November 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r42006 - in /trunk/installation: package/yast2-installation.changes src/clients/copy_files_finish.ycp
by locilka＠svn.opensuse.org 13 Nov '07

13 Nov '07

Author: locilka Date: Tue Nov 13 13:57:02 2007 New Revision: 42006 URL: http://svn.opensuse.org/viewcvs/yast?rev=42006&view=rev Log: - Script copy_files_finish.ycp cleaned up. Modified: trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/copy_files_finish.ycp Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Tue Nov 13 13:57:02 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Nov 13 13:54:13 CET 2007 - locilka(a)suse.cz + +- Script copy_files_finish.ycp cleaned up. + +------------------------------------------------------------------- Fri Nov 9 13:30:34 CET 2007 - locilka(a)suse.cz - Boot Installed System option has been removed (#327505). Modified: trunk/installation/src/clients/copy_files_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/copy_fi… ============================================================================== --- trunk/installation/src/clients/copy_files_finish.ycp (original) +++ trunk/installation/src/clients/copy_files_finish.ycp Tue Nov 13 13:57:02 2007 @@ -60,14 +60,23 @@ AdjustModprobeBlacklist(); // copy hardware status to installed system - SCR::Execute (.target.bash,"/bin/cp -a '/var/lib/hardware' " + - "'" + String::Quote (Installation::destdir) + "/var/lib'"); + y2milestone ("Copying hardware information"); + WFM::Execute (.local.bash, + sformat ( + "mkdir -p '%1/var/lib/'; /bin/cp -a '/var/lib/hardware' '%1/var/lib/'", + String::Quote (Installation::destdir) + ) + ); // if VNC, copy setup data - if (Linuxrc::vnc ()) - { - WFM::Execute (.local.bash, "/bin/cp -a '/root/.vnc' " + - "'" + String::Quote (Installation::destdir) + "/root'"); + if (Linuxrc::vnc ()) { + y2milestone ("Copying VNC settings"); + WFM::Execute (.local.bash, + sformat ( + "/bin/cp -a '/root/.vnc' '%1/root/'", + String::Quote (Installation::destdir) + ) + ); } @@ -77,15 +86,19 @@ Linuxrc::SaveInstallInf (Installation::destdir); // Copy control.xml so it can be read once again during continue mode - SCR::Execute (.target.bash, "/bin/cp " + ProductControl::current_control_file + " " + - "'" + String::Quote (Installation::destdir) + Directory::etcdir + "/control.xml'"); - SCR::Execute (.target.bash, "/bin/chmod 0644 " + - "'" + String::Quote (Installation::destdir) + Directory::etcdir + "/control.xml'"); - // Copy also control files of add-on products - string cf_dir = (string)SCR::Read (.target.tmpdir) + "/control_files"; + y2milestone ("Copying YaST control file"); + WFM::Execute (.local.bash, + sformat ( + "/bin/cp '%1' '%2%3/control.xml' && /bin/chmod 0644 '%2%3/control.xml'", + String::Quote (ProductControl::current_control_file), + String::Quote (Installation::destdir), + String::Quote (Directory::etcdir) + ) + ); // List of files used as additional workflow definitions if (size (WorkflowManager::GetAllUsedControlFiles()) > 0) { + y2milestone ("Coping additional control files %1", WorkflowManager::GetAllUsedControlFiles()); list <string> workflows_list = []; foreach (string one_filename, WorkflowManager::GetAllUsedControlFiles(), { -- 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] r42005 - in /trunk/core/liby2util-r/testsuite: ./ liby2util.test/ test.data/
by mvidner＠svn.opensuse.org 13 Nov '07

13 Nov '07

