- YaST Commits

[yast-commit] r41581 - in /trunk/product-creator: VERSION package/yast2-product-creator.changes src/kiwi_dialogs.ycp src/wizards.ycp
by jsuchome＠svn.opensuse.org 26 Oct '07

26 Oct '07

Author: jsuchome Date: Fri Oct 26 10:38:56 2007 New Revision: 41581 URL: http://svn.opensuse.org/viewcvs/yast?rev=41581&view=rev Log: - fix the sequence for going to kiwi image from main summary - do not read the template name when going from main summary - 2.16.2 Modified: trunk/product-creator/VERSION trunk/product-creator/package/yast2-product-creator.changes trunk/product-creator/src/kiwi_dialogs.ycp trunk/product-creator/src/wizards.ycp Modified: trunk/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/VERSION?rev=4158… ============================================================================== --- trunk/product-creator/VERSION (original) +++ trunk/product-creator/VERSION Fri Oct 26 10:38:56 2007 @@ -1 +1 @@ -2.16.1 +2.16.2 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 Fri Oct 26 10:38:56 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Oct 26 10:25:01 CEST 2007 - jsuchome(a)suse.cz + +- fix the sequence for going to kiwi image from main summary +- do not read the template name when going from main summary +- 2.16.2 + +------------------------------------------------------------------- Thu Oct 25 15:12:09 CEST 2007 - jsuchome(a)suse.cz - adapted for the API change of StorageDevices.ycp 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 Fri Oct 26 10:38:56 2007 @@ -799,12 +799,15 @@ map<string,any> read_config = Kiwi::ReadConfigXML (kiwi_configuration); if (!KiwiConfig["_imported"]:false) { - KiwiConfig = (map<string,any>) union (KiwiConfig, read_config); + KiwiConfig = (map<string,any>) union ( + // "type" had different meaning in ProductCreator::Config... + remove (KiwiConfig, "type"), read_config); // for new configuration, do not read all from the template y2milestone ("product-creator based configuration..."); foreach (string key, ["addons", "packages", "sources"], { KiwiConfig[key] = ProductCreator::Config[key]:[]; }); + KiwiConfig["name"] = ProductCreator::Config["name"]:""; } else { Modified: trunk/product-creator/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/wizards.ycp?… ============================================================================== --- trunk/product-creator/src/wizards.ycp (original) +++ trunk/product-creator/src/wizards.ycp Fri Oct 26 10:38:56 2007 @@ -164,7 +164,6 @@ "ws_start" : "init_sources", "init_sources" : $[ `next : "kiwi", - `prepare : "prepare" ], "kiwi": $[ `abort : `abort, -- 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] r41580 - in /trunk/sound: VERSION data/Makefile.am data/alsa_packages.ycp package/yast2-sound.changes sound/src/Sound.ycp sound/src/complex.ycp sound/src/sound_write.ycp sound/src/wizards.ycp
by lslezak＠svn.opensuse.org 26 Oct '07

26 Oct '07

