Changeset 6481

Timestamp:

08/08/08 03:52:25 (4 months ago)

Author:

flynd

Message:

'Settings' is a better name than 'Modes'.

Location:

trunk/qt4-gui/src/userdlg

Files:

• CMakeLists.txt (modified) (1 diff)
• settings.cpp (moved) (moved from trunk/qt4-gui/src/userdlg/modes.cpp) (12 diffs, 1 prop)
• settings.h (moved) (moved from trunk/qt4-gui/src/userdlg/modes.h) (3 diffs, 1 prop)
• userdlg.cpp (modified) (6 diffs)
• userdlg.h (modified) (2 diffs)

trunk/qt4-gui/src/userdlg/CMakeLists.txt

@@ -2 +2 @@
 set(userdlg_SRCS
   info.cpp
-  modes.cpp
+  settings.cpp
   userdlg.cpp
 )

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

@@ -19 +19 @@
  */
 
-#include "modes.h"
+#include "settings.h"
 
 #include "config.h"
@@ -43 +43 @@
 
 using namespace LicqQtGui;
-/* TRANSLATOR LicqQtGui::UserPages::Modes */
-
-UserPages::Modes::Modes(bool isOwner, UserDlg* parent)
+/* TRANSLATOR LicqQtGui::UserPages::Settings */
+
+UserPages::Settings::Settings(bool isOwner, UserDlg* parent)
   : QObject(parent),
     myIsOwner(isOwner)
@@ -53 +53 @@
     return;
 
