Varname consolidation for the rest of pixmaps

12 files changed, 38 insertions, 38 deletions

diff --git a/src/pixmaps/Makefile.am b/src/pixmaps/Makefile.am
index 3658c5d7..57ab72b5 100644
--- a/src/pixmaps/Makefile.am
+++ b/src/pixmaps/Makefile.am
@@ -6,17 +6,17 @@ LIST =		png_ulist_voice $(srcdir)/ulist_voice.png \
 			png_ulist_owner $(srcdir)/ulist_owner.png \
 			png_ulist_founder $(srcdir)/ulist_founder.png \
 			png_ulist_netop $(srcdir)/ulist_netop.png \
-			traymsgpng $(srcdir)/message.png \
-			trayhilightpng $(srcdir)/highlight.png \
-			trayfilepng $(srcdir)/fileoffer.png \
-			channelpng $(srcdir)/channel.png \
-			dialogpng $(srcdir)/dialog.png \
-			serverpng $(srcdir)/server.png \
-			utilpng $(srcdir)/util.png \
+			png_tray_fileoffer $(srcdir)/tray_fileoffer.png \
+			png_tray_highlight $(srcdir)/tray_highlight.png \
+			png_tray_message $(srcdir)/tray_message.png \
+			png_tree_channel $(srcdir)/tree_channel.png \
+			png_tree_dialog $(srcdir)/tree_dialog.png \
+			png_tree_server $(srcdir)/tree_server.png \
+			png_tree_util $(srcdir)/tree_util.png \
 			png_book $(srcdir)/book.png \
 			png_hexchat $(srcdir)/hexchat.png
 
-PNGS = ulist_voice.png ulist_halfop.png ulist_op.png ulist_owner.png ulist_founder.png ulist_netop.png message.png highlight.png fileoffer.png channel.png dialog.png server.png util.png book.png
+PNGS = ulist_voice.png ulist_halfop.png ulist_op.png ulist_owner.png ulist_founder.png ulist_netop.png tray_fileoffer.png tray_highlight.png tray_message.png tree_channel.png tree_dialog.png tree_server.png tree_util.png book.png
 noinst_HEADERS = inline_pngs.h
 CLEANFILES = $(noinst_HEADERS)
 EXTRA_DIST = $(PNGS)
diff --git a/src/pixmaps/pixmaps-xp.vcxproj b/src/pixmaps/pixmaps-xp.vcxproj
index 06a6615e..8f7538ab 100644
--- a/src/pixmaps/pixmaps-xp.vcxproj
+++ b/src/pixmaps/pixmaps-xp.vcxproj
@@ -92,19 +92,19 @@
     </PostBuildEvent>

   </ItemDefinitionGroup>

   <ItemGroup>

-    <None Include="user_voice.png" />

+    <None Include="ulist_voice.png" />

     <None Include="ulist_halfop.png" />

     <None Include="ulist_op.png" />

     <None Include="ulist_owner.png" />

     <None Include="ulist_founder.png" />

     <None Include="ulist_netop.png" />

-    <None Include="channel.png" />

-    <None Include="dialog.png" />

-    <None Include="fileoffer.png" />

-    <None Include="highlight.png" />

-    <None Include="message.png" />

-    <None Include="server.png" />

-    <None Include="util.png" />

+    <None Include="tray_fileoffer.png" />

+    <None Include="tray_highlight.png" />

+    <None Include="tray_message.png" />

+    <None Include="tree_channel.png" />

+    <None Include="tree_dialog.png" />

+    <None Include="tree_server.png" />

+    <None Include="tree_util.png" />

     <None Include="book.png" />

     <None Include="hexchat.png" />

   </ItemGroup>

diff --git a/src/pixmaps/pixmaps-xp.vcxproj.filters b/src/pixmaps/pixmaps-xp.vcxproj.filters
index bfc9366d..1351b32f 100644
--- a/src/pixmaps/pixmaps-xp.vcxproj.filters
+++ b/src/pixmaps/pixmaps-xp.vcxproj.filters
@@ -25,25 +25,25 @@
     <None Include="ulist_netop.png">

       <Filter>Resource Files</Filter>

     </None>

-    <None Include="fileoffer.png">

+    <None Include="tray_fileoffer.png">

       <Filter>Resource Files</Filter>

     </None>

-    <None Include="highlight.png">

+    <None Include="tray_highlight.png">

       <Filter>Resource Files</Filter>

     </None>

-    <None Include="message.png">

+    <None Include="tray_message.png">

       <Filter>Resource Files</Filter>

     </None>

-    <None Include="channel.png">

+    <None Include="tree_channel.png">

       <Filter>Resource Files</Filter>

     </None>

-    <None Include="dialog.png">

+    <None Include="tree_dialog.png">

       <Filter>Resource Files</Filter>

     </None>

