YaST Commits June 2007

yast-commit@lists.opensuse.org

27 participants
490 discussions

[yast-commit] r39091 - /trunk/installation/package/yast2-installation.changes
by locilka＠svn.opensuse.org 29 Jun '07

29 Jun '07

Author: locilka Date: Fri Jun 29 09:40:15 2007 New Revision: 39091 URL: http://svn.opensuse.org/viewcvs/yast?rev=39091&view=rev Log: ------------------------------------------------------------------- Thu Jun 21 17:38:09 CEST 2007 - adrian(a)suse.de - fix changelog entry order ------------------------------------------------------------------- Modified: trunk/installation/package/yast2-installation.changes 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 Fri Jun 29 09:40:15 2007 @@ -55,6 +55,11 @@ half-started firewall after YOU kernel-update (#282871). ------------------------------------------------------------------- +Thu Jun 21 17:38:09 CEST 2007 - adrian(a)suse.de + +- fix changelog entry order + +------------------------------------------------------------------- Mon Jun 11 18:30:48 CEST 2007 - locilka(a)suse.cz - Added lost fix from Andreas Schwab for startup scripts. The patch @@ -1218,17 +1223,17 @@ source fails in order to allow to enter password (#186804) ------------------------------------------------------------------- -Tue Jun 20 14:35:15 CEST 2006 - jsrain(a)suse.cz - -- translate the congratulate string (#186567) - -------------------------------------------------------------------- Tue Jun 20 14:50:48 CEST 2006 - mvidner(a)suse.cz - When registration succeeds, display only the actually added sources (#180820#c26). ------------------------------------------------------------------- +Tue Jun 20 14:35:15 CEST 2006 - jsrain(a)suse.cz + +- translate the congratulate string (#186567) + +------------------------------------------------------------------- Mon Jun 19 14:05:21 CEST 2006 - jsrain(a)suse.cz - report an error when failed to register the update source for @@ -1873,12 +1878,6 @@ - 2.13.55 ------------------------------------------------------------------- -Wed Mar 29 17:57:35 CEST 2006 - jsrain(a)suse.de - -- prevent from installing one product multiple times (#159662) -- 2.13.54 - -------------------------------------------------------------------- Thu Mar 30 13:42:35 CEST 2006 - mvidner(a)suse.cz - Reset zypp and release its lock before suse_register (#160319). @@ -1892,6 +1891,12 @@ - included new desktop file in Makefile (162112) ------------------------------------------------------------------- +Wed Mar 29 17:57:35 CEST 2006 - jsrain(a)suse.de + +- prevent from installing one product multiple times (#159662) +- 2.13.54 + +------------------------------------------------------------------- Wed Mar 29 16:43:02 CEST 2006 - locilka(a)suse.cz - Fixed adding SLP-based Add-On product (#161270) @@ -2126,11 +2131,6 @@ - forcing using xim for Qt Input (#156962) ------------------------------------------------------------------- -Thu Mar 9 17:35:30 CET 2006 - jsrain(a)suse.de - -- fixed asking for add-on product CD (#156469) - -------------------------------------------------------------------- Thu Mar 9 17:36:39 CET 2006 - mvidner(a)suse.cz - Control files: added network/startmode, being ifplugd for SL and @@ -2138,6 +2138,11 @@ - 2.13.30 ------------------------------------------------------------------- +Thu Mar 9 17:35:30 CET 2006 - jsrain(a)suse.de + +- fixed asking for add-on product CD (#156469) + +------------------------------------------------------------------- Thu Mar 9 12:01:07 CET 2006 - ms(a)suse.de - include proofread message texts @@ -3248,6 +3253,11 @@ - version 2.11.1 ------------------------------------------------------------------- +Mon Oct 11 15:04:26 CEST 2004 - jsrain(a)suse.cz + +- adapted to functional interface of Arch.ycp + +------------------------------------------------------------------- Mon Oct 11 10:43:25 CEST 2004 - jsrain(a)suse.cz - moved default logon/window manager setting to extra client, @@ -3255,11 +3265,6 @@ - 2.11.0 ------------------------------------------------------------------- -Mon Oct 11 15:04:26 CEST 2004 - jsrain(a)suse.cz - -- adapted to functional interface of Arch.ycp - -------------------------------------------------------------------- Thu Sep 30 15:12:09 CEST 2004 - sh(a)suse.de - V 2.10.30 @@ -3576,6 +3581,12 @@ - readded vnc remote proposal to SLES workflow (bug #31023) ------------------------------------------------------------------- +Wed Apr 28 15:38:45 CEST 2004 - arvin(a)suse.de + +- quick implementation of execution of update.post2 scripts + (bug #38677) + +------------------------------------------------------------------- Wed Apr 28 15:26:30 CEST 2004 - lslezak(a)suse.cz - set Ctrl+Alt+Del handler in /etc/inittab to halt (instead of @@ -3584,12 +3595,6 @@ - version 2.9.73 ------------------------------------------------------------------- -Wed Apr 28 15:38:45 CEST 2004 - arvin(a)suse.de - -- quick implementation of execution of update.post2 scripts - (bug #38677) - -------------------------------------------------------------------- Tue Apr 27 18:25:25 CEST 2004 - gs(a)suse.de - write Console: entry for p690 hvc console before reading @@ -3869,14 +3874,14 @@ to installation mode ------------------------------------------------------------------- -Tue Mar 16 16:02:52 CET 2004 - msvec(a)suse.cz +Tue Mar 16 21:18:06 CET 2004 - kkaempf(a)suse.de -- added icons to network and hardware proposals +- run cleanup script for GNOME (#36196) ------------------------------------------------------------------- -Tue Mar 16 21:18:06 CET 2004 - kkaempf(a)suse.de +Tue Mar 16 16:02:52 CET 2004 - msvec(a)suse.cz -- run cleanup script for GNOME (#36196) +- added icons to network and hardware proposals ------------------------------------------------------------------- Tue Mar 16 14:26:03 CET 2004 - fehr(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] r39090 - in /trunk/packager: package/yast2-packager.changes src/clients/inst_rpmcopy.ycp
by jsrain＠svn.opensuse.org 28 Jun '07

28 Jun '07

