May 2011 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r64101 - in /branches/SuSE-Code-11-SP2-Branch/ncurses/src: NCTree.cc NCTree.h NCWidgetFactory.cc NCWidgetFactory.h
by gs＠svn2.opensuse.org 24 May '11

24 May '11

Author: gs Date: Tue May 24 12:22:42 2011 New Revision: 64101 URL: http://svn.opensuse.org/viewcvs/yast?rev=64101&view=rev Log: feature NCTree multi selection added (needed for snapper feature #303699) Modified: branches/SuSE-Code-11-SP2-Branch/ncurses/src/NCTree.cc branches/SuSE-Code-11-SP2-Branch/ncurses/src/NCTree.h branches/SuSE-Code-11-SP2-Branch/ncurses/src/NCWidgetFactory.cc branches/SuSE-Code-11-SP2-Branch/ncurses/src/NCWidgetFactory.h Modified: branches/SuSE-Code-11-SP2-Branch/ncurses/src/NCTree.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/ncurs… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/ncurses/src/NCTree.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/ncurses/src/NCTree.cc Tue May 24 12:22:42 2011 @@ -37,12 +37,12 @@ NCTreeLine * fchild; mutable chtype * prefix; - + bool multiSel; unsigned prefixLen() const { return level + 3; } public: - NCTreeLine( NCTreeLine * p, YTreeItem * item ) + NCTreeLine( NCTreeLine * p, YTreeItem * item, bool multiSelection ) : NCTableLine( 0 ) , yitem( item ) , level( p ? p->level + 1 : 0 ) @@ -50,6 +50,7 @@ , nsibling( 0 ) , fchild( 0 ) , prefix( 0 ) + , multiSel( multiSelection ) { if ( parent ) { @@ -73,9 +74,16 @@ } } - Append( new NCTableCol( NCstring( string( prefixLen(), ' ' ) - + if ( !multiSel ) + { + Append( new NCTableCol( NCstring( string( prefixLen(), ' ' ) + yitem->label() ) ) ); + } + else + { + Append( new NCTableCol( NCstring( string( prefixLen(), ' ' ) + "[ ] " + + yitem->label() ) ) ); + } } virtual ~NCTreeLine() { delete [] prefix; } @@ -132,13 +140,14 @@ switch ( key ) { case KEY_IC: - + case '+': if ( fchild->isVisible() ) return 0; break; case KEY_DC: + case '-': if ( !fchild->isVisible() ) return 0; @@ -147,8 +156,6 @@ case KEY_SPACE: // case KEY_RETURN: see bug 67350 - case '+': - case '-': break; default: @@ -235,11 +242,18 @@ -NCTree::NCTree( YWidget * parent, const string & nlabel ) - : YTree( parent, nlabel ) +NCTree::NCTree( YWidget * parent, const string & nlabel, bool multiselection, bool recursiveselection ) + : YTree( parent, nlabel, multiselection, recursiveselection ) , NCPadWidget( parent ) + , multiSel ( multiselection ) { yuiDebug() << endl; + + if ( multiselection && recursiveselection ) + yuiMilestone() << "NCTree recursive multi selection ON" << endl; + else if ( multiselection ) + yuiMilestone() << "NCTree multi selection ON" << endl; + setLabel( nlabel ); } @@ -336,7 +350,20 @@ return yitem; } +void NCTree::deselectAllItems() +{ + if ( multiSel) + { + YItemCollection selectedItems = YTree::selectedItems(); + for ( YItemConstIterator it = selectedItems.begin(); it != selectedItems.end(); ++it ) + { + selectItem( *it, false ); + } + } + + YTree::deselectAllItems(); +} // Set current item (under the cursor) to selected @@ -348,17 +375,48 @@ YTreeItem * treeItem = dynamic_cast<YTreeItem *>( item ); YUI_CHECK_PTR( treeItem ); YTreeItem *citem = getCurrentItem(); + + //retrieve position of item + int at = treeItem->index(); + + NCTreeLine * cline = 0; // current line + NCTableCol * ccol = 0; // current column + + if ( multiSel ) + { + cline = modifyTreeLine( at ); + if ( cline ) + { + ccol = cline->GetCol(0); + } + } - if ( !selected && ( treeItem == citem ) ) + if ( !selected ) { - YTree::deselectAllItems(); + if ( !multiSel && (treeItem == citem) ) + { + YTree::deselectAllItems(); + } + else + { + YTree::selectItem ( treeItem, false ); + if ( ccol ) + { + ccol->SetLabel( NCstring( string( cline->Level() + 3, ' ' ) + "[ ] " + + item->label() ) ); + } + } } else { - //retrieve position of item - int at = treeItem->index(); - YTree::selectItem( treeItem, selected ); + + if ( multiSel && ccol ) + { + ccol->SetLabel( NCstring( string( cline->Level() + 3, ' ' ) + "[x] " + + item->label() ) ); + } + //this highlights selected item, possibly unpacks the tree //should it be in currently hidden branch myPad()->ShowItem( getTreeLine( at ) ); @@ -422,7 +480,7 @@ YTreeItem * treeItem = dynamic_cast<YTreeItem *>( item ); YUI_CHECK_PTR( treeItem ); - NCTreeLine * line = new NCTreeLine( parentLine, treeItem ); + NCTreeLine * line = new NCTreeLine( parentLine, treeItem, multiSel ); pad->Append( line ); // iterate over children @@ -433,15 +491,18 @@ } } - - +// Returns current item (pure virtual in YTree) +YTreeItem * NCTree::currentItem() +{ + return getCurrentItem(); +} // Fills TreePad with lines (uses CreateTreeLines to create them) void NCTree::DrawPad() { if ( !myPad() ) { - yuiWarning() << "PadWidget not valid" << endl; + yuiWarning() << "PadWidget not yet created" << endl; return; } @@ -463,36 +524,60 @@ NCursesEvent ret = NCursesEvent::none; YTreeItem * oldCurrentItem = getCurrentItem(); - if ( ! handleInput( key ) ) // NCTreePad::handleInput() - { - switch ( key ) - { - case KEY_SPACE: // KEY_SPACE is handled in NCTreeLine::handleInput - case KEY_RETURN: - - if ( notify() ) - { - return NCursesEvent::Activated; - } - break; - } - } - + bool handled = handleInput( key ); // NCTreePad::handleInput() const YItem * currentItem = getCurrentItem(); if ( !currentItem ) return ret; - YTree::selectItem( const_cast<YItem *>( currentItem ), true ); + if ( multiSel ) + { + if ( ! handled ) + { + switch ( key ) + { + // KEY_SPACE is handled in NCTreeLine::handleInput + case KEY_RETURN: - yuiDebug() << "Old item: " << oldCurrentItem->label() << " Current: " << currentItem->label() << endl; + if ( currentItem->selected() ) + selectItem( const_cast<YItem *>(currentItem), false ); + else + selectItem( const_cast<YItem *>(currentItem), true ); + + if ( notify() ) + { + return NCursesEvent::ValueChanged; + } + break; + } + } + } + else + { + if ( ! handled ) + { + switch ( key ) + { + // KEY_SPACE is handled in NCTreeLine::handleInput + case KEY_RETURN: - if ( notify() && immediateMode() && ( oldCurrentItem != currentItem ) ) - ret = NCursesEvent::SelectionChanged; + if ( notify() ) + { + return NCursesEvent::Activated; + } + break; + } + } + YTree::selectItem( const_cast<YItem *>( currentItem ), true ); + } - yuiDebug() << "Notify: " << ( notify() ? "true" : "false" ) << " Return event: " << ret << endl; + if ( notify() && immediateMode() && ( oldCurrentItem != currentItem ) ) + ret = NCursesEvent::SelectionChanged; + yuiDebug() << "Notify: " << ( notify() ? "true" : "false" ) << + " Return event: " << ret.reason << endl; + return ret; } Modified: branches/SuSE-Code-11-SP2-Branch/ncurses/src/NCTree.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/ncurs… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/ncurses/src/NCTree.h (original) +++ branches/SuSE-Code-11-SP2-Branch/ncurses/src/NCTree.h Tue May 24 12:22:42 2011 @@ -24,6 +24,7 @@ #include "YTree.h" #include "NCPadWidget.h" #include "NCTreePad.h" +#include "NCTablePad.h" class NCTreeLine; @@ -37,6 +38,8 @@ NCTree( const NCTree & ); int idx; + bool multiSel; + void CreateTreeLines( NCTreeLine * p, NCTreePad * pad, YItem * item ); protected: @@ -57,7 +60,7 @@ public: - NCTree( YWidget * parent, const string & label ); + NCTree( YWidget * parent, const string & label, bool multiselection=false, bool recursiveselection=false ); virtual ~NCTree(); virtual int preferredWidth(); @@ -70,6 +73,10 @@ virtual YTreeItem * getCurrentItem() const; + virtual YTreeItem * currentItem(); + + virtual void deselectAllItems(); + virtual void selectItem( YItem *item, bool selected ); virtual void selectItem( int index ); Modified: branches/SuSE-Code-11-SP2-Branch/ncurses/src/NCWidgetFactory.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/ncurs… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/ncurses/src/NCWidgetFactory.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/ncurses/src/NCWidgetFactory.cc Tue May 24 12:22:42 2011 @@ -153,9 +153,9 @@ NCTree * -NCWidgetFactory::createTree( YWidget * parent, const string & label ) +NCWidgetFactory::createTree( YWidget * parent, const string & label, bool multiselection, bool recursiveselection ) { - NCTree * tree = new NCTree( parent, label ); + NCTree * tree = new NCTree( parent, label, multiselection, recursiveselection ); YUI_CHECK_NEW( tree ); return tree; Modified: branches/SuSE-Code-11-SP2-Branch/ncurses/src/NCWidgetFactory.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/ncurs… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/ncurses/src/NCWidgetFactory.h (original) +++ branches/SuSE-Code-11-SP2-Branch/ncurses/src/NCWidgetFactory.h Tue May 24 12:22:42 2011 @@ -93,7 +93,7 @@ virtual NCRadioButton * createRadioButton ( YWidget * parent, const string & label, bool isChecked = false ); virtual NCComboBox * createComboBox ( YWidget * parent, const string & label, bool editable = false ); virtual NCSelectionBox * createSelectionBox ( YWidget * parent, const string & label ); - virtual NCTree * createTree ( YWidget * parent, const string & label ); + virtual NCTree * createTree ( YWidget * parent, const string & label, bool multiselection = false, bool recursiveselection = false ); virtual NCTable * createTable ( YWidget * parent, YTableHeader * tableHeader, bool multiSelection = false ); virtual NCProgressBar * createProgressBar ( YWidget * parent, const string & label, int maxValue = 100 ); virtual NCRichText * createRichText ( YWidget * parent, const string & text = string(), 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] r64100 - in /branches/SuSE-Code-11-SP1-Branch/qt-pkg: CMakeLists.txt COPYING MAINTAINER Makefile.cvs RPMNAME VERSION.cmake cmake/ package/ src/ yast2-qt-pkg.spec.in
by tgoettlicher＠svn2.opensuse.org 24 May '11

24 May '11

Author: tgoettlicher Date: Tue May 24 12:20:10 2011 New Revision: 64100 URL: http://svn.opensuse.org/viewcvs/yast?rev=64100&view=rev Log: backported from trunk Added: branches/SuSE-Code-11-SP1-Branch/qt-pkg/CMakeLists.txt - copied unchanged from r64098, trunk/qt-pkg/CMakeLists.txt branches/SuSE-Code-11-SP1-Branch/qt-pkg/COPYING - copied unchanged from r64098, trunk/qt-pkg/COPYING branches/SuSE-Code-11-SP1-Branch/qt-pkg/MAINTAINER - copied unchanged from r64098, trunk/qt-pkg/MAINTAINER branches/SuSE-Code-11-SP1-Branch/qt-pkg/Makefile.cvs - copied unchanged from r64098, trunk/qt-pkg/Makefile.cvs branches/SuSE-Code-11-SP1-Branch/qt-pkg/RPMNAME - copied unchanged from r64098, trunk/qt-pkg/RPMNAME branches/SuSE-Code-11-SP1-Branch/qt-pkg/VERSION.cmake - copied unchanged from r64098, trunk/qt-pkg/VERSION.cmake branches/SuSE-Code-11-SP1-Branch/qt-pkg/cmake/ - copied from r64098, trunk/qt-pkg/cmake/ branches/SuSE-Code-11-SP1-Branch/qt-pkg/package/ - copied from r64098, trunk/qt-pkg/package/ branches/SuSE-Code-11-SP1-Branch/qt-pkg/src/ - copied from r64098, trunk/qt-pkg/src/ branches/SuSE-Code-11-SP1-Branch/qt-pkg/yast2-qt-pkg.spec.in - copied unchanged from r64098, trunk/qt-pkg/yast2-qt-pkg.spec.in -- 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] r64099 - in /branches/SuSE-Code-11-SP1-Branch/qt-pkg: CMakeLists.txt COPYING MAINTAINER Makefile.cvs RPMNAME VERSION.cmake cmake/ package/ src/ yast2-qt-pkg.spec.in
by tgoettlicher＠svn2.opensuse.org 24 May '11

