- YaST Commits

[yast-commit] r38305 - in /trunk/tv: VERSION data/CARDLIST.ivtv data/Makefile.am data/create_tv_db data/tv_dvbcards.ycp data/tv_dvbfirmware.ycp package/yast2-tv.changes src/Tv.ycp
by lslezak＠svn.opensuse.org 06 Jun '07

06 Jun '07

Author: lslezak Date: Wed Jun 6 11:16:24 2007 New Revision: 38305 URL: http://svn.opensuse.org/viewcvs/yast?rev=38305&view=rev Log: - support for ivtv based TV cards (#130098) - install firmware/packages before loading drivers - updated DVB card DB (#222806, #223188) - 2.15.6 Added: trunk/tv/data/CARDLIST.ivtv Modified: trunk/tv/VERSION trunk/tv/data/Makefile.am trunk/tv/data/create_tv_db trunk/tv/data/tv_dvbcards.ycp trunk/tv/data/tv_dvbfirmware.ycp trunk/tv/package/yast2-tv.changes trunk/tv/src/Tv.ycp Modified: trunk/tv/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/tv/VERSION?rev=38305&r1=38304&r2… ============================================================================== --- trunk/tv/VERSION (original) +++ trunk/tv/VERSION Wed Jun 6 11:16:24 2007 @@ -1 +1 @@ -2.15.5 +2.15.6 Added: trunk/tv/data/CARDLIST.ivtv URL: http://svn.opensuse.org/viewcvs/yast/trunk/tv/data/CARDLIST.ivtv?rev=38305&… ============================================================================== --- trunk/tv/data/CARDLIST.ivtv (added) +++ trunk/tv/data/CARDLIST.ivtv Wed Jun 6 11:16:24 2007 @@ -0,0 +1,18 @@ + 1 -> Hauppauge WinTV PVR-250 + 2 -> Hauppauge WinTV PVR-350 + 3 -> Hauppauge WinTV PVR-150 or PVR-500 + 4 -> AVerMedia M179 [1461:a3ce,1461:a3cf] + 5 -> Yuan MPG600/Kuroutoshikou iTVC16-STVLP [12ab:fff3,12ab:ffff] + 6 -> Yuan MPG160/Kuroutoshikou iTVC15-STVLP [12ab:0000,10fc:40a0] + 7 -> Yuan PG600/DiamondMM PVR-550 [ff92:0070,ffab:0600] + 8 -> Adaptec AVC-2410 [9005:0093] + 9 -> Adaptec AVC-2010 [9005:0092] +10 -> NAGASE TRANSGEAR 5000TV [1461:bfff] +11 -> AOpen VA2000MAX-STN6 [0000:ff5f] +12 -> YUAN MPG600GR/Kuroutoshikou CX23416GYC-STVLP [12ab:0600,fbab:0600,1154:0523] +13 -> I/O Data GV-MVP/RX [10fc:d01e,10fc:d038,10fc:d039] +14 -> I/O Data GV-MVP/RX2E [10fc:d025] +15 -> GOTVIEW PCI DVD (partial support only) [12ab:0600] +16 -> GOTVIEW PCI DVD2 Deluxe [ffac:0600] +17 -> Yuan MPC622 [ff01:d998] +18 -> Digital Cowboy DCT-MTVP1 [1461:bfff] Modified: trunk/tv/data/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/tv/data/Makefile.am?rev=38305&r1… ============================================================================== --- trunk/tv/data/Makefile.am (original) +++ trunk/tv/data/Makefile.am Wed Jun 6 11:16:24 2007 @@ -6,13 +6,13 @@ ydata_DATA = tv_cards-lirc_gpio.ycp tv_cards.ycp tv_tuners.ycp tv_dvbcards.ycp tv_dvbfirmware.ycp -tv_cards.ycp: CARDLIST.bttv CARDLIST.saa7134 CARDLIST.cx88 +tv_cards.ycp: CARDLIST.bttv CARDLIST.saa7134 CARDLIST.cx88 CARDLIST.ivtv $(srcdir)/create_tv_db $^ > $@ tv_tuners.ycp: CARDLIST.tuner $(srcdir)/create_tuner_db $^ > $@ -EXTRA_DIST = CARDLIST.bttv CARDLIST.saa7134 CARDLIST.cx88 CARDLIST.tuner\ +EXTRA_DIST = CARDLIST.bttv CARDLIST.saa7134 CARDLIST.cx88 CARDLIST.ivtv CARDLIST.tuner\ create_tv_db create_tuner_db tv_cards-lirc_gpio.ycp tv_dvbcards.ycp tv_dvbfirmware.ycp # delete generated files Modified: trunk/tv/data/create_tv_db URL: http://svn.opensuse.org/viewcvs/yast/trunk/tv/data/create_tv_db?rev=38305&r… ============================================================================== --- trunk/tv/data/create_tv_db (original) +++ trunk/tv/data/create_tv_db Wed Jun 6 11:16:24 2007 @@ -5,6 +5,7 @@ # $1 - the CARDLIST.bttv source file # $2 - the CARDLIST.saa7134 source file # $3 - the CARDLIST.cx88 source file +# $4 - the CARDLIST.ivtv source file # ...more to come... if ($#ARGV < 1) @@ -16,6 +17,7 @@ $bttv_cardlist_fname = $ARGV[0]; $saa7134_cardlist_fname = $ARGV[1]; $cx88_cardlist_fname = $ARGV[2]; +$ivtv_cardlist_fname = $ARGV[3]; # ... more to come ... # Names to translate @@ -149,6 +151,7 @@ push @cards, ReadDatabase($bttv_cardlist_fname, "bttv"); push @cards, ReadDatabase($saa7134_cardlist_fname, "saa7134"); push @cards, ReadDatabase($cx88_cardlist_fname, "cx88xx"); +push @cards, ReadDatabase($ivtv_cardlist_fname, "ivtv"); #...more to come... # Sort @cards Modified: trunk/tv/data/tv_dvbcards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/tv/data/tv_dvbcards.ycp?rev=3830… ============================================================================== --- trunk/tv/data/tv_dvbcards.ycp (original) +++ trunk/tv/data/tv_dvbcards.ycp Wed Jun 6 11:16:24 2007 @@ -24,7 +24,21 @@ $[ "name" : "B2C2 FlexCopII DVB chip / Technisat SkyStar2 DVB card", "module" : [ "b2c2-flexcop-pci", "mt312" ] - ] + ], + // (#222806) + $[ + "name" : "Nova-T DVB-T Model 909", + "module" : [ "cx88_dvb", "bcm3510" ] + ], + // (#223188) + $[ + "name" : "Twinhan VisionPlus DVB-T", + "module" : [ "dvb-bt8xx", "bcm3510" ] + ], + $[ + "name" : "AVermedia DVB-T 771", + "module" : [ "dvb-bt8xx", "mt352" ] + ], ] ] ]; Modified: trunk/tv/data/tv_dvbfirmware.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/tv/data/tv_dvbfirmware.ycp?rev=3… ============================================================================== --- trunk/tv/data/tv_dvbfirmware.ycp (original) +++ trunk/tv/data/tv_dvbfirmware.ycp Wed Jun 6 11:16:24 2007 @@ -132,6 +132,13 @@ ] ] ], + + "ivtv" : + [ + $[ + "packages" : [ "ivtv", "ivtv-firmware", "ivtv-kmp-default" ] + ] + ], ]; } Modified: trunk/tv/package/yast2-tv.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/tv/package/yast2-tv.changes?rev=… ============================================================================== --- trunk/tv/package/yast2-tv.changes (original) +++ trunk/tv/package/yast2-tv.changes Wed Jun 6 11:16:24 2007 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Wed Jun 6 10:30:42 CEST 2007 - lslezak(a)suse.cz + +- support for ivtv based TV cards (#130098) +- install firmware/packages before loading drivers +- updated DVB card DB (#222806, #223188) +- 2.15.6 + +------------------------------------------------------------------- Mon Jun 4 14:35:57 CEST 2007 - lslezak(a)suse.cz - tv card DB updated to kernel-default-2.6.21-12 Modified: trunk/tv/src/Tv.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/tv/src/Tv.ycp?rev=38305&r1=38304… ============================================================================== --- trunk/tv/src/Tv.ycp (original) +++ trunk/tv/src/Tv.ycp Wed Jun 6 11:16:24 2007 @@ -1248,6 +1248,8 @@ y2milestone("required modules with FW: %1", reqmod); + list<string> packages_to_install = []; + if (size(reqmod) > 0) { foreach(string drv, reqmod, { @@ -1255,24 +1257,29 @@ string cardname = "TV"; // is the firmware really needed? - boolean firmware_needed = false; + boolean firmware_needed = nil; foreach(map card, (list<map>) cards, { list<string> drvs = card["module"]:[]; - - if (card["fw_install"]:true) - { - firmware_needed = true; - } - if (contains(drvs, drv)) { cardname = card["name"]:"TV"; + + // install the firmware? + boolean inst = card["fw_install"]:true; + if (firmware_needed == nil) + { + firmware_needed = inst; + } + else + { + firmware_needed = firmware_needed || inst; + } } } ); - if (firmware_needed) + if (firmware_needed == false) { y2milestone("Skipping firmware installation for driver '%1' (card '%2')", drv, cardname); continue; @@ -1281,19 +1288,27 @@ list<map<string,any> > fws = (list<map<string,any> >)firmware_database[drv]:[]; foreach(map<string,any> fw, fws, { - string target = fw["target"]:""; - string source = fw["source"]:""; + list<string> required_packages = fw["packages"]:[]; - boolean inst = IsFWInstalled(firmware_prefix + target); - if (inst) + if (size(required_packages) > 0) { - // the firmware is already installed - y2milestone("Firmware %1 has been already installed.", firmware_prefix + target); - continue; + y2milestone("Driver %1 requires these packages: %2", drv, required_packages); + packages_to_install = (list<string>)union(packages_to_install, required_packages); } + string target = fw["target"]:""; + string source = fw["source"]:""; + if (target != nil && target != "" && source != nil && source != "") { + boolean inst = IsFWInstalled(firmware_prefix + target); + if (inst) + { + // the firmware is already installed + y2milestone("Firmware %1 has been already installed.", firmware_prefix + target); + continue; + } + boolean install = true; // install fw in a loop until it succeeds or a wrong fw is confirmed @@ -1365,6 +1380,21 @@ } ); + + y2milestone("Collected packages: %1", packages_to_install); + + if (size(packages_to_install) > 0) + { + // do not install the packages again + packages_to_install = filter(string pkg, packages_to_install, {return !Package::Installed(pkg);}); + + y2milestone("Packages to install: %1", packages_to_install); + + if (size(packages_to_install) > 0) + { + ret = ret && Package::DoInstall(packages_to_install); + } + } } return ret; @@ -2098,30 +2128,55 @@ // Summary text (%1 is number) _("Installed as DVB card number %1."), dvbcard_no); - if (firmware_database != nil && size(firmware_database) > 0) - { - foreach(string fwmod, list<map<string,any> > fws, (map<string,list<map<string,any> > >)firmware_database, { + } + else + { + installed_str = sformat( + // Summary text (%1 is number) + _("Installed as TV card number %1"), card_no); + } - if (contains(card["module"]:[], fwmod)) - { - foreach(map<string,any> fw, fws, { - string target = fw["target"]:""; - string source = fw["source"]:""; + if (firmware_database != nil && size(firmware_database) > 0) + { + foreach(string fwmod, list<map<string,any> > fws, (map<string,list<map<string,any> > >)firmware_database, { + if (contains(card["module"]:[], fwmod)) + { + foreach(map<string,any> fw, fws, { + string target = fw["target"]:""; + string source = fw["source"]:""; + + if (target != "" && source != "") + { boolean inst = IsFWInstalled(firmware_prefix + target); installed_str = installed_str + "<BR>" + _("Firmware: ") + ((inst) ? sformat(_("Installed (%1)"), target) : sformat(_("Not installed (%1)"), source)); } - ); - } + + // add packages + list<string> required_packages = fw["packages"]:[]; + + if (size(required_packages) > 0) + { + y2milestone("Required packages for driver %1: %2", fwmod, required_packages); + } + + foreach(string pkg, required_packages, + { + // summary string, %1 is a package name, %2 is a status string: installed + installed_str = installed_str + "<BR>" + sformat(_("Package: %1 (%2)"), + // package status + pkg, Package::Installed(pkg) ? _("Installed") : _("Not Installed")); + } + ); + } + ); + } - ); - } + } + ); } - else - installed_str = sformat( - // Summary text (%1 is number) - _("Installed as TV card number %1"), card_no); + card_item = Summary::Device(name, installed_str); } @@ -2470,33 +2525,51 @@ } // add firmware data if available - if (isdvb) + if (firmware_database != nil && size(firmware_database) > 0) { - if (firmware_database != nil && size(firmware_database) > 0) + if (card["fw_install"]:nil == false) { - if (card["fw_install"]:nil == false) - { - y2milestone("Card '%1' doesn't need a firmware", card ["name"]:""); - } - else - { - foreach(string fwmod, list<map<string,any> > fws, (map<string,list<map<string,any> > >)firmware_database, { + y2milestone("Card '%1' doesn't need a firmware", card ["name"]:""); + } + else + { + foreach(string fwmod, list<map<string,any> > fws, (map<string,list<map<string,any> > >)firmware_database, { - if (contains(card["module"]:[], fwmod)) - { - foreach(map<string,any> fw, fws, { - string target = fw["target"]:""; - string source = fw["source"]:""; + if (contains(card["module"]:[], fwmod)) + { + foreach(map<string,any> fw, fws, { + string target = fw["target"]:""; + string source = fw["source"]:""; + + if (target != "" && source != "") + { boolean inst = IsFWInstalled(firmware_prefix + target); descr = add(descr, _("Firmware: ") + ((inst) ? sformat(_("Installed (%1)"), target) : sformat(_("Not installed (%1 -> %2)"), source, target))); } - ); - } + + // any required package? + list<string> required_packages = fw["packages"]:[]; + + if (size(required_packages) > 0) + { + y2milestone("Required packages for driver %1: %2", fwmod, required_packages); + } + + foreach(string pkg, required_packages, + { + // summary string, %1 is a package name, %2 is a status string: installed + descr = add(descr, sformat(_("Package: %1 (%2)"), + // package status + pkg, Package::Installed(pkg) ? _("Installed") : _("Not Installed"))); + } + ); + } + ); } - ); - } + } + ); } } @@ -3290,18 +3363,18 @@ list<string> stages = [ // Progress stage - _("Write the settings"), - // Progress stage _("Install firmware"), // Progress stage + _("Write the settings"), + // Progress stage _("Update sound volume")]; list steps = [ // Progress step - _("Writing the settings..."), - // Progress step _("Installing firmware..."), // Progress step + _("Writing the settings..."), + // Progress step _("Updating the sound volume...")]; if (!not_ask) @@ -3334,7 +3407,14 @@ y2debug("cards: %1", cards); - // Write the settings + // Install firmware + Progress::NextStage (); + + if (cards_dirty && !InstallFW()) + { + return false; + } + Progress::NextStage (); // install required kernel packages @@ -3345,17 +3425,12 @@ Package::InstallKernel(kernelmodules); } + // Write the settings if (cards_dirty && !WriteSettings()) { return false; } - Progress::NextStage (); - if (cards_dirty && !InstallFW()) - { - return false; - } - // Write the sound volume Progress::NextStage (); if (cards_dirty && !WriteSoundVolume()) -- 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] r38304 - in /trunk/yast2: library/packages/src/PackageLock.ycp package/yast2.changes
by locilka＠svn.opensuse.org 05 Jun '07

