Set a more appropriate text and icon for the queue/dequeue action depending on how many of the selected tracks are queued.

This commit is contained in:
David Sansome 2010-07-11 21:52:00 +00:00
parent 4bf9ee0a8e
commit 81b2e40d30
28 changed files with 376 additions and 29 deletions

View File

@ -475,6 +475,12 @@ msgstr ""
msgid "Delete preset"
msgstr ""
msgid "Dequeue selected tracks"
msgstr ""
msgid "Dequeue track"
msgstr ""
msgid "Destination"
msgstr ""
@ -1193,7 +1199,10 @@ msgstr ""
msgid "Queue Manager"
msgstr ""
msgid "Queue this track"
msgid "Queue selected tracks"
msgstr ""
msgid "Queue track"
msgstr ""
msgid "Radio (equal loudness for all tracks)"
@ -1520,6 +1529,9 @@ msgstr "العنوان"
msgid "Toggle fullscreen"
msgstr ""
msgid "Toggle queue status"
msgstr ""
msgid "Tools"
msgstr ""

View File

@ -476,6 +476,12 @@ msgstr ""
msgid "Delete preset"
msgstr "Smazat předvolbu"
msgid "Dequeue selected tracks"
msgstr ""
msgid "Dequeue track"
msgstr ""
msgid "Destination"
msgstr "Cíl"
@ -1197,7 +1203,10 @@ msgstr "Kvalita"
msgid "Queue Manager"
msgstr ""
msgid "Queue this track"
msgid "Queue selected tracks"
msgstr ""
msgid "Queue track"
msgstr ""
msgid "Radio (equal loudness for all tracks)"
@ -1524,6 +1533,9 @@ msgstr "Titulek"
msgid "Toggle fullscreen"
msgstr "Přenout na celou obrazovku"
msgid "Toggle queue status"
msgstr ""
msgid "Tools"
msgstr "Nástroje"

View File

@ -476,6 +476,12 @@ msgstr ""
msgid "Delete preset"
msgstr "Slet forudindstilling"
msgid "Dequeue selected tracks"
msgstr ""
msgid "Dequeue track"
msgstr ""
msgid "Destination"
msgstr ""
@ -1198,7 +1204,10 @@ msgstr ""
msgid "Queue Manager"
msgstr ""
msgid "Queue this track"
msgid "Queue selected tracks"
msgstr ""
msgid "Queue track"
msgstr ""
msgid "Radio (equal loudness for all tracks)"
@ -1527,6 +1536,9 @@ msgstr "Titel"
msgid "Toggle fullscreen"
msgstr ""
msgid "Toggle queue status"
msgstr ""
msgid "Tools"
msgstr "Værktøjer"

View File

@ -477,6 +477,12 @@ msgstr "Originale löschen"
msgid "Delete preset"
msgstr "Voreinstellung löschen"
msgid "Dequeue selected tracks"
msgstr ""
msgid "Dequeue track"
msgstr ""
msgid "Destination"
msgstr "Ziel"
@ -1201,7 +1207,10 @@ msgstr "Qualität"
msgid "Queue Manager"
msgstr ""
msgid "Queue this track"
msgid "Queue selected tracks"
msgstr ""
msgid "Queue track"
msgstr ""
msgid "Radio (equal loudness for all tracks)"
@ -1528,6 +1537,9 @@ msgstr "Titel"
msgid "Toggle fullscreen"
msgstr "Vollbild an/aus"
msgid "Toggle queue status"
msgstr ""
msgid "Tools"
msgstr "Werkzeuge"

View File

@ -485,6 +485,12 @@ msgstr "Διαγραφή των αυθεντικών"
msgid "Delete preset"
msgstr "Διαγραφή ρύθμισης"
msgid "Dequeue selected tracks"
msgstr ""
msgid "Dequeue track"
msgstr ""
msgid "Destination"
msgstr "Προορισμός"
@ -1208,7 +1214,10 @@ msgstr "Ποιότητα"
msgid "Queue Manager"
msgstr ""
msgid "Queue this track"
msgid "Queue selected tracks"
msgstr ""
msgid "Queue track"
msgstr ""
msgid "Radio (equal loudness for all tracks)"
@ -1536,6 +1545,9 @@ msgstr "Τίτλος"
msgid "Toggle fullscreen"
msgstr "Εναλλαγή πλήρης οθόνης"
msgid "Toggle queue status"
msgstr ""
msgid "Tools"
msgstr "Εργαλεία"

