[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdesdk/kbabel/kbabel
From:       Tim Beaulen <tbscope () gmail ! com>
Date:       2006-08-06 12:59:04
Message-ID: 1154869144.252932.7006.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 570324 by beaulen:

Port the font preferences widget to Ui4



 M  +2 -1      CMakeLists.txt  
 A             fontpreferences.cpp   [License: GPL (v2+) (+Qt exception)]
 A             fontpreferences.h   [License: GPL (v2+) (+Qt exception)]
 M  +67 -69    fontpreferences.ui  
 D             fontpreferences.ui.h  
 M  +3 -1      kbabelpref.cpp  


--- trunk/KDE/kdesdk/kbabel/kbabel/CMakeLists.txt #570323:570324
@@ -23,6 +23,7 @@
 	kbhighlighting.cpp 
 	mymultilineedit.cpp 
 	hidingmsgedit.cpp  
+	fontpreferences.cpp
 	kbabelpref.cpp      
 	kbcatalogview.cpp   
 	commentview.cpp     
@@ -49,12 +50,12 @@
 			searchpreferences.ui 
 			editorpreferences.ui 
 			editordiffpreferences.ui 
-			fontpreferences.ui 
 			headerwidget.ui 
                         )
 
 kde4_add_ui_files(kbabel_SRCS
                         spelldlgwidget.ui
+                        fontpreferences.ui
                         )
 
 qt4_add_dbus_adaptor(kbabel_SRCS org.kde.kbabel.kbabel.xml kbabeliface.h KBabelIface)
--- trunk/KDE/kdesdk/kbabel/kbabel/fontpreferences.ui #570323:570324
@@ -1,70 +1,68 @@
-<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
-<class>FontPreferences</class>
-<author>Stanislav Visnovsky</author>
-<customwidgets>
-	<customwidget>
-		<class>KFontChooser</class>
-		<header location="global">kfontdialog.h</header>
-	</customwidget>
-</customwidgets>
-<widget class="QWidget">
-    <property name="name">
-        <cstring>FontPreferences</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>595</width>
-            <height>515</height>
-        </rect>
-    </property>
-    <vbox>
-        <property name="name">
-            <cstring>unnamed</cstring>
+<ui version="4.0" >
+ <author>Stanislav Visnovsky</author>
+ <class>FontPreferencesBase</class>
+ <widget class="QWidget" name="FontPreferencesBase" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>595</width>
+    <height>515</height>
+   </rect>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="margin" >
+    <number>9</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <item row="0" column="0" >
+    <widget class="QGroupBox" name="groupBox" >
+     <property name="title" >
+      <string>Font for Messages</string>
+     </property>
+     <layout class="QGridLayout" >
+      <property name="margin" >
+       <number>9</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item row="0" column="0" >
+       <layout class="QVBoxLayout" >
+        <property name="margin" >
+         <number>0</number>
         </property>
-        <widget class="QGroupBox">
-            <property name="name">
-                <cstring>groupBox1</cstring>
-            </property>
-            <property name="title">
-                <string>Font for Messages</string>
-            </property>
-            <vbox>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <widget class="QCheckBox">
-                    <property name="name">
-                        <cstring>checkBox1</cstring>
-                    </property>
-                    <property name="text">
-                        <string>&amp;Show only fixed font</string>
-                    </property>
-                </widget>
-                <widget class="KFontChooser">
-                    <property name="name">
-                        <cstring>kcfg_MsgFont</cstring>
-                    </property>
-                </widget>
-            </vbox>
-        </widget>
-    </vbox>
-</widget>
-<connections>
-    <connection>
-        <sender>checkBox1</sender>
-        <signal>toggled(bool)</signal>
-        <receiver>FontPreferences</receiver>
-        <slot>showOnlyFixedFonts(bool)</slot>
-    </connection>
-</connections>
-<includes>
-    <include location="local" impldecl="in implementation">fontpreferences.ui.h</include>
-</includes>
-<slots>
-    <slot access="private">showOnlyFixedFonts( bool on )</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
-
-</UI>
+        <property name="spacing" >
+         <number>6</number>
+        </property>
+        <item>
+         <widget class="QCheckBox" name="checkBox1" >
+          <property name="text" >
+           <string>&amp;Show only fixed font</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="KFontChooser" name="kcfg_MsgFont" />
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <customwidgets>
+  <customwidget>
+   <class>KFontChooser</class>
+   <extends>QWidget</extends>
+   <header>kfontdialog.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>
--- trunk/KDE/kdesdk/kbabel/kbabel/kbabelpref.cpp #570323:570324
@@ -90,7 +90,9 @@
 	, "diff"
         , i18n("Options for Showing Differences"));
 
-    addPage(new FontPreferences(0, "fonts")
+    FontPreferences *fontPreferences = new FontPreferences( 0 );
+    fontPreferences->setObjectName( "fonts" );
+    addPage( fontPreferences
 	, i18nc("name of page in preferences dialog icon list","Fonts")
 	, "font"
         , i18nc("title of page in preferences dialog","Font Settings"));
[prev in list] [next in list] [prev in thread] [next in thread]