Changeset 14561

Timestamp:

Sep 1, 2015, 8:19:26 PM (7 years ago)

Author:

mikedld

Message:

Remove context help button from dialogs on Windows

We don't currently (if ever) provide context help, so the button is
useless. Moreover, on Windows 10 it's even larger than before and
sometimes title text doesn't fit because of it.

Location:

trunk/qt

Files:

• AboutDialog.cc (modified) (1 diff)
• AboutDialog.h (modified) (2 diffs)
• BaseDialog.h (added)
• CMakeLists.txt (modified) (1 diff)
• DetailsDialog.cc (modified) (1 diff)
• DetailsDialog.h (modified) (2 diffs)
• LicenseDialog.cc (modified) (1 diff)
• LicenseDialog.h (modified) (1 diff)
• MakeDialog.cc (modified) (3 diffs)
• MakeDialog.h (modified) (2 diffs)
• OptionsDialog.cc (modified) (1 diff)
• OptionsDialog.h (modified) (3 diffs)
• PrefsDialog.cc (modified) (1 diff)
• PrefsDialog.h (modified) (2 diffs)
• RelocateDialog.cc (modified) (1 diff)
• RelocateDialog.h (modified) (2 diffs)
• SessionDialog.cc (modified) (1 diff)
• SessionDialog.h (modified) (2 diffs)
• StatsDialog.cc (modified) (1 diff)
• StatsDialog.h (modified) (2 diffs)
• qtr.pro (modified) (1 diff)

trunk/qt/AboutDialog.cc

@@ -21 +21 @@
 
 AboutDialog::AboutDialog (QWidget * parent):
