Varname consolidation for the rest of pixmaps

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)

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>

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">

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>

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">