Author: mvidner Date: Tue Nov 13 13:16:23 2007 New Revision: 42005 URL: http://svn.opensuse.org/viewcvs/yast?rev=42005&view=rev Log: Copied relevant test cases. Added: trunk/core/liby2util-r/testsuite/ - copied from r42002, trunk/liby2util/testsuite/ Removed: trunk/core/liby2util-r/testsuite/liby2util.test/parseurl.exp trunk/core/liby2util-r/testsuite/parser.cc trunk/core/liby2util-r/testsuite/parseurl.cc trunk/core/liby2util-r/testsuite/runy2util.cc trunk/core/liby2util-r/testsuite/test.data/ trunk/core/liby2util-r/testsuite/test_CallBack.cc trunk/core/liby2util-r/testsuite/test_ISOLanguage.cc trunk/core/liby2util-r/testsuite/test_df.cc trunk/core/liby2util-r/testsuite/test_gpgcheck.cc trunk/core/liby2util-r/testsuite/test_oldsel.cc trunk/core/liby2util-r/testsuite/test_sysconfig.cc trunk/core/liby2util-r/testsuite/test_taggedparser.cc trunk/core/liby2util-r/testsuite/test_timer.cc trunk/core/liby2util-r/testsuite/test_url.cc trunk/core/liby2util-r/testsuite/test_url.sh trunk/core/liby2util-r/testsuite/urltests trunk/core/liby2util-r/testsuite/validate_packages.cc trunk/core/liby2util-r/testsuite/validate_packages_lang.cc trunk/core/liby2util-r/testsuite/validate_selection.cc trunk/core/liby2util-r/testsuite/validate_tagged.cc Modified: trunk/core/liby2util-r/testsuite/Makefile.am trunk/core/liby2util-r/testsuite/liby2util.test/Makefile.am Modified: trunk/core/liby2util-r/testsuite/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/liby2util-r/testsuite/Makef… ============================================================================== --- trunk/core/liby2util-r/testsuite/Makefile.am (original) +++ trunk/core/liby2util-r/testsuite/Makefile.am Tue Nov 13 13:16:23 2007 @@ -5,70 +5,30 @@ PACKAGE = liby2util AUTOMAKE_OPTIONS = dejagnu -INCLUDES= -I$(top_srcdir)/src/include +INCLUDES= -I$(srcdir)/../src/include AM_CPPFLAGS = -DY2LOG=\"liby2util-testsuite\" AM_LDFLAGS = \ -Xlinker --whole-archive \ - $(top_builddir)/src/liby2util.la \ + $(builddir)/../src/liby2util.la \ -Xlinker --no-whole-archive -check_PROGRAMS = parseurl - -parseurl_SOURCES = parseurl.cc - -noinst_PROGRAMS = parser.prg \ - test_taggedparser.prg \ +noinst_PROGRAMS = \ test_Y2SLog.prg \ - test_ISOLanguage.prg \ - test_CallBack.prg \ test_strutil.prg \ test_mkdir.prg \ - test_chroot.prg \ - test_url.prg \ - test_gpgcheck.prg \ - test_df.prg \ - test_oldsel \ - test_timer \ - test_sysconfig \ - validate_tagged \ - validate_packages \ - validate_packages_lang \ - validate_selection - -test_oldsel_SOURCES = test_oldsel.cc - -validate_tagged_SOURCES = validate_tagged.cc -validate_packages_SOURCES = validate_packages.cc -validate_packages_lang_SOURCES = validate_packages_lang.cc -validate_selection_SOURCES = validate_selection.cc - -parser_prg_SOURCES = parser.cc -test_taggedparser_prg_SOURCES = test_taggedparser.cc + test_chroot.prg test_Y2SLog_prg_SOURCES = test_Y2SLog.cc -test_ISOLanguage_prg_SOURCES = test_ISOLanguage.cc - -test_CallBack_prg_SOURCES = test_CallBack.cc - test_strutil_prg_SOURCES = test_strutil.cc test_mkdir_prg_SOURCES = test_mkdir.cc -test_url_prg_SOURCES = test_url.cc -test_df_prg_SOURCES = test_df.cc - test_chroot_prg_SOURCES = test_chroot.cc test_chroot_prg_LDFLAGS = $(AM_LDFLAGS) -static -test_gpgcheck_prg_SOURCES = test_gpgcheck.cc - -test_sysconfig_SOURCES = test_sysconfig.cc - -test_timer_SOURCES = test_timer.cc - clean-local: rm -f tmp.err.* tmp.out.* y2util.log y2util.sum site.exp site.bak Modified: trunk/core/liby2util-r/testsuite/liby2util.test/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/core/liby2util-r/testsuite/liby2… ============================================================================== --- trunk/core/liby2util-r/testsuite/liby2util.test/Makefile.am (original) +++ trunk/core/liby2util-r/testsuite/liby2util.test/Makefile.am Tue Nov 13 13:16:23 2007 @@ -1 +1 @@ -EXTRA_DIST = liby2util.exp parseurl.exp +EXTRA_DIST = liby2util.exp -- 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] r42004 - in /branches/tmp/sh/mod-ui/ncurses/src: NCMultiLineEdit.cc NCMultiLineEdit.h README_mod-ui
by gs＠svn.opensuse.org 13 Nov '07

