From kde-commits  Thu Jan 29 09:21:24 2009
From: Will Stephenson <wstephenson () kde ! org>
Date: Thu, 29 Jan 2009 09:21:24 +0000
To: kde-commits
Subject: playground/base/plasma/applets/networkmanager
Message-Id: <1233220884.439301.24898.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=123322090003461

SVN commit 918106 by wstephens:

Save/restore GSM settings


 M  +22 -15    libs/ui/gsm.ui  
 M  +29 -1     libs/ui/gsmwidget.cpp  
 M  +3 -0      libs/ui/gsmwidget.h  
 M  +2 -4      settings/service/connectionsecretsjob.cpp  


--- trunk/playground/base/plasma/applets/networkmanager/libs/ui/gsm.ui #918105:918106
@@ -6,7 +6,7 @@
     <x>0</x>
     <y>0</y>
     <width>317</width>
-    <height>394</height>
+    <height>454</height>
    </rect>
   </property>
   <property name="windowTitle" >
@@ -25,12 +25,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" >
         <property name="text" >
          <string>*99#</string>
         </property>
@@ -42,12 +42,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_9" >
@@ -55,12 +55,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" />
       </item>
      </layout>
     </widget>
@@ -77,12 +77,12 @@
          <string>&amp;APN</string>
         </property>
         <property name="buddy" >
-         <cstring>kcfg_apn</cstring>
+         <cstring>apn</cstring>
         </property>
        </widget>
       </item>
       <item row="0" column="1" >
-       <widget class="KLineEdit" name="kcfg_apn" />
+       <widget class="KLineEdit" name="apn" />
       </item>
       <item row="1" column="0" >
        <widget class="QLabel" name="label_2" >
@@ -142,12 +142,12 @@
          <string>&amp;Band</string>
         </property>
         <property name="buddy" >
-         <cstring>kcfg_band</cstring>
+         <cstring>band</cstring>
         </property>
        </widget>
       </item>
       <item row="3" column="1" >
-       <widget class="KIntSpinBox" name="kcfg_band" >
+       <widget class="KIntSpinBox" name="band" >
         <property name="minimum" >
          <number>-1</number>
         </property>
@@ -162,12 +162,12 @@
          <string>&amp;PIN</string>
         </property>
         <property name="buddy" >
-         <cstring>kcfg_pin</cstring>
+         <cstring>pin</cstring>
         </property>
        </widget>
       </item>
       <item row="4" column="1" >
-       <widget class="KLineEdit" name="kcfg_pin" />
+       <widget class="KLineEdit" name="pin" />
       </item>
       <item row="5" column="0" >
        <widget class="QLabel" name="label_6" >
@@ -175,17 +175,24 @@
          <string>PU&amp;K</string>
         </property>
         <property name="buddy" >
-         <cstring>kcfg_puk</cstring>
+         <cstring>puk</cstring>
         </property>
        </widget>
       </item>
       <item row="5" column="1" >
-       <widget class="KLineEdit" name="kcfg_puk" />
+       <widget class="KLineEdit" name="puk" />
       </item>
      </layout>
     </widget>
    </item>
    <item>
+    <widget class="QCheckBox" name="chkShowPass" >
+     <property name="text" >
+      <string>&amp;Show secrets</string>
+     </property>
+    </widget>
+   </item>
+   <item>
     <spacer name="verticalSpacer" >
      <property name="orientation" >
       <enum>Qt::Vertical</enum>
--- trunk/playground/base/plasma/applets/networkmanager/libs/ui/gsmwidget.cpp #918105:918106
@@ -45,16 +45,44 @@
 
 void GsmWidget::readConfig()
 {
+    d->ui.number->setText(d->setting->number());
+    d->ui.username->setText(d->setting->username());
+    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()
+{
+    bool on = d->ui.chkShowPass->isChecked();
+    d->ui.password->setEchoMode(on ? QLineEdit::Normal : QLineEdit::Password);
+    d->ui.pin->setEchoMode(on ? QLineEdit::Normal : QLineEdit::Password);
+    d->ui.puk->setEchoMode(on ? QLineEdit::Normal : QLineEdit::Password);
+}
+
+
 void GsmWidget::writeConfig()
 {
-
+    d->setting->setNumber(d->ui.number->text());
+    d->setting->setUsername(d->ui.username->text());
+    d->setting->setPassword(d->ui.password->text());
+    d->setting->setApn(d->ui.apn->text());
+    d->setting->setNetworkid(d->ui.network->text());
+    d->setting->setBand(d->ui.band->value());
+    d->setting->setPin(d->ui.pin->text());
+    d->setting->setPuk(d->ui.puk->text());
 }
 
 void GsmWidget::readSecrets()
 {
+    d->ui.password->setText(d->setting->password());
+    d->ui.pin->setText(d->setting->pin());
+    d->ui.puk->setText(d->setting->puk());
 
 }
 
--- trunk/playground/base/plasma/applets/networkmanager/libs/ui/gsmwidget.h #918105:918106
@@ -32,6 +32,7 @@
 
 class KNM_EXPORT GsmWidget : public SettingWidget
 {
+Q_OBJECT
 public:
     GsmWidget(Knm::Connection *, QWidget * parent = 0 );
     virtual ~GsmWidget();
@@ -39,6 +40,8 @@
     void readConfig();
     void writeConfig();
     void readSecrets();
+protected Q_SLOTS:
+    void chkShowPassToggled();
 private:
     class Private;
     Private * d;
--- trunk/playground/base/plasma/applets/networkmanager/settings/service/connectionsecretsjob.cpp #918105:918106
@@ -114,11 +114,9 @@
     if ( mSettingName == QLatin1String(NM_SETTING_802_1X_SETTING_NAME)) {
         //m_settingWidget = Wired8021xSecurityWidget(m_connection, 0);
     } else if ( mSettingName == QLatin1String(NM_SETTING_CDMA_SETTING_NAME)) {
-#warning CdmaWidget not ported!
-        //m_settingWidget = new CdmaWidget(m_connection, 0);
+        m_settingWidget = new CdmaWidget(m_connection, 0);
     } else if ( mSettingName == QLatin1String(NM_SETTING_GSM_SETTING_NAME)) {
-#warning GsmWidget not ported!
-        //m_settingWidget = new GsmWidget(m_connection, 0);
+        m_settingWidget = new GsmWidget(m_connection, 0);
     } else if ( mSettingName == QLatin1String(NM_SETTING_IP4_CONFIG_SETTING_NAME)) {
         m_settingWidget = new IpV4Widget(m_connection, 0);
     //} else if ( mSettingName == QLatin1String(NM_SETTING_IP6_CONFIG_SETTING_NAME)) {