File build_only_kcm.diff of Package kcm_gtk
--- CMakeLists.txt 2007/08/28 14:09:20 1.1
+++ CMakeLists.txt 2007/08/28 14:09:28
@@ -80,7 +80,7 @@
INCLUDE_DIRECTORIES(${KDE3_INCLUDE_DIRS} ${GTK_INCLUDE_DIR} ${BONOBO_INCLUDE_DIR})
# Subdirectories
-ADD_SUBDIRECTORY(src)
+#ADD_SUBDIRECTORY(src)
ADD_SUBDIRECTORY(kcm_gtk)
ADD_SUBDIRECTORY(po)
--- po/es.po 2007/08/28 15:14:50 1.1
+++ po/es.po 2007/08/28 15:15:15
@@ -78,8 +78,8 @@
msgstr "Usar mi estilo de KDE en las aplicaciones de GTK"
#: kcmgtkwidget.cpp:194
-msgid "Use another style:"
-msgstr "Usar otro estilo:"
+msgid "Use style:"
+msgstr "Usar estilo:"
#: kcmgtkwidget.cpp:195
msgid "Gtk-Qt theme engine homepage"
--- po/nn.po 2007/08/28 15:14:52 1.1
+++ po/nn.po 2007/08/28 15:15:25
@@ -74,8 +74,8 @@
msgstr "Bruk KDE-stil i GTK-program"
#: kcmgtkwidget.cpp:194
-msgid "Use another style:"
-msgstr "Bruk ein annan stil:"
+msgid "Use style:"
+msgstr "Bruk stil:"
#: kcmgtkwidget.cpp:195
msgid "Gtk-Qt theme engine homepage"
--- po/bg.po 2007/08/28 14:11:08 1.1
+++ po/bg.po 2007/08/28 14:11:24
@@ -37,8 +37,8 @@
#. i18n: file /mnt/lvm/home/david/projects/cmakestuff/gtk-qt-engine/po/../kcm_gtk/kcmgtkwidget.ui line 117
#: rc.cpp:12
#, no-c-format
-msgid "Use another style:"
-msgstr "Използване на друг стил:"
+msgid "Use style:"
+msgstr "Използване стил:"
#. i18n: file /mnt/lvm/home/david/projects/cmakestuff/gtk-qt-engine/po/../kcm_gtk/kcmgtkwidget.ui line 128
#: rc.cpp:15
--- po/it.po 2007/08/28 14:11:44 1.1
+++ po/it.po 2007/08/28 14:11:56
@@ -77,8 +77,8 @@
msgstr "Utilizza lo stile configurato in KDE nelle applicazioni GTK"
#: kcmgtkwidget.cpp:194
-msgid "Use another style:"
-msgstr "Utilizza un altro stile:"
+msgid "Use style:"
+msgstr "Utilizza stile:"
#: kcmgtkwidget.cpp:195
msgid "Gtk-Qt theme engine homepage"
--- po/ru.po 2007/08/28 14:12:05 1.1
+++ po/ru.po 2007/08/28 14:12:16
@@ -75,8 +75,8 @@
msgstr "Использовать мой стиль KDE в GTK приложениях"
#: kcmgtkwidget.cpp:194
-msgid "Use another style:"
-msgstr "Использовать другой стиль:"
+msgid "Use style:"
+msgstr "Использовать стиль:"
#: kcmgtkwidget.cpp:195
msgid "Gtk-Qt theme engine homepage"
--- po/sv.po 2007/08/28 14:12:20 1.1
+++ po/sv.po 2007/08/28 14:12:29
@@ -77,7 +77,7 @@
#: kcmgtkwidget.cpp:194
msgid "Use another style:"
-msgstr "Använd en annan stil:"
+msgstr "Använd stil:"
#: kcmgtkwidget.cpp:195
msgid "Gtk-Qt theme engine homepage"
--- po/tr.po 2007/08/28 14:12:33 1.1
+++ po/tr.po 2007/08/28 14:12:42
@@ -36,7 +36,7 @@
#: rc.cpp:12
#, no-c-format
msgid "Use another style:"
-msgstr "Başka bir sitil kullan:"
+msgstr "Başka kullan:"
#. i18n: file /mnt/lvm/home/david/projects/cmakestuff/gtk-qt-engine/po/../kcm_gtk/kcmgtkwidget.ui line 128
#: rc.cpp:15
--- po/de.po 2007/08/28 14:12:48 1.1
+++ po/de.po 2007/08/28 14:13:11
@@ -77,7 +77,7 @@
#: kcmgtkwidget.cpp:194
msgid "Use &another style:"
-msgstr "Anderen Stil verwenden:"
+msgstr "Stil verwenden:"
#: kcmgtkwidget.cpp:195
msgid "Gtk-Qt theme engine homepage"
--- po/fr.po 2006/10/10 13:45:37 1.1
+++ po/fr.po 2006/10/10 13:46:06
@@ -83,7 +83,7 @@
#: kcmgtkwidget.cpp:194
msgid "Use another style:"
-msgstr "Utiliser un autre style :"
+msgstr "Utiliser style :"
#: kcmgtkwidget.cpp:195
msgid "Gtk-Qt theme engine homepage"
--- kcm_gtk/kcmgtkwidget.ui 2007/08/28 14:53:44 1.1
+++ kcm_gtk/kcmgtkwidget.ui 2007/08/28 15:03:27
@@ -84,7 +84,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <spacer row="1" column="2">
+ <spacer row="0" column="2">
<property name="name">
<cstring>spacer8_2</cstring>
</property>
@@ -136,15 +136,7 @@
</spacer>
</hbox>
</widget>
- <widget class="QRadioButton" row="0" column="0" rowspan="1" colspan="3">
- <property name="name">
- <cstring>styleKde</cstring>
- </property>
- <property name="text">
- <string>&Use my KDE style in GTK applications</string>
- </property>
- </widget>
- <widget class="QComboBox" row="1" column="1">
+ <widget class="QComboBox" row="0" column="1">
<property name="name">
<cstring>styleBox</cstring>
</property>
@@ -160,34 +152,12 @@
<bool>false</bool>
</property>
</widget>
- <widget class="QRadioButton" row="1" column="0">
- <property name="name">
- <cstring>styleOther</cstring>
- </property>
- <property name="text">
- <string>Use &another style:</string>
- </property>
- <property name="checked">
- <bool>false</bool>
- </property>
- </widget>
- <widget class="QLabel" row="2" column="0" rowspan="1" colspan="3">
+ <widget class="QLabel" row="0" column="0">
<property name="name">
- <cstring>warning1</cstring>
+ <cstring>styleLabel</cstring>
</property>
<property name="text">
- <string><b>Warning:</b> The Gtk-Qt theme engine is not installed. This means you will not be able to use your KDE style in GTK applications.</string>
- </property>
- </widget>
- <widget class="KURLLabel" row="4" column="0" rowspan="1" colspan="3">
- <property name="name">
- <cstring>warning2</cstring>
- </property>
- <property name="text">
- <string>Gtk-Qt theme engine homepage</string>
- </property>
- <property name="url" stdset="0">
- <string>http://gtk-qt.ecs.soton.ac.uk/</string>
+ <string>Use style:</string>
</property>
</widget>
</grid>
@@ -624,11 +594,8 @@
</vbox>
</widget>
<tabstops>
- <tabstop>styleKde</tabstop>
- <tabstop>styleOther</tabstop>
<tabstop>styleBox</tabstop>
<tabstop>warning3</tabstop>
- <tabstop>warning2</tabstop>
<tabstop>fontKde</tabstop>
<tabstop>fontOther</tabstop>
<tabstop>fontChange</tabstop>
@@ -638,8 +605,6 @@
</tabstops>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
- <includehint>kurllabel.h</includehint>
- <includehint>ksqueezedtextlabel.h</includehint>
<includehint>ksqueezedtextlabel.h</includehint>
</includehints>
</UI>
--- kcm_gtk/kcmgtk.cpp 2007/08/28 14:53:38 1.1
+++ kcm_gtk/kcmgtk.cpp 2007/08/28 14:57:27
@@ -180,6 +180,9 @@
widget = new KcmGtkWidget(this);
l->addWidget(widget);
+ // Hide "Firefox and Thunderbird" groupbox
+ widget->groupBox1->setHidden(true);
+
// Load the icons
KIconLoader iconLoader;
widget->styleIcon->setPixmap(iconLoader.loadIcon("style", KIcon::Desktop));
@@ -191,8 +194,6 @@
load();
// Connect some signals
- connect(widget->warning2, SIGNAL(leftClickedURL(const QString&)), KApplication::kApplication(), SLOT(invokeBrowser(const QString&)));
- connect(widget->styleGroup, SIGNAL(clicked(int)), SLOT(itemChanged()));
connect(widget->fontGroup, SIGNAL(clicked(int)), SLOT(itemChanged()));
connect(widget->styleBox, SIGNAL(activated(int)), SLOT(itemChanged()));
connect(widget->styleBox, SIGNAL(activated(int)), SLOT(styleChanged()));
@@ -226,11 +227,6 @@
widget->styleBox->clear();
widget->styleBox->insertStringList(themes.keys());
- bool installed = (themes.find("Qt") != themes.end());
- widget->styleKde->setEnabled(installed);
- widget->warning1->setHidden(installed);
- widget->warning2->setHidden(installed);
- widget->warning3->setHidden(installed);
}
void KcmGtk::itemChanged()
@@ -251,7 +247,6 @@
void KcmGtk::styleChanged()
{
- widget->styleGroup->setButton(widget->styleGroup->id(widget->styleOther));
itemChanged();
}
@@ -306,10 +301,6 @@
break;
}
- if (usingQtEngine)
- widget->styleGroup->setButton(widget->styleGroup->id(widget->styleKde));
- else
- widget->styleGroup->setButton(widget->styleGroup->id(widget->styleOther));
}
font = parser.font;
@@ -340,8 +331,8 @@
QString(selectedFont.italic() ? "Italic " : "") +
QString::number(selectedFont.pointSize());
- QString themeName = widget->styleKde->isChecked() ? themes["Qt"] : themes[widget->styleBox->currentText()];
- QString themeNameShort = widget->styleKde->isChecked() ? QString("Qt") : widget->styleBox->currentText();
+ QString themeName = themes[widget->styleBox->currentText()];
+ QString themeNameShort = widget->styleBox->currentText();
stream << "# This file was written by KDE\n";
stream << "# You can edit it in the KDE control center, under \"GTK Styles and Fonts\"\n";
