Add the shuffle and repeat menus to the menubar as well
This commit is contained in:
parent
e1952e7ff2
commit
6a4d1734b6
|
@ -133,6 +133,10 @@ MainWindow::MainWindow(QNetworkAccessManager* network, QWidget *parent)
|
||||||
ui_.ban_button->setDefaultAction(ui_.action_ban);
|
ui_.ban_button->setDefaultAction(ui_.action_ban);
|
||||||
ui_.clear_playlist_button->setDefaultAction(ui_.action_clear_playlist);
|
ui_.clear_playlist_button->setDefaultAction(ui_.action_clear_playlist);
|
||||||
|
|
||||||
|
// Add the shuffle and repeat action groups to the menu
|
||||||
|
ui_.action_shuffle_mode->setMenu(playlist_sequence_->shuffle_menu());
|
||||||
|
ui_.action_repeat_mode->setMenu(playlist_sequence_->repeat_menu());
|
||||||
|
|
||||||
// Stop actions
|
// Stop actions
|
||||||
QMenu* stop_menu = new QMenu(this);
|
QMenu* stop_menu = new QMenu(this);
|
||||||
stop_menu->addAction(ui_.action_stop);
|
stop_menu->addAction(ui_.action_stop);
|
||||||
|
|
|
@ -14,7 +14,7 @@
|
||||||
<string>Clementine</string>
|
<string>Clementine</string>
|
||||||
</property>
|
</property>
|
||||||
<property name="windowIcon">
|
<property name="windowIcon">
|
||||||
<iconset>
|
<iconset resource="../data/data.qrc">
|
||||||
<normaloff>:/icon.png</normaloff>:/icon.png</iconset>
|
<normaloff>:/icon.png</normaloff>:/icon.png</iconset>
|
||||||
</property>
|
</property>
|
||||||
<widget class="QWidget" name="centralWidget">
|
<widget class="QWidget" name="centralWidget">
|
||||||
|
@ -294,7 +294,7 @@
|
||||||
<item>
|
<item>
|
||||||
<widget class="QToolButton" name="library_filter_clear">
|
<widget class="QToolButton" name="library_filter_clear">
|
||||||
<property name="icon">
|
<property name="icon">
|
||||||
<iconset>
|
<iconset resource="../data/data.qrc">
|
||||||
<normaloff>:/clear.png</normaloff>:/clear.png</iconset>
|
<normaloff>:/clear.png</normaloff>:/clear.png</iconset>
|
||||||
</property>
|
</property>
|
||||||
<property name="iconSize">
|
<property name="iconSize">
|
||||||
|
@ -318,7 +318,7 @@
|
||||||
<item>
|
<item>
|
||||||
<widget class="QToolButton" name="library_options">
|
<widget class="QToolButton" name="library_options">
|
||||||
<property name="icon">
|
<property name="icon">
|
||||||
<iconset>
|
<iconset resource="../data/data.qrc">
|
||||||
<normaloff>:/configure.png</normaloff>:/configure.png</iconset>
|
<normaloff>:/configure.png</normaloff>:/configure.png</iconset>
|
||||||
</property>
|
</property>
|
||||||
<property name="iconSize">
|
<property name="iconSize">
|
||||||
|
@ -438,7 +438,7 @@
|
||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>804</width>
|
<width>804</width>
|
||||||
<height>21</height>
|
<height>23</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<widget class="QMenu" name="menuMusic">
|
<widget class="QMenu" name="menuMusic">
|
||||||
|
@ -464,6 +464,9 @@
|
||||||
<addaction name="action_add_media"/>
|
<addaction name="action_add_media"/>
|
||||||
<addaction name="action_add_stream"/>
|
<addaction name="action_add_stream"/>
|
||||||
<addaction name="separator"/>
|
<addaction name="separator"/>
|
||||||
|
<addaction name="action_shuffle_mode"/>
|
||||||
|
<addaction name="action_repeat_mode"/>
|
||||||
|
<addaction name="separator"/>
|
||||||
<addaction name="action_clear_playlist"/>
|
<addaction name="action_clear_playlist"/>
|
||||||
<addaction name="action_shuffle"/>
|
<addaction name="action_shuffle"/>
|
||||||
</widget>
|
</widget>
|
||||||
|
@ -496,7 +499,7 @@
|
||||||
</widget>
|
</widget>
|
||||||
<action name="action_previous_track">
|
<action name="action_previous_track">
|
||||||
<property name="icon">
|
<property name="icon">
|
||||||
<iconset>
|
<iconset resource="../data/data.qrc">
|
||||||
<normaloff>:/media-skip-backward.png</normaloff>:/media-skip-backward.png</iconset>
|
<normaloff>:/media-skip-backward.png</normaloff>:/media-skip-backward.png</iconset>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
|
@ -505,7 +508,7 @@
|
||||||
</action>
|
</action>
|
||||||
<action name="action_play_pause">
|
<action name="action_play_pause">
|
||||||
<property name="icon">
|
<property name="icon">
|
||||||
<iconset>
|
<iconset resource="../data/data.qrc">
|
||||||
<normaloff>:/media-playback-start.png</normaloff>:/media-playback-start.png</iconset>
|
<normaloff>:/media-playback-start.png</normaloff>:/media-playback-start.png</iconset>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
|
@ -517,7 +520,7 @@
|
||||||
<bool>false</bool>
|
<bool>false</bool>
|
||||||
</property>
|
</property>
|
||||||
<property name="icon">
|
<property name="icon">
|
||||||
<iconset>
|
<iconset resource="../data/data.qrc">
|
||||||
<normaloff>:/media-playback-stop.png</normaloff>:/media-playback-stop.png</iconset>
|
<normaloff>:/media-playback-stop.png</normaloff>:/media-playback-stop.png</iconset>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
|
@ -526,7 +529,7 @@
|
||||||
</action>
|
</action>
|
||||||
<action name="action_next_track">
|
<action name="action_next_track">
|
||||||
<property name="icon">
|
<property name="icon">
|
||||||
<iconset>
|
<iconset resource="../data/data.qrc">
|
||||||
<normaloff>:/media-skip-forward.png</normaloff>:/media-skip-forward.png</iconset>
|
<normaloff>:/media-skip-forward.png</normaloff>:/media-skip-forward.png</iconset>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
|
@ -535,7 +538,7 @@
|
||||||
</action>
|
</action>
|
||||||
<action name="action_quit">
|
<action name="action_quit">
|
||||||
<property name="icon">
|
<property name="icon">
|
||||||
<iconset>
|
<iconset resource="../data/data.qrc">
|
||||||
<normaloff>:/exit.png</normaloff>:/exit.png</iconset>
|
<normaloff>:/exit.png</normaloff>:/exit.png</iconset>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
|
@ -547,7 +550,7 @@
|
||||||
</action>
|
</action>
|
||||||
<action name="action_stop_after_this_track">
|
<action name="action_stop_after_this_track">
|
||||||
<property name="icon">
|
<property name="icon">
|
||||||
<iconset>
|
<iconset resource="../data/data.qrc">
|
||||||
<normaloff>:/media-playback-stop.png</normaloff>:/media-playback-stop.png</iconset>
|
<normaloff>:/media-playback-stop.png</normaloff>:/media-playback-stop.png</iconset>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
|
@ -613,7 +616,7 @@
|
||||||
<bool>false</bool>
|
<bool>false</bool>
|
||||||
</property>
|
</property>
|
||||||
<property name="icon">
|
<property name="icon">
|
||||||
<iconset>
|
<iconset resource="../data/data.qrc">
|
||||||
<normaloff>:/last.fm/love.png</normaloff>:/last.fm/love.png</iconset>
|
<normaloff>:/last.fm/love.png</normaloff>:/last.fm/love.png</iconset>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
|
@ -625,7 +628,7 @@
|
||||||
<bool>false</bool>
|
<bool>false</bool>
|
||||||
</property>
|
</property>
|
||||||
<property name="icon">
|
<property name="icon">
|
||||||
<iconset>
|
<iconset resource="../data/data.qrc">
|
||||||
<normaloff>:/last.fm/ban.png</normaloff>:/last.fm/ban.png</iconset>
|
<normaloff>:/last.fm/ban.png</normaloff>:/last.fm/ban.png</iconset>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
|
@ -634,7 +637,7 @@
|
||||||
</action>
|
</action>
|
||||||
<action name="action_clear_playlist">
|
<action name="action_clear_playlist">
|
||||||
<property name="icon">
|
<property name="icon">
|
||||||
<iconset>
|
<iconset resource="../data/data.qrc">
|
||||||
<normaloff>:/clear-list.png</normaloff>:/clear-list.png</iconset>
|
<normaloff>:/clear-list.png</normaloff>:/clear-list.png</iconset>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
|
@ -646,7 +649,7 @@
|
||||||
</action>
|
</action>
|
||||||
<action name="action_edit_track">
|
<action name="action_edit_track">
|
||||||
<property name="icon">
|
<property name="icon">
|
||||||
<iconset>
|
<iconset resource="../data/data.qrc">
|
||||||
<normaloff>:/edit-track.png</normaloff>:/edit-track.png</iconset>
|
<normaloff>:/edit-track.png</normaloff>:/edit-track.png</iconset>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
|
@ -655,7 +658,7 @@
|
||||||
</action>
|
</action>
|
||||||
<action name="action_configure">
|
<action name="action_configure">
|
||||||
<property name="icon">
|
<property name="icon">
|
||||||
<iconset>
|
<iconset resource="../data/data.qrc">
|
||||||
<normaloff>:/configure.png</normaloff>:/configure.png</iconset>
|
<normaloff>:/configure.png</normaloff>:/configure.png</iconset>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
|
@ -669,7 +672,7 @@
|
||||||
</action>
|
</action>
|
||||||
<action name="action_shuffle">
|
<action name="action_shuffle">
|
||||||
<property name="icon">
|
<property name="icon">
|
||||||
<iconset>
|
<iconset resource="../data/data.qrc">
|
||||||
<normaloff>:/shuffle.png</normaloff>:/shuffle.png</iconset>
|
<normaloff>:/shuffle.png</normaloff>:/shuffle.png</iconset>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
|
@ -678,7 +681,7 @@
|
||||||
</action>
|
</action>
|
||||||
<action name="action_add_media">
|
<action name="action_add_media">
|
||||||
<property name="icon">
|
<property name="icon">
|
||||||
<iconset>
|
<iconset resource="../data/data.qrc">
|
||||||
<normaloff>:/open_media.png</normaloff>:/open_media.png</iconset>
|
<normaloff>:/open_media.png</normaloff>:/open_media.png</iconset>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
|
@ -687,7 +690,7 @@
|
||||||
</action>
|
</action>
|
||||||
<action name="action_add_stream">
|
<action name="action_add_stream">
|
||||||
<property name="icon">
|
<property name="icon">
|
||||||
<iconset>
|
<iconset resource="../data/data.qrc">
|
||||||
<normaloff>:/open_stream.png</normaloff>:/open_stream.png</iconset>
|
<normaloff>:/open_stream.png</normaloff>:/open_stream.png</iconset>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
|
@ -696,7 +699,7 @@
|
||||||
</action>
|
</action>
|
||||||
<action name="action_open_media">
|
<action name="action_open_media">
|
||||||
<property name="icon">
|
<property name="icon">
|
||||||
<iconset>
|
<iconset resource="../data/data.qrc">
|
||||||
<normaloff>:/open_media.png</normaloff>:/open_media.png</iconset>
|
<normaloff>:/open_media.png</normaloff>:/open_media.png</iconset>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
|
@ -710,7 +713,7 @@
|
||||||
</action>
|
</action>
|
||||||
<action name="action_global_shortcuts">
|
<action name="action_global_shortcuts">
|
||||||
<property name="icon">
|
<property name="icon">
|
||||||
<iconset>
|
<iconset resource="../data/data.qrc">
|
||||||
<normaloff>:/configure.png</normaloff>:/configure.png</iconset>
|
<normaloff>:/configure.png</normaloff>:/configure.png</iconset>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
|
@ -719,13 +722,23 @@
|
||||||
</action>
|
</action>
|
||||||
<action name="action_cover_manager">
|
<action name="action_cover_manager">
|
||||||
<property name="icon">
|
<property name="icon">
|
||||||
<iconset>
|
<iconset resource="../data/data.qrc">
|
||||||
<normaloff>:/download.png</normaloff>:/download.png</iconset>
|
<normaloff>:/download.png</normaloff>:/download.png</iconset>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>Cover Manager</string>
|
<string>Cover Manager</string>
|
||||||
</property>
|
</property>
|
||||||
</action>
|
</action>
|
||||||
|
<action name="action_shuffle_mode">
|
||||||
|
<property name="text">
|
||||||
|
<string>Shuffle mode</string>
|
||||||
|
</property>
|
||||||
|
</action>
|
||||||
|
<action name="action_repeat_mode">
|
||||||
|
<property name="text">
|
||||||
|
<string>Repeat mode</string>
|
||||||
|
</property>
|
||||||
|
</action>
|
||||||
</widget>
|
</widget>
|
||||||
<layoutdefault spacing="6" margin="11"/>
|
<layoutdefault spacing="6" margin="11"/>
|
||||||
<customwidgets>
|
<customwidgets>
|
||||||
|
@ -767,6 +780,8 @@
|
||||||
<header>radioview.h</header>
|
<header>radioview.h</header>
|
||||||
</customwidget>
|
</customwidget>
|
||||||
</customwidgets>
|
</customwidgets>
|
||||||
<resources/>
|
<resources>
|
||||||
|
<include location="../data/data.qrc"/>
|
||||||
|
</resources>
|
||||||
<connections/>
|
<connections/>
|
||||||
</ui>
|
</ui>
|
||||||
|
|
|
@ -30,6 +30,9 @@ class PlaylistSequence : public QWidget {
|
||||||
RepeatMode repeat_mode() const { return repeat_mode_; }
|
RepeatMode repeat_mode() const { return repeat_mode_; }
|
||||||
ShuffleMode shuffle_mode() const { return shuffle_mode_; }
|
ShuffleMode shuffle_mode() const { return shuffle_mode_; }
|
||||||
|
|
||||||
|
QMenu* repeat_menu() const { return repeat_menu_; }
|
||||||
|
QMenu* shuffle_menu() const { return shuffle_menu_; }
|
||||||
|
|
||||||
public slots:
|
public slots:
|
||||||
void SetRepeatMode(PlaylistSequence::RepeatMode mode);
|
void SetRepeatMode(PlaylistSequence::RepeatMode mode);
|
||||||
void SetShuffleMode(PlaylistSequence::ShuffleMode mode);
|
void SetShuffleMode(PlaylistSequence::ShuffleMode mode);
|
||||||
|
|
Loading…
Reference in New Issue