August 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r39873 - in /branches/tmp/sh/qt4-port/qt/src: Makefile.am YQUIThreadHandler.cc YQUIThreadHandler.h
by sh-sh-sh＠svn.opensuse.org 01 Aug '07

01 Aug '07

Author: sh-sh-sh Date: Wed Aug 1 15:34:06 2007 New Revision: 39873 URL: http://svn.opensuse.org/viewcvs/yast?rev=39873&view=rev Log: added generic thread handler Added: branches/tmp/sh/qt4-port/qt/src/YQUIThreadHandler.cc branches/tmp/sh/qt4-port/qt/src/YQUIThreadHandler.h Modified: branches/tmp/sh/qt4-port/qt/src/Makefile.am Modified: branches/tmp/sh/qt4-port/qt/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/Makefi… ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/Makefile.am (original) +++ branches/tmp/sh/qt4-port/qt/src/Makefile.am Wed Aug 1 15:34:06 2007 @@ -45,6 +45,7 @@ YQUI_widgets.cc \ YQUI_builtins.cc \ YQUI_x11.cc \ + YQUIThreadHandler.cc \ YQPackageSelectorPlugin.cc \ \ YQIconPool.cc \ @@ -115,6 +116,7 @@ BUILT_SOURCES = \ YQUI.moc \ + YQUIThreadHandler.moc \ \ YQAlignment.moc \ YQBarGraph.moc \ @@ -167,6 +169,8 @@ YQUI_builtins.o YQUI_builtins.lo: YQUI.moc YQUI_x11.o YQUI_x11.lo: YQUI.moc +YQUIThreadHandler.o YQUIThreadHandler.lo: YQUIThreadHandler.moc + YQAlignment.o YQAlignment.lo: YQAlignment.moc YQBarGraph.o YQBarGraph.lo: YQBarGraph.moc YQCheckBox.o YQCheckBox.lo: YQCheckBox.moc @@ -217,6 +221,7 @@ YQUI.moc: YQUI.h +YQUIThreadHandler.moc: YQUIThreadHandler.h YQAlignment.moc: YQAlignment.h YQBarGraph.moc: YQBarGraph.h Added: branches/tmp/sh/qt4-port/qt/src/YQUIThreadHandler.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQUITh… ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQUIThreadHandler.cc (added) +++ branches/tmp/sh/qt4-port/qt/src/YQUIThreadHandler.cc Wed Aug 1 15:34:06 2007 @@ -0,0 +1,64 @@ +/*---------------------------------------------------------------------\ +| | +| __ __ ____ _____ ____ | +| \ \ / /_ _/ ___|_ _|___ \ | +| \ V / _` \___ \ | | __) | | +| | | (_| |___) || | / __/ | +| |_|\__,_|____/ |_| |_____| | +| | +| core system | +| (C) SuSE GmbH | +\----------------------------------------------------------------------/ + + File: YQUIThreadHandler.cc + + Authors: Stefan Hundhammer <sh(a)suse.de> + +/-*/ + +#define y2log_component "qt-ui" +#include <ycp/y2log.h> + +#include "qthread.h" +#include "YQUIThreadHandler.h" + + +YQUIThreadHandler::YQUIThreadHandler( voidPtrFunction startFunc, + void * startFuncArg ) + : YUIThreadHandler( startFunc, startFuncArg ) + , _yquiThread( 0 ) +{ +} + + +YQUIThreadHandler::~YQUIThreadHandler() +{ + if ( _yquiThread ) + delete _yquiThread; +} + + +void YQUIThreadHandler::startUIThread() +{ + y2debug( "Starting UI thread" ); + + if ( ! _yquiThread ) + _yquiThread = new YQUIThread( _startFunc, _startFuncArg ); + + _yquiThread->start(); + _uiThreadRunning = true; +} + + +void YQUIThreadHandler::terminateUIThread() +{ + y2debug( "Terminating UI thread" ); + + if ( _yquiThread ) + _yquiThread->terminate(); + + _uiThreadRunning = false; +} + + +#include "YQUIThreadHandler.moc" Added: branches/tmp/sh/qt4-port/qt/src/YQUIThreadHandler.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQUITh… ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQUIThreadHandler.h (added) +++ branches/tmp/sh/qt4-port/qt/src/YQUIThreadHandler.h Wed Aug 1 15:34:06 2007 @@ -0,0 +1,109 @@ +/*---------------------------------------------------------------------\ +| | +| __ __ ____ _____ ____ | +| \ \ / /_ _/ ___|_ _|___ \ | +| \ V / _` \___ \ | | __) | | +| | | (_| |___) || | / __/ | +| |_|\__,_|____/ |_| |_____| | +| | +| core system | +| (C) SuSE GmbH | +\----------------------------------------------------------------------/ + + File: YQUIThreadHandler.h + + Authors: Stefan Hundhammer <sh(a)suse.de> + +/-*/ + +#ifndef YQUIThreadHandler_h +#define YQUIThreadHandler_h + +#include <YUIThreadHandler.h> + + +#include "qthread.h" + +class YQUIThread; + + +/** + * Helper class to manage UI threads based on QThread. + **/ +class YQUIThreadHandler: public YUIThreadHandler +{ +public: + + /** + * Constructor. Takes the function to be started upon startThread() and the + * sole argument to that function. The constructor just stores both + * parameters; it will neither create a thread nor call the function. + * Use startThread() for that at some later time. + **/ + YQUIThreadHandler( voidPtrFunction startFunc, void * startFuncArg ); + + /** + * Destructor. + * + * Notice that this will NOT call terminateUIThread() since + * virtual functions can't be used (as virtual functions) in the + * destructor. Remember to call terminateUIThread() manually. + **/ + virtual ~YQUIThreadHandler(); + + /*** + * Start the UI thread with the function (and the argument to that + * function) passed in the constructor. + * + * Reimplemented from YUIThreadHandler. + **/ + virtual void startUIThread(); + + /** + * Terminate the UI thread if it running. + * + * Reimplemented from YUIThreadHandler. + **/ + virtual void terminateUIThread(); + + +protected: + + YQUIThread * _yquiThread; +}; + + +class YQUIThread: public QThread +{ + Q_OBJECT + +public: + + /** + * Constructor. + **/ + YQUIThread( voidPtrFunction startFunc, void * startFuncArg ) + : _startFunc( startFunc ) + , _startFuncArg( startFuncArg ) + {} + + /** + * Destructor. + **/ + virtual ~YQUIThread() {} + + /** + * The worker function. Calls startfunc( startFuncArg ). + **/ + virtual void run() + { _startFunc( _startFuncArg ); } + + +private: + + voidPtrFunction _startFunc; + void * _startFuncArg; +}; + + +#endif // YQUIThreadHandler_h -- 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] r39872 - /branches/tmp/sh/qt4-port/core/libyui/src/YUIThreadHandler.cc
by sh-sh-sh＠svn.opensuse.org 01 Aug '07

01 Aug '07

Author: sh-sh-sh Date: Wed Aug 1 15:23:31 2007 New Revision: 39872 URL: http://svn.opensuse.org/viewcvs/yast?rev=39872&view=rev Log: typo Modified: branches/tmp/sh/qt4-port/core/libyui/src/YUIThreadHandler.cc Modified: branches/tmp/sh/qt4-port/core/libyui/src/YUIThreadHandler.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/core/libyui/s… ============================================================================== --- branches/tmp/sh/qt4-port/core/libyui/src/YUIThreadHandler.cc (original) +++ branches/tmp/sh/qt4-port/core/libyui/src/YUIThreadHandler.cc Wed Aug 1 15:23:31 2007 @@ -10,7 +10,7 @@ | (C) SuSE GmbH | \----------------------------------------------------------------------/ - File: YUIThreadHandler.h + File: YUIThreadHandler.cc Authors: Stefan Hundhammer <sh(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] r39871 - in /branches/tmp/sh/qt4-port/core/libyui/src: Makefile.am YUI.h YUIThreadHandler.cc YUIThreadHandler.h YUI_core.cc
by sh-sh-sh＠svn.opensuse.org 01 Aug '07

01 Aug '07

