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

List:       kde-commits
Subject:    KDE/kdepim/akonadiconsole
From:       Kevin Ottens <ervin () kde ! org>
Date:       2010-11-23 9:11:53
Message-ID: 20101123091153.4F5F6AC8A2 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1199937 by ervin:

Use KEditListWidget instead of KEditListBox when available.


 M  +14 -2     CMakeLists.txt  
 A             browserwidget_contentview-45.ui   browserwidget_contentview.ui#1199909
 M  +29 -20    browserwidget_contentview.ui  
 A             collectioninternalspage-45.ui   collectioninternalspage.ui#1199909
 M  +19 -9     collectioninternalspage.ui  


--- trunk/KDE/kdepim/akonadiconsole/CMakeLists.txt #1199936:1199937
@@ -58,15 +58,27 @@
   agentwidget.ui
   agentconfigdialog.ui
   browserwidget_itemview.ui
-  browserwidget_contentview.ui
   collectionattributespage.ui
-  collectioninternalspage.ui
   collectionaclpage.ui
   dbbrowser.ui
   dbconsole.ui
   rawsocketconsole.ui
 )
 
+macro_ensure_version( "4.5.74" ${KDE_VERSION} KDE_IS_AT_LEAST_4_5_74 )
+
+if(KDE_IS_AT_LEAST_4_5_74)
+  kde4_add_ui_files(akonadiconsole_bin_SRCS
+    browserwidget_contentview.ui
+    collectioninternalspage.ui
+  )
+else(KDE_IS_AT_LEAST_4_5_74)
+  kde4_add_ui_files(akonadiconsole_bin_SRCS
+    browserwidget_contentview-45.ui
+    collectioninternalspage-45.ui
+  )
+endif(KDE_IS_AT_LEAST_4_5_74)
+
 kde4_add_kcfg_files(akonadiconsole_bin_SRCS settings.kcfgc)
 
 kde4_add_app_icon(akonadiconsole_bin_SRCS "${KDE4_ICON_DIR}/oxygen/*/apps/akonadi.png")
--- trunk/KDE/kdepim/akonadiconsole/browserwidget_contentview.ui #1199936:1199937
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>507</width>
+    <width>622</width>
     <height>496</height>
    </rect>
   </property>
@@ -14,7 +14,7 @@
    <item row="0" column="0" colspan="2">
     <widget class="KTabWidget" name="mainTabWidget">
      <property name="currentIndex">
-      <number>0</number>
+      <number>3</number>
      </property>
      <widget class="QWidget" name="tab">
       <attribute name="title">
@@ -76,7 +76,7 @@
             <number>0</number>
            </property>
            <item>
-            <widget class="CalendarSupport::IncidenceViewer" name="incidenceView"/>
+            <widget class="CalendarSupport::IncidenceViewer" name="incidenceView" native="true"/>
            </item>
           </layout>
          </widget>
@@ -292,23 +292,32 @@
         </layout>
        </item>
        <item row="6" column="0">
-        <widget class="KEditListBox" name="flags">
+        <widget class="QGroupBox" name="groupBox">
+         <property name="title">
+          <string>Flags</string>
+         </property>
+         <layout class="QVBoxLayout" name="verticalLayout_6">
+          <item>
+           <widget class="KEditListWidget" name="flags">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
            <horstretch>0</horstretch>
            <verstretch>1</verstretch>
           </sizepolicy>
          </property>
-         <property name="title">
+            <property name="buttons">
+             <set>KEditListWidget::Add|KEditListWidget::Remove</set>
+            </property>
+            <property name="title" stdset="0">
           <string>Flags</string>
          </property>
-         <property name="buttons">
-          <set>KEditListBox::Add|KEditListBox::Remove</set>
-         </property>
         </widget>
        </item>
       </layout>
      </widget>
+       </item>
+      </layout>
+     </widget>
      <widget class="QWidget" name="tab_5">
       <attribute name="title">
        <string>Nepomuk</string>
@@ -417,12 +426,6 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>KEditListBox</class>
-   <extends>QGroupBox</extends>
-   <header>keditlistbox.h</header>
-   <container>1</container>
-  </customwidget>
-  <customwidget>
    <class>KPushButton</class>
    <extends>QPushButton</extends>
    <header>kpushbutton.h</header>
@@ -439,11 +442,23 @@
    <container>1</container>
   </customwidget>
   <customwidget>
+   <class>KEditListWidget</class>
+   <extends>QWidget</extends>
+   <header>keditlistwidget.h</header>
+   <container>1</container>
+  </customwidget>
+  <customwidget>
    <class>KTextBrowser</class>
    <extends>QTextBrowser</extends>
    <header>ktextbrowser.h</header>
   </customwidget>
   <customwidget>
+   <class>KRatingWidget</class>
+   <extends>QFrame</extends>
+   <header>kratingwidget.h</header>
+   <container>1</container>
+  </customwidget>
+  <customwidget>
    <class>CalendarSupport::IncidenceViewer</class>
    <extends>QWidget</extends>
    <header location="global">calendarsupport/incidenceviewer.h</header>
@@ -460,12 +475,6 @@
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>KRatingWidget</class>
-   <extends>QFrame</extends>
-   <header location="global">nepomuk/kratingwidget.h</header>
-   <container>1</container>
-  </customwidget>
-  <customwidget>
    <class>Akonadi::ContactViewer</class>
    <extends>QWidget</extends>
    <header location="global">akonadi/contact/contactviewer.h</header>
--- trunk/KDE/kdepim/akonadiconsole/collectioninternalspage.ui #1199936:1199937
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0" >
  <class>CollectionInternalsPage</class>
  <widget class="QWidget" name="CollectionInternalsPage" >
@@ -5,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>400</width>
+    <width>526</width>
     <height>442</height>
    </rect>
   </property>
@@ -72,21 +73,30 @@
     </widget>
    </item>
    <item>
-    <widget class="KEditListBox" name="contentTypes" >
+    <widget class="QGroupBox" name="groupBox_2">
      <property name="title" >
       <string>Content Types</string>
      </property>
+     <layout class="QVBoxLayout" name="verticalLayout">
+      <item>
+       <widget class="KEditListWidget" name="contentTypes">
      <property name="buttons" >
-      <set>KEditListBox::Add|KEditListBox::Remove</set>
+         <set>KEditListWidget::Add|KEditListWidget::Remove</set>
      </property>
+        <property name="title" stdset="0">
+         <string>Content Types</string>
+        </property>
     </widget>
    </item>
+     </layout>
+    </widget>
+   </item>
    <item>
     <spacer>
      <property name="orientation" >
       <enum>Qt::Vertical</enum>
      </property>
-     <property name="sizeHint" >
+     <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>40</height>
@@ -98,15 +108,15 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>KEditListBox</class>
-   <extends>QGroupBox</extends>
-   <header>keditlistbox.h</header>
-  </customwidget>
-  <customwidget>
    <class>KLineEdit</class>
    <extends>QLineEdit</extends>
    <header>klineedit.h</header>
   </customwidget>
+  <customwidget>
+   <class>KEditListWidget</class>
+   <extends>QWidget</extends>
+   <header>keditlistwidget.h</header>
+  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
[prev in list] [next in list] [prev in thread] [next in thread]