diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-09-07 22:02:54 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-09-07 22:02:54 +0000 |
| commit | e2e6ec17cf1177e4bb81609e8e884e000819dfdc (patch) | |
| tree | b7491d60010c277ee80c223e293b4caac6e8b69e /kopete/kopete/config | |
| parent | f815711d039485259835e246103d3e7f8f3d7203 (diff) | |
| download | tdenetwork-e2e6ec17cf1177e4bb81609e8e884e000819dfdc.tar.gz tdenetwork-e2e6ec17cf1177e4bb81609e8e884e000819dfdc.zip | |
* Part 2/2 of Chakra patches
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1172713 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kopete/kopete/config')
3 files changed, 179 insertions, 62 deletions
diff --git a/kopete/kopete/config/appearance/appearanceconfig.cpp b/kopete/kopete/config/appearance/appearanceconfig.cpp index 2f7a5eaf..35c68e05 100644 --- a/kopete/kopete/config/appearance/appearanceconfig.cpp +++ b/kopete/kopete/config/appearance/appearanceconfig.cpp @@ -57,6 +57,7 @@ #include <ktextedit.h> #include <kurl.h> // KNewStuff #include <kurlrequesterdlg.h> +#include <kurlrequester.h> #include <krun.h> #include <kfiledialog.h> @@ -263,6 +264,8 @@ AppearanceConfig::AppearanceConfig(TQWidget *parent, const char* /*name*/, const this, TQT_SLOT(emitChanged())); connect(d->mPrfsContactList->mIconMode, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(emitChanged())); + connect(d->mPrfsContactList->mThemeURL, TQT_SIGNAL(textChanged(const TQString&)), + this, TQT_SLOT(emitChanged())); connect(d->mPrfsContactList->mAnimateChanges, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(emitChanged())); connect(d->mPrfsContactList->mFadeVisibility, TQT_SIGNAL(toggled(bool)), @@ -307,6 +310,8 @@ AppearanceConfig::AppearanceConfig(TQWidget *parent, const char* /*name*/, const this, TQT_SLOT(emitChanged())); connect(d->mPrfsColors->mNormalFont, TQT_SIGNAL(fontSelected(const TQFont &)), this, TQT_SLOT(emitChanged())); + connect(d->mPrfsColors->mGroupFont, TQT_SIGNAL(fontSelected(const TQFont &)), + this, TQT_SLOT(emitChanged())); connect(d->mPrfsColors->mGroupNameColor, TQT_SIGNAL(changed(const TQColor &)), this, TQT_SLOT(emitChanged())); @@ -364,6 +369,7 @@ void AppearanceConfig::save() } // "Contact List" TAB ======================================================= + p->setThemeURL(d->mPrfsContactList->mThemeURL->url()); p->setTreeView(d->mPrfsContactList->mTreeContactList->isChecked()); p->setSortByGroup(d->mPrfsContactList->mSortByGroup->isChecked()); p->setContactListIndentContacts(d->mPrfsContactList->mIndentContacts->isChecked()); @@ -385,6 +391,7 @@ void AppearanceConfig::save() p->setContactListUseCustomFonts(d->mPrfsColors->mUseCustomFonts->isChecked()); p->setContactListCustomSmallFont(d->mPrfsColors->mSmallFont->font()); p->setContactListCustomNormalFont(d->mPrfsColors->mNormalFont->font()); + p->setContactListCustomGroupFont(d->mPrfsColors->mGroupFont->font()); p->setContactListGroupNameColor(d->mPrfsColors->mGroupNameColor->color()); p->setContactListAutoHide(d->mPrfsContactList->mAutoHide->isChecked()); p->setContactListAutoHideTimeout(d->mPrfsContactList->mAutoHideTimeout->value()); @@ -417,6 +424,7 @@ void AppearanceConfig::load() slotLoadChatStyles(); // "Contact List" TAB ======================================================= + d->mPrfsContactList->mThemeURL->setURL(p->themeURL()); d->mPrfsContactList->mTreeContactList->setChecked( p->treeView() ); d->mPrfsContactList->mSortByGroup->setChecked( p->sortByGroup() ); d->mPrfsContactList->mIndentContacts->setChecked( p->contactListIndentContacts() ); @@ -453,6 +461,7 @@ void AppearanceConfig::load() d->mPrfsColors->mUseCustomFonts->setChecked(p->contactListUseCustomFonts()); d->mPrfsColors->mSmallFont->setFont(p->contactListCustomSmallFont()); d->mPrfsColors->mNormalFont->setFont(p->contactListCustomNormalFont()); + d->mPrfsColors->mGroupFont->setFont(p->contactListCustomGroupFont()); d->mPrfsColors->mGroupNameColor->setColor(p->contactListGroupNameColor()); d->mPrfsColors->mBgOverride->setChecked( p->bgOverride() ); diff --git a/kopete/kopete/config/appearance/appearanceconfig_colors.ui b/kopete/kopete/config/appearance/appearanceconfig_colors.ui index 6300b844..5ec00eb3 100644 --- a/kopete/kopete/config/appearance/appearanceconfig_colors.ui +++ b/kopete/kopete/config/appearance/appearanceconfig_colors.ui @@ -1,4 +1,4 @@ -<!DOCTYPE UI><UI version="3.1" stdsetdef="1"> +<!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>AppearanceConfig_Colors</class> <widget class="QWidget"> <property name="name"> @@ -8,8 +8,8 @@ <rect> <x>0</x> <y>0</y> - <width>595</width> - <height>606</height> + <width>618</width> + <height>594</height> </rect> </property> <property name="caption"> @@ -203,7 +203,7 @@ </widget> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout5</cstring> + <cstring>layout9</cstring> </property> <hbox> <property name="name"> @@ -222,38 +222,56 @@ <property name="sizeHint"> <size> <width>20</width> - <height>0</height> + <height>16</height> </size> </property> </spacer> <widget class="QLayoutWidget"> <property name="name"> - <cstring>layout4</cstring> + <cstring>layout8</cstring> </property> - <grid> + <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="1" column="0"> + <widget class="QLayoutWidget"> <property name="name"> - <cstring>mSmallFontLabel</cstring> + <cstring>layout5</cstring> + </property> + <hbox> + <property name="name"> + <cstring>unnamed</cstring> + </property> + <widget class="QLabel"> + <property name="name"> + <cstring>mGroupFontLabel</cstring> </property> <property name="enabled"> <bool>false</bool> </property> <property name="text"> - <string>Small font:</string> + <string>Group font:</string> </property> </widget> - <widget class="KFontRequester" row="0" column="1"> + <widget class="KFontRequester"> <property name="name"> - <cstring>mNormalFont</cstring> + <cstring>mGroupFont</cstring> </property> <property name="enabled"> <bool>false</bool> </property> </widget> - <widget class="QLabel" row="0" column="0"> + </hbox> + </widget> + <widget class="QLayoutWidget"> + <property name="name"> + <cstring>layout6</cstring> + </property> + <hbox> + <property name="name"> + <cstring>unnamed</cstring> + </property> + <widget class="QLabel"> <property name="name"> <cstring>mNormalFontLabel</cstring> </property> @@ -264,7 +282,36 @@ <string>Normal font:</string> </property> </widget> - <widget class="KFontRequester" row="1" column="1"> + <widget class="KFontRequester"> + <property name="name"> + <cstring>mNormalFont</cstring> + </property> + <property name="enabled"> + <bool>false</bool> + </property> + </widget> + </hbox> + </widget> + <widget class="QLayoutWidget"> + <property name="name"> + <cstring>layout7</cstring> + </property> + <hbox> + <property name="name"> + <cstring>unnamed</cstring> + </property> + <widget class="QLabel"> + <property name="name"> + <cstring>mSmallFontLabel</cstring> + </property> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="text"> + <string>Small font:</string> + </property> + </widget> + <widget class="KFontRequester"> <property name="name"> <cstring>mSmallFont</cstring> </property> @@ -272,7 +319,9 @@ <bool>false</bool> </property> </widget> - </grid> + </hbox> + </widget> + </vbox> </widget> </hbox> </widget> @@ -342,8 +391,6 @@ </spacer> </vbox> </widget> -<customwidgets> -</customwidgets> <connections> <connection> <sender>mUseCustomFonts</sender> @@ -375,6 +422,18 @@ <receiver>idleContactColor</receiver> <slot>setEnabled(bool)</slot> </connection> + <connection> + <sender>mUseCustomFonts</sender> + <signal>toggled(bool)</signal> + <receiver>mGroupFontLabel</receiver> + <slot>setEnabled(bool)</slot> + </connection> + <connection> + <sender>mUseCustomFonts</sender> + <signal>toggled(bool)</signal> + <receiver>mGroupFont</receiver> + <slot>setEnabled(bool)</slot> + </connection> </connections> <tabstops> <tabstop>bgColor</tabstop> @@ -391,6 +450,7 @@ <includehint>kfontrequester.h</includehint> <includehint>kfontrequester.h</includehint> <includehint>kfontrequester.h</includehint> + <includehint>kfontrequester.h</includehint> <includehint>kcolorbutton.h</includehint> <includehint>kcolorbutton.h</includehint> </includehints> diff --git a/kopete/kopete/config/appearance/appearanceconfig_contactlist.ui b/kopete/kopete/config/appearance/appearanceconfig_contactlist.ui index 4c9c7934..14f450a4 100644 --- a/kopete/kopete/config/appearance/appearanceconfig_contactlist.ui +++ b/kopete/kopete/config/appearance/appearanceconfig_contactlist.ui @@ -9,17 +9,25 @@ <x>0</x> <y>0</y> <width>707</width> - <height>445</height> + <height>507</height> </rect> </property> <property name="caption"> <string>Contact List Appearance</string> </property> - <grid> + <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="0" column="0"> + <widget class="QLayoutWidget"> + <property name="name"> + <cstring>layout4</cstring> + </property> + <hbox> + <property name="name"> + <cstring>unnamed</cstring> + </property> + <widget class="QGroupBox"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -83,7 +91,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox" row="0" column="1"> + <widget class="QGroupBox"> <property name="name"> <cstring>groupBox10</cstring> </property> @@ -112,6 +120,9 @@ <property name="text"> <string>&Classic, left-aligned status icons</string> </property> + <property name="accel"> + <string>Alt+C</string> + </property> <property name="checked"> <bool>true</bool> </property> @@ -123,6 +134,9 @@ <property name="text"> <string>&Right-aligned status icons</string> </property> + <property name="accel"> + <string>Alt+R</string> + </property> </widget> <widget class="QRadioButton"> <property name="name"> @@ -131,6 +145,9 @@ <property name="text"> <string>Detailed &view</string> </property> + <property name="accel"> + <string>Alt+V</string> + </property> </widget> </vbox> </widget> @@ -144,7 +161,70 @@ </widget> </vbox> </widget> - <widget class="QGroupBox" row="2" column="0" rowspan="1" colspan="2"> + </hbox> + </widget> + <widget class="QGroupBox"> + <property name="name"> + <cstring>groupBox5</cstring> + </property> + <property name="title"> + <string>Displayed Theme Path</string> + </property> + <vbox> + <property name="name"> + <cstring>unnamed</cstring> + </property> + <widget class="KURLRequester"> + <property name="name"> + <cstring>mThemeURL</cstring> + </property> + <property name="mode"> + <number>15</number> + </property> + </widget> + </vbox> + </widget> + <widget class="QGroupBox"> + <property name="name"> + <cstring>groupBox2</cstring> + </property> + <property name="title"> + <string>Contact List Animations</string> + </property> + <vbox> + <property name="name"> + <cstring>unnamed</cstring> + </property> + <widget class="QCheckBox"> + <property name="name"> + <cstring>mAnimateChanges</cstring> + </property> + <property name="text"> + <string>&Animate changes to contact list items</string> + </property> + <property name="accel"> + <string>Alt+A</string> + </property> + </widget> + <widget class="QCheckBox"> + <property name="name"> + <cstring>mFadeVisibility</cstring> + </property> + <property name="text"> + <string>Fade in / out contacts as the&y appear / disappear</string> + </property> + </widget> + <widget class="QCheckBox"> + <property name="name"> + <cstring>mFoldVisibility</cstring> + </property> + <property name="text"> + <string>Fo&ld in / out contacts as they appear / disappear</string> + </property> + </widget> + </vbox> + </widget> + <widget class="QGroupBox"> <property name="name"> <cstring>groupBox3</cstring> </property> @@ -246,44 +326,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox" row="1" column="0" rowspan="1" colspan="2"> - <property name="name"> - <cstring>groupBox2</cstring> - </property> - <property name="title"> - <string>Contact List Animations</string> - </property> - <vbox> - <property name="name"> - <cstring>unnamed</cstring> - </property> - <widget class="QCheckBox"> - <property name="name"> - <cstring>mAnimateChanges</cstring> - </property> - <property name="text"> - <string>&Animate changes to contact list items</string> - </property> - </widget> - <widget class="QCheckBox"> - <property name="name"> - <cstring>mFadeVisibility</cstring> - </property> - <property name="text"> - <string>Fade in / out contacts as the&y appear / disappear</string> - </property> - </widget> - <widget class="QCheckBox"> - <property name="name"> - <cstring>mFoldVisibility</cstring> - </property> - <property name="text"> - <string>Fo&ld in / out contacts as they appear / disappear</string> - </property> - </widget> - </vbox> - </widget> - <widget class="QLayoutWidget" row="3" column="0" rowspan="1" colspan="2"> + <widget class="QLayoutWidget"> <property name="name"> <cstring>layout8</cstring> </property> @@ -318,7 +361,7 @@ </spacer> </hbox> </widget> - <spacer row="4" column="0" rowspan="1" colspan="2"> + <spacer> <property name="name"> <cstring>spacer15</cstring> </property> @@ -335,7 +378,7 @@ </size> </property> </spacer> - </grid> + </vbox> </widget> <connections> <connection> @@ -346,4 +389,9 @@ </connection> </connections> <layoutdefaults spacing="6" margin="11"/> +<includehints> + <includehint>kurlrequester.h</includehint> + <includehint>klineedit.h</includehint> + <includehint>kpushbutton.h</includehint> +</includehints> </UI> |