Changeset 114 in tspsg-svn for trunk/src

Timestamp:

Apr 30, 2010, 3:45:55 AM (15 years ago)

Author:

laleppa

Message:

+ Added a checkbox to the "Settings" menu to be able to show/hide Toolbar.

• "Save" Toolbar button now has an arrow that calls "Save As..." popup menu.
• Fixed a bug: "Autosize" setting was never saved and was always on.

Location:

trunk/src

Files:

• main.cpp (modified) (1 diff)
• mainwindow.cpp (modified) (5 diffs)
• settingsdialog.cpp (modified) (2 diffs)

trunk/src/main.cpp

@@ -58 +58 @@
 
 MainWindow mainwindow;
+#ifdef HANDHELD
+        mainwindow.showMaximized();
+#else // HANDHELD
         mainwindow.show();
+#endif // HANDHELD
         app.restoreOverrideCursor();
         return app.exec();

trunk/src/mainwindow.cpp

@@ -51 +51 @@
         connect(QApplication::desktop(), SIGNAL(workAreaResized(int)), SLOT(desktopResized(int)));
 #endif // Q_OS_WINCE_WM
-        connect(actionFileNew,SIGNAL(triggered()),this,SLOT(actionFileNewTriggered()));
-        connect(actionFileOpen,SIGNAL(triggered()),this,SLOT(actionFileOpenTriggered()));
-        connect(actionFileSave,SIGNAL(triggered()),this,SLOT(actionFileSaveTriggered()));
-        connect(actionFileSaveAsTask,SIGNAL(triggered()),this,SLOT(actionFileSaveAsTaskTriggered()));
-        connect(actionFileSaveAsSolution,SIGNAL(triggered()),this,SLOT(actionFileSaveAsSolutionTriggered()));
+        connect(actionFileNew, SIGNAL(triggered()), SLOT(actionFileNewTriggered()));
+        connect(actionFileOpen, SIGNAL(triggered()), SLOT(actionFileOpenTriggered()));
+        connect(actionFileSave, SIGNAL(triggered()), SLOT(actionFileSaveTriggered()));
+        connect(actionFileSaveAsTask, SIGNAL(triggered()), SLOT(actionFileSaveAsTaskTriggered()));
+        connect(actionFileSaveAsSolution, SIGNAL(triggered()), SLOT(actionFileSaveAsSolutionTriggered()));
 #ifndef QT_NO_PRINTER
-        connect(actionFilePrintPreview,SIGNAL(triggered()),this,SLOT(actionFilePrintPreviewTriggered()));
-        connect(actionFilePrint,SIGNAL(triggered()),this,SLOT(actionFilePrintTriggered()));
+        connect(actionFilePrintPreview, SIGNAL(triggered()), SLOT(actionFilePrintPreviewTriggered()));
+        connect(actionFilePrint, SIGNAL(triggered()), SLOT(actionFilePrintTriggered()));
 #endif // QT_NO_PRINTER
-        connect(actionSettingsPreferences,SIGNAL(triggered()),this,SLOT(actionSettingsPreferencesTriggered()));
+        connect(actionSettingsPreferences, SIGNAL(triggered()), SLOT(actionSettingsPreferencesTriggered()));
 #ifdef Q_OS_WIN32
         connect(actionHelpCheck4Updates, SIGNAL(triggered()), SLOT(actionHelpCheck4UpdatesTriggered()));
 #endif // Q_OS_WIN32
-        connect(actionSettingsLanguageAutodetect,SIGNAL(triggered(bool)),this,SLOT(actionSettingsLanguageAutodetectTriggered(bool)));
-        connect(groupSettingsLanguageList,SIGNAL(triggered(QAction *)),this,SLOT(groupSettingsLanguageListTriggered(QAction *)));
-        connect(actionHelpAboutQt,SIGNAL(triggered()),qApp,SLOT(aboutQt()));
-        connect(actionHelpAbout,SIGNAL(triggered()),this,SLOT(actionHelpAboutTriggered()));
-
-        connect(buttonSolve,SIGNAL(clicked()),this,SLOT(buttonSolveClicked()));
-        connect(buttonRandom,SIGNAL(clicked()),this,SLOT(buttonRandomClicked()));
-        connect(buttonBackToTask,SIGNAL(clicked()),this,SLOT(buttonBackToTaskClicked()));
-        connect(spinCities,SIGNAL(valueChanged(int)),this,SLOT(spinCitiesValueChanged(int)));
+        connect(actionSettingsLanguageAutodetect, SIGNAL(triggered(bool)), SLOT(actionSettingsLanguageAutodetectTriggered(bool)));
+        connect(groupSettingsLanguageList, SIGNAL(triggered(QAction *)), SLOT(groupSettingsLanguageListTriggered(QAction *)));
+        connect(actionHelpAboutQt, SIGNAL(triggered()), qApp, SLOT(aboutQt()));
+        connect(actionHelpAbout, SIGNAL(triggered()), SLOT(actionHelpAboutTriggered()));
+
+        connect(buttonSolve, SIGNAL(clicked()), SLOT(buttonSolveClicked()));
+        connect(buttonRandom, SIGNAL(clicked()), SLOT(buttonRandomClicked()));
+        connect(buttonBackToTask, SIGNAL(clicked()), SLOT(buttonBackToTaskClicked()));
+        connect(spinCities, SIGNAL(valueChanged(int)), SLOT(spinCitiesValueChanged(int)));
 
 #ifndef HANDHELD
