add wdk changes to named branch

This commit is contained in:
berkeviktor@aol.com
2011-02-28 18:59:32 +01:00
parent ad7ea4b77e
commit d03d6e606b
152 changed files with 32939 additions and 529 deletions

View File

@@ -39,6 +39,7 @@
#include "../common/xchat.h"
#include "../common/util.h"
#include "../common/wdkutil.h"
#include "palette.h"
#include "pixmaps.h"
#include "gtkutil.h"
@@ -87,6 +88,19 @@ menu_about (GtkWidget * wid, gpointer sess)
char buf[512];
const char *locale = NULL;
extern GtkWindow *parent_window; /* maingui.c */
SYSTEM_INFO si;
unsigned short int cpu_arch;
GetSystemInfo (&si);
if (si.wProcessorArchitecture == 9)
{
cpu_arch = 64;
}
else
{
cpu_arch = 86;
}
if (about)
{
@@ -95,7 +109,7 @@ menu_about (GtkWidget * wid, gpointer sess)
}
about = gtk_dialog_new ();
gtk_window_set_position (GTK_WINDOW (about), GTK_WIN_POS_CENTER);
gtk_window_set_position (GTK_WINDOW (about), GTK_WIN_POS_CENTER_ON_PARENT);
gtk_window_set_resizable (GTK_WINDOW (about), FALSE);
gtk_window_set_title (GTK_WINDOW (about), _("About "DISPLAY_NAME));
if (parent_window)
@@ -114,35 +128,42 @@ menu_about (GtkWidget * wid, gpointer sess)
g_get_charset (&locale);
(snprintf) (buf, sizeof (buf),
"<span size=\"x-large\"><b>"DISPLAY_NAME" "PACKAGE_VERSION"</b></span>\n\n"
"%s\n\n"
#ifdef WIN32
/* leave this message to avoid time wasting bug reports! */
"This version is unofficial and comes with no support.\n\n"
#endif
"<b>XChat Release</b>: "XCHAT_RELEASE"\n\n"
"<b>OS</b>: %s\n"
"<b>Charset</b>: %s "
"<b>GTK+</b>: %i.%i.%i\n"
"<b>Compiled</b>: "__DATE__"\n"
"<b>Portable Mode</b>: %s\n"
"<b>Build Type</b>: x%d\n\n"
"<small>This version is unofficial and comes with no support.\n"
"\302\251 1998-2010 Peter \305\275elezn\303\275 &lt;zed@xchat.org>"
/* "\n<a href=\"http://code.google.com/p/xchat-wdk/\">http://code.google.com/p/xchat-wdk/</a>" this is broken in gtk ATM */
"</small>",
get_cpu_str (),
locale,
gtk_major_version,
gtk_minor_version,
gtk_micro_version,
(portable_mode () ? "Yes" : "No"),
cpu_arch
#else
"%s\n\n"
"%s\n"
"<b>Charset</b>: %s "
#ifdef WIN32
"<b>GTK+</b>: %i.%i.%i\n"
#else
"<b>Renderer</b>: %s\n"
#endif
"<b>Compiled</b>: "__DATE__"\n\n"
"<small>\302\251 1998-2010 Peter \305\275elezn\303\275 &lt;zed@xchat.org></small>",
_("A multiplatform IRC Client"),
get_cpu_str(),
locale,
#ifdef WIN32
gtk_major_version,
gtk_minor_version,
gtk_micro_version
#else
_("A multiplatform IRC Client"),
get_cpu_str (),
locale,
#ifdef USE_XFT
"Xft"
"Xft"
#else
"Pango"
"Pango"
#endif
#endif
);
);
gtk_label_set_markup (GTK_LABEL (label), buf);
gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_CENTER);