Drop the icons resolution from their name

The less acrobatic way

diff --git a/Makefile.am b/Makefile.am
index 7ffb5c968b2fb6b7bdef10c448dc7a6dba72c8dd..9069b441b7ebd3a836d3aa3de56159c90e057238 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -735,7 +735,7 @@ package-win-common:
        $(U2D) "$(win32_destdir)/"*.txt || echo "WARNING: this shouldn't happen"
 
 # Necessary icons
-       cp $(srcdir)/share/vlc.ico $(win32_destdir)/
+       cp $(srcdir)/share/icons/vlc.ico $(win32_destdir)/
 
 # Copy the locales
        mkdir -p $(win32_destdir)/locale

diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp
index daa7b5fe5ed98cec942250edeff1f98ab2b88cb7..387681d1f16223a73d8deaf4bfdcf65e75323f6a 100644 (file)
--- a/modules/gui/qt4/qt4.cpp
+++ b/modules/gui/qt4/qt4.cpp
@@ -42,8 +42,8 @@
  #include <vlc_xlib.h>
 #endif
 
-#include "../../../share/vlc32x32.xpm"
-#include "../../../share/vlc32x32-christmas.xpm"
+#include "../../../share/icons/32x32/vlc.xpm"
+#include "../../../share/icons/32x32/vlc-christmas.xpm"
 #include <vlc_plugin.h>
 
 #ifdef WIN32 /* For static builds */

diff --git a/modules/gui/qt4/vlc.qrc b/modules/gui/qt4/vlc.qrc
index b7dbc4e7bfe59e99439e61b243c60fd7d31b3e28..ec173571aee1ac6a863097d44d899d3a7ee35a89 100644 (file)
--- a/modules/gui/qt4/vlc.qrc
+++ b/modules/gui/qt4/vlc.qrc
@@ -1,10 +1,10 @@
 <RCC>
     <qresource prefix="/logo" >
-        <file alias="vlc128.png" >../../../share/vlc128x128.png</file>
-        <file alias="vlc16.png" >../../../share/vlc16x16.png</file>
-        <file alias="vlc48.png" >../../../share/vlc48x48.png</file>
-        <file alias="vlc128-christmas.png" >../../../share/vlc128x128-christmas.png</file>
-        <file alias="vlc48-christmas.png" >../../../share/vlc48x48-christmas.png</file>
+        <file alias="vlc128.png" >../../../share/icons/128x128/vlc.png</file>
+        <file alias="vlc16.png" >../../../share/icons/16x16/vlc.png</file>
+        <file alias="vlc48.png" >../../../share/icons/48x48/vlc.png</file>
+        <file alias="vlc128-christmas.png" >../../../share/icons/128x128/vlc-christmas.png</file>
+        <file alias="vlc48-christmas.png" >../../../share/icons/48x48/vlc-christmas.png</file>
     </qresource>
     <qresource prefix="/menu" >
         <file alias="help" >pixmaps/menus/help_16px.png</file>

diff --git a/share/Makefile.am b/share/Makefile.am
index 02be53dd0b33839dbd4997492a35ad8d1c53c1cd..76b277b76a620b9b76f2ba4bcedbf80838a8129d 100644 (file)
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -12,12 +12,13 @@ icons256dir = $(iconsdatadir)/256x256/apps/
 
 dist_appdata_DATA = vlc.desktop
 
-dist_vlcdata_DATA = vlc.ico
-dist_icons16_DATA = vlc16x16.png vlc16x16.xpm
-dist_icons32_DATA = vlc32x32.png vlc32x32.xpm vlc32x32-christmas.xpm
-dist_icons48_DATA = vlc48x48.png vlc48x48-christmas.png
-dist_icons128_DATA = vlc128x128.png vlc128x128-christmas.png
-dist_icons256_DATA = vlc256x256.png
+dist_vlcdata_DATA = icons/vlc.ico
+dist_icons16_DATA = icons/16x16/vlc.png icons/16x16/vlc.xpm
+dist_icons32_DATA = icons/32x32/vlc.png icons/32x32/vlc.xpm \
+                   icons/32x32/vlc-christmas.xpm
+dist_icons48_DATA = icons/48x48/vlc.png icons/48x48/vlc-christmas.png
+dist_icons128_DATA = icons/128x128/vlc.png icons/128x128/vlc-christmas.png
+dist_icons256_DATA = icons/256x256/vlc.png
 
 nobase_dist_vlcdata_SCRIPTS = \
        utils/gnome-vlc-default.sh \

diff --git a/share/vlc128x128-christmas.png b/share/icons/128x128/vlc-christmas.png
similarity index 100%
rename from share/vlc128x128-christmas.png
rename to share/icons/128x128/vlc-christmas.png

diff --git a/share/vlc128x128.png b/share/icons/128x128/vlc.png
similarity index 100%
rename from share/vlc128x128.png
rename to share/icons/128x128/vlc.png

diff --git a/share/vlc16x16.png b/share/icons/16x16/vlc.png
similarity index 100%
rename from share/vlc16x16.png
rename to share/icons/16x16/vlc.png

diff --git a/share/vlc16x16.xpm b/share/icons/16x16/vlc.xpm
similarity index 100%
rename from share/vlc16x16.xpm
rename to share/icons/16x16/vlc.xpm

diff --git a/share/vlc256x256.png b/share/icons/256x256/vlc.png
similarity index 100%
rename from share/vlc256x256.png
rename to share/icons/256x256/vlc.png

diff --git a/share/vlc32x32-christmas.xpm b/share/icons/32x32/vlc-christmas.xpm
similarity index 100%
rename from share/vlc32x32-christmas.xpm
rename to share/icons/32x32/vlc-christmas.xpm

diff --git a/share/vlc32x32.png b/share/icons/32x32/vlc.png
similarity index 100%
rename from share/vlc32x32.png
rename to share/icons/32x32/vlc.png

diff --git a/share/vlc32x32.xpm b/share/icons/32x32/vlc.xpm
similarity index 100%
rename from share/vlc32x32.xpm
rename to share/icons/32x32/vlc.xpm

diff --git a/share/vlc48x48-christmas.png b/share/icons/48x48/vlc-christmas.png
similarity index 100%
rename from share/vlc48x48-christmas.png
rename to share/icons/48x48/vlc-christmas.png

diff --git a/share/vlc48x48.png b/share/icons/48x48/vlc.png
similarity index 100%
rename from share/vlc48x48.png
rename to share/icons/48x48/vlc.png

diff --git a/share/vlc.ico b/share/icons/vlc.ico
similarity index 100%
rename from share/vlc.ico
rename to share/icons/vlc.ico