February 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r44115 - in /trunk/devtools: VERSION package/yast2-devtools.changes
by mvidner＠svn.opensuse.org 01 Feb '08

01 Feb '08

Author: mvidner Date: Fri Feb 1 17:13:03 2008 New Revision: 44115 URL: http://svn.opensuse.org/viewcvs/yast?rev=44115&view=rev Log: bump Modified: trunk/devtools/VERSION trunk/devtools/package/yast2-devtools.changes Modified: trunk/devtools/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/VERSION?rev=44115&r1=44… ============================================================================== --- trunk/devtools/VERSION (original) +++ trunk/devtools/VERSION Fri Feb 1 17:13:03 2008 @@ -1 +1 @@ -2.16.3 +2.16.4 Modified: trunk/devtools/package/yast2-devtools.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/package/yast2-devtools.… ============================================================================== --- trunk/devtools/package/yast2-devtools.changes (original) +++ trunk/devtools/package/yast2-devtools.changes Fri Feb 1 17:13:03 2008 @@ -4,6 +4,7 @@ - Require autotools, gettext-tools, recommend cmake (bnc#356996). - y2makepot: look for gettext() in addition to _() and __() (bnc#354678). - prefixbuild: cmake fixes, small fixes for individual modules +- 2.16.4 ------------------------------------------------------------------- Thu Jan 24 14:07:52 CET 2008 - mzugec(a)suse.de -- 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] r44114 - in /trunk/devtools: package/yast2-devtools.changes yast2-devtools.spec.in
by mvidner＠svn.opensuse.org 01 Feb '08

01 Feb '08

Author: mvidner Date: Fri Feb 1 17:12:20 2008 New Revision: 44114 URL: http://svn.opensuse.org/viewcvs/yast?rev=44114&view=rev Log: Require autotools, gettext-tools, recommend cmake (bnc#356996). Modified: trunk/devtools/package/yast2-devtools.changes trunk/devtools/yast2-devtools.spec.in Modified: trunk/devtools/package/yast2-devtools.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/package/yast2-devtools.… ============================================================================== --- trunk/devtools/package/yast2-devtools.changes (original) +++ trunk/devtools/package/yast2-devtools.changes Fri Feb 1 17:12:20 2008 @@ -1,6 +1,7 @@ ------------------------------------------------------------------- Fri Feb 1 17:09:30 CET 2008 - mvidner(a)suse.cz +- Require autotools, gettext-tools, recommend cmake (bnc#356996). - y2makepot: look for gettext() in addition to _() and __() (bnc#354678). - prefixbuild: cmake fixes, small fixes for individual modules Modified: trunk/devtools/yast2-devtools.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/yast2-devtools.spec.in?… ============================================================================== --- trunk/devtools/yast2-devtools.spec.in (original) +++ trunk/devtools/yast2-devtools.spec.in Fri Feb 1 17:12:20 2008 @@ -7,6 +7,9 @@ Requires: libxslt # we install our .pc under $prefix/share Requires: pkgconfig >= 0.16 +Requires: automake autoconf +Requires: gettext-tools +Recommends: cmake # /usr/lib/YaST2/bin/ydoxygen needs it Recommends: doxygen Provides: ycpdoc ydoc -- 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] r44113 - in /trunk/devtools: package/yast2-devtools.changes prefixbuild/recreate prefixbuild/yast2-deps
by mvidner＠svn.opensuse.org 01 Feb '08

01 Feb '08

