[gnome-mud] Another Patch - W/ More stuff
- From: "Paul Esson" <paul esson gmail com>
- To: gnome-mud-list gnome org
- Subject: [gnome-mud] Another Patch - W/ More stuff
- Date: Wed, 29 Mar 2006 01:19:14 +1100
Heres the days patch
- Paul
? allinadayswork.diff
? tabLabels.diff
? withtooltips.diff
? po/stamp-it
? src/todo.txt
? src/svg/connection-offline.png
? src/svg/connection-online.png
? ui/main.gladep
Index: src/mud-window-mconnect.c
===================================================================
RCS file: /cvs/gnome/gnome-mud/src/mud-window-mconnect.c,v
retrieving revision 1.9
diff -u -r1.9 mud-window-mconnect.c
--- src/mud-window-mconnect.c 5 Jan 2006 19:42:09 -0000 1.9
+++ src/mud-window-mconnect.c 28 Mar 2006 14:18:04 -0000
@@ -257,7 +257,7 @@
mconnect->priv->view = mud_connection_view_new("Default", mconnect->priv->SelHost, mconnect->priv->SelPort, mconnect->priv->winwidget, (GtkWidget *)mconnect->priv->tray);
- mud_window_add_connection_view(mconnect->priv->window, mconnect->priv->view);
+ mud_window_add_connection_view(mconnect->priv->window, mconnect->priv->view, mconnect->priv->SelHost);
mud_connection_view_set_profile(mconnect->priv->view, get_profile((const gchar *)mud_profile_from_number(gtk_combo_box_get_active(GTK_COMBO_BOX(mconnect->priv->profileCombo)))));
mud_window_profile_menu_set_active(mud_profile_from_number(gtk_combo_box_get_active(GTK_COMBO_BOX(mconnect->priv->profileCombo))),mconnect->priv->window);
Index: src/mud-window.c
===================================================================
RCS file: /cvs/gnome/gnome-mud/src/mud-window.c,v
retrieving revision 1.15
diff -u -r1.15 mud-window.c
--- src/mud-window.c 4 Feb 2006 15:57:14 -0000 1.15
+++ src/mud-window.c 28 Mar 2006 14:18:05 -0000
@@ -82,7 +82,7 @@
}
void
-mud_window_add_connection_view(MudWindow *window, MudConnectionView *view)
+mud_window_add_connection_view(MudWindow *window, MudConnectionView *view, gchar* connectionName)
{
gint nr;
MudViewEntry *entry;
@@ -98,7 +98,7 @@
window->priv->image = NULL;
}
- nr = gtk_notebook_append_page(GTK_NOTEBOOK(window->priv->notebook), mud_connection_view_get_viewport(view), NULL);
+ nr = gtk_notebook_append_page(GTK_NOTEBOOK(window->priv->notebook), mud_connection_view_get_viewport(view), gtk_label_new(connectionName));
gtk_notebook_set_current_page(GTK_NOTEBOOK(window->priv->notebook), nr);
mud_connection_view_set_id(view, nr);
@@ -172,7 +172,10 @@
mud_window_remove_connection_view(window, nr);
if(window->priv->nr_of_tabs == 0)
+ {
mud_tray_update_icon(window->priv->tray, offline_connecting);
+
+ }
}
}
@@ -299,7 +302,7 @@
gtk_window_get_size(GTK_WINDOW(window->priv->window), &w, &h);
- gtk_paned_set_position(GTK_PANED(window->priv->mainvpane),h - 62);
+ // gtk_paned_set_position(GTK_PANED(window->priv->mainvpane),h - 62);
window->priv->toggleState = 0;
}
@@ -311,7 +314,7 @@
gtk_window_get_size(GTK_WINDOW(window->priv->window), &w, &h);
- gtk_paned_set_position(GTK_PANED(window->priv->mainvpane),h - 124);
+ // gtk_paned_set_position(GTK_PANED(window->priv->mainvpane),h - 124);
window->priv->toggleState = 1;
}
@@ -334,8 +337,8 @@
gtk_image_set_from_pixbuf(GTK_IMAGE(window->priv->image), buf);
}
- if(!window->priv->toggleState)
- gtk_paned_set_position(GTK_PANED(window->priv->mainvpane),h - 62);
+// if(!window->priv->toggleState)
+// gtk_paned_set_position(GTK_PANED(window->priv->mainvpane),h - 124);
return FALSE;
}
@@ -381,7 +384,7 @@
mud_tray_update_icon(window->priv->tray, offline);
view = mud_connection_view_new("Default", host, iport, window->priv->window, (GtkWidget *)window->priv->tray);
- mud_window_add_connection_view(window, view);
+ mud_window_add_connection_view(window, view, host);
}
@@ -529,22 +532,21 @@
/* connect quit buttons */
g_signal_connect(window->priv->window, "destroy", G_CALLBACK(mud_window_close), window);
g_signal_connect(glade_xml_get_widget(glade, "menu_quit"), "activate", G_CALLBACK(mud_window_close), window);
- //FIXME g_signal_connect(glade_xml_get_widget(glade, "toolbar_quit"), "clicked", G_CALLBACK(mud_window_close), window);
+ g_signal_connect(glade_xml_get_widget(glade, "toolbar_quit"), "clicked", G_CALLBACK(mud_window_close), window);
/* 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);
- //FIXME g_signal_connect(glade_xml_get_widget(glade, "toolbar_connect"), "clicked", 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_connect_dialog), window);
/* connect disconnect buttons */
g_signal_connect(glade_xml_get_widget(glade, "menu_disconnect"), "activate", G_CALLBACK(mud_window_disconnect_cb), window);
- //FIXME g_signal_connect(glade_xml_get_widget(glade, "toolbar_disconnect"), "clicked", 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);
/* connect reconnect buttons */
g_signal_connect(glade_xml_get_widget(glade, "menu_reconnect"), "activate", G_CALLBACK(mud_window_reconnect_cb), window);
- //FIXME g_signal_connect(glade_xml_get_widget(glade, "toolbar_reconnect"), "clicked", 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);
/* connect close window button */
g_signal_connect(glade_xml_get_widget(glade, "menu_closewindow"), "activate", G_CALLBACK(mud_window_closewindow_cb), window);
@@ -553,6 +555,7 @@
window->priv->mi_profiles = glade_xml_get_widget(glade, "mi_profiles_menu");
g_signal_connect(glade_xml_get_widget(glade, "menu_preferences"), "activate", G_CALLBACK(mud_window_preferences_cb), window);
+ //g_signal_connect(glade_xml_get_widget(glade, "toolbar_preferences"), "clicked", G_CALLBACK(mud_window_preferences_cb), window);
g_signal_connect(glade_xml_get_widget(glade, "menu_about"), "activate", G_CALLBACK(mud_window_about_cb), window);
@@ -577,7 +580,7 @@
window->priv->mainvpane = glade_xml_get_widget(glade, "main_vpane");
gtk_window_get_size(GTK_WINDOW(window->priv->window), &w, &h);
- gtk_paned_set_position(GTK_PANED(window->priv->mainvpane),h - 62);
+ //gtk_paned_set_position(GTK_PANED(window->priv->mainvpane),h - 62);
window->priv->image = glade_xml_get_widget(glade, "image");
Index: src/mud-window.h
===================================================================
RCS file: /cvs/gnome/gnome-mud/src/mud-window.h,v
retrieving revision 1.6
diff -u -r1.6 mud-window.h
--- src/mud-window.h 5 Jan 2006 13:02:44 -0000 1.6
+++ src/mud-window.h 28 Mar 2006 14:18:05 -0000
@@ -32,7 +32,7 @@
GType mud_window_get_type (void) G_GNUC_CONST;
MudWindow* mud_window_new (GConfClient *client);
-void mud_window_add_connection_view(MudWindow *window, MudConnectionView *view);
+void mud_window_add_connection_view(MudWindow *window, MudConnectionView *view, gchar* connectionName);
void mud_window_handle_plugins(MudWindow *window, gint id, gchar *data, gint dir);
void mud_window_populate_profiles_menu(MudWindow *window);
void mud_window_profile_menu_set_active(gchar *name, MudWindow *window);
Index: src/pixmaps/connection-offline.png
===================================================================
RCS file: /cvs/gnome/gnome-mud/src/pixmaps/connection-offline.png,v
retrieving revision 1.1
diff -u -r1.1 connection-offline.png
Binary files /tmp/cvsY3vRWY and connection-offline.png differ
Index: src/pixmaps/connection-online.png
===================================================================
RCS file: /cvs/gnome/gnome-mud/src/pixmaps/connection-online.png,v
retrieving revision 1.1
diff -u -r1.1 connection-online.png
Binary files /tmp/cvsr4OkAj and connection-online.png differ
Index: ui/main.glade
===================================================================
RCS file: /cvs/gnome/gnome-mud/ui/main.glade,v
retrieving revision 1.14
diff -u -r1.14 main.glade
--- ui/main.glade 4 Jan 2006 13:10:32 -0000 1.14
+++ ui/main.glade 28 Mar 2006 14:18:06 -0000
@@ -51,7 +51,7 @@
<accelerator key="o" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image165">
+ <widget class="GtkImage" id="image181">
<property name="visible">True</property>
<property name="stock">gtk-new</property>
<property name="icon_size">1</property>
@@ -72,7 +72,7 @@
<signal name="activate" handler="on_mudlist_listing1_activate" last_modification_time="Mon, 16 Feb 2004 12:51:31 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image166">
+ <widget class="GtkImage" id="image182">
<property name="visible">True</property>
<property name="stock">gtk-new</property>
<property name="icon_size">1</property>
@@ -99,9 +99,9 @@
<signal name="activate" handler="on_connect1_activate" last_modification_time="Mon, 16 Feb 2004 12:51:31 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image167">
+ <widget class="GtkImage" id="image183">
<property name="visible">True</property>
- <property name="stock">gtk-open</property>
+ <property name="stock">gtk-connect</property>
<property name="icon_size">1</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
@@ -120,9 +120,9 @@
<signal name="activate" handler="on_disconnect1_activate" last_modification_time="Mon, 16 Feb 2004 12:51:31 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image168">
+ <widget class="GtkImage" id="image184">
<property name="visible">True</property>
- <property name="stock">gtk-close</property>
+ <property name="stock">gtk-disconnect</property>
<property name="icon_size">1</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
@@ -141,7 +141,7 @@
<signal name="activate" handler="on_reconnect1_activate" last_modification_time="Mon, 16 Feb 2004 12:51:31 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image169">
+ <widget class="GtkImage" id="image185">
<property name="visible">True</property>
<property name="stock">gtk-refresh</property>
<property name="icon_size">1</property>
@@ -168,7 +168,7 @@
<signal name="activate" handler="on_start_logging1_activate" last_modification_time="Mon, 16 Feb 2004 12:51:31 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image170">
+ <widget class="GtkImage" id="image186">
<property name="visible">True</property>
<property name="stock">gtk-new</property>
<property name="icon_size">1</property>
@@ -189,7 +189,7 @@
<signal name="activate" handler="on_stop_logging1_activate" last_modification_time="Mon, 16 Feb 2004 12:51:31 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image171">
+ <widget class="GtkImage" id="image187">
<property name="visible">True</property>
<property name="stock">gtk-close</property>
<property name="icon_size">1</property>
@@ -210,7 +210,7 @@
<signal name="activate" handler="on_save_buffer1_activate" last_modification_time="Mon, 16 Feb 2004 12:51:31 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image172">
+ <widget class="GtkImage" id="image188">
<property name="visible">True</property>
<property name="stock">gtk-save</property>
<property name="icon_size">1</property>
@@ -312,7 +312,7 @@
<signal name="activate" handler="on_plugin_list_activate" last_modification_time="Mon, 02 Jan 2006 00:45:48 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image173">
+ <widget class="GtkImage" id="image189">
<property name="visible">True</property>
<property name="stock">gtk-info</property>
<property name="icon_size">1</property>
@@ -390,23 +390,86 @@
<property name="show_arrow">True</property>
<child>
- <placeholder/>
+ <widget class="GtkToolButton" id="toolbar_connect">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Connect to MUD</property>
+ <property name="stock_id">gtk-connect</property>
+ <property name="visible_horizontal">True</property>
+ <property name="visible_vertical">True</property>
+ <property name="is_important">False</property>
+ <accessibility>
+ <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>
- <placeholder/>
+ <widget class="GtkToolButton" id="toolbar_disconnect">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Disconnect from current MUD</property>
+ <property name="stock_id">gtk-disconnect</property>
+ <property name="visible_horizontal">True</property>
+ <property name="visible_vertical">True</property>
+ <property name="is_important">False</property>
+ <accessibility>
+ <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>
- <placeholder/>
+ <widget class="GtkToolButton" id="toolbar_reconnect">
+ <property name="visible">True</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>
+ <property name="visible_horizontal">True</property>
+ <property name="visible_vertical">True</property>
+ <property name="is_important">False</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
</child>
<child>
- <placeholder/>
+ <widget class="GtkSeparatorToolItem" id="separatortoolitem1">
+ <property name="visible">True</property>
+ <property name="draw">True</property>
+ <property name="visible_horizontal">True</property>
+ <property name="visible_vertical">True</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">False</property>
+ </packing>
</child>
<child>
- <placeholder/>
+ <widget class="GtkToolButton" id="toolbar_quit">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Quit GNOME-Mud</property>
+ <property name="stock_id">gtk-quit</property>
+ <property name="visible_horizontal">True</property>
+ <property name="visible_vertical">True</property>
+ <property name="is_important">False</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
</child>
</widget>
</child>
@@ -419,10 +482,10 @@
</child>
<child>
- <widget class="GtkVPaned" id="main_vpane">
+ <widget class="GtkVBox" id="vbox5">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="position">314</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
<child>
<widget class="GtkNotebook" id="notebook">
@@ -442,7 +505,7 @@
<property name="ypad">0</property>
</widget>
<packing>
- <property name="tab_expand">False</property>
+ <property name="tab_expand">True</property>
<property name="tab_fill">True</property>
</packing>
</child>
@@ -471,8 +534,9 @@
</child>
</widget>
<packing>
- <property name="shrink">True</property>
- <property name="resize">False</property>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
</packing>
</child>
@@ -490,6 +554,7 @@
<child>
<widget class="GtkEntry" id="text_entry">
+ <property name="height_request">25</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="editable">True</property>
@@ -518,7 +583,6 @@
<child>
<widget class="GtkTextView" id="text_view">
- <property name="visible">True</property>
<property name="can_focus">True</property>
<property name="editable">True</property>
<property name="overwrite">False</property>
@@ -577,8 +641,9 @@
</child>
</widget>
<packing>
- <property name="shrink">True</property>
- <property name="resize">True</property>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
</packing>
</child>
</widget>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
