Changeset 25 for gui/main_window.cpp

Timestamp:

12/31/07 15:06:00 (4 years ago)

Author:

sander

Message:

Preferences dialog is now functional and pops up when no connection can be made

File:

• gui/main_window.cpp (modified) (5 diffs)

gui/main_window.cpp

@@ -1 +1 @@
 #include <cmath>
 #include <QtGui>
+
 #include "main_window.h"
+#include "preferences_dialog.h"
 
 MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
 {
+    QSettings settings;
+
     setupUi(this);
 
-    //mpd_status = NULL;
     slidingVolume = false;
 
+    // Start connection thread
     mpd.start();
-    mpd.setHostname("mediapc");
-    mpd.setPort(6600);
-    if(!mpd.connectToMPD()) {
-        qDebug("Big trouble! Exiting...");
-        qApp->quit();
+
+    // Set connection data
+    mpd.setHostname(settings.value("connection/host").toString());
+    mpd.setPort(settings.value("connection/port").toInt());
+
+    while(!mpd.connectToMPD()) {
+        showPreferencesDialog();
+
+        mpd.setHostname(settings.value("connection/host").toString());
+        mpd.setPort(settings.value("connection/port").toInt());
     }
 
@@ -33 +42 @@
 
     // GUI
+    connect(action_Preferences, SIGNAL(triggered(bool)), this, SLOT(showPreferencesDialog()));
     connect(volumeSlider, SIGNAL(sliderPressed()), this, SLOT(volumeSliderPressed()));
     connect(volumeSlider, SIGNAL(sliderReleased()), this, SLOT(setVolume()));
@@ -58 +68 @@
 }*/
 
+void MainWindow::showPreferencesDialog()
+{
+    PreferencesDialog pref(this);
+    pref.exec();
+}
+
 void MainWindow::volumeSliderPressed()
 {
@@ -210 +226 @@
     QModelIndex mappedIndex = libraryProxyModel.mapToSource(index);
     item = static_cast<MusicLibraryItem *>(mappedIndex.internalPointer());
+    MPDStatus::State curState = mpd_status.state;
 
     switch(item->type()) {
@@ -232 +249 @@
     if(!files.isEmpty()) {
         mpd.add(files);
-        mpd.startPlayingSong();
-    }
-}
+        if(curState != MPDStatus::State_Playing)
+            mpd.startPlayingSong();
+    }
+}