Author: lslezak Date: Fri Oct 26 10:36:17 2007 New Revision: 41580 URL: http://svn.opensuse.org/viewcvs/yast?rev=41580&view=rev Log: - added package DB, install packages required by the configured driver (#329690) - 2.16.0 Added: trunk/sound/data/alsa_packages.ycp Modified: trunk/sound/VERSION trunk/sound/data/Makefile.am trunk/sound/package/yast2-sound.changes trunk/sound/sound/src/Sound.ycp trunk/sound/sound/src/complex.ycp trunk/sound/sound/src/sound_write.ycp trunk/sound/sound/src/wizards.ycp Modified: trunk/sound/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/VERSION?rev=41580&r1=41579… ============================================================================== --- trunk/sound/VERSION (original) +++ trunk/sound/VERSION Fri Oct 26 10:36:17 2007 @@ -1 +1 @@ -2.15.11 +2.16.0 Modified: trunk/sound/data/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/data/Makefile.am?rev=41580… ============================================================================== --- trunk/sound/data/Makefile.am (original) +++ trunk/sound/data/Makefile.am Fri Oct 26 10:36:17 2007 @@ -6,6 +6,6 @@ SUBDIRS = addons doc include src -ydata_DATA = sndcards.ycp +ydata_DATA = sndcards.ycp alsa_packages.ycp EXTRA_DIST = $(ydata_DATA) Makefile.generate Added: trunk/sound/data/alsa_packages.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/data/alsa_packages.ycp?rev… ============================================================================== --- trunk/sound/data/alsa_packages.ycp (added) +++ trunk/sound/data/alsa_packages.ycp Fri Oct 26 10:36:17 2007 @@ -0,0 +1,41 @@ + + +// This is a mapping for required packages +// some devices need a firmware or a special tool to work properly + +{ + return + $[ + // "driver name" : [ list of required packages ] + + "snd-ymfpci" : [ "alsa-firmware" ], + "snd-maestro3" : [ "alsa-firmware" ], + "snd-darla20" : [ "alsa-firmware" ], + "snd-darla24" : [ "alsa-firmware" ], + "snd-echo3g" : [ "alsa-firmware" ], + "snd-gina20" : [ "alsa-firmware" ], + "snd-gina24" : [ "alsa-firmware" ], + "snd-indigodj" : [ "alsa-firmware" ], + "snd-indigoio" : [ "alsa-firmware" ], + "snd-indigo" : [ "alsa-firmware" ], + "snd-layla20" : [ "alsa-firmware" ], + "snd-layla24" : [ "alsa-firmware" ], + "snd-mia" : [ "alsa-firmware" ], + "snd-monoa" : [ "alsa-firmware" ], + "snd-mixart" : [ "alsa-firmware" ], + "snd-emu10k1" : [ "alsa-firmware", "awesfx" ], + "snd-sb16" : [ "alsa-firmware", "alsa-tools" ], + "snb-sbawe" : [ "alsa-firmware", "alsa-tools", "awesfx" ], + "snd-wavefront": [ "alsa-firmware" ], + "snd-pcxhr" : [ "alsa-firmware" ], + "snd-hdsp" : [ "alsa-firmware" ], + "snd-korg1212" : [ "alsa-firmware" ], + "snd-vx222" : [ "alsa-firmware" ], + "snd-sscape" : [ "alsa-tools" ], + + // The below are for hotplugged devices, so usually YaST is not involed + "snd-vxpocket" : [ "alsa-firmware" ], + "snd-usb-usx2y" : [ "alsa-firmware", "alsa-tools" ], + + ]; +} Modified: trunk/sound/package/yast2-sound.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/package/yast2-sound.change… ============================================================================== --- trunk/sound/package/yast2-sound.changes (original) +++ trunk/sound/package/yast2-sound.changes Fri Oct 26 10:36:17 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Oct 26 10:27:16 CEST 2007 - lslezak(a)suse.cz + +- added package DB, install packages required by the configured + driver (#329690) +- 2.16.0 + +------------------------------------------------------------------- Thu Aug 30 09:03:05 CEST 2007 - lslezak(a)suse.cz - support for PS3 sound card (automatic configuration) (#305927) Modified: trunk/sound/sound/src/Sound.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/sound/src/Sound.ycp?rev=41… ============================================================================== --- trunk/sound/sound/src/Sound.ycp (original) +++ trunk/sound/sound/src/Sound.ycp Fri Oct 26 10:36:17 2007 @@ -19,6 +19,7 @@ import "Progress"; import "Label"; import "String"; + import "Package"; /** * what sound system we're using (true=alsa, false=oss) @@ -115,6 +116,8 @@ */ global map db_module_index = nil; + global map db_packages = nil; + /** * flag for showing/not showing ui stuff (eg when loading alsa database) */ @@ -652,6 +655,55 @@ } /** + * opens alsa sound cards database + * @return void + */ + global void LoadPackageDatabase() + { + y2milestone("Reading required packages database..."); + db_packages = (map)eval(SCR::Read (.target.yast2, "alsa_packages.ycp")); + y2milestone("Loaded package list for %1 drivers", size(db_packages)); + } + + global list<string> RequiredPackages(string driver) + { + if (db_packages == nil) + { + LoadPackageDatabase(); + } + + list<string> ret = db_packages[driver]:[]; + y2milestone("Driver %1 requires packages: %2", driver, ret); + + return ret; + } + + global list<string> RequiredPackagesToInstall(string driver) + { + list<string> req_pkgs = RequiredPackages(driver); + req_pkgs = filter(string pkg, req_pkgs, {return !Package::PackageInstalled(pkg);}); + + y2milestone("Required packages to install for driver %1: %2", driver, req_pkgs); + return req_pkgs; + } + + global string RequiredPackagesToInstallSummary(string driver) + { + list<string> req_pkgs = RequiredPackagesToInstall(driver); + string pkg_summary = ""; + + if (size(req_pkgs) > 0) + { + // summary string, %1 is a list of packages + pkg_summary = sformat(_("Required packages to install: %1"), + // separator for constructing package list + mergestring(req_pkgs, _(", "))); + } + + return pkg_summary; + } + + /** * Read all sound settings from the SCR * @param interactive if user could be asked for actions * (currently only for detecting with alsaconf) @@ -902,6 +954,25 @@ return mods; } + + global boolean AllRequiredPackagesInstalled() + { + list<string> all_mods = RequiredKernelModules(); + boolean ret = true; + + foreach(string mod, all_mods, + { + if (size(RequiredPackagesToInstall(mod)) > 0) + { + ret = false; + } + } + ); + + y2milestone("All required packages are installed: %1", ret); + return ret; + } + /** * Update the SCR according to sound settings * @return boolean True on success @@ -925,11 +996,20 @@ list keys = maplist (map card, modules_conf, ``( card["unique_key"]:"...")); - list<string> retlist = maplist (map card, modules_conf, ``( - Summary::Device (card["model"]:"Sound card", - // summary text: '(sound card is) Configured as snd-card-1' - sformat(_("Configured as %1."), card["alias"]:"snd-card-0")) - )); + list<string> retlist = maplist (map card, modules_conf, + { + string package_summary = RequiredPackagesToInstallSummary(card["module"]:""); + + if (package_summary != "") + { + package_summary = "<BR>" + package_summary; + } + + Summary::Device (card["model"]:"Sound card", + // summary text: '(sound card is) Configured as snd-card-1' + sformat(_("Configured as %1."), card["alias"]:"snd-card-0") + package_summary); + } + ); if (detected_cards != nil) { Modified: trunk/sound/sound/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/sound/src/complex.ycp?rev=… ============================================================================== --- trunk/sound/sound/src/complex.ycp (original) +++ trunk/sound/sound/src/complex.ycp Fri Oct 26 10:36:17 2007 @@ -64,6 +64,13 @@ descr = add(descr, sformat(_("Driver %1"), card["module"]:"")); } + string pkgs = Sound::RequiredPackagesToInstallSummary(card["module"]:""); + + if (size(pkgs) > 0) + { + descr = add(descr, pkgs); + } + map<string,any> r = $[ "id" : card["unique_key"]:"", "table_descr" : [ card["options","index"]:"", card["model"]:"" ], Modified: trunk/sound/sound/src/sound_write.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/sound/src/sound_write.ycp?… ============================================================================== --- trunk/sound/sound/src/sound_write.ycp (original) +++ trunk/sound/sound/src/sound_write.ycp Fri Oct 26 10:36:17 2007 @@ -72,6 +72,7 @@ import "Service"; import "Package"; import "Mode"; + import "Report"; import "Sound"; import "Joystick"; @@ -83,6 +84,49 @@ y2milestone("asound size: %1", SCR::Read(.target.size, "/etc/asound.state")); } + define boolean install_packages(list<string> modules) + { + list<string> packages_to_install = []; + + foreach(string driver, modules, + { + list<string> req_packages = Sound::RequiredPackagesToInstall(driver); + packages_to_install = (list<string>)union(packages_to_install, req_packages); + } + ); + + y2milestone("Collected packages to install: %1", packages_to_install); + + if (size(packages_to_install) > 0) + { + list<string> not_available = []; + + foreach(string pkg, packages_to_install, + { + boolean avail = Package::Available(pkg); + + if (!avail) + { + not_available = add(not_available, pkg); + } + } + ); + + if (size(not_available) > 0) + { + Report::Error(sformat(_("These required packages are not available: %1 +Some sound device may not work or some features may not be supported. + +Enable or add an additional software repository containing the packages."), mergestring(not_available, ", "))); + return false; + } + + return Package::InstallAll(packages_to_install); + } + + return true; + } + // ==== MAIN ==== map settings = (map) WFM::Args(0); @@ -98,6 +142,8 @@ return true; } + boolean install = !Sound::AllRequiredPackagesInstalled(); + list<string> stones = [ // progress bar item _("Save module configuration"), @@ -110,7 +156,8 @@ // progress bar item _("Store volume"), // progress bar item - _("Store joystick settings")]; + _("Store joystick settings") + ]; list<string> stones2 = [ // progress bar item @@ -124,7 +171,17 @@ // progress bar item _("Storing volume settings..."), // progress bar item - _("Storing joystick settings...")]; + _("Storing joystick settings..."), + ]; + + if (install) + { + // progress bar item + stones = add(stones, _("Install required packages")); + + // progress bar item + stones2 = add(stones2, _("Installing required packages...")); + } // not really necessary for Progress stuf (it is set off in _auto client) @@ -235,6 +292,12 @@ // write joystick configuration Joystick::Write (abort_block); + if (install) + { + Progress::NextStage(); + install_packages(reqmodules); + } + if (size(configuredcards) > 0) { // enable alsasound service in runlevels 2,3,5 Modified: trunk/sound/sound/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/sound/sound/src/wizards.ycp?rev=… ============================================================================== --- trunk/sound/sound/src/wizards.ycp (original) +++ trunk/sound/sound/src/wizards.ycp Fri Oct 26 10:36:17 2007 @@ -327,10 +327,15 @@ if (ui == `finish && !Mode::config()) { - if (!Sound::installation && ( Sound::Changed() || Sound::GetModified() || Joystick::Changed())) + if ((!Sound::installation) && ( Sound::Changed() || Sound::GetModified() || Joystick::Changed() + || (!Sound::AllRequiredPackagesInstalled()))) { Sound::Write (); } + else + { + y2milestone("Not writing the configuration"); + } } UI::CloseDialog (); -- 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] r41579 - in /branches/SuSE-SLE-10-SP1-Branch/product-creator: VERSION package/yast2-product-creator.changes src/kiwi_dialogs.ycp src/wizards.ycp
by jsuchome＠svn.opensuse.org 26 Oct '07

26 Oct '07

Author: jsuchome Date: Fri Oct 26 10:33:53 2007 New Revision: 41579 URL: http://svn.opensuse.org/viewcvs/yast?rev=41579&view=rev Log: - fix the sequence for going to kiwi image from main summary - do not read the template name when going from main summary - 2.13.18 Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi_dialogs.ycp branches/SuSE-SLE-10-SP1-Branch/product-creator/src/wizards.ycp Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION Fri Oct 26 10:33:53 2007 @@ -1 +1 @@ -2.13.17 +2.13.18 Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes Fri Oct 26 10:33:53 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Oct 26 10:25:49 CEST 2007 - jsuchome(a)suse.cz + +- fix the sequence for going to kiwi image from main summary +- do not read the template name when going from main summary +- 2.13.18 + +------------------------------------------------------------------- Thu Oct 25 14:05:48 CEST 2007 - jsuchome(a)suse.cz - allow more characters in the image name Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi_dialogs.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi_dialogs.ycp Fri Oct 26 10:33:53 2007 @@ -798,12 +798,15 @@ map<string,any> read_config = Kiwi::ReadConfigXML (kiwi_configuration); if (!KiwiConfig["_imported"]:false) { - KiwiConfig = (map<string,any>) union (KiwiConfig, read_config); + KiwiConfig = (map<string,any>) union ( + // "type" had different meaning in ProductCreator::Config... + remove (KiwiConfig, "type"), read_config); // for new configuration, do not read all from the template y2milestone ("product-creator based configuration..."); foreach (string key, ["addons", "packages", "sources"], { KiwiConfig[key] = ProductCreator::Config[key]:[]; }); + KiwiConfig["name"] = ProductCreator::Config["name"]:""; } else { Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/produc… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/src/wizards.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/src/wizards.ycp Fri Oct 26 10:33:53 2007 @@ -164,7 +164,6 @@ "ws_start" : "init_sources", "init_sources" : $[ `next : "kiwi", - `prepare : "prepare" ], "kiwi": $[ `abort : `abort, -- 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] r41578 - in /trunk/storage: package/yast2-storage.changes storage/src/modules/Storage.ycp
by fehr＠svn.opensuse.org 25 Oct '07

25 Oct '07

