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

Merge branch 'gresource'

This commit is contained in:
TingPing 2013-09-29 02:24:30 -04:00
parent 4ba886f7aa 1f84c507a0
commit 00bd389cdc
59 changed files with 98 additions and 2547 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitignore vendored
View File

@ -13,6 +13,7 @@ conftest.c
conftest.err
config.guess
config.h.in
config.h.in~
config.h
config.log
config.status
@ -34,7 +35,7 @@ po/Makefile.in.in
po/POTFILES
po/remove-potcdate.sed
po/stamp-po
share/pkgconfig/hexchat-plugin.pc
data/pkgconfig/hexchat-plugin.pc
src/common/dbus/example
src/common/dbus/marshallers.h
src/common/dbus/org.hexchat.service.service
@ -61,7 +62,7 @@ stamp-h1
# Win32 generated files
plugins/wmpa/wmpa_h.h
plugins/wmpa/wmpa_i.c
src/pixmaps/inline_pngs.h
src/fe-gtk/resources.c
src/htm/obj/*
win32/ipch/*
win32/ext/perl/perl-x86-cache

0
share/doc/COPYING → COPYING
View File

2
Makefile.am
View File

@ -2,7 +2,7 @@
ACLOCAL_AMFLAGS = -I m4
SUBDIRS = po intl src plugins man share
SUBDIRS = po intl src plugins data
EXTRA_DIST = autogen.sh

19
configure.ac
View File

@ -731,12 +731,6 @@ AC_TRY_COMPILE(
],
AC_MSG_RESULT(no))
AC_PATH_PROG(gdkpixbufcsourcepath, gdk-pixbuf-csource)
AC_SUBST(gdkpixbufcsourcepath)
if test "$gtkfe" != no -a "_$gdkpixbufcsourcepath" = _; then
AC_MSG_ERROR(Cannot find gdk-pixbuf-csource: Install GTK+ 2.0!)
fi
dnl if we don\'t have this, use g_snprintf instead
AC_CHECK_FUNCS(snprintf vsnprintf memrchr strtoull)
@ -811,11 +805,12 @@ AC_SUBST(hexchatlibdir)
AC_CONFIG_FILES([
Makefile
share/Makefile
share/icons/Makefile
share/misc/Makefile
share/pkgconfig/Makefile
share/pkgconfig/hexchat-plugin.pc
data/Makefile
data/icons/Makefile
data/misc/Makefile
data/man/Makefile
data/pkgconfig/Makefile
data/pkgconfig/hexchat-plugin.pc
src/Makefile
src/common/Makefile
src/common/dbus/Makefile
@ -823,7 +818,6 @@ src/fe-text/Makefile
src/fe-gtk/Makefile
src/htm/Makefile
src/htm/thememan
src/pixmaps/Makefile
plugins/Makefile
plugins/python/Makefile
plugins/perl/Makefile
@ -833,7 +827,6 @@ plugins/fishlim/Makefile
plugins/sysinfo/Makefile
intl/Makefile
po/Makefile.in
man/Makefile
])
AC_OUTPUT

2
share/Makefile.am → data/Makefile.am
View File

@ -1,4 +1,4 @@
SUBDIRS = pkgconfig
SUBDIRS = pkgconfig man
if DO_GTK
SUBDIRS += icons misc

23
data/hexchat.gresource.xml Normal file
View File

@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<gresources>
<gresource prefix="/icons">
<file alias="hexchat.png" preprocess="to-pixdata" compressed="true">icons/hexchat.png</file>
<file alias="book.png" preprocess="to-pixdata" compressed="true">icons/book.png</file>
<file alias="ulist_voice.png" preprocess="to-pixdata" compressed="true">icons/ulist_voice.png</file>
<file alias="ulist_halfop.png" preprocess="to-pixdata" compressed="true">icons/ulist_halfop.png</file>
<file alias="ulist_op.png" preprocess="to-pixdata" compressed="true">icons/ulist_op.png</file>
<file alias="ulist_owner.png" preprocess="to-pixdata" compressed="true">icons/ulist_owner.png</file>
<file alias="ulist_founder.png" preprocess="to-pixdata" compressed="true">icons/ulist_founder.png</file>
<file alias="ulist_netop.png" preprocess="to-pixdata" compressed="true">icons/ulist_netop.png</file>
<file alias="tray_fileoffer.png" preprocess="to-pixdata" compressed="true">icons/tray_fileoffer.png</file>
<file alias="tray_highlight.png" preprocess="to-pixdata" compressed="true">icons/tray_highlight.png</file>
<file alias="tray_message.png" preprocess="to-pixdata" compressed="true">icons/tray_message.png</file>
<file alias="tree_channel.png" preprocess="to-pixdata" compressed="true">icons/tree_channel.png</file>
<file alias="tree_dialog.png" preprocess="to-pixdata" compressed="true">icons/tree_dialog.png</file>
<file alias="tree_server.png" preprocess="to-pixdata" compressed="true">icons/tree_server.png</file>
<file alias="tree_util.png" preprocess="to-pixdata" compressed="true">icons/tree_util.png</file>
</gresource>
</gresources>

2
share/icons/Makefile.am → data/icons/Makefile.am
View File

@ -1,4 +1,4 @@
icon_DATA = ../../src/pixmaps/hexchat.png
icon_DATA = hexchat.png
icondir = $(datadir)/icons/hicolor/48x48/apps
hicolor_DATA = hexchat.svg

0
src/pixmaps/book.png → data/icons/book.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 841 B

After

Width:  |  Height:  |  Size: 841 B

0
share/icons/hexchat-b.svg → data/icons/hexchat-b.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 21 KiB

0
share/icons/hexchat-shadowless.svg → data/icons/hexchat-shadowless.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 26 KiB

0
share/icons/hexchat.ico → data/icons/hexchat.ico
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 17 KiB

0
src/pixmaps/hexchat.png → data/icons/hexchat.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 3.1 KiB

0
share/icons/hexchat.svg → data/icons/hexchat.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 26 KiB

0
src/pixmaps/tray_fileoffer.png → data/icons/tray_fileoffer.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.0 KiB

After

Width:  |  Height:  |  Size: 5.0 KiB

0
src/pixmaps/tray_highlight.png → data/icons/tray_highlight.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.7 KiB

After

Width:  |  Height:  |  Size: 4.7 KiB

0
src/pixmaps/tray_message.png → data/icons/tray_message.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.6 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB

0
src/pixmaps/tree_channel.png → data/icons/tree_channel.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 422 B

After

Width:  |  Height:  |  Size: 422 B

0
src/pixmaps/tree_dialog.png → data/icons/tree_dialog.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 911 B

After

Width:  |  Height:  |  Size: 911 B

0
src/pixmaps/tree_server.png → data/icons/tree_server.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 568 B

After

Width:  |  Height:  |  Size: 568 B

0
src/pixmaps/tree_util.png → data/icons/tree_util.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 611 B

After

Width:  |  Height:  |  Size: 611 B

0
src/pixmaps/ulist_founder.png → data/icons/ulist_founder.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 660 B

After

Width:  |  Height:  |  Size: 660 B

0
src/pixmaps/ulist_halfop.png → data/icons/ulist_halfop.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 668 B

After

Width:  |  Height:  |  Size: 668 B

0
src/pixmaps/ulist_netop.png → data/icons/ulist_netop.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 593 B

After

Width:  |  Height:  |  Size: 593 B

0
src/pixmaps/ulist_op.png → data/icons/ulist_op.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 691 B

After

Width:  |  Height:  |  Size: 691 B

0
src/pixmaps/ulist_owner.png → data/icons/ulist_owner.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 678 B

After

Width:  |  Height:  |  Size: 678 B

0
src/pixmaps/ulist_voice.png → data/icons/ulist_voice.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 670 B

After

Width:  |  Height:  |  Size: 670 B

0
man/Makefile.am → data/man/Makefile.am
View File

0
man/hexchat.1 → data/man/hexchat.1
View File

0
share/misc/Makefile.am → data/misc/Makefile.am
View File

0
share/misc/hexchat.appdata.xml → data/misc/hexchat.appdata.xml
View File

0
share/misc/hexchat.desktop → data/misc/hexchat.desktop
View File

0
share/misc/htm-mime.xml → data/misc/htm-mime.xml
View File

0
share/misc/htm.desktop → data/misc/htm.desktop
View File

0
share/pkgconfig/Makefile.am → data/pkgconfig/Makefile.am
View File

0
share/pkgconfig/hexchat-plugin.pc.in → data/pkgconfig/hexchat-plugin.pc.in
View File

2
share/doc/readme.md → readme.md
View File

@ -1,6 +1,6 @@
# HexChat ReadMe
X-Chat ("xchat") Copyright (c) 1998-2010 By Peter Zelezny.
X-Chat ("xchat") Copyright (c) 1998-2010 By Peter Zelezny.
HexChat ("hexchat") Copyright (c) 2009-2013 By Berke Viktor.
This program is released under the GPL v2 with the additional exemption

2191
share/doc/changelog-xchat.md
View File

File diff suppressed because it is too large Load Diff

33
share/doc/fishlim.md
View File

@ -1,33 +0,0 @@
# FiSHLiM
FiSHLiM is an XChat plugin for FiSH IRC encryption. It's my attempt at making a simple, lightweight and secure plugin for this encryption protocol. For more info, please visit the [FiSHLiM website](http://fishlim.kodafritt.se/).
For installation instructions, see the INSTALL file in the sources.
## Features
Working:
* Sending/receiving messages
* Topic decryption
* Using unecrypted keys / keys without a password from blow.ini
* Pure protocol-level filtering (works with highlighting, nick coloring etc)
* Partially encrypted messages (i.e. prefixed with nickname by a bouncer)
Not working:
* Key exchange
* Password-protected key storage
* Topic encryption
* Remote exploitation (hopefully!)
* Plaintext content that contain +OK is decrypted twice
## Commands
Keys are stored in the configuration file in ~/.config/hexchat/addon_fishlim.txt. To set the encryption key for the nick or channel to password:
<pre>/setkey [nick or #channel] password</pre>
To delete the given nick or channel from the configuration file:
<pre>/delkey nick-or-#channel</pre>

36
share/doc/hacking.md
View File

@ -1,36 +0,0 @@
# HexChat Hacking Guidelines
Just some tips if you're going to help with HexChat code (patches etc):
* Use tabs, not spaces, to indent and align code.
* Use a tab size of 4 (most editors will let you choose this).
Type :set ts=4 in vim/gvim.
* Try to stick to the same consistant coding style (vertically aligned braces, a space after if, while, functions etc.):
```C
void
routine (void)
{
if (function (a, b, c))
{
x = a + 1;
}
}
```
* Don't use "//" C++ style comments, some compilers don't like them.
* When opening a file with Unix level functions (open, read/write, close)
as opposed to the C level functions (fopen, fwrite/fread, fclose), use
the OFLAGS macro. This makes sure it'll work on Win32 as well as Unix e.g.:
<pre>fh = open ("file", OFLAGS | O_RDONLY);</pre>
* Use closesocket() for sockets, and close() for normal files.
* Don't read() from sockets, use recv() instead.
* Patches are only accepted as a Github Pull request: https://help.github.com/articles/using-pull-requests

3
share/doc/hexchat-text.md
View File

@ -1,3 +0,0 @@
# HexChat-Text
HexChat-Text is an experimental text frontend for HexChat. If anyone wants to add ncurses support, they are welcome to.

2
src/Makefile.am
View File

@ -11,7 +11,7 @@ if DO_GTK
gtk_fe = fe-gtk
endif
SUBDIRS = pixmaps common $(gtk_fe) $(text_fe)
SUBDIRS = common $(gtk_fe) $(text_fe)
if WITH_TM
SUBDIRS += htm

8
src/fe-gtk/Makefile.am
View File

@ -11,7 +11,8 @@ EXTRA_DIST = \
chanview-tree.c custom-list.h editlist.h fe-gtk.h fkeys.h gtkutil.h joind.h \
maingui.h menu.h notifygui.h palette.h pixmaps.h \
plugin-tray.h plugingui.c plugingui.h rawlog.h sexy-iso-codes.h \
sexy-spell-entry.h sexy-marshal.h textgui.h urlgrab.h userlistgui.h xtext.h
sexy-spell-entry.h sexy-marshal.h textgui.h urlgrab.h userlistgui.h xtext.h \
../../data/hexchat.gresource.xml
if DO_PLUGIN
plugingui_c = plugingui.c
@ -25,5 +26,8 @@ endif
hexchat_SOURCES = ascii.c banlist.c chanlist.c chanview.c custom-list.c \
dccgui.c editlist.c fe-gtk.c fkeys.c gtkutil.c ignoregui.c joind.c menu.c \
maingui.c notifygui.c palette.c pixmaps.c plugin-tray.c $(plugingui_c) \
rawlog.c servlistgui.c setup.c $(sexy_spell) textgui.c \
rawlog.c resources.c servlistgui.c setup.c $(sexy_spell) textgui.c \
urlgrab.c userlistgui.c xtext.c
resources.c: ../../data/hexchat.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=../../data --generate-dependencies ../../data/hexchat.gresource.xml)
$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=../../data --generate-source $<

14
src/fe-gtk/fe-gtk.vcxproj
View File

@ -22,13 +22,11 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@ -97,6 +95,12 @@
<EntryPointSymbol>mainCRTStartup</EntryPointSymbol>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup>
<PreBuildEvent>
<Command>$(DepsRoot)\bin\glib-compile-resources.exe --generate-source --sourcedir $(DataDir) --target "$(ProjectDir)resources.c" "$(DataDir)hexchat.gresource.xml"</Command>
<Message>Build gresource file</Message>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="ascii.h" />
<ClInclude Include="banlist.h" />
@ -147,6 +151,7 @@
<ClCompile Include="plugin-tray.c" />
<ClCompile Include="plugingui.c" />
<ClCompile Include="rawlog.c" />
<ClCompile Include="resources.c" />
<ClCompile Include="servlistgui.c" />
<ClCompile Include="setup.c" />
<ClCompile Include="sexy-iso-codes.c" />
@ -164,7 +169,10 @@
<ResourceCompile Include="hexchat.rc" />
</ItemGroup>
<ItemGroup>
<None Include="..\..\share\icons\hexchat.ico" />
<None Include="..\..\data\icons\hexchat.ico" />
</ItemGroup>
<ItemGroup>
<Xml Include="..\..\data\hexchat.gresource.xml" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">

10
src/fe-gtk/fe-gtk.vcxproj.filters
View File

@ -185,6 +185,9 @@
<ClCompile Include="xtext.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="resources.c">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<Manifest Include="hexchat.exe.manifest">
@ -197,8 +200,11 @@
</ResourceCompile>
</ItemGroup>
<ItemGroup>
<None Include="..\..\share\icons\hexchat.ico">
<None Include="..\..\data\icons\hexchat.ico">
<Filter>Resource Files</Filter>
</None>
</ItemGroup>
</Project>
<ItemGroup>
<Xml Include="..\..\data\hexchat.gresource.xml" />
</ItemGroup>
</Project>

2
src/fe-gtk/hexchat.rc
View File

@ -2,7 +2,7 @@
#include "../../config-win32.h"
#include "../../resource.h"
XC_ICON ICON "../../share/icons/hexchat.ico"
XC_ICON ICON "../../data/icons/hexchat.ico"
VS_VERSION_INFO VERSIONINFO
FILEVERSION COMMA_VERSION

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

@ -25,10 +25,9 @@
#include "../common/hexchat.h"
#include "../common/fe.h"
#include <gio/gio.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
#include "../pixmaps/inline_pngs.h"
GdkPixbuf *pix_ulist_voice;
GdkPixbuf *pix_ulist_halfop;
GdkPixbuf *pix_ulist_op;
@ -84,21 +83,9 @@ pixmap_load_from_file (char *filename)
return pix;
}
#if 0
#define LOADPIX(vv,pp,ff) \
vv = gdk_pixbuf_new_from_file (HEXCHATSHAREDIR"/hexchat/"ff, 0); \
if (!vv) \
vv = gdk_pixbuf_new_from_inline (-1, pp, FALSE, 0);
#define LOADPIX_DISKONLY(vv,ff) \
vv = gdk_pixbuf_new_from_file (HEXCHATSHAREDIR"/hexchat/"ff, 0);
#define EXT ".png"
#endif
/* load custom icons from <config>/icons, don't mess in system folders */
static GdkPixbuf *
load_pixmap (const char *filename, const char *name, int has_inline)
load_pixmap (const char *filename)
{
gchar *path;
GdkPixbuf *pixbuf;
@ -107,45 +94,40 @@ load_pixmap (const char *filename, const char *name, int has_inline)
pixbuf = gdk_pixbuf_new_from_file (path, 0);
g_free (path);
if (has_inline && !pixbuf && name)
if (!pixbuf)
{
pixbuf = gdk_pixbuf_new_from_inline (-1, name, FALSE, 0);
path = g_strdup_printf ("/icons/%s.png", filename);
pixbuf = gdk_pixbuf_new_from_resource (path, NULL);
g_free (path);
}
g_warn_if_fail (pixbuf != NULL);
return pixbuf;
}
void
pixmaps_init (void)
{
/* userlist icons, with inlined defaults */
pix_ulist_voice = load_pixmap ("ulist_voice", png_ulist_voice, 1);
pix_ulist_halfop = load_pixmap ("ulist_halfop", png_ulist_halfop, 1);
pix_ulist_op = load_pixmap ("ulist_op", png_ulist_op, 1);
pix_ulist_owner = load_pixmap ("ulist_owner", png_ulist_owner, 1);
pix_ulist_founder = load_pixmap ("ulist_founder", png_ulist_founder, 1);
pix_ulist_netop = load_pixmap ("ulist_netop", png_ulist_netop, 1);
pix_ulist_voice = load_pixmap ("ulist_voice");
pix_ulist_halfop = load_pixmap ("ulist_halfop");
pix_ulist_op = load_pixmap ("ulist_op");
pix_ulist_owner = load_pixmap ("ulist_owner");
pix_ulist_founder = load_pixmap ("ulist_founder");
pix_ulist_netop = load_pixmap ("ulist_netop");
/* tray icons, with inlined defaults */
pix_tray_fileoffer = load_pixmap ("tray_fileoffer", png_tray_fileoffer, 1);
pix_tray_highlight = load_pixmap ("tray_highlight", png_tray_highlight, 1);
pix_tray_message = load_pixmap ("tray_message", png_tray_message, 1);
pix_tray_fileoffer = load_pixmap ("tray_fileoffer");
pix_tray_highlight = load_pixmap ("tray_highlight");
pix_tray_message = load_pixmap ("tray_message");
#if 0
/* treeview icons, no defaults, load from disk only */
pix_tree_channel = load_pixmap ("tree_channel", NULL, 0);
pix_tree_dialog = load_pixmap ("tree_dialog", NULL, 0);
pix_tree_server = load_pixmap ("tree_server", NULL, 0);
pix_tree_util = load_pixmap ("tree_util", NULL, 0);
#endif
/* provide inline defaults for these coz they are nice! */
pix_tree_channel = load_pixmap ("tree_channel", png_tree_channel, 1);
pix_tree_dialog = load_pixmap ("tree_dialog", png_tree_dialog, 1);
pix_tree_server = load_pixmap ("tree_server", png_tree_server, 1);
pix_tree_util = load_pixmap ("tree_util", png_tree_util, 1);
pix_tree_channel = load_pixmap ("tree_channel");
pix_tree_dialog = load_pixmap ("tree_dialog");
pix_tree_server = load_pixmap ("tree_server");
pix_tree_util = load_pixmap ("tree_util");
/* non-replaceable book pixmap */
pix_book = gdk_pixbuf_new_from_inline (-1, png_book, FALSE, 0);
pix_book = gdk_pixbuf_new_from_resource ("/icons/book.png", NULL);
/* used in About window, tray icon and WindowManager icon. */
pix_hexchat = load_pixmap ("hexchat", png_hexchat, 1);
pix_hexchat = load_pixmap ("hexchat");
}