Author: sh-sh-sh Date: Wed Aug 1 15:04:53 2007 New Revision: 39871 URL: http://svn.opensuse.org/viewcvs/yast?rev=39871&view=rev Log: generic thread handling Added: branches/tmp/sh/qt4-port/core/libyui/src/YUIThreadHandler.cc branches/tmp/sh/qt4-port/core/libyui/src/YUIThreadHandler.h Modified: branches/tmp/sh/qt4-port/core/libyui/src/Makefile.am branches/tmp/sh/qt4-port/core/libyui/src/YUI.h branches/tmp/sh/qt4-port/core/libyui/src/YUI_core.cc Modified: branches/tmp/sh/qt4-port/core/libyui/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/core/libyui/s… ============================================================================== --- branches/tmp/sh/qt4-port/core/libyui/src/Makefile.am (original) +++ branches/tmp/sh/qt4-port/core/libyui/src/Makefile.am Wed Aug 1 15:04:53 2007 @@ -17,6 +17,7 @@ YUI_special_widgets.cc \ YUI_bindings.cc \ YUI_util.cc \ + YUIThreadHandler.cc \ YUIPlugin.cc \ \ YAlignment.cc \ @@ -76,6 +77,7 @@ YUI_util.h \ UI.h \ YUISymbols.h \ + YUIThreadHandler.h \ YUIPlugin.h \ YPackageSelectorPlugin.h \ \ Modified: branches/tmp/sh/qt4-port/core/libyui/src/YUI.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/core/libyui/s… ============================================================================== --- branches/tmp/sh/qt4-port/core/libyui/src/YUI.h (original) +++ branches/tmp/sh/qt4-port/core/libyui/src/YUI.h Wed Aug 1 15:04:53 2007 @@ -51,6 +51,7 @@ class YTree; class YTreeItem; class Y2Component; +class YUIThreadHandler; typedef struct @@ -90,6 +91,9 @@ * or override @ref #pollInput and @ref #waitForEvent, whichever is * easier for you. * + * Derived classes can pass their own YUIThreadHandler. 0 means the standard + * YUIThreadHandler based on "pthread" will be used. + * * This class is an abstract base class that contains pure virtuals. * It is not intended for direct instantiation, only for inheritance. */ @@ -99,7 +103,7 @@ /** * Constructor. */ - YUI( bool with_threads ); + YUI( bool with_threads, YUIThreadHandler * uiThreadHandler = 0 ); public: @@ -366,9 +370,6 @@ protected: - - - const char *moduleName(); // Event handling, execution flow @@ -390,6 +391,15 @@ virtual void idleLoop( int fd_ycp ); /** + * Set a new UI thread handler. UI thread handling is moved to a separate + * class and object so it can be exchanged in a derived class's constructor + * (virtual functions can't be used in constructors or destructors). + * + * Any previously existing UI thread handler will be deleted. + **/ + virtual void setUIThreadHandler( YUIThreadHandler * newHandler ); + + /** * UI-specific UserInput() method. * * This is called upon evaluating the UI::UserInput() builtin command. @@ -1002,7 +1012,6 @@ /** * Creates and launches the ui thread. */ - void createUIThread(); friend void *start_ui_thread( void *ui_int ); /** @@ -1597,6 +1606,11 @@ **/ Y2Component * _callback; + /** + * Handler for UI threads. + **/ + YUIThreadHandler * _uiThreadHandler; + /** * Global reference to the UI Added: branches/tmp/sh/qt4-port/core/libyui/src/YUIThreadHandler.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/core/libyui/s… ============================================================================== --- branches/tmp/sh/qt4-port/core/libyui/src/YUIThreadHandler.cc (added) +++ branches/tmp/sh/qt4-port/core/libyui/src/YUIThreadHandler.cc Wed Aug 1 15:04:53 2007 @@ -0,0 +1,58 @@ +/*---------------------------------------------------------------------\ +| | +| __ __ ____ _____ ____ | +| \ \ / /_ _/ ___|_ _|___ \ | +| \ V / _` \___ \ | | __) | | +| | | (_| |___) || | / __/ | +| |_|\__,_|____/ |_| |_____| | +| | +| core system | +| (C) SuSE GmbH | +\----------------------------------------------------------------------/ + + File: YUIThreadHandler.h + + Authors: Stefan Hundhammer <sh(a)suse.de> + +/-*/ + +#define y2log_component "ui" +#include <ycp/y2log.h> + +#include "YUIThreadHandler.h" + + +YUIThreadHandler::YUIThreadHandler( voidPtrFunction startFunc, + void * startFuncArg ) + : _startFunc( startFunc ) + , _startFuncArg( startFuncArg ) + , _uiThreadRunning( false ) +{ +} + + +YUIThreadHandler::~YUIThreadHandler() +{ + if ( _uiThreadRunning ) + y2error( "Call terminateUIThread() before the destructor!" ); +} + + +void YUIThreadHandler::startUIThread() +{ + pthread_attr_t attr; + pthread_attr_init( &attr ); + + y2debug( "Starting UI thread" ); + pthread_create( &_uiThread, &attr, _startFunc, _startFuncArg ); + _uiThreadRunning = true; +} + + +void YUIThreadHandler::terminateUIThread() +{ + y2debug( "Terminating UI thread" ); + pthread_join( _uiThread, 0 ); + _uiThreadRunning = false; +} + Added: branches/tmp/sh/qt4-port/core/libyui/src/YUIThreadHandler.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/core/libyui/s… ============================================================================== --- branches/tmp/sh/qt4-port/core/libyui/src/YUIThreadHandler.h (added) +++ branches/tmp/sh/qt4-port/core/libyui/src/YUIThreadHandler.h Wed Aug 1 15:04:53 2007 @@ -0,0 +1,78 @@ +/*---------------------------------------------------------------------\ +| | +| __ __ ____ _____ ____ | +| \ \ / /_ _/ ___|_ _|___ \ | +| \ V / _` \___ \ | | __) | | +| | | (_| |___) || | / __/ | +| |_|\__,_|____/ |_| |_____| | +| | +| core system | +| (C) SuSE GmbH | +\----------------------------------------------------------------------/ + + File: YUIThreadHandler.h + + Authors: Stefan Hundhammer <sh(a)suse.de> + +/-*/ + +#ifndef YUIThreadHandler_h +#define YUIThreadHandler_h + +#include <pthread.h> + + +// Function that accepts a void * and returns a void * +typedef void * (*voidPtrFunction) (void * arg); + +/** + * Helper class to manage UI threads based on pthread. + **/ +class YUIThreadHandler +{ +public: + + /** + * Constructor. Takes the function to be started upon startThread() and the + * sole argument to that function. The constructor just stores both + * parameters; it will neither create a thread nor call the function. + * Use startThread() for that at some later time. + **/ + YUIThreadHandler( voidPtrFunction startFunc, void * startFuncArg ); + + /** + * Destructor. + * + * Notice that this will NOT call terminateUIThread() since + * virtual functions can't be used (as virtual functions) in the + * destructor. Remember to call terminateUIThread() manually. + **/ + virtual ~YUIThreadHandler(); + + /*** + * Start the UI thread with the function (and the argument to that + * function) passed in the constructor. + **/ + virtual void startUIThread(); + + /** + * Terminate the UI thread if it running. + **/ + virtual void terminateUIThread(); + + /** + * Return 'true' if the UI thread is currently running. + **/ + bool uiThreadRunning() const { return _uiThreadRunning; } + + +protected: + + voidPtrFunction _startFunc; + void * _startFuncArg; + pthread_t _uiThread; + bool _uiThreadRunning; +}; + + +#endif // YUIThreadHandler_h Modified: branches/tmp/sh/qt4-port/core/libyui/src/YUI_core.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/core/libyui/s… ============================================================================== --- branches/tmp/sh/qt4-port/core/libyui/src/YUI_core.cc (original) +++ branches/tmp/sh/qt4-port/core/libyui/src/YUI_core.cc Wed Aug 1 15:04:53 2007 @@ -32,7 +32,6 @@ #include <fcntl.h> // fcntl() #include <errno.h> #include <locale.h> // setlocale() -#include <pthread.h> #include <assert.h> #include <string.h> @@ -42,6 +41,7 @@ #include "YUI.h" #include "YUISymbols.h" +#include "YUIThreadHandler.h" #include "YWidget.h" #include "YDialog.h" @@ -63,7 +63,7 @@ extern void *start_ui_thread( void * yui ); -YUI::YUI( bool with_threads ) +YUI::YUI( bool with_threads, YUIThreadHandler * uiThreadHandler ) : id_counter(0) , with_threads( with_threads ) , _moduleName( "yast2" ) @@ -72,8 +72,12 @@ , macroPlayer (0) , _events_blocked( false ) , _callback( 0 ) + , _uiThreadHandler( uiThreadHandler ) { _yui = this; + + if ( with_threads && ! _uiThreadHandler ) + _uiThreadHandler = new YUIThreadHandler( start_ui_thread, this ); } @@ -101,6 +105,9 @@ removeDialog(); } + if ( _uiThreadHandler ) + delete _uiThreadHandler; + deleteMacroRecorder(); deleteMacroPlayer(); } @@ -146,7 +153,9 @@ else { terminate_ui_thread = false; - createUIThread(); + + if ( _uiThreadHandler ) + _uiThreadHandler->startUIThread(); } } else @@ -156,21 +165,22 @@ } -void YUI::createUIThread() +void YUI::terminateUIThread() { - pthread_attr_t attr; - pthread_attr_init( & attr ); - pthread_create( & ui_thread, & attr, start_ui_thread, this ); + terminate_ui_thread = true; + signalUIThread(); + + if ( _uiThreadHandler ) + _uiThreadHandler->terminateUIThread(); } -void YUI::terminateUIThread() +void YUI::setUIThreadHandler( YUIThreadHandler * newHandler ) { - y2debug( "Telling UI thread to shut down" ); - terminate_ui_thread = true; - signalUIThread(); - pthread_join( ui_thread, 0 ); - y2debug( "UI thread shut down correctly" ); + if ( _uiThreadHandler ) + delete _uiThreadHandler; + + _uiThreadHandler = newHandler; } @@ -425,16 +435,16 @@ // ---------------------------------------------------------------------- -void *start_ui_thread( void * yui ) +void *start_ui_thread( void * ui ) { - YUI * ui= (YUI *) yui; - #if VERBOSE_COMM y2debug( "Starting UI thread" ); #endif - if ( ui ) - ui->uiThreadMainLoop(); + YUI * yui = (YUI *) ui; + + if ( yui ) + yui->uiThreadMainLoop(); return 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] r39870 - in /branches/tmp/sh/mod-ui/ncurses/src: NCSelectionBox.cc NCSelectionBox.h
by gs＠svn.opensuse.org 01 Aug '07