View File

@ -477,6 +477,12 @@ msgstr ""
msgid "Delete preset"
msgstr "Delete preset"
msgid "Dequeue selected tracks"
msgstr ""
msgid "Dequeue track"
msgstr ""
msgid "Destination"
msgstr "Destination"
@ -1198,7 +1204,10 @@ msgstr ""
msgid "Queue Manager"
msgstr ""
msgid "Queue this track"
msgid "Queue selected tracks"
msgstr ""
msgid "Queue track"
msgstr ""
msgid "Radio (equal loudness for all tracks)"
@ -1525,6 +1534,9 @@ msgstr "Title"
msgid "Toggle fullscreen"
msgstr ""
msgid "Toggle queue status"
msgstr ""
msgid "Tools"
msgstr "Tools"

View File

@ -475,6 +475,12 @@ msgstr ""
msgid "Delete preset"
msgstr "Delete preset"
msgid "Dequeue selected tracks"
msgstr ""
msgid "Dequeue track"
msgstr ""
msgid "Destination"
msgstr ""
@ -1195,7 +1201,10 @@ msgstr ""
msgid "Queue Manager"
msgstr ""
msgid "Queue this track"
msgid "Queue selected tracks"
msgstr ""
msgid "Queue track"
msgstr ""
msgid "Radio (equal loudness for all tracks)"
@ -1522,6 +1531,9 @@ msgstr "Title"
msgid "Toggle fullscreen"
msgstr ""
msgid "Toggle queue status"
msgstr ""
msgid "Tools"
msgstr "Tools"

View File

@ -479,6 +479,12 @@ msgstr "Eliminar originales"
msgid "Delete preset"
msgstr "Eliminar predefinición"
msgid "Dequeue selected tracks"
msgstr ""
msgid "Dequeue track"
msgstr ""
msgid "Destination"
msgstr "Destino"
@ -1206,7 +1212,10 @@ msgstr "Calidad"
msgid "Queue Manager"
msgstr ""
msgid "Queue this track"
msgid "Queue selected tracks"
msgstr ""
msgid "Queue track"
msgstr ""
msgid "Radio (equal loudness for all tracks)"
@ -1534,6 +1543,9 @@ msgstr "Título"
msgid "Toggle fullscreen"
msgstr "Pantalla completa"
msgid "Toggle queue status"
msgstr ""
msgid "Tools"
msgstr "Herramientas"

View File

@ -475,6 +475,12 @@ msgstr "Poista alkuperäiset"
msgid "Delete preset"
msgstr ""
msgid "Dequeue selected tracks"
msgstr ""
msgid "Dequeue track"
msgstr ""
msgid "Destination"
msgstr "Kohde"
@ -1195,7 +1201,10 @@ msgstr "Laatu"
msgid "Queue Manager"
msgstr ""
msgid "Queue this track"
msgid "Queue selected tracks"
msgstr ""
msgid "Queue track"
msgstr ""
msgid "Radio (equal loudness for all tracks)"
@ -1522,6 +1531,9 @@ msgstr "Kappale"
msgid "Toggle fullscreen"
msgstr ""
msgid "Toggle queue status"
msgstr ""
msgid "Tools"
msgstr ""

View File

@ -476,6 +476,12 @@ msgstr ""
msgid "Delete preset"
msgstr ""
msgid "Dequeue selected tracks"
msgstr ""
msgid "Dequeue track"
msgstr ""
msgid "Destination"
msgstr ""
@ -1201,7 +1207,10 @@ msgstr ""
msgid "Queue Manager"
msgstr ""
msgid "Queue this track"
msgid "Queue selected tracks"
msgstr ""
msgid "Queue track"
msgstr ""
msgid "Radio (equal loudness for all tracks)"
@ -1530,6 +1539,9 @@ msgstr "Titre"
msgid "Toggle fullscreen"
msgstr ""
msgid "Toggle queue status"
msgstr ""
msgid "Tools"
msgstr "Outils"

