September 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r41097 - /tags/stable-2_16_0/network/
by mzugec＠svn.opensuse.org 25 Sep '07

25 Sep '07

Author: mzugec Date: Tue Sep 25 21:31:46 2007 New Revision: 41097 URL: http://svn.opensuse.org/viewcvs/yast?rev=41097&view=rev Log: Created tag stable-2_16_0 for network Added: tags/stable-2_16_0/network/ - copied from r41096, trunk/network/ -- 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] r41096 - in /trunk/network: VERSION package/yast2-network.changes src/services/routing.ycp
by mzugec＠svn.opensuse.org 25 Sep '07

25 Sep '07

Author: mzugec Date: Tue Sep 25 21:31:27 2007 New Revision: 41096 URL: http://svn.opensuse.org/viewcvs/yast?rev=41096&view=rev Log: fixed routing widget enabling (#326042) Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/services/routing.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=41096&r1=410… ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Tue Sep 25 21:31:27 2007 @@ -1 +1 @@ -2.15.81 +2.16.0 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Tue Sep 25 21:31:27 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Sep 25 21:28:00 CEST 2007 - mzugec(a)suse.cz + +- fixed routing widget enabling (#326042) +- 2.16.0 + +------------------------------------------------------------------- Tue Sep 25 12:44:03 CEST 2007 - mzugec(a)suse.cz - write resolv.conf after change from dhcp to static (#327074) Modified: trunk/network/src/services/routing.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/services/routing.ycp… ============================================================================== --- trunk/network/src/services/routing.ycp (original) +++ trunk/network/src/services/routing.ycp Tue Sep 25 21:31:27 2007 @@ -127,7 +127,7 @@ void initRouting (string key) ``{ integer max = 0; - integer items = 0; +// integer items = 0; list<term> table_items_orig = []; boolean forward = Routing::Forward; @@ -142,28 +142,26 @@ defgwdev = r["device"]:""; } else { - item = `item(`id(items), + item = `item(`id(size(r_items)), r["destination"]:"", r["gateway"]:"", r["netmask"]:"", r["device"]:"", r["extrapara"]:""); r_items = add(r_items, item); - items = items + 1; +// items = items + 1; } }); table_items_orig = (list<term>) eval(r_items); y2debug("table_items=%1", r_items); - y2debug("items=%1", items); - max = items; +// y2debug("items=%1", items); +// max = items; UI::ChangeWidget(`gw, `Items, [ defgw ]); UI::ChangeWidget(`id(`gw), `ValidChars, IP::ValidChars); UI::ChangeWidget(`id(`table), `Items, r_items); UI::ChangeWidget(`id(`forward), `Value, forward); - UI::ChangeWidget(`id(`table), `Enabled, false); - UI::ChangeWidget(`id(`add), `Enabled, false); UI::SetFocus(`id(`gw)); // #178538 - disable routing dialog when NetworkManager is used @@ -173,8 +171,8 @@ // UI::ChangeWidget(`id(`gw), `Enabled, enabled); UI::ChangeWidget(`id(`table), `Enabled, enabled); UI::ChangeWidget(`id(`forward), `Enabled, enabled); - UI::ChangeWidget(`id(`add), `Enabled, enabled); - UI::ChangeWidget(`id(`expert), `Enabled, enabled); +// UI::ChangeWidget(`id(`add), `Enabled, enabled); +// UI::ChangeWidget(`id(`expert), `Enabled, enabled); // fixed bug #73739 - if dhcp is used, dont set default gw statically // if (Lan::bootproto == "dhcp")UI::ChangeWidget(`id(`gw),`Enabled, false); @@ -182,7 +180,8 @@ symbol handleRouting( string key, map event ) { - boolean expert = (boolean) UI::QueryWidget(`id(`expert), `Value); +// boolean expert = (boolean) UI::QueryWidget(`id(`expert), `Value); + boolean enabled = !(boolean)NetworkService::IsManaged(); list devs = Routing::GetDevices(); integer cur = (integer) UI::QueryWidget(`id(`table), `CurrentItem); term item=nil; @@ -190,10 +189,12 @@ if (event["EventReason"]:"" == "Activated" || event["EventReason"]:"" == "ValueChanged") { switch (event["ID"]:`nil){ +/* case `expert: UI::ChangeWidget(`id(`table), `Enabled, expert); UI::ChangeWidget(`id(`add), `Enabled, expert); break; +*/ case `add: item = RoutingEditDialog(size(r_items), `empty(), devs); @@ -238,8 +239,9 @@ } } - UI::ChangeWidget(`id(`edit), `Enabled, expert && (size(r_items) > 0)); - UI::ChangeWidget(`id(`delete), `Enabled, expert && (size(r_items) > 0)); + UI::ChangeWidget(`id(`add), `Enabled, enabled); + UI::ChangeWidget(`id(`edit), `Enabled, enabled && (size(r_items) > 0)); + UI::ChangeWidget(`id(`delete), `Enabled, enabled && (size(r_items) > 0)); return nil; } @@ -293,7 +295,7 @@ /* Frame label */ `Frame(_("Routing Table"), `VBox( /* CheckBox label */ - `Left(`CheckBox(`id(`expert), `opt(`notify), _("E&xpert Configuration"))), +// `Left(`CheckBox(`id(`expert), `opt(`notify), _("E&xpert Configuration"))), `Table(`id(`table), `opt(`notify), `header( /* Table header 1/4 */ _("Destination"), @@ -310,9 +312,9 @@ /* PushButton label */ `HBox(`PushButton(`id(`add), _("Ad&d")), /* PushButton label */ - `PushButton(`id(`edit), `opt(`disabled), _("&Edit")), + `PushButton(`id(`edit), _("&Edit")), /* PushButton label */ - `PushButton(`id(`delete), `opt(`disabled), _("De&lete"))))), + `PushButton(`id(`delete), _("De&lete"))))), `VSpacing(1), /* CheckBox label */ `Left(`CheckBox(`id(`forward), _("Enable &IP Forwarding"))), -- 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] r41094 - /tags/branch-Linux-10_3-2_15_28/
by odabrunz＠svn.opensuse.org 25 Sep '07