05 Jun '07

Author: locilka Date: Tue Jun 5 21:24:53 2007 New Revision: 38304 URL: http://svn.opensuse.org/viewcvs/yast?rev=38304&view=rev Log: - Extended PackageLock::Check function to allow to 'Retry' getting the package management lock (#280383). Modified: trunk/yast2/library/packages/src/PackageLock.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/library/packages/src/PackageLock.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/packages/src/Packa… ============================================================================== --- trunk/yast2/library/packages/src/PackageLock.ycp (original) +++ trunk/yast2/library/packages/src/PackageLock.ycp Tue Jun 5 21:24:53 2007 @@ -14,9 +14,11 @@ module "PackageLock"; textdomain "base"; -import "Report"; +import "Popup"; +import "Label"; boolean have_lock = nil; + /** * Tries to acquire the packager (zypp) lock. * Reports an error if another process has the lock already. @@ -24,18 +26,40 @@ * @return true if we can continue */ global boolean Check () { - if (have_lock == nil) - { + // we already have a lock + if (have_lock != nil) return have_lock; + + // just to allow 'Retry', see more in bug #280383 + boolean try_again = true; + + // while not having a lock and user wants to try again + while (try_again) { // Invoke a cheap call that accesses the zypp lock have_lock = Pkg::Connect () == true; // nil guard - if (!have_lock) - { - Report::Error (_("Another process is accessing the package database. + if (have_lock == true) break; + + if (have_lock != true) { + try_again = (Popup::AnyQuestion ( + // TRANSLATORS: a popup headline + _("Accessing the Package Management Failed"), + // TRANSLATORS: an error message with question + _("Another process is accessing the package database. Package management cannot be used now. -")); - // ContinueCancel? What about CLI? + +Would you like to continue without having access +to the package management or retry to access it? +"), + Label::ContinueButton(), + Label::RetryButton(), + // 'Continue' instead of 'Retry' + `focus_yes + ) == false); } + + if (try_again) y2milestone ("User decided to retry..."); } + + y2milestone ("PackageLock::Check result: %1", have_lock); return have_lock; } Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=… ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Tue Jun 5 21:24:53 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Jun 5 21:22:50 CEST 2007 - locilka(a)suse.cz + +- Extended PackageLock::Check function to allow to 'Retry' getting + the package management lock (#280383). + +------------------------------------------------------------------- Fri Jun 1 09:51:24 CEST 2007 - mzugec(a)suse.cz - add function NetworkService::isNetworkRunning() -- 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] r38303 - /tags/stable-2_16_1/vm/
by charlesa＠svn.opensuse.org 05 Jun '07

