Changeset 75

Timestamp:

01/16/08 21:00:16 (4 years ago)

Author:

roeland

Message:

Ticket #8

Location:

gui

Files:

• main_window.cpp (modified) (4 diffs)
• main_window.h (modified) (4 diffs)
• main_window.ui (modified) (1 diff)
• playlisttablemodel.cpp (modified) (4 diffs)

gui/main_window.cpp

@@ -4 +4 @@
 #include <QString>
 #include <QKeyEvent>
+#include <QHeaderView>
 
 #include "main_window.h"
@@ -26 +27 @@
         trayIcon->show();
     }
+
+    //PlaylistView
+    setupPlaylistViewHeader();
+    setupPlaylistViewMenu();
 
     // Status bar
@@ -156 +161 @@
 }
 
+void MainWindow::setupPlaylistViewMenu()
+{
+    playlistTableViewMenu = new QMenu;
+
+    QAction *albumPlaylistViewAction = new QAction(tr("Album"), trayIconMenu);
+    albumPlaylistViewAction->setCheckable(true);
+    albumPlaylistViewAction->setChecked(true);
+    QAction *artistPlaylistViewAction = new QAction(tr("Artist"), trayIconMenu);
+    artistPlaylistViewAction->setCheckable(true);
+    artistPlaylistViewAction->setChecked(true);
+    QAction *titlePlaylistViewAction = new QAction(tr("Title"), trayIconMenu);
+    titlePlaylistViewAction->setCheckable(true);
+    titlePlaylistViewAction->setChecked(true);
+    QAction *timePlaylistViewAction = new QAction(tr("Time"), trayIconMenu);
+    timePlaylistViewAction->setCheckable(true);
+    timePlaylistViewAction->setChecked(true);
+    QAction *trackPlaylistViewAction = new QAction(tr("Track"), trayIconMenu);
+    trackPlaylistViewAction->setCheckable(true);
+    trackPlaylistViewAction->setChecked(true);
+
+    playlistTableViewMenu->addAction(albumPlaylistViewAction);
+    playlistTableViewMenu->addAction(artistPlaylistViewAction);
+    playlistTableViewMenu->addAction(titlePlaylistViewAction);
+    playlistTableViewMenu->addAction(timePlaylistViewAction);
+    playlistTableViewMenu->addAction(trackPlaylistViewAction);
+
+    connect(albumPlaylistViewAction, SIGNAL(toggled(bool)), this, SLOT(playListTableViewToggleAlbum(bool)));
+    connect(artistPlaylistViewAction, SIGNAL(toggled(bool)), this, SLOT(playListTableViewToggleArtist(bool)));
+    connect(timePlaylistViewAction, SIGNAL(toggled(bool)), this, SLOT(playListTableViewToggleTime(bool)));
+    connect(trackPlaylistViewAction, SIGNAL(toggled(bool)), this, SLOT(playListTableViewToggleTrack(bool)));
+    connect(titlePlaylistViewAction, SIGNAL(toggled(bool)), this, SLOT(playListTableViewToggleTitle(bool)));
+    
+    //Restore state
+    QByteArray state = settings.value("playlistTableViewHeader").toByteArray();
+
+    //Restore
+    if (!state.isEmpty()) {
+        playlistTableViewHeader->restoreState(state);
+        if (playlistTableViewHeader->isSectionHidden(0))
+            titlePlaylistViewAction->setChecked(false);
+        if (playlistTableViewHeader->isSectionHidden(1))
+            trackPlaylistViewAction->setChecked(false);
+        if (playlistTableViewHeader->isSectionHidden(2))
+            albumPlaylistViewAction->setChecked(false);
+        if (playlistTableViewHeader->isSectionHidden(3))
+            trackPlaylistViewAction->setChecked(false);
+        if (playlistTableViewHeader->isSectionHidden(4))
+            timePlaylistViewAction->setChecked(false);
+    }
+}
+
+void MainWindow::setupPlaylistViewHeader() {
+    playlistTableViewHeader = playlistTableView->horizontalHeader();
+
+    playlistTableViewHeader->setMovable(true);
+    playlistTableViewHeader->setResizeMode(QHeaderView::Interactive);
+    playlistTableViewHeader->setContextMenuPolicy(Qt::CustomContextMenu);
+    
+    connect(playlistTableViewHeader, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(playlistTableViewContextMenuClicked()));
+}
+
 void MainWindow::showPreferencesDialog()
 {
@@ -548 +614 @@
     mpd.setCrossfade(seconds);
 }
