[vlc-commits] commit: Drop the icons resolution from their name (Christophe Mutricy )

[git at videolan.org]

vlc | branch: master | Christophe Mutricy <xtophe at videolan.org> | Mon Jun 14 23:33:38 2010 +0100| [d1b5547ce1227614d72ad28b078a31cbd09629ae] | committer: Christophe Mutricy 

Drop the icons resolution from their name

The less acrobatic way

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

 Makefile.am                                        |    2 +-
 modules/gui/qt4/qt4.cpp                            |    4 ++--
 modules/gui/qt4/vlc.qrc                            |   10 +++++-----
 share/Makefile.am                                  |   13 +++++++------
 .../128x128/vlc-christmas.png}                     |  Bin 14399 -> 14399 bytes
 share/{vlc128x128.png => icons/128x128/vlc.png}    |  Bin 16585 -> 16585 bytes
 share/{vlc16x16.png => icons/16x16/vlc.png}        |  Bin 618 -> 618 bytes
 share/{vlc16x16.xpm => icons/16x16/vlc.xpm}        |    0 
 share/{vlc256x256.png => icons/256x256/vlc.png}    |  Bin 57537 -> 57537 bytes
 .../32x32/vlc-christmas.xpm}                       |    0 
 share/{vlc32x32.png => icons/32x32/vlc.png}        |  Bin 1535 -> 1535 bytes
 share/{vlc32x32.xpm => icons/32x32/vlc.xpm}        |    0 
 .../48x48/vlc-christmas.png}                       |  Bin 3085 -> 3085 bytes
 share/{vlc48x48.png => icons/48x48/vlc.png}        |  Bin 2988 -> 2988 bytes
 share/{ => icons}/vlc.ico                          |  Bin 73164 -> 73164 bytes
 15 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 7ffb5c9..9069b44 100644
--- 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 daa7b5f..387681d 100644
--- 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 b7dbc4e..ec17357 100644
--- 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 02be53d..76b277b 100644
--- 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