Update async methods! Now valid ip is detected

[vlc-remote] / playermainwindow.cpp

diff --git a/playermainwindow.cpp b/playermainwindow.cpp
index f4b5361..791da6b 100644 (file)
--- 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
 
@@ -76,7 +76,9 @@ PlayerMainWindow::PlayerMainWindow(QWidget *parent) :
     connect(ui->actionConfiguration,SIGNAL(triggered()),this,SLOT(showConfig()));
     connect(ui->actionAbout,SIGNAL(triggered()),this,SLOT(showAbout()));
     connect(ui->playlistButton,SIGNAL(clicked()),mPlayListMainWindow,SLOT(show()));
+    connect(ui->playlistButton,SIGNAL(clicked()),mPlayListMainWindow,SLOT(showPlayList()));
     connect(ui->browseButton,SIGNAL(clicked()),mBrowserMainWindow,SLOT(show()));
+    connect(ui->browseButton,SIGNAL(clicked()),mBrowserMainWindow,SLOT(showCurrentDirectory()));
 
     connect(ui->playButton,SIGNAL(clicked()),this,SLOT(play()));
     connect(ui->stopButton,SIGNAL(clicked()),this,SLOT(stop()));
@@ -94,14 +96,19 @@ PlayerMainWindow::PlayerMainWindow(QWidget *parent) :
 }
 void PlayerMainWindow::init()
 {
-    QSettings settings;
-    QString currentKey = settings.value("config/currentKey").toString();
-    mIp = settings.value("account/"+currentKey).toString()+":8080";
+
+    mIp= AccountDialog::currentIp();
 
     if ( mIp.isEmpty())
         showConfig();
+
     else
+    {
         mTimer->start(5000);
+        mPlayListMainWindow->init();
+        mBrowserMainWindow->init();
+    }
+
 }
 
 PlayerMainWindow::~PlayerMainWindow()
@@ -186,6 +193,7 @@ void PlayerMainWindow::showConfig()
     mTimer->stop();
     AccountDialog * dialog = new AccountDialog;
     dialog->exec();
+
     init();