25
src/pixmaps/Makefile.am
View File

@ -1,25 +0,0 @@
## Process this file with automake to produce Makefile.in
LIST = png_ulist_voice $(srcdir)/ulist_voice.png \
png_ulist_halfop $(srcdir)/ulist_halfop.png \
png_ulist_op $(srcdir)/ulist_op.png \
png_ulist_owner $(srcdir)/ulist_owner.png \
png_ulist_founder $(srcdir)/ulist_founder.png \
png_ulist_netop $(srcdir)/ulist_netop.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 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)
inline_pngs.h: $(PNGS)
@gdkpixbufcsourcepath@ --raw --build-list $(LIST) > $(srcdir)/inline_pngs.h

BIN
src/pixmaps/ban.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.2 KiB

BIN
src/pixmaps/disconnect.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.4 KiB

BIN
src/pixmaps/kick.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.0 KiB

BIN
src/pixmaps/notice.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.7 KiB

112
src/pixmaps/pixmaps.vcxproj
View File

@ -1,112 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Label="Configuration">
<PlatformToolset>v120</PlatformToolset>
</PropertyGroup>
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{626DA61C-FA8B-474C-B2F5-72AD9DFEE642}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>pixmaps</RootNamespace>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\..\win32\hexchat.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="..\..\win32\hexchat.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<OutDir>$(HexChatBin)</OutDir>
<IntDir>$(HexChatObj)$(ProjectName)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
<OutDir>$(HexChatBin)</OutDir>
<IntDir>$(HexChatObj)$(ProjectName)\</IntDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<PrecompiledHeader>
</PrecompiledHeader>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
</Link>
<PostBuildEvent>
<Command>"$(DepsRoot)\bin\gdk-pixbuf-csource" --build-list $(Pixmaps) &gt; "$(SolutionDir)\..\src\pixmaps\inline_pngs.h"</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<PrecompiledHeader>
</PrecompiledHeader>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
</Link>
<PostBuildEvent>
<Command>"$(DepsRoot)\bin\gdk-pixbuf-csource" --build-list $(Pixmaps) &gt; "$(SolutionDir)\..\src\pixmaps\inline_pngs.h"</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
<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="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>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>

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