-  QDialog (parent, Qt::Dialog),
+  BaseDialog (parent),
   myLicenseDialog ()
 {

trunk/qt/AboutDialog.h

@@ -11 +11 @@
 #define QTR_ABOUT_DIALOG_H
 
-#include <QDialog>
 #include <QPointer>
+
+#include "BaseDialog.h"
 
 #include "ui_AboutDialog.h"
@@ -18 +19 @@
 class LicenseDialog;
 
-class AboutDialog: public QDialog
+class AboutDialog: public BaseDialog
 {
     Q_OBJECT

trunk/qt/CMakeLists.txt

@@ -74 +74 @@
     AddData.h
     Application.h
+    BaseDialog.h
     ColumnResizer.h
     CustomVariantType.h

trunk/qt/DetailsDialog.cc

@@ -174 +174 @@
 }
 
-DetailsDialog::DetailsDialog (Session       & session,
-                  Prefs         & prefs,
-                  const TorrentModel& model,
-                  QWidget       * parent):
-  QDialog (parent, Qt::Dialog),
+DetailsDialog::DetailsDialog (Session            & session,
+                              Prefs              & prefs,
+                              const TorrentModel & model,
+                              QWidget            * parent):
+  BaseDialog (parent),
   mySession (session),
   myPrefs (prefs),

trunk/qt/DetailsDialog.h

@@ -11 +11 @@
 #define QTR_DETAILS_DIALOG_H
 
-#include <QDialog>
 #include <QString>
 #include <QMap>
 #include <QSet>
 #include <QTimer>
+
+#include "BaseDialog.h"
 
 #include "ui_DetailsDialog.h"
@@ -29 +30 @@
 class TrackerModelFilter;
 
-class DetailsDialog: public QDialog
+class DetailsDialog: public BaseDialog
 {
     Q_OBJECT

trunk/qt/LicenseDialog.cc

@@ -11 +11 @@
 
 LicenseDialog::LicenseDialog (QWidget * parent):
-  QDialog (parent, Qt::Dialog)
+  BaseDialog (parent)
 {
   ui.setupUi (this);

trunk/qt/LicenseDialog.h

@@ -11 +11 @@
 #define QTR_LICENSE_DIALOG_H
 
-#include <QDialog>
+#include "BaseDialog.h"
 
 #include "ui_LicenseDialog.h"
 
-class LicenseDialog: public QDialog
+class LicenseDialog: public BaseDialog
 {
     Q_OBJECT

trunk/qt/MakeDialog.cc

@@ -28 +28 @@
 namespace
 {
-  class MakeProgressDialog: public QDialog
+  class MakeProgressDialog: public BaseDialog
   {
       Q_OBJECT
@@ -48 +48 @@
 
 MakeProgressDialog::MakeProgressDialog (Session& session, tr_metainfo_builder& builder, QWidget * parent):
-  QDialog (parent),
+  BaseDialog (parent),
   mySession (session),
   myBuilder (builder)
@@ -216 +216 @@
 
 MakeDialog::MakeDialog (Session& session, QWidget * parent):
-  QDialog (parent, Qt::Dialog),
+  BaseDialog (parent),
   mySession (session),
   myBuilder (nullptr, &tr_metaInfoBuilderFree)

trunk/qt/MakeDialog.h

@@ -13 +13 @@
 #include <memory>
 
-#include <QDialog>
+#include "BaseDialog.h"
 
 #include "ui_MakeDialog.h"
@@ -26 +26 @@
 }
 
-class MakeDialog: public QDialog
+class MakeDialog: public BaseDialog
 {
     Q_OBJECT

trunk/qt/OptionsDialog.cc

@@ -28 +28 @@
 
 OptionsDialog::OptionsDialog (Session& session, const Prefs& prefs, const AddData& addme, QWidget * parent):
-  QDialog (parent, Qt::Dialog),
+  BaseDialog (parent),
   mySession (session),
   myAdd (addme),

trunk/qt/OptionsDialog.h

@@ -12 +12 @@
 
 #include <QCryptographicHash>
-#include <QDialog>
 #include <QDir>
 #include <QFile>
@@ -21 +20 @@
 
 #include "AddData.h" // AddData
+#include "BaseDialog.h"
 #include "Torrent.h" // FileList
 
@@ -33 +33 @@
 }
 
-class OptionsDialog: public QDialog
+class OptionsDialog: public BaseDialog
 {
     Q_OBJECT

trunk/qt/PrefsDialog.cc

@@ -536 +536 @@
 
 PrefsDialog::PrefsDialog (Session& session, Prefs& prefs, QWidget * parent):
-  QDialog (parent),
+  BaseDialog (parent),
   mySession (session),
   myPrefs (prefs),

trunk/qt/PrefsDialog.h

@@ -11 +11 @@
 #define QTR_PREFS_DIALOG_H
 
-#include <QDialog>
 #include <QMap>
 #include <QSet>
 
+#include "BaseDialog.h"
 #include "Prefs.h"
+
 #include "ui_PrefsDialog.h"
 
@@ -25 +26 @@
 class Session;
 
-class PrefsDialog: public QDialog
+class PrefsDialog: public BaseDialog
 {
     Q_OBJECT

trunk/qt/RelocateDialog.cc

@@ -34 +34 @@
                                 const QSet<int>    & ids,
                                 QWidget            * parent):
-  QDialog (parent),
+  BaseDialog (parent),
   mySession (session),
   myIds (ids)

trunk/qt/RelocateDialog.h

@@ -11 +11 @@
 #define QTR_RELOCATE_DIALOG_H
 
-#include <QDialog>
 #include <QSet>
+
+#include "BaseDialog.h"
 
 #include "ui_RelocateDialog.h"
@@ -19 +20 @@
 class TorrentModel;
 
-class RelocateDialog: public QDialog
+class RelocateDialog: public BaseDialog
 {
     Q_OBJECT

trunk/qt/SessionDialog.cc

@@ -47 +47 @@
 
 SessionDialog::SessionDialog (Session& session, Prefs& prefs, QWidget * parent):
-  QDialog (parent),
+  BaseDialog (parent),
   mySession (session),
   myPrefs (prefs)

trunk/qt/SessionDialog.h

@@ -11 +11 @@
 #define QTR_SESSION_DIALOG_H
 
-#include <QDialog>
 #include <QWidgetList>
+
+#include "BaseDialog.h"
 
 #include "ui_SessionDialog.h"
@@ -19 +20 @@
 class Session;
 
-class SessionDialog: public QDialog
+class SessionDialog: public BaseDialog
 {
     Q_OBJECT

trunk/qt/StatsDialog.cc

@@ -21 +21 @@
 
 StatsDialog::StatsDialog (Session& session, QWidget * parent):
-  QDialog (parent, Qt::Dialog),
+  BaseDialog (parent),
   mySession (session),
   myTimer (new QTimer (this))

trunk/qt/StatsDialog.h

@@ -11 +11 @@
 #define QTR_STATS_DIALOG_H
 
-#include <QDialog>
+#include "BaseDialog.h"
 
 #include "ui_StatsDialog.h"
@@ -19 +19 @@
 class Session;
 
-class StatsDialog: public QDialog
+class StatsDialog: public BaseDialog
 {
     Q_OBJECT

trunk/qt/qtr.pro

@@ -112 +112 @@
            WatchDir.cc
 HEADERS += $$replace(SOURCES, .cc, .h)
-HEADERS += CustomVariantType.h Speed.h
+HEADERS += BaseDialog.h CustomVariantType.h Speed.h
 
 win32:RC_FILE = qtr.rc