summary refs log tree commit diff stats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/fe-gtk/pixmaps.c2
-rw-r--r--src/fe-gtk/pixmaps.h1
-rw-r--r--src/fe-gtk/userlistgui.c3
-rw-r--r--src/pixmaps/Makefile.am3
-rw-r--r--src/pixmaps/orange.pngbin0 -> 788 bytes
-rw-r--r--src/pixmaps/pixmaps-xp.vcxproj3
-rw-r--r--src/pixmaps/pixmaps-xp.vcxproj.filters5
-rw-r--r--src/pixmaps/pixmaps.vcxproj3
-rw-r--r--src/pixmaps/pixmaps.vcxproj.filters5
-rw-r--r--win32/hexchat-xp.props2
-rw-r--r--win32/hexchat.props2
11 files changed, 21 insertions, 8 deletions
diff --git a/src/fe-gtk/pixmaps.c b/src/fe-gtk/pixmaps.c
index 49e0d56c..f260a22c 100644
--- a/src/fe-gtk/pixmaps.c
+++ b/src/fe-gtk/pixmaps.c
@@ -34,6 +34,7 @@
 GdkPixbuf *pix_xchat;
 GdkPixbuf *pix_book;
 
+GdkPixbuf *pix_orange;
 GdkPixbuf *pix_purple;
 GdkPixbuf *pix_red;
 GdkPixbuf *pix_op;
@@ -127,6 +128,7 @@ pixmaps_init (void)
 
 	/* userlist icons, with inlined defaults */
 	pix_hop = load_pixmap ("hop", hoppng, 1);
+	pix_orange = load_pixmap ("orange", orangepng, 1);
 	pix_purple = load_pixmap ("purple", purplepng, 1);
 	pix_red = load_pixmap ("red", redpng, 1);
 	pix_op = load_pixmap ("op", oppng, 1);
diff --git a/src/fe-gtk/pixmaps.h b/src/fe-gtk/pixmaps.h
index 91b9696e..df84c7b2 100644
--- a/src/fe-gtk/pixmaps.h
+++ b/src/fe-gtk/pixmaps.h
@@ -1,5 +1,6 @@
 extern GdkPixbuf *pix_book;
 extern GdkPixbuf *pix_hop;
+extern GdkPixbuf *pix_orange;
 extern GdkPixbuf *pix_purple;
 extern GdkPixbuf *pix_red;
 extern GdkPixbuf *pix_op;
diff --git a/src/fe-gtk/userlistgui.c b/src/fe-gtk/userlistgui.c
index f46451a9..74fd5cdf 100644
--- a/src/fe-gtk/userlistgui.c
+++ b/src/fe-gtk/userlistgui.c
@@ -96,8 +96,9 @@ get_user_icon (server *serv, struct User *user)
 				{
 				case 0: return pix_red;	/* 1 level above op */
 				case 1: return pix_purple;	 /* 2 levels above op */
+				case 2: return pix_orange;	/* 3 levels above op */
 				}
-				break;	/* 3+, no icons */
+				break;	/* 4+, no icons */
 			}
 			level++;
 			if (pre == serv->nick_prefixes)
diff --git a/src/pixmaps/Makefile.am b/src/pixmaps/Makefile.am
index 65f8cb89..5fc0bac0 100644
--- a/src/pixmaps/Makefile.am
+++ b/src/pixmaps/Makefile.am
@@ -6,6 +6,7 @@ LIST =	traymsgpng $(srcdir)/message.png \
 			bookpng $(srcdir)/book.png \
 			hoppng $(srcdir)/hop.png \
 			oppng $(srcdir)/op.png \
+			orangepng $(srcdir)/orange.png \
 			purplepng $(srcdir)/purple.png \
 			redpng $(srcdir)/red.png \
 			voicepng $(srcdir)/voice.png \
@@ -15,7 +16,7 @@ LIST =	traymsgpng $(srcdir)/message.png \
 			utilpng $(srcdir)/util.png \
 			hexchatpng $(srcdir)/../../hexchat.png
 
-PNGS = message.png highlight.png fileoffer.png book.png hop.png op.png purple.png red.png voice.png channel.png dialog.png server.png util.png
+PNGS = message.png highlight.png fileoffer.png book.png hop.png op.png orange.png purple.png red.png voice.png channel.png dialog.png server.png util.png
 noinst_HEADERS = inline_pngs.h
 CLEANFILES = $(noinst_HEADERS)
 EXTRA_DIST = $(PNGS)
diff --git a/src/pixmaps/orange.png b/src/pixmaps/orange.png
new file mode 100644
index 00000000..63d76046
--- /dev/null
+++ b/src/pixmaps/orange.png
Binary files differdiff --git a/src/pixmaps/pixmaps-xp.vcxproj b/src/pixmaps/pixmaps-xp.vcxproj
index c6ab0967..9d47bf87 100644
--- a/src/pixmaps/pixmaps-xp.vcxproj
+++ b/src/pixmaps/pixmaps-xp.vcxproj
@@ -101,6 +101,7 @@
     <None Include="hop.png" />

     <None Include="message.png" />

     <None Include="op.png" />

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

     <None Include="purple.png" />

     <None Include="red.png" />

     <None Include="server.png" />

