November 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r41816 - /branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgVersionsView.cc
by tgoettlicher＠svn.opensuse.org 06 Nov '07

06 Nov '07

Author: tgoettlicher Date: Tue Nov 6 12:54:06 2007 New Revision: 41816 URL: http://svn.opensuse.org/viewcvs/yast?rev=41816&view=rev Log: code clean up Modified: branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgVersionsView.cc Modified: branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgVersionsView.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/pkg/YQPk… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgVersionsView.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgVersionsView.cc Tue Nov 6 12:54:06 2007 @@ -250,7 +250,6 @@ if ( versionCol() >= 0 ) setText( versionCol(), zyppObj->edition().asString().c_str() ); if ( archCol() >= 0 ) setText( archCol(), zyppObj->arch().asString().c_str() ); -// if ( repoCol() >= 0 ) setText( repoCol(), zyppObj->repository().info().alias().c_str() ); if ( repoCol() >= 0 ) setText( repoCol(), fromUTF8(zyppObj->repository().info().alias()) ); if ( productCol() >= 0 ) { -- 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] r41815 - in /branches/SuSE-Linux-10_3-Branch/product-creator: package/yast2-product-creator.changes src/Kiwi.ycp
by jsuchome＠svn.opensuse.org 06 Nov '07

06 Nov '07

Author: jsuchome Date: Tue Nov 6 12:27:30 2007 New Revision: 41815 URL: http://svn.opensuse.org/viewcvs/yast?rev=41815&view=rev Log: - correctly escape strings which should be written to config.xml (seen in #338090) Modified: branches/SuSE-Linux-10_3-Branch/product-creator/package/yast2-product-creator.changes branches/SuSE-Linux-10_3-Branch/product-creator/src/Kiwi.ycp Modified: branches/SuSE-Linux-10_3-Branch/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/produc… ============================================================================== --- branches/SuSE-Linux-10_3-Branch/product-creator/package/yast2-product-creator.changes (original) +++ branches/SuSE-Linux-10_3-Branch/product-creator/package/yast2-product-creator.changes Tue Nov 6 12:27:30 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Nov 6 12:25:59 CET 2007 - jsuchome(a)suse.cz + +- correctly escape strings which should be written to config.xml + (seen in #338090) + +------------------------------------------------------------------- Fri Oct 26 12:52:54 CEST 2007 - jsuchome(a)suse.cz - do not read the template name when going from main summary (#337444) Modified: branches/SuSE-Linux-10_3-Branch/product-creator/src/Kiwi.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/produc… ============================================================================== --- branches/SuSE-Linux-10_3-Branch/product-creator/src/Kiwi.ycp (original) +++ branches/SuSE-Linux-10_3-Branch/product-creator/src/Kiwi.ycp Tue Nov 6 12:27:30 2007 @@ -177,9 +177,10 @@ children = children + "\n" + Map2XML (chmap, level + 1); }); else if (subkey == "__value") - value = sformat ("%1", val); + value = String::EscapeTags (sformat ("%1", val)); else if (is (val, string)) - ret = sformat ("%1 %2=\"%3\"", ret, subkey, val); + ret = sformat ("%1 %2=\"%3\"", + ret, subkey, String::EscapeTags (tostring (val))); }); if (non_unique_key[key]:false) return sformat ("%1/>", ret); @@ -205,6 +206,8 @@ return ret; map config = (map) SCR::Read (.kiwi, base_path + "/config.xml"); + if (config == nil) + return ret; map<string,map> packages = config["packages"]:$[]; // rest parts of "packages" are saved in product-creator map ret["ignore"] = maplist (map p, -- 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] r41814 - in /trunk/product-creator: package/yast2-product-creator.changes src/Kiwi.ycp
by jsuchome＠svn.opensuse.org 06 Nov '07

06 Nov '07

Author: jsuchome Date: Tue Nov 6 12:26:42 2007 New Revision: 41814 URL: http://svn.opensuse.org/viewcvs/yast?rev=41814&view=rev Log: - correctly escape strings which should be written to config.xml (seen in #338090) Modified: trunk/product-creator/package/yast2-product-creator.changes trunk/product-creator/src/Kiwi.ycp Modified: trunk/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/package/yast2-pr… ============================================================================== --- trunk/product-creator/package/yast2-product-creator.changes (original) +++ trunk/product-creator/package/yast2-product-creator.changes Tue Nov 6 12:26:42 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Nov 2 11:13:58 CET 2007 - jsuchome(a)suse.cz + +- correctly escape strings which should be written to config.xml + (seen in #338090) + +------------------------------------------------------------------- Thu Nov 1 11:01:12 CET 2007 - jsuchome(a)suse.cz - fixed checking if repository has 'plaindir' format (#338115) Modified: trunk/product-creator/src/Kiwi.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/Kiwi.ycp?rev… ============================================================================== --- trunk/product-creator/src/Kiwi.ycp (original) +++ trunk/product-creator/src/Kiwi.ycp Tue Nov 6 12:26:42 2007 @@ -247,9 +247,10 @@ children = children + "\n" + Map2XML (chmap, level + 1); }); else if (subkey == "__value") - value = sformat ("%1", val); + value = String::EscapeTags (sformat ("%1", val)); else if (is (val, string)) - ret = sformat ("%1 %2=\"%3\"", ret, subkey, val); + ret = sformat ("%1 %2=\"%3\"", + ret, subkey, String::EscapeTags (tostring (val))); }); if (non_unique_key[key]:false) return sformat ("%1/>", ret); @@ -275,6 +276,8 @@ return ret; map config = (map) SCR::Read (.kiwi, base_path + "/config.xml"); + if (config == nil) + return ret; map<string,map> packages = config["packages"]:$[]; // rest parts of "packages" are saved in product-creator map ret["ignore"] = maplist (map p, -- 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] r41813 - in /branches/tmp/sh/mod-ui/ncurses/src: NCPackageSelectorPlugin.cc pkg/NCPackageSelector.cc
by gs＠svn.opensuse.org 06 Nov '07

06 Nov '07