01 Aug '07

Author: gs Date: Wed Aug 1 14:54:47 2007 New Revision: 39870 URL: http://svn.opensuse.org/viewcvs/yast?rev=39870&view=rev Log: add addItem() Modified: branches/tmp/sh/mod-ui/ncurses/src/NCSelectionBox.cc branches/tmp/sh/mod-ui/ncurses/src/NCSelectionBox.h Modified: branches/tmp/sh/mod-ui/ncurses/src/NCSelectionBox.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCS… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCSelectionBox.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCSelectionBox.cc Wed Aug 1 14:54:47 2007 @@ -52,24 +52,6 @@ WIDDBG << endl; } -/////////////////////////////////////////////////////////////////// -// -// -// METHOD NAME : NCSelectionBox::nicesize -// METHOD TYPE : long -// -// DESCRIPTION : -// -long NCSelectionBox::nicesize( YUIDimension dim ) -{ - wsze sze = ( biglist ) ? myPad()->tableSize() + 2 : wGetDefsze(); - if (dim == YD_HORIZ) { - return sze.W > (int)(labelWidht()+2) ? sze.W : (labelWidht()+2); - } else { - return sze.H; - } -} - int NCSelectionBox::preferredWidth() { wsze sze = ( biglist ) ? myPad()->tableSize() + 2 : wGetDefsze(); @@ -113,6 +95,7 @@ { if ( !myPad()->Lines() ) return -1; + NCMIL << "Current pos: " << myPad()->CurPos().L << endl; return myPad()->CurPos().L; } @@ -168,6 +151,8 @@ // // DESCRIPTION : // +// still used in NCPkgPopupDeps +// void NCSelectionBox::itemAdded( const YCPString& str, int index, bool selected ) { vector<NCTableCol*> Items( 1U, 0 ); @@ -181,6 +166,29 @@ /////////////////////////////////////////////////////////////////// // // +// METHOD NAME : NCSelectionBox::addItem +// METHOD TYPE : void +// +// DESCRIPTION : +// +void NCSelectionBox::addItem( YItem * item ) +{ + vector<NCTableCol*> Items( 1U, 0 ); + + if ( item ) + { + YSelectionBox::addItem ( item ); + Items[0] = new NCTableCol( item->label() ); + myPad()->Append( Items ); + DrawPad(); + if ( item->selected() ) + myPad()->ScrlLine( myPad()->Lines() ); + } +} + +/////////////////////////////////////////////////////////////////// +// +// // METHOD NAME : NCSelectionBox::setLabel // METHOD TYPE : void // Modified: branches/tmp/sh/mod-ui/ncurses/src/NCSelectionBox.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCS… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCSelectionBox.h (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCSelectionBox.h Wed Aug 1 14:54:47 2007 @@ -67,8 +67,9 @@ void setBigList( const bool big ) { biglist = big; } virtual void itemAdded( const YCPString& string, int index, bool selected ); - virtual long nicesize( YUIDimension dim ); + virtual void addItem( YItem *item ); + virtual int preferredWidth(); virtual int preferredHeight(); @@ -86,7 +87,6 @@ virtual NCursesEvent wHandleInput( wint_t key ); - //virtual void setEnabling( bool do_bv ) { NCWidget::setEnabling( enabled=do_bv ); } virtual void setEnabled( bool do_bv ); virtual bool setKeyboardFocus() { -- 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] r39869 - /branches/tmp/sh/mod-ui/ncurses/src/NCPopupTable.cc
by gs＠svn.opensuse.org 01 Aug '07

01 Aug '07

Author: gs Date: Wed Aug 1 14:26:53 2007 New Revision: 39869 URL: http://svn.opensuse.org/viewcvs/yast?rev=39869&view=rev Log: should work like this - but NCTable is not in widget tree ? Modified: branches/tmp/sh/mod-ui/ncurses/src/NCPopupTable.cc Modified: branches/tmp/sh/mod-ui/ncurses/src/NCPopupTable.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCP… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCPopupTable.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCPopupTable.cc Wed Aug 1 14:26:53 2007 @@ -21,6 +21,7 @@ #include "NCTable.h" #include "YMenuButton.h" +#include "NCLayoutBox.h" /////////////////////////////////////////////////////////////////// // @@ -64,14 +65,22 @@ YWidgetOpt opt; opt.notifyMode.setValue( true ); - sellist = new NCTable( this, opt, row, false ); + NCMIL << "CurrentDialog: " << dynamic_cast<NCDialog *>(currentDialog()) << endl; + + NCLayoutBox * box = new NCLayoutBox( this, YD_VERT ); + NCMIL << "CurrentDialog firstChild: " << dynamic_cast<NCWidget *>(currentDialog()->firstChild()) << endl; + + sellist = new NCTable( box, opt, row, false ); + + //sellist= new NCTable( this, opt, row, false ); + sellist->setBigList( true ); sellist->SetSepChar( ' ' ); sellist->SetSepWidht( 0 ); sellist->SetHotCol( 0 ); - // don' t call addChild any longer! //addChild( sellist ); + currentDialog()->dumpWidgetTree(); } /////////////////////////////////////////////////////////////////// -- 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] r39868 - in /trunk/live-installer: package/yast2-live-installer.changes src/inst_live_simple_proposal.ycp src/inst_live_welcome.ycp
by jsrain＠svn.opensuse.org 01 Aug '07

01 Aug '07

