[gnome-mud] Die libgnome, die.
- From: Les Harris <hl harris comcast net>
- To: gnome-mud-list gnome org, jordi sindominio net
- Cc:
- Subject: [gnome-mud] Die libgnome, die.
- Date: Mon, 24 Apr 2006 17:06:52 -0700
This nukes libgnome/libgnomeui usage entirely out of gmud.
Functionality has been replaced with GTK+ equivalents were appropriate.
Les
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gnome-mud/ChangeLog,v
retrieving revision 1.375
diff -u -p -r1.375 ChangeLog
--- ChangeLog 23 Apr 2006 17:31:12 -0000 1.375
+++ ChangeLog 25 Apr 2006 00:00:47 -0000
@@ -1,4 +1,12 @@
-2006-04-23 Mart Raudsepp <leio dustbite net>
+2006-04-24 Les Harris <hl harris comcast net>
+ * src/gnome-mud.c, src/modules.c, src/mud-preferences.window.c,
+ ui/main.glade, ui/prefs.glade, configure.ac: Removed all traces
+ of libgnome and libgnomeui from gmud; converted functionality to
+ gtk+ equivalents.
+
+ * src/modules-api.c: Added a typecast to stop a warning on compile.
+
+2006-04-23 Mart Raudsepp <leio dustbite net>
* src/gnome-mud.c, src/modules.c, src/modules_api.c,
src/mud-connection-view.c, src/mud-preferences-window.c,
Index: configure.ac
===================================================================
RCS file: /cvs/gnome/gnome-mud/configure.ac,v
retrieving revision 1.60
diff -u -p -r1.60 configure.ac
--- configure.ac 25 Jan 2006 06:27:48 -0000 1.60
+++ configure.ac 25 Apr 2006 00:00:47 -0000
@@ -55,12 +55,9 @@ dnl pkg-config dep checks
GTK_REQUIRED=2.6.0
LIBGLADE_REQUIRED=2.0.1
LIBGNETWORK_REQUIRED=0.0.6
-LIBGNOME_REQUIRED=2.4.0
-LIBGNOMEUI_REQUIRED=2.4.0
VTE_REQUIRED=0.11.00
-dnl libgnome, libgnomeui needed for all utils
-PKG_CHECK_MODULES(GMUD, gtk+-2.0 >= $GTK_REQUIRED libgnome-2.0 >= $LIBGNOME_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED vte >= $VTE_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED libgnetwork-1.0 >= $LIBGNETWORK_REQUIRED)
+PKG_CHECK_MODULES(GMUD, gtk+-2.0 >= $GTK_REQUIRED vte >= $VTE_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED libgnetwork-1.0 >= $LIBGNETWORK_REQUIRED)
AC_SUBST(GMUD_CFLAGS)
AC_SUBST(GMUD_LIBS)
Index: src/gnome-mud.c
===================================================================
RCS file: /cvs/gnome/gnome-mud/src/gnome-mud.c,v
retrieving revision 1.23
diff -u -p -r1.23 gnome-mud.c
--- src/gnome-mud.c 23 Apr 2006 17:31:13 -0000 1.23
+++ src/gnome-mud.c 25 Apr 2006 00:00:47 -0000
@@ -22,10 +22,6 @@
#include <glib/gi18n.h>
#include <gconf/gconf-client.h>
-#include <libgnome/gnome-config.h>
-#include <libgnome/gnome-program.h>
-#include <libgnomeui/gnome-ui-init.h>
-#include <libgnomeui/gnome-window-icon.h>
#include <stdio.h>
#include <sys/stat.h>
@@ -98,13 +94,7 @@ int main (gint argc, char *argv[])
return 1;
}
- gnome_program_init (PACKAGE, VERSION,
- LIBGNOMEUI_MODULE,
- argc, argv,
- GNOME_PROGRAM_STANDARD_PROPERTIES,
- GNOME_PARAM_POPT_TABLE,
- NULL,
- NULL);
+ gtk_init(&argc, &argv);
/* Start a GConf client */
gconf_client = gconf_client_get_default();
@@ -113,10 +103,11 @@ int main (gint argc, char *argv[])
}
gconf_client_add_dir(gconf_client, "/apps/gnome-mud", GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
- gnome_window_icon_set_default_from_file (PIXMAPSDIR "/gnome-mud.png");
mud_profile_load_profiles();
- mud_window_new(gconf_client);
+
+ gtk_window_set_icon_from_file(GTK_WINDOW(mud_window_get_window(mud_window_new(gconf_client))),
+ PIXMAPSDIR "/gnome-mud.png", &err);
#ifdef USE_PYTHON
//Py_SetProgramName(argv[0]);
@@ -139,7 +130,7 @@ int main (gint argc, char *argv[])
mkdir(buf, 0777 );
gtk_main();
- gnome_config_sync();
+ gconf_client_suggest_sync(gconf_client, &err);
#ifdef USE_PYTHON
//python_end();
Index: src/modules.c
===================================================================
RCS file: /cvs/gnome/gnome-mud/src/modules.c,v
retrieving revision 1.29
diff -u -p -r1.29 modules.c
--- src/modules.c 23 Apr 2006 17:31:13 -0000 1.29
+++ src/modules.c 25 Apr 2006 00:00:47 -0000
@@ -28,8 +28,6 @@
#endif
#include <glib/gi18n.h>
-#include <libgnome/gnome-config.h>
-#include <libgnomeui/gnome-dialog.h>
#if HAVE_DIRENT_H
# include <dirent.h>
@@ -102,11 +100,17 @@ static void plugin_enable_check_cb (GtkW
{
PLUGIN_OBJECT *p;
gchar *text;
+ GConfClient *client;
+ GError *err = NULL;
+
+ client = gconf_client_get_default();
gtk_clist_get_text ((GtkCList *) data, plugin_selected_row, 0, &text);
p = plugin_get_plugin_object_by_name (text);
+
+
if (p != NULL) {
gchar path[50];
@@ -116,8 +120,8 @@ static void plugin_enable_check_cb (GtkW
p->enabeled = FALSE;
}
- g_snprintf(path, 50, "/gnome-mud/Plugins/%s", p->name);
- gnome_config_set_bool(path, p->enabeled);
+ g_snprintf(path, 50, "/gnome-mud/Plugins/%s/enbl", p->name);
+ gconf_client_set_bool(client, path, p->enabeled, &err);
}
}
@@ -186,14 +190,14 @@ void do_plugin_information(GtkWidget *wi
return;
}
- dialog1 = gnome_dialog_new (NULL, NULL);
+ dialog1 = gtk_dialog_new();
gtk_object_set_data (GTK_OBJECT (dialog1), "dialog1", dialog1);
gtk_widget_set_usize (dialog1, 430, -2);
gtk_window_set_title(GTK_WINDOW(dialog1), _("Plugin Information"));
gtk_window_set_policy (GTK_WINDOW (dialog1), FALSE, FALSE, FALSE);
- dialog_vbox1 = GNOME_DIALOG (dialog1)->vbox;
+ dialog_vbox1 = GTK_DIALOG (dialog1)->vbox;
gtk_object_set_data (GTK_OBJECT (dialog1), "dialog_vbox1", dialog_vbox1);
gtk_widget_show (dialog_vbox1);
@@ -327,14 +331,13 @@ void do_plugin_information(GtkWidget *wi
gtk_widget_show(plugin_desc_text);
gtk_container_add(GTK_CONTAINER(scrolledwindow2), plugin_desc_text);
- dialog_action_area1 = GNOME_DIALOG (dialog1)->action_area;
+ dialog_action_area1 = GTK_DIALOG (dialog1)->action_area;
gtk_object_set_data (GTK_OBJECT (dialog1), "dialog_action_area1", dialog_action_area1);
gtk_widget_show (dialog_action_area1);
gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area1), GTK_BUTTONBOX_END);
gtk_button_box_set_spacing (GTK_BUTTON_BOX (dialog_action_area1), 8);
- gnome_dialog_append_button (GNOME_DIALOG (dialog1), GNOME_STOCK_BUTTON_CLOSE);
- button1 = GTK_WIDGET (g_list_last (GNOME_DIALOG (dialog1)->buttons)->data);
+ button1 = gtk_dialog_add_button(GTK_DIALOG(dialog1), "Close", GTK_RESPONSE_CLOSE);
gtk_widget_ref (button1);
gtk_object_set_data_full (GTK_OBJECT (dialog1), "button1", button1,
(GtkDestroyNotify) gtk_widget_unref);
@@ -371,7 +374,7 @@ int init_modules(char *path)
gchar *shortname;
if ((directory = opendir(path)) == NULL) {
- g_message("Plugin error (%s): %s", path, strerror(errno));
+ g_message("Plugin error (%s)", path);
return FALSE;
}
@@ -435,10 +438,14 @@ error:
static void plugin_check_enable(PLUGIN_OBJECT *plugin)
{
gchar path[50];
+ GConfClient *client;
+ GError *err = NULL;
+
+ client = gconf_client_get_default();
- g_snprintf(path, 50, "/gnome-mud/Plugins/%s=false", plugin->name);
+ g_snprintf(path, 50, "/gnome-mud/Plugins/%s/enbl", plugin->name);
- plugin->enabeled = gnome_config_get_bool(path);
+ plugin->enabeled = gconf_client_get_bool(client, path, &err);
}
void plugin_register(PLUGIN_OBJECT *plugin)
Index: src/modules_api.c
===================================================================
RCS file: /cvs/gnome/gnome-mud/src/modules_api.c,v
retrieving revision 1.24
diff -u -p -r1.24 modules_api.c
--- src/modules_api.c 23 Apr 2006 17:31:13 -0000 1.24
+++ src/modules_api.c 25 Apr 2006 00:00:47 -0000
@@ -61,7 +61,7 @@ gboolean plugin_register_menu (gint hand
gtk_menu_shell_prepend(GTK_MENU_SHELL(pluginMenu), newMenuItem);
- gtk_signal_connect(newMenuItem, "activate", sig_function, NULL);
+ gtk_signal_connect(GTK_OBJECT(newMenuItem), "activate", sig_function, NULL);
return TRUE;
}
Index: src/mud-preferences-window.c
===================================================================
RCS file: /cvs/gnome/gnome-mud/src/mud-preferences-window.c,v
retrieving revision 1.9
diff -u -p -r1.9 mud-preferences-window.c
--- src/mud-preferences-window.c 23 Apr 2006 17:31:13 -0000 1.9
+++ src/mud-preferences-window.c 25 Apr 2006 00:00:48 -0000
@@ -18,8 +18,8 @@
#include <gtk/gtktreestore.h>
#include <gtk/gtktreeview.h>
#include <gtk/gtktreeviewcolumn.h>
-#include <libgnomeui/gnome-color-picker.h>
-#include <libgnomeui/gnome-font-picker.h>
+#include <gtk/gtkcolorbutton.h>
+#include <gtk/gtkfontbutton.h>
#include "mud-preferences-window.h"
#include "mud-profile.h"
@@ -94,10 +94,10 @@ static void mud_preferences_window_commd
static void mud_preferences_window_terminal_cb (GtkWidget *widget, MudPreferencesWindow *window);
static void mud_preferences_window_history_cb (GtkWidget *widget, MudPreferencesWindow *window);
static void mud_preferences_window_scrollback_cb (GtkWidget *widget, MudPreferencesWindow *window);
-static void mud_preferences_window_font_cb (GtkWidget *widget, const gchar *fontname, MudPreferencesWindow *window);
-static void mud_preferences_window_foreground_cb (GtkWidget *widget, guint r, guint g, guint b, guint a, MudPreferencesWindow *window);
-static void mud_preferences_window_background_cb (GtkWidget *widget, guint r, guint g, guint b, guint a, MudPreferencesWindow *window);
-static void mud_preferences_window_colors_cb (GtkWidget *widget, guint r, guint g, guint b, guint a, MudPreferencesWindow *window);
+static void mud_preferences_window_font_cb (GtkWidget *widget, MudPreferencesWindow *window);
+static void mud_preferences_window_foreground_cb (GtkWidget *widget, MudPreferencesWindow *window);
+static void mud_preferences_window_background_cb (GtkWidget *widget, MudPreferencesWindow *window);
+static void mud_preferences_window_colors_cb (GtkWidget *widget, MudPreferencesWindow *window);
static void mud_preferences_window_changed_cb (MudProfile *profile, MudProfileMask *mask, MudPreferencesWindow *window);
@@ -528,30 +528,41 @@ mud_preferences_window_scrollback_cb(Gtk
}
static void
-mud_preferences_window_font_cb(GtkWidget *widget, const gchar *fontname, MudPreferencesWindow *window)
+mud_preferences_window_font_cb(GtkWidget *widget, MudPreferencesWindow *window)
{
+ const gchar *fontname = gtk_font_button_get_font_name(GTK_FONT_BUTTON(widget));
+
RETURN_IF_CHANGING_PROFILES(window);
mud_profile_set_font(window->priv->profile, fontname);
}
static void
-mud_preferences_window_foreground_cb(GtkWidget *widget, guint r, guint g, guint b, guint a, MudPreferencesWindow *window)
+mud_preferences_window_foreground_cb(GtkWidget *widget, MudPreferencesWindow *window)
{
+ GdkColor color;
+
RETURN_IF_CHANGING_PROFILES(window);
- mud_profile_set_foreground(window->priv->profile, r, g, b);
+
+ gtk_color_button_get_color(GTK_COLOR_BUTTON(widget), &color);
+ mud_profile_set_foreground(window->priv->profile, color.red, color.green, color.blue);
}
static void
-mud_preferences_window_background_cb(GtkWidget *widget, guint r, guint g, guint b, guint a, MudPreferencesWindow *window)
+mud_preferences_window_background_cb(GtkWidget *widget, MudPreferencesWindow *window)
{
+ GdkColor color;
+
RETURN_IF_CHANGING_PROFILES(window);
- mud_profile_set_background(window->priv->profile, r, g, b);
+
+ gtk_color_button_get_color(GTK_COLOR_BUTTON(widget), &color);
+ mud_profile_set_background(window->priv->profile, color.red, color.green, color.blue);
}
static void
-mud_preferences_window_colors_cb(GtkWidget *widget, guint r, guint g, guint b, guint a, MudPreferencesWindow *window)
+mud_preferences_window_colors_cb(GtkWidget *widget, MudPreferencesWindow *window)
{
gint i;
+ GdkColor color;
RETURN_IF_CHANGING_PROFILES(window);
@@ -559,7 +570,9 @@ mud_preferences_window_colors_cb(GtkWidg
{
if (widget == window->priv->colors[i])
{
- mud_profile_set_colors(window->priv->profile, i, r, g, b);
+ gtk_color_button_get_color(GTK_COLOR_BUTTON(widget), &color);
+ mud_profile_set_colors(window->priv->profile, i,
+ color.red, color.green, color.blue);
}
}
}
@@ -646,40 +659,47 @@ mud_preferences_window_update_scrollback
static void
mud_preferences_window_update_font(MudPreferencesWindow *window, MudPrefs *preferences)
{
- gnome_font_picker_set_font_name(GNOME_FONT_PICKER(window->priv->fp_font),
- preferences->FontName);
+ gtk_font_button_set_font_name(GTK_FONT_BUTTON(window->priv->fp_font),
+ preferences->FontName);
}
static void
mud_preferences_window_update_foreground(MudPreferencesWindow *window, MudPrefs *preferences)
{
- gnome_color_picker_set_i16(GNOME_COLOR_PICKER(window->priv->cp_foreground),
- preferences->Foreground.red,
- preferences->Foreground.green,
- preferences->Foreground.blue, 0);
+ GdkColor color;
+
+ color.red = preferences->Foreground.red;
+ color.green = preferences->Foreground.green;
+ color.blue = preferences->Foreground.blue;
+
+ gtk_color_button_set_color(GTK_COLOR_BUTTON(window->priv->cp_foreground), &color);
}
static void
mud_preferences_window_update_background(MudPreferencesWindow *window, MudPrefs *preferences)
{
- gnome_color_picker_set_i16(GNOME_COLOR_PICKER(window->priv->cp_background),
- preferences->Background.red,
- preferences->Background.green,
- preferences->Background.blue, 0);
+ GdkColor color;
+
+ color.red = preferences->Background.red;
+ color.green = preferences->Background.green;
+ color.blue = preferences->Background.blue;
+
+ gtk_color_button_set_color(GTK_COLOR_BUTTON(window->priv->cp_background), &color);
}
static void
mud_preferences_window_update_colors(MudPreferencesWindow *window, MudPrefs *preferences)
{
gint i;
+ GdkColor color;
for (i = 0; i < C_MAX; i++)
{
- gnome_color_picker_set_i16(GNOME_COLOR_PICKER(window->priv->colors[i]),
- preferences->Colors[i].red,
- preferences->Colors[i].green,
- preferences->Colors[i].blue,
- 0);
+ color.red = preferences->Colors[i].red;
+ color.green = preferences->Colors[i].green;
+ color.blue = preferences->Colors[i].blue;
+
+ gtk_color_button_set_color(GTK_COLOR_BUTTON(window->priv->colors[i]), &color);
}
}
Index: src/mud-profile.c
===================================================================
RCS file: /cvs/gnome/gnome-mud/src/mud-profile.c,v
retrieving revision 1.5
diff -u -p -r1.5 mud-profile.c
--- src/mud-profile.c 23 Apr 2006 17:31:13 -0000 1.5
+++ src/mud-profile.c 25 Apr 2006 00:00:48 -0000
@@ -564,6 +564,7 @@ mud_profile_set_foreground (MudProfile *
color.blue = b;
s = color_to_string(&color);
+
gconf_client_set_string(profile->priv->gconf_client, key, s, NULL);
g_free(s);
}
Index: src/mud-window.c
===================================================================
RCS file: /cvs/gnome/gnome-mud/src/mud-window.c,v
retrieving revision 1.18
diff -u -p -r1.18 mud-window.c
--- src/mud-window.c 23 Apr 2006 17:31:13 -0000 1.18
+++ src/mud-window.c 25 Apr 2006 00:00:48 -0000
@@ -85,6 +85,12 @@ mud_window_close(GtkWidget *widget, MudW
return TRUE;
}
+GtkWidget*
+mud_window_get_window(MudWindow *window)
+{
+ return window->priv->window;
+}
+
void
mud_window_add_connection_view(MudWindow *window, MudConnectionView *view, gchar *tabLbl)
{
Index: src/mud-window.h
===================================================================
RCS file: /cvs/gnome/gnome-mud/src/mud-window.h,v
retrieving revision 1.7
diff -u -p -r1.7 mud-window.h
--- src/mud-window.h 17 Apr 2006 23:13:29 -0000 1.7
+++ src/mud-window.h 25 Apr 2006 00:00:48 -0000
@@ -37,6 +37,8 @@ void mud_window_handle_plugins(MudWindow
void mud_window_populate_profiles_menu(MudWindow *window);
void mud_window_profile_menu_set_active(gchar *name, MudWindow *window);
+GtkWidget* mud_window_get_window(MudWindow *window);
+
extern GtkWidget *pluginMenu;
G_END_DECLS
Index: ui/directions.glade
===================================================================
RCS file: /cvs/gnome/gnome-mud/ui/directions.glade,v
retrieving revision 1.2
diff -u -p -r1.2 directions.glade
--- ui/directions.glade 7 Mar 2005 09:26:02 -0000 1.2
+++ ui/directions.glade 25 Apr 2006 00:00:49 -0000
@@ -2,7 +2,6 @@
<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd";>
<glade-interface>
-<requires lib="gnome"/>
<widget class="GtkWindow" id="directionswindow">
<property name="border_width">5</property>
Index: ui/main.glade
===================================================================
RCS file: /cvs/gnome/gnome-mud/ui/main.glade,v
retrieving revision 1.16
diff -u -p -r1.16 main.glade
--- ui/main.glade 23 Apr 2006 01:53:42 -0000 1.16
+++ ui/main.glade 25 Apr 2006 00:00:49 -0000
@@ -2,7 +2,6 @@
<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd";>
<glade-interface>
-<requires lib="gnome"/>
<widget class="GtkWindow" id="main_window">
<property name="visible">True</property>
@@ -20,6 +19,7 @@
<property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
<property name="focus_on_map">True</property>
+ <property name="urgency_hint">False</property>
<child>
<widget class="GtkVBox" id="vbox1">
@@ -30,11 +30,14 @@
<child>
<widget class="GtkMenuBar" id="menubar1">
<property name="visible">True</property>
+ <property name="pack_direction">GTK_PACK_DIRECTION_LTR</property>
+ <property name="child_pack_direction">GTK_PACK_DIRECTION_LTR</property>
<child>
<widget class="GtkMenuItem" id="file1">
<property name="visible">True</property>
- <property name="stock_item">GNOMEUIINFO_MENU_FILE_TREE</property>
+ <property name="label" translatable="yes">_File</property>
+ <property name="use_underline">True</property>
<child>
<widget class="GtkMenu" id="file1_menu">
@@ -48,7 +51,7 @@
<accelerator key="o" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image197">
+ <widget class="GtkImage" id="image349">
<property name="visible">True</property>
<property name="stock">gtk-new</property>
<property name="icon_size">1</property>
@@ -69,7 +72,7 @@
<signal name="activate" handler="on_mudlist_listing1_activate" last_modification_time="Mon, 16 Feb 2004 12:51:31 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image198">
+ <widget class="GtkImage" id="image350">
<property name="visible">True</property>
<property name="stock">gtk-new</property>
<property name="icon_size">1</property>
@@ -96,7 +99,7 @@
<signal name="activate" handler="on_connect1_activate" last_modification_time="Mon, 16 Feb 2004 12:51:31 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image199">
+ <widget class="GtkImage" id="image351">
<property name="visible">True</property>
<property name="stock">gtk-connect</property>
<property name="icon_size">1</property>
@@ -117,7 +120,7 @@
<signal name="activate" handler="on_disconnect1_activate" last_modification_time="Mon, 16 Feb 2004 12:51:31 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image200">
+ <widget class="GtkImage" id="image352">
<property name="visible">True</property>
<property name="stock">gtk-disconnect</property>
<property name="icon_size">1</property>
@@ -138,7 +141,7 @@
<signal name="activate" handler="on_reconnect1_activate" last_modification_time="Mon, 16 Feb 2004 12:51:31 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image201">
+ <widget class="GtkImage" id="image353">
<property name="visible">True</property>
<property name="stock">gtk-refresh</property>
<property name="icon_size">1</property>
@@ -166,7 +169,7 @@
<signal name="activate" handler="on_start_logging1_activate" last_modification_time="Mon, 16 Feb 2004 12:51:31 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image202">
+ <widget class="GtkImage" id="image354">
<property name="visible">True</property>
<property name="stock">gtk-new</property>
<property name="icon_size">1</property>
@@ -188,7 +191,7 @@
<signal name="activate" handler="on_stop_logging1_activate" last_modification_time="Mon, 16 Feb 2004 12:51:31 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image203">
+ <widget class="GtkImage" id="image355">
<property name="visible">True</property>
<property name="stock">gtk-close</property>
<property name="icon_size">1</property>
@@ -210,7 +213,7 @@
<signal name="activate" handler="on_save_buffer1_activate" last_modification_time="Mon, 16 Feb 2004 12:51:31 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image204">
+ <widget class="GtkImage" id="image356">
<property name="visible">True</property>
<property name="stock">gtk-save</property>
<property name="icon_size">1</property>
@@ -247,7 +250,8 @@
<child>
<widget class="GtkImageMenuItem" id="menu_quit">
<property name="visible">True</property>
- <property name="stock_item">GNOMEUIINFO_MENU_EXIT_ITEM</property>
+ <property name="label">gtk-quit</property>
+ <property name="use_stock">True</property>
<signal name="activate" handler="mud_window_close" last_modification_time="Mon, 16 Feb 2004 12:35:53 GMT"/>
</widget>
</child>
@@ -259,7 +263,8 @@
<child>
<widget class="GtkMenuItem" id="settings1">
<property name="visible">True</property>
- <property name="stock_item">GNOMEUIINFO_MENU_SETTINGS_TREE</property>
+ <property name="label" translatable="yes">_Settings</property>
+ <property name="use_underline">True</property>
<child>
<widget class="GtkMenu" id="settings1_menu">
@@ -312,7 +317,7 @@
<signal name="activate" handler="on_plugin_list_activate" last_modification_time="Mon, 02 Jan 2006 00:45:48 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image205">
+ <widget class="GtkImage" id="image357">
<property name="visible">True</property>
<property name="stock">gtk-info</property>
<property name="icon_size">1</property>
@@ -338,7 +343,8 @@
<child>
<widget class="GtkImageMenuItem" id="menu_preferences">
<property name="visible">True</property>
- <property name="stock_item">GNOMEUIINFO_MENU_PREFERENCES_ITEM</property>
+ <property name="label">gtk-preferences</property>
+ <property name="use_stock">True</property>
<signal name="activate" handler="on_menu_preferences_activate" last_modification_time="Tue, 06 Apr 2004 09:47:08 GMT"/>
</widget>
</child>
@@ -350,7 +356,8 @@
<child>
<widget class="GtkMenuItem" id="help1">
<property name="visible">True</property>
- <property name="stock_item">GNOMEUIINFO_MENU_HELP_TREE</property>
+ <property name="label" translatable="yes">_Help</property>
+ <property name="use_underline">True</property>
<child>
<widget class="GtkMenu" id="help1_menu">
@@ -358,7 +365,8 @@
<child>
<widget class="GtkImageMenuItem" id="menu_about">
<property name="visible">True</property>
- <property name="stock_item">GNOMEUIINFO_MENU_ABOUT_ITEM</property>
+ <property name="label">gtk-about</property>
+ <property name="use_stock">True</property>
<signal name="activate" handler="on_about1_activate" last_modification_time="Fri, 13 Feb 2004 13:41:42 GMT"/>
</widget>
</child>
@@ -393,6 +401,8 @@
<widget class="GtkToolButton" id="toolbar_connect">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Connect to MUD</property>
+ <property name="label" translatable="yes">Connect</property>
+ <property name="use_underline">True</property>
<property name="stock_id">gtk-connect</property>
<property name="visible_horizontal">True</property>
<property name="visible_vertical">True</property>
@@ -412,6 +422,8 @@
<widget class="GtkToolButton" id="toolbar_disconnect">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Disconnect from current MUD</property>
+ <property name="label" translatable="yes">Disconnect</property>
+ <property name="use_underline">True</property>
<property name="stock_id">gtk-disconnect</property>
<property name="visible_horizontal">True</property>
<property name="visible_vertical">True</property>
@@ -654,6 +666,7 @@ Petter E. Stokke <gibreel project23 n
<property name="local_only">True</property>
<property name="select_multiple">False</property>
<property name="show_hidden">False</property>
+ <property name="do_overwrite_confirmation">False</property>
<property name="title" translatable="yes">Save buffer as...</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_NONE</property>
@@ -666,6 +679,7 @@ Petter E. Stokke <gibreel project23 n
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
<property name="focus_on_map">True</property>
+ <property name="urgency_hint">False</property>
<child internal-child="vbox">
<widget class="GtkVBox" id="dialog-vbox1">
Index: ui/prefs.glade
===================================================================
RCS file: /cvs/gnome/gnome-mud/ui/prefs.glade,v
retrieving revision 1.6
diff -u -p -r1.6 prefs.glade
--- ui/prefs.glade 4 Jan 2006 13:10:32 -0000 1.6
+++ ui/prefs.glade 25 Apr 2006 00:00:50 -0000
@@ -2,7 +2,6 @@
<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd";>
<glade-interface>
-<requires lib="gnome"/>
<widget class="GtkDialog" id="preferences_window">
<property name="visible">True</property>
@@ -538,46 +537,6 @@
</child>
<child>
- <widget class="GnomeFontPicker" id="fp_font">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">Main font that is used on all open connections.</property>
- <property name="can_focus">True</property>
- <property name="mode">GNOME_FONT_PICKER_MODE_FONT_INFO</property>
- <property name="show_size">True</property>
- <property name="use_font_in_label">False</property>
- <property name="label_font_size">12</property>
- <property name="focus_on_click">True</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GnomeColorPicker" id="cp_foreground">
- <property name="visible">True</property>
- <property name="tooltip" translatable="yes">Default foreground color used when the connection doesn't request the use of a specific color.</property>
- <property name="can_focus">True</property>
- <property name="dither">True</property>
- <property name="use_alpha">False</property>
- <property name="title" translatable="yes">Pick a color</property>
- <property name="focus_on_click">True</property>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">fill</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
<widget class="GtkTable" id="table2">
<property name="visible">True</property>
<property name="n_rows">2</property>
@@ -587,13 +546,10 @@
<property name="column_spacing">0</property>
<child>
- <widget class="GnomeColorPicker" id="cp0">
+ <widget class="GtkColorButton" id="cp0">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">Change the color of a specific color that the MUD requests to use.</property>
<property name="can_focus">True</property>
- <property name="dither">True</property>
<property name="use_alpha">False</property>
- <property name="title" translatable="yes">Pick a color</property>
<property name="focus_on_click">True</property>
</widget>
<packing>
@@ -607,13 +563,10 @@
</child>
<child>
- <widget class="GnomeColorPicker" id="cp1">
+ <widget class="GtkColorButton" id="cp1">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">Change the color of a specific color that the MUD requests to use.</property>
<property name="can_focus">True</property>
- <property name="dither">True</property>
<property name="use_alpha">False</property>
- <property name="title" translatable="yes">Pick a color</property>
<property name="focus_on_click">True</property>
</widget>
<packing>
@@ -627,13 +580,10 @@
</child>
<child>
- <widget class="GnomeColorPicker" id="cp2">
+ <widget class="GtkColorButton" id="cp2">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">Change the color of a specific color that the MUD requests to use.</property>
<property name="can_focus">True</property>
- <property name="dither">True</property>
<property name="use_alpha">False</property>
- <property name="title" translatable="yes">Pick a color</property>
<property name="focus_on_click">True</property>
</widget>
<packing>
@@ -647,13 +597,10 @@
</child>
<child>
- <widget class="GnomeColorPicker" id="cp3">
+ <widget class="GtkColorButton" id="cp3">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">Change the color of a specific color that the MUD requests to use.</property>
<property name="can_focus">True</property>
- <property name="dither">True</property>
<property name="use_alpha">False</property>
- <property name="title" translatable="yes">Pick a color</property>
<property name="focus_on_click">True</property>
</widget>
<packing>
@@ -667,13 +614,10 @@
</child>
<child>
- <widget class="GnomeColorPicker" id="cp4">
+ <widget class="GtkColorButton" id="cp4">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">Change the color of a specific color that the MUD requests to use.</property>
<property name="can_focus">True</property>
- <property name="dither">True</property>
<property name="use_alpha">False</property>
- <property name="title" translatable="yes">Pick a color</property>
<property name="focus_on_click">True</property>
</widget>
<packing>
@@ -687,13 +631,10 @@
</child>
<child>
- <widget class="GnomeColorPicker" id="cp5">
+ <widget class="GtkColorButton" id="cp5">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">Change the color of a specific color that the MUD requests to use.</property>
<property name="can_focus">True</property>
- <property name="dither">True</property>
<property name="use_alpha">False</property>
- <property name="title" translatable="yes">Pick a color</property>
<property name="focus_on_click">True</property>
</widget>
<packing>
@@ -707,13 +648,10 @@
</child>
<child>
- <widget class="GnomeColorPicker" id="cp6">
+ <widget class="GtkColorButton" id="cp6">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">Change the color of a specific color that the MUD requests to use.</property>
<property name="can_focus">True</property>
- <property name="dither">True</property>
<property name="use_alpha">False</property>
- <property name="title" translatable="yes">Pick a color</property>
<property name="focus_on_click">True</property>
</widget>
<packing>
@@ -727,13 +665,10 @@
</child>
<child>
- <widget class="GnomeColorPicker" id="cp7">
+ <widget class="GtkColorButton" id="cp7">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">Change the color of a specific color that the MUD requests to use.</property>
<property name="can_focus">True</property>
- <property name="dither">True</property>
<property name="use_alpha">False</property>
- <property name="title" translatable="yes">Pick a color</property>
<property name="focus_on_click">True</property>
</widget>
<packing>
@@ -747,13 +682,10 @@
</child>
<child>
- <widget class="GnomeColorPicker" id="cp8">
+ <widget class="GtkColorButton" id="cp8">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">Change the color of a specific color that the MUD requests to use.</property>
<property name="can_focus">True</property>
- <property name="dither">True</property>
<property name="use_alpha">False</property>
- <property name="title" translatable="yes">Pick a color</property>
<property name="focus_on_click">True</property>
</widget>
<packing>
@@ -767,13 +699,10 @@
</child>
<child>
- <widget class="GnomeColorPicker" id="cp9">
+ <widget class="GtkColorButton" id="cp9">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">Change the color of a specific color that the MUD requests to use.</property>
<property name="can_focus">True</property>
- <property name="dither">True</property>
<property name="use_alpha">False</property>
- <property name="title" translatable="yes">Pick a color</property>
<property name="focus_on_click">True</property>
</widget>
<packing>
@@ -787,13 +716,10 @@
</child>
<child>
- <widget class="GnomeColorPicker" id="cp10">
+ <widget class="GtkColorButton" id="cp10">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">Change the color of a specific color that the MUD requests to use.</property>
<property name="can_focus">True</property>
- <property name="dither">True</property>
<property name="use_alpha">False</property>
- <property name="title" translatable="yes">Pick a color</property>
<property name="focus_on_click">True</property>
</widget>
<packing>
@@ -807,13 +733,10 @@
</child>
<child>
- <widget class="GnomeColorPicker" id="cp11">
+ <widget class="GtkColorButton" id="cp11">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">Change the color of a specific color that the MUD requests to use.</property>
<property name="can_focus">True</property>
- <property name="dither">True</property>
<property name="use_alpha">False</property>
- <property name="title" translatable="yes">Pick a color</property>
<property name="focus_on_click">True</property>
</widget>
<packing>
@@ -827,13 +750,10 @@
</child>
<child>
- <widget class="GnomeColorPicker" id="cp12">
+ <widget class="GtkColorButton" id="cp12">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">Change the color of a specific color that the MUD requests to use.</property>
<property name="can_focus">True</property>
- <property name="dither">True</property>
<property name="use_alpha">False</property>
- <property name="title" translatable="yes">Pick a color</property>
<property name="focus_on_click">True</property>
</widget>
<packing>
@@ -847,13 +767,10 @@
</child>
<child>
- <widget class="GnomeColorPicker" id="cp13">
+ <widget class="GtkColorButton" id="cp13">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">Change the color of a specific color that the MUD requests to use.</property>
<property name="can_focus">True</property>
- <property name="dither">True</property>
<property name="use_alpha">False</property>
- <property name="title" translatable="yes">Pick a color</property>
<property name="focus_on_click">True</property>
</widget>
<packing>
@@ -867,13 +784,10 @@
</child>
<child>
- <widget class="GnomeColorPicker" id="cp14">
+ <widget class="GtkColorButton" id="cp14">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">Change the color of a specific color that the MUD requests to use.</property>
<property name="can_focus">True</property>
- <property name="dither">True</property>
<property name="use_alpha">False</property>
- <property name="title" translatable="yes">Pick a color</property>
<property name="focus_on_click">True</property>
</widget>
<packing>
@@ -887,13 +801,10 @@
</child>
<child>
- <widget class="GnomeColorPicker" id="cp15">
+ <widget class="GtkColorButton" id="cp15">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">Change the color of a specific color that the MUD requests to use.</property>
<property name="can_focus">True</property>
- <property name="dither">True</property>
<property name="use_alpha">False</property>
- <property name="title" translatable="yes">Pick a color</property>
<property name="focus_on_click">True</property>
</widget>
<packing>
@@ -917,13 +828,47 @@
</child>
<child>
- <widget class="GnomeColorPicker" id="cp_background">
+ <widget class="GtkFontButton" id="fp_font">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="show_style">True</property>
+ <property name="show_size">True</property>
+ <property name="use_font">False</property>
+ <property name="use_size">False</property>
+ <property name="focus_on_click">True</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">0</property>
+ <property name="bottom_attach">1</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkColorButton" id="cp_foreground">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="use_alpha">False</property>
+ <property name="focus_on_click">True</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkColorButton" id="cp_background">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">Default background color used when the connection doesn't request the use of a specific color.</property>
<property name="can_focus">True</property>
- <property name="dither">True</property>
<property name="use_alpha">False</property>
- <property name="title" translatable="yes">Pick a color</property>
<property name="focus_on_click">True</property>
</widget>
<packing>
[Date Prev][
Date Next] [Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
