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

List:       kde-commits
Subject:    playground/utils/filelight/src/part
From:       Martin Tobias Holmedahl Sandsmark <sandsmark () samfundet ! no>
Date:       2010-01-25 22:47:22
Message-ID: 1264459642.433196.32363.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1080249 by sandsmark:

use the kdialog correctly, a qwidget instead of a kdialog in the .ui, saner naming \
for a couple of widgets in the .ui

 M  +7 -51     dialog.ui  
 M  +4 -6      settingsDialog.cpp  


--- trunk/playground/utils/filelight/src/part/dialog.ui #1080248:1080249
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>Dialog</class>
- <widget class="KDialog" name="Dialog">
+ <widget class="QWidget" name="Dialog">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -14,6 +14,9 @@
    <string>Settings - Filelight</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_3">
+   <property name="margin">
+    <number>0</number>
+   </property>
    <item>
     <widget class="QTabWidget" name="tabWidget">
      <property name="sizePolicy">
@@ -61,7 +64,7 @@
        <item>
         <layout class="QHBoxLayout">
          <item>
-          <spacer name="spacer2">
+          <spacer name="m_removeAddSpacer">
            <property name="orientation">
             <enum>Qt::Horizontal</enum>
            </property>
@@ -105,7 +108,7 @@
         </layout>
        </item>
        <item>
-        <widget class="Line" name="line1">
+        <widget class="Line" name="m_scanningSeparatorLine">
          <property name="minimumSize">
           <size>
            <width>0</width>
@@ -129,7 +132,7 @@
        <item>
         <layout class="QGridLayout">
          <item row="1" column="0" rowspan="2">
-          <spacer name="spacer3">
+          <spacer name="m_excludeCheckBoxSpacer">
            <property name="orientation">
             <enum>Qt::Horizontal</enum>
            </property>
@@ -393,52 +396,6 @@
      </widget>
     </widget>
    </item>
-   <item>
-    <layout class="QHBoxLayout">
-     <property name="sizeConstraint">
-      <enum>QLayout::SetFixedSize</enum>
-     </property>
-     <item>
-      <widget class="QPushButton" name="m_resetButton">
-       <property name="whatsThis">
-        <string>Reset any changes you have made since you opened this \
                dialog.</string>
-       </property>
-       <property name="text">
-        <string>&amp;Reset</string>
-       </property>
-       <property name="autoDefault">
-        <bool>false</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="spacer1">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeType">
-        <enum>QSizePolicy::Expanding</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>120</width>
-         <height>30</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QPushButton" name="m_closeButton">
-       <property name="text">
-        <string>&amp;Close</string>
-       </property>
-       <property name="default">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
@@ -453,7 +410,6 @@
  <tabstops>
   <tabstop>tabWidget</tabstop>
   <tabstop>varyLabelFontSizes</tabstop>
-  <tabstop>m_resetButton</tabstop>
   <tabstop>m_removeButton</tabstop>
   <tabstop>m_addButton</tabstop>
   <tabstop>scanAcrossMounts</tabstop>
--- trunk/playground/utils/filelight/src/part/settingsDialog.cpp #1080248:1080249
@@ -38,9 +38,9 @@
 
 SettingsDialog::SettingsDialog(QWidget *parent) : KDialog(parent)
 {
-    setButtons(0);//TODO, use the kdialog buttons
+    setButtons(KDialog::Reset | KDialog::Close);
 
-    setupUi(this);
+    setupUi(this->mainWidget());
     QVBoxLayout *vbox = new QVBoxLayout;
     //colourSchemeGroup->setFrameShape(QFrame::NoFrame);
 
@@ -57,8 +57,8 @@
 
     connect(m_addButton,    SIGNAL(clicked()), SLOT(addFolder()));
     connect(m_removeButton, SIGNAL(clicked()), SLOT(removeFolder()));
-    connect(m_resetButton,  SIGNAL(clicked()), SLOT(reset()));
-    connect(m_closeButton,  SIGNAL(clicked()), SLOT(close()));
+    connect(this,  SIGNAL(resetClicked()), SLOT(reset()));
+    connect(this,  SIGNAL(closeClicked()), SLOT(close()));
 
     connect(colourSchemeGroup, SIGNAL(clicked(int)), SLOT(changeScheme(int)));
     connect(contrastSlider, SIGNAL(valueChanged(int)), SLOT(changeContrast(int)));
@@ -76,8 +76,6 @@
 
     m_addButton->setIcon(SmallIcon("folder-open"));
     m_removeButton->setIcon(SmallIcon("list-remove"));
-    m_resetButton->setIcon(SmallIcon("edit-undo"));
-    m_closeButton->setIcon(SmallIcon("dialog-close"));
 }
 
 


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