January 2011 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r63275 - in /trunk/storage: package/yast2-storage.changes storage/src/include/ep-all.ycp storage/src/modules/Storage.ycp
by fehr＠svn2.opensuse.org 26 Jan '11

26 Jan '11

Author: fehr Date: Wed Jan 26 16:05:49 2011 New Revision: 63275 URL: http://svn.opensuse.org/viewcvs/yast?rev=63275&view=rev Log: add button to trigger query for crypt password (bnc #666883) Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/include/ep-all.ycp trunk/storage/storage/src/modules/Storage.ycp Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Wed Jan 26 16:05:49 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Jan 26 16:03:35 CET 2011 - fehr(a)suse.de + +- add button to trigger query for crypt password (bnc #666883) + +------------------------------------------------------------------- Tue Jan 18 14:49:17 CET 2011 - jsrain(a)suse.cz - adaptations for unattended migration Modified: trunk/storage/storage/src/include/ep-all.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-a… ============================================================================== --- trunk/storage/storage/src/include/ep-all.ycp (original) +++ trunk/storage/storage/src/include/ep-all.ycp Wed Jan 26 16:05:49 2011 @@ -60,6 +60,8 @@ if (true) { // menu entry text configs = add(configs, `item(`id(`multipath), `icon("yast-iscsi-server"), _("Configure &Multipath..."))); + // menu entry text + configs = add(configs, `item(`id(`cryptpwd), `icon("yast-encrypted"), _("Provide Crypt &Passwords..."))); } if (Arch::s390() && IsAvailable("s390")) { @@ -192,6 +194,15 @@ Really call Multipath configuration?"), nil, "multipath-simple"); break; + case `cryptpwd: + map<string,map> tg = Storage::GetTargetMap(); + tg = Storage::AskCryptPasswords( tg ); + Storage::SetTargetMap(tg); + UpdateMainStatus(); + UpdateNavigationTree(nil); + TreePanel::Create(); + break; + case `dasd: // popup text CallConfig(_("Calling DASD configuration cancels all current changes. Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Wed Jan 26 16:05:49 2011 @@ -3451,7 +3451,7 @@ return( ret ); } -map<string, map> AskCryptPasswords( map<string, map> target ) +global map<string, map> AskCryptPasswords( map<string, map> target ) { map crvol = GetCryptLists( target ); boolean ret = true; @@ -3464,6 +3464,8 @@ // header text string header = _("Enter Encryption Password"); + if( Mode::normal() && size(crvol["inactive"]:[])==0 ) + Popup::Error( _("There are no encrypted volume to unlock.")); while( size(crvol["inactive"]:[])>0 && ret ) { ret = CryptVolPopup( crvol["inactive"]:[], crvol["active"]:[] ); -- 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] r63274 - in /branches/SuSE-Linux-11_4-Branch/storage: package/yast2-storage.changes storage/src/include/ep-all.ycp storage/src/modules/Storage.ycp
by fehr＠svn2.opensuse.org 26 Jan '11

26 Jan '11

