From aba616dfea6dde6e9f66a71a600d90553a04fe90 Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Mon, 23 Jan 2012 12:05:18 +0100 Subject: contact-blocking-dialog: use the right style for the remove button --- libempathy-gtk/empathy-contact-blocking-dialog.ui | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'libempathy-gtk') diff --git a/libempathy-gtk/empathy-contact-blocking-dialog.ui b/libempathy-gtk/empathy-contact-blocking-dialog.ui index 25499ac70..fd95186e6 100644 --- a/libempathy-gtk/empathy-contact-blocking-dialog.ui +++ b/libempathy-gtk/empathy-contact-blocking-dialog.ui @@ -86,12 +86,12 @@ - gtk-remove + Remove True - False True True - Remove + list-remove-symbolic + True False @@ -101,6 +101,7 @@ False + False 1 -- cgit v1.2.3 From 65c7d23af61ed8f6980e8bba4cb8c94c67d75977 Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Mon, 23 Jan 2012 12:05:18 +0100 Subject: status preset dialog: use the right style for the remove button --- libempathy-gtk/empathy-status-preset-dialog.ui | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'libempathy-gtk') diff --git a/libempathy-gtk/empathy-status-preset-dialog.ui b/libempathy-gtk/empathy-status-preset-dialog.ui index 359a02f9e..19bfdc910 100644 --- a/libempathy-gtk/empathy-status-preset-dialog.ui +++ b/libempathy-gtk/empathy-status-preset-dialog.ui @@ -41,9 +41,10 @@ Remove True - False + True + True + list-remove-symbolic True - gtk-remove False -- cgit v1.2.3 From 908b396bdccff3c3056a4616ae43b40d5dead990 Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Mon, 23 Jan 2012 12:29:16 +0100 Subject: IRC network dialog: use the use the right style for the buttons --- libempathy-gtk/empathy-account-widget-irc.ui | 119 +++++++++++++++------------ libempathy-gtk/empathy-irc-network-dialog.c | 11 +++ 2 files changed, 77 insertions(+), 53 deletions(-) (limited to 'libempathy-gtk') diff --git a/libempathy-gtk/empathy-account-widget-irc.ui b/libempathy-gtk/empathy-account-widget-irc.ui index 999fd320a..088bd535a 100644 --- a/libempathy-gtk/empathy-account-widget-irc.ui +++ b/libempathy-gtk/empathy-account-widget-irc.ui @@ -60,8 +60,8 @@ True False - 12 6 + 12 True @@ -70,6 +70,10 @@ Network: + 0 + 0 + 1 + 1 @@ -80,8 +84,10 @@ Character set: - 1 0 + 1 + 1 + 1 @@ -91,6 +97,9 @@ 1 + 0 + 1 + 1 @@ -101,6 +110,8 @@ 1 1 + 1 + 1 @@ -140,14 +151,15 @@ True False - 6 6 + 6 - + True True never in + True True @@ -160,81 +172,73 @@ + 0 + 0 + 1 + 1 - + True - False - 6 - start + 1 + - - gtk-add + + Add… True True - True - False - False - True + True + list-add-symbolic + True - False - False - 0 - - gtk-remove + + Remove True True - True - False - False - True + True + list-remove-symbolic + True - False - False - 1 - - gtk-go-up + + Up True True - True - False - False - True + True + go-up-symbolic + True - False - False - 2 - - gtk-go-down + + Down True True - True - False - False - True + True + go-down-symbolic + True - False - False - 3 - 1 + 0 + 1 + 1 + 1 @@ -350,12 +354,6 @@ 1 - - - - - - True @@ -385,8 +383,8 @@ True False - 12 6 + 12 True @@ -396,6 +394,8 @@ 1 2 + 1 + 1 @@ -406,7 +406,10 @@ Quit message: + 3 2 + 1 + 1 @@ -419,6 +422,8 @@ 1 1 + 1 + 1 @@ -431,8 +436,10 @@ entry_nick - 1 0 + 1 + 1 + 1 @@ -445,6 +452,9 @@ 0 + 0 + 1 + 1 @@ -456,6 +466,9 @@ 1 + 0 + 1 + 1 diff --git a/libempathy-gtk/empathy-irc-network-dialog.c b/libempathy-gtk/empathy-irc-network-dialog.c index 69f83637d..e837627ff 100644 --- a/libempathy-gtk/empathy-irc-network-dialog.c +++ b/libempathy-gtk/empathy-irc-network-dialog.c @@ -460,6 +460,8 @@ empathy_irc_network_dialog_show (EmpathyIrcNetwork *network, GtkTreeSelection *selection; GtkTreeViewColumn *column; gchar *filename; + GtkWidget *sw, *toolbar; + GtkStyleContext *context; g_return_val_if_fail (network != NULL, NULL); @@ -488,6 +490,8 @@ empathy_irc_network_dialog_show (EmpathyIrcNetwork *network, "button_remove", &dialog->button_remove, "button_up", &dialog->button_up, "button_down", &dialog->button_down, + "scrolledwindow_network_server", &sw, + "toolbar_network_server", &toolbar, NULL); g_free (filename); @@ -568,6 +572,13 @@ empathy_irc_network_dialog_show (EmpathyIrcNetwork *network, GTK_WINDOW (parent)); gtk_window_set_modal (GTK_WINDOW (dialog->dialog), TRUE); + /* join the add/remove toolbar to the treeview */ + context = gtk_widget_get_style_context (sw); + gtk_style_context_set_junction_sides (context, GTK_JUNCTION_BOTTOM); + + context = gtk_widget_get_style_context (toolbar); + gtk_style_context_set_junction_sides (context, GTK_JUNCTION_TOP); + irc_network_dialog_network_update_buttons (dialog); gtk_widget_show_all (dialog->dialog); -- cgit v1.2.3 From 3bb706a822811e9faef775d4e8fc9c0cc9c5d650 Mon Sep 17 00:00:00 2001 From: Jovanka Gulicoska Date: Fri, 27 Jan 2012 17:16:23 +0100 Subject: Server field expanded --- libempathy-gtk/empathy-irc-network-dialog.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libempathy-gtk') diff --git a/libempathy-gtk/empathy-irc-network-dialog.c b/libempathy-gtk/empathy-irc-network-dialog.c index e837627ff..8164f6c74 100644 --- a/libempathy-gtk/empathy-irc-network-dialog.c +++ b/libempathy-gtk/empathy-irc-network-dialog.c @@ -510,6 +510,9 @@ empathy_irc_network_dialog_show (EmpathyIrcNetwork *network, GTK_TREE_VIEW (dialog->treeview_servers), -1, _("Server"), renderer, "text", COL_ADR, NULL); + column = gtk_tree_view_get_column (GTK_TREE_VIEW (dialog->treeview_servers), + 0); + gtk_tree_view_column_set_expand (column, TRUE); /* port */ adjustment = (GtkAdjustment *) gtk_adjustment_new (6667, 1, G_MAXUINT16, @@ -525,9 +528,6 @@ empathy_irc_network_dialog_show (EmpathyIrcNetwork *network, GTK_TREE_VIEW (dialog->treeview_servers), -1, _("Port"), renderer, "text", COL_PORT, NULL); - column = gtk_tree_view_get_column (GTK_TREE_VIEW (dialog->treeview_servers), - 1); - gtk_tree_view_column_set_expand (column, TRUE); /* SSL */ renderer = gtk_cell_renderer_toggle_new (); -- cgit v1.2.3 From 21e022e89b42df19f71bfe48fd4aa641fee20bf6 Mon Sep 17 00:00:00 2001 From: Jovanka Gulicoska Date: Wed, 25 Jan 2012 04:42:02 +0100 Subject: Remove size group from Blocked Contacts dialog --- libempathy-gtk/empathy-contact-blocking-dialog.ui | 6 ------ 1 file changed, 6 deletions(-) (limited to 'libempathy-gtk') diff --git a/libempathy-gtk/empathy-contact-blocking-dialog.ui b/libempathy-gtk/empathy-contact-blocking-dialog.ui index fd95186e6..19c50fe92 100644 --- a/libempathy-gtk/empathy-contact-blocking-dialog.ui +++ b/libempathy-gtk/empathy-contact-blocking-dialog.ui @@ -144,10 +144,4 @@ - - - - - - -- cgit v1.2.3 From df99b53de13a365945909d3f0cafda0b22aa1974 Mon Sep 17 00:00:00 2001 From: Jovanka Gulicoska Date: Tue, 13 Mar 2012 04:12:16 +0100 Subject: Toolbar and Treeview merged --- libempathy-gtk/empathy-account-widget-irc.ui | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) (limited to 'libempathy-gtk') diff --git a/libempathy-gtk/empathy-account-widget-irc.ui b/libempathy-gtk/empathy-account-widget-irc.ui index 088bd535a..b0c3012dd 100644 --- a/libempathy-gtk/empathy-account-widget-irc.ui +++ b/libempathy-gtk/empathy-account-widget-irc.ui @@ -153,6 +153,10 @@ False 6 6 + + + True + 0 True @@ -172,10 +176,9 @@ - 0 - 0 - 1 - 1 + True + True + 0 @@ -235,15 +238,16 @@ - 0 - 1 - 1 - 1 + True + True + 1 - + + + -- cgit v1.2.3