From da43158772b7f252d355c3daadc5a00a884bc8e3 Mon Sep 17 00:00:00 2001 From: TingPing Date: Fri, 2 Nov 2012 00:54:27 -0400 Subject: [PATCH] added support for op+3 icons --- src/fe-gtk/pixmaps.c | 2 ++ src/fe-gtk/pixmaps.h | 1 + src/fe-gtk/userlistgui.c | 3 ++- src/pixmaps/Makefile.am | 3 ++- src/pixmaps/orange.png | Bin 0 -> 788 bytes src/pixmaps/pixmaps-xp.vcxproj | 3 ++- src/pixmaps/pixmaps-xp.vcxproj.filters | 5 ++++- src/pixmaps/pixmaps.vcxproj | 3 ++- src/pixmaps/pixmaps.vcxproj.filters | 5 ++++- win32/hexchat-xp.props | 2 +- win32/hexchat.props | 2 +- 11 files changed, 21 insertions(+), 8 deletions(-) create mode 100644 src/pixmaps/orange.png 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 0000000000000000000000000000000000000000..63d76046a2ef9ac7027316e843bf7ec3bd4daf40 GIT binary patch literal 788 zcmV+v1MB>WP)3m5o0xTDG(?+jBf7bm&_anD@TQkkER;fW2~DA>h_QO|5=09< z_fm=?Dk>_7ijac=6$>8PN;QdrRA_0U#DA-4+?YSQyIJ@9zUg5%2^#c)_b@N>JoC&j z17)Pz_v0nEaI6F2J=lHW`I0{Y_;l+|)~|1%@7Rw3bhh$EeH9%DiNKhd$kBgsfHT0% z5`|RzevY2IG9M;xc31rU-|?hPoN6k)(@pl|@H)Hnt@@oU>;mZd+LJ{GwJDe!WJfD& z4|UXz)U0i&$fT!(T&|!hDymp4USTWhYIN+cG4}RO_1qrer+EQ)t?PxH9|}3y75lS( zL-M2agN#`iYBcJ^^PD-S;`>H+HcwrmRvNw8wi}Ovp?sbZ0Nr-7XkD#rUDy0c)8w7l1y#X0A@?e8jmbK?KcgF{`mPmGfR)Q=_kDO%@YOj%P((mf5D`Q`RYe4< zS5=d&V>3{H?-@=3B0?fGFf$QR5Eh7($O}VPC!wgsfOvKe^#F=6Q%V#Q5t%1~qC!ci z>;@1s0>Blm+(ITtzdu(b7OylbZ-RVM+OYL~kh@>A)aAKG~U@|jDpj-C*0x*4k*#Ca~{$pwrtHeb-jKw*KIwF-7 zyq?K&`PS5(f7A2=*@92#9u8gy;Gc2s-cIN9spYe6tLs-tWjszK8Z|E(CGdTDGB(b+ zU&rtK{09es(M{j{F!l7_Z;OYs?@N^Kk&OPy~cOZbJMuBUEGTtuIMAhfbeAjKU=`w&HW#~mi<=L S;o9v00000 + @@ -110,4 +111,4 @@ - \ No newline at end of file + 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 @@ Resource Files + + Resource Files + Resource Files @@ -50,4 +53,4 @@ Resource Files - \ No newline at end of file + 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 @@ + @@ -107,4 +108,4 @@ - \ No newline at end of file + 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 @@ Resource Files + + Resource Files + Resource Files @@ -50,4 +53,4 @@ Resource Files - \ No newline at end of file + 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 @@ hcpython $(DepsRoot)\include\glib-2.0;$(DepsRoot)\lib\glib-2.0\include;$(DepsRoot)\include\libxml2 $(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 - 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" + 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" 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 $(SolutionDir)build-xp $(HexChatBuild)\$(PlatformName)\bin\ 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 @@ hcpython $(DepsRoot)\include\glib-2.0;$(DepsRoot)\lib\glib-2.0\include;$(DepsRoot)\include\libxml2 $(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 - 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" + 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" 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 $(SolutionDir)build $(HexChatBuild)\$(PlatformName)\bin\