April 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r46823 - /trunk/ncurses-pkg/src/NCPkgFilterContainer.cc
by kmachalkova＠svn.opensuse.org 18 Apr '08

18 Apr '08

Author: kmachalkova Date: Fri Apr 18 11:44:47 2008 New Revision: 46823 URL: http://svn.opensuse.org/viewcvs/yast?rev=46823&view=rev Log: Show pattern content Modified: trunk/ncurses-pkg/src/NCPkgFilterContainer.cc Modified: trunk/ncurses-pkg/src/NCPkgFilterContainer.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgFilterConta… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgFilterContainer.cc (original) +++ trunk/ncurses-pkg/src/NCPkgFilterContainer.cc Fri Apr 18 11:44:47 2008 @@ -201,10 +201,32 @@ if (patPtr) { yuiMilestone() << "Show packages belonging to selected pattern: " << getCurrentLine() << endl; - zypp::ui::PatternContents patternContents( patPtr ); + NCPkgTable * packageList = packager->PackageList(); + + if ( !packageList ) + { + yuiError() << "Widget is not a valid NCPkgTable widget" << endl; + return; + } + packageList->itemsCleared (); + + // zypp::ui::PatternContents patternContents( patPtr ); packager->FilterDescription()->setText ( showDescription( objPtr ) ); - packages = patternContents.install_packages(); - + // packages = patternContents.install_packages(); + zypp::Pattern::Contents related ( patPtr->contents() ); + for ( zypp::Pattern::Contents::Selectable_iterator it = related.selectableBegin(); + it != related.selectableEnd(); + ++it ) + { + ZyppPkg zyppPkg = tryCastToZyppPkg( (*it)->theObj() ); + if ( zyppPkg ) + { + packageList->createListEntry( zyppPkg, *it ); + } + } + packageList->setCurrentItem( 0 ); + packageList->drawList(); + packageList->showInformation(); } #if 0 //FIXME else if (langPtr) @@ -242,7 +264,7 @@ } #endif - showContainerContent( packages ); + //showContainerContent( packages ); } } @@ -332,7 +354,9 @@ if ( !ptr1 || !ptr2 ) return false; else + { return ptr1->order() < ptr2->order(); + } } /////////////////////////////////////////////////////////////////// -- 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] r46822 - in /branches/tmp/aschnell/part-redesign/storage/src: include/ep-hd.ycp include/ep-lvm.ycp include/ep-main.ycp include/ep-raid.ycp modules/TabPanel.ycp
by aschnell＠svn.opensuse.org 18 Apr '08

18 Apr '08

