[Pkg-running-devel] [openambit] 12/131: Replace username/password setting with email setting [touch: 5]

[Christian Perrier]

This is an automated email from the git hooks/post-receive script.

bubulle pushed a commit to branch master
in repository openambit.

commit 494f4d4cd5ea79c32fbea37e1d94c2eb3f63559d
Author: Emil Ljungdahl <emil at kratern.se>
Date:   Thu Dec 12 21:49:10 2013 +0100

    Replace username/password setting with email setting
    [touch: 5]
---
 src/openambit/settingsdialog.cpp | 15 +++++----------
 src/openambit/settingsdialog.ui  | 33 +++++++++++++--------------------
 2 files changed, 18 insertions(+), 30 deletions(-)

diff --git a/src/openambit/settingsdialog.cpp b/src/openambit/settingsdialog.cpp
index 6d7710e..5d65e4e 100644
--- a/src/openambit/settingsdialog.cpp
+++ b/src/openambit/settingsdialog.cpp
@@ -58,12 +58,10 @@ void SettingsDialog::accept()
 void SettingsDialog::showHideUserSettings()
 {
     if (ui->checkBoxMovescountEnable->isChecked()) {
-        ui->lineEditUsername->setHidden(false);
-        ui->lineEditPassword->setHidden(false);
+        ui->lineEditEmail->setHidden(false);
     }
     else {
-        ui->lineEditUsername->setHidden(true);
-        ui->lineEditPassword->setHidden(true);
+        ui->lineEditEmail->setHidden(true);
     }
 }
 
@@ -77,8 +75,7 @@ void SettingsDialog::readSettings()
     settings.beginGroup("movescountSettings");
     ui->checkBoxNewVersions->setChecked(settings.value("checkNewVersions", true).toBool());
     ui->checkBoxMovescountEnable->setChecked(settings.value("movescountEnable", false).toBool());
-    ui->lineEditUsername->setText(settings.value("username", "").toString());
-    ui->lineEditPassword->setText(settings.value("password", "").toString());
+    ui->lineEditEmail->setText(settings.value("email", "").toString());
     ui->checkBoxDebugFiles->setChecked(settings.value("storeDebugFiles", true).toBool());
     settings.endGroup();
 }
@@ -94,12 +91,10 @@ void SettingsDialog::writeSettings()
     settings.setValue("checkNewVersions", ui->checkBoxNewVersions->isChecked());
     settings.setValue("movescountEnable", ui->checkBoxMovescountEnable->isChecked());
     if (ui->checkBoxMovescountEnable->isChecked()) {
-        settings.setValue("username", ui->lineEditUsername->text());
-        settings.setValue("password", ui->lineEditPassword->text());
+        settings.setValue("email", ui->lineEditEmail->text());
     }
     else {
-        settings.setValue("username", "");
-        settings.setValue("password", "");
+        settings.setValue("email", "");
     }
     settings.setValue("storeDebugFiles", ui->checkBoxDebugFiles->isChecked());
     settings.endGroup();
diff --git a/src/openambit/settingsdialog.ui b/src/openambit/settingsdialog.ui
index 5f2339e..a91f9e2 100644
--- a/src/openambit/settingsdialog.ui
+++ b/src/openambit/settingsdialog.ui
@@ -145,6 +145,9 @@
               <string>Movescount connectivity</string>
              </property>
              <layout class="QFormLayout" name="formLayout_2">
+              <property name="fieldGrowthPolicy">
+               <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+              </property>
               <item row="0" column="0">
                <widget class="QCheckBox" name="checkBoxNewVersions">
                 <property name="text">
@@ -152,34 +155,24 @@
                 </property>
                </widget>
               </item>
-              <item row="2" column="0">
-               <widget class="QCheckBox" name="checkBoxMovescountEnable">
+              <item row="1" column="0">
+               <widget class="QCheckBox" name="checkBoxDebugFiles">
                 <property name="text">
-                 <string>Sync logs with Movescount</string>
+                 <string>Generate debug files (XMLs stored in ~/.openambit/movescount)</string>
                 </property>
                </widget>
               </item>
-              <item row="3" column="0">
-               <widget class="QLineEdit" name="lineEditUsername">
-                <property name="placeholderText">
-                 <string>Username</string>
+              <item row="2" column="0">
+               <widget class="QCheckBox" name="checkBoxMovescountEnable">
+                <property name="text">
+                 <string>Sync logs with Movescount</string>
                 </property>
                </widget>
               </item>
-              <item row="4" column="0">
-               <widget class="QLineEdit" name="lineEditPassword">
-                <property name="echoMode">
-                 <enum>QLineEdit::Password</enum>
-                </property>
+              <item row="3" column="0" colspan="2">
+               <widget class="QLineEdit" name="lineEditEmail">
                 <property name="placeholderText">
-                 <string>Password</string>
-                </property>
-               </widget>
-              </item>
-              <item row="1" column="0">
-               <widget class="QCheckBox" name="checkBoxDebugFiles">
-                <property name="text">
-                 <string>Generate debug files (XMLs stored in ~/.openambit/movescount)</string>
+                 <string>Email (Movescount account)</string>
                 </property>
                </widget>
               </item>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-running/openambit.git