generic: adjust to Katie changes

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/kcontrol/dateandtime/dtime.cpp b/kcontrol/dateandtime/dtime.cpp
index b2afb2a..5fc59bb 100644 (file)
--- a/kcontrol/dateandtime/dtime.cpp
+++ b/kcontrol/dateandtime/dtime.cpp
@@ -94,8 +94,6 @@ Dtime::Dtime(QWidget * parent)
   v3->addStretch();
 
   timeEdit = new QTimeEdit( timeBox );
-  timeEdit->setWrapping(true);
-  timeEdit->setDisplayFormat(KGlobal::locale()->timeFormat(QLocale::ShortFormat));
   v3->addWidget(timeEdit);
 
   v3->addStretch();

diff --git a/plasma/wallpapers/image/image.cpp b/plasma/wallpapers/image/image.cpp
index 431b23d..e31a723 100644 (file)
--- a/plasma/wallpapers/image/image.cpp
+++ b/plasma/wallpapers/image/image.cpp
@@ -217,7 +217,9 @@ QWidget* Image::createConfigurationInterface(QWidget* parent)
         QTime time(0, 0, 0);
         time = time.addSecs(m_delay);
         m_uiSlideshow.m_slideshowDelay->setTime(time);
-        m_uiSlideshow.m_slideshowDelay->setMinimumTime(QTime(0, 0, 10));
+        m_uiSlideshow.m_slideshowDelay->setTimeRange(
+            QTime(0, 0, 10), m_uiSlideshow.m_slideshowDelay->maximumTime()
+        );
         connect(m_uiSlideshow.m_slideshowDelay, SIGNAL(timeChanged(QTime)),
                 this, SLOT(timeChanged(QTime)));
 
@@ -250,7 +252,7 @@ QWidget* Image::createConfigurationInterface(QWidget* parent)
         connect(m_uiSlideshow.m_addDir, SIGNAL(clicked()), this, SLOT(modified()));
         connect(m_uiSlideshow.m_removeDir, SIGNAL(clicked()), this, SLOT(modified()));
         connect(m_uiSlideshow.m_slideshowDelay, SIGNAL(dateTimeChanged(QDateTime)), this, SLOT(modified()));
-       connect(m_uiSlideshow.m_dirlist, SIGNAL(currentRowChanged(int)), SLOT(updateDirs()));
+        connect(m_uiSlideshow.m_dirlist, SIGNAL(currentRowChanged(int)), SLOT(updateDirs()));
     }
 
     connect(this, SIGNAL(settingsChanged(bool)), parent, SLOT(settingsChanged(bool)));

diff --git a/plasma/wallpapers/image/slideshowconfig.ui b/plasma/wallpapers/image/slideshowconfig.ui
index c462649..ce3dfa6 100644 (file)
--- a/plasma/wallpapers/image/slideshowconfig.ui
+++ b/plasma/wallpapers/image/slideshowconfig.ui
@@ -125,17 +125,7 @@
     </widget>
    </item>
    <item row="2" column="1">
-    <widget class="QDateTimeEdit" name="m_slideshowDelay">
-     <property name="dateTime">
-      <datetime>
-       <hour>0</hour>
-       <minute>0</minute>
-       <second>0</second>
-       <year>2000</year>
-       <month>1</month>
-       <day>1</day>
-      </datetime>
-     </property>
+    <widget class="QTimeEdit" name="m_slideshowDelay">
      <property name="time">
       <time>
        <hour>0</hour>
@@ -143,12 +133,6 @@
        <second>0</second>
       </time>
      </property>
-     <property name="currentSection">
-      <enum>QDateTimeEdit::HourSection</enum>
-     </property>
-     <property name="displayFormat">
-      <string comment="(qtdt-format) Please do not change the quotes (') and translate only the content of the quotes.">hh 'Hours' mm 'Mins' ss 'Secs'</string>
-     </property>
     </widget>
    </item>
    <item row="3" column="0">