Changeset 434

Timestamp:

10/22/10 17:16:26 (19 months ago)

Author:

roeland

Message:

Now #7 is also fixed for our KDE users!

Location:

trunk

Files:

• QtMPCui.rc (modified) (1 diff)
• gui/main_window.cpp (modified) (5 diffs)
• gui/main_window.h (modified) (1 diff)

trunk/QtMPCui.rc

@@ -4 +4 @@
   <MenuBar>
     <Menu name="actions">
-        <text>Actions</text>
-        <Action name="updatedatabase" />
-        <Action name="showstatistics" />
-    </Menu>
+          <text>Actions</text>
+          <Action name="updatedatabase" />
+          <Action name="showstatistics" />
+    </Menu>
+    <Menu name="output_menu">
+      <text>Outputs</text>
+      <ActionList name="outputs_list" />
+    </Menu>
   </MenuBar>
 </gui>

trunk/gui/main_window.cpp

@@ -38 +38 @@
 #include <kaboutapplicationdialog.h>
 #include <klineedit.h>
+#include <kxmlguifactory.h>
 #endif
 
@@ -187 +188 @@
     
     action_Copy_song_info = new KAction(this);
-    action_Copy_song_info->setText(il18n("Copy song info"));
+    action_Copy_song_info->setText(i18n("Copy song info"));
     actionCollection()->addAction("copysonginfo", action_Copy_song_info);
 
@@ -449 +450 @@
     // Outputs
     connect(&mpd, SIGNAL(outputsUpdated(const QList<Output *>)), this, SLOT(updateOutpus(const QList<Output *>)));
-    connect(menu_Outputs, SIGNAL(triggered(QAction *)), this, SLOT(outputChanged(QAction *)));
+    #ifdef ENABLE_KDE_SUPPORT
+        QMenu *m = (QMenu *)factory()->container("output_menu", this);
+        connect(m, SIGNAL(triggered(QAction *)), this, SLOT(outputChanged(QAction *)));
+    #else
+        connect(menu_Outputs, SIGNAL(triggered(QAction *)), this, SLOT(outputChanged(QAction *)));
+    #endif
 
     mpd.outputs();
@@ -1305 +1311 @@
 void MainWindow::updateOutpus(const QList<Output *> outputs)
 {
+    #ifndef ENABLE_KDE_SUPPORT
+    
     menu_Outputs->clear();
     
@@ -1317 +1325 @@
         menu_Outputs->addAction(a);
     }
+    
+    #else
+    
+    QList<QAction *> actions;
+    
+    for (int i = 0; i < outputs.size(); i++) {
+        Output *o = outputs.at(i);
+        
+        QAction *a = new QAction(o->name, this);
+        a->setCheckable(true);
+        a->setChecked(o->enabled);
+        a->setData(o->id);
+        
+        actions << a;
+    }   
+    
+    unplugActionList( "outputs_list" );
+    plugActionList( "outputs_list", actions);
+
+    #endif
 }
 

trunk/gui/main_window.h

@@ -177 +177 @@
         KAction *action_Remove_from_playlist;
         KAction *action_Clear_playlist;
+        KAction *action_Copy_song_info;
         KAction *quitAction;
 #else