24 May '11

Author: tgoettlicher Date: Tue May 24 12:19:17 2011 New Revision: 64099 URL: http://svn.opensuse.org/viewcvs/yast?rev=64099&view=rev Log: deleted Removed: branches/SuSE-Code-11-SP1-Branch/qt-pkg/CMakeLists.txt branches/SuSE-Code-11-SP1-Branch/qt-pkg/COPYING branches/SuSE-Code-11-SP1-Branch/qt-pkg/MAINTAINER branches/SuSE-Code-11-SP1-Branch/qt-pkg/Makefile.cvs branches/SuSE-Code-11-SP1-Branch/qt-pkg/RPMNAME branches/SuSE-Code-11-SP1-Branch/qt-pkg/VERSION.cmake branches/SuSE-Code-11-SP1-Branch/qt-pkg/cmake/ branches/SuSE-Code-11-SP1-Branch/qt-pkg/package/ branches/SuSE-Code-11-SP1-Branch/qt-pkg/src/ branches/SuSE-Code-11-SP1-Branch/qt-pkg/yast2-qt-pkg.spec.in -- 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] r64098 - /tags/branch-Code-11-SP2-2_17_40/product-creator/
by jsuchome＠svn2.opensuse.org 24 May '11

24 May '11

Author: jsuchome Date: Tue May 24 10:38:49 2011 New Revision: 64098 URL: http://svn.opensuse.org/viewcvs/yast?rev=64098&view=rev Log: Created tag branch-Code-11-SP2-2_17_40 for product-creator Added: tags/branch-Code-11-SP2-2_17_40/product-creator/ (props changed) - copied from r64097, branches/SuSE-Code-11-SP2-Branch/product-creator/ -- 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] r64097 - /tags/branch-Code-11-SP2-2_17_40/
by jsuchome＠svn2.opensuse.org 24 May '11

24 May '11

Author: jsuchome Date: Tue May 24 10:38:44 2011 New Revision: 64097 URL: http://svn.opensuse.org/viewcvs/yast?rev=64097&view=rev Log: Created tag branch-Code-11-SP2-2_17_40 Added: tags/branch-Code-11-SP2-2_17_40/ -- 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] r64096 - in /branches/SuSE-Code-11-SP2-Branch/product-creator: ./ package/ src/ src/data/kiwi_templates/iso/ src/data/kiwi_templates/xen/
by jsuchome＠svn2.opensuse.org 24 May '11

24 May '11

Author: jsuchome Date: Tue May 24 10:38:26 2011 New Revision: 64096 URL: http://svn.opensuse.org/viewcvs/yast?rev=64096&view=rev Log: - updated to new kiwi version (fate#311430 "Update kiwi to 4.8") - 2.17.40 Modified: branches/SuSE-Code-11-SP2-Branch/product-creator/VERSION branches/SuSE-Code-11-SP2-Branch/product-creator/package/yast2-product-creator.changes branches/SuSE-Code-11-SP2-Branch/product-creator/src/Kiwi.ycp branches/SuSE-Code-11-SP2-Branch/product-creator/src/complex.ycp branches/SuSE-Code-11-SP2-Branch/product-creator/src/data/kiwi_templates/iso/config.xml branches/SuSE-Code-11-SP2-Branch/product-creator/src/data/kiwi_templates/xen/config.xml branches/SuSE-Code-11-SP2-Branch/product-creator/src/kiwi_dialogs.ycp branches/SuSE-Code-11-SP2-Branch/product-creator/src/routines.ycp Modified: branches/SuSE-Code-11-SP2-Branch/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/produ… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/product-creator/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/product-creator/VERSION Tue May 24 10:38:26 2011 @@ -1 +1 @@ -2.17.39 +2.17.40 Modified: branches/SuSE-Code-11-SP2-Branch/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/produ… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/product-creator/package/yast2-product-creator.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/product-creator/package/yast2-product-creator.changes Tue May 24 10:38:26 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed May 18 12:42:05 CEST 2011 - jsuchome(a)suse.cz + +- updated to new kiwi version (fate#311430 "Update kiwi to 4.8") +- 2.17.40 + +------------------------------------------------------------------- Tue Apr 26 10:50:33 CEST 2011 - jsuchome(a)suse.cz - better UI for locale related settings (fate#311734) Modified: branches/SuSE-Code-11-SP2-Branch/product-creator/src/Kiwi.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/produ… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/product-creator/src/Kiwi.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/product-creator/src/Kiwi.ycp Tue May 24 10:38:26 2011 @@ -233,10 +233,22 @@ y2warning ("no such file %1/config.xml", base_path); return ret; } + string file_path = base_path + "/config.xml"; + if (FileUtils::Exists ("/usr/share/kiwi/xsl/master.xsl")) + { + file_path = Directory::tmpdir + "/transformed-config.xml"; + map out = (map) SCR::Execute (.target.bash_output, sformat ( + "xsltproc /usr/share/kiwi/xsl/master.xsl %1/config.xml > %2", + base_path, file_path)); + if (out["exit"]:0 != 0) + { + y2error ("xslt transformation failed: %1", out); + } + } // read rest of config.xml using more generic agent map anyxml = (map) SCR::Read (.anyxml, $[ - "file" : base_path + "/config.xml", + "file" : file_path, "args" : $[ "ForceArray" : 1, "KeepRoot" : 1, @@ -249,7 +261,7 @@ // attributes of 'image' tag: ret["name"] = image["name"]:""; - ret["schemeversion"]= image["schemeversion"]:"2.0"; + ret["schemaversion"]= image["schemaversion"]:"5.2"; if (haskey (image, "inherit")) ret["inherit"] = image["inherit"]:""; @@ -289,7 +301,6 @@ list<string> split = splitstring (lang, "."); ret = save_preferences (ret, "locale", split[0]:lang); } - return ret; } @@ -310,8 +321,8 @@ KiwiConfig = save_preferences(KiwiConfig,"defaultroot",chroot_dir); } - string image_tag = sformat ("<image name=\"%1\" schemeversion=\"%2\"%3>", - KiwiConfig["name"]:"", KiwiConfig["schemeversion"]:"2.0", + string image_tag = sformat ("<image name=\"%1\" schemaversion=\"%2\"%3>", + KiwiConfig["name"]:"", KiwiConfig["schemaversion"]:"5.2", (KiwiConfig["inherit"]:"" == "" ? "" : sformat (" inherit=\"%1\"", KiwiConfig["inherit"]:"") Modified: branches/SuSE-Code-11-SP2-Branch/product-creator/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/produ… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/product-creator/src/complex.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/product-creator/src/complex.ycp Tue May 24 10:38:26 2011 @@ -693,10 +693,12 @@ string name = config["name"]:d; // index by order, so we can handle more configs with same name Configurations[i] = config; - string unit = config["preferences",0,"size",0,"unit"]:"M"; - string i_size = get_preferences (config, "size", 0) + unit; + map size_map = get_current_size_map (config, task); + string unit = size_map["unit"]:"M"; + string i_size = size_map[Kiwi::content_key]:"0" + unit; + // with "additive", "size" has a different meaning - if (config["preferences",0,"size",0,"additive"]:"" == "true") + if (size_map["additive"]:"" == "true") i_size = "+" + i_size; overview = add (overview, `item ( `id (i), name, Modified: branches/SuSE-Code-11-SP2-Branch/product-creator/src/data/kiwi_templates/iso/config.xml URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/produ… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/product-creator/src/data/kiwi_templates/iso/config.xml (original) +++ branches/SuSE-Code-11-SP2-Branch/product-creator/src/data/kiwi_templates/iso/config.xml Tue May 24 10:38:26 2011 @@ -1,44 +1,43 @@ -<?xml version="1.0"?> -<image schemeversion="2.0" name="kiwi-image-template"> - <description type="system"> - <author></author> - <contact></contact> - <specification>Template for system image configuration</specification> - </description> - <preferences> - <type primary="true" boot="isoboot/suse-SLES11" flags="compressed">iso</type> - <type boot="vmxboot/suse-SLES11" filesystem="ext3" format="vmdk">vmx</type> - <type boot="usbboot/suse-SLES11" filesystem="ext3">usb</type> - <type boot="xenboot/suse-SLES11" filesystem="ext3">xen</type> - <type boot="oemboot/suse-SLES11" filesystem="ext3" flags="unified">oem</type> - <version>1.0.0</version> - <size unit="M">2000</size> - <packagemanager>zypper</packagemanager> - <rpm-check-signatures>False</rpm-check-signatures> - <rpm-force>False</rpm-force> - <locale>en_US</locale> - </preferences> - <users group="users"> - <user name="linux" pwd="" home="/home/linux" realname="Live-CD User"/> - <user name="root" pwd="" home="/root"/> - </users> - <packages type="image" patternType="plusRecommended" patternPackageType="plusRecommended"> - <opensusePattern name="Minimal"/> - </packages> - <packages type="bootstrap"> - <package name="filesystem"/> - <package name="glibc-locale"/> - <package name="kernel-default"/> - <package name="udev"/> - <package name="openssl-certs"/> - </packages> - <split> - <temporary> -  - <file name="/var"/> - <file name="/var/*"/> - <file name="/etc"/> - <file name="/etc/*"/> - </temporary> - </split> +<?xml version="1.0" encoding="utf-8"?> + +<image schemaversion="5.2" name="kiwi-image-template"> + <description type="system"> + <author/> + <contact/> + <specification>Template for system image configuration</specification> + </description> + <preferences> + <type image="iso" primary="true" boot="isoboot/suse-SLES11" flags="compressed"> + <size unit="M">2000</size> + </type> + <type image="vmx" boot="vmxboot/suse-SLES11" filesystem="ext3" format="vmdk"> + <size unit="M">2000</size> + </type> + <type image="usb" boot="usbboot/suse-SLES11" filesystem="ext3"> + <size unit="M">2000</size> + </type> + <type boot="vmxboot/suse-SLES11" filesystem="ext3" image="vmx" bootkernel="xenk" bootprofile="xen">2000</type> + <type image="oem" boot="oemboot/suse-SLES11" filesystem="ext3" flags="unified"> + <size unit="M">2000</size> + </type> + <version>1.0.0</version> + <packagemanager>zypper</packagemanager> + <rpm-check-signatures>false</rpm-check-signatures> + <rpm-force>false</rpm-force> + <locale>en_US</locale> + </preferences> + <users group="users"> + <user name="linux" pwd="" home="/home/linux" realname="Live-CD User"/> + <user name="root" pwd="" home="/root"/> + </users> + <packages type="image" patternType="plusRecommended"> + <opensusePattern name="Minimal"/> + </packages> + <packages type="bootstrap"> + <package name="filesystem"/> + <package name="glibc-locale"/> + <package name="kernel-default"/> + <package name="udev"/> + <package name="openssl-certs"/> + </packages> </image> Modified: branches/SuSE-Code-11-SP2-Branch/product-creator/src/data/kiwi_templates/xen/config.xml URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/produ… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/product-creator/src/data/kiwi_templates/xen/config.xml (original) +++ branches/SuSE-Code-11-SP2-Branch/product-creator/src/data/kiwi_templates/xen/config.xml Tue May 24 10:38:26 2011 @@ -1,31 +1,31 @@ -<?xml version="1.0"?> -<image schemeversion="2.0" name="kiwi-xen-image-template"> +<?xml version="1.0" encoding="utf-8"?> + +<image schemaversion="5.2" name="kiwi-xen-image-template"> <description type="system"> - <author></author> - <contact></contact> + <author/> + <contact/> <specification>Template for system image configuration</specification> </description> <preferences> - <type boot="xenboot/suse-SLES11" filesystem="ext3">xen</type> + <type boot="vmxboot/suse-SLES11" filesystem="ext3" image="vmx" bootkernel="xenk" bootprofile="xen">2000</type> <version>1.0.0</version> - <size unit="M">2000</size> <packagemanager>zypper</packagemanager> - <rpm-check-signatures>False</rpm-check-signatures> - <rpm-force>True</rpm-force> + <rpm-check-signatures>false</rpm-check-signatures> + <rpm-force>true</rpm-force> </preferences> <users group="users"> - <user home="/home/linux" name="linux"/> - <user home="/root" name="root"/> + <user home="/home/linux" name="linux"/> + <user home="/root" name="root"/> </users> <packages type="image"> - <package name="OpenIPMI"/> + <package name="OpenIPMI"/> <package name="lvm2"/> <package name="aaa_base"/> <package name="aaa_skel"/> <package name="acl"/> <package name="acpid"/> <package name="attr"/> -  + <package name="linux32" arch="x86_64"/> <package name="bash"/> <package name="bc"/> @@ -167,7 +167,7 @@ <package name="portmap"/> <package name="cron"/> </packages> - <packages type="xen" memory="512" disk="/dev/sda"> + <packages type="xen"> <package name="kernel-xen"/> <package name="xen"/> </packages> Modified: branches/SuSE-Code-11-SP2-Branch/product-creator/src/kiwi_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/produ… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/product-creator/src/kiwi_dialogs.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/product-creator/src/kiwi_dialogs.ycp Tue May 24 10:38:26 2011 @@ -73,7 +73,7 @@ string current_method = "none"; foreach (map typemap, (list<map>)KiwiConfig["preferences",0,"type"]:[], { - if (typemap[content_key]:"" == kiwi_task) + if (typemap["image"]:"" == kiwi_task) { current_method = typemap["flags"]:current_method; } @@ -98,7 +98,7 @@ KiwiConfig["preferences",0,"type"] = maplist (map typemap, (list<map>)KiwiConfig["preferences",0,"type"]:[], { - if (typemap[content_key]:"" == kiwi_task) + if (typemap["image"]:"" == kiwi_task) { if (selected == "none") { @@ -361,29 +361,6 @@ } /** - * initialize the value of compress checkbox - */ - define void InitCompressCheckBox (string id) { - UI::ChangeWidget (`id (id), `Enabled, false); - UI::ChangeWidget (`id (id), `Value, KiwiConfig["compressed"]:false); - } - - /** - * store the value of compress checkbox - */ - define void StoreCompressCheckBox (string key, map event) { - KiwiConfig["compressed"] = (boolean) UI::QueryWidget(`id(key), `Value); - } - /** - * handler for compress checkbox - */ - define symbol HandleCompressCheckBox (string key, map event) { - // store the value on exiting - if (event["ID"]:nil == `next) StoreCompressCheckBox (key, event); - return nil; - } - - /** * initialize the value of version */ define void InitVersion (string id) { @@ -411,42 +388,40 @@ } /** - * initialize the value of size unit + * initialize the values of "size", "sizeunit" and "additive" widgets */ - define void InitSizeUnitCombo (string id) { - string unit = KiwiConfig["preferences",0,"size",0,"unit"]:"M"; - UI::ChangeWidget (`id (id), `Items, maplist (string u, [ "M", "G" ], ``( - `item (`id (u), u + "B", unit == u)) - )); - } + define void InitSize (string id) { - /** - * initialize the value of 'additive' - */ - define void InitAdditiveCheckBox (string id) { - boolean additive = KiwiConfig["preferences",0,"size",0,"additive"]:"" == "true"; - UI::ChangeWidget (`id (id), `Value, additive); - } + map size_map = get_current_size_map (KiwiConfig, kiwi_task); - /** - * initialize the value of version - */ - define void InitSize (string id) { - integer siz = tointeger (get_preferences (KiwiConfig, "size", "2000")); - if (siz == nil) siz = 2000; - UI::ChangeWidget (`id (id), `Value, siz); + integer siz = tointeger (size_map[Kiwi::content_key]:"0"); + if (siz == nil) siz = 0; + UI::ChangeWidget (`id ("size"), `Value, siz); + UI::ChangeWidget (`id ("additive"), `Value, size_map["additive"]:"" == "true"); + UI::ChangeWidget (`id ("sizeunit"), `Items, maplist (string u, [ "M", "G" ], ``( + `item (`id (u), u + "B", size_map["unit"]:"M" == u)) + )); } /** - * store the size value + * store the values of "size", "sizeunit" and "additive" widgets */ define void StoreSize (string key, map event) { - KiwiConfig["preferences",0,"size"] = [ $[ - content_key : sformat ("%1", UI::QueryWidget(`id(key), `Value)), - "unit" : UI::QueryWidget (`id ("sizeunit"), `Value), - "additive" : ((boolean) UI::QueryWidget (`id ("additive"), `Value)) - ? "true" : "false" - ]]; + + KiwiConfig["preferences",0,"type"] = maplist (map typemap, + (list<map>)KiwiConfig["preferences",0,"type"]:[], + { + if (typemap["image"]:"" == kiwi_task) + { + typemap["size"] = [ $[ + content_key : sformat ("%1", UI::QueryWidget(`id(key), `Value)), + "unit" : UI::QueryWidget (`id ("sizeunit"), `Value), + "additive" : ((boolean) UI::QueryWidget (`id ("additive"), `Value)) ? "true" : "false", + ] ]; + } + return typemap; + }); + } /** @@ -1322,22 +1297,10 @@ if (FileUtils::CheckAndCreatePath (out_dir) && Kiwi::PrepareAndCreate (out_dir, selected_profiles)) { - if (kiwi_task == "usb" && false) - { - // additional question (yes/no) - if (Popup::YesNo (sformat (success[kiwi_task]:"", out_dir) + _(" -Save the image to the stick now?"))) - { - NotImplementedHandler ("", $[ "ID" : ""]); - } - } - else - { - // default popup message, %1 is a dir - Popup::Message (sformat (success[kiwi_task]:_("Image successfully created in + // default popup message, %1 is a dir + Popup::Message (sformat (success[kiwi_task]:_("Image successfully created in %1 directory."), out_dir)); - } } else { @@ -1505,8 +1468,8 @@ KiwiConfig["preferences",0,"type"] = maplist ( map typemap, (list<map>)pref[0,"type"]:[], { - string type = typemap[content_key]:""; - if (typemap["primary"]:"false" == "true" && type != kiwi_task) + string type = typemap["image"]:""; + if (tolower (typemap["primary"]:"false") == "true" && type != kiwi_task) typemap = remove (typemap, "primary"); else if (type == kiwi_task) { @@ -1530,7 +1493,7 @@ map<string,any> def_map = Kiwi::ReadConfigXML (default_dir); foreach (map typemap, (list<map>)def_map["preferences",0,"type"]:[], { - if (typemap[content_key]:"" == kiwi_task) + if (typemap["image"]:"" == kiwi_task) { KiwiConfig["preferences",0,"type"] = add ( KiwiConfig["preferences",0,"type"]:[], typemap); @@ -1598,7 +1561,7 @@ // compression not allowed in most cases (bnc#510833) foreach (map typemap, (list<map>)KiwiConfig["preferences",0,"type"]:[], { - if (typemap[content_key]:"" == kiwi_task) + if (typemap["image"]:"" == kiwi_task) { if (typemap["filesystem"]:"" == "ext3") show_compression = false; @@ -1738,16 +1701,6 @@ "validate_function" : CreateImage, "no_help" : true, ], - // widgets for config.xml tab - "compressed" : $[ - "widget" : `checkbox, - // textentry label - "label" : _("Co&mpress"), - "help" : _("Check Compress if the final image should be based \non the squashfs compressed file system."), - "init" : InitCompressCheckBox, - "store" : StoreCompressCheckBox, - "handle" : HandleCompressCheckBox, - ], "compression" : $[ "widget" : `combobox, "opt" : [ `hstretch, `notify ], @@ -1833,7 +1786,6 @@ "label" : _("&Unit"), "no_help" : true, "items" : [], - "init" : InitSizeUnitCombo, // stored and handled by "size" ], "additive" : $[ @@ -1841,7 +1793,6 @@ // check box label "label" : _("Additive"), "no_help" : true, - "init" : InitAdditiveCheckBox, ], // ---------------- widgtes for directory structure "general_scripts" : $[ @@ -2259,7 +2210,7 @@ list type_its = []; //solve `back here (=no import) foreach (map typemap, (list<map>) Config["preferences",0,"type"]:[], { - string type = typemap[content_key]:""; + string type = typemap["image"]:""; type_its = add (type_its, `item (`id (type), task2label[type]:type, type == kiwi_task)); }); @@ -2334,8 +2285,8 @@ kiwi_task = ""; foreach (map typemap, (list<map>) Config["preferences",0,"type"]:[], { - string type = typemap[content_key]:""; - if (typemap["primary"]:"false" == "true" || kiwi_task == "") + string type = typemap["image"]:""; + if (tolower (typemap["primary"]:"false") == "true" || kiwi_task == "") kiwi_task = type; if ((supported_images == "" && !contains (present_types, type)) || supported_images == "template") Modified: branches/SuSE-Code-11-SP2-Branch/product-creator/src/routines.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/produ… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/product-creator/src/routines.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/product-creator/src/routines.ycp Tue May 24 10:38:26 2011 @@ -41,10 +41,10 @@ string task = ""; foreach (map typemap, (list<map>) config["preferences",0,"type"]:[], { if (task == "") // take the 1st one if none is default - task = typemap[Kiwi::content_key]:task; - if (typemap["primary"]:"false" == "true") + task = typemap["image"]:task; + if (tolower (typemap["primary"]:"false") == "true") { - task = typemap[Kiwi::content_key]:task; + task = typemap["image"]:task; break; } }); @@ -55,12 +55,24 @@ return task; } +// return the size info for current image type +map get_current_size_map (map config, string task) { + + map ret = $[]; + foreach (map typemap, (list<map>) config["preferences",0,"type"]:[], { + if (task == typemap["image"]:"") + ret = typemap["size",0]:$[]; + }); + return ret; +} + + // get the value of boot image directory string get_bootdir (map config, string task) { string dir = ""; foreach (map typemap, (list<map>) config["preferences",0,"type"]:[], { - if (task == typemap[Kiwi::content_key]:"") + if (task == typemap["image"]:"") { dir = typemap["boot"]:""; break; -- 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] r64095 - /tags/stable-2_21_3/product-creator/
by jsuchome＠svn2.opensuse.org 24 May '11