Author: aschnell Date: Fri Apr 18 10:27:55 2008 New Revision: 46822 URL: http://svn.opensuse.org/viewcvs/yast?rev=46822&view=rev Log: - added tab history Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd.ycp branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm.ycp branches/tmp/aschnell/part-redesign/storage/src/include/ep-main.ycp branches/tmp/aschnell/part-redesign/storage/src/include/ep-raid.ycp branches/tmp/aschnell/part-redesign/storage/src/modules/TabPanel.ycp Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/st… ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-hd.ycp Fri Apr 18 10:27:55 2008 @@ -278,17 +278,17 @@ { string device = (string) user_data; - map data = $[ `overview : $[ `create : CreateHdDiskOverviewTab, - `handle : HandleHdDiskOverviewTab, - `user_data : user_data ], - `partitions : $[ `create : CreateHdDiskPartitionsTab, - `handle : HandleHdDiskPartitionsTab, - `user_data : user_data ] ]; + map<symbol, map> data = $[ `overview : $[ `create : CreateHdDiskOverviewTab, + `handle : HandleHdDiskOverviewTab, + `user_data : user_data ], + `partitions : $[ `create : CreateHdDiskPartitionsTab, + `handle : HandleHdDiskPartitionsTab, + `user_data : user_data ] ]; UI::ReplaceWidget(`tree_panel, `VBox( `Left(`Heading("Hard Disk: " + device)), - TabPanel::DumbTab( `id(`tab), [ + TabPanel::DumbTab(`id(`tab), [ `item(`id(`overview), "&Overview"), `item(`id(`partitions), "&Partitions") ], Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/st… ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-lvm.ycp Fri Apr 18 10:27:55 2008 @@ -108,7 +108,7 @@ DlgResizeVolumeGroup(); break; } - + case `delete: { if (EpDeleteVg(vgname)) @@ -237,9 +237,9 @@ { string device = (string) user_data; - map data = $[ `overview : $[ `create : CreateLvmVgOverviewTab, `handle : HandleLvmVgOverviewTab, `user_data : user_data ], - `lvs : $[ `create : CreateLvmVgLvsTab, `handle : HandleLvmVgLvsTab, `user_data : user_data ], - `pvs : $[ `create : CreateLvmVgPvsTab, `user_data : user_data ] ]; + map<symbol, map> data = $[ `overview : $[ `create : CreateLvmVgOverviewTab, `handle : HandleLvmVgOverviewTab, `user_data : user_data ], + `lvs : $[ `create : CreateLvmVgLvsTab, `handle : HandleLvmVgLvsTab, `user_data : user_data ], + `pvs : $[ `create : CreateLvmVgPvsTab, `user_data : user_data ] ]; UI::ReplaceWidget(`tree_panel, `VBox( Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-main.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/st… ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-main.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-main.ycp Fri Apr 18 10:27:55 2008 @@ -64,7 +64,7 @@ { return open_items[id]:"" == "ID"; } - + void huhu(map disk, symbol type, map a, map b) { @@ -95,25 +95,29 @@ string device = disk["device"]:""; symbol type = disk["type"]:`CT_UNKNOWN; - if (type == `CT_DISK || type == `CT_DMRAID) { - huhu(disk, `hd, $[ `create : CreateHdPartitionPanel, `handle : HandleHdPartitionPanel ], - $[ `create : CreateHdDiskPanel, `handle : HandleHdDiskPanel ]); - } - else if (type == `CT_LVM) { - huhu(disk, `lvm, $[ `create : CreateLvmLvPanel, `handle : HandleLvmLvPanel ], - $[ `create : CreateLvmVgPanel, `handle : HandleLvmVgPanel ]); - } - else if (type == `CT_MD) { - huhu(disk, `md, $[ `create : CreateRaidPanel, `handle : HandleRaidPanel ], nil); - } - else if (type == `CT_LOOP) { - huhu(disk, `loop, $[ `create : CreateLoopPanel, `handle : HandleLoopPanel ], nil); - } - else if (type == `CT_DM) { - huhu(disk, `dm, $[ `create : CreateDmPanel, `handle : HandleDmPanel ], nil); - } - else if (type == `CT_NFS) { - huhu(disk, `nfs, $[ `create : CreateNfsPanel, `handle : HandleNfsPanel ], nil); + switch(type) + { + case `CT_DISK: + case `CT_DMRAID: + huhu(disk, `hd, $[ `create : CreateHdPartitionPanel, `handle : HandleHdPartitionPanel ], + $[ `create : CreateHdDiskPanel, `handle : HandleHdDiskPanel ]); + break; + case `CT_LVM: + huhu(disk, `lvm, $[ `create : CreateLvmLvPanel, `handle : HandleLvmLvPanel ], + $[ `create : CreateLvmVgPanel, `handle : HandleLvmVgPanel ]); + break; + case `CT_MD: + huhu(disk, `md, $[ `create : CreateRaidPanel, `handle : HandleRaidPanel ], nil); + break; + case `CT_LOOP: + huhu(disk, `loop, $[ `create : CreateLoopPanel, `handle : HandleLoopPanel ], nil); + break; + case `CT_DM: + huhu(disk, `dm, $[ `create : CreateDmPanel, `handle : HandleDmPanel ], nil); + break; + case `CT_NFS: + huhu(disk, `nfs, $[ `create : CreateNfsPanel, `handle : HandleNfsPanel ], nil); + break; } } Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-raid.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/st… ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-raid.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-raid.ycp Fri Apr 18 10:27:55 2008 @@ -115,8 +115,8 @@ { string device = (string) user_data; - map data = $[ `overview : $[ `create : CreateRaidOverviewTab, `handle : HandleRaidOverviewTab, `user_data : user_data ], - `devices : $[ `create : CreateRaidDevicesTab, `user_data : user_data ] ]; + map<symbol, map> data = $[ `overview : $[ `create : CreateRaidOverviewTab, `handle : HandleRaidOverviewTab, `user_data : user_data ], + `devices : $[ `create : CreateRaidDevicesTab, `user_data : user_data ] ]; UI::ReplaceWidget(`tree_panel, `VBox( Modified: branches/tmp/aschnell/part-redesign/storage/src/modules/TabPanel.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/st… ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/modules/TabPanel.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/modules/TabPanel.ycp Fri Apr 18 10:27:55 2008 @@ -4,15 +4,18 @@ * Summary: Expert Partitioner * Authors: Arvin Schnell <aschnell(a)suse.de> * - * The DumbTab widget must have id `tab. + * The DumbTab widget must have id `tab. The ids of the items of the DumbTab widget + * must be made of symbols. */ { module "TabPanel"; - map data = nil; + map<symbol, map> data = nil; - any current_item = nil; + symbol current_item = nil; + + list<symbol> history = []; global const term empty_panel = `VBox(`VStretch(), `HStretch()); @@ -52,17 +55,40 @@ } + void AddToHistory() + { + history = filter(symbol s, history, { return s != current_item; }); + history = prepend(history, current_item); + } + + /** * When calling this function the DumbTab widget must already exist. */ - global void Init(map d) + global void Init(map<symbol, map> d) { data = d; + list<symbol> item1 = maplist(term t, (list<term>) UI::QueryWidget(`id(`tab), `Items), + { return t[0, 0]:`none; }); + list<symbol> item2 = maplist(symbol s, map m, data, { return s; }); + if (sort(item1) != sort(item2)) + y2warning("DumbTab items and callback data do not match"); + + current_item = find(symbol s, history, { return contains(item1, s); }); + + if (current_item != nil) + { + if (!UI::HasSpecialWidget(`DumbTab)) + UI::ChangeWidget(`tab, `Value, current_item); + else + UI::ChangeWidget(`tab, `CurrentItem, current_item); + } + if (!UI::HasSpecialWidget(`DumbTab)) - current_item = UI::QueryWidget(`tab, `Value); + current_item = (symbol) UI::QueryWidget(`tab, `Value); else - current_item = UI::QueryWidget(`tab, `CurrentItem); + current_item = (symbol) UI::QueryWidget(`tab, `CurrentItem); CallCreate(); } @@ -79,7 +105,8 @@ if (widget != current_item) { CallDestroy(); - current_item = widget; + current_item = (symbol) widget; + AddToHistory(); CallCreate(); } } @@ -98,9 +125,9 @@ global term DumbTab(term id, list<term> tabs, term contents) { if (!UI::HasSpecialWidget(`DumbTab)) - return `VBox(`Left(`ComboBox(id, `opt(`notify), "DumbTab Workaround", + return `VBox(`Left(`ComboBox(id, `opt(`notify), "DumbTab Workaround", maplist(term t, tabs, { - return `item(t[0]:nil, deletechars(t[1]:"", "&")); + return `item(t[0]:nil, deletechars(t[1]:"", "&")); }))), contents); else return `DumbTab(id, tabs, contents); -- 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] r46821 - /trunk/sound/data/alsa_packages.ycp
by lslezak＠svn.opensuse.org 18 Apr '08

