YaST Commits April 2008

yast-commit@lists.opensuse.org

27 participants
1339 discussions

[yast-commit] r47223 - /tags/stable-2_16_8/http-server/
by mzugec＠svn.opensuse.org 30 Apr '08

30 Apr '08

Author: mzugec Date: Wed Apr 30 14:01:00 2008 New Revision: 47223 URL: http://svn.opensuse.org/viewcvs/yast?rev=47223&view=rev Log: Created tag stable-2_16_8 for http-server Added: tags/stable-2_16_8/http-server/ - copied from r47222, trunk/http-server/ -- 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] r47222 - in /trunk/http-server: VERSION package/yast2-http-server.changes src/HttpServerWidgets.ycp
by mzugec＠svn.opensuse.org 30 Apr '08

30 Apr '08

Author: mzugec Date: Wed Apr 30 14:00:26 2008 New Revision: 47222 URL: http://svn.opensuse.org/viewcvs/yast?rev=47222&view=rev Log: enable/disable https by firewall (bnc#384692) Modified: trunk/http-server/VERSION trunk/http-server/package/yast2-http-server.changes trunk/http-server/src/HttpServerWidgets.ycp Modified: trunk/http-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/VERSION?rev=47222&r1… ============================================================================== --- trunk/http-server/VERSION (original) +++ trunk/http-server/VERSION Wed Apr 30 14:00:26 2008 @@ -1 +1 @@ -2.16.7 +2.16.8 Modified: trunk/http-server/package/yast2-http-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/package/yast2-http-s… ============================================================================== --- trunk/http-server/package/yast2-http-server.changes (original) +++ trunk/http-server/package/yast2-http-server.changes Wed Apr 30 14:00:26 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Apr 30 13:57:22 CEST 2008 - mzugec(a)suse.cz + +- enable/disable https by firewall (bnc#384692) +- 2.16.8 + +------------------------------------------------------------------- Tue Apr 22 17:30:57 CEST 2008 - mzugec(a)suse.cz - fixed Missing "Open Firewall Ports" checkbox in wizard expert Modified: trunk/http-server/src/HttpServerWidgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/src/HttpServerWidget… ============================================================================== --- trunk/http-server/src/HttpServerWidgets.ycp (original) +++ trunk/http-server/src/HttpServerWidgets.ycp Wed Apr 30 14:00:26 2008 @@ -786,7 +786,6 @@ else used[option["option"]:""]=$[]; }); }); - if (mainhost) used = union(used, filter(string key,map val, popups, { return(key!="SSL"); })); else used = union(used, popups); return used; @@ -1403,7 +1402,7 @@ "help" : HELPS["server_enable"]:"", ], "firewall_adapt" : CWMFirewallInterfaces::CreateOpenFirewallWidget ($[ - "services" : [ "service:apache2" ], + "services" : [ "service:apache2", "service:apache2-ssl" ], "help" : HELPS["firewall_adapt"]:"", "display_details" : true, ]), -- 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] r47221 - /trunk/packager/src/clients/inst_rpmcopy.ycp
by locilka＠svn.opensuse.org 30 Apr '08

30 Apr '08

Author: locilka Date: Wed Apr 30 14:00:20 2008 New Revision: 47221 URL: http://svn.opensuse.org/viewcvs/yast?rev=47221&view=rev Log: Preparing for SLE11 Modified: trunk/packager/src/clients/inst_rpmcopy.ycp Modified: trunk/packager/src/clients/inst_rpmcopy.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/inst_rpmcop… ============================================================================== --- trunk/packager/src/clients/inst_rpmcopy.ycp (original) +++ trunk/packager/src/clients/inst_rpmcopy.ycp Wed Apr 30 14:00:20 2008 @@ -897,6 +897,9 @@ { SourceManager::SyncYaSTInstSourceWithZMD (); // #156030 CleanupDiskCache (); + + // some new SCR asgents might have been installed + SCR::RegisterNewAgents(); } } -- 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] r47220 - in /trunk/ncurses-pkg/src: NCPkgFilterSearch.cc NCPkgPackageDetails.cc NCPkgStatusStrategy.cc
by gs＠svn.opensuse.org 30 Apr '08

30 Apr '08

