Author: gs Date: Thu Sep 27 18:07:41 2007 New Revision: 41156 URL: http://svn.opensuse.org/viewcvs/yast?rev=41156&view=rev Log: move post() from .h to .cc Modified: branches/tmp/sh/mod-ui/ncurses/src/NCPopup.cc branches/tmp/sh/mod-ui/ncurses/src/NCPopup.h branches/tmp/sh/mod-ui/ncurses/src/README_mod-ui Modified: branches/tmp/sh/mod-ui/ncurses/src/NCPopup.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCPo... ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCPopup.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCPopup.cc Thu Sep 27 18:07:41 2007 @@ -34,7 +34,7 @@ NCPopup::NCPopup( const wpos at, const bool boxed ) : NCDialog( wopt, at, boxed ) { - NCMIL << "Constructor NCPopup - creates NCDialog" << endl; + } /////////////////////////////////////////////////////////////////// @@ -59,9 +59,7 @@ // void NCPopup::popupDialog() { - NCMIL << "popupDialog calls initDialog()" << endl; initDialog(); - NCMIL << "Call showDialog() " << endl; showDialog(); activate ( true ); while ( !(postevent = userInput()) ) @@ -97,3 +95,17 @@ return NCDialog::wHandleInput( ch ); } +int NCPopup::post( NCursesEvent * returnevent ) +{ + postevent = NCursesEvent(); + do { + popupDialog(); + } while ( postAgain() ); + popdownDialog(); + if ( returnevent ) + *returnevent = postevent; + + NCMIL << "Return: " << postevent.detail << endl; + + return postevent.detail; +} Modified: branches/tmp/sh/mod-ui/ncurses/src/NCPopup.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCPo... ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCPopup.h (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCPopup.h Thu Sep 27 18:07:41 2007 @@ -60,16 +60,7 @@ public: - int post( NCursesEvent * returnevent = 0 ) { - postevent = NCursesEvent(); - do { - popupDialog(); - } while ( postAgain() ); - popdownDialog(); - if ( returnevent ) - *returnevent = postevent; - return postevent.detail; - } + int post( NCursesEvent * returnevent = 0 ); }; Modified: branches/tmp/sh/mod-ui/ncurses/src/README_mod-ui URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/READ... ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/README_mod-ui (original) +++ branches/tmp/sh/mod-ui/ncurses/src/README_mod-ui Thu Sep 27 18:07:41 2007 @@ -81,7 +81,8 @@ NCIntField ---------- Don't create NCPopupTextEntry on the stack !!! -TODO: test thoroughly, esp. calling NCPopupTextEntry +TODO: test thoroughly, IntField2.ycp: NCPopupTextEntry is created + when a digit is typed NCPopupTextEntry @@ -103,5 +104,5 @@ NCAskForDirectory/NCAskForFile ------------------------------ TODO: CheckBox Show details doesn't work - test FileSelection.ycp and FileSelection2.ycp thoroughly + test examples FileSelection.ycp and FileSelection2.ycp thoroughly ComboBox entries are added twice -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org