-  parent->addPage(UserDlg::SettingsPage, createPageModes(parent),
+  parent->addPage(UserDlg::SettingsPage, createPageSettings(parent),
       tr("Settings"));
   parent->addPage(UserDlg::StatusPage, createPageStatus(parent),
@@ -61 +61 @@
 }
 
-QWidget* UserPages::Modes::createPageModes(QWidget* parent)
+QWidget* UserPages::Settings::createPageSettings(QWidget* parent)
 {
   QWidget* w = new QWidget(parent);
@@ -67 +67 @@
   myPageModesLayout->setContentsMargins(0, 0, 0, 0);
 
-  myMiscModesBox = new QGroupBox(tr("Misc Modes"));
-  myMiscModesLayout = new QGridLayout(myMiscModesBox);
+  mySettingsBox = new QGroupBox(tr("Misc Modes"));
+  mySettingsLayout = new QGridLayout(mySettingsBox);
 
   myAcceptInAwayCheck = new QCheckBox(tr("Accept in away"));
   myAcceptInAwayCheck->setToolTip(tr("Play sounds for this contact when my status is away."));
-  myMiscModesLayout->addWidget(myAcceptInAwayCheck, 0, 0);
+  mySettingsLayout->addWidget(myAcceptInAwayCheck, 0, 0);
 
   myAcceptInNaCheck = new QCheckBox(tr("Accept in not available"));
   myAcceptInNaCheck->setToolTip(tr("Play sounds for this contact when my status is not available."));
-  myMiscModesLayout->addWidget(myAcceptInNaCheck, 1, 0);
+  mySettingsLayout->addWidget(myAcceptInNaCheck, 1, 0);
 
   myAcceptInOccupiedCheck = new QCheckBox(tr("Accept in occupied"));
   myAcceptInOccupiedCheck->setToolTip(tr("Play sounds for this contact when my status is occupied."));
-  myMiscModesLayout->addWidget(myAcceptInOccupiedCheck, 2, 0);
+  mySettingsLayout->addWidget(myAcceptInOccupiedCheck, 2, 0);
 
   myAcceptInDndCheck = new QCheckBox(tr("Accept in do not disturb"));
   myAcceptInDndCheck->setToolTip(tr("Play sounds for this contact when my status is do not disturb."));
-  myMiscModesLayout->addWidget(myAcceptInDndCheck, 3, 0);
+  mySettingsLayout->addWidget(myAcceptInDndCheck, 3, 0);
 
   myAutoAcceptFileCheck = new QCheckBox(tr("Auto accept files"));
   myAutoAcceptFileCheck->setToolTip(tr("Automatically accept file transfers from this contact."));
-  myMiscModesLayout->addWidget(myAutoAcceptFileCheck, 0, 1);
+  mySettingsLayout->addWidget(myAutoAcceptFileCheck, 0, 1);
 
   myAutoAcceptChatCheck = new QCheckBox(tr("Auto accept chats"));
   myAutoAcceptChatCheck->setToolTip(tr("Automatically accept chat requests from this contact."));
-  myMiscModesLayout->addWidget(myAutoAcceptChatCheck, 1, 1);
+  mySettingsLayout->addWidget(myAutoAcceptChatCheck, 1, 1);
 
   myAutoSecureCheck = new QCheckBox(tr("Auto request secure"));
   myAutoSecureCheck->setToolTip(tr("Automatically request secure channel to this contact."));
-  myMiscModesLayout->addWidget(myAutoSecureCheck, 2, 1);
+  mySettingsLayout->addWidget(myAutoSecureCheck, 2, 1);
 
 #ifdef HAVE_LIBGPGME
   myUseGpgCheck = new QCheckBox(tr("Use GPG encryption"));
   myUseGpgCheck->setToolTip(tr("Use GPG encryption for messages with this contact."));
-  myMiscModesLayout->addWidget(myUseGpgCheck, 3, 1);
+  mySettingsLayout->addWidget(myUseGpgCheck, 3, 1);
 #endif
 
   myUseRealIpCheck = new QCheckBox(tr("Use real ip (LAN)"));
   myUseRealIpCheck->setToolTip(tr("Use real IP for when sending to this contact."));
-  myMiscModesLayout->addWidget(myUseRealIpCheck, 4, 0);
-
-  myPageModesLayout->addWidget(myMiscModesBox, 0, 0, 1, 2);
+  mySettingsLayout->addWidget(myUseRealIpCheck, 4, 0);
+
+  myPageModesLayout->addWidget(mySettingsBox, 0, 0, 1, 2);
   myPageModesLayout->setRowStretch(1, 1);
 
@@ -114 +114 @@
 }
 
-QWidget* UserPages::Modes::createPageStatus(QWidget* parent)
+QWidget* UserPages::Settings::createPageStatus(QWidget* parent)
 {
   QWidget* w = new QWidget(parent);
@@ -204 +204 @@
 }
 
-QWidget* UserPages::Modes::createPageGroups(QWidget* parent)
+QWidget* UserPages::Settings::createPageGroups(QWidget* parent)
 {
   QWidget* w = new QWidget(parent);
@@ -229 +229 @@
 }
 
-void UserPages::Modes::load(const ICQUser* user)
+void UserPages::Settings::load(const ICQUser* user)
 {
   if (myIsOwner)
@@ -324 +324 @@
 }
 
-void UserPages::Modes::apply(ICQUser* user)
+void UserPages::Settings::apply(ICQUser* user)
 {
   if (myIsOwner)
@@ -360 +360 @@
 }
 
-void UserPages::Modes::apply2(const QString& id, unsigned long ppid)
+void UserPages::Settings::apply2(const QString& id, unsigned long ppid)
 {
   if (myIsOwner)
@@ -409 +409 @@
 }
 
-void UserPages::Modes::userUpdated(const CICQSignal* sig, const ICQUser* user)
+void UserPages::Settings::userUpdated(const CICQSignal* sig, const ICQUser* user)
 {
   switch (sig->SubSignal())
@@ -419 +419 @@
 }
 
-void UserPages::Modes::showAutoRespHints()
+void UserPages::Settings::showAutoRespHints()
 {
   AwayMsgDlg::showAutoResponseHints(dynamic_cast<UserDlg*>(parent()));

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

@@ -49 +49 @@
 namespace UserPages
 {
-class Modes : public QObject
+class Settings : public QObject
 {
   Q_OBJECT
 
 public:
-  Modes(bool isOwner, UserDlg* parent);
-  virtual ~Modes() {}
+  Settings(bool isOwner, UserDlg* parent);
+  virtual ~Settings() {}
 
   void load(const ICQUser* user);
@@ -89 +89 @@
    * @return a widget with the modes settings
    */
-  QWidget* createPageModes(QWidget* parent);
+  QWidget* createPageSettings(QWidget* parent);
 
   /**
@@ -109 +109 @@
   // Widgets for on modes page
   QGridLayout* myPageModesLayout;
-  QGroupBox* myMiscModesBox;
-  QGridLayout* myMiscModesLayout;
+  QGroupBox* mySettingsBox;
+  QGridLayout* mySettingsLayout;
   QCheckBox* myAcceptInAwayCheck;
   QCheckBox* myAcceptInNaCheck;

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

@@ -42 +42 @@
 
 #include "info.h"
-#include "modes.h"
+#include "settings.h"
 
 using namespace LicqQtGui;
@@ -101 +101 @@
 
   myUserInfo = new UserPages::Info(myIsOwner, this);
-  myUserModes = new UserPages::Modes(myIsOwner, this);
+  myUserSettings = new UserPages::Settings(myIsOwner, this);
 
   const ICQUser* user = gUserManager.FetchUser(myId.toLatin1(), myPpid, LOCK_R);
@@ -117 +117 @@
 
     myUserInfo->load(user);
-    myUserModes->load(user);
+    myUserSettings->load(user);
 
     gUserManager.DropUser(user);
@@ -214 +214 @@
 
   myUserInfo->apply(user);
-  myUserModes->apply(user);
+  myUserSettings->apply(user);
 
   user->SetEnableSave(true);
@@ -223 +223 @@
   // Special stuff that must be called without holding lock
   myUserInfo->apply2(myId, myPpid);
-  myUserModes->apply2(myId, myPpid);
+  myUserSettings->apply2(myId, myPpid);
 
   // Make sure GUI is updated
@@ -239 +239 @@
 
   myUserInfo->userUpdated(sig, user);
-  myUserModes->userUpdated(sig, user);
+  myUserSettings->userUpdated(sig, user);
 
   gUserManager.DropUser(user);

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

@@ -38 +38 @@
 {
   class Info;
-  class Modes;
+  class Settings;
 }
 
@@ -194 +194 @@
 
   UserPages::Info* myUserInfo;
-  UserPages::Modes* myUserModes;
+  UserPages::Settings* myUserSettings;
 };