Author: mvidner Date: Fri Feb 1 17:09:49 2008 New Revision: 44113 URL: http://svn.opensuse.org/viewcvs/yast?rev=44113&view=rev Log: prefixbuild: cmake fixes, small fixes for individual modules Modified: trunk/devtools/package/yast2-devtools.changes trunk/devtools/prefixbuild/recreate trunk/devtools/prefixbuild/yast2-deps Modified: trunk/devtools/package/yast2-devtools.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/package/yast2-devtools.… ============================================================================== --- trunk/devtools/package/yast2-devtools.changes (original) +++ trunk/devtools/package/yast2-devtools.changes Fri Feb 1 17:09:49 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Feb 1 17:09:30 CET 2008 - mvidner(a)suse.cz + +- y2makepot: look for gettext() in addition to _() and __() (bnc#354678). +- prefixbuild: cmake fixes, small fixes for individual modules + +------------------------------------------------------------------- Thu Jan 24 14:07:52 CET 2008 - mzugec(a)suse.de - replace deprecated NetworkDevices by NetworkInterfaces (from yast2) Modified: trunk/devtools/prefixbuild/recreate URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/prefixbuild/recreate?re… ============================================================================== --- trunk/devtools/prefixbuild/recreate (original) +++ trunk/devtools/prefixbuild/recreate Fri Feb 1 17:09:49 2008 @@ -127,19 +127,22 @@ pushd "$MODULE" case "$MODULE" in - zypper|libzypp) init_cmake "$MODULE";; + zypper|libzypp|qt) init_cmake "$MODULE";; *) init_autotools "$MODULE";; esac # special case not to drag in old libzypp: force linking from scratch case "$MODULE" in pkg-bindings) : ;; - *-bindings) find -name \*.la | xargs rm -v ;; + *-bindings) find -name \*.la | xargs --no-run-if-empty rm -v ;; esac pfx $MAKE pfx make install + case "$MODULE" in + zypper|libzypp|qt) cd ..;; + esac touch .recreated popd } @@ -189,7 +192,7 @@ module perl-bindings "$PFX" "$CFLAGS" -module storage "$PFX" "$CFLAGS" '--sbindir=$(prefix)/sbin' +module storage "$PFX" "$CFLAGS" "$FILLUPDIR" '--sbindir=$(prefix)/sbin' module bootloader "$PFX" "$FILLUPDIR" module x11 "$PFX" "$CFLAGS" @@ -215,6 +218,7 @@ module firstboot "$PFX" "$FILLUPDIR" '--sysconfdir=$(prefix)/etc' module metapackage "$PFX" '--sbindir=$(prefix)/sbin' +module product-creator "$PFX" "$FILLUPDIR" if $RESOLVE_DEPS; then echo >&2 "Getting dependencies" Modified: trunk/devtools/prefixbuild/yast2-deps URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/prefixbuild/yast2-deps?… ============================================================================== --- trunk/devtools/prefixbuild/yast2-deps (original) +++ trunk/devtools/prefixbuild/yast2-deps Fri Feb 1 17:09:49 2008 @@ -14,6 +14,8 @@ case "$RPM" in yast2|liby2util) echo "$RPM" ;; + yast2-country-data) + echo country ;; yast2-mail-aliases) echo mail ;; yast2-storage-lib) -- 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] r44112 - /trunk/devtools/devtools/bin/y2autoconf
by mvidner＠svn.opensuse.org 01 Feb '08

01 Feb '08

Author: mvidner Date: Fri Feb 1 17:08:20 2008 New Revision: 44112 URL: http://svn.opensuse.org/viewcvs/yast?rev=44112&view=rev Log: gettext-devel got renamed to gettext-tools Modified: trunk/devtools/devtools/bin/y2autoconf Modified: trunk/devtools/devtools/bin/y2autoconf URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/bin/y2autoconf… ============================================================================== --- trunk/devtools/devtools/bin/y2autoconf (original) +++ trunk/devtools/devtools/bin/y2autoconf Fri Feb 1 17:08:20 2008 @@ -233,7 +233,7 @@ dnl no need for AC_ARG_VAR AC_PATH_PROG(XGETTEXT, xgettext) if test -z "$XGETTEXT" ; then - AC_MSG_ERROR(xgettext is missing; please install gettext-devel.) + AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) fi Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` -- 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] r44111 - in /trunk/ncurses/src/pkg: NCPkgPopupDescr.cc NCPkgPopupDiskspace.cc NCPkgPopupRepo.cc NCPkgPopupSearch.cc NCPkgPopupSelection.cc NCPkgPopupTable.cc
by sh-sh-sh＠svn.opensuse.org 01 Feb '08

01 Feb '08

