diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | gui/gdmchooser.c | 2 | ||||
-rw-r--r-- | gui/gdmchooser.glade | 210 |
3 files changed, 130 insertions, 87 deletions
@@ -1,3 +1,8 @@ +2005-11-03 Dennis Cranston <dennis_cranston@yahoo.com> + + * gui/gdmchooser.c: (main): Set the window icon. + * gui/gdmchooser.glade: Use HIG recommended widget spacing. + 2005-11-03 Brian Cameron <brian.cameron@sun.com> Redesign of daemon configuraton. Now all vicious-extensions diff --git a/gui/gdmchooser.c b/gui/gdmchooser.c index 886b9d4a..157a6b2a 100644 --- a/gui/gdmchooser.c +++ b/gui/gdmchooser.c @@ -2109,6 +2109,8 @@ main (int argc, char *argv[]) return EXIT_SUCCESS; } + gtk_window_set_default_icon_from_file (DATADIR"/pixmaps/gdm-xnest.png", NULL); + gdm_chooser_gui_init(); gdm_chooser_signals_init(); diff --git a/gui/gdmchooser.glade b/gui/gdmchooser.glade index 5a8daf39..4771d1ba 100644 --- a/gui/gdmchooser.glade +++ b/gui/gdmchooser.glade @@ -5,23 +5,30 @@ <requires lib="gnome"/> <widget class="GtkDialog" id="gdmchooser_main"> - <property name="border_width">6</property> + <property name="border_width">5</property> <property name="visible">True</property> - <property name="title" translatable="yes">GDM Host Chooser</property> + <property name="title" translatable="yes">Login Host Chooser</property> <property name="type">GTK_WINDOW_TOPLEVEL</property> <property name="window_position">GTK_WIN_POS_NONE</property> <property name="modal">False</property> <property name="default_height">500</property> <property name="resizable">True</property> <property name="destroy_with_parent">False</property> - <property name="has_separator">True</property> + <property name="decorated">True</property> + <property name="skip_taskbar_hint">False</property> + <property name="skip_pager_hint">False</property> + <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property> + <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> + <property name="focus_on_map">True</property> + <property name="urgency_hint">False</property> + <property name="has_separator">False</property> <signal name="delete_event" handler="gdm_chooser_cancel" last_modification_time="Tue, 23 Apr 2002 20:39:41 GMT"/> <child internal-child="vbox"> <widget class="GtkVBox" id="dialog-vbox1"> <property name="visible">True</property> <property name="homogeneous">False</property> - <property name="spacing">6</property> + <property name="spacing">2</property> <child internal-child="action_area"> <widget class="GtkHButtonBox" id="dialog-action_area1"> @@ -147,78 +154,30 @@ </child> <child> - <widget class="GtkLabel" id="status_label"> - <property name="visible">True</property> - <property name="label" translatable="yes">Status</property> - <property name="use_underline">True</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">True</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="mnemonic_widget">chooser_iconlist</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkScrolledWindow" id="scrolledwindow1"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property> - <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> - <property name="shadow_type">GTK_SHADOW_IN</property> - <property name="window_placement">GTK_CORNER_TOP_LEFT</property> - - <child> - <widget class="GtkTreeView" id="chooser_iconlist"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="headers_visible">False</property> - <property name="rules_hint">True</property> - <property name="reorderable">False</property> - <property name="enable_search">True</property> - </widget> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkHBox" id="add_hbox"> + <widget class="GtkVBox" id="vbox1"> + <property name="border_width">5</property> <property name="visible">True</property> <property name="homogeneous">False</property> <property name="spacing">6</property> <child> - <widget class="GtkLabel" id="add_label"> + <widget class="GtkLabel" id="status_label"> <property name="visible">True</property> - <property name="label" translatable="yes">A_dd host: </property> + <property name="label" translatable="yes">Status</property> <property name="use_underline">True</property> <property name="use_markup">False</property> <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> + <property name="wrap">True</property> <property name="selectable">False</property> - <property name="xalign">0.5</property> + <property name="xalign">0</property> <property name="yalign">0.5</property> <property name="xpad">0</property> <property name="ypad">0</property> - <property name="mnemonic_widget">add_entry</property> - <accessibility> - <atkrelation target="add_button" type="label-for"/> - <atkrelation target="add_entry" type="label-for"/> - </accessibility> + <property name="mnemonic_widget">chooser_iconlist</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> @@ -228,21 +187,27 @@ </child> <child> - <widget class="GtkEntry" id="add_entry"> + <widget class="GtkScrolledWindow" id="scrolledwindow1"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="editable">True</property> - <property name="visibility">True</property> - <property name="max_length">0</property> - <property name="text" translatable="yes"></property> - <property name="has_frame">True</property> - <property name="invisible_char" translatable="yes">*</property> - <property name="activates_default">False</property> - <accessibility> - <atkrelation target="add_label" type="labelled-by"/> - </accessibility> - <signal name="activate" handler="gdm_chooser_add_host" last_modification_time="Tue, 03 Jun 2003 19:25:52 GMT"/> - <signal name="changed" handler="gdm_chooser_add_entry_changed" last_modification_time="Sun, 20 Jul 2003 17:47:14 GMT"/> + <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property> + <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property> + <property name="shadow_type">GTK_SHADOW_IN</property> + <property name="window_placement">GTK_CORNER_TOP_LEFT</property> + + <child> + <widget class="GtkTreeView" id="chooser_iconlist"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="headers_visible">False</property> + <property name="rules_hint">True</property> + <property name="reorderable">False</property> + <property name="enable_search">True</property> + <property name="fixed_height_mode">False</property> + <property name="hover_selection">False</property> + <property name="hover_expand">False</property> + </widget> + </child> </widget> <packing> <property name="padding">0</property> @@ -252,17 +217,88 @@ </child> <child> - <widget class="GtkButton" id="add_button"> + <widget class="GtkHBox" id="add_hbox"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">Query and add this host to the above list</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">_Add</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <accessibility> - <atkrelation target="add_label" type="labelled-by"/> - </accessibility> - <signal name="clicked" handler="gdm_chooser_add_host" last_modification_time="Tue, 03 Jun 2003 19:26:04 GMT"/> + <property name="homogeneous">False</property> + <property name="spacing">6</property> + + <child> + <widget class="GtkHBox" id="hbox2"> + <property name="visible">True</property> + <property name="homogeneous">False</property> + <property name="spacing">12</property> + + <child> + <widget class="GtkLabel" id="add_label"> + <property name="visible">True</property> + <property name="label" translatable="yes">A_dd host: </property> + <property name="use_underline">True</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="mnemonic_widget">add_entry</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> + + <child> + <widget class="GtkEntry" id="add_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="editable">True</property> + <property name="visibility">True</property> + <property name="max_length">0</property> + <property name="text" translatable="yes"></property> + <property name="has_frame">True</property> + <property name="invisible_char">*</property> + <property name="activates_default">False</property> + <signal name="activate" handler="gdm_chooser_add_host" last_modification_time="Tue, 03 Jun 2003 19:25:52 GMT"/> + <signal name="changed" handler="gdm_chooser_add_entry_changed" last_modification_time="Sun, 20 Jul 2003 17:47:14 GMT"/> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + + <child> + <widget class="GtkButton" id="add_button"> + <property name="visible">True</property> + <property name="tooltip" translatable="yes">Query and add this host to the above list</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">_Add</property> + <property name="use_underline">True</property> + <property name="relief">GTK_RELIEF_NORMAL</property> + <property name="focus_on_click">True</property> + <signal name="clicked" handler="gdm_chooser_add_host" last_modification_time="Tue, 03 Jun 2003 19:26:04 GMT"/> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> </widget> <packing> <property name="padding">0</property> @@ -273,7 +309,7 @@ </widget> <packing> <property name="padding">0</property> - <property name="expand">False</property> + <property name="expand">True</property> <property name="fill">True</property> </packing> </child> |