[vinagre] Use GtkGrid rather than deprecated GtkTable
- From: David King <davidk src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vinagre] Use GtkGrid rather than deprecated GtkTable
- Date: Sun, 30 Oct 2011 18:32:47 +0000 (UTC)
commit 77f29613b2df75435a975fe483c3fab340fb1b9e
Author: Victoria Martinez de la Cruz <vickymsee gmail com>
Date: Sun Oct 30 14:06:51 2011 -0300
Use GtkGrid rather than deprecated GtkTable
Fixes bug 660432.
data/vinagre.ui | 259 +++++++++++++++++++---------------
plugins/spice/vinagre-spice-plugin.c | 17 +--
2 files changed, 154 insertions(+), 122 deletions(-)
---
diff --git a/data/vinagre.ui b/data/vinagre.ui
index 88309e8..22b4143 100644
--- a/data/vinagre.ui
+++ b/data/vinagre.ui
@@ -128,27 +128,47 @@ Jonh Wendell <jwendell gnome org></property>
</packing>
</child>
<child>
- <object class="GtkTable" id="table3">
+ <object class="GtkGrid" id="grid3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">6</property>
<property name="n_rows">4</property>
<property name="n_columns">2</property>
- <property name="column_spacing">6</property>
- <property name="row_spacing">6</property>
<child>
- <object class="GtkEntry" id="username_entry">
+ <object class="GtkLabel" id="label19">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="max_length">254</property>
- <property name="activates_default">True</property>
+ <property name="margin_left">12</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Host:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">password_entry</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="host_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="xalign">0</property>
+ <attributes>
+ <attribute name="style" value="italic"/>
+ </attributes>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -163,8 +183,28 @@ Jonh Wendell <jwendell gnome org></property>
<property name="mnemonic_widget">username_entry</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="password_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="margin_left">12</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Password:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">password_entry</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -174,31 +214,36 @@ Jonh Wendell <jwendell gnome org></property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Store the login credential in GNOME Keyring</property>
<property name="tooltip_text" translatable="yes">Store the login credential in GNOME Keyring</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
+ <property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="host_label">
+ <object class="GtkEntry" id="username_entry">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="xalign">0</property>
- <attributes>
- <attribute name="style" value="italic"/>
- </attributes>
+ <property name="max_length">254</property>
+ <property name="invisible_char">â</property>
+ <property name="activates_default">True</property>
+ <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -207,49 +252,23 @@ Jonh Wendell <jwendell gnome org></property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="visibility">False</property>
+ <property name="invisible_char">â</property>
<property name="activates_default">True</property>
+ <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="password_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="margin_left">12</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Password:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">password_entry</property>
- </object>
- <packing>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="label19">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="margin_left">12</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Host:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">password_entry</property>
- </object>
- </child>
- <child>
<placeholder/>
</child>
</object>
<packing>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
@@ -329,14 +348,14 @@ Jonh Wendell <jwendell gnome org></property>
</packing>
</child>
<child>
- <object class="GtkTable" id="table2">
+ <object class="GtkGrid" id="grid2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">6</property>
<property name="n_rows">2</property>
<property name="n_columns">2</property>
- <property name="column_spacing">6</property>
- <property name="row_spacing">6</property>
<child>
<object class="GtkLabel" id="label14">
<property name="visible">True</property>
@@ -349,8 +368,10 @@ Jonh Wendell <jwendell gnome org></property>
<property name="mnemonic_widget">edit_bookmark_name_entry</property>
</object>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -365,10 +386,10 @@ Jonh Wendell <jwendell gnome org></property>
<property name="mnemonic_widget">edit_bookmark_host_entry</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -383,7 +404,9 @@ Jonh Wendell <jwendell gnome org></property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -397,9 +420,9 @@ Jonh Wendell <jwendell gnome org></property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
</object>
@@ -832,33 +855,28 @@ Jonh Wendell <jwendell gnome org></property>
</packing>
</child>
<child>
- <object class="GtkTable" id="table1">
+ <object class="GtkGrid" id="grid1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="n_rows">2</property>
- <property name="n_columns">3</property>
- <property name="column_spacing">6</property>
<property name="row_spacing">6</property>
+ <property name="column_spacing">6</property>
+ <property name="n_rows">2</property>
<child>
- <object class="GtkButton" id="find_button">
- <property name="label">gtk-find</property>
+ <object class="GtkLabel" id="label22">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="receives_default">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="tooltip_text" translatable="yes">Search for remote hosts on the network</property>
- <property name="use_action_appearance">False</property>
- <property name="use_stock">True</property>
- <property name="focus_on_click">False</property>
+ <property name="margin_left">12</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Protocol:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">protocol_combo</property>
</object>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -873,42 +891,13 @@ Jonh Wendell <jwendell gnome org></property>
<property name="mnemonic_widget">host_entry</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkComboBoxText" id="host_entry">
- <property name="width_request">250</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="has_entry">True</property>
- <child internal-child="entry">
- <object class="GtkEntry" id="comboboxtext-entry2">
- <property name="can_focus">True</property>
- <property name="tooltip_text" translatable="yes">Enter a valid hostname or IP address</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label22">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_left">12</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Protocol:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">protocol_combo</property>
- </object>
- </child>
- <child>
<object class="GtkBox" id="hbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -917,6 +906,8 @@ Jonh Wendell <jwendell gnome org></property>
<object class="GtkComboBox" id="protocol_combo">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Select a remote desktop protocol for this connection</property>
<property name="tooltip_text" translatable="yes">Select a remote desktop protocol for this connection</property>
</object>
<packing>
@@ -945,12 +936,54 @@ Jonh Wendell <jwendell gnome org></property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBoxText" id="host_entry">
+ <property name="width_request">250</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="has_entry">True</property>
+ <child internal-child="entry">
+ <object class="GtkEntry" id="comboboxtext-entry">
+ <property name="can_focus">False</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
<placeholder/>
</child>
+ <child>
+ <object class="GtkButton" id="find_button">
+ <property name="label">gtk-find</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Search for remote hosts on the network</property>
+ <property name="tooltip_text" translatable="yes">Search for remote hosts on the network</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_stock">True</property>
+ <property name="focus_on_click">False</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">True</property>
diff --git a/plugins/spice/vinagre-spice-plugin.c b/plugins/spice/vinagre-spice-plugin.c
index c51eb0b..68ab8ef 100644
--- a/plugins/spice/vinagre-spice-plugin.c
+++ b/plugins/spice/vinagre-spice-plugin.c
@@ -199,8 +199,7 @@ ssh_tunnel_check_toggled_cb (GtkToggleButton *button, GObject *box)
static GtkWidget *
impl_get_connect_widget (VinagreProtocol *plugin, VinagreConnection *conn)
{
- GtkWidget *box, *label, *check, *p_entry, *box2, *ssh_host_entry;
- GtkTable *table;
+ GtkWidget *box, *label, *check, *p_entry, *box2, *ssh_host_entry, *grid;
gchar *str, *ssh_host;
gboolean has_conn = VINAGRE_IS_SPICE_CONNECTION (conn);
@@ -214,9 +213,9 @@ impl_get_connect_widget (VinagreProtocol *plugin, VinagreConnection *conn)
gtk_misc_set_padding (GTK_MISC (label), 0, 6);
gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0);
- table = GTK_TABLE (gtk_table_new (6, 2, FALSE));
+ grid = gtk_grid_new ();
label = gtk_label_new (" ");
- gtk_table_attach (table, label, 0, 1, 0, 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
+ gtk_grid_attach (grid, label, 0, 0, 1, 1);
/* View only check button - not fully ready on spice-gtk side */
check = gtk_check_button_new_with_mnemonic (_("_View only"));
@@ -229,7 +228,7 @@ impl_get_connect_widget (VinagreProtocol *plugin, VinagreConnection *conn)
/* Resize guest check button */
check = gtk_check_button_new_with_mnemonic (_("_Resize guest"));
g_object_set_data (G_OBJECT (box), "resize_guest", check);
- gtk_table_attach_defaults (table, check, 1, 2, 0, 1);
+ gtk_grid_attach (grid, check, 1, 0, 1, 1);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check),
has_conn ? vinagre_spice_connection_get_resize_guest (VINAGRE_SPICE_CONNECTION (conn))
: vinagre_cache_prefs_get_boolean ("spice-connection", "resize-guest", TRUE));
@@ -237,7 +236,7 @@ impl_get_connect_widget (VinagreProtocol *plugin, VinagreConnection *conn)
/* Clipboard sharing check button */
check = gtk_check_button_new_with_mnemonic (_("_Share clipboard"));
g_object_set_data (G_OBJECT (box), "auto_clipboard", check);
- gtk_table_attach_defaults (table, check, 1, 2, 1, 2);
+ gtk_grid_attach (table, check, 1, 1, 1, 1);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check),
has_conn ? vinagre_spice_connection_get_auto_clipboard (VINAGRE_SPICE_CONNECTION (conn))
: vinagre_cache_prefs_get_boolean ("spice-connection", "auto-clipboard", TRUE));
@@ -245,7 +244,7 @@ impl_get_connect_widget (VinagreProtocol *plugin, VinagreConnection *conn)
/* Scaling check button */
check = gtk_check_button_new_with_mnemonic (_("_Scaling"));
g_object_set_data (G_OBJECT (box), "scaling", check);
- gtk_table_attach_defaults (table, check, 1, 2, 2, 3);
+ gtk_grid_attach (table, check, 1, 2, 1, 1);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check),
has_conn ? vinagre_spice_connection_get_scaling (VINAGRE_SPICE_CONNECTION (conn))
: vinagre_cache_prefs_get_boolean ("spice-connection", "scaling", FALSE));
@@ -287,7 +286,7 @@ impl_get_connect_widget (VinagreProtocol *plugin, VinagreConnection *conn)
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), ssh_host && *ssh_host);
g_free (ssh_host);
- gtk_table_attach_defaults (table, box2, 1, 2, 3, 4);
+ gtk_grid_attach (table, box2, 1, 3, 1, 1);
/* Password */
box2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
@@ -307,7 +306,7 @@ impl_get_connect_widget (VinagreProtocol *plugin, VinagreConnection *conn)
g_free (str);
/* FIXME: how do you set the password here? gtk_table_attach_defaults (table, box2, 1, 2, 4, 5); */
- gtk_box_pack_start (GTK_BOX (box), GTK_WIDGET (table), FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (box), grid, FALSE, FALSE, 0);
return box;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