Author: sh-sh-sh Date: Fri Feb 1 16:42:21 2008 New Revision: 44111 URL: http://svn.opensuse.org/viewcvs/yast?rev=44111&view=rev Log: use widget pointers, not artificially introduced IDs Modified: trunk/ncurses/src/pkg/NCPkgPopupDescr.cc trunk/ncurses/src/pkg/NCPkgPopupDiskspace.cc trunk/ncurses/src/pkg/NCPkgPopupRepo.cc trunk/ncurses/src/pkg/NCPkgPopupSearch.cc trunk/ncurses/src/pkg/NCPkgPopupSelection.cc trunk/ncurses/src/pkg/NCPkgPopupTable.cc Modified: trunk/ncurses/src/pkg/NCPkgPopupDescr.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/pkg/NCPkgPopupDescr.… ============================================================================== --- trunk/ncurses/src/pkg/NCPkgPopupDescr.cc (original) +++ trunk/ncurses/src/pkg/NCPkgPopupDescr.cc Fri Feb 1 16:42:21 2008 @@ -21,7 +21,6 @@ #include "YMenuButton.h" #include "YDialog.h" -#include "YWidgetID.h" #include "NCLayoutBox.h" #include "NCSpacing.h" @@ -125,9 +124,6 @@ // add the OK button opt.key_Fxx.setValue( 10 ); okButton = new NCPushButton( split, NCPkgNames::OKLabel() ); - YStringWidgetID * okID = new YStringWidgetID( "ok" ); - okButton->setId( okID ); - } /////////////////////////////////////////////////////////////////// @@ -232,16 +228,6 @@ if ( ! postevent.widget ) return false; - // YCPValue currentId = dynamic_cast<YWidget *>(postevent.widget)->id(); - YWidgetID * currentId = dynamic_cast<YWidget *>(postevent.widget)->id(); - - if ( currentId - && currentId->toString() == "cancel" ) - { - // close the dialog - postevent = NCursesEvent::cancel; - } - if ( postevent == NCursesEvent::button || postevent == NCursesEvent::cancel ) { // return false means: close the popup dialog Modified: trunk/ncurses/src/pkg/NCPkgPopupDiskspace.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/pkg/NCPkgPopupDisksp… ============================================================================== --- trunk/ncurses/src/pkg/NCPkgPopupDiskspace.cc (original) +++ trunk/ncurses/src/pkg/NCPkgPopupDiskspace.cc Fri Feb 1 16:42:21 2008 @@ -21,7 +21,6 @@ #include "YMenuButton.h" #include "YDialog.h" -#include "YWidgetID.h" #include "YTypes.h" #include "NCLayoutBox.h" @@ -118,10 +117,7 @@ // add the ok button okButton = new NCPushButton( split, NCPkgNames::OKLabel() ); - YStringWidgetID * okID = new YStringWidgetID( "ok" ); okButton->setFunctionKey( 10 ); - okButton->setId( okID ); - } /////////////////////////////////////////////////////////////////// Modified: trunk/ncurses/src/pkg/NCPkgPopupRepo.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/pkg/NCPkgPopupRepo.c… ============================================================================== --- trunk/ncurses/src/pkg/NCPkgPopupRepo.cc (original) +++ trunk/ncurses/src/pkg/NCPkgPopupRepo.cc Fri Feb 1 16:42:21 2008 @@ -220,9 +220,6 @@ //the cute button okButton = new NCPushButton( split, NCPkgNames::OKLabel() ); - YStringWidgetID * okID = new YStringWidgetID("ok"); - - okButton->setId( okID ); okButton->setFunctionKey(10); new NCSpacing( split, YD_VERT, false, 0.4 ); @@ -379,10 +376,7 @@ postevent.detail = NCursesEvent::NODETAIL; - YWidgetID *currentId = dynamic_cast<YWidget *>(postevent.widget)->id(); - - if ( currentId - && currentId->toString() == "ok" ) + if ( postevent.widget == okButton ) { postevent.detail = NCursesEvent::USERDEF ; // return false means: close the popup Modified: trunk/ncurses/src/pkg/NCPkgPopupSearch.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/pkg/NCPkgPopupSearch… ============================================================================== --- trunk/ncurses/src/pkg/NCPkgPopupSearch.cc (original) +++ trunk/ncurses/src/pkg/NCPkgPopupSearch.cc Fri Feb 1 16:42:21 2008 @@ -29,8 +29,6 @@ #include "NCPkgNames.h" #include "NCPackageSelector.h" -#include "YWidgetID.h" - #include "NCi18n.h" /* @@ -103,8 +101,6 @@ NCPkgNames::SearchPhrase(), true ); // editable = true - YStringWidgetID * searchID = new YStringWidgetID ("search_box" ); - searchExpr->setId( searchID ); searchExpr->setStretchable( YD_HORIZ, true ); searchExpr->addItem( new YTableItem() ); @@ -148,15 +144,11 @@ // add the cancel and the ok button okButton = new NCPushButton( hSplit3, NCPkgNames::OKLabel() ); - YStringWidgetID * okID = new YStringWidgetID("ok"); - okButton->setId( okID ); okButton->setFunctionKey( 10 ); new NCSpacing( hSplit3, YD_HORIZ, true, 0.4 ); cancelButton = new NCPushButton( hSplit3, NCPkgNames::CancelLabel() ); - YStringWidgetID * cancelID = new YStringWidgetID("cancel"); - cancelButton->setId( cancelID ); cancelButton->setFunctionKey( 9 ); new NCSpacing( hSplit3, YD_HORIZ, true, 0.2 ); @@ -275,10 +267,7 @@ postevent.result = ""; - YWidgetID * currentId = dynamic_cast<YWidget *>(postevent.widget)->id(); - - if ( currentId && - currentId->toString() == "cancel" ) + if ( postevent.widget == cancelButton ) { postevent = NCursesEvent::cancel; } Modified: trunk/ncurses/src/pkg/NCPkgPopupSelection.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/pkg/NCPkgPopupSelect… ============================================================================== --- trunk/ncurses/src/pkg/NCPkgPopupSelection.cc (original) +++ trunk/ncurses/src/pkg/NCPkgPopupSelection.cc Fri Feb 1 16:42:21 2008 @@ -137,9 +137,6 @@ // add an OK button okButton = new NCPushButton( split, NCPkgNames::OKLabel() ); - YStringWidgetID * okID = new YStringWidgetID("ok"); - - okButton->setId( okID ); okButton->setFunctionKey(10); new NCSpacing( split, YD_VERT, false, 0.4 ); @@ -312,10 +309,7 @@ postevent.detail = NCursesEvent::NODETAIL; - YWidgetID * currentId = dynamic_cast<YWidget *>(postevent.widget)->id(); - - if ( currentId - && currentId->toString() == "ok" ) + if ( postevent.widget == okButton ) { postevent.detail = NCursesEvent::USERDEF ; // return false means: close the popup Modified: trunk/ncurses/src/pkg/NCPkgPopupTable.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/pkg/NCPkgPopupTable.… ============================================================================== --- trunk/ncurses/src/pkg/NCPkgPopupTable.cc (original) +++ trunk/ncurses/src/pkg/NCPkgPopupTable.cc Fri Feb 1 16:42:21 2008 @@ -20,7 +20,6 @@ #include "YMenuButton.h" #include "YDialog.h" -#include "YWidgetID.h" #include "NCLayoutBox.h" #include "NCSpacing.h" @@ -125,8 +124,6 @@ // add the OK button opt.key_Fxx.setValue( 10 ); okButton = new NCPushButton( hSplit, NCPkgNames::OKLabel() ); - YStringWidgetID * okID = new YStringWidgetID( "ok" ); - okButton->setId( okID ); //hSplit->addChild( new NCSpacing( hSplit, opt, 0.4, true, false ) ); new NCSpacing( hSplit, YD_HORIZ, true, 0.4 ); @@ -134,8 +131,6 @@ // add the Cancel button opt.key_Fxx.setValue( 9 ); cancelButton = new NCPushButton( hSplit, NCPkgNames::CancelLabel() ); - YStringWidgetID * cancelID = new YStringWidgetID( "cancel" ); - cancelButton->setId( cancelID ); //hSplit->addChild( new NCSpacing( hSplit, opt, 0.2, true, false ) ); new NCSpacing( hSplit, YD_HORIZ, true, 0.2 ); @@ -301,10 +296,7 @@ if ( ! postevent.widget ) return false; - // YCPValue currentId = dynamic_cast<YWidget *>(postevent.widget)->id(); - YWidgetID * currentId = dynamic_cast<YWidget *>(postevent.widget)->id(); - if ( currentId - && currentId->toString() == "cancel" ) + if ( postevent.widget == cancelButton ) { //user hit cancel - discard set of changes (if not empty) packager->clearVerifiedPkgs(); -- 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] r44110 - /trunk/ncurses/src/pkg/NCPkgPopupDeps.cc
by sh-sh-sh＠svn.opensuse.org 01 Feb '08

