From ad6c07bb007c13c50eb48c47fdc49ae4ee9adc6d Mon Sep 17 00:00:00 2001 From: Peter Mash Morgan Date: Tue, 5 Oct 2010 15:36:22 +0100 Subject: [PATCH] db toolbar --- sqlitebrowser/sqlitebrowser/form1.cpp | 21 +++++++++++---------- sqlitebrowser/sqlitebrowser/form1.h | 19 ++++++++++++++----- 2 files changed, 25 insertions(+), 15 deletions(-) diff --git a/sqlitebrowser/sqlitebrowser/form1.cpp b/sqlitebrowser/sqlitebrowser/form1.cpp index d6a066c9..1530deb2 100644 --- a/sqlitebrowser/sqlitebrowser/form1.cpp +++ b/sqlitebrowser/sqlitebrowser/form1.cpp @@ -1083,7 +1083,8 @@ void mainForm::dbState( bool dirty ) void mainForm::fileSave() { if (db.isOpen()){ - db.save(); + db.save(); + //dbStatusBar->showMessage("Date written to file", 4000) } } @@ -1091,15 +1092,15 @@ void mainForm::fileSave() void mainForm::fileRevert() { if (db.isOpen()){ - QString msg = "Are you sure you want to undo all changes made to the database file \n "; - msg.append(db.curDBFilename); - msg.append(" since the last save?"); - if (QMessageBox::question( this, applicationName ,msg, QMessageBox::Yes, QMessageBox::No)==QMessageBox::Yes) - { - db.revert(); - populateStructure(); - resetBrowser(); - } + QString msg = "Are you sure you want to undo all changes made to the database file \n\n "; + msg.append(db.curDBFilename); + msg.append("\n since the last save?"); + if (QMessageBox::question( this, applicationName ,msg, QMessageBox::Yes, QMessageBox::No)==QMessageBox::Yes) + { + db.revert(); + populateStructure(); + resetBrowser(); + } } } diff --git a/sqlitebrowser/sqlitebrowser/form1.h b/sqlitebrowser/sqlitebrowser/form1.h index 2300f450..31a2e1b8 100644 --- a/sqlitebrowser/sqlitebrowser/form1.h +++ b/sqlitebrowser/sqlitebrowser/form1.h @@ -164,6 +164,9 @@ public: fileSaveAction->setName("fileSaveAction"); fileSaveAction->setEnabled(false); fileSaveAction->setIcon(QIcon(":/icons/db_save")); + QFont fntS = fileSaveAction->font(); + fntS.setBold(true); + fileSaveAction->setFont(fntS); //** Db Revert fileRevertAction = new QAction(mainForm); @@ -171,6 +174,9 @@ public: fileRevertAction->setName("fileRevertAction"); fileRevertAction->setEnabled(false); fileRevertAction->setIcon(QIcon(":/icons/db_revert")); + QFont fntR = fileRevertAction->font(); + fntR.setBold(true); + fileRevertAction->setFont(fntR); //** Exit @@ -537,6 +543,7 @@ public: Toolbar = new QToolBar(); mainForm->addToolBar(Qt::TopToolBarArea, Toolbar); Toolbar->setObjectName(QString::fromUtf8("Toolbar")); + Toolbar->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); //*** Setup main Menu menubar = mainForm->menuBar(); //new QMenuBar(mainForm); @@ -562,6 +569,7 @@ public: Toolbar->addAction(fileRevertAction); Toolbar->addSeparator(); + /* Toolbar->addAction(editCreateTableAction); Toolbar->addAction(editDeleteTableAction); Toolbar->addAction(editModifyTableAction); @@ -574,6 +582,7 @@ public: Toolbar->addAction(sqlLogAction); Toolbar->addSeparator(); Toolbar->addAction(helpWhatsThisAction); + */ menubar->addAction(fileMenu->menuAction()); menubar->addAction(EditMenu->menuAction()); @@ -756,16 +765,16 @@ public: #ifndef QT_NO_WHATSTHIS fileExportCSVAction->setWhatsThis(QApplication::translate("mainForm", "Export a database table as a comma separated text file, ready to be imported into other database or spreadsheet applications.", 0, QApplication::UnicodeUTF8)); #endif // QT_NO_WHATSTHIS - fileSaveAction->setIconText(QApplication::translate("mainForm", "Save Database", 0, QApplication::UnicodeUTF8)); - fileSaveAction->setText(QApplication::translate("mainForm", "Save Database", 0, QApplication::UnicodeUTF8)); + fileSaveAction->setIconText(QApplication::translate("mainForm", "Write Changes", 0, QApplication::UnicodeUTF8)); + fileSaveAction->setText(QApplication::translate("mainForm", "Revert Changes", 0, QApplication::UnicodeUTF8)); #ifndef QT_NO_TOOLTIP - fileSaveAction->setToolTip(QApplication::translate("mainForm", "Save changes to the database file", 0, QApplication::UnicodeUTF8)); + fileSaveAction->setToolTip(QApplication::translate("mainForm", "Write changes to the database file", 0, QApplication::UnicodeUTF8)); #endif // QT_NO_TOOLTIP #ifndef QT_NO_WHATSTHIS fileSaveAction->setWhatsThis(QApplication::translate("mainForm", "This option is used to save changes to the database file.", 0, QApplication::UnicodeUTF8)); #endif // QT_NO_WHATSTHIS - fileRevertAction->setIconText(QApplication::translate("mainForm", "Revert Database", 0, QApplication::UnicodeUTF8)); - fileRevertAction->setText(QApplication::translate("mainForm", "Revert Database", 0, QApplication::UnicodeUTF8)); + fileRevertAction->setIconText(QApplication::translate("mainForm", "Revert Changes", 0, QApplication::UnicodeUTF8)); + fileRevertAction->setText(QApplication::translate("mainForm", "Revert Changes", 0, QApplication::UnicodeUTF8)); #ifndef QT_NO_TOOLTIP fileRevertAction->setToolTip(QApplication::translate("mainForm", "Revert database to last saved state", 0, QApplication::UnicodeUTF8)); #endif // QT_NO_TOOLTIP