Improve icons. Move some menu items to the toolbar. Don't show buttons in current...

[dorian] / devtools.cpp

diff --git a/devtools.cpp b/devtools.cpp
index 84fa2ca..a22e617 100644 (file)
--- a/devtools.cpp
+++ b/devtools.cpp
@@ -6,34 +6,18 @@
 #include "settings.h"
 #include "toolbuttonbox.h"
 
-DevTools::DevTools(QWidget *parent):
-        QDialog(parent, Qt::Dialog | Qt::WindowTitleHint |
-                Qt::CustomizeWindowHint | Qt::WindowCloseButtonHint)
+DevTools::DevTools(QWidget *parent): Dyalog(parent, false)
 {
     setWindowTitle(tr("Developer"));
-    QScrollArea *scroller = new QScrollArea(this);
-    scroller->setFrameStyle(QFrame::NoFrame);
-#ifdef Q_WS_MAEMO_5
-    scroller->setProperty("FingerScrollable", true);
-    scroller->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-#else
-    scroller->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
-    setSizeGripEnabled(true);
-#endif // Q_WS_MAEMO_5
-    scroller->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-
-    QWidget *contents = new QWidget(scroller);
-    QVBoxLayout *layout = new QVBoxLayout(contents);
-
     QPushButton *clearSettings = new QPushButton("Clear persistent data", this);
     connect(clearSettings, SIGNAL(clicked()), this, SLOT(onClear()));
-    layout->addWidget(clearSettings);
+    addWidget(clearSettings);
 
-    QLabel *level = new QLabel(tr("Trace level:"), contents);
-    layout->addWidget(level);
+    QLabel *level = new QLabel(tr("Trace level:"), this);
+    addWidget(level);
 
     ToolButtonBox *box = new ToolButtonBox(this);
-    layout->addWidget(box);
+    addWidget(box);
     box->addButton(QtDebugMsg, tr("Debug"));
     box->addButton(QtWarningMsg, tr("Warning"));
     box->addButton(QtCriticalMsg, tr("Critical"));
@@ -41,26 +25,15 @@ DevTools::DevTools(QWidget *parent):
     box->toggle(Trace::level);
     connect(box, SIGNAL(buttonClicked(int)),
             this, SLOT(onLevelButtonClicked(int)));
-
-    contents->setLayout(layout);
-    scroller->setWidget(contents);
-
-    QHBoxLayout *dialogLayout = new QHBoxLayout();
-    dialogLayout->addWidget(scroller);
-    setLayout(dialogLayout);
 }
 
 void DevTools::onClear()
 {
     if (QMessageBox::Yes ==
-        QMessageBox::question(this, "Clear persistent data?",
-                              "Library and settings data will be cleared, "
-                              "application will be restarted. Continue?",
-                              QMessageBox::Yes
-#ifndef Q_WS_MAEMO_5
-                              , QMessageBox::No
-#endif
-                              )) {
+        QMessageBox::question(this, tr("Clear persistent data?"),
+                              tr("Library and settings will be cleared, "
+                                 "application will be restarted. Continue?"),
+                              QMessageBox::Yes | QMessageBox::No)) {
         QSettings().clear();
         QApplication::exit(1000);
     }