- redesign about dialog to include logo

- unify summary in .desktop and .spec file
- change version to 0.9.13.2


git-svn-id: http://svn.code.sf.net/p/xqf/code/trunk@598 d2ac09be-c843-0410-8b1f-f8a84130e0ec

xqf/ChangeLog

@@ -1,3 +1,8 @@
+Mar 14, 2004: Ludwig Nussel <l-n@users.sourceforge.net>
+- redesign about dialog to include logo
+- unify summary in .desktop and .spec file
+- change version to 0.9.13.2
+
 Feb 17, 2004: Ludwig Nussel <l-n@users.sourceforge.net>
 - add LAN master for ut2004
 - detect whether a server is ut2003 or ut2004

xqf/configure.in

@@ -3,7 +3,7 @@
 # Initially written by Markus Fischer <mfischer@josefine.ben.tuwien.ac.at>
 #
 
-AC_INIT([xqf],[0.9.13.1],xqf-developer@lists.sourceforge.net)
+AC_INIT([xqf],[0.9.13.2],xqf-developer@lists.sourceforge.net)
 AC_CONFIG_SRCDIR([src/xqf.c])
 AC_PREREQ(2.52)
 

xqf/src/dialogs.c

@@ -31,6 +31,7 @@
 #include "utils.h"
 #include "xutils.h"
 #include "dialogs.h"
