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

Timestamp:

May 2, 2010, 12:51:20 PM (15 years ago)

Author:

laleppa

Message:

+ Started adding a toolbar customization with the ude of QtToolbarDialog? (​http://qt.nokia.com/products/appdev/add-on-products/catalog/4/Widgets/qttoolbardialog/).

• Updated and renamed icons to conform freedesktop.org Icon Naming Specification (​http://standards.freedesktop.org/icon-naming-spec/icon-naming-spec-latest.html).

File:

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

trunk/src/mainwindow.cpp

@@ -316 +316 @@
 {
 QPrintDialog pd(printer,this);
-#if QT_VERSION >= 0x040500
-        // No such methods in Qt < 4.5
-        pd.setOption(QAbstractPrintDialog::PrintSelection,false);
-        pd.setOption(QAbstractPrintDialog::PrintPageRange,false);
-#endif
         if (pd.exec() != QDialog::Accepted)
                 return;
         QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
-        solutionText->document()->print(printer);
+        solutionText->print(printer);
         QApplication::restoreOverrideCursor();
 }
@@ -520 +515 @@
         dlg->setWindowFlags(Qt::Dialog | Qt::CustomizeWindowHint | Qt::WindowTitleHint | Qt::WindowCloseButtonHint);
         dlg->setWindowTitle(tr("About %1").arg(QApplication::applicationName()));
+        dlg->setWindowIcon(QIcon(":/images/icons/help-about.png"));
         dlg->setLayout(vb);
 
@@ -1233 +1229 @@
         actionFilePrintPreview->setObjectName("actionFilePrintPreview");
         actionFilePrintPreview->setEnabled(false);
-        actionFilePrintPreview->setIcon(QIcon(":/images/icons/document_preview.png"));
+        actionFilePrintPreview->setIcon(QIcon(":/images/icons/document-print-preview.png"));
 
         actionFilePrint = new QAction(this);
         actionFilePrint->setObjectName("actionFilePrint");
         actionFilePrint->setEnabled(false);
-        actionFilePrint->setIcon(QIcon(":/images/icons/fileprint.png"));
+        actionFilePrint->setIcon(QIcon(":/images/icons/document-print.png"));
 
         menuFile->insertAction(actionFileExit,actionFilePrintPreview);
@@ -1261 +1257 @@
 #ifdef Q_OS_WIN32
         actionHelpCheck4Updates = new QAction(this);
+        actionHelpCheck4Updates->setIcon(QIcon(":/images/icons/system-software-update.png"));
         actionHelpCheck4Updates->setEnabled(hasUpdater());
         menuHelp->insertAction(actionHelpAboutQt, actionHelpCheck4Updates);
@@ -1276 +1273 @@
         }
 #endif // Q_OS_WIN32
+
+#ifndef HANDHELD
+        toolBarManager = new QtToolBarManager;
+        toolBarManager->setMainWindow(this);
+QString cat = toolBar->windowTitle();
+        toolBarManager->addToolBar(toolBar, cat);
+#ifndef QT_NO_PRINTER
+        toolBarManager->addAction(actionFilePrintPreview, cat);
+#endif // QT_NO_PRINTER
+        toolBarManager->addAction(actionHelpContents, cat);
+        toolBarManager->addAction(actionHelpContextual, cat);
+//      toolBarManager->addAction(action, cat);
+#endif // HANDHELD
 }
 
@@ -1301 +1311 @@
 #endif // Q_OS_WIN32
 }
+
+#ifndef HANDHELD
+void MainWindow::on_actionSettingsToolbars_triggered()
+{
+QtToolBarDialog dlg(this);
+        dlg.setToolBarManager(toolBarManager);
+        dlg.exec();
+}
+#endif // HANDHELD