From 7944ad1e6367e7ad2db6ac887232541d8498be5b Mon Sep 17 00:00:00 2001
From: uwolfer <uwolfer@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Sun, 10 Feb 2008 11:13:14 +0000
Subject: [PATCH] feature to change password for webinterface

git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/KDE/kdenetwork@773126 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kget/conf/dlgwebinterface.cpp |  8 ------
 kget/conf/dlgwebinterface.h   |  1 -
 kget/conf/dlgwebinterface.ui  | 63 +++++++++++++++++++++++++++++--------------
 kget/mainwindow.cpp           |  2 +-
 4 files changed, 44 insertions(+), 30 deletions(-)

diff --git a/kget/conf/dlgwebinterface.cpp b/kget/conf/dlgwebinterface.cpp
index d5886002f..a160ca019 100644
--- a/kget/conf/dlgwebinterface.cpp
+++ b/kget/conf/dlgwebinterface.cpp
@@ -16,9 +16,6 @@ DlgWebinterface::DlgWebinterface(QWidget *parent)
     : QWidget(parent)
 {
     setupUi(this);
-    changePasswordButton->setIcon(KIcon("dialog-password"));
-
-    connect(changePasswordButton, SIGNAL(clicked()), SLOT(changePasswordButtonClicked()));
 
     readConfig();
 }
@@ -35,9 +32,4 @@ void DlgWebinterface::saveSettings()
 {
 }
 
-void DlgWebinterface::changePasswordButtonClicked()
-{
-//TODO: implement
-}
-
 #include "dlgwebinterface.moc"
diff --git a/kget/conf/dlgwebinterface.h b/kget/conf/dlgwebinterface.h
index 87f1c77a7..c165015dd 100644
--- a/kget/conf/dlgwebinterface.h
+++ b/kget/conf/dlgwebinterface.h
@@ -26,7 +26,6 @@ public:
 private Q_SLOTS:
     void readConfig();
     void saveSettings();
-    void changePasswordButtonClicked();
 };
 
 #endif
diff --git a/kget/conf/dlgwebinterface.ui b/kget/conf/dlgwebinterface.ui
index 08b9c3652..f3d383096 100644
--- a/kget/conf/dlgwebinterface.ui
+++ b/kget/conf/dlgwebinterface.ui
@@ -13,6 +13,21 @@
    <string/>
   </property>
   <layout class="QVBoxLayout" >
+   <property name="spacing" >
+    <number>0</number>
+   </property>
+   <property name="leftMargin" >
+    <number>0</number>
+   </property>
+   <property name="topMargin" >
+    <number>0</number>
+   </property>
+   <property name="rightMargin" >
+    <number>0</number>
+   </property>
+   <property name="bottomMargin" >
+    <number>0</number>
+   </property>
    <item>
     <widget class="QGroupBox" name="kcfg_WebinterfaceEnabled" >
      <property name="title" >
@@ -32,15 +47,15 @@
         </property>
        </widget>
       </item>
-      <item rowspan="2" row="0" column="1" >
+      <item rowspan="3" row="0" column="1" >
        <spacer>
         <property name="orientation" >
          <enum>Qt::Horizontal</enum>
         </property>
         <property name="sizeHint" >
          <size>
-          <width>61</width>
-          <height>51</height>
+          <width>121</width>
+          <height>101</height>
          </size>
         </property>
        </spacer>
@@ -60,36 +75,37 @@
        </widget>
       </item>
       <item row="1" column="2" >
-       <widget class="QLineEdit" name="kcfg_WebinterfaceUser" />
-      </item>
-      <item row="2" column="0" colspan="2" >
-       <spacer>
-        <property name="orientation" >
-         <enum>Qt::Horizontal</enum>
+       <widget class="KLineEdit" name="kcfg_WebinterfaceUser" >
+        <property name="showClearButton" stdset="0" >
+         <bool>true</bool>
         </property>
-        <property name="sizeHint" >
-         <size>
-          <width>171</width>
-          <height>20</height>
-         </size>
+       </widget>
+      </item>
+      <item row="2" column="0" >
+       <widget class="QLabel" name="passwordLabel" >
+        <property name="text" >
+         <string>Password:</string>
         </property>
-       </spacer>
+       </widget>
       </item>
       <item row="2" column="2" >
-       <widget class="QPushButton" name="changePasswordButton" >
-        <property name="text" >
-         <string>Change Password...</string>
+       <widget class="KLineEdit" name="kcfg_WebinterfacePassword" >
+        <property name="showClearButton" stdset="0" >
+         <bool>true</bool>
+        </property>
+        <property name="passwordMode" >
+         <bool>true</bool>
         </property>
        </widget>
       </item>
-      <item row="3" column="0" colspan="2" >
+      <item row="3" column="0" colspan="3" >
        <spacer>
         <property name="orientation" >
          <enum>Qt::Vertical</enum>
         </property>
         <property name="sizeHint" >
          <size>
-          <width>131</width>
+          <width>361</width>
           <height>40</height>
          </size>
         </property>
@@ -113,6 +129,13 @@
    </item>
   </layout>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>KLineEdit</class>
+   <extends>QLineEdit</extends>
+   <header>klineedit.h</header>
+  </customwidget>
+ </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/kget/mainwindow.cpp b/kget/mainwindow.cpp
index a4147b705..d6dd28b02 100644
--- a/kget/mainwindow.cpp
+++ b/kget/mainwindow.cpp
@@ -606,7 +606,7 @@ void MainWindow::slotNewConfig()
 
     if (Settings::webinterfaceEnabled() && !m_webinterface) {
         m_webinterface = new HttpServer(this);
-    } else if (m_webinterface) {
+    } else if (m_webinterface && !Settings::webinterfaceEnabled()) {
         delete m_webinterface;
         m_webinterface = 0;
     }
-- 
2.11.4.GIT