Author: gs Date: Wed Apr 30 14:00:14 2008 New Revision: 47220 URL: http://svn.opensuse.org/viewcvs/yast?rev=47220&view=rev Log: deprecated libzypp methods replaced Modified: trunk/ncurses-pkg/src/NCPkgFilterSearch.cc trunk/ncurses-pkg/src/NCPkgPackageDetails.cc trunk/ncurses-pkg/src/NCPkgStatusStrategy.cc Modified: trunk/ncurses-pkg/src/NCPkgFilterSearch.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgFilterSearc… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgFilterSearch.cc (original) +++ trunk/ncurses-pkg/src/NCPkgFilterSearch.cc Wed Apr 30 14:00:14 2008 @@ -122,7 +122,6 @@ string NCPkgFilterSearch::getSearchExpression() const { string value; - unsigned int i = 0; if ( searchExpr ) { 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 Apr 30 14:00:14 2008 @@ -141,7 +141,7 @@ // show the size text += NCPkgStrings::Size(); - text += pkgPtr->size().asString(); + text += pkgPtr->installsize().asString(); text += " "; ZyppPkg package = tryCastToZyppPkg (pkgPtr); @@ -258,8 +258,8 @@ descr += patchPtr->edition().asString(); descr += "<br>"; - if ( selectable->hasInstalledObj() - && selectable->installedPoolItem().isBroken() ) + if ( !selectable->installedEmpty() + && selectable->installedObj().isBroken() ) { descr += _( "----- this patch is broken !!! -----" ); descr += "<br>"; Modified: trunk/ncurses-pkg/src/NCPkgStatusStrategy.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgStatusStrat… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgStatusStrategy.cc (original) +++ trunk/ncurses-pkg/src/NCPkgStatusStrategy.cc Wed Apr 30 14:00:14 2008 @@ -108,7 +108,7 @@ bool valid = true; ZyppStatus retStat = S_NoInst; ZyppStatus oldStatus = getPackageStatus( slbPtr, objPtr ); - bool installed = slbPtr->hasInstalledObj(); + bool installed = !slbPtr->installedEmpty(); // get the new status switch ( key ) @@ -343,7 +343,7 @@ bool valid = true; ZyppStatus retStat = S_NoInst; ZyppStatus oldStatus = getPackageStatus( slbPtr, objPtr ); - bool installed = slbPtr->hasInstalledObj(); + bool installed = !slbPtr->installedEmpty(); // get the new status switch ( key ) -- 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] r47219 - /tags/stable-2_16_1/security/
by jsuchome＠svn.opensuse.org 30 Apr '08

30 Apr '08

Author: jsuchome Date: Wed Apr 30 13:59:18 2008 New Revision: 47219 URL: http://svn.opensuse.org/viewcvs/yast?rev=47219&view=rev Log: Created tag stable-2_16_1 for security Added: tags/stable-2_16_1/security/ - copied from r47218, trunk/security/ -- 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] r47218 - in /trunk/security: VERSION package/yast2-security.changes src/levels.ycp testsuite/tests/Level1.out testsuite/tests/Level2.out testsuite/tests/Level3.out
by jsuchome＠svn.opensuse.org 30 Apr '08

30 Apr '08