01 Feb '08

Author: sh-sh-sh Date: Fri Feb 1 16:31:45 2008 New Revision: 44110 URL: http://svn.opensuse.org/viewcvs/yast?rev=44110&view=rev Log: use widget pointers, not artificially introduced IDs Modified: trunk/ncurses/src/pkg/NCPkgPopupDeps.cc Modified: trunk/ncurses/src/pkg/NCPkgPopupDeps.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/pkg/NCPkgPopupDeps.c… ============================================================================== --- trunk/ncurses/src/pkg/NCPkgPopupDeps.cc (original) +++ trunk/ncurses/src/pkg/NCPkgPopupDeps.cc Fri Feb 1 16:31:45 2008 @@ -31,8 +31,6 @@ #include "NCPopupInfo.h" #include "NCInputField.h" -#include "YWidgetID.h" - #include "NCi18n.h" /* @@ -168,9 +166,6 @@ // add the solve button solveButton = new NCPushButton( hSplit, NCPkgNames::SolveLabel() ); solveButton->setFunctionKey( 10 ); - //solveButton->setId( NCPkgNames::Solve () ); - YStringWidgetID * solveID = new YStringWidgetID("solve"); - solveButton->setId( solveID ); //hSplit->addChild( new NCSpacing( hSplit, opt, 0.2, true, false ) ); new NCSpacing( hSplit, YD_HORIZ, true, 0.2 ); // stretchable = 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] r44109 - /trunk/ncurses/src/pkg/NCPkgPopupDeps.cc
by sh-sh-sh＠svn.opensuse.org 01 Feb '08

