June 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r48057 - /tags/branch-Linux-11_0-2_16_48/network/
by mzugec＠svn.opensuse.org 04 Jun '08

04 Jun '08

Author: mzugec Date: Wed Jun 4 12:50:06 2008 New Revision: 48057 URL: http://svn.opensuse.org/viewcvs/yast?rev=48057&view=rev Log: Created tag branch-Linux-11_0-2_16_48 for network Added: tags/branch-Linux-11_0-2_16_48/network/ - copied from r48056, branches/SuSE-Linux-11_0-Branch/network/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r48056 - /tags/branch-Linux-11_0-2_16_48/
by mzugec＠svn.opensuse.org 04 Jun '08

04 Jun '08

Author: mzugec Date: Wed Jun 4 12:50:03 2008 New Revision: 48056 URL: http://svn.opensuse.org/viewcvs/yast?rev=48056&view=rev Log: Created tag branch-Linux-11_0-2_16_48 Added: tags/branch-Linux-11_0-2_16_48/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r48055 - in /branches/SuSE-Linux-11_0-Branch/network: VERSION package/yast2-network.changes src/lan/cmdline.ycp
by mzugec＠svn.opensuse.org 04 Jun '08

04 Jun '08

Author: mzugec Date: Wed Jun 4 12:49:55 2008 New Revision: 48055 URL: http://svn.opensuse.org/viewcvs/yast?rev=48055&view=rev Log: fixed command-line (bnc#397016) Modified: branches/SuSE-Linux-11_0-Branch/network/VERSION branches/SuSE-Linux-11_0-Branch/network/package/yast2-network.changes branches/SuSE-Linux-11_0-Branch/network/src/lan/cmdline.ycp Modified: branches/SuSE-Linux-11_0-Branch/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_0-Branch/networ… ============================================================================== --- branches/SuSE-Linux-11_0-Branch/network/VERSION (original) +++ branches/SuSE-Linux-11_0-Branch/network/VERSION Wed Jun 4 12:49:55 2008 @@ -1 +1 @@ -2.16.47 +2.16.48 Modified: branches/SuSE-Linux-11_0-Branch/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_0-Branch/networ… ============================================================================== --- branches/SuSE-Linux-11_0-Branch/network/package/yast2-network.changes (original) +++ branches/SuSE-Linux-11_0-Branch/network/package/yast2-network.changes Wed Jun 4 12:49:55 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Jun 4 12:48:24 CEST 2008 - mzugec(a)suse.cz + +- fixed command-line (bnc#397016) +- 2.16.48 + +------------------------------------------------------------------- Mon Jun 2 09:21:09 CEST 2008 - mzugec(a)suse.cz - set link status up for all interfaces during installation Modified: branches/SuSE-Linux-11_0-Branch/network/src/lan/cmdline.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_0-Branch/networ… ============================================================================== --- branches/SuSE-Linux-11_0-Branch/network/src/lan/cmdline.ycp (original) +++ branches/SuSE-Linux-11_0-Branch/network/src/lan/cmdline.ycp Wed Jun 4 12:49:55 2008 @@ -181,10 +181,11 @@ LanItems::current = getItem(options, config); LanItems::SetItem(); - if (!(size(LanItems::getCurrentItem()["ifcfg"]:"")>0)){ + if (size(LanItems::getCurrentItem()["ifcfg"]:"")==0){ NetworkInterfaces::Add(); LanItems::operation = `edit; LanItems::interfacename=LanItems::getCurrentItem()["hwinfo", "dev_name"]:""; + LanItems::Items[LanItems::current, "ifcfg"] = LanItems::interfacename; } /* @@ -216,6 +217,7 @@ } } */ +if (contains(Map::Keys(options), "ip")) options["bootproto"] = "static"; LanItems::bootproto = options["bootproto"]:"none"; if (!contains(["none", "static", "dhcp"], LanItems::bootproto)){ @@ -224,7 +226,7 @@ } if (LanItems::bootproto=="static"){ LanItems::ipaddr = options["ip"]:""; - LanItems::netmask = options["netmask"]:""; + LanItems::netmask = options["netmask"]:"255.255.255.0"; } else{ LanItems::ipaddr = ""; LanItems::netmask = ""; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r48054 - in /trunk/ncurses-pkg/src: NCPackageSelector.cc NCPackageSelector.h NCPkgFilterSearch.cc NCPkgFilterSearch.h
by kmachalkova＠svn.opensuse.org 04 Jun '08

