1 files changed, 21 insertions, 24 deletions

diff --git a/abs/core/mythinstall/MythVantage-app/mythinstall/password_manage.h b/abs/core/mythinstall/MythVantage-app/mythinstall/password_manage.h
index 049cbce..cea7010 100755
--- a/abs/core/mythinstall/MythVantage-app/mythinstall/password_manage.h
+++ b/abs/core/mythinstall/MythVantage-app/mythinstall/password_manage.h
@@ -1,24 +1,24 @@
-#include <settings.h>
+//#include <settings.h>
+#include "standardsettings.h"
 #include "mythdialogs.h"
 //#include "libmyth/mythdialogs.h"
 #include "libmyth/mythwidgets.h"
 #include "installsettings.h"
 #include <QTextStream>
 
-class UserManagement: public
-        VerticalConfigurationGroup {
+class UserManagement: public GroupSetting {
     Q_OBJECT
 public:
     UserManagement();
-    TransComboBoxSetting *userlist;
-    TransLineEditSetting *userpass1;
-    TransButtonSetting   *userapplyButton;
-    TransButtonSetting   *usercreateButton;
-    TransButtonSetting   *userdeleteButton;
-    TransButtonSetting   *passToggleButton;
-    TransLabelSetting    *info;
-    TransCheckBoxSetting *lockaccount;
-    HostCheckBox    *rootSSH;
+    HostComboBoxSetting *userlist;
+    HostTextEditSetting *userpass1;
+    ButtonStandardSetting   *userapplyButton;
+    ButtonStandardSetting   *usercreateButton;
+    ButtonStandardSetting   *userdeleteButton;
+    ButtonStandardSetting   *passToggleButton;
+//    TransLabelSetting    *info;
+//    TransMythUICheckBoxSetting *lockaccount;
+    HostCheckBoxSetting    *rootSSH;
     void user_fillselection(void);
     bool user_exist_check(QString);
     bool user_valid_check(QString);
@@ -33,29 +33,26 @@ public slots:
 
 
 
-class WebPassword: public
-        TriggeredConfigurationGroup {
+class WebPassword: public GroupSetting {
     Q_OBJECT
 public:
     WebPassword();
-    HostLineEdit    *webuser;
-    HostLineEdit    *webpassword;
-    HostCheckBox    *webAuth;
-    TransButtonSetting   *webpassToggleButton;
-    TransLabelSetting    *info;
+    HostTextEditSetting    *webuser;
+    HostTextEditSetting    *webpassword;
+    HostCheckBoxSetting    *webAuth;
+    ButtonStandardSetting   *webpassToggleButton;
+//    TransLabelSetting    *info;
     bool valid_check(QString);
-    TransButtonSetting   *webapplyButton;
+    ButtonStandardSetting   *webapplyButton;
 
 public slots:
     void webpassword_gathersettings();
     void togglepass();
 };
 
-class WebPasswordFrame: public
-        VerticalConfigurationGroup {
+class WebPasswordFrame: public GroupSetting {
     Q_OBJECT
 public:
     WebPasswordFrame();
-    TransButtonSetting   *webapplyButton;
-
+    ButtonStandardSetting   *webapplyButton;
 };