[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 14:30:06
Message-ID: 1154874606.159119.17948.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 570361 by beaulen:

Port the last ui file to Ui4



 M  +2 -4      CMakeLists.txt  
 M  +3 -2      headereditor.cpp  
 A             headerwidget.cpp   [License: GPL (v2+) (+Qt exception)]
 A             headerwidget.h   [License: GPL (v2+) (+Qt exception)]
 M  +62 -58    headerwidget.ui  


--- trunk/KDE/kdesdk/kbabel/kbabel/CMakeLists.txt #570360:570361
@@ -16,6 +16,7 @@
 set(libkbabel_SRCS 
 	kbbookmarkhandler.cpp 
 	kbcatalog.cpp 
+	headerwidget.cpp
 	headereditor.cpp 
 	spelldlgwidget.cpp
 	spelldlg.cpp 
@@ -49,10 +50,6 @@
 
 set(kbabel_SRCS main.cpp ${libkbabel_SRCS} ${libkbabelcommonui_SRCS} ${libkbabeldict_SRCS})
 
-kde4_add_ui3_files(kbabel_SRCS
-			headerwidget.ui 
-                        )
-
 kde4_add_ui_files(kbabel_SRCS
                         colorpreferences.ui
                         editorpreferences.ui
@@ -60,6 +57,7 @@
                         spelldlgwidget.ui
                         fontpreferences.ui
                         searchpreferences.ui
+                        headerwidget.ui
                         )
 
 qt4_add_dbus_adaptor(kbabel_SRCS org.kde.kbabel.kbabel.xml kbabeliface.h KBabelIface)
--- trunk/KDE/kdesdk/kbabel/kbabel/headereditor.cpp #570360:570361
@@ -69,8 +69,9 @@
    setButtonWhatsThis (Default, i18n("<qt><p>This button "
 	"will revert all changes made so far.</p></qt>") );
 
-   _editor=new HeaderWidget(this,"internal headereditor");
-   _editor->setMinimumSize(_editorSize);
+   _editor = new HeaderWidget( this );
+   _editor->setObjectName( "internal headereditor" );
+   _editor->setMinimumSize( _editorSize );
 
    KCursor::setAutoHideCursor(_editor,true);
 
--- trunk/KDE/kdesdk/kbabel/kbabel/headerwidget.ui #570360:570361
@@ -1,58 +1,62 @@
-<!DOCTYPE UI><UI version="3.1" stdsetdef="1">
-<class>HeaderWidget</class>
-<widget class="QWidget">
-    <property name="name">
-        <cstring>HeaderWidget</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>401</width>
-            <height>380</height>
-        </rect>
-    </property>
-    <vbox>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <widget class="QLabel">
-            <property name="name">
-                <cstring>commentLabel</cstring>
-            </property>
-            <property name="text">
-                <string>&amp;Comment:</string>
-            </property>
-            <property name="buddy" stdset="0">
-                <cstring>commentEdit</cstring>
-            </property>
-        </widget>
-        <widget class="KTextEdit">
-            <property name="name">
-                <cstring>commentEdit</cstring>
-            </property>
-        </widget>
-        <widget class="QLabel">
-            <property name="name">
-                <cstring>headerLabel</cstring>
-            </property>
-            <property name="text">
-                <string>&amp;Header:</string>
-            </property>
-            <property name="buddy" stdset="0">
-                <cstring>headerEdit</cstring>
-            </property>
-        </widget>
-        <widget class="KTextEdit">
-            <property name="name">
-                <cstring>headerEdit</cstring>
-            </property>
-        </widget>
-    </vbox>
-</widget>
-<layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>ktextedit.h</includehint>
-    <includehint>ktextedit.h</includehint>
-</includehints>
-</UI>
+<ui version="4.0" >
+ <class>HeaderWidgetBase</class>
+ <widget class="QWidget" name="HeaderWidgetBase" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>401</width>
+    <height>380</height>
+   </rect>
+  </property>
+  <layout class="QVBoxLayout" >
+   <property name="margin" >
+    <number>11</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <item>
+    <widget class="QLabel" name="commentLabel" >
+     <property name="text" >
+      <string>&amp;Comment:</string>
+     </property>
+     <property name="buddy" >
+      <cstring>commentEdit</cstring>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="KTextEdit" name="commentEdit" />
+   </item>
+   <item>
+    <widget class="QLabel" name="headerLabel" >
+     <property name="text" >
+      <string>&amp;Header:</string>
+     </property>
+     <property name="buddy" >
+      <cstring>headerEdit</cstring>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="KTextEdit" name="headerEdit" />
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <customwidgets>
+  <customwidget>
+   <class>KTextEdit</class>
+   <extends>QTextEdit</extends>
+   <header>ktextedit.h</header>
+  </customwidget>
+ </customwidgets>
+ <includes>
+  <include location="local" >ktextedit.h</include>
+  <include location="local" >ktextedit.h</include>
+ </includes>
+ <resources/>
+ <connections/>
+</ui>
[prev in list] [next in list] [prev in thread] [next in thread]