Author: fehr Date: Thu Oct 25 18:16:22 2007 New Revision: 41578 URL: http://svn.opensuse.org/viewcvs/yast?rev=41578&view=rev Log: - fix problem when more than one device name translation could be applied (#332520) Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/modules/Storage.ycp 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 Thu Oct 25 18:16:22 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Oct 25 17:55:57 CEST 2007 - fehr(a)suse.de + +- fix problem when more than one device name translation could be + applied (#332520) + +------------------------------------------------------------------- Thu Oct 25 15:07:31 CEST 2007 - fehr(a)suse.de - force "partitions" in DEVICE line of mdadm.conf duing update if Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Thu Oct 25 18:16:22 2007 @@ -5402,16 +5402,16 @@ map dm = BuildDiskmap( oldv ); if( size(dm)>0 ) { - ret = maplist( string n, names, ``(HdDiskMap( n, dm ))); + ret = maplist( string n, ret, ``(HdDiskMap( n, dm ))); } if( (oldv["major"]:0<9 || (oldv["major"]:0==9 && oldv["minor"]:0==0)) && Arch::board_iseries () ) { - ret = maplist( string n, names, ``(HdToIseries( n ))); + ret = maplist( string n, ret, ``(HdToIseries( n ))); } if( oldv["major"]:0==9 ) { - ret = maplist( string n, names, ``(SLES9PersistentDevNames( n ))); + ret = maplist( string n, ret, ``(SLES9PersistentDevNames( n ))); } y2milestone( "GetTranslatedDevices ret %1", ret ); return( ret ); -- 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] r41577 - /tags/branch-SLE-10-SP1-2_13_95/storage/
by fehr＠svn.opensuse.org 25 Oct '07

25 Oct '07

Author: fehr Date: Thu Oct 25 17:58:29 2007 New Revision: 41577 URL: http://svn.opensuse.org/viewcvs/yast?rev=41577&view=rev Log: Created tag branch-SLE-10-SP1-2_13_95 for storage Added: tags/branch-SLE-10-SP1-2_13_95/storage/ - copied from r41576, branches/SuSE-SLE-10-SP1-Branch/storage/ -- 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] r41576 - /tags/branch-SLE-10-SP1-2_13_95/storage/
by fehr＠svn.opensuse.org 25 Oct '07

25 Oct '07

Author: fehr Date: Thu Oct 25 17:58:26 2007 New Revision: 41576 URL: http://svn.opensuse.org/viewcvs/yast?rev=41576&view=rev Log: update Removed: tags/branch-SLE-10-SP1-2_13_95/storage/ -- 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] r41575 - in /branches/SuSE-SLE-10-SP1-Branch/storage: package/yast2-storage.changes storage/src/modules/Storage.ycp
by fehr＠svn.opensuse.org 25 Oct '07

25 Oct '07

Author: fehr Date: Thu Oct 25 17:57:45 2007 New Revision: 41575 URL: http://svn.opensuse.org/viewcvs/yast?rev=41575&view=rev Log: - fix problem when more than one device name translation could be applied (#332520) Modified: branches/SuSE-SLE-10-SP1-Branch/storage/package/yast2-storage.changes branches/SuSE-SLE-10-SP1-Branch/storage/storage/src/modules/Storage.ycp Modified: branches/SuSE-SLE-10-SP1-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/storag… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-SLE-10-SP1-Branch/storage/package/yast2-storage.changes Thu Oct 25 17:57:45 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Oct 25 17:55:57 CEST 2007 - fehr(a)suse.de + +- fix problem when more than one device name translation could be + applied (#332520) +- version 2.13.95 + +------------------------------------------------------------------- Thu Oct 11 13:08:33 CEST 2007 - fehr(a)suse.de - add support for online resize of ext3 (feature #301943) @@ -12,7 +19,6 @@ - fix missing initialisation of tmpcrypt (#307219) - fix case of nonzero passno for encrypted fstab entries (#307221) - fix problem with resizing encrypted volumes (#307219) -- version 2.13.95 ------------------------------------------------------------------- Mon Oct 8 10:49:37 CEST 2007 - fehr(a)suse.de Modified: branches/SuSE-SLE-10-SP1-Branch/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/storag… ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/storage/storage/src/modules/Storage.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/storage/storage/src/modules/Storage.ycp Thu Oct 25 17:57:45 2007 @@ -5032,16 +5032,16 @@ map dm = BuildDiskmap( oldv ); if( size(dm)>0 ) { - ret = maplist( string n, names, ``(HdDiskMap( n, dm ))); + ret = maplist( string n, ret, ``(HdDiskMap( n, dm ))); } if( (oldv["major"]:0<9 || (oldv["major"]:0==9 && oldv["minor"]:0==0)) && Arch::board_iseries () ) { - ret = maplist( string n, names, ``(HdToIseries( n ))); + ret = maplist( string n, ret, ``(HdToIseries( n ))); } if( oldv["major"]:0==9 ) { - ret = maplist( string n, names, ``(SLES9PersistentDevNames( n ))); + ret = maplist( string n, ret, ``(SLES9PersistentDevNames( n ))); } y2milestone( "GetTranslatedDevices ret %1", ret ); return( ret ); -- 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] r41574 - in /trunk/gtk: ChangeLog src/YGDumbTab.cc src/YGPackageSelector.cc src/YGProgressBar.cc src/YGWidget.cc src/YGWidget.h src/ygtkratiobox.c src/ygtkratiobox.h tests/MultiProgressMeterHuge.ycp
by rpmcruz＠svn.opensuse.org 25 Oct '07

25 Oct '07