13 Nov '07

Author: gs Date: Tue Nov 13 13:15:18 2007 New Revision: 42004 URL: http://svn.opensuse.org/viewcvs/yast?rev=42004&view=rev Log: correct preferredHeight() Modified: branches/tmp/sh/mod-ui/ncurses/src/NCMultiLineEdit.cc branches/tmp/sh/mod-ui/ncurses/src/NCMultiLineEdit.h branches/tmp/sh/mod-ui/ncurses/src/README_mod-ui Modified: branches/tmp/sh/mod-ui/ncurses/src/NCMultiLineEdit.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCM… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCMultiLineEdit.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCMultiLineEdit.cc Tue Nov 13 13:15:18 2007 @@ -54,29 +54,39 @@ /////////////////////////////////////////////////////////////////// // // -// METHOD NAME : NCMultiLineEdit::nicesize -// METHOD TYPE : long +// METHOD NAME : NCMultiLineEdit::preferredWidth +// METHOD TYPE : int // // DESCRIPTION : // -long NCMultiLineEdit::nicesize( YUIDimension dim ) -{ - defsze.W = ( 5 > labelWidht() ? 5 : labelWidht() ) + 2; - return dim == YD_HORIZ ? wGetDefsze().W : wGetDefsze().H; -} - int NCMultiLineEdit::preferredWidth() { defsze.W = ( 5 > labelWidht() ? 5 : labelWidht() ) + 2; return wGetDefsze().W; } +/////////////////////////////////////////////////////////////////// +// +// +// METHOD NAME : NCMultiLineEdit::preferredHeight +// METHOD TYPE : int +// +// DESCRIPTION : +// int NCMultiLineEdit::preferredHeight() { - //return wGetDefsze().H; - return YMultiLineEdit::defaultVisibleLines(); + return wGetDefsze().H; + //return YMultiLineEdit::defaultVisibleLines(); } +/////////////////////////////////////////////////////////////////// +// +// +// METHOD NAME : NCMultiLineEdit::setEnabled +// METHOD TYPE : void +// +// DESCRIPTION : +// void NCMultiLineEdit::setEnabled( bool do_bv ) { NCWidget::setEnabled( do_bv ); Modified: branches/tmp/sh/mod-ui/ncurses/src/NCMultiLineEdit.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCM… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCMultiLineEdit.h (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCMultiLineEdit.h Tue Nov 13 13:15:18 2007 @@ -67,8 +67,6 @@ virtual ~NCMultiLineEdit(); - virtual long nicesize( YUIDimension dim ); - virtual int preferredWidth(); virtual int preferredHeight(); /** @@ -85,8 +83,7 @@ virtual NCursesEvent wHandleInput( wint_t key ); - //virtual void setEnabling( bool do_bv ) { NCWidget::setEnabling( enabled=do_bv ); } - virtual void setEnabled( bool do_bv ); + virtual void setEnabled( bool do_bv ); virtual bool setKeyboardFocus() { if ( !grabFocus() ) 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/REA… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/README_mod-ui (original) +++ branches/tmp/sh/mod-ui/ncurses/src/README_mod-ui Tue Nov 13 13:15:18 2007 @@ -10,6 +10,11 @@ ---------------------------------------------------------- +TO DO - Common issues: +---------------------- +- Use WidgetFactory create methods, e.g. in NCAskForDirectory/File, NCPkgPopups +- call YUI_CHECK_NEW(() for all with 'new' created widgets, e.g. NCPopuptextEntry + NCTree ------ @@ -113,13 +118,6 @@ setHeader(): call YTable::setTableHeader ??? NCPopupMenu -Common issues: -- Use WidgetFactory create methods, e.g. in NCAskForDirectory/File -- remove NCSpacing 0.x which are without effect for ncurses (NCAskFor.., - NCPkgPopup..) -- call YUI_CHECK_NEW(() for all with 'new' created widgets, e.g. NCPopuptextEntry - - NCMenuButton/NCPopupMenu ------------------------ @@ -131,7 +129,7 @@ NCRichText ---------- -TODO: hyper links doesn't yet work +TODO: hyper links don't yet work PackageSelector -- 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] r42003 - in /branches/tmp/sh/mod-ui/ncurses/src: NCAlignment.cc NCInputField.cc NCIntField.cc NCPushButton.cc NCPushButton.h
by gs＠svn.opensuse.org 13 Nov '07