24 May '11

Author: jsuchome Date: Tue May 24 10:34:12 2011 New Revision: 64095 URL: http://svn.opensuse.org/viewcvs/yast?rev=64095&view=rev Log: Created tag stable-2_21_3 for product-creator Added: tags/stable-2_21_3/product-creator/ - copied from r64094, trunk/product-creator/ -- 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] r64094 - in /trunk/product-creator: ./ package/ src/ src/data/kiwi_templates/iso/ src/data/kiwi_templates/xen/
by jsuchome＠svn2.opensuse.org 24 May '11

24 May '11

Author: jsuchome Date: Tue May 24 10:34:00 2011 New Revision: 64094 URL: http://svn.opensuse.org/viewcvs/yast?rev=64094&view=rev Log: - updated to new kiwi version (fate#311430 "Update kiwi to 4.8") - 2.21.3 Modified: trunk/product-creator/VERSION trunk/product-creator/package/yast2-product-creator.changes trunk/product-creator/src/Kiwi.ycp trunk/product-creator/src/complex.ycp trunk/product-creator/src/data/kiwi_templates/iso/config.xml trunk/product-creator/src/data/kiwi_templates/xen/config.xml trunk/product-creator/src/kiwi_dialogs.ycp trunk/product-creator/src/routines.ycp Modified: trunk/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/VERSION?rev=6409… ============================================================================== --- trunk/product-creator/VERSION (original) +++ trunk/product-creator/VERSION Tue May 24 10:34:00 2011 @@ -1 +1 @@ -2.21.2 +2.21.3 Modified: trunk/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/package/yast2-pr… ============================================================================== --- trunk/product-creator/package/yast2-product-creator.changes (original) +++ trunk/product-creator/package/yast2-product-creator.changes Tue May 24 10:34:00 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue May 24 10:11:06 CEST 2011 - jsuchome(a)suse.cz + +- updated to new kiwi version (fate#311430 "Update kiwi to 4.8") +- 2.21.3 + +------------------------------------------------------------------- Fri May 13 09:59:46 CEST 2011 - jsuchome(a)suse.cz - better UI for locale related settings (fate#311734) Modified: trunk/product-creator/src/Kiwi.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/Kiwi.ycp?rev… ============================================================================== --- trunk/product-creator/src/Kiwi.ycp (original) +++ trunk/product-creator/src/Kiwi.ycp Tue May 24 10:34:00 2011 @@ -233,10 +233,22 @@ y2warning ("no such file %1/config.xml", base_path); return ret; } + string file_path = base_path + "/config.xml"; + if (FileUtils::Exists ("/usr/share/kiwi/xsl/master.xsl")) + { + file_path = Directory::tmpdir + "/transformed-config.xml"; + map out = (map) SCR::Execute (.target.bash_output, sformat ( + "xsltproc /usr/share/kiwi/xsl/master.xsl %1/config.xml > %2", + base_path, file_path)); + if (out["exit"]:0 != 0) + { + y2error ("xslt transformation failed: %1", out); + } + } // read rest of config.xml using more generic agent map anyxml = (map) SCR::Read (.anyxml, $[ - "file" : base_path + "/config.xml", + "file" : file_path, "args" : $[ "ForceArray" : 1, "KeepRoot" : 1, @@ -249,7 +261,7 @@ // attributes of 'image' tag: ret["name"] = image["name"]:""; - ret["schemeversion"]= image["schemeversion"]:"2.0"; + ret["schemaversion"]= image["schemaversion"]:"5.2"; if (haskey (image, "inherit")) ret["inherit"] = image["inherit"]:""; @@ -289,7 +301,6 @@ list<string> split = splitstring (lang, "."); ret = save_preferences (ret, "locale", split[0]:lang); } - return ret; } @@ -310,8 +321,8 @@ KiwiConfig = save_preferences(KiwiConfig,"defaultroot",chroot_dir); } - string image_tag = sformat ("<image name=\"%1\" schemeversion=\"%2\"%3>", - KiwiConfig["name"]:"", KiwiConfig["schemeversion"]:"2.0", + string image_tag = sformat ("<image name=\"%1\" schemaversion=\"%2\"%3>", + KiwiConfig["name"]:"", KiwiConfig["schemaversion"]:"5.2", (KiwiConfig["inherit"]:"" == "" ? "" : sformat (" inherit=\"%1\"", KiwiConfig["inherit"]:"") Modified: trunk/product-creator/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/complex.ycp?… ============================================================================== --- trunk/product-creator/src/complex.ycp (original) +++ trunk/product-creator/src/complex.ycp Tue May 24 10:34:00 2011 @@ -697,10 +697,12 @@ string name = config["name"]:d; // index by order, so we can handle more configs with same name Configurations[i] = config; - string unit = config["preferences",0,"size",0,"unit"]:"M"; - string i_size = get_preferences (config, "size", 0) + unit; + map size_map = get_current_size_map (config, task); + string unit = size_map["unit"]:"M"; + string i_size = size_map[Kiwi::content_key]:"0" + unit; + // with "additive", "size" has a different meaning - if (config["preferences",0,"size",0,"additive"]:"" == "true") + if (size_map["additive"]:"" == "true") i_size = "+" + i_size; overview = add (overview, `item ( `id (i), name, Modified: trunk/product-creator/src/data/kiwi_templates/iso/config.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/data/kiwi_te… ============================================================================== --- trunk/product-creator/src/data/kiwi_templates/iso/config.xml (original) +++ trunk/product-creator/src/data/kiwi_templates/iso/config.xml Tue May 24 10:34:00 2011 @@ -1,735 +1,51 @@ -<?xml version="1.0"?> -<image schemeversion="2.4" name="kiwi-image-template"> - <description type="system"> - <author></author> - <contact></contact> - <specification>Template for system image configuration</specification> - </description> - <preferences> - <type primary="true" boot="isoboot/suse-11.2" bootprofile="default" bootkernel="desktop" flags="clic" hybrid="true">iso</type> - <type boot="vmxboot/suse-11.1" filesystem="ext3" format="vmdk">vmx</type> - <type boot="usbboot/suse-11.1" filesystem="ext3">usb</type> - <type boot="xenboot/suse-11.1" filesystem="ext3">xen</type> - <type boot="oemboot/suse-11.1" filesystem="ext3" flags="unified">oem</type> - <version>1.0.0</version> - <packagemanager>zypper</packagemanager> - <size unit="M">3000</size> - <boot-theme>openSUSE</boot-theme> - <rpm-check-signatures>false</rpm-check-signatures> - <rpm-force>false</rpm-force> - <locale>en_US</locale> - <oem-swap>false</oem-swap> - <oem-boot-title>USB</oem-boot-title> - <rpm-excludedocs>false</rpm-excludedocs> - </preferences> - <users group="users"> - <user name="linux" pwd="" home="/home/linux" realname="Live-CD User"/> - <user name="root" pwd="" home="/root"/> - </users> - <repository type="rpm-md"> - <source path="http://download.opensuse.org/repositories/openSUSE:/Factory:/Live/standard/"/> - </repository> - <packages type="image" patternPackageType="onlyRequired"> - <package name="bootsplash-branding-openSUSE" bootinclude="true" bootdelete="true"/> - <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true"/> - <package name="yast2-live-installer"/> - <package name="pam"/> - <package name="pam-config"/> - <package name="pam-modules"/> - <package name="udev"/> - <package name="aaa_base"/> - <package name="tar"/> - <package name="patch"/> - <package name="zypper"/> -  - <package name="ConsoleKit"/> - <package name="ConsoleKit-x11"/> - <package name="DeviceKit-disks"/> - <package name="DirectFB"/> - <package name="ImageMagick"/> - <package name="Mesa"/> - <package name="MozillaSunbird"/> - <package name="MozillaSunbird-translations"/> - <package name="PolicyKit"/> - <package name="PolicyKit-doc"/> - <package name="SuSEfirewall2"/> - <package name="a2ps"/> - <package name="aaa_base"/> - <package name="acl"/> - <package name="acpica"/> - <package name="acpid"/> - <package name="adaptec-firmware"/> - <package name="alsa"/> - <package name="alsa-firmware"/> - <package name="alsa-oss"/> - <package name="alsa-plugins"/> - <package name="alsa-utils"/> - <package name="apparmor-parser"/> - <package name="apparmor-profiles"/> - <package name="apparmor-utils"/> - <package name="aria2"/> - <package name="aspell"/> - <package name="aspell-de"/> - <package name="aspell-en"/> - <package name="atk"/> - <package name="atmel-firmware"/> - <package name="attr"/> - <package name="audiofile"/> - <package name="audit"/> - <package name="audit-libs"/> - <package name="augeas-lenses"/> - <package name="autofs"/> - <package name="autoyast2-installation"/> - <package name="awesfx"/> - <package name="b43-fwcutter"/> - <package name="bash"/> - <package name="bc"/> - <package name="bind-libs"/> - <package name="bind-utils"/> - <package name="bluez-firmware"/> - <package name="bootsplash"/> - <package name="bootsplash-branding-openSUSE"/> - <package name="branding-openSUSE"/> - <package name="btrfsprogs"/> - <package name="bundle-lang-common-de"/> - <package name="bundle-lang-common-en"/> - <package name="bzip2"/> - <package name="cabextract"/> - <package name="cairo"/> - <package name="cdrkit-cdrtools-compat"/> - <package name="checkmedia"/> - <package name="cifs-mount"/> - <package name="command-not-found"/> - <package name="compcache"/> - <package name="compcache-kmp-desktop"/> - <package name="coreutils"/> - <package name="cpio"/> - <package name="cpp"/> - <package name="cpp44"/> - <package name="cracklib"/> - <package name="cracklib-dict-full"/> - <package name="crda"/> - <package name="cron"/> - <package name="cryptsetup"/> - <package name="cups"/> - <package name="cups-client"/> - <package name="cups-drivers"/> - <package name="cups-libs"/> - <package name="curl"/> - <package name="cyrus-sasl"/> - <package name="cyrus-sasl-crammd5"/> - <package name="cyrus-sasl-digestmd5"/> - <package name="cyrus-sasl-gssapi"/> - <package name="cyrus-sasl-plain"/> - <package name="db-utils"/> - <package name="dbus-1"/> - <package name="dbus-1-glib"/> - <package name="dbus-1-x11"/> - <package name="ddrescue"/> - <package name="dejavu"/> - <package name="deltarpm"/> - <package name="desktop-data-openSUSE"/> - <package name="desktop-file-utils"/> - <package name="device-mapper"/> - <package name="dhcpcd"/> - <package name="dialog"/> - <package name="diffutils"/> - <package name="dirmngr"/> - <package name="dmidecode"/> - <package name="dmraid"/> - <package name="dosfstools"/> - <package name="dvb"/> - <package name="e2fsprogs"/> - <package name="eject"/> - <package name="elfutils"/> - <package name="esound-daemon"/> - <package name="espeak"/> - <package name="ethtool"/> - <package name="fam"/> - <package name="fbset"/> - <package name="file"/> - <package name="filesystem"/> - <package name="fillup"/> - <package name="findutils"/> - <package name="fontconfig"/> - <package name="fonts-config"/> - <package name="foomatic-filters"/> - <package name="freeglut"/> - <package name="freetype2"/> - <package name="fuse"/> - <package name="gawk"/> - <package name="gconf2"/> - <package name="gd"/> - <package name="gdbm"/> - <package name="genisoimage"/> - <package name="gettext-runtime"/> - <package name="gfxboot"/> - <package name="gfxboot-branding-openSUSE"/> - <package name="ghostscript-fonts-std"/> - <package name="ghostscript-library"/> - <package name="ghostscript-x11"/> - <package name="glib2"/> - <package name="glib2-branding-openSUSE"/> - <package name="glibc"/> - <package name="glibc-32bit"/> - <package name="glibc-locale"/> - <package name="glibc-locale-32bit"/> - <package name="gnome-icon-theme"/> - <package name="gnome-keyring"/> - <package name="gnome-vfs2"/> - <package name="gnutls"/> - <package name="gpart"/> - <package name="gpg2"/> - <package name="gpm"/> - <package name="grep"/> - <package name="groff"/> - <package name="grub"/> - <package name="gtk2"/> - <package name="gtk2-branding-openSUSE"/> - <package name="gtk2-engine-murrine"/> - <package name="gtk2-engines"/> - <package name="gtk2-metatheme-gilouche"/> - <package name="gtk2-metatheme-sonar"/> - <package name="gvfs"/> - <package name="gvfs-backends"/> - <package name="gvfs-fuse"/> - <package name="gzip"/> - <package name="hal"/> - <package name="hdparm"/> - <package name="hicolor-icon-theme"/> - <package name="hwinfo"/> - <package name="icedax"/> - <package name="icewm"/> - <package name="icewm-lite"/> - <package name="ifnteuro"/> - <package name="ifplugd"/> - <package name="info"/> - <package name="info2html"/> - <package name="initviocons"/> - <package name="input-utils"/> - <package name="insserv"/> - <package name="iproute2"/> - <package name="iptables"/> - <package name="iputils"/> - <package name="ipw-firmware"/> - <package name="irda"/> - <package name="irqbalance"/> - <package name="iw"/> - <package name="jfsutils"/> - <package name="kbd"/> - <package name="kernel-desktop"/> - <package name="kernel-firmware"/> - <package name="keyutils"/> - <package name="keyutils-libs"/> - <package name="klogd"/> - <package name="kpartx"/> - <package name="krb5"/> - <package name="krb5-client"/> - <package name="lcms"/> - <package name="less"/> - <package name="libFLAC8"/> - <package name="libHX18"/> - <package name="libMagickCore2"/> - <package name="libMagickWand2"/> - <package name="libSDL-1_2-0"/> - <package name="libacl"/> - <package name="libadns1"/> - <package name="libaio"/> - <package name="libapparmor1"/> - <package name="libarchive2"/> - <package name="libart_lgpl"/> - <package name="libasm1"/> - <package name="libasound2"/> - <package name="libatasmart4"/> - <package name="libatk-1_0-0"/> - <package name="libattr"/> - <package name="libaugeas0"/> - <package name="libavahi-client3"/> - <package name="libavahi-common3"/> - <package name="libavahi-glib1"/> - <package name="libblkid1"/> - <package name="libblocxx6"/> - <package name="libbluetooth3"/> - <package name="libbonobo"/> - <package name="libbonoboui"/> - <package name="libbonoboui-lang"/> - <package name="libbz2-1"/> - <package name="libcap2"/> - <package name="libcdio10"/> - <package name="libcdio_cdda0"/> - <package name="libcdio_paranoia0"/> - <package name="libcloog0"/> - <package name="libcom_err2"/> - <package name="libcryptsetup0"/> - <package name="libcurl4"/> - <package name="libdaemon0"/> - <package name="libdb-4_5"/> - <package name="libdns_sd"/> - <package name="libdrm"/> - <package name="libdw1"/> - <package name="libeggdbus-1-0"/> - <package name="libelf1"/> - <package name="liberation-fonts"/> - <package name="libesd0"/> - <package name="libevent-1_4-2"/> - <package name="libexif"/> - <package name="libexpat1"/> - <package name="libext2fs2"/> - <package name="libfprint0"/> - <package name="libfreebl3"/> - <package name="libfuse2"/> - <package name="libgcc44"/> - <package name="libgcrypt11"/> - <package name="libgdu0"/> - <package name="libgimpprint"/> - <package name="libgio-2_0-0"/> - <package name="libgio-fam"/> - <package name="libglade2"/> - <package name="libglib-2_0-0"/> - <package name="libgmodule-2_0-0"/> - <package name="libgmp3"/> - <package name="libgmpxx4"/> - <package name="libgnome"/> - <package name="libgnomecanvas"/> - <package name="libgnomecanvas-lang"/> - <package name="libgnomeui"/> - <package name="libgnomeui-lang"/> - <package name="libgnutls26"/> - <package name="libgobject-2_0-0"/> - <package name="libgomp44"/> - <package name="libgpg-error0"/> - <package name="libgphoto2"/> - <package name="libgssglue1"/> - <package name="libgthread-2_0-0"/> - <package name="libgudev-1_0-0"/> - <package name="libgvfscommon0"/> - <package name="libidl"/> - <package name="libidn"/> - <package name="libiw30"/> - <package name="libjasper"/> - <package name="libjpeg"/> - <package name="libksba"/> - <package name="liblcms1"/> - <package name="libldap-2_4-2"/> - <package name="libldapcpp1"/> - <package name="libltdl7"/> - <package name="liblua5_1"/> - <package name="liblzma0"/> - <package name="liblzo2-2"/> - <package name="libmng"/> - <package name="libmpfr1"/> - <package name="libmysqlclient_r16"/> - <package name="libncurses5"/> - <package name="libncurses5-32bit"/> - <package name="libncurses6"/> - <package name="libnetpbm10"/> - <package name="libnl"/> - <package name="libnscd"/> - <package name="libnsssharedhelper0"/> - <package name="libnuma1"/> - <package name="libogg0"/> - <package name="libopenct1"/> - <package name="libopensc2"/> - <package name="libopenssl0_9_8"/> - <package name="libpcap1"/> - <package name="libpciaccess0"/> - <package name="libpcre0"/> - <package name="libpixman-1-0"/> - <package name="libpng12-0"/> - <package name="libpolkit0"/> - <package name="libpoppler5"/> - <package name="libpopt0"/> - <package name="libppl7"/> - <package name="libppl_c2"/> - <package name="libproxy0"/> - <package name="libproxy0-config-gnome"/> - <package name="libproxy0-pacrunner-mozjs"/> - <package name="libproxy0-wpad-dns"/> - <package name="libpth20"/> - <package name="libpulse0"/> - <package name="libpython2_6-1_0"/> - <package name="libqt4"/> - <package name="libqt4-qt3support"/> - <package name="libqt4-sql"/> - <package name="libqt4-sql-mysql"/> - <package name="libqt4-x11"/> - <package name="libreadline6"/> - <package name="libreiserfs"/> - <package name="librpcsecgss"/> - <package name="libselinux1"/> - <package name="libsmbclient0"/> - <package name="libsmbios-bin"/> - <package name="libsmbios2"/> - <package name="libsndfile"/> - <package name="libsoup-2_4-1"/> - <package name="libsqlite3-0"/> - <package name="libstdc++44"/> - <package name="libstorage"/> - <package name="libtalloc1"/> - <package name="libtasn1"/> - <package name="libtasn1-3"/> - <package name="libtdb1"/> - <package name="libtiff3"/> - <package name="libtirpc1"/> - <package name="libudev0"/> - <package name="libusb-0_1-4"/> - <package name="libusb-1_0-0"/> - <package name="libuuid1"/> - <package name="libvorbis"/> - <package name="libwbclient0"/> - <package name="libx86"/> - <package name="libx86emu1"/> - <package name="libxcrypt"/> - <package name="libxml2"/> - <package name="libzio"/> - <package name="libzypp"/> - <package name="licenses"/> - <package name="limal"/> - <package name="limal-ca-mgm"/> - <package name="limal-ca-mgm-perl"/> - <package name="limal-nfs-server"/> - <package name="limal-nfs-server-perl"/> - <package name="limal-perl"/> - <package name="linux-atm-lib"/> - <package name="linux32"/> - <package name="login"/> - <package name="logrotate"/> - <package name="lomoco"/> - <package name="lsb-release"/> - <package name="lsof"/> - <package name="lsscsi"/> - <package name="lukemftp"/> - <package name="lvm2"/> - <package name="mailx"/> - <package name="man"/> - <package name="manufacturer-PPDs"/> - <package name="master-boot-code"/> - <package name="mc"/> - <package name="mdadm"/> - <package name="memtest86+"/> - <package name="mhash"/> - <package name="microcode_ctl"/> - <package name="mingetty"/> - <package name="mkinitrd"/> - <package name="module-init-tools"/> - <package name="mozilla-nspr"/> - <package name="mozilla-nss"/> - <package name="mpt-firmware"/> - <package name="mtools"/> - <package name="multipath-tools"/> - <package name="nano"/> - <package name="ncurses-utils"/> - <package name="ndiswrapper"/> - <package name="ndiswrapper-kmp-desktop"/> - <package name="net-tools"/> - <package name="netcat"/> - <package name="netcfg"/> - <package name="netpbm"/> - <package name="nfs-client"/> - <package name="nfsidmap"/> - <package name="nss_ldap"/> - <package name="ntfs-3g"/> - <package name="ntfsprogs"/> - <package name="ntp"/> - <package name="numactl"/> - <package name="numlockx"/> - <package name="obex-data-server"/> - <package name="openSUSE-build-key"/> - <package name="openSUSE-release"/> - <package name="openldap2-client"/> - <package name="openobex"/> - <package name="openslp"/> - <package name="openssh"/> - <package name="openssh-askpass"/> - <package name="openssl"/> - <package name="openssl-certs"/> - <package name="opensuse-manuals_en"/> - <package name="orbit2"/> - <package name="pam"/> - <package name="pam-config"/> - <package name="pam-modules"/> - <package name="pam_apparmor"/> - <package name="pam_fp"/> - <package name="pam_krb5"/> - <package name="pam_ldap"/> - <package name="pam_mount"/> - <package name="pango"/> - <package name="parted"/> - <package name="patterns-openSUSE-apparmor"/> - <package name="patterns-openSUSE-base"/> - <package name="patterns-openSUSE-enhanced_base"/> - <package name="patterns-openSUSE-fonts"/> - <package name="patterns-openSUSE-sw_management"/> - <package name="patterns-openSUSE-x11"/> - <package name="patterns-openSUSE-x11_yast"/> - <package name="patterns-openSUSE-yast2_basis"/> - <package name="patterns-openSUSE-yast2_install_wf"/> - <package name="pciutils"/> - <package name="pciutils-ids"/> - <package name="pcmciautils"/> - <package name="pcre"/> - <package name="perl"/> - <package name="perl-Bootloader"/> - <package name="perl-Business-ISBN"/> - <package name="perl-Business-ISBN-Data"/> - <package name="perl-Config-Crontab"/> - <package name="perl-Crypt-SSLeay"/> - <package name="perl-Crypt-SmbHash"/> - <package name="perl-DBD-SQLite"/> - <package name="perl-DBI"/> - <package name="perl-Digest-HMAC"/> - <package name="perl-Digest-MD4"/> - <package name="perl-Digest-SHA1"/> - <package name="perl-File-Tail"/> - <package name="perl-GD"/> - <package name="perl-GD-Barcode"/> - <package name="perl-HTML-Parser"/> - <package name="perl-HTML-Tagset"/> - <package name="perl-Net-Daemon"/> - <package name="perl-NetxAP"/> - <package name="perl-Parse-RecDescent"/> - <package name="perl-PlRPC"/> - <package name="perl-RPC-XML"/> - <package name="perl-TermReadKey"/> - <package name="perl-TimeDate"/> - <package name="perl-URI"/> - <package name="perl-WWW-Curl"/> - <package name="perl-X500-DN"/> - <package name="perl-XML-LibXML"/> - <package name="perl-XML-LibXML-Common"/> - <package name="perl-XML-NamespaceSupport"/> - <package name="perl-XML-Parser"/> - <package name="perl-XML-SAX"/> - <package name="perl-XML-Simple"/> - <package name="perl-XML-Writer"/> - <package name="perl-XML-XPath"/> - <package name="perl-base"/> - <package name="perl-gettext"/> - <package name="perl-libapparmor"/> - <package name="perl-libwww-perl"/> - <package name="permissions"/> - <package name="pinentry"/> - <package name="pkg-config"/> - <package name="pm-profiler"/> - <package name="pm-utils"/> - <package name="polkit"/> - <package name="polkit-default-privs"/> - <package name="poppler-tools"/> - <package name="postfix"/> - <package name="ppp"/> - <package name="pptp"/> - <package name="preload"/> - <package name="preload-kmp-desktop"/> - <package name="procps"/> - <package name="psmisc"/> - <package name="pullin-flash-player"/> - <package name="pullin-msttf-fonts"/> - <package name="pwdutils"/> - <package name="python"/> - <package name="python-base"/> - <package name="python-satsolver"/> - <package name="python-xml"/> - <package name="quota"/> - <package name="recode"/> - <package name="reiserfs"/> - <package name="release-notes-openSUSE"/> - <package name="rpcbind"/> - <package name="rpm"/> - <package name="rpm-python"/> - <package name="rsync"/> - <package name="rsyslog"/> - <package name="satsolver-tools"/> - <package name="sax2"/> - <package name="sax2-gui"/> - <package name="sax2-ident"/> - <package name="sax2-libsax"/> - <package name="sax2-libsax-perl"/> - <package name="sax2-tools"/> - <package name="sbl"/> - <package name="scout"/> - <package name="scpm"/> - <package name="sed"/> - <package name="setserial"/> - <package name="sg3_utils"/> - <package name="shared-mime-info"/> - <package name="slang"/> - <package name="smartmontools"/> - <package name="smp_utils"/> - <package name="smpppd"/> - <package name="splashy"/> - <package name="splashy-branding-openSUSE"/> - <package name="strace"/> - <package name="sudo"/> - <package name="suseRegister"/> - <package name="susehelp"/> - <package name="susehelp_de"/> - <package name="susehelp_en"/> - <package name="suspend"/> - <package name="sysconfig"/> - <package name="sysfsutils"/> - <package name="systemtap-runtime"/> - <package name="sysvinit"/> - <package name="tar"/> - <package name="tcpd"/> - <package name="terminfo-base"/> - <package name="tightvnc"/> - <package name="timezone"/> - <package name="translation-update"/> - <package name="translation-update-de"/> - <package name="udev"/> - <package name="ulimit"/> - <package name="unrar"/> - <package name="unscd"/> - <package name="unzip"/> - <package name="update-alternatives"/> - <package name="usbutils"/> - <package name="utempter"/> - <package name="util-linux"/> - <package name="vim"/> - <package name="vim-base"/> - <package name="virtualbox-ose-kmp-desktop"/> - <package name="w3m"/> - <package name="wdiff"/> - <package name="wget"/> - <package name="wireless-regdb"/> - <package name="wireless-tools"/> - <package name="wodim"/> - <package name="wpa_supplicant"/> - <package name="wvdial"/> - <package name="wvstreams"/> - <package name="x11-input-fujitsu"/> - <package name="x11-input-wacom"/> - <package name="x11-tools"/> - <package name="xdg-menu"/> - <package name="xdg-utils"/> - <package name="xfsdump"/> - <package name="xfsprogs"/> - <package name="xinetd"/> - <package name="xkeyboard-config"/> - <package name="xorg-x11"/> - <package name="xorg-x11-Xvnc"/> - <package name="xorg-x11-driver-input"/> - <package name="xorg-x11-driver-video"/> - <package name="xorg-x11-driver-video-radeonhd"/> - <package name="xorg-x11-driver-virtualbox-ose"/> - <package name="xorg-x11-fonts-core"/> - <package name="xorg-x11-libICE"/> - <package name="xorg-x11-libSM"/> - <package name="xorg-x11-libX11"/> - <package name="xorg-x11-libX11-ccache"/> - <package name="xorg-x11-libXau"/> - <package name="xorg-x11-libXdmcp"/> - <package name="xorg-x11-libXext"/> - <package name="xorg-x11-libXfixes"/> - <package name="xorg-x11-libXmu"/> - <package name="xorg-x11-libXp"/> - <package name="xorg-x11-libXpm"/> - <package name="xorg-x11-libXprintUtil"/> - <package name="xorg-x11-libXrender"/> - <package name="xorg-x11-libXt"/> - <package name="xorg-x11-libXv"/> - <package name="xorg-x11-libfontenc"/> - <package name="xorg-x11-libs"/> - <package name="xorg-x11-libxcb"/> - <package name="xorg-x11-libxkbfile"/> - <package name="xorg-x11-server"/> - <package name="xorg-x11-xauth"/> - <package name="xstroke"/> - <package name="xterm"/> - <package name="xz"/> - <package name="yast2"/> - <package name="yast2-add-on"/> - <package name="yast2-apparmor"/> - <package name="yast2-backup"/> - <package name="yast2-bootloader"/> - <package name="yast2-branding-openSUSE"/> - <package name="yast2-control-center"/> - <package name="yast2-control-center-qt"/> - <package name="yast2-core"/> - <package name="yast2-country"/> - <package name="yast2-country-data"/> - <package name="yast2-dbus-client"/> - <package name="yast2-fingerprint-reader"/> - <package name="yast2-firewall"/> - <package name="yast2-hardware-detection"/> - <package name="yast2-inetd"/> - <package name="yast2-installation"/> - <package name="yast2-irda"/> - <package name="yast2-iscsi-client"/> - <package name="yast2-kerberos-client"/> - <package name="yast2-ldap"/> - <package name="yast2-ldap-client"/> - <package name="yast2-libyui"/> - <package name="yast2-mail"/> - <package name="yast2-metapackage-handler"/> - <package name="yast2-mouse"/> - <package name="yast2-ncurses"/> - <package name="yast2-ncurses-pkg"/> - <package name="yast2-network"/> - <package name="yast2-nfs-client"/> - <package name="yast2-nfs-common"/> - <package name="yast2-nis-client"/> - <package name="yast2-ntp-client"/> - <package name="yast2-online-update"/> - <package name="yast2-online-update-frontend"/> - <package name="yast2-packager"/> - <package name="yast2-packager-webpin"/> - <package name="yast2-pam"/> - <package name="yast2-perl-bindings"/> - <package name="yast2-pkg-bindings"/> - <package name="yast2-printer"/> - <package name="yast2-profile-manager"/> - <package name="yast2-qt"/> - <package name="yast2-qt-pkg"/> - <package name="yast2-registration"/> - <package name="yast2-registration-branding-openSUSE"/> - <package name="yast2-repair"/> - <package name="yast2-restore"/> - <package name="yast2-runlevel"/> - <package name="yast2-samba-client"/> - <package name="yast2-samba-server"/> - <package name="yast2-scanner"/> - <package name="yast2-security"/> - <package name="yast2-slp"/> - <package name="yast2-sound"/> - <package name="yast2-storage"/> - <package name="yast2-sudo"/> - <package name="yast2-sysconfig"/> - <package name="yast2-theme-openSUSE"/> - <package name="yast2-trans-de"/> - <package name="yast2-trans-en_US"/> - <package name="yast2-trans-stats"/> - <package name="yast2-transfer"/> - <package name="yast2-tune"/> - <package name="yast2-tv"/> - <package name="yast2-update"/> - <package name="yast2-users"/> - <package name="yast2-vm"/> - <package name="yast2-x11"/> - <package name="yast2-xml"/> - <package name="yast2-ycp-ui-bindings"/> - <package name="yp-tools"/> - <package name="ypbind"/> - <package name="zd1211-firmware"/> - <package name="zip"/> - <package name="zisofs-tools"/> - <package name="zlib"/> - <package name="zypper"/> -  - </packages> - <packages type="bootstrap"> - <package name="filesystem"/> - <package name="bundle-lang-common-en"/> - <package name="openSUSE-release"/> - <package name="openSUSE-release-livecd-x11"/> - </packages> - <split> - <temporary> -  - <file name="/var"/> - <file name="/var/*"/> - <file name="/etc"/> - <file name="/etc/*"/> - </temporary> - </split> +<?xml version="1.0" encoding="utf-8"?> + +<image schemaversion="5.2" name="kiwi-image-template"> + <description type="system"> + <author/> + <contact/> + <specification>Template for system image configuration</specification> + </description> + <preferences> + <type image="iso" primary="true" boot="isoboot/suse-11.4" bootprofile="default" bootkernel="desktop" flags="clic" hybrid="true"> + <size unit="M">3000</size> + </type> + <type image="vmx" boot="vmxboot/suse-11.4" filesystem="ext3" format="vmdk"> + <size unit="M">3000</size> + </type> + <type image="usb" boot="usbboot/suse-11.4" filesystem="ext3"> + <size unit="M">3000</size> + </type> + <type boot="vmxboot/suse-11.1" filesystem="ext3" image="vmx" bootkernel="xenk" bootprofile="xen">3000</type> + <type image="oem" boot="oemboot/suse-11.4" filesystem="ext3" flags="unified"> + <size unit="M">3000</size> + <oemconfig> + <oem-boot-title>USB</oem-boot-title> + <oem-swap>false</oem-swap> + </oemconfig> + </type> + <version>1.0.0</version> + <packagemanager>zypper</packagemanager> + <boot-theme>openSUSE</boot-theme> + <rpm-check-signatures>false</rpm-check-signatures> + <rpm-force>false</rpm-force> + <locale>en_US</locale> + <rpm-excludedocs>false</rpm-excludedocs> + </preferences> + <users group="users"> + <user name="linux" pwd="" home="/home/linux" realname="Live-CD User"/> + <user name="root" pwd="" home="/root"/> + </users> + <repository type="rpm-md"> + <source path="http://download.opensuse.org/repositories/openSUSE:/Factory:/Live/standard/"/> + </repository> + <packages type="image"> + <opensusePattern name="Minimal"/> + </packages> + <packages type="bootstrap"> + <package name="filesystem"/> + <package name="bundle-lang-common-en"/> + <package name="openSUSE-release"/> + <package name="openSUSE-release-livecd-x11"/> + </packages> </image> Modified: trunk/product-creator/src/data/kiwi_templates/xen/config.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/data/kiwi_te… ============================================================================== --- trunk/product-creator/src/data/kiwi_templates/xen/config.xml (original) +++ trunk/product-creator/src/data/kiwi_templates/xen/config.xml Tue May 24 10:34:00 2011 @@ -1,31 +1,31 @@ -<?xml version="1.0"?> -<image schemeversion="2.0" name="kiwi-xen-image-template"> +<?xml version="1.0" encoding="utf-8"?> + +<image schemaversion="5.2" name="kiwi-xen-image-template"> <description type="system"> - <author></author> - <contact></contact> + <author/> + <contact/> <specification>Template for system image configuration</specification> </description> <preferences> - <type boot="xenboot/suse-11.1" filesystem="ext3">xen</type> + <type boot="vmxboot/suse-11.1" filesystem="ext3" image="vmx" bootkernel="xenk" bootprofile="xen">2000</type> <version>1.0.0</version> - <size unit="M">2000</size> <packagemanager>zypper</packagemanager> - <rpm-check-signatures>False</rpm-check-signatures> - <rpm-force>True</rpm-force> + <rpm-check-signatures>false</rpm-check-signatures> + <rpm-force>true</rpm-force> </preferences> <users group="users"> - <user home="/home/linux" name="linux"/> - <user home="/root" name="root"/> + <user home="/home/linux" name="linux"/> + <user home="/root" name="root"/> </users> <packages type="image"> - <package name="OpenIPMI"/> + <package name="OpenIPMI"/> <package name="lvm2"/> <package name="aaa_base"/> <package name="aaa_skel"/> <package name="acl"/> <package name="acpid"/> <package name="attr"/> -  + <package name="linux32" arch="x86_64"/> <package name="bash"/> <package name="bc"/> @@ -167,7 +167,7 @@ <package name="portmap"/> <package name="cron"/> </packages> - <packages type="xen" memory="512" disk="/dev/sda"> + <packages type="xen"> <package name="kernel-xen"/> <package name="xen"/> </packages> Modified: trunk/product-creator/src/kiwi_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/kiwi_dialogs… ============================================================================== --- trunk/product-creator/src/kiwi_dialogs.ycp (original) +++ trunk/product-creator/src/kiwi_dialogs.ycp Tue May 24 10:34:00 2011 @@ -73,7 +73,7 @@ string current_method = "none"; foreach (map typemap, (list<map>)KiwiConfig["preferences",0,"type"]:[], { - if (typemap[content_key]:"" == kiwi_task) + if (typemap["image"]:"" == kiwi_task) { current_method = typemap["flags"]:current_method; } @@ -98,7 +98,7 @@ KiwiConfig["preferences",0,"type"] = maplist (map typemap, (list<map>)KiwiConfig["preferences",0,"type"]:[], { - if (typemap[content_key]:"" == kiwi_task) + if (typemap["image"]:"" == kiwi_task) { if (selected == "none") { @@ -361,29 +361,6 @@ } /** - * initialize the value of compress checkbox - */ - define void InitCompressCheckBox (string id) { - UI::ChangeWidget (`id (id), `Enabled, false); - UI::ChangeWidget (`id (id), `Value, KiwiConfig["compressed"]:false); - } - - /** - * store the value of compress checkbox - */ - define void StoreCompressCheckBox (string key, map event) { - KiwiConfig["compressed"] = (boolean) UI::QueryWidget(`id(key), `Value); - } - /** - * handler for compress checkbox - */ - define symbol HandleCompressCheckBox (string key, map event) { - // store the value on exiting - if (event["ID"]:nil == `next) StoreCompressCheckBox (key, event); - return nil; - } - - /** * initialize the value of version */ define void InitVersion (string id) { @@ -411,42 +388,40 @@ } /** - * initialize the value of size unit + * initialize the values of "size", "sizeunit" and "additive" widgets */ - define void InitSizeUnitCombo (string id) { - string unit = KiwiConfig["preferences",0,"size",0,"unit"]:"M"; - UI::ChangeWidget (`id (id), `Items, maplist (string u, [ "M", "G" ], ``( - `item (`id (u), u + "B", unit == u)) - )); - } + define void InitSize (string id) { - /** - * initialize the value of 'additive' - */ - define void InitAdditiveCheckBox (string id) { - boolean additive = KiwiConfig["preferences",0,"size",0,"additive"]:"" == "true"; - UI::ChangeWidget (`id (id), `Value, additive); - } + map size_map = get_current_size_map (KiwiConfig, kiwi_task); - /** - * initialize the value of version - */ - define void InitSize (string id) { - integer siz = tointeger (get_preferences (KiwiConfig, "size", "2000")); - if (siz == nil) siz = 2000; - UI::ChangeWidget (`id (id), `Value, siz); + integer siz = tointeger (size_map[Kiwi::content_key]:"0"); + if (siz == nil) siz = 0; + UI::ChangeWidget (`id ("size"), `Value, siz); + UI::ChangeWidget (`id ("additive"), `Value, size_map["additive"]:"" == "true"); + UI::ChangeWidget (`id ("sizeunit"), `Items, maplist (string u, [ "M", "G" ], ``( + `item (`id (u), u + "B", size_map["unit"]:"M" == u)) + )); } /** - * store the size value + * store the values of "size", "sizeunit" and "additive" widgets */ define void StoreSize (string key, map event) { - KiwiConfig["preferences",0,"size"] = [ $[ - content_key : sformat ("%1", UI::QueryWidget(`id(key), `Value)), - "unit" : UI::QueryWidget (`id ("sizeunit"), `Value), - "additive" : ((boolean) UI::QueryWidget (`id ("additive"), `Value)) - ? "true" : "false" - ]]; + + KiwiConfig["preferences",0,"type"] = maplist (map typemap, + (list<map>)KiwiConfig["preferences",0,"type"]:[], + { + if (typemap["image"]:"" == kiwi_task) + { + typemap["size"] = [ $[ + content_key : sformat ("%1", UI::QueryWidget(`id(key), `Value)), + "unit" : UI::QueryWidget (`id ("sizeunit"), `Value), + "additive" : ((boolean) UI::QueryWidget (`id ("additive"), `Value)) ? "true" : "false", + ] ]; + } + return typemap; + }); + } /** @@ -1322,22 +1297,10 @@ if (FileUtils::CheckAndCreatePath (out_dir) && Kiwi::PrepareAndCreate (out_dir, selected_profiles)) { - if (kiwi_task == "usb" && false) - { - // additional question (yes/no) - if (Popup::YesNo (sformat (success[kiwi_task]:"", out_dir) + _(" -Save the image to the stick now?"))) - { - NotImplementedHandler ("", $[ "ID" : ""]); - } - } - else - { - // default popup message, %1 is a dir - Popup::Message (sformat (success[kiwi_task]:_("Image successfully created in + // default popup message, %1 is a dir + Popup::Message (sformat (success[kiwi_task]:_("Image successfully created in %1 directory."), out_dir)); - } } else { @@ -1502,8 +1465,8 @@ KiwiConfig["preferences",0,"type"] = maplist ( map typemap, (list<map>)pref[0,"type"]:[], { - string type = typemap[content_key]:""; - if (typemap["primary"]:"false" == "true" && type != kiwi_task) + string type = typemap["image"]:""; + if (tolower (typemap["primary"]:"false") == "true" && type != kiwi_task) typemap = remove (typemap, "primary"); else if (type == kiwi_task) { @@ -1527,7 +1490,7 @@ map<string,any> def_map = Kiwi::ReadConfigXML (default_dir); foreach (map typemap, (list<map>)def_map["preferences",0,"type"]:[], { - if (typemap[content_key]:"" == kiwi_task) + if (typemap["image"]:"" == kiwi_task) { KiwiConfig["preferences",0,"type"] = add ( KiwiConfig["preferences",0,"type"]:[], typemap); @@ -1595,7 +1558,7 @@ // compression not allowed in most cases (bnc#510833) foreach (map typemap, (list<map>)KiwiConfig["preferences",0,"type"]:[], { - if (typemap[content_key]:"" == kiwi_task) + if (typemap["image"]:"" == kiwi_task) { if (typemap["filesystem"]:"" == "ext3") show_compression = false; @@ -1735,16 +1698,6 @@ "validate_function" : CreateImage, "no_help" : true, ], - // widgets for config.xml tab - "compressed" : $[ - "widget" : `checkbox, - // textentry label - "label" : _("Co&mpress"), - "help" : _("Check Compress if the final image should be based \non the squashfs compressed file system."), - "init" : InitCompressCheckBox, - "store" : StoreCompressCheckBox, - "handle" : HandleCompressCheckBox, - ], "compression" : $[ "widget" : `combobox, "opt" : [ `hstretch, `notify ], @@ -1830,7 +1783,6 @@ "label" : _("&Unit"), "no_help" : true, "items" : [], - "init" : InitSizeUnitCombo, // stored and handled by "size" ], "additive" : $[ @@ -1838,7 +1790,6 @@ // check box label "label" : _("Additive"), "no_help" : true, - "init" : InitAdditiveCheckBox, ], // ---------------- widgtes for directory structure "general_scripts" : $[ @@ -2256,7 +2207,7 @@ list type_its = []; //solve `back here (=no import) foreach (map typemap, (list<map>) Config["preferences",0,"type"]:[], { - string type = typemap[content_key]:""; + string type = typemap["image"]:""; type_its = add (type_its, `item (`id (type), task2label[type]:type, type == kiwi_task)); }); @@ -2331,8 +2282,8 @@ kiwi_task = ""; foreach (map typemap, (list<map>) Config["preferences",0,"type"]:[], { - string type = typemap[content_key]:""; - if (typemap["primary"]:"false" == "true" || kiwi_task == "") + string type = typemap["image"]:""; + if (tolower (typemap["primary"]:"false") == "true" || kiwi_task == "") kiwi_task = type; if ((supported_images == "" && !contains (present_types, type)) || supported_images == "template") Modified: trunk/product-creator/src/routines.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/routines.ycp… ============================================================================== --- trunk/product-creator/src/routines.ycp (original) +++ trunk/product-creator/src/routines.ycp Tue May 24 10:34:00 2011 @@ -41,12 +41,10 @@ string task = ""; foreach (map typemap, (list<map>) config["preferences",0,"type"]:[], { if (task == "") // take the 1st one if none is default - task = typemap[Kiwi::content_key]:task; - if (typemap["primary"]:"false" == "true") + task = typemap["image"]:task; + if (tolower (typemap["primary"]:"false") == "true") { - task = typemap[Kiwi::content_key]:task; - if (task == "" && typemap["image"]:"" != "") - task = typemap["image"]:""; + task = typemap["image"]:task; break; } }); @@ -58,12 +56,24 @@ return task; } +// return the size info for current image type +map get_current_size_map (map config, string task) { + + map ret = $[]; + foreach (map typemap, (list<map>) config["preferences",0,"type"]:[], { + if (task == typemap["image"]:"") + ret = typemap["size",0]:$[]; + }); + return ret; +} + + // get the value of boot image directory string get_bootdir (map config, string task) { string dir = ""; foreach (map typemap, (list<map>) config["preferences",0,"type"]:[], { - if (task == typemap[Kiwi::content_key]:"") + if (task == typemap["image"]:"") { dir = typemap["boot"]:""; break; -- 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] r64093 - /branches/tmp/dmacvicar/zc10/ncurses/src/NCPkgStrings.cc
by dmacvicar＠svn2.opensuse.org 23 May '11

