Author: jsuchome Date: Thu Jun 7 09:28:51 2007 New Revision: 38327 URL: http://svn.opensuse.org/viewcvs/yast?rev=38327&view=rev Log: - removed Browse button (#240045) - 2.13.37 Modified: branches/SuSE-SLE-10-SP2-Branch/samba-client/VERSION branches/SuSE-SLE-10-SP2-Branch/samba-client/package/yast2-samba-client.changes branches/SuSE-SLE-10-SP2-Branch/samba-client/src/dialogs.ycp branches/SuSE-SLE-10-SP2-Branch/samba-client/src/routines.ycp Modified: branches/SuSE-SLE-10-SP2-Branch/samba-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/samba-client/VERSION?rev=38327&r1=38326&r2=38327&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/samba-client/VERSION (original) +++ branches/SuSE-SLE-10-SP2-Branch/samba-client/VERSION Thu Jun 7 09:28:51 2007 @@ -1 +1 @@ -2.13.36 +2.13.37 Modified: branches/SuSE-SLE-10-SP2-Branch/samba-client/package/yast2-samba-client.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/samba-client/package/yast2-samba-client.changes?rev=38327&r1=38326&r2=38327&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/samba-client/package/yast2-samba-client.changes (original) +++ branches/SuSE-SLE-10-SP2-Branch/samba-client/package/yast2-samba-client.changes Thu Jun 7 09:28:51 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jun 7 09:10:03 CEST 2007 - jsuchome@suse.cz + +- removed Browse button (#240045) +- 2.13.37 + +------------------------------------------------------------------- Mon Mar 26 06:52:46 CEST 2007 - jsuchome@suse.cz - added autoyast support for disabling DHCLIENT_SET_HOSTNAME (#169260) Modified: branches/SuSE-SLE-10-SP2-Branch/samba-client/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/samba-client/src/dialogs.ycp?rev=38327&r1=38326&r2=38327&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/samba-client/src/dialogs.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/samba-client/src/dialogs.ycp Thu Jun 7 09:28:51 2007 @@ -209,12 +209,7 @@ `TextEntry(`id(`workgroup), (Stage::cont() ? _("&Domain") : // translators: text entry label - _("&Domain or Workgroup")), Samba::GetWorkgroupOrRealm()), - `VBox ( - `Label(""), - // translators: push button label - `PushButton(`id(`browse), _("Br&owse...")) - ) + _("&Domain or Workgroup")), Samba::GetWorkgroupOrRealm()) ), status_term, winbind_term, @@ -263,9 +258,6 @@ Wizard::HideBackButton(); check_domain_membership (Samba::GetWorkgroupOrRealm()); } - if (Mode::config ()) { - UI::ChangeWidget (`id(`browse), `Enabled, false); - } any ret = nil; while(true) { @@ -432,15 +424,6 @@ ")); } break; - } else if (ret == `browse) { - - string new_workgroup = BrowseNeighbours( Stage::cont() ); - if( new_workgroup != nil && new_workgroup != "" ) { - // fill in the new workgroup name - UI::ChangeWidget( `id(`workgroup), `Value, new_workgroup ); - check_domain_membership (new_workgroup); - } - continue; } else if (ret == `back ) { break; } Modified: branches/SuSE-SLE-10-SP2-Branch/samba-client/src/routines.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/samba-client/src/routines.ycp?rev=38327&r1=38326&r2=38327&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP2-Branch/samba-client/src/routines.ycp (original) +++ branches/SuSE-SLE-10-SP2-Branch/samba-client/src/routines.ycp Thu Jun 7 09:28:51 2007 @@ -174,54 +174,6 @@ /** - * Show a selection popup to select a workgroup from the ones existing on LAN. - * - * @return string chosen workgroup or nil if cancelled - */ -define string BrowseNeighbours(boolean domains_only) ``{ - list<string> groups = nil; - - UI::OpenDialog ( - // popup window - `Label (_("Looking for available workgroups and domains..."))); - - UI::BusyCursor (); - - if (domains_only) { - groups = SambaNmbLookup::GetAvailableDomains(); - } else { - groups = SambaNmbLookup::GetAvailableNeighbours(_(" (Domain)")); - } - - UI::CloseDialog (); - if( groups == nil ) return nil; - groups = filter (string group, groups, ``(size (group) > 0)); - - // let the user choose a workgroup - UI::OpenDialog( `VBox( - `HSpacing (36), - // translators: selection box label - `SelectionBox(`id(`selection), (domains_only ? _("&Existing Domains") : _("&Existing Neighbours")), groups), - `HBox( - `PushButton( `id(`ok), Label::OKButton() ), - `PushButton( `id(`cancel), Label::CancelButton() ) - ) - ) ); - - any ret = UI::UserInput(); - string sel = (string) UI::QueryWidget( `id(`selection), `CurrentItem ); - // textentry constant (automatically added to some kind of values) - if ( sel != nil && issubstring (sel, _(" (Domain)") ) ) - { - integer pos = search (sel, _(" (Domain)") ); - sel = (pos == nil) ? sel : substring (sel, 0, pos); - } - UI::CloseDialog(); - return ret == `ok ? sel : nil; -} - - -/** * Check if user shares already exist * @param path to directory with shares */ -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org