18 Apr '08

Author: lslezak Date: Fri Apr 18 09:57:18 2008 New Revision: 46821 URL: http://svn.opensuse.org/viewcvs/yast?rev=46821&view=rev Log: - added a warning to not to forget edit also extra-packages file Modified: trunk/sound/data/alsa_packages.ycp Modified: 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 (original) +++ trunk/sound/data/alsa_packages.ycp Fri Apr 18 09:57:18 2008 @@ -3,6 +3,11 @@ // This is a mapping for required packages // some devices need a firmware or a special tool to work properly +/*************************************************** +* NOTE: DO NOT FORGET TO EDIT extra-packages file +* to ensure the packages are on the medium!! +***************************************************/ + { return $[ -- 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] r46820 - /trunk/extra-packages
by lslezak＠svn.opensuse.org 18 Apr '08

18 Apr '08

Author: lslezak Date: Fri Apr 18 09:52:57 2008 New Revision: 46820 URL: http://svn.opensuse.org/viewcvs/yast?rev=46820&view=rev Log: - added extra packages installed by yast2-sound (required for certain drivers, see alsa_packages.ycp in yast2-sound) bnc #381180 Modified: trunk/extra-packages Modified: trunk/extra-packages URL: http://svn.opensuse.org/viewcvs/yast/trunk/extra-packages?rev=46820&r1=4681… ============================================================================== --- trunk/extra-packages (original) +++ trunk/extra-packages Fri Apr 18 09:52:57 2008 @@ -132,7 +132,13 @@ yast2-users:yast2-nis-client // if NIS authentication yast2-users:yast2-samba-client // if Windows authentication +// for joystick config yast2-sound:input-utils +// extra packages required for certain drivers +// (see alsa_packages.ycp in yast2-sound) +yast2-sound:alsa-firmware +yast2-sound:alsa-tools +yast2-sound:awesfx yast2-network:smpppd yast2-network:ifplugd -- 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] r46819 - /trunk/devtools/devtools/admin/all-packages
by lslezak＠svn.opensuse.org 18 Apr '08