13 Nov '07

Author: gs Date: Tue Nov 13 12:58:47 2007 New Revision: 42003 URL: http://svn.opensuse.org/viewcvs/yast?rev=42003&view=rev Log: remove unused code/add comments Modified: branches/tmp/sh/mod-ui/ncurses/src/NCAlignment.cc branches/tmp/sh/mod-ui/ncurses/src/NCInputField.cc branches/tmp/sh/mod-ui/ncurses/src/NCIntField.cc branches/tmp/sh/mod-ui/ncurses/src/NCPushButton.cc branches/tmp/sh/mod-ui/ncurses/src/NCPushButton.h Modified: branches/tmp/sh/mod-ui/ncurses/src/NCAlignment.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCA… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCAlignment.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCAlignment.cc Tue Nov 13 12:58:47 2007 @@ -65,6 +65,14 @@ YAlignment::setSize( newwidth, newheight); } +/////////////////////////////////////////////////////////////////// +// +// +// METHOD NAME : NCAlignment::setEnabled +// METHOD TYPE : void +// +// DESCRIPTION : +// void NCAlignment::setEnabled( bool do_bv ) { NCWidget::setEnabled( do_bv ); Modified: branches/tmp/sh/mod-ui/ncurses/src/NCInputField.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCI… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCInputField.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCInputField.cc Tue Nov 13 12:58:47 2007 @@ -82,16 +82,40 @@ WIDDBG << endl; } +/////////////////////////////////////////////////////////////////// +// +// +// METHOD NAME : NCInputField::preferredWidth +// METHOD TYPE : int +// +// DESCRIPTION : +// int NCInputField::preferredWidth() { return wGetDefsze().W; } +/////////////////////////////////////////////////////////////////// +// +// +// METHOD NAME : NCInputField::preferredHeight +// METHOD TYPE : int +// +// DESCRIPTION : +// int NCInputField::preferredHeight() { return wGetDefsze().H; } +/////////////////////////////////////////////////////////////////// +// +// +// METHOD NAME : NCInputField::setEnabled +// METHOD TYPE : void +// +// DESCRIPTION : +// void NCInputField::setEnabled( bool do_bv ) { NCWidget::setEnabled( do_bv ); Modified: branches/tmp/sh/mod-ui/ncurses/src/NCIntField.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCI… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCIntField.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCIntField.cc Tue Nov 13 12:58:47 2007 @@ -75,16 +75,40 @@ WIDDBG << endl; } +/////////////////////////////////////////////////////////////////// +// +// +// METHOD NAME : NCIntField::preferredWidth +// METHOD TYPE : int +// +// DESCRIPTION : +// int NCIntField::preferredWidth() { return wGetDefsze().W; } +/////////////////////////////////////////////////////////////////// +// +// +// METHOD NAME : NCIntField::preferredHeight +// METHOD TYPE : int +// +// DESCRIPTION : +// int NCIntField::preferredHeight() { return wGetDefsze().H; } +/////////////////////////////////////////////////////////////////// +// +// +// METHOD NAME : NCIntField::setEnabled +// METHOD TYPE : void +// +// DESCRIPTION : +// void NCIntField::setEnabled( bool do_bv ) { NCWidget::setEnabled( do_bv ); @@ -199,17 +223,8 @@ // void NCIntField::setValueInternal( int newValue ) { -#if 0 - if ( newValue < minValue() ) - cvalue = minValue(); - else if ( newValue > maxValue() ) - cvalue = maxValue(); - else - cvalue = newValue; - - YIntField::setValue( cvalue ); -#endif // checking newValue is done by YIntField + // -> no checks required cvalue = newValue; tUpdate(); } Modified: branches/tmp/sh/mod-ui/ncurses/src/NCPushButton.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCP… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCPushButton.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCPushButton.cc Tue Nov 13 12:58:47 2007 @@ -51,6 +51,14 @@ WIDDBG << endl; } +/////////////////////////////////////////////////////////////////// +// +// +// METHOD NAME : NCPushButton::preferredWidth +// METHOD TYPE : int +// +// DESCRIPTION : +// int NCPushButton::preferredWidth() { wsze defsize = wGetDefsze(); @@ -58,11 +66,27 @@ return wGetDefsze().W; } +/////////////////////////////////////////////////////////////////// +// +// +// METHOD NAME : NCPushButton::preferredHeight +// METHOD TYPE : int +// +// DESCRIPTION : +// int NCPushButton::preferredHeight() { return wGetDefsze().H; } +/////////////////////////////////////////////////////////////////// +// +// +// METHOD NAME : NCPushButton::setEnabled +// METHOD TYPE : void +// +// DESCRIPTION : +// void NCPushButton::setEnabled( bool do_bv ) { NCWidget::setEnabled( do_bv ); Modified: branches/tmp/sh/mod-ui/ncurses/src/NCPushButton.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCP… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCPushButton.h (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCPushButton.h Tue Nov 13 12:58:47 2007 @@ -67,7 +67,7 @@ virtual NCursesEvent wHandleInput( wint_t key ); virtual void setLabel( const string & nlabel ); - //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] r42002 - /trunk/core/liby2util-r/testsuite/
by mvidner＠svn.opensuse.org 13 Nov '07