Author: jsrain Date: Thu Jun 28 21:35:39 2007 New Revision: 39090 URL: http://svn.opensuse.org/viewcvs/yast?rev=39090&view=rev Log: updated for live CD installation Modified: trunk/packager/package/yast2-packager.changes trunk/packager/src/clients/inst_rpmcopy.ycp Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Thu Jun 28 21:35:39 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Jun 28 21:34:57 CEST 2007 - jsrain(a)suse.cz + +- updated for live CD installation + +------------------------------------------------------------------- Fri Jun 1 15:58:06 CEST 2007 - locilka(a)suse.cz - Adjusted Add-On module to store also a "PRODUCT" tag from the Modified: trunk/packager/src/clients/inst_rpmcopy.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/inst_rpmcop… ============================================================================== --- trunk/packager/src/clients/inst_rpmcopy.ycp (original) +++ trunk/packager/src/clients/inst_rpmcopy.ycp Thu Jun 28 21:35:39 2007 @@ -846,7 +846,7 @@ // Initialize and check whether some packages need to be installed // stop proceeding the script if they don't (Second stage) - if (Stage::cont()) { + if (Stage::cont() && ! Mode::live_installation ()) { InitRemainingPackages(); if (SomePackagesAreRemainForInstallation() != true) { y2milestone ("No packages need to be installed, skipping..."); @@ -871,7 +871,7 @@ RemoveObsoleteResolvables(); } - if (Stage::cont()) { + if (Stage::cont() && ! Mode::live_installation ()) { // initialize the package agent in continue mode Packages::Init( true ); RestoreDiskCacheSettings (); @@ -891,7 +891,7 @@ InstInitAndInitialSourceCaching(); // continue mode, set remaining packages to be installed - } else { + } else if (! Mode::live_installation ()){ InstallRemainingAndBinarySource(); } -- 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] r39089 - in /trunk/installation: package/yast2-installation.changes src/include/inst_inc_second.ycp
by jsrain＠svn.opensuse.org 28 Jun '07

28 Jun '07

Author: jsrain Date: Thu Jun 28 21:35:08 2007 New Revision: 39089 URL: http://svn.opensuse.org/viewcvs/yast?rev=39089&view=rev Log: updated for live CD installation Modified: trunk/installation/package/yast2-installation.changes trunk/installation/src/include/inst_inc_second.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 Thu Jun 28 21:35:08 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Jun 28 21:34:19 CEST 2007 - jsrain(a)suse.cz + +- updated for live CD installation + +------------------------------------------------------------------- Thu Jun 21 10:34:10 CEST 2007 - locilka(a)suse.cz - Added handling for "Suggested Installation Sources" during the Modified: trunk/installation/src/include/inst_inc_second.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/include/inst_in… ============================================================================== --- trunk/installation/src/include/inst_inc_second.ycp (original) +++ trunk/installation/src/include/inst_inc_second.ycp Thu Jun 28 21:35:08 2007 @@ -242,6 +242,11 @@ SCR::Execute(.target.remove, Installation::file_update_mode); SCR::Execute(.target.remove, "/var/adm/current_package_descr"); } + else if (Mode::live_installation ()) + { + y2milestone("Removing %1", Installation::file_live_install_mode); + SCR::Execute(.target.remove, Installation::file_live_install_mode); + } if (FileUtils::Exists (Installation::run_yast_at_boot)) { y2milestone("Removing %1", Installation::run_yast_at_boot); @@ -330,6 +335,9 @@ if (FileUtils::Exists (Installation::destdir + Installation::file_update_mode)) { Mode::SetMode ("update"); } + else if (FileUtils::Exists (Installation::destdir + Installation::file_live_install_mode)) { + Mode::SetMode ("live_installation"); + } // during update, set the 'update language' for the 2nd stage // FATE #300572 -- 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] r39088 - in /trunk/yast2: library/control/src/Installation.ycp library/modules/Mode.ycp library/system/src/Initrd.ycp package/yast2.changes
by jsrain＠svn.opensuse.org 28 Jun '07

28 Jun '07

Author: jsrain Date: Thu Jun 28 21:34:35 2007 New Revision: 39088 URL: http://svn.opensuse.org/viewcvs/yast?rev=39088&view=rev Log: added mode for live CD installation several updates for live CD installation Modified: trunk/yast2/library/control/src/Installation.ycp trunk/yast2/library/modules/Mode.ycp trunk/yast2/library/system/src/Initrd.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/library/control/src/Installation.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/control/src/Instal… ============================================================================== --- trunk/yast2/library/control/src/Installation.ycp (original) +++ trunk/yast2/library/control/src/Installation.ycp Thu Jun 28 21:34:35 2007 @@ -72,6 +72,9 @@ // Update instead on New Installation global string Installation::file_update_mode = Directory::vardir + "/update_mode"; + // Live installation instead on standard Installation + global string Installation::file_live_install_mode = Directory::vardir + "/live_install_mode"; + // Second stage installation (Stage::cont()) global string Installation::restart_data_file = Directory::vardir + "/continue_installation"; Modified: trunk/yast2/library/modules/Mode.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/modules/Mode.ycp?r… ============================================================================== --- trunk/yast2/library/modules/Mode.ycp (original) +++ trunk/yast2/library/modules/Mode.ycp Thu Jun 28 21:34:35 2007 @@ -113,6 +113,7 @@ if (! contains ( [ "installation", "update", "normal", "repair", "autoinstallation", "autoinst_config", + "live_installation" ], new_mode)) { @@ -178,7 +179,15 @@ * we're doing a fresh installation */ global boolean installation () { - return mode () == "installation" || mode () == "autoinstallation"; + return mode () == "installation" || mode () == "autoinstallation" + || mode () == "live_installation"; +} + +/** + * we're doing a fresh installation from live CD/DVD + */ +global boolean live_installation () { + return mode () == "live_installation"; } /** Modified: trunk/yast2/library/system/src/Initrd.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/system/src/Initrd.… ============================================================================== --- trunk/yast2/library/system/src/Initrd.ycp (original) +++ trunk/yast2/library/system/src/Initrd.ycp Thu Jun 28 21:34:35 2007 @@ -61,6 +61,10 @@ */ string splash = ""; /** + * Additional parameters for mkinitrd + */ + string additional_parameters = ""; + /** * List of modules which should be not added/removed to/from initrd */ list<string> modules_to_skip = nil; @@ -395,8 +399,9 @@ string param = ""; if (splash != "" && splash != nil) param = sformat ("-s %1", splash); - if ( SCR::Execute (.target.bash, sformat ("/sbin/mkinitrd %1 >> \ -%2 2>&1", param, Directory::logdir + "/y2logmkinitrd")) != 0 ) + if ( SCR::Execute (.target.bash, sformat ("/sbin/mkinitrd %1 %2 >> \ +%3 2>&1", param, additional_parameters, +Directory::logdir + "/y2logmkinitrd")) != 0 ) { string log = (string) SCR::Read (.target.string, Directory::logdir + "/y2logmkinitrd"); @@ -439,4 +444,20 @@ } } +/** + * Get additional parameters for mkinitrd + * @return string additional mkinitrd parameters + */ +global string AdditionalParameters () { + return additional_parameters; +} + +/** + * Set additional parameters for mkinitrd + * @param params string additional mkinitrd parameters + */ +global void SetAdditionalParameters (string params) { + additional_parameters = params; +} + } // end of module Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=… ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Thu Jun 28 21:34:35 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jun 28 21:33:42 CEST 2007 - jsrain(a)suse.cz + +- added mode for live CD installation +- several updates for live CD installation + +------------------------------------------------------------------- Wed Jun 20 11:56:36 CEST 2007 - locilka(a)suse.cz - Extending Installation module to provide persistent information -- 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] r39087 - in /branches/tmp/sh/mod-ui/core/libyui/src: Makefile.am YCPItemParser.cc YCPItemParser.h YCP_UI_Exception.h YItem.h
by sh-sh-sh＠svn.opensuse.org 28 Jun '07

