From 70c4d9da8ad3b6603de225743bff9ce8b7d65839 Mon Sep 17 00:00:00 2001
From: Yann Nave <ynave@ynave-laptop.(none)>
Date: Mon, 16 Aug 2010 10:00:06 +0200
Subject: [PATCH] Update new account dialog to have Port field. Actually field
 is set to readonly, port 8080.

Update settings save and edit to cut the port part of ip.

Update mIp .
---
 browsemainwindow.cpp |    5 ++---
 newaccountdialog.cpp |   39 ++++++++++++++++++++++++++++-----------
 newaccountdialog.h   |    6 ++++--
 playermainwindow.cpp |   12 ++++++------
 4 files changed, 40 insertions(+), 22 deletions(-)

diff --git a/browsemainwindow.cpp b/browsemainwindow.cpp
index 17410ab..4ddf99e 100644
--- a/browsemainwindow.cpp
+++ b/browsemainwindow.cpp
@@ -35,9 +35,8 @@ BrowseMainWindow::BrowseMainWindow(QWidget *parent) :
 
     QSettings settings;
 
-    QString key = settings.value("config/currentKey").toString();
-    mIp = settings.value("account/home").toString()+":8080";
-
+    QString currentKey = settings.value("config/currentKey").toString();
+    mIp = settings.value("account/"+currentKey).toString();
 
     mNetManager = new QNetworkAccessManager(this);
 
diff --git a/newaccountdialog.cpp b/newaccountdialog.cpp
index 4f9c39e..8950467 100644
--- a/newaccountdialog.cpp
+++ b/newaccountdialog.cpp
@@ -8,8 +8,11 @@ NewAccountDialog::NewAccountDialog(QWidget *parent)
 {
     this->setWindowTitle(tr("Add account"));
 
-    mMyKeyLineEdit = new QLineEdit;
-    mMyIpLineEdit = new QLineEdit;
+    mKeyLineEdit = new QLineEdit;
+    mIpLineEdit = new QLineEdit;
+    mPortLineEdit = new QLineEdit;
+    mPortLineEdit->setText("8080");
+    mPortLineEdit->setReadOnly(true);
 
     mButtonBox = new QDialogButtonBox;
     mButtonBox->addButton(QDialogButtonBox::Save);
@@ -20,8 +23,9 @@ NewAccountDialog::NewAccountDialog(QWidget *parent)
 
     QFormLayout *layout = new QFormLayout;
     layout->expandingDirections();
-    layout->addRow(tr("Name:"), mMyKeyLineEdit);
-    layout->addRow(tr("Ip:"), mMyIpLineEdit);
+    layout->addRow(tr("Name:"), mKeyLineEdit);
+    layout->addRow(tr("Ip:"), mIpLineEdit);
+    layout->addRow(tr("Port:"), mPortLineEdit);
     layout->addWidget(mButtonBox);
 
     setLayout(layout);
@@ -29,8 +33,9 @@ NewAccountDialog::NewAccountDialog(QWidget *parent)
 
 void NewAccountDialog::save()
 {
-    QString myKey = mMyKeyLineEdit->text();
-    QString myIp = mMyIpLineEdit->text();
+    QString myKey = mKeyLineEdit->text();
+    QString myIp = mIpLineEdit->text();
+    QString myPort = mPortLineEdit->text();
 
     QSettings settings;
     settings.beginGroup("account");
@@ -39,7 +44,10 @@ void NewAccountDialog::save()
     }
 
     if (!myIp.isEmpty() && !myKey.isEmpty()) {
-        settings.setValue(myKey, myIp);
+        if (myPort.isEmpty()) {
+            myPort = "8080";
+        }
+        settings.setValue(myKey, myIp+":"+myPort);
         // Rajouter des tests pour vérifier qu'on est sur Maemo
         //QMaemo5InformationBox::information(this, tr("Account saved"), QMaemo5InformationBox::DefaultTimeout);
     }
@@ -52,11 +60,20 @@ void NewAccountDialog::edit(QString &key, QString &ip)
 {
     this->setWindowTitle(tr("Edit account"));
 
+    QSettings settings;
+    settings.beginGroup("account");
+    QString value = settings.value(key).toString();
+    settings.endGroup();
+
+    QStringList values = value.split(":");
+
     mEditKey = key;
-    mEditIp = ip;
+    mEditIp = values.first();
+    mEditPort = values.last();
 
-    mMyKeyLineEdit->setText(key);
-    mMyKeyLineEdit->setDisabled(true);
-    mMyIpLineEdit->setText(ip);
+    mKeyLineEdit->setText(mEditKey);
+    mKeyLineEdit->setDisabled(true);
+    mIpLineEdit->setText(mEditIp);
+    mPortLineEdit->setText(mEditPort);
 }
 
diff --git a/newaccountdialog.h b/newaccountdialog.h
index 85c8e25..6f544d3 100644
--- a/newaccountdialog.h
+++ b/newaccountdialog.h
@@ -18,14 +18,16 @@ public slots:
     void save();
 
 private:
-    QLineEdit *mMyKeyLineEdit;
-    QLineEdit *mMyIpLineEdit;
+    QLineEdit *mKeyLineEdit;
+    QLineEdit *mIpLineEdit;
+    QLineEdit *mPortLineEdit;
     QPushButton *mSavePushButton;
     QPushButton *mCancelPushButton;
     QDialogButtonBox *mButtonBox;
 
     QString mEditKey;
     QString mEditIp;
+    QString mEditPort;
 };
 
 #endif // NEWACCOUNTDIALOG_H
diff --git a/playermainwindow.cpp b/playermainwindow.cpp
index f4b5361..9558fe1 100644
--- a/playermainwindow.cpp
+++ b/playermainwindow.cpp
@@ -63,12 +63,12 @@ PlayerMainWindow::PlayerMainWindow(QWidget *parent) :
     setAttribute(Qt::WA_Maemo5StackedWindow);
     mPlayListMainWindow->setWindowFlags(mPlayListMainWindow->windowFlags() | Qt::Window);
 
-    mBrowseMainWindow->setParent(this);
-    mBrowseMainWindow->setAttribute(Qt::WA_Maemo5StackedWindow);
-    mBrowseMainWindow->setAttribute(Qt::WA_Maemo5LandscapeOrientation,true);
-    mBrowseMainWindow->setAttribute(Qt::WA_Maemo5LandscapeOrientation,true);
+    mBrowserMainWindow->setParent(this);
+    mBrowserMainWindow->setAttribute(Qt::WA_Maemo5StackedWindow);
+    mBrowserMainWindow->setAttribute(Qt::WA_Maemo5LandscapeOrientation,true);
+    mBrowserMainWindow->setAttribute(Qt::WA_Maemo5LandscapeOrientation,true);
     setAttribute(Qt::WA_Maemo5StackedWindow);
-    mBrowseMainWindow->setWindowFlags(mBrowseMainWindow->windowFlags() | Qt::Window);
+    mBrowserMainWindow->setWindowFlags(mBrowserMainWindow->windowFlags() | Qt::Window);
 
 #endif
 
@@ -96,7 +96,7 @@ void PlayerMainWindow::init()
 {
     QSettings settings;
     QString currentKey = settings.value("config/currentKey").toString();
-    mIp = settings.value("account/"+currentKey).toString()+":8080";
+    mIp = settings.value("account/"+currentKey).toString();
 
     if ( mIp.isEmpty())
         showConfig();
-- 
1.7.9.5