[vlc-commits] qt: Merge extremely similar clear/quit pixmaps into one

[Hugo Beauzée-Luyssen]

vlc | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Mon Apr 24 15:51:51 2017 +0200| [87f27486a40db581c02ccfb3cb70e2fcdbca6762] | committer: Hugo Beauzée-Luyssen

qt: Merge extremely similar clear/quit pixmaps into one

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=87f27486a40db581c02ccfb3cb70e2fcdbca6762
---

 modules/gui/qt/Makefile.am                          |   1 -
 modules/gui/qt/components/sout/profile_selector.cpp |   2 +-
 modules/gui/qt/dialogs/vlm.cpp                      |   2 +-
 modules/gui/qt/extensions_manager.cpp               |   2 +-
 modules/gui/qt/pixmaps/menus/quit_16px.png          | Bin 534 -> 0 bytes
 modules/gui/qt/util/customwidgets.cpp               |   2 +-
 modules/gui/qt/vlc.qrc                              |   1 -
 7 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/modules/gui/qt/Makefile.am b/modules/gui/qt/Makefile.am
index dc4f3f6d2c..a5a428d36c 100644
--- a/modules/gui/qt/Makefile.am
+++ b/modules/gui/qt/Makefile.am
@@ -307,7 +307,6 @@ DEPS_res = \
 	pixmaps/menus/messages_16px.png \
 	pixmaps/menus/playlist_16px.png \
 	pixmaps/menus/preferences_16px.png \
-	pixmaps/menus/quit_16px.png \
 	pixmaps/menus/settings_16px.png \
 	pixmaps/menus/stream_16px.png \
 	pixmaps/next.png \
diff --git a/modules/gui/qt/components/sout/profile_selector.cpp b/modules/gui/qt/components/sout/profile_selector.cpp
index d795160297..49213b11ea 100644
--- a/modules/gui/qt/components/sout/profile_selector.cpp
+++ b/modules/gui/qt/components/sout/profile_selector.cpp
@@ -626,7 +626,7 @@ void VLCProfileEditor::muxSelected()
     else if ( !caps["muxers"].contains( current->property("module").toString() ) &&
               !caps["muxers"].contains( "mux_" + current->property("module").toString() ) )
         ui.muxerwarning->setText(
-                    QString( "<img src=\":/menu/quit\"/> %1" )
+                    QString( "<img src=\":/pixmaps/clear\"/> %1" )
                     .arg( qtr( "This muxer is missing. Using this profile will fail" ) )
                     );
     else
diff --git a/modules/gui/qt/dialogs/vlm.cpp b/modules/gui/qt/dialogs/vlm.cpp
index 0da88ccf2b..205069445f 100644
--- a/modules/gui/qt/dialogs/vlm.cpp
+++ b/modules/gui/qt/dialogs/vlm.cpp
@@ -507,7 +507,7 @@ VLMAWidget::VLMAWidget( const QString& _name, const QString& _input,
     objLayout->addWidget( modifyButton, 0, 5 );
 
     QToolButton *deleteButton = new QToolButton;
-    deleteButton->setIcon( QIcon( ":/menu/quit" ) );
+    deleteButton->setIcon( QIcon( ":/pixmaps/clear" ) );
     deleteButton->setToolTip("Delete");
     objLayout->addWidget( deleteButton, 0, 6 );
 
diff --git a/modules/gui/qt/extensions_manager.cpp b/modules/gui/qt/extensions_manager.cpp
index 970563fa64..72a687a8c2 100644
--- a/modules/gui/qt/extensions_manager.cpp
+++ b/modules/gui/qt/extensions_manager.cpp
@@ -193,7 +193,7 @@ void ExtensionsManager::menu( QMenu *current )
             }
 
             submenu->addSeparator();
-            action = submenu->addAction( QIcon( ":/menu/quit" ),
+            action = submenu->addAction( QIcon( ":/pixmaps/clear" ),
                                          qtr( "Deactivate" ) );
             menuMapper->setMapping( action, MENU_MAP( 0, i_ext ) );
             CONNECT( action, triggered(), menuMapper, map() );
diff --git a/modules/gui/qt/pixmaps/menus/quit_16px.png b/modules/gui/qt/pixmaps/menus/quit_16px.png
deleted file mode 100644
index f6cc71120a..0000000000
Binary files a/modules/gui/qt/pixmaps/menus/quit_16px.png and /dev/null differ
diff --git a/modules/gui/qt/util/customwidgets.cpp b/modules/gui/qt/util/customwidgets.cpp
index f8ee22237f..7ee4ec71e4 100644
--- a/modules/gui/qt/util/customwidgets.cpp
+++ b/modules/gui/qt/util/customwidgets.cpp
@@ -405,7 +405,7 @@ YesNoCheckBox::YesNoCheckBox( QWidget *parent ) : QCheckBox( parent )
     setStyleSheet("\
                   QCheckBox::indicator:unchecked:hover,\
                   QCheckBox::indicator:unchecked {\
-                      image: url(:/menu/quit);\
+                      image: url(:/pixmaps/clear);\
                   }\
                   QCheckBox::indicator:checked:hover,\
                   QCheckBox::indicator:checked {\
diff --git a/modules/gui/qt/vlc.qrc b/modules/gui/qt/vlc.qrc
index 7f0abaac2f..78e88d989b 100644
--- a/modules/gui/qt/vlc.qrc
+++ b/modules/gui/qt/vlc.qrc
@@ -12,7 +12,6 @@
         <file alias="info">pixmaps/menus/info_16px.png</file>
         <file alias="messages">pixmaps/menus/messages_16px.png</file>
         <file alias="preferences">pixmaps/menus/preferences_16px.png</file>
-        <file alias="quit">pixmaps/menus/quit_16px.png</file>
         <file alias="settings">pixmaps/menus/settings_16px.png</file>
         <file alias="stream">pixmaps/menus/stream_16px.png</file>
         <file alias="playlist_menu">pixmaps/menus/playlist_16px.png</file>