23 May '11

Author: dmacvicar Date: Mon May 23 22:21:03 2011 New Revision: 64093 URL: http://svn.opensuse.org/viewcvs/yast?rev=64093&view=rev Log: misisng file Added: branches/tmp/dmacvicar/zc10/ncurses/src/NCPkgStrings.cc Added: branches/tmp/dmacvicar/zc10/ncurses/src/NCPkgStrings.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/dmacvicar/zc10/ncurses/sr… ============================================================================== --- branches/tmp/dmacvicar/zc10/ncurses/src/NCPkgStrings.cc (added) +++ branches/tmp/dmacvicar/zc10/ncurses/src/NCPkgStrings.cc Mon May 23 22:21:03 2011 @@ -0,0 +1,781 @@ +/*---------------------------------------------------------------------\ +| | +| __ __ ____ _____ ____ | +| \ \ / /_ _/ ___|_ _|___ \ | +| \ V / _` \___ \ | | __) | | +| | | (_| |___) || | / __/ | +| |_|\__,_|____/ |_| |_____| | +| | +| core system | +| (C) SuSE GmbH | +\----------------------------------------------------------------------/ + + File: NCPkgStrings.cc + + Author: Gabriele Strattner <gs(a)suse.de> + +/-*/ + + +#include "NCPkgStrings.h" + +#include "NCi18n.h" + +#include <libintl.h> + + +/* + Textdomain "ncurses-pkg" +*/ + +const string NCPkgStrings::Deps() +{ + //menu entry 1 - all about pkg dependencies + static const string value = _( "&Dependencies" ); + return value; +} + +const string NCPkgStrings::View() +{ + //menu entry 2 - display different kinds of info on pkgs + static const string value = _( "&View" ); + return value; +} + +const string NCPkgStrings::Extras() +{ + //menu entry 3 - miscellaneous stuff + static const string value = _( "&Extras" ); + return value; +} + +const string NCPkgStrings::Filter() +{ + //pick a package filter - patterns, langs, repos, search,... + static const string value = _( "&Filter" ); + return value; +} + + +const string NCPkgStrings::InstPkg() +{ + // All installed Packages + static const string value = _( "Installed Packages" ); + return value; +} + +const string NCPkgStrings::PackageName() +{ + // Label under the pkg table - pkg name follows + static const string value = _( "Package: " ); + return value; +} + +const string NCPkgStrings::Actions() +{ + // Actions on pkgs (install, remove,..) + static const string value = _( "A&ctions" ); + return value; +} + +const string NCPkgStrings::Help() +{ + // Help button + static const string value = _( "&Help" ); + return value; +} + +const string NCPkgStrings::PackageHelp() +{ + // the headline of the help window + static const string value = _( "General Help" ); + return value; +} + +const string NCPkgStrings::HelpPkgGen1() +{ + // part1 of help text package installation + static const string value = _( "<h3>Welcome to package selector</h3>This tool will help you to manage software installed on your system. You can install, update or remove single packages, as well as patterns (sets of packages serving certain purpose) or languages. Usually, you don't need to care about package dependencies when installing or removing anything - solver will do it for you. Package selector consists of three main parts: filters, package table and menu." ); + return value; + +} + +const string NCPkgStrings::HelpPkgGen2() +{ + // part of help text package installation + static const string value = _( "Filters (left panel) are designed to make orientation in great amount of packages easier. They enable displaying e.g. only packages from certain repository, or in a selected pattern (for example, Games or C/C++ Development) as well as searching for particular keywords. More information on filters can be found in How to use filters." ); + return value; +} + +const string NCPkgStrings::HelpPkgGen3() +{ + // additional help text for post installation + static const string value = _( "Package table is the main component of package selector. You will see a list of packages matching current filter (for example, selected RPM group or search result) there. Each line of package table has several columns:" ); + return value; +} + +const string NCPkgStrings::HelpPkgGen4 () +{ + // part2 of help text package installation + static const string value = _( "<ol><li>Package status ( for more information see Package Status and Symbols )</li><li>Package name</li><li>Package summary</li><li>Available version ( on some of the configured repositories )</li><li>Installed version( empty for not yet installed packages )</li><li>Package size</li></ol>" ); + + return value; +} + +const string NCPkgStrings::HelpPkgGen5() +{ + // part3 of help text package installation + static const string value = _( "Actions menu just below the table provides the possibilities to change the status of selected package (or all packages in the list), for example, to delete a package or select an additional package for installation. The status change can also be done directly by pressing the key specified in the menu item (for detailed information about the package status, see Package Status and Symbols)." ); + return value; +} + +const string NCPkgStrings::HelpPkgGen6() +{ + // part4 of help text package installation + static const string value = _( "Menu provides functions related to package dependencies handling, displaying relevant information on packages and several other useful actions, such as opening repository editor. For more information, see Useful Functions in Menu." ); + return value; +} + +const string NCPkgStrings::PackageStatusHelp() +{ + // the headline of the help window + static const string value = _( "Package Status and Symbols" ); + return value; +} + +const string NCPkgStrings::HelpOnStatus1() +{ + // part 1 of help text package status + static const string value = _( "The package status can be changed using the Actions menu or the keys specified in the menu items. For example, use '+' to install an additional package.The \"Taboo\" status means the package should never be installed. Similarly \"Locked\" status means that installed version of this package should always be kept." ); + return value; +} + +const string NCPkgStrings::HelpOnStatus2() +{ + // part 2 of help text package status + static const string value = _( "You can also use RET or SPACE to toggle the package status.The Actions menu also provides the possibility to change the status for all packages in the list (select 'All Listed Packages')." ); + return value; +} +const string NCPkgStrings::HelpOnStatus3() +{ + // part 3 of help text package status + static const string value = _( "The meaning of the status flags:" ); + return value; +} + +const string NCPkgStrings::HelpOnStatus4() +{ + // help text package status + static const string value = _( " + : package will be installeda+ : package will be installed automatically > : package will be updateda> : package will be automatically updated i : package is installed - : package will be deleted---: never install this package (taboo)" ); + return value; +} + +const string NCPkgStrings::HelpOnStatus5() +{ + // help text package status + static const string value = _( "-i-: keep the installed version and never update or delete it ( package locked )Status information for pattern and languages: i : All requirements of this pattern/language are satisfied" ); + return value; +} + +const string NCPkgStrings::PackageFiltersHelp() +{ + // label for an error popup + static const string value = _( "How to Use Filters" ); + return value; +} + +const string NCPkgStrings::HelpOnFilters1() +{ + // help text package status + static const string value = _( "Out of all available packages, Filters allow you to filter out only those you are interested in. Package filters are based on package properties (repository, RPM group), package \"containers\" (patterns, languages) or search results. Select the desired filter from the drop-down menu. Specific filters are described below." ); + return value; +} + +const string NCPkgStrings::HelpOnFilters2() +{ + // help text package status + static const string value = _( "Patterns describe the features and functions system should have (for example, X server or Console tools). Each pattern contains a set of packages it requires (must have), recommends (should have) and suggests (may have). If you trigger pattern for installation (update, deletion), solver will be run and change the status of subordinate packages accordingly." ); + return value; +} + +const string NCPkgStrings::HelpOnFilters3() +{ + // help text package status + static const string value = _( "Languages are package containers very much like patterns. They contain packages with translations, dictionaries and other language-specific files for selected language. RPM Groups are however not package containers that can be installed. Instead, membership in certain RPM group is a property of package itself. They have hierarchical (tree) structure. Repositories filter enables displaying packages coming only from specific repository. " ); + return value; +} + +const string NCPkgStrings::HelpOnFilters4() +{ + // help text package search + static const string value = _( "To use Search filter, enter a keyword (or part of keyword) for package search. For example, search for all 3D packages using expression \"3d\". It is also possible to search in package descriptions, RPM provides, or requires. Just select the appropriate check box. Start the search by hitting 'Search' button." ); + return value; +} + +const string NCPkgStrings::HelpOnFilters5() +{ + // help text package status +static const string value = _( "Installation summary presents a summary of packages, whose status has changed in this session (for example, they were marked for installation, or removal), either by user, or automatically by the solver." ); + return value; +} + +const string NCPkgStrings::PackageMenuHelp() +{ + // label for an error popup + static const string value = _( "Useful Functions in Menu" ); + return value; +} + +const string NCPkgStrings::HelpPkgMenu1() +{ + static const string value = _( "Dependencies: This menu offers various actions related to package dependency handling. By default, the package dependencies are checked with every status change (Automatic Dependency Check is on) You will be informed about package conflicts in a dialog proposing possible conflict resolution. To resolve the conflict, select one of the offered solutions and press 'OK -- Try Again'." ); + return value; +} + +const string NCPkgStrings::HelpPkgMenu2() +{ + static const string value = _( "To disable dependency checking on every status change, toggle Automatic Dependency Check off. In that case, you can check dependencies manually by selecting Check Dependencies Now item. Verify system entry will check package dependencies and resolve conflicts non-interactively, marking missing packages for automatic installation, if necessary. For debugging purpose, you may use Generate Dependency Solver Testcase. It will dump package dependencies data into <tt>/var/log/YaST2/solverTestcase</tt> directory. This is usually what you need when asked for \"solver testcase\" in bugzilla." ); + return value; +} + +const string NCPkgStrings::HelpPkgMenu2_2() +{ + static const string value = _( "Available options for dependency checking are: System Verification Mode (monitor and repair dependencies of already installed packages and solve immediately), Cleanup when deleting packages (remove dependent unused packages) and Allow vendor change (package vendor may differ from vendor of installed package). Please note: after checking the system with Verify System Now the option System Verification Mode is on (if desired uncheck the option)." ); + return value; +} +const string NCPkgStrings::HelpPkgMenu3() +{ + static const string value = _( "View: here you have the possibility to choose which information about the selected package will be displayed in the window below the package table. Available options are: package description, technical data (version, size, license etc.) package versions (all available), file list (all files included in the package) and dependencies (provides, requires etc.)." ); + return value; +} + +const string NCPkgStrings::HelpPkgMenu4() +{ + static const string value = _("Configuration: this menu integrates package selector with the rest of package management utils. From here, you can Launch Repository Manager and edit configured repositories or register to update repository and configure periodic download of available updates (Launch Online Update Configuration). Also, you can pick one of the three possible behaviours of package selector at exit - in Action after Package Installation menu."); + return value; +} +const string NCPkgStrings::HelpPkgMenu5() +{ + static const string value = _( "Extras: miscellaneous functions reside here. Export Package List to File will dump data on installed packages, patterns and languages into specified XML file. This file can be later read by Import Package List from File option e.g. on different computer. It will bring the set of packages on the target computer into the same state as described in provided XML file. Show Available Disk Space will show a popup table displaying disk usage and free disk space on currently mounted partition." ); + return value; +} + + +const string NCPkgStrings::SearchIn() +{ + // label of a frame with search settings + static const string value = _( "&Search in " ); + return value; +} + +const string NCPkgStrings::SearchPhrase() +{ + // begin: text/labels for search popups (use unique hotkeys until the end:) + // text for the package search popup + static const string value = _( "Search &Phrase" ); + return value; +} + +const string NCPkgStrings::PkgStatus() +{ + // column header status + static const string value = string(" "); + return value; +} + +const string NCPkgStrings::PatternsLabel() +{ + // the label of the selections + static const string value = _( "Patterns" ); + return value; +} + +const string NCPkgStrings::LangCode() +{ + static const string value = _("Code"); + return value; +} + +const string NCPkgStrings::LangName() +{ + static const string value = _("Language"); + return value; +} + +const string NCPkgStrings::RepoURL() +{ + static const string value = _("URL"); + return value; + +} + +const string NCPkgStrings::PkgName() +{ + // column header package name (keep it short!) + static const string value = _( "Name" ); + return value; +} + +const string NCPkgStrings::PkgVersion() +{ + // column header installed package version (keep it short!) + static const string value = _( "Version" ); + return value; +} + +const string NCPkgStrings::PkgInstSource() +{ + // column header - repository of the package (e.g. openSUSE 10.3) + static const string value = _( "Repository" ); + return value; +} + +const string NCPkgStrings::PkgVersionNew() +{ + // column header available package version (keep it short - use abbreviation!) + static const string value = _( "Avail. Vers." ); + return value; +} + +const string NCPkgStrings::PkgVersionInst() +{ + // column header installed package version (keep it short - use abbreviation!) + static const string value = _( "Inst. Vers." ); + return value; +} + +const string NCPkgStrings::PkgSummary() +{ + // column header package description (keep it short!) + static const string value = _( "Summary" ); + return value; +} + + +const string NCPkgStrings::PkgSize() +{ + // column header package size (keep it short!) + static const string value = _( "Size" ); + return value; +} + +const string NCPkgStrings::PkgArch() +{ + // column header package architecture (keep it short!) + static const string value = _( "Architecture" ); + return value; +} + +const string NCPkgStrings::PatchKind() +{ + // column header patch kind (keep it short!) + static const string value = _( "Kind" ); + return value; +} + +const string NCPkgStrings::Solving() +{ + // a text for a small popup which is shown during package dependency checking + static const string value = _( "Solving..." ); + return value; +} +const string NCPkgStrings::Saving() +{ + // a text for a small popup which is shown during writing package selection to a file + static const string value = _( "Saving..." ); + return value; +} +const string NCPkgStrings::Loading() +{ + // a text for a samll popup which is shown during loading package selections from a file + static const string value = _( "Loading..." ); + return value; +} + +const string NCPkgStrings::DiskspaceLabel() +{ + // the headline of the disk space popup + static const string value = _( "Disk Usage Overview" ); + return value; +} + +const string NCPkgStrings::Partition() +{ + // column header name of the partition (keep it short!) + static const string value = _( "Partition" ); + return value; +} + +const string NCPkgStrings::UsedSpace() +{ + // column header used disk space (keep it short!) + static const string value = _( "Used" ); + return value; +} + +const string NCPkgStrings::FreeSpace() +{ + // column header free disk space (keep it short!) + static const string value = _( "Free" ); + return value; +} + +const string NCPkgStrings::TotalSpace() +{ + // column header total disk space (keep it short!) + static const string value = _( "Total" ); + return value; +} + +const string NCPkgStrings::DiskSpaceError() +{ + // + static const string value = _( "Out of disk space!" ); + return value; +} + +const string NCPkgStrings::DiskSpaceWarning() +{ + // + static const string value = _( "Disk space is running out!" ); + return value; +} + +const string NCPkgStrings::MoreText() +{ + // part of a text + static const string value = _( "needs" ); + return value; +} + +const string NCPkgStrings::MoreSpaceText() +{ + // part of a text + static const string value = _( "more disk space." ); + return value; +} + +const string NCPkgStrings::Version() +{ + // part of the package description + static const string value = _( "Version: " ); + return value; +} + +const string NCPkgStrings::Size() +{ + // part of the package description + static const string value = _( "Size: " ); + return value; +} + +const string NCPkgStrings::InstVersion() +{ + // part of the package description + static const string value = _( "Installed: " ); + return value; +} + +const string NCPkgStrings::Authors() +{ + // part of the package description + static const string value = _( "Authors: " ); + return value; +} + +const string NCPkgStrings::License() +{ + // part of the package description + static const string value = _( "License: " ); + return value; +} + +const string NCPkgStrings::MediaNo() +{ + // part of the package description + static const string value = _( "Media No.: " ); + return value; +} + +const string NCPkgStrings::RpmGroup() +{ + // part of the package description + static const string value = _( "Package Group: " ); + return value; +} + +const string NCPkgStrings::Provides() +{ + // part of the package description + static const string value = _( "Provides: " ); + return value; +} + +const string NCPkgStrings::Requires() +{ + // part of the package description + static const string value = _( "Requires: " ); + return value; +} + +const string NCPkgStrings::PreRequires() +{ + // part of the package description + static const string value = _( "Prerequires: " ); + return value; + +} + +const string NCPkgStrings::Conflicts() +{ + // part of the package description + static const string value = _( "Conflicts with: " ); + return value; +} + +const string NCPkgStrings::ListOfFiles() +{ + // headline for a list of installed files + static const string value = _( "List of Installed Files: " ); + return value; +} + +const string NCPkgStrings::LanguageDescription() +{ + static const string value = _( "Translations, dictionaries and other language related files for " ); + return value; +} + +const string NCPkgStrings::AutoChangeLabel() +{ + // the headline of the popup containing a list with packages with status changes + static const string value = _( "Automatic Changes" ); + return value; +} + +const string NCPkgStrings::AutoChangeText1() +{ + // text part1 of popup with automatic changes (it's a label; text continous) + static const string value = _( "In addition to your manual selections, the following" ); + return value; +} + +const string NCPkgStrings::AutoChangeText2() +{ + // text part1 of popup with automatic changes continous + static const string value = _( "packages have been changed to resolve dependencies:" ); + return value; +} + +const string NCPkgStrings::YouHelp() +{ + // the headline of the help popup + static const string value = _( "Patch Status and Patch Installation" ); + return value; +} + +const string NCPkgStrings::YouHelp1() +{ + // help text online udpate + // Do NOT translate 'recommended' and 'security'! because the patch kind is always shown as english text. + static const string value = _( "Kind \"recommended\" means you should install the patch. \"security\" is a security patch and it is highly recommended to install it." ); + return value; +} + +const string NCPkgStrings::YouHelp2() +{ + // help text online udpate continue + static const string value = _( "Patches for \"libzypp\" (Package, Patch, Pattern and Product Management) will be always installed first. The other patches must be installed on a second run." ); + return value; +} + +const string NCPkgStrings::YouHelp3() +{ + // help text online udpate continue + static const string value = _( "Meaning of the status flags:a+ : Patches concerning your installation are preselected. They will be downloaded and installed on your system. If you do not want a certain patch, deselect it with '-'. i : All requirements of this patch are satisfied.+ : You have selected this patch for installation." ); + return value; +} + +// +// label, text for translation +// +const string NCPkgStrings::WarningLabel() +{ + // label for a warning popup + static const string value = _( "Warning" ); + return value; +} + +const string NCPkgStrings::ErrorLabel() +{ + // label for an error popup + static const string value = _( "Error" ); + return value; +} + +const string NCPkgStrings::NotifyLabel() +{ + // label for a notify popup + static const string value = _( "Notify" ); + return value; +} + + +const string NCPkgStrings::OKLabel() +{ + // the label of an OK button + static const string value = _( "&OK" ); + return value; +} + +const string NCPkgStrings::CancelLabel() +{ + // begin: the label of the Cancel button + static const string value = _( "&Cancel" ); + return value; +} + +const string NCPkgStrings::YesLabel() +{ + // the label of the Yes button + static const string value = _( "&Yes" ); + return value; +} + +const string NCPkgStrings::AcceptLabel() +{ + // the label of an Accept button + static const string value = _( "&Accept" ); + return value; +} + +const string NCPkgStrings::NoLabel() +{ + // the label of the No button + static const string value = _( "&No" ); + return value; +} + +const string NCPkgStrings::SolveLabel() +{ + // the label of the Solve button - 'try again' implies that user + // has to make some action (#213602) + static const string value = _( "&OK -- Try Again" ); + return value; +} + + +const string NCPkgStrings::CancelText() +{ + // text for a Notify popup + static const string value = _( "All changes in package, patch or pattern selection will be lost. Really exit?" ); + return value; +} + +//FIXME: remove these if possible +const string NCPkgStrings::LanguageLabel() +{ + // the label of language table + static const string value = _( "Available Languages" ); + return value; +} + +const string NCPkgStrings::RepoLabel() +{ + // the label of language table + static const string value = _( "Available Repositories" ); + return value; +} + +const string NCPkgStrings::YOUPatches() +{ + // A label for a list of YOU Patches - keep it short - max 25 chars! + // (the list shows all patches which are needed) + //static const string value = _( "Installable Patches" ); + //static const string value = _( "Relevant Patches" ); + static const string value = _( "Needed Patches" ); + return value; +} + +const string NCPkgStrings::InstPatches() +{ + // A label for a list of YOU Patches - keep it short - max. 25 chars! + // (the list shows all patches which are already installed) + //static const string value = _( "Installed Patches" ); + static const string value = _( "Unneeded Patches" ); + //static const string value = _( "Satisfied Patches" ); + return value; +} + +const string NCPkgStrings::Patches() +{ + // A common label for a list of YOU Patches - keep it short - max. 25 chars! + static const string value = _( "Online Update Patches" ); + return value; +} + +const string NCPkgStrings::UpdateProblem() +{ + // the label Filter: Update Problem ( keep it short - max. 25 chars ) + static const string value = _( "Update Problem -- see help" ); + return value; +} + +const string NCPkgStrings::SearchResults() +{ + // the label for Filter: Search results + static const string value = _( "Search Results" ); + return value; +} + +const string NCPkgStrings::PackageDeps() +{ + // the headline of the dependency popup + static const string value = _( "Package Dependencies" ); + return value; +} + +const string NCPkgStrings::HelpOnUpdate() +{ + // help text package status + static const string value = _( "Update Problem List The packages in the list cannot be updated automatically.Possible reasons:They are obsoleted by other packages.There is no newer version to which to update on any installation media.They are third-party packagesManually select what to do with them. The safest course of action is to delete them." ); + return value; +} + +const string NCPkgStrings::PkgSource() +{ + // column header source RPM installation (keep it short!) + static const string value = _( "Source" ); + return value; +} + +#if 0 +const string NCPkgStrings::MenuEntryUpdateList() +{ + // menu entry Update List + static const string value = _( "&Update List" ); + return value; +} +#endif +const string NCPkgStrings::Patch() +{ + // part of the patch description + static const string value = _( "Patch: " ); + return value; +} + +const string NCPkgStrings::NoPatches() +{ + // info line is shown if YOU patch list is empty + static const string value = _( "No patches available" ); + return value; +} + +const string NCPkgStrings::Script() +{ + static const string value = _( "Script" ); + return value; + +} + + -- 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] r64092 - /branches/tmp/dmacvicar/zc10/ncurses/src/Makefile.am
by dmacvicar＠svn2.opensuse.org 23 May '11

23 May '11

Author: dmacvicar Date: Mon May 23 22:04:34 2011 New Revision: 64092 URL: http://svn.opensuse.org/viewcvs/yast?rev=64092&view=rev Log: missing file Modified: branches/tmp/dmacvicar/zc10/ncurses/src/Makefile.am Modified: branches/tmp/dmacvicar/zc10/ncurses/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/dmacvicar/zc10/ncurses/sr… ============================================================================== --- branches/tmp/dmacvicar/zc10/ncurses/src/Makefile.am (original) +++ branches/tmp/dmacvicar/zc10/ncurses/src/Makefile.am Mon May 23 22:04:34 2011 @@ -84,6 +84,7 @@ NCPopupTextEntry.h NCPopupTextEntry.cc \ \ YQZypp.h \ + NCPkgStrings.h NCPkgStrings.cc \ NCPkgSelMapper.cc NCPkgSelMapper.h \ NCPackageSelector.cc NCPackageSelector.h \ NCPkgTable.cc NCPkgTable.h \ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0