01 Feb '08

Author: sh-sh-sh Date: Fri Feb 1 16:31:12 2008 New Revision: 44109 URL: http://svn.opensuse.org/viewcvs/yast?rev=44109&view=rev Log: use widget pointers, not artificially introduced IDs Modified: trunk/ncurses/src/pkg/NCPkgPopupDeps.cc Modified: trunk/ncurses/src/pkg/NCPkgPopupDeps.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/pkg/NCPkgPopupDeps.c… ============================================================================== --- trunk/ncurses/src/pkg/NCPkgPopupDeps.cc (original) +++ trunk/ncurses/src/pkg/NCPkgPopupDeps.cc Fri Feb 1 16:31:12 2008 @@ -178,9 +178,6 @@ // add the cancel button cancelButton = new NCPushButton( hSplit, NCPkgNames::CancelLabel() ); cancelButton->setFunctionKey( 9 ); - // cancelButton->setId( NCPkgNames::Cancel () ); - YStringWidgetID * cancelID = new YStringWidgetID("cancel"); - cancelButton->setId( cancelID ); new NCSpacing( vSplit, YD_VERT, false, 1 ); // stretchable = false } @@ -401,17 +398,12 @@ if ( ! postevent.widget ) return false; - // YCPValue currentId = dynamic_cast<YWidget *>(postevent.widget)->id(); - YWidgetID * currentId = dynamic_cast<YWidget *>(postevent.widget)->id(); - if ( !currentId ) - return false; - - if ( currentId->toString() == "cancel" ) + if ( postevent.widget == cancelButton ) { // close the dialog postevent = NCursesEvent::cancel; } - else if ( currentId->toString() == "solve" ) + else if ( postevent.widget == solveButton ) { // apply the solution here zypp::Resolver_Ptr resolver = zypp::getZYpp()->resolver(); -- 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] r44108 - in /trunk/ncurses/src: NCMenuButton.cc NCPopupInfo.cc NCRichText.cc
by sh-sh-sh＠svn.opensuse.org 01 Feb '08

01 Feb '08