@ -1,56 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Resource Files">
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
</Filter>
</ItemGroup>
<ItemGroup>
<None Include="ulist_voice.png">
<Filter>Resource Files</Filter>
</None>
<None Include="ulist_halfop.png">
<Filter>Resource Files</Filter>
</None>
<None Include="ulist_op.png">
<Filter>Resource Files</Filter>
</None>
<None Include="ulist_owner.png">
<Filter>Resource Files</Filter>
</None>
<None Include="ulist_founder.png">
<Filter>Resource Files</Filter>
</None>
<None Include="ulist_netop.png">
<Filter>Resource Files</Filter>
</None>
<None Include="tray_fileoffer.png">
<Filter>Resource Files</Filter>
</None>
<None Include="tray_highlight.png">
<Filter>Resource Files</Filter>
</None>
<None Include="tray_message.png">
<Filter>Resource Files</Filter>
</None>
<None Include="tree_channel.png">
<Filter>Resource Files</Filter>
</None>
<None Include="tree_dialog.png">
<Filter>Resource Files</Filter>
</None>
<None Include="tree_server.png">
<Filter>Resource Files</Filter>
</None>
<None Include="tree_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>

2
win32/copy/readme.url
View File

@ -1,4 +1,4 @@
[InternetShortcut]
URL=https://github.com/hexchat/hexchat/blob/master/share/doc/readme.md
URL=https://github.com/hexchat/hexchat/blob/master/readme.md
IconFile=%systemroot%\system32\shell32.dll
IconIndex=23

