Changeset 5032

Timestamp:

07/20/07 05:36:49 (17 months ago)

Author:

flynd

Message:

Updated UserInfoDlg? to use Qt4 without Qt3 compability classes.

Location:

branches/qt-gui_qt4/src

Files:

• userinfodlg.cpp (modified) (106 diffs)
• userinfodlg.h (modified) (8 diffs)

branches/qt-gui_qt4/src/userinfodlg.cpp

@@ -27 +27 @@
 #include "config.h"
 
-#include "widgets/tabwidget.h"
-
-#include <Q3VBox>
+#include <cstring>
+
 #include <QCheckBox>
-#include <Q3Header>
 #include <QDateTime>
-#include <QLayout>
-#include <QSpinBox>
-#include <QTimer>
-#include <Q3ProgressBar>
-#include <QApplication>
-#include <QTextCodec>
-#include <Q3Accel>
-#include <QTimer>
-#include <Q3WhatsThis>
-//Added by qt3to4:
+#include <QGridLayout>
+#include <QHBoxLayout>
+#include <QHeaderView>
 #include <QLabel>
 #include <QPixmap>
-#include <Q3GridLayout>
-#include <QKeyEvent>
-#include <Q3HBoxLayout>
-#include <Q3VBoxLayout>
-#include <ctype.h>
+#include <QProgressBar>
+#include <QShortcut>
+#include <QSpinBox>
+#include <QTextCodec>
+#include <QTimer>
+#include <QTreeWidget>
+#include <QVBoxLayout>
 
 #ifdef USE_KDE
@@ -62 +55 @@
 #endif
 #else
-#include <Q3FileDialog>
+#include <QFileDialog>
 #endif
 
@@ -78 +71 @@
 #include "licq_socket.h"
 #include "licq_log.h"
-#include "usercodec.h"
 
 #include "widgets/infofield.h"
+#include "widgets/tabwidget.h"
 #include "widgets/timezoneedit.h"
 
+#include "catdlg.h"
 #include "editfile.h"
 #include "ewidgets.h"
 #include "eventdesc.h"
 #include "gui-defines.h"
-#include "userinfodlg.h"
-#include "sigman.h"
+#include "mainwin.h"
 #include "mledit.h"
 #include "mlview.h"
+#include "phonedlg.h"
+#include "sigman.h"
+#include "usercodec.h"
 
 #include "xpm/phonebookPhone.xpm"
@@ -98 +94 @@
 #include "xpm/phonebookPager.xpm"
 
+#include "userinfodlg.h"
+
+
 // -----------------------------------------------------------------------------
 UserInfoDlg::UserInfoDlg(CICQDaemon *s, CSignalManager *theSigMan, CMainWindow *m,
                          const char *szId, unsigned long nPPID, QWidget *parent)
