--- a/usr/src/cmd/gui-install/src/users.glade Fri Nov 06 00:13:08 2009 +0000
+++ b/usr/src/cmd/gui-install/src/users.glade Fri Sep 09 17:09:49 2011 +0000
@@ -25,13 +25,11 @@
-->
<!--*- mode: xml -*-->
<glade-interface>
- <!-- interface-requires gtk+ 2.6 -->
- <!-- interface-naming-policy toplevel-contextual -->
<widget class="GtkWindow" id="userswindow">
<property name="visible">True</property>
<property name="title" translatable="yes">Users</property>
- <property name="window_position">center-always</property>
- <property name="gravity">center</property>
+ <property name="window_position">GTK_WIN_POS_CENTER_ALWAYS</property>
+ <property name="gravity">GDK_GRAVITY_CENTER</property>
<signal name="delete_event" handler="gtk_main_quit"/>
<child>
<widget class="GtkVBox" id="userstoplevel">
@@ -39,10 +37,160 @@
<property name="border_width">8</property>
<property name="spacing">20</property>
<child>
+ <widget class="GtkFrame" id="rootframe">
+ <property name="visible">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <child>
+ <widget class="GtkAlignment" id="rootalign">
+ <property name="visible">True</property>
+ <property name="top_padding">10</property>
+ <property name="left_padding">12</property>
+ <child>
+ <widget class="GtkTable" id="roottable">
+ <property name="visible">True</property>
+ <property name="n_rows">2</property>
+ <property name="n_columns">3</property>
+ <property name="column_spacing">6</property>
+ <property name="row_spacing">10</property>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <widget class="GtkEntry" id="rootpassword2entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="visibility">False</property>
+ <property name="activates_default">True</property>
+ <property name="width_chars">14</property>
+ <signal name="changed" handler="on_users_entry_changed"/>
+ <signal name="focus_out_event" handler="on_rootpassword_focus_out_event"/>
+ </widget>
+ <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="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkEntry" id="rootpassword1entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="visibility">False</property>
+ <property name="activates_default">True</property>
+ <property name="width_chars">14</property>
+ <signal name="changed" handler="on_users_entry_changed"/>
+ <signal name="focus_out_event" handler="on_rootpassword_focus_out_event"/>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="rootpassword2label">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="xpad">10</property>
+ <property name="label" translatable="yes"><span font_desc="Arial Bold">Con_firm password:</span></property>
+ <property name="use_markup">True</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">rootpassword2entry</property>
+ </widget>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="rootpassword1label">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="xpad">10</property>
+ <property name="label" translatable="yes"><span font_desc="Arial Bold">_Root password:</span></property>
+ <property name="use_markup">True</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">rootpassword1entry</property>
+ </widget>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="rootpasswordinfohbox">
+ <property name="visible">True</property>
+ <property name="spacing">5</property>
+ <child>
+ <widget class="GtkImage" id="rootpasswordinfoimage">
+ <property name="xalign">0</property>
+ <property name="stock">gtk-no</property>
+ <property name="icon_size">1</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="rootpasswordinfolabel">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Re-enter to check for typing errors.</property>
+ <property name="use_markup">True</property>
+ <property name="wrap">True</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <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">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="rootlabel">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="ypad">5</property>
+ <property name="label" translatable="yes"><span font_desc="Arial Bold">Enter a root password for this system.</span></property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="type">label_item</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ <child>
<widget class="GtkFrame" id="userframe">
<property name="visible">True</property>
<property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
+ <property name="shadow_type">GTK_SHADOW_NONE</property>
<child>
<widget class="GtkAlignment" id="useralign">
<property name="visible">True</property>
@@ -56,6 +204,12 @@
<property name="column_spacing">6</property>
<property name="row_spacing">10</property>
<child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
<widget class="GtkEntry" id="userpassword2entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -201,18 +355,18 @@
<widget class="GtkImage" id="loginnameinfoimage">
<property name="xalign">0</property>
<property name="stock">gtk-no</property>
- <property name="icon-size">1</property>
+ <property name="icon_size">1</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">0</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="loginnameinfolabel">
<property name="visible">True</property>
<property name="xalign">0</property>
+ <property name="label" translatable="yes">Required when creating a user account.</property>
<property name="use_markup">True</property>
<property name="wrap">True</property>
</widget>
@@ -240,12 +394,11 @@
<widget class="GtkImage" id="userpasswordinfoimage">
<property name="xalign">0</property>
<property name="stock">gtk-no</property>
- <property name="icon-size">1</property>
+ <property name="icon_size">1</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">0</property>
</packing>
</child>
<child>
@@ -272,12 +425,6 @@
<property name="y_options"></property>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
</widget>
</child>
</widget>
@@ -287,7 +434,7 @@
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="ypad">5</property>
- <property name="label" translatable="yes"><span font_desc="Arial Bold">Create a user account for yourself. It will have administrative privileges.</span></property>
+ <property name="label" translatable="yes"><span font_desc="Arial Bold">Create a user account for yourself.</span></property>
<property name="use_markup">True</property>
</widget>
<packing>
@@ -298,14 +445,14 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
<widget class="GtkFrame" id="hostframe">
<property name="visible">True</property>
<property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
+ <property name="shadow_type">GTK_SHADOW_NONE</property>
<child>
<widget class="GtkAlignment" id="hostalign">
<property name="visible">True</property>
@@ -357,12 +504,11 @@
<widget class="GtkImage" id="hostnameinfoimage">
<property name="xalign">0</property>
<property name="stock">gtk-no</property>
- <property name="icon-size">1</property>
+ <property name="icon_size">1</property>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">0</property>
</packing>
</child>
<child>
@@ -404,7 +550,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
</widget>