View File

@ -475,6 +475,12 @@ msgstr ""
msgid "Delete preset"
msgstr "Eliminar predefinido"
msgid "Dequeue selected tracks"
msgstr ""
msgid "Dequeue track"
msgstr ""
msgid "Destination"
msgstr ""
@ -1195,7 +1201,10 @@ msgstr ""
msgid "Queue Manager"
msgstr ""
msgid "Queue this track"
msgid "Queue selected tracks"
msgstr ""
msgid "Queue track"
msgstr ""
msgid "Radio (equal loudness for all tracks)"
@ -1522,6 +1531,9 @@ msgstr "Título"
msgid "Toggle fullscreen"
msgstr ""
msgid "Toggle queue status"
msgstr ""
msgid "Tools"
msgstr ""

View File

@ -478,6 +478,12 @@ msgstr "Elimina originali"
msgid "Delete preset"
msgstr "Elimina la preimpostazione"
msgid "Dequeue selected tracks"
msgstr ""
msgid "Dequeue track"
msgstr ""
msgid "Destination"
msgstr "Destinazione"
@ -1204,7 +1210,10 @@ msgstr "Qualità"
msgid "Queue Manager"
msgstr ""
msgid "Queue this track"
msgid "Queue selected tracks"
msgstr ""
msgid "Queue track"
msgstr ""
msgid "Radio (equal loudness for all tracks)"
@ -1535,6 +1544,9 @@ msgstr "Titolo"
msgid "Toggle fullscreen"
msgstr "Attiva la modalità a schermo intero"
msgid "Toggle queue status"
msgstr ""
msgid "Tools"
msgstr "Strumenti"

View File

@ -475,6 +475,12 @@ msgstr ""
msgid "Delete preset"
msgstr ""
msgid "Dequeue selected tracks"
msgstr ""
msgid "Dequeue track"
msgstr ""
msgid "Destination"
msgstr ""
@ -1195,7 +1201,10 @@ msgstr ""
msgid "Queue Manager"
msgstr ""
msgid "Queue this track"
msgid "Queue selected tracks"
msgstr ""
msgid "Queue track"
msgstr ""
msgid "Radio (equal loudness for all tracks)"
@ -1522,6 +1531,9 @@ msgstr "Аталуы"
msgid "Toggle fullscreen"
msgstr ""
msgid "Toggle queue status"
msgstr ""
msgid "Tools"
msgstr ""

View File

@ -475,6 +475,12 @@ msgstr ""
msgid "Delete preset"
msgstr "Slett forhåndsinnstilling"
msgid "Dequeue selected tracks"
msgstr ""
msgid "Dequeue track"
msgstr ""
msgid "Destination"
msgstr ""
@ -1196,7 +1202,10 @@ msgstr ""
msgid "Queue Manager"
msgstr ""
msgid "Queue this track"
msgid "Queue selected tracks"
msgstr ""
msgid "Queue track"
msgstr ""
msgid "Radio (equal loudness for all tracks)"
@ -1524,6 +1533,9 @@ msgstr "Tittel"
msgid "Toggle fullscreen"
msgstr ""
msgid "Toggle queue status"
msgstr ""
msgid "Tools"
msgstr "Verktøy"

View File

@ -475,6 +475,12 @@ msgstr ""
msgid "Delete preset"
msgstr "Escafar un prereglatge"
msgid "Dequeue selected tracks"
msgstr ""
msgid "Dequeue track"
msgstr ""
msgid "Destination"
msgstr "Destinacion"
@ -1193,7 +1199,10 @@ msgstr ""
msgid "Queue Manager"
msgstr ""
msgid "Queue this track"
msgid "Queue selected tracks"
msgstr ""
msgid "Queue track"
msgstr ""
msgid "Radio (equal loudness for all tracks)"
@ -1520,6 +1529,9 @@ msgstr "Títol"
msgid "Toggle fullscreen"
msgstr ""
msgid "Toggle queue status"
msgstr ""
msgid "Tools"
msgstr "Espleches"

View File

