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

List:       kde-commits
Subject:    KDE/kdebase/apps/plasma/applets/folderview
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2010-05-21 0:27:09
Message-ID: 20100521002709.28E90AC8BC () svn ! kde ! org
[Download RAW message or body]

SVN commit 1129004 by aseigo:

tweak out the Apply button, hide the Header title when appropriate
BUG:201675


 M  +22 -0     folderview.cpp  
 M  +6 -1      folderviewDisplayConfig.ui  
 M  +11 -3     folderviewFilterConfig.ui  


--- trunk/KDE/kdebase/apps/plasma/applets/folderview/folderview.cpp #1129003:1129004
@@ -489,6 +489,7 @@
     if (isContainment()) {
         uiDisplay.lblCustomLabel->hide();
         uiDisplay.labelEdit->hide();
+        uiDisplay.headerTitle->hide();
     }
 
     uiDisplay.labelEdit->setText(m_titleText);
@@ -575,6 +576,27 @@
             }
         }
     }
+
+    connect(uiDisplay.labelEdit, SIGNAL(textChanged(QString)), parent, \
SLOT(settingsModified())); +    connect(uiDisplay.flowCombo, \
SIGNAL(currentIndexChanged(int)), parent, SLOT(settingsModified())); +    \
connect(uiDisplay.sortCombo, SIGNAL(currentIndexChanged(int)), parent, \
SLOT(settingsModified())); +    connect(uiDisplay.sizeSlider, \
SIGNAL(sliderMoved(int)), parent, SLOT(settingsModified())); +    \
connect(uiDisplay.showPreviews, SIGNAL(toggled(bool)), parent, \
SLOT(settingsModified())); +    connect(uiDisplay.lockInPlace, SIGNAL(toggled(bool)), \
parent, SLOT(settingsModified())); +    connect(uiDisplay.alignToGrid, \
SIGNAL(toggled(bool)), parent, SLOT(settingsModified())); +    \
connect(uiDisplay.numLinesEdit, SIGNAL(valueChanged(int)), parent, \
SLOT(settingsModified())); +    connect(uiDisplay.colorButton, \
SIGNAL(changed(QColor)), parent, SLOT(settingsModified())); +    \
connect(uiDisplay.drawShadows, SIGNAL(toggled(bool)), parent, \
SLOT(settingsModified())); +
+    connect(uiFilter.filterType, SIGNAL(currentIndexChanged(int)), parent, \
SLOT(settingsModified())); +    connect(uiFilter.filterFilesPattern, \
SIGNAL(textChanged(QString)), parent, SLOT(settingsModified())); +    \
connect(uiFilter.filterFilesList->model(), \
SIGNAL(dataChanged(QModelIndex,QModelIndex)), parent, SLOT(settingsModified())); +
+    connect(uiLocation.showDesktopFolder, SIGNAL(toggled(bool)), parent, \
SLOT(settingsModified())); +    connect(uiLocation.showPlace, SIGNAL(toggled(bool)), \
parent, SLOT(settingsModified())); +    connect(uiLocation.showCustomFolder, \
SIGNAL(toggled(bool)), parent, SLOT(settingsModified())); +    \
connect(uiLocation.placesCombo, SIGNAL(currentIndexChagned(int)), parent, \
SLOT(settingsModified())); +    connect(uiLocation.lineEdit, \
SIGNAL(textChanged(QString)), parent, SLOT(settingsModified()));  }
 
 void FolderView::configAccepted()
--- trunk/KDE/kdebase/apps/plasma/applets/folderview/folderviewDisplayConfig.ui \
#1129003:1129004 @@ -12,7 +12,7 @@
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="0" column="0" colspan="2">
-    <widget class="QLabel" name="label_13">
+    <widget class="QLabel" name="headerTitle">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
        <horstretch>0</horstretch>
@@ -471,6 +471,11 @@
    <header>klineedit.h</header>
   </customwidget>
   <customwidget>
+   <class>KComboBox</class>
+   <extends>QComboBox</extends>
+   <header>kcombobox.h</header>
+  </customwidget>
+  <customwidget>
    <class>KColorButton</class>
    <extends>QPushButton</extends>
    <header>kcolorbutton.h</header>
--- trunk/KDE/kdebase/apps/plasma/applets/folderview/folderviewFilterConfig.ui \
#1129003:1129004 @@ -121,6 +121,9 @@
             </item>
             <item>
              <spacer name="verticalSpacer">
+              <property name="orientation">
+               <enum>Qt::Vertical</enum>
+              </property>
               <property name="sizeHint" stdset="0">
                <size>
                 <width>20</width>
@@ -135,7 +138,7 @@
         </item>
         <item row="3" column="0">
          <widget class="KLineEdit" name="searchMimetype">
-          <property name="clickMessage" stdset="0">
+          <property name="clickMessage">
            <string>Search file type</string>
           </property>
           <property name="showClearButton" stdset="0">
@@ -174,10 +177,10 @@
           <property name="alignment">
            <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
           </property>
-          <property name="urlDropsEnabled" stdset="0">
+          <property name="urlDropsEnabled">
            <bool>false</bool>
           </property>
-          <property name="clickMessage" stdset="0">
+          <property name="clickMessage">
            <string>Pattern filter</string>
           </property>
           <property name="showClearButton" stdset="0">
@@ -198,6 +201,11 @@
    <extends>QLineEdit</extends>
    <header>klineedit.h</header>
   </customwidget>
+  <customwidget>
+   <class>KComboBox</class>
+   <extends>QComboBox</extends>
+   <header>kcombobox.h</header>
+  </customwidget>
  </customwidgets>
  <includes>
   <include location="global">KDE/KUrlRequester</include>


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