aboutsummaryrefslogtreecommitdiffstats
path: root/libempathy-gtk
diff options
context:
space:
mode:
Diffstat (limited to 'libempathy-gtk')
-rw-r--r--libempathy-gtk/empathy-account-widget-irc.ui125
-rw-r--r--libempathy-gtk/empathy-contact-blocking-dialog.ui13
-rw-r--r--libempathy-gtk/empathy-irc-network-dialog.c17
-rw-r--r--libempathy-gtk/empathy-status-preset-dialog.ui5
4 files changed, 92 insertions, 68 deletions
diff --git a/libempathy-gtk/empathy-account-widget-irc.ui b/libempathy-gtk/empathy-account-widget-irc.ui
index 999fd320a..b0c3012dd 100644
--- a/libempathy-gtk/empathy-account-widget-irc.ui
+++ b/libempathy-gtk/empathy-account-widget-irc.ui
@@ -60,8 +60,8 @@
<object class="GtkGrid" id="greid14">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="column_spacing">12</property>
<property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
<child>
<object class="GtkLabel" id="label_network">
<property name="visible">True</property>
@@ -70,6 +70,10 @@
<property name="label" translatable="yes">Network:</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>
@@ -80,8 +84,10 @@
<property name="label" translatable="yes">Character set:</property>
</object>
<packing>
- <property name="top_attach">1</property>
<property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -91,6 +97,9 @@
</object>
<packing>
<property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -101,6 +110,8 @@
<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>
</object>
@@ -140,14 +151,19 @@
<object class="GtkGrid" id="grid15">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="column_spacing">6</property>
<property name="row_spacing">6</property>
+ <property name="column_spacing">6</property>
+ <child>
+ <object class="GtkVBox" id="vbox1">
+ <property name="visible">True</property>
+ <property name="spacing">0</property>
<child>
- <object class="GtkScrolledWindow" id="scrolledwindow19">
+ <object class="GtkScrolledWindow" id="scrolledwindow_network_server">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">never</property>
<property name="shadow_type">in</property>
+ <property name="expand">True</property>
<child>
<object class="GtkTreeView" id="treeview_servers">
<property name="visible">True</property>
@@ -160,86 +176,78 @@
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkVButtonBox" id="vbuttonbox1">
+ <object class="GtkToolbar" id="toolbar_network_server">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">6</property>
- <property name="layout_style">start</property>
+ <property name="icon_size">1</property>
+ <style>
+ <class name="inline-toolbar"/>
+ </style>
<child>
- <object class="GtkButton" id="button_add">
- <property name="label">gtk-add</property>
+ <object class="GtkToolButton" id="button_add">
+ <property name="tooltip-text" translatable="yes">Add…</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
- <property name="use_stock">True</property>
+ <property name="receives_default">True</property>
+ <property name="icon_name">list-add-symbolic</property>
+ <property name="use_underline">True</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkButton" id="button_remove">
- <property name="label">gtk-remove</property>
+ <object class="GtkToolButton" id="button_remove">
+ <property name="tooltip-text" translatable="yes">Remove</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
- <property name="use_stock">True</property>
+ <property name="receives_default">True</property>
+ <property name="icon_name">list-remove-symbolic</property>
+ <property name="use_underline">True</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
</packing>
</child>
<child>
- <object class="GtkButton" id="button_up">
- <property name="label">gtk-go-up</property>
+ <object class="GtkToolButton" id="button_up">
+ <property name="tooltip-text" translatable="yes">Up</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
- <property name="use_stock">True</property>
+ <property name="receives_default">True</property>
+ <property name="icon_name">go-up-symbolic</property>
+ <property name="use_underline">True</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
</packing>
</child>
<child>
- <object class="GtkButton" id="button_down">
- <property name="label">gtk-go-down</property>
+ <object class="GtkToolButton" id="button_down">
+ <property name="tooltip-text" translatable="yes">Down</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">False</property>
- <property name="use_action_appearance">False</property>
- <property name="use_stock">True</property>
+ <property name="receives_default">True</property>
+ <property name="icon_name">go-down-symbolic</property>
+ <property name="use_underline">True</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">3</property>
</packing>
</child>
</object>
<packing>
- <property name="left_attach">1</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
</child>
- </object>
+ </object>
+ </child>
+ </object>
</child>
<child type="label">
<object class="GtkLabel" id="label_servers">
@@ -351,12 +359,6 @@
</packing>
</child>
<child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
<object class="GtkLabel" id="label_password">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -385,8 +387,8 @@
<object class="GtkGrid" id="grid_irc_settings1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="column_spacing">12</property>
<property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
<child>
<object class="GtkEntry" id="entry_quit_message">
<property name="visible">True</property>
@@ -396,6 +398,8 @@
<packing>
<property name="left_attach">1</property>
<property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -406,7 +410,10 @@
<property name="label" translatable="yes">Quit message:</property>
</object>
<packing>
+ <property name="left_attach">3</property>
<property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -419,6 +426,8 @@
<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>
@@ -431,8 +440,10 @@
<property name="mnemonic_widget">entry_nick</property>
</object>
<packing>
- <property name="top_attach">1</property>
<property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -445,6 +456,9 @@
</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>
@@ -456,6 +470,9 @@
</object>
<packing>
<property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
</object>
diff --git a/libempathy-gtk/empathy-contact-blocking-dialog.ui b/libempathy-gtk/empathy-contact-blocking-dialog.ui
index 25499ac70..19c50fe92 100644
--- a/libempathy-gtk/empathy-contact-blocking-dialog.ui
+++ b/libempathy-gtk/empathy-contact-blocking-dialog.ui
@@ -86,12 +86,12 @@
</style>
<child>
<object class="GtkToolButton" id="remove-button">
- <property name="stock_id">gtk-remove</property>
+ <property name="tooltip-text" translatable="yes">Remove</property>
<property name="visible">True</property>
- <property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="tooltip-text" translatable="yes">Remove</property>
+ <property name="icon_name">list-remove-symbolic</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -101,6 +101,7 @@
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
@@ -143,10 +144,4 @@
</packing>
</child>
</object>
- <object class="GtkSizeGroup" id="sizegroup1">
- <widgets>
- <widget name="add-button"/>
- <widget name="remove-button"/>
- </widgets>
- </object>
</interface>
diff --git a/libempathy-gtk/empathy-irc-network-dialog.c b/libempathy-gtk/empathy-irc-network-dialog.c
index 69f83637d..8164f6c74 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);
@@ -506,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,
@@ -521,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 ();
@@ -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);
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 @@
<object class="GtkToolButton" id="remove-button">
<property name="tooltip-text" translatable="yes">Remove</property>
<property name="visible">True</property>
- <property name="use_action_appearance">False</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="icon_name">list-remove-symbolic</property>
<property name="use_underline">True</property>
- <property name="stock_id">gtk-remove</property>
</object>
<packing>
<property name="expand">False</property>
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-27 01:04:05 +0800