Changeset 6249

Timestamp:

06/11/08 05:31:29 (4 months ago)

Author:

eugene

Message:

Updated to use new daemon setting of default user encoding.

Location:

trunk/qt4-gui/src

Files:

• config/chat.cpp (modified) (3 diffs)
• config/chat.h (modified) (3 diffs)
• core/licqgui.cpp (modified) (1 diff)
• dialogs/searchuserdlg.cpp (modified) (3 diffs)
• helpers/usercodec.cpp (modified) (2 diffs)
• settings/chat.cpp (modified) (2 diffs)

trunk/qt4-gui/src/config/chat.cpp

@@ -99 +99 @@
 
   iniFile.SetSection("locale");
-  iniFile.ReadStr("DefaultEncoding", szTemp, "");
-  myDefaultEncoding = szTemp;
   iniFile.ReadBool("ShowAllEncodings", myShowAllEncodings, false);
 
@@ -158 +156 @@
 
   iniFile.SetSection("locale");
-  iniFile.WriteStr("DefaultEncoding", myDefaultEncoding);
   iniFile.WriteBool("ShowAllEncodings", myShowAllEncodings);
 
@@ -238 +235 @@
 }
 
-void Config::Chat::setDefaultEncoding(QByteArray defaultEncoding)
-{
-  if (defaultEncoding == myDefaultEncoding)
-    return;
-
-  myDefaultEncoding = defaultEncoding;
-}
-
 void Config::Chat::setTabbedChatting(bool tabbedChatting)
 {

trunk/qt4-gui/src/config/chat.h

@@ -76 +76 @@
   bool showDlgButtons() const { return myShowDlgButtons; }
   bool showAllEncodings() const { return myShowAllEncodings; }
-  QByteArray defaultEncoding() const { return myDefaultEncoding; }
   bool tabbedChatting() const { return myTabbedChatting; }
   bool showHistory() const { return myShowHistory; }
@@ -126 +125 @@
   void setShowDlgButtons(bool showDlgButtons);
   void setShowAllEncodings(bool showAllEncodings);
-  void setDefaultEncoding(QByteArray defaultEncoding);
   void setTabbedChatting(bool tabbedChatting);
   void setShowHistory(bool showHistory);
@@ -203 +201 @@
   QString myChatBackColor;
 
-  QByteArray myDefaultEncoding;
-
   QRect myDialogRect;
 

trunk/qt4-gui/src/core/licqgui.cpp

@@ -1389 +1389 @@
   switch (sig->SubSignal())
   {
-    case LIST_ADD:
-    {
-      ICQUser* u = gUserManager.FetchUser(sig->Id(), sig->PPID(), LOCK_W);
-      if (u == NULL)
-      {
-        gLog.Warn("%sLicqGui::listUpdated(): Invalid user received: %s\n",
-          L_ERRORxSTR, sig->Id());
-        break;
-      }
-
-      // as we intercept the user's addition, we set it our default codec
-      QByteArray defaultEncoding = Config::Chat::instance()->defaultEncoding();
-      if (!defaultEncoding.isEmpty())
-        u->SetUserEncoding(defaultEncoding);
-
-      gUserManager.DropUser(u);
-      break;
-    }
-
     case LIST_REMOVE:
     {

trunk/qt4-gui/src/dialogs/searchuserdlg.cpp

@@ -41 +41 @@
 #include <licq_countrycodes.h>
 
-#include "config/chat.h"
-
 #include "core/gui-defines.h"
 #include "core/licqgui.h"
@@ -246 +244 @@
   if (edtUin->text().trimmed().isEmpty())
   {
-    QTextCodec* codec = QTextCodec::codecForName(Config::Chat::instance()->defaultEncoding());
+    QTextCodec* codec = QTextCodec::codecForName(gUserManager.DefaultUserEncoding());
     if (codec == 0)
       codec = QTextCodec::codecForLocale();
@@ -342 +340 @@
   QString text;
   QTreeWidgetItem* item = new QTreeWidgetItem(foundView);
-  QTextCodec* codec = QTextCodec::codecForName(
-      Config::Chat::instance()->defaultEncoding());
+  QTextCodec* codec = QTextCodec::codecForName(gUserManager.DefaultUserEncoding());
   if (codec == NULL)
     codec = QTextCodec::codecForLocale();

trunk/qt4-gui/src/helpers/usercodec.cpp

@@ -26 +26 @@
 #include <licq_user.h>
 #include <licq_chat.h>
-
-#include "config/chat.h"
 
 using namespace LicqQtGui;
@@ -85 +83 @@
 QTextCodec* UserCodec::defaultEncoding()
 {
-  QTextCodec* codec = QTextCodec::codecForName(Config::Chat::instance()->defaultEncoding());
+  QTextCodec* codec = QTextCodec::codecForName(gUserManager.DefaultUserEncoding());
 
   if (codec != NULL)

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

@@ -554 +554 @@
   mySendTNCheck->setChecked(gLicqDaemon->SendTypingNotification());
 
-  myDefaultEncodingCombo->setCurrentIndex(0);
-  // first combo myBox item is the locale encoding, so we skip it
-  for (int i = 1; i < myDefaultEncodingCombo->count(); i++)
+  QByteArray defaultEncoding = gUserManager.DefaultUserEncoding();
+  if (defaultEncoding.isEmpty())
+    myDefaultEncodingCombo->setCurrentIndex(0);
+  else
   {
-    if (UserCodec::encodingForName(myDefaultEncodingCombo->itemText(i)) == chatConfig->defaultEncoding())
+    for (int i = 1; i < myDefaultEncodingCombo->count(); i++)
     {
-       myDefaultEncodingCombo->setCurrentIndex(i);
-       break;
+      if (UserCodec::encodingForName(myDefaultEncodingCombo->itemText(i)) == defaultEncoding)
+      {
+        myDefaultEncodingCombo->setCurrentIndex(i);
+        break;
+      }
     }
   }
@@ -621 +625 @@
 
   if (myDefaultEncodingCombo->currentIndex() > 0)
-    chatConfig->setDefaultEncoding(UserCodec::encodingForName(myDefaultEncodingCombo->currentText()));
+    gUserManager.SetDefaultUserEncoding(UserCodec::encodingForName(myDefaultEncodingCombo->currentText()));
   else
-    chatConfig->setDefaultEncoding(QByteArray());
+    gUserManager.SetDefaultUserEncoding("");
   chatConfig->setShowAllEncodings(myShowAllEncodingsCheck->isChecked());