05 Jun '07

Author: charlesa Date: Tue Jun 5 18:48:33 2007 New Revision: 38303 URL: http://svn.opensuse.org/viewcvs/yast?rev=38303&view=rev Log: Created tag stable-2_16_1 for vm Added: tags/stable-2_16_1/vm/ - copied from r38302, trunk/vm/ -- 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] r38302 - /tags/stable-2_16_1/
by charlesa＠svn.opensuse.org 05 Jun '07

05 Jun '07

Author: charlesa Date: Tue Jun 5 18:48:26 2007 New Revision: 38302 URL: http://svn.opensuse.org/viewcvs/yast?rev=38302&view=rev Log: Created tag stable-2_16_1 Added: tags/stable-2_16_1/ -- 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] r38301 - /trunk/slide-show/AUTHORS
by jimmacfx＠svn.opensuse.org 05 Jun '07

05 Jun '07

Author: jimmacfx Date: Tue Jun 5 18:16:14 2007 New Revision: 38301 URL: http://svn.opensuse.org/viewcvs/yast?rev=38301&view=rev Log: add myself to the AUTHORS file Modified: trunk/slide-show/AUTHORS Modified: trunk/slide-show/AUTHORS URL: http://svn.opensuse.org/viewcvs/yast/trunk/slide-show/AUTHORS?rev=38301&r1=… ============================================================================== --- trunk/slide-show/AUTHORS (original) +++ trunk/slide-show/AUTHORS Tue Jun 5 18:16:14 2007 @@ -2,3 +2,4 @@ Martin Sommer <msommer(a)suse.de> Stefan Hundhammer <sh(a)suse.de> Rebecca Walter <rwalter(a)suse.de> +Jakub Steiner <jimmac(a)novell.com> -- 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] r38300 - /trunk/slide-show/SuSELinux/pic/09_security-alt.svg
by jimmacfx＠svn.opensuse.org 05 Jun '07