18 Apr '08

Author: lslezak Date: Fri Apr 18 09:41:19 2008 New Revision: 46819 URL: http://svn.opensuse.org/viewcvs/yast?rev=46819&view=rev Log: - added yast2-dirinstall package Modified: trunk/devtools/devtools/admin/all-packages Modified: trunk/devtools/devtools/admin/all-packages URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/admin/all-pack… ============================================================================== --- trunk/devtools/devtools/admin/all-packages (original) +++ trunk/devtools/devtools/admin/all-packages Fri Apr 18 09:41:19 2008 @@ -52,6 +52,7 @@ yast2-slide-show inst-sys install yast2-slide-show-SLES inst-sys install yast2-live-installer - install +yast2-dirinstall - install # auto installation autoyast2 default all,autoinstall -- 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] r46818 - /tags/stable-2_16_2/dirinstall/
by lslezak＠svn.opensuse.org 18 Apr '08

18 Apr '08

Author: lslezak Date: Fri Apr 18 09:38:17 2008 New Revision: 46818 URL: http://svn.opensuse.org/viewcvs/yast?rev=46818&view=rev Log: Created tag stable-2_16_2 for dirinstall Added: tags/stable-2_16_2/dirinstall/ - copied from r46817, trunk/dirinstall/ -- 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] r46817 - in /trunk/dirinstall: VERSION package/yast2-dirinstall.changes src/clients/dirinstall.ycp src/clients/inst_dirinstall.ycp src/include/ui.ycp src/modules/DirInstall.ycp
by lslezak＠svn.opensuse.org 18 Apr '08

18 Apr '08

