File build-only-kcm.diff of Package kcm_gtk

Overview Repositories Revisions Requests Users Attributes Meta

File build-only-kcm.diff of Package kcm_gtk (Revision d7cabe5a404afeccde057ac96c328727)

Currently displaying revision d7cabe5a404afeccde057ac96c328727 , Show latest

--- po/cs.po	2009/01/21 13:41:28	1.1
+++ po/cs.po	2009/01/21 13:41:28
@@ -173,7 +173,7 @@
 #. i18n: file /home/david/projects/gtk-qt-engine/po/../kcm_gtk/kcmgtkwidget.ui line 117
 #: rc.cpp:79
 #, no-c-format
-msgid "Change search paths..."
+msgid "Change Search Paths..."
 msgstr "Změnit vyhledávací cesty..."
 
 #. i18n: file /home/david/projects/gtk-qt-engine/po/../kcm_gtk/kcmgtkwidget.ui line 144
@@ -185,8 +185,8 @@
 #. i18n: file /home/david/projects/gtk-qt-engine/po/../kcm_gtk/kcmgtkwidget.ui line 168
 #: rc.cpp:85
 #, no-c-format
-msgid "Use &another style:"
-msgstr "Použít &jiný styl:"
+msgid "Use style:"
+msgstr "Použít styl:"
 
 #. i18n: file /home/david/projects/gtk-qt-engine/po/../kcm_gtk/kcmgtkwidget.ui line 179
 #: rc.cpp:88
@@ -299,7 +299,7 @@
 #. i18n: file /home/david/projects/gtk-qt-engine/po/../kcm_gtk/searchpaths.ui line 16
 #: rc.cpp:143
 #, no-c-format
-msgid "Change search paths"
+msgid "Change Search Paths"
 msgstr "Změnit vyhledávací cesty"
 
 #. i18n: file /home/david/projects/gtk-qt-engine/po/../kcm_gtk/searchpaths.ui line 27
--- po/ru.po	2009/01/21 13:41:28	1.1
+++ po/ru.po	2009/01/21 13:41:28
@@ -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	2009/01/21 13:41:28	1.1
+++ po/sv.po	2009/01/21 13:41:28
@@ -76,8 +76,8 @@
 msgstr "Använd min KDE-stil i GTK-program"
 
 #: kcmgtkwidget.cpp:194
-msgid "Use another style:"
-msgstr "Använd en annan stil:"
+msgid "Use style:"
+msgstr "Använd stil:"
 
 #: kcmgtkwidget.cpp:195
 msgid "Gtk-Qt theme engine homepage"
--- po/fr.po	2009/01/21 13:41:28	1.1
+++ po/fr.po	2009/01/21 13:41:28
@@ -82,8 +82,8 @@
 msgstr "Appliquer le style de KDE aux applications GTK"
 
 #: kcmgtkwidget.cpp:194
-msgid "Use another style:"
-msgstr "Utiliser un autre style :"
+msgid "Use style:"
+msgstr "Utiliser style :"
 
 #: kcmgtkwidget.cpp:195
 msgid "Gtk-Qt theme engine homepage"
--- po/tr.po	2009/01/21 13:41:28	1.1
+++ po/tr.po	2009/01/21 13:41:28
@@ -35,8 +35,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 "Başka bir sitil kullan:"
+msgid "Use style:"
+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/bg.po	2009/01/21 13:41:28	1.1
+++ po/bg.po	2009/01/21 13:41:28
@@ -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	2009/01/21 13:41:28	1.1
+++ po/it.po	2009/01/21 13:41:28
@@ -87,8 +87,8 @@
 msgstr "Utilizza lo stile 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/de.po	2009/01/21 13:41:28	1.1
+++ po/de.po	2009/01/21 13:41:28
@@ -40,8 +40,8 @@
 #. i18n: tag string
 #. i18n: file /home/david/projects/gtk-qt/trunk/gtk-qt-engine/po/../kcm_gtk/kcmgtkwidget.ui line 52
 #: rc.cpp:12
-msgid "Use &another style:"
-msgstr "&Anderen Stil verwenden:"
+msgid "Use style:"
+msgstr "Stil verwenden:"
 
 #. i18n: tag string
 #. i18n: file /home/david/projects/gtk-qt/trunk/gtk-qt-engine/po/../kcm_gtk/kcmgtkwidget.ui line 84
--- kcm_gtk/searchpaths.ui	2009/01/21 13:41:28	1.1
+++ kcm_gtk/searchpaths.ui	2009/01/21 13:41:28
@@ -10,7 +10,7 @@
    </rect>
   </property>
   <property name="windowTitle" >
-   <string>Change search paths</string>
+   <string>Change Search Paths</string>
   </property>
   <layout class="QVBoxLayout" >
    <item>