Author: sh-sh-sh Date: Fri Feb 1 16:25:37 2008 New Revision: 44108 URL: http://svn.opensuse.org/viewcvs/yast?rev=44108&view=rev Log: use widget pointers, not artificially introduced IDs Modified: trunk/ncurses/src/NCMenuButton.cc trunk/ncurses/src/NCPopupInfo.cc trunk/ncurses/src/NCRichText.cc Modified: trunk/ncurses/src/NCMenuButton.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCMenuButton.cc?rev=… ============================================================================== --- trunk/ncurses/src/NCMenuButton.cc (original) +++ trunk/ncurses/src/NCMenuButton.cc Fri Feb 1 16:25:37 2008 @@ -21,8 +21,6 @@ #include "NCMenuButton.h" #include "NCPopupMenu.h" -#include "YWidgetID.h" - /////////////////////////////////////////////////////////////////// // // Modified: trunk/ncurses/src/NCPopupInfo.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCPopupInfo.cc?rev=4… ============================================================================== --- trunk/ncurses/src/NCPopupInfo.cc (original) +++ trunk/ncurses/src/NCPopupInfo.cc Fri Feb 1 16:25:37 2008 @@ -25,8 +25,6 @@ #include "NCLayoutBox.h" #include "NCSpacing.h" -#include "YWidgetID.h" - namespace { const string idOk( "ok" ); @@ -105,9 +103,6 @@ // add the OK button okButton = new NCPushButton( hSplit, okButtonLabel ); okButton->setFunctionKey( 10 ); - - YStringWidgetID * okID = new YStringWidgetID (idOk ); - okButton->setId( okID ); } if ( cancelButtonLabel != "" ) @@ -117,9 +112,6 @@ // add the Cancel button cancelButton = new NCPushButton( hSplit, cancelButtonLabel ); cancelButton->setFunctionKey( 9 ); - - YStringWidgetID * cancelID = new YStringWidgetID( idCancel ); - cancelButton->setId( cancelID ); new NCSpacing( hSplit, YD_HORIZ, true, 0.4 ); } @@ -242,10 +234,7 @@ if ( okButton && cancelButton ) { - YWidgetID * currentId = dynamic_cast<YWidget *>(postevent.widget)->id(); - - if ( currentId - && currentId->toString() == idCancel ) + if ( postevent.widget == cancelButton ) { NCMIL << "Cancel button pressed" << endl; // close the dialog Modified: trunk/ncurses/src/NCRichText.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCRichText.cc?rev=44… ============================================================================== --- trunk/ncurses/src/NCRichText.cc (original) +++ trunk/ncurses/src/NCRichText.cc Fri Feb 1 16:25:37 2008 @@ -25,8 +25,6 @@ #include "YMenuItem.h" -#include "YWidgetID.h" - #if 0 #undef DBG_CLASS #define DBG_CLASS "_NCRichText_" -- 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] r44107 - /trunk/ncurses/src/NCAskForFile.cc
by sh-sh-sh＠svn.opensuse.org 01 Feb '08

01 Feb '08

