diff --git a/src/collection/collectionfilterwidget.ui b/src/collection/collectionfilterwidget.ui index c5b4db505..282e6fd0b 100644 --- a/src/collection/collectionfilterwidget.ui +++ b/src/collection/collectionfilterwidget.ui @@ -17,7 +17,16 @@ 0 - + + 0 + + + 0 + + + 0 + + 0 @@ -99,14 +108,14 @@ - - Save current grouping - + + Save current grouping + - - Manage saved groupings - + + Manage saved groupings + diff --git a/src/collection/collectionviewcontainer.ui b/src/collection/collectionviewcontainer.ui index ddc805a59..824917c64 100644 --- a/src/collection/collectionviewcontainer.ui +++ b/src/collection/collectionviewcontainer.ui @@ -17,7 +17,16 @@ 0 - + + 0 + + + 0 + + + 0 + + 0 diff --git a/src/collection/savedgroupingmanager.ui b/src/collection/savedgroupingmanager.ui index 2b5faa5c5..6f8e51053 100644 --- a/src/collection/savedgroupingmanager.ui +++ b/src/collection/savedgroupingmanager.ui @@ -14,7 +14,7 @@ Saved Grouping Manager - + :/icon.png:/icon.png diff --git a/src/covermanager/albumcoverexport.ui b/src/covermanager/albumcoverexport.ui index 90600a504..e8ed915f3 100644 --- a/src/covermanager/albumcoverexport.ui +++ b/src/covermanager/albumcoverexport.ui @@ -7,7 +7,7 @@ 0 0 608 - 412 + 434 @@ -79,14 +79,14 @@ - Overwrite all + O&verwrite all - Overwrite smaller ones only + Overwrite s&maller ones only diff --git a/src/covermanager/albumcovermanager.ui b/src/covermanager/albumcovermanager.ui index d104a27eb..66958348c 100644 --- a/src/covermanager/albumcovermanager.ui +++ b/src/covermanager/albumcovermanager.ui @@ -19,7 +19,16 @@ - + + 0 + + + 0 + + + 0 + + 0 @@ -49,7 +58,16 @@ 0 - + + 0 + + + 0 + + + 0 + + 0 diff --git a/src/covermanager/albumcoversearcher.ui b/src/covermanager/albumcoversearcher.ui index cc41bf79f..071a412a9 100644 --- a/src/covermanager/albumcoversearcher.ui +++ b/src/covermanager/albumcoversearcher.ui @@ -17,7 +17,7 @@ - + Artist @@ -27,7 +27,7 @@ - + Album diff --git a/src/covermanager/coverfromurldialog.ui b/src/covermanager/coverfromurldialog.ui index 31c34e29c..f9a908327 100644 --- a/src/covermanager/coverfromurldialog.ui +++ b/src/covermanager/coverfromurldialog.ui @@ -34,7 +34,7 @@ - + diff --git a/src/device/deviceproperties.ui b/src/device/deviceproperties.ui index fdce0104a..98d9ad5a1 100644 --- a/src/device/deviceproperties.ui +++ b/src/device/deviceproperties.ui @@ -102,7 +102,16 @@ 0 - + + 0 + + + 0 + + + 0 + + 0 @@ -125,7 +134,16 @@ 0 - + + 0 + + + 0 + + + 0 + + 0 @@ -176,7 +194,16 @@ - + + 0 + + + 0 + + + 0 + + 0 @@ -274,7 +301,16 @@ - + + 0 + + + 0 + + + 0 + + 0 @@ -328,13 +364,22 @@ - + + 0 + + + 0 + + + 0 + + 0 - + diff --git a/src/device/deviceviewcontainer.ui b/src/device/deviceviewcontainer.ui index d2e4dcf1d..7689365da 100644 --- a/src/device/deviceviewcontainer.ui +++ b/src/device/deviceviewcontainer.ui @@ -17,7 +17,16 @@ 0 - + + 0 + + + 0 + + + 0 + + 0 diff --git a/src/dialogs/edittagdialog.ui b/src/dialogs/edittagdialog.ui index a3c75a19c..171a81338 100644 --- a/src/dialogs/edittagdialog.ui +++ b/src/dialogs/edittagdialog.ui @@ -315,8 +315,6 @@ - - @@ -349,9 +347,7 @@ - - - + @@ -383,14 +379,6 @@ - - - - - - - - @@ -838,7 +826,7 @@ - + @@ -860,12 +848,6 @@ QLineEdit
widgets/lineedit.h
- - RatingWidget - QWidget -
widgets/ratingwidget.h
- 1 - TextEdit QTextEdit diff --git a/src/dialogs/organisedialog.ui b/src/dialogs/organisedialog.ui index 7e40ab7de..68045fc36 100644 --- a/src/dialogs/organisedialog.ui +++ b/src/dialogs/organisedialog.ui @@ -7,7 +7,7 @@ 0 0 588 - 525 + 608 @@ -152,7 +152,16 @@ 0 - + + 0 + + + 0 + + + 0 + + 0 @@ -165,7 +174,16 @@ 0 - + + 0 + + + 0 + + + 0 + + 0 diff --git a/src/dialogs/trackselectiondialog.ui b/src/dialogs/trackselectiondialog.ui index 1d385081a..acb1adede 100644 --- a/src/dialogs/trackselectiondialog.ui +++ b/src/dialogs/trackselectiondialog.ui @@ -36,7 +36,7 @@ - 0 + 1 @@ -159,7 +159,16 @@ - + + 0 + + + 0 + + + 0 + + 0 diff --git a/src/equalizer/equalizer.ui b/src/equalizer/equalizer.ui index a9de1a592..d7e2a4fe9 100644 --- a/src/equalizer/equalizer.ui +++ b/src/equalizer/equalizer.ui @@ -21,7 +21,7 @@ - + Preset: @@ -84,54 +84,60 @@ - + + + + 11 + + Left - Qt::AlignLeft | Qt::AlignBottom - - - - 11 - + Qt::AlignBottom - + Balance - Qt::AlignCenter + Qt::AlignCenter - - - Right - - - Qt::AlignRight | Qt::AlignBottom - + 11 + + Right + + + Qt::AlignBottom + + + -100 + 100 - - -100 + + 10 + + + 100 Qt::Horizontal @@ -142,12 +148,6 @@ 10 - - 10 - - - 100 - diff --git a/src/equalizer/equalizerslider.ui b/src/equalizer/equalizerslider.ui index 8390fe7e6..7ce3cf6a4 100644 --- a/src/equalizer/equalizerslider.ui +++ b/src/equalizer/equalizerslider.ui @@ -6,7 +6,7 @@ 0 0 - 33 + 36 224 @@ -20,13 +20,22 @@ Form - + + 0 + + + 0 + + + 0 + + 0 - + Qt::Horizontal diff --git a/src/playlist/playlistcontainer.ui b/src/playlist/playlistcontainer.ui index 154e078d5..259ae3a6a 100644 --- a/src/playlist/playlistcontainer.ui +++ b/src/playlist/playlistcontainer.ui @@ -24,7 +24,16 @@ 0 - + + 0 + + + 0 + + + 0 + + 0 @@ -36,7 +45,16 @@ 0 - + + 0 + + + 0 + + + 0 + + 0 @@ -118,7 +136,7 @@ - + Qt::Vertical diff --git a/src/playlist/playlistlistcontainer.ui b/src/playlist/playlistlistcontainer.ui index 9f9cafb95..81a7cd1f4 100644 --- a/src/playlist/playlistlistcontainer.ui +++ b/src/playlist/playlistlistcontainer.ui @@ -23,7 +23,16 @@ 0 - + + 0 + + + 0 + + + 0 + + 0 @@ -38,7 +47,16 @@ 0 - + + 0 + + + 0 + + + 0 + + 0 @@ -56,7 +74,7 @@ - + Qt::Vertical diff --git a/src/playlist/playlistsaveoptionsdialog.ui b/src/playlist/playlistsaveoptionsdialog.ui index c2e004b41..35d608c3c 100644 --- a/src/playlist/playlistsaveoptionsdialog.ui +++ b/src/playlist/playlistsaveoptionsdialog.ui @@ -7,7 +7,7 @@ 0 0 348 - 116 + 135 @@ -15,7 +15,7 @@ - + diff --git a/src/playlist/playlistsequence.ui b/src/playlist/playlistsequence.ui index 2b66de3cf..b315a007c 100644 --- a/src/playlist/playlistsequence.ui +++ b/src/playlist/playlistsequence.ui @@ -21,7 +21,16 @@ 0 - + + 0 + + + 0 + + + 0 + + 0 diff --git a/src/settings/appearancesettingspage.ui b/src/settings/appearancesettingspage.ui index 1a36db62a..d40a8435f 100644 --- a/src/settings/appearancesettingspage.ui +++ b/src/settings/appearancesettingspage.ui @@ -23,7 +23,7 @@ - Use the system default color set + &Use the system default color set @@ -35,7 +35,7 @@ - + @@ -94,7 +94,7 @@ - Default background image + Default bac&kground image @@ -104,14 +104,14 @@ The album cover of the currently playing song - Album cover + Albu&m cover - No background image + &No background image diff --git a/src/settings/collectionsettingspage.ui b/src/settings/collectionsettingspage.ui index 74f2c39fb..e4f5920f4 100644 --- a/src/settings/collectionsettingspage.ui +++ b/src/settings/collectionsettingspage.ui @@ -111,7 +111,7 @@ If there are no matches then it will use the largest image in the directory. - + Display options diff --git a/src/settings/networkproxysettingspage.ui b/src/settings/networkproxysettingspage.ui index 62cf0fe1c..3d2ac7834 100644 --- a/src/settings/networkproxysettingspage.ui +++ b/src/settings/networkproxysettingspage.ui @@ -17,7 +17,7 @@ - Use the system proxy settings + &Use the system proxy settings true @@ -34,7 +34,7 @@ - Manual proxy configuration + &Manual proxy configuration diff --git a/src/settings/notificationssettingspage.ui b/src/settings/notificationssettingspage.ui index 2ab566fbe..70a828e5b 100644 --- a/src/settings/notificationssettingspage.ui +++ b/src/settings/notificationssettingspage.ui @@ -7,7 +7,7 @@ 0 0 526 - 642 + 668 @@ -37,7 +37,7 @@ - Show a native desktop notification + Show a &native desktop notification @@ -51,7 +51,7 @@ - Show a popup from the system tray + Show a popup fro&m the system tray @@ -67,7 +67,16 @@ - + + 0 + + + 0 + + + 0 + + 0 @@ -152,7 +161,16 @@ 0 - + + 0 + + + 0 + + + 0 + + 0 diff --git a/src/settings/playlistsettingspage.ui b/src/settings/playlistsettingspage.ui index 5be24dbc1..72b646a1f 100644 --- a/src/settings/playlistsettingspage.ui +++ b/src/settings/playlistsettingspage.ui @@ -22,14 +22,14 @@ - - - Grey out non existent songs in my playlists - - + + + Grey out non existent songs in my playlists + + - + Using the menu to add a song will... @@ -170,7 +170,7 @@ - + When saving a playlist, file paths should be @@ -178,7 +178,7 @@ - Automatic + Auto&matic true @@ -195,19 +195,19 @@ - Relative + Relati&ve - Ask when saving + As&k when saving - + Qt::Vertical diff --git a/src/settings/settingsdialog.ui b/src/settings/settingsdialog.ui index 48c623a7f..c1d8a8244 100644 --- a/src/settings/settingsdialog.ui +++ b/src/settings/settingsdialog.ui @@ -55,7 +55,7 @@ - + @@ -74,7 +74,7 @@ - + Qt::Horizontal diff --git a/src/settings/shortcutssettingspage.ui b/src/settings/shortcutssettingspage.ui index 7567e89ad..5ac13826d 100644 --- a/src/settings/shortcutssettingspage.ui +++ b/src/settings/shortcutssettingspage.ui @@ -21,7 +21,16 @@ - + + 0 + + + 0 + + + 0 + + 0 @@ -53,7 +62,16 @@ 0 - + + 0 + + + 0 + + + 0 + + 0 diff --git a/src/settings/transcodersettingspage.ui b/src/settings/transcodersettingspage.ui index 5b7e0621b..d4b477ea6 100644 --- a/src/settings/transcodersettingspage.ui +++ b/src/settings/transcodersettingspage.ui @@ -15,7 +15,7 @@ - + These settings are used in the "Transcode Music" dialog, and when converting music before copying it to a device. @@ -29,7 +29,7 @@ 0 - + MP3 @@ -37,7 +37,16 @@ 0 - + + 0 + + + 0 + + + 0 + + 0 @@ -53,7 +62,16 @@ 0 - + + 0 + + + 0 + + + 0 + + 0 @@ -69,7 +87,16 @@ 0 - + + 0 + + + 0 + + + 0 + + 0 @@ -85,7 +112,16 @@ 0 - + + 0 + + + 0 + + + 0 + + 0 @@ -101,7 +137,16 @@ 0 - + + 0 + + + 0 + + + 0 + + 0 @@ -117,7 +162,16 @@ 0 - + + 0 + + + 0 + + + 0 + + 0 @@ -133,7 +187,16 @@ 0 - + + 0 + + + 0 + + + 0 + + 0 diff --git a/src/tidal/tidalsearchview.cpp b/src/tidal/tidalsearchview.cpp index 380895c9c..67cd35241 100644 --- a/src/tidal/tidalsearchview.cpp +++ b/src/tidal/tidalsearchview.cpp @@ -393,8 +393,8 @@ bool TidalSearchView::SearchKeyEvent(QKeyEvent *event) { bool TidalSearchView::ResultsContextMenuEvent(QContextMenuEvent *event) { context_menu_ = new QMenu(this); - context_actions_ << context_menu_->addAction( IconLoader::Load("media-playback-start"), tr("Append to current playlist"), this, SLOT(AddSelectedToPlaylist())); - context_actions_ << context_menu_->addAction( IconLoader::Load("media-playback-start"), tr("Replace current playlist"), this, SLOT(LoadSelected())); + context_actions_ << context_menu_->addAction( IconLoader::Load("media-play"), tr("Append to current playlist"), this, SLOT(AddSelectedToPlaylist())); + context_actions_ << context_menu_->addAction( IconLoader::Load("media-play"), tr("Replace current playlist"), this, SLOT(LoadSelected())); context_actions_ << context_menu_->addAction( IconLoader::Load("document-new"), tr("Open in new playlist"), this, SLOT(OpenSelectedInNewPlaylist())); context_menu_->addSeparator(); @@ -403,7 +403,7 @@ bool TidalSearchView::ResultsContextMenuEvent(QContextMenuEvent *event) { context_menu_->addSeparator(); if (ui_->results->selectionModel() && ui_->results->selectionModel()->selectedRows().length() == 1) { - context_actions_ << context_menu_->addAction(IconLoader::Load("system-search"), tr("Search for this"), this, SLOT(SearchForThis())); + context_actions_ << context_menu_->addAction(IconLoader::Load("search"), tr("Search for this"), this, SLOT(SearchForThis())); } context_menu_->addSeparator(); diff --git a/src/transcoder/transcodedialog.ui b/src/transcoder/transcodedialog.ui index 70bdbb0d0..1032ab5d4 100644 --- a/src/transcoder/transcodedialog.ui +++ b/src/transcoder/transcodedialog.ui @@ -60,7 +60,7 @@ - + @@ -76,7 +76,7 @@ - + Qt::Vertical @@ -110,7 +110,7 @@ - + Audio format @@ -175,7 +175,7 @@ - + diff --git a/src/transcoder/transcoderoptionsaac.ui b/src/transcoder/transcoderoptionsaac.ui index 9463d276e..1d42759ea 100644 --- a/src/transcoder/transcoderoptionsaac.ui +++ b/src/transcoder/transcoderoptionsaac.ui @@ -15,7 +15,7 @@ - + Bitrate diff --git a/src/transcoder/transcoderoptionsflac.ui b/src/transcoder/transcoderoptionsflac.ui index 8375ff62f..9e0e07aba 100644 --- a/src/transcoder/transcoderoptionsflac.ui +++ b/src/transcoder/transcoderoptionsflac.ui @@ -15,7 +15,7 @@ - + Quality diff --git a/src/transcoder/transcoderoptionsmp3.ui b/src/transcoder/transcoderoptionsmp3.ui index a6eb09b5b..2d1337950 100644 --- a/src/transcoder/transcoderoptionsmp3.ui +++ b/src/transcoder/transcoderoptionsmp3.ui @@ -17,7 +17,7 @@ - Optimize for quality + Optimize for &quality false @@ -25,7 +25,7 @@ - + false @@ -43,7 +43,7 @@ 0 - + Quality @@ -88,7 +88,7 @@ - Optimize for bitrate + Opti&mize for bitrate true @@ -258,7 +258,7 @@ target_quality toggled(bool) - widget + widget_1 setEnabled(bool) diff --git a/src/transcoder/transcoderoptionsspeex.ui b/src/transcoder/transcoderoptionsspeex.ui index 7aedd6134..528ebeeb6 100644 --- a/src/transcoder/transcoderoptionsspeex.ui +++ b/src/transcoder/transcoderoptionsspeex.ui @@ -15,14 +15,14 @@ - + Quality - + @@ -59,7 +59,7 @@ - + diff --git a/src/transcoder/transcoderoptionsvorbis.ui b/src/transcoder/transcoderoptionsvorbis.ui index 65f390acc..cd8ab647b 100644 --- a/src/transcoder/transcoderoptionsvorbis.ui +++ b/src/transcoder/transcoderoptionsvorbis.ui @@ -15,14 +15,14 @@ - + Quality - + @@ -90,7 +90,7 @@ - + @@ -127,7 +127,7 @@ - + @@ -167,7 +167,7 @@ - + diff --git a/src/widgets/fileview.ui b/src/widgets/fileview.ui index b66c3eabc..cd1eac8ce 100644 --- a/src/widgets/fileview.ui +++ b/src/widgets/fileview.ui @@ -17,7 +17,16 @@ 0 - + + 0 + + + 0 + + + 0 + + 0 diff --git a/src/widgets/loginstatewidget.cpp b/src/widgets/loginstatewidget.cpp index 735d2b803..16fad3272 100644 --- a/src/widgets/loginstatewidget.cpp +++ b/src/widgets/loginstatewidget.cpp @@ -39,7 +39,7 @@ LoginStateWidget::LoginStateWidget(QWidget *parent) ui_->sign_out->setIcon(IconLoader::Load("list-remove")); ui_->signed_in_icon_label->setPixmap(IconLoader::Load("dialog-ok-apply").pixmap(22)); - ui_->expires_icon_label->setPixmap(IconLoader::Load("user-away").pixmap(22)); + ui_->expires_icon_label->setPixmap(IconLoader::Load("dialog-password").pixmap(22)); ui_->account_type_icon_label->setPixmap(IconLoader::Load("dialog-warning").pixmap(22)); QFont bold_font(font()); diff --git a/src/widgets/loginstatewidget.ui b/src/widgets/loginstatewidget.ui index 20ef1e32e..704d142c8 100644 --- a/src/widgets/loginstatewidget.ui +++ b/src/widgets/loginstatewidget.ui @@ -14,17 +14,35 @@ Form - + + 0 + + + 0 + + + 0 + + 0 - + + 0 + + + 0 + + + 0 + + 0 - + 22 @@ -55,7 +73,16 @@ - + + 0 + + + 0 + + + 0 + + 0 @@ -97,7 +124,16 @@ - + + 0 + + + 0 + + + 0 + + 0 @@ -126,7 +162,16 @@ - + + 0 + + + 0 + + + 0 + + 0 @@ -178,5 +223,6 @@ 1 + diff --git a/src/widgets/trackslider.ui b/src/widgets/trackslider.ui index 88b5c9a6f..d7b5cde00 100644 --- a/src/widgets/trackslider.ui +++ b/src/widgets/trackslider.ui @@ -17,7 +17,16 @@ Form - + + 0 + + + 0 + + + 0 + + 0