Changeset 6474

Timestamp:

08/07/08 03:51:16 (4 months ago)

Author:

flynd

Message:

Remake of user dialog to have same page handling as settings dialog. Added pages for other user settings and group membership as well.

Location:

trunk/qt4-gui/src

Files:

• CMakeLists.txt (modified) (1 diff)
• core/licqgui.cpp (modified) (7 diffs)
• core/licqgui.h (modified) (4 diffs)
• dialogs/CMakeLists.txt (modified) (1 diff)
• userdlg (added)
• userdlg/CMakeLists.txt (added)
• userdlg/info.cpp (moved) (moved from trunk/qt4-gui/src/dialogs/userinfodlg.cpp) (54 diffs, 1 prop)
• userdlg/info.h (moved) (moved from trunk/qt4-gui/src/dialogs/userinfodlg.h) (8 diffs, 1 prop)
• userdlg/modes.cpp (added)
• userdlg/modes.h (added)
• userdlg/userdlg.cpp (added)
• userdlg/userdlg.h (added)

trunk/qt4-gui/src/CMakeLists.txt

@@ -7 +7 @@
   helpers
   settings
+  userdlg
   userevents
   views

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

@@ -86 +86 @@
 
 #include "dialogs/logwindow.h"
-#include "dialogs/userinfodlg.h"
 
 #include "dockicons/dockicon.h"
@@ -96 +95 @@
 
 #include "helpers/support.h"
+
+#include "userdlg/userdlg.h"
 
 #include "userevents/usereventcommon.h"
@@ -745 +746 @@
   if (id.isEmpty() || ppid == 0) return;
 