-  : QWidget(parent, "UserInfoDialog", Qt::WDestructiveClose)
-{
+  : QWidget(parent)
+{
+  setObjectName("UserInfoDialog");
+  setAttribute(Qt::WA_DeleteOnClose, true);
+
   server = s;
   mainwin = m;
   sigman = theSigMan;
   icqEventTag = 0;
-  m_szId = szId ? strdup(szId) : 0;
+  myId = szId;
   m_nPPID = nPPID;
   m_bOwner = (gUserManager.FindOwner(szId, nPPID) != NULL);
@@ -126 +128 @@
 #endif
 
-  Q3BoxLayout *lay = new Q3VBoxLayout(this, 8);
-
-  tabs = new CTabWidget(this);
+  QVBoxLayout* lay = new QVBoxLayout(this);
+
+  tabs = new CTabWidget();
   lay->addWidget(tabs, 2);
 
@@ -148 +150 @@
            this, SLOT(updatedUser(CICQSignal *)));
 
-  btnMain3 = new QPushButton(tr("&Update"), this);
-  btnMain4 = new QPushButton(tr("&Close"), this);
+  btnMain3 = new QPushButton(tr("&Update"));
+  btnMain4 = new QPushButton(tr("&Close"));
   connect(btnMain4, SIGNAL(clicked()), this, SLOT(close()));
 
   if (m_bOwner)
   {
-    btnMain1 = new QPushButton(tr("&Save"), this);
-    btnMain2 = new QPushButton(tr("Retrieve"), this);
+    btnMain1 = new QPushButton(tr("&Save"));
+    btnMain2 = new QPushButton(tr("Retrieve"));
     connect(btnMain1, SIGNAL(clicked()), this, SLOT(SaveSettings()));
     connect(btnMain2, SIGNAL(clicked()), this, SLOT(slotRetrieve()));
@@ -162 +164 @@
   else
   {
-    btnMain1 = new QPushButton(tr("&Menu"), this);
-    btnMain2 = new QPushButton(tr("&Save"), this);
+    btnMain1 = new QPushButton(tr("&Menu"));
+    btnMain2 = new QPushButton(tr("&Save"));
     connect(btnMain1, SIGNAL(pressed()), this, SLOT(ShowUsermenu()));
-    btnMain1->setPopup(gMainWindow->UserMenu());
+    btnMain1->setMenu(gMainWindow->UserMenu());
     connect(btnMain2, SIGNAL(clicked()), this, SLOT(SaveSettings()));
     connect(btnMain3, SIGNAL(clicked()), this, SLOT(slotRetrieve()));
@@ -171 +173 @@
 
   int bw = 80;
-  bw = QMAX(bw, btnMain1->sizeHint().width());
-  bw = QMAX(bw, btnMain2->sizeHint().width());
-  bw = QMAX(bw, btnMain3->sizeHint().width());
-  bw = QMAX(bw, btnMain4->sizeHint().width());
+  bw = qMax(bw, btnMain1->sizeHint().width());
+  bw = qMax(bw, btnMain2->sizeHint().width());
+  bw = qMax(bw, btnMain3->sizeHint().width());
+  bw = qMax(bw, btnMain4->sizeHint().width());
   btnMain1->setFixedWidth(bw);
   btnMain2->setFixedWidth(bw);
@@ -180 +182 @@
   btnMain4->setFixedWidth(bw);
 
-  Q3BoxLayout* l = new Q3HBoxLayout(lay);
+  QHBoxLayout* l = new QHBoxLayout();
 
   l->addWidget(btnMain1);
@@ -190 +192 @@
   btnMain4->setDefault(true);
 
+  lay->addLayout(l);
+
   // prepare the timer for the history filter
-  timer = new QTimer(this, "history_filterTimer");
+  timer = new QTimer(this);
+  timer->setObjectName("history_filterTimer");
   connect(timer, SIGNAL(timeout()), this, SLOT(ShowHistory()));
 
-  ICQUser *u = gUserManager.FetchUser(m_szId, m_nPPID, LOCK_R);
+  ICQUser* u = gUserManager.FetchUser(myId.toLatin1(), m_nPPID, LOCK_R);
   if (u == NULL)
   {
     m_sBasic = tr("Licq - Info ") + tr("INVALID USER");
     resetCaption();
-    setIconText(tr("INVALID USER"));
+    setWindowIconText(tr("INVALID USER"));
   }
   else
@@ -213 +218 @@
     m_sBasic = tr("Licq - Info ") + QString::fromUtf8(u->GetAlias()) + tmp;
     resetCaption();
-    setIconText(u->GetAlias());
+    setWindowIconText(u->GetAlias());
     SetGeneralInfo(u);
     gUserManager.DropUser(u);
@@ -243 +248 @@
     delete m_PhoneBook;
 
-  emit finished(m_szId, m_nPPID);
+  emit finished(myId.toLatin1(), m_nPPID);
 
   ICQUser::ClearHistory(m_lHistoryList);
@@ -253 +258 @@
 void UserInfoDlg::keyPressEvent(QKeyEvent* e)
 {
-  if ( e->state() == 0 )
+  if (e->modifiers() == Qt::NoModifier)
   {
     switch ( e->key() ) {
@@ -275 +280 @@
 void UserInfoDlg::showTab(int tab)
 {
-  tabs->showPage(tabList[tab].tab);
+  tabs->setCurrentWidget(tabList[tab].tab);
 }
 
 bool UserInfoDlg::isTabShown(int tab)
 {
-  return (tabs->currentPage() == tabList[tab].tab);
+  return (tabs->currentWidget() == tabList[tab].tab);
 }
 
@@ -289 +294 @@
 {
   tabList[GeneralInfo].label = tr("&General");
-  tabList[GeneralInfo].tab = new QWidget(this, tabList[GeneralInfo].label.latin1());
+  QWidget* p = new QWidget(this);
+  tabList[GeneralInfo].tab = p;
+  p->setObjectName(tabList[GeneralInfo].label);
   tabList[GeneralInfo].loaded = false;
 
   unsigned short CR = 0;
-  QWidget *p = tabList[GeneralInfo].tab;
-
-  Q3GridLayout *lay = new Q3GridLayout(p, 11, 5, 10, 5);
-  lay->addColSpacing(2, 10);
+
+  QGridLayout* lay = new QGridLayout(p);
+  lay->setColumnMinimumWidth(2, 10);
   lay->setRowStretch(9, 1);
 
-  lay->addWidget(new QLabel(tr("Alias:"), p), CR, 0);
-  nfoAlias = new CInfoField(p, false);
+  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"), p);
-  Q3WhatsThis::add(chkKeepAliasOnUpdate, tr("Normally Licq overwrites the Alias when updating user details.\n"
+  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->addMultiCellWidget(chkKeepAliasOnUpdate, CR, CR, 3,4);
-
-  lay->addWidget(new QLabel(tr("ID:"), p), ++CR, 0);
-  nfoUin = new CInfoField(p, true);
+  lay->addWidget(chkKeepAliasOnUpdate, CR, 3, 1, 2);
+
+  lay->addWidget(new QLabel(tr("ID:")), ++CR, 0);
+  nfoUin = new InfoField(true);
   lay->addWidget(nfoUin, CR, 1);
-  lay->addWidget(new QLabel(tr("IP:"), p), CR, 3);
-  nfoIp = new CInfoField(p, true);
+  lay->addWidget(new QLabel(tr("IP:")), CR, 3);
+  nfoIp = new InfoField(true);
   lay->addWidget(nfoIp, CR, 4);
 
-  lay->addWidget(new QLabel(tr("Status:"), p), ++CR, 0);
-  nfoStatus = new CInfoField(p, true);
+  lay->addWidget(new QLabel(tr("Status:")), ++CR, 0);
+  nfoStatus = new InfoField(true);
   lay->addWidget(nfoStatus, CR, 1);
-  lay->addWidget(new QLabel(tr("Timezone:"), p), CR, 3);
-  tznZone = new TimeZoneEdit(p);
+  lay->addWidget(new QLabel(tr("Timezone:")), CR, 3);
+  tznZone = new TimeZoneEdit();
   lay->addWidget(tznZone, CR, 4);
 
-  lay->addWidget(new QLabel(tr("Name:"), p), ++CR, 0);
-  nfoFirstName = new CInfoField(p, false);
+  lay->addWidget(new QLabel(tr("Name:")), ++CR, 0);
+  nfoFirstName = new InfoField(false);
   lay->addWidget(nfoFirstName, CR, 1);
-  nfoLastName = new CInfoField(p, false);
-  lay->addMultiCellWidget(nfoLastName, CR, CR, 2, 4);
-
-  lay->addWidget(new QLabel(tr("EMail 1:"), p), ++CR, 0);
-  nfoEmailPrimary = new CInfoField(p, false);
-  lay->addMultiCellWidget(nfoEmailPrimary, CR, CR, 1, 4);
-
-  lay->addWidget(new QLabel(tr("EMail 2:"), p), ++CR, 0);
-  nfoEmailSecondary = new CInfoField(p, false);
-  lay->addMultiCellWidget(nfoEmailSecondary, CR, CR, 1, 4);
-
-  lay->addWidget(new QLabel(tr("Old Email:"), p), ++CR, 0);
-  nfoEmailOld = new CInfoField(p, false);
-  lay->addMultiCellWidget(nfoEmailOld, CR, CR, 1, 4);
-
-  lay->addWidget(new QLabel(tr("Address:"), p), ++CR, 0);
-  nfoAddress = new CInfoField(p, !m_bOwner);
+  nfoLastName = new InfoField(false);
+  lay->addWidget(nfoLastName, CR, 2, 1, 3);
+
+  lay->addWidget(new QLabel(tr("EMail 1:")), ++CR, 0);
+  nfoEmailPrimary = new InfoField(false);
+  lay->addWidget(nfoEmailPrimary, CR, 1, 1, 4);
+
+  lay->addWidget(new QLabel(tr("EMail 2:")), ++CR, 0);
+  nfoEmailSecondary = new InfoField(false);
+  lay->addWidget(nfoEmailSecondary, CR, 1, 1, 4);
+
+  lay->addWidget(new QLabel(tr("Old Email:")), ++CR, 0);
+  nfoEmailOld = new InfoField(false);
+  lay->addWidget(nfoEmailOld, CR, 1, 1, 4);
+
+  lay->addWidget(new QLabel(tr("Address:")), ++CR, 0);
+  nfoAddress = new InfoField(!m_bOwner);
   lay->addWidget(nfoAddress, CR, 1);
-  lay->addWidget(new QLabel(tr("Phone:"), p), CR, 3);
-  nfoPhone = new CInfoField(p, false);//!m_bOwner);
+  lay->addWidget(new QLabel(tr("Phone:")), CR, 3);
+  nfoPhone = new InfoField(false);//!m_bOwner);
   lay->addWidget(nfoPhone, CR, 4);
 
-  lay->addWidget(new QLabel(tr("State:"), p), ++CR, 0);
-  nfoState = new CInfoField(p, !m_bOwner);
+  lay->addWidget(new QLabel(tr("State:")), ++CR, 0);
+  nfoState = new InfoField(!m_bOwner);
   nfoState->setMaxLength(3);
+  lay->addWidget(nfoState, CR, 1);
   setTabOrder(nfoAddress, nfoState);
-  lay->addWidget(nfoState, CR, 1);
-  lay->addWidget(new QLabel(tr("Fax:"), p), CR, 3);
-  nfoFax = new CInfoField(p, false);//!m_bOwner);
+  lay->addWidget(new QLabel(tr("Fax:")), CR, 3);
+  nfoFax = new InfoField(false);//!m_bOwner);
+  lay->addWidget(nfoFax, CR, 4);
   setTabOrder(nfoPhone, nfoFax);
-  lay->addWidget(nfoFax, CR, 4);
-
-  lay->addWidget(new QLabel(tr("City:"), p), ++CR, 0);
-  nfoCity = new CInfoField(p, !m_bOwner);
+
+  lay->addWidget(new QLabel(tr("City:")), ++CR, 0);
+  nfoCity = new InfoField(!m_bOwner);
+  lay->addWidget(nfoCity, CR, 1);
   setTabOrder(nfoState, nfoCity);
-  lay->addWidget(nfoCity, CR, 1);
-  lay->addWidget(new QLabel(tr("Cellular:"), p), CR, 3);
-  nfoCellular = new CInfoField(p, false);//!m_bOwner);
+  lay->addWidget(new QLabel(tr("Cellular:")), CR, 3);
+  nfoCellular = new InfoField(false);//!m_bOwner);
+  lay->addWidget(nfoCellular, CR, 4);
   setTabOrder(nfoFax, nfoCellular);
-  lay->addWidget(nfoCellular, CR, 4);
-
-  lay->addWidget(new QLabel(tr("Zip:"), p), ++CR, 0);
-  nfoZipCode = new CInfoField(p, !m_bOwner);
+
+  lay->addWidget(new QLabel(tr("Zip:")), ++CR, 0);
+  nfoZipCode = new InfoField(!m_bOwner);
+  lay->addWidget(nfoZipCode, CR, 1);
   setTabOrder(nfoCity, nfoZipCode);
-  lay->addWidget(nfoZipCode, CR, 1);
-  lay->addWidget(new QLabel(tr("Country:"), p), CR, 3);
+  lay->addWidget(new QLabel(tr("Country:")), CR, 3);
   if (m_bOwner)
   {
     cmbCountry = new QComboBox(tabList[GeneralInfo].tab);
-    //cmbCountry->insertItem(tr("Unspecified"));
+    //cmbCountry->addItem(tr("Unspecified"));
     cmbCountry->setMaximumWidth(cmbCountry->sizeHint().width()+20);
     for (unsigned short i = 0; i < NUM_COUNTRIES; i++)
-      cmbCountry->insertItem(GetCountryByIndex(i)->szName);
+      cmbCountry->addItem(GetCountryByIndex(i)->szName);
     lay->addWidget(cmbCountry, CR, 4);
   }
   else
   {
-    nfoCountry = new CInfoField(p, !m_bOwner);
+    nfoCountry = new InfoField(!m_bOwner);
     lay->addWidget(nfoCountry, CR, 4);
   }
@@ -396 +402 @@
   if (u == NULL)
   {
-    u = gUserManager.FetchUser(m_szId, m_nPPID, LOCK_R);
+    u = gUserManager.FetchUser(myId.toLatin1(), m_nPPID, LOCK_R);
     if (u == NULL) return;
     bDropUser = true;
@@ -406 +412 @@
     chkKeepAliasOnUpdate->hide();
   chkKeepAliasOnUpdate->setChecked(u->KeepAliasOnUpdate());
-  nfoAlias->setData(QString::fromUtf8(u->GetAlias()));
+  nfoAlias->setText(QString::fromUtf8(u->GetAlias()));
   connect(nfoAlias, SIGNAL(textChanged(const QString &)), this, SLOT(slot_aliasChanged(const QString &)));
-  nfoFirstName->setData(codec->toUnicode(u->GetFirstName()));
-  nfoLastName->setData(codec->toUnicode(u->GetLastName()));
-  nfoEmailPrimary->setData(codec->toUnicode(u->GetEmailPrimary()));
-  nfoEmailSecondary->setData(codec->toUnicode(u->GetEmailSecondary()));
-  nfoEmailOld->setData(codec->toUnicode(u->GetEmailOld()));
-  nfoUin->setData(u->IdString());
+  nfoFirstName->setText(codec->toUnicode(u->GetFirstName()));
+  nfoLastName->setText(codec->toUnicode(u->GetLastName()));
+  nfoEmailPrimary->setText(codec->toUnicode(u->GetEmailPrimary()));
+  nfoEmailSecondary->setText(codec->toUnicode(u->GetEmailSecondary()));
+  nfoEmailOld->setText(codec->toUnicode(u->GetEmailOld()));
+  nfoUin->setText(u->IdString());
   QString ip = QString(u->IpStr(buf));
   if (u->Ip() != u->IntIp() && u->IntIp() != 0)
@@ -423 +429 @@
     ip.append(QString(":%1").arg(u->PortStr(buf)));
   }
-  nfoIp->setData(ip);
+  nfoIp->setText(ip);
   tznZone->setData(u->GetTimezone());
-  nfoStatus->setData(u->StatusStr());
+  nfoStatus->setText(u->StatusStr());
   if (m_bOwner)
   {
@@ -433 +439 @@
     const SCountry *c = GetCountryByCode(u->GetCountryCode());
     if (c == NULL)
-      cmbCountry->setCurrentItem(0);
+      cmbCountry->setCurrentIndex(0);
     else
-      cmbCountry->setCurrentItem(c->nIndex);
+      cmbCountry->setCurrentIndex(c->nIndex);
   }
   else
@@ -441 +447 @@
     const SCountry *c = GetCountryByCode(u->GetCountryCode());
     if (c == NULL)
-      nfoCountry->setData(tr("Unknown (%1)").arg(u->GetCountryCode()));
+      nfoCountry->setText(tr("Unknown (%1)").arg(u->GetCountryCode()));
     else  // known
-      nfoCountry->setData(c->szName);
-  }
-  nfoAddress->setData(codec->toUnicode(u->GetAddress()));
-  nfoCity->setData(codec->toUnicode(u->GetCity()));
-  nfoState->setData(codec->toUnicode(u->GetState()));
-  nfoPhone->setData(codec->toUnicode(u->GetPhoneNumber()));
-  nfoFax->setData(codec->toUnicode(u->GetFaxNumber()));
-  nfoCellular->setData(codec->toUnicode(u->GetCellularNumber()));
-  nfoZipCode->setData(codec->toUnicode(u->GetZipCode()));
+      nfoCountry->setText(c->szName);
+  }
+  nfoAddress->setText(codec->toUnicode(u->GetAddress()));
+  nfoCity->setText(codec->toUnicode(u->GetCity()));
+  nfoState->setText(codec->toUnicode(u->GetState()));
+  nfoPhone->setText(codec->toUnicode(u->GetPhoneNumber()));
+  nfoFax->setText(codec->toUnicode(u->GetFaxNumber()));
+  nfoCellular->setText(codec->toUnicode(u->GetCellularNumber()));
+  nfoZipCode->setText(codec->toUnicode(u->GetZipCode()));
 
   if (!u->StatusOffline())
-    nfoLastOnline->setData(tr("Now"));
+    nfoLastOnline->setText(tr("Now"));
   else if (u->LastOnline() == 0)
-    nfoLastOnline->setData(tr("Unknown"));
+    nfoLastOnline->setText(tr("Unknown"));
   else
   {
@@ -463 +469 @@
     QString ds = t.toString();
     ds.truncate(ds.length() - 8);
-    nfoLastOnline->setData(ds);
+    nfoLastOnline->setText(ds);
   }
 
@@ -471 +477 @@
 void UserInfoDlg::SaveGeneralInfo()
 {
-  ICQUser *u = gUserManager.FetchUser(m_szId, m_nPPID, LOCK_W);
+  ICQUser* u = gUserManager.FetchUser(myId.toLatin1(), m_nPPID, LOCK_W);
   if (u == NULL) return;
 
@@ -478 +484 @@
   u->SetEnableSave(false);
 
-  u->SetAlias(nfoAlias->text().utf8());
+  u->SetAlias(nfoAlias->text().toUtf8());
   u->SetKeepAliasOnUpdate(chkKeepAliasOnUpdate->isChecked());
   u->SetFirstName(codec->fromUnicode(nfoFirstName->text()));
@@ -494 +500 @@
   if (m_bOwner)
   {
-    unsigned short i = cmbCountry->currentItem();
+    unsigned short i = cmbCountry->currentIndex();
     u->SetCountryCode(GetCountryByIndex(i)->nCode);
   }
@@ -505 +511 @@
 
   if (!m_bOwner)
-    server->ProtoRenameUser(m_szId, m_nPPID);
+    server->ProtoRenameUser(myId.toLatin1(), m_nPPID);
 }
 
@@ -513 +519 @@
 {
   tabList[MoreInfo].label = tr("&More");
-  tabList[MoreInfo].tab = new QWidget(this, tabList[MoreInfo].label.latin1());
+  QWidget* p = new QWidget(this);
+  tabList[MoreInfo].tab = p;
+  p->setObjectName(tabList[MoreInfo].label);
   tabList[MoreInfo].loaded = false;
 
   unsigned short CR = 0;
-  QWidget *p = tabList[MoreInfo].tab;
-  Q3GridLayout *lay = new Q3GridLayout(p, 9, 5, 10, 5);
-  lay->addColSpacing(2, 10);
-  lay->addRowSpacing(6, 5);
+  QGridLayout* lay = new QGridLayout(p);
+  lay->setColumnMinimumWidth(2, 10);
+  lay->setRowMinimumHeight(6, 5);
   lay->setRowStretch(3, 1);
 
-  lay->addWidget(new QLabel(tr("Age:"), p), CR, 0);
-  nfoAge = new CInfoField(p, !m_bOwner);
+  lay->addWidget(new QLabel(tr("Age:")), CR, 0);
+  nfoAge = new InfoField(!m_bOwner);
   lay->addWidget(nfoAge, CR, 1);
-  lay->addWidget(new QLabel(tr("Gender:"), p), CR, 3);
+  lay->addWidget(new QLabel(tr("Gender:")), CR, 3);
   if (m_bOwner)
   {
-    cmbGender = new QComboBox(p);
-    cmbGender->insertItem(tr("Unspecified"), GENDER_UNSPECIFIED);
-    cmbGender->insertItem(tr("Female"), GENDER_FEMALE);
-    cmbGender->insertItem(tr("Male"), GENDER_MALE);
+    cmbGender = new QComboBox();
+    cmbGender->insertItem(GENDER_UNSPECIFIED, tr("Unspecified"));
+    cmbGender->insertItem(GENDER_FEMALE, tr("Female"));
+    cmbGender->insertItem(GENDER_MALE, tr("Male"));
     lay->addWidget(cmbGender, CR, 4);
   }
   else
   {
-    nfoGender = new CInfoField(p, true);
+    nfoGender = new InfoField(true);
     lay->addWidget(nfoGender, CR, 4);
   }
 
-  lay->addWidget(new QLabel(tr("Homepage:"), p), ++CR, 0);
-  nfoHomepage = new CInfoField(p, !m_bOwner);
-  lay->addMultiCellWidget(nfoHomepage, CR, CR, 1, 4);
-
-  lay->addWidget(new QLabel(tr("Category:"), p), ++CR, 0);
-  lvHomepageCategory = new Q3ListView(p);
-  lvHomepageCategory->addColumn("");
+  lay->addWidget(new QLabel(tr("Homepage:")), ++CR, 0);
+  nfoHomepage = new InfoField(!m_bOwner);
+  lay->addWidget(nfoHomepage, CR, 1, 1, 4);
+
+  lay->addWidget(new QLabel(tr("Category:")), ++CR, 0);
+  lvHomepageCategory = new QTreeWidget();
+  lvHomepageCategory->setColumnCount(1);
   lvHomepageCategory->header()->hide();
   lvHomepageCategory->setRootIsDecorated(true);
   lvHomepageCategory->setMaximumHeight(50);
-  lay->addMultiCellWidget(lvHomepageCategory, CR, CR, 1, 4);
-
-  lay->addWidget(new QLabel(tr("Description:"), p), ++CR, 0);
-  mleHomepageDesc = new MLEditWrap(true, p);
+  lay->addWidget(lvHomepageCategory, CR, 1, 1, 4);
+
+  lay->addWidget(new QLabel(tr("Description:")), ++CR, 0);
+  mleHomepageDesc = new MLEditWrap(true);
   mleHomepageDesc->setReadOnly(true);
-  lay->addMultiCellWidget(mleHomepageDesc, CR, CR, 1, 4);
+  lay->addWidget(mleHomepageDesc, CR, 1, 1, 4);
   
-  lay->addWidget(new QLabel(tr("Birthday:"), p), ++CR, 0);
+  lay->addWidget(new QLabel(tr("Birthday:")), ++CR, 0);
   if (m_bOwner)
   {
-    Q3HBox* w = new Q3HBox(p);
+    QHBoxLayout* w = new QHBoxLayout();
     w->setSpacing(8);
-    QLabel* lblDay = new QLabel(tr(" Day:"), w);
-    lblDay->setAlignment(Qt::AlignRight | Qt::AlignVCenter | Qt::SingleLine);
-    spnBirthDay = new QSpinBox(1, 31, 1, w);
-    QLabel* lblMonth = new QLabel(tr(" Month:"), w);
-    lblMonth->setAlignment(Qt::AlignRight | Qt::AlignVCenter | Qt::SingleLine);
-    spnBirthMonth = new QSpinBox(1, 12, 1, w);
-    QLabel* lblYear = new QLabel(tr(" Year:"), w);
-    lblYear->setAlignment(Qt::AlignRight | Qt::AlignVCenter | Qt::SingleLine);
-    spnBirthYear = new QSpinBox(1900, 2020, 1, w);
-    lay->addMultiCellWidget(w, CR, CR, 1, 4);
-  }
-  else
-  {
-    nfoBirthday = new CInfoField(p, !m_bOwner);
-    lay->addMultiCellWidget(nfoBirthday, CR, CR, 1, 4);
+    QLabel* lblDay = new QLabel(tr(" Day:"));
+    lblDay->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
+    spnBirthDay = new QSpinBox();
+    spnBirthDay->setRange(1, 31);
+    QLabel* lblMonth = new QLabel(tr(" Month:"));
+    lblMonth->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
+    spnBirthMonth = new QSpinBox();
+    spnBirthMonth->setRange(1, 12);
+    QLabel* lblYear = new QLabel(tr(" Year:"));
+    lblYear->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
+    spnBirthYear = new QSpinBox();
+    spnBirthYear->setRange(1900, 2020);
+    lay->addLayout(w, CR, 1, 1, 4);
+  }
+  else
+  {
+    nfoBirthday = new InfoField(!m_bOwner);
+    lay->addWidget(nfoBirthday, CR, 1, 1, 4);
   }
 
   if (m_bOwner)
   {
-    lay->addWidget(new QLabel(tr("Language 1:"), p), ++CR, 0);
-    cmbLanguage[0] = new QComboBox(p);
+    lay->addWidget(new QLabel(tr("Language 1:")), ++CR, 0);
+    cmbLanguage[0] = new QComboBox();
     lay->addWidget(cmbLanguage[0], CR, 1);
-    lay->addWidget(new QLabel(tr("Language 2:"), p), CR, 3);
-    cmbLanguage[1] = new QComboBox(p);
+    lay->addWidget(new QLabel(tr("Language 2:")), CR, 3);
+    cmbLanguage[1] = new QComboBox();
     lay->addWidget(cmbLanguage[1], CR, 4);
 
-    lay->addWidget(new QLabel(tr("Language 3:"), p), ++CR, 0);
-    cmbLanguage[2] = new QComboBox(p);
+    lay->addWidget(new QLabel(tr("Language 3:")), ++CR, 0);
+    cmbLanguage[2] = new QComboBox();
     lay->addWidget(cmbLanguage[2], CR, 1);
 
@@ -597 +607 @@
       for (unsigned short j = 0; j < NUM_LANGUAGES; j++)
         if (GetLanguageByIndex(j))
-          cmbLanguage[i]->insertItem(GetLanguageByIndex(j)->szName);
-    }
-  }
-  else
-  {
-    lay->addWidget(new QLabel(tr("Language 1:"), p), ++CR, 0);
-    nfoLanguage[0] = new CInfoField(p, !m_bOwner);
+          cmbLanguage[i]->addItem(GetLanguageByIndex(j)->szName);
+    }