-    <None Include="server.png">

+    <None Include="tree_server.png">

       <Filter>Resource Files</Filter>

     </None>

-    <None Include="util.png">

+    <None Include="tree_util.png">

       <Filter>Resource Files</Filter>

     </None>

     <None Include="book.png">

diff --git a/src/pixmaps/pixmaps.vcxproj b/src/pixmaps/pixmaps.vcxproj
index b3943bce..a7df8989 100644
--- a/src/pixmaps/pixmaps.vcxproj
+++ b/src/pixmaps/pixmaps.vcxproj
@@ -89,19 +89,19 @@
     </PostBuildEvent>

   </ItemDefinitionGroup>

   <ItemGroup>

-    <None Include="user_voice.png" />

+    <None Include="ulist_voice.png" />

     <None Include="ulist_halfop.png" />

     <None Include="ulist_op.png" />

     <None Include="ulist_owner.png" />

     <None Include="ulist_founder.png" />

     <None Include="ulist_netop.png" />

-    <None Include="channel.png" />

-    <None Include="dialog.png" />

-    <None Include="fileoffer.png" />

-    <None Include="highlight.png" />

-    <None Include="message.png" />

-    <None Include="server.png" />

-    <None Include="util.png" />

+    <None Include="tray_fileoffer.png" />

+    <None Include="tray_highlight.png" />

+    <None Include="tray_message.png" />

+    <None Include="tree_channel.png" />

+    <None Include="tree_dialog.png" />

+    <None Include="tree_server.png" />

+    <None Include="tree_util.png" />

     <None Include="book.png" />

     <None Include="hexchat.png" />

   </ItemGroup>

diff --git a/src/pixmaps/pixmaps.vcxproj.filters b/src/pixmaps/pixmaps.vcxproj.filters
index bfc9366d..1351b32f 100644
--- a/src/pixmaps/pixmaps.vcxproj.filters
+++ b/src/pixmaps/pixmaps.vcxproj.filters
@@ -25,25 +25,25 @@
     <None Include="ulist_netop.png">

       <Filter>Resource Files</Filter>

     </None>

-    <None Include="fileoffer.png">

+    <None Include="tray_fileoffer.png">

       <Filter>Resource Files</Filter>

     </None>

-    <None Include="highlight.png">

+    <None Include="tray_highlight.png">

       <Filter>Resource Files</Filter>

     </None>

-    <None Include="message.png">

+    <None Include="tray_message.png">

       <Filter>Resource Files</Filter>

     </None>

-    <None Include="channel.png">

+    <None Include="tree_channel.png">

       <Filter>Resource Files</Filter>

     </None>

-    <None Include="dialog.png">

+    <None Include="tree_dialog.png">

       <Filter>Resource Files</Filter>

     </None>

-    <None Include="server.png">

+    <None Include="tree_server.png">

       <Filter>Resource Files</Filter>

     </None>

-    <None Include="util.png">

+    <None Include="tree_util.png">

       <Filter>Resource Files</Filter>

     </None>

     <None Include="book.png">

diff --git a/src/pixmaps/fileoffer.png b/src/pixmaps/tray_fileoffer.png
index f1afc029..f1afc029 100644
--- a/src/pixmaps/fileoffer.png
+++ b/src/pixmaps/tray_fileoffer.png
Binary files differdiff --git a/src/pixmaps/highlight.png b/src/pixmaps/tray_highlight.png
index 1a2f4910..1a2f4910 100644
--- a/src/pixmaps/highlight.png
+++ b/src/pixmaps/tray_highlight.png
Binary files differdiff --git a/src/pixmaps/message.png b/src/pixmaps/tray_message.png
index 8beb9b56..8beb9b56 100644
--- a/src/pixmaps/message.png
+++ b/src/pixmaps/tray_message.png
Binary files differdiff --git a/src/pixmaps/channel.png b/src/pixmaps/tree_channel.png
index f6e83254..f6e83254 100644
--- a/src/pixmaps/channel.png
+++ b/src/pixmaps/tree_channel.png
Binary files differdiff --git a/src/pixmaps/dialog.png b/src/pixmaps/tree_dialog.png
index 9d2d5008..9d2d5008 100644
--- a/src/pixmaps/dialog.png
+++ b/src/pixmaps/tree_dialog.png
Binary files differdiff --git a/src/pixmaps/server.png b/src/pixmaps/tree_server.png
index acddccc9..acddccc9 100644
--- a/src/pixmaps/server.png
+++ b/src/pixmaps/tree_server.png
Binary files differdiff --git a/src/pixmaps/util.png b/src/pixmaps/tree_util.png
index 9460dfc7..9460dfc7 100644
--- a/src/pixmaps/util.png
+++ b/src/pixmaps/tree_util.png
Binary files differ