Author: lslezak Date: Fri Apr 18 09:38:10 2008 New Revision: 46817 URL: http://svn.opensuse.org/viewcvs/yast?rev=46817&view=rev Log: - do not create a copy of the installation source - select a product for installation - preselect dependent patterns - do not store the config when abort is pressed - code clean up (bnc#379154) - 2.16.2 Modified: trunk/dirinstall/VERSION trunk/dirinstall/package/yast2-dirinstall.changes trunk/dirinstall/src/clients/dirinstall.ycp trunk/dirinstall/src/clients/inst_dirinstall.ycp trunk/dirinstall/src/include/ui.ycp trunk/dirinstall/src/modules/DirInstall.ycp Modified: trunk/dirinstall/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/dirinstall/VERSION?rev=46817&r1=… ============================================================================== --- trunk/dirinstall/VERSION (original) +++ trunk/dirinstall/VERSION Fri Apr 18 09:38:10 2008 @@ -1 +1 @@ -2.16.1 +2.16.2 Modified: trunk/dirinstall/package/yast2-dirinstall.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/dirinstall/package/yast2-dirinst… ============================================================================== --- trunk/dirinstall/package/yast2-dirinstall.changes (original) +++ trunk/dirinstall/package/yast2-dirinstall.changes Fri Apr 18 09:38:10 2008 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Fri Apr 18 08:52:12 CEST 2008 - lslezak(a)suse.cz + +- do not create a copy of the installation source +- select a product for installation - preselect dependent patterns +- do not store the config when abort is pressed +- code clean up (bnc#379154) +- 2.16.2 + +------------------------------------------------------------------- Fri Apr 11 13:55:26 CEST 2008 - jsrain(a)suse.cz - added possiblity to load software selection from AutoYaST profile Modified: trunk/dirinstall/src/clients/dirinstall.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/dirinstall/src/clients/dirinstal… ============================================================================== --- trunk/dirinstall/src/clients/dirinstall.ycp (original) +++ trunk/dirinstall/src/clients/dirinstall.ycp Fri Apr 18 09:38:10 2008 @@ -12,6 +12,7 @@ textdomain "dirinstall"; import "CommandLine"; + import "PackageCallbacks"; symbol StartDirInstall() { @@ -23,13 +24,13 @@ import "DirInstall"; import "PackageLock"; - import "Product"; import "Report"; import "Progress"; - import "Popup"; include "dirinstall/ui.ycp"; + DirInstall::SetStarted(false); + // check whether having the packager for ourselves if (! PackageLock::Check ()) return `abort; @@ -61,10 +62,6 @@ stages, stages2, _("Please wait...")); - // install package callbacks - import "PackageCallbacksInit"; - PackageCallbacksInit::InitPackageCallbacks(); - Progress::NextStage(); // initializa the package manager @@ -74,92 +71,48 @@ Pkg::TargetFinish (); Pkg::SourceStartManager(true); - boolean have_patterns - = size (Pkg::ResolvableProperties ("", `pattern, "")) > 0; - boolean have_selections - = size (Pkg::GetSelections (`available, "base")) > 0; - have_patterns = have_patterns && ! have_selections; Progress::NextStage(); - if (have_patterns) - { - y2milestone ("Host system is using patterns"); + list<map<string,any> > prods = Pkg::ResolvableProperties ("", `product, ""); + y2milestone("Found products: %1", prods); - Pkg::TargetInit ("/", false); - list<map<string,any> > prods = Pkg::ResolvableProperties ("", `product, ""); - list<map<string,any> > base_l = filter (map<string,any> p, prods, { - return p["category"]:"" == "base"; - }); - map<string,any> base = base_l[0]:$[]; - if (size (base_l) == 0) - { - y2warning ("No base product found, using first found product"); - base = prods[0]:$[]; - } - y2milestone ("Found base product: %1", base); - prods = Pkg::ResolvableProperties (base["name"]:"", `product, ""); - y2milestone ("Found appropriate base products in repositories: %1", prods); - if (size (prods) == 0) - { - // error report - Report::Error (_("Could not read package information.")); - Wizard::CloseDialog(); - return `abort; - } - map<string,any> prod = prods[0]:$[]; - integer source = prod["source"]:-1; - map src_data = Pkg::SourceGeneralData (source); - y2milestone ("Repository: %1", src_data); - Pkg::SourceSetEnabled (source, false); - string url = src_data["url"]:""; - string dir = src_data["product_dir"]:"/"; - if (substring (url, 0, 3) == "cd:" || substring (url, 0, 4) == "dvd:") - { - if (! Popup::ContinueCancel (sformat (_("Insert %1 CD 1"), base["summary"]:""))) - { - Wizard::CloseDialog(); - return `back; - } - } - new_src = Pkg::SourceCreateBase (url, dir); - old_src = source; - using_patterns = true; - - string content_file = Pkg::SourceProvideFile (new_src, 1, "/content"); - SCR::RegisterAgent (.media.content, `ag_ini( - `IniAgent( content_file, - $[ - "options" : [ "read_only", "global_values", "flat" ], - "comments" : [ "^#.*", "^[ \t]*$", ], - "params" : [ - $[ "match" : [ "^[ \t]*([a-zA-Z0-9_\.]+)[ \t]*(.*)[ \t]*$", "%s %s" ] ] - ] - ] - ))); - any tmp1 = SCR::Read (.media.content.PATTERNS); - if (tmp1 != nil) - Product::patterns = splitstring ((string)tmp1, " "); - y2milestone ("***Patterns: %1", Product::patterns); - Pkg::TargetFinish (); + list<map<string,any> > base_l = filter (map<string,any> p, prods, { + return p["category"]:"" == "base"; + }); + + map<string,any> base = base_l[0]:$[]; + if (size (base_l) == 0) + { + y2warning ("No base product found, using first found product"); + base = prods[0]:$[]; } - else + + y2milestone ("Found base product: %1", base); + prods = Pkg::ResolvableProperties (base["name"]:"", `product, ""); + y2milestone ("Found appropriate base products in repositories: %1", prods); + if (size (prods) == 0) { - y2milestone ("Host system is using selections"); + // error report + Report::Error (_("Could not read package information.")); + Wizard::CloseDialog(); + return `abort; } + // select the base product for installation + Pkg::ResolvableInstall(base["name"]:"", `product); + symbol ret = Run (); Progress::NextStage(); y2milestone ("Sequence returned %1", ret); DirInstall::UmountFilesystems (); - if (using_patterns) + + if (DirInstall::GetStarted()) { - Pkg::SourceDelete (new_src); - Pkg::SourceSetEnabled (old_src, true); + DirInstall::FinishPackageManager (); } - DirInstall::FinishPackageManager (); Wizard::CloseDialog(); return ret; Modified: trunk/dirinstall/src/clients/inst_dirinstall.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/dirinstall/src/clients/inst_diri… ============================================================================== --- trunk/dirinstall/src/clients/inst_dirinstall.ycp (original) +++ trunk/dirinstall/src/clients/inst_dirinstall.ycp Fri Apr 18 09:38:10 2008 @@ -12,16 +12,11 @@ textdomain "dirinstall"; import "DirInstall"; - import "Installation"; - import "Directory"; - import "Popup"; import "SlideShow"; - import "PackageInstallation"; - import "PackageCallbacks"; - import "Wizard"; - import "Progress"; import "String"; + DirInstall::SetStarted(true); + Pkg::TargetFinish (); DirInstall::MountFilesystems (); @@ -34,28 +29,6 @@ // initialize the slideshow SlideShow::InitPkgData(false); -/* - if(Pkg::TargetInit (Installation::destdir,true) != true) - { - // continue-cancel popup - if(Popup::ContinueCancel(_("Initializing the target directory failed")) == false) - { - return `abort; - } - } -*/ - - /* - boolean anyToDelete = Pkg::PkgAnyToDelete(); - SlideShow::SetLanguage (UI::GetLanguage(true)); - SlideShow::InitPkgData(); - SlideShow::OpenSlideShowDialog(); - - Pkg::TargetLogfile (Installation::destdir + Directory::logdir + "/y2logRPM"); - list commit_result = PackageInstallation::CommitPackages (0, 0); - - SlideShow::CloseSlideShowDialog(); - */ return `next; } Modified: trunk/dirinstall/src/include/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/dirinstall/src/include/ui.ycp?re… ============================================================================== --- trunk/dirinstall/src/include/ui.ycp (original) +++ trunk/dirinstall/src/include/ui.ycp Fri Apr 18 09:38:10 2008 @@ -55,32 +55,36 @@ symbol ret = ProductControl::Run(); - // display a progress during exit - list<string> stages = - [ - // progress bar item - _("Finish the Package Manager"), - // progress bar item - _("Clean Up"), - ]; - - list<string> stages2 = - [ - // progress bar item - _("Finishing the Package Manager..."), - // progress bar item - _("Cleaning Up..."), - ]; - - // progres bar label - Progress::New (_("Finishing..."), " ", size(stages) - 1, - // progres bar label - stages, stages2, _("Please wait...")); + if (DirInstall::GetStarted()) + { + // display a progress during exit + list<string> stages = + [ + // progress bar item + _("Finish the Package Manager"), + // progress bar item + _("Clean Up"), + ]; + + list<string> stages2 = + [ + // progress bar item + _("Finishing the Package Manager..."), + // progress bar item + _("Cleaning Up..."), + ]; + + // progres bar label + Progress::New (_("Finishing..."), " ", size(stages) - 1, + // progres bar label + stages, stages2, _("Please wait...")); + + Progress::NextStage(); + + Pkg::SourceFinishAll (); + Pkg::TargetFinish(); + } - Progress::NextStage(); - - Pkg::SourceFinishAll (); - Pkg::TargetFinish(); Installation::destdir = "/"; return ret; Modified: trunk/dirinstall/src/modules/DirInstall.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/dirinstall/src/modules/DirInstal… ============================================================================== --- trunk/dirinstall/src/modules/DirInstall.ycp (original) +++ trunk/dirinstall/src/modules/DirInstall.ycp Fri Apr 18 09:38:10 2008 @@ -29,6 +29,8 @@ global string dirinstall_control_file = "/usr/share/YaST2/control/dirinstall.xml"; +boolean started = false; + list<list<string> > filesystems = [ ["/proc", "proc", "proc" ], ["/sys", "sysfs", "sysfs" ], @@ -36,6 +38,18 @@ list<string> mounted_fs = []; +global void SetStarted(boolean status) +{ + started = status; + y2milestone("DirInstall started set to: %1", started); +} + +global boolean GetStarted() +{ + y2milestone("DirInstall started: %1", started); + return started; +} + global integer GetTargetChangeTime() { return Installation::dirinstall_target_time; -- 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] r46816 - /trunk/qt-pkg/package/yast2-qt-pkg.changes
by dmacvicar＠svn.opensuse.org 17 Apr '08

