diff options
| author |   Unit 193 <unit193@ubuntu.com> | 2014-12-14 08:24:32 -0500 |
|---|---|---|
| committer | Unit 193 <unit193@ubuntu.com> | 2014-12-14 08:24:32 -0500 |
| commit | e571839e140139a6a819077e94cf8cc01c13b29f (patch) | |
| tree | 8263635257cfb5ed979a584a958103b700bf31e7 /SQLiteStudio3/guiSQLiteStudio/dbtree/dbtreemodel.cpp | |
| parent | 407eac41f46936e3f346bb5a964a682e578b4237 (diff) | |
| parent | 89214766d8e3e7b8dd749a1fa18a5b9727f5010d (diff) | |
Merge tag 'upstream/3.0.0'
Upstream version 3.0.0
# gpg: Signature made Sun 14 Dec 2014 08:24:31 AM EST using RSA key ID EBE9BD91
# gpg: Good signature from "Unit 193 <unit193@gmail.com>"
# gpg: aka "Unit 193 <unit193@ninthfloor.org>"
# gpg: aka "Unit 193 <unit193@ubuntu.com>"
Diffstat (limited to 'SQLiteStudio3/guiSQLiteStudio/dbtree/dbtreemodel.cpp')
| -rw-r--r-- | SQLiteStudio3/guiSQLiteStudio/dbtree/dbtreemodel.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtreemodel.cpp b/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtreemodel.cpp index 8a71a10..281510f 100644 --- a/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtreemodel.cpp +++ b/SQLiteStudio3/guiSQLiteStudio/dbtree/dbtreemodel.cpp @@ -1152,7 +1152,7 @@ void DbTreeModel::moveOrCopyDbObjects(const QList<DbTreeItem*>& srcItems, DbTree bool DbTreeModel::confirmReferencedTables(const QStringList& tables) { QMessageBox::StandardButton result = QMessageBox::question(MAINWINDOW, tr("Referenced tables"), - tr("Do you want to include following referenced tables as well:\n%1").arg(tables.join(", "))); + tr("Do you want to include following referenced tables as well:\n%1").arg(tables.join(", "))); return result == QMessageBox::Yes; } @@ -1180,7 +1180,7 @@ bool DbTreeModel::confirmConversion(const QList<QPair<QString, QString> >& diffs return dialog.exec() == QDialog::Accepted; } -bool DbTreeModel::confirmConversionErrors(const QHash<QString,QSet<QString>>& errors) +bool DbTreeModel::confirmConversionErrors(const QHash<QString, QSet<QString> >& errors) { ErrorsConfirmDialog dialog(MAINWINDOW); dialog.setTopLabel(tr("Following error occurred while converting SQL statements to the target SQLite version:")); @@ -1188,6 +1188,7 @@ bool DbTreeModel::confirmConversionErrors(const QHash<QString,QSet<QString>>& er dialog.setErrors(errors); return dialog.exec() == QDialog::Accepted; } + bool DbTreeModel::getIgnoreDbLoadedSignal() const { return ignoreDbLoadedSignal; |