Changeset 25

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

Files:

• QtMPC.pro (modified) (1 diff)
• gui/main_window.cpp (modified) (5 diffs)
• gui/main_window.h (modified) (1 diff)
• gui/preferences_dialog.cpp (modified) (3 diffs)
• gui/preferences_dialog.h (modified) (2 diffs)
• lib/mpdparseutils.cpp (modified) (3 diffs)
• main.cpp (modified) (1 diff)

QtMPC.pro

@@ -9 +9 @@
 CONFIG += qt debug
 QT += network
-#DEFINES += QT_NO_DEBUG_OUTPUT
+DEFINES += QT_NO_DEBUG_OUTPUT
 
 # Input

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();
+    }
+}

gui/main_window.h

@@ -30 +30 @@
 
     private slots:
+        void showPreferencesDialog();
         void volumeSliderPressed();
         void volumeSliderReleased();

gui/preferences_dialog.cpp

@@ -3 +3 @@
 PreferencesDialog::PreferencesDialog(QWidget *parent, Qt::WindowFlags f) : QDialog(parent, f)
 {
-    //loadSettings();
+    setupUi(this);
+
+    connect(buttonBox, SIGNAL(clicked(QAbstractButton *)), this, SLOT(buttonPressed(QAbstractButton *)));
+
+    loadSettings();
 }
 
@@ -9 +13 @@
 {
     hostLineEdit->setText(settings.value("connection/host", "").toString());
-    portSpinBox->setValue(settings.value("connection/port", 6600).toInt());
+    portSpinBox->setValue(settings.value("connection/port").toInt());
+    passwordLineEdit->setText(settings.value("connection/password", "").toString());
 }
 
@@ -15 +20 @@
 {
 }
+
+void PreferencesDialog::buttonPressed(QAbstractButton *button)
+{
+    switch(buttonBox->buttonRole(button)) {
+        case QDialogButtonBox::AcceptRole:
+        case QDialogButtonBox::ApplyRole:
+            settings.setValue("connection/host", hostLineEdit->text());
+            settings.setValue("connection/port", portSpinBox->value());
+            settings.setValue("connection/password", passwordLineEdit->text());
+            break;
+        case QDialogButtonBox::RejectRole:
+            break;
+        default:
+            /* unhandled button */
+            break;
+    }
+}

gui/preferences_dialog.h

@@ -12 +12 @@
 
     public:
-        PreferencesDialog(QWidget * parent = 0, Qt::WindowFlags f = 0);
+        PreferencesDialog(QWidget *parent = 0, Qt::WindowFlags f = 0);
 
     private:
@@ -20 +20 @@
         void loadSettings();
         void writeSettings();
+        void buttonPressed(QAbstractButton *button);
 };
 

lib/mpdparseutils.cpp

@@ -79 +79 @@
                 if(j != 1 && j != tokens.size() - 1)
                     song->album += ":";
-                song->album += tokens.at(j);
+                song->album += QString::fromUtf8(tokens.at(j));
             }
         } else if(tokens.at(0) == "Artist") {
@@ -85 +85 @@
                 if(j != 1 && j != tokens.size() - 1)
                     song->artist += ":";
-                song->artist += tokens.at(j);
+                song->artist += QString::fromUtf8(tokens.at(j));
             }
         } else if(tokens.at(0) == "Title") {
@@ -91 +91 @@
                 if(j != 1 && j != tokens.size() - 1)
                     song->title += ":";
-                song->title += tokens.at(j);
+                song->title += QString::fromUtf8(tokens.at(j));
             }
         } else if(tokens.at(0) == "Track") {

main.cpp

@@ -7 +7 @@
     QApplication app(argc, argv);
     QApplication::setApplicationName("qtmpc");
+    QApplication::setOrganizationName("lowblogprojects");
 
     MainWindow w;