+
+void MainWindow::playlistTableViewContextMenuClicked()
+{
+    playlistTableViewMenu->exec(QCursor::pos());
+}
+
+void MainWindow::playListTableViewToggleAlbum(bool visible)
+{
+    playlistTableViewHeader->setSectionHidden(2, !visible);
+    settings.setValue("playlistTableViewHeader", playlistTableViewHeader->saveState());
+}
+
+void MainWindow::playListTableViewToggleArtist(bool visible)
+{
+    playlistTableViewHeader->setSectionHidden(1, !visible);
+    settings.setValue("playlistTableViewHeader", playlistTableViewHeader->saveState());
+}
+
+void MainWindow::playListTableViewToggleTime(bool visible)
+{
+    playlistTableViewHeader->setSectionHidden(3, !visible);
+    settings.setValue("playlistTableViewHeader", playlistTableViewHeader->saveState());
+}
+
+void MainWindow::playListTableViewToggleTrack(bool visible)
+{
+    playlistTableViewHeader->setSectionHidden(4, !visible);
+    settings.setValue("playlistTableViewHeader", playlistTableViewHeader->saveState());
+}
+
+void MainWindow::playListTableViewToggleTitle(bool visible)
+{
+    playlistTableViewHeader->setSectionHidden(0, !visible);
+    settings.setValue("playlistTableViewHeader", playlistTableViewHeader->saveState());
+}

gui/main_window.h

@@ -7 +7 @@
 #include <QSystemTrayIcon>
 #include <QMenu>
+#include <QHeaderView>
 
 #include "ui_main_window.h"
@@ -43 +44 @@
         QIcon icon;
         QLabel bitrateLabel;
+        QHeaderView *playlistTableViewHeader;
 
         bool setupTrayIcon();
+        void setupPlaylistViewMenu();
+        void setupPlaylistViewHeader();
         QAction *playPauseAction;
         QAction *stopAction;
@@ -53 +57 @@
         QMenu *trayIconMenu;
         QString toolTipText;
+        QMenu *playlistTableViewMenu;
 
     private slots:
@@ -81 +86 @@
         void trayIconClicked(QSystemTrayIcon::ActivationReason reason);
         void crossfadingChanged(int seconds);
+        void playlistTableViewContextMenuClicked();
+        
+        void playListTableViewToggleAlbum(bool visible);
+        void playListTableViewToggleArtist(bool visible);
+        void playListTableViewToggleTrack(bool visible);
+        void playListTableViewToggleTime(bool visible);
+        void playListTableViewToggleTitle(bool visible);
 };
 

gui/main_window.ui

@@ -428 +428 @@
         <item>
          <widget class="QTableView" name="playlistTableView" >
+          <property name="contextMenuPolicy" >
+           <enum>Qt::CustomContextMenu</enum>
+          </property>
           <property name="alternatingRowColors" >
            <bool>true</bool>

gui/playlisttablemodel.cpp

@@ -1 +1 @@
 #include <QPalette>
+#include <QModelIndex>
 
 #include "playlisttablemodel.h"
@@ -22 +23 @@
                 return "Album";
                 break;
+            case 3:
+                return "Track";
+                break;
+            case 4:
+                return "Time";
+                break;
             default:
                 break;
@@ -37 +44 @@
 int PlaylistTableModel::columnCount(const QModelIndex &) const
 {
-    return 3;
+    return 5;
 }
 
@@ -66 +73 @@
             case 2:
                 return song->album;
+                break;
+            case 3:
+                return song->track;
+                break;
+            case 4:
+                return song->time;
                 break;
             default: