Changeset 7bb19df196 in tspsg for src/mainwindow.cpp

Timestamp:

May 2, 2010, 11:59:26 PM (14 years ago)

Author:

Oleksii Serdiuk

Branches:

0.1.3.145-beta1-symbian, 0.1.4.170-beta2-bb10, appveyor, imgbot, master, readme

Children:

8b0661d1ee

Parents:

94cd045fad

git-author:

Oleksii Serdiuk <contacts@…> (05/02/10 23:59:26)

git-committer:

Oleksii Serdiuk <contacts@…> (06/29/12 19:41:43)

Message:

Finished toolbar customization feature.
It is not available on handheld devices (mainly, because the customization dialog is too big for a small screen).

File:

• src/mainwindow.cpp (modified) (12 diffs)

src/mainwindow.cpp

@@ -68 +68 @@
         connect(actionFilePrint, SIGNAL(triggered()), SLOT(actionFilePrintTriggered()));
 #endif // QT_NO_PRINTER
+#ifndef HANDHELD
+        connect(actionSettingsToolbarsConfigure, SIGNAL(triggered()), SLOT(actionSettingsToolbarsConfigureTriggered()));
+#endif // HANDHELD
         connect(actionSettingsPreferences, SIGNAL(triggered()), SLOT(actionSettingsPreferencesTriggered()));
 #ifdef Q_OS_WIN32
@@ -395 +398 @@
 }
 
+#ifndef HANDHELD
+void MainWindow::actionSettingsToolbarsConfigureTriggered()
+{
+QtToolBarDialog dlg(this);
+        dlg.setToolBarManager(toolBarManager);
+        dlg.exec();
+QToolButton *tb = static_cast<QToolButton *>(toolBarMain->widgetForAction(actionFileSave));
+        if (tb != NULL) {
+                tb->setMenu(menuFileSaveAs);
+                tb->setPopupMode(QToolButton::MenuButtonPopup);
+                tb->resize(tb->sizeHint());
+        }
+
+        loadToolbarList();
+}
+#endif // HANDHELD
+
 #ifdef Q_OS_WIN32
 void MainWindow::actionHelpCheck4UpdatesTriggered()
@@ -423 +443 @@
 #else
         title += QString("<b><a href=\"http://tspsg.sourceforge.net/\">http://tspsg.sf.net/</a></b>");
-#endif // Q_OS_WINCE_WM && Q_OS_SYMBIAN
+#endif // HANDHELD
 
 QString about;
@@ -825 +845 @@
 
                 // Saving Main Window state
+#ifndef HANDHELD
                 if (settings->value("SavePos", DEF_SAVEPOS).toBool()) {
                         settings->beginGroup("MainWindow");
-#ifndef HANDHELD
                         settings->setValue("Geometry", saveGeometry());
-#endif // HANDHELD
                         settings->setValue("State", saveState());
+                        settings->setValue("Toolbars", toolBarManager->saveState());
                         settings->endGroup();
                 }
+#endif // HANDHELD
         } else {
                 settings->remove("SettingsReset");
@@ -1060 +1081 @@
 }
 
+void MainWindow::loadToolbarList()
+{
+        menuSettingsToolbars->clear();
+#ifndef HANDHELD
+        menuSettingsToolbars->insertAction(NULL, actionSettingsToolbarsConfigure);
+        menuSettingsToolbars->addSeparator();
+QList<QToolBar *> list = toolBarManager->toolBars();
+        foreach (QToolBar *t, list) {
+                menuSettingsToolbars->insertAction(NULL, t->toggleViewAction());
+        }
+#else // HANDHELD
+        menuSettingsToolbars->insertAction(NULL, toolBarMain->toggleViewAction());
+#endif // HANDHELD
+}
+
 bool MainWindow::maybeSave()
 {
@@ -1128 +1164 @@
 
         loadStyleList();
-
-        actionSettingsLanguageEnglish->setStatusTip(tr("Set application language to %1").arg("English"));
+        loadToolbarList();
+
+#ifndef HANDHELD
+        actionSettingsToolbarsConfigure->setText(tr("Configure..."));
+        actionSettingsToolbarsConfigure->setToolTip(tr("Customize toolbars"));
+#endif // HANDHELD
 
 #ifndef QT_NO_PRINTER
-        actionFilePrintPreview->setText(QApplication::translate("MainWindow", "P&rint Preview...", 0, QApplication::UnicodeUTF8));
+        actionFilePrintPreview->setText(tr("P&rint Preview..."));
 #ifndef QT_NO_TOOLTIP
-        actionFilePrintPreview->setToolTip(QApplication::translate("MainWindow", "Preview solution results", 0, QApplication::UnicodeUTF8));
+        actionFilePrintPreview->setToolTip(tr("Preview solution results"));
 #endif // QT_NO_TOOLTIP
 #ifndef QT_NO_STATUSTIP
-        actionFilePrintPreview->setStatusTip(QApplication::translate("MainWindow", "Preview current solution results before printing", 0, QApplication::UnicodeUTF8));
+        actionFilePrintPreview->setStatusTip(tr("Preview current solution results before printing"));
 #endif // QT_NO_STATUSTIP
 
-        actionFilePrint->setText(QApplication::translate("MainWindow", "&Print...", 0, QApplication::UnicodeUTF8));
+        actionFilePrint->setText(tr("&Print..."));
 #ifndef QT_NO_TOOLTIP
-        actionFilePrint->setToolTip(QApplication::translate("MainWindow", "Print solution", 0, QApplication::UnicodeUTF8));
+        actionFilePrint->setToolTip(tr("Print solution"));
 #endif // QT_NO_TOOLTIP
 #ifndef QT_NO_STATUSTIP
-        actionFilePrint->setStatusTip(QApplication::translate("MainWindow", "Print current solution results", 0, QApplication::UnicodeUTF8));
+        actionFilePrint->setStatusTip(tr("Print current solution results"));
 #endif // QT_NO_STATUSTIP
-        actionFilePrint->setShortcut(QApplication::translate("MainWindow", "Ctrl+P", 0, QApplication::UnicodeUTF8));
+        actionFilePrint->setShortcut(tr("Ctrl+P"));
 #endif // QT_NO_PRINTER
 #ifdef Q_OS_WIN32
@@ -1217 +1257 @@
         //! \hack HACK: A little hack for toolbar icons to have a sane size.
 #ifdef HANDHELD
-        toolBar->setIconSize(QSize(logicalDpiX() / 4, logicalDpiY() / 4));
-#endif // HANDHELD
-        static_cast<QToolButton *>(toolBar->widgetForAction(actionFileSave))->setMenu(menuFileSaveAs);
-        static_cast<QToolButton *>(toolBar->widgetForAction(actionFileSave))->setPopupMode(QToolButton::MenuButtonPopup);
+        toolBarMain->setIconSize(QSize(logicalDpiX() / 4, logicalDpiY() / 4));
+#endif // HANDHELD
+QToolButton *tb = static_cast<QToolButton *>(toolBarMain->widgetForAction(actionFileSave));
+        if (tb != NULL)  {
+                tb->setMenu(menuFileSaveAs);
+                tb->setPopupMode(QToolButton::MenuButtonPopup);
+        }
 
         solutionText->document()->setDefaultFont(settings->value("Output/Font", QFont(DEF_FONT_FAMILY, DEF_FONT_SIZE)).value<QFont>());
@@ -1240 +1283 @@
         menuFile->insertSeparator(actionFileExit);
 
-        toolBar->insertAction(actionSettingsPreferences,actionFilePrint);
+        toolBarMain->insertAction(actionSettingsPreferences, actionFilePrint);
 #endif // QT_NO_PRINTER
-
-        menuSettings->insertAction(actionSettingsPreferences, toolBar->toggleViewAction());
-        menuSettings->insertSeparator(actionSettingsPreferences);
 
         groupSettingsLanguageList = new QActionGroup(this);
@@ -1254 +1294 @@
         actionSettingsStyleSystem->setData(true);
         groupSettingsStyleList = new QActionGroup(this);
+
+#ifndef HANDHELD
+        actionSettingsToolbarsConfigure = new QAction(this);
+        actionSettingsToolbarsConfigure->setIcon(QIcon(":/images/icons/configure-toolbars.png"));
+#endif // HANDHELD
 
 #ifdef Q_OS_WIN32
@@ -1265 +1310 @@
         spinCities->setMaximum(MAX_NUM_CITIES);
 
-        retranslateUi(false);
-
-#ifdef Q_OS_WIN32
-        // Adding some eyecandy in Vista and 7 :-)
-        if (QtWin::isCompositionEnabled() && settings->value("UseTranslucency", DEF_USE_TRANSLUCENCY).toBool())  {
-                toggleTranclucency(true);
-        }
-#endif // Q_OS_WIN32
-
 #ifndef HANDHELD
         toolBarManager = new QtToolBarManager;
         toolBarManager->setMainWindow(this);
-QString cat = toolBar->windowTitle();
-        toolBarManager->addToolBar(toolBar, cat);
+QString cat = toolBarMain->windowTitle();
+        toolBarManager->addToolBar(toolBarMain, cat);
 #ifndef QT_NO_PRINTER
         toolBarManager->addAction(actionFilePrintPreview, cat);
@@ -1285 +1321 @@
         toolBarManager->addAction(actionHelpContextual, cat);
 //      toolBarManager->addAction(action, cat);
-#endif // HANDHELD
+        toolBarManager->restoreState(settings->value("MainWindow/Toolbars").toByteArray());
+#endif // HANDHELD
+
+        retranslateUi(false);
+
+#ifdef Q_OS_WIN32
+        // Adding some eyecandy in Vista and 7 :-)
+        if (QtWin::isCompositionEnabled() && settings->value("UseTranslucency", DEF_USE_TRANSLUCENCY).toBool())  {
+                toggleTranclucency(true);
+        }
+#endif // Q_OS_WIN32
 }
 
@@ -1311 +1357 @@
 #endif // Q_OS_WIN32
 }
-
-#ifndef HANDHELD
-void MainWindow::on_actionSettingsToolbars_triggered()
-{
-QtToolBarDialog dlg(this);
-        dlg.setToolBarManager(toolBarManager);
-        dlg.exec();
-}
-#endif // HANDHELD