Author: sh-sh-sh Date: Fri Feb 1 16:19:54 2008 New Revision: 44107 URL: http://svn.opensuse.org/viewcvs/yast?rev=44107&view=rev Log: use widget pointers, not artificially introduced IDs Modified: trunk/ncurses/src/NCAskForFile.cc Modified: trunk/ncurses/src/NCAskForFile.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCAskForFile.cc?rev=… ============================================================================== --- trunk/ncurses/src/NCAskForFile.cc (original) +++ trunk/ncurses/src/NCAskForFile.cc Fri Feb 1 16:19:54 2008 @@ -21,7 +21,6 @@ #include "NCAskForFile.h" #include "YDialog.h" -#include "YWidgetID.h" #include "NCLayoutBox.h" #include "NCSpacing.h" @@ -38,15 +37,6 @@ Textdomain "packages" */ -namespace -{ - const string idOk( "ok" ); - const string idCancel( "cancel" ); - const string idDirList( "dirlist" ); - const string idFileList( "filelist" ); - const string idDirName( "dirname" ); - const string idDetails( "details" ); -} /////////////////////////////////////////////////////////////////// // @@ -147,17 +137,12 @@ dirName = new NCComboBox( frame, _( "Selected Directory:" ), false ); // editable = false; dirName->setNotify( true ); dirName->setStretchable( YD_HORIZ, true ); - - YStringWidgetID * dirID = new YStringWidgetID( idDirName ); - dirName->setId( dirID ); // add the checkBox detailed NCLayoutBox * hSplit = new NCLayoutBox( split, YD_HORIZ ); // label for checkbox detailed = new NCCheckBox( hSplit, _( "&Detailed View" ), false ); - YStringWidgetID * detailsID = new YStringWidgetID( idDetails ); - detailed->setId( detailsID ); detailed->setNotify( true ); // HBox for the lists @@ -174,9 +159,6 @@ NCFileSelection::T_Overview, startDir ); dirList->setSendKeyEvents( true ); - - YStringWidgetID * dirListID = new YStringWidgetID( idDirList ); - dirList->setId( dirListID ); // create table header for table type T_Overview YTableHeader * fileHeader = new YTableHeader(); @@ -191,8 +173,6 @@ startDir ); fileList->setSendKeyEvents( true ); - YStringWidgetID * dirFileID = new YStringWidgetID( idFileList ); - fileList->setId( dirFileID ); NCLayoutBox * hSplit2 = new NCLayoutBox( split, YD_HORIZ ); @@ -226,9 +206,6 @@ okButton = new NCPushButton( hSplit3, _( "&OK" ) ); okButton->setFunctionKey( 10 ); okButton->setStretchable( YD_HORIZ, true ); - - YStringWidgetID * okID = new YStringWidgetID( idOk ); - okButton->setId( okID ); new NCSpacing( hSplit3, YD_HORIZ, true, 0.4 ); @@ -236,9 +213,6 @@ cancelButton = new NCPushButton( hSplit3, _( "&Cancel" ) ); cancelButton->setFunctionKey( 9 ); cancelButton->setStretchable( YD_HORIZ, true ); - - YStringWidgetID * cancelID = new YStringWidgetID( idCancel ); - cancelButton->setId( cancelID ); new NCSpacing( hSplit3, YD_HORIZ, true, 0.2 ); } @@ -343,69 +317,65 @@ return true; } - YWidgetID * currentId = dynamic_cast<YWidget *>(postevent.widget)->id(); - - if ( currentId ) + if ( postevent.widget == okButton ) { - if ( currentId->toString() == idOk ) - { - postevent.result = dirList->getCurrentDir() + "/" + getFileName(); - // return false means: close the popup - return false; - } - else if ( ( currentId->toString() == idDirList ) && - ( postevent.result != "" ) ) - { - // show the currently selected directory - dirName->addItem( postevent.result, - true ); - updateFileList(); + postevent.result = dirList->getCurrentDir() + "/" + getFileName(); + // return false means: close the popup + return false; + } + else if ( ( postevent.widget == dirList ) && + ( postevent.result != "" ) ) + { + // show the currently selected directory + dirName->addItem( postevent.result, + true ); + updateFileList(); - if ( postevent.reason == YEvent::Activated ) - { - // fill directory and file list - dirList->fillList(); - updateFileList(); - } - } - else if ( currentId->toString() == idDirName ) + if ( postevent.reason == YEvent::Activated ) { - dirList->setStartDir( dirName->text() ); + // fill directory and file list dirList->fillList(); - updateFileList(); } - else if ( currentId->toString() == idDetails ) + } + else if ( postevent.widget == dirName ) + { + dirList->setStartDir( dirName->text() ); + dirList->fillList(); + + updateFileList(); + } + else if ( postevent.widget == detailed ) + { + bool details = getCheckBoxValue( detailed ); + if ( details ) { - bool details = getCheckBoxValue( detailed ); - if ( details ) - { - fileList->setTableType( NCFileTable::T_Detailed ); - dirList->setTableType( NCFileTable::T_Detailed ); - } - else - { - fileList->setTableType( NCFileTable::T_Overview ); - dirList->setTableType( NCFileTable::T_Overview ); - } - fileList->fillList(); - dirList->fillList(); + fileList->setTableType( NCFileTable::T_Detailed ); + dirList->setTableType( NCFileTable::T_Detailed ); } - else if ( currentId->toString() == idFileList ) + else { - if ( postevent.result != "" ) - { - fileName->setValue( postevent.result ); - } + fileList->setTableType( NCFileTable::T_Overview ); + dirList->setTableType( NCFileTable::T_Overview ); } - else + fileList->fillList(); + dirList->fillList(); + } + else if ( postevent.widget == fileList ) + { + if ( postevent.result != "" ) { - postevent.result = ""; - return false; + fileName->setValue( postevent.result ); } } + else + { + postevent.result = ""; + return false; + } - if (postevent == NCursesEvent::cancel) + if ( postevent.widget == cancelButton || + postevent == NCursesEvent::cancel ) { postevent.result = ""; return false; -- 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] r44106 - /trunk/ncurses/src/NCAskForDirectory.cc
by sh-sh-sh＠svn.opensuse.org 01 Feb '08

01 Feb '08

