gnome-mud r753 - in trunk: . src ui
- From: lharris svn gnome org
- To: svn-commits-list gnome org
- Subject: gnome-mud r753 - in trunk: . src ui
- Date: Sun, 22 Feb 2009 01:21:42 +0000 (UTC)
Author: lharris
Date: Sun Feb 22 01:21:42 2009
New Revision: 753
URL: http://svn.gnome.org/viewvc/gnome-mud?rev=753&view=rev
Log:
UI Usability Fixes, ZMP/MCCP Subneq fix, GString fixes.
Modified:
trunk/ChangeLog
trunk/src/mud-connection-view.c
trunk/src/mud-connection-view.h
trunk/src/mud-connections.c
trunk/src/mud-telnet-mccp.c
trunk/src/mud-telnet-msp.c
trunk/src/mud-telnet.c
trunk/src/mud-tray.c
trunk/src/mud-window.c
trunk/src/mud-window.h
trunk/ui/main.glade
trunk/ui/muds.glade
trunk/ui/prefs.glade
Modified: trunk/src/mud-connection-view.c
==============================================================================
--- trunk/src/mud-connection-view.c (original)
+++ trunk/src/mud-connection-view.c Sun Feb 22 01:21:42 2009
@@ -316,6 +316,11 @@
local_codeset,
&bytes_read, &bytes_written, &error);
+ if(error)
+ {
+ text = NULL;
+ }
+
vte_terminal_set_encoding(VTE_TERMINAL(view->priv->terminal), encoding);
g_free(encoding);
@@ -343,7 +348,9 @@
mud_connection_view_feed_text(view, (!error) ? text : message);
mud_connection_view_feed_text(view, "\e[0m");
- g_free(text);
+
+ if(text != NULL)
+ g_free(text);
}
@@ -396,7 +403,7 @@
connection_view->priv->terminal = vte_terminal_new();
vte_terminal_set_encoding(VTE_TERMINAL(connection_view->priv->terminal), "ISO-8859-1");
vte_terminal_set_emulation(VTE_TERMINAL(connection_view->priv->terminal), "xterm");
-
+
connection_view->priv->width = VTE_TERMINAL(connection_view->priv->terminal)->column_count;
connection_view->priv->height = VTE_TERMINAL(connection_view->priv->terminal)->row_count;
@@ -755,7 +762,9 @@
gboolean
mud_connection_view_islogging(MudConnectionView *view)
{
- return mud_log_islogging(view->priv->log);
+ return (view && view->connection &&
+ gnet_conn_is_connected(view->connection) &&
+ mud_log_islogging(view->priv->log));
}
static void
@@ -1128,6 +1137,7 @@
{
case GNET_CONN_ERROR:
mud_connection_view_add_text(view, _("*** Could not connect.\n"), Error);
+ mud_window_disconnected(view->priv->window);
break;
case GNET_CONN_CONNECT:
@@ -1157,6 +1167,8 @@
g_object_unref(view->priv->telnet);
mud_connection_view_add_text(view, _("*** Connection closed.\n"), Error);
+
+ mud_window_disconnected(view->priv->window);
break;
case GNET_CONN_TIMEOUT:
@@ -1269,6 +1281,12 @@
}
}
+gboolean
+mud_connection_view_is_connected(MudConnectionView *view)
+{
+ return (view && view->connection && gnet_conn_is_connected(view->connection));
+}
+
#ifdef ENABLE_GST
static void
mud_connection_view_start_download(MudConnectionView *view)
Modified: trunk/src/mud-connection-view.h
==============================================================================
--- trunk/src/mud-connection-view.h (original)
+++ trunk/src/mud-connection-view.h Sun Feb 22 01:21:42 2009
@@ -84,6 +84,7 @@
void mud_connection_view_start_logging(MudConnectionView *view);
void mud_connection_view_stop_logging(MudConnectionView *view);
gboolean mud_connection_view_islogging(MudConnectionView *view);
+gboolean mud_connection_view_is_connected(MudConnectionView *view);
#include "mud-parse-base.h"
MudParseBase *mud_connection_view_get_parsebase(MudConnectionView *view);
Modified: trunk/src/mud-connections.c
==============================================================================
--- trunk/src/mud-connections.c (original)
+++ trunk/src/mud-connections.c Sun Feb 22 01:21:42 2009
@@ -153,22 +153,22 @@
if (!object_type)
{
- static const GTypeInfo object_info =
- {
- sizeof (MudConnectionsClass),
- NULL,
- NULL,
- (GClassInitFunc) mud_connections_class_init,
- NULL,
- NULL,
- sizeof (MudConnections),
- 0,
- (GInstanceInitFunc) mud_connections_init,
- };
-
- object_type =
- g_type_register_static(G_TYPE_OBJECT,
- "MudConnections", &object_info, 0);
+ static const GTypeInfo object_info =
+ {
+ sizeof (MudConnectionsClass),
+ NULL,
+ NULL,
+ (GClassInitFunc) mud_connections_class_init,
+ NULL,
+ NULL,
+ sizeof (MudConnections),
+ 0,
+ (GInstanceInitFunc) mud_connections_init,
+ };
+
+ object_type =
+ g_type_register_static(G_TYPE_OBJECT,
+ "MudConnections", &object_info, 0);
}
return object_type;
@@ -188,49 +188,49 @@
conn->priv->iconview = glade_xml_get_widget(glade, "iconview");
conn->priv->icon_model =
- GTK_TREE_MODEL(gtk_list_store_new(MODEL_COLUMN_N,
- G_TYPE_STRING,
- GDK_TYPE_PIXBUF));
-
+ GTK_TREE_MODEL(gtk_list_store_new(MODEL_COLUMN_N,
+ G_TYPE_STRING,
+ GDK_TYPE_PIXBUF));
+
conn->priv->original_name = NULL;
conn->priv->original_char_name = NULL;
gtk_icon_view_set_model(GTK_ICON_VIEW(conn->priv->iconview),
- conn->priv->icon_model);
+ conn->priv->icon_model);
gtk_icon_view_set_text_column(GTK_ICON_VIEW(conn->priv->iconview),
- MODEL_COLUMN_STRING);
+ MODEL_COLUMN_STRING);
gtk_icon_view_set_pixbuf_column(GTK_ICON_VIEW(conn->priv->iconview),
- MODEL_COLUMN_PIXBUF);
+ MODEL_COLUMN_PIXBUF);
client = gconf_client_get_default();
gconf_client_add_dir(client, "/apps/gnome-mud/muds",
- GCONF_CLIENT_PRELOAD_NONE, NULL);
-
+ GCONF_CLIENT_PRELOAD_NONE, NULL);
+
conn->priv->connection =
- gconf_client_notify_add(client, "/apps/gnome-mud/muds",
- (GConfClientNotifyFunc)
- mud_connections_gconf_notify_cb,
- conn, NULL, NULL);
+ gconf_client_notify_add(client, "/apps/gnome-mud/muds",
+ (GConfClientNotifyFunc)
+ mud_connections_gconf_notify_cb,
+ conn, NULL, NULL);
g_signal_connect(conn->priv->iconview, "item-activated",
- G_CALLBACK(mud_connections_iconview_activate_cb),
- conn);
+ G_CALLBACK(mud_connections_iconview_activate_cb),
+ conn);
g_signal_connect(conn->priv->iconview, "button-press-event",
- G_CALLBACK(mud_connections_button_press_cb),
- conn);
+ G_CALLBACK(mud_connections_button_press_cb),
+ conn);
g_signal_connect(conn->priv->window, "destroy",
- G_CALLBACK(mud_connections_close_cb), conn);
+ G_CALLBACK(mud_connections_close_cb), conn);
g_signal_connect(glade_xml_get_widget(glade, "connect_button"),
- "clicked", G_CALLBACK(mud_connections_connect_cb),
- conn);
+ "clicked", G_CALLBACK(mud_connections_connect_cb),
+ conn);
g_signal_connect(glade_xml_get_widget(glade, "add_button"),
- "clicked", G_CALLBACK(mud_connections_add_cb), conn);
+ "clicked", G_CALLBACK(mud_connections_add_cb), conn);
g_signal_connect(glade_xml_get_widget(glade, "delete_button"),
- "clicked", G_CALLBACK(mud_connections_delete_cb),
- conn);
+ "clicked", G_CALLBACK(mud_connections_delete_cb),
+ conn);
g_signal_connect(glade_xml_get_widget(glade, "properties_button"),
- "clicked", G_CALLBACK(mud_connections_properties_cb),
- conn);
+ "clicked", G_CALLBACK(mud_connections_properties_cb),
+ conn);
mud_connections_populate_iconview(conn);
@@ -336,11 +336,11 @@
if(char_name && strlen(char_name) > 0)
{
- key = g_strdup_printf(
- "/apps/gnome-mud/muds/%s/characters/%s/logon",
- strip_name, char_name);
- logon = gconf_client_get_string(client, key, NULL);
- g_free(key);
+ key = g_strdup_printf(
+ "/apps/gnome-mud/muds/%s/characters/%s/logon",
+ strip_name, char_name);
+ logon = gconf_client_get_string(client, key, NULL);
+ g_free(key);
}
mud_tray_update_icon(conn->priv->tray, offline);
@@ -573,8 +573,6 @@
if(muds)
g_slist_free(muds);
-
-
}
static void
@@ -611,12 +609,12 @@
MudConnections *conn)
{
if ((event->button == 3) &&
- !(event->state & (GDK_SHIFT_MASK |
- GDK_CONTROL_MASK |
- GDK_MOD1_MASK)))
+ !(event->state & (GDK_SHIFT_MASK |
+ GDK_CONTROL_MASK |
+ GDK_MOD1_MASK)))
{
- mud_connections_popup(conn, event);
- return TRUE;
+ mud_connections_popup(conn, event);
+ return TRUE;
}
return FALSE;
@@ -902,7 +900,6 @@
mud_connections_property_cancel_cb(GtkWidget *widget, MudConnections *conn)
{
gtk_widget_destroy(conn->priv->properties_window);
-
}
static void
@@ -1228,7 +1225,7 @@
GTK_ICON_VIEW(conn->priv->icon_dialog_view),
MODEL_COLUMN_PIXBUF);
- if(conn->priv->icon_current == NULL)
+ if(conn->priv->icon_current != NULL)
g_free(conn->priv->icon_current);
conn->priv->icon_current = NULL;
@@ -1291,17 +1288,21 @@
full_path, 48, 48, NULL);
GtkTreeIter iter;
- gtk_list_store_append(
- GTK_LIST_STORE(conn->priv->icon_dialog_view_model),
- &iter);
- gtk_list_store_set(
- GTK_LIST_STORE(conn->priv->icon_dialog_view_model),
- &iter,
- MODEL_COLUMN_STRING, file,
- MODEL_COLUMN_PIXBUF, icon,
- -1);
-
- g_object_unref(icon);
+ if(icon)
+ {
+ gtk_list_store_append(
+ GTK_LIST_STORE(conn->priv->icon_dialog_view_model),
+ &iter);
+ gtk_list_store_set(
+ GTK_LIST_STORE(conn->priv->icon_dialog_view_model),
+ &iter,
+ MODEL_COLUMN_STRING, file,
+ MODEL_COLUMN_PIXBUF, icon,
+ -1);
+
+ g_object_unref(icon);
+ }
+
g_free(full_path);
}
Modified: trunk/src/mud-telnet-mccp.c
==============================================================================
--- trunk/src/mud-telnet-mccp.c (original)
+++ trunk/src/mud-telnet-mccp.c Sun Feb 22 01:21:42 2009
@@ -56,7 +56,7 @@
if(zstatus == Z_OK)
{
for(i = 0; i < (4096 - telnet->compress_out->avail_out); ++i)
- g_string_append_c(ret,
+ ret = g_string_append_c(ret,
(gchar)telnet->compress_out_buf[i]);
continue;
}
@@ -64,11 +64,11 @@
if(zstatus == Z_STREAM_END)
{
for(i = 0; i < (4096 - telnet->compress_out->avail_out); ++i)
- g_string_append_c(ret, (gchar)telnet->compress_out_buf[i]);
+ ret = g_string_append_c(ret, (gchar)telnet->compress_out_buf[i]);
if(telnet->compress_out->avail_in > 0)
for(i = 0; i < telnet->compress_out->avail_in; ++i)
- g_string_append_c(ret,
+ ret = g_string_append_c(ret,
(gchar)telnet->compress_out->next_in[i]);
inflateEnd(telnet->compress_out);
Modified: trunk/src/mud-telnet-msp.c
==============================================================================
--- trunk/src/mud-telnet-msp.c (original)
+++ trunk/src/mud-telnet-msp.c Sun Feb 22 01:21:42 2009
@@ -61,7 +61,7 @@
if(telnet->prev_buffer)
{
- g_string_prepend(buf, telnet->prev_buffer->str);
+ buf = g_string_prepend(buf, telnet->prev_buffer->str);
g_string_free(telnet->prev_buffer, TRUE);
telnet->prev_buffer = NULL;
}
@@ -75,7 +75,8 @@
telnet->msp_parser.state = MSP_STATE_POSSIBLE_COMMAND;
else
{
- g_string_append_c(telnet->msp_parser.output,
+ telnet->msp_parser.output =
+ g_string_append_c(telnet->msp_parser.output,
buf->str[telnet->msp_parser.lex_pos_start++]);
}
break;
@@ -85,7 +86,8 @@
continue;
else if(buf->str[telnet->msp_parser.lex_pos_start + 1] != '!')
{
- g_string_append_c(telnet->msp_parser.output,
+ telnet->msp_parser.output =
+ g_string_append_c(telnet->msp_parser.output,
buf->str[telnet->msp_parser.lex_pos_start++]);
telnet->msp_parser.state = MSP_STATE_TEXT;
continue;
@@ -102,7 +104,8 @@
count = telnet->msp_parser.lex_pos_start;
while(count != buf->len)
- g_string_append_c(telnet->prev_buffer, buf->str[count++]);
+ telnet->prev_buffer =
+ g_string_append_c(telnet->prev_buffer, buf->str[count++]);
telnet->msp_parser.lex_pos_start += count;
continue;
@@ -123,9 +126,11 @@
else
{
/* Not an msp command, bail out. */
- g_string_append_c(telnet->msp_parser.output,
+ telnet->msp_parser.output =
+ g_string_append_c(telnet->msp_parser.output,
buf->str[telnet->msp_parser.lex_pos_start++]);
- g_string_append_c(telnet->msp_parser.output,
+ telnet->msp_parser.output =
+ g_string_append_c(telnet->msp_parser.output,
buf->str[telnet->msp_parser.lex_pos_start++]);
telnet->msp_parser.state = MSP_STATE_TEXT;
@@ -155,8 +160,9 @@
while(telnet->msp_parser.lex_pos_end < *len &&
buf->str[telnet->msp_parser.lex_pos_end] != ')')
- g_string_append_c(telnet->msp_parser.arg_buffer,
- buf->str[telnet->msp_parser.lex_pos_end++]);
+ telnet->msp_parser.arg_buffer =
+ g_string_append_c(telnet->msp_parser.arg_buffer,
+ buf->str[telnet->msp_parser.lex_pos_end++]);
if(telnet->msp_parser.lex_pos_end >= *len &&
buf->str[telnet->msp_parser.lex_pos_end - 1] != ')')
@@ -292,7 +298,7 @@
buffer = g_string_new(NULL);
}
else
- g_string_append_c(buffer, args[i]);
+ buffer = g_string_append_c(buffer, args[i]);
break;
case ARG_STATE_V:
@@ -304,7 +310,7 @@
buffer = g_string_new(NULL);
}
else
- g_string_append_c(buffer, args[i]);
+ buffer = g_string_append_c(buffer, args[i]);
break;
case ARG_STATE_L:
@@ -316,7 +322,7 @@
buffer = g_string_new(NULL);
}
else
- g_string_append_c(buffer, args[i]);
+ buffer = g_string_append_c(buffer, args[i]);
break;
case ARG_STATE_C:
@@ -328,7 +334,7 @@
buffer = g_string_new(NULL);
}
else
- g_string_append_c(buffer, args[i]);
+ buffer = g_string_append_c(buffer, args[i]);
break;
case ARG_STATE_T:
@@ -340,7 +346,7 @@
buffer = g_string_new(NULL);
}
else
- g_string_append_c(buffer, args[i]);
+ buffer = g_string_append_c(buffer, args[i]);
break;
case ARG_STATE_U:
@@ -348,14 +354,14 @@
mud_telnet_msp_parser_switch_on_param_char(&state, args, i, len))
{
if(buffer->str[buffer->len - 1] != '/')
- g_string_append_c(buffer, '/');
+ buffer = g_string_append_c(buffer, '/');
command->U = g_strdup(buffer->str);
g_string_free(buffer, TRUE);
buffer = g_string_new(NULL);
}
else
- g_string_append_c(buffer, args[i]);
+ buffer = g_string_append_c(buffer, args[i]);
break;
case ARG_STATE_P:
@@ -367,7 +373,7 @@
buffer = g_string_new(NULL);
}
else
- g_string_append_c(buffer, args[i]);
+ buffer = g_string_append_c(buffer, args[i]);
break;
}
}
@@ -396,7 +402,7 @@
case ARG_STATE_U:
if(buffer->str[buffer->len - 1] != '/')
- g_string_append_c(buffer, '/');
+ buffer = g_string_append_c(buffer, '/');
command->U = g_strdup(buffer->str);
break;
@@ -685,8 +691,8 @@
for(i = 0; i < depth - 1; ++i)
{
- g_string_append(subdir, structure[i]);
- g_string_append_c(subdir, '/');
+ subdir = g_string_append(subdir, structure[i]);
+ subdir = g_string_append_c(subdir, '/');
}
file_name = g_string_new(structure[depth - 1]);
@@ -694,10 +700,10 @@
g_strfreev(structure);
full_dir = g_string_new(sound_dir);
- g_string_append(full_dir, subdir->str);
+ full_dir = g_string_append(full_dir, subdir->str);
if(telnet->sound[type].current_command->T)
- g_string_append(full_dir, telnet->sound[type].current_command->T);
+ full_dir = g_string_append(full_dir, telnet->sound[type].current_command->T);
if(!g_file_test(full_dir->str, G_FILE_TEST_IS_DIR))
g_mkdir_with_parents(full_dir->str, 0777);
@@ -712,11 +718,11 @@
{
if(g_pattern_match_string(regex, file))
{
- g_string_append(file_output, "file://");
- g_string_append(file_output, full_dir->str);
- g_string_append_c(file_output, '/');
- g_string_append(file_output, file);
- g_string_append_c(file_output, '\n');
+ file_output = g_string_append(file_output, "file://");
+ file_output = g_string_append(file_output, full_dir->str);
+ file_output = g_string_append_c(file_output, '/');
+ file_output = g_string_append(file_output, file);
+ file_output = g_string_append_c(file_output, '\n');
}
}
@@ -730,7 +736,7 @@
{
g_string_free(full_dir, TRUE);
full_dir = g_string_new(sound_dir);
- g_string_append(full_dir, subdir->str);
+ full_dir = g_string_append(full_dir, subdir->str);
dir = g_dir_open(full_dir->str, 0, NULL);
@@ -738,11 +744,11 @@
{
if(g_pattern_match_string(regex, file))
{
- g_string_append(file_output, "file://");
- g_string_append(file_output, full_dir->str);
- g_string_append_c(file_output, '/');
- g_string_append(file_output, file);
- g_string_append_c(file_output, '\n');
+ file_output = g_string_append(file_output, "file://");
+ file_output = g_string_append(file_output, full_dir->str);
+ file_output = g_string_append_c(file_output, '/');
+ file_output = g_string_append(file_output, file);
+ file_output = g_string_append_c(file_output, '\n');
}
}
@@ -758,25 +764,25 @@
if(telnet->base_url || telnet->sound[type].current_command->U)
{
if(telnet->base_url)
- g_string_append(url_output, telnet->base_url);
+ url_output = g_string_append(url_output, telnet->base_url);
else
- g_string_append(url_output, telnet->sound[type].current_command->U);
+ url_output = g_string_append(url_output, telnet->sound[type].current_command->U);
if(subdir->len != 0)
- g_string_append(url_output, subdir->str);
+ url_output = g_string_append(url_output, subdir->str);
if(telnet->sound[type].current_command->T)
{
- g_string_append(url_output, telnet->sound[type].current_command->T);
- g_string_append_c(url_output, '/');
+ url_output = g_string_append(url_output, telnet->sound[type].current_command->T);
+ url_output = g_string_append_c(url_output, '/');
}
- g_string_append(url_output, file_name->str);
+ url_output = g_string_append(url_output, file_name->str);
- g_string_append(file_output, full_dir->str);
+ file_output = g_string_append(file_output, full_dir->str);
if(telnet->sound[type].current_command->T)
- g_string_append_c(file_output, '/');
- g_string_append(file_output, file_name->str);
+ file_output = g_string_append_c(file_output, '/');
+ file_output = g_string_append(file_output, file_name->str);
telnet->sound[type].current_command->priority = 0;
Modified: trunk/src/mud-telnet.c
==============================================================================
--- trunk/src/mud-telnet.c (original)
+++ trunk/src/mud-telnet.c Sun Feb 22 01:21:42 2009
@@ -188,6 +188,7 @@
telnet->mud_name = g_strdup(mud_name);
telnet->buffer = NULL;
telnet->pos = 0;
+ telnet->subreq_pos = 0;
#ifdef ENABLE_GST
telnet->sound[0].files = NULL;
@@ -358,6 +359,7 @@
{
guint32 i;
guint32 count;
+
g_assert(telnet != NULL);
if(telnet->buffer != NULL)
@@ -384,13 +386,13 @@
}
else
{
- g_string_append(telnet->buffer, ret->str);
+ telnet->buffer = g_string_append_len(telnet->buffer, ret->str, ret->len);
g_string_free(ret, TRUE);
}
}
else
#endif
- g_string_append_len(telnet->buffer, (gchar *)buf, c);
+ telnet->buffer = g_string_append_len(telnet->buffer, (gchar *)buf, c);
count = telnet->buffer->len;
@@ -409,14 +411,20 @@
telnet->mccp_new = FALSE;
// decompress the rest of the buffer.
- ret = mud_mccp_decompress(telnet, &buf[i], c - i);
+ ret = mud_mccp_decompress(telnet, &buf[i], count - i);
+
+ if(telnet->buffer)
+ {
+ g_string_free(telnet->buffer, TRUE);
+ telnet->buffer = NULL;
+ }
if(ret == NULL)
{
GString *ret_string =
g_string_new_len(telnet->processed->str, telnet->pos);
+
*len = telnet->pos;
-
telnet->pos= 0;
if(telnet->processed)
@@ -425,21 +433,9 @@
telnet->processed = g_string_new(NULL);
}
- if(telnet->buffer)
- {
- g_string_free(telnet->buffer, TRUE);
- telnet->buffer = NULL;
- }
-
return ret_string;
}
- if(telnet->buffer)
- {
- g_string_free(telnet->buffer, TRUE);
- telnet->buffer = NULL;
- }
-
telnet->buffer = g_string_new(ret->str);
if(telnet->buffer->len == 0)
@@ -472,7 +468,8 @@
telnet->tel_state = TEL_STATE_IAC;
else
{
- g_string_append_c(telnet->processed, telnet->buffer->str[i]);
+ telnet->processed =
+ g_string_append_c(telnet->processed, telnet->buffer->str[i]);
telnet->pos++;
}
break;
@@ -482,7 +479,8 @@
{
case (guchar)TEL_IAC:
telnet->pos++;
- g_string_append_c(telnet->processed, telnet->buffer->str[i]);
+ telnet->processed =
+ g_string_append_c(telnet->processed, telnet->buffer->str[i]);
telnet->tel_state = TEL_STATE_TEXT;
break;
@@ -518,7 +516,7 @@
case (guchar)TEL_SB:
telnet->tel_state = TEL_STATE_SB;
- telnet->subreq_pos = 0;
+ //telnet->subreq_pos = 0;
break;
default:
@@ -528,29 +526,45 @@
}
break;
- case TEL_STATE_DO:
- mud_telnet_handle_positive_nego(telnet, (guchar)telnet->buffer->str[i],
- (guchar)TEL_WILL, (guchar)TEL_WONT, FALSE);
- telnet->tel_state = TEL_STATE_TEXT;
- break;
-
- case TEL_STATE_WILL:
- mud_telnet_handle_positive_nego(telnet, (guchar)telnet->buffer->str[i],
- (guchar)TEL_DO, (guchar)TEL_DONT, TRUE);
- telnet->tel_state = TEL_STATE_TEXT;
- break;
-
- case TEL_STATE_DONT:
- mud_telnet_handle_negative_nego(telnet,
- (guchar)telnet->buffer->str[i], (guchar)TEL_WILL, (guchar)TEL_WONT, FALSE);
- telnet->tel_state = TEL_STATE_TEXT;
- break;
+ case TEL_STATE_DO:
+ mud_telnet_handle_positive_nego(
+ telnet,
+ (guchar)telnet->buffer->str[i],
+ (guchar)TEL_WILL,
+ (guchar)TEL_WONT, FALSE);
+
+ telnet->tel_state = TEL_STATE_TEXT;
+ break;
+
+ case TEL_STATE_WILL:
+ mud_telnet_handle_positive_nego(
+ telnet,
+ (guchar)telnet->buffer->str[i],
+ (guchar)TEL_DO,
+ (guchar)TEL_DONT, TRUE);
+
+ telnet->tel_state = TEL_STATE_TEXT;
+ break;
+
+ case TEL_STATE_DONT:
+ mud_telnet_handle_negative_nego(
+ telnet,
+ (guchar)telnet->buffer->str[i],
+ (guchar)TEL_WILL,
+ (guchar)TEL_WONT, FALSE);
+
+ telnet->tel_state = TEL_STATE_TEXT;
+ break;
+
+ case TEL_STATE_WONT:
+ mud_telnet_handle_negative_nego(
+ telnet,
+ (guchar)telnet->buffer->str[i],
+ (guchar)TEL_DO,
+ (guchar)TEL_DONT, TRUE);
- case TEL_STATE_WONT:
- mud_telnet_handle_negative_nego(telnet,
- (guchar)telnet->buffer->str[i], (guchar)TEL_DO, (guchar)TEL_DONT, TRUE);
- telnet->tel_state = TEL_STATE_TEXT;
- break;
+ telnet->tel_state = TEL_STATE_TEXT;
+ break;
case TEL_STATE_SB:
if ((guchar)telnet->buffer->str[i] == (guchar)TEL_IAC)
@@ -565,7 +579,8 @@
telnet->tel_state = TEL_STATE_TEXT;
}
else
- telnet->subreq_buffer[telnet->subreq_pos++] = (guchar)telnet->buffer->str[i];
+ telnet->subreq_buffer[telnet->subreq_pos++] =
+ (guchar)telnet->buffer->str[i];
}
break;
@@ -579,19 +594,26 @@
telnet->tel_state = TEL_STATE_TEXT;
}
else
- telnet->subreq_buffer[telnet->subreq_pos++] = (guchar)telnet->buffer->str[i];
+ telnet->subreq_buffer[telnet->subreq_pos++] =
+ (guchar)telnet->buffer->str[i];
telnet->tel_state = TEL_STATE_SB;
}
- else if ((guchar)telnet->buffer->str[i] == (guchar)TEL_SE)
- {
- telnet->subreq_buffer[telnet->subreq_pos++] = (guchar)telnet->buffer->str[i];
- mud_telnet_on_handle_subnego(telnet);
- telnet->tel_state = TEL_STATE_TEXT;
- } else {
- g_warning("Erronous byte %d after an IAC inside a subrequest", telnet->buffer->str[i]);
- telnet->subreq_pos = 0;
- telnet->tel_state = TEL_STATE_TEXT;
+ else if ((guchar)telnet->buffer->str[i] == (guchar)TEL_SE)
+ {
+ telnet->subreq_buffer[telnet->subreq_pos++] =
+ (guchar)telnet->buffer->str[i];
+
+ mud_telnet_on_handle_subnego(telnet);
+
+ telnet->subreq_pos = 0;
+ telnet->tel_state = TEL_STATE_TEXT;
+ } else {
+ g_warning("Erronous byte %d after an IAC inside a subrequest",
+ telnet->buffer->str[i]);
+
+ telnet->subreq_pos = 0;
+ telnet->tel_state = TEL_STATE_TEXT;
}
break;
}
@@ -632,22 +654,22 @@
switch (ch)
{
case TEL_WILL:
- g_string_append(string, "WILL");
+ string = g_string_append(string, "WILL");
break;
case TEL_WONT:
- g_string_append(string, "WONT");
+ string = g_string_append(string, "WONT");
break;
case TEL_DO:
- g_string_append(string, "DO");
+ string = g_string_append(string, "DO");
break;
case TEL_DONT:
- g_string_append(string, "DONT");
+ string = g_string_append(string, "DONT");
break;
case TEL_IAC:
- g_string_append(string, "IAC");
+ string = g_string_append(string, "IAC");
break;
default:
- g_string_append_c(string,ch);
+ string = g_string_append_c(string,ch);
break;
}
@@ -665,51 +687,51 @@
switch (ch)
{
case TELOPT_ECHO:
- g_string_append(string, "ECHO");
+ string = g_string_append(string, "ECHO");
break;
case TELOPT_TTYPE:
- g_string_append(string, "TTYPE");
+ string = g_string_append(string, "TTYPE");
break;
case TELOPT_EOR:
- g_string_append(string, "END-OF-RECORD");
+ string = g_string_append(string, "END-OF-RECORD");
break;
case TELOPT_NAWS:
- g_string_append(string, "NAWS");
+ string = g_string_append(string, "NAWS");
break;
case TELOPT_CHARSET:
- g_string_append(string, "CHARSET");
+ string = g_string_append(string, "CHARSET");
break;
case TELOPT_MCCP:
- g_string_append(string, "COMPRESS");
+ string = g_string_append(string, "COMPRESS");
break;
case TELOPT_MCCP2:
- g_string_append(string, "COMPRESS2");
+ string = g_string_append(string, "COMPRESS2");
break;
case TELOPT_CLIENT:
- g_string_append(string, "CLIENT");
+ string = g_string_append(string, "CLIENT");
break;
case TELOPT_CLIENTVER:
- g_string_append(string, "CLIENTVER");
+ string = g_string_append(string, "CLIENTVER");
break;
case TELOPT_MSP:
- g_string_append(string, "MSP");
+ string = g_string_append(string, "MSP");
break;
case TELOPT_MXP:
- g_string_append(string, "MXP");
+ string = g_string_append(string, "MXP");
break;
case TELOPT_ZMP:
- g_string_append(string, "ZMP");
+ string = g_string_append(string, "ZMP");
break;
}
Modified: trunk/src/mud-tray.c
==============================================================================
--- trunk/src/mud-tray.c (original)
+++ trunk/src/mud-tray.c Sun Feb 22 01:21:42 2009
@@ -159,7 +159,8 @@
entry = gtk_menu_item_new_with_mnemonic(_("_Hide window"));
else
entry = gtk_menu_item_new_with_mnemonic(_("_Show window"));
- gtk_signal_connect(GTK_OBJECT(entry), "activate", G_CALLBACK(mud_tray_window_toggle), tray);
+ g_signal_connect(G_OBJECT(entry), "activate", G_CALLBACK(mud_tray_window_toggle), tray);
+
gtk_menu_shell_append(GTK_MENU_SHELL(menu), entry);
entry = gtk_separator_menu_item_new ();
gtk_menu_shell_append(GTK_MENU_SHELL(menu), entry);
Modified: trunk/src/mud-window.c
==============================================================================
--- trunk/src/mud-window.c (original)
+++ trunk/src/mud-window.c Sun Feb 22 01:21:42 2009
@@ -57,6 +57,12 @@
GtkWidget *stoplog;
GtkWidget *bufferdump;
+ GtkWidget *menu_close;
+ GtkWidget *menu_reconnect;
+ GtkWidget *menu_disconnect;
+ GtkWidget *toolbar_disconnect;
+ GtkWidget *toolbar_reconnect;
+
GtkWidget *blank_label;
GtkWidget *current_view;
@@ -130,6 +136,11 @@
gtk_widget_set_sensitive(window->priv->startlog, TRUE);
gtk_widget_set_sensitive(window->priv->bufferdump, TRUE);
+ gtk_widget_set_sensitive(window->priv->menu_close, TRUE);
+ gtk_widget_set_sensitive(window->priv->menu_reconnect, TRUE);
+ gtk_widget_set_sensitive(window->priv->menu_disconnect, TRUE);
+ gtk_widget_set_sensitive(window->priv->toolbar_disconnect, TRUE);
+ gtk_widget_set_sensitive(window->priv->toolbar_reconnect, TRUE);
mud_connection_view_set_id(view, nr);
mud_connection_view_set_parent(view, window);
@@ -204,14 +215,31 @@
mud_window_disconnect_cb(GtkWidget *widget, MudWindow *window)
{
if (window->priv->current_view != NULL)
+ {
+ gtk_widget_set_sensitive(window->priv->startlog, FALSE);
+ gtk_widget_set_sensitive(window->priv->menu_disconnect, FALSE);
+ gtk_widget_set_sensitive(window->priv->toolbar_disconnect, FALSE);
mud_connection_view_disconnect(MUD_CONNECTION_VIEW(window->priv->current_view));
+ }
}
static void
mud_window_reconnect_cb(GtkWidget *widget, MudWindow *window)
{
if (window->priv->current_view != NULL)
+ {
+ gtk_widget_set_sensitive(window->priv->menu_disconnect, TRUE);
+ gtk_widget_set_sensitive(window->priv->toolbar_disconnect, TRUE);
mud_connection_view_reconnect(MUD_CONNECTION_VIEW(window->priv->current_view));
+ }
+}
+
+void
+mud_window_disconnected(MudWindow *window)
+{
+ gtk_widget_set_sensitive(window->priv->startlog, FALSE);
+ gtk_widget_set_sensitive(window->priv->menu_disconnect, FALSE);
+ gtk_widget_set_sensitive(window->priv->toolbar_disconnect, FALSE);
}
static void
@@ -347,6 +375,7 @@
mud_window_notebook_page_change(GtkNotebook *notebook, GtkNotebookPage *page, gint arg, MudWindow *window)
{
gchar *name;
+ gboolean connected;
window->priv->current_view =
g_object_get_data(
@@ -361,6 +390,9 @@
mud_window_profile_menu_set_active(name, window);
+ connected = mud_connection_view_is_connected(
+ MUD_CONNECTION_VIEW(window->priv->current_view));
+
if(mud_connection_view_islogging(MUD_CONNECTION_VIEW(window->priv->current_view)))
{
gtk_widget_set_sensitive(window->priv->startlog, FALSE);
@@ -371,12 +403,26 @@
gtk_widget_set_sensitive(window->priv->startlog, TRUE);
gtk_widget_set_sensitive(window->priv->stoplog, FALSE);
}
+
+ if(!connected)
+ {
+ gtk_widget_set_sensitive(window->priv->startlog, FALSE);
+ gtk_widget_set_sensitive(window->priv->stoplog, FALSE);
+ }
+
+ gtk_widget_set_sensitive(window->priv->menu_disconnect, connected);
+ gtk_widget_set_sensitive(window->priv->toolbar_disconnect, connected);
}
else
{
gtk_widget_set_sensitive(window->priv->startlog, FALSE);
gtk_widget_set_sensitive(window->priv->stoplog, FALSE);
gtk_widget_set_sensitive(window->priv->bufferdump, FALSE);
+ gtk_widget_set_sensitive(window->priv->menu_close, FALSE);
+ gtk_widget_set_sensitive(window->priv->menu_reconnect, FALSE);
+ gtk_widget_set_sensitive(window->priv->menu_disconnect, FALSE);
+ gtk_widget_set_sensitive(window->priv->toolbar_disconnect, FALSE);
+ gtk_widget_set_sensitive(window->priv->toolbar_reconnect, FALSE);
}
gtk_widget_grab_focus(window->priv->textview);
@@ -479,6 +525,7 @@
GTK_NOTEBOOK(window->priv->notebook),
i)),
"connection-view");
+
mud_connection_view_send_naws(iter);
}
@@ -747,7 +794,6 @@
/* start glading */
glade = glade_xml_new(GLADEDIR "/main.glade", "main_window", NULL);
window->priv->window = glade_xml_get_widget(glade, "main_window");
- //gtk_widget_show_all(window->priv->window);
/* connect quit buttons */
g_signal_connect(window->priv->window, "destroy", G_CALLBACK(mud_window_close), window);
@@ -756,20 +802,23 @@
/* connect connect buttons */
g_signal_connect(glade_xml_get_widget(glade, "main_connect"), "activate", G_CALLBACK(mud_window_mconnect_dialog), window);
g_signal_connect(glade_xml_get_widget(glade, "menu_connect"), "activate", G_CALLBACK(mud_window_connect_dialog), window);
- /*g_signal_connect(glade_xml_get_widget(glade, "menu_mudlist"), "activate",
- G_CALLBACK(mud_window_list_cb), window);*/
g_signal_connect(glade_xml_get_widget(glade, "toolbar_connect"), "clicked", G_CALLBACK(mud_window_mconnect_dialog), window);
/* connect disconnect buttons */
- g_signal_connect(glade_xml_get_widget(glade, "menu_disconnect"), "activate", G_CALLBACK(mud_window_disconnect_cb), window);
- g_signal_connect(glade_xml_get_widget(glade, "toolbar_disconnect"), "clicked", G_CALLBACK(mud_window_disconnect_cb), window);
+ window->priv->menu_disconnect = glade_xml_get_widget(glade, "menu_disconnect");
+ window->priv->toolbar_disconnect = glade_xml_get_widget(glade, "toolbar_disconnect");
+ g_signal_connect(window->priv->menu_disconnect, "activate", G_CALLBACK(mud_window_disconnect_cb), window);
+ g_signal_connect(window->priv->toolbar_disconnect, "clicked", G_CALLBACK(mud_window_disconnect_cb), window);
/* connect reconnect buttons */
- g_signal_connect(glade_xml_get_widget(glade, "menu_reconnect"), "activate", G_CALLBACK(mud_window_reconnect_cb), window);
- g_signal_connect(glade_xml_get_widget(glade, "toolbar_reconnect"), "clicked", G_CALLBACK(mud_window_reconnect_cb), window);
+ window->priv->menu_reconnect = glade_xml_get_widget(glade, "menu_reconnect");
+ window->priv->toolbar_reconnect = glade_xml_get_widget(glade, "toolbar_reconnect");
+ g_signal_connect(window->priv->menu_reconnect, "activate", G_CALLBACK(mud_window_reconnect_cb), window);
+ g_signal_connect(window->priv->toolbar_reconnect, "clicked", G_CALLBACK(mud_window_reconnect_cb), window);
/* connect close window button */
- g_signal_connect(glade_xml_get_widget(glade, "menu_closewindow"), "activate", G_CALLBACK(mud_window_closewindow_cb), window);
+ window->priv->menu_close = glade_xml_get_widget(glade, "menu_closewindow");
+ g_signal_connect(window->priv->menu_close, "activate", G_CALLBACK(mud_window_closewindow_cb), window);
/* logging */
window->priv->startlog = glade_xml_get_widget(glade, "menu_start_logging");
Modified: trunk/src/mud-window.h
==============================================================================
--- trunk/src/mud-window.h (original)
+++ trunk/src/mud-window.h Sun Feb 22 01:21:42 2009
@@ -38,6 +38,7 @@
void mud_window_populate_profiles_menu(MudWindow *window);
void mud_window_profile_menu_set_active(gchar *name, MudWindow *window);
void mud_window_close_current_window(MudWindow *window);
+void mud_window_disconnected(MudWindow *window);
GtkWidget* mud_window_get_window(MudWindow *window);
Modified: trunk/ui/main.glade
==============================================================================
--- trunk/ui/main.glade (original)
+++ trunk/ui/main.glade Sun Feb 22 01:21:42 2009
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--*- mode: xml -*-->
+<?xml version="1.0"?>
<glade-interface>
+ <!-- interface-requires gtk+ 2.10 -->
+ <!-- interface-naming-policy toplevel-contextual -->
<widget class="GtkWindow" id="main_window">
<property name="visible">True</property>
<property name="title" translatable="yes">Gnome-Mud</property>
@@ -22,16 +22,16 @@
<widget class="GtkMenu" id="file1_menu">
<child>
<widget class="GtkImageMenuItem" id="main_connect">
- <property name="visible">True</property>
<property name="label" translatable="yes">C_onnection...</property>
+ <property name="visible">True</property>
<property name="use_underline">True</property>
- <signal name="activate" handler="on_connection_wizard1_activate"/>
- <accelerator key="o" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+ <property name="use_stock">False</property>
+ <accelerator key="o" signal="activate" modifiers="GDK_CONTROL_MASK"/>
<child internal-child="image">
- <widget class="GtkImage" id="image349">
+ <widget class="GtkImage" id="image1">
<property name="visible">True</property>
- <property name="stock">gtk-new</property>
- <property name="icon_size">1</property>
+ <property name="stock">gtk-connect</property>
+ <property name="icon-size">1</property>
</widget>
</child>
</widget>
@@ -43,45 +43,47 @@
</child>
<child>
<widget class="GtkImageMenuItem" id="menu_connect">
- <property name="visible">True</property>
<property name="label" translatable="yes">Q_uick Connect...</property>
+ <property name="visible">True</property>
<property name="use_underline">True</property>
- <signal name="activate" handler="on_connect1_activate"/>
+ <property name="use_stock">False</property>
<child internal-child="image">
- <widget class="GtkImage" id="image351">
+ <widget class="GtkImage" id="image3">
<property name="visible">True</property>
- <property name="stock">gtk-connect</property>
- <property name="icon_size">1</property>
+ <property name="stock">gtk-new</property>
+ <property name="icon-size">1</property>
</widget>
</child>
</widget>
</child>
<child>
<widget class="GtkImageMenuItem" id="menu_disconnect">
- <property name="visible">True</property>
<property name="label" translatable="yes">_Disconnect</property>
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
<property name="use_underline">True</property>
- <signal name="activate" handler="on_disconnect1_activate"/>
+ <property name="use_stock">False</property>
<child internal-child="image">
- <widget class="GtkImage" id="image352">
+ <widget class="GtkImage" id="image2">
<property name="visible">True</property>
<property name="stock">gtk-disconnect</property>
- <property name="icon_size">1</property>
+ <property name="icon-size">1</property>
</widget>
</child>
</widget>
</child>
<child>
<widget class="GtkImageMenuItem" id="menu_reconnect">
- <property name="visible">True</property>
<property name="label" translatable="yes">_Reconnect</property>
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
<property name="use_underline">True</property>
- <signal name="activate" handler="on_reconnect1_activate"/>
+ <property name="use_stock">False</property>
<child internal-child="image">
- <widget class="GtkImage" id="image353">
+ <widget class="GtkImage" id="image4">
<property name="visible">True</property>
<property name="stock">gtk-refresh</property>
- <property name="icon_size">1</property>
+ <property name="icon-size">1</property>
</widget>
</child>
</widget>
@@ -93,48 +95,48 @@
</child>
<child>
<widget class="GtkImageMenuItem" id="menu_start_logging">
+ <property name="label" translatable="yes">Start _Logging...</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
- <property name="label" translatable="yes">Start _Logging...</property>
<property name="use_underline">True</property>
- <signal name="activate" handler="on_start_logging1_activate"/>
+ <property name="use_stock">False</property>
<child internal-child="image">
- <widget class="GtkImage" id="image354">
+ <widget class="GtkImage" id="image6">
<property name="visible">True</property>
- <property name="stock">gtk-new</property>
- <property name="icon_size">1</property>
+ <property name="stock">gtk-harddisk</property>
+ <property name="icon-size">1</property>
</widget>
</child>
</widget>
</child>
<child>
<widget class="GtkImageMenuItem" id="menu_stop_logging">
+ <property name="label" translatable="yes">Stop Lo_gging</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
- <property name="label" translatable="yes">Stop Lo_gging</property>
<property name="use_underline">True</property>
- <signal name="activate" handler="on_stop_logging1_activate"/>
+ <property name="use_stock">False</property>
<child internal-child="image">
- <widget class="GtkImage" id="image355">
+ <widget class="GtkImage" id="image7">
<property name="visible">True</property>
- <property name="stock">gtk-close</property>
- <property name="icon_size">1</property>
+ <property name="stock">gtk-stop</property>
+ <property name="icon-size">1</property>
</widget>
</child>
</widget>
</child>
<child>
<widget class="GtkImageMenuItem" id="menu_dump_buffer">
+ <property name="label" translatable="yes">_Save Buffer...</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
- <property name="label" translatable="yes">_Save Buffer...</property>
<property name="use_underline">True</property>
- <signal name="activate" handler="on_save_buffer1_activate"/>
+ <property name="use_stock">False</property>
<child internal-child="image">
- <widget class="GtkImage" id="image356">
+ <widget class="GtkImage" id="image5">
<property name="visible">True</property>
<property name="stock">gtk-save</property>
- <property name="icon_size">1</property>
+ <property name="icon-size">1</property>
</widget>
</child>
</widget>
@@ -145,11 +147,19 @@
</widget>
</child>
<child>
- <widget class="GtkMenuItem" id="menu_closewindow">
- <property name="visible">True</property>
+ <widget class="GtkImageMenuItem" id="menu_closewindow">
<property name="label" translatable="yes">Close _Window</property>
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
<property name="use_underline">True</property>
- <signal name="activate" handler="on_close_window1_activate"/>
+ <property name="use_stock">False</property>
+ <child internal-child="image">
+ <widget class="GtkImage" id="image9">
+ <property name="visible">True</property>
+ <property name="stock">gtk-close</property>
+ <property name="icon-size">1</property>
+ </widget>
+ </child>
</widget>
</child>
<child>
@@ -159,11 +169,10 @@
</child>
<child>
<widget class="GtkImageMenuItem" id="menu_quit">
- <property name="visible">True</property>
<property name="label">gtk-quit</property>
+ <property name="visible">True</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
- <signal name="activate" handler="mud_window_close"/>
</widget>
</child>
</widget>
@@ -212,15 +221,15 @@
</child>
<child>
<widget class="GtkImageMenuItem" id="plugin_list">
- <property name="visible">True</property>
<property name="label" translatable="yes">Plugin _Information...</property>
+ <property name="visible">True</property>
<property name="use_underline">True</property>
- <signal name="activate" handler="on_plugin_list_activate"/>
+ <property name="use_stock">False</property>
<child internal-child="image">
- <widget class="GtkImage" id="image357">
+ <widget class="GtkImage" id="image8">
<property name="visible">True</property>
- <property name="stock">gtk-info</property>
- <property name="icon_size">1</property>
+ <property name="stock">gtk-dialog-info</property>
+ <property name="icon-size">1</property>
</widget>
</child>
</widget>
@@ -236,11 +245,10 @@
</child>
<child>
<widget class="GtkImageMenuItem" id="menu_preferences">
- <property name="visible">True</property>
<property name="label">gtk-preferences</property>
+ <property name="visible">True</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
- <signal name="activate" handler="on_menu_preferences_activate"/>
</widget>
</child>
</widget>
@@ -256,11 +264,10 @@
<widget class="GtkMenu" id="help1_menu">
<child>
<widget class="GtkImageMenuItem" id="menu_about">
- <property name="visible">True</property>
<property name="label">gtk-about</property>
+ <property name="visible">True</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
- <signal name="activate" handler="on_about1_activate"/>
</widget>
</child>
</widget>
@@ -271,12 +278,13 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<widget class="GtkToolbar" id="toolbar1">
<property name="visible">True</property>
- <property name="toolbar_style">GTK_TOOLBAR_BOTH</property>
+ <property name="toolbar_style">both</property>
<child>
<widget class="GtkToolButton" id="toolbar_connect">
<property name="visible">True</property>
@@ -285,39 +293,44 @@
<property name="use_underline">True</property>
<property name="stock_id">gtk-connect</property>
<accessibility>
- <atkproperty name="AtkObject::accessible_name" translatable="yes">Connect</atkproperty>
- <atkproperty name="AtkObject::accessible_description" translatable="yes">Connect to host</atkproperty>
+ <atkproperty name="AtkObject::accessible-name" translatable="yes">Connect</atkproperty>
+ <atkproperty name="AtkObject::accessible-description" translatable="yes">Connect to host</atkproperty>
</accessibility>
</widget>
<packing>
+ <property name="expand">False</property>
<property name="homogeneous">True</property>
</packing>
</child>
<child>
<widget class="GtkToolButton" id="toolbar_disconnect">
<property name="visible">True</property>
+ <property name="sensitive">False</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>
<accessibility>
- <atkproperty name="AtkObject::accessible_name" translatable="yes">Disconnect</atkproperty>
- <atkproperty name="AtkObject::accessible_description" translatable="yes">Disconnect from current host</atkproperty>
+ <atkproperty name="AtkObject::accessible-name" translatable="yes">Disconnect</atkproperty>
+ <atkproperty name="AtkObject::accessible-description" translatable="yes">Disconnect from current host</atkproperty>
</accessibility>
</widget>
<packing>
+ <property name="expand">False</property>
<property name="homogeneous">True</property>
</packing>
</child>
<child>
<widget class="GtkToolButton" id="toolbar_reconnect">
<property name="visible">True</property>
+ <property name="sensitive">False</property>
<property name="tooltip" translatable="yes">Reconnect to current MUD</property>
<property name="label" translatable="yes">Reconnect</property>
<property name="use_underline">True</property>
<property name="stock_id">gtk-refresh</property>
</widget>
<packing>
+ <property name="expand">False</property>
<property name="homogeneous">True</property>
</packing>
</child>
@@ -352,8 +365,8 @@
<property name="label" translatable="yes">label37</property>
</widget>
<packing>
- <property name="type">tab</property>
<property name="tab_fill">False</property>
+ <property name="type">tab</property>
</packing>
</child>
</widget>
@@ -371,9 +384,9 @@
<widget class="GtkScrolledWindow" id="text_view_scroll">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
<child>
<widget class="GtkTextView" id="text_view">
<property name="visible">True</property>
@@ -381,8 +394,14 @@
</widget>
</child>
</widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
</widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
</widget>
<packing>
@@ -402,9 +421,9 @@
<property name="visible">True</property>
<property name="border_width">5</property>
<property name="title" translatable="yes">Save buffer as...</property>
- <property name="window_position">GTK_WIN_POS_CENTER</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
- <property name="action">GTK_FILE_CHOOSER_ACTION_SAVE</property>
+ <property name="window_position">center</property>
+ <property name="type_hint">dialog</property>
+ <property name="action">save</property>
<child internal-child="vbox">
<widget class="GtkVBox" id="dialog-vbox2">
<property name="visible">True</property>
@@ -412,35 +431,45 @@
<child internal-child="action_area">
<widget class="GtkHButtonBox" id="dialog-action_area2">
<property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
+ <property name="layout_style">end</property>
<child>
<widget class="GtkButton" id="button1">
+ <property name="label">gtk-cancel</property>
+ <property name="response_id">-6</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
- <property name="label">gtk-cancel</property>
+ <property name="receives_default">False</property>
<property name="use_stock">True</property>
- <property name="response_id">-6</property>
</widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<widget class="GtkButton" id="button2">
+ <property name="label">gtk-save</property>
+ <property name="response_id">-5</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
- <property name="label">gtk-save</property>
+ <property name="receives_default">False</property>
<property name="use_stock">True</property>
- <property name="response_id">-5</property>
</widget>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</widget>
<packing>
<property name="expand">False</property>
- <property name="pack_type">GTK_PACK_END</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
</packing>
</child>
</widget>
Modified: trunk/ui/muds.glade
==============================================================================
--- trunk/ui/muds.glade (original)
+++ trunk/ui/muds.glade Sun Feb 22 01:21:42 2009
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--*- mode: xml -*-->
+<?xml version="1.0"?>
<glade-interface>
+ <!-- interface-requires gtk+ 2.10 -->
+ <!-- interface-naming-policy toplevel-contextual -->
<widget class="GtkWindow" id="mudviewwindow">
<property name="visible">True</property>
<property name="title" translatable="yes">Connections</property>
- <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+ <property name="window_position">center-on-parent</property>
<property name="default_width">600</property>
<property name="default_height">400</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+ <property name="type_hint">dialog</property>
<property name="skip_taskbar_hint">True</property>
<property name="skip_pager_hint">True</property>
<child>
@@ -17,13 +17,14 @@
<child>
<widget class="GtkToolbar" id="toolbar">
<property name="visible">True</property>
- <property name="toolbar_style">GTK_TOOLBAR_BOTH</property>
+ <property name="toolbar_style">both</property>
<child>
<widget class="GtkToolButton" id="connect_button">
<property name="visible">True</property>
<property name="stock_id">gtk-connect</property>
</widget>
<packing>
+ <property name="expand">False</property>
<property name="homogeneous">True</property>
</packing>
</child>
@@ -31,6 +32,9 @@
<widget class="GtkSeparatorToolItem" id="separatortoolitem1">
<property name="visible">True</property>
</widget>
+ <packing>
+ <property name="expand">False</property>
+ </packing>
</child>
<child>
<widget class="GtkToolButton" id="add_button">
@@ -38,6 +42,7 @@
<property name="stock_id">gtk-add</property>
</widget>
<packing>
+ <property name="expand">False</property>
<property name="homogeneous">True</property>
</packing>
</child>
@@ -47,6 +52,7 @@
<property name="stock_id">gtk-delete</property>
</widget>
<packing>
+ <property name="expand">False</property>
<property name="homogeneous">True</property>
</packing>
</child>
@@ -54,6 +60,9 @@
<widget class="GtkSeparatorToolItem" id="separatortoolitem2">
<property name="visible">True</property>
</widget>
+ <packing>
+ <property name="expand">False</property>
+ </packing>
</child>
<child>
<widget class="GtkToolButton" id="properties_button">
@@ -61,6 +70,7 @@
<property name="stock_id">gtk-properties</property>
</widget>
<packing>
+ <property name="expand">False</property>
<property name="homogeneous">True</property>
</packing>
</child>
@@ -68,14 +78,15 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<widget class="GtkScrolledWindow" id="scrolledwindow">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="hscrollbar_policy">never</property>
+ <property name="vscrollbar_policy">automatic</property>
<child>
<widget class="GtkIconView" id="iconview">
<property name="visible">True</property>
@@ -87,6 +98,107 @@
<property name="position">1</property>
</packing>
</child>
+ <child>
+ <widget class="GtkExpander" id="expander">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="use_markup">True</property>
+ <child>
+ <widget class="GtkVBox" id="vbox4">
+ <property name="visible">True</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <widget class="GtkLabel" id="label7">
+ <property name="visible">True</property>
+ <property name="xalign">0.10000000149011612</property>
+ <property name="label" translatable="yes"><b>Host:</b></property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkEntry" id="entry3">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">●</property>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label8">
+ <property name="visible">True</property>
+ <property name="xalign">0.10000000149011612</property>
+ <property name="label" translatable="yes"><b>Port:</b></property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkEntry" id="entry4">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">●</property>
+ </widget>
+ <packing>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox3">
+ <property name="visible">True</property>
+ <child>
+ <widget class="GtkLabel" id="label9">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">
+</property>
+ <property name="width_chars">32</property>
+ </widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="button3">
+ <property name="label" translatable="yes">gtk-connect</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Quick Connect</b></property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="type">label_item</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
</widget>
</child>
</widget>
@@ -94,10 +206,10 @@
<property name="visible">True</property>
<property name="title" translatable="yes">Connection Properties</property>
<property name="modal">True</property>
- <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+ <property name="window_position">center-on-parent</property>
<property name="default_width">512</property>
<property name="default_height">320</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+ <property name="type_hint">dialog</property>
<property name="skip_taskbar_hint">True</property>
<property name="skip_pager_hint">True</property>
<child>
@@ -115,18 +227,19 @@
<property name="height_request">64</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="response_id">0</property>
+ <property name="receives_default">False</property>
<child>
<widget class="GtkImage" id="icon_image">
<property name="visible">True</property>
- <property name="icon_size">6</property>
<property name="icon_name">gnome-mud</property>
+ <property name="icon-size">6</property>
</widget>
</child>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -142,6 +255,7 @@
<packing>
<property name="expand">False</property>
<property name="padding">5</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -160,6 +274,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -176,6 +291,7 @@
<property name="expand">False</property>
<property name="fill">False</property>
<property name="padding">5</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -189,6 +305,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -205,6 +322,7 @@
<property name="expand">False</property>
<property name="fill">False</property>
<property name="padding">3</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -238,6 +356,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -254,6 +373,7 @@
<property name="expand">False</property>
<property name="fill">False</property>
<property name="padding">3</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -287,6 +407,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -303,6 +424,7 @@
<property name="expand">False</property>
<property name="fill">False</property>
<property name="padding">3</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -341,6 +463,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -371,6 +494,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -385,6 +509,7 @@
<property name="expand">False</property>
<property name="fill">False</property>
<property name="padding">3</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -419,6 +544,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -449,6 +575,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -465,6 +592,7 @@
<property name="expand">False</property>
<property name="fill">False</property>
<property name="padding">3</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -498,6 +626,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -515,15 +644,16 @@
<property name="expand">False</property>
<property name="fill">False</property>
<property name="padding">3</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<widget class="GtkScrolledWindow" id="scrolledwindow1">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
<child>
<widget class="GtkTextView" id="character_logon_textview">
<property name="visible">True</property>
@@ -552,6 +682,9 @@
</packing>
</child>
</widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<widget class="GtkHSeparator" id="hseparator1">
@@ -565,27 +698,34 @@
<child>
<widget class="GtkHButtonBox" id="hbuttonbox2">
<property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
+ <property name="layout_style">end</property>
<child>
<widget class="GtkButton" id="cancel_button">
+ <property name="label">gtk-cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
- <property name="label">gtk-cancel</property>
+ <property name="receives_default">False</property>
<property name="use_stock">True</property>
- <property name="response_id">0</property>
</widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<widget class="GtkButton" id="save_button">
+ <property name="label">gtk-save</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
- <property name="label">gtk-save</property>
+ <property name="receives_default">False</property>
<property name="use_stock">True</property>
- <property name="response_id">0</property>
</widget>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
@@ -603,9 +743,9 @@
<property name="visible">True</property>
<property name="title" translatable="yes">Unsaved Changes</property>
<property name="modal">True</property>
- <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+ <property name="window_position">center-on-parent</property>
<property name="destroy_with_parent">True</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+ <property name="type_hint">dialog</property>
<child internal-child="vbox">
<widget class="GtkVBox" id="dialog-vbox1">
<property name="visible">True</property>
@@ -617,10 +757,11 @@
<property name="visible">True</property>
<property name="yalign">0</property>
<property name="stock">gtk-dialog-warning</property>
- <property name="icon_size">6</property>
+ <property name="icon-size">6</property>
</widget>
<packing>
<property name="expand">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -642,47 +783,60 @@
<child internal-child="action_area">
<widget class="GtkHButtonBox" id="dialog-action_area1">
<property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
+ <property name="layout_style">end</property>
<child>
<widget class="GtkButton" id="close_button">
+ <property name="label" translatable="yes">Close _without Saving</property>
+ <property name="response_id">-7</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
- <property name="label" translatable="yes">Close _without Saving</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
- <property name="response_id">-7</property>
</widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<widget class="GtkButton" id="cancel_button1">
+ <property name="label">gtk-cancel</property>
+ <property name="response_id">-6</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
- <property name="label">gtk-cancel</property>
+ <property name="receives_default">False</property>
<property name="use_stock">True</property>
- <property name="response_id">-6</property>
</widget>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
<child>
<widget class="GtkButton" id="save_button1">
+ <property name="label">gtk-save</property>
+ <property name="response_id">-5</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
- <property name="label">gtk-save</property>
+ <property name="receives_default">False</property>
<property name="use_stock">True</property>
- <property name="response_id">-5</property>
</widget>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">2</property>
</packing>
</child>
</widget>
<packing>
<property name="expand">False</property>
- <property name="pack_type">GTK_PACK_END</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
</packing>
</child>
</widget>
@@ -692,9 +846,9 @@
<property name="visible">True</property>
<property name="title" translatable="yes">Delete Mud?</property>
<property name="modal">True</property>
- <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+ <property name="window_position">center-on-parent</property>
<property name="destroy_with_parent">True</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+ <property name="type_hint">dialog</property>
<child internal-child="vbox">
<widget class="GtkVBox" id="dialog-vbox2">
<property name="visible">True</property>
@@ -705,10 +859,11 @@
<widget class="GtkImage" id="image4">
<property name="visible">True</property>
<property name="stock">gtk-dialog-warning</property>
- <property name="icon_size">6</property>
+ <property name="icon-size">6</property>
</widget>
<packing>
<property name="expand">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -731,34 +886,44 @@
<child internal-child="action_area">
<widget class="GtkHButtonBox" id="dialog-action_area2">
<property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
+ <property name="layout_style">end</property>
<child>
<widget class="GtkButton" id="button1">
+ <property name="label">gtk-cancel</property>
+ <property name="response_id">-6</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
- <property name="label">gtk-cancel</property>
+ <property name="receives_default">False</property>
<property name="use_stock">True</property>
- <property name="response_id">-6</property>
</widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<widget class="GtkButton" id="button2">
+ <property name="label">gtk-delete</property>
+ <property name="response_id">-8</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
- <property name="label">gtk-delete</property>
+ <property name="receives_default">False</property>
<property name="use_stock">True</property>
- <property name="response_id">-8</property>
</widget>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</widget>
<packing>
<property name="expand">False</property>
- <property name="pack_type">GTK_PACK_END</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
</packing>
</child>
</widget>
@@ -767,8 +932,8 @@
<widget class="GtkMenu" id="popupmenu">
<child>
<widget class="GtkImageMenuItem" id="connect">
- <property name="visible">True</property>
<property name="label">gtk-connect</property>
+ <property name="visible">True</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<signal name="activate" handler="on_connect_activate"/>
@@ -781,8 +946,8 @@
</child>
<child>
<widget class="GtkImageMenuItem" id="add">
- <property name="visible">True</property>
<property name="label">gtk-add</property>
+ <property name="visible">True</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<signal name="activate" handler="on_add_activate"/>
@@ -790,8 +955,8 @@
</child>
<child>
<widget class="GtkImageMenuItem" id="delete">
- <property name="visible">True</property>
<property name="label">gtk-delete</property>
+ <property name="visible">True</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<signal name="activate" handler="on_delete_activate"/>
@@ -804,8 +969,8 @@
</child>
<child>
<widget class="GtkImageMenuItem" id="properties">
- <property name="visible">True</property>
<property name="label">gtk-properties</property>
+ <property name="visible">True</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<signal name="activate" handler="on_properties_activate"/>
@@ -816,10 +981,10 @@
<property name="visible">True</property>
<property name="title" translatable="yes">Select An Icon...</property>
<property name="modal">True</property>
- <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+ <property name="window_position">center-on-parent</property>
<property name="default_width">300</property>
<property name="default_height">400</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+ <property name="type_hint">dialog</property>
<child internal-child="vbox">
<widget class="GtkVBox" id="dialog-vbox3">
<property name="visible">True</property>
@@ -829,19 +994,20 @@
<child>
<widget class="GtkFileChooserButton" id="chooser">
<property name="visible">True</property>
- <property name="action">GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER</property>
+ <property name="action">select-folder</property>
<property name="title" translatable="yes">Select A Folder</property>
</widget>
<packing>
<property name="expand">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<widget class="GtkScrolledWindow" id="scrolledwindow2">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
<child>
<widget class="GtkIconView" id="view">
<property name="visible">True</property>
@@ -861,34 +1027,44 @@
<child internal-child="action_area">
<widget class="GtkHButtonBox" id="dialog-action_area3">
<property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
+ <property name="layout_style">end</property>
<child>
<widget class="GtkButton" id="button3">
+ <property name="label">gtk-cancel</property>
+ <property name="response_id">-6</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
- <property name="label">gtk-cancel</property>
+ <property name="receives_default">False</property>
<property name="use_stock">True</property>
- <property name="response_id">-6</property>
</widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<widget class="GtkButton" id="button4">
+ <property name="label">gtk-ok</property>
+ <property name="response_id">-5</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
- <property name="label">gtk-ok</property>
+ <property name="receives_default">False</property>
<property name="use_stock">True</property>
- <property name="response_id">-5</property>
</widget>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</widget>
<packing>
<property name="expand">False</property>
- <property name="pack_type">GTK_PACK_END</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
</packing>
</child>
</widget>
Modified: trunk/ui/prefs.glade
==============================================================================
--- trunk/ui/prefs.glade (original)
+++ trunk/ui/prefs.glade Sun Feb 22 01:21:42 2009
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--*- mode: xml -*-->
+<?xml version="1.0"?>
<glade-interface>
+ <!-- interface-requires gtk+ 2.10 -->
+ <!-- interface-naming-policy toplevel-contextual -->
<widget class="GtkDialog" id="preferences_window">
<property name="visible">True</property>
<property name="title" translatable="yes">Preferences</property>
- <property name="window_position">GTK_WIN_POS_CENTER</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+ <property name="window_position">center</property>
+ <property name="type_hint">dialog</property>
<property name="skip_taskbar_hint">True</property>
<property name="skip_pager_hint">True</property>
<child internal-child="vbox">
@@ -22,9 +22,9 @@
<property name="width_request">185</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
<child>
<widget class="GtkTreeView" id="treeview">
<property name="visible">True</property>
@@ -33,6 +33,9 @@
</widget>
</child>
</widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<widget class="GtkNotebook" id="notebook">
@@ -50,8 +53,8 @@
<property name="label" translatable="yes">Blank</property>
</widget>
<packing>
- <property name="type">tab</property>
<property name="tab_fill">False</property>
+ <property name="type">tab</property>
</packing>
</child>
<child>
@@ -70,6 +73,7 @@
</widget>
<packing>
<property name="expand">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -83,6 +87,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -90,25 +95,26 @@
<property name="visible">True</property>
<child>
<widget class="GtkCheckButton" id="cb_echo">
+ <property name="label" translatable="yes">_Echo the Text Sent</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">_Echo the Text Sent</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<widget class="GtkCheckButton" id="cb_keep">
+ <property name="label" translatable="yes">_Keep the Text Entered</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">_Keep the Text Entered</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
</widget>
<packing>
@@ -119,11 +125,11 @@
</child>
<child>
<widget class="GtkCheckButton" id="cb_system">
+ <property name="label" translatable="yes">Disable _System Keys</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Disable _System Keys</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
</widget>
<packing>
@@ -154,6 +160,7 @@
<property name="expand">False</property>
<property name="fill">False</property>
<property name="padding">2</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -219,6 +226,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -233,6 +241,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -297,11 +306,11 @@
</child>
<child>
<widget class="GtkCheckButton" id="encoding_check">
+ <property name="label" translatable="yes">Enable Encoding Negotiation</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Enable Encoding Negotiation</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
</widget>
<packing>
@@ -346,6 +355,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -353,16 +363,17 @@
<property name="visible">True</property>
<child>
<widget class="GtkCheckButton" id="proxy_check">
+ <property name="label" translatable="yes">Enable Proxy</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Enable Proxy</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -376,6 +387,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -395,6 +407,7 @@
<property name="expand">False</property>
<property name="fill">False</property>
<property name="padding">2</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -421,6 +434,9 @@
</packing>
</child>
</widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
</widget>
<packing>
@@ -443,6 +459,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -459,6 +476,7 @@
<property name="expand">False</property>
<property name="fill">False</property>
<property name="padding">2</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -529,6 +547,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -536,25 +555,26 @@
<property name="visible">True</property>
<child>
<widget class="GtkCheckButton" id="sound_check">
+ <property name="label" translatable="yes">Enable Sound</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Enable Sound</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<widget class="GtkCheckButton" id="msp_check">
+ <property name="label" translatable="yes">Enable Remote Download</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Enable Remote Download</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
</widget>
<packing>
@@ -592,8 +612,8 @@
<property name="label" translatable="yes">Functionality</property>
</widget>
<packing>
- <property name="type">tab</property>
<property name="tab_fill">False</property>
+ <property name="type">tab</property>
</packing>
</child>
<child>
@@ -608,7 +628,7 @@
<widget class="GtkColorButton" id="cp_background">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="response_id">0</property>
+ <property name="receives_default">False</property>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -623,7 +643,7 @@
<widget class="GtkColorButton" id="cp_foreground">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="response_id">0</property>
+ <property name="receives_default">False</property>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -638,7 +658,7 @@
<widget class="GtkFontButton" id="fp_font">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="response_id">0</property>
+ <property name="receives_default">False</property>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -656,7 +676,7 @@
<widget class="GtkColorButton" id="cp15">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="response_id">0</property>
+ <property name="receives_default">False</property>
</widget>
<packing>
<property name="left_attach">7</property>
@@ -671,7 +691,7 @@
<widget class="GtkColorButton" id="cp14">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="response_id">0</property>
+ <property name="receives_default">False</property>
</widget>
<packing>
<property name="left_attach">6</property>
@@ -686,7 +706,7 @@
<widget class="GtkColorButton" id="cp13">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="response_id">0</property>
+ <property name="receives_default">False</property>
</widget>
<packing>
<property name="left_attach">5</property>
@@ -701,7 +721,7 @@
<widget class="GtkColorButton" id="cp12">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="response_id">0</property>
+ <property name="receives_default">False</property>
</widget>
<packing>
<property name="left_attach">4</property>
@@ -716,7 +736,7 @@
<widget class="GtkColorButton" id="cp11">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="response_id">0</property>
+ <property name="receives_default">False</property>
</widget>
<packing>
<property name="left_attach">3</property>
@@ -731,7 +751,7 @@
<widget class="GtkColorButton" id="cp10">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="response_id">0</property>
+ <property name="receives_default">False</property>
</widget>
<packing>
<property name="left_attach">2</property>
@@ -746,7 +766,7 @@
<widget class="GtkColorButton" id="cp9">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="response_id">0</property>
+ <property name="receives_default">False</property>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -761,7 +781,7 @@
<widget class="GtkColorButton" id="cp8">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="response_id">0</property>
+ <property name="receives_default">False</property>
</widget>
<packing>
<property name="top_attach">1</property>
@@ -774,7 +794,7 @@
<widget class="GtkColorButton" id="cp7">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="response_id">0</property>
+ <property name="receives_default">False</property>
</widget>
<packing>
<property name="left_attach">7</property>
@@ -787,7 +807,7 @@
<widget class="GtkColorButton" id="cp6">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="response_id">0</property>
+ <property name="receives_default">False</property>
</widget>
<packing>
<property name="left_attach">6</property>
@@ -800,7 +820,7 @@
<widget class="GtkColorButton" id="cp5">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="response_id">0</property>
+ <property name="receives_default">False</property>
</widget>
<packing>
<property name="left_attach">5</property>
@@ -813,7 +833,7 @@
<widget class="GtkColorButton" id="cp4">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="response_id">0</property>
+ <property name="receives_default">False</property>
</widget>
<packing>
<property name="left_attach">4</property>
@@ -826,7 +846,7 @@
<widget class="GtkColorButton" id="cp3">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="response_id">0</property>
+ <property name="receives_default">False</property>
</widget>
<packing>
<property name="left_attach">3</property>
@@ -839,7 +859,7 @@
<widget class="GtkColorButton" id="cp2">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="response_id">0</property>
+ <property name="receives_default">False</property>
</widget>
<packing>
<property name="left_attach">2</property>
@@ -852,7 +872,7 @@
<widget class="GtkColorButton" id="cp1">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="response_id">0</property>
+ <property name="receives_default">False</property>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -865,7 +885,7 @@
<widget class="GtkColorButton" id="cp0">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="response_id">0</property>
+ <property name="receives_default">False</property>
</widget>
<packing>
<property name="x_options">GTK_FILL</property>
@@ -943,9 +963,9 @@
<property name="label" translatable="yes">Color and Fonts</property>
</widget>
<packing>
- <property name="type">tab</property>
<property name="position">1</property>
<property name="tab_fill">False</property>
+ <property name="type">tab</property>
</packing>
</child>
<child>
@@ -965,6 +985,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -995,16 +1016,17 @@
</widget>
<packing>
<property name="expand">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<widget class="GtkCheckButton" id="cb_scrollback">
+ <property name="label" translatable="yes">S_croll on output</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="receives_default">False</property>
<property name="tooltip" translatable="yes">If enabled, whenever there's new output the terminal will be scrolled to the bottom.</property>
- <property name="label" translatable="yes">S_croll on output</property>
<property name="use_underline">True</property>
- <property name="response_id">0</property>
<property name="draw_indicator">True</property>
</widget>
<packing>
@@ -1024,9 +1046,9 @@
<property name="label" translatable="yes">Terminal</property>
</widget>
<packing>
- <property name="type">tab</property>
<property name="position">2</property>
<property name="tab_fill">False</property>
+ <property name="type">tab</property>
</packing>
</child>
</widget>
@@ -1040,9 +1062,9 @@
<property name="label" translatable="yes">Preferences</property>
</widget>
<packing>
- <property name="type">tab</property>
<property name="position">1</property>
<property name="tab_fill">False</property>
+ <property name="type">tab</property>
</packing>
</child>
<child>
@@ -1056,9 +1078,9 @@
<widget class="GtkScrolledWindow" id="scrolledwindow4">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
<child>
<widget class="GtkTreeView" id="alias_treeview">
<property name="visible">True</property>
@@ -1066,20 +1088,28 @@
</widget>
</child>
</widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<widget class="GtkVButtonBox" id="vbuttonbox2">
<property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_START</property>
+ <property name="layout_style">start</property>
<child>
<widget class="GtkButton" id="alias_del">
+ <property name="label">gtk-delete</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
- <property name="label">gtk-delete</property>
+ <property name="receives_default">False</property>
<property name="use_stock">True</property>
- <property name="response_id">0</property>
</widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
</child>
</widget>
<packing>
@@ -1111,19 +1141,22 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<widget class="GtkEntry" id="alias_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">*</property>
</widget>
<packing>
<property name="position">1</property>
</packing>
</child>
</widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<widget class="GtkHBox" id="hbox34">
@@ -1141,15 +1174,16 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<widget class="GtkScrolledWindow" id="scrolledwindow11">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
<child>
<widget class="GtkTextView" id="alias_regex_textview">
<property name="visible">True</property>
@@ -1182,15 +1216,16 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<widget class="GtkScrolledWindow" id="scrolledwindow12">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
<child>
<widget class="GtkTextView" id="alias_textview">
<property name="visible">True</property>
@@ -1228,13 +1263,13 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<widget class="GtkEntry" id="alias_match_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">*</property>
</widget>
<packing>
<property name="position">1</property>
@@ -1244,7 +1279,7 @@
<widget class="GtkButton" id="alias_match_test">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="response_id">0</property>
+ <property name="receives_default">False</property>
<child>
<widget class="GtkAlignment" id="alignment2">
<property name="visible">True</property>
@@ -1262,6 +1297,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -1318,6 +1354,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -1331,15 +1368,16 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<widget class="GtkScrolledWindow" id="scrolledwindow10">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
<child>
<widget class="GtkTreeView" id="alias_match_treeview">
<property name="visible">True</property>
@@ -1373,16 +1411,21 @@
<child>
<widget class="GtkHButtonBox" id="hbuttonbox4">
<property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
+ <property name="layout_style">end</property>
<child>
<widget class="GtkButton" id="alias_ok">
+ <property name="label">gtk-save</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
- <property name="label">gtk-ok</property>
+ <property name="receives_default">False</property>
<property name="use_stock">True</property>
- <property name="response_id">0</property>
</widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
</child>
</widget>
<packing>
@@ -1407,9 +1450,9 @@
<property name="label" translatable="yes">Aliases</property>
</widget>
<packing>
- <property name="type">tab</property>
<property name="position">2</property>
<property name="tab_fill">False</property>
+ <property name="type">tab</property>
</packing>
</child>
<child>
@@ -1423,9 +1466,9 @@
<widget class="GtkScrolledWindow" id="scrolledwindow6">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
<child>
<widget class="GtkTreeView" id="trigger_treeview">
<property name="visible">True</property>
@@ -1433,20 +1476,28 @@
</widget>
</child>
</widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<widget class="GtkVButtonBox" id="vbuttonbox3">
<property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_START</property>
+ <property name="layout_style">start</property>
<child>
<widget class="GtkButton" id="trigger_del">
+ <property name="label">gtk-delete</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
- <property name="label">gtk-delete</property>
+ <property name="receives_default">False</property>
<property name="use_stock">True</property>
- <property name="response_id">0</property>
</widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
</child>
</widget>
<packing>
@@ -1478,13 +1529,13 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<widget class="GtkEntry" id="trigger_name_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">*</property>
</widget>
<packing>
<property name="position">1</property>
@@ -1493,6 +1544,7 @@
</widget>
<packing>
<property name="expand">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -1511,15 +1563,16 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<widget class="GtkScrolledWindow" id="scrolledwindow8">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
<child>
<widget class="GtkTextView" id="trigger_regex_textview">
<property name="visible">True</property>
@@ -1553,15 +1606,16 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<widget class="GtkScrolledWindow" id="scrolledwindow7">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
<child>
<widget class="GtkTextView" id="trigger_action_textview">
<property name="visible">True</property>
@@ -1586,6 +1640,9 @@
<widget class="GtkHSeparator" id="hseparator1">
<property name="visible">True</property>
</widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
</widget>
<packing>
@@ -1610,13 +1667,13 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<widget class="GtkEntry" id="trigger_match_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">*</property>
</widget>
<packing>
<property name="position">1</property>
@@ -1626,7 +1683,7 @@
<widget class="GtkButton" id="trigger_match_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="response_id">0</property>
+ <property name="receives_default">False</property>
<child>
<widget class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
@@ -1644,6 +1701,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -1672,6 +1730,7 @@
</widget>
<packing>
<property name="expand">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -1681,6 +1740,9 @@
<widget class="GtkHSeparator" id="hseparator2">
<property name="visible">True</property>
</widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
</widget>
<packing>
@@ -1702,6 +1764,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -1715,15 +1778,16 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<widget class="GtkScrolledWindow" id="scrolledwindow9">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
<child>
<widget class="GtkTreeView" id="trigger_match_treeview">
<property name="visible">True</property>
@@ -1757,6 +1821,9 @@
<widget class="GtkHSeparator" id="hseparator3">
<property name="visible">True</property>
</widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
</widget>
<packing>
@@ -1770,18 +1837,26 @@
<child>
<widget class="GtkHButtonBox" id="hbuttonbox3">
<property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
+ <property name="layout_style">end</property>
<child>
<widget class="GtkButton" id="trigger_ok">
+ <property name="label">gtk-save</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
- <property name="label">gtk-ok</property>
+ <property name="receives_default">False</property>
<property name="use_stock">True</property>
- <property name="response_id">0</property>
</widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
</child>
</widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
</widget>
<packing>
@@ -1806,9 +1881,9 @@
<property name="label" translatable="yes">Triggers</property>
</widget>
<packing>
- <property name="type">tab</property>
<property name="position">3</property>
<property name="tab_fill">False</property>
+ <property name="type">tab</property>
</packing>
</child>
</widget>
@@ -1824,21 +1899,28 @@
<child internal-child="action_area">
<widget class="GtkHButtonBox" id="hbuttonbox1">
<property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
+ <property name="layout_style">end</property>
<child>
<widget class="GtkButton" id="button1">
+ <property name="label">gtk-close</property>
+ <property name="response_id">-7</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
- <property name="label">gtk-close</property>
+ <property name="receives_default">False</property>
<property name="use_stock">True</property>
- <property name="response_id">-7</property>
</widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
</child>
</widget>
<packing>
<property name="expand">False</property>
- <property name="pack_type">GTK_PACK_END</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
</packing>
</child>
</widget>
@@ -1847,9 +1929,9 @@
<widget class="GtkDialog" id="newprofile_dialog">
<property name="visible">True</property>
<property name="title" translatable="yes">New Profile</property>
- <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+ <property name="window_position">center-on-parent</property>
<property name="default_width">350</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+ <property name="type_hint">dialog</property>
<property name="skip_taskbar_hint">True</property>
<property name="skip_pager_hint">True</property>
<child internal-child="vbox">
@@ -1867,13 +1949,13 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<widget class="GtkEntry" id="entry_profile">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">*</property>
</widget>
<packing>
<property name="position">1</property>
@@ -1888,34 +1970,44 @@
<child internal-child="action_area">
<widget class="GtkHButtonBox" id="dialog-action_area2">
<property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
+ <property name="layout_style">end</property>
<child>
<widget class="GtkButton" id="cancelbutton1">
+ <property name="label">gtk-cancel</property>
+ <property name="response_id">-6</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
- <property name="label">gtk-cancel</property>
+ <property name="receives_default">False</property>
<property name="use_stock">True</property>
- <property name="response_id">-6</property>
</widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<widget class="GtkButton" id="okbutton1">
+ <property name="label">gtk-ok</property>
+ <property name="response_id">-5</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
- <property name="label">gtk-ok</property>
+ <property name="receives_default">False</property>
<property name="use_stock">True</property>
- <property name="response_id">-5</property>
</widget>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</widget>
<packing>
<property name="expand">False</property>
- <property name="pack_type">GTK_PACK_END</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
</packing>
</child>
</widget>
@@ -1924,8 +2016,8 @@
<widget class="GtkDialog" id="regex_error_dialog">
<property name="visible">True</property>
<property name="title" translatable="yes">Regex Error</property>
- <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+ <property name="window_position">center-on-parent</property>
+ <property name="type_hint">dialog</property>
<property name="skip_taskbar_hint">True</property>
<property name="skip_pager_hint">True</property>
<child internal-child="vbox">
@@ -1948,6 +2040,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -1961,6 +2054,9 @@
</packing>
</child>
</widget>
+ <packing>
+ <property name="position">0</property>
+ </packing>
</child>
<child>
<widget class="GtkHBox" id="hbox28">
@@ -1976,6 +2072,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -2002,12 +2099,13 @@
<property name="visible">True</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">Error At:</property>
- <property name="justify">GTK_JUSTIFY_RIGHT</property>
+ <property name="justify">right</property>
<property name="width_chars">11</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
@@ -2033,21 +2131,28 @@
<child internal-child="action_area">
<widget class="GtkHButtonBox" id="dialog-action_area3">
<property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
+ <property name="layout_style">end</property>
<child>
<widget class="GtkButton" id="closebutton1">
+ <property name="label">gtk-close</property>
+ <property name="response_id">-7</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
- <property name="label">gtk-close</property>
+ <property name="receives_default">False</property>
<property name="use_stock">True</property>
- <property name="response_id">-7</property>
</widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
</child>
</widget>
<packing>
<property name="expand">False</property>
- <property name="pack_type">GTK_PACK_END</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
</packing>
</child>
</widget>
@@ -2055,7 +2160,7 @@
</widget>
<widget class="GtkWindow" id="profiles_window">
<property name="title" translatable="yes">Profiles</property>
- <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+ <property name="window_position">center-on-parent</property>
<property name="default_width">300</property>
<property name="default_height">350</property>
<property name="destroy_with_parent">True</property>
@@ -2073,6 +2178,7 @@
<property name="stock_id">gtk-add</property>
</widget>
<packing>
+ <property name="expand">False</property>
<property name="homogeneous">True</property>
</packing>
</child>
@@ -2082,20 +2188,22 @@
<property name="stock_id">gtk-delete</property>
</widget>
<packing>
+ <property name="expand">False</property>
<property name="homogeneous">True</property>
</packing>
</child>
</widget>
<packing>
<property name="expand">False</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<widget class="GtkScrolledWindow" id="scrolledwindow2">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="hscrollbar_policy">automatic</property>
+ <property name="vscrollbar_policy">automatic</property>
<child>
<widget class="GtkTreeView" id="profilesView">
<property name="visible">True</property>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