Author: fehr Date: Wed Jan 26 16:05:31 2011 New Revision: 63274 URL: http://svn.opensuse.org/viewcvs/yast?rev=63274&view=rev Log: add button to trigger query for crypt password (bnc #666883) Modified: branches/SuSE-Linux-11_4-Branch/storage/package/yast2-storage.changes branches/SuSE-Linux-11_4-Branch/storage/storage/src/include/ep-all.ycp branches/SuSE-Linux-11_4-Branch/storage/storage/src/modules/Storage.ycp Modified: branches/SuSE-Linux-11_4-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_4-Branch/storag… ============================================================================== --- branches/SuSE-Linux-11_4-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-Linux-11_4-Branch/storage/package/yast2-storage.changes Wed Jan 26 16:05:31 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Jan 26 16:03:35 CET 2011 - fehr(a)suse.de + +- add button to trigger query for crypt password (bnc #666883) + +------------------------------------------------------------------- Mon Jan 17 17:28:51 CET 2011 - fehr(a)suse.de - allow floating point value in reserved block percentage and Modified: branches/SuSE-Linux-11_4-Branch/storage/storage/src/include/ep-all.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_4-Branch/storag… ============================================================================== --- branches/SuSE-Linux-11_4-Branch/storage/storage/src/include/ep-all.ycp (original) +++ branches/SuSE-Linux-11_4-Branch/storage/storage/src/include/ep-all.ycp Wed Jan 26 16:05:31 2011 @@ -60,6 +60,8 @@ if (true) { // menu entry text configs = add(configs, `item(`id(`multipath), `icon("yast-iscsi-server"), _("Configure &Multipath..."))); + // menu entry text + configs = add(configs, `item(`id(`cryptpwd), `icon("yast-encrypted"), _("Provide Crypt &Passwords..."))); } if (Arch::s390() && IsAvailable("s390")) { @@ -192,6 +194,15 @@ Really call Multipath configuration?"), nil, "multipath-simple"); break; + case `cryptpwd: + map<string,map> tg = Storage::GetTargetMap(); + tg = Storage::AskCryptPasswords( tg ); + Storage::SetTargetMap(tg); + UpdateMainStatus(); + UpdateNavigationTree(nil); + TreePanel::Create(); + break; + case `dasd: // popup text CallConfig(_("Calling DASD configuration cancels all current changes. Modified: branches/SuSE-Linux-11_4-Branch/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_4-Branch/storag… ============================================================================== --- branches/SuSE-Linux-11_4-Branch/storage/storage/src/modules/Storage.ycp (original) +++ branches/SuSE-Linux-11_4-Branch/storage/storage/src/modules/Storage.ycp Wed Jan 26 16:05:31 2011 @@ -3450,7 +3450,7 @@ return( ret ); } -map<string, map> AskCryptPasswords( map<string, map> target ) +global map<string, map> AskCryptPasswords( map<string, map> target ) { map crvol = GetCryptLists( target ); boolean ret = true; @@ -3463,6 +3463,8 @@ // header text string header = _("Enter Encryption Password"); + if( Mode::normal() && size(crvol["inactive"]:[])==0 ) + Popup::Error( _("There are no encrypted volume to unlock.")); while( size(crvol["inactive"]:[])>0 && ret ) { ret = CryptVolPopup( crvol["inactive"]:[], crvol["active"]:[] ); -- 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] r63273 - /tags/branch-SLE-10-SP4-2_13_11/support/
by jsrain＠svn2.opensuse.org 26 Jan '11

26 Jan '11

Author: jsrain Date: Wed Jan 26 14:37:49 2011 New Revision: 63273 URL: http://svn.opensuse.org/viewcvs/yast?rev=63273&view=rev Log: Created tag branch-SLE-10-SP4-2_13_11 for support Added: tags/branch-SLE-10-SP4-2_13_11/support/ (props changed) - copied from r63272, branches/SuSE-SLE-10-SP4-Branch/support/ -- 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] r63272 - /tags/branch-SLE-10-SP4-2_13_11/
by jsrain＠svn2.opensuse.org 26 Jan '11

26 Jan '11

Author: jsrain Date: Wed Jan 26 14:37:47 2011 New Revision: 63272 URL: http://svn.opensuse.org/viewcvs/yast?rev=63272&view=rev Log: Created tag branch-SLE-10-SP4-2_13_11 Added: tags/branch-SLE-10-SP4-2_13_11/ -- 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] r63271 - in /branches/SuSE-SLE-10-SP4-Branch/support: VERSION package/yast2-support.changes src/dialogs.ycp
by jsrain＠svn2.opensuse.org 26 Jan '11

26 Jan '11