04 Jun '08

Author: kmachalkova Date: Wed Jun 4 12:44:02 2008 New Revision: 48054 URL: http://svn.opensuse.org/viewcvs/yast?rev=48054&view=rev Log: Let's not bother users with hitting search button - removing it, searching directly by hitting enter on search expression field (ReturnOnReturn rulezz :) ) Modified: trunk/ncurses-pkg/src/NCPackageSelector.cc trunk/ncurses-pkg/src/NCPackageSelector.h trunk/ncurses-pkg/src/NCPkgFilterSearch.cc trunk/ncurses-pkg/src/NCPkgFilterSearch.h Modified: trunk/ncurses-pkg/src/NCPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPackageSelecto… ============================================================================== --- trunk/ncurses-pkg/src/NCPackageSelector.cc (original) +++ trunk/ncurses-pkg/src/NCPackageSelector.cc Wed Jun 4 12:44:02 2008 @@ -255,7 +255,7 @@ { retVal = filterMain->handleEvent(); } - else if ( event.widget == searchButton ) + else if ( event.widget == searchField ) { retVal = searchPopup->showSearchResultPackages(); } Modified: trunk/ncurses-pkg/src/NCPackageSelector.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPackageSelecto… ============================================================================== --- trunk/ncurses-pkg/src/NCPackageSelector.h (original) +++ trunk/ncurses-pkg/src/NCPackageSelector.h Wed Jun 4 12:44:02 2008 @@ -144,7 +144,7 @@ // information about packages NCPkgPackageDetails * infoText; // short/longdecsription, filelist NCRichText * filter_desc; - NCPushButton *searchButton; + NCInputField *searchField; NCPkgSearchSettings *searchSet; YReplacePoint * replacePoint; // replace point for info text YReplacePoint * replPoint; @@ -224,7 +224,7 @@ YReplacePoint *ReplacePoint() { return replacePoint; } NCRichText *FilterDescription() { return filter_desc; } NCPkgSearchSettings *SearchSettings() { return searchSet; } - void setSearchButton( NCPushButton *pb ) { searchButton = pb; } + void setSearchField( NCInputField *expr ) { searchField = expr; } bool checkNow( bool *ok ); bool verifySystem( bool *ok ); Modified: trunk/ncurses-pkg/src/NCPkgFilterSearch.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgFilterSearc… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgFilterSearch.cc (original) +++ trunk/ncurses-pkg/src/NCPkgFilterSearch.cc Wed Jun 4 12:44:02 2008 @@ -87,18 +87,10 @@ NCLayoutBox * vSplit = new NCLayoutBox ( frame0, YD_VERT); new NCSpacing( vSplit, YD_VERT, true, 0.5 ); - NCLayoutBox * hSplit = new NCLayoutBox ( vSplit, YD_HORIZ); - searchExpr = new NCComboBox( hSplit, - NCPkgStrings::SearchPhrase(), - true ); // editable = true - + searchExpr = new NCInputField( vSplit, NCPkgStrings::SearchPhrase() ); searchExpr->setStretchable( YD_HORIZ, true ); - searchExpr->addItem( new YTableItem() ); - - NCLayoutBox * bogus = new NCLayoutBox ( hSplit, YD_VERT); - new NCSpacing( bogus, YD_VERT, false, 1.0 ); - searchButton = new NCPushButton( bogus, NCPkgStrings::SearchButton()); - packager->setSearchButton( searchButton ); + searchExpr->setReturnOnReturn( true ); + packager->setSearchField( searchExpr ); new NCSpacing( vSplit, YD_VERT, false, 0.5 ); @@ -128,8 +120,8 @@ // get the expression and store it in combo box list // value = searchExpr->getValue(); - value = searchExpr->text(); - searchExpr->addItem( value, true ); + value = searchExpr->value(); + //searchExpr->addItem( value, true ); } return value; @@ -245,27 +237,6 @@ /////////////////////////////////////////////////////////////////// // // -// METHOD NAME : NCPopup::wHandleInput -// METHOD TYPE : NCursesEvent -// -// DESCRIPTION : -// -NCursesEvent NCPkgFilterSearch::wHandleInput( wint_t ch ) -{ - NCursesEvent ret = NCursesEvent::none; - - // start package search if Return is pressed - if ( ch == KEY_RETURN ) - ret = NCursesEvent::button; - else - ret = NCWidget::wHandleInput( ch ); - - return ret; -} - -/////////////////////////////////////////////////////////////////// -// -// // METHOD NAME : NCPkgFilterSearch::postAgain // METHOD TYPE : bool // Modified: trunk/ncurses-pkg/src/NCPkgFilterSearch.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgFilterSearc… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgFilterSearch.h (original) +++ trunk/ncurses-pkg/src/NCPkgFilterSearch.h Wed Jun 4 12:44:02 2008 @@ -28,7 +28,7 @@ using std::string; #include "NCPopup.h" -#include "NCComboBox.h" +#include "NCInputField.h" #include "NCLabel.h" #include "NCLayoutBox.h" #include "NCRichText.h" @@ -50,7 +50,7 @@ private: - NCComboBox * searchExpr; + NCInputField * searchExpr; NCCheckBox * ignoreCase; NCPushButton * searchButton; @@ -62,9 +62,6 @@ protected: string getSearchExpression() const; - - - virtual NCursesEvent wHandleInput( wint_t ch ); public: -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r48053 - in /trunk/ncurses-pkg: package/yast2-ncurses-pkg.changes src/NCPkgPopupDeps.cc src/NCPkgPopupDeps.h
by gs＠svn.opensuse.org 04 Jun '08