25 Sep '07

Author: odabrunz Date: Tue Sep 25 19:52:27 2007 New Revision: 41094 URL: http://svn.opensuse.org/viewcvs/yast?rev=41094&view=rev Log: Created tag branch-Linux-10_3-2_15_28 Added: tags/branch-Linux-10_3-2_15_28/ -- 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] r41095 - /tags/branch-Linux-10_3-2_15_28/bootloader/
by odabrunz＠svn.opensuse.org 25 Sep '07

25 Sep '07

Author: odabrunz Date: Tue Sep 25 19:52:27 2007 New Revision: 41095 URL: http://svn.opensuse.org/viewcvs/yast?rev=41095&view=rev Log: Created tag branch-Linux-10_3-2_15_28 for bootloader Added: tags/branch-Linux-10_3-2_15_28/bootloader/ - copied from r41094, branches/SuSE-Linux-10_3-Branch/bootloader/ -- 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] r41093 - in /branches/SuSE-Linux-10_3-Branch/bootloader: VERSION package/yast2-bootloader.changes
by odabrunz＠svn.opensuse.org 25 Sep '07

25 Sep '07

Author: odabrunz Date: Tue Sep 25 19:52:06 2007 New Revision: 41093 URL: http://svn.opensuse.org/viewcvs/yast?rev=41093&view=rev Log: - updated changes file - 2.15.28 Modified: branches/SuSE-Linux-10_3-Branch/bootloader/VERSION branches/SuSE-Linux-10_3-Branch/bootloader/package/yast2-bootloader.changes Modified: branches/SuSE-Linux-10_3-Branch/bootloader/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/bootlo… ============================================================================== --- branches/SuSE-Linux-10_3-Branch/bootloader/VERSION (original) +++ branches/SuSE-Linux-10_3-Branch/bootloader/VERSION Tue Sep 25 19:52:06 2007 @@ -1 +1 @@ -2.15.27 +2.15.28 Modified: branches/SuSE-Linux-10_3-Branch/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/bootlo… ============================================================================== --- branches/SuSE-Linux-10_3-Branch/bootloader/package/yast2-bootloader.changes (original) +++ branches/SuSE-Linux-10_3-Branch/bootloader/package/yast2-bootloader.changes Tue Sep 25 19:52:06 2007 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Tue Sep 25 19:49:51 CEST 2007 - od(a)suse.de + +- re-read bootloader config from system after the delayed run of + perl-Bootloader updates, then call FlagOnetimeBoot() based on + current setup (#328078) +- 2.15.28 + +------------------------------------------------------------------- Tue Sep 25 11:09:55 CEST 2007 - od(a)suse.de - added logging to find problem in #328078 -- 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] r41092 - /branches/SuSE-Linux-10_3-Branch/bootloader/y2_checkin.state
by odabrunz＠svn.opensuse.org 25 Sep '07

25 Sep '07