13 Nov '07

Author: mvidner Date: Tue Nov 13 12:53:55 2007 New Revision: 42002 URL: http://svn.opensuse.org/viewcvs/yast?rev=42002&view=rev Log: make place for copy Removed: trunk/core/liby2util-r/testsuite/ -- 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] r42001 - in /branches/tmp/sh/mod-ui/ncurses/src: NCComboBox.cc NCComboBox.h README_mod-ui
by gs＠svn.opensuse.org 13 Nov '07

13 Nov '07

Author: gs Date: Tue Nov 13 12:31:42 2007 New Revision: 42001 URL: http://svn.opensuse.org/viewcvs/yast?rev=42001&view=rev Log: remove unused code/ add comments Modified: branches/tmp/sh/mod-ui/ncurses/src/NCComboBox.cc branches/tmp/sh/mod-ui/ncurses/src/NCComboBox.h branches/tmp/sh/mod-ui/ncurses/src/README_mod-ui Modified: branches/tmp/sh/mod-ui/ncurses/src/NCComboBox.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCC… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCComboBox.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCComboBox.cc Tue Nov 13 12:31:42 2007 @@ -66,16 +66,40 @@ WIDDBG << endl; } +/////////////////////////////////////////////////////////////////// +// +// +// METHOD NAME : NCComboBox::preferredWidth +// METHOD TYPE : int +// +// DESCRIPTION : +// int NCComboBox::preferredWidth() { return wGetDefsze().W; } +/////////////////////////////////////////////////////////////////// +// +// +// METHOD NAME : NCComboBox::preferredHeight +// METHOD TYPE : int +// +// DESCRIPTION : +// int NCComboBox::preferredHeight() { return wGetDefsze().H; } +/////////////////////////////////////////////////////////////////// +// +// +// METHOD NAME : NCComboBox::setEnabled +// METHOD TYPE : void +// +// DESCRIPTION : +// void NCComboBox::setEnabled( bool do_bv ) { NCWidget::setEnabled( do_bv ); @@ -284,7 +308,14 @@ Redraw(); } - +/////////////////////////////////////////////////////////////////// +// +// +// METHOD NAME : NCComboBox::text +// METHOD TYPE : string +// +// DESCRIPTION : +// string NCComboBox::text() { if ( modified ) Modified: branches/tmp/sh/mod-ui/ncurses/src/NCComboBox.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCC… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCComboBox.h (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCComboBox.h Tue Nov 13 12:31:42 2007 @@ -89,11 +89,6 @@ bool editable ); virtual ~NCComboBox(); -#if 0 - virtual void itemAdded( const YCPString & string, - int index, - bool selected ); -#endif virtual void addItem ( YItem * item ); void addItem( const string & label, bool selected ); 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/REA… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/README_mod-ui (original) +++ branches/tmp/sh/mod-ui/ncurses/src/README_mod-ui Tue Nov 13 12:31:42 2007 @@ -134,3 +134,8 @@ TODO: hyper links doesn't yet work +PackageSelector +-------------- +after terminating the package selector: + +[ui] YUI_core.cc(~YUI):83 2 open dialogs left over -- 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] r42000 - in /branches/tmp/sh/mod-ui/web-wt/src: YWebPushButton.cc YWebPushButton.h YWebWidgetFactory.cc
by visnov＠svn.opensuse.org 13 Nov '07

