Hi Following the work, the contact list settings dialog (the first tab) was too big, so I splitted it into two (created a new one called Advanced).
Screenshot at: http://people.mandriva.com/~boiko/kopete/contactlist/contactlist_config.png The patch also gets rid of dummy classes for config widgets (those are not necessary anymore) and use normal QWidgets. Please review the code Cheers -- Gustavo Pichorim Boiko
Index: kopete/config/appearance/appearanceconfig_contactlist.h =================================================================== --- kopete/config/appearance/appearanceconfig_contactlist.h (revisão 733884) +++ kopete/config/appearance/appearanceconfig_contactlist.h (cópia de trabalho) @@ -1,30 +0,0 @@ -/* - appearanceconfig_contactlist.h - - Copyright (c) 2006 by Thorben Kröger <[EMAIL PROTECTED]> - - Kopete (c) 2002-2007 by the Kopete developers <[email protected]> - - ************************************************************************* - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ************************************************************************* -*/ - -#ifndef __APPEARANCECONFIG_CONTACTLIST_H -#define __APPEARANCECONFIG_CONTACTLIST_H - -#include "ui_appearanceconfig_contactlist.h" - -class AppearanceConfig_ContactList : public QWidget, public Ui::AppearanceConfig_ContactList -{ - Q_OBJECT - -public: - AppearanceConfig_ContactList(QWidget *parent = 0); -}; -#endif Index: kopete/config/appearance/appearanceconfig.cpp =================================================================== --- kopete/config/appearance/appearanceconfig.cpp (revisão 733884) +++ kopete/config/appearance/appearanceconfig.cpp (cópia de trabalho) @@ -17,8 +17,9 @@ */ #include "appearanceconfig.h" -#include "appearanceconfig_colors.h" -#include "appearanceconfig_contactlist.h" +#include "ui_appearanceconfig_colors.h" +#include "ui_appearanceconfig_contactlist.h" +#include "ui_appearanceconfig_advanced.h" #include "tooltipeditdialog.h" @@ -72,13 +73,14 @@ { public: Private() - : mAppearanceTabCtl(0L), mPrfsColors(0L), mPrfsContactList(0L) + : mAppearanceTabCtl(0L) {} QTabWidget *mAppearanceTabCtl; - AppearanceConfig_Colors *mPrfsColors; - AppearanceConfig_ContactList *mPrfsContactList; + Ui::AppearanceConfig_Colors mPrfsColors; + Ui::AppearanceConfig_ContactList mPrfsContactList; + Ui::AppearanceConfig_Advanced mPrfsAdvanced; }; @@ -96,20 +98,29 @@ KConfigGroup config(KGlobal::config(), "ChatWindowSettings"); // "Contact List" TAB ======================================================= - d->mPrfsContactList = new AppearanceConfig_ContactList(d->mAppearanceTabCtl); - addConfig( Kopete::AppearanceSettings::self(), d->mPrfsContactList ); + QWidget *contactListWidget = new QWidget(d->mAppearanceTabCtl); + d->mPrfsContactList.setupUi(contactListWidget); + addConfig( Kopete::AppearanceSettings::self(), contactListWidget ); - connect(d->mPrfsContactList->mEditTooltips, SIGNAL(clicked()), + connect(d->mPrfsContactList.mEditTooltips, SIGNAL(clicked()), this, SLOT(slotEditTooltips())); - d->mAppearanceTabCtl->addTab(d->mPrfsContactList, i18n("Contact List")); + d->mAppearanceTabCtl->addTab(contactListWidget, i18n("Contact List")); // "Colors and Fonts" TAB =================================================== - d->mPrfsColors = new AppearanceConfig_Colors(d->mAppearanceTabCtl); - addConfig( Kopete::AppearanceSettings::self(), d->mPrfsColors ); + QWidget *colorsWidget = new QWidget(d->mAppearanceTabCtl); + d->mPrfsColors.setupUi(colorsWidget); + addConfig( Kopete::AppearanceSettings::self(), colorsWidget ); - d->mAppearanceTabCtl->addTab(d->mPrfsColors, i18n("Colors && Fonts")); + d->mAppearanceTabCtl->addTab(colorsWidget, i18n("Colors && Fonts")); + // "Advanced" TAB =========================================================== + QWidget *advancedWidget = new QWidget(d->mAppearanceTabCtl); + d->mPrfsAdvanced.setupUi(advancedWidget); + addConfig( Kopete::AppearanceSettings::self(), advancedWidget ); + + d->mAppearanceTabCtl->addTab(advancedWidget, i18n("Advanced")); + // ========================================================================== load(); Index: kopete/config/appearance/appearanceconfig_advanced.ui =================================================================== --- kopete/config/appearance/appearanceconfig_advanced.ui (revisão 0) +++ kopete/config/appearance/appearanceconfig_advanced.ui (revisão 0) @@ -0,0 +1,226 @@ +<ui version="4.0" > + <class>AppearanceConfig_Advanced</class> + <widget class="QWidget" name="AppearanceConfig_Advanced" > + <property name="geometry" > + <rect> + <x>0</x> + <y>0</y> + <width>400</width> + <height>300</height> + </rect> + </property> + <property name="windowTitle" > + <string>Contact List Advanced</string> + </property> + <layout class="QVBoxLayout" > + <item> + <widget class="QGroupBox" name="groupBox_3" > + <property name="title" > + <string>Contact List Animations</string> + </property> + <layout class="QGridLayout" > + <property name="leftMargin" > + <number>9</number> + </property> + <property name="topMargin" > + <number>9</number> + </property> + <property name="rightMargin" > + <number>9</number> + </property> + <property name="bottomMargin" > + <number>9</number> + </property> + <property name="horizontalSpacing" > + <number>6</number> + </property> + <property name="verticalSpacing" > + <number>6</number> + </property> + <item row="2" column="0" > + <widget class="QCheckBox" name="kcfg_contactListFolding" > + <property name="sizePolicy" > + <sizepolicy vsizetype="Fixed" hsizetype="Preferred" > + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text" > + <string>Fo&ld in / out contacts as they appear / disappear</string> + </property> + </widget> + </item> + <item row="1" column="0" > + <widget class="QCheckBox" name="kcfg_contactListFading" > + <property name="sizePolicy" > + <sizepolicy vsizetype="Fixed" hsizetype="Preferred" > + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text" > + <string>Fade in / out contacts as the&y appear / disappear</string> + </property> + </widget> + </item> + <item row="0" column="0" > + <widget class="QCheckBox" name="kcfg_contactListAnimateChange" > + <property name="sizePolicy" > + <sizepolicy vsizetype="Fixed" hsizetype="Preferred" > + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text" > + <string>A&nimate changes to contact list items</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="QGroupBox" name="groupBox_4" > + <property name="title" > + <string>Contact List Auto-Hide</string> + </property> + <layout class="QVBoxLayout" > + <property name="spacing" > + <number>6</number> + </property> + <property name="leftMargin" > + <number>9</number> + </property> + <property name="topMargin" > + <number>9</number> + </property> + <property name="rightMargin" > + <number>9</number> + </property> + <property name="bottomMargin" > + <number>9</number> + </property> + <item> + <widget class="QCheckBox" name="kcfg_contactListAutoHide" > + <property name="sizePolicy" > + <sizepolicy vsizetype="Fixed" hsizetype="Preferred" > + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text" > + <string>A&uto-hide contact list</string> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="kcfg_contactListAutoHideVScroll" > + <property name="sizePolicy" > + <sizepolicy vsizetype="Fixed" hsizetype="Preferred" > + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="whatsThis" > + <string>Since vertical scrollbars occupy space, we introduced this auto-hide feature. The vertical scrollbar will not be available until you move your mouse over the contact list.<br> +(<b>Disabled</b> if "<b>Hide vertical scrollbar</b>" option is selected above.)</string> + </property> + <property name="text" > + <string>Auto-hide vertical &scrollbar</string> + </property> + </widget> + </item> + <item> + <layout class="QHBoxLayout" > + <property name="spacing" > + <number>6</number> + </property> + <property name="leftMargin" > + <number>0</number> + </property> + <property name="topMargin" > + <number>0</number> + </property> + <property name="rightMargin" > + <number>0</number> + </property> + <property name="bottomMargin" > + <number>0</number> + </property> + <item> + <spacer> + <property name="orientation" > + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeType" > + <enum>QSizePolicy::Fixed</enum> + </property> + <property name="sizeHint" > + <size> + <width>16</width> + <height>16</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QSpinBox" name="kcfg_contactListAutoHideTimeout" > + <property name="enabled" > + <bool>false</bool> + </property> + <property name="sizePolicy" > + <sizepolicy vsizetype="Fixed" hsizetype="Maximum" > + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="whatsThis" > + <string>The timeout value for both contact list and scrollbar auto-hiding.</string> + </property> + <property name="suffix" > + <string> Sec</string> + </property> + <property name="minimum" > + <number>3</number> + </property> + <property name="maximum" > + <number>300</number> + </property> + <property name="value" > + <number>30</number> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="textLabel1" > + <property name="enabled" > + <bool>false</bool> + </property> + <property name="text" > + <string>after the cursor left the window</string> + </property> + </widget> + </item> + </layout> + </item> + </layout> + </widget> + </item> + <item> + <spacer> + <property name="orientation" > + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" > + <size> + <width>20</width> + <height>40</height> + </size> + </property> + </spacer> + </item> + </layout> + </widget> + <resources/> + <connections/> +</ui> Index: kopete/config/appearance/appearanceconfig_colors.cpp =================================================================== --- kopete/config/appearance/appearanceconfig_colors.cpp (revisão 733884) +++ kopete/config/appearance/appearanceconfig_colors.cpp (cópia de trabalho) @@ -1,26 +0,0 @@ -/* - appearanceconfig_colors.cpp - - Copyright (c) 2006 by Thorben Kröger <[EMAIL PROTECTED]> - - Kopete (c) 2002-2007 by the Kopete developers <[email protected]> - - ************************************************************************* - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ************************************************************************* -*/ - -#include "appearanceconfig_colors.h" - -AppearanceConfig_Colors::AppearanceConfig_Colors(QWidget *parent) - : QWidget(parent) -{ - setupUi(this); -} - -#include "appearanceconfig_colors.moc" Index: kopete/config/appearance/appearanceconfig_contactlist.ui =================================================================== --- kopete/config/appearance/appearanceconfig_contactlist.ui (revisão 733884) +++ kopete/config/appearance/appearanceconfig_contactlist.ui (cópia de trabalho) @@ -5,394 +5,201 @@ <rect> <x>0</x> <y>0</y> - <width>395</width> - <height>531</height> + <width>399</width> + <height>268</height> </rect> </property> <property name="windowTitle" > <string>Contact List Appearance</string> </property> - <layout class="QGridLayout" > - <property name="margin" > - <number>9</number> - </property> - <property name="spacing" > - <number>6</number> - </property> - <item row="0" column="0" colspan="2" > - <widget class="QGroupBox" name="groupBox_2" > - <property name="title" > - <string>Contact Layout and Display</string> - </property> - <layout class="QGridLayout" > - <property name="margin" > - <number>9</number> - </property> - <property name="spacing" > - <number>6</number> - </property> - <item row="4" column="0" colspan="2" > - <layout class="QHBoxLayout" > - <property name="margin" > - <number>0</number> - </property> - <property name="spacing" > - <number>6</number> - </property> - <item> - <spacer> - <property name="orientation" > - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeType" > - <enum>QSizePolicy::Fixed</enum> - </property> - <property name="sizeHint" > - <size> - <width>16</width> - <height>16</height> - </size> - </property> - </spacer> - </item> - <item> - <widget class="QCheckBox" name="kcfg_contactListIndentContact" > - <property name="enabled" > - <bool>false</bool> - </property> - <property name="sizePolicy" > - <sizepolicy> - <hsizetype>1</hsizetype> - <vsizetype>0</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text" > - <string>In&dent contacts</string> - </property> - </widget> - </item> - </layout> - </item> - <item row="3" column="0" colspan="2" > - <widget class="QCheckBox" name="kcfg_contactListTreeView" > - <property name="sizePolicy" > - <sizepolicy> - <hsizetype>5</hsizetype> - <vsizetype>0</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> + <layout class="QVBoxLayout" > + <item> + <layout class="QHBoxLayout" > + <item> + <widget class="QLabel" name="label" > + <property name="text" > + <string>Contact list style:</string> + </property> + </widget> + </item> + <item> + <widget class="QComboBox" name="kcfg_contactListDisplayMode" > + <property name="sizePolicy" > + <sizepolicy vsizetype="Fixed" hsizetype="Expanding" > + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <item> <property name="text" > - <string>Show tree &branch lines</string> + <string>Classic, left-aligned status icon</string> </property> - </widget> - </item> - <item row="1" column="0" colspan="2" > - <widget class="QCheckBox" name="kcfg_contactListIconMode" > - <property name="sizePolicy" > - <sizepolicy> - <hsizetype>5</hsizetype> - <vsizetype>0</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> + </item> + <item> <property name="text" > - <string>Use contact photos &when available</string> + <string>Right-aligned status icons</string> </property> - </widget> - </item> - <item row="2" column="0" colspan="2" > - <widget class="QCheckBox" name="kcfg_groupContactByGroup" > - <property name="sizePolicy" > - <sizepolicy> - <hsizetype>5</hsizetype> - <vsizetype>0</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> + </item> + <item> <property name="text" > - <string>Arrange metacontacts by &group</string> + <string>Detailed view</string> </property> - </widget> - </item> - <item row="5" column="0" colspan="2" > - <widget class="QCheckBox" name="kcfg_contactListHideVerticalScrollBar" > - <property name="sizePolicy" > - <sizepolicy> - <hsizetype>5</hsizetype> - <vsizetype>0</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="whatsThis" > - <string><b>Always</b> disables the vertical scrollbar</string> - </property> - <property name="text" > - <string>&Hide vertical scrollbar</string> - </property> - </widget> - </item> - <item row="0" column="1" > - <widget class="QComboBox" name="kcfg_contactListDisplayMode" > - <property name="sizePolicy" > - <sizepolicy> - <hsizetype>7</hsizetype> - <vsizetype>0</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <item> - <property name="text" > - <string>Classic, left-aligned status icon</string> - </property> - </item> - <item> - <property name="text" > - <string>Right-aligned status icons</string> - </property> - </item> - <item> - <property name="text" > - <string>Detailed view</string> - </property> - </item> - </widget> - </item> - <item row="0" column="0" > - <widget class="QLabel" name="label" > - <property name="text" > - <string>Contact list style:</string> - </property> - </widget> - </item> - </layout> - </widget> + </item> + </widget> + </item> + </layout> </item> - <item row="3" column="0" > - <widget class="QPushButton" name="mEditTooltips" > + <item> + <widget class="QCheckBox" name="kcfg_contactListIconMode" > <property name="sizePolicy" > - <sizepolicy> - <hsizetype>4</hsizetype> - <vsizetype>0</vsizetype> + <sizepolicy vsizetype="Fixed" hsizetype="Preferred" > <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> <property name="text" > - <string>Change &Tooltip Contents...</string> + <string>Use contact photos &when available</string> </property> </widget> </item> - <item row="3" column="1" > - <spacer> - <property name="orientation" > - <enum>Qt::Horizontal</enum> + <item> + <widget class="QCheckBox" name="kcfg_groupContactByGroup" > + <property name="sizePolicy" > + <sizepolicy vsizetype="Fixed" hsizetype="Preferred" > + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> </property> - <property name="sizeType" > - <enum>QSizePolicy::Preferred</enum> + <property name="text" > + <string>Arrange metacontacts by &group</string> </property> - <property name="sizeHint" > - <size> - <width>16</width> - <height>16</height> - </size> - </property> - </spacer> + </widget> </item> - <item row="1" column="0" colspan="2" > - <widget class="QGroupBox" name="groupBox_3" > - <property name="title" > - <string>Contact List Animations</string> + <item> + <widget class="QCheckBox" name="kcfg_contactListTreeView" > + <property name="sizePolicy" > + <sizepolicy vsizetype="Fixed" hsizetype="Preferred" > + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> </property> - <layout class="QGridLayout" > - <property name="margin" > - <number>9</number> - </property> - <property name="spacing" > - <number>6</number> - </property> - <item row="2" column="0" > - <widget class="QCheckBox" name="kcfg_contactListFolding" > - <property name="sizePolicy" > - <sizepolicy> - <hsizetype>5</hsizetype> - <vsizetype>0</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text" > - <string>Fo&ld in / out contacts as they appear / disappear</string> - </property> - </widget> - </item> - <item row="1" column="0" > - <widget class="QCheckBox" name="kcfg_contactListFading" > - <property name="sizePolicy" > - <sizepolicy> - <hsizetype>5</hsizetype> - <vsizetype>0</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text" > - <string>Fade in / out contacts as the&y appear / disappear</string> - </property> - </widget> - </item> - <item row="0" column="0" > - <widget class="QCheckBox" name="kcfg_contactListAnimateChange" > - <property name="sizePolicy" > - <sizepolicy> - <hsizetype>5</hsizetype> - <vsizetype>0</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text" > - <string>A&nimate changes to contact list items</string> - </property> - </widget> - </item> - </layout> + <property name="text" > + <string>Show tree &branch lines</string> + </property> </widget> </item> - <item row="2" column="0" colspan="2" > - <widget class="QGroupBox" name="groupBox_4" > - <property name="title" > - <string>Contact List Auto-Hide</string> + <item> + <layout class="QHBoxLayout" > + <property name="spacing" > + <number>6</number> </property> - <layout class="QVBoxLayout" > - <property name="margin" > - <number>9</number> - </property> - <property name="spacing" > - <number>6</number> - </property> - <item> - <widget class="QCheckBox" name="kcfg_contactListAutoHide" > - <property name="sizePolicy" > - <sizepolicy> - <hsizetype>5</hsizetype> - <vsizetype>0</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text" > - <string>A&uto-hide contact list</string> - </property> - </widget> - </item> - <item> - <widget class="QCheckBox" name="kcfg_contactListAutoHideVScroll" > - <property name="sizePolicy" > - <sizepolicy> - <hsizetype>5</hsizetype> - <vsizetype>0</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="whatsThis" > - <string>Since vertical scrollbars occupy space, we introduced this auto-hide feature. The vertical scrollbar will not be available until you move your mouse over the contact list.<br> -(<b>Disabled</b> if "<b>Hide vertical scrollbar</b>" option is selected above.)</string> - </property> - <property name="text" > - <string>Auto-hide vertical &scrollbar</string> - </property> - </widget> - </item> - <item> - <layout class="QHBoxLayout" > - <property name="margin" > - <number>0</number> - </property> - <property name="spacing" > - <number>6</number> - </property> - <item> - <spacer> - <property name="orientation" > - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeType" > - <enum>QSizePolicy::Fixed</enum> - </property> - <property name="sizeHint" > - <size> - <width>16</width> - <height>16</height> - </size> - </property> - </spacer> - </item> - <item> - <widget class="QSpinBox" name="kcfg_contactListAutoHideTimeout" > - <property name="enabled" > - <bool>false</bool> - </property> - <property name="sizePolicy" > - <sizepolicy> - <hsizetype>4</hsizetype> - <vsizetype>0</vsizetype> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="whatsThis" > - <string>The timeout value for both contact list and scrollbar auto-hiding.</string> - </property> - <property name="suffix" > - <string> Sec</string> - </property> - <property name="maximum" > - <number>300</number> - </property> - <property name="minimum" > - <number>3</number> - </property> - <property name="value" > - <number>30</number> - </property> - </widget> - </item> - <item> - <widget class="QLabel" name="textLabel1" > - <property name="enabled" > - <bool>false</bool> - </property> - <property name="text" > - <string>after the cursor left the window</string> - </property> - </widget> - </item> - </layout> - </item> - </layout> + <property name="leftMargin" > + <number>0</number> + </property> + <property name="topMargin" > + <number>0</number> + </property> + <property name="rightMargin" > + <number>0</number> + </property> + <property name="bottomMargin" > + <number>0</number> + </property> + <item> + <spacer> + <property name="orientation" > + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeType" > + <enum>QSizePolicy::Fixed</enum> + </property> + <property name="sizeHint" > + <size> + <width>16</width> + <height>16</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QCheckBox" name="kcfg_contactListIndentContact" > + <property name="enabled" > + <bool>false</bool> + </property> + <property name="sizePolicy" > + <sizepolicy vsizetype="Fixed" hsizetype="Minimum" > + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text" > + <string>In&dent contacts</string> + </property> + </widget> + </item> + </layout> + </item> + <item> + <widget class="QCheckBox" name="kcfg_contactListHideVerticalScrollBar" > + <property name="sizePolicy" > + <sizepolicy vsizetype="Fixed" hsizetype="Preferred" > + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="whatsThis" > + <string><b>Always</b> disables the vertical scrollbar</string> + </property> + <property name="text" > + <string>&Hide vertical scrollbar</string> + </property> </widget> </item> - <item row="4" column="1" > + <item> + <layout class="QHBoxLayout" > + <item> + <widget class="QPushButton" name="mEditTooltips" > + <property name="sizePolicy" > + <sizepolicy vsizetype="Fixed" hsizetype="Maximum" > + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text" > + <string>Change &Tooltip Contents...</string> + </property> + </widget> + </item> + <item> + <spacer> + <property name="orientation" > + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeType" > + <enum>QSizePolicy::Preferred</enum> + </property> + <property name="sizeHint" > + <size> + <width>16</width> + <height>16</height> + </size> + </property> + </spacer> + </item> + </layout> + </item> + <item> <spacer> <property name="orientation" > <enum>Qt::Vertical</enum> </property> <property name="sizeType" > - <enum>QSizePolicy::Preferred</enum> + <enum>QSizePolicy::Expanding</enum> </property> <property name="sizeHint" > <size> - <width>16</width> - <height>20</height> + <width>381</width> + <height>41</height> </size> </property> </spacer> @@ -402,22 +209,6 @@ <resources/> <connections> <connection> - <sender>kcfg_contactListHideVerticalScrollBar</sender> - <signal>toggled(bool)</signal> - <receiver>kcfg_contactListAutoHideVScroll</receiver> - <slot>setDisabled(bool)</slot> - <hints> - <hint type="sourcelabel" > - <x>40</x> - <y>116</y> - </hint> - <hint type="destinationlabel" > - <x>40</x> - <y>287</y> - </hint> - </hints> - </connection> - <connection> <sender>kcfg_contactListTreeView</sender> <signal>toggled(bool)</signal> <receiver>kcfg_contactListIndentContact</receiver> @@ -433,37 +224,5 @@ </hint> </hints> </connection> - <connection> - <sender>kcfg_contactListAutoHideVScroll</sender> - <signal>toggled(bool)</signal> - <receiver>kcfg_contactListAutoHideTimeout</receiver> - <slot>setEnabled(bool)</slot> - <hints> - <hint type="sourcelabel" > - <x>76</x> - <y>280</y> - </hint> - <hint type="destinationlabel" > - <x>73</x> - <y>297</y> - </hint> - </hints> - </connection> - <connection> - <sender>kcfg_contactListAutoHideVScroll</sender> - <signal>toggled(bool)</signal> - <receiver>textLabel1</receiver> - <slot>setEnabled(bool)</slot> - <hints> - <hint type="sourcelabel" > - <x>189</x> - <y>281</y> - </hint> - <hint type="destinationlabel" > - <x>187</x> - <y>297</y> - </hint> - </hints> - </connection> </connections> </ui> Index: kopete/config/appearance/appearanceconfig_colors.h =================================================================== --- kopete/config/appearance/appearanceconfig_colors.h (revisão 733884) +++ kopete/config/appearance/appearanceconfig_colors.h (cópia de trabalho) @@ -1,30 +0,0 @@ -/* - appearanceconfig_colors.h - - Copyright (c) 2006 by Thorben Kröger <[EMAIL PROTECTED]> - - Kopete (c) 2002-2007 by the Kopete developers <[email protected]> - - ************************************************************************* - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ************************************************************************* -*/ - -#ifndef __APPEARANCECONFIG_COLORS_H -#define __APPEARANCECONFIG_COLORS_H - -#include "ui_appearanceconfig_colors.h" - -class AppearanceConfig_Colors : public QWidget, public Ui::AppearanceConfig_Colors -{ - Q_OBJECT - -public: - AppearanceConfig_Colors(QWidget *parent = 0); -}; -#endif Index: kopete/config/appearance/appearanceconfig_contactlist.cpp =================================================================== --- kopete/config/appearance/appearanceconfig_contactlist.cpp (revisão 733884) +++ kopete/config/appearance/appearanceconfig_contactlist.cpp (cópia de trabalho) @@ -1,26 +0,0 @@ -/* - appearanceconfig_contactlist.cpp - - Copyright (c) 2006 by Thorben Kröger <[EMAIL PROTECTED]> - - Kopete (c) 2002-2007 by the Kopete developers <[email protected]> - - ************************************************************************* - * * - * This program is free software; you can redistribute it and/or modify * - * it under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - ************************************************************************* -*/ - -#include "appearanceconfig_contactlist.h" - -AppearanceConfig_ContactList::AppearanceConfig_ContactList(QWidget *parent) - : QWidget(parent) -{ - setupUi(this); -} - -#include "appearanceconfig_contactlist.moc" Index: kopete/config/appearance/CMakeLists.txt =================================================================== --- kopete/config/appearance/CMakeLists.txt (revisão 733884) +++ kopete/config/appearance/CMakeLists.txt (cópia de trabalho) @@ -9,13 +9,12 @@ set(kcm_kopete_appearanceconfig_PART_SRCS appearanceconfig.cpp - appearanceconfig_colors.cpp - appearanceconfig_contactlist.cpp tooltipeditdialog.cpp ) kde4_add_ui_files(kcm_kopete_appearanceconfig_PART_SRCS appearanceconfig_colors.ui - appearanceconfig_contactlist.ui + appearanceconfig_contactlist.ui + appearanceconfig_advanced.ui tooltipeditwidget.ui ) kde4_add_plugin(kcm_kopete_appearanceconfig ${kcm_kopete_appearanceconfig_PART_SRCS})
_______________________________________________ kopete-devel mailing list [email protected] https://mail.kde.org/mailman/listinfo/kopete-devel