Author: rpmcruz Date: Thu Oct 25 17:06:52 2007 New Revision: 41574 URL: http://svn.opensuse.org/viewcvs/yast?rev=41574&view=rev Log: * src/ygtkratiobox.h/c, YGProgressBar.cc, YGWidget.cc: bug fix 309049. A ratio box can request for a very big size when using weights so that its children are all visible. Added a max_width/height property to YGtkMinSize and renamed it to YGtkAdjSize. Set it for MultiProgressMeter. * tests/MultiProgressMeterHuge.ycp: test case. Added: trunk/gtk/tests/MultiProgressMeterHuge.ycp Modified: trunk/gtk/ChangeLog trunk/gtk/src/YGDumbTab.cc trunk/gtk/src/YGPackageSelector.cc trunk/gtk/src/YGProgressBar.cc trunk/gtk/src/YGWidget.cc trunk/gtk/src/YGWidget.h trunk/gtk/src/ygtkratiobox.c trunk/gtk/src/ygtkratiobox.h Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=41574&r1=41573… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Thu Oct 25 17:06:52 2007 @@ -1,3 +1,12 @@ +2007-10-25 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + + * src/ygtkratiobox.h/c, YGProgressBar.cc, YGWidget.cc: bug + fix 309049. A ratio box can request for a very big size when using weights + so that its children are all visible. Added a max_width/height property + to YGtkMinSize and renamed it to YGtkAdjSize. Set it for MultiProgressMeter. + + * tests/MultiProgressMeterHuge.ycp: test case. + 2007-10-23 JP Rosevear <jpr(a)novell.com> * src/YGPackageSelector.cc (class YGPatchSelector): Use the more Modified: trunk/gtk/src/YGDumbTab.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGDumbTab.cc?rev=41574&r… ============================================================================== --- trunk/gtk/src/YGDumbTab.cc (original) +++ trunk/gtk/src/YGDumbTab.cc Thu Oct 25 17:06:52 2007 @@ -32,7 +32,7 @@ // GTK+ keeps the notebook size set to the biggset page. We can't // do this since this is dynamic, but at least don't let the notebook // reduce its size. - ygtk_min_size_set_only_expand (YGTK_MIN_SIZE (m_min_size), TRUE); + ygtk_adj_size_set_only_expand (YGTK_ADJ_SIZE (m_adj_size), TRUE); g_signal_connect (G_OBJECT (getWidget()), "switch-page", G_CALLBACK (changed_tab_cb), this); Modified: trunk/gtk/src/YGPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGPackageSelector.cc?rev… ============================================================================== --- trunk/gtk/src/YGPackageSelector.cc (original) +++ trunk/gtk/src/YGPackageSelector.cc Thu Oct 25 17:06:52 2007 @@ -1144,9 +1144,9 @@ *remove_button; selection_buttons_vbox = gtk_vbox_new (TRUE, 80); // to avoid re-labeling glitches, let it only grow - buttons_minsize = ygtk_min_size_new (0, 0); + buttons_minsize = ygtk_adj_size_new(); gtk_container_add (GTK_CONTAINER (buttons_minsize), selection_buttons_vbox); - ygtk_min_size_set_only_expand (YGTK_MIN_SIZE (buttons_minsize), TRUE); + ygtk_adj_size_set_only_expand (YGTK_ADJ_SIZE (buttons_minsize), TRUE); install_button = createArrowButton (_("_install"), GTK_ARROW_RIGHT, &m_install_label); remove_button = createArrowButton (_("_remove"), GTK_ARROW_LEFT, &m_remove_label); Modified: trunk/gtk/src/YGProgressBar.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGProgressBar.cc?rev=415… ============================================================================== --- trunk/gtk/src/YGProgressBar.cc (original) +++ trunk/gtk/src/YGProgressBar.cc Thu Oct 25 17:06:52 2007 @@ -137,6 +137,8 @@ maxValue (i), TRUE, TRUE, 0); } + ygtk_adj_size_set_max (YGTK_ADJ_SIZE (m_adj_size), horizontal ? 200 : 0, + horizontal ? 0 : 200); gtk_widget_show_all (getWidget()); } Modified: trunk/gtk/src/YGWidget.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGWidget.cc?rev=41574&r1… ============================================================================== --- trunk/gtk/src/YGWidget.cc (original) +++ trunk/gtk/src/YGWidget.cc Thu Oct 25 17:06:52 2007 @@ -30,12 +30,12 @@ m_widget = GTK_WIDGET (g_object_new_valist (type, property_name, args)); if (type == GTK_TYPE_WINDOW) - m_min_size = m_widget; + m_adj_size = m_widget; else { - m_min_size = ygtk_min_size_new (0, 0); - g_object_ref_sink (G_OBJECT (m_min_size)); - gtk_widget_show (m_min_size); - gtk_container_add (GTK_CONTAINER (m_min_size), m_widget); + m_adj_size = ygtk_adj_size_new(); + g_object_ref_sink (G_OBJECT (m_adj_size)); + gtk_widget_show (m_adj_size); + gtk_container_add (GTK_CONTAINER (m_adj_size), m_widget); } y_widget->setWidgetRep ((void *) this); @@ -56,8 +56,8 @@ YGWidget::~YGWidget() { IMPL - gtk_widget_destroy (m_min_size); - g_object_unref (G_OBJECT (m_min_size)); + gtk_widget_destroy (m_adj_size); + g_object_unref (G_OBJECT (m_adj_size)); } void YGWidget::show() @@ -121,16 +121,13 @@ void YGWidget::setBorder (unsigned int border) { IMPL - gtk_container_set_border_width (GTK_CONTAINER (m_min_size), border); + gtk_container_set_border_width (GTK_CONTAINER (m_adj_size), border); } void YGWidget::setMinSize (unsigned int width, unsigned int height) { IMPL - if (width) - ygtk_min_size_set_width (YGTK_MIN_SIZE (m_min_size), width); - if (height) - ygtk_min_size_set_height (YGTK_MIN_SIZE (m_min_size), height); + ygtk_adj_size_set_min (YGTK_ADJ_SIZE (m_adj_size), width, height); } void YGWidget::setMinSizeInChars (unsigned int width, unsigned int height) Modified: trunk/gtk/src/YGWidget.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGWidget.h?rev=41574&r1=… ============================================================================== --- trunk/gtk/src/YGWidget.h (original) +++ trunk/gtk/src/YGWidget.h Thu Oct 25 17:06:52 2007 @@ -28,7 +28,7 @@ void show(); // containers should use this call rather than getWidget() - GtkWidget *getLayout() { return m_min_size; } + GtkWidget *getLayout() { return m_adj_size; } // Get the YGWidget associated with a YWidget static YGWidget *get (YWidget *y_widget); @@ -41,7 +41,7 @@ void emitEvent(YEvent::EventReason reason, bool if_notify = true, bool if_not_pending = false, bool immediate = true); - // Aesthicts + // Aesthetics void setBorder (unsigned int border); // in pixels void setMinSize (unsigned int min_width, unsigned int min_height); void setMinSizeInChars (unsigned int min_width, unsigned int min_height); @@ -57,14 +57,11 @@ protected: GtkWidget *m_widget; // associated GtkWidget -- use getWidget() YWidget *m_y_widget; // associated YWidget - GtkWidget *m_min_size; // installed on m_widget, allows setting a min size + GtkWidget *m_adj_size; // installed on m_widget, allows better size constrains void construct (YWidget *y_widget, YGWidget *parent, bool show, GType type, const char *property_name, va_list args); - - // parameters to set the layout prettier - int m_min_width, m_min_height; }; /* Modified: trunk/gtk/src/ygtkratiobox.c URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkratiobox.c?rev=41574… ============================================================================== --- trunk/gtk/src/ygtkratiobox.c (original) +++ trunk/gtk/src/ygtkratiobox.c Thu Oct 25 17:06:52 2007 @@ -433,17 +433,17 @@ widget_class->size_allocate = ygtk_ratio_vbox_size_allocate; } -//** YGtkMinSize +//** YGtkAdjSize -G_DEFINE_TYPE (YGtkMinSize, ygtk_min_size, GTK_TYPE_BIN) +G_DEFINE_TYPE (YGtkAdjSize, ygtk_adj_size, GTK_TYPE_BIN) -static void ygtk_min_size_init (YGtkMinSize *min_size) +static void ygtk_adj_size_init (YGtkAdjSize *adj_size) { - GTK_WIDGET_SET_FLAGS (min_size, GTK_NO_WINDOW); - gtk_widget_set_redraw_on_allocate (GTK_WIDGET (min_size), FALSE); + GTK_WIDGET_SET_FLAGS (adj_size, GTK_NO_WINDOW); + gtk_widget_set_redraw_on_allocate (GTK_WIDGET (adj_size), FALSE); } -static void ygtk_min_size_size_request (GtkWidget *widget, +static void ygtk_adj_size_size_request (GtkWidget *widget, GtkRequisition *requisition) { GtkWidget *child = GTK_BIN (widget)->child; @@ -454,18 +454,23 @@ requisition->width += border * 2; requisition->height += border * 2; - YGtkMinSize *min_size = YGTK_MIN_SIZE (widget); - requisition->width = MAX (requisition->width, min_size->min_width); - requisition->height = MAX (requisition->height, min_size->min_height); - - if (min_size->only_expand) { - min_size->min_width = requisition->width; - min_size->min_height = requisition->height; + YGtkAdjSize *adj_size = YGTK_ADJ_SIZE (widget); + requisition->width = MAX (requisition->width, adj_size->min_width); + requisition->height = MAX (requisition->height, adj_size->min_height); + + if (adj_size->max_width) + requisition->width = MIN (requisition->width, adj_size->max_width); + if (adj_size->max_height) + requisition->height = MIN (requisition->height, adj_size->max_height); + + if (adj_size->only_expand) { + adj_size->min_width = requisition->width; + adj_size->min_height = requisition->height; } } } -static void ygtk_min_size_size_allocate (GtkWidget *widget, +static void ygtk_adj_size_size_allocate (GtkWidget *widget, GtkAllocation *allocation) { GtkWidget *child = GTK_BIN (widget)->child; @@ -478,39 +483,38 @@ child_alloc.height -= border * 2; gtk_widget_size_allocate (child, &child_alloc); } - GTK_WIDGET_CLASS (ygtk_min_size_parent_class)->size_allocate (widget, allocation); + GTK_WIDGET_CLASS (ygtk_adj_size_parent_class)->size_allocate (widget, allocation); } -GtkWidget* ygtk_min_size_new(guint min_width, guint min_height) +GtkWidget* ygtk_adj_size_new (void) { - YGtkMinSize *min_size = g_object_new (YGTK_TYPE_MIN_SIZE, NULL); - ygtk_min_size_set_width (min_size, min_width); - ygtk_min_size_set_height (min_size, min_height); - return GTK_WIDGET (min_size); + return GTK_WIDGET (g_object_new (YGTK_TYPE_ADJ_SIZE, NULL)); } -void ygtk_min_size_set_width (YGtkMinSize *min_size, guint min_width) +void ygtk_adj_size_set_min (YGtkAdjSize *adj_size, guint min_width, guint min_height) { - min_size->min_width = min_width; + adj_size->min_width = min_width; + adj_size->min_height = min_height; } -void ygtk_min_size_set_height (YGtkMinSize *min_size, guint min_height) +void ygtk_adj_size_set_max (YGtkAdjSize *adj_size, guint max_width, guint max_height) { - min_size->min_height = min_height; + adj_size->max_width = max_width; + adj_size->max_height = max_height; } -void ygtk_min_size_set_only_expand (YGtkMinSize *min_size, gboolean only_expand) +void ygtk_adj_size_set_only_expand (YGtkAdjSize *adj_size, gboolean only_expand) { - min_size->only_expand = only_expand; + adj_size->only_expand = only_expand; } -static void ygtk_min_size_class_init (YGtkMinSizeClass *klass) +static void ygtk_adj_size_class_init (YGtkAdjSizeClass *klass) { - ygtk_min_size_parent_class = g_type_class_peek_parent (klass); + ygtk_adj_size_parent_class = g_type_class_peek_parent (klass); GtkWidgetClass* widget_class = GTK_WIDGET_CLASS (klass); - widget_class->size_request = ygtk_min_size_size_request; - widget_class->size_allocate = ygtk_min_size_size_allocate; + widget_class->size_request = ygtk_adj_size_size_request; + widget_class->size_allocate = ygtk_adj_size_size_allocate; } //** YGtkScrolledWindow Modified: trunk/gtk/src/ygtkratiobox.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/ygtkratiobox.h?rev=41574… ============================================================================== --- trunk/gtk/src/ygtkratiobox.h (original) +++ trunk/gtk/src/ygtkratiobox.h Thu Oct 25 17:06:52 2007 @@ -153,50 +153,49 @@ G_END_DECLS #endif /* YGTK_RATIO_BOX_H */ -/* YGtkMinSize is container where a widget may be installed so that one can - set a minimum size to it. */ -#ifndef YGTK_MIN_SIZE_H -#define YGTK_MIN_SIZE_H +/* YGtkAdjSize container allows for better fine grained size constrains. */ +#ifndef YGTK_ADJ_SIZE_H +#define YGTK_ADJ_SIZE_H #include <gtk/gtkbin.h> G_BEGIN_DECLS -#define YGTK_TYPE_MIN_SIZE (ygtk_min_size_get_type ()) -#define YGTK_MIN_SIZE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), \ - YGTK_TYPE_MIN_SIZE, YGtkMinSize)) -#define YGTK_MIN_SIZE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), \ - YGTK_TYPE_MIN_SIZE, YGtkMinSizeClass)) -#define YGTK_IS_MIN_SIZE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \ - YGTK_TYPE_MIN_SIZE)) -#define YGTK_IS_MIN_SIZE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), \ - YGTK_TYPE_MIN_SIZE)) -#define YGTK_MIN_SIZE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), \ - YGTK_TYPE_MIN_SIZE, YGtkMinSizeClass)) +#define YGTK_TYPE_ADJ_SIZE (ygtk_adj_size_get_type ()) +#define YGTK_ADJ_SIZE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), \ + YGTK_TYPE_ADJ_SIZE, YGtkAdjSize)) +#define YGTK_ADJ_SIZE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), \ + YGTK_TYPE_ADJ_SIZE, YGtkAdjSizeClass)) +#define YGTK_IS_ADJ_SIZE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \ + YGTK_TYPE_ADJ_SIZE)) +#define YGTK_IS_ADJ_SIZE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), \ + YGTK_TYPE_ADJ_SIZE)) +#define YGTK_ADJ_SIZE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), \ + YGTK_TYPE_ADJ_SIZE, YGtkAdjSizeClass)) -typedef struct _YGtkMinSize +typedef struct _YGtkAdjSize { GtkBin parent; // members - guint min_width, min_height; + guint min_width, min_height, max_width, max_height; gboolean only_expand; -} YGtkMinSize; +} YGtkAdjSize; -typedef struct _YGtkMinSizeClass +typedef struct _YGtkAdjSizeClass { GtkBinClass parent_class; -} YGtkMinSizeClass; +} YGtkAdjSizeClass; -GType ygtk_min_size_get_type (void) G_GNUC_CONST; -GtkWidget* ygtk_min_size_new (guint min_width, guint min_height); +GType ygtk_adj_size_get_type (void) G_GNUC_CONST; +GtkWidget* ygtk_adj_size_new (void); -void ygtk_min_size_set_width (YGtkMinSize *min_size, guint min_width); -void ygtk_min_size_set_height (YGtkMinSize *min_size, guint min_height); +void ygtk_adj_size_set_min (YGtkAdjSize *adj_size, guint min_width, guint min_height); +void ygtk_adj_size_set_max (YGtkAdjSize *adj_size, guint max_width, guint max_height); /* Only allow the child to grow (ie. to ask for bigger sizes). */ -void ygtk_min_size_set_only_expand (YGtkMinSize *min_size, gboolean only_expand); +void ygtk_adj_size_set_only_expand (YGtkAdjSize *adj_size, gboolean only_expand); G_END_DECLS -#endif /*YGTK_MIN_SIZE_H*/ +#endif /*YGTK_ADJ_SIZE_H*/ /* YGtkScrolledWindow gives some a more fine-grained automatic scroll policy. It allows the user to specify from which size scrolling should be applied. */ Added: trunk/gtk/tests/MultiProgressMeterHuge.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/tests/MultiProgressMeterHuge… ============================================================================== --- trunk/gtk/tests/MultiProgressMeterHuge.ycp (added) +++ trunk/gtk/tests/MultiProgressMeterHuge.ycp Thu Oct 25 17:06:52 2007 @@ -0,0 +1,39 @@ +// Simple example for MultiProgressMeter +{ + if ( ! UI::HasSpecialWidget(`HMultiProgressMeter ) ) + { + UI::OpenDialog( + `VBox( + `Label("Error: This UI doesn't support the MultiProgressMeter widget!"), + `PushButton(`opt(`default), "&OK") + ) + ); + UI::UserInput(); + UI::CloseDialog(); + + return; + } + + + UI::OpenDialog( + `VBox( + `HMultiProgressMeter(`id(`prog), [ 10000, 200, 500, 20, 100 ] ), + `PushButton(`opt(`default), "&Ok" ) + ) + ); + + UI::ChangeWidget(`prog, `Values, [ 1000, 200, 500, 20, 100 ] ); UI::UserInput(); + UI::ChangeWidget(`prog, `Values, [ 800, 200, 500, 20, 100 ] ); UI::UserInput(); + UI::ChangeWidget(`prog, `Values, [ 500, 200, 500, 20, 100 ] ); UI::UserInput(); + UI::ChangeWidget(`prog, `Values, [ 200, 200, 500, 20, 100 ] ); UI::UserInput(); + UI::ChangeWidget(`prog, `Values, [ 0, 200, 500, 20, 100 ] ); UI::UserInput(); + + UI::ChangeWidget(`prog, `Values, [ 0, 100, 500, 20, 100 ] ); UI::UserInput(); + UI::ChangeWidget(`prog, `Values, [ 0, 20, 500, 20, 100 ] ); UI::UserInput(); + UI::ChangeWidget(`prog, `Values, [ 0, 0, 500, 20, 100 ] ); UI::UserInput(); + + UI::ChangeWidget(`prog, `Values, [ 0, 0, 400, 20, 100 ] ); UI::UserInput(); + UI::ChangeWidget(`prog, `Values, [ 0, 0, 300, 20, 100 ] ); UI::UserInput(); + UI::ChangeWidget(`prog, `Values, [ 0, 0, 200, 20, 100 ] ); UI::UserInput(); + UI::ChangeWidget(`prog, `Values, [ 0, 0, 100, 20, 100 ] ); UI::UserInput(); +} -- 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] r41573 - in /branches/tmp/sh/mod-ui: core/libyui/src/ qt/src/
by sh-sh-sh＠svn.opensuse.org 25 Oct '07