Author: gs Date: Tue Nov 6 11:32:28 2007 New Revision: 41813 URL: http://svn.opensuse.org/viewcvs/yast?rev=41813&view=rev Log: don't delete NCPkgPopups in destructor; don't create NCPpopupInfo/NCPkgPopups on the stack Modified: branches/tmp/sh/mod-ui/ncurses/src/NCPackageSelectorPlugin.cc branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPackageSelector.cc Modified: branches/tmp/sh/mod-ui/ncurses/src/NCPackageSelectorPlugin.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCP… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCPackageSelectorPlugin.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCPackageSelectorPlugin.cc Tue Nov 6 11:32:28 2007 @@ -183,6 +183,8 @@ UIERR << "No NCPackageSelectorStart existing" << endl; } + YDialog::deleteTopmostDialog(); + if ( !event.result.isNull() ) { UIMIL << "Return value: " << event.result->toString() << endl; Modified: branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/pkg… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPackageSelector.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPackageSelector.cc Tue Nov 6 11:32:28 2007 @@ -201,8 +201,7 @@ saveState (); - // creation of the popups is moved to createPopups() - + // Changed because of new libyui: the creation of the popups is moved to createPopups() } @@ -212,40 +211,21 @@ // NCPackageSelector::~NCPackageSelector() { - if ( filterPopup ) - { - delete filterPopup; - } - if ( selectionPopup ) - { - delete selectionPopup; - } - if ( patternPopup ) - { - delete patternPopup; - } - if ( languagePopup ) - { - delete languagePopup; - } - if ( depsPopup ) - { - delete depsPopup; - } - if ( diskspacePopup ) - { - delete diskspacePopup; - } - if ( searchPopup ) - { - delete searchPopup; - } - if ( _rpmGroupsTree ) - { - delete _rpmGroupsTree; - } + // Changed because of new libyui: don't call delete for the popups; + // call YDialog::deleteTopmostDialog() instead at the end of + // NCPackageSelectorPlugin::runPkgSelection } - +/////////////////////////////////////////////////////////////////// +// +// createPopups +// +// Create all popups needed for the PackageSelector +// Don't create the popups any longer in constructur because the current dialog +// wouldn't be the PackageSelector dialog then but a PopupDialog and +// NCPackageSelectorPlugin:: runPkgSelection wouldn't find the selector widget. +// Call NCPackageSelector::createPopups() instead after the PackageSelector dialog +// is created (see NCPackageSelectorStart::showDefaultList()). +// void NCPackageSelector::createPopups() { if ( !youMode ) @@ -267,7 +247,7 @@ if ( zyppPkg ) { _rpmGroupsTree->addRpmGroup (zyppPkg->group ()); - NCMIL << "Adding group: " << zyppPkg->group() << endl; + NCDBG << "Adding group: " << zyppPkg->group() << endl; } } #if 0 @@ -1605,11 +1585,11 @@ return false; } - NCPopupInfo info( wpos( (NCurses::lines()-5)/2, (NCurses::cols()-35)/2 ), YCPString( "" ), - YCPString(_( "All package dependencies are OK." )), - NCPkgNames::OKLabel() ); - info.setNiceSize( 35, 5 ); - + NCPopupInfo * info = new NCPopupInfo( wpos( (NCurses::lines()-5)/2, (NCurses::cols()-35)/2 ), YCPString( "" ), + YCPString(_( "All package dependencies are OK." )), + NCPkgNames::OKLabel() ); + info->setNiceSize( 35, 5 ); + // ( event.selection->compare( NCPkgNames::ShowDeps() ) == YO_EQUAL ) if ( event.selection->toString() == "showdeps" ) { @@ -1622,7 +1602,7 @@ } if ( ok ) - info.showInfoPopup(); + info->showInfoPopup(); // update the package list and the disk space info updatePackageList(); @@ -1833,6 +1813,8 @@ packageList->showInformation(); packageList->setKeyboardFocus(); + + YDialog::deleteTopmostDialog(); // delete NCPopupInfo dialog // return true means: don't leave the event loop in runPkgSelection return true; @@ -2009,10 +1991,13 @@ ZyppPkg pkgPtr = tryCastToZyppPkg ((*i)->theObj()); if ( pkgPtr && pkgPtr->name() == pkgName ) { - NCERR << "Package " << pkgName << " found" << endl; + NCMIL << "Package " << pkgName << " found" << endl; // open popup with package info - NCPkgPopupDescr popupDescr( wpos(1,1), this ); - popupDescr.showInfoPopup( pkgPtr, *i ); + NCPkgPopupDescr * popupDescr = new NCPkgPopupDescr( wpos(1,1), this ); + popupDescr->showInfoPopup( pkgPtr, *i ); + + YDialog::deleteTopmostDialog(); + found = true; } } @@ -2042,11 +2027,15 @@ if ( success ) { - NCPopupInfo info( wpos( (NCurses::lines()-8)/2, (NCurses::cols()-40)/2 ), - YCPString( "" ), - YCPString( _("Dependency resolver test case written to ") + " " + testCaseDir ) ); - info.setNiceSize( 40, 8 ); - info.showInfoPopup( ); + NCPopupInfo * info = new NCPopupInfo( wpos( (NCurses::lines()-8)/2, (NCurses::cols()-40)/2 ), + YCPString( "" ), + YCPString( _("Dependency resolver test case written to ") + + " " + testCaseDir ) + ); + info->setNiceSize( 40, 8 ); + info->showInfoPopup( ); + + YDialog::deleteTopmostDialog(); } return success; } @@ -2102,14 +2091,16 @@ (void) unlink( filename->asString()->value_cstr() ); //present error popup to the user - NCPopupInfo errorMsg ( wpos( (NCurses::lines()-5)/2, (NCurses::cols()-40)/2 ), - YCPString( NCPkgNames::ErrorLabel()), - YCPString( _("Error exporting list of packages and patterns to ") + filename->toString() ), - NCPkgNames::OKLabel(), - ""); - errorMsg.setNiceSize(40,5); - NCursesEvent input = errorMsg.showInfoPopup(); + NCPopupInfo * errorMsg = new NCPopupInfo( wpos( (NCurses::lines()-5)/2, (NCurses::cols()-40)/2 ), + YCPString( NCPkgNames::ErrorLabel()), + YCPString( _("Error exporting list of packages and patterns to ") + + filename->toString() ), + NCPkgNames::OKLabel(), + ""); + errorMsg->setNiceSize(40,5); + NCursesEvent input = errorMsg->showInfoPopup(); + YDialog::deleteTopmostDialog(); } return true; @@ -2186,14 +2177,16 @@ { NCWAR << "Error importing list of packages and patterns from" << filename->toString() << endl; - NCPopupInfo errorMsg ( wpos( (NCurses::lines()-5)/2, (NCurses::cols()-40)/2) , - YCPString( NCPkgNames::ErrorLabel()), - YCPString( _("Error importing list of packages and patterns from ") + filename->toString() ), - NCPkgNames::OKLabel(), - ""); - errorMsg.setNiceSize(40,5); - NCursesEvent input = errorMsg.showInfoPopup(); + NCPopupInfo * errorMsg = new NCPopupInfo( wpos( (NCurses::lines()-5)/2, (NCurses::cols()-40)/2) , + YCPString( NCPkgNames::ErrorLabel()), + YCPString( _("Error importing list of packages and patterns from ") + + filename->toString() ), + NCPkgNames::OKLabel(), + ""); + errorMsg->setNiceSize(40,5); + NCursesEvent input = errorMsg->showInfoPopup(); + YDialog::deleteTopmostDialog(); } } } @@ -2252,10 +2245,15 @@ } // open the popup with the help text - NCPopupInfo pkgHelp( wpos( (NCurses::lines()*8)/100, (NCurses::cols()*18)/100 ), headline, YCPString( text ) ); - pkgHelp.setNiceSize( (NCurses::cols()*65)/100, (NCurses::lines()*85)/100 ); - pkgHelp.showInfoPopup( ); + NCPopupInfo * pkgHelp = new NCPopupInfo( wpos( (NCurses::lines()*8)/100, (NCurses::cols()*18)/100 ), + headline, + YCPString( text ) + ); + pkgHelp->setNiceSize( (NCurses::cols()*65)/100, (NCurses::lines()*85)/100 ); + pkgHelp->showInfoPopup( ); + YDialog::deleteTopmostDialog(); + if ( packageList ) { packageList->setKeyboardFocus(); @@ -2280,10 +2278,15 @@ text += NCPkgNames::YouHelp3(); // open the popup with the help text - NCPopupInfo youHelp( wpos( NCurses::lines()/3, NCurses::cols()/6 ), YCPString(NCPkgNames::YouHelp()), YCPString(text) ); - youHelp.setNiceSize( (NCurses::cols()*2)/3, NCurses::lines()/3 ); - youHelp.showInfoPopup( ); + NCPopupInfo * youHelp = new NCPopupInfo( wpos( NCurses::lines()/3, NCurses::cols()/6 ), + YCPString(NCPkgNames::YouHelp()), + YCPString(text) + ); + youHelp->setNiceSize( (NCurses::cols()*2)/3, NCurses::lines()/3 ); + youHelp->showInfoPopup( ); + YDialog::deleteTopmostDialog(); + if ( packageList ) { packageList->setKeyboardFocus(); @@ -2304,13 +2307,17 @@ if (changes) { // show a popup and ask the user - NCPopupInfo cancelMsg( wpos( (NCurses::lines()-8)/2, (NCurses::cols()-45)/2 ), - YCPString( NCPkgNames::NotifyLabel() ), - YCPString( NCPkgNames::CancelText() ), - NCPkgNames::YesLabel(), - NCPkgNames::NoLabel() ); - cancelMsg.setNiceSize( 45, 8 ); - NCursesEvent input = cancelMsg.showInfoPopup( ); + NCPopupInfo * cancelMsg = new NCPopupInfo( wpos( (NCurses::lines()-8)/2, (NCurses::cols()-45)/2 ), + YCPString( NCPkgNames::NotifyLabel() ), + YCPString( NCPkgNames::CancelText() ), + NCPkgNames::YesLabel(), + NCPkgNames::NoLabel() + ); + cancelMsg->setNiceSize( 45, 8 ); + NCursesEvent input = cancelMsg->showInfoPopup( ); + + YDialog::deleteTopmostDialog(); + if ( input == NCursesEvent::cancel ) { // don't leave the package installation dialog return true; @@ -2355,8 +2362,10 @@ if ( !youMode ) // don't show automatic changes if YOU mode { // show the automatic changes list - NCPkgPopupTable autoChangePopup( wpos( 3, 8), this ); - NCursesEvent input = autoChangePopup.showInfoPopup(); + NCPkgPopupTable * autoChangePopup = new NCPkgPopupTable( wpos( 3, 8), this ); + NCursesEvent input = autoChangePopup->showInfoPopup(); + + YDialog::deleteTopmostDialog(); if ( input == NCursesEvent::cancel ) { @@ -2372,14 +2381,16 @@ if ( message != "" ) { // open the popup e.g. with the text "/usr needs 50 MB more disk space" - NCPopupInfo spaceMsg( wpos( (NCurses::lines()-10)/2, (NCurses::cols()-50)/2 ), - YCPString( NCPkgNames::ErrorLabel() ), - YCPString( NCPkgNames::DiskSpaceError() + " " + message ), - NCPkgNames::OKLabel(), - NCPkgNames::CancelLabel() ); + NCPopupInfo * spaceMsg = new NCPopupInfo( wpos( (NCurses::lines()-10)/2, (NCurses::cols()-50)/2 ), + YCPString( NCPkgNames::ErrorLabel() ), + YCPString( NCPkgNames::DiskSpaceError() + " " + message ), + NCPkgNames::OKLabel(), + NCPkgNames::CancelLabel() ); - spaceMsg.setNiceSize( 50, 10 ); - NCursesEvent input = spaceMsg.showInfoPopup( ); + spaceMsg->setNiceSize( 50, 10 ); + NCursesEvent input = spaceMsg->showInfoPopup( ); + + YDialog::deleteTopmostDialog(); if ( input == NCursesEvent::cancel ) { @@ -2479,14 +2490,15 @@ bool ok = true; string pkgName = slbPtr->name(); - NCPopupInfo info( wpos( NCurses::lines()/10, NCurses::cols()/10), - NCPkgNames::NotifyLabel(), - YCPString( "" + pkgName + " " + createDescrText( licenseText ) ), - NCPkgNames::AcceptLabel(), - NCPkgNames::CancelLabel() ); - info.setNiceSize( (NCurses::cols() * 80)/100, (NCurses::lines()*80)/100); - license_confirmed = info.showInfoPopup( ) != NCursesEvent::cancel; + NCPopupInfo * info = new NCPopupInfo ( wpos( NCurses::lines()/10, NCurses::cols()/10), + NCPkgNames::NotifyLabel(), + YCPString( "" + pkgName + " " + + createDescrText( licenseText ) ), + NCPkgNames::AcceptLabel(), + NCPkgNames::CancelLabel() ); + info->setNiceSize( (NCurses::cols() * 80)/100, (NCurses::lines()*80)/100); + license_confirmed = info->showInfoPopup( ) != NCursesEvent::cancel; if ( !license_confirmed ) { @@ -2514,6 +2526,8 @@ ok = true; } + YDialog::deleteTopmostDialog(); + return ok; } @@ -2627,10 +2641,12 @@ bool ok = false; bool cancel = false; - NCPopupInfo info( wpos( (NCurses::lines()-5)/2, (NCurses::cols()-30)/2 ), YCPString( "" ), - YCPString(_( "System dependencies verify OK." )), - NCPkgNames::OKLabel() ); - info.setNiceSize( 30, 5 ); + NCPopupInfo * info = new NCPopupInfo( wpos( (NCurses::lines()-5)/2, (NCurses::cols()-30)/2 ), + YCPString( "" ), + YCPString(_( "System dependencies verify OK." )), + NCPkgNames::OKLabel() + ); + info->setNiceSize( 30, 5 ); NCMIL << "Verifying system" << endl; @@ -2639,10 +2655,13 @@ saveState(); //call the solver (with S_Verify it displays no popup) cancel = depsPopup->showDependencies( NCPkgPopupDeps::S_Verify, &ok ); - //display the popup with automatic changes - NCPkgPopupTable autoChangePopup( wpos( 3, 8 ), this ); - NCursesEvent input = autoChangePopup.showInfoPopup(); + //display the popup with automatic changes + NCPkgPopupTable * autoChangePopup = new NCPkgPopupTable( wpos( 3, 8 ), this ); + NCursesEvent input = autoChangePopup->showInfoPopup(); + + YDialog::deleteTopmostDialog(); + if ( input == NCursesEvent::cancel ) { // user clicked on Cancel @@ -2652,9 +2671,12 @@ if ( ok && input == NCursesEvent::button ) { // dependencies OK, no automatic changes/the user has accepted the changes - info.showInfoPopup(); + info->showInfoPopup(); } } + + YDialog::deleteTopmostDialog(); // delete NCPopupInfo dialog + return cancel; } -- 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] r41812 - /branches/tmp/sh/mod-ui/ncurses/src/NCDialog.cc
by gs＠svn.opensuse.org 06 Nov '07