--- kcm_gtk/kcmgtkwidget.ui	2009/01/21 13:41:28	1.1
+++ kcm_gtk/kcmgtkwidget.ui	2009/01/21 13:41:28
@@ -5,8 +5,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>535</width>
-    <height>587</height>
+    <width>553</width>
+    <height>673</height>
    </rect>
   </property>
   <property name="windowTitle" >
@@ -18,8 +18,8 @@
      <property name="title" >
       <string>GTK Styles</string>
      </property>
-     <layout class="QGridLayout" >
-      <item rowspan="5" row="0" column="0" >
+     <layout class="QGridLayout" name="gridLayout" >
+      <item rowspan="2" row="0" column="0" >
        <layout class="QVBoxLayout" >
         <item>
          <widget class="QLabel" name="styleIcon" />
@@ -29,7 +29,7 @@
           <property name="orientation" >
            <enum>Qt::Vertical</enum>
           </property>
-          <property name="sizeHint" >
+          <property name="sizeHint" stdset="0" >
            <size>
             <width>20</width>
             <height>40</height>
@@ -39,29 +39,38 @@
         </item>
        </layout>
       </item>
-      <item row="0" column="1" colspan="4" >
-       <widget class="QRadioButton" name="styleKde" >
+      <item row="0" column="1" >
+       <widget class="QLabel" name="label" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Preferred" hsizetype="Maximum" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
         <property name="text" >
-         <string>&amp;Use my KDE style in GTK applications</string>
+         <string>Use style:</string>
+        </property>
+        <property name="buddy" >
+         <cstring>styleBox</cstring>
         </property>
        </widget>
       </item>
-      <item row="1" column="1" >
-       <widget class="QRadioButton" name="styleOther" >
-        <property name="text" >
-         <string>Use &amp;another style:</string>
+      <item row="0" column="2" >
+       <widget class="QComboBox" name="styleBox" >
+        <property name="sizePolicy" >
+         <sizepolicy vsizetype="Fixed" hsizetype="MinimumExpanding" >
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
         </property>
        </widget>
       </item>
-      <item row="1" column="2" colspan="2" >
-       <widget class="QComboBox" name="styleBox" />
-      </item>
-      <item row="1" column="4" >
+      <item row="0" column="3" >
        <spacer>
         <property name="orientation" >
          <enum>Qt::Horizontal</enum>
         </property>
-        <property name="sizeHint" >
+        <property name="sizeHint" stdset="0" >
          <size>
           <width>191</width>
           <height>20</height>
@@ -69,48 +78,19 @@
         </property>
        </spacer>
       </item>
-      <item row="2" column="1" colspan="4" >
-       <widget class="QLabel" name="warning1" >
-        <property name="sizePolicy" >
-         <sizepolicy vsizetype="Minimum" hsizetype="Preferred" >
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text" >
-         <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;style type="text/css">
-p, li { white-space: pre-wrap; }
-&lt;/style>&lt;/head>&lt;body style=" font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;">
-&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;span style=" font-weight:600;">Warning:&lt;/span> The Gtk-Qt theme engine is not installed. This means you will not be able to use your KDE style in GTK applications.&lt;/p>&lt;/body>&lt;/html></string>
-        </property>
-        <property name="wordWrap" >
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="1" colspan="4" >
-       <widget class="KUrlLabel" name="warning2" >
-        <property name="text" >
-         <string>Gtk-Qt theme engine homepage</string>
-        </property>
-        <property name="url" >
-         <string>http://gtk-qt.ecs.soton.ac.uk</string>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="1" colspan="2" >
+      <item row="1" column="1" >
        <widget class="QPushButton" name="warning3" >
         <property name="text" >
-         <string>Change search paths...</string>
+         <string>Change Search Paths...</string>
         </property>
        </widget>
       </item>
-      <item row="4" column="3" colspan="2" >
+      <item row="1" column="2" colspan="2" >
        <spacer>
         <property name="orientation" >
          <enum>Qt::Horizontal</enum>
         </property>
-        <property name="sizeHint" >
+        <property name="sizeHint" stdset="0" >
          <size>
           <width>211</width>
           <height>20</height>
@@ -141,7 +121,7 @@
           <property name="orientation" >
            <enum>Qt::Vertical</enum>
           </property>
-          <property name="sizeHint" >
+          <property name="sizeHint" stdset="0" >
            <size>
             <width>20</width>
             <height>40</height>
@@ -177,7 +157,7 @@
         <property name="orientation" >
          <enum>Qt::Horizontal</enum>
         </property>
-        <property name="sizeHint" >
+        <property name="sizeHint" stdset="0" >
          <size>
           <width>141</width>
           <height>20</height>
@@ -186,23 +166,29 @@
        </spacer>
       </item>
       <item row="2" column="1" colspan="3" >
-       <widget class="KSqueezedTextLabel" name="fontPreview" >
-        <property name="indent" >
+       <widget class="KSqueezedTextLabel" native="1" name="fontPreview" >
+        <property name="indent" stdset="0" >
          <number>32</number>
         </property>
        </widget>
       </item>
       <item row="3" column="1" colspan="3" >