Author: jsrain Date: Wed Aug 1 14:00:13 2007 New Revision: 39868 URL: http://svn.opensuse.org/viewcvs/yast?rev=39868&view=rev Log: even more simplified installation overview Modified: trunk/live-installer/package/yast2-live-installer.changes trunk/live-installer/src/inst_live_simple_proposal.ycp trunk/live-installer/src/inst_live_welcome.ycp Modified: trunk/live-installer/package/yast2-live-installer.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/live-installer/package/yast2-liv… ============================================================================== --- trunk/live-installer/package/yast2-live-installer.changes (original) +++ trunk/live-installer/package/yast2-live-installer.changes Wed Aug 1 14:00:13 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Aug 1 13:58:19 CEST 2007 - jsrain(a)suse.cz + +- even more simplified installation overview + +------------------------------------------------------------------- Mon Jul 30 17:27:29 CEST 2007 - jsrain(a)suse.cz - added simplified installation overview Modified: trunk/live-installer/src/inst_live_simple_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/live-installer/src/inst_live_sim… ============================================================================== --- trunk/live-installer/src/inst_live_simple_proposal.ycp (original) +++ trunk/live-installer/src/inst_live_simple_proposal.ycp Wed Aug 1 14:00:13 2007 @@ -15,8 +15,10 @@ textdomain "live-installer"; Wizard::SetContents ( + // dialog caption _("Installation settings"), - `Label (_("Analyzing the system")), + // label + `Label (_("Analyzing the system...")), "", false, false @@ -36,6 +38,8 @@ ] ); +term contents = `VBox (); + // partitioning summary map<string,map> tm = Storage::GetTargetMap (); @@ -60,54 +64,46 @@ { used = (100*used)/(used+free); disks = add (disks, sformat ( - _("<li>Use %1%% of %2 for Linux</li>"), used, data["name"]:"disk")); + _("Use %1%% of disk %2 for Linux"), used, data["name"]:"")); } else { - disks = add (disks, sformat (_("<li>Do not use %1</li>"), data["name"]:"disk")); + disks = add (disks, sformat (_("Do not use disk %1"), data["name"]:"")); } }); -string partitioning = HTML::List (disks); +contents = add (contents, `Left (`Heading (_("Partitioning")))); +foreach (string disk, disks, { + contents = add (contents, `Left (`Label (disk))); +}); // end of partitioning summary - // bootloader summary -string booting = "booting"; -string lt = BootCommon::getLoaderType (false); -string ln = BootCommon::getLoaderName (lt, `summary); +string timeout = BootCommon::globals["timeout"]:""; -list<string> locations = []; - -if (BootCommon::globals["boot_boot"]:"" == "true") - locations = add(locations, BootCommon::BootPartitionDevice); -if (BootCommon::globals["boot_root"]:"" == "true") - locations = add(locations, BootCommon::RootPartitionDevice); -if (BootCommon::globals["boot_mbr"]:"" == "true") - locations = add(locations, BootCommon::mbrDisk); -if (haskey (BootCommon::globals, "boot_custom")) - locations = add(locations, BootCommon::globals["boot_custom"]:""); - -if (size (locations) == 0 || lt == "none") - booting = _("Do not install bootloader"); -else -{ - booting = sformat (_("Install %1 to %2"), ln, mergestring (locations, ", ")); -} +boolean other = false; +foreach (map<string,any> s, BootCommon::sections, { + if (s["type"]:"" == "other") + other = true; +}); -booting = HTML::List ([booting]); +contents = add (contents, `VSpacing (2)); +contents = add (contents, `Left (`Heading (_("System start-up")))); +contents = add (contents, `Left (`Label (other + ? _("Ask whether to boot Linux or existing system") + : _("Boot only Linux" )))); +contents = add (contents, `Left (`Label (sformat (_("System start time-out: %1 seconds"), timeout)))); -// FIXME was copy-pasted from GRUB, adaptability on anything but GRUB or LILO may be problematic // end of bootloader summary -string summary = sformat (_("<h1>Partitioning</h1>%1<h1>Booting</h1>%2"), - partitioning, booting); - -term contents = `VBox ( - // TRANSLATORS: progress message - `RichText (summary), - `PushButton (`id (`change), _("Change Installation Settings")) +contents = `HBox (`HSpacing (2), contents, `HSpacing (2)); +contents = `VBox ( + `VSpacing (1), + contents, + `VStretch (), + `PushButton (`id (`change), _("Change Installation Settings")), + `VSpacing (1) ); Wizard::SetContents ( Modified: trunk/live-installer/src/inst_live_welcome.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/live-installer/src/inst_live_wel… ============================================================================== --- trunk/live-installer/src/inst_live_welcome.ycp (original) +++ trunk/live-installer/src/inst_live_welcome.ycp Wed Aug 1 14:00:13 2007 @@ -11,12 +11,12 @@ textdomain "live-installer"; Wizard::SetContents ( + // dialog caption, %1 is product name (typically openSUSE) sformat (_("Welcome to %1 installation"), Product::name), - // TRANSLATORS: progress message - `Label (sformat (_("YaST will install %1 -on your computer. You will be asked several -questions before the installation will -start."), Product::name)), + // wellcome label, %1 is product name + `Label (sformat (_("Your %1 will be installed quickly +and easily in a few steps. +You will only have to answer some questions."), Product::name)), "", GetInstArgs::enable_back(), GetInstArgs::enable_next() -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r39867 - /trunk/fingerprint-reader/agent-thinkfinger/testsuite/Makefile.am
by jsuchome＠svn.opensuse.org 01 Aug '07

01 Aug '07

Author: jsuchome Date: Wed Aug 1 13:52:21 2007 New Revision: 39867 URL: http://svn.opensuse.org/viewcvs/yast?rev=39867&view=rev Log: no readme here Modified: trunk/fingerprint-reader/agent-thinkfinger/testsuite/Makefile.am Modified: trunk/fingerprint-reader/agent-thinkfinger/testsuite/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/fingerprint-reader/agent-thinkfi… ============================================================================== --- trunk/fingerprint-reader/agent-thinkfinger/testsuite/Makefile.am (original) +++ trunk/fingerprint-reader/agent-thinkfinger/testsuite/Makefile.am Wed Aug 1 13:52:21 2007 @@ -6,5 +6,3 @@ clean-local: rm -f tmp.err.* tmp.out.* site.exp site.bak - -EXTRA_DIST = README -- 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] r39866 - in /trunk/squid/src: Makefile.am Squid.ycp SquidACL.ycp SquidACL_local_functions.ycp complex.ycp dialogs.ycp popup_dialogs.ycp
by dfiser＠svn.opensuse.org 01 Aug '07

01 Aug '07

