SoniEx2
/
c.sexchat
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #218 from TingPing/usericon 

added support for op+3 icons
This commit is contained in:
bviktor 2012-11-02 15:23:54 -07:00
parent 7bd55c4f43 da43158772
commit 58e7e967db
11 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/fe-gtk/pixmaps.c
View File

@ -34,6 +34,7 @@
GdkPixbuf *pix_xchat; GdkPixbuf *pix_xchat;
GdkPixbuf *pix_book; GdkPixbuf *pix_book;
GdkPixbuf *pix_orange;
GdkPixbuf *pix_purple; GdkPixbuf *pix_purple;
GdkPixbuf *pix_red; GdkPixbuf *pix_red;
GdkPixbuf *pix_op; GdkPixbuf *pix_op;
@ -127,6 +128,7 @@ pixmaps_init (void)
/* userlist icons, with inlined defaults */ /* userlist icons, with inlined defaults */
pix_hop = load_pixmap ("hop", hoppng, 1); pix_hop = load_pixmap ("hop", hoppng, 1);
pix_orange = load_pixmap ("orange", orangepng, 1);
pix_purple = load_pixmap ("purple", purplepng, 1); pix_purple = load_pixmap ("purple", purplepng, 1);
pix_red = load_pixmap ("red", redpng, 1); pix_red = load_pixmap ("red", redpng, 1);
pix_op = load_pixmap ("op", oppng, 1); pix_op = load_pixmap ("op", oppng, 1);

1
src/fe-gtk/pixmaps.h
View File

@ -1,5 +1,6 @@
extern GdkPixbuf *pix_book; extern GdkPixbuf *pix_book;
extern GdkPixbuf *pix_hop; extern GdkPixbuf *pix_hop;
extern GdkPixbuf *pix_orange;
extern GdkPixbuf *pix_purple; extern GdkPixbuf *pix_purple;
extern GdkPixbuf *pix_red; extern GdkPixbuf *pix_red;
extern GdkPixbuf *pix_op; extern GdkPixbuf *pix_op;

3
src/fe-gtk/userlistgui.c
View File

@ -96,8 +96,9 @@ get_user_icon (server *serv, struct User *user)
{ {
case 0: return pix_red; /* 1 level above op */ case 0: return pix_red; /* 1 level above op */
case 1: return pix_purple; /* 2 levels 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++; level++;
if (pre == serv->nick_prefixes) if (pre == serv->nick_prefixes)

3
src/pixmaps/Makefile.am
View File

@ -6,6 +6,7 @@ LIST = traymsgpng $(srcdir)/message.png \
bookpng $(srcdir)/book.png \ bookpng $(srcdir)/book.png \
hoppng $(srcdir)/hop.png \ hoppng $(srcdir)/hop.png \
oppng $(srcdir)/op.png \ oppng $(srcdir)/op.png \
orangepng $(srcdir)/orange.png \
purplepng $(srcdir)/purple.png \ purplepng $(srcdir)/purple.png \
redpng $(srcdir)/red.png \ redpng $(srcdir)/red.png \
voicepng $(srcdir)/voice.png \ voicepng $(srcdir)/voice.png \
@ -15,7 +16,7 @@ LIST = traymsgpng $(srcdir)/message.png \
utilpng $(srcdir)/util.png \ utilpng $(srcdir)/util.png \
hexchatpng $(srcdir)/../../hexchat.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 noinst_HEADERS = inline_pngs.h
CLEANFILES = $(noinst_HEADERS) CLEANFILES = $(noinst_HEADERS)
EXTRA_DIST = $(PNGS) EXTRA_DIST = $(PNGS)

BIN
src/pixmaps/orange.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 788 B

1
src/pixmaps/pixmaps-xp.vcxproj
View File

@ -101,6 +101,7 @@
<None Include="hop.png" /> <None Include="hop.png" />
<None Include="message.png" /> <None Include="message.png" />
<None Include="op.png" /> <None Include="op.png" />
<None Include="orange.png" />
<None Include="purple.png" /> <None Include="purple.png" />
<None Include="red.png" /> <None Include="red.png" />
<None Include="server.png" /> <None Include="server.png" />

3
src/pixmaps/pixmaps-xp.vcxproj.filters
View File

@ -25,6 +25,9 @@
<None Include="op.png"> <None Include="op.png">
<Filter>Resource Files</Filter> <Filter>Resource Files</Filter>
</None> </None>
<None Include="orange.png">
<Filter>Resource Files</Filter>
</None>
<None Include="purple.png"> <None Include="purple.png">
<Filter>Resource Files</Filter> <Filter>Resource Files</Filter>
</None> </None>

1
src/pixmaps/pixmaps.vcxproj
View File

@ -98,6 +98,7 @@
<None Include="hop.png" /> <None Include="hop.png" />
<None Include="message.png" /> <None Include="message.png" />
<None Include="op.png" /> <None Include="op.png" />
<None Include="orange.png" />
<None Include="purple.png" /> <None Include="purple.png" />
<None Include="red.png" /> <None Include="red.png" />
<None Include="server.png" /> <None Include="server.png" />

3
src/pixmaps/pixmaps.vcxproj.filters
View File

@ -25,6 +25,9 @@
<None Include="op.png"> <None Include="op.png">
<Filter>Resource Files</Filter> <Filter>Resource Files</Filter>
</None> </None>
<None Include="orange.png">
<Filter>Resource Files</Filter>
</None>
<None Include="purple.png"> <None Include="purple.png">
<Filter>Resource Files</Filter> <Filter>Resource Files</Filter>
</None> </None>

2
win32/hexchat-xp.props
View File

@ -34,7 +34,7 @@
<PythonOutput>hcpython</PythonOutput> <PythonOutput>hcpython</PythonOutput>
<Glib>$(DepsRoot)\include\glib-2.0;$(DepsRoot)\lib\glib-2.0\include;$(DepsRoot)\include\libxml2</Glib> <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> <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> <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> <HexChatBuild>$(SolutionDir)build-xp</HexChatBuild>
<HexChatBin>$(HexChatBuild)\$(PlatformName)\bin\</HexChatBin> <HexChatBin>$(HexChatBuild)\$(PlatformName)\bin\</HexChatBin>

2
win32/hexchat.props
View File

@ -36,7 +36,7 @@
<PythonOutput>hcpython</PythonOutput> <PythonOutput>hcpython</PythonOutput>
<Glib>$(DepsRoot)\include\glib-2.0;$(DepsRoot)\lib\glib-2.0\include;$(DepsRoot)\include\libxml2</Glib> <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> <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> <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> <HexChatBuild>$(SolutionDir)build</HexChatBuild>
<HexChatBin>$(HexChatBuild)\$(PlatformName)\bin\</HexChatBin> <HexChatBin>$(HexChatBuild)\$(PlatformName)\bin\</HexChatBin>