diff --git a/src/playlist/playlistheader.cpp b/src/playlist/playlistheader.cpp index d697ed4bc..6245348ff 100644 --- a/src/playlist/playlistheader.cpp +++ b/src/playlist/playlistheader.cpp @@ -24,12 +24,10 @@ PlaylistHeader::PlaylistHeader(Qt::Orientation orientation, QWidget* parent) : QHeaderView(orientation, parent), menu_(new QMenu(this)), - show_menu_(new QMenu(this)), show_mapper_(new QSignalMapper(this)) { hide_action_ = menu_->addAction(tr("Hide..."), this, SLOT(HideCurrent())); - QAction* show_action = menu_->addAction(tr("Show section")); - show_action->setMenu(show_menu_); + menu_->addSeparator(); connect(show_mapper_, SIGNAL(mapped(int)), SLOT(ToggleVisible(int))); } @@ -47,7 +45,8 @@ void PlaylistHeader::contextMenuEvent(QContextMenuEvent* e) { hide_action_->setText(tr("Hide %1").arg(title)); } - show_menu_->clear(); + qDeleteAll(show_actions_); + show_actions_.clear(); for (int i=0 ; iheaderData(index, Qt::Horizontal).toString()); - QAction* action = show_menu_->addAction(title, show_mapper_, SLOT(map())); + QAction* action = menu_->addAction(title, show_mapper_, SLOT(map())); action->setCheckable(true); action->setChecked(!isSectionHidden(index)); + show_actions_ << action; show_mapper_->setMapping(action, index); } diff --git a/src/playlist/playlistheader.h b/src/playlist/playlistheader.h index cf8f16c8c..f9f3e5ce4 100644 --- a/src/playlist/playlistheader.h +++ b/src/playlist/playlistheader.h @@ -42,7 +42,7 @@ class PlaylistHeader : public QHeaderView { int menu_section_; QMenu* menu_; QAction* hide_action_; - QMenu* show_menu_; + QList show_actions_; QSignalMapper* show_mapper_; }; diff --git a/src/translations/ar.po b/src/translations/ar.po index fdd40cb7c..cd69b48db 100644 --- a/src/translations/ar.po +++ b/src/translations/ar.po @@ -289,9 +289,6 @@ msgstr "المجرى" msgid "Hide..." msgstr "إخفاء..." -msgid "Show section" -msgstr "اظهر القسم" - #, qt-format msgid "Hide %1" msgstr "أخفِ %1" @@ -1415,5 +1412,8 @@ msgstr "" msgid "0:00:00" msgstr "" +#~ msgid "Show section" +#~ msgstr "اظهر القسم" + #~ msgid "Options" #~ msgstr "خيارات" diff --git a/src/translations/cs.po b/src/translations/cs.po index a516520bd..3e518c941 100644 --- a/src/translations/cs.po +++ b/src/translations/cs.po @@ -290,9 +290,6 @@ msgstr "Proud" msgid "Hide..." msgstr "Skrýt..." -msgid "Show section" -msgstr "Zobrazit skeci" - #, qt-format msgid "Hide %1" msgstr "Skrýt %1" @@ -1419,6 +1416,9 @@ msgstr "" msgid "0:00:00" msgstr "0:00:00" +#~ msgid "Show section" +#~ msgstr "Zobrazit skeci" + #~ msgid "Enter your Last.fm details below:" #~ msgstr "Níže zadejte přihlašovací údaje pro Last.fm:" diff --git a/src/translations/da.po b/src/translations/da.po index e5fd62da2..8a178c546 100644 --- a/src/translations/da.po +++ b/src/translations/da.po @@ -292,9 +292,6 @@ msgstr "Stream" msgid "Hide..." msgstr "Skjul..." -msgid "Show section" -msgstr "Vis sektion" - #, qt-format msgid "Hide %1" msgstr "Skjul %1" @@ -1422,6 +1419,9 @@ msgstr "" msgid "0:00:00" msgstr "0:00:00" +#~ msgid "Show section" +#~ msgstr "Vis sektion" + #~ msgid "Enter your Last.fm details below:" #~ msgstr "Indtast dine Last.fm-detaljer herunder:" diff --git a/src/translations/de.po b/src/translations/de.po index 6202d7aa4..4c5b28242 100644 --- a/src/translations/de.po +++ b/src/translations/de.po @@ -290,9 +290,6 @@ msgstr "Stream" msgid "Hide..." msgstr "Verstecken..." -msgid "Show section" -msgstr "Spalten" - #, qt-format msgid "Hide %1" msgstr "%1 ausblenden" @@ -1423,6 +1420,9 @@ msgstr "" msgid "0:00:00" msgstr "0:00:00" +#~ msgid "Show section" +#~ msgstr "Spalten" + #~ msgid "Enter your Last.fm details below:" #~ msgstr "Geben Sie hier Ihre Last.fm Daten ein:" diff --git a/src/translations/el.po b/src/translations/el.po index 50b8931ee..66d436a86 100644 --- a/src/translations/el.po +++ b/src/translations/el.po @@ -293,9 +293,6 @@ msgstr "Stream" msgid "Hide..." msgstr "Απόκρυψη..." -msgid "Show section" -msgstr "Εμφάνιση τμήματος" - #, qt-format msgid "Hide %1" msgstr "Απόκρυψη %1" @@ -1425,6 +1422,9 @@ msgstr "Σφάλμα του Clementine." msgid "0:00:00" msgstr "0:00:00" +#~ msgid "Show section" +#~ msgstr "Εμφάνιση τμήματος" + #~ msgid "Enter your Last.fm details below:" #~ msgstr "Εισάγετε τις λεπτομέρειες για το Last.fm:" diff --git a/src/translations/en_CA.po b/src/translations/en_CA.po index b8c1d886e..fcecf1248 100644 --- a/src/translations/en_CA.po +++ b/src/translations/en_CA.po @@ -290,9 +290,6 @@ msgstr "Stream" msgid "Hide..." msgstr "Hide..." -msgid "Show section" -msgstr "Show section" - #, qt-format msgid "Hide %1" msgstr "Hide %1" @@ -1420,6 +1417,9 @@ msgstr "Clementine Error" msgid "0:00:00" msgstr "0:00:00" +#~ msgid "Show section" +#~ msgstr "Show section" + #~ msgid "Enter your Last.fm details below:" #~ msgstr "Enter your Last.fm details below:" diff --git a/src/translations/en_GB.po b/src/translations/en_GB.po index 29cd3f498..de4a364c5 100644 --- a/src/translations/en_GB.po +++ b/src/translations/en_GB.po @@ -289,9 +289,6 @@ msgstr "Stream" msgid "Hide..." msgstr "Hide..." -msgid "Show section" -msgstr "Show section" - #, qt-format msgid "Hide %1" msgstr "Hide %1" @@ -1417,6 +1414,9 @@ msgstr "" msgid "0:00:00" msgstr "0:00:00" +#~ msgid "Show section" +#~ msgstr "Show section" + #~ msgid "Enter your Last.fm details below:" #~ msgstr "Enter your Last.fm details below:" diff --git a/src/translations/es.po b/src/translations/es.po index 1e7b1a8ba..b3c2e7801 100644 --- a/src/translations/es.po +++ b/src/translations/es.po @@ -292,9 +292,6 @@ msgstr "Transmisión" msgid "Hide..." msgstr "Ocultar..." -msgid "Show section" -msgstr "Mostrar columna" - #, qt-format msgid "Hide %1" msgstr "Ocultar %1" @@ -1431,6 +1428,9 @@ msgstr "Error de Clementine" msgid "0:00:00" msgstr "0:00:00" +#~ msgid "Show section" +#~ msgstr "Mostrar columna" + #~ msgid "Enter your Last.fm details below:" #~ msgstr "Ingrese su información de Last.fm debajo:" diff --git a/src/translations/fi.po b/src/translations/fi.po index 0280a75ff..4e0418aff 100644 --- a/src/translations/fi.po +++ b/src/translations/fi.po @@ -289,9 +289,6 @@ msgstr "" msgid "Hide..." msgstr "Piilota" -msgid "Show section" -msgstr "" - #, qt-format msgid "Hide %1" msgstr "Piilota %1" diff --git a/src/translations/fr.po b/src/translations/fr.po index adb0dc892..78c696299 100644 --- a/src/translations/fr.po +++ b/src/translations/fr.po @@ -290,9 +290,6 @@ msgstr "Flux" msgid "Hide..." msgstr "Masquer..." -msgid "Show section" -msgstr "Montrer la colonne" - #, qt-format msgid "Hide %1" msgstr "Masquer %1" @@ -1427,6 +1424,9 @@ msgstr "" msgid "0:00:00" msgstr "0:00:00" +#~ msgid "Show section" +#~ msgstr "Montrer la colonne" + #~ msgid "Enter your Last.fm details below:" #~ msgstr "Inscrivez vos identifiants Last.fm ci-dessous :" diff --git a/src/translations/gl.po b/src/translations/gl.po index 040113629..c4f39a30b 100644 --- a/src/translations/gl.po +++ b/src/translations/gl.po @@ -289,9 +289,6 @@ msgstr "Fluxo" msgid "Hide..." msgstr "Esconder..." -msgid "Show section" -msgstr "Mostrar a seczón" - #, qt-format msgid "Hide %1" msgstr "Esconder %1" @@ -1416,3 +1413,6 @@ msgstr "" msgid "0:00:00" msgstr "" + +#~ msgid "Show section" +#~ msgstr "Mostrar a seczón" diff --git a/src/translations/it.po b/src/translations/it.po index a9d445630..ad59132fb 100644 --- a/src/translations/it.po +++ b/src/translations/it.po @@ -292,9 +292,6 @@ msgstr "Flusso" msgid "Hide..." msgstr "Nascondi..." -msgid "Show section" -msgstr "Mostra sezione" - #, qt-format msgid "Hide %1" msgstr "Nascondi %1" @@ -1428,6 +1425,9 @@ msgstr "Errore di Clementine" msgid "0:00:00" msgstr "0:00:00" +#~ msgid "Show section" +#~ msgstr "Mostra sezione" + #~ msgid "Enter your Last.fm details below:" #~ msgstr "Inserisci di seguito i tuoi dettagli Last.fm:" diff --git a/src/translations/kk.po b/src/translations/kk.po index 97a8fc50e..51e9a896c 100644 --- a/src/translations/kk.po +++ b/src/translations/kk.po @@ -289,9 +289,6 @@ msgstr "Ағындық" msgid "Hide..." msgstr "" -msgid "Show section" -msgstr "" - #, qt-format msgid "Hide %1" msgstr "%1 жасыру" diff --git a/src/translations/nb.po b/src/translations/nb.po index 6f18caff9..542f815a4 100644 --- a/src/translations/nb.po +++ b/src/translations/nb.po @@ -289,9 +289,6 @@ msgstr "Strøm" msgid "Hide..." msgstr "Skjul..." -msgid "Show section" -msgstr "Vis del" - #, qt-format msgid "Hide %1" msgstr "Skjul %1" @@ -1419,6 +1416,9 @@ msgstr "" msgid "0:00:00" msgstr "0:00:00" +#~ msgid "Show section" +#~ msgstr "Vis del" + #~ msgid "Enter your Last.fm details below:" #~ msgstr "Fyll inn din Last.fm brukerinformasjon under:" diff --git a/src/translations/oc.po b/src/translations/oc.po index 9387dcab2..46ac6802f 100644 --- a/src/translations/oc.po +++ b/src/translations/oc.po @@ -289,9 +289,6 @@ msgstr "Flux" msgid "Hide..." msgstr "Amagar..." -msgid "Show section" -msgstr "" - #, qt-format msgid "Hide %1" msgstr "Amagar « %1 »" diff --git a/src/translations/pl.po b/src/translations/pl.po index 59e25bb2b..d6ac65a22 100644 --- a/src/translations/pl.po +++ b/src/translations/pl.po @@ -290,9 +290,6 @@ msgstr "" msgid "Hide..." msgstr "Ukryj..." -msgid "Show section" -msgstr "Pokaż sekcję" - #, qt-format msgid "Hide %1" msgstr "Ukryj %1" @@ -1417,6 +1414,9 @@ msgstr "" msgid "0:00:00" msgstr "" +#~ msgid "Show section" +#~ msgstr "Pokaż sekcję" + #~ msgid "Enter your Last.fm details below:" #~ msgstr "Podaj swoje dane dla Last.fm:" diff --git a/src/translations/pt.po b/src/translations/pt.po index 97f80d75b..2f5a97ac2 100644 --- a/src/translations/pt.po +++ b/src/translations/pt.po @@ -291,9 +291,6 @@ msgstr "Emissão" msgid "Hide..." msgstr "Ocultar..." -msgid "Show section" -msgstr "Mostrar secção" - #, qt-format msgid "Hide %1" msgstr "Ocultar %1" @@ -1422,6 +1419,9 @@ msgstr "Erro do Clementine" msgid "0:00:00" msgstr "0:00:00" +#~ msgid "Show section" +#~ msgstr "Mostrar secção" + #~ msgid "Enter your Last.fm details below:" #~ msgstr "Introduza em baixo os seus detalhes Last.fm:" diff --git a/src/translations/pt_BR.po b/src/translations/pt_BR.po index 70bf6d492..bb0988c8d 100644 --- a/src/translations/pt_BR.po +++ b/src/translations/pt_BR.po @@ -291,9 +291,6 @@ msgstr "Transmissão online" msgid "Hide..." msgstr "Esconder..." -msgid "Show section" -msgstr "Mostrar sessão" - #, qt-format msgid "Hide %1" msgstr "Ocultar %1" @@ -1425,6 +1422,9 @@ msgstr "" msgid "0:00:00" msgstr "0:00:00" +#~ msgid "Show section" +#~ msgstr "Mostrar sessão" + #~ msgid "Enter your Last.fm details below:" #~ msgstr "Digite seus dados do Last.fm abaixo:" diff --git a/src/translations/ro.po b/src/translations/ro.po index f198f3f4c..965b96405 100644 --- a/src/translations/ro.po +++ b/src/translations/ro.po @@ -289,9 +289,6 @@ msgstr "Flux" msgid "Hide..." msgstr "Ascunde..." -msgid "Show section" -msgstr "Arată secțiune" - #, qt-format msgid "Hide %1" msgstr "Ascunde %1" @@ -1416,6 +1413,9 @@ msgstr "" msgid "0:00:00" msgstr "0:00:00" +#~ msgid "Show section" +#~ msgstr "Arată secțiune" + #~ msgid "Radio" #~ msgstr "Radio" diff --git a/src/translations/ru.po b/src/translations/ru.po index 7c339cf2d..b7f03d7b2 100644 --- a/src/translations/ru.po +++ b/src/translations/ru.po @@ -290,9 +290,6 @@ msgstr "Поток" msgid "Hide..." msgstr "Скрыть..." -msgid "Show section" -msgstr "Показать секцию" - #, qt-format msgid "Hide %1" msgstr "Скрыть %1" @@ -1422,6 +1419,9 @@ msgstr "" msgid "0:00:00" msgstr "0:00:00" +#~ msgid "Show section" +#~ msgstr "Показать секцию" + #~ msgid "Enter your Last.fm details below:" #~ msgstr "Введите ваши данные Last.fm:" diff --git a/src/translations/sk.po b/src/translations/sk.po index b52c661e3..e76bcf9d8 100644 --- a/src/translations/sk.po +++ b/src/translations/sk.po @@ -291,9 +291,6 @@ msgstr "Stream" msgid "Hide..." msgstr "Skryť..." -msgid "Show section" -msgstr "Zobraziť stĺpec" - #, qt-format msgid "Hide %1" msgstr "Skryť %1" @@ -1422,6 +1419,9 @@ msgstr "Chyba Clementine" msgid "0:00:00" msgstr "0:00:00" +#~ msgid "Show section" +#~ msgstr "Zobraziť stĺpec" + #~ msgid "Enter your Last.fm details below:" #~ msgstr "Vložte svoje Last.fm detaily nižšie:" diff --git a/src/translations/sv.po b/src/translations/sv.po index 8df58f094..2ac4cfeab 100644 --- a/src/translations/sv.po +++ b/src/translations/sv.po @@ -289,9 +289,6 @@ msgstr "Ström" msgid "Hide..." msgstr "Dölj..." -msgid "Show section" -msgstr "Visa kolumn" - #, qt-format msgid "Hide %1" msgstr "Dölj %1" @@ -1422,6 +1419,9 @@ msgstr "" msgid "0:00:00" msgstr "0:00:00" +#~ msgid "Show section" +#~ msgstr "Visa kolumn" + #~ msgid "Enter your Last.fm details below:" #~ msgstr "Fyll i dina Last.fm uppgifter nedan:" diff --git a/src/translations/tr.po b/src/translations/tr.po index a0d1e2064..1ac94f116 100644 --- a/src/translations/tr.po +++ b/src/translations/tr.po @@ -289,9 +289,6 @@ msgstr "" msgid "Hide..." msgstr "" -msgid "Show section" -msgstr "" - #, qt-format msgid "Hide %1" msgstr "Gizle %1" diff --git a/src/translations/zh_CN.po b/src/translations/zh_CN.po index 0715719f3..4c3689667 100644 --- a/src/translations/zh_CN.po +++ b/src/translations/zh_CN.po @@ -289,9 +289,6 @@ msgstr "流媒体" msgid "Hide..." msgstr "隐藏..." -msgid "Show section" -msgstr "" - #, qt-format msgid "Hide %1" msgstr "隐藏 %1" diff --git a/src/translations/zh_TW.po b/src/translations/zh_TW.po index dc7249668..ac1829e8a 100644 --- a/src/translations/zh_TW.po +++ b/src/translations/zh_TW.po @@ -289,9 +289,6 @@ msgstr "" msgid "Hide..." msgstr "" -msgid "Show section" -msgstr "" - #, qt-format msgid "Hide %1" msgstr ""