Author: jsuchome Date: Wed Apr 30 13:58:33 2008 New Revision: 47218 URL: http://svn.opensuse.org/viewcvs/yast?rev=47218&view=rev Log: - new defaults in security levels (bnc#385159): CWD_IN_ROOT_PATH, CWD_IN_USER_PATH always "no", ENABLE_SYSRQ "yes" for Home Workstation RUN_UPDATEDB_AS always "nobody" OBSCURE_CHECKS_ENAB, PASSWD_USE_CRACKLIB always "yes" - 2.16.1 Modified: trunk/security/VERSION trunk/security/package/yast2-security.changes trunk/security/src/levels.ycp trunk/security/testsuite/tests/Level1.out trunk/security/testsuite/tests/Level2.out trunk/security/testsuite/tests/Level3.out Modified: trunk/security/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/security/VERSION?rev=47218&r1=47… ============================================================================== --- trunk/security/VERSION (original) +++ trunk/security/VERSION Wed Apr 30 13:58:33 2008 @@ -1 +1 @@ -2.16.0 +2.16.1 Modified: trunk/security/package/yast2-security.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/security/package/yast2-security.… ============================================================================== --- trunk/security/package/yast2-security.changes (original) +++ trunk/security/package/yast2-security.changes Wed Apr 30 13:58:33 2008 @@ -1,4 +1,14 @@ ------------------------------------------------------------------- +Wed Apr 30 13:07:33 CEST 2008 - jsuchome(a)suse.cz + +- new defaults in security levels (bnc#385159): + CWD_IN_ROOT_PATH, CWD_IN_USER_PATH always "no", + ENABLE_SYSRQ "yes" for Home Workstation + RUN_UPDATEDB_AS always "nobody" + OBSCURE_CHECKS_ENAB, PASSWD_USE_CRACKLIB always "yes" +- 2.16.1 + +------------------------------------------------------------------- Mon Apr 14 10:18:13 CEST 2008 - jsuchome(a)suse.cz - 2.16.0 Modified: trunk/security/src/levels.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/security/src/levels.ycp?rev=4721… ============================================================================== --- trunk/security/src/levels.ycp (original) +++ trunk/security/src/levels.ycp Wed Apr 30 13:58:33 2008 @@ -56,25 +56,25 @@ "Level1" : $[ "CONSOLE_SHUTDOWN" : "reboot", - "CWD_IN_ROOT_PATH" : "yes", - "CWD_IN_USER_PATH" : "yes", + "CWD_IN_ROOT_PATH" : "no", + "CWD_IN_USER_PATH" : "no", "DISPLAYMANAGER_REMOTE_ACCESS" : "no", - "ENABLE_SYSRQ" : "no", + "ENABLE_SYSRQ" : "yes", "FAIL_DELAY" : "1", "GID_MAX" : "60000", "GID_MIN" : "1000", "GROUP_ENCRYPTION" : "des", "DISPLAYMANAGER_SHUTDOWN" : "all", "LASTLOG_ENAB" : "yes", - "OBSCURE_CHECKS_ENAB" : "no", + "OBSCURE_CHECKS_ENAB" : "yes", "PASSWD_ENCRYPTION" : "blowfish", - "PASSWD_USE_CRACKLIB" : "no", + "PASSWD_USE_CRACKLIB" : "yes", "PASS_MAX_DAYS" : "99999", "PASS_MIN_DAYS" : "0", "PASS_MIN_LEN" : "5", "PASS_WARN_AGE" : "7", "PERMISSION_SECURITY" : "easy", - "RUN_UPDATEDB_AS" : "root", + "RUN_UPDATEDB_AS" : "nobody", "UID_MAX" : "60000", "UID_MIN" : "1000", "SYSTEM_UID_MAX" : "499", @@ -100,7 +100,7 @@ "GROUP_ENCRYPTION" : "des", "DISPLAYMANAGER_SHUTDOWN" : "root", "LASTLOG_ENAB" : "yes", - "OBSCURE_CHECKS_ENAB" : "no", + "OBSCURE_CHECKS_ENAB" : "yes", "PASSWD_ENCRYPTION" : "blowfish", "PASSWD_USE_CRACKLIB" : "yes", "PASS_MAX_DAYS" : "99999", @@ -134,7 +134,7 @@ "GROUP_ENCRYPTION" : "des", "DISPLAYMANAGER_SHUTDOWN" : "root", "LASTLOG_ENAB" : "yes", - "OBSCURE_CHECKS_ENAB" : "no", + "OBSCURE_CHECKS_ENAB" : "yes", "PASSWD_ENCRYPTION" : "blowfish", "PASSWD_USE_CRACKLIB" : "yes", "PASS_MAX_DAYS" : "99999", Modified: trunk/security/testsuite/tests/Level1.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/security/testsuite/tests/Level1.… ============================================================================== --- trunk/security/testsuite/tests/Level1.out (original) +++ trunk/security/testsuite/tests/Level1.out Wed Apr 30 13:58:33 2008 @@ -35,15 +35,15 @@ Read .sysconfig.displaymanager.DISPLAYMANAGER_SHUTDOWN nil Write .sysconfig.displaymanager.DISPLAYMANAGER_SHUTDOWN "all" true Read .sysconfig.locate.RUN_UPDATEDB_AS nil -Write .sysconfig.locate.RUN_UPDATEDB_AS "root" true +Write .sysconfig.locate.RUN_UPDATEDB_AS "nobody" true Read .sysconfig.security.PERMISSION_SECURITY nil Write .sysconfig.security.PERMISSION_SECURITY "easy local" true Read .sysconfig.suseconfig.CWD_IN_ROOT_PATH nil -Write .sysconfig.suseconfig.CWD_IN_ROOT_PATH "yes" true +Write .sysconfig.suseconfig.CWD_IN_ROOT_PATH "no" true Read .sysconfig.suseconfig.CWD_IN_USER_PATH nil -Write .sysconfig.suseconfig.CWD_IN_USER_PATH "yes" true +Write .sysconfig.suseconfig.CWD_IN_USER_PATH "no" true Read .sysconfig.sysctl.ENABLE_SYSRQ nil -Write .sysconfig.sysctl.ENABLE_SYSRQ "no" true +Write .sysconfig.sysctl.ENABLE_SYSRQ "yes" true Write .etc.login_defs nil true Write .sysconfig.displaymanager nil true Write .sysconfig.locate nil true @@ -55,12 +55,12 @@ Execute .target.bash "/sbin/telinit q" 0 Read .etc.default.passwd."CRYPT_FILES" nil Write .etc.default.passwd."CRYPT_FILES" "blowfish" true -Execute .target.bash_output "pam-config -d --pwcheck-cracklib" $[] -Execute .target.bash_output "pam-config -a --pwcheck-no_obscure_checks" $[] +Execute .target.bash_output "pam-config -a --pwcheck-cracklib" $[] +Execute .target.bash_output "pam-config -d --pwcheck-no_obscure_checks" $[] Execute .target.bash_output "pam-config -d --pwcheck-minlen=" $[] Execute .target.bash_output "pam-config -d --pwcheck-remember=" $[] Write .etc.default.passwd nil true -Execute .target.bash "echo 0 > /proc/sys/kernel/sysrq" 0 +Execute .target.bash "echo 1 > /proc/sys/kernel/sysrq" 0 Read .sysconfig.displaymanager.DISPLAYMANAGER "" Execute .target.bash "/sbin/SuSEconfig --module kde3" 0 Execute .target.bash "/sbin/SuSEconfig --module kdm3" 0 Modified: trunk/security/testsuite/tests/Level2.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/security/testsuite/tests/Level2.… ============================================================================== --- trunk/security/testsuite/tests/Level2.out (original) +++ trunk/security/testsuite/tests/Level2.out Wed Apr 30 13:58:33 2008 @@ -56,7 +56,7 @@ Read .etc.default.passwd."CRYPT_FILES" nil Write .etc.default.passwd."CRYPT_FILES" "blowfish" true Execute .target.bash_output "pam-config -a --pwcheck-cracklib" $[] -Execute .target.bash_output "pam-config -a --pwcheck-no_obscure_checks" $[] +Execute .target.bash_output "pam-config -d --pwcheck-no_obscure_checks" $[] Execute .target.bash_output "pam-config -d --pwcheck-minlen=" $[] Execute .target.bash_output "pam-config -d --pwcheck-remember=" $[] Write .etc.default.passwd nil true Modified: trunk/security/testsuite/tests/Level3.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/security/testsuite/tests/Level3.… ============================================================================== --- trunk/security/testsuite/tests/Level3.out (original) +++ trunk/security/testsuite/tests/Level3.out Wed Apr 30 13:58:33 2008 @@ -56,7 +56,7 @@ Read .etc.default.passwd."CRYPT_FILES" nil Write .etc.default.passwd."CRYPT_FILES" "blowfish" true Execute .target.bash_output "pam-config -a --pwcheck-cracklib" $[] -Execute .target.bash_output "pam-config -a --pwcheck-no_obscure_checks" $[] +Execute .target.bash_output "pam-config -d --pwcheck-no_obscure_checks" $[] Execute .target.bash_output "pam-config -a --pwcheck-minlen=6" $[] Execute .target.bash_output "pam-config -d --pwcheck-remember=" $[] Write .etc.default.passwd nil true -- 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] r47217 - /tags/stable-2_16_2/control-center/
by sh-sh-sh＠svn.opensuse.org 30 Apr '08

