From c65e16fd00dd3ceacac301f2f774bdf29cf211d2 Mon Sep 17 00:00:00 2001
From: Berke Viktor <bviktor@hexchat.org>
Date: Sat, 3 Nov 2012 02:33:44 +0100
Subject: Relocate hexchat.png and hexchat.ico and some more varname cleanup

---
 src/pixmaps/Makefile.am                |   6 +++---
 src/pixmaps/hexchat.png                | Bin 0 -> 3175 bytes
 src/pixmaps/pixmaps-xp.vcxproj         |   4 ++--
 src/pixmaps/pixmaps-xp.vcxproj.filters |  12 ++++++------
 src/pixmaps/pixmaps.vcxproj            |   4 ++--
 src/pixmaps/pixmaps.vcxproj.filters    |  12 ++++++------
 6 files changed, 19 insertions(+), 19 deletions(-)
 create mode 100644 src/pixmaps/hexchat.png

(limited to 'src/pixmaps')

diff --git a/src/pixmaps/Makefile.am b/src/pixmaps/Makefile.am
index 6e3e5ab0..3658c5d7 100644
--- a/src/pixmaps/Makefile.am
+++ b/src/pixmaps/Makefile.am
@@ -9,14 +9,14 @@ LIST =		png_ulist_voice $(srcdir)/ulist_voice.png \
 			traymsgpng $(srcdir)/message.png \
 			trayhilightpng $(srcdir)/highlight.png \
 			trayfilepng $(srcdir)/fileoffer.png \
-			bookpng $(srcdir)/book.png \
 			channelpng $(srcdir)/channel.png \
 			dialogpng $(srcdir)/dialog.png \
 			serverpng $(srcdir)/server.png \
 			utilpng $(srcdir)/util.png \
-			hexchatpng $(srcdir)/../../hexchat.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 book.png channel.png dialog.png server.png util.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
 noinst_HEADERS = inline_pngs.h
 CLEANFILES = $(noinst_HEADERS)
 EXTRA_DIST = $(PNGS)
diff --git a/src/pixmaps/hexchat.png b/src/pixmaps/hexchat.png
new file mode 100644
index 00000000..4d977c02
Binary files /dev/null and b/src/pixmaps/hexchat.png differ
diff --git a/src/pixmaps/pixmaps-xp.vcxproj b/src/pixmaps/pixmaps-xp.vcxproj
index a177822b..06a6615e 100644
--- a/src/pixmaps/pixmaps-xp.vcxproj
+++ b/src/pixmaps/pixmaps-xp.vcxproj
@@ -98,8 +98,6 @@
     <None Include="ulist_owner.png" />
     <None Include="ulist_founder.png" />
     <None Include="ulist_netop.png" />
-    <None Include="..\..\hexchat.png" />
-    <None Include="book.png" />
     <None Include="channel.png" />
     <None Include="dialog.png" />
     <None Include="fileoffer.png" />
@@ -107,6 +105,8 @@
     <None Include="message.png" />
     <None Include="server.png" />
     <None Include="util.png" />
+    <None Include="book.png" />
+    <None Include="hexchat.png" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/src/pixmaps/pixmaps-xp.vcxproj.filters b/src/pixmaps/pixmaps-xp.vcxproj.filters
index 661d5b49..bfc9366d 100644
--- a/src/pixmaps/pixmaps-xp.vcxproj.filters
+++ b/src/pixmaps/pixmaps-xp.vcxproj.filters
@@ -25,9 +25,6 @@
     <None Include="ulist_netop.png">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="book.png">
-      <Filter>Resource Files</Filter>
-    </None>
     <None Include="fileoffer.png">
       <Filter>Resource Files</Filter>
     </None>
@@ -37,9 +34,6 @@
     <None Include="message.png">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="..\..\hexchat.png">
-      <Filter>Resource Files</Filter>
-    </None>
     <None Include="channel.png">
       <Filter>Resource Files</Filter>
     </None>
@@ -52,5 +46,11 @@
     <None Include="util.png">
       <Filter>Resource Files</Filter>
     </None>
+    <None Include="book.png">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="hexchat.png">
+      <Filter>Resource Files</Filter>
+    </None>
   </ItemGroup>
 </Project>
diff --git a/src/pixmaps/pixmaps.vcxproj b/src/pixmaps/pixmaps.vcxproj
index 623724d7..b3943bce 100644
--- a/src/pixmaps/pixmaps.vcxproj
+++ b/src/pixmaps/pixmaps.vcxproj
@@ -95,8 +95,6 @@
     <None Include="ulist_owner.png" />
     <None Include="ulist_founder.png" />
     <None Include="ulist_netop.png" />
-    <None Include="..\..\hexchat.png" />
-    <None Include="book.png" />
     <None Include="channel.png" />
     <None Include="dialog.png" />
     <None Include="fileoffer.png" />
@@ -104,6 +102,8 @@
     <None Include="message.png" />
     <None Include="server.png" />
     <None Include="util.png" />
+    <None Include="book.png" />
+    <None Include="hexchat.png" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/src/pixmaps/pixmaps.vcxproj.filters b/src/pixmaps/pixmaps.vcxproj.filters
index 661d5b49..bfc9366d 100644
--- a/src/pixmaps/pixmaps.vcxproj.filters
+++ b/src/pixmaps/pixmaps.vcxproj.filters
@@ -25,9 +25,6 @@
     <None Include="ulist_netop.png">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="book.png">
-      <Filter>Resource Files</Filter>
-    </None>
     <None Include="fileoffer.png">
       <Filter>Resource Files</Filter>
     </None>
@@ -37,9 +34,6 @@
     <None Include="message.png">
       <Filter>Resource Files</Filter>
     </None>
-    <None Include="..\..\hexchat.png">
-      <Filter>Resource Files</Filter>
-    </None>
     <None Include="channel.png">
       <Filter>Resource Files</Filter>
     </None>
@@ -52,5 +46,11 @@
     <None Include="util.png">
       <Filter>Resource Files</Filter>
     </None>
+    <None Include="book.png">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="hexchat.png">
+      <Filter>Resource Files</Filter>
+    </None>
   </ItemGroup>
 </Project>
-- 
cgit 1.4.1