@@ -110,4 +111,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

   <ImportGroup Label="ExtensionTargets">

   </ImportGroup>

-</Project>
\ No newline at end of file
+</Project>

diff --git a/src/pixmaps/pixmaps-xp.vcxproj.filters b/src/pixmaps/pixmaps-xp.vcxproj.filters
index 82b5ddef..5ae1c68a 100644
--- a/src/pixmaps/pixmaps-xp.vcxproj.filters
+++ b/src/pixmaps/pixmaps-xp.vcxproj.filters
@@ -25,6 +25,9 @@
     <None Include="op.png">

       <Filter>Resource Files</Filter>

     </None>

+    <None Include="orange.png">

+      <Filter>Resource Files</Filter>

+    </None>

     <None Include="purple.png">

       <Filter>Resource Files</Filter>

     </None>

@@ -50,4 +53,4 @@
       <Filter>Resource Files</Filter>

     </None>

   </ItemGroup>

-</Project>
\ No newline at end of file
+</Project>

diff --git a/src/pixmaps/pixmaps.vcxproj b/src/pixmaps/pixmaps.vcxproj
index 1a01658b..e3072bb2 100644
--- a/src/pixmaps/pixmaps.vcxproj
+++ b/src/pixmaps/pixmaps.vcxproj
@@ -98,6 +98,7 @@
     <None Include="hop.png" />

     <None Include="message.png" />

     <None Include="op.png" />

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

     <None Include="purple.png" />

     <None Include="red.png" />

     <None Include="server.png" />

@@ -107,4 +108,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

   <ImportGroup Label="ExtensionTargets">

   </ImportGroup>

-</Project>
\ No newline at end of file
+</Project>

diff --git a/src/pixmaps/pixmaps.vcxproj.filters b/src/pixmaps/pixmaps.vcxproj.filters
index 82b5ddef..5ae1c68a 100644
--- a/src/pixmaps/pixmaps.vcxproj.filters
+++ b/src/pixmaps/pixmaps.vcxproj.filters
@@ -25,6 +25,9 @@
     <None Include="op.png">

       <Filter>Resource Files</Filter>

     </None>

+    <None Include="orange.png">

+      <Filter>Resource Files</Filter>

+    </None>

     <None Include="purple.png">

       <Filter>Resource Files</Filter>

     </None>

@@ -50,4 +53,4 @@
       <Filter>Resource Files</Filter>

     </None>

   </ItemGroup>

-</Project>
\ No newline at end of file
+</Project>

diff --git a/win32/hexchat-xp.props b/win32/hexchat-xp.props
index 1d667b55..9ed55ba2 100644
--- a/win32/hexchat-xp.props
+++ b/win32/hexchat-xp.props
@@ -34,7 +34,7 @@
     <PythonOutput>hcpython</PythonOutput>

     <Glib>$(DepsRoot)\include\glib-2.0;$(DepsRoot)\lib\glib-2.0\include;$(DepsRoot)\include\libxml2</Glib>

     <Gtk>$(DepsRoot)\include\gtk-2.0;$(DepsRoot)\lib\gtk-2.0\include;$(DepsRoot)\include\atk-1.0;$(DepsRoot)\include\cairo;$(DepsRoot)\include\pango-1.0;$(DepsRoot)\include\gdk-pixbuf-2.0</Gtk>

-    <Pixmaps>bookpng "$(SolutionDir)\..\src\pixmaps\book.png" hoppng "$(SolutionDir)\..\src\pixmaps\hop.png" oppng "$(SolutionDir)\..\src\pixmaps\op.png" purplepng "$(SolutionDir)\..\src\pixmaps\purple.png" redpng "$(SolutionDir)\..\src\pixmaps\red.png" trayfilepng "$(SolutionDir)\..\src\pixmaps\fileoffer.png" trayhilightpng "$(SolutionDir)\..\src\pixmaps\highlight.png" traymsgpng "$(SolutionDir)\..\src\pixmaps\message.png" voicepng "$(SolutionDir)\..\src\pixmaps\voice.png" channelpng "$(SolutionDir)\..\src\pixmaps\channel.png" dialogpng "$(SolutionDir)\..\src\pixmaps\dialog.png" serverpng "$(SolutionDir)\..\src\pixmaps\server.png" utilpng "$(SolutionDir)\..\src\pixmaps\util.png" hexchatpng "$(SolutionDir)\..\hexchat.png"</Pixmaps>

