Funkwhale
/
Clementine-audio-player-Mac-Linux-Windows
mirror of https://github.com/clementine-player/Clementine
1
0
Fork 0
Code Issues Releases Wiki Activity

Move the clear playlist button down to the bottom again.

This commit is contained in:
David Sansome 2010-06-18 15:07:21 +00:00
parent 2824c153bc
commit 43ae900852
5 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/playlist/playlistcontainer.cpp
View File

@ -91,12 +91,10 @@ PlaylistView* PlaylistContainer::view() const {
}
void PlaylistContainer::SetActions(
QAction* new_playlist, QAction* save_playlist, QAction* load_playlist,
QAction* clear_playlist) {
QAction* new_playlist, QAction* save_playlist, QAction* load_playlist) {
ui_->create_new->setDefaultAction(new_playlist);
ui_->save->setDefaultAction(save_playlist);
ui_->load->setDefaultAction(load_playlist);
ui_->clear_playlist->setDefaultAction(clear_playlist);
ui_->tab_bar->SetActions(new_playlist, load_playlist);

2
src/playlist/playlistcontainer.h
View File

@ -39,7 +39,7 @@ public:
static const char* kSettingsGroup;
void SetActions(QAction* new_playlist, QAction* save_playlist,
QAction* load_playlist, QAction* clear_playlist);
QAction* load_playlist);
void SetManager(PlaylistManager* manager);
PlaylistView* view() const;

13
src/playlist/playlistcontainer.ui
View File

@ -39,19 +39,6 @@
<property name="margin">
<number>0</number>
</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>
<widget class="QToolButton" name="create_new">
<property name="iconSize">

3
src/ui/mainwindow.cpp
View File

@ -260,8 +260,9 @@ MainWindow::MainWindow(NetworkAccessManager* network, Engine::Type engine, QWidg
ui_->stop_button->setDefaultAction(ui_->action_stop);
ui_->love_button->setDefaultAction(ui_->action_love);
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_->action_load_playlist, ui_->action_clear_playlist);
ui_->action_load_playlist);
#ifdef ENABLE_VISUALISATIONS
visualisation_->SetActions(ui_->action_previous_track, ui_->action_play_pause,

20
src/ui/mainwindow.ui
View File

@ -183,6 +183,26 @@
<property name="margin">
<number>0</number>
</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>
<widget class="QToolButton" name="back_button">
<property name="iconSize">