17 Apr '08

Author: dmacvicar Date: Thu Apr 17 23:27:35 2008 New Revision: 46816 URL: http://svn.opensuse.org/viewcvs/yast?rev=46816&view=rev Log: changes Modified: trunk/qt-pkg/package/yast2-qt-pkg.changes Modified: trunk/qt-pkg/package/yast2-qt-pkg.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/package/yast2-qt-pkg.chan… ============================================================================== --- trunk/qt-pkg/package/yast2-qt-pkg.changes (original) +++ trunk/qt-pkg/package/yast2-qt-pkg.changes Thu Apr 17 23:27:35 2008 @@ -1,3 +1,9 @@ +Thu Apr 17 22:17:53 CEST 2008 - dmacvicar(a)suse.de +------------------------------------------------------------------- + +- don't reorder patterns when clicking +- enable tooltip for repositories and patterns + ------------------------------------------------------------------- Thu Apr 17 13:36:41 CEST 2008 - dmacvicar(a)suse.de -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r46815 - /trunk/qt-pkg/src/YQPkgPatternList.cc
by dmacvicar＠svn.opensuse.org 17 Apr '08

17 Apr '08

Author: dmacvicar Date: Thu Apr 17 23:27:25 2008 New Revision: 46815 URL: http://svn.opensuse.org/viewcvs/yast?rev=46815&view=rev Log: - move the numbers of installed packages of a pattern to the tooltip Modified: trunk/qt-pkg/src/YQPkgPatternList.cc Modified: trunk/qt-pkg/src/YQPkgPatternList.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgPatternList.cc?r… ============================================================================== --- trunk/qt-pkg/src/YQPkgPatternList.cc (original) +++ trunk/qt-pkg/src/YQPkgPatternList.cc Thu Apr 17 23:27:25 2008 @@ -324,7 +324,7 @@ } selection()->setInstalledPackages(installed); selection()->setTotalPackages(total); - + selection()->resetToolTip(); } } @@ -486,10 +486,13 @@ { std::string infoToolTip; infoToolTip += ("" + zyppPattern()->description() + ""); - setToolTip(_patternList->summaryCol(), infoToolTip.c_str()); - -// setTooltip( _summaryCol, QString().sprintf("%s (%d/%d)", zyppPattern->summary().c_str(), installed, total)); + if ( totalPackages() > 0 ) + { + infoToolTip += ("" + zypp::str::form("%d / %d", installedPackages(), totalPackages() ) + ""); + } + + setToolTip(_patternList->summaryCol(), infoToolTip.c_str()); } void -- 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] r46814 - in /trunk/qt-pkg/src: YQPkgPatternList.cc YQPkgPatternList.h
by dmacvicar＠svn.opensuse.org 17 Apr '08

