Hi
I'm still working on config dialogs rearranging to make them suitable at
800x600 size.
So I've moved the chatwindow color settings and overrides from the Contact
List section to a tab in the Chat Window section.
Please review the attached patch.
Cheers
--
Gustavo Pichorim Boiko
Index: kopete/config/appearance/appearanceconfig_colors.ui
===================================================================
--- kopete/config/appearance/appearanceconfig_colors.ui (revisão 733861)
+++ kopete/config/appearance/appearanceconfig_colors.ui (cópia de trabalho)
@@ -6,335 +6,159 @@
<x>0</x>
<y>0</y>
<width>497</width>
- <height>507</height>
+ <height>227</height>
</rect>
</property>
- <layout class="QVBoxLayout" >
- <property name="margin" >
- <number>9</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item>
- <widget class="QGroupBox" name="groupBox" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>5</hsizetype>
- <vsizetype>5</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
+ <layout class="QGridLayout" >
+ <item row="0" column="0" colspan="2" >
+ <widget class="QCheckBox" name="kcfg_contactListUseCustomFont" >
+ <property name="text" >
+ <string>U&se custom fonts for contact list items</string>
</property>
- <property name="title" >
- <string>ChatWindow</string>
+ </widget>
+ </item>
+ <item row="1" column="0" colspan="2" >
+ <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>
- <layout class="QGridLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item row="0" column="1" colspan="3" >
- <widget class="KFontRequester" name="kcfg_chatFont" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>5</hsizetype>
- <vsizetype>0</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- </widget>
- </item>
- <item row="1" column="2" >
- <widget class="QLabel" name="textLabel2_2" >
- <property name="text" >
- <string>Background color:</string>
- </property>
- </widget>
- </item>
- <item row="0" column="0" >
- <widget class="QLabel" name="textLabel3" >
- <property name="text" >
- <string>Base font:</string>
- </property>
- </widget>
- </item>
- <item row="2" column="1" >
- <widget class="KColorButton" name="kcfg_chatLinkColor" >
- <property name="text" >
- <string/>
- </property>
- <property name="color" >
- <color>
- <red>0</red>
- <green>85</green>
- <blue>255</blue>
- </color>
- </property>
- </widget>
- </item>
- <item row="3" column="1" >
- <widget class="KColorButton" name="kcfg_highlightForegroundColor" >
- <property name="text" >
- <string/>
- </property>
- </widget>
- </item>
- <item row="2" column="0" >
- <widget class="QLabel" name="textLabel1_3" >
- <property name="text" >
- <string>Link color:</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1" >
- <widget class="KColorButton" name="kcfg_chatTextColor" >
- <property name="text" >
- <string/>
- </property>
- </widget>
- </item>
- <item row="3" column="3" >
- <widget class="KColorButton" name="kcfg_highlightBackgroundColor" >
- <property name="text" >
- <string/>
- </property>
- </widget>
- </item>
- <item row="1" column="0" >
- <widget class="QLabel" name="textLabel1_2" >
- <property name="text" >
- <string>Base font color:</string>
- </property>
- </widget>
- </item>
- <item row="3" column="2" >
- <widget class="QLabel" name="textLabel1" >
- <property name="text" >
- <string>Highlight background:</string>
- </property>
- </widget>
- </item>
- <item row="3" column="0" >
- <widget class="QLabel" name="textLabel2" >
- <property name="text" >
- <string>Highlight foreground:</string>
- </property>
- </widget>
- </item>
- <item row="1" column="3" >
- <widget class="KColorButton" name="kcfg_chatBackgroundColor" >
- <property name="text" >
- <string/>
- </property>
- <property name="color" >
- <color>
- <red>255</red>
- <green>255</green>
- <blue>255</blue>
- </color>
- </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::Maximum</enum>
+ </property>
+ <property name="sizeHint" >
+ <size>
+ <width>20</width>
+ <height>47</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <layout class="QGridLayout" >
+ <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>
+ <property name="horizontalSpacing" >
+ <number>6</number>
+ </property>
+ <property name="verticalSpacing" >
+ <number>6</number>
+ </property>
+ <item row="1" column="0" >
+ <widget class="QLabel" name="mSmallFontLabel" >
+ <property name="enabled" >
+ <bool>false</bool>
+ </property>
+ <property name="text" >
+ <string>Small font:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1" >
+ <widget class="KFontRequester" name="kcfg_contactListNormalFont" >
+ <property name="enabled" >
+ <bool>false</bool>
+ </property>
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Maximum" hsizetype="Preferred" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="0" >
+ <widget class="QLabel" name="mNormalFontLabel" >
+ <property name="enabled" >
+ <bool>false</bool>
+ </property>
+ <property name="text" >
+ <string>Normal font:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1" >
+ <widget class="KFontRequester" name="kcfg_contactListSmallFont" >
+ <property name="enabled" >
+ <bool>false</bool>
+ </property>
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Maximum" hsizetype="Preferred" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </item>
+ <item row="2" column="0" >
+ <widget class="QCheckBox" name="kcfg_greyIdleMetaContacts" >
+ <property name="text" >
+ <string>Recolor co&ntacts marked as idle:</string>
+ </property>
</widget>
</item>
- <item>
- <widget class="QGroupBox" name="groupBox_2" >
- <property name="title" >
- <string>Formatting Overrides</string>
+ <item row="2" column="1" >
+ <widget class="KColorButton" name="kcfg_idleContactColor" >
+ <property name="enabled" >
+ <bool>false</bool>
</property>
- <layout class="QVBoxLayout" >
- <property name="margin" >
- <number>9</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item>
- <widget class="QCheckBox" name="kcfg_chatBgOverride" >
- <property name="text" >
- <string>Do not show user specified &background color</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QCheckBox" name="kcfg_chatFgOverride" >
- <property name="text" >
- <string>&Do not show user specified foreground color</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QCheckBox" name="kcfg_chatRtfOverride" >
- <property name="text" >
- <string>Do not show user specified &rich text</string>
- </property>
- </widget>
- </item>
- </layout>
+ <property name="text" >
+ <string/>
+ </property>
</widget>
</item>
- <item>
- <widget class="QGroupBox" name="groupBox_3" >
- <property name="title" >
- <string>Contact List</string>
+ <item row="3" column="0" >
+ <widget class="QLabel" name="textLabel1_4" >
+ <property name="text" >
+ <string>Group name color:</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="QCheckBox" name="kcfg_contactListUseCustomFont" >
- <property name="text" >
- <string>U&se custom fonts for contact list items</string>
- </property>
- </widget>
- </item>
- <item row="1" 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::Maximum</enum>
- </property>
- <property name="sizeHint" >
- <size>
- <width>20</width>
- <height>47</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <layout class="QGridLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item row="1" column="0" >
- <widget class="QLabel" name="mSmallFontLabel" >
- <property name="enabled" >
- <bool>false</bool>
- </property>
- <property name="text" >
- <string>Small font:</string>
- </property>
- </widget>
- </item>
- <item row="0" column="1" >
- <widget class="KFontRequester" name="kcfg_contactListNormalFont" >
- <property name="enabled" >
- <bool>false</bool>
- </property>
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>5</hsizetype>
- <vsizetype>4</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- </widget>
- </item>
- <item row="0" column="0" >
- <widget class="QLabel" name="mNormalFontLabel" >
- <property name="enabled" >
- <bool>false</bool>
- </property>
- <property name="text" >
- <string>Normal font:</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1" >
- <widget class="KFontRequester" name="kcfg_contactListSmallFont" >
- <property name="enabled" >
- <bool>false</bool>
- </property>
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>5</hsizetype>
- <vsizetype>4</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- </layout>
- </item>
- <item row="3" column="1" >
- <widget class="KColorButton" name="kcfg_groupNameColor" >
- <property name="text" >
- <string/>
- </property>
- </widget>
- </item>
- <item row="3" column="0" >
- <widget class="QLabel" name="textLabel1_4" >
- <property name="text" >
- <string>Group name color:</string>
- </property>
- </widget>
- </item>
- <item row="2" column="1" >
- <widget class="KColorButton" name="kcfg_idleContactColor" >
- <property name="enabled" >
- <bool>false</bool>
- </property>
- <property name="text" >
- <string/>
- </property>
- </widget>
- </item>
- <item row="2" column="0" >
- <widget class="QCheckBox" name="kcfg_greyIdleMetaContacts" >
- <property name="text" >
- <string>Recolor co&ntacts marked as idle:</string>
- </property>
- </widget>
- </item>
- </layout>
</widget>
</item>
- <item>
+ <item row="3" column="1" >
+ <widget class="KColorButton" name="kcfg_groupNameColor" >
+ <property name="text" >
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="0" colspan="2" >
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" >
<size>
- <width>20</width>
+ <width>461</width>
<height>40</height>
</size>
</property>
@@ -354,11 +178,6 @@
<header>kfontrequester.h</header>
</customwidget>
</customwidgets>
- <tabstops>
- <tabstop>kcfg_chatBackgroundColor</tabstop>
- <tabstop>kcfg_chatTextColor</tabstop>
- <tabstop>kcfg_chatLinkColor</tabstop>
- </tabstops>
<resources/>
<connections>
<connection>
Index: kopete/config/chatwindow/chatwindowconfig.h
===================================================================
--- kopete/config/chatwindow/chatwindowconfig.h (revisão 733861)
+++ kopete/config/chatwindow/chatwindowconfig.h (cópia de trabalho)
@@ -25,6 +25,7 @@
#undef KDE3_SUPPORT
#include "ui_chatwindowconfig_style.h"
#include "ui_chatwindowconfig_emoticons.h"
+#include "ui_chatwindowconfig_colors.h"
#include <kopetechatwindowstyle.h>
class FakeProtocol;
@@ -96,5 +97,8 @@
//----- Emoticons TAB ---------------------
Ui::ChatWindowConfig_Emoticons m_emoticonsUi;
+ //----- Colors TAB ------------------------
+ Ui::ChatWindowConfig_Colors m_colorsUi;
+
};
#endif
Index: kopete/config/chatwindow/chatwindowconfig_colors.ui
===================================================================
--- kopete/config/chatwindow/chatwindowconfig_colors.ui (revisão 0)
+++ kopete/config/chatwindow/chatwindowconfig_colors.ui (revisão 0)
@@ -0,0 +1,243 @@
+<ui version="4.0" >
+ <class>ChatWindowConfig_Colors</class>
+ <widget class="QWidget" name="ChatWindowConfig_Colors" >
+ <property name="geometry" >
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>435</width>
+ <height>344</height>
+ </rect>
+ </property>
+ <property name="windowTitle" >
+ <string>Form</string>
+ </property>
+ <layout class="QVBoxLayout" >
+ <item>
+ <widget class="QGroupBox" name="groupBox" >
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="title" >
+ <string>Chat Window</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>
+ <layout class="QGridLayout" >
+ <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>
+ <property name="horizontalSpacing" >
+ <number>6</number>
+ </property>
+ <property name="verticalSpacing" >
+ <number>6</number>
+ </property>
+ <item row="0" column="1" colspan="3" >
+ <widget class="KFontRequester" name="kcfg_chatFont" >
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="2" >
+ <widget class="QLabel" name="textLabel2_2" >
+ <property name="text" >
+ <string>Background color:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="0" >
+ <widget class="QLabel" name="textLabel3" >
+ <property name="text" >
+ <string>Base font:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1" >
+ <widget class="KColorButton" name="kcfg_chatLinkColor" >
+ <property name="text" >
+ <string/>
+ </property>
+ <property name="color" >
+ <color>
+ <red>0</red>
+ <green>85</green>
+ <blue>255</blue>
+ </color>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="1" >
+ <widget class="KColorButton" name="kcfg_highlightForegroundColor" >
+ <property name="text" >
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0" >
+ <widget class="QLabel" name="textLabel1_3" >
+ <property name="text" >
+ <string>Link color:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1" >
+ <widget class="KColorButton" name="kcfg_chatTextColor" >
+ <property name="text" >
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="3" >
+ <widget class="KColorButton" name="kcfg_highlightBackgroundColor" >
+ <property name="text" >
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0" >
+ <widget class="QLabel" name="textLabel1_2" >
+ <property name="text" >
+ <string>Base font color:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="2" >
+ <widget class="QLabel" name="textLabel1" >
+ <property name="text" >
+ <string>Highlight background:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="0" >
+ <widget class="QLabel" name="textLabel2" >
+ <property name="text" >
+ <string>Highlight foreground:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="3" >
+ <widget class="KColorButton" name="kcfg_chatBackgroundColor" >
+ <property name="text" >
+ <string/>
+ </property>
+ <property name="color" >
+ <color>
+ <red>255</red>
+ <green>255</green>
+ <blue>255</blue>
+ </color>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <widget class="QGroupBox" name="groupBox_2" >
+ <property name="title" >
+ <string>Formatting Overrides</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_chatBgOverride" >
+ <property name="text" >
+ <string>Do not show user specified &background color</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="kcfg_chatFgOverride" >
+ <property name="text" >
+ <string>&Do not show user specified foreground color</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="kcfg_chatRtfOverride" >
+ <property name="text" >
+ <string>Do not show user specified &rich text</string>
+ </property>
+ </widget>
+ </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>
+ <customwidgets>
+ <customwidget>
+ <class>KColorButton</class>
+ <extends>QPushButton</extends>
+ <header>kcolorbutton.h</header>
+ </customwidget>
+ <customwidget>
+ <class>KFontRequester</class>
+ <extends>QWidget</extends>
+ <header>kfontrequester.h</header>
+ </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>
Index: kopete/config/chatwindow/CMakeLists.txt
===================================================================
--- kopete/config/chatwindow/CMakeLists.txt (revisão 733861)
+++ kopete/config/chatwindow/CMakeLists.txt (cópia de trabalho)
@@ -15,7 +15,8 @@
kde4_add_ui_files(kcm_kopete_chatwindowconfig_PART_SRCS
chatwindowconfig_style.ui
- chatwindowconfig_emoticons.ui )
+ chatwindowconfig_emoticons.ui
+ chatwindowconfig_colors.ui )
kde4_add_plugin(kcm_kopete_chatwindowconfig ${kcm_kopete_chatwindowconfig_PART_SRCS})
Index: kopete/config/chatwindow/chatwindowconfig.cpp
===================================================================
--- kopete/config/chatwindow/chatwindowconfig.cpp (revisão 733861)
+++ kopete/config/chatwindow/chatwindowconfig.cpp (cópia de trabalho)
@@ -274,6 +274,12 @@
connect(m_emoticonsUi.btnRemoveTheme, SIGNAL(clicked()),
this, SLOT(slotRemoveEmoticonTheme()));
+//--------- colors tab --------------------------
+ QWidget *colorsWidget = new QWidget(m_tab);
+ m_colorsUi.setupUi(colorsWidget);
+ m_tab->addTab(colorsWidget, i18n("Colors && Fonts"));
+ addConfig( Kopete::AppearanceSettings::self(), colorsWidget );
+
load();
}
_______________________________________________
kopete-devel mailing list
[email protected]
https://mail.kde.org/mailman/listinfo/kopete-devel