28 Jun '07

Author: sh-sh-sh Date: Thu Jun 28 17:12:08 2007 New Revision: 39087 URL: http://svn.opensuse.org/viewcvs/yast?rev=39087&view=rev Log: new item list parser Added: branches/tmp/sh/mod-ui/core/libyui/src/YCPItemParser.cc branches/tmp/sh/mod-ui/core/libyui/src/YCPItemParser.h branches/tmp/sh/mod-ui/core/libyui/src/YCP_UI_Exception.h Modified: branches/tmp/sh/mod-ui/core/libyui/src/Makefile.am branches/tmp/sh/mod-ui/core/libyui/src/YItem.h Modified: branches/tmp/sh/mod-ui/core/libyui/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/Makefile.am (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/Makefile.am Thu Jun 28 17:12:08 2007 @@ -26,6 +26,7 @@ YWidgetID.cc \ YCPValueWidgetID.cc \ YCPDialogParser.cc \ + YCPItemParser.cc \ \ YAlignment.cc \ YBarGraph.cc \ @@ -83,10 +84,12 @@ YApplication.h \ YBothDim.h \ YCPDialogParser.h \ + YCPItem.h \ + YCPItemParser.h \ YCPValueWidgetID.h \ + YCP_UI_Exception.h \ YChildrenManager.h \ YItem.h \ - YCPItem.h \ YOptionalWidgetFactory.h \ YPackageSelectorPlugin.h \ YProperty.h \ Added: branches/tmp/sh/mod-ui/core/libyui/src/YCPItemParser.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YCPItemParser.cc (added) +++ branches/tmp/sh/mod-ui/core/libyui/src/YCPItemParser.cc Thu Jun 28 17:12:08 2007 @@ -0,0 +1,166 @@ +/*---------------------------------------------------------------------\ +| | +| __ __ ____ _____ ____ | +| \ \ / /_ _/ ___|_ _|___ \ | +| \ V / _` \___ \ | | __) | | +| | | (_| |___) || | / __/ | +| |_|\__,_|____/ |_| |_____| | +| | +| core system | +| (C) SuSE GmbH | +\----------------------------------------------------------------------/ + + File: YCPItemParser.h + + Author: Stefan Hundhammer <sh(a)suse.de> + +/-*/ + + +#include <ycp/YCPTerm.h> +#include <ycp/YCPBoolean.h> + +#include "YCPItemParser.h" +#include "YCPItem.h" +#include "YCP_UI_Exception.h" +#include "YUISymbols.h" + + +YItemList +YCPItemParser::parseItemList( const YCPList & ycpItemList ) +{ + YItemList itemList; + + try + { + for ( int i=0; i < ycpItemList->size(); i++ ) + { + YCPItem * item = parseItem( ycpItemList->value(i) ); + itemList.push_back( item ); + } + } + catch ( YUIException & exception ) + { + YItemListIterator it = itemList.begin(); + + while ( it != itemList.end() ) + { + YItem * item = *it; + ++it; + delete item; + } + + itemList.clear(); + YUI_RETHROW( exception ); + } + + return itemList; +} + + + +YCPItem * +YCPItemParser::parseItem( const YCPValue & rawItem ) +{ + YCPItem * item = 0; + + if ( rawItem->isString() ) // Simple case: just a string + { + YCPString label = rawItem->asString(); + item = new YCPItem( label, // The real label + label, // Use the label as ID, too + false ); // Not initially selected + } + else // `item(...) + { + if ( rawItem->isTerm() && + rawItem->asTerm()->name() == YUISymbol_item ) // `item + { + item = parseItem( rawItem->asTerm() ); + + } + else // not `item(...) + { + YUI_THROW( YCPDialogSyntaxError( "Expected `item(...)", rawItem ) ); + } + } + + return item; +} + + +YCPItem * +YCPItemParser::parseItem( const YCPTerm & itemTerm ) +{ + YCPValue id = YCPNull(); + YCPString iconName = YCPNull(); + YCPString label = YCPNull(); + YCPBoolean selected = YCPNull(); + + YCPDialogSyntaxError syntaxError( "Expected " + "`item(`id(`myID), " + "`icon(\"MyIcon.png\")," + "\"MyItemText\"," + "boolean selected )", + itemTerm ); + + for ( int i=0; i < itemTerm->size(); i++ ) + { + YCPValue arg = itemTerm->value( i ); + + if ( arg->isTerm() ) // `id(), `icon() + { + YCPTerm term = arg->asTerm(); + + if ( term->size() != 1 ) + YUI_THROW( syntaxError ); + + if ( term->name() == YUISymbol_id // `id() + && id.isNull() ) // and don't have an ID yet + { + id = term->value(0); + } + else if ( term->name() == YUISymbol_icon // `icon() + && term->value(0)->isString() + && iconName.isNull() ) // and don't have an icon name yet + { + iconName = term->value(0)->asString(); + } + else + { + YUI_THROW( syntaxError ); + } + } + else if ( arg->isString() // label + && label.isNull() ) // and don't have a label yet + { + label = arg->asString(); + } + else if ( arg->isBoolean() // "selected" flag + && selected.isNull() ) // and don't have a "selected" flag yet + { + selected = arg->asBoolean(); + } + else + { + YUI_THROW( syntaxError ); + } + } + + if ( label.isNull() ) // the label is required + YUI_THROW( syntaxError ); + + if ( iconName.isNull() ) + iconName = YCPString( "" ); + + if ( id.isNull() ) // no `id() ? + id = label; // use the label instead + + if ( selected.isNull() ) // "selected" not specified? + selected = YCPBoolean( false ); // use "not selected" (false) as default + + YCPItem * item = new YCPItem( label, id, iconName, selected->value() ); + YUI_CHECK_NEW( item ); + + return item; +} Added: branches/tmp/sh/mod-ui/core/libyui/src/YCPItemParser.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YCPItemParser.h (added) +++ branches/tmp/sh/mod-ui/core/libyui/src/YCPItemParser.h Thu Jun 28 17:12:08 2007 @@ -0,0 +1,74 @@ +/*---------------------------------------------------------------------\ +| | +| __ __ ____ _____ ____ | +| \ \ / /_ _/ ___|_ _|___ \ | +| \ V / _` \___ \ | | __) | | +| | | (_| |___) || | / __/ | +| |_|\__,_|____/ |_| |_____| | +| | +| core system | +| (C) SuSE GmbH | +\----------------------------------------------------------------------/ + + File: YCPItemParser.h + + Author: Stefan Hundhammer <sh(a)suse.de> + +/-*/ + +#ifndef YCPItemParser_h +#define YCPItemParser_h + +#include <ycp/YCPTerm.h> +#include "YCPItem.h" + + +/** + * Parsers for SelectionBox, ComboBox, MultiSelectionBox item lists + **/ +class YCPItemParser +{ +public: + + /** + * Parse an item list: + * + * [ + * `item(`id( `myID1 ), "Label1" ), + * `item(`id( `myID2 ), `icon( "icon2.png"), "Label2", true ), + * "Label3" + * ] + * + * Return a list of newly created YItem-derived objects. + * + * This function throws exceptions if there are syntax errors. + **/ + static YItemList parseItemList( const YCPList & ycpItemList ); + + + /** + * Parse one item and create a YCPItem from it. + * + * This function throws exceptions if there are syntax errors. + **/ + static YCPItem * parseItem( const YCPValue & item ); + +protected: + + /** + * Parse an item term: + * + * `item(`id( `myID1 ), "Label1" ) + * `item(`id( `myID2 ), `icon( "icon2.png"), "Label2", true ) + * + * Everything except the label is optional. + * + * This function throws exceptions if there are syntax errors. + **/ + static YCPItem * parseItem( const YCPTerm & itemTerm ); + + +}; + + +#endif // YCPItemParser_h Added: branches/tmp/sh/mod-ui/core/libyui/src/YCP_UI_Exception.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YCP_UI_Exception.h (added) +++ branches/tmp/sh/mod-ui/core/libyui/src/YCP_UI_Exception.h Thu Jun 28 17:12:08 2007 @@ -0,0 +1,50 @@ +/*---------------------------------------------------------------------\ +| | +| __ __ ____ _____ ____ | +| \ \ / /_ _/ ___|_ _|___ \ | +| \ V / _` \___ \ | | __) | | +| | | (_| |___) || | / __/ | +| |_|\__,_|____/ |_| |_____| | +| | +| core system | +| (C) SuSE GmbH | +\----------------------------------------------------------------------/ + + File: YCP_UI_Exception.h + + Author: Stefan Hundhammer <sh(a)suse.de> + +/-*/ + +#ifndef YCP_UI_Exception_h +#define YCP_UI_Exception_h + + +#include <ycp/YCPValue.h> +#include "YUIException.h" + + +/** + * Exception class for "YCP dialog term syntax error" + **/ +class YCPDialogSyntaxError: public YUIException +{ +public: + YCPDialogSyntaxError( const string & msg ) + : YUIException( string( "Syntax Error:" ) + msg ) + {} + + YCPDialogSyntaxError( const string & expected, + const YCPValue & seen ) + : YUIException( string( "Syntax Error: " ) + + expected + + string( ", seen: " ) + + seen->toString() ) + {} + + virtual ~YCPDialogSyntaxError() throw() + {} +}; + + +#endif // YCP_UI_Exception_h Modified: branches/tmp/sh/mod-ui/core/libyui/src/YItem.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YItem.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YItem.h Thu Jun 28 17:12:08 2007 @@ -22,6 +22,8 @@ #include <string> #include <list> +using std::string; +using std::list; /** * Simple item class for SelectionBox, ComboBox, MultiSelectionBox etc. items. -- 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] r39086 - /branches/tmp/sh/mod-ui/core/libyui/src/YWidgetFactory.cc
by sh-sh-sh＠svn.opensuse.org 28 Jun '07