13 Nov '07

Author: visnov Date: Tue Nov 13 11:36:28 2007 New Revision: 42000 URL: http://svn.opensuse.org/viewcvs/yast?rev=42000&view=rev Log: missing files Added: branches/tmp/sh/mod-ui/web-wt/src/YWebPushButton.cc branches/tmp/sh/mod-ui/web-wt/src/YWebPushButton.h Modified: branches/tmp/sh/mod-ui/web-wt/src/YWebWidgetFactory.cc Added: branches/tmp/sh/mod-ui/web-wt/src/YWebPushButton.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/web-wt/src/YWeb… ============================================================================== --- branches/tmp/sh/mod-ui/web-wt/src/YWebPushButton.cc (added) +++ branches/tmp/sh/mod-ui/web-wt/src/YWebPushButton.cc Tue Nov 13 11:36:28 2007 @@ -0,0 +1,57 @@ +/*---------------------------------------------------------------------\ +| | +| __ __ ____ _____ ____ | +| \ \ / /_ _/ ___|_ _|___ \ | +| \ V / _` \___ \ | | __) | | +| | | (_| |___) || | / __/ | +| |_|\__,_|____/ |_| |_____| | +| | +| core system | +| (C) SuSE GmbH | +\----------------------------------------------------------------------/ + + File: YWebPushButton.cc + + Author: Stefan Hundhammer <sh(a)suse.de> + +/-*/ + + +#define y2log_component "web-ui" +#include <ycp/y2log.h> + +#include "YWebPushButton.h" + + +using std::string; + + +YWebPushButton::YWebPushButton( YWidget * parent, const string & label ) + : YPushButton( parent, label ) +{ +} + + +YWebPushButton::~YWebPushButton() +{ + // NOP +} + +int YWebPushButton::preferredWidth() +{ + // FIXME + return 1; +} + +int YWebPushButton::preferredHeight() +{ + // FIXME + return 1; +} + + +void YWebPushButton::setSize( int newWidth, int newHeight ) +{ + // FIXME +} + Added: branches/tmp/sh/mod-ui/web-wt/src/YWebPushButton.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/web-wt/src/YWeb… ============================================================================== --- branches/tmp/sh/mod-ui/web-wt/src/YWebPushButton.h (added) +++ branches/tmp/sh/mod-ui/web-wt/src/YWebPushButton.h Tue Nov 13 11:36:28 2007 @@ -0,0 +1,84 @@ +/*---------------------------------------------------------------------\ +| | +| __ __ ____ _____ ____ | +| \ \ / /_ _/ ___|_ _|___ \ | +| \ V / _` \___ \ | | __) | | +| | | (_| |___) || | / __/ | +| |_|\__,_|____/ |_| |_____| | +| | +| core system | +| (C) SuSE GmbH | +\----------------------------------------------------------------------/ + + File: YWebPushButton.h + + Author: Stefan Hundhammer <sh(a)suse.de> + +/-*/ + +#ifndef YWebPushButton_h +#define YWebPushButton_h + +#include <yui/YPushButton.h> + + +using std::string; + + +class YWebPushButton : public YPushButton +{ +public: + /** + * Constructor. + **/ + YWebPushButton( YWidget * parent, const string & label ); + + /** + * Destructor. + **/ + ~YWebPushButton(); + + /** + * Return a descriptive name of this widget class for logging, + * debugging etc. + **/ + virtual const char * widgetClass() const { return "YWebPushButton"; } + + /** + * Preferred width of the widget. + * + * Reimplemented from YWidget + **/ + virtual int preferredWidth(); + + /** + * Preferred height of the widget. + * + * Reimplemented from YWidget + **/ + virtual int preferredHeight(); + + /** + * Set the new size of the widget. + * + * Layout manager widgets (like YLayoutBox) call this during geometry + * management after all widgets are queried about their preferred widths + * and heights. Depending on layout constraints, widgets might be resized + * beyond or below their preferred size. + * + * The sizes passed here are not meant to affect any future + * preferredWidth() or preferredHeight() calls; they are just the outcome + * of all kinds of compromises (too little screen space or too much) for + * the current geometry management calculation. + * + * Reimplemented from YWidget + **/ + virtual void setSize( int newWidth, int newHeight ); + +}; + + +typedef YWebPushButton YWebIconButton; + + +#endif // YWebPushButton_h Modified: branches/tmp/sh/mod-ui/web-wt/src/YWebWidgetFactory.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/web-wt/src/YWeb… ============================================================================== --- branches/tmp/sh/mod-ui/web-wt/src/YWebWidgetFactory.cc (original) +++ branches/tmp/sh/mod-ui/web-wt/src/YWebWidgetFactory.cc Tue Nov 13 11:36:28 2007 @@ -16,13 +16,14 @@ /-*/ +#define y2log_component "web-ui" +#include <ycp/y2log.h> + #include "YWebWidgetFactory.h" +#include "YWebPushButton.h" #include <string> -#include "YTypes.h" - -#include "YWebPushButton.h" using std::string; @@ -88,6 +89,7 @@ YPushButton * YWebWidgetFactory::createPushButton ( YWidget * parent, const string & label ) { + y2milestone( "Creating push button '%s'", label.c_str() ); return new YWebPushButton( parent, label ); } -- 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] r41999 - in /branches/tmp/sh/mod-ui/web-wt/src: YWebDialog.h YWebUI_core.cc
by visnov＠svn.opensuse.org 13 Nov '07