Author: jsrain Date: Wed Jan 26 14:37:41 2011 New Revision: 63271 URL: http://svn.opensuse.org/viewcvs/yast?rev=63271&view=rev Log: fixed dialogs and supportconfig call (bnc#665910) Modified: branches/SuSE-SLE-10-SP4-Branch/support/VERSION branches/SuSE-SLE-10-SP4-Branch/support/package/yast2-support.changes branches/SuSE-SLE-10-SP4-Branch/support/src/dialogs.ycp Modified: branches/SuSE-SLE-10-SP4-Branch/support/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/suppor… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/support/VERSION (original) +++ branches/SuSE-SLE-10-SP4-Branch/support/VERSION Wed Jan 26 14:37:41 2011 @@ -1 +1 @@ -2.13.10 +2.13.11 Modified: branches/SuSE-SLE-10-SP4-Branch/support/package/yast2-support.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/suppor… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/support/package/yast2-support.changes (original) +++ branches/SuSE-SLE-10-SP4-Branch/support/package/yast2-support.changes Wed Jan 26 14:37:41 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Jan 26 13:50:40 CET 2011 - jsrain(a)suse.cz + +- fixed dialogs and supportconfig call (bnc#665910) +- 2.13.11 + +------------------------------------------------------------------- Tue May 25 16:50:20 CEST 2009 - mzugec(a)suse.de - removed calls of not-implemented functions Modified: branches/SuSE-SLE-10-SP4-Branch/support/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP4-Branch/suppor… ============================================================================== --- branches/SuSE-SLE-10-SP4-Branch/support/src/dialogs.ycp (original) +++ branches/SuSE-SLE-10-SP4-Branch/support/src/dialogs.ycp Wed Jan 26 14:37:41 2011 @@ -153,7 +153,7 @@ load_save=`Left( `CheckBoxFrame(`id(`save), _("Save as"), true, `HBox( - `InputField(`id(`save_dir), _("Directory to Save"), home), + `TextEntry(`id(`save_dir), `opt(`hstretch), _("Directory to Save"), home), `VBox( `Label(""), `PushButton(`id(`browse), Label::BrowseButton()) @@ -163,7 +163,7 @@ ); else load_save=`Left( `HBox( - `InputField(`id(`tarball_file), _("Package with log files"), Support::log_files["tarball"]:""), + `TextEntry(`id(`tarball_file), `opt(`hstretch), _("Package with log files"), Support::log_files["tarball"]:""), `VBox(`Label(""), `PushButton(`id(`browse), Label::BrowseButton()))) ); @@ -171,7 +171,7 @@ `VBox( load_save, `CheckBoxFrame(`id(`upload), _("Upload log files tarball into URL"), true, - `Left( `InputField(`id(`url), _("Upload Target"), url) ) + `TextEntry(`id(`url), `opt(`hstretch), _("Upload Target"), url) ) ) ); @@ -304,7 +304,7 @@ /* `Left( `HBox( - `InputField(`id(`log_dir), _("Log directory"), Support::log_files["tmp_dir"]:""), + `TextEntry(`id(`log_dir), `opt(`hstretch), _("Log directory"), Support::log_files["tmp_dir"]:""), `VBox(`Label(""), `PushButton(`id(`browse), Label::BrowseButton())) )), `MultiSelectionBox(`id(`options), _("Options"), items), @@ -425,7 +425,7 @@ any id = UI::QueryWidget(`var_table, `CurrentItem); term row = (term)UI::QueryWidget(`var_table, `Item(id)); UI::OpenDialog(`VBox( - `InputField(`id(`changed_value), row[1]:"", row[2]:""), + `TextEntry(`id(`changed_value), `opt(`hstretch), row[1]:"", row[2]:""), `HBox( `PushButton(`id(`cancel), Label::CancelButton()), `PushButton(`id(`ok), Label::OKButton()) @@ -490,17 +490,17 @@ /* Support configure2 dialog contents */ term contents = `VBox( `Frame (_("Contact Information"), `VBox( - `Left(`InputField(`id(`company), _("Company"), Support::options["VAR_OPTION_CONTACT_COMPANY"]:"")), - `Left(`InputField(`id(`email), _("Email Address"), Support::options["VAR_OPTION_CONTACT_EMAIL"]:"")), - `Left(`InputField(`id(`name), _("Name"), Support::options["VAR_OPTION_CONTACT_NAME"]:"")), - `Left(`InputField(`id(`phone), _("Phone Number"), Support::options["VAR_OPTION_CONTACT_PHONE"]:"")), - `Left(`InputField(`id(`storeid), _("Store ID"), Support::options["VAR_OPTION_CONTACT_STOREID"]:"")), - `Left(`InputField(`id(`terminalid), _("Terminal ID"), Support::options["VAR_OPTION_CONTACT_TERMINALID"]:"")), - `Left(`InputField(`id(`gpg_uid), _("GPG UID"), Support::options["VAR_OPTION_GPG_UID"]:"")) + `TextEntry(`id(`company), `opt(`hstretch), _("Company"), Support::options["VAR_OPTION_CONTACT_COMPANY"]:""), + `TextEntry(`id(`email), `opt(`hstretch), _("Email Address"), Support::options["VAR_OPTION_CONTACT_EMAIL"]:""), + `TextEntry(`id(`name), `opt(`hstretch), _("Name"), Support::options["VAR_OPTION_CONTACT_NAME"]:""), + `TextEntry(`id(`phone), `opt(`hstretch), _("Phone Number"), Support::options["VAR_OPTION_CONTACT_PHONE"]:""), + `TextEntry(`id(`storeid), `opt(`hstretch), _("Store ID"), Support::options["VAR_OPTION_CONTACT_STOREID"]:""), + `TextEntry(`id(`terminalid), `opt(`hstretch), _("Terminal ID"), Support::options["VAR_OPTION_CONTACT_TERMINALID"]:""), + `TextEntry(`id(`gpg_uid), `opt(`hstretch), _("GPG UID"), Support::options["VAR_OPTION_GPG_UID"]:"") )), `Frame (_("Upload Information"), `VBox( - `Left(`InputField(`id(`target), _("Upload Target"), deletechars(Support::options["VAR_OPTION_UPLOAD_TARGET"]:"", "'"))), - `Left(`InputField(`id(`novell_number), _("Novell 11 digit service request number"), Support::novell_number)) + `TextEntry(`id(`target),`opt(`hstretch), _("Upload Target"), deletechars(Support::options["VAR_OPTION_UPLOAD_TARGET"]:"", "'")), + `TextEntry(`id(`novell_number), `opt(`hstretch), _("Novell 11 digit service request number"), Support::novell_number) ))); Wizard::SetContentsButtons(caption, contents, HELPS["contact"]:"", @@ -561,29 +561,28 @@ return `back; integer id = Support::WhoAmI(); SCR::Write (.target.string, Support::pwd_file, Support::root_pw + "\n"); - cmd = sformat("cat %4 | su -c '%1 && chown -R %3 %2'", cmd, Support::log_files["tmp_dir"]:"", id, Support::pwd_file); + cmd = sformat("bash -c \"cat %4 | su -c '%1 && chown -R %3 %2'\"", cmd, Support::log_files["tmp_dir"]:"", id, Support::pwd_file); } symbol ret = nil; - integer pid = (integer) SCR::Execute(.process.start_shell, cmd); + SCR::Execute(.background.run_output, cmd); string unfinished_line = ""; Wizard::DisableNextButton (); - while (true) { - sleep (100); - if (SCR::Read (.process.running, pid) == true) { - string new_text = (string)SCR::Read (.process.read, pid); - if (new_text != nil) - UI::ChangeWidget (`id (`log), `LastLine, new_text); - } else { - Wizard::EnableNextButton (); - break; - } + while((boolean)SCR::Read(.background.output_open) || (boolean)(SCR::Read(.background.newlines) > 0)) { + sleep (100); + list<string> script_out = (list<string>)SCR::Read(.background.newout); + y2internal ("Out: %1", script_out); + foreach (string line, script_out, { + if (line != nil) + UI::ChangeWidget (`id (`log), `LastLine, "\n" + line); + }); ret = (symbol)UI::PollInput(); if (ret == `back || ret == `abort ) { - SCR::Execute (.process.kill, pid); + SCR::Execute (.background.kill); break; } } + Wizard::EnableNextButton (); if (Support::WhoAmI() != 0) SCR::Write (.target.string, Support::pwd_file, ""); while(ret!=`back && ret!=`abort && ret!=`next){ -- 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] r63270 - in /trunk/ncurses-pkg/src: NCPackageSelector.cc NCPackageSelector.h NCPkgPackageDetails.cc NCPkgPopupDescr.cc NCPkgTable.cc
by gs＠svn2.opensuse.org 26 Jan '11