@@ -86 +86 @@
                 settings->endGroup();
         }
-#else
-        setWindowState(Qt::WindowMaximized);
 #endif // HANDHELD
 
         tspmodel = new CTSPModel(this);
         taskView->setModel(tspmodel);
-        connect(tspmodel,SIGNAL(numCitiesChanged(int)),this,SLOT(numCitiesChanged(int)));
-        connect(tspmodel,SIGNAL(dataChanged(const QModelIndex &, const QModelIndex &)),this,SLOT(dataChanged(const QModelIndex &, const QModelIndex &)));
-        connect(tspmodel,SIGNAL(layoutChanged()),this,SLOT(dataChanged()));
+        connect(tspmodel, SIGNAL(numCitiesChanged(int)), SLOT(numCitiesChanged(int)));
+        connect(tspmodel, SIGNAL(dataChanged(const QModelIndex &, const QModelIndex &)), SLOT(dataChanged(const QModelIndex &, const QModelIndex &)));
+        connect(tspmodel, SIGNAL(layoutChanged()), SLOT(dataChanged()));
         if ((QCoreApplication::arguments().count() > 1) && (tspmodel->loadTask(QCoreApplication::arguments().at(1))))
                 setFileName(QCoreApplication::arguments().at(1));
@@ -944 +942 @@
                         name = t.translate("--------", "LANGNAME", "Please, provide a native name of your translation language here.");
                         a = menuSettingsLanguage->addAction(name);
-                        a->setStatusTip(QString("Set application language to %1").arg(name));
+                        a->setStatusTip(tr("Set application language to %1").arg(name));
                         a->setData(lang.completeBaseName().mid(6));
                         a->setCheckable(true);
@@ -1169 +1167 @@
 
         //! \hack HACK: A little hack for toolbar icons to have a sane size.
-#ifdef Q_OS_WINCE_WM
+#ifdef HANDHELD
         toolBar->setIconSize(QSize(logicalDpiX() / 4, logicalDpiY() / 4));
-#elif defined(Q_OS_SYMBIAN)
-        toolBar->setIconSize(QSize(logicalDpiX() / 5, logicalDpiY() / 5));
-#endif // Q_OS_WINCE_WM
+#endif // HANDHELD
+        static_cast<QToolButton *>(toolBar->widgetForAction(actionFileSave))->setMenu(menuFileSaveAs);
+        static_cast<QToolButton *>(toolBar->widgetForAction(actionFileSave))->setPopupMode(QToolButton::MenuButtonPopup);
 
         solutionText->document()->setDefaultFont(settings->value("Output/Font", QFont(DEF_FONT_FAMILY, DEF_FONT_SIZE)).value<QFont>());
@@ -1195 +1193 @@
         toolBar->insertAction(actionSettingsPreferences,actionFilePrint);
 #endif // QT_NO_PRINTER
+
+        menuSettings->insertAction(actionSettingsPreferences, toolBar->toggleViewAction());
+        menuSettings->insertSeparator(actionSettingsPreferences);
+
 #ifdef Q_OS_WIN32
         actionHelpCheck4Updates = new QAction(this);

trunk/src/settingsdialog.cpp

@@ -227 +227 @@
         settings->endGroup();
 
-#ifndef Q_OS_WINCE_WM
+#ifdef HANDHELD
+        setWindowState(Qt::WindowMaximized);
+#else
         adjustSize();
 #endif // Q_OS_WINCE_WM
@@ -290 +292 @@
         }
 #endif // Q_OS_WIN32
+        settings->setValue("Autosize", cbAutosize->isChecked());
         settings->setValue("UseNativeDialogs", cbUseNativeDialogs->isChecked());