Author: odabrunz Date: Tue Sep 25 19:49:07 2007 New Revision: 41092 URL: http://svn.opensuse.org/viewcvs/yast?rev=41092&view=rev Log: - updated merge state Modified: branches/SuSE-Linux-10_3-Branch/bootloader/y2_checkin.state Modified: branches/SuSE-Linux-10_3-Branch/bootloader/y2_checkin.state URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/bootlo… ============================================================================== --- branches/SuSE-Linux-10_3-Branch/bootloader/y2_checkin.state (original) +++ branches/SuSE-Linux-10_3-Branch/bootloader/y2_checkin.state Tue Sep 25 19:49:07 2007 @@ -2,30 +2,33 @@ # records the merge state and history for merging changes from other branches # to the branch of the current working directory # URLs of other branches and the highest revisions we have looked at +http://svn.opensuse.org/svn/yast/trunk/bootloader 41082 http://svn.opensuse.org/svn/yast/branches/SuSE-Linux-9_3-Branch/bootloader 22587 http://svn.opensuse.org/svn/yast/branches/SuSE-Linux-10_0-Branch/bootloader 26031 http://svn.opensuse.org/svn/yast/branches/SuSE-Linux-10_1-Branch/bootloader 30669 -http://svn.opensuse.org/svn/yast/branches/SuSE-SLE-10-Branch/bootloader 31732 http://svn.opensuse.org/svn/yast/branches/SuSE-Linux-10_2-Branch/bootloader 34622 http://svn.opensuse.org/svn/yast/branches/SuSE-SLE-10-SP1-Branch/bootloader 37794 +http://svn.opensuse.org/svn/yast/branches/SuSE-SLE-10-SP2-Branch/bootloader 41076 # revisions seen: # +http://svn.opensuse.org/svn/yast/trunk/bootloader 41082 http://svn.opensuse.org/svn/yast/branches/SuSE-Linux-9_3-Branch/bootloader 21937 21967 22006 22037 22040 22055 22100 22113 22239 22285 22312 22318 22488 22587 http://svn.opensuse.org/svn/yast/branches/SuSE-Linux-10_0-Branch/bootloader 25537 25727 26031 http://svn.opensuse.org/svn/yast/branches/SuSE-Linux-10_1-Branch/bootloader 30669 -http://svn.opensuse.org/svn/yast/branches/SuSE-SLE-10-Branch/bootloader 31508 31536 31598 31728 31732 http://svn.opensuse.org/svn/yast/branches/SuSE-Linux-10_2-Branch/bootloader 34622 http://svn.opensuse.org/svn/yast/branches/SuSE-SLE-10-SP1-Branch/bootloader 31627 31731 33390 34876 35236 35340 35342 35344 35347 35356 35413 35417 35650 35829 35850 35916 35917 35999 36005 36006 36027 36059 36143 36175 36768 36888 36889 36890 36900 36960 36961 36964 37091 37172 37196 37377 37430 37448 37451 37616 37672 37673 37674 37675 37676 37677 37678 37761 37762 37794 +http://svn.opensuse.org/svn/yast/branches/SuSE-SLE-10-SP2-Branch/bootloader # revisions postponed: # +http://svn.opensuse.org/svn/yast/trunk/bootloader http://svn.opensuse.org/svn/yast/branches/SuSE-Linux-9_3-Branch/bootloader http://svn.opensuse.org/svn/yast/branches/SuSE-Linux-10_0-Branch/bootloader http://svn.opensuse.org/svn/yast/branches/SuSE-Linux-10_1-Branch/bootloader -http://svn.opensuse.org/svn/yast/branches/SuSE-SLE-10-Branch/bootloader http://svn.opensuse.org/svn/yast/branches/SuSE-Linux-10_2-Branch/bootloader http://svn.opensuse.org/svn/yast/branches/SuSE-SLE-10-SP1-Branch/bootloader +http://svn.opensuse.org/svn/yast/branches/SuSE-SLE-10-SP2-Branch/bootloader # source: # merge states of the revisions @@ -103,4 +106,7 @@ MERGE_STATE[37761]=merged MERGE_STATE[37762]=merged MERGE_STATE[37794]=merged +MERGE_STATE[41082]=already_merged + +# comments for postponed / not merged revisions -- 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] r41091 - /branches/SuSE-Linux-10_3-Branch/bootloader/src/clients/bootloader_finish.ycp
by odabrunz＠svn.opensuse.org 25 Sep '07

25 Sep '07

Author: odabrunz Date: Tue Sep 25 19:35:47 2007 New Revision: 41091 URL: http://svn.opensuse.org/viewcvs/yast?rev=41091&view=rev Log: - re-read bootloader config from system after the delayed run of perl-Bootloader updates, then call FlagOnetimeBoot() based on current setup (#328078) Modified: branches/SuSE-Linux-10_3-Branch/bootloader/src/clients/bootloader_finish.ycp Modified: branches/SuSE-Linux-10_3-Branch/bootloader/src/clients/bootloader_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/bootlo… ============================================================================== --- branches/SuSE-Linux-10_3-Branch/bootloader/src/clients/bootloader_finish.ycp (original) +++ branches/SuSE-Linux-10_3-Branch/bootloader/src/clients/bootloader_finish.ycp Tue Sep 25 19:35:47 2007 @@ -170,6 +170,9 @@ if (retcode) { // perl-BL delayed section removal Bootloader::RunDelayedUpdates(); + // re-read external changes, then boot through to second stage of + // installation or update + Bootloader::Read (); return Bootloader::FlagOnetimeBoot(Bootloader::getDefaultSection ()); } else -- 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] r41090 - /tags/stable-2_15_28/bootloader/
by odabrunz＠svn.opensuse.org 25 Sep '07