04 Jun '08

Author: gs Date: Wed Jun 4 12:18:45 2008 New Revision: 48053 URL: http://svn.opensuse.org/viewcvs/yast?rev=48053&view=rev Log: Improve dependency popup: show solution details (NCRichText), only add NCSpacing if there's enough space Modified: trunk/ncurses-pkg/package/yast2-ncurses-pkg.changes trunk/ncurses-pkg/src/NCPkgPopupDeps.cc trunk/ncurses-pkg/src/NCPkgPopupDeps.h Modified: trunk/ncurses-pkg/package/yast2-ncurses-pkg.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/package/yast2-ncurse… ============================================================================== --- trunk/ncurses-pkg/package/yast2-ncurses-pkg.changes (original) +++ trunk/ncurses-pkg/package/yast2-ncurses-pkg.changes Wed Jun 4 12:18:45 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Jun 4 12:13:54 CEST 2008 - gs(a)suse.de + +- Improve dependency popup: show solution details (NCRichText), + only add NCSpacing if there's enough space + +------------------------------------------------------------------- Thu May 29 10:12:08 CEST 2008 - gs(a)suse.de - Show the status of a language pattern and make installation Modified: trunk/ncurses-pkg/src/NCPkgPopupDeps.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgPopupDeps.c… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgPopupDeps.cc (original) +++ trunk/ncurses-pkg/src/NCPkgPopupDeps.cc Wed Jun 4 12:18:45 2008 @@ -44,7 +44,7 @@ typedef NCProblemSelectionBox Self; NCProblemSelectionBox (const Self &); // prohibit copying Self & operator= (const Self &); // prohibit assignment - + NCPkgPopupDeps * depsPopup; // to notify about changes protected: @@ -66,7 +66,8 @@ Self & operator= (const Self &); // prohibit assignment NCPkgPopupDeps * depsPopup; - + std::map<YItem *, string> detailsMap; + protected: virtual NCursesEvent wHandleInput( wint_t ch ); @@ -77,6 +78,7 @@ , depsPopup (aDepsPopup) {} virtual ~NCSolutionSelectionBox () {} + void saveDetails( YItem * item, string details ) { detailsMap[item] = details; } }; using namespace std; @@ -96,6 +98,7 @@ , solutionw( 0 ) , head( 0 ) , details( 0 ) + , solDetails( 0 ) , packager( pkger ) , problemw( 0 ) @@ -129,38 +132,53 @@ // vertical split is the (only) child of the dialog NCLayoutBox * vSplit = new NCLayoutBox( this, YD_VERT ); - // FIXME - // opt.vWeight.setValue( 40 ); - vSplit->setNotify( true ); new NCSpacing( vSplit, YD_VERT, false, 1 ); - head = new NCLabel( vSplit, "", true, false ); // isHeading = true + head = new NCLabel( vSplit, "", true ); // isHeading = true - new NCSpacing( vSplit, YD_VERT, false, 1 ); + // only add spacings if there's enough space + if ( this->preferredHeight() > 25 ) + new NCSpacing( vSplit, YD_VERT, false, 1 ); + + NCAlignment * left = new NCAlignment( vSplit, YAlignBegin, YAlignUnchanged ); + left->setWeight(YD_VERT, 30 ); - // add the list containing packages with unresolved dependencies - problemw = new NCProblemSelectionBox( vSplit, _("&Problems"), this); + // the list containing the problems (the unresolved package dependencies) + problemw = new NCProblemSelectionBox( left, _("&Problems"), this); problemw->setStretchable( YD_HORIZ, true ); - new NCSpacing( vSplit, YD_VERT, false, 1 ); + NCAlignment * left1 = new NCAlignment( vSplit, YAlignBegin, YAlignUnchanged ); + left1->setWeight(YD_VERT, 10 ); - NCAlignment * left = new NCAlignment( vSplit, YAlignBegin, YAlignUnchanged ); + // show the details of the problem + details = new NCLabel ( left1, "", false, true ); // heading = false, + details->setStretchable( YD_HORIZ, true ); // outputField = true - // heading = false, outputField = true - details = new NCLabel ( left,"", false, true ); - - new NCSpacing( vSplit, YD_VERT, false, 1 ); // stretchable = true + if ( this->preferredHeight() > 25 ) + new NCSpacing( vSplit, YD_VERT, false, 0.5 ); // stretchable = false - // add the package list containing the dependencies - solutionw = new NCSolutionSelectionBox ( vSplit, _("Possible &Solutions"), this); + NCAlignment * left2 = new NCAlignment( vSplit, YAlignBegin, YAlignUnchanged ); + left2->setWeight( YD_VERT, 30 ); + + // the list containing the solutions of a dependency problem + solutionw = new NCSolutionSelectionBox ( left2, _("Possible &Solutions"), this); + + if ( this->preferredHeight() > 25 ) + new NCSpacing( vSplit, YD_VERT, false, 1 ); + + NCAlignment * left3 = new NCAlignment( vSplit, YAlignBegin, YAlignUnchanged ); + left3->setWeight( YD_VERT, 30 ); + + // show the details of the solution + solDetails = new NCRichText ( left3, "", true ); // plain text mode = true - new NCSpacing( vSplit, YD_VERT, false, 1 ); // stretchable = false + if ( this->preferredHeight() > 25 ) + new NCSpacing( vSplit, YD_VERT, false, 1 ); // stretchable = false NCLayoutBox * hSplit = new NCLayoutBox( vSplit, YD_HORIZ ); - - + // add the solve button solveButton = new NCPushButton( hSplit, NCPkgStrings::SolveLabel() ); solveButton->setFunctionKey( 10 ); @@ -170,8 +188,9 @@ // add the cancel button cancelButton = new NCPushButton( hSplit, NCPkgStrings::CancelLabel() ); cancelButton->setFunctionKey( 9 ); - - new NCSpacing( vSplit, YD_VERT, false, 1 ); // stretchable = false + + if ( this->preferredHeight() > 25 ) + new NCSpacing( vSplit, YD_VERT, false, 0.5 ); // stretchable = false } /////////////////////////////////////////////////////////////////// @@ -260,15 +279,15 @@ e = rproblems.end (), i; int idx; - yuiMilestone() << "PROBLEMS" << endl; + for (i = b, idx = 0; i != e; ++i, ++idx) { - yuiMilestone() << "PROB " << (*i)->description () << endl; - yuiMilestone() << ": " << (*i)->details () << endl; + yuiMilestone() << "Problem: " << (*i)->description () << endl; + yuiMilestone() << "Details: " << (*i)->details () << endl; // no solution yet problems.push_back (make_pair (*i, zypp::ProblemSolution_Ptr ())); - //problemw->itemAdded ((*i)->description (), idx, false /*selected*/); + problemw->addItem( (*i)->description(), false ); // selected: false } @@ -298,14 +317,34 @@ bb = solutions.begin (), ee = solutions.end (), ii; + + bool showDetails = true;; + string description; + for (ii = bb; ii != ee; ++ii) { - yuiMilestone() << " SOL " << (*ii)->description () << endl; - yuiMilestone() << " : " << (*ii)->details () << endl; + yuiMilestone() << "Solution: " << (*ii)->description () << endl; + yuiMilestone() << "Details: " << (*ii)->details () << endl; + yuiMilestone() << "User decision: " << user_solution << endl; - solutionw->addItem( new YItem ( (*ii)->description(), // label - (user_solution == *ii) ) ); // selected + description = (*ii)->description(); - yuiMilestone() << "usr: " << user_solution << " cur: " << *ii << endl; + if ( !((*ii)->details().empty()) ) + // hint for the user: more information below + description += _(" see below"); + + if ( showDetails ) + { + showSolutionDetails( (*ii)->details() ); // show details of 1. solution + showDetails = false; + } + + YItem *newItem = new YItem ( description, // text + (user_solution == *ii) ); // selected ? + + solutionw->addItem( newItem ); + solutionw->saveDetails( newItem, (*ii)->details() ); + + yuiDebug() << "Solution: " << (*ii) << endl; // Complete info } solutionw->doneMultipleChanges(); @@ -470,6 +509,21 @@ problems[prob_num] = make_pair (problem, sol); } +void NCPkgPopupDeps::showSolutionDetails( string details ) +{ + string text; + if ( details.empty() ) + // hint for the user: there isn't any additional information + // (for the currently selected solution of a dependency problem) + text = _("No further solution details available"); + else + text = details; + + if ( solDetails ) + solDetails->setText( text ); + +} + /////////////////////////////////////////////////////////////////// // // @@ -519,7 +573,7 @@ NCursesEvent NCSolutionSelectionBox::wHandleInput( wint_t key ) { NCursesEvent ret = NCMultiSelectionBox::wHandleInput( key ); - + switch ( key ) { case KEY_SPACE: @@ -536,6 +590,13 @@ } break; } + case KEY_UP: + case KEY_DOWN: { + // show details + depsPopup->showSolutionDetails( detailsMap[currentItem()] ); + break; + } + default: { break; } Modified: trunk/ncurses-pkg/src/NCPkgPopupDeps.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgPopupDeps.h… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgPopupDeps.h (original) +++ trunk/ncurses-pkg/src/NCPkgPopupDeps.h Wed Jun 4 12:18:45 2008 @@ -34,7 +34,8 @@ class NCSelectionBox; class NCMultiSelectionBox; class NCPackageSelector; -class NCInputField; +class NCRichText; +class NCSolutionSelectionBox; namespace PkgDep { class ErrorResult; @@ -72,11 +73,12 @@ NCPushButton * cancelButton; NCPushButton * solveButton; - NCMultiSelectionBox * solutionw; // resolver problem solutions + NCSolutionSelectionBox * solutionw; // resolver problem solutions NCLabel * head; // the headline NCLabel *details; // problem details + NCRichText *solDetails; // solution details NCPackageSelector * packager; // connection to the package selector @@ -107,6 +109,8 @@ bool showSolutions( int index ); // for the currently selected problem, choose this solution void setSolution (int index); + // show details + void showSolutionDetails( string details ); }; /////////////////////////////////////////////////////////////////// -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r48052 - in /trunk/installation: package/yast2-installation.changes src/clients/copy_files_finish.ycp src/clients/inst_license.ycp
by locilka＠svn.opensuse.org 04 Jun '08

