From b6351c06eb605ad8a23510f079ec6b6914ebf7c2 Mon Sep 17 00:00:00 2001
From: druid23 <usr@dru-id.co.uk>
Date: Sun, 5 Sep 2010 16:55:46 +0100
Subject: [PATCH] Begin tidying up settings refactoring. 	modified:  
 src/accountdialog.cpp 	modified:   src/accountdialog.h 
 modified:   src/appsettings.cpp 	modified:  
 src/appsettings.h 	modified:   src/playermainwindow.cpp

---
 src/accountdialog.cpp    |   26 +++++++-------------------
 src/accountdialog.h      |    2 +-
 src/appsettings.cpp      |   16 ++++++++++++++++
 src/appsettings.h        |    3 +++
 src/playermainwindow.cpp |    4 ++--
 5 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/src/accountdialog.cpp b/src/accountdialog.cpp
index 0cb777b..cc97fec 100644
--- a/src/accountdialog.cpp
+++ b/src/accountdialog.cpp
@@ -75,19 +75,6 @@ void AccountDialog::add()
     dialog->exec();
     load();
 }
-QString AccountDialog::currentIp()
-{
-
-    QSettings settings;
-    QString useKey = settings.value("config/currentKey").toString();
-    QString useIp ;
-    if ( !useKey.isEmpty())
-        useIp = settings.value("account/"+useKey).toString();
-
-    else return QString();
-
-    return useIp;
-}
 
 void AccountDialog::load()
 {
@@ -98,12 +85,12 @@ void AccountDialog::load()
 
     QSettings settings;
 
-    QString useKey = settings.value("config/currentKey").toString();
+    QString useKey = AppSettings::getCurrentKey(); // settings.value("config/currentKey").toString();
 
     QList <QListWidgetItem> asycItems;
 
-    settings.beginGroup("account");
-    foreach ( QString key, settings.allKeys())
+    //settings.beginGroup("account");
+    foreach ( QString key, AppSettings::getAllAccounts()) //settings.allKeys())
     {
         QListWidgetItem * item = new QListWidgetItem;
 
@@ -119,7 +106,7 @@ void AccountDialog::load()
             asycItems.append(*item);
         }
     }
-    settings.endGroup();    
+    //settings.endGroup();
 
 
     // ... create and add in the list widget
@@ -209,8 +196,9 @@ void AccountDialog::rem()
 void AccountDialog::use()
 {
     QString currentKey = ui->listWidget->currentItem()->text();
-    QSettings settings;
-    settings.setValue("config/currentKey", currentKey);
+    AppSettings::setCurrentKey(currentKey);
+    //QSettings settings;
+    //settings.setValue("config/currentKey", currentKey);
     load();
     emit accept();
 }
diff --git a/src/accountdialog.h b/src/accountdialog.h
index e9468dd..2c87467 100644
--- a/src/accountdialog.h
+++ b/src/accountdialog.h
@@ -35,7 +35,7 @@ public:
      static QListWidgetItem asyncTestItem(const QListWidgetItem& item);
 
 
-static QString  currentIp();
+//static QString  currentIp();
 
 public slots:
     void add();
diff --git a/src/appsettings.cpp b/src/appsettings.cpp
index dc2472c..e280c70 100644
--- a/src/appsettings.cpp
+++ b/src/appsettings.cpp
@@ -38,14 +38,30 @@ bool AppSettings::isConnected() {
         return false;
     }
 }
+QStringList AppSettings::getAllAccounts() {
+    QStringList accounts;
+    QSettings sets;
+    sets.beginGroup("account");
+    accounts = sets.allKeys();
+    sets.endGroup();
+    return accounts;
+}
 QString AppSettings::getCurrentKey() {
     QSettings sets;
     return sets.value("config/currentKey", "").toString();
 }
+void AppSettings::setCurrentKey(QString key) {
+    QSettings sets;
+    sets.setValue("config/currentKey", key);
+}
 QString AppSettings::getCurrentIp() {
     QSettings sets;
     return sets.value("account/" + getCurrentKey(), "").toString();
 }
+void AppSettings::setCurrentIp(QString ip) {
+    QSettings sets;
+    sets.setValue("account/" + getCurrentKey(), ip);
+}
 VlcDirectory AppSettings::getHomeDirectory() {
     QSettings sets;
     VlcDirectory home;
diff --git a/src/appsettings.h b/src/appsettings.h
index 1da0b9a..35af82b 100644
--- a/src/appsettings.h
+++ b/src/appsettings.h
@@ -55,7 +55,10 @@ public:
     explicit AppSettings();
     ~AppSettings();
     static QString getCurrentKey();
+    static void setCurrentKey(QString key);
     static QString getCurrentIp();
+    static void setCurrentIp(QString ip);
+    static QStringList getAllAccounts();
     static VlcDirectory getHomeDirectory();
     static QList<VlcDirectory>* getFavourites();
     static bool addFavourite(VlcDirectory dir);
diff --git a/src/playermainwindow.cpp b/src/playermainwindow.cpp
index 6ad1541..9e5363b 100644
--- a/src/playermainwindow.cpp
+++ b/src/playermainwindow.cpp
@@ -123,7 +123,7 @@
       // check for network
       if (AppSettings::isConnected()) {
           QSettings settings;
-          QString last_ip = AccountDialog::currentIp();
+          QString last_ip = AppSettings::getCurrentIp(); // AccountDialog::currentIp();
           if (!last_ip.isNull() && !last_ip.isEmpty()) {
               QTcpSocket * socket = new QTcpSocket;
               if(last_ip.contains(":"))
@@ -306,7 +306,7 @@
           AccountDialog * dialog = new AccountDialog(this);
           dialog->exec();
 
-           mIp= AccountDialog::currentIp();
+          mIp= AppSettings::getCurrentIp(); //AccountDialog::currentIp();
 
           mPlayListMainWindow->init();
           mBrowserMainWindow->init();
-- 
1.7.9.5