+#include "loadpixmap.h"
 
 static int destroy_on_escape (GtkWidget *widget, GdkEventKey *event) {
 
@@ -42,6 +43,11 @@ static int destroy_on_escape (GtkWidget *widget, GdkEventKey *event) {
   return FALSE;
 }
 
+static int unregister_window_callback (GtkWidget *widget, GdkEventKey *event)
+{
+	unregister_window(widget);
+	return FALSE;
+}
 
 GtkWidget *dialog_create_modal_transient_window (char *title,
 						 int close_on_esc, 
@@ -478,3 +484,142 @@ char *enter_string_with_option_dialog (int visible, char *optstr, int *optval,
   return res;
 }
 
+static GtkWidget* create_AboutWindow (void);
+
+void about_dialog (GtkWidget *widget, gpointer data) {
+  GtkWidget* aboutwindow = NULL;
+  GtkWidget* w = NULL, *w2 = NULL;
+  char *intro = _("XQF Game Server Browser");
+  char *version = g_strdup_printf(_("Version %s"),XQF_VERSION);
+
+  /* translators can use the copyright symbol instead of (C) */
+  char *author = _("Copyright (C) 1998-2002 Roman Pozlevich");
+  char *urls = "http://www.linuxgames.com/xqf\n"
+		"http://sourceforge.net/projects/xqf\n";
+  char *contrib1 = _("Maintainers:");
+  char *contrib2 =
+	"Ludwig Nussel <l-n@users.sourceforge.net>\n"
+	"Alex Burger <alex_b@users.sourceforge.net>\n"
+	"Jordi Mallach <jordi@sindominio.net>\n"
+	"Bill Adams <webmaster@evil.inetarena.com>\n";
+  char *contrib3 = _("Contributors:");
+  char *contrib4 = 
+	"Jochen Baier <email@jochen-baier.de>\n"
+	"Luca Camillo <kamy@tutorials.it>\n";
+  char *bugs1 = _("Bug reports and feature requests:");
+  char *bugs2 = "http://sourceforge.net/projects/xqf\n"
+		"xqf-developer@lists.sourceforge.net\n";
+
+  char *text = NULL;//  dialog_ok (_("About XQF"), "%s", text);
+  aboutwindow = create_AboutWindow();
+
+  w2 = load_pixmap(aboutwindow, "splash.png");
+
+  w = gtk_object_get_data(GTK_OBJECT(aboutwindow),"AboutVBox");
+  gtk_box_pack_start (GTK_BOX (w), w2, FALSE, FALSE, 0);
+  gtk_box_reorder_child(GTK_BOX(w), w2, 0);
+  gtk_widget_show(w2);
+
+  w = gtk_object_get_data(GTK_OBJECT(aboutwindow),"AboutLabel");
+
+  text = g_strjoin("\n", intro, version, author, urls, contrib1, contrib2,
+      contrib3, contrib4, bugs1, bugs2, NULL);
+  g_free(version);
+
+  gtk_label_set_text(GTK_LABEL(w), text);
+
+  g_free(text);
+
+  gtk_window_set_transient_for (GTK_WINDOW (aboutwindow), GTK_WINDOW (top_window()));
+
+  register_window(aboutwindow);
+
+  gtk_widget_show(aboutwindow);
+}
+
+/* glade generated */
+
+GtkWidget*
+create_AboutWindow (void)
+{
+  GtkWidget *AboutWindow;
+  GtkWidget *AboutVBox;
+  GtkWidget *scrolledwindow1;
+  GtkWidget *viewport1;
+  GtkWidget *AboutLabel;
+  GtkWidget *hbuttonbox1;
+  GtkWidget *OKButton;
+
+  AboutWindow = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  gtk_object_set_data (GTK_OBJECT (AboutWindow), "AboutWindow", AboutWindow);
+  gtk_widget_set_usize (AboutWindow, 400, 440);
+  gtk_window_set_title (GTK_WINDOW (AboutWindow), _("About XQF"));
+  gtk_window_set_position (GTK_WINDOW (AboutWindow), GTK_WIN_POS_CENTER);
+  gtk_window_set_modal (GTK_WINDOW (AboutWindow), TRUE);
+
+  AboutVBox = gtk_vbox_new (FALSE, 0);
+  gtk_widget_ref (AboutVBox);
+  gtk_object_set_data_full (GTK_OBJECT (AboutWindow), "AboutVBox", AboutVBox,
+                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_show (AboutVBox);
+  gtk_container_add (GTK_CONTAINER (AboutWindow), AboutVBox);
+
+  scrolledwindow1 = gtk_scrolled_window_new (NULL, NULL);
+  gtk_widget_ref (scrolledwindow1);
+  gtk_object_set_data_full (GTK_OBJECT (AboutWindow), "scrolledwindow1", scrolledwindow1,
+                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_show (scrolledwindow1);
+  gtk_box_pack_start (GTK_BOX (AboutVBox), scrolledwindow1, TRUE, TRUE, 0);
+  gtk_container_set_border_width (GTK_CONTAINER (scrolledwindow1), 4);
+  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow1), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
+
+  viewport1 = gtk_viewport_new (NULL, NULL);
+  gtk_widget_ref (viewport1);
+  gtk_object_set_data_full (GTK_OBJECT (AboutWindow), "viewport1", viewport1,
+                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_show (viewport1);
+  gtk_container_add (GTK_CONTAINER (scrolledwindow1), viewport1);
+
+  AboutLabel = gtk_label_new (_("[placeholder, do not translate]"));
+  gtk_widget_ref (AboutLabel);
+  gtk_object_set_data_full (GTK_OBJECT (AboutWindow), "AboutLabel", AboutLabel,
+                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_show (AboutLabel);
+  gtk_container_add (GTK_CONTAINER (viewport1), AboutLabel);
+  gtk_label_set_justify (GTK_LABEL (AboutLabel), GTK_JUSTIFY_LEFT);
+  gtk_label_set_line_wrap (GTK_LABEL (AboutLabel), TRUE);
+  gtk_misc_set_alignment (GTK_MISC (AboutLabel), 0, 0);
+
+  hbuttonbox1 = gtk_hbutton_box_new ();
+  gtk_widget_ref (hbuttonbox1);
+  gtk_object_set_data_full (GTK_OBJECT (AboutWindow), "hbuttonbox1", hbuttonbox1,
+                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_show (hbuttonbox1);
+  gtk_box_pack_start (GTK_BOX (AboutVBox), hbuttonbox1, FALSE, TRUE, 4);
+
+  OKButton = gtk_button_new_with_label (_("OK"));
+  gtk_widget_ref (OKButton);
+  gtk_object_set_data_full (GTK_OBJECT (AboutWindow), "OKButton", OKButton,
+                            (GtkDestroyNotify) gtk_widget_unref);
+  gtk_widget_show (OKButton);
+  gtk_container_add (GTK_CONTAINER (hbuttonbox1), OKButton);
+  GTK_WIDGET_SET_FLAGS (OKButton, GTK_CAN_DEFAULT);
+
+  gtk_signal_connect (GTK_OBJECT (AboutWindow), "destroy_event",
+                      GTK_SIGNAL_FUNC (gtk_main_quit),
+                      NULL);
+  gtk_signal_connect (GTK_OBJECT (AboutWindow), "key_press_event",
+                      GTK_SIGNAL_FUNC (destroy_on_escape),
+                      NULL);
+  gtk_signal_connect (GTK_OBJECT (AboutWindow), "destroy",
+                      GTK_SIGNAL_FUNC (unregister_window_callback),
+                      NULL);
+  gtk_signal_connect_object (GTK_OBJECT (OKButton), "clicked",
+                             GTK_SIGNAL_FUNC (gtk_widget_destroy),
+                             GTK_OBJECT (AboutWindow));
+
+  gtk_widget_grab_focus (OKButton);
+  gtk_widget_grab_default (OKButton);
+  return AboutWindow;
+}
+

xqf/src/dialogs.h

@@ -34,4 +34,6 @@ extern	char *enter_string_dialog (int visible, char *fmt, ...);
 extern	char *enter_string_with_option_dialog (
                       int visible, char *optstr, int *optval, char *fmt, ...);
 
+void about_dialog (GtkWidget *widget, gpointer data);
+
 #endif /* __DIALOGS_H__ */

xqf/src/xqf-ui.c

@@ -141,6 +141,7 @@ int window_delete_event_callback (GtkWidget *widget, gpointer data) {
 
 void register_window (GtkWidget *window) {
   xqf_windows = g_slist_prepend (xqf_windows, window);
+  debug(6, "%p", window);
 }
 
 
@@ -155,6 +156,8 @@ void unregister_window (GtkWidget *window) {
     gtk_widget_destroy ((GtkWidget *) (xqf_windows->data));
   else
     target_window = NULL;
+
+  debug(6, "%p", window);
 }
 
 

xqf/src/xqf.c

@@ -2511,36 +2511,6 @@ static void statistics_callback (GtkWidget *widget, gpointer data) {
 }
 
 
-static void about_dialog (GtkWidget *widget, gpointer data) {
-  char *intro = _("X11 Quake/QuakeWorld/Quake2/Quake3 Front-End\n");
-  char *version = g_strdup_printf(_("Version %s\n\n"),XQF_VERSION);
-
-  /* translators can use the copyright symbol instead of (C) */
-  char *author = _("Copyright (C) 1998-2002 Roman Pozlevich <roma@botik.ru>\n\n");
-  char *urls = "http://www.linuxgames.com/xqf\n"
-		"http://sourceforge.net/projects/xqf\n\n";
-  char *contrib1 = _("Significant Contributors:");
-  char *contrib2 = "\n\n"
-	"Bill Adams <webmaster@evil.inetarena.com>\n"
-	"Alex Burger <alex_b@users.sourceforge.net>\n"
-	"Jordi Mallach <jordi@sindominio.net>\n"
-	"Ludwig Nussel <l-n@users.sourceforge.net>\n\n";
-  char *contrib3 = _("Other Contributors:");
-  char *contrib4 = "\n\n"
-	"Jochen Baier <email@jochen-baier.de>\n"
-	"Luca Camillo <kamy@tutorials.it>\n\n";
-  char *bugs1 = _("Bug reports and feature requests:");
-  char *bugs2 = "\n\nhttp://sourceforge.net/projects/xqf\n"
-		"xqf-developer@lists.sourceforge.net\n";
-
-  char *abouttext = g_strconcat(intro,version,author,urls,
-	     contrib1,contrib2,contrib3,contrib4,
-	     bugs1,bugs2,NULL);
-  dialog_ok (_("About XQF"), "%s", abouttext);
-  g_free(version);
-  g_free(abouttext);
-}
-
 
 struct __menuitem {
   char *label;

xqf/xqf.desktop.in

@@ -1,11 +1,11 @@
 [Desktop Entry]
 Encoding=UTF-8
 _Name=XQF
-_GenericName=Game browser
-_Comment=Game browser for X
+_GenericName=XQF Game Server Browser
+_Comment=Locate and connect to game servers
 Exec=xqf
 Icon=xqf_32x32.png
 StartupNotify=true
 Terminal=false
 Type=Application
-Categories=Application;Game;Arcade;
+Categories=X-SuSE-Core-Game;Application;Game;

xqf/xqf.spec.in

@@ -2,19 +2,18 @@
 %define version  @VERSION@
 %define release  %{?CUSTOM_RELEASE} %{!?CUSTOM_RELEASE:@RELEASE@}
 
-Summary:   A network game browser an launcher (Quake/QuakeWorld/Quake2/etc.)
+Summary:   A network game browser and launcher
 Name:      %{name}
 Version:   %{version}
 Release:   %{release}
-Copyright: GPL
+License:   GPL
 Group:     Games/Utilities
 Source0:   %{name}-%{version}.tar.gz
 URL:       http://www.linuxgames.com/xqf/ 
 Buildroot: %{_tmppath}/%{name}-buildroot
-Packager: The XQF Team
-#Docdir: %{prefix}/doc
+Packager:  The XQF Team
 
-#Since there is not a .spec file with qstst, we will not
+#Since there is not a .spec file with qstat, we will not
 #  require it for now.  You may want to uncomment it  
 #  for your dist.
 #Requires:  qstat >= 2.4e
@@ -22,11 +21,10 @@ Requires:  gzip
 Requires:  wget
 
 %description
-XQF is a network game browser (e.g. Quake, Sin, etc.).
-It helps you locate and connect
-to game servers.  It has configurable server and player filters so
-you can find a server running your favorite game type or that
-has a buddy.
+XQF is a network game browser (e.g. Quake, Unreal, etc.). It helps
+you locate and connect to game servers. It has configurable server
+and player filters so you can find a server running your favorite
+game type or that has a buddy.
 
 %prep
 rm -rf $RPM_BUILD_ROOT
@@ -56,5 +54,3 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man?/xqf.*
 %{_datadir}/locale/*/LC_MESSAGES/xqf.mo
 %{_datadir}/xqf/*
-
-