Author: lslezak Date: Wed Oct 1 16:28:59 2008 New Revision: 51760 URL: http://svn.opensuse.org/viewcvs/yast?rev=51760&view=rev Log: - fixed repository rename, delete - fixed service rename - fixed UI - resize the richtext area so there is no scroll bar Modified: trunk/packager/src/clients/repositories.ycp Modified: trunk/packager/src/clients/repositories.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/repositories.ycp?rev=51760&r1=51759&r2=51760&view=diff ============================================================================== --- trunk/packager/src/clients/repositories.ycp (original) +++ trunk/packager/src/clients/repositories.ycp Wed Oct 1 16:28:59 2008 @@ -258,7 +258,7 @@ `Left(`Label(`id(`service), `opt(`hstretch), service)) ) : - `VSquash(`RichText(`id(`repo_info), "")); + `VSquash(`MinHeight(7, `RichText(`id(`repo_info), ""))); } void fillRepoInfo(integer index, map source, boolean repo_mode, string service_name) @@ -842,7 +842,6 @@ // update the current item current = (integer) UI::QueryWidget( `id( `table ), `CurrentItem ); - y2internal("UI refresh done"); } else { @@ -910,7 +909,7 @@ // copy the refresh flag createResult = createSource( url, SourceDialogs::IsPlainDir(), sourceState["do_refresh"]:false, SourceDialogs::GetRepoName ()); if ( createResult == `ok ) { - deleteSource( current ); + deleteSource( global_current ); fillTable(repository_view, displayed_service); fillCurrentRepoInfo(); } @@ -919,7 +918,7 @@ { y2milestone ("URL is the same, not recreating the source"); sourceState["name"] = SourceDialogs::GetRepoName (); - sourceStatesOut[ current ] = sourceState; + sourceStatesOut[ global_current ] = sourceState; fillTable(repository_view, displayed_service); fillCurrentRepoInfo(); createResult = `ok; @@ -970,8 +969,9 @@ { y2milestone ("URL is the same, not recreating the service"); string entered_service_name = SourceDialogs::GetRepoName(); + string old_service_name = service_info["name"]:""; - if (service_info["name"]:nil != entered_service_name) + if (old_service_name != entered_service_name) { y2milestone("Updating name of the service to '%1'", entered_service_name); service_info["name"] = entered_service_name; @@ -980,6 +980,18 @@ fillCurrentRepoInfo(); createResult = `ok; + // update the reference + sourceStatesOut = maplist(map src_state, sourceStatesOut, + { + if (src_state["service"]:"" == old_service_name) + { + src_state["service"] = entered_service_name; + } + + return src_state; + } + ); + // refresh also the tree widget UI::ChangeWidget(`id(`tree), `Items, buildTree()); } @@ -1091,7 +1103,7 @@ // yes-no popup if ( Popup::YesNo( _("Delete the selected repository from the list?") ) ) { - deleteSource( current ); + deleteSource(global_current); fillTable(repository_view, displayed_service); fillCurrentRepoInfo(); } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org