Author: dfiser Date: Wed Aug 1 13:06:25 2007 New Revision: 39866 URL: http://svn.opensuse.org/viewcvs/yast?rev=39866&view=rev Log: Squid: rewrited Add/Modify functions. SquidACL: added few ACLs, added function SupportedACLs dialogs.ycp: splitted into dialogs.ycp and popup_dialogs.ycp complex.ycp: in table ACL Groups will be displayed only ACLs which are supported Added: trunk/squid/src/popup_dialogs.ycp Modified: trunk/squid/src/Makefile.am trunk/squid/src/Squid.ycp trunk/squid/src/SquidACL.ycp trunk/squid/src/SquidACL_local_functions.ycp trunk/squid/src/complex.ycp trunk/squid/src/dialogs.ycp Modified: trunk/squid/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/Makefile.am?rev=39866&… ============================================================================== --- trunk/squid/src/Makefile.am (original) +++ trunk/squid/src/Makefile.am Wed Aug 1 13:06:25 2007 @@ -11,6 +11,7 @@ helps.ycp \ wizards.ycp \ dialogs.ycp \ + popup_dialogs.ycp \ complex.ycp \ SquidACL_local_functions.ycp Modified: trunk/squid/src/Squid.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/Squid.ycp?rev=39866&r1… ============================================================================== --- trunk/squid/src/Squid.ycp (original) +++ trunk/squid/src/Squid.ycp Wed Aug 1 13:06:25 2007 @@ -62,7 +62,7 @@ /** * List of http_ports. Format: * [ $["host" : "hostname", - * "port" : 3128, + * "port" : "3128", * "transparent" : true], * ... * ] @@ -92,9 +92,9 @@ * List of refresh patterns. Format: * [ $["regexp" : "^ftp:", * "case_sensitive" : true, - * "min" : 12, - * "max" : 12, - * "percent" : 12], + * "min" : "12", + * "max" : "12", + * "percent" : "12"], * ... * ] */ @@ -176,13 +176,17 @@ { return acls[id_item]:$[]; } -global void AddACL(map<string, any> data) +global void AddACL(string name, string type, list<string> options) { - acls = add(acls, data); + acls = add(acls, $[ "name" : name, + "type" : type, + "options" : options]); } -global void ModifyACL(integer id_item, map<string,any> value) +global void ModifyACL(integer id_item, string name, string type, list<string> options) { - acls[id_item] = value; + acls[id_item] = $[ "name" : name, + "type" : type, + "options" : options]; } global void DelACL(integer id_item) { @@ -199,13 +203,15 @@ { return http_accesses[id_item]:$[]; } -global void AddHttpAccess(map<string, any> value) +global void AddHttpAccess(boolean allow, list<string> acl) { - http_accesses = add(http_accesses, value); + http_accesses = add(http_accesses, $["allow" : allow, + "acl" : acl]); } -global void ModifyHttpAccess(integer id_item, map<string, any> value) +global void ModifyHttpAccess(integer id_item, boolean allow, list<string> acl) { - http_accesses[id_item] = value; + http_accesses[id_item] = $["allow" : allow, + "acl" : acl]; } global void DelHttpAccess(integer id_item) { @@ -243,13 +249,21 @@ { return refresh_patterns[id_item]:$[]; } -global void AddRefreshPattern(map<string,any> data) +global void AddRefreshPattern(string regexp, string min, string percent, string max, boolean case_sensitive) { - refresh_patterns = add(refresh_patterns, data); -} -global void ModifyRefreshPattern(integer id_item, map<string,any> data) -{ - refresh_patterns[id_item] = data; + refresh_patterns = add(refresh_patterns, $[ "regexp" : regexp, + "min" : min, + "percent" : percent, + "max" : max, + "case_sensitive" : case_sensitive]); +} +global void ModifyRefreshPattern(integer id_item, string regexp, string min, string percent, string max, boolean case_sensitive) +{ + refresh_patterns[id_item] = $[ "regexp" : regexp, + "min" : min, + "percent" : percent, + "max" : max, + "case_sensitive" : case_sensitive]; } global void DelRefreshPattern(integer id_item) { @@ -272,13 +286,17 @@ { return http_ports[id_item]:$[]; } -global void AddHttpPort(map<string,any> data) +global void AddHttpPort(string host, string port, boolean transparent) { - http_ports = add(http_ports, data); + http_ports = add(http_ports, $["host" : host, + "port" : port, + "transparent" : transparent]); } -global void ModifyHttpPort(integer id_item, map<string,any> data) +global void ModifyHttpPort(integer id_item, string host, string port, boolean transparent) { - http_ports[id_item] = data; + http_ports[id_item] = $["host" : host, + "port" : port, + "transparent" : transparent]; } global void DelHttpPort(integer id_item) { @@ -423,7 +441,7 @@ return ok; } -/** TODO: Regular expressions! +/** * Read setting of parameter acl. * acl aclname acltype string1 string2 ... * @@ -460,6 +478,7 @@ tmp_acl["type"] = tmp[1]:""; tmp_acl["options"] = remove(remove(tmp,0),0); + // Special settings: // concat list of regular expressions into one option if (contains(regexps, tmp_acl["type"]:"")){ if ((tmp_acl["options"]:[])[0]:"" == "-i"){ @@ -467,6 +486,17 @@ }else{ tmp_acl["options"] = [mergestring(tmp_acl["options"]:[], " ")]; } + }else + //format: acl aclname header_name [-i] list of regexps + if(tmp_acl["type"]:"" == "req_header" || tmp_acl["type"]:"" == "rep_header"){ + if ((tmp_acl["options"]:[])[1]:"" == "-i"){ + tmp_acl["options"] = [(tmp_acl["options"]:[])[0]:"", + "-i", + mergestring((list<string>)remove(remove(tmp_acl["options"]:[], 0), 0), " ")]; + }else{ + tmp_acl["options"] = [(tmp_acl["options"]:[])[0]:"", + mergestring((list<string>)remove(tmp_acl["options"]:[], 0), " ")]; + } } acls = add(acls, tmp_acl); Modified: trunk/squid/src/SquidACL.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/SquidACL.ycp?rev=39866… ============================================================================== --- trunk/squid/src/SquidACL.ycp (original) +++ trunk/squid/src/SquidACL.ycp Wed Aug 1 13:06:25 2007 @@ -34,6 +34,30 @@ include "squid/SquidACL_local_functions.ycp"; +list<string> getKeys(map<string, any> m) +{ + list<string> ret = []; + foreach(string key, any value, m, + { + ret = add(ret, key); + }); + return ret; +} + +/*** + * Unsupported ACLS: + * * * * * * * * * * * * + * ident, ident_regex, + * src_as, dst_as, + * proxy_auth, proxy_auth_regex, + * snmp_community, + * max_user_ip, + * external, + * urllogin, urlgroup + * user_cert, ca_cert + * ext_user + */ + /** * map of acl definition. format: * $[ @@ -180,33 +204,65 @@ ), "widget_init" : maxconnWidgetInit, "verification" : maxconnVerif, - "options" : maxconnOptions ] + "options" : maxconnOptions ], + + "referer_regex" : regexp("referer_regex", "referer_regex"), + + "req_header" : $[ "name" : "req_header", + "widget" : `Frame( "req_header", + `VBox( + `TextEntry(`id("acl_header_name"), _("Header Name"), ""), + `TextEntry(`id("acl_regexp"), _("Regular Expression(s)"), ""), + `CheckBox(`id("acl_regexp_case_insensitive"), _("Case Insensitive"), false) + ) + ), + "widget_init" : headerWidgetInit, + "verification" : headerVerif, + "options" : headerOptions ], + + "rep_header" : $[ "name" : "rep_header", + "widget" : `Frame( "rep_header", + `VBox( + `TextEntry(`id("acl_header_name"), _("Header Name"), ""), + `TextEntry(`id("acl_regexp"), _("Regular Expression(s)"), ""), + `CheckBox(`id("acl_regexp_case_insensitive"), _("Case Insensitive"), false) + ) + ), + "widget_init" : headerWidgetInit, + "verification" : headerVerif, + "options" : headerOptions ], + + "req_mime_type" : regexp("req_mime_type", "req_mime_type"), + "rep_mime_type" : regexp("rep_mime_type", "rep_mime_type"), + + "arp" : $[ "name" : "arp", + "widget" : `Frame( "arp", + `TextEntry(`id("acl_mac"), _("MAC Address"), "") + ), + "widget_init" : arpWidgetInit, + "verification" : arpVerif, + "options" : arpOptions ] ]; /** - * Specify order of acls. + * List of available acls. + * Also specify order of acls. * Values must corespond with keys in acl_map. */ -list<string> acl_order = ["src", - "dst", - "myip", - "srcdomain", - "dstdomain", - "srcdom_regex", - "dstdom_regex", - "time", - "url_regex", - "urlpath_regex", - "port", - "myport", - "proto", - "method", - "browser", - "maxconn"]; +list<string> acl = sort(getKeys(acl_map)); /** + * Returns list of supported ACLs. + * It's necessary to have saved unsupported ACLs but do not handle with them. + */ +global list<string> SupportedACLs() +{ + return acl; +} + +/** * Returns list of terms in form: * [ `item(`id(key), acl_map[key]["name"]:""), `item(... ) ] * Returned list is preferably to place in UI::ComboBox as list of @@ -216,7 +272,7 @@ { list<term> items = []; - foreach(string value, acl_order, + foreach(string value, acl, { items = add(items, `item(`id(value), (acl_map[value]:$[])["name"]:"")); }); Modified: trunk/squid/src/SquidACL_local_functions.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/SquidACL_local_functio… ============================================================================== --- trunk/squid/src/SquidACL_local_functions.ycp (original) +++ trunk/squid/src/SquidACL_local_functions.ycp Wed Aug 1 13:06:25 2007 @@ -459,5 +459,79 @@ return [tostring(UI::QueryWidget(`id("acl_connections"), `Value))]; } /*************** MAXCONN END ********************/ + + +/*************** HEADER *************************/ +void headerWidgetInit(integer id_item) +{ + if (id_item != nil){ + map<string, any> acl = Squid::GetACL(id_item); + UI::ChangeWidget(`id("acl_header_name"), `Value, (acl["options"]:[])[0]:""); + if ((acl["options"]:[])[1]:"" == "-i"){ + UI::ChangeWidget(`id("acl_regexp"), `Value, (acl["options"]:[])[2]:""); + UI::ChangeWidget(`id("acl_regexp_case_insensitive"), `Value, true); + }else{ + UI::ChangeWidget(`id("acl_regexp"), `Value, (acl["options"]:[])[1]:""); + } + } +} +boolean headerVerif() +{ + boolean ok = true; + string header_name = (string)UI::QueryWidget(`id("acl_header_name"), `Value); + string regexp = (string)UI::QueryWidget(`id("acl_regexp"), `Value); + + if (size(header_name) == 0 && size(regexp) == 0){ + ok = false; + Report::Error( _("Header Name and Regular Expression must not be empty.")); + } + return ok; +} +list<string> headerOptions() +{ + string header_name = (string)UI::QueryWidget(`id("acl_header_name"), `Value); + string regexp = (string)UI::QueryWidget(`id("acl_regexp"), `Value); + boolean ci = (boolean)UI::QueryWidget(`id("acl_regexp_case_insensitive"), `Value); + list <string> ret = [header_name]; + + if (ci == true) + ret = add(ret, "-i"); + ret = add(ret, regexp); + + return ret; +} +/*************** HEADER END *********************/ + + +/*************** ARP ****************************/ +void arpWidgetInit(integer id_item) +{ + UI::ChangeWidget(`id("acl_mac"), `ValidChars, "1234567890ABCDEFabcdef:"); + + if (id_item != nil){ + map<string,any> acl = Squid::GetACL(id_item); + UI::ChangeWidget(`id("acl_mac"), `Value, (acl["options"]:[])[0]:""); + } +} +boolean arpVerif() +{ + boolean ok = true; + string mac = (string)UI::QueryWidget(`id("acl_mac"), `Value); + if (size(mac) == 0){ + ok = false; + Report::Error( _("MAC Address must not be empty.")); + }else if (!regexpmatch(mac, "^([0-9a-fA-F]{2}:){5}[0-9a-fA-F]{2}$")){ + ok = false; + Report::Error( _("Incorrect formar of MAC Address.")); + } + return ok; +} +list<string> arpOptions() +{ + return [(string)UI::QueryWidget(`id("acl_mac"), `Value)]; +} +/*************** ARP END ************************/ + + } /* vim: set sw=4 ts=4 et ft=ycp : */ Modified: trunk/squid/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/complex.ycp?rev=39866&… ============================================================================== --- trunk/squid/src/complex.ycp (original) +++ trunk/squid/src/complex.ycp Wed Aug 1 13:06:25 2007 @@ -216,12 +216,16 @@ { list items = []; integer i = 0; + list<string> sup_acls = SquidACL::SupportedACLs(); foreach(map<string,any> value, Squid::GetACLs(), { - items = add(items, `item(`id(i), value["name"]:"", value["type"]:"", - mergestring(value["options"]:[], " "))); - i = i+1; + // test, if know how to handle this ACL + if (contains(sup_acls, value["type"]:"")){ + items = add(items, `item(`id(i), value["name"]:"", value["type"]:"", + mergestring(value["options"]:[], " "))); + i = i+1; + } }); UI::ChangeWidget(`id("acl"), `Items, items); @@ -249,9 +253,13 @@ if (size(items) > 0){ UI::ChangeWidget(`id(`edit_http_access), `Enabled, true); UI::ChangeWidget(`id(`del_http_access), `Enabled, true); + UI::ChangeWidget(`id(`up_http_access), `Enabled, true); + UI::ChangeWidget(`id(`down_http_access), `Enabled, true); }else{ UI::ChangeWidget(`id(`edit_http_access), `Enabled, false); UI::ChangeWidget(`id(`del_http_access), `Enabled, false); + UI::ChangeWidget(`id(`up_http_access), `Enabled, false); + UI::ChangeWidget(`id(`down_http_access), `Enabled, false); } } @@ -308,18 +316,15 @@ boolean StoreDataFromAddEditHttpPortDialog(integer id_item) { boolean ok = true; - map <string, any> data = $[ - "host" : UI::QueryWidget(`id("host"), `Value), - "port" : UI::QueryWidget(`id("port"), `Value), - "transparent" : UI::QueryWidget(`id("transparent"), `Value) - ]; - y2debug("complex::StoreDataFromAddEditHttpPortDialog() - data: %1",data); + string host = (string)UI::QueryWidget(`id("host"), `Value); + string port = (string)UI::QueryWidget(`id("port"), `Value); + boolean transparent = (boolean)UI::QueryWidget(`id("transparent"), `Value); - if (size(data["port"]:"") > 0){ + if (size(port) > 0){ if (id_item == nil){ - Squid::AddHttpPort(data); + Squid::AddHttpPort(host, port, transparent); }else{ - Squid::ModifyHttpPort(id_item, data); + Squid::ModifyHttpPort(id_item, host, port, transparent); } }else{ Report::Error(_("Port number must not be empty.")); @@ -341,20 +346,17 @@ boolean StoreDataFromAddEditRefreshPatternDialog(integer id_item) { boolean ok = true; - map <string,any> data = $[ - "regexp" : UI::QueryWidget(`id("regexp"), `Value), - "min" : tostring(UI::QueryWidget(`id("min"), `Value)), - "percent" : tostring(UI::QueryWidget(`id("percent"), `Value)), - "max" : tostring(UI::QueryWidget(`id("max"), `Value)), - "case_sensitive" : !(boolean)UI::QueryWidget(`id("regexp_case_insensitive"), `Value) - ]; - y2debug("complex::StoreDataFromAddEditRefreshPatternDialog() - data: %1", data); + string regexp = (string)UI::QueryWidget(`id("regexp"), `Value); + string min = tostring(UI::QueryWidget(`id("min"), `Value)); + string percent = tostring(UI::QueryWidget(`id("percent"), `Value)); + string max = tostring(UI::QueryWidget(`id("max"), `Value)); + boolean case_sensitive = !(boolean)UI::QueryWidget(`id("regexp_case_insensitive"), `Value); - if (size(data["regexp"]:"") > 0){ + if (size(regexp) > 0){ if (id_item == nil){ - Squid::AddRefreshPattern(data); + Squid::AddRefreshPattern(regexp, min, percent, max, case_sensitive); }else{ - Squid::ModifyRefreshPattern(id_item, data); + Squid::ModifyRefreshPattern(id_item, regexp, min, percent, max, case_sensitive); } }else{ Report::Error(_("Regular expression must not be empty.")); @@ -458,9 +460,9 @@ if (size(acls) > 0){ if (id_item == nil){ - Squid::AddHttpAccess($["allow" : allow, "acl" : acls]); + Squid::AddHttpAccess(allow, acls); }else{ - Squid::ModifyHttpAccess(id_item, $["allow" : allow, "acl" : acls]); + Squid::ModifyHttpAccess(id_item, allow, acls); } }else{ ok = false; @@ -502,23 +504,18 @@ boolean StoreDataFromAddEditACLDialog(integer id_item) { boolean ok = true; - map<string, any> data = $[]; - string type = (string)UI::QueryWidget(`id("type"), `Value); string name = (string)UI::QueryWidget(`id("name"), `Value); + list<string> options = []; boolean verification = SquidACL::Verify(type); if (verification && size(name) > 0){ - data["name"] = name; - data["type"] = type; - data["options"] = SquidACL::GetOptions(type); - - y2debug("complex::StoreDataFromAddEditACLDialog() - data: %1", data); + options = SquidACL::GetOptions(type); if (id_item == nil){ - Squid::AddACL(data); + Squid::AddACL(name, type, options); }else{ - Squid::ModifyACL(id_item, data); + Squid::ModifyACL(id_item, name, type, options); } }else if(verification){ // -> size(name) <= 0 ok = false; Modified: trunk/squid/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/dialogs.ycp?rev=39866&… ============================================================================== --- trunk/squid/src/dialogs.ycp (original) +++ trunk/squid/src/dialogs.ycp Wed Aug 1 13:06:25 2007 @@ -38,6 +38,7 @@ //import "Squid"; include "squid/helps.ycp"; +include "squid/popup_dialogs.ycp"; /** @@ -58,55 +59,6 @@ } -/** - * returns true if something added/edited otherwise false - */ -boolean AddEditHttpPortDialog(integer id_item) -{ - any ui = nil; - boolean ret = false; - string label = (id_item == nil ? _("Add New HTTP Port") - : _("Edit Current HTTP Port")); - term contents = - `VBox( - `Left(`Label(label)), - `TextEntry(`id("host"), _("Host"), ""), - `TextEntry(`id("port"), _("Port"), ""), - `Frame(_("Options"), - `VBox( - `CheckBox(`id("transparent"), "Transparent", false) - ) - ), - `VSpacing(), - `HBox( - `PushButton(`id(`cancel), Label::CancelButton()), - `PushButton(`id(`ok), Label::OKButton()) - ) - ); - - UI::OpenDialog(`opt(`decorated), contents); - UI::ChangeWidget(`id("port"), `ValidChars, "1234567890"); - - InitAddEditHttpPortDialog(id_item); - - while (true){ - ui = UI::UserInput(); - - if (ui == `abort || ui == `cancel){ - ret = false; - break; - }else if (ui == `ok){ - if (StoreDataFromAddEditHttpPortDialog(id_item)){ - ret = true; - break; - } - } - } - - UI::CloseDialog(); - return ret; -} - any HttpPortsDialog(){ @@ -163,62 +115,6 @@ } -boolean AddEditRefreshPatternDialog(integer id_item) -{ - boolean ret = false; - any ui = nil; - string label = (id_item == nil ? _("Add New Refresh Pattern") - : _("Edit Current refresh Pattern")); - term contents = - `VBox( - `Left(`Label(label)), - - `HBox( - `TextEntry(`id("regexp"), _("Regular Expression"), ""), - `CheckBox(`id("regexp_case_insensitive"), _("Case Insensitive")) - ), - `HBox( - `Bottom(`IntField(`id("min"), _("Min"), 0, 99999, 0)), - `Bottom(`Label(_("minutes"))) - ), - `HBox( - `Bottom(`IntField(`id("percent"), _("Percent"), 0, 99999, 0)), - `Bottom(`Label("%")) - ), - `HBox( - `Bottom(`IntField(`id("max"), _("Max"), 0, 99999, 0)), - `Bottom(`Label(_("minutes"))) - ), - - `VSpacing(), - - `HBox( - `PushButton(`id(`cancel), Label::CancelButton()), - `PushButton(`id(`ok), Label::OKButton()) - ) - ); - - UI::OpenDialog(`opt(`decorated), contents); - - InitAddEditRefreshPatternDialog(id_item); - - while (true){ - ui = UI::UserInput(); - - if (ui == `cancel || ui == `abort){ - ret = false; - break; - }else if (ui == `ok){ - if (StoreDataFromAddEditRefreshPatternDialog(id_item)){ - ret = true; - break; - } - } - } - - UI::CloseDialog(); - return ret; -} any CacheDialog(){ any ret = nil; @@ -288,52 +184,6 @@ return ret; } -boolean CacheDirAdvancedSettingDialog(){ - boolean ret = false; - any ui = nil; - term contents = - `VBox( - `Left(`Label( _("Cache Directory Advanced Setting"))), - - //`ComboBox(`id("type"), _("Type"), []), - `HBox( - `IntField(`id("mbytes"), _("Size"), 1, 99999, 10), - `Bottom(`Label(_("MB"))) - ), - `IntField(`id("l1dirs"), _("Level 1 Directories"), 1, 99999, 20), - `IntField(`id("l2dirs"), _("Level 2 Directories"), 1, 99999, 20), - - `VSpacing(), - - `HBox( - `PushButton(`id(`cancel), Label::CancelButton()), - `PushButton(`id(`ok), Label::OKButton()) - ) - ); - - UI::OpenDialog(contents); - - - InitCacheDirAdvancedSettingDialog(); - - while (true){ - ui = UI::UserInput(); - - if (ui == `cancel || ui == `abort){ - ret = false; - break; - }else if (ui == `ok){ - if (StoreDataFromCacheDirAdvancedSettingDialog()){ - ret = true; - break; - } - } - } - - - UI::CloseDialog(); - return ret; -} any Cache2Dialog(){ any ret = nil; @@ -410,162 +260,6 @@ -void addItemToAddEditHttpAccessDialog(boolean not, string item) -{ - list items = []; - - integer i = 0; - foreach (term value, (list<term>)UI::QueryWidget(`id("acls"), `Items), - { - items = add(items, `item(`id(i), value[1]:"", value[2]:"")); - i = i+1; - }); - items = add(items, `item(`id(i), (not == true ? "not" : ""), item)); - UI::ChangeWidget(`id("acls"), `Items, items); -} -integer delItemFromAddEditHttpAccessDialog(integer id_item) -{ - list items = []; - - integer i = 0; - foreach (term value, (list<term>)UI::QueryWidget(`id("acls"), `Items), - { - if (value[0]:nil != `id(id_item)){ - items = add(items, `item(`id(i), value[1]:"", value[2]:"")); - i = i+1; - } - }); - UI::ChangeWidget(`id("acls"), `Items, items); - if (id_item >= size(items)){ - id_item = id_item - 1; - } - return id_item; -} -boolean AddEditHttpAccessDialog(integer id_item) -{ - boolean ret = false; - any ui = nil; - string acl = ""; - boolean not = false; - any tmp = nil; - integer id_acl = 0; - term contents = - `VBox( - `ComboBox(`id("allow_deny"), _("Allow/Deny"), - [`item(`id("allow"), "allow"), `item(`id("deny"), "deny")]), - - //`VSpacing(), - - `MinSize(25, 7, - `Table(`id("acls"), `header(" ", _("ACL")), []) - ), - `Left(`PushButton(`id(`del), Label::DeleteButton())), - - //`VSpacing(), - - `Frame( _("Add ACL"), - `HBox( - `CheckBox(`id("acl_not"), _("not")), - `ComboBox(`id("acl"), "ACL", []), - `PushButton(`id(`add), Label::AddButton()) - ) - ), - - `HBox( - `PushButton(`id(`cancel), Label::CancelButton()), - `PushButton(`id(`ok), Label::OKButton()) - ) - ); - - UI::OpenDialog(contents); - - InitAddEditHttpAccessDialog(id_item); - - while (true){ - ui = UI::UserInput(); - - if (ui == `cancel || ui == `abort){ - ret = false; - break; - }else if (ui == `ok){ - if (StoreDataFromAddEditHttpAccessDialog(id_item)){ - ret = true; - break; - } - }else if (ui == `add){ - acl = (string)UI::QueryWidget(`id("acl"), `Value); - not = (boolean)UI::QueryWidget(`id("acl_not"), `Value); - if (size(acl) > 0){ - addItemToAddEditHttpAccessDialog(not, acl); - InitAddEditHttpAccessDialog(nil); - } - }else if (ui == `del){ - id_acl = delItemFromAddEditHttpAccessDialog((integer)UI::QueryWidget(`id("acls"), `CurrentItem)); - InitAddEditHttpAccessDialog(nil); - UI::ChangeWidget(`id("acls"), `CurrentItem, id_acl); - } - } - - - UI::CloseDialog(); - - return ret; -} - - -boolean AddEditACLDialog(integer id_item) -{ - boolean ret = false; - any ui = nil; - string orig_type = ""; - string type = ""; - term contents = - `VBox( - `TextEntry(`id("name"), _("Name"), ""), - `ComboBox(`id("type"), `opt(`notify), _("Type"), SquidACL::GetTypesToComboBox()), - `ReplacePoint(`id(`replace_point), `Empty()), - - `HBox( - `PushButton(`id(`cancel), Label::CancelButton()), - `PushButton(`id(`ok), Label::OKButton()) - ) - ); - - UI::OpenDialog(contents); - - InitAddEditACLDialog(id_item); - - orig_type = (string)UI::QueryWidget(`id("type"), `Value); - SquidACL::Replace(`replace_point, orig_type); - SquidACL::InitWidget(orig_type, id_item); - - while (true){ - ui = UI::UserInput(); - - if (ui == `cancel || ui == `abort){ - ret = false; - break; - }else if (ui == `ok){ - if (StoreDataFromAddEditACLDialog(id_item)){ - ret = true; - break; - } - }else if (ui == "type"){ - type = (string)UI::QueryWidget(`id("type"), `Value); - SquidACL::Replace(`replace_point, type); - if (type == orig_type){ - SquidACL::InitWidget(type, id_item); - }else{ - SquidACL::InitWidget(type, nil); - } - } - } - - - UI::CloseDialog(); - - return ret; -} any AccessControlDialog(){ any ret = nil; integer id_item = nil; Added: trunk/squid/src/popup_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/popup_dialogs.ycp?rev=… ============================================================================== --- trunk/squid/src/popup_dialogs.ycp (added) +++ trunk/squid/src/popup_dialogs.ycp Wed Aug 1 13:06:25 2007 @@ -0,0 +1,368 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2006 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + +/** + * File: include/squid/popup_dialogs.ycp + * Package: Configuration of squid + * Summary: Popup dialogs definitions + * Authors: Daniel Fiser <dfiser(a)suse.cz> + * + * $Id$ + */ + +{ + +textdomain "squid"; + +/***************** HTTP PORT ********************/ +/** + * returns true if something added/edited otherwise false + */ +boolean AddEditHttpPortDialog(integer id_item) +{ + any ui = nil; + boolean ret = false; + string label = (id_item == nil ? _("Add New HTTP Port") + : _("Edit Current HTTP Port")); + term contents = + `VBox( + `Label(label), + `VSpacing(0.5), + `TextEntry(`id("host"), _("Host"), ""), + `TextEntry(`id("port"), _("Port"), ""), + `Frame(_("Options"), + `VBox( + `CheckBox(`id("transparent"), "Transparent", false) + ) + ), + `VSpacing(), + `VStretch(), + `HBox( + `PushButton(`id(`cancel), Label::CancelButton()), + `PushButton(`id(`ok), Label::OKButton()) + ) + ); + + UI::OpenDialog(`opt(`decorated), contents); + UI::ChangeWidget(`id("port"), `ValidChars, "1234567890"); + + InitAddEditHttpPortDialog(id_item); + + while (true){ + ui = UI::UserInput(); + + if (ui == `abort || ui == `cancel){ + ret = false; + break; + }else if (ui == `ok){ + if (StoreDataFromAddEditHttpPortDialog(id_item)){ + ret = true; + break; + } + } + } + + UI::CloseDialog(); + return ret; +} +/***************** HTTP PORT END ****************/ + + +/***************** CACHE ************************/ +boolean AddEditRefreshPatternDialog(integer id_item) +{ + boolean ret = false; + any ui = nil; + string label = (id_item == nil ? _("Add New Refresh Pattern") + : _("Edit Current refresh Pattern")); + term contents = + `VBox( + `Label(label), + `VSpacing(0.5), + + `VSquash(`HBox( + `TextEntry(`id("regexp"), _("Regular Expression"), ""), + `Bottom(`CheckBox(`id("regexp_case_insensitive"), _("Case Insensitive"))) + )), + `IntField(`id("min"), _("Min (in minutes)"), 0, 99999, 0), + `IntField(`id("percent"), _("Percent"), 0, 99999, 0), + `IntField(`id("max"), _("Max (in minutes)"), 0, 99999, 0), + + `VSpacing(), + `VStretch(), + + `HBox( + `PushButton(`id(`cancel), Label::CancelButton()), + `PushButton(`id(`ok), Label::OKButton()) + ) + ); + + UI::OpenDialog(`opt(`decorated), contents); + + InitAddEditRefreshPatternDialog(id_item); + + while (true){ + ui = UI::UserInput(); + + if (ui == `cancel || ui == `abort){ + ret = false; + break; + }else if (ui == `ok){ + if (StoreDataFromAddEditRefreshPatternDialog(id_item)){ + ret = true; + break; + } + } + } + + UI::CloseDialog(); + return ret; +} + + +boolean CacheDirAdvancedSettingDialog(){ + boolean ret = false; + any ui = nil; + term contents = + `VBox( + `Label( _("Cache Directory Advanced Setting")), + `VSpacing(0.5), + + //`ComboBox(`id("type"), _("Type"), []), + `IntField(`id("mbytes"), _("Size (in MB)"), 1, 99999, 10), + `IntField(`id("l1dirs"), _("Level 1 Directories"), 1, 99999, 20), + `IntField(`id("l2dirs"), _("Level 2 Directories"), 1, 99999, 20), + + `VSpacing(), + + `HBox( + `PushButton(`id(`cancel), Label::CancelButton()), + `PushButton(`id(`ok), Label::OKButton()) + ) + ); + + UI::OpenDialog(contents); + + + InitCacheDirAdvancedSettingDialog(); + + while (true){ + ui = UI::UserInput(); + + if (ui == `cancel || ui == `abort){ + ret = false; + break; + }else if (ui == `ok){ + if (StoreDataFromCacheDirAdvancedSettingDialog()){ + ret = true; + break; + } + } + } + + + UI::CloseDialog(); + return ret; +} +/***************** CACHE END ********************/ + + +/***************** ACCESS CONTROL ***************/ +void addItemToAddEditHttpAccessDialog(boolean not, string item) +{ + list items = []; + + integer i = 0; + foreach (term value, (list<term>)UI::QueryWidget(`id("acls"), `Items), + { + items = add(items, `item(`id(i), value[1]:"", value[2]:"")); + i = i+1; + }); + items = add(items, `item(`id(i), (not == true ? "not" : ""), item)); + UI::ChangeWidget(`id("acls"), `Items, items); +} +integer delItemFromAddEditHttpAccessDialog(integer id_item) +{ + list items = []; + + integer i = 0; + foreach (term value, (list<term>)UI::QueryWidget(`id("acls"), `Items), + { + if (value[0]:nil != `id(id_item)){ + items = add(items, `item(`id(i), value[1]:"", value[2]:"")); + i = i+1; + } + }); + UI::ChangeWidget(`id("acls"), `Items, items); + if (id_item >= size(items)){ + id_item = id_item - 1; + } + return id_item; +} + + +boolean AddEditHttpAccessDialog(integer id_item) +{ + boolean ret = false; + any ui = nil; + string acl = ""; + boolean not = false; + any tmp = nil; + integer id_acl = 0; + string label = (id_item == nil ? _("Add New HTTP Access") + : _("Edit HTTP Access")); + term contents = + `VBox( + `Label(label), + `VSpacing(0.5), + + `Left(`ComboBox(`id("allow_deny"), _("Allow/Deny"), + [`item(`id("allow"), "allow"), `item(`id("deny"), "deny")])), + + //`VSpacing(), + + `MinSize(25, 7, + `Table(`id("acls"), `header(" ", _("ACL")), []) + ), + `Left(`PushButton(`id(`del), Label::DeleteButton())), + + //`VSpacing(), + + `Frame( _("Add ACL"), + `VSquash(`HBox( + `Bottom(`CheckBox(`id("acl_not"), _("not"))), + `ComboBox(`id("acl"), "ACL", []), + `Bottom(`PushButton(`id(`add), Label::AddButton())) + )) + ), + + `VStretch(), + + `HBox( + `PushButton(`id(`cancel), Label::CancelButton()), + `PushButton(`id(`ok), Label::OKButton()) + ) + ); + + UI::OpenDialog(contents); + + InitAddEditHttpAccessDialog(id_item); + + while (true){ + ui = UI::UserInput(); + + if (ui == `cancel || ui == `abort){ + ret = false; + break; + }else if (ui == `ok){ + if (StoreDataFromAddEditHttpAccessDialog(id_item)){ + ret = true; + break; + } + }else if (ui == `add){ + acl = (string)UI::QueryWidget(`id("acl"), `Value); + not = (boolean)UI::QueryWidget(`id("acl_not"), `Value); + if (size(acl) > 0){ + addItemToAddEditHttpAccessDialog(not, acl); + InitAddEditHttpAccessDialog(nil); + } + }else if (ui == `del){ + id_acl = delItemFromAddEditHttpAccessDialog((integer)UI::QueryWidget(`id("acls"), `CurrentItem)); + InitAddEditHttpAccessDialog(nil); + UI::ChangeWidget(`id("acls"), `CurrentItem, id_acl); + } + } + + + UI::CloseDialog(); + + return ret; +} + + +boolean AddEditACLDialog(integer id_item) +{ + boolean ret = false; + any ui = nil; + string orig_type = ""; + string type = ""; + string label = (id_item == nil ? _("Add New ACL Group") + : _("Edit ACL Group")); + term contents = + `HBox( + `HWeight(50, `RichText(`id("help_text"), "Bla bla bla bla bla bla bla bla bla bla bla bla bla bla etc.")), + `HWeight(70, `VBox( + `Label(label), + `VSpacing(0.5), + + `TextEntry(`id("name"), _("Name"), ""), + `Left(`ComboBox(`id("type"), `opt(`notify), _("Type"), SquidACL::GetTypesToComboBox())), + `ReplacePoint(`id(`replace_point), `Empty()), + + `VStretch(), + + `HBox( + `PushButton(`id(`cancel), Label::CancelButton()), + `PushButton(`id(`ok), Label::OKButton()) + ) + )) + ); + + UI::OpenDialog(contents); + + InitAddEditACLDialog(id_item); + + orig_type = (string)UI::QueryWidget(`id("type"), `Value); + SquidACL::Replace(`replace_point, orig_type); + SquidACL::InitWidget(orig_type, id_item); + + while (true){ + ui = UI::UserInput(); + + if (ui == `cancel || ui == `abort){ + ret = false; + break; + }else if (ui == `ok){ + if (StoreDataFromAddEditACLDialog(id_item)){ + ret = true; + break; + } + }else if (ui == "type"){ + type = (string)UI::QueryWidget(`id("type"), `Value); + SquidACL::Replace(`replace_point, type); + if (type == orig_type){ + SquidACL::InitWidget(type, id_item); + }else{ + SquidACL::InitWidget(type, nil); + } + } + } + + + UI::CloseDialog(); + + return ret; +} +/***************** ACCESS CONTROL END ***********/ + + + +} +/* vim: set sw=4 ts=4 et ft=ycp : */ -- 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] r39865 - /branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPkgPopupTree.cc
by gs＠svn.opensuse.org 01 Aug '07