25 Oct '07

Author: sh-sh-sh Date: Thu Oct 25 16:21:39 2007 New Revision: 41573 URL: http://svn.opensuse.org/viewcvs/yast?rev=41573&view=rev Log: YTable now uses YTableHeader object in constructor so column headers and alignment are known right away in the constructor (bubli's request) Added: branches/tmp/sh/mod-ui/core/libyui/src/YTableHeader.cc branches/tmp/sh/mod-ui/core/libyui/src/YTableHeader.h Modified: branches/tmp/sh/mod-ui/core/libyui/src/ChangeLog branches/tmp/sh/mod-ui/core/libyui/src/Makefile.am branches/tmp/sh/mod-ui/core/libyui/src/YAlignment.h branches/tmp/sh/mod-ui/core/libyui/src/YCPDialogParser.cc branches/tmp/sh/mod-ui/core/libyui/src/YCPDialogParser.h branches/tmp/sh/mod-ui/core/libyui/src/YTable.cc branches/tmp/sh/mod-ui/core/libyui/src/YTable.h branches/tmp/sh/mod-ui/core/libyui/src/YTypes.h branches/tmp/sh/mod-ui/core/libyui/src/YWidgetFactory.h branches/tmp/sh/mod-ui/qt/src/YQTable.cc branches/tmp/sh/mod-ui/qt/src/YQTable.h branches/tmp/sh/mod-ui/qt/src/YQWidgetFactory.cc branches/tmp/sh/mod-ui/qt/src/YQWidgetFactory.h Modified: branches/tmp/sh/mod-ui/core/libyui/src/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/ChangeLog (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/ChangeLog Thu Oct 25 16:21:39 2007 @@ -384,3 +384,11 @@ a custom pointer to some other class. Look at YQMenuButton for a sample implementation. + + +2007-10-25 17:00 sh(a)suse.de + +* Changed YTable header handling (bubli's request): + - Constructor now gets YTableHeader object + - no more setHeader() and setAlignment functions - get rid of them + - use columns(), header(), alignment() in the constructor to set up columns Modified: branches/tmp/sh/mod-ui/core/libyui/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/Makefile.am (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/Makefile.am Thu Oct 25 16:21:39 2007 @@ -27,6 +27,7 @@ YItem.cc \ YTreeItem.cc \ YTableItem.cc \ + YTableHeader.cc \ YProperty.cc \ YUIComponent.cc \ YUIException.cc \ @@ -117,6 +118,7 @@ YMenuItem.h \ YTreeItem.h \ YTableItem.h \ + YTableHeader.h \ YOptionalWidgetFactory.h \ YPackageSelectorPlugin.h \ YProperty.h \ Modified: branches/tmp/sh/mod-ui/core/libyui/src/YAlignment.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YAlignment.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YAlignment.h Thu Oct 25 16:21:39 2007 @@ -59,6 +59,7 @@ * Return the alignment in the specified dimension. **/ YAlignmentType alignment( YUIDimension dim ) const; + /** * Return the left margin in pixels, the distance between the left edge of * this alignment and the left edge of the child widget. Modified: branches/tmp/sh/mod-ui/core/libyui/src/YCPDialogParser.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YCPDialogParser.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YCPDialogParser.cc Thu Oct 25 16:21:39 2007 @@ -2080,6 +2080,7 @@ return 0; } + // Parse options bool immediate = false; @@ -2093,36 +2094,50 @@ } YCPTerm headerTerm = term->value( argnr )->asTerm(); - int columns = headerTerm->size(); - - YTable * table = YUI::widgetFactory()->createTable( parent, columns ); - + + YTable * table = YUI::widgetFactory()->createTable( parent, parseTableHeader( headerTerm ) ); + if ( keepSorting ) table->setKeepSorting( true ); if ( immediate ) table->setImmediateMode( true ); + + if ( numArgs >= 2 ) // Fill table with items, if item list is specified + { + YCPList itemList = term->value( argnr+1 )->asList(); + table->addItems( YCPTableItemParser::parseTableItemList( itemList ) ); + } + + return table; +} - // - // Parse header term - // + +YTableHeader * +YCPDialogParser::parseTableHeader( const YCPTerm & headerTerm ) +{ + YTableHeader * header = new YTableHeader(); + YUI_CHECK_NEW( header ); + for ( int i=0; i < headerTerm->size(); i++ ) { YCPValue colHeader = headerTerm->value( i ); if ( colHeader->isString() ) { - table->setHeader( i, colHeader->asString()->value() ); + header->addColumn( colHeader->asString()->value() ); } else if ( colHeader->isTerm() ) { - YCPTerm colHeaderTerm = colHeader->asTerm(); - - if ( colHeaderTerm->name() == YUISymbol_Left ) table->setAlignment( i, YTable::Left ); - else if ( colHeaderTerm->name() == YUISymbol_Right ) table->setAlignment( i, YTable::Right ); - else if ( colHeaderTerm->name() == YUISymbol_Center ) table->setAlignment( i, YTable::Center ); + string headerText; + YAlignmentType alignment = YAlignBegin; + YCPTerm colHeaderTerm = colHeader->asTerm(); + + if ( colHeaderTerm->name() == YUISymbol_Left ) alignment = YAlignBegin; + else if ( colHeaderTerm->name() == YUISymbol_Right ) alignment = YAlignEnd; + else if ( colHeaderTerm->name() == YUISymbol_Center ) alignment = YAlignCenter; else { string msg = string( "Unknown table header alignment: " ) @@ -2134,7 +2149,7 @@ if ( colHeaderTerm->size() > 0 ) { if ( colHeaderTerm->value(0)->isString() ) - table->setHeader( i, colHeaderTerm->value(0)->asString()->value() ); + headerText = colHeaderTerm->value(0)->asString()->value(); else { string msg = string( "Expected string for table header, not " ) @@ -2153,16 +2168,12 @@ ycperror( "%s", msg.c_str() ); } } - } - } - if ( numArgs >= 2 ) // Fill table with items, if item list is specified - { - YCPList itemList = term->value( argnr+1 )->asList(); - table->addItems( YCPTableItemParser::parseTableItemList( itemList ) ); + header->addColumn( headerText, alignment ); + } } - - return table; + + return header; } Modified: branches/tmp/sh/mod-ui/core/libyui/src/YCPDialogParser.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YCPDialogParser.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YCPDialogParser.h Thu Oct 25 16:21:39 2007 @@ -31,6 +31,7 @@ class YWidget; class YMenu; class YMenuButton; +class YTableHeader; /** @@ -216,6 +217,8 @@ static YWidget * parseTable( YWidget *parent, YWidgetOpt & opt, const YCPTerm & term, const YCPList & optList, int argnr ); + static YTableHeader * parseTableHeader( const YCPTerm & headerTerm ); + static YWidget * parseProgressBar( YWidget *parent, YWidgetOpt & opt, const YCPTerm & term, const YCPList & optList, int argnr ); Modified: branches/tmp/sh/mod-ui/core/libyui/src/YTable.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YTable.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YTable.cc Thu Oct 25 16:21:39 2007 @@ -17,11 +17,6 @@ /-*/ -#include <ycp/YCPSymbol.h> -#include <ycp/YCPBoolean.h> -#include <ycp/YCPVoid.h> -#include <ycp/YCPTerm.h> -#include <ycp/YCPInteger.h> #define y2log_component "ui" #include <ycp/y2log.h> @@ -33,32 +28,29 @@ struct YTablePrivate { - YTablePrivate( int col ) - : columns( col ) + YTablePrivate( YTableHeader * header ) + : header( header ) , keepSorting( false ) , immediateMode( false ) { - headers.resize( columns ); // Fill with empty strings (from default constructor) - alignments.resize( columns, YTable::Left ); } - int columns; - bool keepSorting; - bool immediateMode; - vector<string> headers; - vector<YTable::Alignment> alignments; + YTableHeader * header; + bool keepSorting; + bool immediateMode; }; -YTable::YTable( YWidget * parent, int columns ) +YTable::YTable( YWidget * parent, YTableHeader * header ) : YSelectionWidget( parent, "", // label true ) // enforceSingleSelection - , priv( new YTablePrivate( columns ) ) + , priv( new YTablePrivate( header ) ) { - YUI_CHECK_NEW( priv ); + YUI_CHECK_PTR( header ); + YUI_CHECK_NEW( priv ); setDefaultStretchable( YD_HORIZ, true ); setDefaultStretchable( YD_VERT, true ); @@ -67,57 +59,36 @@ YTable::~YTable() { - // NOP + if ( priv->header ) + delete priv->header; } int YTable::columns() const { - return priv->columns; + return priv->header->columns(); } bool YTable::hasColumn( int column ) const { - return column >= 0 && column <= priv->columns; -} - - -void -YTable::setHeader( int column, const string & text ) -{ - if ( hasColumn( column ) ) - priv->headers[ column ] = text; + return priv->header->hasColumn( column ); } string YTable::header( int column ) const { - if ( hasColumn( column ) ) - return priv->headers[ column ]; - else - return ""; + return priv->header->header( column ); } -void -YTable::setAlignment( int column, YTable::Alignment alignment ) -{ - if ( hasColumn( column ) ) - priv->alignments[ column ] = alignment; -} - - -YTable::Alignment +YAlignmentType YTable::alignment( int column ) const { - if ( hasColumn( column ) ) - return priv->alignments[ column ]; - else - return YTable::Left; + return priv->header->alignment( column ); } @@ -227,4 +198,3 @@ macroRecorder->recordWidgetProperty( this, YUIProperty_CurrentItem ); } - Modified: branches/tmp/sh/mod-ui/core/libyui/src/YTable.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YTable.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YTable.h Thu Oct 25 16:21:39 2007 @@ -19,9 +19,10 @@ #ifndef YTable_h #define YTable_h +#include "YTypes.h" #include "YSelectionWidget.h" #include "YTableItem.h" - +#include "YTableHeader.h" class YMacroRecorder; class YTablePrivate; @@ -51,9 +52,14 @@ { protected: /** - * Constructor. 'columns' is the number of columns to be created. + * Constructor. + * + * 'header' describes the table's headers: Number of columns, column + * headings, and column alignment. The widget assumes ownership of this + * object and will delete it when appropriate. The header cannot be changed + * after creating the widget. **/ - YTable( YWidget * parent, int columns ); + YTable( YWidget * parent, YTableHeader * header ); public: @@ -69,56 +75,32 @@ virtual const char * widgetClass() const { return "YTable"; } /** - * Return the number of coluns of this table. - * Note that this can only be set in the constructor. + * Return the number of columns of this table. **/ int columns() const; /** - * Return 'true' if this table has 'column' columns. + * Return 'true' if this table has a column no. 'column' + * (counting from 0 on). **/ bool hasColumn( int column ) const; /** - * Set the header text for the specified column (counting from 0 on). - * - * Derived classes can overwrite this function, but they should call this - * base class function in the new implementation. - **/ - virtual void setHeader( int column, const string & text ); - - /** * Return the header text for the specified column. **/ string header( int column ) const; - enum Alignment - { - Left, - Center, - Right - }; - - /** - * Set the alignment for the specified column (counting from 0 on): - * YTable::Left, YTable::Center, YTable::Right - * - * Derived classes can overwrite this function, but they should call this - * base class function in the new implementation. - **/ - virtual void setAlignment( int column, YTable::Alignment alignment ); - /** * Return the alignment for the specified column. **/ - YTable::Alignment alignment( int column ) const; + YAlignmentType alignment( int column ) const; /** * Deliver even more events than with notify() set. * * With "notify" alone, a table widget sends an ActivatedEvent when the - * user double-clicks an item or presses the "space" key on it. It does not - * send an event when the user just sends another item. + * user double-clicks an item or presses the "space" key on it. It does + * not send an event when the user just sends another item. * * With "immediate", it also sends a SelectionChangedEvent when the user * selects another item. "immediate" implicitly includes "notify". Added: branches/tmp/sh/mod-ui/core/libyui/src/YTableHeader.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YTableHeader.cc (added) +++ branches/tmp/sh/mod-ui/core/libyui/src/YTableHeader.cc Thu Oct 25 16:21:39 2007 @@ -0,0 +1,94 @@ +/*---------------------------------------------------------------------\ +| | +| __ __ ____ _____ ____ | +| \ \ / /_ _/ ___|_ _|___ \ | +| \ V / _` \___ \ | | __) | | +| | | (_| |___) || | / __/ | +| |_|\__,_|____/ |_| |_____| | +| | +| core system | +| (C) SuSE GmbH | +\----------------------------------------------------------------------/ + + File: YTableHeader.cc + + Author: Stefan Hundhammer <sh(a)suse.de> + +/-*/ + + +#include <vector> +#define y2log_component "ui" +#include <ycp/y2log.h> +#include "YTableHeader.h" +#include "YUIException.h" + +using std::vector; + + +struct YTableHeaderPrivate +{ + YTableHeaderPrivate() + {} + + vector<string> headers; + vector<YAlignmentType> alignments; +}; + + + + +YTableHeader::YTableHeader() + : priv( new YTableHeaderPrivate ) +{ + YUI_CHECK_NEW( priv ); +} + + +YTableHeader::~YTableHeader() +{ + // NOP +} + + +void +YTableHeader::addColumn( const string & header, YAlignmentType alignment ) +{ + priv->headers.push_back( header ); + priv->alignments.push_back( alignment ); +} + + +int +YTableHeader::columns() const +{ + return (int) priv->headers.size(); +} + + +bool +YTableHeader::hasColumn( int column ) const +{ + return column >= 0 && column < (int) priv->headers.size(); +} + + +string +YTableHeader::header( int column ) const +{ + if ( column >= 0 && column < (int) priv->headers.size() ) + return priv->headers[ column ]; + else + return ""; +} + + +YAlignmentType +YTableHeader::alignment( int column ) const +{ + if ( column >= 0 && column < (int) priv->alignments.size() ) + return priv->alignments[ column ]; + else + return YAlignBegin; +} + Added: branches/tmp/sh/mod-ui/core/libyui/src/YTableHeader.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YTableHeader.h (added) +++ branches/tmp/sh/mod-ui/core/libyui/src/YTableHeader.h Thu Oct 25 16:21:39 2007 @@ -0,0 +1,85 @@ +/*---------------------------------------------------------------------\ +| | +| __ __ ____ _____ ____ | +| \ \ / /_ _/ ___|_ _|___ \ | +| \ V / _` \___ \ | | __) | | +| | | (_| |___) || | / __/ | +| |_|\__,_|____/ |_| |_____| | +| | +| core system | +| (C) SuSE GmbH | +\----------------------------------------------------------------------/ + + File: YTableHeader.h + + Author: Stefan Hundhammer <sh(a)suse.de> + +/-*/ + +#ifndef YTableHeader_h +#define YTableHeader_h + +#include <string> +#include "ImplPtr.h" +#include "YTypes.h" + +using std::string; + + +class YTableHeaderPrivate; + +/** + * Helper class for YTable for table column properties: + * + * - number of columns + * - header for each column + * - alignment for each column + **/ +class YTableHeader +{ +public: + /** + * Constructor. + **/ + YTableHeader(); + + /** + * Destructor. + **/ + virtual ~YTableHeader(); + + /** + * Add a column with the specified colum header text and alignment. + **/ + void addColumn( const string & header, + YAlignmentType alignment = YAlignBegin ); + + /** + * Return the number of columns. + **/ + int columns() const; + + /** + * Return 'true' if this table header has a column no. 'column' + * (counting from 0 on). + **/ + bool hasColumn( int column ) const; + + /** + * Return the header text for the specified column. + **/ + string header( int column ) const; + + /** + * Return the alignment for the specified column. + **/ + YAlignmentType alignment( int column ) const; + + +private: + + ImplPtr<YTableHeaderPrivate> priv; +}; + + +#endif // YTableHeader_h Modified: branches/tmp/sh/mod-ui/core/libyui/src/YTypes.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YTypes.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YTypes.h Thu Oct 25 16:21:39 2007 @@ -52,6 +52,4 @@ }; - - #endif // YTypes_h Modified: branches/tmp/sh/mod-ui/core/libyui/src/YWidgetFactory.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YWidgetFactory.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YWidgetFactory.h Thu Oct 25 16:21:39 2007 @@ -53,6 +53,7 @@ class YSpacing; class YSquash; class YTable; +class YTableHeader; class YTimeField; class YTree; @@ -97,7 +98,7 @@ virtual YComboBox * createComboBox ( YWidget * parent, const string & label, bool editable = false ) = 0; virtual YSelectionBox * createSelectionBox ( YWidget * parent, const string & label ) = 0; virtual YTree * createTree ( YWidget * parent, const string & label ) = 0; - virtual YTable * createTable ( YWidget * parent, int columns ) = 0; + virtual YTable * createTable ( YWidget * parent, YTableHeader * header ) = 0; virtual YProgressBar * createProgressBar ( YWidget * parent, const string & label, int maxValue = 100 ) = 0; virtual YRichText * createRichText ( YWidget * parent, const string & text, bool plainTextMode = false ) = 0; Modified: branches/tmp/sh/mod-ui/qt/src/YQTable.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQTable.… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQTable.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQTable.cc Thu Oct 25 16:21:39 2007 @@ -30,21 +30,45 @@ #include "YQTable.h" -YQTable::YQTable( YWidget * parent, - int columns ) +YQTable::YQTable( YWidget * parent, YTableHeader * tableHeader ) : QVBox( (QWidget *) parent->widgetRep() ) - , YTable( parent, columns ) + , YTable( parent, tableHeader ) { setWidgetRep( this ); setMargin( YQWidgetMargin ); _qt_listView = new QY2ListView( this ); YUI_CHECK_NEW( _qt_listView ); + _qt_listView->setAllColumnsShowFocus( true ); - for ( int i=0; i < columns; i++ ) - _qt_listView->addColumn( "" ); // Headers are not known yet - _qt_listView->setAllColumnsShowFocus( true ); + // + // Add columns + // + + for ( int i=0; i < columns(); i++ ) + { + _qt_listView->addColumn( fromUTF8( header( i ) ) ); + + int qt_alignment = Qt::Left; + + switch ( alignment( i ) ) + { + case YAlignBegin: qt_alignment = Qt::AlignLeft; break; + case YAlignCenter: qt_alignment = Qt::AlignCenter; break; + case YAlignEnd: qt_alignment = Qt::AlignRight; break; + + case YAlignUnchanged: break; + } + + _qt_listView->setColumnAlignment( i, qt_alignment ); + // _qt_listView->adjustColumn( column ); + } + + + // + // Connect signals and slots + // connect( _qt_listView, SIGNAL( doubleClicked ( QListViewItem * ) ), this, SLOT ( slotActivated ( QListViewItem * ) ) ); @@ -64,40 +88,6 @@ void -YQTable::setHeader( int column, const string & text ) -{ - YTable::setHeader( column, text ); - - if ( hasColumn( column ) ) - { - _qt_listView->header()->setLabel( column, fromUTF8( text ) ); - _qt_listView->adjustColumn( column ); - } -} - - -void -YQTable::setAlignment( int column, YTable::Alignment alignment ) -{ - YTable::setAlignment( column, alignment ); - - if ( hasColumn( column ) ) - { - int qt_alignment = Qt::Left; - - switch ( alignment ) - { - case YTable::Left: qt_alignment = Qt::AlignLeft; break; - case YTable::Center: qt_alignment = Qt::AlignCenter; break; - case YTable::Right: qt_alignment = Qt::AlignRight; break; - } - - _qt_listView->setColumnAlignment( column, qt_alignment ); - } -} - - -void YQTable::setKeepSorting( bool keepSorting ) { YTable::setKeepSorting( keepSorting ); @@ -110,9 +100,9 @@ { YTableItem * item = dynamic_cast<YTableItem *> (yitem); YUI_CHECK_PTR( item ); - + YTable::addItem( item ); - + YQTableListViewItem * clone = new YQTableListViewItem( this, _qt_listView, item ); YUI_CHECK_NEW( clone ); @@ -131,7 +121,7 @@ YTableItem * item = dynamic_cast<YTableItem *> (yitem); YUI_CHECK_PTR( item ); - + YQTableListViewItem * clone = (YQTableListViewItem *) item->data(); YUI_CHECK_PTR( clone ); @@ -151,7 +141,7 @@ YQTable::deselectAllItems() { YQSignalBlocker sigBlocker( _qt_listView ); - + YTable::deselectAllItems(); _qt_listView->clearSelection(); } @@ -195,7 +185,7 @@ YQTable::slotSelected( QListViewItem * listViewItem ) { selectOrigItem( listViewItem ); - + if ( immediateMode() ) { if ( ! YQUI::ui()->eventPendingFor( this ) ) @@ -212,7 +202,7 @@ YQTable::slotActivated( QListViewItem * listViewItem ) { selectOrigItem( listViewItem ); - + if ( notify() ) YQUI::ui()->sendEvent( new YWidgetEvent( this, YEvent::Activated ) ); } Modified: branches/tmp/sh/mod-ui/qt/src/YQTable.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQTable.… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQTable.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQTable.h Thu Oct 25 16:21:39 2007 @@ -38,7 +38,7 @@ /** * Constructor. **/ - YQTable( YWidget * parent, int columns ); + YQTable( YWidget * parent, YTableHeader * header ); /** * Destructor. @@ -46,21 +46,6 @@ virtual ~YQTable(); /** - * Set the header text for the specified column (counting from 0 on). - * - * Reimplemented from YTableWidget. - **/ - virtual void setHeader( int column, const string & text ); - - /** - * Set the alignment for the specified column (counting from 0 on): - * YTable::Left, YTable::Center, YTable::Right - * - * Reimplemented from YTableWidget. - **/ - virtual void setAlignment( int column, YTable::Alignment alignment ); - - /** * Switch between sorting by item insertion order (keepSorting: true) or * allowing the user to sort by an arbitrary column (by clicking on the * column header). Modified: branches/tmp/sh/mod-ui/qt/src/YQWidgetFactory.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQWidget… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQWidgetFactory.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/YQWidgetFactory.cc Thu Oct 25 16:21:39 2007 @@ -181,9 +181,9 @@ YQTable * -YQWidgetFactory::createTable( YWidget * parent, int columns ) +YQWidgetFactory::createTable( YWidget * parent, YTableHeader * header ) { - YQTable * table = new YQTable( parent, columns ); + YQTable * table = new YQTable( parent, header ); YUI_CHECK_NEW( table ); return table; Modified: branches/tmp/sh/mod-ui/qt/src/YQWidgetFactory.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/YQWidget… ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/YQWidgetFactory.h (original) +++ branches/tmp/sh/mod-ui/qt/src/YQWidgetFactory.h Thu Oct 25 16:21:39 2007 @@ -91,7 +91,7 @@ virtual YQComboBox * createComboBox ( YWidget * parent, const string & label, bool editable = false ); virtual YQSelectionBox * createSelectionBox ( YWidget * parent, const string & label ); virtual YQTree * createTree ( YWidget * parent, const string & label ); - virtual YQTable * createTable ( YWidget * parent, int columns ); + virtual YQTable * createTable ( YWidget * parent, YTableHeader * header ); virtual YQProgressBar * createProgressBar ( YWidget * parent, const string & label, int maxValue = 100 ); virtual YQRichText * createRichText ( YWidget * parent, const string & text, bool plainTextMode = false ); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41572 - /branches/tmp/sh/mod-ui/core/libyui/doc/examples/ComboBox5.ycp
by sh-sh-sh＠svn.opensuse.org 25 Oct '07