6
win32/hexchat.props
View File

@ -32,8 +32,8 @@
<Python3Output>hcpython3</Python3Output>
<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>png_ulist_voice "$(SolutionDir)\..\src\pixmaps\ulist_voice.png" png_ulist_halfop "$(SolutionDir)\..\src\pixmaps\ulist_halfop.png" png_ulist_op "$(SolutionDir)\..\src\pixmaps\ulist_op.png" png_ulist_owner "$(SolutionDir)\..\src\pixmaps\ulist_owner.png" png_ulist_founder "$(SolutionDir)\..\src\pixmaps\ulist_founder.png" png_ulist_netop "$(SolutionDir)\..\src\pixmaps\ulist_netop.png" png_tray_fileoffer "$(SolutionDir)\..\src\pixmaps\tray_fileoffer.png" png_tray_highlight "$(SolutionDir)\..\src\pixmaps\tray_highlight.png" png_tray_message "$(SolutionDir)\..\src\pixmaps\tray_message.png" png_tree_channel "$(SolutionDir)\..\src\pixmaps\tree_channel.png" png_tree_dialog "$(SolutionDir)\..\src\pixmaps\tree_dialog.png" png_tree_server "$(SolutionDir)\..\src\pixmaps\tree_server.png" png_tree_util "$(SolutionDir)\..\src\pixmaps\tree_util.png" png_book "$(SolutionDir)\..\src\pixmaps\book.png" png_hexchat "$(SolutionDir)\..\src\pixmaps\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>
<DataDir>$(SolutionDir)..\data\</DataDir>
<HexChatBuild>$(SolutionDir)..\..\hexchat-build</HexChatBuild>
<HexChatBin>$(HexChatBuild)\$(PlatformName)\bin\</HexChatBin>
<HexChatObj>$(HexChatBuild)\$(PlatformName)\obj\</HexChatObj>
@ -77,8 +77,7 @@ copy "$(DepsRoot)\bin\zlib1.dll" "$(HexChatRel)"
xcopy /q /s /i "$(DepsRoot)\lib\gtk-2.0\i686-pc-vs10\engines" "$(HexChatRel)\lib\gtk-2.0\i686-pc-vs10\engines"
xcopy /q /s /i etc "$(HexChatRel)\etc"
xcopy /q /s /i share "$(HexChatRel)\share"
xcopy /q /s /i "..\..\share\doc\COPYING" "$(HexChatRel)\share\doc\hexchat\"
xcopy /q /s /i "$(DepsRoot)\share\doc" "$(HexChatRel)\share\doc"
xcopy /q /s /i "..\..\COPYING" "$(HexChatRel)\"
xcopy /q /s /i "$(DepsRoot)\lib\enchant\libenchant_myspell.dll" "$(HexChatRel)\lib\enchant\"
xcopy /q /s /i "$(HexChatBin)hcchecksum.dll" "$(HexChatRel)\plugins\"
copy "$(HexChatBin)hcdns.dll" "$(HexChatRel)\plugins"
@ -102,6 +101,7 @@ xcopy /q /s /i "$(DepsRoot)\share\locale" "$(HexChatRel)\share\locale"
<WarningLevel>Level3</WarningLevel>
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
<AdditionalOptions>/d2Zi+ %(AdditionalOptions)</AdditionalOptions>
<WholeProgramOptimization>false</WholeProgramOptimization>
<!-- UNCOMMENT ONLY ONE -->
<!--Optimization>Disabled</Optimization-->
<Optimization>MaxSpeed</Optimization>