25 Sep '07

Author: odabrunz Date: Tue Sep 25 19:06:49 2007 New Revision: 41090 URL: http://svn.opensuse.org/viewcvs/yast?rev=41090&view=rev Log: Created tag stable-2_15_28 for bootloader Added: tags/stable-2_15_28/bootloader/ - copied from r41089, trunk/bootloader/ -- 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] r41089 - in /branches/tmp/sh/mod-ui: core/libyui/src/ ncurses/src/ qt/src/
by sh-sh-sh＠svn.opensuse.org 25 Sep '07

25 Sep '07

Author: sh-sh-sh Date: Tue Sep 25 17:00:25 2007 New Revision: 41089 URL: http://svn.opensuse.org/viewcvs/yast?rev=41089&view=rev Log: changed WidgetFactory::createTable() Added: branches/tmp/sh/mod-ui/core/libyui/src/YCPTableItem.h Modified: branches/tmp/sh/mod-ui/core/libyui/src/Makefile.am branches/tmp/sh/mod-ui/core/libyui/src/YCPItem.h branches/tmp/sh/mod-ui/core/libyui/src/YCPTreeItem.h branches/tmp/sh/mod-ui/core/libyui/src/YTableItem.h branches/tmp/sh/mod-ui/core/libyui/src/YWidgetFactory.h branches/tmp/sh/mod-ui/ncurses/src/NCWidgetFactory.cc branches/tmp/sh/mod-ui/ncurses/src/NCWidgetFactory.h branches/tmp/sh/mod-ui/qt/src/YQWidgetFactory.cc branches/tmp/sh/mod-ui/qt/src/YQWidgetFactory.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 Tue Sep 25 17:00:25 2007 @@ -95,6 +95,7 @@ YCPItemParser.h \ YCPTreeItem.h \ YCPTreeItemParser.h \ + YCPTableItem.h \ YCPPropertyHandler.h \ YCPValueWidgetID.h \ YCP_UI_Exception.h \ Modified: 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 (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YCPItem.h Tue Sep 25 17:00:25 2007 @@ -82,12 +82,12 @@ { YItem::setLabel( newLabel->value() ); } /** - * Return this icon's icon name as a YCPString. + * Return this item's icon name as a YCPString. **/ YCPString iconName() const { return YCPString( YItem::iconName() ); } /** - * Set this icon's icon name with a YCPString. + * Set this item's icon name with a YCPString. **/ void setIconName( const YCPString & newIconName ) { YItem::setIconName( newIconName->value() ); } Added: branches/tmp/sh/mod-ui/core/libyui/src/YCPTableItem.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YCPTableItem.h (added) +++ branches/tmp/sh/mod-ui/core/libyui/src/YCPTableItem.h Tue Sep 25 17:00:25 2007 @@ -0,0 +1,89 @@ +/*---------------------------------------------------------------------\ +| | +| __ __ ____ _____ ____ | +| \ \ / /_ _/ ___|_ _|___ \ | +| \ V / _` \___ \ | | __) | | +| | | (_| |___) || | / __/ | +| |_|\__,_|____/ |_| |_____| | +| | +| core system | +| (C) SuSE GmbH | +\----------------------------------------------------------------------/ + + File: YCPTableItem.h + + Author: Stefan Hundhammer <sh(a)suse.de> + +/-*/ + +#ifndef YCPTableItem_h +#define YCPTableItem_h + +#include <ycp/YCPValue.h> +#include <ycp/YCPString.h> +#include "YItem.h" + + +/** + * Item class with YCPValue IDs + **/ +class YCPTableItem: public YTableItem +{ +public: + + /** + * Constructor + **/ + YCPTableItem( const YCPValue & id ) + : YTableItem() + , _id( id ) + {} + + /** + * Destructor. + **/ + virtual ~YCPTableItem() + {} + + /** + * 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; } + + /** + * Create a new cell and add it (even if both 'label' and + * 'iconName' are empty). + **/ + void addCell( const YCPString & label, const YCPString & iconName ) + YTableItem::addCell( label->value(), iconName->value() ); + + /** + * Return the label of cell no. 'index' (counting from 0 on) as a YCPString + * or an empty YCPString if there is no cell with that index. + **/ + YCPString label( int index ) const { return YCPString( YTableItem::label( index ) ); } + + /** + * Return the icon of cell no. 'index' (counting from 0 on) as a YCPString + * or an empty YCPString if there is no cell with that index. + **/ + YCPString iconName( int index ) const { return YCPString( YItem::iconName( index ) ); } + + +private: + + YCPValue _id; +}; + + +#endif // YCPTableItem_h Modified: branches/tmp/sh/mod-ui/core/libyui/src/YCPTreeItem.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YCPTreeItem.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YCPTreeItem.h Tue Sep 25 17:00:25 2007 @@ -103,12 +103,12 @@ { YTreeItem::setLabel( newLabel->value() ); } /** - * Return this icon's icon name as a YCPString. + * Return this item's icon name as a YCPString. **/ YCPString iconName() const { return YCPString( YTreeItem::iconName() ); } /** - * Set this icon's icon name with a YCPString. + * Set this item's icon name with a YCPString. **/ void setIconName( const YCPString & newIconName ) { YTreeItem::setIconName( newIconName->value() ); } Modified: branches/tmp/sh/mod-ui/core/libyui/src/YTableItem.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YTableItem.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YTableItem.h Tue Sep 25 17:00:25 2007 @@ -98,7 +98,7 @@ * Create a new cell and add it (even if both 'label' and * 'iconName' are empty). **/ - void addCell( const string & label, const string & iconName = "" ); + void addCell( const string & label, const string & iconName = string() ); /** * Delete all cells. @@ -118,7 +118,8 @@ YTableCellConstIterator cellsEnd() const { return _cells.end(); } /** - * Return the cell at the specified index (counting from 0 on) or 0 if there is none. + * Return the cell at the specified index (counting from 0 on) + * or 0 if there is none. **/ const YTableCell * cell( int index ) const; @@ -128,8 +129,8 @@ int cellCount() const { return _cells.size(); } /** - * Return 'true' if this item has a cell with the specified index (counting - * from 0 on), 'false' otherwise. + * Return 'true' if this item has a cell with the specified index + * (counting from 0 on), 'false' otherwise. **/ bool hasCell( int index ) const { return index >= 0 && (unsigned) index < _cells.size(); } Modified: branches/tmp/sh/mod-ui/core/libyui/src/YWidgetFactory.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YWidgetFactory.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YWidgetFactory.h Tue Sep 25 17:00:25 2007 @@ -97,7 +97,7 @@ virtual YComboBox * createComboBox ( YWidget * parent, const string & label, bool editable = false ) = 0; virtual YSelectionBox * createSelectionBox ( YWidget * parent, const string & label ) = 0; virtual YTree * createTree ( YWidget * parent, const string & label ) = 0; - virtual YTable * createTable ( YWidget * parent ) = 0; + virtual YTable * createTable ( YWidget * parent, int columns ) = 0; virtual YProgressBar * createProgressBar ( YWidget * parent, const string & label, int maxValue = 100 ) = 0; virtual YRichText * createRichText ( YWidget * parent, const string & text, bool plainTextMode = false ) = 0; Modified: branches/tmp/sh/mod-ui/ncurses/src/NCWidgetFactory.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCW… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCWidgetFactory.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCWidgetFactory.cc Tue Sep 25 17:00:25 2007 @@ -165,7 +165,7 @@ NCTable * -NCWidgetFactory::createTable( YWidget * parent ) +NCWidgetFactory::createTable( YWidget * parent, int columns ) { return 0; // FIXME: TO DO } Modified: branches/tmp/sh/mod-ui/ncurses/src/NCWidgetFactory.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCW… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCWidgetFactory.h (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCWidgetFactory.h Tue Sep 25 17:00:25 2007 @@ -116,7 +116,8 @@ virtual NCTree * createTree ( YWidget * parent, const string & label ); - virtual NCTable * createTable ( YWidget * parent ); + virtual NCTable * createTable ( YWidget * parent, + int columns ); virtual NCProgressBar * createProgressBar ( YWidget * parent, const string & label, Modified: branches/tmp/sh/mod-ui/qt/src/YQWidgetFactory.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQWidget… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQWidgetFactory.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQWidgetFactory.cc Tue Sep 25 17:00:25 2007 @@ -181,7 +181,7 @@ YQTable * -YQWidgetFactory::createTable( YWidget * parent ) +YQWidgetFactory::createTable( YWidget * parent, int columns ) { return 0; // FIXME: TO DO } Modified: branches/tmp/sh/mod-ui/qt/src/YQWidgetFactory.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQWidget… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQWidgetFactory.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQWidgetFactory.h Tue Sep 25 17:00:25 2007 @@ -91,7 +91,7 @@ virtual YQComboBox * createComboBox ( YWidget * parent, const string & label, bool editable = false ); virtual YQSelectionBox * createSelectionBox ( YWidget * parent, const string & label ); virtual YQTree * createTree ( YWidget * parent, const string & label ); - virtual YQTable * createTable ( YWidget * parent ); + virtual YQTable * createTable ( YWidget * parent, int columns ); virtual YQProgressBar * createProgressBar ( YWidget * parent, const string & label, int maxValue = 100 ); virtual YQRichText * createRichText ( YWidget * parent, const string & text, bool plainTextMode = false ); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41088 - in /branches/tmp/sh/mod-ui/core/libyui/src: Makefile.am YItem.h YTableItem.cc YTableItem.h YTreeItem.h
by sh-sh-sh＠svn.opensuse.org 25 Sep '07