26 Jan '11

Author: gs Date: Wed Jan 26 14:23:54 2011 New Revision: 63270 URL: http://svn.opensuse.org/viewcvs/yast?rev=63270&view=rev Log: code cleanup: obsolete lines removed, createDescrText renamed to createLicenseText (because only used for licenses) Modified: trunk/ncurses-pkg/src/NCPackageSelector.cc trunk/ncurses-pkg/src/NCPackageSelector.h trunk/ncurses-pkg/src/NCPkgPackageDetails.cc trunk/ncurses-pkg/src/NCPkgPopupDescr.cc trunk/ncurses-pkg/src/NCPkgTable.cc 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 Jan 26 14:23:54 2011 @@ -373,31 +373,6 @@ packageList->createPatchEntry ( patchPtr, *it); } - /*// get the patch list and sort it - list<ZyppSel> patchList( zyppPatchesBegin (), zyppPatchesEnd () ); - patchList.sort( sortByName ); - list<ZyppSel>::iterator listIt = patchList.begin(); - - while ( listIt != patchList.end() ) - { - ZyppPatch patchPtr = tryCastToZyppPatch( ( *listIt)->theObj() ); - - if ( patchPtr ) - { - string name = patchPtr->name(); - - string::iterator pos = search( name.begin(), name.end(), - expr.begin(), expr.end(), - ic_compare ); - - if ( pos != name.end() ) - { - // search sucessful - packageList->createPatchEntry( patchPtr, *listIt ); - } - } - ++listIt; - }*/ // show the patch list with search result packageList->drawList(); @@ -1255,7 +1230,7 @@ NCPopupInfo * info = new NCPopupInfo ( wpos( NCurses::lines()/10, NCurses::cols()/10), NCPkgStrings::NotifyLabel(), "" + pkgName + " " - + createDescrText( licenseText ), + + createLicenseText( licenseText ), NCPkgStrings::AcceptLabel(), NCPkgStrings::CancelLabel() ); @@ -1327,81 +1302,24 @@ /////////////////////////////////////////////////////////////////// // -// createDescrText -// -#define DOCTYPETAG "" +// createLicenseText +// -string NCPackageSelector::createDescrText( string value ) +#define DOCTYPETAG "" // Special doctype for preformatted HTML + +string NCPackageSelector::createLicenseText( string value ) { string html_text = ""; + const string htmlIdent(DOCTYPETAG); -#ifdef FIXME - bool author_format = false; - bool htmlFormat = false; /* Is the description coming in html? */ - /* By default, this is false and the text is plain text. But if the - * description contains DOCTYPETAG in the first line, it is considered - * to be formatted in html. The yast (this method here) needs not to - * do further formatting for the text part. - */ - - list<string>::const_iterator it = value.begin(); - - string line; - - /* Check if the first line is the html tag */ - if( it != value.end() ) + if ( value.find( htmlIdent ) != string::npos ) { - line = (*it); - const string htmlIdent(DOCTYPETAG); - - if ( line.length() >= htmlIdent.length() && /* Avoid exception if stringlen < len of tag */ - line.substr( 0, htmlIdent.length() ) == htmlIdent ) /* first line == DOCTYPETAG ? */ - { - htmlFormat = true; /* indicate that the text is already html formatted */ - } - else - { - html_text += line + " "; - } - ++it; + html_text = value; // HTML text } - - /** Loop over the remaining text. **/ - const string authors("Authors:"); - while ( it != value.end() ) + else { - line = (*it); - - /* Check if authors-line starts */ - if ( line.length() >= authors.length() && /* Avoid exception if stringlen < len of Authors */ - line.substr( 0, authors.length() ) == authors ) - { - line = " " + line + ""; - author_format = true; - } - if ( author_format ) - { - /* every author in his own line */ - html_text += line + " "; - } - else - { - html_text += " " + line; - if( (! htmlFormat) && (line.length() == 0) ) - { - html_text += " "; - } - else - { - html_text += " "; - } - } - - ++it; + html_text = "<pre>" + value + "</pre>"; // add <pre> to preserve newlines and spaces } -#else - html_text = value; -#endif return html_text; } 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 Jan 26 14:23:54 2011 @@ -395,11 +395,11 @@ bool autoChecking() { return autoCheck; } /** - * Creates a text from a list of strings which may contain HTML tags - * @param t used to be list, now a single string. but what does it contain? + * Creates a the license text + * @param t the license string * @return string The text */ - string createDescrText( string t ); + string createLicenseText( string t ); /** * Calls the package mananager (updateDu()) and shows the required disk space Modified: trunk/ncurses-pkg/src/NCPkgPackageDetails.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgPackageDeta… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgPackageDetails.cc (original) +++ trunk/ncurses-pkg/src/NCPkgPackageDetails.cc Wed Jan 26 14:23:54 2011 @@ -277,7 +277,7 @@ // get and format the patch description string value = patchPtr->description(); - //descr += createDescrText( value ); + descr += ""; descr += value; descr += ""; Modified: trunk/ncurses-pkg/src/NCPkgPopupDescr.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgPopupDescr.… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgPopupDescr.cc (original) +++ trunk/ncurses-pkg/src/NCPkgPopupDescr.cc Wed Jan 26 14:23:54 2011 @@ -134,7 +134,7 @@ headline->setLabel( pkgPtr->summary() ); - descrText->setText( packager->createDescrText(pkgPtr->description()) ); + descrText->setText( pkgPtr->description() ); return true; } Modified: trunk/ncurses-pkg/src/NCPkgTable.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgTable.cc?re… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgTable.cc (original) +++ trunk/ncurses-pkg/src/NCPkgTable.cc Wed Jan 26 14:23:54 2011 @@ -213,7 +213,7 @@ if ( objPtr ) { notify = objPtr->delnotify(); - yuiDebug() << "DELETE message: " << notify << endl; + yuiMilestone() << "DELETE message: " << notify << endl; header = NCPkgStrings::WarningLabel(); } break; @@ -223,7 +223,7 @@ if ( objPtr ) { notify = objPtr->insnotify(); - yuiDebug() << "NOTIFY message: " << notify << endl; + yuiMilestone() << "NOTIFY message: " << notify << endl; header = NCPkgStrings::NotifyLabel(); } case S_Update: @@ -248,8 +248,8 @@ { NCPopupInfo * info = new NCPopupInfo( wpos( (lines * 10)/100, (cols * 10) /100), NCPkgStrings::NotifyLabel(), - string( _("End User License Agreement") + - "" + pkgName + " " + packager->createDescrText( license ) ), + string( _("End User License Agreement") + " " + + "" + pkgName + " " + packager->createLicenseText( license ) ), NCPkgStrings::AcceptLabel(), NCPkgStrings::CancelLabel() ); @@ -291,7 +291,7 @@ { NCPopupInfo * info = new NCPopupInfo( wpos( (lines * 35)/100, (cols * 25)/100), header, - "" + pkgName + " " + packager->createDescrText( notify ) + "" + pkgName + " " + notify ); info->setPreferredSize( (NCurses::cols() * 50)/100, (NCurses::lines() * 30)/100); info->showInfoPopup( ); -- 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] r63269 - in /trunk/theme: VERSION package/yast2-theme.changes
by coolo＠svn2.opensuse.org 26 Jan '11