06 Nov '07

Author: gs Date: Tue Nov 6 10:58:30 2007 New Revision: 41812 URL: http://svn.opensuse.org/viewcvs/yast?rev=41812&view=rev Log: check NCursesUserPanel pointer in activate() Modified: branches/tmp/sh/mod-ui/ncurses/src/NCDialog.cc Modified: branches/tmp/sh/mod-ui/ncurses/src/NCDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCD… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCDialog.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCDialog.cc Tue Nov 6 10:58:30 2007 @@ -302,7 +302,7 @@ // void NCDialog::activate( const bool newactive ) { - if ( active != newactive || pan->hidden()) { + if ( active != newactive || ( pan && pan->hidden()) ) { active = newactive; if ( pan ) { pan->show(); // not getVisible() because wRedraw() follows. -- 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] r41811 - in /branches/tmp/sh/mod-ui/qt/src/pkg: YQPkgRepoList.cc YQPkgVersionsView.cc
by tgoettlicher＠svn.opensuse.org 06 Nov '07

06 Nov '07

Author: tgoettlicher Date: Tue Nov 6 10:24:00 2007 New Revision: 41811 URL: http://svn.opensuse.org/viewcvs/yast?rev=41811&view=rev Log: fixed broken accented characters in repository list in qt packager widget (#329894) Modified: branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgRepoList.cc branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgVersionsView.cc Modified: branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgRepoList.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/pkg/YQPk… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgRepoList.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgRepoList.cc Tue Nov 6 10:24:00 2007 @@ -225,16 +225,19 @@ { if ( nameCol() >= 0 ) { - string name; - ZyppProduct product = singleProduct( _zyppRepo ); + string name = repo.info().name(); - if ( product ) // only if the repository provides exactly one product - { // (which is the most common case) - name = product->summary(); - } +#if SHOW_SINGLE_PRODUCT + ZyppProduct product = singleProduct( _zyppRepo ); + + if ( product ) // only if the repository provides exactly one product + { // (which is the most common case) + name = product->summary(); + } +#endif if ( ! name.empty() ) - setText( nameCol(), name.c_str() ); + setText( nameCol(), fromUTF8( name )); } if ( urlCol() >= 0 ) Modified: branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgVersionsView.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/pkg/YQPk… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgVersionsView.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgVersionsView.cc Tue Nov 6 10:24:00 2007 @@ -250,7 +250,8 @@ if ( versionCol() >= 0 ) setText( versionCol(), zyppObj->edition().asString().c_str() ); if ( archCol() >= 0 ) setText( archCol(), zyppObj->arch().asString().c_str() ); - if ( repoCol() >= 0 ) setText( repoCol(), zyppObj->repository().info().alias().c_str() ); +// if ( repoCol() >= 0 ) setText( repoCol(), zyppObj->repository().info().alias().c_str() ); + if ( repoCol() >= 0 ) setText( repoCol(), fromUTF8(zyppObj->repository().info().alias()) ); if ( productCol() >= 0 ) { ZyppProduct product = YQPkgRepoListItem::singleProduct( zyppObj->repository() ); -- 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] r41810 - /tags/branch-SLE-10-SP1-2_13_21/product-creator/
by jsuchome＠svn.opensuse.org 05 Nov '07

05 Nov '07

Author: jsuchome Date: Mon Nov 5 22:38:31 2007 New Revision: 41810 URL: http://svn.opensuse.org/viewcvs/yast?rev=41810&view=rev Log: Created tag branch-SLE-10-SP1-2_13_21 for product-creator Added: tags/branch-SLE-10-SP1-2_13_21/product-creator/ - copied from r41809, branches/SuSE-SLE-10-SP1-Branch/product-creator/ -- 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] r41809 - in /branches/SuSE-SLE-10-SP1-Branch/product-creator: VERSION package/yast2-product-creator.changes src/Kiwi.ycp src/Makefile.am src/SourceDialogsLite.ycp src/kiwi_dialogs.ycp
by jsuchome＠svn.opensuse.org 05 Nov '07

05 Nov '07

