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

List:       kde-commits
Subject:    playground/base/plasma/applets/networkmanager/libs/ui
From:       Will Stephenson <wstephenson () kde ! org>
Date:       2009-01-29 10:40:40
Message-ID: 1233225640.490882.26216.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 918111 by wstephens:

More cellular settings fixes.  Anyone want to test CDMA for me?

 M  +15 -8     cdma.ui  
 M  +14 -2     cdmawidget.cpp  
 M  +3 -0      cdmawidget.h  
 M  +3 -4      gsmwidget.cpp  


--- trunk/playground/base/plasma/applets/networkmanager/libs/ui/cdma.ui #918110:918111
@@ -5,8 +5,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>173</width>
-    <height>109</height>
+    <width>183</width>
+    <height>168</height>
    </rect>
   </property>
   <property name="windowTitle" >
@@ -21,12 +21,12 @@
         <string>&amp;Number</string>
        </property>
        <property name="buddy" >
-        <cstring>kcfg_number</cstring>
+        <cstring>number</cstring>
        </property>
       </widget>
      </item>
      <item row="0" column="1" >
-      <widget class="KLineEdit" name="kcfg_number" />
+      <widget class="KLineEdit" name="number" />
      </item>
      <item row="1" column="0" >
       <widget class="QLabel" name="label_2" >
@@ -34,12 +34,12 @@
         <string>&amp;Username</string>
        </property>
        <property name="buddy" >
-        <cstring>kcfg_username</cstring>
+        <cstring>username</cstring>
        </property>
       </widget>
      </item>
      <item row="1" column="1" >
-      <widget class="KLineEdit" name="kcfg_username" />
+      <widget class="KLineEdit" name="username" />
      </item>
      <item row="2" column="0" >
       <widget class="QLabel" name="label_3" >
@@ -47,12 +47,12 @@
         <string>&amp;Password</string>
        </property>
        <property name="buddy" >
-        <cstring>kcfg_password</cstring>
+        <cstring>password</cstring>
        </property>
       </widget>
      </item>
      <item row="2" column="1" >
-      <widget class="KLineEdit" name="kcfg_password" >
+      <widget class="KLineEdit" name="password" >
        <property name="minimumSize" >
         <size>
          <width>100</width>
@@ -64,6 +64,13 @@
     </layout>
    </item>
    <item>
+    <widget class="QCheckBox" name="chkShowPass" >
+     <property name="text" >
+      <string>&amp;Show password</string>
+     </property>
+    </widget>
+   </item>
+   <item>
     <spacer name="verticalSpacer" >
      <property name="orientation" >
       <enum>Qt::Vertical</enum>
--- trunk/playground/base/plasma/applets/networkmanager/libs/ui/cdmawidget.cpp #918110:918111
@@ -36,6 +36,8 @@
 {
     d->ui.setupUi(this);
     d->setting = static_cast<Knm::CdmaSetting *>(connection->setting(Knm::Setting::Cdma));
+    connect(d->ui.chkShowPass, SIGNAL(stateChanged(int)), this, SLOT(chkShowPassToggled()));
+    d->ui.password->setEchoMode(QLineEdit::Password);
 }
 
 CdmaWidget::~CdmaWidget()
@@ -43,19 +45,29 @@
     delete d;
 }
 
+void CdmaWidget::chkShowPassToggled()
+{
+    bool on = d->ui.chkShowPass->isChecked();
+    d->ui.password->setEchoMode(on ? QLineEdit::Normal : QLineEdit::Password);
+}
+
 void CdmaWidget::readConfig()
 {
+    d->ui.number->setText(d->setting->number());
+    d->ui.username->setText(d->setting->username());
 
 }
 
 void CdmaWidget::writeConfig()
 {
-
+    d->setting->setNumber(d->ui.number->text());
+    d->setting->setUsername(d->ui.username->text());
+    d->setting->setPassword(d->ui.password->text());
 }
 
 void CdmaWidget::readSecrets()
 {
-
+    d->ui.password->setText(d->setting->password());
 }
 
 
--- trunk/playground/base/plasma/applets/networkmanager/libs/ui/cdmawidget.h #918110:918111
@@ -32,12 +32,15 @@
 
 class KNM_EXPORT CdmaWidget : public SettingWidget
 {
+Q_OBJECT
 public:
     CdmaWidget(Knm::Connection * connection, QWidget * parent = 0 );
     virtual ~CdmaWidget();
     void readConfig();
     void writeConfig();
     void readSecrets();
+protected Q_SLOTS:
+    void chkShowPassToggled();
 private:
     class Private;
     Private * d;
--- trunk/playground/base/plasma/applets/networkmanager/libs/ui/gsmwidget.cpp #918110:918111
@@ -36,6 +36,9 @@
 {
     d->ui.setupUi(this);
     d->setting = static_cast<Knm::GsmSetting *>(connection->setting(Knm::Setting::Gsm));
+    connect(d->ui.chkShowPass, SIGNAL(stateChanged(int)), this, SLOT(chkShowPassToggled()));
+    d->ui.pin->setEchoMode(QLineEdit::Password);
+    d->ui.puk->setEchoMode(QLineEdit::Password);
 }
 
 GsmWidget::~GsmWidget()
@@ -50,11 +53,7 @@
     d->ui.apn->setText(d->setting->apn());
     d->ui.network->setText(d->setting->networkid());
     d->ui.band->setValue(d->setting->band());
-
-    connect(d->ui.chkShowPass, SIGNAL(stateChanged(int)), this, SLOT(chkShowPassToggled()));
     d->ui.password->setEchoMode(QLineEdit::Password);
-    d->ui.pin->setEchoMode(QLineEdit::Password);
-    d->ui.puk->setEchoMode(QLineEdit::Password);
 }
 
 void GsmWidget::chkShowPassToggled()
[prev in list] [next in list] [prev in thread] [next in thread]