26 Jan '11

Author: coolo Date: Wed Jan 26 13:20:14 2011 New Revision: 63269 URL: http://svn.opensuse.org/viewcvs/yast?rev=63269&view=rev Log: new version Modified: trunk/theme/VERSION trunk/theme/package/yast2-theme.changes Modified: trunk/theme/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/VERSION?rev=63269&r1=63268… ============================================================================== --- trunk/theme/VERSION (original) +++ trunk/theme/VERSION Wed Jan 26 13:20:14 2011 @@ -1 +1 @@ -2.19.2 +2.20.1 Modified: trunk/theme/package/yast2-theme.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/package/yast2-theme.change… ============================================================================== --- trunk/theme/package/yast2-theme.changes (original) +++ trunk/theme/package/yast2-theme.changes Wed Jan 26 13:20:14 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Jan 26 12:19:57 UTC 2011 - coolo(a)novell.com + +- use dark stripes with light text for 11.4 +- 2.20.1 + +------------------------------------------------------------------- Wed May 19 10:16:37 CEST 2010 - tgoettlicher(a)suse.de - moved oxygen icons to correct directory -- 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] r63268 - in /trunk/theme/openSUSE/wizard: background.png installation.qss logo.png
by coolo＠svn2.opensuse.org 26 Jan '11