25 Oct '07

Author: sh-sh-sh Date: Thu Oct 25 16:20:18 2007 New Revision: 41572 URL: http://svn.opensuse.org/viewcvs/yast?rev=41572&view=rev Log: New example Added: branches/tmp/sh/mod-ui/core/libyui/doc/examples/ComboBox5.ycp Added: branches/tmp/sh/mod-ui/core/libyui/doc/examples/ComboBox5.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/doc… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/doc/examples/ComboBox5.ycp (added) +++ branches/tmp/sh/mod-ui/core/libyui/doc/examples/ComboBox5.ycp Thu Oct 25 16:20:18 2007 @@ -0,0 +1,48 @@ +// Advanced ComboBox / SelecionBox example: +// Dialog with a ComboBox and a SelectionBox +// where selecting an item in one will also select it in the other +{ + list items = + [ + `item(`id( "Napoli" ), "Napoli" ), + `item(`id( "Funghi" ), "Funghi", true ), + `item(`id( "Salami" ), "Salami" ) + ]; + + UI::OpenDialog( + `VBox( + `MinSize( 30, 5, + `HBox( + `Top( + `ComboBox(`id(`pizzaComboBox), `opt(`notify), "Pizza:", items ) + ), + `SelectionBox (`id(`pizzaSelBox ), `opt(`notify), "Pizza:", items ) + ) + ), + `Right(`PushButton(`id(`cancel), "&Close") ) + ) + ); + + symbol widget = nil; + + repeat + { + widget = (symbol) UI::UserInput(); + // y2debug( "Event widget: %1", widget ); + + if ( widget == `pizzaComboBox || widget == `pizzaSelBox ) + { + string pizza = (string) UI::QueryWidget( widget, `Value ); + y2debug( "Pizza: %1", pizza ); + + UI::ChangeWidget( widget == `pizzaComboBox ? + `pizzaSelBox : `pizzaComboBox, + `Value, pizza ); + + y2debug( "ComboBox: %1", UI::QueryWidget(`pizzaComboBox, `Items ) ); + y2debug( "SelBox : %1", UI::QueryWidget(`pizzaSelBox, `Items ) ); + } + } until ( widget == `cancel ); + + UI::CloseDialog(); +} -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0