28 Jun '07

Author: sh-sh-sh Date: Thu Jun 28 15:42:19 2007 New Revision: 39086 URL: http://svn.opensuse.org/viewcvs/yast?rev=39086&view=rev Log: Added missing functions Modified: branches/tmp/sh/mod-ui/core/libyui/src/YWidgetFactory.cc Modified: branches/tmp/sh/mod-ui/core/libyui/src/YWidgetFactory.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YWidgetFactory.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YWidgetFactory.cc Thu Jun 28 15:42:19 2007 @@ -86,60 +86,60 @@ YAlignment * -YWidgetFactory::createLeft( YWidget * parent ) +YWidgetFactory::createLeft( YWidget * parent ) { - return createAlignment( parent, YAlignBegin, YAlignUnchanged ); + return createAlignment( parent, YAlignBegin, YAlignUnchanged ); } YAlignment * -YWidgetFactory::createRight( YWidget * parent ) +YWidgetFactory::createRight( YWidget * parent ) { - return createAlignment( parent, YAlignEnd, YAlignUnchanged ); + return createAlignment( parent, YAlignEnd, YAlignUnchanged ); } YAlignment * -YWidgetFactory::createTop( YWidget * parent ) +YWidgetFactory::createTop( YWidget * parent ) { - return createAlignment( parent, YAlignUnchanged, YAlignBegin ); + return createAlignment( parent, YAlignUnchanged, YAlignBegin ); } YAlignment * -YWidgetFactory::createBottom( YWidget * parent ) +YWidgetFactory::createBottom( YWidget * parent ) { - return createAlignment( parent, YAlignUnchanged, YAlignEnd ); + return createAlignment( parent, YAlignUnchanged, YAlignEnd ); } YAlignment * -YWidgetFactory::createHCenter( YWidget * parent ) +YWidgetFactory::createHCenter( YWidget * parent ) { - return createAlignment( parent, YAlignCenter, YAlignUnchanged ); + return createAlignment( parent, YAlignCenter, YAlignUnchanged ); } YAlignment * -YWidgetFactory::createVCenter( YWidget * parent ) +YWidgetFactory::createVCenter( YWidget * parent ) { - return createAlignment( parent, YAlignUnchanged, YAlignCenter ); + return createAlignment( parent, YAlignUnchanged, YAlignCenter ); } YAlignment * -YWidgetFactory::createHVCenter( YWidget * parent ) +YWidgetFactory::createHVCenter( YWidget * parent ) { - return createAlignment( parent, YAlignCenter, YAlignCenter ); + return createAlignment( parent, YAlignCenter, YAlignCenter ); } YAlignment * -YWidgetFactory::createMarginBox( YWidget * parent, YLayoutSize_t horMargin, YLayoutSize_t vertMargin ) +YWidgetFactory::createMarginBox( YWidget * parent, YLayoutSize_t horMargin, YLayoutSize_t vertMargin ) { return createMarginBox( parent, horMargin, horMargin, - vertMargin, vertMargin ); + vertMargin, vertMargin ); } @@ -150,7 +150,7 @@ YLayoutSize_t topMargin, YLayoutSize_t bottomMargin ) { YAlignment * alignment = createAlignment( parent, YAlignUnchanged, YAlignUnchanged ); - + alignment->setLeftMargin ( YUI::ui()->deviceUnits( YD_HORIZ, leftMargin ) ); alignment->setRightMargin ( YUI::ui()->deviceUnits( YD_HORIZ, rightMargin ) ); alignment->setTopMargin ( YUI::ui()->deviceUnits( YD_VERT, topMargin ) ); @@ -161,49 +161,49 @@ YAlignment * -YWidgetFactory::createMinWidth( YWidget * parent, YLayoutSize_t minWidth ) +YWidgetFactory::createMinWidth( YWidget * parent, YLayoutSize_t minWidth ) { - return createMinSize( parent, minWidth, 0 ); + return createMinSize( parent, minWidth, 0 ); } YAlignment * -YWidgetFactory::createMinHeight( YWidget * parent, YLayoutSize_t minHeight ) +YWidgetFactory::createMinHeight( YWidget * parent, YLayoutSize_t minHeight ) { - return createMinSize( parent, 0, minHeight ); + return createMinSize( parent, 0, minHeight ); } YAlignment * -YWidgetFactory::createMinSize( YWidget * parent, YLayoutSize_t minWidth, YLayoutSize_t minHeight ) +YWidgetFactory::createMinSize( YWidget * parent, YLayoutSize_t minWidth, YLayoutSize_t minHeight ) { YAlignment * alignment = createAlignment( parent, YAlignUnchanged, YAlignUnchanged ); alignment->setMinWidth ( YUI::ui()->deviceUnits( YD_HORIZ, minWidth ) ); alignment->setMinHeight( YUI::ui()->deviceUnits( YD_VERT, minHeight ) ); - + return alignment; } YSquash * -YWidgetFactory::createHSquash( YWidget * parent ) +YWidgetFactory::createHSquash( YWidget * parent ) { - return createSquash( parent, true, false ); + return createSquash( parent, true, false ); } YSquash * -YWidgetFactory::createVSquash( YWidget * parent ) +YWidgetFactory::createVSquash( YWidget * parent ) { - return createSquash( parent, false, true ); + return createSquash( parent, false, true ); } YSquash * -YWidgetFactory::createHVSquash( YWidget * parent ) +YWidgetFactory::createHVSquash( YWidget * parent ) { - return createSquash( parent, true, true ); + return createSquash( parent, true, true ); } @@ -214,11 +214,31 @@ { YPushButton * button = createPushButton( parent, fallbackTextLabel ); button->setIcon( iconName ); - + return button; } +YLabel * +YWidgetFactory::createHeading( YWidget * parent, const string & text ) +{ + return createLabel( parent, + text, + true, // isHeading + false ); // isOutputField +} + + +YLabel * +YWidgetFactory::createOutputField( YWidget * parent, const string & text ) +{ + return createLabel( parent, + text, + false, // isHeading + true); // isOutputField +} + + YInputField * YWidgetFactory::createPasswordField( YWidget * parent, const string & 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] r39085 - /branches/tmp/sh/mod-ui/ncurses/src/
by gs＠svn.opensuse.org 28 Jun '07