30 Apr '08

Author: sh-sh-sh Date: Wed Apr 30 13:58:27 2008 New Revision: 47217 URL: http://svn.opensuse.org/viewcvs/yast?rev=47217&view=rev Log: Created tag stable-2_16_2 for control-center Added: tags/stable-2_16_2/control-center/ - copied from r47216, trunk/control-center/ -- 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] r47216 - in /trunk/control-center: VERSION package/yast2-control-center.changes yast2-control-center.spec.in
by sh-sh-sh＠svn.opensuse.org 30 Apr '08

30 Apr '08

Author: sh-sh-sh Date: Wed Apr 30 13:58:19 2008 New Revision: 47216 URL: http://svn.opensuse.org/viewcvs/yast?rev=47216&view=rev Log: Added "supplements: kdebase4-session" to .spec (bnc #385110) Modified: trunk/control-center/VERSION trunk/control-center/package/yast2-control-center.changes trunk/control-center/yast2-control-center.spec.in Modified: trunk/control-center/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/VERSION?rev=47216… ============================================================================== --- trunk/control-center/VERSION (original) +++ trunk/control-center/VERSION Wed Apr 30 13:58:19 2008 @@ -1 +1 @@ -2.16.1 +2.16.2 Modified: trunk/control-center/package/yast2-control-center.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/package/yast2-con… ============================================================================== --- trunk/control-center/package/yast2-control-center.changes (original) +++ trunk/control-center/package/yast2-control-center.changes Wed Apr 30 13:58:19 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Apr 30 13:57:34 CEST 2008 - sh(a)suse.de + +- Added "supplements: kdebase4-session" to .spec (bnc #385110) + +------------------------------------------------------------------- Tue Apr 29 16:44:03 CEST 2008 - sh(a)suse.de - Fixed bnc #144694: Too low resolution for control center app icon Modified: trunk/control-center/yast2-control-center.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/yast2-control-cen… ============================================================================== --- trunk/control-center/yast2-control-center.spec.in (original) +++ trunk/control-center/yast2-control-center.spec.in Wed Apr 30 13:58:19 2008 @@ -19,6 +19,7 @@ Provides: yast2-control-center-binary Provides: yast2-control-center:@ybindir@/y2controlcenter Supplements: kdebase3 +Supplements: kdebase4-session Group: System/YaST %description qt -- 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] r47215 - /trunk/ncurses-pkg/src/NCPkgMenuDeps.cc
by gs＠svn.opensuse.org 30 Apr '08

