Changeset 54 in tspsg-svn for trunk/src/mainwindow.cpp

Timestamp:

Aug 9, 2009, 1:45:19 AM (15 years ago)

Author:

laleppa

Message:

• mainwindow.ui and mainwindow.ce.ui had differences only in printing actions and statusbar, so I merged them into one. Differences are now applied in source code. This will simplify Main Window maintenance.
• Changed #ifndef Q_OS_WINCE to #ifndef QT_NO_PRINTER where relevant.
• Now using method at() instead of operator [] in solving algorithm. This change dramatically decreased solution time (from 13 seconds to 10-40 milliseconds for 20 cities on my PC).
• Increased maximum number of cities to 30. Setting more makes no sense at this moment, because generated solution output is big and inserting it to QTextEdit takes veeeeery long time.
• Translations were updated.

File:

• trunk/src/mainwindow.cpp (modified) (8 diffs)

trunk/src/mainwindow.cpp

@@ -30 +30 @@
         loadLanguage();
         setupUi(this);
+#ifndef Q_OS_WINCE
+QStatusBar *statusbar = new QStatusBar(this);
+        statusbar->setObjectName("statusbar");
+        setStatusBar(statusbar);
+#endif // Q_OS_WINCE
         initDocStyleSheet();
         solutionText->document()->setDefaultFont(settings->value("Output/Font",QFont(DEF_FONT_FAMILY,DEF_FONT_SIZE)).value<QFont>());
@@ -39 +44 @@
         toolBar->setIconSize(QSize(s / 10,s / 10));
 #endif
-#ifndef Q_OS_WINCE
+#ifndef QT_NO_PRINTER
         printer = new QPrinter(QPrinter::HighResolution);
-#endif // Q_OS_WINCE
+#endif // QT_NO_PRINTER
         groupSettingsLanguageList = new QActionGroup(this);
         actionSettingsLanguageEnglish->setData("en");
@@ -58 +63 @@
         connect(actionHelpAboutQt,SIGNAL(triggered()),qApp,SLOT(aboutQt()));
         connect(actionHelpAbout,SIGNAL(triggered()),this,SLOT(actionHelpAboutTriggered()));
-#ifndef Q_OS_WINCE
+#ifndef QT_NO_PRINTER
+        menuFile->insertAction(actionFileExit,actionFilePrintPreview);
+        menuFile->insertAction(actionFileExit,actionFilePrint);
+        menuFile->insertSeparator(actionFileExit);
+        toolBar->insertAction(actionSettingsPreferences,actionFilePrint);
         connect(actionFilePrintPreview,SIGNAL(triggered()),this,SLOT(actionFilePrintPreviewTriggered()));
         connect(actionFilePrint,SIGNAL(triggered()),this,SLOT(actionFilePrintTriggered()));
-#endif // Q_OS_WINCE
+#endif // QT_NO_PRINTER
         connect(buttonSolve,SIGNAL(clicked()),this,SLOT(buttonSolveClicked()));
         connect(buttonRandom,SIGNAL(clicked()),this,SLOT(buttonRandomClicked()));
@@ -106 +115 @@
         if (!enable)
                 output.clear();
-#ifndef Q_OS_WINCE
+#ifndef QT_NO_PRINTER
         actionFilePrint->setEnabled(enable);
         actionFilePrintPreview->setEnabled(enable);
-#endif // Q_OS_WINCE
+#endif // QT_NO_PRINTER
 }
 
@@ -206 +215 @@
         if (!maybeSave())
                 return;
+        QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
         tspmodel->clear();
         taskView->resizeColumnsToContents();
@@ -214 +224 @@
         solutionText->clear();
         enableSolutionActions(false);
+        QApplication::restoreOverrideCursor();
 }
 
@@ -349 +360 @@
 }
 
-#ifndef Q_OS_WINCE
+#ifndef QT_NO_PRINTER
 void MainWindow::printPreview(QPrinter *printer)
 {
@@ -372 +383 @@
         if (pd.exec() != QDialog::Accepted)
                 return;
+        QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
         solutionText->document()->print(printer);
-}
-#endif // Q_OS_WINCE
+        QApplication::restoreOverrideCursor();
+}
+#endif // QT_NO_PRINTER
 
 void MainWindow::buttonRandomClicked()
 {
+        QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
         tspmodel->randomize();
         setWindowModified(true);
         taskView->resizeColumnsToContents();
         taskView->resizeRowsToContents();
+        QApplication::restoreOverrideCursor();
 }