28 Jun '07

Author: gs Date: Thu Jun 28 15:35:57 2007 New Revision: 39085 URL: http://svn.opensuse.org/viewcvs/yast?rev=39085&view=rev Log: remove YWidget::setSize Modified: branches/tmp/sh/mod-ui/ncurses/src/NCAlignment.cc branches/tmp/sh/mod-ui/ncurses/src/NCCheckBox.cc branches/tmp/sh/mod-ui/ncurses/src/NCCheckBoxFrame.cc branches/tmp/sh/mod-ui/ncurses/src/NCComboBox.cc branches/tmp/sh/mod-ui/ncurses/src/NCDialog.cc branches/tmp/sh/mod-ui/ncurses/src/NCEmpty.cc branches/tmp/sh/mod-ui/ncurses/src/NCFrame.cc branches/tmp/sh/mod-ui/ncurses/src/NCImage.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/NCLabel.cc branches/tmp/sh/mod-ui/ncurses/src/NCLayoutBox.cc branches/tmp/sh/mod-ui/ncurses/src/NCLogView.cc branches/tmp/sh/mod-ui/ncurses/src/NCMenuButton.cc branches/tmp/sh/mod-ui/ncurses/src/NCMultiLineEdit.cc branches/tmp/sh/mod-ui/ncurses/src/NCMultiSelectionBox.cc branches/tmp/sh/mod-ui/ncurses/src/NCPackageSelectorStart.cc branches/tmp/sh/mod-ui/ncurses/src/NCProgressBar.cc branches/tmp/sh/mod-ui/ncurses/src/NCPushButton.cc branches/tmp/sh/mod-ui/ncurses/src/NCRadioButton.cc branches/tmp/sh/mod-ui/ncurses/src/NCRadioButtonGroup.cc branches/tmp/sh/mod-ui/ncurses/src/NCReplacePoint.cc branches/tmp/sh/mod-ui/ncurses/src/NCRichText.cc branches/tmp/sh/mod-ui/ncurses/src/NCSelectionBox.cc branches/tmp/sh/mod-ui/ncurses/src/NCSpacing.cc branches/tmp/sh/mod-ui/ncurses/src/NCSquash.cc branches/tmp/sh/mod-ui/ncurses/src/NCTable.cc branches/tmp/sh/mod-ui/ncurses/src/NCTree.cc branches/tmp/sh/mod-ui/ncurses/src/NCWeight.cc 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 Thu Jun 28 15:35:57 2007 @@ -62,7 +62,6 @@ void NCAlignment::setSize( int newwidth, int newheight ) { wRelocate( wpos( 0 ), wsze( newheight, newwidth ) ); - YAlignment::setSize( newwidth, newheight ); } /////////////////////////////////////////////////////////////////// Modified: branches/tmp/sh/mod-ui/ncurses/src/NCCheckBox.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCC… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCCheckBox.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCCheckBox.cc Thu Jun 28 15:35:57 2007 @@ -95,7 +95,6 @@ void NCCheckBox::setSize( int newwidth, int newheight ) { wRelocate( wpos( 0 ), wsze( newheight, newwidth ) ); - YCheckBox::setSize( newwidth, newheight ); } /////////////////////////////////////////////////////////////////// Modified: branches/tmp/sh/mod-ui/ncurses/src/NCCheckBoxFrame.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCC… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCCheckBoxFrame.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCCheckBoxFrame.cc Thu Jun 28 15:35:57 2007 @@ -100,6 +100,7 @@ wsze csze( newheight, newwidth ); wRelocate( wpos( 0 ), csze ); csze = wsze::max( 0, csze - framedim.Sze ); + // FIXME //YContainerWidget::child(0)->setSize( csze.W, csze.H ); firstChild()->setSize( csze.W, csze.H ); } 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 Thu Jun 28 15:35:57 2007 @@ -100,7 +100,6 @@ void NCComboBox::setSize( int newwidth, int newheight ) { wRelocate( wpos( 0 ), wsze( newheight, newwidth ) ); - YComboBox::setSize( newwidth, newheight ); } /////////////////////////////////////////////////////////////////// @@ -631,7 +630,4 @@ tUpdate(); curpos = buffer.length(); } - - InputMaxLength; -#warning FIXME: Either throw this out or do something properly with it! } Modified: branches/tmp/sh/mod-ui/ncurses/src/NCDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCD… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCDialog.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCDialog.cc Thu Jun 28 15:35:57 2007 @@ -222,7 +222,6 @@ void NCDialog::setSize( int newwidth, int newheight ) { wRelocate( wpos( 0 ), wsze( newheight, newwidth ) ); - YDialog::setSize( newwidth, newheight ); } /////////////////////////////////////////////////////////////////// Modified: branches/tmp/sh/mod-ui/ncurses/src/NCEmpty.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCE… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCEmpty.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCEmpty.cc Thu Jun 28 15:35:57 2007 @@ -60,5 +60,4 @@ void NCEmpty::setSize( int newwidth, int newheight ) { wRelocate( wpos( 0 ), wsze( newheight, newwidth ) ); - YEmpty::setSize( newwidth, newheight ); } Modified: branches/tmp/sh/mod-ui/ncurses/src/NCFrame.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCF… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCFrame.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCFrame.cc Thu Jun 28 15:35:57 2007 @@ -89,6 +89,7 @@ wsze csze( newheight, newwidth ); wRelocate( wpos( 0 ), csze ); csze = wsze::max( 0, csze - framedim.Sze ); + // FIXME //YContainerWidget::child(0)->setSize( csze.W, csze.H ); firstChild()->setSize( csze.W, csze.H ); } Modified: branches/tmp/sh/mod-ui/ncurses/src/NCImage.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCI… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCImage.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCImage.cc Thu Jun 28 15:35:57 2007 @@ -87,5 +87,4 @@ void NCImage::setSize( int newwidth, int newheight ) { wRelocate( wpos( 0 ), wsze( newheight, newwidth ) ); - YImage::setSize( newwidth, newheight ); } 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 Thu Jun 28 15:35:57 2007 @@ -120,7 +120,6 @@ void NCInputField::setSize( int newwidth, int newheight ) { wRelocate( wpos( 0 ), wsze( newheight, newwidth ) ); - YInputField::setSize( newwidth, newheight ); } /////////////////////////////////////////////////////////////////// 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 Thu Jun 28 15:35:57 2007 @@ -110,7 +110,6 @@ void NCIntField::setSize( int newwidth, int newheight ) { wRelocate( wpos( 0 ), wsze( newheight, newwidth ) ); - YIntField::setSize( newwidth, newheight ); } /////////////////////////////////////////////////////////////////// Modified: branches/tmp/sh/mod-ui/ncurses/src/NCLabel.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCL… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCLabel.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCLabel.cc Thu Jun 28 15:35:57 2007 @@ -87,7 +87,6 @@ void NCLabel::setSize( int newwidth, int newheight ) { wRelocate( wpos( 0 ), wsze( newheight, newwidth ) ); - YLabel::setSize( newwidth, newheight ); } /////////////////////////////////////////////////////////////////// Modified: branches/tmp/sh/mod-ui/ncurses/src/NCLayoutBox.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCL… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCLayoutBox.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCLayoutBox.cc Thu Jun 28 15:35:57 2007 @@ -61,7 +61,6 @@ void NCLayoutBox::setSize( int newwidth, int newheight ) { wRelocate( wpos( 0 ), wsze( newheight, newwidth ) ); - YLayoutBox::setSize( newwidth, newheight ); } /////////////////////////////////////////////////////////////////// Modified: branches/tmp/sh/mod-ui/ncurses/src/NCLogView.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCL… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCLogView.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCLogView.cc Thu Jun 28 15:35:57 2007 @@ -88,7 +88,6 @@ void NCLogView::setSize( int newwidth, int newheight ) { wRelocate( wpos( 0 ), wsze( newheight, newwidth ) ); - YLogView::setSize( newwidth, newheight ); } /////////////////////////////////////////////////////////////////// Modified: branches/tmp/sh/mod-ui/ncurses/src/NCMenuButton.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCM… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCMenuButton.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCMenuButton.cc Thu Jun 28 15:35:57 2007 @@ -92,7 +92,6 @@ void NCMenuButton::setSize( int newwidth, int newheight ) { wRelocate( wpos( 0 ), wsze( newheight, newwidth ) ); - YMenuButton::setSize( newwidth, newheight ); } /////////////////////////////////////////////////////////////////// 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 Thu Jun 28 15:35:57 2007 @@ -87,7 +87,6 @@ void NCMultiLineEdit::setSize( int newwidth, int newheight ) { wRelocate( wpos( 0 ), wsze( newheight, newwidth ) ); - YMultiLineEdit::setSize( newwidth, newheight ); } /////////////////////////////////////////////////////////////////// Modified: branches/tmp/sh/mod-ui/ncurses/src/NCMultiSelectionBox.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCM… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCMultiSelectionBox.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCMultiSelectionBox.cc Thu Jun 28 15:35:57 2007 @@ -86,7 +86,6 @@ void NCMultiSelectionBox::setSize( int newwidth, int newheight ) { wRelocate( wpos( 0 ), wsze( newheight, newwidth ) ); - YMultiSelectionBox::setSize( newwidth, newheight ); } /////////////////////////////////////////////////////////////////// Modified: branches/tmp/sh/mod-ui/ncurses/src/NCPackageSelectorStart.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCP… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCPackageSelectorStart.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCPackageSelectorStart.cc Thu Jun 28 15:35:57 2007 @@ -165,7 +165,6 @@ void NCPackageSelectorStart::setSize( int newwidth, int newheight ) { wRelocate( wpos( 0 ), wsze( newheight, newwidth ) ); - NCLayoutBox::setSize( newwidth, newheight ); } Modified: branches/tmp/sh/mod-ui/ncurses/src/NCProgressBar.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCP… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCProgressBar.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCProgressBar.cc Thu Jun 28 15:35:57 2007 @@ -98,7 +98,6 @@ void NCProgressBar::setSize( int newwidth, int newheight ) { wRelocate( wpos( 0 ), wsze( newheight, newwidth ) ); - YProgressBar::setSize( newwidth, newheight ); } /////////////////////////////////////////////////////////////////// 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 Thu Jun 28 15:35:57 2007 @@ -88,7 +88,6 @@ void NCPushButton::setSize( int newwidth, int newheight ) { wRelocate( wpos( 0 ), wsze( newheight, newwidth ) ); - YPushButton::setSize( newwidth, newheight ); } /////////////////////////////////////////////////////////////////// Modified: branches/tmp/sh/mod-ui/ncurses/src/NCRadioButton.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCR… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCRadioButton.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCRadioButton.cc Thu Jun 28 15:35:57 2007 @@ -90,7 +90,6 @@ void NCRadioButton::setSize( int newwidth, int newheight ) { wRelocate( wpos( 0 ), wsze( newheight, newwidth ) ); - YRadioButton::setSize( newwidth, newheight ); } /////////////////////////////////////////////////////////////////// Modified: branches/tmp/sh/mod-ui/ncurses/src/NCRadioButtonGroup.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCR… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCRadioButtonGroup.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCRadioButtonGroup.cc Thu Jun 28 15:35:57 2007 @@ -61,7 +61,6 @@ void NCRadioButtonGroup::setSize( int newwidth, int newheight ) { wRelocate( wpos( 0 ), wsze( newheight, newwidth ) ); - YRadioButtonGroup::setSize( newwidth, newheight ); } /////////////////////////////////////////////////////////////////// Modified: branches/tmp/sh/mod-ui/ncurses/src/NCReplacePoint.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCR… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCReplacePoint.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCReplacePoint.cc Thu Jun 28 15:35:57 2007 @@ -60,5 +60,4 @@ void NCReplacePoint::setSize( int newwidth, int newheight ) { wRelocate( wpos( 0 ), wsze( newheight, newwidth ) ); - YReplacePoint::setSize( newwidth, newheight ); } Modified: branches/tmp/sh/mod-ui/ncurses/src/NCRichText.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCR… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCRichText.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCRichText.cc Thu Jun 28 15:35:57 2007 @@ -229,7 +229,6 @@ void NCRichText::setSize( int newwidth, int newheight ) { wRelocate( wpos( 0 ), wsze( newheight, newwidth ) ); - YRichText::setSize( newwidth, newheight ); } /////////////////////////////////////////////////////////////////// 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 Thu Jun 28 15:35:57 2007 @@ -93,7 +93,6 @@ void NCSelectionBox::setSize( int newwidth, int newheight ) { wRelocate( wpos( 0 ), wsze( newheight, newwidth ) ); - YSelectionBox::setSize( newwidth, newheight ); } /////////////////////////////////////////////////////////////////// Modified: branches/tmp/sh/mod-ui/ncurses/src/NCSpacing.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCS… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCSpacing.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCSpacing.cc Thu Jun 28 15:35:57 2007 @@ -86,6 +86,5 @@ void NCSpacing::setSize( int newwidth, int newheight ) { wRelocate( wpos( 0 ), wsze( newheight, newwidth ) ); - YSpacing::setSize( newwidth, newheight ); } Modified: branches/tmp/sh/mod-ui/ncurses/src/NCSquash.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCS… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCSquash.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCSquash.cc Thu Jun 28 15:35:57 2007 @@ -61,5 +61,4 @@ void NCSquash::setSize( int newwidth, int newheight ) { wRelocate( wpos( 0 ), wsze( newheight, newwidth ) ); - YSquash::setSize( newwidth, newheight ); } Modified: branches/tmp/sh/mod-ui/ncurses/src/NCTable.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCT… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCTable.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCTable.cc Thu Jun 28 15:35:57 2007 @@ -103,7 +103,6 @@ void NCTable::setSize( int newwidth, int newheight ) { wRelocate( wpos( 0 ), wsze( newheight, newwidth ) ); - YTable::setSize( newwidth, newheight ); } /////////////////////////////////////////////////////////////////// Modified: branches/tmp/sh/mod-ui/ncurses/src/NCTree.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCT… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCTree.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCTree.cc Thu Jun 28 15:35:57 2007 @@ -272,7 +272,6 @@ void NCTree::setSize( int newwidth, int newheight ) { wRelocate( wpos( 0 ), wsze( newheight, newwidth ) ); - YTree::setSize( newwidth, newheight ); } /////////////////////////////////////////////////////////////////// Modified: branches/tmp/sh/mod-ui/ncurses/src/NCWeight.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCW… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCWeight.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCWeight.cc Thu Jun 28 15:35:57 2007 @@ -60,5 +60,4 @@ void NCWeight::setSize( int newwidth, int newheight ) { wRelocate( wpos( 0 ), wsze( newheight, newwidth ) ); - YWeight::setSize( newwidth, newheight ); } -- 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] r39084 - /branches/tmp/sh/mod-ui/core/libyui/src/YLayoutBox.cc
by sh-sh-sh＠svn.opensuse.org 28 Jun '07

