Changeset 6480

Timestamp:

08/08/08 03:41:02 (4 months ago)

Author:

flynd

Message:

Renamed misc modes page to 'Settings'. Moved status settings to separated page. Added custom auto response editing to status page.

Location:

trunk/qt4-gui/src/userdlg

Files:

• modes.cpp (modified) (7 diffs)
• modes.h (modified) (6 diffs)
• userdlg.h (modified) (1 diff)

trunk/qt4-gui/src/userdlg/modes.cpp

@@ -26 +26 @@
 #include <QGridLayout>
 #include <QGroupBox>
+#include <QHBoxLayout>
 #include <QHeaderView>
 #include <QRadioButton>
@@ -35 +36 @@
 #include <licq_user.h>
 
+#include "dialogs/awaymsgdlg.h"
+#include "widgets/mledit.h"
+
 #include "userdlg.h"
 
@@ -49 +53 @@
     return;
 
-  parent->addPage(UserDlg::ModesPage, createPageModes(parent),
-      tr("Misc Modes"));
+  parent->addPage(UserDlg::SettingsPage, createPageModes(parent),
+      tr("Settings"));
+  parent->addPage(UserDlg::StatusPage, createPageStatus(parent),
+      tr("Status"), UserDlg::SettingsPage);
   parent->addPage(UserDlg::GroupsPage, createPageGroups(parent),
       tr("Groups"));
@@ -102 +108 @@
   myMiscModesLayout->addWidget(myUseRealIpCheck, 4, 0);
 
+  myPageModesLayout->addWidget(myMiscModesBox, 0, 0, 1, 2);
+  myPageModesLayout->setRowStretch(1, 1);
+
+  return w;
+}
+
+QWidget* UserPages::Modes::createPageStatus(QWidget* parent)
+{
+  QWidget* w = new QWidget(parent);
+  myPageStatusLayout = new QGridLayout(w);
+  myPageStatusLayout->setContentsMargins(0, 0, 0, 0);
 
   myStatusBox = new QGroupBox(tr("Status to User"));
@@ -158 +175 @@
   mySysGroupLayout->addStretch(1);
 
-
-  myPageModesLayout->addWidget(myMiscModesBox, 0, 0, 1, 2);
-  myPageModesLayout->addWidget(myStatusBox, 1, 0);
-  myPageModesLayout->addWidget(mySysGroupBox, 1, 1);
-  myPageModesLayout->setRowStretch(2, 1);
+  myAutoRespBox = new QGroupBox(tr("Custom Auto Response"));
+  myAutoRespLayout = new QHBoxLayout(myAutoRespBox);
+
+  myAutoRespEdit = new MLEdit(true);
+  myAutoRespEdit->setSizeHintLines(5);
+  myAutoRespLayout->addWidget(myAutoRespEdit);
+
+  QVBoxLayout* autoRespButtons = new QVBoxLayout();
+
+  myAutoRespHintsButton = new QPushButton(tr("Hints"));
+  connect(myAutoRespHintsButton, SIGNAL(clicked()), SLOT(showAutoRespHints()));
+  autoRespButtons->addWidget(myAutoRespHintsButton);
+
+  myAutoRespClearButton = new QPushButton(tr("Clear"));
+  connect(myAutoRespClearButton, SIGNAL(clicked()), myAutoRespEdit, SLOT(clear()));
+  autoRespButtons->addWidget(myAutoRespClearButton);
+
+  autoRespButtons->addStretch(1);
+  myAutoRespLayout->addLayout(autoRespButtons);
+
+
+  myPageStatusLayout->addWidget(myStatusBox, 0, 0);
+  myPageStatusLayout->addWidget(mySysGroupBox, 0, 1);
+  myPageStatusLayout->addWidget(myAutoRespBox, 1, 0, 1, 2);
+  myPageStatusLayout->setRowStretch(2, 1);
 
   return w;
@@ -318 +355 @@
     statusToUser = ICQ_STATUS_DND;
   user->SetStatusToUser(statusToUser);
+
+  // Set auto response (empty string will disable custom auto response)
+  user->SetCustomAutoResponse(myAutoRespEdit->toPlainText().trimmed().toLocal8Bit());
 }
 
@@ -379 +419 @@
 }
 
+void UserPages::Modes::showAutoRespHints()
+{
+  AwayMsgDlg::showAutoResponseHints(dynamic_cast<UserDlg*>(parent()));
+}

trunk/qt4-gui/src/userdlg/modes.h

@@ -31 +31 @@
 class QGridLayout;
 class QGroupBox;
+class QHBoxLayout;
+class QPushButton;
 class QRadioButton;
 class QTableWidget;
@@ -42 +44 @@
 namespace LicqQtGui
 {
+class MLEdit;
 class UserDlg;
 
@@ -74 +77 @@
   void userUpdated(const CICQSignal* sig, const ICQUser* user);
 
+private slots:
+  /**
+   * Show hints for auto response editing
+   */
+  void showAutoRespHints();
+
 private:
   /**
@@ -81 +90 @@
    */
   QWidget* createPageModes(QWidget* parent);
+
+  /**
+   * Setup the status page.
+   *
+   * @return a widget with the status settings
+   */
+  QWidget* createPageStatus(QWidget* parent);
 
   /**
@@ -104 +120 @@
   QCheckBox* myUseGpgCheck;
   QCheckBox* myUseRealIpCheck;
+
+  // Status page
+  QGridLayout* myPageStatusLayout;
   QGroupBox* myStatusBox;
   QVBoxLayout* myStatusLayout;
@@ -115 +134 @@
   QVBoxLayout* mySysGroupLayout;
   QCheckBox* mySystemGroupCheck[NUM_GROUPS_SYSTEM_ALL];
+  QGroupBox* myAutoRespBox;
+  QHBoxLayout* myAutoRespLayout;
+  MLEdit* myAutoRespEdit;
+  QPushButton* myAutoRespClearButton;
+  QPushButton* myAutoRespHintsButton;
 
   // Widgets for groups page

trunk/qt4-gui/src/userdlg/userdlg.h

@@ -61 +61 @@
     CountersPage,
     KabcPage,
-    ModesPage,
+    SettingsPage,
+    StatusPage,
     GroupsPage,
   };