05 Jun '07

Author: jimmacfx Date: Tue Jun 5 18:14:46 2007 New Revision: 38300 URL: http://svn.opensuse.org/viewcvs/yast?rev=38300&view=rev Log: no need to ship the svg Removed: trunk/slide-show/SuSELinux/pic/09_security-alt.svg -- 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] r38299 - /trunk/storage/package/yast2-storage.changes
by fehr＠svn.opensuse.org 05 Jun '07

05 Jun '07

Author: fehr Date: Tue Jun 5 18:10:01 2007 New Revision: 38299 URL: http://svn.opensuse.org/viewcvs/yast?rev=38299&view=rev Log: fix typo Modified: trunk/storage/package/yast2-storage.changes Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Tue Jun 5 18:10:01 2007 @@ -503,7 +503,7 @@ - fix problem propagating mkfs options to libstorage - add dir_index option for ext3 formats (feature #301236) - make dir_index option default for ext3 formats -- fix problem with ancryption and noauto (#204942) +- fix problem with encryption and noauto (#204942) - version 2.14.6 ------------------------------------------------------------------- -- 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] r38298 - in /branches/tmp/sh/mod-ui/core/libyui/src: Makefile.am YChildrenManager.h YWidget.cc YWidget.h
by sh-sh-sh＠svn.opensuse.org 05 Jun '07

