Move the clear playlist button to the top
This commit is contained in:
parent
3ef78d5bba
commit
840a617ae8
|
@ -91,10 +91,12 @@ PlaylistView* PlaylistContainer::view() const {
|
||||||
}
|
}
|
||||||
|
|
||||||
void PlaylistContainer::SetActions(
|
void PlaylistContainer::SetActions(
|
||||||
QAction *new_playlist, QAction *save_playlist, QAction *load_playlist) {
|
QAction* new_playlist, QAction* save_playlist, QAction* load_playlist,
|
||||||
|
QAction* clear_playlist) {
|
||||||
ui_->create_new->setDefaultAction(new_playlist);
|
ui_->create_new->setDefaultAction(new_playlist);
|
||||||
ui_->save->setDefaultAction(save_playlist);
|
ui_->save->setDefaultAction(save_playlist);
|
||||||
ui_->load->setDefaultAction(load_playlist);
|
ui_->load->setDefaultAction(load_playlist);
|
||||||
|
ui_->clear_playlist->setDefaultAction(clear_playlist);
|
||||||
|
|
||||||
ui_->tab_bar->SetActions(new_playlist, load_playlist);
|
ui_->tab_bar->SetActions(new_playlist, load_playlist);
|
||||||
|
|
||||||
|
|
|
@ -39,7 +39,7 @@ public:
|
||||||
static const char* kSettingsGroup;
|
static const char* kSettingsGroup;
|
||||||
|
|
||||||
void SetActions(QAction* new_playlist, QAction* save_playlist,
|
void SetActions(QAction* new_playlist, QAction* save_playlist,
|
||||||
QAction* load_playlist);
|
QAction* load_playlist, QAction* clear_playlist);
|
||||||
void SetManager(PlaylistManager* manager);
|
void SetManager(PlaylistManager* manager);
|
||||||
|
|
||||||
PlaylistView* view() const;
|
PlaylistView* view() const;
|
||||||
|
|
|
@ -39,6 +39,19 @@
|
||||||
<property name="margin">
|
<property name="margin">
|
||||||
<number>0</number>
|
<number>0</number>
|
||||||
</property>
|
</property>
|
||||||
|
<item>
|
||||||
|
<widget class="QToolButton" name="clear_playlist">
|
||||||
|
<property name="iconSize">
|
||||||
|
<size>
|
||||||
|
<width>16</width>
|
||||||
|
<height>16</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
<property name="autoRaise">
|
||||||
|
<bool>true</bool>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QToolButton" name="create_new">
|
<widget class="QToolButton" name="create_new">
|
||||||
<property name="iconSize">
|
<property name="iconSize">
|
||||||
|
|
|
@ -260,9 +260,8 @@ MainWindow::MainWindow(NetworkAccessManager* network, Engine::Type engine, QWidg
|
||||||
ui_->stop_button->setDefaultAction(ui_->action_stop);
|
ui_->stop_button->setDefaultAction(ui_->action_stop);
|
||||||
ui_->love_button->setDefaultAction(ui_->action_love);
|
ui_->love_button->setDefaultAction(ui_->action_love);
|
||||||
ui_->ban_button->setDefaultAction(ui_->action_ban);
|
ui_->ban_button->setDefaultAction(ui_->action_ban);
|
||||||
ui_->clear_playlist_button->setDefaultAction(ui_->action_clear_playlist);
|
|
||||||
ui_->playlist->SetActions(ui_->action_new_playlist, ui_->action_save_playlist,
|
ui_->playlist->SetActions(ui_->action_new_playlist, ui_->action_save_playlist,
|
||||||
ui_->action_load_playlist);
|
ui_->action_load_playlist, ui_->action_clear_playlist);
|
||||||
|
|
||||||
#ifdef ENABLE_VISUALISATIONS
|
#ifdef ENABLE_VISUALISATIONS
|
||||||
visualisation_->SetActions(ui_->action_previous_track, ui_->action_play_pause,
|
visualisation_->SetActions(ui_->action_previous_track, ui_->action_play_pause,
|
||||||
|
|
|
@ -179,26 +179,6 @@
|
||||||
<property name="margin">
|
<property name="margin">
|
||||||
<number>0</number>
|
<number>0</number>
|
||||||
</property>
|
</property>
|
||||||
<item>
|
|
||||||
<widget class="QToolButton" name="clear_playlist_button">
|
|
||||||
<property name="iconSize">
|
|
||||||
<size>
|
|
||||||
<width>22</width>
|
|
||||||
<height>22</height>
|
|
||||||
</size>
|
|
||||||
</property>
|
|
||||||
<property name="autoRaise">
|
|
||||||
<bool>true</bool>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<widget class="Line" name="line_3">
|
|
||||||
<property name="orientation">
|
|
||||||
<enum>Qt::Vertical</enum>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
<item>
|
||||||
<widget class="QToolButton" name="back_button">
|
<widget class="QToolButton" name="back_button">
|
||||||
<property name="iconSize">
|
<property name="iconSize">
|
||||||
|
@ -450,7 +430,7 @@
|
||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>1131</width>
|
<width>1131</width>
|
||||||
<height>25</height>
|
<height>23</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<widget class="QMenu" name="menuMusic">
|
<widget class="QMenu" name="menuMusic">
|
||||||
|
|
Loading…
Reference in New Issue