01 Aug '07

Author: gs Date: Wed Aug 1 12:09:49 2007 New Revision: 39865 URL: http://svn.opensuse.org/viewcvs/yast?rev=39865&view=rev Log: check pointer Modified: branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPkgPopupTree.cc Modified: branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPkgPopupTree.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/pkg… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPkgPopupTree.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPkgPopupTree.cc Wed Aug 1 12:09:49 2007 @@ -263,5 +263,10 @@ YStringTreeItem * NCPkgPopupTree::getDefaultGroup( ) { - return packager->rpmGroupsTree()->root()->firstChild(); + if ( packager && + packager->rpmGroupsTree() && + packager->rpmGroupsTree()->root() ) + return packager->rpmGroupsTree()->root()->firstChild(); + else + return 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] r39864 - /branches/tmp/sh/mod-ui/ncurses/src/NCPopupTable.cc
by gs＠svn.opensuse.org 01 Aug '07

01 Aug '07

Author: gs Date: Wed Aug 1 12:08:44 2007 New Revision: 39864 URL: http://svn.opensuse.org/viewcvs/yast?rev=39864&view=rev Log: don't call addChild() Modified: branches/tmp/sh/mod-ui/ncurses/src/NCPopupTable.cc Modified: branches/tmp/sh/mod-ui/ncurses/src/NCPopupTable.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCP… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCPopupTable.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCPopupTable.cc Wed Aug 1 12:08:44 2007 @@ -86,7 +86,7 @@ { if ( !sellist ) return; - NCMIL << "Calling NCPopupTable::addItem" << endl; + sellist->addItem( id, row ); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0