Changeset 14393

Timestamp:

Dec 21, 2014, 11:46:31 PM (8 years ago)

Author:

mikedld

Message:

Rework session dialog in Qt client to load from .ui

Location:

trunk/qt

Files:

• CMakeLists.txt (modified) (1 diff)
• qtr.pro (modified) (1 diff)
• session-dialog.cc (modified) (4 diffs)
• session-dialog.h (modified) (2 diffs)
• session-dialog.ui (added)
• stats-dialog.cc (modified) (1 diff)

trunk/qt/CMakeLists.txt

@@ -104 +104 @@
     details.ui
     mainwin.ui
+    session-dialog.ui
     stats-dialog.ui
 )

trunk/qt/qtr.pro

@@ -49 +49 @@
 FORMS += details.ui \
          mainwin.ui \
+         session-dialog.ui \
          stats-dialog.ui
 RESOURCES += application.qrc

trunk/qt/session-dialog.cc

@@ -8 +8 @@
  */
 
-#include <QCheckBox>
-#include <QDialogButtonBox>
-#include <QLabel>
-#include <QLineEdit>
-#include <QRadioButton>
-#include <QSpinBox>
-#include <QVBoxLayout>
-
-#include "hig.h"
 #include "prefs.h"
 #include "session.h"
@@ -28 +19 @@
 SessionDialog::onAccepted ()
 {
-  myPrefs.set (Prefs::SESSION_IS_REMOTE, myRemoteRadioButton->isChecked ());
-  myPrefs.set (Prefs::SESSION_REMOTE_HOST, myHostLineEdit->text ());
-  myPrefs.set (Prefs::SESSION_REMOTE_PORT, myPortSpinBox->value ());
-  myPrefs.set (Prefs::SESSION_REMOTE_AUTH, myAuthCheckBox->isChecked ());
-  myPrefs.set (Prefs::SESSION_REMOTE_USERNAME, myUsernameLineEdit->text ());
-  myPrefs.set (Prefs::SESSION_REMOTE_PASSWORD, myPasswordLineEdit->text ());
+  myPrefs.set (Prefs::SESSION_IS_REMOTE, ui.remoteSessionRadio->isChecked ());
+  myPrefs.set (Prefs::SESSION_REMOTE_HOST, ui.hostEdit->text ());
+  myPrefs.set (Prefs::SESSION_REMOTE_PORT, ui.portSpin->value ());
+  myPrefs.set (Prefs::SESSION_REMOTE_AUTH, ui.authCheck->isChecked ());
+  myPrefs.set (Prefs::SESSION_REMOTE_USERNAME, ui.usernameEdit->text ());
+  myPrefs.set (Prefs::SESSION_REMOTE_PASSWORD, ui.passwordEdit->text ());
   mySession.restart ();
   hide ();
@@ -41 +32 @@
 SessionDialog::resensitize ()
 {
-  const bool isRemote = myRemoteRadioButton->isChecked();
-  const bool useAuth = myAuthCheckBox->isChecked();
+  const bool isRemote = ui.remoteSessionRadio->isChecked ();
+  const bool useAuth = ui.authCheck->isChecked ();
 
   foreach (QWidget * w, myRemoteWidgets)
@@ -60 +51 @@
   myPrefs (prefs)
 {
-  QWidget * l;
-  QSpinBox * sb;
-  QCheckBox * cb;
-  QLineEdit * le;
-  QRadioButton * rb;
+  ui.setupUi (this);
 
-  setWindowTitle (tr ("Change Session"));
-  QVBoxLayout * top = new QVBoxLayout (this);
-  top->setSpacing (HIG::PAD);
+  ui.localSessionRadio->setChecked (!prefs.get<bool> (Prefs::SESSION_IS_REMOTE));
+  connect (ui.localSessionRadio, SIGNAL (toggled (bool)), this, SLOT (resensitize ()));
 
-  HIG * hig = new HIG;
-  hig->setContentsMargins (0, 0, 0, 0);
-  hig->addSectionTitle (tr ("Source"));
-  rb = new QRadioButton (tr ("Start &Local Session"));
-  rb->setChecked (!prefs.get<bool>(Prefs::SESSION_IS_REMOTE));
-  connect (rb, SIGNAL(toggled(bool)), this, SLOT(resensitize()));
-  hig->addWideControl (rb);
-  rb = myRemoteRadioButton = new QRadioButton (tr ("Connect to &Remote Session"));
-  rb->setChecked (prefs.get<bool>(Prefs::SESSION_IS_REMOTE));
-  connect (rb, SIGNAL(toggled(bool)), this, SLOT(resensitize()));
-  hig->addWideControl (rb);
-  le = myHostLineEdit = new QLineEdit ();
-  le->setText (prefs.get<QString>(Prefs::SESSION_REMOTE_HOST));
-  l = hig->addRow (tr ("&Host:"), le);
-  myRemoteWidgets << l << le;
-  sb = myPortSpinBox = new QSpinBox;
-  sb->setRange (1, 65535);
-  sb->setValue (prefs.get<int>(Prefs::SESSION_REMOTE_PORT));
-  l = hig->addRow (tr ("&Port:"), sb);
-  myRemoteWidgets << l << sb;
-  cb = myAuthCheckBox = new QCheckBox (tr ("&Authentication required"));
-  cb->setChecked (prefs.get<bool>(Prefs::SESSION_REMOTE_AUTH));
-  connect (cb, SIGNAL(toggled(bool)), this, SLOT(resensitize()));
-  myRemoteWidgets << cb;
-  hig->addWideControl (cb);
-  le = myUsernameLineEdit = new QLineEdit ();
-  le->setText (prefs.get<QString>(Prefs::SESSION_REMOTE_USERNAME));
-  l = hig->addRow (tr ("&Username:"), le);
-  myAuthWidgets << l << le;
-  le = myPasswordLineEdit = new QLineEdit ();
-  le->setEchoMode (QLineEdit::Password);
-  le->setText (prefs.get<QString>(Prefs::SESSION_REMOTE_PASSWORD));
-  l = hig->addRow (tr ("Pass&word:"), le);
-  myAuthWidgets << l << le;
-  hig->finish ();
-  top->addWidget (hig, 1);
+  ui.remoteSessionRadio->setChecked (prefs.get<bool> (Prefs::SESSION_IS_REMOTE));
+  connect (ui.remoteSessionRadio, SIGNAL (toggled (bool)), this, SLOT (resensitize ()));
+
+  ui.hostEdit->setText (prefs.get<QString> (Prefs::SESSION_REMOTE_HOST));
+  myRemoteWidgets << ui.hostLabel << ui.hostEdit;
+
+  ui.portSpin->setValue (prefs.get<int> (Prefs::SESSION_REMOTE_PORT));
+  myRemoteWidgets << ui.portLabel << ui.portSpin;
+
+  ui.authCheck->setChecked (prefs.get<bool> (Prefs::SESSION_REMOTE_AUTH));
+  connect (ui.authCheck, SIGNAL (toggled (bool)), this, SLOT (resensitize ()));
+  myRemoteWidgets << ui.authCheck;
+
+  ui.usernameEdit->setText (prefs.get<QString> (Prefs::SESSION_REMOTE_USERNAME));
+  myAuthWidgets << ui.usernameLabel << ui.usernameEdit;
+
+  ui.passwordEdit->setText (prefs.get<QString> (Prefs::SESSION_REMOTE_PASSWORD));
+  myAuthWidgets << ui.passwordLabel << ui.passwordEdit;
+
   resensitize ();
 
-  QDialogButtonBox * buttons = new QDialogButtonBox (QDialogButtonBox::Cancel|QDialogButtonBox::Ok);
-  connect (buttons, SIGNAL(rejected()), this, SLOT(hide()));
-  connect (buttons, SIGNAL(accepted()), this, SLOT(onAccepted()));
-  top->addWidget (buttons, 0);
+  connect (ui.dialogButtons, SIGNAL (rejected ()), this, SLOT (hide ()));
+  connect (ui.dialogButtons, SIGNAL (accepted ()), this, SLOT (onAccepted ()));
 }

trunk/qt/session-dialog.h

@@ -14 +14 @@
 #include <QWidgetList>
 
+#include "ui_session-dialog.h"
+
 class Prefs;
 class Session;
-class QCheckBox;
-class QLineEdit;
-class QRadioButton;
-class QSpinBox;
 
 class SessionDialog: public QDialog
@@ -34 +32 @@
 
   private:
-    QCheckBox * myAuthCheckBox;
-    QRadioButton * myRemoteRadioButton;
-    QLineEdit * myHostLineEdit;
-    QSpinBox * myPortSpinBox;
-    QLineEdit * myUsernameLineEdit;
-    QLineEdit * myPasswordLineEdit;
-    QCheckBox * myAutomaticCheckBox;
-
-  private:
     Session& mySession;
     Prefs& myPrefs;
+    Ui::SessionDialog ui;
     QWidgetList myRemoteWidgets;
     QWidgetList myAuthWidgets;

trunk/qt/stats-dialog.cc

@@ -11 +11 @@
 
 #include "formatter.h"
-#include "hig.h"
 #include "session.h"
 #include "stats-dialog.h"