13 Nov '07

Author: visnov Date: Tue Nov 13 11:31:30 2007 New Revision: 41999 URL: http://svn.opensuse.org/viewcvs/yast?rev=41999&view=rev Log: create web dialogs Modified: branches/tmp/sh/mod-ui/web-wt/src/YWebDialog.h branches/tmp/sh/mod-ui/web-wt/src/YWebUI_core.cc Modified: branches/tmp/sh/mod-ui/web-wt/src/YWebDialog.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/web-wt/src/YWeb… ============================================================================== --- branches/tmp/sh/mod-ui/web-wt/src/YWebDialog.h (original) +++ branches/tmp/sh/mod-ui/web-wt/src/YWebDialog.h Tue Nov 13 11:31:30 2007 @@ -26,7 +26,8 @@ class YWebDialog : public YDialog { -protected: +public: + /** * Constructor. **/ @@ -38,8 +39,6 @@ **/ virtual ~YWebDialog(); -public: - /** * Returns a descriptive name of this widget class for logging, * debugging etc. Modified: branches/tmp/sh/mod-ui/web-wt/src/YWebUI_core.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/web-wt/src/YWeb… ============================================================================== --- branches/tmp/sh/mod-ui/web-wt/src/YWebUI_core.cc (original) +++ branches/tmp/sh/mod-ui/web-wt/src/YWebUI_core.cc Tue Nov 13 11:31:30 2007 @@ -32,8 +32,7 @@ #include "YWebApplication.h" #include "YWebWidgetFactory.h" #include "YWebOptionalWidgetFactory.h" -#include "YEvent.h" -#include "YUISymbols.h" +#include "YWebDialog.h" using namespace Wt; @@ -219,8 +218,7 @@ YDialog * YWebUI::createDialog( YWidgetOpt & opt ) { - // FIXME - return 0L; + return new YWebDialog( opt ); } -- 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] r41998 - /branches/tmp/sh/mod-ui/web-wt/src/YWebWidgetFactory.cc
by visnov＠svn.opensuse.org 13 Nov '07

