File licq-1.3.5.3-userinfodlg.patch of Package licq
--- plugins/qt-gui/src/userinfodlg.cpp
+++ plugins/qt-gui/src/userinfodlg.cpp
@@ -135,7 +135,7 @@
tabs->addTab(tabList[KABCInfo].tab, tabList[KABCInfo].label);
#endif
- connect (tabs, SIGNAL(selected(const QString &)), this, SLOT(updateTab(const QString &)));
+ connect (tabs, SIGNAL(currentChanged(QWidget*)), this, SLOT(updateTab(QWidget*)));
connect (sigman, SIGNAL(signal_updatedUser(CICQSignal *)),
this, SLOT(updatedUser(CICQSignal *)));
@@ -2086,9 +2086,9 @@
// -----------------------------------------------------------------------------
-void UserInfoDlg::updateTab(const QString& txt)
+void UserInfoDlg::updateTab(QWidget* tab)
{
- if (txt == tabList[GeneralInfo].label)
+ if (tab == tabList[GeneralInfo].tab)
{
currentTab = GeneralInfo;
btnMain1->setText(m_bOwner ? tr("&Save") : tr("&Menu"));
@@ -2100,7 +2100,7 @@
if (!tabList[GeneralInfo].loaded)
SetGeneralInfo(NULL);
}
- else if (txt == tabList[MoreInfo].label)
+ else if (tab == tabList[MoreInfo].tab)
{
btnMain1->setText(m_bOwner ? tr("&Save") : tr("&Menu"));
btnMain2->setText(m_bOwner ? tr("&Retrieve") : tr("&Save"));
@@ -2112,7 +2112,7 @@
if (!tabList[MoreInfo].loaded)
SetMoreInfo(NULL);
}
- else if (txt == tabList[More2Info].label)
+ else if (tab == tabList[More2Info].tab)
{
btnMain1->setText(m_bOwner ? tr("&Save") : tr("&Menu"));
btnMain2->setText(m_bOwner ? tr("&Retrieve") : tr("&Save"));
@@ -2124,7 +2124,7 @@
if (!tabList[More2Info].loaded)
SetMore2Info(NULL);
}
- else if (txt == tabList[WorkInfo].label)
+ else if (tab == tabList[WorkInfo].tab)
{
btnMain1->setText(m_bOwner ? tr("&Save") : tr("&Menu"));
btnMain2->setText(m_bOwner ? tr("&Retrieve") : tr("&Save"));
@@ -2136,7 +2136,7 @@
if (!tabList[WorkInfo].loaded)
SetWorkInfo(NULL);
}
- else if (txt == tabList[AboutInfo].label)
+ else if (tab == tabList[AboutInfo].tab)
{
btnMain1->setText(m_bOwner ? tr("&Save") : tr("&Menu"));
btnMain2->setText(m_bOwner ? tr("&Retrieve") : tr("&Save"));
@@ -2148,7 +2148,7 @@
if (!tabList[AboutInfo].loaded)
SetAbout(NULL);
}
- else if (txt == tabList[PhoneInfo].label)
+ else if (tab == tabList[PhoneInfo].tab)
{
btnMain3->setText(m_bOwner ? tr("&Add") : tr("&Update"));
btnMain2->setText(m_bOwner ? tr("&Clear") : tr("&Save"));
@@ -2160,7 +2160,7 @@
if (!tabList[PhoneInfo].loaded)
SetPhoneBook(NULL);
}
- else if (txt == tabList[PictureInfo].label)
+ else if (tab == tabList[PictureInfo].tab)
{
btnMain3->setText(m_bOwner ? tr("&Browse") : tr("&Update"));
btnMain2->setText(m_bOwner ? tr("&Clear") : tr("&Save"));
@@ -2172,7 +2172,7 @@
if (!tabList[PictureInfo].loaded)
SetPicture(NULL);
}
- else if (txt == tabList[HistoryInfo].label)
+ else if (tab == tabList[HistoryInfo].tab)
{
btnMain3->setText(tr("Nex&t"));
btnMain2->setText(tr("P&rev"));
@@ -2188,7 +2188,7 @@
SetupHistory();
mlvHistory->setFocus();
}
- else if (txt == tabList[LastCountersInfo].label)
+ else if (tab == tabList[LastCountersInfo].tab)
{
currentTab = LastCountersInfo;
btnMain3->setText("");
@@ -2201,7 +2201,7 @@
SetLastCountersInfo(NULL);
}
#ifdef USE_KABC
- else if (txt == tabList[KABCInfo].label)
+ else if (tab == tabList[KABCInfo].tab)
{
currentTab = KABCInfo;
btnMain3->setText(tr("&Browse"));
--- plugins/qt-gui/src/userinfodlg.h
+++ plugins/qt-gui/src/userinfodlg.h
@@ -202,7 +202,7 @@
void ShowHistoryNext();
void HistoryReverse(bool);
void HistoryReload();
- void updateTab(const QString&);
+ void updateTab(QWidget*);
void updatedUser(CICQSignal*);
void SaveSettings();
void slotUpdate();