8
win32/hexchat.sln
View File

@ -8,13 +8,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "..\src\common\com
{A7D7CE59-2A31-48AE-BED2-A9828E241832} = {A7D7CE59-2A31-48AE-BED2-A9828E241832}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pixmaps", "..\src\pixmaps\pixmaps.vcxproj", "{626DA61C-FA8B-474C-B2F5-72AD9DFEE642}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "version", "..\src\version\version.vcxproj", "{6CD3647E-4541-4849-9DD7-C8816665AE42}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fe-gtk", "..\src\fe-gtk\fe-gtk.vcxproj", "{E4BDB4C8-2335-415A-ACEE-BA88B19BFE82}"
ProjectSection(ProjectDependencies) = postProject
{626DA61C-FA8B-474C-B2F5-72AD9DFEE642} = {626DA61C-FA8B-474C-B2F5-72AD9DFEE642}
{87554B59-006C-4D94-9714-897B27067BA3} = {87554B59-006C-4D94-9714-897B27067BA3}
{6CD3647E-4541-4849-9DD7-C8816665AE42} = {6CD3647E-4541-4849-9DD7-C8816665AE42}
EndProjectSection
@ -99,10 +96,6 @@ Global
{87554B59-006C-4D94-9714-897B27067BA3}.Release|Win32.Build.0 = Release|Win32
{87554B59-006C-4D94-9714-897B27067BA3}.Release|x64.ActiveCfg = Release|x64
{87554B59-006C-4D94-9714-897B27067BA3}.Release|x64.Build.0 = Release|x64
{626DA61C-FA8B-474C-B2F5-72AD9DFEE642}.Release|Win32.ActiveCfg = Release|Win32
{626DA61C-FA8B-474C-B2F5-72AD9DFEE642}.Release|Win32.Build.0 = Release|Win32
{626DA61C-FA8B-474C-B2F5-72AD9DFEE642}.Release|x64.ActiveCfg = Release|x64
{626DA61C-FA8B-474C-B2F5-72AD9DFEE642}.Release|x64.Build.0 = Release|x64
{6CD3647E-4541-4849-9DD7-C8816665AE42}.Release|Win32.ActiveCfg = Release|Win32
{6CD3647E-4541-4849-9DD7-C8816665AE42}.Release|Win32.Build.0 = Release|Win32
{6CD3647E-4541-4849-9DD7-C8816665AE42}.Release|x64.ActiveCfg = Release|x64
@ -188,7 +181,6 @@ Global
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{626DA61C-FA8B-474C-B2F5-72AD9DFEE642} = {AAACEB12-9475-410E-AF5A-FDFF907E9043}
{E4BDB4C8-2335-415A-ACEE-BA88B19BFE82} = {AAACEB12-9475-410E-AF5A-FDFF907E9043}
{E93E1255-95D1-4B08-8FDF-B53CC6A21280} = {AAACEB12-9475-410E-AF5A-FDFF907E9043}
{87554B59-006C-4D94-9714-897B27067BA3} = {AAACEB12-9475-410E-AF5A-FDFF907E9043}