13 Nov '07

Author: visnov Date: Tue Nov 13 11:26:40 2007 New Revision: 41998 URL: http://svn.opensuse.org/viewcvs/yast?rev=41998&view=rev Log: compile Modified: branches/tmp/sh/mod-ui/web-wt/src/YWebWidgetFactory.cc Modified: branches/tmp/sh/mod-ui/web-wt/src/YWebWidgetFactory.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/web-wt/src/YWeb… ============================================================================== --- branches/tmp/sh/mod-ui/web-wt/src/YWebWidgetFactory.cc (original) +++ branches/tmp/sh/mod-ui/web-wt/src/YWebWidgetFactory.cc Tue Nov 13 11:26:40 2007 @@ -22,6 +22,8 @@ #include "YTypes.h" +#include "YWebPushButton.h" + using std::string; class YWidget; @@ -43,7 +45,6 @@ class YMultiSelectionBox; class YPackageSelector; class YProgressBar; -class YPushButton; class YRadioButton; class YRadioButtonGroup; class YReplacePoint; @@ -85,7 +86,11 @@ // Common Leaf Widgets // - YPushButton * YWebWidgetFactory::createPushButton ( YWidget * parent, const string & label ) {} +YPushButton * YWebWidgetFactory::createPushButton ( YWidget * parent, const string & label ) +{ + return new YWebPushButton( parent, label ); +} + YLabel * YWebWidgetFactory::createLabel ( YWidget * parent, const string & text, bool isHeading, bool isOutputField ) {} YInputField * YWebWidgetFactory::createInputField ( YWidget * parent, const string & label, bool passwordMode ) {} YCheckBox * YWebWidgetFactory::createCheckBox ( YWidget * parent, const string & label, bool isChecked ) {} -- 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] r41997 - /branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPkgPopupTree.cc
by gs＠svn.opensuse.org 13 Nov '07

13 Nov '07

Author: gs Date: Tue Nov 13 11:22:33 2007 New Revision: 41997 URL: http://svn.opensuse.org/viewcvs/yast?rev=41997&view=rev Log: get original rpm group item from currently selected item 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 Tue Nov 13 11:22:33 2007 @@ -30,7 +30,15 @@ #include "NCZypp.h" - +/////////////////////////////////////////////////////////////////// +// +// +// CLASS NAME : NCRpmGroupItem +// +// DESCRIPTION : class derived from YTreeItem with additional +// property to store the original rpm group item +// +// class NCRpmGroupItem : public YTreeItem { private: @@ -55,7 +63,7 @@ } - YStringTreeItem * getOrigItem() { return rpmGroupItem; } + YStringTreeItem * getOrigItem() const { return rpmGroupItem; } }; @@ -142,6 +150,8 @@ if ( !packager || !filterTree ) return postevent; + YStringTreeItem * origItem; + // get the currently selected rpm group and show the package list if ( postevent.detail == NCursesEvent::USERDEF ) { @@ -149,22 +159,27 @@ if ( item ) { - // get the data pointer - YStringTreeItem * origItem = (YStringTreeItem *) (item->data()); + const NCRpmGroupItem * rpmGroupItem = dynamic_cast<const NCRpmGroupItem *>(item); - if ( origItem ) + if ( rpmGroupItem ) { - string label = origItem->value().translation(); + // get the original rpm group item (YStringTreeItem) + origItem = rpmGroupItem->getOrigItem(); + + if ( origItem ) + { + string label = origItem->value().translation(); - // fill the package list - packager->fillPackageList( YCPString( label ), origItem ); + // fill the package list + packager->fillPackageList( YCPString( label ), origItem ); - NCMIL << "Selected RPM group: " << label << endl; + NCMIL << "Selected RPM group: " << label << endl; + } } } else { - NCERR << "No RPM group tree existing" << endl; + NCERR << "Current item not valid" << endl; } } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0