25 Sep '07

Author: sh-sh-sh Date: Tue Sep 25 15:41:46 2007 New Revision: 41088 URL: http://svn.opensuse.org/viewcvs/yast?rev=41088&view=rev Log: items for tables 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/YTableItem.cc branches/tmp/sh/mod-ui/core/libyui/src/YTableItem.h branches/tmp/sh/mod-ui/core/libyui/src/YTreeItem.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 Tue Sep 25 15:41:46 2007 @@ -20,6 +20,7 @@ YCPValueWidgetID.cc \ YItem.cc \ YTreeItem.cc \ + YTableItem.cc \ YProperty.cc \ YUIComponent.cc \ YUIException.cc \ @@ -100,6 +101,7 @@ YChildrenManager.h \ YItem.h \ YTreeItem.h \ + YTableItem.h \ YOptionalWidgetFactory.h \ YPackageSelectorPlugin.h \ YProperty.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 Tue Sep 25 15:41:46 2007 @@ -31,11 +31,6 @@ typedef YItemCollection::iterator YItemIterator; typedef YItemCollection::const_iterator YItemConstIterator; -typedef vector<const YItem *> YConstItemCollection; -typedef YConstItemCollection::iterator YConstItemIterator; -typedef YConstItemCollection::const_iterator YConstItemConstIterator; - - /** * Simple item class for SelectionBox, ComboBox, MultiSelectionBox etc. items. @@ -90,7 +85,7 @@ bool hasIconName() const { return ! _iconName.empty(); } /** - * Set this icon's icon name. + * Set this item's icon name. **/ void setIconName( const string & newIconName ) { _iconName = newIconName; } Modified: branches/tmp/sh/mod-ui/core/libyui/src/YTableItem.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YTableItem.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YTableItem.cc Tue Sep 25 15:41:46 2007 @@ -10,85 +10,135 @@ | (C) SuSE GmbH | \----------------------------------------------------------------------/ - File: YTreeItem.cc + File: YTableItem.cc Author: Stefan Hundhammer <sh(a)suse.de> /-*/ -#include "YTreeItem.h" +#include "YTableItem.h" +#include "YUIException.h" -YTreeItem::YTreeItem( const string & label, - bool isOpen ) - : YItem( label ) - , _parent( 0 ) - , _isOpen( isOpen ) +YTableItem::YTableItem() + : YItem( "" ) , _data( 0 ) { + } -YTreeItem::YTreeItem( const string & label, - const string & iconName, - bool isOpen ) - : YItem( label, iconName ) - , _parent( 0 ) - , _isOpen( isOpen ) +YTableItem::YTableItem( const string & label_0, + const string & label_1, + const string & label_2, + const string & label_3, + const string & label_4, + const string & label_5, + const string & label_6, + const string & label_7, + const string & label_8, + const string & label_9 ) + : YItem( "" ) , _data( 0 ) { + vector<string> labels; + labels.reserve(10); // slight optimization + labels.push_back( label_0 ); + labels.push_back( label_1 ); + labels.push_back( label_2 ); + labels.push_back( label_3 ); + labels.push_back( label_4 ); + labels.push_back( label_5 ); + labels.push_back( label_6 ); + labels.push_back( label_7 ); + labels.push_back( label_8 ); + labels.push_back( label_9 ); + + // + // Find the last non-empty label + // + + unsigned lastLabel = labels.size() - 1; + + while ( labels[ lastLabel ].empty() ) + --lastLabel; + + // + // Create cells + // + + for ( unsigned i = 0; i <= lastLabel; ++i ) + { + addCell( labels[i] ); + } } -YTreeItem::YTreeItem( YTreeItem * parent, - const string & label, - bool isOpen ) - : YItem( label ) - , _parent( parent ) - , _isOpen( isOpen ) - , _data( 0 ) + +YTableItem::~YTableItem() { - if ( parent ) - parent->addChild( this ); + deleteCells(); } -YTreeItem::YTreeItem( YTreeItem * parent, - const string & label, - const string & iconName, - bool isOpen ) - : YItem( label, iconName ) - , _parent( parent ) - , _isOpen( isOpen ) - , _data( 0 ) +void +YTableItem::deleteCells() +{ + YTableCellIterator it = cellsBegin(); + + while ( it != cellsEnd() ) + { + YTableCell * cell = *it; + ++it; + delete cell; + } + + _cells.clear(); +} + + +void +YTableItem::addCell( YTableCell * cell ) { - if ( parent ) - parent->addChild( this ); + YUI_CHECK_PTR( cell ); + _cells.push_back( cell ); } -YTreeItem::~YTreeItem() +void +YTableItem::addCell( const string & label, const string & iconName ) { - deleteChildren(); + YTableCell * cell = new YTableCell( label, iconName ); + YUI_CHECK_NEW( cell ); + + _cells.push_back( cell ); } -void YTreeItem::addChild( YItem * child ) +const YTableCell * +YTableItem::cell( int index ) const { - _children.push_back( child ); + return hasCell( index ) ? + _cells[ index ] : 0; } -void YTreeItem::deleteChildren() +string +YTableItem::label( int index ) const { - YItemIterator it = childrenBegin(); + return hasCell( index ) ? _cells[ index ]->label() : ""; +} + + +string +YTableItem::iconName( int index ) const +{ + return hasCell( index ) ? _cells[ index ]->iconName() : ""; +} - while ( it != childrenEnd() ) - { - YItem * child = *it; - ++it; - delete child; - } - _children.clear(); +bool +YTableItem::hasIconName( int index ) const +{ + return hasCell( index ) ? _cells[ index ]->hasIconName() : false; } Modified: branches/tmp/sh/mod-ui/core/libyui/src/YTableItem.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YTableItem.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YTableItem.h Tue Sep 25 15:41:46 2007 @@ -1,18 +1,18 @@ /*---------------------------------------------------------------------\ -| | -| __ __ ____ _____ ____ | -| \ \ / /_ _/ ___|_ _|___ \ | -| \ V / _` \___ \ | | __) | | -| | | (_| |___) || | / __/ | -| |_|\__,_|____/ |_| |_____| | -| | -| core system | -| (C) SuSE GmbH | +| | +| __ __ ____ _____ ____ | +| \ \ / /_ _/ ___|_ _|___ \ | +| \ V / _` \___ \ | | __) | | +| | | (_| |___) || | / __/ | +| |_|\__,_|____/ |_| |_____| | +| | +| core system | +| (C) SuSE GmbH | \----------------------------------------------------------------------/ - File: YTableItem.h + File: YTableItem.h - Author: Stefan Hundhammer <sh(a)suse.de> + Author: Stefan Hundhammer <sh(a)suse.de> /-*/ @@ -21,59 +21,29 @@ #include "YItem.h" +using std::string; +using std::vector; +class YTableCell; -class YTableCell -{ -public: - /** - * Constructor with label and icon name and optionally the selected state. - **/ - YTableCell( const string & label, const string & iconName ) - : _label( label ) - , _iconName( iconName ) - , _selected( selected ) - , _index( -1 ) - {} - - /** - * Return this cells'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 cell's label. - **/ - void setLabel( const string & newLabel ) { _label = newLabel; } - - /** - * Return this cell's icon name. - **/ - string iconName() const { return _iconName; } - - /** - * Return 'true' if this cell has an icon name. - **/ - bool hasIconName() const { return ! _iconName.empty(); } - - /** - * Set this cell's icon name. - **/ - void setIconName( const string & newIconName ) { _iconName = newIconName; } - - -private: - - string _label; - string _iconName; -} +typedef vector<YTableCell *> YTableCellCollection; +typedef YTableCellCollection::iterator YTableCellIterator; +typedef YTableCellCollection::const_iterator YTableCellConstIterator; /** - * Item class for table items. + * Item class for YTable items. Each YTableItem corresponds to one row in a + * YTable. + * + * A YTableItem might have any number of cells (columns within this row), + * including none. The YTable widget is free to ignore any excess cells if + * there are more than the YTable widget has columns. The YTable widget is to + * treat nonexistent cells like empty ones. * - * This class implements multiple cells per item. + * Note that while YTable items and their cells can be manipulated through + * pointers, their visual representation on screen might be updated only upon + * calling certain methods of the YTable widget. See the YTable reference for + * details. **/ class YTableItem: public YItem { @@ -86,18 +56,30 @@ /** * Convenience constructor for table items without any icons. - **/ - YTableItem( const string & label0, - const string & label1 = "", - const string & label2 = "", - const string & label3 = "", - const string & label4 = "", - const string & label5 = "", - const string & label6 = "", - const string & label7 = "", - const string & label8 = "", - const string & label9 = "" ); - + * + * This will create up to 10 (0..9) cells. Empty cells for empty labels at + * the end of the labels are not created, but empty cells in between are. + * + * new YTableItem( "one", "two", "", "", "five" ); + * + * will create an item with 5 cells: + * + * cell[0] ==> "one" + * cell[1] ==> "two" + * cell[2] ==> "" + * cell[3] ==> "" + * cell[4] ==> "five" + **/ + YTableItem( const string & label_0, + const string & label_1 = string(), + const string & label_2 = string(), + const string & label_3 = string(), + const string & label_4 = string(), + const string & label_5 = string(), + const string & label_6 = string(), + const string & label_7 = string(), + const string & label_8 = string(), + const string & label_9 = string() ); /** * Destructor. @@ -108,25 +90,49 @@ /** * Add a cell. This item will assume ownership over the cell and delete it - * when appropriate. + * when appropriate. **/ void addCell( YTableCell * cell ); /** + * Create a new cell and add it (even if both 'label' and + * 'iconName' are empty). + **/ + void addCell( const string & label, const string & iconName = "" ); + + /** + * Delete all cells. + **/ + void deleteCells(); + + /** + * Return an iterator that points to the first cell of this item. + **/ + YTableCellIterator cellsBegin() { return _cells.begin(); } + YTableCellConstIterator cellsBegin() const { return _cells.begin(); } + + /** + * Return an iterator that points after the last cell of this item. + **/ + YTableCellIterator cellsEnd() { return _cells.end(); } + YTableCellConstIterator cellsEnd() const { return _cells.end(); } + + /** * Return the cell at the specified index (counting from 0 on) or 0 if there is none. **/ - const YTableCell * cell( int index ) const; + const YTableCell * cell( int index ) const; /** * Return the number of cells this item has. - **/ - int cellCount() const; + **/ + int cellCount() const { return _cells.size(); } /** * Return 'true' if this item has a cell with the specified index (counting * from 0 on), 'false' otherwise. **/ - bool hasCell( int index ) const; + bool hasCell( int index ) const + { return index >= 0 && (unsigned) index < _cells.size(); } /** * Return the label of cell no. 'index' (counting from 0 on) or an empty @@ -146,7 +152,6 @@ **/ bool hasIconName( int index ) const; - /** * Set the opaque data pointer for application use. * @@ -164,8 +169,93 @@ private: - vector<YTableCell> _cells; - void * _data; + // Disable unwanted base class methods. They don't make sense in this + // context since there is not just one single label or icon name, but one + // for each cell. + + string label() const { return ""; } + string iconName() const { return ""; } + bool hasIconName() const { return false; } + void setLabel ( const string & ) {} + void setIconName ( const string & ) {} + + + // + // Data members + // + + YTableCellCollection _cells; + void * _data; +}; + + + +/** + * One cell (one column in one row) of a YTableItem. Each cell has a label (a + * user visible text) and optionally an icon (*). + * + * Note that cells don't have individual IDs; they have just an index. + * The first cell in an item is cell(0). In an ideal world, each YTableItem + * would have exactly as many cells as there are columns in the YTable, but + * these classes make no such assumptions. A YTableItem might have any number + * of cells, including none. + * + * The YTable widget, is free to ignore any excess cells if there are more than + * the YTable widget has columns. If there are less cells than the table has + * columns, the nonexistent cells will be treated as empty. + * + * + * (*) Not all UIs can handle icons. UIs that can't handle them will simply + * ignore any icons specified for YTableCells. Thus, applications should either + * check the UI capabilities if it can handle icons or use icons only as an + * additional visual cue that still has a text counterpart (so the user can + * still make sense of the table content when no icons are visible). + **/ +class YTableCell +{ +public: + /** + * Constructor with label and icon name and optionally the selected state. + **/ + YTableCell( const string & label, const string & iconName = "" ) + : _label( label ) + , _iconName( iconName ) + {} + + // No virtual destructor. This saves a vtable for this class since there + // are no other virtual methods either. + + /** + * Return this cells'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 cell's label. + **/ + void setLabel( const string & newLabel ) { _label = newLabel; } + + /** + * Return this cell's icon name. + **/ + string iconName() const { return _iconName; } + + /** + * Return 'true' if this cell has an icon name. + **/ + bool hasIconName() const { return ! _iconName.empty(); } + + /** + * Set this cell's icon name. + **/ + void setIconName( const string & newIconName ) { _iconName = newIconName; } + + +private: + + string _label; + string _iconName; }; Modified: branches/tmp/sh/mod-ui/core/libyui/src/YTreeItem.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YTreeItem.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YTreeItem.h Tue Sep 25 15:41:46 2007 @@ -21,6 +21,9 @@ #include "YItem.h" +using std::string; +using std::vector; + /** * Item class for tree items. @@ -140,13 +143,4 @@ }; -typedef vector<YTreeItem *> YTreeItemCollection; -typedef YTreeItemCollection::iterator YTreeItemIterator; -typedef YTreeItemCollection::const_iterator YTreeItemConstIterator; - -typedef vector<const YTreeItem *> YConstTreeItemCollection; -typedef YConstTreeItemCollection::iterator YConstTreeItemIterator; -typedef YConstTreeItemCollection::const_iterator YConstTreeItemConstIterator; - - #endif // YTreeItem_h -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0