04 Jun '08

Author: locilka Date: Wed Jun 4 12:03:29 2008 New Revision: 48052 URL: http://svn.opensuse.org/viewcvs/yast?rev=48052&view=rev Log: - Copying /license.tar.gz to /etc/YaST2/license/ (bnc #396444). Modified: trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/copy_files_finish.ycp trunk/installation/src/clients/inst_license.ycp Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Wed Jun 4 12:03:29 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Jun 4 11:57:07 CEST 2008 - locilka(a)suse.cz + +- Copying /license.tar.gz to /etc/YaST2/license/ (bnc #396444). + +------------------------------------------------------------------- Tue Jun 3 13:44:56 CEST 2008 - locilka(a)suse.cz - Umounting temporary directory in inst_pre_install (if already Modified: trunk/installation/src/clients/copy_files_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/copy_fi… ============================================================================== --- trunk/installation/src/clients/copy_files_finish.ycp (original) +++ trunk/installation/src/clients/copy_files_finish.ycp Wed Jun 4 12:03:29 2008 @@ -177,10 +177,21 @@ SCR::Execute (.target.remove, eula_txt); } - // Copy info.txt so it can be used in firstboot (new eula.txt) - if (FileUtils::Exists ("/info.txt")) - { - SCR::Execute (.target.bash, sformat("/bin/cp /info.txt %1", eula_txt)); + string license_dir = sformat ("%1%2/license/", Installation::destdir, Directory::etcdir); + string license_file = "/license.tar.gz"; + // Copy licenses so it can be used in firstboot later + // bnc #396976 + map cmd = (map) WFM::Execute (.target.bash_output, + sformat ( + "mkdir -p '%1' && cd '%1' && rm -rf license*.txt; tar -xf '%2'", + String::Quote (license_dir), + String::Quote (license_file) + ) + ); + if (cmd["exit"]:-1 == 0) { + y2milestone ("Copying %1 to %2 was successful", license_file, license_dir); + } else { + y2error ("Copying %1 to %2 has failed: %3", license_file, license_dir, cmd); } // bugzila #328126 Modified: trunk/installation/src/clients/inst_license.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_li… ============================================================================== --- trunk/installation/src/clients/inst_license.ycp (original) +++ trunk/installation/src/clients/inst_license.ycp Wed Jun 4 12:03:29 2008 @@ -3,6 +3,8 @@ * Package: Installation * Summary: Generic License File * Authors: Anas Nashif <nashif(a)suse.de> + * Jiri Srain <jsrain(a)suse.cz> + * Lukas Ocilka <locilka(a)suse.cz> * * $Id$ * @@ -18,13 +20,9 @@ import "ProductLicense"; import "Mode"; -map display = UI::GetDisplayInfo(); -integer space = display["TextMode"]:true ? 1 : 3; - // all the arguments map argmap = GetInstArgs::argmap(); - // Action if license is not accepted // abort|continue|halt // halt is the default @@ -40,22 +38,18 @@ symbol ask_ret = nil; -string text = ""; - if (Stage::initial ()) { ask_ret = ProductLicense::AskFirstStageLicenseAgreement (action); } else { - list<string> default_patterns = ["info.txt"]; - string directory = argmap["directory"]:"/var/lib/YaST2"; + string directory = argmap["directory"]:Directory::etcdir + "/license/"; if (argmap["directory"]:"" != "") directory = Directory::custom_workflow_dir + directory; - list<string> patterns = argmap["patterns"]:default_patterns; - ask_ret = ProductLicense::AskInstalledLicenseAgreement (directory, - patterns, action); + // patterns are hardcoded + ask_ret = ProductLicense::AskInstalledLicenseAgreement (directory, [], action); } if (ask_ret == nil || ask_ret == `auto) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r48051 - in /trunk/qt-pkg: VERSION.cmake package/yast2-qt-pkg.changes src/YQPackageSelector.cc
by sh-sh-sh＠svn.opensuse.org 04 Jun '08