5
win32/installer/hexchat-x64.skel.iss
View File

@ -4,7 +4,7 @@ AppPublisherURL=http://www.hexchat.org/
AppCopyright=Copyright (C) 1998-2010 Peter Zelezny
AppSupportURL=https://github.com/hexchat/hexchat/issues
AppUpdatesURL=http://www.hexchat.org/home/downloads
LicenseFile=share\doc\hexchat\COPYING
LicenseFile=COPYING
UninstallDisplayIcon={app}\hexchat.exe
UninstallDisplayName=HexChat (x64)
DefaultDirName={pf}\HexChat
@ -86,8 +86,7 @@ Source: "cert.pem"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
Source: "etc\gtk-2.0\gtkrc"; DestDir: "{app}\etc\gtk-2.0"; Flags: ignoreversion; Components: gtktheme
;Source: "etc\gtk-2.0\gtkrc"; DestDir: "{app}\etc\gtk-2.0"; Flags: ignoreversion; Components: libs and not gtkengines
Source: "share\xml\*"; DestDir: "{app}\share\xml"; Flags: ignoreversion createallsubdirs recursesubdirs; Components: libs
Source: "share\doc\*"; DestDir: "{app}\share\doc"; Flags: ignoreversion createallsubdirs recursesubdirs; Components: libs
Source: "COPYING"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
Source: "share\locale\*"; DestDir: "{app}\share\locale"; Flags: ignoreversion createallsubdirs recursesubdirs; Components: translations
Source: "atk-1.0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs

5
win32/installer/hexchat-x86.skel.iss
View File

@ -4,7 +4,7 @@ AppPublisherURL=http://www.hexchat.org/
AppCopyright=Copyright (C) 1998-2010 Peter Zelezny
AppSupportURL=https://github.com/hexchat/hexchat/issues
AppUpdatesURL=http://www.hexchat.org/home/downloads
LicenseFile=share\doc\hexchat\COPYING
LicenseFile=COPYING
UninstallDisplayIcon={app}\hexchat.exe
UninstallDisplayName=HexChat (x86)
DefaultDirName={pf}\HexChat
@ -85,8 +85,7 @@ Source: "cert.pem"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
Source: "etc\gtk-2.0\gtkrc"; DestDir: "{app}\etc\gtk-2.0"; Flags: ignoreversion; Components: gtktheme
;Source: "etc\gtk-2.0\gtkrc"; DestDir: "{app}\etc\gtk-2.0"; Flags: ignoreversion; Components: libs and not gtkengines
Source: "share\xml\*"; DestDir: "{app}\share\xml"; Flags: ignoreversion createallsubdirs recursesubdirs; Components: libs
Source: "share\doc\*"; DestDir: "{app}\share\doc"; Flags: ignoreversion createallsubdirs recursesubdirs; Components: libs
Source: "COPYING"; DestDir: "{app}"; Flags: ignoreversion; Components: libs
Source: "share\locale\*"; DestDir: "{app}\share\locale"; Flags: ignoreversion createallsubdirs recursesubdirs; Components: translations
Source: "atk-1.0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs

6
win32/installer/installer.vcxproj
View File

@ -68,7 +68,7 @@ echo WizardSmallImageFile="$(ProjectDir)\wizardsmallimage.bmp" &gt;&gt; "$(OutDi
"$(OutDir)\version" -v &gt;&gt; "$(OutDir)\hexchat-x86.iss"
"$(OutDir)\version" -i &gt;&gt; "$(OutDir)\hexchat-x86.iss"
"$(OutDir)\version" -o &gt;&gt; "$(OutDir)\hexchat-x86.iss"
echo SetupIconFile="$(SolutionDir)\..\share\icons\hexchat.ico" &gt;&gt; "$(OutDir)\hexchat-x86.iss"
echo SetupIconFile="$(DataDir)icons\hexchat.ico" &gt;&gt; "$(OutDir)\hexchat-x86.iss"
type hexchat-x86.skel.iss &gt;&gt; "$(OutDir)\hexchat-x86.iss"
"$(ProgramFiles)\Inno Setup 5\compil32" /cc "$(OutDir)\hexchat-x86.iss"</Command>
</PreBuildEvent>
@ -91,7 +91,7 @@ echo WizardSmallImageFile="$(ProjectDir)\wizardsmallimage.bmp" &gt;&gt; "$(OutDi
"$(OutDir)\version" -v &gt;&gt; "$(OutDir)\hexchat-x64.iss"
"$(OutDir)\version" -i &gt;&gt; "$(OutDir)\hexchat-x64.iss"
"$(OutDir)\version" -o &gt;&gt; "$(OutDir)\hexchat-x64.iss"
echo SetupIconFile="$(SolutionDir)\..\share\icons\hexchat.ico" &gt;&gt; "$(OutDir)\hexchat-x64.iss"
echo SetupIconFile="$(DataDir)icons\hexchat.ico" &gt;&gt; "$(OutDir)\hexchat-x64.iss"
type hexchat-x64.skel.iss &gt;&gt; "$(OutDir)\hexchat-x64.iss"
"$(ProgramFiles)\Inno Setup 5\compil32" /cc "$(OutDir)\hexchat-x64.iss"</Command>
</PreBuildEvent>
@ -105,4 +105,4 @@ type hexchat-x64.skel.iss &gt;&gt; "$(OutDir)\hexchat-x64.iss"
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>