Author: jsuchome Date: Mon Nov 5 22:37:39 2007 New Revision: 41809 URL: http://svn.opensuse.org/viewcvs/yast?rev=41809&view=rev Log: - do not allow source types not supported by kiwi (#339110) - 2.13.21 Added: branches/SuSE-SLE-10-SP1-Branch/product-creator/src/SourceDialogsLite.ycp (with props) Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes branches/SuSE-SLE-10-SP1-Branch/product-creator/src/Kiwi.ycp branches/SuSE-SLE-10-SP1-Branch/product-creator/src/Makefile.am branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi_dialogs.ycp Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION Mon Nov 5 22:37:39 2007 @@ -1 +1 @@ -2.13.20 +2.13.21 Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes Mon Nov 5 22:37:39 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Nov 5 21:56:21 CET 2007 - jsuchome(a)suse.cz + +- do not allow source types not supported by kiwi (#339110) +- 2.13.21 + +------------------------------------------------------------------- Fri Nov 2 11:02:42 CET 2007 - jsuchome(a)suse.cz - correctly escape strings which should be written to config.xml Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/src/Kiwi.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/src/Kiwi.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/src/Kiwi.ycp Mon Nov 5 22:37:39 2007 @@ -21,6 +21,7 @@ import "Report"; import "Security"; import "String"; + import "URL"; string encryption_method = nil; @@ -58,6 +59,11 @@ // map with image templates (to base new projects on) global map<string,map> Templates = $[]; + // repository schemes unsupported by kiwi + // (= not to be offered as new sources, to be deleted + // from current system sources) + global list<string> unsupported_schemes = [ "iso", "cd", "dvd", "nfs", "smb" ]; + /** * crypt given user password with current encryption algorithm */ @@ -759,10 +765,14 @@ integer srcid = source["SrcId"]:-1; map data = Pkg::SourceGeneralData (srcid); string url = data["url"]:""; - current_repositories[url] = $[ - "url" : url, - "plaindir" : data["type"]:"" == "Plaindir" - ]; + map parsed = URL::Parse(url); + if (! contains (unsupported_schemes, parsed["scheme"]:"")) + { + current_repositories[url] = $[ + "url" : url, + "plaindir" : data["type"]:"" == "Plaindir" + ]; + } }); return current_repositories; } Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/src/Makefile.am (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/src/Makefile.am Mon Nov 5 22:37:39 2007 @@ -26,7 +26,8 @@ module_DATA = \ ProductCreator.ycp \ - Kiwi.ycp + Kiwi.ycp \ + SourceDialogsLite.ycp EXTRA_DIST = $(client_DATA) $(ynclude_DATA) $(module_DATA) $(desktop_DATA) Added: branches/SuSE-SLE-10-SP1-Branch/product-creator/src/SourceDialogsLite.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/src/SourceDialogsLite.ycp (added) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/src/SourceDialogsLite.ycp Mon Nov 5 22:37:39 2007 @@ -0,0 +1,1031 @@ +/** + * File: SourceDialogsLite.ycp + * + * Authors: Jiri Srain <jsrain(a)suse.cz> + * Klaus Kaempf <kkaempf(a)suse.de> + * Gabriele Strattner <gs(a)suse.de> + * Stefan Schubert <schubi(a)suse.de> + * Cornelius Schumacher <cschum(a)suse.de> + * + * Purpose: + * Reduced version of SourceDialogs.ycp: removed the support for + * source types unsupported by kiwi (#339110) + * + * $Id$ + */ + +{ +textdomain "packager"; + +module "SourceDialogsLite"; + +import "Label"; +import "URL"; +import "Popup"; +import "CWM"; +import "SourceManager"; + +// common functions / data + +/** + * URL to work with + */ +string _url = ""; + +/** + * Allow HTTPS for next source dialog? + */ +boolean _allow_https = true; + +/** + * Help text suffix for some types of the medias + */ +string multi_cd_help = _("If the catalog is on multiple medias, +set the location of the first media of the set."); + +/** + * Set the URL to work with + * @param url string URL to run the dialogs with + */ +global void SetURL (string url) { + _url = url; +} + +/** + * Return URL after the run of the dialog + * @return string the URL + */ +global string GetURL () { + return _url; +} + +/** + * Postprocess URL of an ISO image + * @param url string URL in the original form + * @return string postprocessed URL + */ +string PosprocessISOURL (string url) { + y2milestone ("Updating ISO URL %1", url); + integer last = findlastof (url, "/") + 1; + string onlydir = substring (url, 0, last); + url = "iso:/?iso=" + substring (url, last) + "&url=" + onlydir; + y2milestone ("Updated URL: %1", url); + return url; +} + +/** + * Check if URL is an ISO URL + * @param url string URL to check + * @return boolean true if URL is an ISO URL, false otherwise + */ +boolean IsISOURL (string url) { + boolean ret = substring (url, 0, 5) == "iso:/" && + issubstring (url, "&url="); + y2milestone ("URL %1 is ISO: %2", url, ret); + return ret; +} + +/** + * Preprocess the ISO URL to be used in the dialogs + * @param url string URL to preprocess + * @return string preprocessed URL + */ +string PreprocessISOURL (string url) { + y2milestone ("Preprocessing ISO URL %1", url); + integer url_pt = search (url, "&url="); + string serverpart = substring (url, url_pt + 5); + string isopart = substring (url, 0, url_pt); + url = serverpart + substring (isopart, search (isopart, "iso=") + 4); + y2milestone ("Updated URL: %1", url); + return url; +} + +/** + * check if given path points to ISO file + * @param url string URL to check + * @return boolean true if URL is ISO image + */ +boolean PathIsISO (string url) { + if (size (url) < 4) return false; + return substring (url, size (url) - 4, 4) == ".iso"; +} + +/** + * Add a slash to the part of url, if it is not already present + * @param urlpart string a part of the URL + * @return string urlpart with leading slash + */ +string Slashed (string urlpart) { + if ( substring( urlpart, 0, 1 ) == "/" ) + return urlpart; + return "/" + urlpart; +} + +/** + * Remove leading and trailing (and inner) spaces from the host name + * @param host string original host name + * @return string host without leading and trailing spaces + */ +string NormalizeHost (string host) { + host = deletechars (host, " \t"); + return host; +} + +/** + * Return an HBox with ok and cancel buttons for use by other dialogs. + * @return An HBox term for use in a CreateDialog call. + */ +term PopupButtons() { + return `HBox( + `PushButton( `id( `ok ), `opt( `default ), Label::OKButton() ), + `HStretch(), + `PushButton( `id( `cancel ), Label::CancelButton() ) + ); +} + +/** + * Get scheme of a URL, also for ISO URL get scheme of the access protocol + * @param url string URL to get scheme for + * @return string URL scheme + */ +string URLScheme (string url) { + string scheme = ""; + if (IsISOURL (url)) + { + string tmp_url = PreprocessISOURL (url); + map parsed = URL::Parse (tmp_url); + scheme = parsed["scheme"]:""; + } + else + { + map parsed = URL::Parse (url); + scheme = parsed["scheme"]:""; + } + + if (scheme == "" || scheme == nil) + scheme = "url"; + y2milestone ("URL scheme for URL %1: %2", url, scheme); + return scheme; +} + +// raw URL editation widget + +/** + * Init function of a widget + * @param key string widget key + */ +void PlainURLInit (string key) { + UI::ChangeWidget (`id (`url), `Value, _url); + UI::SetFocus (`url); +} + +/** + * Store function of a widget + * @param key string widget key + * @param event map which caused settings being stored + */ +void PlainURLStore (string key, map event) { + _url = (string)UI::QueryWidget (`id (`url), `Value); +} + +boolean PlainURLValidate (string key, map event) { + string url = (string)UI::QueryWidget (`id (`url), `Value); + if (url == "") + { + UI::SetFocus (`id (`url)); + // popup message + Popup::Message (_("URL cannot be empty.")); + return false; + } + return true; +} + +/** + * Get widget description map + * @return widget description map + */ +map<string,any> PlainURLWidget () { + return $[ + "widget" : `custom, + "custom_widget" : `VBox ( + // text entry + `TextEntry( `id( `url ), _("&URL") ) + ), + "init" : PlainURLInit, + "store" : PlainURLStore, + "validate_type" : `function, + "validate_function" : PlainURLValidate, + // help text + "help" : _("<big>Catalog URL</big> +Use URL to specify the URL of the catalog.") + multi_cd_help, + ]; +} + +// NFS editation widget + +/** + * Init function of a widget + * @param key string widget key + */ +void NFSInit (string key) { + boolean iso = IsISOURL (_url); + if (iso) + _url = PreprocessISOURL (_url); + map parsed = URL::Parse (_url); + UI::ChangeWidget (`id (`server), `Value, parsed["host"]:""); + UI::ChangeWidget (`id (`dir), `Value, parsed["path"]:""); + UI::SetFocus (`server); +} + +/** + * Store function of a widget + * @param key string widget key + * @param event map which caused settings being stored + */ +void NFSStore (string key, map event) { + map parsed = $[ + "scheme" : "nfs", + "host" : NormalizeHost ( + (string)UI::QueryWidget (`id (`server), `Value)), + "path" : (string)UI::QueryWidget (`id (`dir), `Value), + ]; + _url = URL::Build (parsed); +} + +/** + * Get widget description map + * @return widget description map + */ +map<string,any> NFSWidget () { + return $[ + "widget" : `custom, + "custom_widget" : `VBox ( + // text entry + `TextEntry (`id (`server), _("&Server Name")), + // text entry + `TextEntry (`id (`dir), _("&Path to Directory")) + ), + "init" : NFSInit, + "store" : NFSStore, + // help text + "help" : _("<big>NFS Server</big> +Use Server Name and Path to Directory +to specify the NFS server host name and path on the server.") ++ multi_cd_help, + ]; +} + +// CD/DVD source widget + +/** + * Init function of a widget + * @param key string widget key + */ +void CDInit (string key) { + map parsed = URL::Parse (_url); + string scheme = parsed["scheme"]:""; + if (scheme == "dvd") + UI::ChangeWidget (`id (`cd), `Value, true); + else + UI::ChangeWidget (`id (`dvd), `Value, true); + UI::SetFocus (`cd); +} + +/** + * Store function of a widget + * @param key string widget key + * @param event map which caused settings being stored + */ +void CDStore (string key, map event) { + symbol device = (symbol)UI::QueryWidget (`id (`device), `CurrentButton); + if (device == `cd) + _url = "cd:///"; + else + _url = "dvd:///"; +} + +/** + * Get widget description map + * @return widget description map + */ +map<string,any> CDWidget () { + return $[ + "widget" : `custom, + "custom_widget" : `RadioButtonGroup (`id (`device), `VBox ( + // radio button + `Left (`RadioButton (`id (`cd), _("&CD-ROM"))), + // radio button + `Left (`RadioButton (`id (`dvd ), _("&DVD-ROM"))) + )), + "init" : CDInit, + "store" : CDStore, + "help" : _("<big>CD or DVD Media</big> +Set CD-ROM or DVD-ROM to specify the type of media."), + ]; +} + +// File / Directory source widget + +/** + * Init function of a widget + * @param key string widget key + */ +void DirInit (string key) { + boolean iso = IsISOURL (_url); + if (iso) + _url = PreprocessISOURL (_url); + map parsed = URL::Parse (_url); + UI::ChangeWidget (`id (`dir), `Value, parsed["path"]:""); + UI::SetFocus (`dir); + +} + +/** + * Store function of a widget + * @param key string widget key + * @param event map which caused settings being stored + */ +void DirStore (string key, map event) { + map parsed = $[ + "scheme" : "dir", + "path" : (string)UI::QueryWidget (`id (`dir), `Value), + ]; + _url = URL::Build (parsed); + + if (UI::WidgetExists(`id(`ch_iso))) + { + boolean iso = (boolean)UI::QueryWidget (`id (`ch_iso), `Value); + if (iso) + _url = PosprocessISOURL (_url); + } +} + +/** + * Handle function of a widget + * @param key string widget key + * @param event map which caused settings being stored + * @return always nil + */ +symbol DirHandle (string key, map event) { + + string dir = (string)UI::QueryWidget (`id (`dir), `Value); + string result = + // dialog caption + UI::AskForExistingDirectory (dir, _("Local Directory")); + if ( result != nil ) + UI::ChangeWidget (`id (`dir), `Value, result); + return nil; +} + +/** + * Get widget description map + * @return widget description map + */ +map<string,any> DirWidget () { + return $[ + "widget" : `custom, + "custom_widget" : `VBox( + `HBox( + // text entry + `TextEntry (`id (`dir), _("&Path to Directory")), + `VBox ( + `Label (""), + // push button + `PushButton (`id (`browse), _("&Browse...")) + ) + ) + ), + "init" : DirInit, + "store" : DirStore, + "handle" : DirHandle, + "handle_events" : [ `browse ], + "help" : _("<big>Local Directory</big> +Ise Path to Directory to specify the path to the +directory of the installation media.") ++ multi_cd_help, + ]; + +} + +/** + * Store function of a widget + * @param key string widget key + * @param event map which caused settings being stored + */ +void PlainDirStore (string key, map event) { + map parsed = $[ + "scheme" : "pkg", + "path" : (string)UI::QueryWidget (`id (`dir), `Value), + ]; + _url = URL::Build (parsed); +} +/** + * Get widget description map + * @return widget description map + */ +map<string,any> PlainDirWidget () { + return $[ + "widget" : `custom, + "custom_widget" : `VBox( + `HBox( + // text entry + `TextEntry (`id (`dir), _("&Path to Directory")), + `VBox ( + `Label (""), + // push button + `PushButton (`id (`browse), _("&Browse...")) + ) + ) + ), + "init" : DirInit, + "store" : PlainDirStore, + "handle" : DirHandle, + "handle_events" : [ `browse ], + "help" : _("<big>Local Directory</big> +Use Path to Directory to specify the path to the +directory holding RPM packages.") + ]; + +} + +// HTTP(s)/FTP/SMB/CIFS source widget + +/** + * Handle function of a widget + * @param key string widget key + * @param event map which caused settings being stored + * @return always nil + */ +symbol ServerHandle (string key, map event) { + y2debug("ServerHandle: %1, %2", key, event); + any id = event["ID"]:nil; + if (is (id, symbol) + && contains ([`http, `https, `ftp, `samba, `rb_type], (symbol)id)) + { + symbol type = (symbol)UI::QueryWidget (`id (`rb_type), `CurrentButton); + string server = UI::WidgetExists (`id (`server)) + ? (string)UI::QueryWidget (`id (`server), `Value) + : ""; + string dir = UI::WidgetExists (`id (`dir)) + ? (string)UI::QueryWidget (`id (`dir), `Value) + : ""; + boolean anonymous = UI::WidgetExists (`id (`anonymous)) + ? (boolean)UI::QueryWidget (`id (`anonymous), `Value) + : false; + string username = UI::WidgetExists (`id (`username)) + ? (string)UI::QueryWidget (`id (`username), `Value) + : ""; + string password = UI::WidgetExists (`id (`password)) + ? (string)UI::QueryWidget (`id (`password), `Value) + : ""; + term widget = `VBox ( + // text entry + `TextEntry (`id (`server), _("Server &Name"), server), + type == `samba + // text entry + ? `TextEntry (`id (`share), _("&Share")) + : `Empty (), + type == `samba + ? `VBox ( + `TextEntry (`id (`dir), + // text entry + _("&Path to Directory"), dir) + ) + // text entry + : `TextEntry( `id( `dir ), _("&Directory on Server"), dir), + `HBox ( + `HSpacing (0.5), + // frame + `Frame (_("Au&thentication"), `VBox ( + `Left (`CheckBox (`id (`anonymous), `opt (`notify), + // check box + _("&Anonymous"), anonymous)), + // text entry + `TextEntry (`id (`username), _("&User Name"), username), + // password entry + `Password (`id (`password), _("&Password"), password) + )), + `HSpacing (0.5) + ) + ); + UI::ReplaceWidget (`id (`server_rp), widget); + + // update widget status + UI::ChangeWidget (`id (`username), `Enabled, !anonymous); + UI::ChangeWidget (`id (`password), `Enabled, !anonymous); + return nil; + } + if (event["ID"]:nil == `anonymous) + { + boolean anonymous = (boolean)UI::QueryWidget (`id (`anonymous), + `Value); + UI::ChangeWidget (`id (`username), `Enabled, !anonymous); + UI::ChangeWidget (`id (`password), `Enabled, !anonymous); + return nil; + } +} + +/** + * Init function of a widget + * @param key string widget key + */ +void ServerInit (string key) { + term protocol_box = `HBox ( + `HStretch (), + // radio button + `RadioButton (`id (`ftp),`opt (`notify), _("&FTP")), + `HStretch(), + // radio button + `RadioButton (`id (`http),`opt (`notify), _("H&TTP")), + `HStretch() + ); + if (_allow_https) + { + protocol_box = add (protocol_box, + // radio button + `RadioButton (`id (`https), `opt (`notify), _("HTT&PS")) + ); + protocol_box = add (protocol_box, `HStretch ()); + } + protocol_box = add (protocol_box, `HStretch ()); + protocol_box = `RadioButtonGroup (`id (`rb_type), `opt (`notify), + protocol_box); + UI::ReplaceWidget (`id (`rb_type_rp), protocol_box); + + boolean iso = IsISOURL (_url); + if (iso) + _url = PreprocessISOURL (_url); + map parsed = URL::Parse (_url); + symbol type = `ftp; + if ( parsed["scheme"]:"" == "http" ) + type = `http; + else if ( parsed["scheme"]:"" == "https" ) + type = `https; + UI::ChangeWidget (`id (`rb_type), `CurrentButton, type); + ServerHandle (key, $[ "ID" : `rb_type ]); + + UI::ChangeWidget (`id (`server), `Value, parsed["host"]:""); + string dir = parsed["path"]:""; + UI::ChangeWidget (`id (`dir), `Value, dir); + UI::ChangeWidget (`id (`username), `Value, parsed["user"]:""); + UI::ChangeWidget (`id (`password), `Value, parsed["pass"]:""); + boolean anonymous = ! (parsed["user"]:"" != "" || parsed["pass"]:"" != ""); + y2milestone ("Anonymous: %1", anonymous); + UI::ChangeWidget (`id (`anonymous), `Value, anonymous); + if (anonymous) + { + UI::ChangeWidget (`id (`username), `Enabled, false); + UI::ChangeWidget (`id (`password), `Enabled, false); + } +} + +/** + * Store function of a widget + * @param key string widget key + * @param event map which caused settings being stored + */ +void ServerStore (string key, map event) { + y2debug("Server store: %1, %2", key, event); + + symbol type = (symbol) UI::QueryWidget( `id( `rb_type), `CurrentButton ); + map parsed = $[]; + if ( type == `ftp ) + parsed["scheme"] = "ftp"; + else if ( type == `http ) + parsed["scheme"] = "http"; + else if ( type == `https ) + parsed["scheme"] = "https"; + + boolean anonymous = (boolean)UI::QueryWidget (`id (`anonymous), `Value); + if ( !anonymous ) { + string user = (string)UI::QueryWidget (`id (`username), `Value); + string pass = (string)UI::QueryWidget (`id (`password ), `Value); + if (size (user) != 0) + parsed["user"] = user; + if (size (pass) != 0) + parsed["pass"] = pass; + } + + string host = NormalizeHost((string)UI::QueryWidget (`id (`server), `Value)); + string directory = (string)UI::QueryWidget (`id (`dir), `Value); + + // is / in the host name? + integer pos = findfirstof(host, "/"); + if (pos != nil) + { + // update the hostname and the directory, + // URL::Build return empty URL when the hostname is not valid + y2milestone("The hostname contains a path: %1", host); + string dir = substring(host, pos); + + if (substring(dir, size(dir) - 1, 1) != "/" && substring(directory, 0, 1) != "/") + { + dir = dir + "/"; + } + + directory = dir + directory; + host = substring(host, 0, pos); + + y2milestone("Updated hostname: %1, directory: %2", host, directory); + } + + parsed["host"] = host; + + if (type != `ftp) + // FTP needs to distinguish absolute and relative path + { + directory = Slashed (directory); + } + parsed["path"] = directory; + y2milestone("Entered URL: %1", parsed); + _url = URL::Build (parsed); + y2milestone("URL::Build: %1", _url); + if (UI::WidgetExists (`id (`ch_iso))) + { + boolean iso = (boolean)UI::QueryWidget (`id (`ch_iso), `Value); + if (iso) + _url = PosprocessISOURL (_url); + } +} + + +/** + * Get widget description map + * @return widget description map + */ +map<string,any> ServerWidget () { + return $[ + "widget" : `custom, + "custom_widget" : `VBox ( + `HBox ( + `HSpacing (0.5), + // frame + `Frame (_("P&rotocol"), `ReplacePoint (`id (`rb_type_rp), + `Empty ()) + ), + `HSpacing( 0.5 ) + ), + `ReplacePoint (`id (`server_rp), `Empty ()) + ), + "init" : ServerInit, + "store" : ServerStore, + "handle" : ServerHandle, + "help" : _("<big>Server and Directory</big> +Use Server Name and Path to Directory +to specify the server host name and path on the server. +To enable authentication, uncheck Anonymous and specify the +User Name and the Password. +") ++ multi_cd_help, + ]; +} + +/** + * Checks whether some network is available in the current moment, + * see the bug #170147 for more information. + */ +boolean IsAnyNetworkAvailable () { + boolean ret = false; + + string command = "TERM=dumb /sbin/ip -o address show | grep inet | grep -v scope.host"; + y2milestone("Running %1", command); + map cmd_run = (map) SCR::Execute(.target.bash_output, command); + y2milestone("Command returned: %1", cmd_run); + + // command failed + if (cmd_run["exit"]:-1 != 0) { + // some errors were there, we don't know the status, rather return that it's available + // `grep` also returns non zero exit code when there is nothing to do... + if (cmd_run["stdout"]:"" != "") { + y2error("Checking the network failed"); + ret = true; + } + // some devices are listed + } else if (cmd_run["stdout"]:"" != nil && cmd_run["stdout"]:"" != "") { + ret = true; + } + + return ret; +} + + +term SelectRadioWidget () { + term contents = `HBox (`HStretch (), `VBox ( + `RadioButtonGroup (`id (`type), `VBox ( + `VStretch (), + // radio button + `Left (`RadioButton(`id(`slp), _("&Scan Using SLP..."))), + // radio button + `Left (`RadioButton(`id(`ftp), _("&FTP..."))), + // radio button + `Left (`RadioButton(`id(`http), _("&HTTP..."))), + // radio button + `Left (`RadioButton(`id(`https), _("HTT&PS..."))), + // radio button + /* + `Left (`RadioButton(`id(`samba), _("&SMB/CIFS"))), + // radio button + `Left (`RadioButton(`id(`nfs), _("&NFS..."))), + // radio button + `Left (`RadioButton(`id(`cd), _("&CD..."))), + // radio button + `Left (`RadioButton(`id(`dvd), _("&DVD..."))), + */ + // radio button + `Left (`RadioButton(`id(`local_dir), _("&Local Directory..."))), + // radio button + `Left (`RadioButton(`id(`pkg), _("&Package Directory..."))), + // radio button +// `Left (`RadioButton (`id (`specify_url),_("Specify &URL..."))), + `VStretch () + ))), `HStretch () + ); + if (! IsAnyNetworkAvailable()) { + y2milestone ("Network is not available, skipping all Network-related options..."); + + contents = `HBox (`HStretch (), `VBox ( + `RadioButtonGroup (`id (`type), `VBox ( + `VStretch (), + /* + // radio button + `Left (`RadioButton(`id(`cd), _("&CD..."))), + // radio button + `Left (`RadioButton(`id(`dvd), _("&DVD..."))), + */ + // radio button + `Left (`RadioButton(`id(`local_dir), _("&Local Directory..."))), + // radio button + `Left (`RadioButton(`id(`pkg), _("&Package Directory..."))), + // radio button +// `Left (`RadioButton (`id (`specify_url),_("Specify &URL..."))), + `VStretch () + ))), `HStretch () + ); + } else { + y2milestone("Network is available, allowing Network-related options..."); + } + return contents; +} + +string SelectWidgetHelp () { + // help text + string help_text = _("<big>Catalog Media</big> +The software catalog can be located on CD, on a network server, +or on the hard disk."); + + // help, continued + help_text = help_text + _(" +The product CDs can be copied to the hard disk. +Insert the path where the first +CD is located, for example, /data1/CD1. +Only the base path is required if all CDs are copied +into one directory. +"); + + // help, continued + help_text = help_text + _(" +Network installation requires a working network connection. +Specify the directory where the packages from +the first CD are located, such as /data1/CD1. +"); + return help_text; +} + +boolean SelectValidate (string key, map event) { + symbol selected = (symbol)UI::QueryWidget (`id (`type), `CurrentButton); + if (selected == nil) + { + // error popup + Popup::Message (_("Select the media type.")); + return false; + } + if (selected == `cd || selected == `dvd) + { + Pkg::SourceReleaseAll(); + string msg = selected == `cd + ? _("Insert the add-on product CD") + : _("Insert the add-on product DVD"); + if (! SourceManager::AskForCD (msg)) + return false; + } + return true; +} + +symbol SelectHandle (string key, map event) { + if (! (event["ID"]:nil == `next || event["ID"]:nil == `ok)) + return nil; + symbol selected = (symbol)UI::QueryWidget (`id (`type), `CurrentButton); + if (selected == nil) + return nil; + if (selected == `slp || selected == `cd || selected == `dvd) + return `finish; +} + +void SelectStore (string key, map event) { + _url = ""; + symbol selected = (symbol)UI::QueryWidget (`id (`type), `CurrentButton); + if (contains ([`ftp, `http, `https, `samba, `nfs, `cd, `dvd, + `local_dir, `specify__url, `slp, `pkg], selected)) + { + if ( selected == `ftp ) _url = "ftp://"; + else if ( selected == `http ) _url = "http://"; + else if ( selected == `https ) _url = "https://"; + else if ( selected == `samba ) _url = "smb://"; + else if ( selected == `nfs ) _url = "nfs://"; + else if ( selected == `cd ) _url = "cd:///"; + else if ( selected == `dvd ) _url = "dvd:///"; + else if ( selected == `local_dir ) _url = "dir://"; + else if ( selected == `pkg ) _url = "pkg://"; // hack for local PlainDir source + else if ( selected == `slp ) _url = "slp://"; + } +} + +map<string,any> SelectWidget () { + return $[ + "widget" : `func, + "widget_func" : SelectRadioWidget, + "help" : SelectWidgetHelp (), + "validate_type" : `function, + "validate_function" : SelectValidate, + "store" : SelectStore, + "handle" : SelectHandle, + ]; +} + +// general data + +/** + * Individual widgets + */ +map<string,map<string,any> > _widgets = $[]; + +/** + * Get individual widgets + * @return individual widgets + */ +map<string,map<string,any> > Widgets () { + if (size (_widgets) == 0) + _widgets = $[ + "url" : PlainURLWidget (), + "nfs" : NFSWidget (), + "cd" : CDWidget (), + "dvd" : CDWidget (), + "dir" : DirWidget (), + "file" : DirWidget (), + "pkg" : PlainDirWidget(), + "http" : ServerWidget (), + "https" : ServerWidget (), + "ftp" : ServerWidget (), + "smb" : ServerWidget (), + "cifs" : ServerWidget (), + "select" : SelectWidget (), + ]; + return _widgets; +} + +/** + * Captions for individual protocols + */ +map<string,string> _caption = $[ + // label / dialog caption + "url" : _("Catalog URL"), + // label / dialog caption + "nfs" : _("NFS Server"), + // label / dialog caption + "cd" : _("CD or DVD Media"), + // label / dialog caption + "dvd" : _("CD or DVD Media"), + // label / dialog caption + "dir" : _("Local Directory"), + // label / dialog caption + "file" : _("Local Directory"), + // label / dialog caption + "pkg" : _("Package Directory"), + // label / dialog caption + "http" : _("Server and Directory"), + // label / dialog caption + "https" : _("Server and Directory"), + // label / dialog caption + "ftp" : _("Server and Directory"), + // label / dialog caption + "smb" : _("Server and Directory"), + // label / dialog caption + "cifs" : _("Server and Directory"), +]; + +// general functions + +/** + * Get contents of a popup for specified protocol + * @param proto string protocol to display popup for + * @return term popup contents + */ +term PopupContents (string proto) { + return `VBox ( + `HSpacing (50), + // label + `Label (_caption[proto]:""), + proto, + PopupButtons () + ); +}; + +/** + * URL editation popup with the HTTPS option + * @param url string url URL to edit + * @return string modified URL or empty string if canceled + */ +global string EditPopup (string url) { + SetURL (url); + string proto = URLScheme (url); + y2milestone ("Displaying popup for protocol %1", proto); + + list<map<string,any> > w = CWM::CreateWidgets ([proto], Widgets ()); + term contents = PopupContents (proto); + contents = CWM::PrepareDialog (contents, w); + UI::OpenDialog (contents); + symbol ret = CWM::Run (w, $[]); + y2milestone ("Ret: %1", ret); + UI::CloseDialog (); + if (ret == `ok) + return GetURL (); + else + return ""; +} + +/** + * URL editation popup without the HTTPS option + * @param url string url URL to edit + * @return string modified URL or empty string if canceled + */ +global string EditPopupNoHTTPS (string url) { + _allow_https = false; + string ret = EditPopup (url); + _allow_https = true; + return ret; +} + +/** + * Sample implementation of URL selection dialog + * @return symbol for wizard sequencer + */ +global symbol EditDialog () { + string proto = URLScheme (_url); + y2milestone ("Displaying dialog for protocol %1", proto); + string caption = _caption[proto]:""; + + return CWM::ShowAndRun ($[ + "widget_names" : [proto], + "widget_descr" : Widgets (), + "contents" : `HVCenter(`MinWidth( 65, proto ) ), + "caption" : caption, + "back_button" : Label::BackButton (), + "next_button" : Label::NextButton (), + "fallback_functions" : $[] + ]); +} + +/** + * URL editation popup with the HTTPS option + * @return string modified URL or empty string if canceled + */ +global string TypePopup () { + list<map<string,any> > w = CWM::CreateWidgets (["select"], Widgets ()); + term contents = PopupContents ("select"); + contents = CWM::PrepareDialog (contents, w); + UI::OpenDialog (contents); + symbol ret = CWM::Run (w, $[]); + y2milestone ("Ret: %1", ret); + UI::CloseDialog (); + return ""; +/* + if (ret == `ok) + return GetURL (); + else + return ""; +*/ +} + +/** + * Sample implementation of URL type selection dialog + * @return symbol for wizard sequencer + */ +global symbol TypeDialog () { + y2milestone ("Running source type dialog"); + // dialog caption + string caption = _("Media Type"); + symbol ret = CWM::ShowAndRun ($[ + "widget_names" : ["select"], + "widget_descr" : Widgets (), + "contents" : `VBox ( "select" ), + "caption" : caption, + "back_button" : Label::BackButton (), + "next_button" : Label::NextButton (), + "fallback_functions" : $[] + ]); + y2milestone ("Type dialog returned %1", ret); + return ret; +} + +} // EOF + Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi_dialogs.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi_dialogs.ycp Mon Nov 5 22:37:39 2007 @@ -17,7 +17,7 @@ import "Label"; import "Kiwi"; import "Popup"; - import "SourceDialogs"; + import "SourceDialogsLite"; import "SourceManager"; import "Summary"; import "URL"; @@ -1758,12 +1758,12 @@ { Wizard::CreateDialog (); string url = ""; - symbol type_ret = SourceDialogs::TypeDialog (); + symbol type_ret = SourceDialogsLite::TypeDialog (); if ((type_ret == `next || type_ret == `finish)) { // FIXME SLP code for SLE10SP1 only, adapt for 10.3... - if (type_ret == `finish && SourceDialogs::GetURL () == "slp://") + if (type_ret == `finish && SourceDialogsLite::GetURL () == "slp://") { string service = SourceManager::AddSourceTypeSLP (); if (service != nil) @@ -1773,8 +1773,8 @@ } else { - if (SourceDialogs::EditDialog () == `next) - url = SourceDialogs::GetURL (); + if (SourceDialogsLite::EditDialog () == `next) + url = SourceDialogsLite::GetURL (); } } Wizard::CloseDialog (); @@ -1812,7 +1812,7 @@ parsed["scheme"] = "pkg"; url = URL::Build (parsed); } - url = SourceDialogs::EditPopup (url); + url = SourceDialogsLite::EditPopup (url); if (url == "" || url == nil || url == selected_url) continue; // remove current url + add new one -- 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] r41808 - /trunk/printer/src/common/dialogs.ycp
by mzugec＠svn.opensuse.org 05 Nov '07