04 Jun '08

Author: sh-sh-sh Date: Wed Jun 4 11:47:44 2008 New Revision: 48051 URL: http://svn.opensuse.org/viewcvs/yast?rev=48051&view=rev Log: Added translation marker for "File" menu (bnc #396419) Modified: trunk/qt-pkg/VERSION.cmake trunk/qt-pkg/package/yast2-qt-pkg.changes trunk/qt-pkg/src/YQPackageSelector.cc Modified: trunk/qt-pkg/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/VERSION.cmake?rev=48051&r… ============================================================================== --- trunk/qt-pkg/VERSION.cmake (original) +++ trunk/qt-pkg/VERSION.cmake Wed Jun 4 11:47:44 2008 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "16") -SET(VERSION_PATCH "47") +SET(VERSION_PATCH "48") Modified: trunk/qt-pkg/package/yast2-qt-pkg.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/package/yast2-qt-pkg.chan… ============================================================================== --- trunk/qt-pkg/package/yast2-qt-pkg.changes (original) +++ trunk/qt-pkg/package/yast2-qt-pkg.changes Wed Jun 4 11:47:44 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Jun 4 11:46:58 CEST 2008 - sh(a)suse.de + +- Added translation marker for "File" menu (bnc #396419) +- V 2.16.48 + +------------------------------------------------------------------- Thu May 29 15:29:40 CEST 2008 - ma(a)suse.de - Revert 'fix persistent locks saving (bnc#332853)' because the Modified: trunk/qt-pkg/src/YQPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPackageSelector.cc?… ============================================================================== --- trunk/qt-pkg/src/YQPackageSelector.cc (original) +++ trunk/qt-pkg/src/YQPackageSelector.cc Wed Jun 4 11:47:44 2008 @@ -605,7 +605,7 @@ _fileMenu = new QMenu( _menuBar ); Q_CHECK_PTR( _fileMenu ); QAction *action = _menuBar->addMenu( _fileMenu ); - action->setText(( "&File" )); + action->setText( _( "&File" )); _fileMenu->addAction( _( "&Import..." ), this, SLOT( pkgImport() ) ); _fileMenu->addAction( _( "&Export..." ), this, SLOT( pkgExport() ) ); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r48050 - /tags/branch-Linux-11_0-2_16_18/bootloader/
by juhliarik＠svn.opensuse.org 04 Jun '08

