Author: rhafer Date: Fri Apr 1 16:19:33 2011 New Revision: 63694 URL: http://svn.opensuse.org/viewcvs/yast?rev=63694&view=rev Log: Merged bnc#421040 fixes from trunk (r62150 and r62151) Modified: branches/SuSE-Code-11-SP2-Branch/ldap-server/ (props changed) branches/SuSE-Code-11-SP2-Branch/ldap-server/src/LdapDatabase.ycp branches/SuSE-Code-11-SP2-Branch/ldap-server/src/tree_structure.ycp branches/SuSE-Code-11-SP2-Branch/ldap-server/src/widgets.ycp Modified: branches/SuSE-Code-11-SP2-Branch/ldap-server/src/LdapDatabase.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/ldap-server/src/LdapDatabase.ycp?rev=63694&r1=63693&r2=63694&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/ldap-server/src/LdapDatabase.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/ldap-server/src/LdapDatabase.ycp Fri Apr 1 16:19:33 2011 @@ -855,10 +855,12 @@ `PushButton( `id (`pb_down ), _("Down") ) ) ), - `HBox( - `PushButton( `id (`pb_add ), _("Add") ), - `PushButton( `id (`pb_del ), _("Delete") ), - `PushButton( `id (`pb_edit ), _("Edit") ) + `Left( + `HBox( + `PushButton( `id (`pb_add ), Label::AddButton() ), + `PushButton( `id (`pb_edit ), Label::EditButton() ), + `PushButton( `id (`pb_del ), Label::DeleteButton() ) + ) ) ) ), @@ -1147,10 +1149,12 @@ `PushButton( `id (`pb_down ), _("Down") ) ) ), - `HBox( - `PushButton( `id (`pb_add ), _("Add") ), - `PushButton( `id (`pb_del ), _("Delete") ), - `PushButton( `id (`pb_edit ), _("Edit") ) + `Left( + `HBox( + `PushButton( `id (`pb_add ), Label::AddButton() ), + `PushButton( `id (`pb_edit ),Label::EditButton() ), + `PushButton( `id (`pb_del ), Label::DeleteButton() ) + ) ) ) ); Modified: branches/SuSE-Code-11-SP2-Branch/ldap-server/src/tree_structure.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/ldap-server/src/tree_structure.ycp?rev=63694&r1=63693&r2=63694&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/ldap-server/src/tree_structure.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/ldap-server/src/tree_structure.ycp Fri Apr 1 16:19:33 2011 @@ -1192,9 +1192,11 @@ `MinSize( 60, 7, `Table( `id( `tab_db ),`opt(`keepSorting), `header(_("Suffix DN"), _("Database type") ) ) ), - `HBox( - `PushButton( `id( `pb_add ), _("A&dd Database...") ), - `PushButton( `id( `pb_del ), _("Delete Database") ) + `Left( + `HBox( + `PushButton( `id( `pb_add ), Label::AddButton() ), + `PushButton( `id( `pb_del ), Label::DeleteButton() ) + ) ) ), "cb_read" : ``( cb_read_databases() ), Modified: branches/SuSE-Code-11-SP2-Branch/ldap-server/src/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/ldap-server/src/widgets.ycp?rev=63694&r1=63693&r2=63694&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/ldap-server/src/widgets.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/ldap-server/src/widgets.ycp Fri Apr 1 16:19:33 2011 @@ -301,11 +301,13 @@ `header( _("Attrbute"), _("Presence"), _("Equality"), _("Substring")), [ ] ), - `HSquash( - `HBox( - `PushButton( `id( `pb_idx_add ), _("Add") ), - `PushButton( `id( `pb_idx_edit ), _("Edit") ), - `PushButton( `id( `pb_idx_del ), _("Delete") ) + `Left( + `HSquash( + `HBox( + `PushButton( `id( `pb_idx_add ), Label::AddButton() ), + `PushButton( `id( `pb_idx_edit ), Label::EditButton() ), + `PushButton( `id( `pb_idx_del ), Label::DeleteButton() ) + ) ) ) ); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org