diff options
| author |   Unit 193 <unit193@ubuntu.com> | 2017-02-09 04:37:26 -0500 |
|---|---|---|
| committer | Unit 193 <unit193@ubuntu.com> | 2017-02-09 04:37:26 -0500 |
| commit | c9d6debf9015b7853c3e061bbc64a555d85e2fcd (patch) | |
| tree | 53341bc57ae9fbad2beb5b6c08d97a68bee0ec8e /SQLiteStudio3/guiSQLiteStudio/windows/viewwindow.h | |
| parent | d5caba2b1f36dc3b92fa705a06097d0597fa2ddd (diff) | |
| parent | d9aa870e5d509cc7309ab82dd102a937ab58613a (diff) | |
Merge tag 'upstream/3.1.1+dfsg1'
Upstream version 3.1.1+dfsg1
# gpg: Signature made Thu 09 Feb 2017 04:37:24 AM EST
# gpg: using RSA key 5001E1B09AA3744B
# gpg: issuer "unit193@ubuntu.com"
# gpg: Good signature from "Unit 193 <unit193@ubuntu.com>" [unknown]
# gpg: aka "Unit 193 <unit193@gmail.com>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 8DB3 E586 865D 2B4A 2B18 5A5C 5001 E1B0 9AA3 744B
Diffstat (limited to 'SQLiteStudio3/guiSQLiteStudio/windows/viewwindow.h')
| -rw-r--r-- | SQLiteStudio3/guiSQLiteStudio/windows/viewwindow.h | 7 |
1 files changed, 4 insertions, 3 deletions
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(); |