30 Apr '08

Author: gs Date: Wed Apr 30 13:32:01 2008 New Revision: 47215 URL: http://svn.opensuse.org/viewcvs/yast?rev=47215&view=rev Log: replace first item for auto check on/off Modified: trunk/ncurses-pkg/src/NCPkgMenuDeps.cc Modified: trunk/ncurses-pkg/src/NCPkgMenuDeps.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgMenuDeps.cc… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgMenuDeps.cc (original) +++ trunk/ncurses-pkg/src/NCPkgMenuDeps.cc Wed Apr 30 13:32:01 2008 @@ -125,12 +125,12 @@ { if ( pkg->isAutoCheck() ) { - itemAt( 2 )->setLabel( _("&Automatic Dependency Check [ ]") ); + itemAt( 1 )->setLabel( _("&Automatic Dependency Check [ ]") ); pkg->AutoCheck( false ); } else { - itemAt( 2 )->setLabel( _("&Automatic Dependency Check [x]") ); + itemAt( 1 )->setLabel( _("&Automatic Dependency Check [x]") ); pkg->AutoCheck( true ); } -- 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] r47214 - in /trunk/ncurses-pkg/src: NCPackageSelector.cc NCPackageSelector.h NCPackageSelectorStart.cc
by gs＠svn.opensuse.org 30 Apr '08

30 Apr '08