05 Nov '07

Author: mzugec Date: Mon Nov 5 22:23:10 2007 New Revision: 41808 URL: http://svn.opensuse.org/viewcvs/yast?rev=41808&view=rev Log: enable/disable queues tab Modified: trunk/printer/src/common/dialogs.ycp Modified: trunk/printer/src/common/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/common/dialogs.ycp?r… ============================================================================== --- trunk/printer/src/common/dialogs.ycp (original) +++ trunk/printer/src/common/dialogs.ycp Mon Nov 5 22:23:10 2007 @@ -2193,7 +2193,7 @@ } else { UI::ChangeWidget(`id(`server_type), `CurrentButton, `remote); UI::ChangeWidget(`id(`server_name), `Items, [ CUPS::server_hostname ]); - if (CUPS::server_default) UI::ChangeWidget(`use_default, `Value, true); + if (CUPS::server_default) UI::ChangeWidget(`use_default, `Value, true); else UI::ChangeWidget(`queues, `Items, [ Printer::default_queue ]); } if ( contains (CUPS::cups_server_settings["Browsing"]:["On"],"On") ) UI::ChangeWidget(`ipp_listen, `Value, true); @@ -2360,7 +2360,7 @@ y2milestone("Printer %1 without ppd file already configured", row["ID"]:nil); } }); - if (finded==false) return + if (finded==false) return $[ "ID":Printerlib::getReplacedString(Printerlib::getUriDevice (i["uri"]:""), false), "MODEL":i["info"]:"unknown", "SPOOL":i["name"]:"not configured", @@ -2394,6 +2394,11 @@ UI::ChangeWidget (`id (`_hw_items), `Items, term_items); if (size(o_items)>0) UI::ChangeWidget(`_hw_sum, `Value, o_items[0, "rich_descr"]:""); else UI::ChangeWidget(`_hw_sum, `Value, ""); + boolean local = (CUPS::InstallationType() == `server); + UI::ChangeWidget(`_hw_items, `Enabled, local); + UI::ChangeWidget(`add, `Enabled, local); + UI::ChangeWidget(`edit, `Enabled, local); + UI::ChangeWidget(`delete, `Enabled, local); } @@ -2548,7 +2553,7 @@ "widget" : `custom, "custom_widget" : `VBox( - `VWeight(2,`Table (`id (`_hw_items), `opt (`notify, `immediate), + `VWeight(2,`Table (`id (`_hw_items), `opt (`notify, `immediate), `header(_("Queue Name"),_("Device"), _("Model"), _("Default Queue")))), `VWeight(1,`RichText (`id (`_hw_sum), "")), `HBox ( -- 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] r41807 - in /trunk/printer/src: common/dialogs.ycp common/wizards.ycp cups/dialogs-cups.ycp
by mzugec＠svn.opensuse.org 05 Nov '07