28 Jun '07

Author: sh-sh-sh Date: Thu Jun 28 15:31:46 2007 New Revision: 39084 URL: http://svn.opensuse.org/viewcvs/yast?rev=39084&view=rev Log: don't inline exported functions Modified: branches/tmp/sh/mod-ui/core/libyui/src/YLayoutBox.cc Modified: branches/tmp/sh/mod-ui/core/libyui/src/YLayoutBox.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YLayoutBox.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YLayoutBox.cc Thu Jun 28 15:31:46 2007 @@ -66,14 +66,14 @@ } -inline YUIDimension +YUIDimension YLayoutBox::primary() const { return priv->primary; } -inline YUIDimension +YUIDimension YLayoutBox::secondary() const { return priv->secondary; -- 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] r39083 - in /branches/tmp/sh/mod-ui/core/libyui/src: Makefile.am YCPItem.h YItem.h YSelectionBox.h
by sh-sh-sh＠svn.opensuse.org 28 Jun '07

28 Jun '07

Author: sh-sh-sh Date: Thu Jun 28 14:41:25 2007 New Revision: 39083 URL: http://svn.opensuse.org/viewcvs/yast?rev=39083&view=rev Log: new class for selection widgets Added: branches/tmp/sh/mod-ui/core/libyui/src/YCPItem.h Modified: branches/tmp/sh/mod-ui/core/libyui/src/Makefile.am branches/tmp/sh/mod-ui/core/libyui/src/YItem.h branches/tmp/sh/mod-ui/core/libyui/src/YSelectionBox.h Modified: branches/tmp/sh/mod-ui/core/libyui/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/Makefile.am (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/Makefile.am Thu Jun 28 14:41:25 2007 @@ -81,7 +81,12 @@ ImplPtr.h \ UI.h \ YApplication.h \ + YBothDim.h \ + YCPDialogParser.h \ + YCPValueWidgetID.h \ YChildrenManager.h \ + YItem.h \ + YCPItem.h \ YOptionalWidgetFactory.h \ YPackageSelectorPlugin.h \ YProperty.h \ @@ -94,10 +99,7 @@ YUI_util.h \ YWidgetFactory.h \ YWidgetID.h \ - YCPValueWidgetID.h \ - YCPDialogParser.h \ YWidgetOpt.h \ - YBothDim.h \ \ YAlignment.h \ YBarGraph.h \ Added: branches/tmp/sh/mod-ui/core/libyui/src/YCPItem.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YCPItem.h (added) +++ branches/tmp/sh/mod-ui/core/libyui/src/YCPItem.h Thu Jun 28 14:41:25 2007 @@ -0,0 +1,101 @@ +/*---------------------------------------------------------------------\ +| | +| __ __ ____ _____ ____ | +| \ \ / /_ _/ ___|_ _|___ \ | +| \ V / _` \___ \ | | __) | | +| | | (_| |___) || | / __/ | +| |_|\__,_|____/ |_| |_____| | +| | +| core system | +| (C) SuSE GmbH | +\----------------------------------------------------------------------/ + + File: YCPItem.h + + Author: Stefan Hundhammer <sh(a)suse.de> + +/-*/ + +#ifndef YCPItem_h +#define YCPItem_h + +#include <ycp/YCPValue.h> +#include <ycp/YCPString.h> +#include "YItem.h" + + +/** + * Item class with YCPValue IDs + **/ +class YCPItem: public YItem +{ +public: + + /** + * Constructors + **/ + YCPItem( const YCPString & label, + const YCPValue & id, + bool sel = false ) + : YItem( label->value(), sel ) + , _id( id ) + {} + + YCPItem( const YCPString & label, + const YCPValue & id, + const YCPString & iconName, + bool sel = false ) + : YItem( label->value(), iconName->value(), sel ) + , _id( id ) + {} + + /** + * Destructor. + **/ + virtual ~YCPItem() + {} + + /** + * Return 'true' if this item has an ID. + **/ + bool hasId() const { return ! _id.isNull() && ! _id->isVoid(); } + + /** + * Return this item's ID. + **/ + YCPValue id() const { return _id; } + + /** + * Set a new ID. + **/ + void setId( const YCPValue & newId ) { _id = newId; } + + /** + * Return this item's label as a YCPString. + **/ + YCPString label() const { return YCPString( YItem::label() ); } + + /** + * Set this item's label with a YCPString. + **/ + void setLabel( const YCPString & newLabel ) + { YItem::setLabel( newLabel->value() ); } + + /** + * Return this icon's icon name as a YCPString. + **/ + YCPString iconName() const { return YCPString( YItem::iconName() ); } + + /** + * Set this icon's icon name with a YCPString. + **/ + void setIconName( const YCPString & newIconName ) + { YItem::setIconName( newIconName->value() ); } + + +private: + YCPValue _id; +}; + + +#endif // YCPItem_h Modified: branches/tmp/sh/mod-ui/core/libyui/src/YItem.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YItem.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YItem.h Thu Jun 28 14:41:25 2007 @@ -23,26 +23,81 @@ #include <list> -struct YItem +/** + * Simple item class for SelectionBox, ComboBox, MultiSelectionBox etc. items. + **/ +class YItem { - string label; - string id; - bool isSelected; - - YItem( string labelText ) - : label( labelText ) - , id( labelText ) - , isSelected( false ) +public: + + /** + * Constructor with just the label and optionally the selected state. + **/ + YItem( const string & label, bool sel = false ) + : _label( label ) + , _selected( sel ) + {} + + /** + * Constructor with label and icon name and optionally the selected state. + **/ + YItem( const string & label, const string & iconName, bool sel = false ) + : _label( label ) + , _iconName( iconName ) + , _selected( sel ) {} - YItem( string labelText, string idText, bool sel = false ) - : label( labelText ) - , id( idText ) - , isSelected( sel ) + /** + * Virtual Destructor. Only needed to enforce this class getting a VTable + * so RTTI and dynymic_cast will work. + **/ + virtual ~YItem() {} -}; // struct YItem -typedef list<YItem> YItemList; + /** + * Return this item's label. This is what the user sees in a dialog, so + * this will usually be a translated text. + **/ + string label() const { return _label; } + + /** + * Set this item's label. + **/ + void setLabel( const string & newLabel ) { _label = newLabel; } + + /** + * Return this icon's icon name. + **/ + string iconName() const { return _iconName; } + + /** + * Set this icon's icon name. + **/ + void setIconName( const string & newIconName ) { _iconName = newIconName; } + + /** + * Return 'true' if this item is currently selected. + **/ + bool selected() const { return _selected; } + + /** + * Select or unselect this item. This does not have any effect on any other + * item; if it is desired that only one item is selected at any time, the + * caller has to take care of that. + **/ + void setSelected( bool sel = true ) { _selected = sel; } + + +private: + string _label; + string _iconName; + bool _selected; +}; + + +typedef list<YItem *> YItemList; +typedef YItemList::iterator YItemListIterator; +typedef YItemList::const_iterator YItemListConstIterator; #endif // YItem_h Modified: branches/tmp/sh/mod-ui/core/libyui/src/YSelectionBox.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YSelectionBox.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YSelectionBox.h Thu Jun 28 14:41:25 2007 @@ -20,6 +20,7 @@ #define YSelectionBox_h #include "YSelectionWidget.h" +#include "YCPItem.h" #include <ycp/YCPString.h> #include <ycp/YCPList.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] r39082 - in /branches/tmp/sh/mod-ui/ncurses/src/pkg: NCPkgPopupDeps.cc NCPkgPopupDeps.h
by gs＠svn.opensuse.org 28 Jun '07