-       <widget class="KSqueezedTextLabel" name="fontPreview2" >
-        <property name="text" >
+       <widget class="KSqueezedTextLabel" native="1" name="fontPreview2" >
+        <property name="text" stdset="0" >
          <string>The Quick Brown Fox Jumped Over The Lazy Dog</string>
         </property>
-        <property name="indent" >
+        <property name="indent" stdset="0" >
          <number>32</number>
         </property>
        </widget>
       </item>
      </layout>
+     <zorder>fontKde</zorder>
+     <zorder>fontOther</zorder>
+     <zorder>fontChange</zorder>
+     <zorder>fontPreview</zorder>
+     <zorder>fontPreview2</zorder>
+     <zorder>groupBox</zorder>
     </widget>
    </item>
    <item>
@@ -225,7 +211,7 @@
           <property name="orientation" >
            <enum>Qt::Vertical</enum>
           </property>
-          <property name="sizeHint" >
+          <property name="sizeHint" stdset="0" >
            <size>
             <width>20</width>
             <height>40</height>
@@ -263,7 +249,7 @@
         <property name="orientation" >
          <enum>Qt::Horizontal</enum>
         </property>
-        <property name="sizeHint" >
+        <property name="sizeHint" stdset="0" >
          <size>
           <width>221</width>
           <height>20</height>
@@ -295,7 +281,7 @@
      <property name="orientation" >
       <enum>Qt::Vertical</enum>
      </property>
-     <property name="sizeHint" >
+     <property name="sizeHint" stdset="0" >
       <size>
        <width>535</width>
        <height>21</height>
@@ -307,9 +293,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>KUrlLabel</class>
-   <extends>QLabel</extends>
-   <header>kurllabel.h</header>
+   <class>KSqueezedTextLabel</class>
+   <extends>QWidget</extends>
+   <header>ksqueezedtextlabel.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
--- kcm_gtk/kcmgtk.cpp	2009/01/21 13:41:28	1.1
+++ kcm_gtk/kcmgtk.cpp	2009/01/21 13:41:28
@@ -52,7 +52,6 @@
 	connect(m_ui.fontChange, SIGNAL(clicked()), SLOT(fontChangeClicked()));
 	connect(m_ui.fontKde, SIGNAL(clicked(bool)), SLOT(fontKdeClicked()));
 	connect(m_ui.styleBox, SIGNAL(activated(int)), SLOT(styleChanged()));
-	connect(m_ui.styleKde, SIGNAL(clicked(bool)), SLOT(styleKdeClicked(bool)));
 	connect(m_ui.firefoxFix, SIGNAL(clicked()), SLOT(firefoxFixClicked()));
 	
 	m_gtkRc = new GtkRcFile(k_gtkRcFileName);
@@ -88,8 +87,6 @@
 {
 	m_gtkRc->load();
 	
-	m_ui.styleKde->setChecked(m_gtkRc->themeName() == k_qtThemeName);
-	m_ui.styleOther->setChecked(m_gtkRc->themeName() != k_qtThemeName);
 	m_ui.styleBox->setCurrentIndex(m_themes.keys().indexOf(m_gtkRc->themeName()));
 	
 	QFont defaultFont;
@@ -170,10 +167,7 @@
 	m_ui.styleBox->addItems(m_themes.keys());
 	
 	bool installed = m_themes.contains(k_qtThemeName);
-	m_ui.styleKde->setEnabled(installed);
-	m_ui.warning1->setHidden(installed);
-	m_ui.warning2->setHidden(installed);
-	m_ui.warning3->setHidden(installed);
+        m_ui.groupBox_3->setHidden(true);
 }
 
 void KcmGtk::fontChangeClicked()
@@ -198,7 +192,6 @@
 void KcmGtk::styleChanged()
 {
 	m_gtkRc->setTheme(m_themes[m_ui.styleBox->currentText()]);
-	m_ui.styleOther->setChecked(true);
 	changed(true);
 }
 
--- CMakeLists.txt	2009/01/21 13:41:28	1.1
+++ CMakeLists.txt	2009/01/21 13:41:28
@@ -81,7 +81,7 @@
 INCLUDE_DIRECTORIES(${GTK_INCLUDE_DIR} ${BONOBO_INCLUDE_DIR} ${QT_INCLUDES} ${X11_X11_INCLUDE_PATH})
 
 # Subdirectories
-ADD_SUBDIRECTORY(src)
+#ADD_SUBDIRECTORY(src)
 
 IF (DEFINED KDE4_FOUND)
 	ADD_SUBDIRECTORY(kcm_gtk)

Places

File build-only-kcm.diff of Package kcm_gtk (Revision d7cabe5a404afeccde057ac96c328727)

Places