Author: gs Date: Wed Apr 30 13:17:38 2008 New Revision: 47214 URL: http://svn.opensuse.org/viewcvs/yast?rev=47214&view=rev Log: improve YOU layout, show YOU help Modified: trunk/ncurses-pkg/src/NCPackageSelector.cc trunk/ncurses-pkg/src/NCPackageSelector.h trunk/ncurses-pkg/src/NCPackageSelectorStart.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 Apr 30 13:17:38 2008 @@ -94,6 +94,7 @@ , viewMenu( 0 ) , extrasMenu( 0 ) , helpMenu( 0 ) + , youHelpButton( 0 ) , filterMain( 0 ) , actionMenu( 0 ) , filterMenu( 0 ) @@ -110,26 +111,6 @@ , visibleInfo( 0 ) { - // FIXME - remove this code when everthiong is handled by handleEvent() ! - // (the eventHandlerMap is obsolete) - - // Fill the handler map - -#if 0 - eventHandlerMap[ NCPkgStrings::Search()->toString() ] = &NCPackageSelector::SearchHandler; -#endif - - // Information menu -> DONE - - // Action menu -> DONE - - // Etc. menu -> DONE - - // Help menu -#if 0 - eventHandlerMap[ NCPkgStrings::PatchHelp()->toString() ] = &NCPackageSelector::YouHelpHandler; -#endif - if ( modeFlags & YPkg_OnlineUpdateMode ) youMode = true; @@ -282,6 +263,8 @@ retVal = OkButtonHandler( event ); else if ( event.widget == cancelButton ) retVal = CancelHandler( event ); + else if ( event.widget == youHelpButton ) + retVal = YouHelpHandler( event ); else if ( event.widget == filterPopup ) { retVal = filterPopup->handleEvent(); @@ -995,11 +978,11 @@ text += NCPkgStrings::YouHelp3(); // open the popup with the help text - NCPopupInfo * youHelp = new NCPopupInfo( wpos( NCurses::lines()/3, NCurses::cols()/6 ), + NCPopupInfo * youHelp = new NCPopupInfo( wpos( (NCurses::lines()*8)/100, (NCurses::cols())*18/100 ), NCPkgStrings::YouHelp(), text ); - youHelp->setNiceSize( (NCurses::cols()*2)/3, NCurses::lines()/3 ); + youHelp->setNiceSize( (NCurses::cols()*65)/100, (NCurses::lines()*85)/100 ); youHelp->showInfoPopup( ); YDialog::deleteTopmostDialog(); @@ -1526,7 +1509,7 @@ viewMenu = new NCPkgMenuView( left3, NCPkgStrings::View(), this); YAlignment * left4 = YUI::widgetFactory()->createLeft( hSplit ); - extrasMenu = new NCPkgMenuExtras( left4, NCPkgStrings::Extras(), this); + depsMenu = new NCPkgMenuDeps( left4, NCPkgStrings::Deps(), this); // add the package table YTableHeader * tableHeader = new YTableHeader(); @@ -1563,10 +1546,15 @@ infoText = new NCPkgPackageDetails( replacePoint, " ", this ); YUI_CHECK_NEW( infoText ); - YLayoutBox * hSplit5 = YUI::widgetFactory()->createHBox( vSplit ); + YLayoutBox * bottom_bar = YUI::widgetFactory()->createHBox( vSplit ); + YAlignment *ll = YUI::widgetFactory()->createLeft( bottom_bar ); - helpMenu = new NCPkgMenuHelp (hSplit5, _("&Help")); - YUI_CHECK_NEW( helpMenu ); + youHelpButton = new NCPushButton ( ll, _("&Help")); + YUI_CHECK_NEW( youHelpButton ); + youHelpButton->setFunctionKey( 1 ); + + YAlignment *r = YUI::widgetFactory()->createRight( bottom_bar ); + YLayoutBox * hSplit5 = YUI::widgetFactory()->createHBox( r ); // add the Cancel button cancelButton = new NCPushButton( hSplit5, _( "&Cancel" ) ); 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 Apr 30 13:17:38 2008 @@ -134,6 +134,7 @@ NCPkgMenuView *viewMenu; NCPkgMenuExtras *extrasMenu; NCPkgMenuHelp *helpMenu; + NCPushButton *youHelpButton; NCPkgFilterMain *filterMain; NCPkgMenuAction *actionMenu; NCPkgMenuFilter *filterMenu; Modified: trunk/ncurses-pkg/src/NCPackageSelectorStart.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPackageSelecto… ============================================================================== --- trunk/ncurses-pkg/src/NCPackageSelectorStart.cc (original) +++ trunk/ncurses-pkg/src/NCPackageSelectorStart.cc Wed Apr 30 13:17:38 2008 @@ -148,8 +148,6 @@ { // show the required diskspace packager->showDiskSpace(); - // FIXME - show appropriate filter menu entries (with patterns or selections) - // This may be obsolete if selections are surely obsolete // packager->createFilterMenu(); } } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

Jump to page:

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

YaST Commits April 2008