+    <Pixmaps>bookpng "$(SolutionDir)\..\src\pixmaps\book.png" hoppng "$(SolutionDir)\..\src\pixmaps\hop.png" oppng "$(SolutionDir)\..\src\pixmaps\op.png" orangepng "$(SolutionDir)\..\src\pixmaps\orange.png" purplepng "$(SolutionDir)\..\src\pixmaps\purple.png" redpng "$(SolutionDir)\..\src\pixmaps\red.png" trayfilepng "$(SolutionDir)\..\src\pixmaps\fileoffer.png" trayhilightpng "$(SolutionDir)\..\src\pixmaps\highlight.png" traymsgpng "$(SolutionDir)\..\src\pixmaps\message.png" voicepng "$(SolutionDir)\..\src\pixmaps\voice.png" channelpng "$(SolutionDir)\..\src\pixmaps\channel.png" dialogpng "$(SolutionDir)\..\src\pixmaps\dialog.png" serverpng "$(SolutionDir)\..\src\pixmaps\server.png" utilpng "$(SolutionDir)\..\src\pixmaps\util.png" hexchatpng "$(SolutionDir)\..\hexchat.png"</Pixmaps>

     <DepLibs>gtk-win32-2.0.lib;gdk-win32-2.0.lib;atk-1.0.lib;gio-2.0.lib;gdk_pixbuf-2.0.lib;pangowin32-1.0.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;gobject-2.0.lib;gmodule-2.0.lib;glib-2.0.lib;intl.lib;libxml2.lib;libeay32.lib;ssleay32.lib;wininet.lib;winmm.lib;ws2_32.lib</DepLibs>

     <HexChatBuild>$(SolutionDir)build-xp</HexChatBuild>

     <HexChatBin>$(HexChatBuild)\$(PlatformName)\bin\</HexChatBin>

diff --git a/win32/hexchat.props b/win32/hexchat.props
index 733238f5..edd45e53 100644
--- a/win32/hexchat.props
+++ b/win32/hexchat.props
@@ -36,7 +36,7 @@
     <PythonOutput>hcpython</PythonOutput>

     <Glib>$(DepsRoot)\include\glib-2.0;$(DepsRoot)\lib\glib-2.0\include;$(DepsRoot)\include\libxml2</Glib>

     <Gtk>$(DepsRoot)\include\gtk-2.0;$(DepsRoot)\lib\gtk-2.0\include;$(DepsRoot)\include\atk-1.0;$(DepsRoot)\include\cairo;$(DepsRoot)\include\pango-1.0;$(DepsRoot)\include\gdk-pixbuf-2.0</Gtk>

-    <Pixmaps>bookpng "$(SolutionDir)\..\src\pixmaps\book.png" hoppng "$(SolutionDir)\..\src\pixmaps\hop.png" oppng "$(SolutionDir)\..\src\pixmaps\op.png" purplepng "$(SolutionDir)\..\src\pixmaps\purple.png" redpng "$(SolutionDir)\..\src\pixmaps\red.png" trayfilepng "$(SolutionDir)\..\src\pixmaps\fileoffer.png" trayhilightpng "$(SolutionDir)\..\src\pixmaps\highlight.png" traymsgpng "$(SolutionDir)\..\src\pixmaps\message.png" voicepng "$(SolutionDir)\..\src\pixmaps\voice.png" channelpng "$(SolutionDir)\..\src\pixmaps\channel.png" dialogpng "$(SolutionDir)\..\src\pixmaps\dialog.png" serverpng "$(SolutionDir)\..\src\pixmaps\server.png" utilpng "$(SolutionDir)\..\src\pixmaps\util.png" hexchatpng "$(SolutionDir)\..\hexchat.png"</Pixmaps>

+    <Pixmaps>bookpng "$(SolutionDir)\..\src\pixmaps\book.png" hoppng "$(SolutionDir)\..\src\pixmaps\hop.png" oppng "$(SolutionDir)\..\src\pixmaps\op.png" orangepng "$(SolutionDir)\..\src\pixmaps\orange.png" purplepng "$(SolutionDir)\..\src\pixmaps\purple.png" redpng "$(SolutionDir)\..\src\pixmaps\red.png" trayfilepng "$(SolutionDir)\..\src\pixmaps\fileoffer.png" trayhilightpng "$(SolutionDir)\..\src\pixmaps\highlight.png" traymsgpng "$(SolutionDir)\..\src\pixmaps\message.png" voicepng "$(SolutionDir)\..\src\pixmaps\voice.png" channelpng "$(SolutionDir)\..\src\pixmaps\channel.png" dialogpng "$(SolutionDir)\..\src\pixmaps\dialog.png" serverpng "$(SolutionDir)\..\src\pixmaps\server.png" utilpng "$(SolutionDir)\..\src\pixmaps\util.png" hexchatpng "$(SolutionDir)\..\hexchat.png"</Pixmaps>

     <DepLibs>gtk-win32-2.0.lib;gdk-win32-2.0.lib;atk-1.0.lib;gio-2.0.lib;gdk_pixbuf-2.0.lib;pangowin32-1.0.lib;pangocairo-1.0.lib;pango-1.0.lib;cairo.lib;gobject-2.0.lib;gmodule-2.0.lib;glib-2.0.lib;libintl.lib;libxml2.lib;libeay32.lib;ssleay32.lib;wininet.lib;winmm.lib;ws2_32.lib</DepLibs>

     <HexChatBuild>$(SolutionDir)build</HexChatBuild>

     <HexChatBin>$(HexChatBuild)\$(PlatformName)\bin\</HexChatBin>
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-12-25 08:15:43 +0000