05 Nov '07

Author: mzugec Date: Mon Nov 5 17:24:51 2007 New Revision: 41807 URL: http://svn.opensuse.org/viewcvs/yast?rev=41807&view=rev Log: fixed global tab start with CUPS server tab Modified: trunk/printer/src/common/dialogs.ycp trunk/printer/src/common/wizards.ycp trunk/printer/src/cups/dialogs-cups.ycp Modified: trunk/printer/src/common/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/common/dialogs.ycp?r… ============================================================================== --- trunk/printer/src/common/dialogs.ycp (original) +++ trunk/printer/src/common/dialogs.ycp Mon Nov 5 17:24:51 2007 @@ -1076,21 +1076,6 @@ return ret; } -/* -void saveOptions(){ - // fixed #164851 - check for conflict choices in PPD - string src_ppd = Printer::printer["ppd"]:""; - string dst_ppd = (string)SCR::Read (.target.tmpdir) + "/patched_ppd_" + Printer::printer["name"]:""; - SCR::Write (.ppd.file.modify,[src_ppd, dst_ppd, Printer::printer["ppd_options"]:$[]]); - string warning = parseWarn( ((map<string, any>)SCR::Execute(.target.bash_output, - "cupstestppd $PPD", $["PPD":dst_ppd]))["stdout"]:""); - SCR::Execute(.target.remove, dst_ppd); - if (size(warning)>0){ - Popup::Error(warning); - } - -} -*/ /** * Configuration of the filter. It is quite complicated because there can @@ -2207,6 +2192,9 @@ UI::ChangeWidget(`id(`server_type), `CurrentButton, `local); } else { UI::ChangeWidget(`id(`server_type), `CurrentButton, `remote); + UI::ChangeWidget(`id(`server_name), `Items, [ CUPS::server_hostname ]); + if (CUPS::server_default) UI::ChangeWidget(`use_default, `Value, true); + else UI::ChangeWidget(`queues, `Items, [ Printer::default_queue ]); } if ( contains (CUPS::cups_server_settings["Browsing"]:["On"],"On") ) UI::ChangeWidget(`ipp_listen, `Value, true); } @@ -2232,9 +2220,6 @@ symbol ret = nil; do { UI::ChangeWidget(`addr, `Items, addresses); - boolean enabled = (size(addresses)>0); - UI::ChangeWidget(`edit, `Enabled, enabled); - UI::ChangeWidget(`del, `Enabled, enabled); ret = (symbol) UI::UserInput(); string curr = (string)UI::QueryWidget(`addr, `CurrentItem); switch(ret){ @@ -2273,10 +2258,9 @@ boolean local = (UI::QueryWidget(`id(`server_type), `CurrentButton) == `local); UI::ChangeWidget(`ipp_listen, `Enabled, local); - if (local){ - boolean listen = (boolean)UI::QueryWidget(`ipp_listen, `Value); - UI::ChangeWidget(`select_addr, `Enabled, listen); - } + boolean listen = (boolean)UI::QueryWidget(`ipp_listen, `Value); + UI::ChangeWidget(`select_addr, `Enabled, listen && local); + UI::ChangeWidget(`server_name, `Enabled, !local); UI::ChangeWidget(`lookup_server, `Enabled, !local); UI::ChangeWidget(`test_ipp, `Enabled, !local); @@ -2289,6 +2273,30 @@ if (event["EventReason"]:""=="Activated" && event["ID"]:`nil==`select_addr) { CUPS::cups_server_settings["BrowseAddress"] = getAddresses(CUPS::cups_server_settings["BrowseAddress"]:[]); } + symbol id = event["ID"]:`nil; + switch(id){ + case `get_hosts_listen: + case `get_hosts_special: + case `get_hosts: + list hosts = []; + if (id == `get_hosts_listen) hosts = CUPS::ListenCupsServers (); + else hosts = getHostnames ( `get_hosts_special == id ? "ipp" : ""); + UI::ChangeWidget(`server_name, `Items, hosts); + break; + case `test_ipp: + string n = (string)UI::QueryWidget (`id(`server_name), `Value); + if (nil == n || "" == n) + // popup + Popup::Message (_("Enter a valid server name.")); + else + Printerlib::testRemote (n, "", "ipp_server", 0); + break; + case `lookup_queue: + list queues = (list)SCR::Read (.cups.remote, UI::QueryWidget (`id (`server_name), `Value)); + queues = toset (queues); + UI::ChangeWidget(`queues, `Items, queues); + break; + } return nil; } @@ -2299,8 +2307,12 @@ boolean listen = (boolean)UI::QueryWidget(`ipp_listen, `Value); CUPS::cups_server_settings["Browsing"] = listen ? ["On"] : ["Off"]; }else{ - CUPS::cups_installation=`client; + CUPS::cups_installation=`client; + CUPS::server_hostname = (string)UI::QueryWidget(`server_name, `Value); + CUPS::server_default = ((boolean)UI::QueryWidget(`use_default, `Value)); + if (!CUPS::server_default) Printer::default_queue = (string)UI::QueryWidget(`queues, `Value); } + Printer::dirty = true; } /** @@ -2320,17 +2332,17 @@ y2milestone("printcap %1", i); string def = ""; if (i["name"]:"unknown" == Printer::default_queue) def="Default"; - return $[ "ID":Printerlib::getReplacedString(Printerlib::getUriDevice (i["uri"]:""), false), - "MODEL":i["ppd_info", "model"]:"unknown", - "SPOOL":i["name"]:"unknown", - "DESCR": sformat("%1 %2 / %3 %4 %5 %6 %7 %8", - i["ppd_info", "manufacturer"]:"none", i["ppd_info", "model"]:"", i["name"]:"", - (((boolean)i["shared"]:false)?_("Shared"):_("Not Shared")), - _("Connected As"), Printerlib::getReplacedString(i["uri"]:"none", false), - _("With Spool"), i["name"]:"none" - ), - - "DEFAULT":def ]; + return $[ + "ID":Printerlib::getReplacedString(Printerlib::getUriDevice (i["uri"]:""), false), + "MODEL":i["ppd_info", "model"]:"unknown", + "SPOOL":i["name"]:"unknown", + "DESCR": sformat("%1 %2 / %3 %4 %5 %6 %7 %8", + i["ppd_info", "manufacturer"]:"none", i["ppd_info", "model"]:"", i["name"]:"", + (((boolean)i["shared"]:false)?_("Shared"):_("Not Shared")), + _("Connected As"), Printerlib::getReplacedString(i["uri"]:"none", false), + _("With Spool"), i["name"]:"none" + ), + "DEFAULT":def ]; }); items=(list < map<string,any> >) merge((list < map<string,any> >) items, (list < map<string,any> >) maplist (map i, Printer::autodetected, ``{ @@ -2359,32 +2371,19 @@ })); items = (list < map<string,any> >) filter (any i, items, ``(i != nil)); - integer pos=0; Printer::conf_unconf_printers = items; maplist(map<string,any> s, items, { - o_items = add(o_items, $[ - "id" : tostring(pos), - "rich_descr" : s["DESCR"]:"none", - "table_descr":[ - s["SPOOL"]:"unknown", - s["ID"]:"unknown" , - s["MODEL"]:"unknown", - s["DEFAULT"]:"" ] + o_items = add(o_items, $[ + "id" : tostring(size(o_items)), + "rich_descr" : s["DESCR"]:"none", + "table_descr":[ + s["SPOOL"]:"unknown", + s["ID"]:"unknown" , + s["MODEL"]:"unknown", + s["DEFAULT"]:"" ] ]); - pos = pos + 1; }); - } else { - o_items = [ $[ - "id" : "0", - "rich_descr" : "" + CUPS::server_hostname + " " - + ((CUPS::server_default == true) ? _("Default Queue") : (_(" With Spool ") + Printer::default_queue)), - "table_descr":[ - "CUPS", - "", - "", - "" ] - ] ]; - } + } list<term> term_items = maplist (map<string,any> i, o_items, { term t = `item (`id (i["id"]:"")); foreach (string l, i["table_descr"]:[], { @@ -2435,7 +2434,7 @@ break; case `add : Printer::selectPrinter(-1); - ret = `configure_button; + ret = `configure_button; break; case `edit : if (new_spooler == "cups") @@ -2492,19 +2491,14 @@ ret = nil; } } -/* - boolean exists=size((list)UI::QueryWidget(`id(`_hw_items), `Items))>0; - UI::ChangeWidget(`id(`edit), `Enabled, exists); - UI::ChangeWidget(`id(`delete), `Enabled, exists); -*/ return ret; // FIXME } - +/* void runCups(string key){ runCupsServerDialog (); } - +*/ map<string, map<string,any> > wd = $[ "SERVER_TYPE" : $[ @@ -2524,13 +2518,22 @@ `VBox( `Left(`RadioButton(`id(`remote), `opt(`notify), "Remote CUPS Server" )), `HBox( - `TextEntry(`id(`server_name), _("Server Name")), - `PushButton(`id(`lookup_server), _("Lookup")), + `ComboBox(`id(`server_name), `opt(`editable), _("Server Name")), + // menubutton + `MenuButton (`id(`lookup_server), _("&Look Up"), [ + // menu entry + `item (`id (`get_hosts_special), _("Scan for &IPP Servers")), + // menu item + `item (`id (`get_hosts_listen),_("Listen for IPP &Broadcasts")), + // menu entry + `item (`id (`get_hosts), _("Look Up &All Hosts")), + ]), +// `PushButton(`id(`lookup_server), _("Lookup")), `PushButton(`id(`test_ipp), _("Test Remote IPP Access")) ), `CheckBox(`id(`use_default), `opt(`notify), _("Use Server's Default Queue")), `HBox( - `ComboBox(`id(`queues), _("Queues")), + `ComboBox(`id(`queues), `opt(`editable), _("Queues")), `PushButton(`id(`lookup_queue), _("Lookup")) ) ) @@ -2562,8 +2565,51 @@ ], "SERVER" : $[ "widget" : `custom, - "custom_widget" : `Empty(), - "init" : runCups + "custom_widget" : + `HBox (`HSpacing (2), `VBox ( + `VSpacing (1), + // frame + `Frame (_("Browsing Settings"), `VBox ( + `HBox (`HSpacing (3), `RadioButtonGroup (`id (`browsing), `HBox ( + // label + `Label (_("Browsing")), + // radiobutton + `RadioButton (`id (`on), _("On")), + // radiobutton + `RadioButton (`id (`off), _("Off")) + )), + `HSpacing (3)), + // selectionbox label + `HBox (`HSpacing (3), `ReplacePoint (`id( `replace_addr), `SelectionBox (`id (`addr), _("Browse Addre&sses"))), `HSpacing (3)), + `HBox ( + `HSpacing (3), + `PushButton (`id (`add), `opt (`key_F3), Label::AddButton ()), + `PushButton (`id (`edit), `opt (`key_F4), Label::EditButton ()), + `PushButton (`id (`del), `opt (`key_F5), Label::DeleteButton ()), + `HStretch (), + // push button + `PushButton (`id (`propose_server), _("&Propose")), + `HSpacing (3) + ) + )), + // frame + `Frame (_("Access Settings"), `VBox ( + `RadioButtonGroup (`id (`loc), `VBox ( + `HBox ( + `RadioButton (`id (`root), `opt (`hstretch), "/ (r&oot)", true), + `RadioButton (`id (`admin), `opt (`hstretch), "/ad&min") + ), + `HBox ( + `RadioButton (`id (`printers), `opt (`hstretch), "/&printers"), + `RadioButton (`id (`classes), `opt (`hstretch), "/&classes") + ) + )), + // pushbutton + `PushButton (`id (`change), _("Change P&ermissions")) + )) +// firewall_layout + ), `HSpacing (2)), + "init" : runCupsServerDialog ] ]; @@ -2583,8 +2629,10 @@ "widget_names" : ["OVERVIEW"] ], "server" : $[ - "header" : _("Some server settings"), - "contents" : `VBox (), + "header" : _("CUPS server settings"), + "contents" : `VBox ( + "SERVER" + ), "widget_names" : ["SERVER"] ], ]; Modified: trunk/printer/src/common/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/common/wizards.ycp?r… ============================================================================== --- trunk/printer/src/common/wizards.ycp (original) +++ trunk/printer/src/common/wizards.ycp Mon Nov 5 17:24:51 2007 @@ -101,7 +101,7 @@ "add_remote_printer":``(runConnectionTypeDialog(false)), "add_new_queue" : ``(runNewQueueDialog()), "advanced" : ``(runAdvancedDialog ()), - "cupsd" : ``(runCupsServerDialog ()), +// "cupsd" : ``(runCupsServerDialog ("")), "cupsaclroot" : ``(runCupsAclDialog (`root)), "cupsacladmin" : ``(runCupsAclDialog (`admin)), "cupsaclprinters" : ``(runCupsAclDialog (`printers)), @@ -488,7 +488,7 @@ `abort : `abort, `next : `next, `change_ipp_listen : "listen_ipp_bcast", - `cupsd : "cupsd", +// `cupsd : "cupsd", `cupsusb : "cups_usb" ], "remote_access" : $[ @@ -499,6 +499,7 @@ `next : "detected", `abort : `abort, ], +/* "cupsd" : $[ `next : "detected", `abort : `abort, @@ -507,20 +508,21 @@ `printers : "cupsaclprinters", `classes : "cupsaclclasses", ], +*/ "cupsaclroot" : $[ - `next : "cupsd", +// `next : "cupsd", `abort : `abort, ], "cupsacladmin" : $[ - `next : "cupsd", +// `next : "cupsd", `abort : `abort, ], "cupsaclprinters" : $[ - `next : "cupsd", +// `next : "cupsd", `abort : `abort, ], "cupsaclclasses" : $[ - `next : "cupsd", +// `next : "cupsd", `abort : `abort, ], "add_printer_wz" : $[ Modified: trunk/printer/src/cups/dialogs-cups.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/cups/dialogs-cups.yc… ============================================================================== --- trunk/printer/src/cups/dialogs-cups.ycp (original) +++ trunk/printer/src/cups/dialogs-cups.ycp Mon Nov 5 17:24:51 2007 @@ -966,7 +966,7 @@ * CUPS server settings dialog * @return symbol `next or `back */ - define symbol runCupsServerDialog () ``{ + define void runCupsServerDialog (string key) ``{ map<string,any> firewall_settings = $[ "services" : [ "ipp-tcp" ], @@ -976,7 +976,7 @@ = CWMFirewallInterfaces::CreateOpenFirewallWidget (firewall_settings); string firewall_help = firewall_widget["help"]:""; term firewall_layout = firewall_widget["custom_widget"]:`VBox (); - +/* term contents = `HBox (`HSpacing (2), `VBox ( `VSpacing (1), // frame @@ -1020,9 +1020,10 @@ )), firewall_layout ), `HSpacing (2)); +*/ // dialog caption - Wizard::SetContentsButtons (_("CUPS Server Settings"), contents, getCupsServerHelp () + firewall_help, Label::BackButton (), Label::NextButton ()); +// Wizard::SetContentsButtons (_("CUPS Server Settings"), contents, getCupsServerHelp () + firewall_help, Label::BackButton (), Label::NextButton ()); list<string> addresses = CUPS::cups_server_settings["BrowseAddress"]:[]; @@ -1030,7 +1031,7 @@ // selectionbox UI::ReplaceWidget (`id (`replace_addr), `SelectionBox (`id (`addr), _("Browse Addre&sses"), addresses)); - CWMFirewallInterfaces::OpenFirewallInit (firewall_widget, ""); +// CWMFirewallInterfaces::OpenFirewallInit (firewall_widget, ""); map event = $[]; any ret = nil; @@ -1038,8 +1039,7 @@ { event = UI::WaitForEvent (); ret = event["ID"]:nil; - if (ret == `cancel) - ret = `abort; + if (ret == `cancel) ret = `abort; CWMFirewallInterfaces::OpenFirewallHandle (firewall_widget, "", event); if (`abort == ret) @@ -1047,9 +1047,8 @@ if (reallyAbort ()) break; } - else if (`back == ret) - break; - else if (`propose_server == ret) +// else if (`back == ret) break; + if (`propose_server == ret) { if ((size(addresses)>0 && Popup::ContinueCancel(_("Really replace with the suggested value?")))||(size(addresses)==0)){ CUPS::ProposeServerSettings (); @@ -1121,6 +1120,6 @@ CWMFirewallInterfaces::OpenFirewallStore (firewall_widget, "", event); } CUPS::cups_server_settings["BrowseAddress"] = addresses; - return (symbol)ret; +// return (symbol)ret; } } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0