26 Jan '11

Author: coolo Date: Wed Jan 26 13:19:19 2011 New Revision: 63268 URL: http://svn.opensuse.org/viewcvs/yast?rev=63268&view=rev Log: use dark stripes and light text for 11.4 Modified: trunk/theme/openSUSE/wizard/background.png trunk/theme/openSUSE/wizard/installation.qss trunk/theme/openSUSE/wizard/logo.png Modified: trunk/theme/openSUSE/wizard/background.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/wizard/background… ============================================================================== Binary files - no diff available. Modified: trunk/theme/openSUSE/wizard/installation.qss URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/wizard/installati… ============================================================================== --- trunk/theme/openSUSE/wizard/installation.qss (original) +++ trunk/theme/openSUSE/wizard/installation.qss Wed Jan 26 13:19:19 2011 @@ -14,7 +14,7 @@ } #steps { - padding: 90px 2em 1em 0.5em; + padding: 5em 2em 1em 0.5em; background: url(logo.png) no-repeat top left; border: none; font-size: 10pt; @@ -28,41 +28,41 @@ } .current-step-name { - color: #000; + color: white; font-weight: bold; } .done-step-name { font-weight: normal; - color: #444; + color: #dddddd; } .todo-step-name { - color: #000; - font-weight: normal; + color: #bbbbbb; + font-weight: bold; } .todo-step-status { - qproperty-pixmap: url(step-todo.png); + qproperty-pixmap: url(white-step-todo.png); max-width: 14px; min-width: 14px; } .done-step-status { - qproperty-pixmap: url(step-done.png); + qproperty-pixmap: url(white-step-done.png); max-width: 14px; min-width: 14px; } .current-step-status { - qproperty-pixmap: url(step-current.png); + qproperty-pixmap: url(white-step-current.png); max-width: 14px; min-width: 14px; } .steps_heading { font-weight: bold; - color: #444; + color: white; margin: 1em 0 0 0; } @@ -199,7 +199,7 @@ QComboBox QAbstractItemView, QComboBox QMenu { color: black; - background-color: #bebebe; + background: #bebbe; border: 1px solid #888; selection-background-color: #4d8e0d; selection-color: white; @@ -482,6 +482,7 @@ border-radius: 5px; padding: 1px; } - QAbstractScrollArea>* { - border: 0; - } +QAbstractScrollArea>* { + border: 0; +} + Modified: trunk/theme/openSUSE/wizard/logo.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/wizard/logo.png?r… ============================================================================== Binary files - no diff available. -- 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] r63267 - in /trunk/printer: package/yast2-printer.changes src/autoconfig.ycp
by jsmeix＠svn2.opensuse.org 25 Jan '11

25 Jan '11