@ -476,6 +476,12 @@ msgstr ""
msgid "Delete preset"
msgstr ""
msgid "Dequeue selected tracks"
msgstr ""
msgid "Dequeue track"
msgstr ""
msgid "Destination"
msgstr ""
@ -1195,7 +1201,10 @@ msgstr ""
msgid "Queue Manager"
msgstr ""
msgid "Queue this track"
msgid "Queue selected tracks"
msgstr ""
msgid "Queue track"
msgstr ""
msgid "Radio (equal loudness for all tracks)"
@ -1522,6 +1531,9 @@ msgstr "Nazwa"
msgid "Toggle fullscreen"
msgstr ""
msgid "Toggle queue status"
msgstr ""
msgid "Tools"
msgstr "Narzędzia"

View File

@ -482,6 +482,12 @@ msgstr "Apagar originais"
msgid "Delete preset"
msgstr "Apagar pré-ajustes"
msgid "Dequeue selected tracks"
msgstr ""
msgid "Dequeue track"
msgstr ""
msgid "Destination"
msgstr "Destino"
@ -1205,7 +1211,10 @@ msgstr "Qualidade"
msgid "Queue Manager"
msgstr ""
msgid "Queue this track"
msgid "Queue selected tracks"
msgstr ""
msgid "Queue track"
msgstr ""
msgid "Radio (equal loudness for all tracks)"
@ -1532,6 +1541,9 @@ msgstr "Título"
msgid "Toggle fullscreen"
msgstr "Alternar ecrã completo"
msgid "Toggle queue status"
msgstr ""
msgid "Tools"
msgstr "Ferramentas"

View File

@ -480,6 +480,12 @@ msgstr "Apagar originais"
msgid "Delete preset"
msgstr "Apagar pré-regulagem"
msgid "Dequeue selected tracks"
msgstr ""
msgid "Dequeue track"
msgstr ""
msgid "Destination"
msgstr "Destino"
@ -1205,7 +1211,10 @@ msgstr "Qualidade"
msgid "Queue Manager"
msgstr ""
msgid "Queue this track"
msgid "Queue selected tracks"
msgstr ""
msgid "Queue track"
msgstr ""
msgid "Radio (equal loudness for all tracks)"
@ -1533,6 +1542,9 @@ msgstr "Tí­tulo"
msgid "Toggle fullscreen"
msgstr "Alternar tela cheia"
msgid "Toggle queue status"
msgstr ""
msgid "Tools"
msgstr "Ferramentas"

View File

@ -475,6 +475,12 @@ msgstr ""
msgid "Delete preset"
msgstr "Şterge presetări"
msgid "Dequeue selected tracks"
msgstr ""
msgid "Dequeue track"
msgstr ""
msgid "Destination"
msgstr ""
@ -1194,7 +1200,10 @@ msgstr ""
msgid "Queue Manager"
msgstr ""
msgid "Queue this track"
msgid "Queue selected tracks"
msgstr ""
msgid "Queue track"
msgstr ""
msgid "Radio (equal loudness for all tracks)"
@ -1521,6 +1530,9 @@ msgstr "Titlu"
msgid "Toggle fullscreen"
msgstr ""
msgid "Toggle queue status"
msgstr ""
msgid "Tools"
msgstr "Unelte"

View File

@ -476,6 +476,12 @@ msgstr "Удалить оригиналы"
msgid "Delete preset"
msgstr "Удалить настройку"
msgid "Dequeue selected tracks"
msgstr ""
msgid "Dequeue track"
msgstr ""
msgid "Destination"
msgstr "Назначение"
@ -1199,7 +1205,10 @@ msgstr "Качество"
msgid "Queue Manager"
msgstr ""
msgid "Queue this track"
msgid "Queue selected tracks"
msgstr ""
msgid "Queue track"
msgstr ""
msgid "Radio (equal loudness for all tracks)"
@ -1527,6 +1536,9 @@ msgstr "Название"
msgid "Toggle fullscreen"
msgstr "Переключение в полноэкранный режим"
msgid "Toggle queue status"
msgstr ""
msgid "Tools"
msgstr "Инструменты"

View File