04 Jun '08

Author: juhliarik Date: Wed Jun 4 10:31:34 2008 New Revision: 48050 URL: http://svn.opensuse.org/viewcvs/yast?rev=48050&view=rev Log: Created tag branch-Linux-11_0-2_16_18 for bootloader Added: tags/branch-Linux-11_0-2_16_18/bootloader/ - copied from r48049, branches/SuSE-Linux-11_0-Branch/bootloader/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r48049 - /tags/branch-Linux-11_0-2_16_18/
by juhliarik＠svn.opensuse.org 04 Jun '08

04 Jun '08

Author: juhliarik Date: Wed Jun 4 10:31:31 2008 New Revision: 48049 URL: http://svn.opensuse.org/viewcvs/yast?rev=48049&view=rev Log: Created tag branch-Linux-11_0-2_16_18 Added: tags/branch-Linux-11_0-2_16_18/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r48048 - in /branches/SuSE-Linux-11_0-Branch/bootloader: VERSION package/yast2-bootloader.changes
by juhliarik＠svn.opensuse.org 04 Jun '08

04 Jun '08

Author: juhliarik Date: Wed Jun 4 10:31:22 2008 New Revision: 48048 URL: http://svn.opensuse.org/viewcvs/yast?rev=48048&view=rev Log: added new version 2.16.18 Modified: branches/SuSE-Linux-11_0-Branch/bootloader/VERSION branches/SuSE-Linux-11_0-Branch/bootloader/package/yast2-bootloader.changes Modified: branches/SuSE-Linux-11_0-Branch/bootloader/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_0-Branch/bootlo… ============================================================================== --- branches/SuSE-Linux-11_0-Branch/bootloader/VERSION (original) +++ branches/SuSE-Linux-11_0-Branch/bootloader/VERSION Wed Jun 4 10:31:22 2008 @@ -1 +1 @@ -2.16.17 +2.16.18 Modified: branches/SuSE-Linux-11_0-Branch/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_0-Branch/bootlo… ============================================================================== --- branches/SuSE-Linux-11_0-Branch/bootloader/package/yast2-bootloader.changes (original) +++ branches/SuSE-Linux-11_0-Branch/bootloader/package/yast2-bootloader.changes Wed Jun 4 10:31:22 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Jun 4 10:06:01 CEST 2008 - juhliarik(a)suse.cz + +- added fix for problem with liveCD and simlinks for initrd and + kernel (bnc# 393030) +- 2.16.18 + +------------------------------------------------------------------- Mon May 26 18:34:43 CEST 2008 - juhliarik(a)suse.cz - added fix for problem with editing boot section for LILO -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0