[Openvas-commits] r10486 - in trunk/gsd: . src

[scm-commit@wald.intevation.org]

Author: raimund
Date: 2011-03-07 17:04:57 +0100 (Mon, 07 Mar 2011)
New Revision: 10486

Modified:
   trunk/gsd/ChangeLog
   trunk/gsd/src/dlg_modify_credential.ui
   trunk/gsd/src/gsd_dialogs.h
Log:
Removed password change checkbox in credentials editor.

* src/gsd_dialogs.h: Removed obsolete code.

* src/dlg_modify_credential.ui: Removed checkbox.



Modified: trunk/gsd/ChangeLog
===================================================================
--- trunk/gsd/ChangeLog	2011-03-07 15:43:15 UTC (rev 10485)
+++ trunk/gsd/ChangeLog	2011-03-07 16:04:57 UTC (rev 10486)
@@ -1,3 +1,11 @@
+2011-03-07  Raimund Renkert <raimund.renkert at greenbone.net>
+
+	Removed password change checkbox in credentials editor.
+
+	* src/gsd_dialogs.h: Removed obsolete code.
+
+	* src/dlg_modify_credential.ui: Removed checkbox.
+
 2011-03-03  Raimund Renkert <raimund.renkert at greenbone.net>
 
 	Added credential editor.

Modified: trunk/gsd/src/dlg_modify_credential.ui
===================================================================
--- trunk/gsd/src/dlg_modify_credential.ui	2011-03-07 15:43:15 UTC (rev 10485)
+++ trunk/gsd/src/dlg_modify_credential.ui	2011-03-07 16:04:57 UTC (rev 10486)
@@ -9,7 +9,7 @@
     <x>0</x>
     <y>0</y>
     <width>400</width>
-    <height>204</height>
+    <height>178</height>
    </rect>
   </property>
   <property name="windowTitle" >
@@ -51,34 +51,20 @@
     <widget class="QLineEdit" name="le_login" />
    </item>
    <item row="3" column="0" >
-    <widget class="QLabel" name="label_5" >
-     <property name="text" >
-      <string>Repace existing value</string>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="1" >
-    <widget class="QCheckBox" name="cb_replace" >
-     <property name="text" >
-      <string/>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="0" >
     <widget class="QLabel" name="label_4" >
      <property name="text" >
       <string>Password:</string>
      </property>
     </widget>
    </item>
-   <item row="4" column="1" colspan="3" >
+   <item row="3" column="1" colspan="3" >
     <widget class="QLineEdit" name="le_password" >
      <property name="echoMode" >
       <enum>QLineEdit::Password</enum>
      </property>
     </widget>
    </item>
-   <item row="5" column="0" >
+   <item row="4" column="0" >
     <spacer name="verticalSpacer" >
      <property name="orientation" >
       <enum>Qt::Vertical</enum>
@@ -91,21 +77,21 @@
      </property>
     </spacer>
    </item>
-   <item row="5" column="2" >
+   <item row="4" column="2" >
     <widget class="QPushButton" name="pb_cancel" >
      <property name="text" >
       <string>Cancel</string>
      </property>
     </widget>
    </item>
-   <item row="5" column="3" >
+   <item row="4" column="3" >
     <widget class="QPushButton" name="pb_save" >
      <property name="text" >
       <string>Save</string>
      </property>
     </widget>
    </item>
-   <item row="5" column="1" >
+   <item row="4" column="1" >
     <spacer name="horizontalSpacer" >
      <property name="orientation" >
       <enum>Qt::Horizontal</enum>

Modified: trunk/gsd/src/gsd_dialogs.h
===================================================================
--- trunk/gsd/src/gsd_dialogs.h	2011-03-07 15:43:15 UTC (rev 10485)
+++ trunk/gsd/src/gsd_dialogs.h	2011-03-07 16:04:57 UTC (rev 10486)
@@ -991,10 +991,7 @@
         else
           {
             login = le_login->text ();
-            if (cb_replace->isChecked ())
-              password = le_password->text ();
-            else
-              password = "";
+            password = le_password->text ();
           }
         emit sig_modify (le_name->text (),
                          le_comment->text (),
@@ -1021,7 +1018,6 @@
     void setLogin (QString login) {this->le_login->setText (login);};
     void setAutogenerated (bool val) {generated = val;
                                       this->le_login->setEnabled (!val);
-                                      this->cb_replace->setEnabled (!val);
                                       this->le_password->setEnabled (!val);};
  };
 /**