@ -482,6 +482,12 @@ msgstr "Vymazať originály"
msgid "Delete preset"
msgstr "Vymazať predvoľbu"
msgid "Dequeue selected tracks"
msgstr ""
msgid "Dequeue track"
msgstr ""
msgid "Destination"
msgstr "Cieľ"
@ -1204,7 +1210,10 @@ msgstr "Kvalita"
msgid "Queue Manager"
msgstr ""
msgid "Queue this track"
msgid "Queue selected tracks"
msgstr ""
msgid "Queue track"
msgstr ""
msgid "Radio (equal loudness for all tracks)"
@ -1531,6 +1540,9 @@ msgstr "Názov"
msgid "Toggle fullscreen"
msgstr "Prepnúť na celú obrazovku"
msgid "Toggle queue status"
msgstr ""
msgid "Tools"
msgstr "Nástroje"

View File

@ -477,6 +477,12 @@ msgstr ""
msgid "Delete preset"
msgstr "Ta bort förinställning"
msgid "Dequeue selected tracks"
msgstr ""
msgid "Dequeue track"
msgstr ""
msgid "Destination"
msgstr "Mål"
@ -1198,7 +1204,10 @@ msgstr "Kvalitet"
msgid "Queue Manager"
msgstr ""
msgid "Queue this track"
msgid "Queue selected tracks"
msgstr ""
msgid "Queue track"
msgstr ""
msgid "Radio (equal loudness for all tracks)"
@ -1527,6 +1536,9 @@ msgstr "Titel"
msgid "Toggle fullscreen"
msgstr "Växla fullskärm"
msgid "Toggle queue status"
msgstr ""
msgid "Tools"
msgstr "Verktyg"

View File

@ -475,6 +475,12 @@ msgstr ""
msgid "Delete preset"
msgstr ""
msgid "Dequeue selected tracks"
msgstr ""
msgid "Dequeue track"
msgstr ""
msgid "Destination"
msgstr ""
@ -1195,7 +1201,10 @@ msgstr ""
msgid "Queue Manager"
msgstr ""
msgid "Queue this track"
msgid "Queue selected tracks"
msgstr ""
msgid "Queue track"
msgstr ""
msgid "Radio (equal loudness for all tracks)"
@ -1522,6 +1531,9 @@ msgstr "Başlık"
msgid "Toggle fullscreen"
msgstr ""
msgid "Toggle queue status"
msgstr ""
msgid "Tools"
msgstr "Araçlar"

View File

@ -466,6 +466,12 @@ msgstr ""
msgid "Delete preset"
msgstr ""
msgid "Dequeue selected tracks"
msgstr ""
msgid "Dequeue track"
msgstr ""
msgid "Destination"
msgstr ""
@ -1184,7 +1190,10 @@ msgstr ""
msgid "Queue Manager"
msgstr ""
msgid "Queue this track"
msgid "Queue selected tracks"
msgstr ""
msgid "Queue track"
msgstr ""
msgid "Radio (equal loudness for all tracks)"
@ -1511,6 +1520,9 @@ msgstr ""
msgid "Toggle fullscreen"
msgstr ""
msgid "Toggle queue status"
msgstr ""
msgid "Tools"
msgstr ""

View File

@ -481,6 +481,12 @@ msgstr "Вилучити ориґінали"
msgid "Delete preset"
msgstr "Стерти установки"
msgid "Dequeue selected tracks"
msgstr ""
msgid "Dequeue track"
msgstr ""
msgid "Destination"
msgstr "Призначення"
@ -1204,7 +1210,10 @@ msgstr "Якість"
msgid "Queue Manager"
msgstr ""
msgid "Queue this track"
msgid "Queue selected tracks"
msgstr ""
msgid "Queue track"
msgstr ""
msgid "Radio (equal loudness for all tracks)"
@ -1531,6 +1540,9 @@ msgstr "Назва"
msgid "Toggle fullscreen"
msgstr "Повноекранний режим"
msgid "Toggle queue status"
msgstr ""
msgid "Tools"
msgstr "Інструменти"

View File

