From 43c2c636d2d8f8b8aafc44de1d5e321e9a2cfd1b Mon Sep 17 00:00:00 2001 From: Ilya Selyuminov Date: Mon, 12 Sep 2016 16:00:01 +0300 Subject: [PATCH 1/2] Add ability to show full playlist name in PlaylistTab. --- src/playlist/playlisttabbar.cpp | 32 ++++++++++++++++++++++++++++++++ src/playlist/playlisttabbar.h | 3 +++ 2 files changed, 35 insertions(+) diff --git a/src/playlist/playlisttabbar.cpp b/src/playlist/playlisttabbar.cpp index ba7a674eb..d543e4241 100644 --- a/src/playlist/playlisttabbar.cpp +++ b/src/playlist/playlisttabbar.cpp @@ -57,6 +57,16 @@ PlaylistTabBar::PlaylistTabBar(QWidget* parent) tr("Rename playlist..."), this, SLOT(Rename())); save_ = menu_->addAction(IconLoader::Load("document-save", IconLoader::Base), tr("Save playlist..."), this, SLOT(Save())); + + menu_->addSeparator(); + + expand_ = menu_->addAction(IconLoader::Load("zoom-in", IconLoader::Base), + tr("Show full playlists names"), this, SLOT(ExpandNames())); + elide_ = menu_->addAction(IconLoader::Load("zoom-in", IconLoader::Base), + tr("Hide full playlists names"), this, SLOT(ExpandNames())); + + elide_->setVisible(false); + menu_->addSeparator(); rename_editor_->setVisible(false); @@ -408,3 +418,25 @@ void PlaylistTabBar::PlaylistFavoritedSlot(int id, bool favorite) { favorite_widget->SetFavorite(favorite); } } + +void PlaylistTabBar::ExpandNames() +{ + switch(elideMode()) { + case Qt::ElideNone: { + setElideMode(Qt::ElideRight); + elide_->setVisible(false); + expand_->setVisible(true); + break; + } + + case Qt::ElideRight: { + setElideMode(Qt::ElideNone); + elide_->setVisible(true); + expand_->setVisible(false); + break; + } + + default: + assert(false); + } +} diff --git a/src/playlist/playlisttabbar.h b/src/playlist/playlisttabbar.h index 98cb74b93..fdbf2bb5d 100644 --- a/src/playlist/playlisttabbar.h +++ b/src/playlist/playlisttabbar.h @@ -86,6 +86,7 @@ signals: void PlaylistManagerInitialized(); void TabMoved(); void Save(); + void ExpandNames(); private: PlaylistManager* manager_; @@ -96,6 +97,8 @@ signals: QAction* rename_; QAction* close_; QAction* save_; + QAction* expand_; + QAction* elide_; QBasicTimer drag_hover_timer_; int drag_hover_tab_; From dc2ad805c4f3758e8ac44ab527b2bf1a69c0156d Mon Sep 17 00:00:00 2001 From: Ilya Selyuminov Date: Tue, 13 Sep 2016 14:35:47 +0300 Subject: [PATCH 2/2] fix style errors. --- src/playlist/playlisttabbar.cpp | 37 ++++++++++++++++----------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/src/playlist/playlisttabbar.cpp b/src/playlist/playlisttabbar.cpp index d543e4241..849389c7a 100644 --- a/src/playlist/playlisttabbar.cpp +++ b/src/playlist/playlisttabbar.cpp @@ -419,24 +419,23 @@ void PlaylistTabBar::PlaylistFavoritedSlot(int id, bool favorite) { } } -void PlaylistTabBar::ExpandNames() -{ - switch(elideMode()) { - case Qt::ElideNone: { - setElideMode(Qt::ElideRight); - elide_->setVisible(false); - expand_->setVisible(true); - break; - } - - case Qt::ElideRight: { - setElideMode(Qt::ElideNone); - elide_->setVisible(true); - expand_->setVisible(false); - break; - } - - default: - assert(false); +void PlaylistTabBar::ExpandNames() { + switch (elideMode()) { + case Qt::ElideNone: { + setElideMode(Qt::ElideRight); + elide_->setVisible(false); + expand_->setVisible(true); + break; } + + case Qt::ElideRight: { + setElideMode(Qt::ElideNone); + elide_->setVisible(true); + expand_->setVisible(false); + break; + } + + default: + assert(false); + } }