gossip r2783 - in trunk: . data/glade src
- From: rhult svn gnome org
- To: svn-commits-list gnome org
- Subject: gossip r2783 - in trunk: . data/glade src
- Date: Thu, 3 Apr 2008 19:18:51 +0100 (BST)
Author: rhult
Date: Thu Apr 3 19:18:50 2008
New Revision: 2783
URL: http://svn.gnome.org/viewvc/gossip?rev=2783&view=rev
Log:
2008-04-03 Richard Hult <richard imendio com>
* data/glade/main.glade:
* src/gossip-accounts-dialog.c:
(accounts_dialog_update_connect_button): Tweak the accounts dialog
slightly so it looks a bit less cluttered.
Modified:
trunk/ChangeLog
trunk/data/glade/main.glade
trunk/src/gossip-accounts-dialog.c
Modified: trunk/data/glade/main.glade
==============================================================================
--- trunk/data/glade/main.glade (original)
+++ trunk/data/glade/main.glade Thu Apr 3 19:18:50 2008
@@ -4922,6 +4922,7 @@
<child>
<widget class="GtkTreeView" id="treeview">
+ <property name="width_request">125</property>
<property name="height_request">200</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -4949,39 +4950,34 @@
<property name="spacing">6</property>
<child>
- <widget class="GtkButton" id="button_connect">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label">Connect</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
<widget class="GtkHBox" id="hbox148">
<property name="visible">True</property>
- <property name="homogeneous">True</property>
+ <property name="homogeneous">False</property>
<property name="spacing">6</property>
<child>
<widget class="GtkButton" id="button_add">
<property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Add an account</property>
<property name="can_focus">True</property>
- <property name="label">gtk-add</property>
- <property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
+
+ <child>
+ <widget class="GtkImage" id="image903">
+ <property name="visible">True</property>
+ <property name="stock">gtk-add</property>
+ <property name="icon_size">4</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ </child>
</widget>
<packing>
<property name="padding">0</property>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="fill">True</property>
</packing>
</child>
@@ -4989,18 +4985,47 @@
<child>
<widget class="GtkButton" id="button_remove">
<property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Remove the selected account</property>
<property name="can_focus">True</property>
- <property name="label">gtk-remove</property>
- <property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
+
+ <child>
+ <widget class="GtkImage" id="image904">
+ <property name="visible">True</property>
+ <property name="stock">gtk-remove</property>
+ <property name="icon_size">4</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ </child>
</widget>
<packing>
<property name="padding">0</property>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="fill">True</property>
</packing>
</child>
+
+ <child>
+ <widget class="GtkButton" id="button_connect">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Connect/disconnect the selected account</property>
+ <property name="can_focus">True</property>
+ <property name="label"></property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">GTK_PACK_END</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="padding">0</property>
@@ -5068,42 +5093,6 @@
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label_name">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Imendio </property>
- <property name="use_underline">False</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">0</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkHSeparator" id="hseparator1">
- <property name="visible">True</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
<widget class="GtkVBox" id="vbox219">
<property name="visible">True</property>
<property name="homogeneous">False</property>
@@ -5166,22 +5155,60 @@
</child>
<child>
- <widget class="GtkLabel" id="label598">
+ <widget class="GtkHBox" id="hbox196">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>Account</b></property>
- <property name="use_underline">False</property>
- <property name="use_markup">True</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">6</property>
+
+ <child>
+ <widget class="GtkLabel" id="labelfoo">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Account:</b></property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">True</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">0</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label_name">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"></property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="type">label_item</property>
@@ -7315,7 +7342,7 @@
<child>
<widget class="GtkButton" id="button_register">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">Register this account with the Jabber server. If this is a new account, you will need to click on this first before connecting.</property>
+ <property name="tooltip" translatable="yes">Register account with the Jabber server. If this is a new account, you will need to register it before connecting.</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">R_egister</property>
<property name="use_underline">True</property>
@@ -7360,7 +7387,7 @@
<child>
<widget class="GtkButton" id="button_forget">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">Forget password and clear the entry.</property>
+ <property name="tooltip" translatable="yes">Forget password</property>
<property name="can_focus">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
Modified: trunk/src/gossip-accounts-dialog.c
==============================================================================
--- trunk/src/gossip-accounts-dialog.c (original)
+++ trunk/src/gossip-accounts-dialog.c Thu Apr 3 19:18:50 2008
@@ -321,6 +321,7 @@
const gchar *stock_id;
gboolean is_connected;
gboolean is_connecting;
+ GtkWidget *image;
view = GTK_TREE_VIEW (dialog->treeview);
selection = gtk_tree_view_get_selection (view);
@@ -345,8 +346,9 @@
}
}
- gtk_button_set_label (GTK_BUTTON (dialog->button_connect), stock_id);
- gtk_button_set_use_stock (GTK_BUTTON (dialog->button_connect), TRUE);
+ image = gtk_image_new_from_stock (stock_id, GTK_ICON_SIZE_BUTTON);
+ gtk_button_set_image (GTK_BUTTON (dialog->button_connect), image);
+ gtk_widget_show (image); /* override gtk-button-images setting */
}
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