05 Jun '07

Author: sh-sh-sh Date: Tue Jun 5 18:01:57 2007 New Revision: 38298 URL: http://svn.opensuse.org/viewcvs/yast?rev=38298&view=rev Log: children management in YWidget Added: branches/tmp/sh/mod-ui/core/libyui/src/YChildrenManager.h Modified: branches/tmp/sh/mod-ui/core/libyui/src/Makefile.am branches/tmp/sh/mod-ui/core/libyui/src/YWidget.cc branches/tmp/sh/mod-ui/core/libyui/src/YWidget.h Modified: branches/tmp/sh/mod-ui/core/libyui/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/Makefile.am (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/Makefile.am Tue Jun 5 18:01:57 2007 @@ -21,6 +21,7 @@ YUIException.cc \ YProperty.cc \ \ + YWidget.cc \ YAlignment.cc \ YBarGraph.cc \ YCheckBox.cc \ @@ -65,7 +66,6 @@ YTextEntry.cc \ YTime.cc \ YTree.cc \ - YWidget.cc \ YWizard.cc \ YSelectionWidget.cc Added: branches/tmp/sh/mod-ui/core/libyui/src/YChildrenManager.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YChildrenManager.h (added) +++ branches/tmp/sh/mod-ui/core/libyui/src/YChildrenManager.h Tue Jun 5 18:01:57 2007 @@ -0,0 +1,213 @@ +/*---------------------------------------------------------------------\ +| | +| __ __ ____ _____ ____ | +| \ \ / /_ _/ ___|_ _|___ \ | +| \ V / _` \___ \ | | __) | | +| | | (_| |___) || | / __/ | +| |_|\__,_|____/ |_| |_____| | +| | +| core system | +| (C) SuSE GmbH | +\----------------------------------------------------------------------/ + + File: YChildrenManager.h + + Author: Stefan Hundhammer <sh(a)suse.de> + +/-*/ + +#ifndef YChildrenManager_h +#define YChildrenManager_h + +#include <list> +#include <algorithm> +#include <YUIException.h> + + +/** + * Abstract base template class for children management, such as child + * widgets. + **/ +template<class T> class YChildrenManager +{ +protected: + + /** + * Constructor. + * + * 'containerParent' is the class whose children are managed. + **/ + YChildrenManager( T * containerParent ) + : _container( containerParent ) + {} + + /** + * Destructor. + **/ + virtual ~YChildrenManager() {} + +public: + + typedef std::list<T *> ChildrenList; + + /** + * Check if there are any children. + **/ + bool hasChildren() const { return ! empty(); } + + /** + * Check if the children list is empty, i.e. if there are no children. + **/ + bool empty() const { return _children.empty(); } + + /** + * Returns the number of children. + **/ + int count() const { return _children.size(); } + + /** + * Return an iterator that points to the first child. + **/ + typename ChildrenList::const_iterator begin() const + { return _children.begin(); } + + /** + * Returns an iterator that points after the last child. + **/ + typename ChildrenList::const_iterator end() const + { return _children.end(); } + + /** + * Returns the first child or 0 if there is none. + * Useful mostly for children managers that handle only one child. + **/ + T * firstChild() + { return _children.empty() ? (T *) 0 : _children.front(); } + + /** + * Add a new child. + * + * This may throw exceptions if more children are added than the class + * whose children are handled (the associated widget) can handle. + **/ + virtual void add( T * child ) + { _children.push_back( child ); } + + /** + * Remove a child. This only removes the child from the children manager's + * list; it does not delete it. + **/ + virtual void remove( T * child ) + { _children.remove( child ); } + + /** + * Remove all children. This only removes the children from the children + * manager's list; it does not delete them. + **/ + virtual void clear() + { _children.clear(); } + + /** + * Check if the children list contains the specified child. + * Returns 'true' if the children list contains the child, + * 'false' otherwise. + **/ + bool contains( T * child ) const + { + return ( find( _children, _children.begin(), _children.end() ) + != _children.end() ); + } + + /** + * Returns the associated container, i.e. the object whose children are + * handled here. + **/ + T * container() const { return _container; } + +protected: + + T * _container; + ChildrenList _children; +}; + + +/** + * Children manager that can handle one single child (rejecting any more). + * Useful for YAlignment, YFrame etc. + **/ +template<class T> class YSingleChildManager: public YChildrenManager<T> +{ +public: + + YSingleChildManager( T * containerParent ) + : YChildrenManager<T>( containerParent ) + {} + + /** + * Add a new child. + * + * Reimplemented from YChildrenManager. + * + * This will throw a YUITooManyChildrenException if there already is a + * child. + **/ + virtual void add( T * child ) + { + if ( this->empty() ) + this->_children.push_back( child ); + else + YUI_THROW( YUITooManyChildrenException<T>( this->container() ) ); + } + + /** + * Replace the previous child (if any) with a new one. + **/ + void replace( T * newChild ) + { + this->_children.clear(); + this->_children.push_back( newChild ); + } +}; + + +/** + * Children manager that rejects all children. + * + * Useful for widget classes that can't handle children such as YPushButton, + * YSelectionBox etc. + **/ +template<class T> class YChildrenRejector: public YChildrenManager<T> +{ +public: + /** + * Constructor. + **/ + YChildrenRejector( T * containerParent ) + : YChildrenManager<T>( containerParent ) + {} + + /** + * Add a new child. + * + * Reimplemented from YChildrenManager. + * + * Since this class is designed to reject children, this always throws a + * YUITooManyChildrenException. + **/ + virtual void add( T * child ) + { YUI_THROW( YUITooManyChildrenException<T>( this->container() ) ); } + + /** + * Remove a child. + * + * Reimplemented from YChildrenManager. + * + * Since this class is designed to reject children, this always throws a + * YUIInvalidChildException. + **/ + virtual void remove( T * child ) + { YUI_THROW( YUIInvalidChildException<T>( this->container(), child ) ); } +}; + + +#endif // YChildrenManager_h Modified: branches/tmp/sh/mod-ui/core/libyui/src/YWidget.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YWidget.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YWidget.cc Tue Jun 5 18:01:57 2007 @@ -41,12 +41,31 @@ #define MAX_DEBUG_LABEL_LEN 50 +struct YWidgetPrivate +{ + /** + * Constructor + **/ + YWidgetPrivate( YWidget * widget ) + : childrenRejector( widget ) + , childrenManager( childrenRejector ) + {} + + // + // Data members + // + + YWidgetChildrenRejector childrenRejector; // default: no children + YWidgetChildrenManager & childrenManager; +}; + int YWidget::next_internal_widget_id = 0; YWidget::YWidget( const YWidgetOpt & opt ) - : magic( YWIDGET_MAGIC ) + : priv( new YWidgetPrivate( this ) ) + , magic( YWIDGET_MAGIC ) , user_widget_id( YCPNull() ) , yparent(0) , rep(0) @@ -83,7 +102,36 @@ } -string YWidget::debugLabel() +YChildrenManager & +YWidget::childrenManager() const +{ + return priv->childrenManager; +} + + +void +YWidget::setChildrenManager( YChildrenManager & newChildrenManager ) +{ + priv->childrenManager = newChildrenManager; +} + + +void +YWidget::addChild( YWidget * child ) +{ + childrenManager().addChild( child ); +} + + +void +YWidget::removeChild( YWidget * child ) +{ + childrenManager().removeChild( child ); +} + + +string +YWidget::debugLabel() { string label = YShortcut::cleanShortcutString( YShortcut::getShortcutString( this ) ); Modified: branches/tmp/sh/mod-ui/core/libyui/src/YWidget.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YWidget.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YWidget.h Tue Jun 5 18:01:57 2007 @@ -27,6 +27,7 @@ #include "YWidgetOpt.h" #include "YUISymbols.h" #include "YUIException.h" +#include "YChildrenManager.h" #include "ImplPtr.h" #define YWIDGET_MAGIC 42 // what else? ;- ) @@ -44,6 +45,12 @@ typedef std::list<YWidget *>::iterator YWidgetListIterator; typedef std::list<YWidget *>::const_iterator YWidgetListConstIterator; +typedef YChildrenManager<YWidget> YWidgetChildrenManager; +typedef YSingleChildManager<YWidget> YSingleWidgetChildManager; +typedef YChildrenRejector<YWidget> YWidgetChildrenRejector; + +class YWidgetPrivate; + /** * @short Abstract base class of all ui widgets */ @@ -79,6 +86,11 @@ **/ virtual std::string debugLabel(); + + // + // Property Management + // + /** * Return this class's property set. * This also initializes the property upon the first call. @@ -134,6 +146,83 @@ virtual YPropertyValue getProperty( const std::string & propertyName ); // FIXME: = 0 + + // + // Children Management + // + // Even though many widget classes are leaf classes and thus cannot have + // children by design, it makes sense to have the children management in + // this base class: Then descending down a widget tree is transparent to + // the outside without the need to check for container widget classes, + // casting to those container widget classes and only calling child + // management methods in that case. + // + // By default, YWidget and derived classes have a YWidgetChildrenRejector + // as their children manager, i.e. any attempt to add a child will result + // in a YUITooManyChildrenException. + // + // Derived classes that can (semantically) handle children should set the + // children manager to one of + // + // - YWidgetChildrenManager: handles any number of child widgets; + // useful for VBox / HBox + // + // - YSingleWidgetChildManager: handles exactly one child + // useful for widgets like Alignment, Frame, Dialog + // + + + /** + * Returns 'true' if this widget has any children. + **/ + bool hasChildren() const + { return childrenManager().hasChildren(); } + /** + * Returns the first child or 0 if there is none. + * Useful mostly for children managers that handle only one child. + **/ + YWidget * firstChild() const + { return childrenManager().firstChild(); } + + /** + * Return an iterator that points to the first child or to childrenEnd() if + * there are no children. + **/ + YWidgetListConstIterator childrenBegin() const + { return childrenManager().begin(); } + + /** + * Returns the current number of children. + **/ + int childrenCount() const { return childrenManager().count(); } + + /** + * Return an interator that points after the last child. + **/ + YWidgetListConstIterator childrenEnd() const + { return childrenManager().end(); } + + /** + * Add a new child. + * + * This may throw exceptions if more children are added than this widget + * can handle. + **/ + virtual void addChild( YWidget * child ); + + /** + * Remove a child. This only removes the child from the children manager's + * list; it does not delete it. + **/ + virtual void removeChild( YWidget * child ); + + + // + // Misc + // + + + /** * Checks whether or not this object is valid. This is to enable * dangling pointer error checking ( i.e. this object is already @@ -445,6 +534,27 @@ virtual void doneMultipleChanges() {} +protected: + + /** + * Returns this widget's children manager. + **/ + YWidgetChildrenManager & childrenManager() const; + + /** + * Sets a new children manager for this widget. + * The default children manager (a YWidgetChildrenRejector) rejects all + * children. This is useful for leaf widgets such as PushButton, ComboBox + * etc. + * + * Derived classes that can handle children might want to set the children + * manager to a YWidgetChildrenManager (the base class that does not reject + * children) or to a YSingleWidgetChildManager (the class that handles + * exactly one child widget). + **/ + void setChildrenManager( YWidgetChildrenManager & manager ); + + private: /** @@ -528,7 +638,8 @@ private: - static YPropertySet _propertySet; + ImplPtr<YWidgetPrivate *> priv; + static YPropertySet _propertySet; public: -- 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] r38297 - in /trunk/vm: VERSION package/yast2-vm.changes src/VM_XEN.ycp src/xen.ycp
by charlesa＠svn.opensuse.org 05 Jun '07