-  UserInfoDlg* f = NULL;
-
-  for (int i = 0; i < myUserInfoList.size(); ++i)
-  {
-    UserInfoDlg* item = myUserInfoList.at(i);
-    if (item->Id() == id && item->PPID() == ppid)
+  UserDlg* f = NULL;
+
+  for (int i = 0; i < myUserDlgList.size(); ++i)
+  {
+    UserDlg* item = myUserDlgList.at(i);
+    if (item->id() == id && item->ppid() == ppid)
     {
       f = item;
@@ -757 +758 @@
   }
 
-  int tab = UserInfoDlg::GeneralInfo;
+  UserDlg::UserPage tab = UserDlg::GeneralPage;
 
   if (f != NULL)
   {
-    if (toggle && f->isTabShown(tab))
+    if (toggle && f->currentPage() == tab)
     {
       delete f; // will notify us about deletion
@@ -774 +775 @@
   else
   {
-    f = new UserInfoDlg(id, ppid);
-    connect(f, SIGNAL(finished(UserInfoDlg*)),
-        SLOT(userInfoDlgFinished(UserInfoDlg*)));
+    f = new UserDlg(id, ppid);
+    connect(f, SIGNAL(finished(UserDlg*)), SLOT(userDlgFinished(UserDlg*)));
     f->show();
-    myUserInfoList.append(f);
-  }
-
-  f->showTab(tab);
+    myUserDlgList.append(f);
+  }
+
+  f->showPage(tab);
   f->show();
   f->raise();
@@ -1022 +1022 @@
 }
 
-void LicqGui::userInfoDlgFinished(UserInfoDlg* dialog)
-{
-  if (myUserInfoList.removeAll(dialog) > 0)
+void LicqGui::userDlgFinished(UserDlg* dialog)
+{
+  if (myUserDlgList.removeAll(dialog) > 0)
     return;
 
   gLog.Warn("%sUser Info finished signal for user with no window (%s)!\n",
-      L_WARNxSTR, dialog->Id().toLatin1().data());
+      L_WARNxSTR, dialog->id().toLatin1().data());
 }
 
@@ -1359 +1359 @@
       }
       // if their info box is open, kill it
-      for (int i = 0; i < myUserInfoList.size(); ++i)
+      for (int i = 0; i < myUserDlgList.size(); ++i)
       {
-        UserInfoDlg* item = myUserInfoList.at(i);
-        if (item->Id() == sig->Id() && item->PPID() == sig->PPID())
+        UserDlg* item = myUserDlgList.at(i);
+        if (item->id() == sig->Id() && item->ppid() == sig->PPID())
         {
           item->close();
-          myUserInfoList.removeAll(item);
+          myUserDlgList.removeAll(item);
           break;
         }

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

@@ -49 +49 @@
 class UserEventCommon;
 class UserEventTabDlg;
-class UserInfoDlg;
+class UserDlg;
 class UserMenu;
 class UserSendCommon;
@@ -55 +55 @@
 
 typedef QList<UserViewEvent*> UserViewEventList;
-typedef QList<UserInfoDlg*> UserInfoList;
+typedef QList<UserDlg*> UserDlgList;
 typedef QList<UserSendCommon*> UserSendEventList;
 
@@ -234 +234 @@
 #endif
 
-  void userInfoDlgFinished(UserInfoDlg* dialog);
+  void userDlgFinished(UserDlg* dialog);
   void userEventTabDlgDone();
   void userEventFinished(QString id, unsigned long ppid);
@@ -291 +291 @@
   UserEventTabDlg* myUserEventTabDlg;
   UserViewEventList myUserViewList;
-  UserInfoList myUserInfoList;
+  UserDlgList myUserDlgList;
   UserSendEventList myUserSendList;
 

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

@@ -32 +32 @@
   skinbrowser.cpp
   statsdlg.cpp
-  userinfodlg.cpp
   userselectdlg.cpp
   utilitydlg.cpp

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

@@ -19 +19 @@
  */
 
-// written by Graham Roff <graham@licq.org>
-// contributions by Dirk A. Mueller <dirk@licq.org>
-
-#include "userinfodlg.h"
+#include "info.h"
 
 #include "config.h"
@@ -30 +27 @@
 #include <QCheckBox>
 #include <QComboBox>
-#include <QDateTime>
+#include <QDate>
 #include <QGridLayout>
-#include <QHBoxLayout>
+#include <QGroupBox>
 #include <QHeaderView>
 #include <QLabel>
@@ -40 +37 @@
 #include <QSpinBox>
 #include <QTextCodec>
-#include <QTimer>
 #include <QTreeWidget>
 #include <QVBoxLayout>
@@ -52 +48 @@
 //#include <kabc/addressee.h>
 //#include <kabc/addresseedialog.h>
-//#include "licqkimiface.h"
+//#include "core/licqkimiface.h"
 //#define USE_KABC
 #else
@@ -58 +54 @@
 #endif
 
+#include <licq_backgroundcodes.h>
 #include <licq_countrycodes.h>
+#include <licq_homepagecodes.h>
+#include <licq_interestcodes.h>
+#include <licq_icq.h>
+#include <licq_icqd.h>
+#include <licq_languagecodes.h>
+#include <licq_log.h>
 #include <licq_occupationcodes.h>
-#include <licq_homepagecodes.h>
-#include <licq_events.h>
-#include <licq_languagecodes.h>
-#include <licq_interestcodes.h>
 #include <licq_organizationcodes.h>
-#include <licq_backgroundcodes.h>
 #include <licq_providers.h>
-#include <licq_icqd.h>
-#include <licq_socket.h>
-#include <licq_log.h>
 #include <licq_user.h>
 
+#include "config/iconmanager.h"
+#include "core/messagebox.h"
+#include "dialogs/editcategorydlg.h"
+#include "dialogs/phonedlg.h"
+#include "helpers/licqstrings.h"
+#include "helpers/usercodec.h"
 #include "widgets/infofield.h"
 #include "widgets/mledit.h"
 #include "widgets/mlview.h"
-#include "widgets/tabwidget.h"
 #include "widgets/timezoneedit.h"
-
-#include "config/chat.h"
-#include "config/iconmanager.h"
-
-#include "core/licqgui.h"
-#include "core/messagebox.h"
-#include "core/signalmanager.h"
-#include "core/usermenu.h"
-
-#include "helpers/eventdesc.h"
-#include "helpers/licqstrings.h"
-#include "helpers/usercodec.h"
-
-#include "editcategorydlg.h"
-#include "editfiledlg.h"
-#include "phonedlg.h"
+#include "userdlg.h"
+
+#ifdef USE_KABC
+#include "core/mainwin.h"
+#endif
+
 
 using namespace LicqQtGui;
-/* TRANSLATOR LicqQtGui::UserInfoDlg */
-
-UserInfoDlg::UserInfoDlg(QString id, unsigned long ppid, QWidget* parent)
-  : QDialog(parent),
-    myId(id),
-    m_nPPID(ppid),
-    icqEventTag(0)
-{
-  setObjectName("UserInfoDialog");
-  setAttribute(Qt::WA_DeleteOnClose, true);
-
-  m_bOwner = (gUserManager.FindOwner(myId.toLatin1(), m_nPPID) != NULL);
+/* TRANSLATOR LicqQtGui::UserPages::Info */
+
+UserPages::Info::Info(bool isOwner, UserDlg* parent)
+  : QObject(parent),
+    m_bOwner(isOwner)
+{
   m_Interests = m_Organizations = m_Backgrounds = NULL;
   m_PhoneBook = NULL;
 
-  CreateGeneralInfo();
-  CreateMoreInfo();
-  CreateMore2Info();
-  CreateWorkInfo();
-  CreateAbout();
-  CreatePhoneBook();
-  CreatePicture();
-  CreateLastCountersInfo();
+  parent->addPage(UserDlg::GeneralPage, createPageGeneral(parent),
+      tr("General"));
+  parent->addPage(UserDlg::MorePage, createPageMore(parent),
+      tr("More"));
+  parent->addPage(UserDlg::More2Page, createPageMore2(parent),
+      tr("More II"));
+  parent->addPage(UserDlg::WorkPage, createPageWork(parent),
+      tr("Work"));
+  parent->addPage(UserDlg::AboutPage, createPageAbout(parent),
+      tr("About"));
+  parent->addPage(UserDlg::PhonePage, createPagePhoneBook(parent),
+      tr("Phone Book"));
+  parent->addPage(UserDlg::PicturePage, createPagePicture(parent),
+      tr("Picture"));
+  parent->addPage(UserDlg::CountersPage, createPageCounters(parent),
+      tr("Last"));
 #ifdef USE_KABC
-  CreateKABCInfo();
+  parent->addPage(UserDlg::KabcPage, createPageKabc(parent),
+      tr("KDE Adressbook"));
 #endif
-
-  QVBoxLayout* lay = new QVBoxLayout(this);
-
-  lay->setContentsMargins(2, 2, 2, 2);
-  tabs = new TabWidget();
-  lay->addWidget(tabs, 2);
-
-  tabs->addTab(tabList[GeneralInfo].tab, tabList[GeneralInfo].label);
-  tabs->addTab(tabList[MoreInfo].tab, tabList[MoreInfo].label);
-  tabs->addTab(tabList[More2Info].tab, tabList[More2Info].label);
-  tabs->addTab(tabList[WorkInfo].tab, tabList[WorkInfo].label);
-  tabs->addTab(tabList[AboutInfo].tab, tabList[AboutInfo].label);
-  tabs->addTab(tabList[PhoneInfo].tab, tabList[PhoneInfo].label);
-  tabs->addTab(tabList[PictureInfo].tab, tabList[PictureInfo].label);
-  tabs->addTab(tabList[LastCountersInfo].tab, tabList[LastCountersInfo].label);
+}
+
+void UserPages::Info::load(const ICQUser* user)
+{
+  myId = user->IdString();
+  myPpid = user->PPID();
+  codec = UserCodec::codecForICQUser(user);
+
+  loadPageGeneral(user);
+  loadPageMore(user);
+  loadPageMore2(user);
+  loadPageWork(user);
+  loadPageAbout(user);
+  loadPagePhoneBook(user);
+  loadPagePicture(user);
+  loadPageCounters(user);
 #ifdef USE_KABC
-  tabs->addTab(tabList[KABCInfo].tab, tabList[KABCInfo].label);
+  loadPageKabc(user);
 #endif
-
-  connect(tabs, SIGNAL(currentChanged(int)), SLOT(updateTab(int)));
-  connect(LicqGui::instance()->signalManager(),
-      SIGNAL(updatedUser(CICQSignal*)), SLOT(updatedUser(CICQSignal*)));
-
-  btnMain3 = new QPushButton(tr("&Update"));
-  btnMain4 = new QPushButton(tr("&Close"));
-  connect(btnMain4, SIGNAL(clicked()), SLOT(close()));
-
-  if (m_bOwner)
-  {
-    btnMain1 = new QPushButton(tr("&Save"));
-    btnMain2 = new QPushButton(tr("Retrieve"));
-    connect(btnMain1, SIGNAL(clicked()), SLOT(SaveSettings()));
-    connect(btnMain2, SIGNAL(clicked()), SLOT(slotRetrieve()));
-    connect(btnMain3, SIGNAL(clicked()), SLOT(slotUpdate()));
-  }
-  else
-  {
-    btnMain1 = new QPushButton(tr("&Menu"));
-    btnMain2 = new QPushButton(tr("&Save"));
-    connect(btnMain1, SIGNAL(pressed()), SLOT(ShowUsermenu()));
-    btnMain1->setMenu(LicqGui::instance()->userMenu());
-    connect(btnMain2, SIGNAL(clicked()), SLOT(SaveSettings()));
-    connect(btnMain3, SIGNAL(clicked()), SLOT(slotRetrieve()));
-  }
-
-  QHBoxLayout* l = new QHBoxLayout();
-
-  l->setContentsMargins(10, 0, 10, 5);
-  l->addWidget(btnMain1);
-  l->addStretch(2);
-  l->addWidget(btnMain2);
-  l->addWidget(btnMain3);
-  l->addSpacing(35);
-  l->addWidget(btnMain4);
-  btnMain4->setDefault(true);
-
-  lay->addLayout(l);
-
-  const ICQUser* u = gUserManager.FetchUser(myId.toLatin1(), m_nPPID, LOCK_R);
-  if (u == NULL)
-  {
-    m_sBasic = tr("Licq - Info ") + tr("INVALID USER");
-    resetCaption();
-    setWindowIconText(tr("INVALID USER"));
-  }
-  else
-  {
-    QTextCodec* codec = UserCodec::codecForICQUser(u);
-    QString tmp = codec->toUnicode(u->GetFirstName());
-    QString lastname = codec->toUnicode(u->GetLastName());
-    if ((!tmp.isEmpty()) && (!lastname.isEmpty()))
-      tmp = tmp + " " + lastname;
-    else
-      tmp = tmp + lastname;
-    if (!tmp.isEmpty()) tmp = " (" + tmp + ")";
-    m_sBasic = tr("Licq - Info ") + QString::fromUtf8(u->GetAlias()) + tmp;
-    resetCaption();
-    setWindowIconText(u->GetAlias());
-    SetGeneralInfo(u);
-    gUserManager.DropUser(u);
-  }
-
-  // Set Tab Order
-  setTabOrder (tabs, btnMain1);
-  setTabOrder (btnMain1, btnMain2);
-  setTabOrder (btnMain2, btnMain3);
-  setTabOrder (btnMain3, btnMain4);
-}
-
-// -----------------------------------------------------------------------------
-UserInfoDlg::~UserInfoDlg()
-{
-  if (icqEventTag != 0)
-  {
-    gLicqDaemon->CancelEvent(icqEventTag);
-    icqEventTag = 0;
-  }
-
-  if (m_Interests != NULL)
-    delete m_Interests;
-  if (m_Organizations != NULL)
-    delete m_Organizations;
-  if (m_Backgrounds != NULL)
-    delete m_Backgrounds;
-  if (m_PhoneBook != NULL)
-    delete m_PhoneBook;
-
-  emit finished(this);
-}
-
-// -----------------------------------------------------------------------------
-void UserInfoDlg::showTab(int tab)
-{
-  tabs->setCurrentWidget(tabList[tab].tab);
-}
-
-bool UserInfoDlg::isTabShown(int tab)
-{
-  return (tabs->currentWidget() == tabList[tab].tab);
-}
-
-
-// -----------------------------------------------------------------------------
-
-void UserInfoDlg::CreateGeneralInfo()
-{
-  tabList[GeneralInfo].label = tr("&General");
-  QWidget* p = new QWidget(this);
-  tabList[GeneralInfo].tab = p;
-  p->setObjectName(tabList[GeneralInfo].label);
-  tabList[GeneralInfo].loaded = false;
+}
+
+void UserPages::Info::apply(ICQUser* user)
+{
+  savePageGeneral(user);
+  savePageMore(user);
+  savePageMore2(user);
+  savePageWork(user);
+  savePageAbout(user);
+  savePagePhoneBook(user);
+  savePagePicture(user);
+}
+
+void UserPages::Info::apply2(const QString& id, unsigned long ppid)
+{
+  if (!m_bOwner)
+  {
+    gLicqDaemon->ProtoRenameUser(id.toLatin1(), ppid);
+  }
+
+#ifdef USE_KABC
+  savePageKabc();
+#endif
+}
+
+QWidget* UserPages::Info::createPageGeneral(QWidget* parent)
+{
+  QWidget* w = new QWidget(parent);
+  myPageGeneralLayout = new QVBoxLayout(w);
+  myPageGeneralLayout->setContentsMargins(0, 0, 0, 0);
 
   unsigned short CR = 0;
 
-  QGridLayout* lay = new QGridLayout(p);
+  myGeneralBox = new QGroupBox(tr("General Information"));
+  QGridLayout* lay = new QGridLayout(myGeneralBox);
   lay->setColumnMinimumWidth(2, 10);
-  lay->setRowStretch(9, 1);
 
   lay->addWidget(new QLabel(tr("Alias:")), CR, 0);
   nfoAlias = new InfoField(false);
   lay->addWidget(nfoAlias, CR, 1);
-  chkKeepAliasOnUpdate = new QCheckBox(tr("Keep Alias on Update"));
-  chkKeepAliasOnUpdate->setToolTip(tr("Normally Licq overwrites the Alias when updating user details.\n"
-                                           "Check this if you want to keep your changes to the Alias."));
-  lay->addWidget(chkKeepAliasOnUpdate, CR, 3, 1, 2);
+
+  if (!m_bOwner)
+  {
+    chkKeepAliasOnUpdate = new QCheckBox(tr("Keep Alias on Update"));
+    chkKeepAliasOnUpdate->setToolTip(tr(
+        "Normally Licq overwrites the Alias when updating user details.\n"
+        "Check this if you want to keep your changes to the Alias."));
+    lay->addWidget(chkKeepAliasOnUpdate, CR, 3, 1, 2);
+    connect(nfoAlias, SIGNAL(textChanged(const QString&)), SLOT(aliasChanged()));
+  }
 
   lay->addWidget(new QLabel(tr("ID:")), ++CR, 0);
@@ -310 +227 @@
   nfoState->setMaxLength(3);
   lay->addWidget(nfoState, CR, 1);
-  setTabOrder(nfoAddress, nfoState);
+  w->setTabOrder(nfoAddress, nfoState);
   lay->addWidget(new QLabel(tr("Fax:")), CR, 3);
   nfoFax = new InfoField(false);//!m_bOwner);
   lay->addWidget(nfoFax, CR, 4);
-  setTabOrder(nfoPhone, nfoFax);
+  w->setTabOrder(nfoPhone, nfoFax);
 
   lay->addWidget(new QLabel(tr("City:")), ++CR, 0);
   nfoCity = new InfoField(!m_bOwner);
   lay->addWidget(nfoCity, CR, 1);
-  setTabOrder(nfoState, nfoCity);
+  w->setTabOrder(nfoState, nfoCity);
   lay->addWidget(new QLabel(tr("Cellular:")), CR, 3);
   nfoCellular = new InfoField(false);//!m_bOwner);
   lay->addWidget(nfoCellular, CR, 4);
-  setTabOrder(nfoFax, nfoCellular);
+  w->setTabOrder(nfoFax, nfoCellular);
 
   lay->addWidget(new QLabel(tr("Zip:")), ++CR, 0);
   nfoZipCode = new InfoField(!m_bOwner);
   lay->addWidget(nfoZipCode, CR, 1);
-  setTabOrder(nfoCity, nfoZipCode);
+  w->setTabOrder(nfoCity, nfoZipCode);
   lay->addWidget(new QLabel(tr("Country:")), CR, 3);
   if (m_bOwner)
   {
-    cmbCountry = new QComboBox(tabList[GeneralInfo].tab);
+    cmbCountry = new QComboBox();
     //cmbCountry->addItem(tr("Unspecified"));
     cmbCountry->setMaximumWidth(cmbCountry->sizeHint().width()+20);
@@ -346 +263 @@
 
   lay->setRowStretch(++CR, 5);
-}
-
-void UserInfoDlg::SetGeneralInfo(const ICQUser* u)
-{
-  tabList[GeneralInfo].loaded = true;
+
+  myPageGeneralLayout->addWidget(myGeneralBox);
+  myPageGeneralLayout->addStretch(1);
+
+  return w;
+}
+
+void UserPages::Info::loadPageGeneral(const ICQUser* u)
+{
   char buf[32];
-  bool bDropUser = false;
-
-  if (u == NULL)
-  {
-    u = gUserManager.FetchUser(myId.toLatin1(), m_nPPID, LOCK_R);
-    if (u == NULL) return;
-    bDropUser = true;
-  }
-
-  QTextCodec* codec = UserCodec::codecForICQUser(u);
-
-  if(m_bOwner)
-    chkKeepAliasOnUpdate->hide();
-  chkKeepAliasOnUpdate->setChecked(u->KeepAliasOnUpdate());
+
+  if (!m_bOwner)
+    chkKeepAliasOnUpdate->setChecked(u->KeepAliasOnUpdate());
   nfoAlias->setText(QString::fromUtf8(u->GetAlias()));
-  connect(nfoAlias, SIGNAL(textChanged(const QString&)), SLOT(slot_aliasChanged(const QString&)));
   nfoFirstName->setText(codec->toUnicode(u->GetFirstName()));
   nfoLastName->setText(codec->toUnicode(u->GetLastName()));
@@ -373 +282 @@
   nfoEmailSecondary->setText(codec->toUnicode(u->GetEmailSecondary()));
   nfoEmailOld->setText(codec->toUnicode(u->GetEmailOld()));
-  nfoUin->setText(u->IdString());
+  nfoUin->setText(myId);
   QString ip = QString(u->IpStr(buf));
   if (u->Ip() != u->IntIp() && u->IntIp() != 0)
@@ -412 +321 @@
   nfoCellular->setText(codec->toUnicode(u->GetCellularNumber()));
   nfoZipCode->setText(codec->toUnicode(u->GetZipCode()));
-
-  if (!u->StatusOffline())
-    nfoLastOnline->setText(tr("Now"));
-  else if (u->LastOnline() == 0)
-    nfoLastOnline->setText(tr("Unknown"));
-  else
-  {
-    QDateTime t;
-    t.setTime_t(u->LastOnline());
-    QString ds = t.toString();
-    ds.truncate(ds.length() - 8);
-    nfoLastOnline->setText(ds);
-  }
-
-  if (bDropUser) gUserManager.DropUser(u);
-}
-
-void UserInfoDlg::SaveGeneralInfo()
-{
-  ICQUser* u = gUserManager.FetchUser(myId.toLatin1(), m_nPPID, LOCK_W);
-  if (u == NULL) return;
-
-  QTextCodec* codec = UserCodec::codecForICQUser(u);
-
-  u->SetEnableSave(false);
-
+}
+
+void UserPages::Info::savePageGeneral(ICQUser* u)
+{
   u->SetAlias(nfoAlias->text().toUtf8());
-  u->SetKeepAliasOnUpdate(chkKeepAliasOnUpdate->isChecked());
+  if (!m_bOwner)
+    u->SetKeepAliasOnUpdate(chkKeepAliasOnUpdate->isChecked());
   u->SetFirstName(codec->fromUnicode(nfoFirstName->text()));
   u->SetLastName(codec->fromUnicode(nfoLastName->text()));
@@ -458 +346 @@
   }
   u->SetTimezone(tznZone->data());
-
-  u->SetEnableSave(true);
-  u->SaveGeneralInfo();
-
-  gUserManager.DropUser(u);
-
-  if (!m_bOwner)
-    gLicqDaemon->ProtoRenameUser(myId.toLatin1(), m_nPPID);
-}
-
-// -----------------------------------------------------------------------------
-
-void UserInfoDlg::CreateMoreInfo()
-{
-  tabList[MoreInfo].label = tr("&More");
-  QWidget* p = new QWidget(this);
-  tabList[MoreInfo].tab = p;
-  p->setObjectName(tabList[MoreInfo].label);
-  tabList[MoreInfo].loaded = false;
+}
+
+QWidget* UserPages::Info::createPageMore(QWidget* parent)
+{
+  QWidget* w = new QWidget(parent);
+  myPageMoreLayout = new QVBoxLayout(w);
+  myPageMoreLayout->setContentsMargins(0, 0, 0, 0);
 
   unsigned short CR = 0;
-  QGridLayout* lay = new QGridLayout(p);
-  lay->setColumnMinimumWidth(2, 10);
+  myMoreBox = new QGroupBox(tr("More"));
+  QGridLayout* lay = new QGridLayout(myMoreBox);
   lay->setRowMinimumHeight(6, 5);
-  lay->setRowStretch(3, 1);
 
   lay->addWidget(new QLabel(tr("Age:")), CR, 0);
@@ -585 +460 @@
   CR++;
   lay->addWidget(lblICQHomepage, CR, 0, 1, 5);
-}
-
-void UserInfoDlg::SetMoreInfo(const ICQUser* u)
-{
-  tabList[MoreInfo].loaded = true;
-  bool bDropUser = false;
-
-  if (u == NULL)
-  {
-    u = gUserManager.FetchUser(myId.toLatin1(), m_nPPID, LOCK_R);
-    if (u == NULL) return;
-    bDropUser = true;
-  }
-
-  QTextCodec* codec = UserCodec::codecForICQUser(u);
-
+
+  myPageMoreLayout->addWidget(myMoreBox);
+  myPageMoreLayout->addStretch(1);
+
+  return w;
+}
+
+void UserPages::Info::loadPageMore(const ICQUser* u)
+{
   // Gender
   if (m_bOwner)
@@ -717 +585 @@
   {
     QString url;
-    url.sprintf("(http://%s.homepage.icq.com/)", u->IdString());
+    url.sprintf("(http://%s.homepage.icq.com/)", myId.toLatin1().data());
     lblICQHomepage->setText(tr("User has an ICQ Homepage ") + url);