Author: sh-sh-sh Date: Fri Feb 1 16:10:17 2008 New Revision: 44106 URL: http://svn.opensuse.org/viewcvs/yast?rev=44106&view=rev Log: use widget pointers, not artificially introduced IDs Modified: trunk/ncurses/src/NCAskForDirectory.cc Modified: trunk/ncurses/src/NCAskForDirectory.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCAskForDirectory.cc… ============================================================================== --- trunk/ncurses/src/NCAskForDirectory.cc (original) +++ trunk/ncurses/src/NCAskForDirectory.cc Fri Feb 1 16:10:17 2008 @@ -22,7 +22,6 @@ #include "NCAskForDirectory.h" -#include "YWidgetID.h" #include "YDialog.h" #include "YTypes.h" #include "NCLayoutBox.h" @@ -39,14 +38,6 @@ Textdomain "packages" */ -namespace -{ - const string idOk( "ok" ); - const string idCancel( "cancel" ); - const string idDirList( "dirlist" ); - const string idDirName( "dirname" ); - const string idDetails( "details" ); -} /////////////////////////////////////////////////////////////////// // @@ -107,18 +98,11 @@ dirName->setNotify( true ); dirName->setStretchable( YD_HORIZ, true ); -#warning is this widget ID really needed? - YStringWidgetID * dirID = new YStringWidgetID( idDirName ); - dirName->setId( dirID ); - // add the checkBox detailed NCLayoutBox * hSplit = new NCLayoutBox( split, YD_HORIZ ); // label for checkbox detailed = new NCCheckBox( hSplit, _( "&Detailed View" ), false ); -#warning is this widget ID really needed? - YStringWidgetID * detailsID = new YStringWidgetID( idDetails ); - detailed->setId( detailsID ); detailed->setNotify( true ); // create table header for table type T_Overview @@ -132,10 +116,6 @@ NCFileTable::T_Overview, iniDir ); -#warning is this widget ID really needed? - YStringWidgetID * dirListID = new YStringWidgetID( idDirList ); - dirList->setId( dirListID ); - new NCSpacing( split, YD_VERT, false, 1.0 ); // HBox for the buttons @@ -147,10 +127,6 @@ okButton = new NCPushButton( hSplit1, _( "&OK" ) ); okButton->setFunctionKey( 10 ); okButton->setStretchable( YD_HORIZ, true ); - -#warning is this widget ID really needed? - YStringWidgetID * okID = new YStringWidgetID ( idOk ); - okButton->setId( okID ); new NCSpacing( hSplit1, YD_HORIZ, true, 0.4 ); @@ -159,12 +135,7 @@ cancelButton->setFunctionKey( 9 ); cancelButton->setStretchable( YD_HORIZ, true); -#warning is this widget ID really needed? - YStringWidgetID * cancelID = new YStringWidgetID (idCancel ); - cancelButton->setId( cancelID ); - new NCSpacing( hSplit1, YD_HORIZ, true, 0.2 ); - } /////////////////////////////////////////////////////////////////// @@ -238,60 +209,55 @@ postevent.detail = NCursesEvent::NODETAIL; -#warning compare widget pointers here, not IDs - YWidgetID * currentId = dynamic_cast<YWidget *>(postevent.widget)->id(); - - if ( currentId ) + if ( postevent.widget == okButton ) { - if ( currentId->toString() == idOk ) - { - postevent.result = dirList->getCurrentDir(); - // return false means: close the popup - return false; - } - else if ( currentId->toString() == idDirList ) - { - if ( postevent.result == "" ) - return true; + postevent.result = dirList->getCurrentDir(); + // return false means: close the popup + return false; + } + else if ( postevent.widget == dirList ) + { + if ( postevent.result == "" ) + return true; - // show the currently selected directory - NCDBG << "Add item: " << postevent.result << endl; + // show the currently selected directory + NCDBG << "Add item: " << postevent.result << endl; - dirName->addItem( postevent.result, - true ); + dirName->addItem( postevent.result, + true ); - if ( postevent.reason == YEvent::Activated ) - { - // fill the directory list - dirList->fillList(); - } - } - else if ( currentId->toString() == idDirName ) + if ( postevent.reason == YEvent::Activated ) { - dirList->setStartDir( dirName->value() ); + // fill the directory list dirList->fillList(); } - else if ( currentId->toString() == idDetails ) + } + else if ( postevent.widget == dirName ) + { + dirList->setStartDir( dirName->value() ); + dirList->fillList(); + } + else if ( postevent.widget == detailed ) + { + bool details = getCheckBoxValue( detailed ); + if ( details ) { - bool details = getCheckBoxValue( detailed ); - if ( details ) - { - dirList->setTableType( NCFileTable::T_Detailed ); - } - else - { - dirList->setTableType( NCFileTable::T_Overview ); - } - dirList->fillList(); + dirList->setTableType( NCFileTable::T_Detailed ); } else { - postevent.result = ""; - return false; + dirList->setTableType( NCFileTable::T_Overview ); } + dirList->fillList(); + } + else + { + postevent.result = ""; + return false; } - if (postevent == NCursesEvent::cancel) + if ( postevent.widget == cancelButton || + postevent == NCursesEvent::cancel ) { postevent.result = ""; return false; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0