Author: jsmeix Date: Tue Jan 25 16:04:35 2011 New Revision: 63267 URL: http://svn.opensuse.org/viewcvs/yast?rev=63267&view=rev Log: Added in autoconfig.ycp a "&" keyboard shortcut for CheckBox Modified: trunk/printer/package/yast2-printer.changes trunk/printer/src/autoconfig.ycp Modified: trunk/printer/package/yast2-printer.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/package/yast2-printer.ch… ============================================================================== --- trunk/printer/package/yast2-printer.changes (original) +++ trunk/printer/package/yast2-printer.changes Tue Jan 25 16:04:35 2011 @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Tue Jan 25 14:10:21 CET 2011 - jsmeix(a)suse.de -- Adapt the "Driver Packages" dialog because the package +- Adapted the "Driver Packages" dialog because the package "cups-drivers-splix" is renamed to "splix" for openSUSE 11.4 (see Novell/openSUSE Bugzilla bnc#659579). To be backward compatible it tries first to install "splix" Modified: trunk/printer/src/autoconfig.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/autoconfig.ycp?rev=6… ============================================================================== --- trunk/printer/src/autoconfig.ycp (original) +++ trunk/printer/src/autoconfig.ycp Tue Jan 25 16:04:35 2011 @@ -58,7 +58,7 @@ // CheckBox for automatic configuration of USB printers // by installing or removing the RPM package udev-configure-printer. // Do not change or translate "udev-configure-printer", it is a RPM package name. - _("Use the package udev-configure-printer for automated USB printer configuration") + _("&Use the package udev-configure-printer for automated USB printer configuration") ) ), // Have space between the content and the bottom of the dialog: -- 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] r63266 - in /trunk/printer: VERSION package/yast2-printer.changes src/driveradd.ycp
by jsmeix＠svn2.opensuse.org 25 Jan '11

25 Jan '11