05 Jun '07

Author: charlesa Date: Tue Jun 5 17:59:26 2007 New Revision: 38297 URL: http://svn.opensuse.org/viewcvs/yast?rev=38297&view=rev Log: Respond when "help" is requested at the command line. (#269913) Prompt for installing graphical tools when running in text mode. (#268510) Modified: trunk/vm/VERSION trunk/vm/package/yast2-vm.changes trunk/vm/src/VM_XEN.ycp trunk/vm/src/xen.ycp Modified: trunk/vm/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/vm/VERSION?rev=38297&r1=38296&r2… ============================================================================== --- trunk/vm/VERSION (original) +++ trunk/vm/VERSION Tue Jun 5 17:59:26 2007 @@ -1 +1 @@ -2.15.4 +2.16.1 Modified: trunk/vm/package/yast2-vm.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/vm/package/yast2-vm.changes?rev=… ============================================================================== --- trunk/vm/package/yast2-vm.changes (original) +++ trunk/vm/package/yast2-vm.changes Tue Jun 5 17:59:26 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Jun 5 09:57:06 MDT 2007 - carnold(a)novell.com + +- Respond when "help" is requested at the command line. (#269913) +- Prompt for installing graphical tools when running in text mode. + (#268510) + +------------------------------------------------------------------- Mon May 21 08:29:37 MDT 2007 - carnold(a)novell.com - The 'Virtualization' category is missing and the virtualization Modified: trunk/vm/src/VM_XEN.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/vm/src/VM_XEN.ycp?rev=38297&r1=3… ============================================================================== --- trunk/vm/src/VM_XEN.ycp (original) +++ trunk/vm/src/VM_XEN.ycp Tue Jun 5 17:59:26 2007 @@ -181,8 +181,13 @@ list<string> packages = ["xen", "xen-libs", "xen-tools", "xen-tools-ioemu"]; packages = add(packages, kernel_pkg); + boolean inst_gui = true; + // Assume python gtk is installed. If in text mode we don't care - if (UI::GetDisplayInfo()["TextMode"]:true == false) { + if (UI::GetDisplayInfo()["TextMode"]:true == true) { + inst_gui = Popup::YesNo (_("Running in text mode. Install graphical components anyway?")); + } + if ( inst_gui == true ) { packages = add(packages, "python-gtk"); // Also make sure virt-manager is there - runs GUI only packages = add(packages, "virt-manager"); Modified: trunk/vm/src/xen.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/vm/src/xen.ycp?rev=38297&r1=3829… ============================================================================== --- trunk/vm/src/xen.ycp (original) +++ trunk/vm/src/xen.ycp Tue Jun 5 17:59:26 2007 @@ -41,6 +41,7 @@ import "Arch"; + import "CommandLine"; import "Mode"; import "Package"; import "Popup"; @@ -66,38 +67,24 @@ return ret; } + /* Main */ -/* boolean GUIHandler() { - - // Assume python gtk is installed. If in text mode we don't care - if (UI::GetDisplayInfo()["TextMode"]:true == false) { - // FIXME: do we want to launch the GUI??? - // start the Xen VM install GUI - //string cmd = "/usr/sbin/xen-vm-install"; - //y2milestone("Executing: %1", cmd); - //integer ret = (integer)SCR::Execute(.target.bash_background, cmd); - //y2milestone("GUIHandler returned: %1", (ret == 0)); - //return (ret == 0); - } - - return true; - } -*/ + /** + * Definition of command line mode options + */ + map cmdline = $[ + "id" : "vm", + "help" : _("Install Hypervisor and Tools"), + "guihandler" : CheckConfiguration + ]; - /* Main */ + any rc = CommandLine::Run(cmdline); + y2milestone("YAST2-VM: rc = %1", rc); // Always check the dom0 configuration - boolean ret = CheckConfiguration(); - if (ret == false) return `abort; - - // only start the GUI if we are running Xen kernel - /* if (Arch::is_xen()) { - ret = GUIHandler(); - if (ret == false) return `abort; - } -*/ - +// boolean ret = CheckConfiguration(); +// if (ret == false) return `abort; /* Finish */ y2milestone("Xen (yast-vm) module finished"); -- 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] r38296 - in /branches/tmp/sh/mod-ui/core/libyui/src: Makefile.am YUIException.cc YUIException.h YUI_core.cc YWidget.cc
by sh-sh-sh＠svn.opensuse.org 05 Jun '07