28 Jun '07

Author: gs Date: Thu Jun 28 14:37:20 2007 New Revision: 39082 URL: http://svn.opensuse.org/viewcvs/yast?rev=39082&view=rev Log: use NCInputField Modified: branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPkgPopupDeps.cc branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPkgPopupDeps.h Modified: branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPkgPopupDeps.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/pkg… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPkgPopupDeps.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPkgPopupDeps.cc Thu Jun 28 14:37:20 2007 @@ -28,7 +28,7 @@ #include "NCMultiSelectionBox.h" #include "NCPushButton.h" #include "NCPopupInfo.h" -#include "NCTextEntry.h" +#include "NCInputField.h" #include "YWidgetID.h" @@ -151,8 +151,9 @@ //vSplit->addChild( new NCSpacing( vSplit, opt, 0.2, false, true ) ); vSplit->addChild( new NCSpacing( vSplit, YD_VERT, true, 0.2 ) ); // stretchable = true - details = new NCTextEntry( vSplit, - "", false ); + details = new NCInputField( vSplit, + "", + false ); // passwordMode = false details->setInputMaxLength( 200 ); // FIXME //details->setMaxFld( 200 ); Modified: branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPkgPopupDeps.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/pkg… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPkgPopupDeps.h (original) +++ branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPkgPopupDeps.h Thu Jun 28 14:37:20 2007 @@ -34,7 +34,7 @@ class NCSelectionBox; class NCMultiSelectionBox; class NCPackageSelector; -class NCTextEntry; +class NCInputField; namespace PkgDep { class ErrorResult; @@ -76,7 +76,7 @@ NCLabel * head; // the headline - NCTextEntry *details; // problem details + NCInputField *details; // problem details NCPackageSelector * packager; // connection to the package selector -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

Jump to page:

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

YaST Commits June 2007