Author: jsmeix Date: Tue Jan 25 16:00:23 2011 New Revision: 63266 URL: http://svn.opensuse.org/viewcvs/yast?rev=63266&view=rev Log: - Adapt the "Driver Packages" dialog because the package "cups-drivers-splix" is renamed to "splix" for openSUSE 11.4 (see Novell/openSUSE Bugzilla bnc#659579). To be backward compatible it tries first to install "splix" but if this fails it tries to install "cups-drivers-splix" and it removes both splix and cups-drivers-splix if installed (see Novell/openSUSE Bugzilla bnc#642510). - 2.20.6 Modified: trunk/printer/VERSION trunk/printer/package/yast2-printer.changes trunk/printer/src/driveradd.ycp Modified: trunk/printer/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/VERSION?rev=63266&r1=632… ============================================================================== --- trunk/printer/VERSION (original) +++ trunk/printer/VERSION Tue Jan 25 16:00:23 2011 @@ -1 +1 @@ -2.20.5 +2.20.6 Modified: trunk/printer/package/yast2-printer.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/package/yast2-printer.ch… ============================================================================== --- trunk/printer/package/yast2-printer.changes (original) +++ trunk/printer/package/yast2-printer.changes Tue Jan 25 16:00:23 2011 @@ -1,4 +1,16 @@ ------------------------------------------------------------------- +Tue Jan 25 14:10:21 CET 2011 - jsmeix(a)suse.de + +- Adapt the "Driver Packages" dialog because the package + "cups-drivers-splix" is renamed to "splix" for openSUSE 11.4 + (see Novell/openSUSE Bugzilla bnc#659579). + To be backward compatible it tries first to install "splix" + but if this fails it tries to install "cups-drivers-splix" + and it removes both splix and cups-drivers-splix if installed + (see Novell/openSUSE Bugzilla bnc#642510). +- 2.20.6 + +------------------------------------------------------------------- Wed Jan 19 13:28:09 CET 2011 - jsmeix(a)suse.de - Rework the "Autoconfig Settings" dialog and drop the support for Modified: trunk/printer/src/driveradd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/driveradd.ycp?rev=63… ============================================================================== --- trunk/printer/src/driveradd.ycp (original) +++ trunk/printer/src/driveradd.ycp Tue Jan 25 16:00:23 2011 @@ -52,9 +52,10 @@ boolean gutenprint_installed = Printerlib::TestAndInstallPackage( "gutenprint", "installed" ); boolean hplip_installed = Printerlib::TestAndInstallPackage( "hplip", "installed" ); boolean manufacturer_PPDs_installed = Printerlib::TestAndInstallPackage( "manufacturer-PPDs", "installed" ); - boolean cups_drivers_splix_installed = Printerlib::TestAndInstallPackage( "cups-drivers-splix", "installed" ); + boolean splix_installed = Printerlib::TestAndInstallPackage( "splix", "installed" ) + || Printerlib::TestAndInstallPackage( "cups-drivers-splix", "installed" ); boolean m2300w_installed = Printerlib::TestAndInstallPackage( "m2300w", "installed" ); - y2milestone( "entering AddDriverDialog with OpenPrintingPPDs_ghostscript_installed:'%1' OpenPrintingPPDs_hpijs_installed:'%2' OpenPrintingPPDs_postscript_installed:'%3' gutenprint_installed:'%4' hplip_installed:'%5' manufacturer_PPDs_installed:'%6' cups_drivers_splix_installed:'%7' m2300w_installed:'%8'", OpenPrintingPPDs_ghostscript_installed, OpenPrintingPPDs_hpijs_installed, OpenPrintingPPDs_postscript_installed, gutenprint_installed, hplip_installed, manufacturer_PPDs_installed, cups_drivers_splix_installed, m2300w_installed ); + y2milestone( "entering AddDriverDialog with OpenPrintingPPDs_ghostscript_installed:'%1' OpenPrintingPPDs_hpijs_installed:'%2' OpenPrintingPPDs_postscript_installed:'%3' gutenprint_installed:'%4' hplip_installed:'%5' manufacturer_PPDs_installed:'%6' splix_installed:'%7' m2300w_installed:'%8'", OpenPrintingPPDs_ghostscript_installed, OpenPrintingPPDs_hpijs_installed, OpenPrintingPPDs_postscript_installed, gutenprint_installed, hplip_installed, manufacturer_PPDs_installed, splix_installed, m2300w_installed ); term contents = `VBox ( `VStretch(), `Left @@ -132,12 +133,12 @@ ), `Left ( `CheckBox - ( `id("cups-drivers-splix"), - // CheckBox to select or un-select the printer driver package cups-drivers-splix. - // There is no need to have the package name "cups-drivers-splix" in this text + ( `id("splix"), + // CheckBox to select or un-select the printer driver package splix. + // There is no need to have the package name "splix" in this text // because it is shown in a separated column to the left of this text. - "cups-drivers-&splix : " + _("SpliX Driver for SPL Printers without JBIG"), - cups_drivers_splix_installed + "&splix : " + _("SpliX Driver for SPL Printers without JBIG"), + splix_installed ) ), `Left @@ -229,7 +230,7 @@ boolean gutenprint_install = (boolean)UI::QueryWidget( `id("gutenprint"), `Value ); boolean hplip_install = (boolean)UI::QueryWidget( `id("hplip"), `Value ); boolean manufacturer_PPDs_install = (boolean)UI::QueryWidget( `id("manufacturer-PPDs"), `Value ); - boolean cups_drivers_splix_install = (boolean)UI::QueryWidget( `id("cups-drivers-splix"), `Value ); + boolean splix_install = (boolean)UI::QueryWidget( `id("splix"), `Value ); boolean m2300w_install = (boolean)UI::QueryWidget( `id("m2300w"), `Value ); string ppd_path_input_value = (string)UI::QueryWidget( `id("ppd_path_input"), `Value ); // Ignore an effectively empty ppd_path_input_value: @@ -239,7 +240,7 @@ && gutenprint_install == gutenprint_installed && hplip_install == hplip_installed && manufacturer_PPDs_install == manufacturer_PPDs_installed - && cups_drivers_splix_install == cups_drivers_splix_installed + && splix_install == splix_installed && m2300w_install == m2300w_installed && "" == filterchars( ppd_path_input_value, Printer::alnum_chars ) ) @@ -407,15 +408,29 @@ } } } - if( cups_drivers_splix_install != cups_drivers_splix_installed ) - { if( cups_drivers_splix_install ) - { if( Printerlib::TestAndInstallPackage( "cups-drivers-splix", "install" ) ) + if( splix_install != splix_installed ) + { if( splix_install ) + { if( Printerlib::TestAndInstallPackage( "splix", "install" ) ) { package_changed = true; } + if( ! Printerlib::TestAndInstallPackage( "splix", "installed" ) ) + { // Try to install the old cups-drivers-splix only if the newer splix was not installed: + if( Printerlib::TestAndInstallPackage( "cups-drivers-splix", "install" ) ) + { package_changed = true; + } + } } else - { if( Printerlib::TestAndInstallPackage( "cups-drivers-splix", "remove" ) ) - { package_changed = true; + { // Try to remove both splix and cups-drivers-splix if installed: + if( Printerlib::TestAndInstallPackage( "splix", "installed" ) ) + { if( Printerlib::TestAndInstallPackage( "splix", "remove" ) ) + { package_changed = true; + } + } + if( Printerlib::TestAndInstallPackage( "cups-drivers-splix", "installed" ) ) + { if( Printerlib::TestAndInstallPackage( "cups-drivers-splix", "remove" ) ) + { package_changed = true; + } } } } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0