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.

qt/AboutDialog.cc

@@ -20,7 +20,7 @@
 #include "Utils.h"
 
 AboutDialog::AboutDialog (QWidget * parent):
-  QDialog (parent, Qt::Dialog),
+  BaseDialog (parent),
   myLicenseDialog ()
 {
   ui.setupUi (this);

qt/AboutDialog.h

@@ -10,14 +10,15 @@
 #ifndef QTR_ABOUT_DIALOG_H
 #define QTR_ABOUT_DIALOG_H
 
-#include <QDialog>
 #include <QPointer>
 
+#include "BaseDialog.h"
+
 #include "ui_AboutDialog.h"
 
 class LicenseDialog;
 
-class AboutDialog: public QDialog
+class AboutDialog: public BaseDialog
 {
     Q_OBJECT
 

qt/BaseDialog.h

@@ -0,0 +1,25 @@
+/*
+ * This file Copyright (C) 2015 Mnemosyne LLC
+ *
+ * It may be used under the GNU GPL versions 2 or 3
+ * or any future license endorsed by Mnemosyne LLC.
+ *
+ * $Id$
+ */
+
+#ifndef QTR_BASE_DIALOG_H
+#define QTR_BASE_DIALOG_H
+
+#include <QDialog>
+
+class BaseDialog: public QDialog
+{
+  public:
+    BaseDialog (QWidget * parent = nullptr, Qt::WindowFlags flags = 0):
+      QDialog (parent, flags)
+    {
+      setWindowFlags (windowFlags () & ~Qt::WindowContextHelpButtonHint);
+    }
+};
+
+#endif // QTR_BASE_DIALOG_H

qt/CMakeLists.txt

@@ -73,6 +73,7 @@ set(${PROJECT_NAME}_HEADERS
     AboutDialog.h
     AddData.h
     Application.h
+    BaseDialog.h
     ColumnResizer.h
     CustomVariantType.h
     DBusAdaptor.h

qt/DetailsDialog.cc

@@ -173,11 +173,11 @@ DetailsDialog::getStockIcon (const QString& freedesktop_name, int fallback)
   return icon;
 }
 
-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),
   myModel (model),

qt/DetailsDialog.h

@@ -10,12 +10,13 @@
 #ifndef QTR_DETAILS_DIALOG_H
 #define QTR_DETAILS_DIALOG_H
 
-#include <QDialog>
 #include <QString>
 #include <QMap>
 #include <QSet>
 #include <QTimer>
 
+#include "BaseDialog.h"
+
 #include "ui_DetailsDialog.h"
 
 class QTreeWidgetItem;
@@ -28,7 +29,7 @@ class TrackerDelegate;
 class TrackerModel;
 class TrackerModelFilter;
 
-class DetailsDialog: public QDialog
+class DetailsDialog: public BaseDialog
 {
     Q_OBJECT
 

qt/LicenseDialog.cc

@@ -10,7 +10,7 @@
 #include "LicenseDialog.h"
 
 LicenseDialog::LicenseDialog (QWidget * parent):
-  QDialog (parent, Qt::Dialog)
+  BaseDialog (parent)
 {
   ui.setupUi (this);
 }

qt/LicenseDialog.h

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

qt/MakeDialog.cc

@@ -27,7 +27,7 @@
 
 namespace
 {
-  class MakeProgressDialog: public QDialog
+  class MakeProgressDialog: public BaseDialog
   {
       Q_OBJECT
 
@@ -47,7 +47,7 @@ namespace
 }
 
 MakeProgressDialog::MakeProgressDialog (Session& session, tr_metainfo_builder& builder, QWidget * parent):
-  QDialog (parent),
+  BaseDialog (parent),
   mySession (session),
   myBuilder (builder)
 {
@@ -215,7 +215,7 @@ MakeDialog::onSourceChanged ()
 }
 
 MakeDialog::MakeDialog (Session& session, QWidget * parent):
-  QDialog (parent, Qt::Dialog),
+  BaseDialog (parent),
   mySession (session),
   myBuilder (nullptr, &tr_metaInfoBuilderFree)
 {

qt/MakeDialog.h

@@ -12,7 +12,7 @@
 
 #include <memory>
 
-#include <QDialog>
+#include "BaseDialog.h"
 
 #include "ui_MakeDialog.h"
 
@@ -25,7 +25,7 @@ extern "C"
   struct tr_metainfo_builder;
 }
 
-class MakeDialog: public QDialog
+class MakeDialog: public BaseDialog
 {
     Q_OBJECT
 

qt/OptionsDialog.cc

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

qt/OptionsDialog.h

@@ -11,7 +11,6 @@
 #define QTR_OPTIONS_DIALOG_H
 
 #include <QCryptographicHash>
-#include <QDialog>
 #include <QDir>
 #include <QFile>
 #include <QMap>
@@ -20,6 +19,7 @@
 #include <QVector>
 
 #include "AddData.h" // AddData
+#include "BaseDialog.h"
 #include "Torrent.h" // FileList
 
 #include "ui_OptionsDialog.h"
@@ -32,7 +32,7 @@ extern "C"
   struct tr_variant;
 }
 
-class OptionsDialog: public QDialog
+class OptionsDialog: public BaseDialog
 {
     Q_OBJECT
 

qt/PrefsDialog.cc

@@ -535,7 +535,7 @@ PrefsDialog::initDownloadingTab ()
 ***/
 
 PrefsDialog::PrefsDialog (Session& session, Prefs& prefs, QWidget * parent):
-  QDialog (parent),
+  BaseDialog (parent),
   mySession (session),
   myPrefs (prefs),
   myIsServer (session.isServer ())

qt/PrefsDialog.h

@@ -10,11 +10,12 @@
 #ifndef QTR_PREFS_DIALOG_H
 #define QTR_PREFS_DIALOG_H
 
-#include <QDialog>
 #include <QMap>
 #include <QSet>
 
+#include "BaseDialog.h"
 #include "Prefs.h"
+
 #include "ui_PrefsDialog.h"
 
 class QHttp;
@@ -24,7 +25,7 @@ class QString;
 class Prefs;
 class Session;
 
-class PrefsDialog: public QDialog
+class PrefsDialog: public BaseDialog
 {
     Q_OBJECT
 

qt/RelocateDialog.cc

@@ -33,7 +33,7 @@ RelocateDialog::RelocateDialog (Session            & session,
                                 const TorrentModel & model,
                                 const QSet<int>    & ids,
                                 QWidget            * parent):
-  QDialog (parent),
+  BaseDialog (parent),
   mySession (session),
   myIds (ids)
 {

qt/RelocateDialog.h

@@ -10,15 +10,16 @@
 #ifndef QTR_RELOCATE_DIALOG_H
 #define QTR_RELOCATE_DIALOG_H
 
-#include <QDialog>
 #include <QSet>
 
+#include "BaseDialog.h"
+
 #include "ui_RelocateDialog.h"
 
 class Session;
 class TorrentModel;
 
-class RelocateDialog: public QDialog
+class RelocateDialog: public BaseDialog
 {
     Q_OBJECT
 

qt/SessionDialog.cc

@@ -46,7 +46,7 @@ SessionDialog::resensitize ()
 ***/
 
 SessionDialog::SessionDialog (Session& session, Prefs& prefs, QWidget * parent):
-  QDialog (parent),
+  BaseDialog (parent),
   mySession (session),
   myPrefs (prefs)
 {

qt/SessionDialog.h

@@ -10,15 +10,16 @@
 #ifndef QTR_SESSION_DIALOG_H
 #define QTR_SESSION_DIALOG_H
 
-#include <QDialog>
 #include <QWidgetList>
 
+#include "BaseDialog.h"
+
 #include "ui_SessionDialog.h"
 
 class Prefs;
 class Session;
 
-class SessionDialog: public QDialog
+class SessionDialog: public BaseDialog
 {
     Q_OBJECT
 

qt/StatsDialog.cc

@@ -20,7 +20,7 @@ enum
 };
 
 StatsDialog::StatsDialog (Session& session, QWidget * parent):
-  QDialog (parent, Qt::Dialog),
+  BaseDialog (parent),
   mySession (session),
   myTimer (new QTimer (this))
 {

qt/StatsDialog.h

@@ -10,7 +10,7 @@
 #ifndef QTR_STATS_DIALOG_H
 #define QTR_STATS_DIALOG_H
 
-#include <QDialog>
+#include "BaseDialog.h"
 
 #include "ui_StatsDialog.h"
 
@@ -18,7 +18,7 @@ class QTimer;
 
 class Session;
 
-class StatsDialog: public QDialog
+class StatsDialog: public BaseDialog
 {
     Q_OBJECT
 

qt/qtr.pro

@@ -111,6 +111,6 @@ SOURCES += AboutDialog.cc \
            Utils.cc \
            WatchDir.cc
 HEADERS += $$replace(SOURCES, .cc, .h)
-HEADERS += CustomVariantType.h Speed.h
+HEADERS += BaseDialog.h CustomVariantType.h Speed.h
 
 win32:RC_FILE = qtr.rc