17 Apr '08

Author: dmacvicar Date: Thu Apr 17 23:20:13 2008 New Revision: 46814 URL: http://svn.opensuse.org/viewcvs/yast?rev=46814&view=rev Log: - tooltip for patterns (description) Modified: trunk/qt-pkg/src/YQPkgPatternList.cc trunk/qt-pkg/src/YQPkgPatternList.h Modified: trunk/qt-pkg/src/YQPkgPatternList.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgPatternList.cc?r… ============================================================================== --- trunk/qt-pkg/src/YQPkgPatternList.cc (original) +++ trunk/qt-pkg/src/YQPkgPatternList.cc Thu Apr 17 23:20:13 2008 @@ -325,7 +325,6 @@ selection()->setInstalledPackages(installed); selection()->setTotalPackages(total); - selection()->setText( _summaryCol, QString().sprintf("%s (%d/%d)", zyppPattern->summary().c_str(), installed, total)); } } @@ -461,13 +460,16 @@ if (_zyppPattern) { string icon = _zyppPattern->icon().asString(); + // HACK most patterns have wrong default icon if ( icon == zypp::Pathname("yast-system").asString() ) icon = "pattern-generic"; + // FIXME find the icon in a sane way setIcon(_patternList->iconCol(), QIcon(QString("/usr/share/icons/hicolor/32x32/apps/") + icon.c_str() + QString(".png"))); } setStatusIcon(); + resetToolTip(); setFirstColumnSpanned ( false ); } @@ -480,6 +482,17 @@ void +YQPkgPatternListItem::resetToolTip() +{ + std::string infoToolTip; + infoToolTip += ("" + zyppPattern()->description() + ""); + setToolTip(_patternList->summaryCol(), infoToolTip.c_str()); + +// setTooltip( _summaryCol, QString().sprintf("%s (%d/%d)", zyppPattern->summary().c_str(), installed, total)); + +} + +void YQPkgPatternListItem::applyChanges() { solveResolvableCollections(); Modified: trunk/qt-pkg/src/YQPkgPatternList.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-pkg/src/YQPkgPatternList.h?re… ============================================================================== --- trunk/qt-pkg/src/YQPkgPatternList.h (original) +++ trunk/qt-pkg/src/YQPkgPatternList.h Thu Apr 17 23:20:13 2008 @@ -196,6 +196,11 @@ void setTotalPackages(int v) { _total = v; } void setInstalledPackages(int v) { _installed = v; } + /** + * resets the tooltip with the current available information + */ + void resetToolTip(); + protected: /** -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0