05 Jun '07

Author: sh-sh-sh Date: Tue Jun 5 16:51:51 2007 New Revision: 38296 URL: http://svn.opensuse.org/viewcvs/yast?rev=38296&view=rev Log: children management classes Modified: branches/tmp/sh/mod-ui/core/libyui/src/Makefile.am branches/tmp/sh/mod-ui/core/libyui/src/YUIException.cc branches/tmp/sh/mod-ui/core/libyui/src/YUIException.h branches/tmp/sh/mod-ui/core/libyui/src/YUI_core.cc branches/tmp/sh/mod-ui/core/libyui/src/YWidget.cc Modified: branches/tmp/sh/mod-ui/core/libyui/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/Makefile.am (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/Makefile.am Tue Jun 5 16:51:51 2007 @@ -82,6 +82,7 @@ YPackageSelectorPlugin.h \ YUIException.h \ YProperty.h \ + YChildrenManager.h \ ImplPtr.h \ \ YAlignment.h \ Modified: branches/tmp/sh/mod-ui/core/libyui/src/YUIException.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YUIException.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YUIException.cc Tue Jun 5 16:51:51 2007 @@ -19,7 +19,6 @@ /-*/ -#include <iostream> #include <sstream> #include <string.h> // strerror() @@ -160,7 +159,7 @@ if ( widget() ) widgetClass = std::string( widget()->widgetClass() ) + "::"; - + return str << "Property type mismatch: " << widgetClass << property().name() @@ -179,10 +178,12 @@ if ( widget() ) widgetClass = std::string( widget()->widgetClass() ) + "::"; - + return str << "Property " << widgetClass << property().name() << "is read-only!" << endl; } + + Modified: branches/tmp/sh/mod-ui/core/libyui/src/YUIException.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YUIException.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YUIException.h Tue Jun 5 16:51:51 2007 @@ -24,7 +24,7 @@ #include <cerrno> -#include <iosfwd> +#include <iostream> #include <stdexcept> #include "YProperty.h" @@ -471,6 +471,103 @@ }; +/** + * Exception class for "too many children": + * Attempt to add a child to a widget class that can't handle children + * (YPushButton etc.) or just one child (YFrame, YDialog). + **/ +template<class YWidget> class YUITooManyChildrenException: public YUIException +{ +public: + + YUITooManyChildrenException( YWidget * container ) + : YUIException( "Too many children" ) + , _container( container ) + {} + + /** + * Returns the container widget that can't handle that many children. + **/ + YWidget * container() const { return _container; } + +protected: + + /** + * Write proper error message with all relevant data. + * Reimplemented from YUIException. + **/ + virtual ostream & dumpOn( ostream & str ) const + { + std::string widgetClass = + container() ? container()->widgetClass() : + "widget"; + + return str << "Too many children for " + << widgetClass + << std::endl; + } + +private: + + YWidget * _container; +}; + + +/** + * Exception class for "invalid child": + * Attempt to remove a child from a children manager that is not in that + * manager's children list. + **/ +template<class YWidget> class YUIInvalidChildException: public YUIException +{ +public: + + YUIInvalidChildException( YWidget * container, + YWidget * child = 0 ) + : YUIException( "Invalid child" ) + , _container( container ) + , _child( child ) + {} + + /** + * Returns the container widget whose child should be removed etc. + **/ + YWidget * container() const { return _container; } + + /** + * Returns the child widget. + **/ + YWidget * child() const { return _child; } + +protected: + + /** + * Write proper error message with all relevant data. + * Reimplemented from YUIException. + **/ + virtual ostream & dumpOn( ostream & str ) const + { + std::string containerWidgetClass = + container() ? container()->widgetClass() : + "widget"; + + std::string childWidgetClass = + child() ? child()->widgetClass() : + "<Null>"; + + return str << childWidgetClass + << " is not a child of " + << containerWidgetClass + << std::endl; + } + +private: + + YWidget * _container; + YWidget * _child; +}; + + // // Helper templates // Modified: branches/tmp/sh/mod-ui/core/libyui/src/YUI_core.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YUI_core.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YUI_core.cc Tue Jun 5 16:51:51 2007 @@ -394,6 +394,8 @@ YRadioButtonGroup * YUI::findRadioButtonGroup( YContainerWidget * root, YWidget * widget, bool * contains ) { + // FIXME: this function is very likely very obsolete + YCPValue root_id = root->id(); #if VERBOSE_FIND_RADIO_BUTTON_GROUP Modified: branches/tmp/sh/mod-ui/core/libyui/src/YWidget.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YWidget.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YWidget.cc Tue Jun 5 16:51:51 2007 @@ -35,6 +35,8 @@ #include "YDialog.h" #include "YUIException.h" +#include "YChildrenManager.h" + using std::string; #define MAX_DEBUG_LABEL_LEN 50 -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0