aboutsummaryrefslogtreecommitdiffstats
path: root/SQLiteStudio3/guiSQLiteStudio/windows
diff options
context:
space:
mode:
Diffstat (limited to 'SQLiteStudio3/guiSQLiteStudio/windows')
-rw-r--r--SQLiteStudio3/guiSQLiteStudio/windows/bugreporthistorywindow.cpp4
-rw-r--r--SQLiteStudio3/guiSQLiteStudio/windows/bugreporthistorywindow.h4
-rw-r--r--SQLiteStudio3/guiSQLiteStudio/windows/collationseditor.cpp6
-rw-r--r--SQLiteStudio3/guiSQLiteStudio/windows/collationseditor.h4
-rw-r--r--SQLiteStudio3/guiSQLiteStudio/windows/ddlhistorywindow.cpp4
-rw-r--r--SQLiteStudio3/guiSQLiteStudio/windows/ddlhistorywindow.h4
-rw-r--r--SQLiteStudio3/guiSQLiteStudio/windows/editorwindow.cpp18
-rw-r--r--SQLiteStudio3/guiSQLiteStudio/windows/editorwindow.h6
-rw-r--r--SQLiteStudio3/guiSQLiteStudio/windows/functionseditor.cpp6
-rw-r--r--SQLiteStudio3/guiSQLiteStudio/windows/functionseditor.h4
-rw-r--r--SQLiteStudio3/guiSQLiteStudio/windows/tablewindow.cpp57
-rw-r--r--SQLiteStudio3/guiSQLiteStudio/windows/tablewindow.h7
-rw-r--r--SQLiteStudio3/guiSQLiteStudio/windows/viewwindow.cpp47
-rw-r--r--SQLiteStudio3/guiSQLiteStudio/windows/viewwindow.h7
14 files changed, 113 insertions, 65 deletions
diff --git a/SQLiteStudio3/guiSQLiteStudio/windows/bugreporthistorywindow.cpp b/SQLiteStudio3/guiSQLiteStudio/windows/bugreporthistorywindow.cpp
index c92f6f4..7632c8f 100644
--- a/SQLiteStudio3/guiSQLiteStudio/windows/bugreporthistorywindow.cpp
+++ b/SQLiteStudio3/guiSQLiteStudio/windows/bugreporthistorywindow.cpp
@@ -144,12 +144,12 @@ void BugReportHistoryWindow::deleteSelected()
CFG->deleteReport(id);
}
-bool BugReportHistoryWindow::isUncommited() const
+bool BugReportHistoryWindow::isUncommitted() const
{
return false;
}
-QString BugReportHistoryWindow::getQuitUncommitedConfirmMessage() const
+QString BugReportHistoryWindow::getQuitUncommittedConfirmMessage() const
{
return QString();
}
diff --git a/SQLiteStudio3/guiSQLiteStudio/windows/bugreporthistorywindow.h b/SQLiteStudio3/guiSQLiteStudio/windows/bugreporthistorywindow.h
index e582a48..42e518a 100644
--- a/SQLiteStudio3/guiSQLiteStudio/windows/bugreporthistorywindow.h
+++ b/SQLiteStudio3/guiSQLiteStudio/windows/bugreporthistorywindow.h
@@ -33,8 +33,8 @@ class GUI_API_EXPORT BugReportHistoryWindow : public MdiChild
~BugReportHistoryWindow();
bool restoreSessionNextTime();
- bool isUncommited() const;
- QString getQuitUncommitedConfirmMessage() const;
+ bool isUncommitted() const;
+ QString getQuitUncommittedConfirmMessage() const;
protected:
QVariant saveSession();
diff --git a/SQLiteStudio3/guiSQLiteStudio/windows/collationseditor.cpp b/SQLiteStudio3/guiSQLiteStudio/windows/collationseditor.cpp
index 1d0594d..286924b 100644
--- a/SQLiteStudio3/guiSQLiteStudio/windows/collationseditor.cpp
+++ b/SQLiteStudio3/guiSQLiteStudio/windows/collationseditor.cpp
@@ -378,12 +378,12 @@ void CollationsEditor::changeFont(const QVariant& font)
}
-bool CollationsEditor::isUncommited() const
+bool CollationsEditor::isUncommitted() const
{
return model->isModified();
}
-QString CollationsEditor::getQuitUncommitedConfirmMessage() const
+QString CollationsEditor::getQuitUncommittedConfirmMessage() const
{
- return tr("Collations editor window has uncommited modifications.");
+ return tr("Collations editor window has uncommitted modifications.");
}
diff --git a/SQLiteStudio3/guiSQLiteStudio/windows/collationseditor.h b/SQLiteStudio3/guiSQLiteStudio/windows/collationseditor.h
index 62cb281..a75e66b 100644
--- a/SQLiteStudio3/guiSQLiteStudio/windows/collationseditor.h
+++ b/SQLiteStudio3/guiSQLiteStudio/windows/collationseditor.h
@@ -40,8 +40,8 @@ class GUI_API_EXPORT CollationsEditor : public MdiChild
~CollationsEditor();
bool restoreSessionNextTime();
- bool isUncommited() const;
- QString getQuitUncommitedConfirmMessage() const;
+ bool isUncommitted() const;
+ QString getQuitUncommittedConfirmMessage() const;
protected:
QVariant saveSession();
diff --git a/SQLiteStudio3/guiSQLiteStudio/windows/ddlhistorywindow.cpp b/SQLiteStudio3/guiSQLiteStudio/windows/ddlhistorywindow.cpp
index 3aeccfb..15b49e5 100644
--- a/SQLiteStudio3/guiSQLiteStudio/windows/ddlhistorywindow.cpp
+++ b/SQLiteStudio3/guiSQLiteStudio/windows/ddlhistorywindow.cpp
@@ -139,12 +139,12 @@ QToolBar* DdlHistoryWindow::getToolBar(int toolbar) const
}
-bool DdlHistoryWindow::isUncommited() const
+bool DdlHistoryWindow::isUncommitted() const
{
return false;
}
-QString DdlHistoryWindow::getQuitUncommitedConfirmMessage() const
+QString DdlHistoryWindow::getQuitUncommittedConfirmMessage() const
{
return QString();
}
diff --git a/SQLiteStudio3/guiSQLiteStudio/windows/ddlhistorywindow.h b/SQLiteStudio3/guiSQLiteStudio/windows/ddlhistorywindow.h
index 16a07ce..1a04831 100644
--- a/SQLiteStudio3/guiSQLiteStudio/windows/ddlhistorywindow.h
+++ b/SQLiteStudio3/guiSQLiteStudio/windows/ddlhistorywindow.h
@@ -24,8 +24,8 @@ class GUI_API_EXPORT DdlHistoryWindow : public MdiChild
~DdlHistoryWindow();
bool restoreSessionNextTime();
- bool isUncommited() const;
- QString getQuitUncommitedConfirmMessage() const;
+ bool isUncommitted() const;
+ QString getQuitUncommittedConfirmMessage() const;
protected:
void changeEvent(QEvent *e);
diff --git a/SQLiteStudio3/guiSQLiteStudio/windows/editorwindow.cpp b/SQLiteStudio3/guiSQLiteStudio/windows/editorwindow.cpp
index 30fe07b..56ab6fe 100644
--- a/SQLiteStudio3/guiSQLiteStudio/windows/editorwindow.cpp
+++ b/SQLiteStudio3/guiSQLiteStudio/windows/editorwindow.cpp
@@ -375,6 +375,9 @@ void EditorWindow::createActions()
attachActionInMenu(ui->sqlEdit->getAction(SqlEditor::SAVE_SQL_FILE), ui->sqlEdit->getAction(SqlEditor::SAVE_AS_SQL_FILE), ui->toolBar);
ui->toolBar->addAction(ui->sqlEdit->getAction(SqlEditor::OPEN_SQL_FILE));
ui->toolBar->addSeparator();
+ ui->toolBar->addAction(ui->sqlEdit->getAction(SqlEditor::FIND));
+ ui->toolBar->addAction(ui->sqlEdit->getAction(SqlEditor::REPLACE));
+ ui->toolBar->addSeparator();
actionMap[CURRENT_DB] = ui->toolBar->addWidget(dbCombo);
ui->toolBar->addSeparator();
ui->toolBar->addAction(staticActions[RESULTS_IN_TAB]);
@@ -424,7 +427,7 @@ void EditorWindow::selectCurrentQuery(bool fallBackToPreviousIfNecessary)
int pos = cursor.position();
int queryStartPos;
QString contents = ui->sqlEdit->toPlainText();
- QString query = getQueryWithPosition(contents, pos, dialect, &queryStartPos);
+ QString query = getQueryWithPosition(contents, pos, &queryStartPos);
TokenList tokens = Lexer::tokenize(query, dialect);
tokens.trim();
tokens.trimRight(Token::OPERATOR, ";");
@@ -435,7 +438,7 @@ void EditorWindow::selectCurrentQuery(bool fallBackToPreviousIfNecessary)
pos = contents.lastIndexOf(";", pos - 1);
if (pos > -1)
{
- query = getQueryWithPosition(contents, pos, dialect, &queryStartPos);
+ query = getQueryWithPosition(contents, pos, &queryStartPos);
tokens = Lexer::tokenize(query, dialect);
tokens.trim();
tokens.trimRight(Token::OPERATOR, ";");
@@ -470,6 +473,7 @@ void EditorWindow::execQuery(bool explain)
resultsModel->setDb(getCurrentDb());
resultsModel->setExplainMode(explain);
resultsModel->setQuery(sql);
+ resultsModel->setQueryCountLimitForSmartMode(queryLimitForSmartExecution);
ui->dataView->refreshData();
updateState();
@@ -623,7 +627,7 @@ void EditorWindow::exportResults()
}
QString query = lastSuccessfulQuery.isEmpty() ? getQueryToExecute() : lastSuccessfulQuery;
- QStringList queries = splitQueries(query, getCurrentDb()->getDialect(), false);
+ QStringList queries = splitQueries(query, getCurrentDb()->getDialect(), false, true);
if (queries.size() == 0)
{
qWarning() << "No queries after split in EditorWindow::exportResults()";
@@ -662,12 +666,12 @@ int qHash(EditorWindow::ActionGroup actionGroup)
}
-bool EditorWindow::isUncommited() const
+bool EditorWindow::isUncommitted() const
{
- return ui->dataView->isUncommited();
+ return ui->dataView->isUncommitted();
}
-QString EditorWindow::getQuitUncommitedConfirmMessage() const
+QString EditorWindow::getQuitUncommittedConfirmMessage() const
{
- return tr("Editor window \"%1\" has uncommited data.").arg(getMdiWindow()->windowTitle());
+ return tr("Editor window \"%1\" has uncommitted data.").arg(getMdiWindow()->windowTitle());
}
diff --git a/SQLiteStudio3/guiSQLiteStudio/windows/editorwindow.h b/SQLiteStudio3/guiSQLiteStudio/windows/editorwindow.h
index d952b1b..12486a8 100644
--- a/SQLiteStudio3/guiSQLiteStudio/windows/editorwindow.h
+++ b/SQLiteStudio3/guiSQLiteStudio/windows/editorwindow.h
@@ -93,8 +93,8 @@ class GUI_API_EXPORT EditorWindow : public MdiChild
void execute();
QToolBar* getToolBar(int toolbar) const;
SqlEditor* getEditor() const;
- bool isUncommited() const;
- QString getQuitUncommitedConfirmMessage() const;
+ bool isUncommitted() const;
+ QString getQuitUncommittedConfirmMessage() const;
protected:
void changeEvent(QEvent *e);
@@ -115,6 +115,8 @@ class GUI_API_EXPORT EditorWindow : public MdiChild
void selectCurrentQuery(bool fallBackToPreviousIfNecessary = false);
void updateShortcutTips();
+ static const int queryLimitForSmartExecution = 100;
+
static ResultsDisplayMode resultsDisplayMode;
static QHash<Action,QAction*> staticActions;
static QHash<ActionGroup,QActionGroup*> staticActionGroups;
diff --git a/SQLiteStudio3/guiSQLiteStudio/windows/functionseditor.cpp b/SQLiteStudio3/guiSQLiteStudio/windows/functionseditor.cpp
index 29163e3..1bfd1f7 100644
--- a/SQLiteStudio3/guiSQLiteStudio/windows/functionseditor.cpp
+++ b/SQLiteStudio3/guiSQLiteStudio/windows/functionseditor.cpp
@@ -621,12 +621,12 @@ QVariant FunctionsEditor::saveSession()
}
-bool FunctionsEditor::isUncommited() const
+bool FunctionsEditor::isUncommitted() const
{
return model->isModified();
}
-QString FunctionsEditor::getQuitUncommitedConfirmMessage() const
+QString FunctionsEditor::getQuitUncommittedConfirmMessage() const
{
- return tr("Functions editor window has uncommited modifications.");
+ return tr("Functions editor window has uncommitted modifications.");
}
diff --git a/SQLiteStudio3/guiSQLiteStudio/windows/functionseditor.h b/SQLiteStudio3/guiSQLiteStudio/windows/functionseditor.h
index 0fa496e..72455d3 100644
--- a/SQLiteStudio3/guiSQLiteStudio/windows/functionseditor.h
+++ b/SQLiteStudio3/guiSQLiteStudio/windows/functionseditor.h
@@ -48,8 +48,8 @@ class GUI_API_EXPORT FunctionsEditor : public MdiChild
~FunctionsEditor();
bool restoreSessionNextTime();
- bool isUncommited() const;
- QString getQuitUncommitedConfirmMessage() const;
+ bool isUncommitted() const;
+ QString getQuitUncommittedConfirmMessage() const;
protected:
QVariant saveSession();
diff --git a/SQLiteStudio3/guiSQLiteStudio/windows/tablewindow.cpp b/SQLiteStudio3/guiSQLiteStudio/windows/tablewindow.cpp
index fd344e8..286aad7 100644
--- a/SQLiteStudio3/guiSQLiteStudio/windows/tablewindow.cpp
+++ b/SQLiteStudio3/guiSQLiteStudio/windows/tablewindow.cpp
@@ -176,9 +176,10 @@ void TableWindow::init()
connect(CFG_UI.General.DataTabAsFirstInTables, SIGNAL(changed(const QVariant&)), this, SLOT(updateTabsOrder()));
connect(ui->structureView, SIGNAL(doubleClicked(const QModelIndex&)), this, SLOT(structureViewDoubleClicked(const QModelIndex&)));
connect(ui->tableConstraintsView, SIGNAL(doubleClicked(const QModelIndex&)), this, SLOT(constraintsViewDoubleClicked(const QModelIndex&)));
+ connect(CFG_UI.Fonts.DataView, SIGNAL(changed(QVariant)), this, SLOT(updateFont()));
structureExecutor = new ChainExecutor(this);
- connect(structureExecutor, SIGNAL(success()), this, SLOT(changesSuccessfullyCommited()));
+ connect(structureExecutor, SIGNAL(success(SqlQueryPtr)), this, SLOT(changesSuccessfullyCommitted()));
connect(structureExecutor, SIGNAL(failure(int,QString)), this, SLOT(changesFailedToCommit(int,QString)));
THEME_TUNER->manageCompactLayout({
@@ -191,6 +192,7 @@ void TableWindow::init()
ui->ddlTab
});
+ updateFont();
setupCoverWidget();
updateAfterInit();
}
@@ -797,7 +799,7 @@ void TableWindow::commitStructure(bool skipWarning)
executeStructureChanges();
}
-void TableWindow::changesSuccessfullyCommited()
+void TableWindow::changesSuccessfullyCommitted()
{
modifyingThisTable = false;
@@ -820,10 +822,17 @@ void TableWindow::changesSuccessfullyCommited()
updateNewTableState();
updateWindowTitle();
+ NotifyManager* notifyManager = NotifyManager::getInstance();
if (oldTable.compare(table, Qt::CaseInsensitive) == 0 || oldTable.isEmpty())
- notifyInfo(tr("Commited changes for table '%1' successfly.").arg(table));
+ {
+ notifyInfo(tr("Committed changes for table '%1' successfully.").arg(table));
+ }
else
- notifyInfo(tr("Commited changes for table '%1' (named before '%2') successfly.").arg(table, oldTable));
+ {
+ notifyInfo(tr("Committed changes for table '%1' (named before '%2') successfully.").arg(table, oldTable));
+ notifyManager->renamed(db, database, oldTable, table);
+ }
+ notifyManager->modified(db, database, table);
DBTREE->refreshSchema(db);
@@ -835,7 +844,6 @@ void TableWindow::changesSuccessfullyCommited()
tableModifier->getModifiedTriggers(),
tableModifier->getModifiedViews()
};
- NotifyManager* notifyManager = NotifyManager::getInstance();
foreach (const QStringList& objList, modifiedObjects)
{
foreach (const QString& obj, objList)
@@ -886,7 +894,7 @@ void TableWindow::resetAutoincrement()
if (res->isError())
notifyError(tr("An error occurred while trying to reset autoincrement value for table '%1': %2").arg(table, res->getErrorText()));
else
- notifyInfo(tr("Autoincrement value for table '%1' has been reset successfly.").arg(table));
+ notifyInfo(tr("Autoincrement value for table '%1' has been reset successfully.").arg(table));
}
void TableWindow::addColumn()
@@ -1259,8 +1267,8 @@ void TableWindow::tabChanged(int newTab)
{
if (isModified())
{
- int res = QMessageBox::question(this, tr("Uncommited changes"),
- tr("There are uncommited structure modifications. You cannot browse or edit data until you have "
+ int res = QMessageBox::question(this, tr("Uncommitted changes"),
+ tr("There are uncommitted structure modifications. You cannot browse or edit data until you have "
"table structure settled.\n"
"Do you want to commit the structure, or do you want to go back to the structure tab?"),
tr("Go back to structure tab"), tr("Commit modifications and browse data."));
@@ -1596,23 +1604,23 @@ bool TableWindow::handleInitialFocus()
return false;
}
-bool TableWindow::isUncommited() const
+bool TableWindow::isUncommitted() const
{
- return ui->dataView->isUncommited() || isModified();
+ return ui->dataView->isUncommitted() || isModified();
}
-QString TableWindow::getQuitUncommitedConfirmMessage() const
+QString TableWindow::getQuitUncommittedConfirmMessage() const
{
QString title = getMdiWindow()->windowTitle();
- if (ui->dataView->isUncommited() && isModified())
- return tr("Table window \"%1\" has uncommited structure modifications and data.").arg(title);
- else if (ui->dataView->isUncommited())
- return tr("Table window \"%1\" has uncommited data.").arg(title);
+ if (ui->dataView->isUncommitted() && isModified())
+ return tr("Table window \"%1\" has uncommitted structure modifications and data.").arg(title);
+ else if (ui->dataView->isUncommitted())
+ return tr("Table window \"%1\" has uncommitted data.").arg(title);
else if (isModified())
- return tr("Table window \"%1\" has uncommited structure modifications.").arg(title);
+ return tr("Table window \"%1\" has uncommitted structure modifications.").arg(title);
else
{
- qCritical() << "Unhandled message case in TableWindow::getQuitUncommitedConfirmMessage().";
+ qCritical() << "Unhandled message case in TableWindow::getQuitUncommittedConfirmMessage().";
return QString();
}
}
@@ -1630,3 +1638,18 @@ Db* TableWindow::getAssociatedDb() const
{
return db;
}
+
+void TableWindow::updateFont()
+{
+ QFont f = CFG_UI.Fonts.DataView.get();
+ QFontMetrics fm(f);
+
+ QTableView* views[] = {ui->structureView, ui->tableConstraintsView, ui->indexList, ui->triggerList};
+ for (QTableView* view : views)
+ {
+ view->setFont(f);
+ view->horizontalHeader()->setFont(f);
+ view->verticalHeader()->setFont(f);
+ view->verticalHeader()->setDefaultSectionSize(fm.height() + 4);
+ }
+}
diff --git a/SQLiteStudio3/guiSQLiteStudio/windows/tablewindow.h b/SQLiteStudio3/guiSQLiteStudio/windows/tablewindow.h
index d8738f1..f44af4f 100644
--- a/SQLiteStudio3/guiSQLiteStudio/windows/tablewindow.h
+++ b/SQLiteStudio3/guiSQLiteStudio/windows/tablewindow.h
@@ -118,8 +118,8 @@ class GUI_API_EXPORT TableWindow : public MdiChild
QString getTable() const;
Db* getDb() const;
bool handleInitialFocus();
- bool isUncommited() const;
- QString getQuitUncommitedConfirmMessage() const;
+ bool isUncommitted() const;
+ QString getQuitUncommittedConfirmMessage() const;
void useCurrentTableAsBaseForNew();
Db* getAssociatedDb() const;
@@ -193,7 +193,7 @@ class GUI_API_EXPORT TableWindow : public MdiChild
void checkIfTriggerDeleted(const QString& object);
void refreshStructure();
void commitStructure(bool skipWarning = false);
- void changesSuccessfullyCommited();
+ void changesSuccessfullyCommitted();
void changesFailedToCommit(int errorCode, const QString& errorText);
void rollbackStructure();
void resetAutoincrement();
@@ -237,6 +237,7 @@ class GUI_API_EXPORT TableWindow : public MdiChild
void nextTab();
void prevTab();
void updateTabsOrder();
+ void updateFont();
public slots:
void updateIndexes();
diff --git a/SQLiteStudio3/guiSQLiteStudio/windows/viewwindow.cpp b/SQLiteStudio3/guiSQLiteStudio/windows/viewwindow.cpp
index 07c927c..be805af 100644
--- a/SQLiteStudio3/guiSQLiteStudio/windows/viewwindow.cpp
+++ b/SQLiteStudio3/guiSQLiteStudio/windows/viewwindow.cpp
@@ -237,9 +237,10 @@ void ViewWindow::init()
connect(ui->outputColumnsTable->model(), SIGNAL(rowsMoved(const QModelIndex&, int, int, const QModelIndex&, int)), this, SLOT(updateQueryToolbarStatus()));
connect(ui->outputColumnsTable, SIGNAL(itemChanged(QListWidgetItem*)), this, SLOT(updateQueryToolbarStatus()));
connect(CFG_UI.General.DataTabAsFirstInViews, SIGNAL(changed(const QVariant&)), this, SLOT(updateTabsOrder()));
+ connect(CFG_UI.Fonts.DataView, SIGNAL(changed(QVariant)), this, SLOT(updateFont()));
structureExecutor = new ChainExecutor(this);
- connect(structureExecutor, SIGNAL(success()), this, SLOT(changesSuccessfullyCommited()));
+ connect(structureExecutor, SIGNAL(success(SqlQueryPtr)), this, SLOT(changesSuccessfullyCommitted()));
connect(structureExecutor, SIGNAL(failure(int,QString)), this, SLOT(changesFailedToCommit(int,QString)));
setupCoverWidget();
@@ -253,6 +254,7 @@ void ViewWindow::init()
updateTabsOrder();
+ updateFont();
refreshTriggers();
updateQueryToolbarStatus();
updateTriggersState();
@@ -347,23 +349,23 @@ void ViewWindow::setSelect(const QString &selectSql)
ui->queryEdit->setPlainText(selectSql);
}
-bool ViewWindow::isUncommited() const
+bool ViewWindow::isUncommitted() const
{
- return ui->dataView->isUncommited() || isModified();
+ return ui->dataView->isUncommitted() || isModified();
}
-QString ViewWindow::getQuitUncommitedConfirmMessage() const
+QString ViewWindow::getQuitUncommittedConfirmMessage() const
{
QString title = getMdiWindow()->windowTitle();
- if (ui->dataView->isUncommited() && isModified())
- return tr("View window \"%1\" has uncommited structure modifications and data.").arg(title);
- else if (ui->dataView->isUncommited())
- return tr("View window \"%1\" has uncommited data.").arg(title);
+ if (ui->dataView->isUncommitted() && isModified())
+ return tr("View window \"%1\" has uncommitted structure modifications and data.").arg(title);
+ else if (ui->dataView->isUncommitted())
+ return tr("View window \"%1\" has uncommitted data.").arg(title);
else if (isModified())
- return tr("View window \"%1\" has uncommited structure modifications.").arg(title);
+ return tr("View window \"%1\" has uncommitted structure modifications.").arg(title);
else
{
- qCritical() << "Unhandled message case in ViewWindow::getQuitUncommitedConfirmMessage().";
+ qCritical() << "Unhandled message case in ViewWindow::getQuitUncommittedConfirmMessage().";
return QString();
}
}
@@ -569,8 +571,8 @@ void ViewWindow::tabChanged(int tabIdx)
{
if (isModified())
{
- int res = QMessageBox::question(this, tr("Uncommited changes"),
- tr("There are uncommited structure modifications. You cannot browse or edit data until you have "
+ int res = QMessageBox::question(this, tr("Uncommitted changes"),
+ tr("There are uncommitted structure modifications. You cannot browse or edit data until you have "
"the view structure settled.\n"
"Do you want to commit the structure, or do you want to go back to the structure tab?"),
tr("Go back to structure tab"), tr("Commit modifications and browse data."));
@@ -604,7 +606,7 @@ void ViewWindow::updateQueryToolbarStatus()
actionMap[REFRESH_QUERY]->setEnabled(existingView);
}
-void ViewWindow::changesSuccessfullyCommited()
+void ViewWindow::changesSuccessfullyCommitted()
{
QStringList sqls = structureExecutor->getQueries();
CFG->addDdlHistory(sqls.join("\n"), db->getName(), db->getPath());
@@ -624,9 +626,9 @@ void ViewWindow::changesSuccessfullyCommited()
updateWindowTitle();
if (oldView.compare(view, Qt::CaseInsensitive) == 0)
- notifyInfo(tr("Commited changes for view '%1' successfly.").arg(view));
+ notifyInfo(tr("Committed changes for view '%1' successfully.").arg(view));
else
- notifyInfo(tr("Commited changes for view '%1' (named before '%2') successfly.").arg(view, oldView));
+ notifyInfo(tr("Committed changes for view '%1' (named before '%2') successfully.").arg(view, oldView));
DBTREE->refreshSchema(db);
}
@@ -1044,3 +1046,18 @@ void ViewWindow::executeStructureChanges()
structureExecutor->exec();
widgetCover->show();
}
+
+void ViewWindow::updateFont()
+{
+ QFont f = CFG_UI.Fonts.DataView.get();
+ QFontMetrics fm(f);
+
+ QTableView* views[] = {ui->triggersList};
+ for (QTableView* view : views)
+ {
+ view->setFont(f);
+ view->horizontalHeader()->setFont(f);
+ view->verticalHeader()->setFont(f);
+ view->verticalHeader()->setDefaultSectionSize(fm.height() + 4);
+ }
+}
diff --git a/SQLiteStudio3/guiSQLiteStudio/windows/viewwindow.h b/SQLiteStudio3/guiSQLiteStudio/windows/viewwindow.h
index 65c3260..6144ad8 100644
--- a/SQLiteStudio3/guiSQLiteStudio/windows/viewwindow.h
+++ b/SQLiteStudio3/guiSQLiteStudio/windows/viewwindow.h
@@ -73,8 +73,8 @@ class GUI_API_EXPORT ViewWindow : public MdiChild
QString getDatabase() const;
QString getView() const;
void setSelect(const QString& selectSql);
- bool isUncommited() const;
- QString getQuitUncommitedConfirmMessage() const;
+ bool isUncommitted() const;
+ QString getQuitUncommittedConfirmMessage() const;
Db* getAssociatedDb() const;
static void staticInit();
@@ -147,7 +147,7 @@ class GUI_API_EXPORT ViewWindow : public MdiChild
void executionFailed(const QString& errorMessage);
void tabChanged(int tabIdx);
void updateQueryToolbarStatus();
- void changesSuccessfullyCommited();
+ void changesSuccessfullyCommitted();
void changesFailedToCommit(int errorCode, const QString& errorText);
void updateTriggersState();
void nextTab();
@@ -165,6 +165,7 @@ class GUI_API_EXPORT ViewWindow : public MdiChild
void updateDbRelatedUiElements();
void updateTabsOrder();
void triggerViewDoubleClicked(const QModelIndex& idx);
+ void updateFont();
public slots:
void refreshTriggers();