@ -475,6 +475,12 @@ msgstr ""
msgid "Delete preset"
msgstr ""
msgid "Dequeue selected tracks"
msgstr ""
msgid "Dequeue track"
msgstr ""
msgid "Destination"
msgstr ""
@ -1193,7 +1199,10 @@ msgstr ""
msgid "Queue Manager"
msgstr ""
msgid "Queue this track"
msgid "Queue selected tracks"
msgstr ""
msgid "Queue track"
msgstr ""
msgid "Radio (equal loudness for all tracks)"
@ -1520,6 +1529,9 @@ msgstr "标题"
msgid "Toggle fullscreen"
msgstr ""
msgid "Toggle queue status"
msgstr ""
msgid "Tools"
msgstr ""

View File

@ -475,6 +475,12 @@ msgstr ""
msgid "Delete preset"
msgstr ""
msgid "Dequeue selected tracks"
msgstr ""
msgid "Dequeue track"
msgstr ""
msgid "Destination"
msgstr ""
@ -1193,7 +1199,10 @@ msgstr ""
msgid "Queue Manager"
msgstr ""
msgid "Queue this track"
msgid "Queue selected tracks"
msgstr ""
msgid "Queue track"
msgstr ""
msgid "Radio (equal loudness for all tracks)"
@ -1520,6 +1529,9 @@ msgstr ""
msgid "Toggle fullscreen"
msgstr ""
msgid "Toggle queue status"
msgstr ""
msgid "Tools"
msgstr ""

View File

@ -376,7 +376,7 @@ MainWindow::MainWindow(NetworkAccessManager* network, Engine::Type engine, QWidg
playlist_play_pause_ = playlist_menu_->addAction(tr("Play"), this, SLOT(PlaylistPlay()));
playlist_menu_->addAction(ui_->action_stop);
playlist_stop_after_ = playlist_menu_->addAction(IconLoader::Load("media-playback-stop"), tr("Stop after this track"), this, SLOT(PlaylistStopAfter()));
playlist_queue_ = playlist_menu_->addAction(IconLoader::Load("go-next"), tr("Queue this track"), this, SLOT(PlaylistQueue()));
playlist_queue_ = playlist_menu_->addAction("", this, SLOT(PlaylistQueue()));
playlist_menu_->addSeparator();
playlist_menu_->addAction(ui_->action_remove_from_playlist);
playlist_undoredo_ = playlist_menu_->addSeparator();
@ -925,15 +925,22 @@ void MainWindow::PlaylistRightClick(const QPoint& global_pos, const QModelIndex&
playlist_stop_after_->setEnabled(index.isValid());
// Are any of the selected songs editable?
// Are any of the selected songs editable or queued?
QModelIndexList selection = ui_->playlist->view()->selectionModel()->selection().indexes();
int editable = 0;
int in_queue = 0;
int not_in_queue = 0;
foreach (const QModelIndex& index, selection) {
if (index.column() != 0)
continue;
if (playlists_->current()->item_at(index.row())->Metadata().IsEditable()) {
editable++;
}
if (index.data(Playlist::Role_QueuePosition).toInt() == -1)
not_in_queue ++;
else
in_queue ++;
}
ui_->action_edit_track->setEnabled(editable);
@ -948,6 +955,22 @@ void MainWindow::PlaylistRightClick(const QPoint& global_pos, const QModelIndex&
playlist_organise_->setVisible(false);
playlist_delete_->setVisible(false);
if (in_queue == 1 && not_in_queue == 0)
playlist_queue_->setText(tr("Dequeue track"));
else if (in_queue > 1 && not_in_queue == 0)
playlist_queue_->setText(tr("Dequeue selected tracks"));
else if (in_queue == 0 && not_in_queue == 1)
playlist_queue_->setText(tr("Queue track"));
else if (in_queue == 0 && not_in_queue > 1)
playlist_queue_->setText(tr("Queue selected tracks"));
else
playlist_queue_->setText(tr("Toggle queue status"));
if (not_in_queue == 0)
playlist_queue_->setIcon(IconLoader::Load("go-previous"));
else
playlist_queue_->setIcon(IconLoader::Load("go-next"));
if (!index.isValid()) {
ui_->action_selection_set_value->setVisible(false);
ui_->action_edit_value->setVisible(false);