January 2010 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r60407 - /trunk/storage/storage/src/include/ep-lib.ycp
by aschnell＠svn.opensuse.org 15 Jan '10

15 Jan '10

Author: aschnell Date: Fri Jan 15 18:51:27 2010 New Revision: 60407 URL: http://svn.opensuse.org/viewcvs/yast?rev=60407&view=rev Log: - show name instead of device in bargraph of disks/vgs Modified: trunk/storage/storage/src/include/ep-lib.ycp Modified: trunk/storage/storage/src/include/ep-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-l… ============================================================================== --- trunk/storage/storage/src/include/ep-lib.ycp (original) +++ trunk/storage/storage/src/include/ep-lib.ycp Fri Jan 15 18:51:27 2010 @@ -387,7 +387,7 @@ float tmp = (float) Region::Length(region) / (float) disk["cyl_count"]:1; y2debug("i:%1 this cyl:%2 end cyl:%3 next cyl:%4", i, ccyl, Region::End(region), next_cyl); - AddSegment(tmp, part["device"]:"", part["size_k"]:0); + AddSegment(tmp, part["name"]:"", part["size_k"]:0); // Now there is some xtra space between the end of this partition and the start of the next one // or the end of the disk if @@ -417,7 +417,7 @@ foreach(map partition, partitions, { integer size_k = partition["size_k"]:0; disk_free_k = disk_free_k - size_k; - AddSegment((float) size_k / (float) disk_size_k, partition["device"]:"", size_k); + AddSegment((float) size_k / (float) disk_size_k, partition["name"]:"", size_k); }); if (disk_free_k > 0) -- 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] r60406 - /tags/stable-2_19_2/installation/
by aschnell＠svn.opensuse.org 15 Jan '10

15 Jan '10

Author: aschnell Date: Fri Jan 15 17:31:52 2010 New Revision: 60406 URL: http://svn.opensuse.org/viewcvs/yast?rev=60406&view=rev Log: Created tag stable-2_19_2 for installation Added: tags/stable-2_19_2/installation/ - copied from r60405, trunk/installation/ -- 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] r60405 - in /trunk/installation: VERSION control/control.rnc package/yast2-installation.changes
by aschnell＠svn.opensuse.org 15 Jan '10

15 Jan '10

Author: aschnell Date: Fri Jan 15 17:31:00 2010 New Revision: 60405 URL: http://svn.opensuse.org/viewcvs/yast?rev=60405&view=rev Log: - updated control.rnc Modified: trunk/installation/VERSION trunk/installation/control/control.rnc trunk/installation/package/yast2-installation.changes Modified: trunk/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=60405&r… ============================================================================== --- trunk/installation/VERSION (original) +++ trunk/installation/VERSION Fri Jan 15 17:31:00 2010 @@ -1 +1 @@ -2.19.1 +2.19.2 Modified: trunk/installation/control/control.rnc URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.rnc… ============================================================================== --- trunk/installation/control/control.rnc (original) +++ trunk/installation/control/control.rnc Fri Jan 15 17:31:00 2010 @@ -350,6 +350,7 @@ | boot_evms | use_separate_multipath_module | prefer_remove + | vm_keep_unpartitioned_region | remove_special_partitions | partitions @@ -366,6 +367,7 @@ boot_evms = element boot_evms { BOOLEAN } prefer_remove = element prefer_remove { BOOLEAN } remove_special_partitions = element remove_special_partitions { BOOLEAN } +vm_keep_unpartitioned_region = element vm_keep_unpartitioned_region { BOOLEAN } # used by HASI Add-On use_separate_multipath_module = element use_separate_multipath_module { BOOLEAN } Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Fri Jan 15 17:31:00 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jan 15 17:29:45 CET 2010 - aschnell(a)suse.de + +- updated control.rnc +- 2.19.2 + +------------------------------------------------------------------- Thu Jan 7 15:29:13 CET 2010 - jsuchome(a)suse.cz - inst_complex_welcome adapted to Language::SwitchToEnglishIfNeeded -- 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] r60404 - in /branches/tmp/bubli/libyui: VERSION package/libyui.changes
by mvidner＠svn.opensuse.org 15 Jan '10

15 Jan '10

Author: mvidner Date: Fri Jan 15 17:16:43 2010 New Revision: 60404 URL: http://svn.opensuse.org/viewcvs/yast?rev=60404&view=rev Log: Bumped the version. Otherwise the 'Obsoletes: yast2-libyui < %version' cannot take effect. Modified: branches/tmp/bubli/libyui/VERSION branches/tmp/bubli/libyui/package/libyui.changes Modified: branches/tmp/bubli/libyui/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/bubli/libyui/VERSION?rev=… ============================================================================== --- branches/tmp/bubli/libyui/VERSION (original) +++ branches/tmp/bubli/libyui/VERSION Fri Jan 15 17:16:43 2010 @@ -1 +1 @@ -2.18.8 +2.18.9 Modified: branches/tmp/bubli/libyui/package/libyui.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/bubli/libyui/package/liby… ============================================================================== --- branches/tmp/bubli/libyui/package/libyui.changes (original) +++ branches/tmp/bubli/libyui/package/libyui.changes Fri Jan 15 17:16:43 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Jan 15 17:07:32 CET 2010 - kmachalkova(a)suse.cz + +- Renamed yast2-libyui to libyui to further the independence from + YaST +- V 2.18.9 + +------------------------------------------------------------------- Tue Jul 28 17:22:58 CEST 2009 - kmachalkova(a)suse.cz - Search for icons in several possible directories (using -- 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] r60403 - in /trunk/storage/storage/src/include: ep-all.ycp ep-dialogs.ycp ep-hd-lib.ycp ep-lvm-lib.ycp ep-raid-lib.ycp ep-unused.ycp
by aschnell＠svn.opensuse.org 15 Jan '10

15 Jan '10

Author: aschnell Date: Fri Jan 15 16:17:32 2010 New Revision: 60403 URL: http://svn.opensuse.org/viewcvs/yast?rev=60403&view=rev Log: - tiny modernisations Modified: trunk/storage/storage/src/include/ep-all.ycp trunk/storage/storage/src/include/ep-dialogs.ycp trunk/storage/storage/src/include/ep-hd-lib.ycp trunk/storage/storage/src/include/ep-lvm-lib.ycp trunk/storage/storage/src/include/ep-raid-lib.ycp trunk/storage/storage/src/include/ep-unused.ycp Modified: trunk/storage/storage/src/include/ep-all.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-a… ============================================================================== --- trunk/storage/storage/src/include/ep-all.ycp (original) +++ trunk/storage/storage/src/include/ep-all.ycp Fri Jan 15 16:17:32 2010 @@ -71,7 +71,7 @@ configs = add(configs, `item(`id(`xpram), `icon("yast-xpram"), _("Configure &XPRAM..."))); } - if (size(configs) > 0) { + if (!isempty(configs)) { // menu button text buttons = add(buttons, `MenuButton(`opt(`key_F7), _("Configure..."), configs)); } Modified: trunk/storage/storage/src/include/ep-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-d… ============================================================================== --- trunk/storage/storage/src/include/ep-dialogs.ycp (original) +++ trunk/storage/storage/src/include/ep-dialogs.ycp Fri Jan 15 16:17:32 2010 @@ -592,7 +592,7 @@ if (used_fs != `swap) { map free_data = Storage::GetFreeSpace(device, used_fs, true); - if (size(free_data) == 0 || !free_data["ok"]:false) + if (isempty(free_data) || !free_data["ok"]:false) { y2error("Failed to retrieve FreeSpace %1, filesystem %2", device, data["used_fs"]:`none); //FIXME: Really? Modified: trunk/storage/storage/src/include/ep-hd-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-h… ============================================================================== --- trunk/storage/storage/src/include/ep-hd-lib.ycp (original) +++ trunk/storage/storage/src/include/ep-hd-lib.ycp Fri Jan 15 16:17:32 2010 @@ -373,19 +373,20 @@ more partitions. After cloning, these partitions will be deleted."); - list <string> AvailableTargetDisks() { - list <string> items = []; - + list <string> AvailableTargetDisks() + { map <string, map> filtered_target_map = filter( string dev, map props, target_map, { - return ( dev != device && - Storage::IsDiskType( props["type"]:`CT_UNKNOWN ) && - props["used_by_device"]:"" == "" && - props["cyl_size"]:0 == mycyl_size ); + return dev != device && + Storage::IsDiskType( props["type"]:`CT_UNKNOWN ) && + isempty(props["used_by"]:[]) && + props["cyl_size"]:0 == mycyl_size; }); y2milestone("Available, suitable and unused disks (other than %1): %2", device, Map::Keys(filtered_target_map)); + list <string> items = []; + foreach( string dev, map props, filtered_target_map,{ if( props["size_k"]:0 >= mysize ) items = add(items, dev); Modified: trunk/storage/storage/src/include/ep-lvm-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-l… ============================================================================== --- trunk/storage/storage/src/include/ep-lvm-lib.ycp (original) +++ trunk/storage/storage/src/include/ep-lvm-lib.ycp Fri Jan 15 16:17:32 2010 @@ -42,7 +42,7 @@ void EpCreateVolumeGroup() { map<string, map> target_map = Storage::GetTargetMap(); - list<map> unused_pvs = filter(map pv, get_possible_pvs(target_map), { return isempty(pv["used_by_device"]:""); }); + list<map> unused_pvs = filter(map pv, get_possible_pvs(target_map), { return isempty(pv["used_by"]:[]); }); if (size(unused_pvs) < 1) { Modified: trunk/storage/storage/src/include/ep-raid-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-r… ============================================================================== --- trunk/storage/storage/src/include/ep-raid-lib.ycp (original) +++ trunk/storage/storage/src/include/ep-raid-lib.ycp Fri Jan 15 16:17:32 2010 @@ -42,7 +42,7 @@ void EpCreateRaid() { map<string, map> target_map = Storage::GetTargetMap(); - list<map> unused_devices = filter(map dev, get_possible_rds(target_map), { return isempty(dev["used_by_device"]:""); }); + list<map> unused_devices = filter(map dev, get_possible_rds(target_map), { return isempty(dev["used_by"]:[]); }); if (size(unused_devices) < 2) { Modified: trunk/storage/storage/src/include/ep-unused.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-u… ============================================================================== --- trunk/storage/storage/src/include/ep-unused.ycp (original) +++ trunk/storage/storage/src/include/ep-unused.ycp Fri Jan 15 16:17:32 2010 @@ -20,8 +20,8 @@ if (partition == nil) { - if (disk["partitions"]:[] == [] && - disk["used_by_type"]:`UB_NONE == `UB_NONE) + if (isempty(disk["partitions"]:[]) && + isempty(disk["used_by"]:[])) { return `show; } @@ -31,8 +31,8 @@ else { if (partition["type"]:`primary != `extended && - partition["mount"]:"" == "" && - partition["used_by_type"]:`UB_NONE == `UB_NONE) + isempty(partition["mount"]:"") && + isempty(partition["used_by"]:[])) { return `show; } -- 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] r60402 - /branches/tmp/bubli/libyui/configure.in
by kmachalkova＠svn.opensuse.org 15 Jan '10

15 Jan '10

Author: kmachalkova Date: Fri Jan 15 16:00:18 2010 New Revision: 60402 URL: http://svn.opensuse.org/viewcvs/yast?rev=60402&view=rev Log: Adding plugindir and themedir definitions to find UI plugins and icons where they really are Modified: branches/tmp/bubli/libyui/configure.in Modified: branches/tmp/bubli/libyui/configure.in URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/bubli/libyui/configure.in… ============================================================================== --- branches/tmp/bubli/libyui/configure.in (original) +++ branches/tmp/bubli/libyui/configure.in Fri Jan 15 16:00:18 2010 @@ -21,12 +21,16 @@ docdir=\${prefix}/share/doc/packages/libyui includedir=\${prefix}/include/YaST2 pkgconfigdir=\${libdir}/pkgconfig +plugindir=\${libdir}/YaST2/plugin +themedir=\${prefix}/share/YaST2/theme/ AC_SUBST(VERSION) AC_SUBST(RPMNAME) AC_SUBST(docdir) AC_SUBST(includedir) AC_SUBST(pkgconfigdir) +AC_SUBST(plugindir) +AC_SUBST(themedir) AC_OUTPUT( Makefile -- 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] r60401 - /branches/tmp/bubli/libyui/libyui.spec.in
by kmachalkova＠svn.opensuse.org 15 Jan '10

15 Jan '10

Author: kmachalkova Date: Fri Jan 15 15:14:16 2010 New Revision: 60401 URL: http://svn.opensuse.org/viewcvs/yast?rev=60401&view=rev Log: typo (thanks for spotting, Uwe :) ) Modified: branches/tmp/bubli/libyui/libyui.spec.in Modified: branches/tmp/bubli/libyui/libyui.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/bubli/libyui/libyui.spec.… ============================================================================== --- branches/tmp/bubli/libyui/libyui.spec.in (original) +++ branches/tmp/bubli/libyui/libyui.spec.in Fri Jan 15 15:14:16 2010 @@ -23,7 +23,7 @@ BuildRequires: boost-devel Provides: yast2-libyui = %{version} -Obsoletes: yast2-libyi < %{version} +Obsoletes: yast2-libyui < %{version} Summary: YaST2 - User Interface Engine -- 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] r60400 - /branches/tmp/bubli/libyui/libyui.spec.in
by kmachalkova＠svn.opensuse.org 15 Jan '10

15 Jan '10

Author: kmachalkova Date: Fri Jan 15 15:02:38 2010 New Revision: 60400 URL: http://svn.opensuse.org/viewcvs/yast?rev=60400&view=rev Log: Added provides/obsoletes to make this replacement pack for yast2-libyui Updated group/descriptions Modified: branches/tmp/bubli/libyui/libyui.spec.in Modified: branches/tmp/bubli/libyui/libyui.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/bubli/libyui/libyui.spec.… ============================================================================== --- branches/tmp/bubli/libyui/libyui.spec.in (original) +++ branches/tmp/bubli/libyui/libyui.spec.in Fri Jan 15 15:02:38 2010 @@ -22,29 +22,34 @@ # libyui ImplPtr BuildRequires: boost-devel +Provides: yast2-libyui = %{version} +Obsoletes: yast2-libyi < %{version} + Summary: YaST2 - User Interface Engine %description -This is the YaST2 user interface engine that provides the abstraction -from graphical user interfaces (Qt, Gtk) and text based user interfaces +This is the user interface engine that provides the abstraction from +graphical user interfaces (Qt, Gtk) and text based user interfaces (ncurses). -This can be used independently of YaST2 for generic (C++) applications. -This package has very few dependencies. +Originally developed for YaST, it can now be used independently of +YaST for generic (C++) applications. This package has very few +dependencies. %package devel Summary: YaST2 - User Interface Engine header filews +Group: Development/Languages/C and C++ Requires: glibc-devel Requires: libstdc++-devel Requires: boost-devel %description devel -This is the development package for the YaST2 user interface engine +This is the development package for libyui user interface engine that provides the abstraction from graphical user interfaces (Qt, Gtk) and text based user interfaces (ncurses). -This can be used independently of YaST2 for generic (C++) applications. +This can be used independently of YaST for generic (C++) applications. This package has very few dependencies. %prep -- 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] r60399 - in /branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src: MdPartCo.cc MdPartCo.h Storage.cc Storage.h StorageInterface.h
by mpatelcz＠svn.opensuse.org 15 Jan '10

15 Jan '10

Author: mpatelcz Date: Fri Jan 15 14:09:48 2010 New Revision: 60399 URL: http://svn.opensuse.org/viewcvs/yast?rev=60399&view=rev Log: BZ568325 - Storage::removeUsing not handling MDPART Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdPartCo.cc branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdPartCo.h branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Storage.cc branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Storage.h branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/StorageInterface.h Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdPartCo.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdPartCo.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdPartCo.cc Fri Jan 15 14:09:48 2010 @@ -669,27 +669,39 @@ y2mil("begin"); if( readonly() ) { + y2war("Read-Only RAID."); ret = MDPART_CHANGE_READONLY; } if( ret==0 && !created() ) { + list<string> rdevs; + getDevs( rdevs ); + for( list<string>::const_iterator s=rdevs.begin(); + s!=rdevs.end(); ++s ) + { + getStorage()->clearUsedBy(*s); + } + //Remove partitions MdPartPair p=mdpartPair(MdPart::notDeleted); for( MdPartIter i=p.begin(); i!=p.end(); ++i ) { if( i->nr()>0 ) + { ret = removePartition( i->nr() ); + } } + //Remove 'whole device' it was created when last partition was deleted. p=mdpartPair(MdPart::notDeleted); if( p.begin()!=p.end() && p.begin()->nr()==0 ) { if( !removeFromList( &(*p.begin()) )) + { y2err( "not found:" << *p.begin() ); + } } setDeleted( true ); - } - if( ret==0 ) - { - //unuseDev(); - In PeContainer. + destrSb = true; + del_ptable = true; } y2mil("ret:" << ret); return( ret ); @@ -867,16 +879,90 @@ return( ret ); } +//Remove MDPART unless: +//1. It's IMSM or DDF SW RAID +//2. It contains partitions. int MdPartCo::doRemove() { - return( MDPART_NO_REMOVE ); + y2mil("begin"); + // 1. Check Metadata. + if( sb_ver == "imsm" || sb_ver == "ddf" ) + { + if( !silent ) + { + getStorage()->showInfoCb( noRemoveTextFormat(true) ); + } + y2error("Cannot remove IMSM or DDF SW RAIDs."); + return (MDPART_NO_REMOVE); + } + // 2. Check for partitions. + if( disk!=NULL && disk->numPartitions()>0 ) + { + int permitRemove=1; + //handleWholeDevice: partition 0. + if( disk->numPartitions() == 1 ) + { + //Find partition '0' if it exists then this 'whole device' + MdPartIter i; + if( findMdPart( 0, i ) == true) + { + //Single case when removal is allowed. + permitRemove = 0; + } + } + if( permitRemove == 1 ) + { + if( !silent ) + { + getStorage()->showInfoCb( noRemoveTextPartitions(true) ); + } + y2error("Cannot remove RAID with partitions."); + return (MDPART_NO_REMOVE); + } + } + /* Try to remove this. */ + y2milestone( "Raid:%s is going to be removed permanently.", name().c_str() ); + int ret = 0; + if( deleted() ) + { + string cmd = MDADMBIN " --stop " + quote(device()); + SystemCmd c( cmd ); + if( c.retcode()!=0 ) + { + ret = MD_REMOVE_FAILED; + setExtError( c ); + } + if( !silent ) + { + getStorage()->showInfoCb( removeText(true) ); + } + if( ret==0 && destrSb ) + { + SystemCmd c; + list<string> d; + getDevs( d ); + for( list<string>::const_iterator i=d.begin(); i!=d.end(); ++i ) + { + c.execute(MDADMBIN " --zero-superblock " + quote(*i)); + } + } + if( ret==0 ) + { + EtcRaidtab* tab = getStorage()->getRaidtab(); + if( tab!=NULL ) + { + tab->removeEntry( nr() ); + } + } + } + y2mil("Done, ret:" << ret); + return( ret ); } int MdPartCo::doRemove( Volume* v ) { y2mil("name:" << name() << " v->name:" << v->name()); MdPart * l = dynamic_cast<MdPart *>(v); - bool save_act = false; int ret = disk ? 0 : MDPART_INTERNAL_ERR; if( ret==0 && l == NULL ) ret = MDPART_INVALID_VOLUME; @@ -890,28 +976,28 @@ } if( ret==0 ) { - save_act = active; - if( active ) - activate_part(false); Partition *p = l->getPtr(); if( p==NULL ) + { + y2error("Partition not found"); ret = MDPART_PARTITION_NOT_FOUND; - else if( !deleted() ) - ret = disk->doRemove( p ); + } + else + { + ret = disk->doRemove( p ); + } } if( ret==0 ) { if( !removeFromList( l ) ) + { + y2warning("Couldn't remove parititon from list."); ret = MDPART_REMOVE_PARTITION_LIST_ERASE; - } - if( save_act && !deleted() ) - { - activate_part(true); - updateMinor(); + } } if( ret==0 ) getStorage()->waitForDevice(); - y2mil("ret:" << ret); + y2mil("Done, ret:" << ret); return( ret ); } @@ -1004,8 +1090,36 @@ } return( txt ); } - - +string MdPartCo::noRemoveTextFormat( bool doing ) const + { + string txt; + if( doing ) + { + // displayed text during action, %1$s is replaced by a name (e.g. pdc_igeeeadj), + txt = sformat( _("Cannot remove %1$s. It is IMSM or DDF RAID."), name().c_str() ); + } + else + { + // displayed text before action, %1$s is replaced by a name (e.g. pdc_igeeeadj), + txt = sformat( _("Couldn't remove %1$s. It is IMSM or DDF RAID."), name().c_str() ); + } + return( txt ); + } +string MdPartCo::noRemoveTextPartitions( bool doing ) const + { + string txt; + if( doing ) + { + // displayed text during action, %1$s is replaced by a name (e.g. pdc_igeeeadj), + txt = sformat( _("Cannot remove %1$s because it contains at least 1 partition."), name().c_str() ); + } + else + { + // displayed text before action, %1$s is replaced by a name (e.g. pdc_igeeeadj), + txt = sformat( _("Couldn't remove %1$s because it contains at least 1 partition."), name().c_str() ); + } + return( txt ); + } void MdPartCo::setUdevData(const list<string>& id) { Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdPartCo.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdPartCo.h (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdPartCo.h Fri Jan 15 14:09:48 2010 @@ -277,6 +277,8 @@ int doCreateLabel(); virtual int doRemove(); virtual string removeText( bool doing ) const; + virtual string noRemoveTextFormat( bool doing ) const; + virtual string noRemoveTextPartitions( bool doing ) const; virtual string setDiskLabelText( bool doing ) const; void getMajorMinor(void); Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Storage.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Storage.cc Fri Jan 15 14:09:48 2010 @@ -3865,6 +3865,37 @@ return ret; } +// +// Removes Software RAIDs that are not IMSM RAIDs. +// +int Storage::removeMdPartCo(const string& devName, bool destroySb) +{ + y2mil("Called"); + int ret; + MdPartCoIterator mdp; + + mdp = findMdPartCo(devName); + if( mdp == mdpCoEnd() ) + { + y2war("Not found device: " + devName); + return MDPART_DEVICE_NOT_FOUND; + } + MdPartCoInfo mdpInfo; + mdp->getInfo(mdpInfo); + if( mdpInfo.sb_ver == "imsm" || mdpInfo.sb_ver == "ddf" ) + { + y2war("IMSM or DDF RAID cannot be removed"); + return MDPART_NO_REMOVE; + } + //Remove all: Md Partitions and RAID itself. + ret = mdp->removeMdPart(); + if( ret==0 ) + { + ret = checkCache(); + } + y2mil("Done, ret=" << ret); + return ret; +} bool Storage::haveMd( MdCo*& md ) { @@ -4465,7 +4496,7 @@ const_cast<Container*>((*ac)->vol()->getContainer()); if( cont ) { - bool cont_removed = co->deleted() && type==LVM; + bool cont_removed = co->deleted() && (type==LVM || type==MDPART); ret = co->commitChanges( *pt ); cont_removed = cont_removed && ret==0; if( cont_removed ) @@ -5937,8 +5968,7 @@ //ret = removeDmraidCo( name ); break; case UB_MDPART: - y2war(device << " used by MD PART"); - //ret = removeMdPartCo( uby.device() ); + ret = removeMdPartCo( uby.device(), true ); break; case UB_DMMULTIPATH: break; Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Storage.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Storage.h (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Storage.h Fri Jan 15 14:09:48 2010 @@ -481,6 +481,7 @@ MdPartCoInfo& info); int getMdPartCoStateInfo(const string& name, MdPartCoStateInfo& info); bool useMdForImsm() { return MdPartCo::isHandlingDev(); } + int removeMdPartCo(const string& devName, bool destroySb); int addNfsDevice( const string& nfsDev, const string& opts, unsigned long long sizeK, const string& mp ); Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/StorageInterface.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/StorageInterface.h (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/StorageInterface.h Fri Jan 15 14:09:48 2010 @@ -712,6 +712,7 @@ MDPART_REMOVE_PARTITION_LIST_ERASE = -6104, MDPART_COMMIT_NOTHING_TODO = -6105, MDPART_NO_REMOVE = -6106, + MDPART_DEVICE_NOT_FOUND = -6107, LOOP_CHANGE_READONLY = -7000, LOOP_DUPLICATE_FILE = -7001, @@ -1908,6 +1909,18 @@ virtual int computeMdSize(MdType md_type, list<string> devices, unsigned long long& sizeK) = 0; + /** + * Remove a Partitionable Software raid device. + * + * Only RAID with persistent superblock can be removed. IMSM and DDF + * RAIDs cannot be removed. + * @param name name of software raid device to remove (e.g. /dev/md0) + * @param destroySb flag if the MD superblocks on the physical devices + * should be destroyed after md device is deleted + * @return zero if all is ok, a negative number to indicate an error + */ + virtual int removeMdPartCo(const string& name, bool destroySb ) = 0; + /** * Add knowledge about existence of nfs device. * -- 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] r60398 - in /trunk/storage: ./ bindings/src/ package/ storage/src/ storage/src/modules/
by aschnell＠svn.opensuse.org 15 Jan '10

15 Jan '10

Author: aschnell Date: Fri Jan 15 14:00:10 2010 New Revision: 60398 URL: http://svn.opensuse.org/viewcvs/yast?rev=60398&view=rev Log: - implemented popup to query user whether to ignore failures during commit (fate #304500) Modified: trunk/storage/bindings/src/StorageCallbacks.cc trunk/storage/bindings/src/StorageCallbacks.h trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/inst_prepdisk.ycp trunk/storage/storage/src/modules/StorageClients.ycp trunk/storage/yast2-storage.spec.in Modified: trunk/storage/bindings/src/StorageCallbacks.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/bindings/src/StorageCall… ============================================================================== --- trunk/storage/bindings/src/StorageCallbacks.cc (original) +++ trunk/storage/bindings/src/StorageCallbacks.cc Fri Jan 15 14:00:10 2010 @@ -46,7 +46,8 @@ extern CallbackProgressBar progress_bar_cb_ycp; extern CallbackShowInstallInfo install_info_cb_ycp; extern CallbackInfoPopup info_popup_cb_ycp; - extern CallbackYesNoPopup yesno_popup_cb_ycp; + extern CallbackYesNoPopup yesno_popup_cb_ycp; + extern CallbackCommitErrorPopup commit_error_popup_cb_ycp; extern CallbackPasswordPopup password_popup_cb_ycp; } @@ -212,6 +213,7 @@ static Y2Function* show_install_info = NULL; static Y2Function* info_popup = NULL; static Y2Function* yesno_popup = NULL; +static Y2Function* commit_error_popup = NULL; static Y2Function* password_popup = NULL; void progress_bar_callback( const string& id, unsigned cur, unsigned max ) @@ -268,6 +270,27 @@ } +bool commit_error_popup_callback(int error, const string& last_action, const string& extended_message) +{ + bool ret = false; + + if (commit_error_popup) + { + commit_error_popup->reset(); + commit_error_popup->appendParameter(YCPInteger(error)); + commit_error_popup->appendParameter(YCPString(last_action)); + commit_error_popup->appendParameter(YCPString(extended_message)); + commit_error_popup->finishParameters(); + + YCPValue tmp = commit_error_popup->evaluateCall(); + if (tmp->isBoolean()) + ret = tmp->asBoolean()->value(); + } + + return ret; +} + + bool password_popup_callback(const string& device, int attempts, string& password) { bool ret = false; @@ -477,6 +500,53 @@ YCPValue +StorageCallbacks::CommitErrorPopup(const YCPString& callback) +{ + string name_r = callback->value(); + + y2debug("Registering callback %s", name_r.c_str()); + string::size_type colonpos = name_r.find("::"); + + if (colonpos == string::npos) + { + ycp2error ("Specify namespace and the fuction name for a callback"); + return YCPVoid (); + } + + string module = name_r.substr(0, colonpos); + string name = name_r.substr(colonpos + 2); + + Y2Component* c = Y2ComponentBroker::getNamespaceComponent(module.c_str()); + if (c == NULL) + { + ycp2error("No component can provide namespace %s for a callback of %s", + module.c_str(), name.c_str()); + return YCPVoid(); + } + + Y2Namespace* ns = c->import(module.c_str()); + if (ns == NULL) + { + y2error("No namespace %s for a callback of %s", module.c_str(), + name.c_str()); + return YCPVoid(); + } + + commit_error_popup = ns->createFunctionCall(name, Type::Unspec); + if (commit_error_popup == NULL) + { + ycp2error("Cannot find function %s in module %s as a callback", + name.c_str(), module.c_str()); + return YCPVoid(); + } + + storage::commit_error_popup_cb_ycp = commit_error_popup_callback; + + return YCPVoid(); +} + + +YCPValue StorageCallbacks::PasswordPopup (const YCPString & callback) { string name_r = callback->value (); Modified: trunk/storage/bindings/src/StorageCallbacks.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/bindings/src/StorageCall… ============================================================================== --- trunk/storage/bindings/src/StorageCallbacks.h (original) +++ trunk/storage/bindings/src/StorageCallbacks.h Fri Jan 15 14:00:10 2010 @@ -58,6 +58,8 @@ /* TYPEINFO: void(string) */ YCPValue YesNoPopup (const YCPString& func); /* TYPEINFO: void(string) */ + YCPValue CommitErrorPopup (const YCPString& func); + /* TYPEINFO: void(string) */ YCPValue PasswordPopup (const YCPString& func); /** 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 Fri Jan 15 14:00:10 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jan 15 11:42:55 CET 2010 - aschnell(a)suse.de + +- implemented popup to query user whether to ignore failures during + commit (fate #304500) + +------------------------------------------------------------------- Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz - Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su Modified: trunk/storage/storage/src/inst_prepdisk.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/inst_prepdis… ============================================================================== --- trunk/storage/storage/src/inst_prepdisk.ycp (original) +++ trunk/storage/storage/src/inst_prepdisk.ycp Fri Jan 15 14:00:10 2010 @@ -118,20 +118,7 @@ integer ret = Storage::CommitChanges(); y2milestone( "CommitChanges ret:%1", ret ); if( ret!=0 ) - { - string txt = sformat(_("Failure occurred during following action: -%2 - -System error code was: %1 -"), ret, Storage::LastAction() ); - string ext = Storage::ExtendedErrorMsg(); - if( size(ext)>0 ) - { - txt = txt + "\n\n" + ext; - } - Popup::Error( txt ); ret_val = `abort; - } //mount proc and usbfs during installation if( Stage::initial() ) Modified: trunk/storage/storage/src/modules/StorageClients.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/StorageClients.ycp (original) +++ trunk/storage/storage/src/modules/StorageClients.ycp Fri Jan 15 14:00:10 2010 @@ -77,6 +77,27 @@ } + global boolean CommitErrorPopup(integer error, string last_action, string extended_message) + { + y2milestone("CommitErrorPopup error%1 last_action%2 extended_message:%3", error, + last_action, extended_message); + + string text = _("Failure occurred during following action:") + "\n" + last_action + "\n\n"; + + text = text + sformat(_("System error code was: %1"), error) + "\n\n"; + + if (!isempty(extended_message)) + { + text = text + extended_message + "\n\n"; + } + + text = text + _("Continue despite the error?"); + + return Report::ErrorAnyQuestion(Popup::NoHeadline(), text, Label::ContinueButton(), + Label::AbortButton(), `focus_no); + } + + global list<any> PasswordPopup(string device, integer attempts, string password) { y2milestone("PasswordPopup device:%1 attempts:%2", device, attempts); @@ -117,6 +138,7 @@ StorageCallbacks::ShowInstallInfo("StorageClients::ShowInstallInfo"); StorageCallbacks::InfoPopup("StorageClients::InfoPopup"); StorageCallbacks::YesNoPopup("StorageClients::YesNoPopup"); + StorageCallbacks::CommitErrorPopup("StorageClients::CommitErrorPopup"); StorageCallbacks::PasswordPopup("StorageClients::PasswordPopup"); } Modified: trunk/storage/yast2-storage.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/yast2-storage.spec.in?re… ============================================================================== --- trunk/storage/yast2-storage.spec.in (original) +++ trunk/storage/yast2-storage.spec.in Fri Jan 15 14:00:10 2010 @@ -5,10 +5,10 @@ License: GPL v2 or later BuildRequires: blocxx-devel boost-devel gcc-c++ libxcrypt-devel openssl-devel sablot swig BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files -BuildRequires: libstorage-devel >= 2.19.5 yast2 >= 2.18.19 yast2-core-devel >= 2.18.1 yast2-devtools +BuildRequires: libstorage-devel >= 2.19.5 yast2 >= 2.19.4 yast2-core-devel >= 2.18.1 yast2-devtools BuildRequires: yast2-testsuite >= 2.19.0 yast2-perl-bindings Requires: libstorage = %(echo `rpm -q --queryformat '%{VERSION}' libstorage`) -Requires: yast2-perl-bindings yast2-core >= 2.18.3 yast2 >= 2.18.19 yast2-libyui >= 2.18.7 +Requires: yast2-perl-bindings yast2-core >= 2.18.3 yast2 >= 2.19.4 yast2-libyui >= 2.18.7 Requires: yast2-dbus-client %ifarch s390 s390x Requires: yast2-s390 -- 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] r60397 - /tags/stable-2_19_4/yast2/
by aschnell＠svn.opensuse.org 15 Jan '10

15 Jan '10

Author: aschnell Date: Fri Jan 15 13:51:57 2010 New Revision: 60397 URL: http://svn.opensuse.org/viewcvs/yast?rev=60397&view=rev Log: Created tag stable-2_19_4 for yast2 Added: tags/stable-2_19_4/yast2/ - copied from r60396, trunk/yast2/ -- 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] r60396 - in /trunk/yast2: VERSION library/modules/Popup.ycp library/modules/Report.ycp package/yast2.changes
by aschnell＠svn.opensuse.org 15 Jan '10

15 Jan '10

Author: aschnell Date: Fri Jan 15 13:50:06 2010 New Revision: 60396 URL: http://svn.opensuse.org/viewcvs/yast?rev=60396&view=rev Log: - extended Report and Popup module (needed for fate #304500) Modified: trunk/yast2/VERSION trunk/yast2/library/modules/Popup.ycp trunk/yast2/library/modules/Report.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/VERSION?rev=60396&r1=60395… ============================================================================== --- trunk/yast2/VERSION (original) +++ trunk/yast2/VERSION Fri Jan 15 13:50:06 2010 @@ -1 +1 @@ -2.19.3 +2.19.4 Modified: trunk/yast2/library/modules/Popup.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/modules/Popup.ycp?… ============================================================================== --- trunk/yast2/library/modules/Popup.ycp (original) +++ trunk/yast2/library/modules/Popup.ycp Fri Jan 15 13:50:06 2010 @@ -346,6 +346,52 @@ /** + * Generic error question popup with two buttons. + * + * Style guide hint: The first button has to have the semantics of "yes", + * "OK", "continue" etc., the second its opposite ("no", "cancel", ...). + * NEVER use this generic question popup to simply exchange the order of + * yes/no, continue/cancel or ok/cancel buttons! + * + * @param headline headline or Popup::NoHeadline() + * @param message message string + * @param yes_button_message label on affirmative buttons (on left side) + * @param no_button_message label on negating button (on right side) + * @param focus `focus_yes (first button) or `focus_no (second button) + * @screenshot screenshots/AnyQuestion.png + * + * @return true: first button has been clicked + * false: second button has been clicked + * + * @see YesNo + * @see ContinueCancel + * + * @example Popup::ErrorAnyQuestion( Label::WarningMsg(), "Do really want to ...?", "Install", "Don't do it", `focus_no ); + */ +global boolean ErrorAnyQuestion(string headline, + string message, + string yes_button_message, + string no_button_message, + symbol focus) +{ + term button_box = AnyQuestionButtonBox ( yes_button_message, no_button_message, focus); + boolean success = (boolean) UI::OpenDialog( + `opt(`decorated), + popupLayoutInternal( headline, message, Icon::IconPath ("error"), button_box ) + ); + + any ret = nil; + + if (success == true) { + ret = UI::UserInput(); + UI::CloseDialog(); + } + + return ret == `yes; +} + + +/** * Timed question popup with two buttons and time display * * @param headline headline or Popup::NoHeadline() @@ -411,6 +457,71 @@ /** + * Timed error question popup with two buttons and time display + * + * @param headline headline or Popup::NoHeadline() + * @param message message string + * @param yes_button_message label on affirmative buttons (on left side) + * @param no_button_message label on negating button (on right side) + * @param focus `focus_yes (first button) or `focus_no (second button) + * @param timeout_seconds timeout, if 0, normal behaviour + * @return boolean True if Yes, False if no + * @see AnyQuestion + */ +global boolean TimedErrorAnyQuestion( string headline, + string message, + string yes_button_message, + string no_button_message, + symbol focus , + integer timeout_seconds) +{ + term button_box = AnyQuestionButtonBox ( yes_button_message, no_button_message, focus); + term timed = + `ReplacePoint(`id(`replace_buttons) , + `VBox( + `HCenter( + `Label(`id(`remaining_time), "" + timeout_seconds) + ), + `ButtonBox ( + // FIXME: BNC #422612, Use `opt(`noSanityCheck) later + `PushButton (`id (`timed_stop), `opt (`cancelButton), Label::StopButton()), + `PushButton (`id (`timed_ok), `opt (`default, `key_F10, `okButton), Label::OKButton()) + ), + `VSpacing(0.2) + ) + ); + + + boolean success = (boolean) UI::OpenDialog( + `opt(`decorated), + popupLayoutInternal( headline, message, Icon::IconPath ("error"), timed ) + ); + + any which_input = nil; + + while (timeout_seconds > 0) { + which_input = UI::TimeoutUserInput( 1000 ); + + if (which_input == `timed_ok) + break; + if (which_input == `timed_stop) + { + UI::ReplaceWidget(`id(`replace_buttons), button_box); + while (which_input == `timed_stop) + which_input = UI::UserInput(); + break; + } + timeout_seconds = timeout_seconds - 1; + if (success == true) UI::ChangeWidget (`id(`remaining_time), `Value, ""+timeout_seconds); + } + + if (success == true) UI::CloseDialog(); + + return which_input == `yes; +} + + +/** * Dialog which displays the "message" and has a Continue * and a Cancel button. * Modified: trunk/yast2/library/modules/Report.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/modules/Report.ycp… ============================================================================== --- trunk/yast2/library/modules/Report.ycp (original) +++ trunk/yast2/library/modules/Report.ycp Fri Jan 15 13:50:06 2010 @@ -328,6 +328,57 @@ return ret; } + +/** + * Question with headline and Yes/No Buttons + * @param headline Popup Headline + * @param message Popup Message + * @param yes_button_message Yes Button Message + * @param no_button_message No Button Message + * @param focus Which Button has the focus + * @return boolean True if Yes is pressed, otherwise false + */ +global boolean ErrorAnyQuestion(string headline, + string message, + string yes_button_message, + string no_button_message, + symbol focus) +{ + if (log_yesno_messages) + { + y2milestone(1, "%1", message); + } + + boolean ret = false; + if (display_yesno_messages) + { + if (timeout_yesno_messages > 0) + { + ret = Popup::TimedErrorAnyQuestion( + headline, + message, + yes_button_message, + no_button_message, + focus, + timeout_yesno_messages); + } + else + { + ret = Popup::ErrorAnyQuestion( + headline, + message, + yes_button_message, + no_button_message, + focus ); + + } + } + + yesno_messages = add(yesno_messages, message); + return ret; +} + + /** * Store new message text * @param message_string message text, it can contain new line characters ("\n") Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=… ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Fri Jan 15 13:50:06 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jan 15 11:44:39 CET 2010 - aschnell(a)suse.de + +- extended Report and Popup module (needed for fate #304500) +- 2.19.4 + +------------------------------------------------------------------- Thu Jan 14 17:53:48 CET 2010 - mzugec(a)suse.cz - NetworkStorage: adapt functions needed for iBFT (bnc#551380) -- 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] r60395 - in /trunk/theme: openSUSE-Crystal/icons/22x22/apps/ openSUSE-Crystal/icons/32x32/apps/ openSUSE-Crystal/icons/48x48/apps/ openSUSE-Oxygen/icons/22x22/apps/ openSUSE-Oxygen/icons/32x32/apps...
by jsrain＠svn.opensuse.org 15 Jan '10

15 Jan '10

Author: jsrain Date: Fri Jan 15 13:27:54 2010 New Revision: 60395 URL: http://svn.opensuse.org/viewcvs/yast?rev=60395&view=rev Log: added icons for the LXDE pattern Added: trunk/theme/openSUSE-Crystal/icons/22x22/apps/pattern-lxde.png (with props) trunk/theme/openSUSE-Crystal/icons/32x32/apps/pattern-lxde.png (with props) trunk/theme/openSUSE-Crystal/icons/48x48/apps/pattern-lxde.png (with props) trunk/theme/openSUSE-Oxygen/icons/22x22/apps/pattern-lxde.png (with props) trunk/theme/openSUSE-Oxygen/icons/32x32/apps/pattern-lxde.png (with props) trunk/theme/openSUSE-Oxygen/icons/48x48/apps/pattern-lxde.png (with props) trunk/theme/openSUSE/icons/16x16/apps/pattern-lxde.png (with props) trunk/theme/openSUSE/icons/22x22/apps/pattern-lxde.png (with props) trunk/theme/openSUSE/icons/32x32/apps/pattern-lxde.png (with props) trunk/theme/openSUSE/icons/48x48/apps/pattern-lxde.png (with props) trunk/theme/openSUSE/icons/64x64/apps/pattern-lxde.png (with props) trunk/theme/openSUSE/icons/scalable/apps/pattern-lxde.svg Modified: trunk/theme/package/yast2-theme.changes Added: trunk/theme/openSUSE-Crystal/icons/22x22/apps/pattern-lxde.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE-Crystal/icons/22x… ============================================================================== Binary file - no diff available. Added: trunk/theme/openSUSE-Crystal/icons/32x32/apps/pattern-lxde.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE-Crystal/icons/32x… ============================================================================== Binary file - no diff available. Added: trunk/theme/openSUSE-Crystal/icons/48x48/apps/pattern-lxde.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE-Crystal/icons/48x… ============================================================================== Binary file - no diff available. Added: trunk/theme/openSUSE-Oxygen/icons/22x22/apps/pattern-lxde.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE-Oxygen/icons/22x2… ============================================================================== Binary file - no diff available. Added: trunk/theme/openSUSE-Oxygen/icons/32x32/apps/pattern-lxde.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE-Oxygen/icons/32x3… ============================================================================== Binary file - no diff available. Added: trunk/theme/openSUSE-Oxygen/icons/48x48/apps/pattern-lxde.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE-Oxygen/icons/48x4… ============================================================================== Binary file - no diff available. Added: trunk/theme/openSUSE/icons/16x16/apps/pattern-lxde.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/16x16/apps/… ============================================================================== Binary file - no diff available. Added: trunk/theme/openSUSE/icons/22x22/apps/pattern-lxde.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/22x22/apps/… ============================================================================== Binary file - no diff available. Added: trunk/theme/openSUSE/icons/32x32/apps/pattern-lxde.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/32x32/apps/… ============================================================================== Binary file - no diff available. Added: trunk/theme/openSUSE/icons/48x48/apps/pattern-lxde.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/48x48/apps/… ============================================================================== Binary file - no diff available. Added: trunk/theme/openSUSE/icons/64x64/apps/pattern-lxde.png URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/64x64/apps/… ============================================================================== Binary file - no diff available. Added: trunk/theme/openSUSE/icons/scalable/apps/pattern-lxde.svg URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/openSUSE/icons/scalable/ap… ============================================================================== --- trunk/theme/openSUSE/icons/scalable/apps/pattern-lxde.svg (added) +++ trunk/theme/openSUSE/icons/scalable/apps/pattern-lxde.svg Fri Jan 15 13:27:54 2010 @@ -0,0 +1,171 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + version="1.0" + width="551" + height="535" + id="svg2"> + <defs + id="defs4"> + <linearGradient + id="linearGradient4835"> + <stop + id="stop4837" + style="stop-color:#ffffff;stop-opacity:0" + offset="0" /> + <stop + id="stop4839" + style="stop-color:#ffffff;stop-opacity:0.63529414" + offset="1" /> + </linearGradient> + <linearGradient + id="linearGradient4793"> + <stop + id="stop4795" + style="stop-color:#000000;stop-opacity:0" + offset="0" /> + <stop + id="stop4797" + style="stop-color:#000000;stop-opacity:0.2" + offset="1" /> + </linearGradient> + <linearGradient + id="linearGradient4777"> + <stop + id="stop4779" + style="stop-color:#000000;stop-opacity:0.1451" + offset="0" /> + <stop + id="stop4781" + style="stop-color:#000000;stop-opacity:0" + offset="1" /> + </linearGradient> + <filter + id="filter3326"> + <feGaussianBlur + inkscape:collect="always" + stdDeviation="2.6472166" + id="feGaussianBlur3328" /> + </filter> + <linearGradient + id="linearGradient3486"> + <stop + id="stop3488" + style="stop-color:#000000;stop-opacity:0.502" + offset="0" /> + <stop + id="stop3490" + style="stop-color:#ffffff;stop-opacity:1" + offset="1" /> + </linearGradient> + <filter + id="filter4517"> + <feGaussianBlur + inkscape:collect="always" + stdDeviation="1.3154426" + id="feGaussianBlur4519" /> + </filter> + <filter + id="filter4638"> + <feGaussianBlur + id="feGaussianBlur4640" + stdDeviation="1.1397656" + inkscape:collect="always" /> + </filter> + <radialGradient + cx="244.97728" + cy="276.31491" + r="217.6875" + fx="244.97728" + fy="276.31491" + id="radialGradient4712" + xlink:href="#linearGradient3486" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.197615,0,0,1.2337965,-49.386039,-65.706911)" /> + <filter + id="filter4773"> + <feGaussianBlur + id="feGaussianBlur4775" + stdDeviation="1.5496228" + inkscape:collect="always" /> + </filter> + <linearGradient + x1="352.8949" + y1="175.32442" + x2="324.35019" + y2="158.35384" + id="linearGradient4783" + xlink:href="#linearGradient4777" + gradientUnits="userSpaceOnUse" /> + <radialGradient + cx="390.52817" + cy="105.77066" + r="118.78125" + fx="390.52817" + fy="105.77066" + id="radialGradient4832" + xlink:href="#linearGradient4793" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(-0.2772848,0.2362336,-0.420973,-0.4941271,560.77607,53.57883)" /> + <radialGradient + cx="235.58434" + cy="137.56808" + r="268.90195" + fx="235.58434" + fy="137.56808" + id="radialGradient4841" + xlink:href="#linearGradient4835" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.238287,-0.271638,8.4789835e-2,7.4379539e-2,222.35079,262.49258)" /> + <filter + id="filter4871"> + <feGaussianBlur + id="feGaussianBlur4873" + stdDeviation="8.1240593" + inkscape:collect="always" /> + </filter> + </defs> + <path + d="M 412.16854,218.15914 C 379.24636,180.99249 349.57792,156.98715 305.65942,219.57725 C 279.52595,256.82117 122.69744,470.17773 93.920162,504.16239 C 85.56097,514.03419 80.664076,520.89484 74.245956,524.87146 C 74.256126,511.36283 182.57673,339.82398 212.89071,290.11257 C 249.30349,230.39983 248.14737,233.88692 243.78991,233.90272 C 237.62115,233.92509 225.07431,243.02462 205.99617,263.37162 C 171.15829,300.52652 67.980346,438.81008 60.867026,436.67724 C 63.338226,426.63211 144.05036,302.86253 180.69716,251.66277 C 212.28828,207.52638 200.21253,204.16234 182.10529,208.47107 C 104.95461,226.87137 12.682123,271.35549 9.698,269.75057 C 10.813869,267.44718 320.45952,49.705306 361.82441,45.542656 C 366.63982,45.058076 376.79996,36.469766 394.90524,29.316506 C 414.56,21.551066 427.78793,15.234746 431.06028,17.231686 C 416.71694,37.338446 409.16462,41.384836 409.037,47.870636 C 408.82802,58.491026 405.0481,75.672236 400.90885,81.158046 C 480.92504,134.46286 512.14367,316.21474 535.00272,462.40238 C 540.45791,497.10059 545.51337,523.15783 546.80268,538.641 C 540.04893,521.26323 476.07124,290.30048 412.16854,218.15914 z" + id="path3317" + style="fill-opacity:0.33333333" /> + <path + d="M 413.66855,218.15915 C 380.74637,180.99249 351.07792,156.98715 307.15943,219.57726 C 281.02596,256.82118 124.19745,470.17774 95.420165,504.1624 C 87.060973,514.0342 82.164079,520.89485 75.745959,524.87147 C 75.756129,511.36284 184.07674,339.82399 214.39071,290.11258 C 250.8035,230.39984 249.64739,233.88693 245.28992,233.90273 C 239.12115,233.9251 226.57431,243.02463 207.49617,263.37163 C 172.65829,300.52653 69.480349,438.81008 62.367029,436.67724 C 64.838229,426.63211 145.55036,302.86254 182.19716,251.66278 C 213.78829,207.52639 201.71254,204.16235 183.60529,208.47108 C 106.45462,226.87138 14.18213,271.3555 11.198,269.75058 C 12.31387,267.44719 321.95952,49.705306 363.32441,45.542656 C 368.13983,45.058076 378.29997,36.469766 396.40525,29.316506 C 416.06001,21.551066 429.28794,15.234746 432.56029,17.231686 C 418.21694,37.338446 410.66463,41.384836 410.537,47.870636 C 410.32803,58.491026 406.54811,75.672236 402.40885,81.158046 C 482.42505,134.46286 513.64367,316.21475 536.50273,462.40239 C 541.95792,497.10059 547.01338,523.15783 548.30268,538.641 C 541.54894,521.26323 477.57125,290.30049 413.66855,218.15915 z" + id="path3293" + style="fill-opacity:0.62745098;filter:url(#filter3326)" /> + <path + d="M 409.4182,207.90913 C 376.49602,170.74247 346.82758,146.73713 302.90908,209.32724 C 276.77561,246.57116 119.9471,459.92771 91.169817,493.91237 C 82.810633,503.78417 77.913739,510.64482 71.495619,514.62144 C 71.505789,501.11281 179.82639,329.57397 210.14037,279.86256 C 246.55315,220.14982 245.39703,223.63691 241.03957,223.65271 C 234.87081,223.67508 222.32397,232.77461 203.24583,253.12161 C 168.40795,290.27651 65.230009,428.56005 58.116689,426.42721 C 60.587889,416.38209 141.30002,292.61252 177.94682,241.41276 C 209.53794,197.27637 197.46219,193.91233 179.35495,198.22106 C 102.20427,216.62136 9.931786,261.10548 6.947663,259.50056 C 8.063532,257.19717 317.70918,39.455291 359.07407,35.292641 C 363.88948,34.808061 374.04962,26.219751 392.1549,19.066491 C 411.80966,11.301051 425.03759,4.9847312 428.30994,6.9816712 C 413.9666,27.088431 406.41428,31.134821 406.28666,37.620621 C 406.07768,48.241011 402.29776,65.422221 398.15851,70.908031 C 478.1747,124.21284 509.39333,305.96473 532.25238,452.15236 C 537.70757,486.85056 542.76303,512.9078 544.05234,528.39097 C 537.29859,511.0132 473.3209,280.05047 409.4182,207.90913 z" + id="path3287" + style="fill:#ffffff;stroke:#6e6e6e;stroke-width:1.5" /> + <path + d="M 369.68194,43.72421 C 361.05783,44.56946 355.80263,44.84181 349.94119,47.20878 C 321.0342,58.882 295.07449,77.33996 268.25823,93.53775 C 204.47385,133.64807 142.00159,175.77354 80.111522,218.75514 C 116.08971,204.76035 152.66026,191.3193 190.79902,184.91139 C 202.3928,185.01864 211.90075,198.4354 206.64277,209.22389 C 199.69213,233.00554 181.09919,250.45906 168.5633,271.13716 C 158.9205,284.95139 149.45414,298.90387 140.08027,312.91139 C 164.93707,281.85825 189.51743,250.16284 219.16342,223.61788 C 226.34947,217.95391 234.99148,211.19746 244.64277,212.72389 C 252.10167,214.66187 255.63334,224.4677 250.67402,230.50514 C 240.48394,249.84761 227.93249,268.02707 216.90943,286.93216 C 189.36812,331.55972 161.5989,375.91001 134.48652,420.75514 C 192.80277,344.08677 215.5073,319.78705 271.90653,241.70448 C 284.97538,225.22287 338.96887,157.35021 361.11152,160.06764 C 385.97464,163.51124 403.73808,183.74355 418.74649,201.99643 C 458.38379,251.04619 479.4501,311.46263 502.20527,369.53639 C 506.77067,381.87336 511.15689,394.27091 515.48652,406.69264 C 501.08748,319.66806 480.13673,235.9727 443.81358,155.09981 C 419.50847,130.25872 411.77023,120.36297 383.96982,103.05797 C 380.3438,99.578425 341.4367,130.64903 341.4367,130.64903 L 369.68194,43.72421 z" + id="path3431" + style="fill:url(#radialGradient4712);filter:url(#filter4871)" /> + <path + d="M 395.53125,71.90625 C 316.13989,125.13108 243.75709,176.38874 243.21875,177.5 C 246.20287,179.10492 338.47432,134.61905 415.625,116.21875 C 419.45131,115.30826 423.00484,114.75698 425.9375,114.84375 C 418.04797,104.77863 409.57936,96.144144 400.4375,89.25 C 397.46486,87.86954 394.72943,86.324669 392.3125,84.53125 L 395.53125,71.90625 z M 433.34375,125 C 431.86998,131.81514 426.1971,142.67114 414.21875,159.40625 C 409.04653,166.63243 402.82074,175.59798 396.21875,185.21875 C 402.01427,190.63464 407.33919,196.63805 412.46875,202.75 C 423.22448,189.62476 432.75501,178.35192 439.53125,171.125 C 444.24559,166.09712 448.56154,161.77054 452.46875,158.09375 C 446.53509,146.05288 440.17638,134.97553 433.34375,125 z M 460.3125,175.15625 C 456.2838,181.72471 452.49298,187.89346 446.40625,197.875 C 442.29293,204.62037 436.26754,214.38462 429.65625,225.0625 C 435.90094,234.30186 441.63914,243.85545 447,253.625 C 456.81218,240.33094 466.30125,227.45456 475.46875,214.96875 C 470.7705,201.01882 465.73094,187.68856 460.3125,175.15625 z" + id="path4752" + style="fill:url(#radialGradient4832)" /> + <path + d="M 358.33965,37.660347 C 311.53448,49.208781 15.125,255.25 15.125,255.25 C 15.125,255.25 68.09375,230.8125 68.09375,230.8125 C 145.10094,177.46953 222.52779,124.31059 302.9375,76.0625 C 323.76957,64.538733 343.71205,50.42956 366.9375,44.5625 C 381.0195,38.319639 394.15978,29.40753 409,24.75 C 409,24.75 416.30154,18.048139 422.03125,12.78125 C 423.10734,11.38314 424.21048,9.9292952 425.375,8.34375 C 402.91526,16.118308 363.04432,36.499545 358.33965,37.660347 z M 198.875,205.84375 C 202.85869,217.82767 145.70024,282.88884 63.78125,418.4375 C 63.168831,419.52003 62.754337,420.29622 62.3125,421.125 C 69.539823,412.01596 116.9375,352.28125 116.9375,352.28125 C 141.1394,314.65284 166.58204,277.94018 191.9375,241.09375 C 197.24394,232.01172 205.09667,222.92257 204.75,211.90625 C 205.32691,207.83875 201.19688,207.7445 198.875,205.84375 z M 248.0625,232.9375 C 244.65487,233.79159 241.46845,235.4553 238.21875,236.8125 C 182.94375,328.31767 125.22216,416.39452 75.03125,509.90625 C 80.978009,502.03556 114,458.34375 114,458.34375 C 153.85446,390.27521 196.69611,323.81805 237.8125,256.375 C 241.5724,248.59417 247.89529,242.07446 250.4375,233.78125 C 249.85156,233.06104 249.0066,232.85612 248.0625,232.9375 z" + id="path3279" + style="fill:#ffffff;filter:url(#filter4638)" /> + <path + d="M 172.8125,159.1875 C 137.66622,182.74314 102.83389,206.74797 68.09375,230.8125 C 68.09375,230.8125 46.442429,241.00574 28.341381,249.50102 L 21.560131,254.28227 C 50.682021,242.39728 119.2777,212.5444 179.34375,198.21875 C 197.45099,193.91002 209.52863,197.26986 177.9375,241.40625 C 172.04009,249.64561 164.92004,259.87207 157.25,271.09375 C 162.3661,276.02499 167.47781,281.5874 172.6875,287.46875 C 172.90336,287.71244 173.1279,287.97146 173.34375,288.21875 C 185.30533,273.55382 195.83339,260.97031 203.21875,253.09375 C 211.11848,244.66863 217.89156,238.22232 223.5625,233.5 C 209.42176,202.30493 192.76901,176.52405 172.8125,159.1875 z M 229.75,247.8125 C 224.89148,255.73817 218.70892,265.76711 210.125,279.84375 C 205.39721,287.59678 198.3783,298.94454 190.5625,311.5625 C 196.16282,320.26869 201.74029,329.95992 207.21875,340.34375 C 220.32577,322.6039 232.8083,305.65448 244.75,289.375 C 240.1062,274.85103 235.12437,260.94145 229.75,247.8125 z" + id="path3522" + style="fill-opacity:0.2" /> + <path + d="M 56.749912,231.34053 C 58.955402,230.43801 60.141562,232.39418 62.437412,231.46553 C 96.389922,217.73204 139.2075,204.92596 178.59366,195.59053 C 183.59634,194.40478 188.32602,193.66052 193.18741,194.62178 C 195.6181,195.10241 198.21034,196.13349 200.34366,198.15303 C 202.47698,200.17257 204.32502,197.08013 204.71866,199.93428 C 205.50594,205.64258 203.65968,211.20264 200.12491,218.40303 C 196.59014,225.60342 191.03847,234.40704 182.87491,245.55928 C 164.39265,270.80789 134.76971,315.02381 109.56241,354.02803 C 107.04702,357.92019 105.47565,360.57424 103.06241,364.34053 C 106.51825,360.02118 109.26355,361.99374 112.84366,357.49678 C 144.03771,318.31414 178.50072,274.38265 196.53116,255.15303 C 206.20432,244.83652 214.53263,236.80252 221.49991,231.15303 C 228.46719,225.50354 233.21191,221.5231 240.46866,221.49678 C 240.64044,221.49616 241.04909,221.36183 242.62491,221.52803 C 243.41282,221.61113 246.23007,218.92054 246.24991,220.80928 C 246.31872,227.36122 249.63618,220.08369 249.93741,221.74678 C 250.53987,225.07296 249.62982,226.17082 249.06241,227.49678 C 248.495,228.82274 247.75793,230.17121 246.74991,231.96553 C 242.71781,239.14283 233.91208,253.22419 215.71866,283.05928 C 200.49663,308.02164 165.64685,363.70749 134.56241,414.87178 C 124.53409,431.37817 115.34105,446.70967 106.90616,461.05928 C 205.37881,335.60906 257.56152,269.43924 279.09869,235.01148 C 291.14602,215.75349 305.71891,191.06423 321.07908,168.98759 C 334.28334,150.00959 354.9708,146.6778 365.84501,149.81481 C 387.59344,156.08884 403.90347,176.9591 417.87626,194.09606 C 452.44718,236.49563 485.96138,321.83174 523.87491,439.30928 C 513.31506,372.94667 500.45928,295.95543 480.71866,228.65303 C 460.29858,159.03414 425.68529,120.8467 387.80601,95.666823 C 387.80601,95.666823 398.15616,69.43428 398.15616,69.43428 C 479.40308,123.44238 510.40823,309.49852 531.93741,445.24678 C 540.97154,502.20995 543.98457,515.33583 542.81241,522.02803 C 493.72667,365.06652 452.04063,257.89161 411.19012,209.46282 C 385.21317,178.66681 350.17547,137.69842 301.53116,210.65303 C 276.5678,248.09199 118.68345,460.60587 89.906162,494.59053 C 81.546979,504.46233 76.511782,511.92641 70.093662,515.90303 C 77.136609,505.91077 179.08429,336.14722 209.39827,286.43581 C 245.81105,226.72308 245.32612,222.48098 240.96866,222.49678 C 234.7999,222.51916 221.20305,233.58728 202.12491,253.93428 C 167.28703,291.08918 69.051953,423.72973 61.938633,421.59689 C 66.871306,412.25504 139.1653,299.84264 176.51538,246.00558 C 207.45435,201.40962 198.8297,192.1103 180.71866,196.40303 C 103.26784,214.76066 8.2340345,261.1017 5.249912,259.49678 M 236.18741,221.77803 C 236.21982,221.80113 236.23502,221.88554 236.18741,221.99678 C 236.1738,222.02858 236.07964,222.17715 236.06241,222.21553 C 236.07141,222.16854 236.05183,221.96902 236.06241,221.93428 C 236.10537,221.79314 236.155,221.75493 236.18741,221.77803 z" + id="path3461" + style="fill:url(#radialGradient4841);filter:url(#filter4517)" /> + <path + d="M 248.24312,283.84454 C 283.05445,238.45198 247.51232,280.61945 312.07555,193.93211 C 324.7798,178.15733 340.12168,159.72643 361.5625,163.375 C 386.7512,168.31395 403.70187,189.56306 419.68689,207.93674 C 454.21096,251.97738 473.9804,305.31104 494.89629,356.87019 C 503.85323,380.32991 512.27692,403.94496 520.21875,427.75 C 505.06953,335.23368 488.99955,246.44647 451.31846,160.00137 C 437.42595,132.84648 418.85085,113.40757 389.49999,91.190236 C 389.49999,91.190236 289.00029,189.46481 248.24312,283.84454 z" + id="path4714" + style="fill:url(#linearGradient4783);filter:url(#filter4773)" /> + <path + d="M 426.625,7.375 C 425.99774,7.3707455 425.15745,7.4471891 424.1875,7.65625 C 422.2476,8.0743717 419.6962,8.9181064 416.625,10.0625 C 410.4826,12.351287 402.27603,15.862874 392.4375,19.75 C 383.43567,23.306555 376.39789,27.24609 371,30.34375 C 365.60211,33.44141 361.95086,35.750026 359.15625,36.03125 C 354.26332,36.523637 344.87011,40.344268 332.46875,46.6875 C 320.06739,53.030732 304.57922,61.894258 287.15625,72.40625 C 252.3103,93.430234 209.69907,121.10052 168.34375,148.71875 C 126.98843,176.33698 86.891324,203.88782 57.0625,224.6875 C 42.148088,235.08734 29.77601,243.82001 21.125,250 C 16.799495,253.08999 13.39658,255.53151 11.0625,257.25 C 10.663247,257.54395 10.492228,257.6874 10.15625,257.9375 C 10.70896,257.74802 11.091729,257.631 11.78125,257.375 C 14.72154,256.28337 18.864597,254.6151 24,252.5 C 24.080266,252.46694 24.2005,252.40827 24.28125,252.375 C 84.731095,209.18646 325.69769,42.425006 361.90625,38.78125 C 366.72165,38.296671 376.89472,29.71576 395,22.5625 C 407.87009,17.477636 417.88708,13.070349 424.25,11.15625 C 425.13913,9.972026 426.05077,8.7524851 427,7.4375 C 426.84898,7.4221366 426.80761,7.3762386 426.625,7.375 z M 198.09375,201.96875 C 198.63357,205.14953 197.62948,209.54417 194.71875,215.75 C 191.65923,222.27306 186.47607,230.7876 178.5625,241.84375 C 160.2539,267.42295 130.90691,311.15911 105.84375,349.75 C 93.312169,369.04544 81.856367,387.06799 73.375,400.875 C 69.134316,407.77851 65.632322,413.63049 63.125,418.0625 C 61.871339,420.27851 60.851569,422.14149 60.125,423.59375 C 59.775884,424.29156 59.714683,424.53071 59.5,425.03125 C 59.696384,424.89623 59.831634,424.8371 60.0625,424.65625 C 61.169503,423.78908 62.664815,422.40594 64.4375,420.59375 C 65.419814,419.58954 66.499065,418.41603 67.65625,417.15625 C 87.97497,382.36583 149.92165,288.02063 180.78125,244.90625 C 200.40075,217.49558 203.14506,205.85461 198.09375,201.96875 z M 245.28125,227.125 C 244.90373,227.10524 244.41968,227.15428 243.875,227.15625 C 243.57259,227.15734 243.21766,227.20227 242.875,227.25 C 242.5243,227.94652 242.09189,228.72496 241.53125,229.71875 C 237.78836,236.35343 228.9861,250.39616 210.78125,280.25 C 195.61717,305.11734 160.96055,360.43791 130.09375,411.21875 C 114.66035,436.60917 100.18529,460.84856 89.5625,479.59375 C 84.251105,488.96634 79.886128,496.97284 76.875,503.03125 C 75.369436,506.06045 74.194956,508.61483 73.40625,510.59375 C 73.002613,511.6065 73.006783,511.96019 72.8125,512.65625 C 74.676883,511.286 76.468805,509.63643 78.3125,507.71875 C 98.00538,467.11747 186.09919,327.43796 212.96875,283.375 C 244.82994,231.12636 247.92387,227.26335 245.28125,227.125 z" + id="path3523" + style="fill:#c2c2c2" /> +</svg> \ No newline at end of file Modified: trunk/theme/package/yast2-theme.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/package/yast2-theme.change… ============================================================================== --- trunk/theme/package/yast2-theme.changes (original) +++ trunk/theme/package/yast2-theme.changes Fri Jan 15 13:27:54 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Jan 15 13:27:26 CET 2010 - jsrain(a)suse.cz + +- added icons for the LXDE pattern + +------------------------------------------------------------------- Wed Dec 2 19:29:14 CET 2009 - jimmac(a)novell.com - address the button submenu styling. bnc#444400 and bnc#458001. -- 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] r60394 - /tags/stable-2_19_2/ca-management/
by mcalmer＠svn.opensuse.org 15 Jan '10

15 Jan '10

Author: mcalmer Date: Fri Jan 15 11:20:48 2010 New Revision: 60394 URL: http://svn.opensuse.org/viewcvs/yast?rev=60394&view=rev Log: Created tag stable-2_19_2 for ca-management Added: tags/stable-2_19_2/ca-management/ - copied from r60393, trunk/ca-management/ -- 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] r60393 - in /trunk/ca-management: VERSION package/yast2-ca-management.changes src/common_cert.ycp src/startup.ycp
by mcalmer＠svn.opensuse.org 15 Jan '10

15 Jan '10

Author: mcalmer Date: Fri Jan 15 11:20:40 2010 New Revision: 60393 URL: http://svn.opensuse.org/viewcvs/yast?rev=60393&view=rev Log: - version 2.19.2 - add a hint to the help texts that more informations about CA Management are available in our manual. (fate#306589) Modified: trunk/ca-management/VERSION trunk/ca-management/package/yast2-ca-management.changes trunk/ca-management/src/common_cert.ycp trunk/ca-management/src/startup.ycp Modified: trunk/ca-management/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/VERSION?rev=60393&… ============================================================================== --- trunk/ca-management/VERSION (original) +++ trunk/ca-management/VERSION Fri Jan 15 11:20:40 2010 @@ -1 +1 @@ -2.19.1 +2.19.2 Modified: trunk/ca-management/package/yast2-ca-management.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/package/yast2-ca-m… ============================================================================== --- trunk/ca-management/package/yast2-ca-management.changes (original) +++ trunk/ca-management/package/yast2-ca-management.changes Fri Jan 15 11:20:40 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Jan 15 11:17:28 CET 2010 - mc(a)suse.de + +- version 2.19.2 +- add a hint to the help texts that more informations about + CA Management are available in our manual. (fate#306589) + +------------------------------------------------------------------- Fri Jan 15 10:34:48 CET 2010 - mc(a)suse.de - version 2.19.1 Modified: trunk/ca-management/src/common_cert.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/src/common_cert.yc… ============================================================================== --- trunk/ca-management/src/common_cert.ycp (original) +++ trunk/ca-management/src/common_cert.ycp Fri Jan 15 11:20:40 2010 @@ -37,27 +37,30 @@ Wizard::CreateDialog(); Wizard::SetDesktopIcon("ca-management"); -// help text 1/7 +// help text 1/8 string helptext = _("A Server Certificate is used by services which provide SSL/TLS encrypted network connections."); -// help text 2/7 +// help text 2/8 helptext = helptext + _("The purpose of the Common Server Certificate is, to provide a certificate for several services running on this host. "); -// help text 3/7 +// help text 3/8 helptext = helptext + _("Some YaST modules provide the capability to use this certificate during configuration of such a service."); -// help text 4/7 +// help text 4/8 helptext = helptext + _("With the Import/Replace button you can add a new server certificate or replace the currect one."); -// help text 5/7 +// help text 5/8 helptext = helptext + _("You can remove the Certificates by clicking the Remove button. But make sure, that it is not used anymore by other services."); -// help text 6/7 +// help text 6/8 helptext = helptext + _("Certificates can be written to a file using Export to File in section Certificate in the CA Management module."); -// help text 7/7 +// help text 7/8 helptext = helptext + _("Certificates to import from disk must have been written in PKCS12 format with CA chain."); +// help text 8/8 +helptext = helptext + _("For more informations, please read the manual."); + symbol ui = nil; repeat Modified: trunk/ca-management/src/startup.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/src/startup.ycp?re… ============================================================================== --- trunk/ca-management/src/startup.ycp (original) +++ trunk/ca-management/src/startup.ycp Fri Jan 15 11:20:40 2010 @@ -114,10 +114,12 @@ */ define symbol Startup () ``{ - // help text 1/2 + // help text 1/3 string helptext = _("Select one CA and press Enter CA."); - // help text 2/2 + // help text 2/3 helptext = helptext + _("Create Root CA generates a new root certificate authority."); + // help text 3/3 + helptext = helptext + _("For more informations about CA Management, please read the manual."); list<term> termList = getCAList (""); -- 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] r60392 - in /trunk/installation: VERSION package/yast2-installation.changes
by locilka＠svn.opensuse.org 15 Jan '10

15 Jan '10

Author: locilka Date: Fri Jan 15 11:19:12 2010 New Revision: 60392 URL: http://svn.opensuse.org/viewcvs/yast?rev=60392&view=rev Log: New version Modified: trunk/installation/VERSION trunk/installation/package/yast2-installation.changes Modified: trunk/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=60392&r… ============================================================================== --- trunk/installation/VERSION (original) +++ trunk/installation/VERSION Fri Jan 15 11:19:12 2010 @@ -1 +1 @@ -2.19.0 +2.19.1 Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Fri Jan 15 11:19:12 2010 @@ -3,6 +3,7 @@ - inst_complex_welcome adapted to Language::SwitchToEnglishIfNeeded (bnc#479529) +- 2.19.1 ------------------------------------------------------------------- Fri Dec 11 16:48:58 CET 2009 - locilka(a)suse.cz -- 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] r60391 - /tags/stable-2_19_1/installation/
by locilka＠svn.opensuse.org 15 Jan '10

15 Jan '10

Author: locilka Date: Fri Jan 15 11:18:42 2010 New Revision: 60391 URL: http://svn.opensuse.org/viewcvs/yast?rev=60391&view=rev Log: Created tag stable-2_19_1 for installation Added: tags/stable-2_19_1/installation/ - copied from r60390, trunk/installation/ -- 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] r60390 - /tags/stable-2_19_1/ca-management/
by mcalmer＠svn.opensuse.org 15 Jan '10

15 Jan '10

Author: mcalmer Date: Fri Jan 15 10:52:04 2010 New Revision: 60390 URL: http://svn.opensuse.org/viewcvs/yast?rev=60390&view=rev Log: Created tag stable-2_19_1 for ca-management Added: tags/stable-2_19_1/ca-management/ - copied from r60389, trunk/ca-management/ -- 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] r60389 - in /trunk/ca-management: VERSION package/yast2-ca-management.changes src/common_cert.ycp yast2-ca-management.spec.in
by mcalmer＠svn.opensuse.org 15 Jan '10

15 Jan '10

Author: mcalmer Date: Fri Jan 15 10:46:15 2010 New Revision: 60389 URL: http://svn.opensuse.org/viewcvs/yast?rev=60389&view=rev Log: - version 2.19.1 - add remove certificate function to common server certificate module (fate#306590) - improve the help text. Modified: trunk/ca-management/VERSION trunk/ca-management/package/yast2-ca-management.changes trunk/ca-management/src/common_cert.ycp trunk/ca-management/yast2-ca-management.spec.in Modified: trunk/ca-management/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/VERSION?rev=60389&… ============================================================================== --- trunk/ca-management/VERSION (original) +++ trunk/ca-management/VERSION Fri Jan 15 10:46:15 2010 @@ -1 +1 @@ -2.19.0 +2.19.1 Modified: trunk/ca-management/package/yast2-ca-management.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/package/yast2-ca-m… ============================================================================== --- trunk/ca-management/package/yast2-ca-management.changes (original) +++ trunk/ca-management/package/yast2-ca-management.changes Fri Jan 15 10:46:15 2010 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Fri Jan 15 10:34:48 CET 2010 - mc(a)suse.de + +- version 2.19.1 +- add remove certificate function to common server certificate module + (fate#306590) +- improve the help text. + +------------------------------------------------------------------- Thu Jan 14 12:35:43 CET 2010 - mc(a)suse.de - version 2.19.0 Modified: trunk/ca-management/src/common_cert.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/src/common_cert.yc… ============================================================================== --- trunk/ca-management/src/common_cert.ycp (original) +++ trunk/ca-management/src/common_cert.ycp Fri Jan 15 10:46:15 2010 @@ -37,19 +37,27 @@ Wizard::CreateDialog(); Wizard::SetDesktopIcon("ca-management"); -// help text 1/5 -string helptext = _("The Common Server Certificate will be used by other YaST modules."); -// help text 2/5 -helptext = helptext + _("This certificate can be exchanged by importing a certificate from a file."); -// help text 3/5 +// help text 1/7 +string helptext = _("A Server Certificate is used by services which provide SSL/TLS encrypted network connections."); + +// help text 2/7 +helptext = helptext + _("The purpose of the Common Server Certificate is, to provide a certificate for several services running on this host. "); + +// help text 3/7 +helptext = helptext + _("Some YaST modules provide the capability to use this certificate during configuration of such a service."); + +// help text 4/7 +helptext = helptext + _("With the Import/Replace button you can add a new server certificate or replace the currect one."); + +// help text 5/7 +helptext = helptext + _("You can remove the Certificates by clicking the Remove button. But make sure, that it is not used anymore by other services."); + +// help text 6/7 helptext = helptext + _("Certificates can be written to a file using Export to File in section Certificate in the CA Management module."); -// help text 4/5 +// help text 7/7 helptext = helptext + _("Certificates to import from disk must have been written in PKCS12 format with CA chain."); -// help text 5/5 -helptext = helptext + _("You can remove the Certificates from disk. But make sure, that it is not used anymore by other services."); - symbol ui = nil; repeat @@ -74,10 +82,12 @@ `VSpacing (0.5), `RichText (ret), `VSpacing (0.5), - `HBox ( // push button label + `HBox ( `HStretch(), + // push button label `PushButton (`id(`remove), _("&Remove")), - `PushButton (`id(`importDisk), _("&Import"))) + // push button label + `PushButton (`id(`importDisk), _("&Import/Replace"))) ); // To translators: dialog label Modified: trunk/ca-management/yast2-ca-management.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/yast2-ca-managemen… ============================================================================== --- trunk/ca-management/yast2-ca-management.spec.in (original) +++ trunk/ca-management/yast2-ca-management.spec.in Fri Jan 15 10:46:15 2010 @@ -1,15 +1,13 @@ @HEADER-COMMENT@ @HEADER@ -Group: System/YaST -License: GPL v2 or later -BuildRequires: dosfstools limal-ca-mgm-perl limal-perl perl-Date-Calc perl-URI perl-X500-DN docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer yast2-devtools pkg-config yast2-core yast2 update-desktop-files -Requires: yast2 perl perl-gettext yast2-perl-bindings perl-X500-DN perl-Date-Calc limal-perl perl-Config-IniFiles perl-URI -Requires: limal-ca-mgm-perl >= 1.4.0 - -BuildArchitectures: noarch - -Summary: YaST2 - CAs, Certificates and Requests Management +Group: System/YaST +License: GPLv2+ +BuildRequires: docbook-xsl-stylesheets dosfstools doxygen libxslt limal-ca-mgm-perl limal-perl perl-Date-Calc perl-URI perl-X500-DN perl-XML-Writer pkg-config update-desktop-files yast2 yast2-core yast2-devtools +Requires: yast2 perl perl-gettext yast2-perl-bindings perl-X500-DN perl-Date-Calc limal-perl perl-Config-IniFiles perl-URI +Requires: limal-ca-mgm-perl >= 1.4.0 +BuildArch: noarch +Summary: YaST2 - CAs, Certificates and Requests Management %description Managing CAs, Certificates and Requests in an understanding way. @@ -19,7 +17,6 @@ @BUILD@ @INSTALL@ - @CLEAN@ %files @@ -45,5 +42,4 @@ /usr/bin/generateCRL.pl /usr/bin/exportCRL.pl %attr(600, root, root) %config(noreplace) /etc/generateCRL.conf - %changelog -- 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] r60388 - /tags/stable-2_19_7/network/
by mzugec＠svn.opensuse.org 15 Jan '10

15 Jan '10

Author: mzugec Date: Fri Jan 15 10:03:43 2010 New Revision: 60388 URL: http://svn.opensuse.org/viewcvs/yast?rev=60388&view=rev Log: Created tag stable-2_19_7 for network Added: tags/stable-2_19_7/network/ - copied from r60387, trunk/network/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60387 - in /trunk/network: VERSION package/yast2-network.changes src/lan/address.ycp
by mzugec＠svn.opensuse.org 15 Jan '10

15 Jan '10

Author: mzugec Date: Fri Jan 15 10:03:29 2010 New Revision: 60387 URL: http://svn.opensuse.org/viewcvs/yast?rev=60387&view=rev Log: allow bridge as ETHERDEVICE for VLAN (bnc#569970) Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/lan/address.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=60387&r1=603… ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Fri Jan 15 10:03:29 2010 @@ -1 +1 @@ -2.19.6 +2.19.7 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Fri Jan 15 10:03:29 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jan 15 10:02:26 CET 2010 - mzugec(a)suse.cz + +- allow bridge as ETHERDEVICE for VLAN (bnc#569970) +- 2.19.7 + +------------------------------------------------------------------- Thu Jan 14 17:59:48 CET 2010 - mzugec(a)suse.cz - support for BOOTPROTO=ibft option (bnc#551380) Modified: trunk/network/src/lan/address.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/address.ycp?rev=… ============================================================================== --- trunk/network/src/lan/address.ycp (original) +++ trunk/network/src/lan/address.ycp Fri Jan 15 10:03:29 2010 @@ -128,7 +128,7 @@ map <string, any> configurations = NetworkInterfaces::FilterDevices("netcard"); foreach(string devtype, splitstring(NetworkInterfaces::CardRegex["netcard"]:"", "|"), { foreach(string devname, (list<string>) Map::Keys(configurations[devtype]:$[]), { - if (contains(["vlan", "bond", "br"], NetworkInterfaces::GetType(devname))) continue; + if (contains(["vlan", "bond"], NetworkInterfaces::GetType(devname))) continue; items = add (items, `item(`id(devname), sformat("%1 - %2", devname, configurations[devtype, devname, "NAME"]:""), settings["ETHERDEVICE"]:""==devname) ); }); }); -- 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] r60386 - in /trunk/gtk: ./ src/ src/pkg/ tests/
by rpmcruz＠svn.opensuse.org 15 Jan '10

15 Jan '10

Author: rpmcruz Date: Fri Jan 15 03:22:46 2010 New Revision: 60386 URL: http://svn.opensuse.org/viewcvs/yast?rev=60386&view=rev Log: * src/pkg/YGPackageSelector.cc: added repositories combo and view widgets together with a simplifification of the pairing categories and status code. * src/pkg/YGPackageSelector.cc: added GtkVBox subclass widget to fine-tune handling of GtkExpander children, as well as call to easily link multiple GtkVPaned widgets. * src/pkg/YGPackageSelector.cc: added StackWidget to support deck of widgets, optionally under a combo-box or a note-book. * src/pkg/YGPackageSelector.cc: added StartupMenu widget that mimics the initial menu of Suse studio. * src/pkg/ygtkpackageview.h/cc: changed action check behavior. * src/YGPackageSelectorPluginStub.cc: added flags: sidebar: --expander-sidebar, --flex-sidebar, --grid-sidebar, --layered-sidebar, --layered-tabs-sidebar, --startup-menu, --big-icons-sidebar, --icons-sidebar, --repositories-side, and --repositories-top row colorization: --italicize-changed-row, and --golden-changed-row. Added: trunk/gtk/tests/Label-Underline.ycp Modified: trunk/gtk/ChangeLog trunk/gtk/src/YGDumbTab.cc trunk/gtk/src/YGPackageSelectorPluginStub.cc trunk/gtk/src/YGUtils.cc trunk/gtk/src/pkg/YGPackageSelector.cc trunk/gtk/src/pkg/ygtkpackageview.cc trunk/gtk/src/pkg/ygtkpackageview.h Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=60386&r1=60385… ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Fri Jan 15 03:22:46 2010 @@ -1,3 +1,31 @@ +2010-01-15 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + + * src/pkg/YGPackageSelector.cc: added repositories combo and + view widgets together with a simplifification of the pairing + categories and status code. + + * src/pkg/YGPackageSelector.cc: added GtkVBox subclass widget + to fine-tune handling of GtkExpander children, as well as + call to easily link multiple GtkVPaned widgets. + + * src/pkg/YGPackageSelector.cc: added StackWidget to + support deck of widgets, optionally under a combo-box or + a note-book. + + * src/pkg/YGPackageSelector.cc: added StartupMenu widget + that mimics the initial menu of Suse studio. + + * src/pkg/ygtkpackageview.h/cc: changed action check + behavior. + + * src/YGPackageSelectorPluginStub.cc: added flags: + sidebar: --expander-sidebar, --flex-sidebar, --grid-sidebar, + --layered-sidebar, --layered-tabs-sidebar, --startup-menu, + --big-icons-sidebar, --icons-sidebar, --repositories-side, + and --repositories-top + row colorization: --italicize-changed-row, and + --golden-changed-row. + 2010-01-07 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/pkg/yzyppwrapper.h/cc: added API to read changes log. Modified: trunk/gtk/src/YGDumbTab.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGDumbTab.cc?rev=60386&r… ============================================================================== --- trunk/gtk/src/YGDumbTab.cc (original) +++ trunk/gtk/src/YGDumbTab.cc Fri Jan 15 03:22:46 2010 @@ -31,7 +31,7 @@ // the notebook reduce its size. ygtk_adj_size_set_only_expand (YGTK_ADJ_SIZE (m_adj_size), TRUE); - connect (getWidget(), "switch-page", G_CALLBACK (changed_tab_cb), this); + connect (getWidget(), "switch-page", G_CALLBACK (switch_page_cb), this); } virtual ~YGDumbTab() @@ -141,8 +141,8 @@ } // callbacks - static void changed_tab_cb (GtkNotebook *notebook, GtkNotebookPage *page, - gint tab_nb, YGDumbTab *pThis) + static void switch_page_cb (GtkNotebook *notebook, GtkNotebookPage *page, + guint tab_nb, YGDumbTab *pThis) { GtkWidget *child = gtk_notebook_get_nth_page (notebook, tab_nb); YItem *item = (YItem *) g_object_get_data (G_OBJECT (child), "yitem"); Modified: trunk/gtk/src/YGPackageSelectorPluginStub.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGPackageSelectorPluginS… ============================================================================== --- trunk/gtk/src/YGPackageSelectorPluginStub.cc (original) +++ trunk/gtk/src/YGPackageSelectorPluginStub.cc Fri Jan 15 03:22:46 2010 @@ -11,14 +11,20 @@ #include <YEvent.h> #include <string.h> -bool search_entry_side = true, search_entry_top = false, dynamic_sidebar = false, - categories_side = true, categories_top = false, status_side = false, - status_top = false, status_tabs = true, status_tabs_as_actions = false, - undo_side = false, undo_tab = true, undo_old_style = false, undo_log_all = false, - undo_log_changed = false, status_col = false, action_col = true, - action_col_as_button = true, action_col_as_check = false, action_col_label = true, +bool search_entry_side = true, search_entry_top = false, dynamic_sidebar = true, + expander_sidebar = false, flex_sidebar = false, grid_sidebar = false, + layered_sidebar = false, layered_tabs_sidebar = false, startup_menu = false, + big_icons_sidebar = false, icons_sidebar = false, + categories_side = true, repositories_side = true, categories_top = false, + repositories_top = false, + status_side = true, status_top = false, status_tabs = false, + status_tabs_as_actions = false, undo_side = false, undo_tab = true, + undo_old_style = false, undo_log_all = false, undo_log_changed = false, + status_col = false, action_col = true, + action_col_as_button = false, action_col_as_check = false, action_col_label = true, version_col = true, single_line_rows = false, colorful_rows = false, - details_start_hide = true, toolbar_top = false, toolbar_yast = false, + italicize_changed_row = false, golden_changed_row = false, + details_start_hide = false, toolbar_top = false, toolbar_yast = false, arrange_by = false; struct Arg { @@ -29,8 +35,18 @@ { "search-entry-side", &search_entry_side }, { "search-entry-top", &search_entry_top }, { "dynamic-sidebar", &dynamic_sidebar }, + { "expander-sidebar", &expander_sidebar }, + { "flex-sidebar", &flex_sidebar }, + { "grid-sidebar", &grid_sidebar }, + { "layered-sidebar", &layered_sidebar }, + { "layered-tabs-sidebar", &layered_tabs_sidebar }, + { "startup-menu", &startup_menu }, + { "big-icons-sidebar", &big_icons_sidebar }, + { "icons-sidebar", &icons_sidebar }, { "categories-side", &categories_side }, + { "repositories-side", &repositories_side }, { "categories-top", &categories_top }, + { "repositories-top", &repositories_top }, { "status-side", &status_side }, { "status-top", &status_top }, { "status-tabs", &status_tabs }, @@ -48,6 +64,8 @@ { "version-col", &version_col }, { "single-line-rows", &single_line_rows }, { "colorful-rows", &colorful_rows }, + { "italicize-changed-row", &italicize_changed_row }, + { "golden-changed-row", &golden_changed_row }, { "details-start-hide", &details_start_hide }, { "toolbar-top", &toolbar_top }, { "toolbar-yast", &toolbar_yast }, Modified: trunk/gtk/src/YGUtils.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGUtils.cc?rev=60386&r1=… ============================================================================== --- trunk/gtk/src/YGUtils.cc (original) +++ trunk/gtk/src/YGUtils.cc Fri Jan 15 03:22:46 2010 @@ -291,6 +291,7 @@ std::string YGUtils::mapKBAccel (const std::string &src) { + // conversion pairs: ('_', '__') ('&&', '&') ('&', '_') std::string::size_type length = src.length(), i; string str; str.reserve (length); Modified: trunk/gtk/src/pkg/YGPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/YGPackageSelector.cc… ============================================================================== --- trunk/gtk/src/pkg/YGPackageSelector.cc (original) +++ trunk/gtk/src/pkg/YGPackageSelector.cc Fri Jan 15 03:22:46 2010 @@ -27,14 +27,30 @@ #include "ygtknotebook.h" // experiments: -extern bool search_entry_side, search_entry_top, dynamic_sidebar, categories_side, - categories_top, status_side, status_top, status_tabs, status_tabs_as_actions, +extern bool search_entry_side, search_entry_top, dynamic_sidebar, + expander_sidebar, flex_sidebar, grid_sidebar, layered_sidebar, + layered_tabs_sidebar, startup_menu, big_icons_sidebar, icons_sidebar, + categories_side, + repositories_side, categories_top, repositories_top, status_side, status_top, + status_tabs, status_tabs_as_actions, undo_side, undo_tab, undo_old_style, undo_log_all, undo_log_changed, status_col, action_col, action_col_as_button, action_col_as_check, version_col, single_line_rows, details_start_hide, toolbar_top, toolbar_yast, arrange_by; //** UI components -- split up for re-usability, but mostly for readability +static gboolean paint_white_expose_cb (GtkWidget *widget, GdkEventExpose *event) +{ + cairo_t *cr = gdk_cairo_create (widget->window); + GdkColor color = { 0, 255 << 8, 255 << 8, 255 << 8 }; + gdk_cairo_set_source_color (cr, &color); + cairo_rectangle (cr, event->area.x, event->area.y, + event->area.width, event->area.height); + cairo_fill (cr); + cairo_destroy (cr); + return FALSE; +} + class UndoView { Ypp::PkgList m_changes; @@ -342,21 +358,8 @@ gtk_box_pack_start (GTK_BOX (vbox), m_empty_label, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX (vbox), m_entries_box, TRUE, TRUE, 0); - struct inner { - static gboolean expose_cb (GtkWidget *widget, GdkEventExpose *event) - { - cairo_t *cr = gdk_cairo_create (widget->window); - GdkColor color = { 0, 255 << 8, 255 << 8, 255 << 8 }; - gdk_cairo_set_source_color (cr, &color); - cairo_rectangle (cr, event->area.x, event->area.y, - event->area.width, event->area.height); - cairo_fill (cr); - cairo_destroy (cr); - return FALSE; - } - }; g_signal_connect (G_OBJECT (vbox), "expose-event", - G_CALLBACK (inner::expose_cb), NULL); + G_CALLBACK (paint_white_expose_cb), NULL); GtkWidget *scroll = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scroll), @@ -2255,80 +2258,149 @@ { gtk_widget_grab_focus (widget); } }; -static void selection_changed_cb (GtkTreeSelection *selection, _QueryWidget *pThis) -{ - if (gtk_tree_selection_get_selected (selection, NULL, NULL)) - pThis->notify(); -} - -static GtkWidget *tree_view_new() -{ - GtkWidget *view = gtk_tree_view_new(); - GtkTreeView *tview = GTK_TREE_VIEW (view); - gtk_tree_view_set_headers_visible (tview, FALSE); - gtk_tree_view_set_search_column (tview, 0); - GtkTreeSelection *selection = gtk_tree_view_get_selection (tview); - gtk_tree_selection_set_mode (selection, GTK_SELECTION_BROWSE); - GtkCellRenderer *renderer = gtk_cell_renderer_text_new(); - g_object_set (G_OBJECT (renderer), "ellipsize", PANGO_ELLIPSIZE_END, NULL); - GtkTreeViewColumn *column = gtk_tree_view_column_new_with_attributes ( - NULL, renderer, "markup", 0, NULL); - gtk_tree_view_append_column (tview, column); - return view; -} - -static GtkWidget *scrolled_window_new (GtkWidget *child) -{ - GtkWidget *scroll = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scroll), - GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scroll), GTK_SHADOW_IN); - gtk_container_add (GTK_CONTAINER (scroll), child); - return scroll; -} - -static void list_store_set_text_count (GtkListStore *store, GtkTreeIter *iter, - const char *text, int count) +class PropertyModel { - gchar *_text = g_strdup_printf ("%s (%d)", text, count); - gtk_list_store_set (store, iter, 0, _text, 1, count > 0, -1); - g_free (_text); -} - -class CategoryModel -{ -GtkListStore *m_store; -GtkTreeModel *m_filter; -bool m_type2, m_dynamic; +protected: + GtkListStore *m_store; + GtkTreeModel *m_filter; public: - CategoryModel (bool dynamic) - : m_type2 (false), m_dynamic (dynamic) + enum Column { TEXT_COLUMN, VISIBLE_COLUMN, DATA_COLUMN, ICON_COLUMN, TOTAL_COLUMNS }; + + PropertyModel() { - m_store = gtk_list_store_new (3, G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_POINTER); - if (m_dynamic) { + m_store = gtk_list_store_new (TOTAL_COLUMNS, G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_POINTER, G_TYPE_STRING); + if (dynamic_sidebar) { m_filter = gtk_tree_model_filter_new (GTK_TREE_MODEL (m_store), NULL); gtk_tree_model_filter_set_visible_column (GTK_TREE_MODEL_FILTER (m_filter), 1); g_object_unref (G_OBJECT (m_store)); } } - ~CategoryModel() + virtual ~PropertyModel() { g_object_unref (G_OBJECT (getModel())); } GtkTreeModel *getModel() - { return m_dynamic ? m_filter : GTK_TREE_MODEL (m_store); } + { return dynamic_sidebar ? m_filter : GTK_TREE_MODEL (m_store); } + + virtual const char *getLabel() = 0; + virtual void setType (Ypp::Package::Type type) = 0; + virtual void updateList (Ypp::PkgList list) = 0; + virtual bool writeQuery (Ypp::QueryAnd *query, GtkTreeIter *iter) = 0; + + static void list_store_set_text_count (GtkListStore *store, GtkTreeIter *iter, + const char *text, int count) + { + gchar *_text = g_strdup_printf ("%s (%d)", text, count); + gtk_list_store_set (store, iter, 0, _text, 1, count > 0, -1); + g_free (_text); + } +}; + +class StatusModel : public PropertyModel +{ +public: + StatusModel() : PropertyModel() + { + GtkTreeIter iter; + gtk_list_store_append (m_store, &iter); + if (!dynamic_sidebar) + gtk_list_store_set (m_store, &iter, 0, _("All packages"), -1); + gtk_list_store_set (m_store, &iter, 1, TRUE, 2, GINT_TO_POINTER (0), 3, NULL, -1); + gtk_list_store_append (m_store, &iter); + if (!dynamic_sidebar) + gtk_list_store_set (m_store, &iter, 0, _("Available"), -1); + gtk_list_store_set (m_store, &iter, 1, TRUE, 2, GINT_TO_POINTER (1), 3, GTK_STOCK_NETWORK, -1); + gtk_list_store_append (m_store, &iter); + if (!dynamic_sidebar) + gtk_list_store_set (m_store, &iter, 0, _("Installed"), -1); + gtk_list_store_set (m_store, &iter, 1, TRUE, 2, GINT_TO_POINTER (2), 3, GTK_STOCK_HARDDISK, -1); + gtk_list_store_append (m_store, &iter); + if (!dynamic_sidebar) + gtk_list_store_set (m_store, &iter, 0, _("Upgrades"), -1); + gtk_list_store_set (m_store, &iter, 1, TRUE, 2, GINT_TO_POINTER (3), 3, GTK_STOCK_GO_UP, -1); + gtk_list_store_append (m_store, &iter); + if (!dynamic_sidebar) + gtk_list_store_set (m_store, &iter, 0, _("Summary"), -1); + gtk_list_store_set (m_store, &iter, 1, TRUE, 2, GINT_TO_POINTER (4), 3, NULL, -1); + } + + virtual const char *getLabel() + { return _("_Status:"); } + + virtual void setType (Ypp::Package::Type type) {} + + virtual void updateList (Ypp::PkgList list) + { + if (!dynamic_sidebar) return; + int installedNb = 0, upgradableNb = 0, notInstalledNb = 0, modifiedNb = 0; + for (int i = 0; i < list.size(); i++) { + Ypp::Package *pkg = list.get (i); + if (pkg->isInstalled()) { + installedNb++; + if (pkg->hasUpgrade()) + upgradableNb++; + } + else + notInstalledNb++; + if (pkg->toModify()) + modifiedNb++; + } + + GtkListStore *store = m_store; + GtkTreeModel *model = GTK_TREE_MODEL (m_store); + GtkTreeIter iter; + gtk_tree_model_iter_nth_child (model, &iter, NULL, 0); + list_store_set_text_count (store, &iter, _("Any Status"), list.size()); + gtk_tree_model_iter_nth_child (model, &iter, NULL, 1); + list_store_set_text_count (store, &iter, _("Not Installed"), notInstalledNb); + gtk_tree_model_iter_nth_child (model, &iter, NULL, 2); + list_store_set_text_count (store, &iter, _("Installed"), installedNb); + gtk_tree_model_iter_nth_child (model, &iter, NULL, 3); + list_store_set_text_count (store, &iter, _("Upgradable"), upgradableNb); + gtk_tree_model_iter_nth_child (model, &iter, NULL, 4); + list_store_set_text_count (store, &iter, _("Modified"), modifiedNb); + } + + virtual bool writeQuery (Ypp::QueryAnd *query, GtkTreeIter *iter) + { + gpointer _status; + gtk_tree_model_get (getModel(), iter, 2, &_status, -1); + int status = GPOINTER_TO_INT (_status); + switch (status) { + case 0: default: break; + case 1: query->add (new Ypp::QueryProperty ("is-installed", false)); break; + case 2: query->add (new Ypp::QueryProperty ("is-installed", true)); break; + case 3: query->add (new Ypp::QueryProperty ("has-upgrade", true)); break; + case 4: query->add (new Ypp::QueryProperty ("to-modify", true)); break; + } + if (status > 0 && status <= 4) + return true; + return false; + } +}; + +class CategoryModel : public PropertyModel +{ +bool m_type2; + +public: + CategoryModel() : PropertyModel(), m_type2 (false) + {} + + virtual const char *getLabel() + { return _("_Category:"); } - void setType (Ypp::Package::Type type) + virtual void setType (Ypp::Package::Type type) { m_type2 = (type == Ypp::Package::PACKAGE_TYPE); gtk_list_store_clear (m_store); GtkTreeIter iter; gtk_list_store_append (m_store, &iter); - if (!m_dynamic) + if (!dynamic_sidebar) gtk_list_store_set (m_store, &iter, 0, _("All packages"), -1); - gtk_list_store_set (m_store, &iter, 1, TRUE, 2, NULL, -1); + gtk_list_store_set (m_store, &iter, 1, TRUE, 2, NULL, ICON_COLUMN, NULL, -1); Ypp::Node *category; if (m_type2) category = Ypp::get()->getFirstCategory2 (type); @@ -2336,15 +2408,15 @@ category = Ypp::get()->getFirstCategory (type); for (; category; category = category->next()) { gtk_list_store_append (m_store, &iter); - if (!m_dynamic) + if (!dynamic_sidebar) gtk_list_store_set (m_store, &iter, 0, category->name.c_str(), -1); - gtk_list_store_set (m_store, &iter, 1, TRUE, 2, category, -1); + gtk_list_store_set (m_store, &iter, 1, TRUE, 2, category, ICON_COLUMN, category->icon, -1); } } - void updateList (Ypp::PkgList list) + virtual void updateList (Ypp::PkgList list) { - if (!m_dynamic) return; + if (!dynamic_sidebar) return; GtkTreeModel *model = GTK_TREE_MODEL (m_store); GtkTreeIter iter; if (gtk_tree_model_get_iter_first (model, &iter)) @@ -2367,7 +2439,7 @@ } while (gtk_tree_model_iter_next (model, &iter)); } - bool writeQuery (Ypp::QueryAnd *query, GtkTreeIter *iter) + virtual bool writeQuery (Ypp::QueryAnd *query, GtkTreeIter *iter) { Ypp::Node *category; gtk_tree_model_get (getModel(), iter, 2, &category, -1); @@ -2382,41 +2454,150 @@ } }; -class CategoryView : public _QueryWidget +class RepositoryModel : public PropertyModel +{ +public: + RepositoryModel() : PropertyModel() + { + GtkTreeIter iter; + gtk_list_store_append (m_store, &iter); + if (!dynamic_sidebar) + gtk_list_store_set (m_store, &iter, 0, _("All packages"), -1); + gtk_list_store_set (m_store, &iter, 1, TRUE, 2, NULL, ICON_COLUMN, NULL, -1); + for (int i = 0; Ypp::get()->getRepository (i); i++) { + const Ypp::Repository *repo = Ypp::get()->getRepository (i); + gtk_list_store_append (m_store, &iter); + if (!dynamic_sidebar) { + if (big_icons_sidebar) + gtk_list_store_set (m_store, &iter, 0, (repo->name + '\n' + repo->url).c_str(), -1); + else + gtk_list_store_set (m_store, &iter, 0, repo->name.c_str(), -1); + } + gtk_list_store_set (m_store, &iter, 1, TRUE, 2, repo, -1); + + const gchar *icon; + if (repo->url.empty()) + icon = GTK_STOCK_MISSING_IMAGE; + else if (repo->url.compare (0, 2, "cd", 2) == 0 || + repo->url.compare (0, 3, "dvd", 3) == 0) + icon = GTK_STOCK_CDROM; + else if (repo->url.compare (0, 3, "iso", 3) == 0) + icon = GTK_STOCK_FILE; + else + icon = GTK_STOCK_NETWORK; + gtk_list_store_set (m_store, &iter, ICON_COLUMN, icon, -1); + } + } + + virtual const char *getLabel() + { return _("_Repository:"); } + + virtual void setType (Ypp::Package::Type type) {} + + virtual void updateList (Ypp::PkgList list) + { + if (!dynamic_sidebar) return; + GtkTreeModel *model = GTK_TREE_MODEL (m_store); + GtkTreeIter iter; + if (gtk_tree_model_get_iter_first (model, &iter)) + do { + Ypp::Repository *repo; + gtk_tree_model_get (model, &iter, 2, &repo, -1); + if (repo) { + int sum = 0; + for (int i = 0; i < list.size(); i++) { + Ypp::Package *pkg = list.get (i); + for (int v = 0; pkg->getAvailableVersion (v); v++) { + const Ypp::Package::Version *version = pkg->getAvailableVersion (v); + if (version->repo == repo) { + sum++; + break; + } + } + } + if (big_icons_sidebar) + list_store_set_text_count (m_store, &iter, (repo->name + '\n' + repo->url).c_str(), sum); + else + list_store_set_text_count (m_store, &iter, repo->name.c_str(), sum); + } + else + list_store_set_text_count (m_store, &iter, _("All Repositories"), list.size()); + } while (gtk_tree_model_iter_next (model, &iter)); + } + + virtual bool writeQuery (Ypp::QueryAnd *query, GtkTreeIter *iter) + { + Ypp::Repository *repo; + gtk_tree_model_get (getModel(), iter, 2, &repo, -1); + if (repo) { + query->add (new Ypp::QueryRepository (repo)); + return true; + } + return false; + } +}; + +class PropertyView : public _QueryWidget { GtkWidget *m_widget, *m_view; -CategoryModel *m_model; +PropertyModel *m_model; public: - CategoryView() : _QueryWidget() + PropertyView (PropertyModel *model) : _QueryWidget() { - m_model = new CategoryModel (dynamic_sidebar); - m_view = tree_view_new(); - gtk_tree_view_set_model (GTK_TREE_VIEW (m_view), m_model->getModel()); - GtkWidget *scroll = scrolled_window_new (m_view); -#if 0 - GtkWidget *combo = gtk_combo_box_new_text(); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("Categories")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combo), _("Repositories")); - gtk_combo_box_set_active (GTK_COMBO_BOX (combo), 0); - g_signal_connect (G_OBJECT (combo), "changed", - G_CALLBACK (combo_changed_cb), this); -#endif - GtkWidget *combo = gtk_label_new_with_mnemonic ("Ca_tegories:"); - gtk_misc_set_alignment (GTK_MISC (combo), 0, .5); - gtk_label_set_mnemonic_widget (GTK_LABEL (combo), m_view); - - GtkWidget *vbox = gtk_vbox_new (FALSE, 4); //0); - gtk_box_pack_start (GTK_BOX (vbox), combo, FALSE, TRUE, 0); - gtk_box_pack_start (GTK_BOX (vbox), scroll, TRUE, TRUE, 0); - m_widget = vbox; + m_model = model; + m_view = gtk_tree_view_new_with_model (m_model->getModel()); + GtkTreeView *tview = GTK_TREE_VIEW (m_view); + gtk_tree_view_set_headers_visible (tview, FALSE); + gtk_tree_view_set_search_column (tview, 0); + gtk_tree_view_set_tooltip_column (tview, 0); + GtkTreeSelection *selection = gtk_tree_view_get_selection (tview); + gtk_tree_selection_set_mode (selection, GTK_SELECTION_BROWSE); + GtkCellRenderer *renderer = gtk_cell_renderer_text_new(); + g_object_set (G_OBJECT (renderer), "ellipsize", + dynamic_sidebar ? PANGO_ELLIPSIZE_MIDDLE : PANGO_ELLIPSIZE_END, NULL); + GtkTreeViewColumn *column; + if (icons_sidebar || big_icons_sidebar) { + GtkCellRenderer *renderer = gtk_cell_renderer_pixbuf_new(); + column = gtk_tree_view_column_new_with_attributes (NULL, + renderer, "icon-name", PropertyModel::ICON_COLUMN, NULL); + g_object_set (G_OBJECT (renderer), "stock-size", big_icons_sidebar ? GTK_ICON_SIZE_LARGE_TOOLBAR : GTK_ICON_SIZE_MENU, NULL); + gtk_tree_view_append_column (tview, column); + } + column = gtk_tree_view_column_new_with_attributes ( + NULL, renderer, "markup", PropertyModel::TEXT_COLUMN, NULL); + gtk_tree_view_append_column (tview, column); + + GtkWidget *scroll = gtk_scrolled_window_new (NULL, NULL); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scroll), + GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scroll), GTK_SHADOW_IN); + gtk_container_add (GTK_CONTAINER (scroll), m_view); + + if (layered_sidebar) + m_widget = scroll; + else if (expander_sidebar) { + m_widget = gtk_expander_new_with_mnemonic (m_model->getLabel()); + gtk_container_add (GTK_CONTAINER (m_widget), scroll); + } + else { + GtkWidget *label = gtk_label_new_with_mnemonic (m_model->getLabel()); + gtk_misc_set_alignment (GTK_MISC (label), 0, .5); + gtk_label_set_mnemonic_widget (GTK_LABEL (label), m_view); + + m_widget = gtk_vbox_new (FALSE, 4); + gtk_box_pack_start (GTK_BOX (m_widget), label, FALSE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (m_widget), scroll, TRUE, TRUE, 0); + } - GtkTreeSelection *selection; selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (m_view)); g_signal_connect (G_OBJECT (selection), "changed", G_CALLBACK (selection_changed_cb), this); } + ~PropertyView() + { delete m_model; } + virtual GtkWidget *getWidget() { return m_widget; } @@ -2448,20 +2629,22 @@ return false; } - static void combo_changed_cb (GtkComboBox *combo, CategoryView *pThis) + static void selection_changed_cb (GtkTreeSelection *selection, _QueryWidget *pThis) { + if (gtk_tree_selection_get_selected (selection, NULL, NULL)) + pThis->notify(); } }; -class CategoryCombo : public _QueryWidget +class PropertyCombo : public _QueryWidget { GtkWidget *m_widget, *m_combo; -CategoryModel *m_model; +PropertyModel *m_model; public: - CategoryCombo() : _QueryWidget() + PropertyCombo (PropertyModel *model) : _QueryWidget() { - m_model = new CategoryModel (dynamic_sidebar); + m_model = model; m_combo = gtk_combo_box_new_with_model (m_model->getModel()); GtkCellRenderer *renderer = gtk_cell_renderer_text_new(); @@ -2469,7 +2652,7 @@ gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (m_combo), renderer, "markup", 0, NULL); - GtkWidget *label = gtk_label_new_with_mnemonic ("Ca_tegories:"); + GtkWidget *label = gtk_label_new_with_mnemonic (m_model->getLabel()); gtk_misc_set_alignment (GTK_MISC (label), 0, .5); gtk_label_set_mnemonic_widget (GTK_LABEL (label), m_combo); @@ -2480,6 +2663,9 @@ G_CALLBACK (changed_cb), this); } + ~PropertyCombo() + { delete m_model; } + virtual GtkWidget *getWidget() { return m_widget; } @@ -2505,384 +2691,62 @@ return false; } - static void changed_cb (GtkComboBox *combo, CategoryCombo *pThis) + static void changed_cb (GtkComboBox *combo, PropertyCombo *pThis) { pThis->notify(); } }; -class StatusModel +#define BROWSER_PATH "/usr/bin/firefox" + +class DetailBox { -GtkListStore *m_store; -GtkTreeModel *m_filter; -bool m_dynamic; +GtkWidget *m_widget, *m_text, *m_pkg_view, *m_link_popup; +std::string m_link_str; public: - StatusModel (bool dynamic) - : m_dynamic (dynamic) - { - m_store = gtk_list_store_new (3, G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_INT); + GtkWidget *getWidget() { return m_widget; } - GtkTreeIter iter; - gtk_list_store_append (m_store, &iter); - if (!dynamic_sidebar) - gtk_list_store_set (m_store, &iter, 0, _("All packages"), -1); - gtk_list_store_set (m_store, &iter, 1, TRUE, 2, 0, -1); - gtk_list_store_append (m_store, &iter); - if (!dynamic_sidebar) - gtk_list_store_set (m_store, &iter, 0, _("Available"), -1); - gtk_list_store_set (m_store, &iter, 1, TRUE, 2, 1, -1); - gtk_list_store_append (m_store, &iter); - if (!dynamic_sidebar) - gtk_list_store_set (m_store, &iter, 0, _("Installed"), -1); - gtk_list_store_set (m_store, &iter, 1, TRUE, 2, 2, -1); - gtk_list_store_append (m_store, &iter); - if (!dynamic_sidebar) - gtk_list_store_set (m_store, &iter, 0, _("Upgrades"), -1); - gtk_list_store_set (m_store, &iter, 1, TRUE, 2, 3, -1); - gtk_list_store_append (m_store, &iter); - if (!dynamic_sidebar) - gtk_list_store_set (m_store, &iter, 0, _("Summary"), -1); - gtk_list_store_set (m_store, &iter, 1, TRUE, 2, 4, -1); + DetailBox() + : m_link_popup (NULL) + { + m_text = ygtk_rich_text_new(); +/* + ygtk_rich_text_set_text (YGTK_RICH_TEXT (m_text), + _("Write a little introductory text here")); +*/ + YGtkPackageView *view = ygtk_package_view_new (TRUE); + m_pkg_view = GTK_WIDGET (view); + //gtk_widget_set_size_request (m_pkg_view, -1, 200); - if (m_dynamic) { - m_filter = gtk_tree_model_filter_new (GTK_TREE_MODEL (m_store), NULL); - gtk_tree_model_filter_set_visible_column (GTK_TREE_MODEL_FILTER (m_filter), 1); - g_object_unref (G_OBJECT (m_store)); - } - } + GtkWidget *vbox = gtk_vbox_new (FALSE, 18); + gtk_box_pack_start (GTK_BOX (vbox), m_text, FALSE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (vbox), m_pkg_view, TRUE, TRUE, 0); - ~StatusModel() - { g_object_unref (G_OBJECT (getModel())); } + m_widget = gtk_scrolled_window_new (NULL, NULL); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (m_widget), + GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (m_widget), vbox); - GtkTreeModel *getModel() - { return m_dynamic ? m_filter : GTK_TREE_MODEL (m_store); } + g_signal_connect (G_OBJECT (m_text), "link-clicked", + G_CALLBACK (link_clicked_cb), this); + g_signal_connect (G_OBJECT (vbox), "expose-event", + G_CALLBACK (paint_white_expose_cb), NULL); + } - void setType (Ypp::Package::Type type) {} + ~DetailBox() + { + if (m_link_popup) + gtk_widget_destroy (m_link_popup); + } - void updateList (Ypp::PkgList list) + void setPackage (Ypp::Package *package) { - if (!m_dynamic) return; - int installedNb = 0, upgradableNb = 0, notInstalledNb = 0, modifiedNb = 0; - for (int i = 0; i < list.size(); i++) { - Ypp::Package *pkg = list.get (i); - if (pkg->isInstalled()) { - installedNb++; - if (pkg->hasUpgrade()) - upgradableNb++; - } - else - notInstalledNb++; - if (pkg->toModify()) - modifiedNb++; + if (package) { + std::string text = package->description (HTML_MARKUP); + ygtk_rich_text_set_text (YGTK_RICH_TEXT (m_text), text.c_str()); + gtk_widget_show (m_widget); } - - GtkListStore *store = m_store; - GtkTreeModel *model = GTK_TREE_MODEL (m_store); - GtkTreeIter iter; - gtk_tree_model_iter_nth_child (model, &iter, NULL, 0); - list_store_set_text_count (store, &iter, _("Any Status"), list.size()); - gtk_tree_model_iter_nth_child (model, &iter, NULL, 1); - list_store_set_text_count (store, &iter, _("Not Installed"), notInstalledNb); - gtk_tree_model_iter_nth_child (model, &iter, NULL, 2); - list_store_set_text_count (store, &iter, _("Installed"), installedNb); - gtk_tree_model_iter_nth_child (model, &iter, NULL, 3); - list_store_set_text_count (store, &iter, _("Upgradable"), upgradableNb); - gtk_tree_model_iter_nth_child (model, &iter, NULL, 4); - list_store_set_text_count (store, &iter, _("Modified"), modifiedNb); - } - - bool writeQuery (Ypp::QueryAnd *query, GtkTreeIter *iter) - { - int status; - gtk_tree_model_get (getModel(), iter, 2, &status, -1); - switch (status) { - case 0: default: break; - case 1: query->add (new Ypp::QueryProperty ("is-installed", false)); break; - case 2: query->add (new Ypp::QueryProperty ("is-installed", true)); break; - case 3: query->add (new Ypp::QueryProperty ("has-upgrade", true)); break; - case 4: query->add (new Ypp::QueryProperty ("to-modify", true)); break; - } - if (status > 0 && status <= 4) - return true; - return false; - } -}; - -class StatusView : public _QueryWidget -{ -GtkWidget *m_widget, *m_view; -StatusModel *m_model; - -public: - StatusView() : _QueryWidget() - { - m_model = new StatusModel (dynamic_sidebar); - m_view = tree_view_new(); - gtk_tree_view_set_model (GTK_TREE_VIEW (m_view), m_model->getModel()); - GtkWidget *scroll = scrolled_window_new (m_view); - - GtkWidget *label = gtk_label_new_with_mnemonic ("_Status:"); - gtk_misc_set_alignment (GTK_MISC (label), 0, .5); - gtk_label_set_mnemonic_widget (GTK_LABEL (label), m_view); - - m_widget = gtk_vbox_new (FALSE, 4); - gtk_box_pack_start (GTK_BOX (m_widget), label, FALSE, TRUE, 0); - gtk_box_pack_start (GTK_BOX (m_widget), scroll, TRUE, TRUE, 0); - - GtkTreeSelection *selection; - selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (m_view)); - g_signal_connect (G_OBJECT (selection), "changed", - G_CALLBACK (selection_changed_cb), this); - } - - virtual GtkWidget *getWidget() - { return m_widget; } - - virtual void updateType (Ypp::Package::Type type) - { - m_model->setType (type); - - GtkTreeSelection *selection; - GtkTreeIter iter; - selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (m_view)); - g_signal_handlers_block_by_func (selection, (gpointer) selection_changed_cb, this); - gtk_tree_model_get_iter_first (m_model->getModel(), &iter); - gtk_tree_selection_select_iter (selection, &iter); - g_signal_handlers_unblock_by_func (selection, (gpointer) selection_changed_cb, this); - } - - virtual void updateList (Ypp::PkgList list) - { m_model->updateList (list); } - - virtual bool begsUpdate() { return dynamic_sidebar; } - - virtual bool writeQuery (Ypp::QueryAnd *query) - { - GtkTreeIter iter; - GtkTreeSelection *selection; - selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (m_view)); - if (gtk_tree_selection_get_selected (selection, NULL, &iter)) - return m_model->writeQuery (query, &iter); - return false; - } -}; - -class StatusCombo : public _QueryWidget -{ -GtkWidget *m_widget, *m_combo; -StatusModel *m_model; - -public: - StatusCombo() : _QueryWidget() - { - m_model = new StatusModel (dynamic_sidebar); - m_combo = gtk_combo_box_new_with_model (m_model->getModel()); - - GtkCellRenderer *renderer = gtk_cell_renderer_text_new(); - gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (m_combo), renderer, TRUE); - gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (m_combo), renderer, - "markup", 0, NULL); - - GtkWidget *label = gtk_label_new_with_mnemonic ("_Status:"); - gtk_misc_set_alignment (GTK_MISC (label), 0, .5); - gtk_label_set_mnemonic_widget (GTK_LABEL (label), m_combo); - - m_widget = gtk_hbox_new (FALSE, 2); - gtk_box_pack_start (GTK_BOX (m_widget), label, FALSE, TRUE, 0); - gtk_box_pack_start (GTK_BOX (m_widget), m_combo, TRUE, TRUE, 0); - g_signal_connect (G_OBJECT (m_combo), "changed", - G_CALLBACK (changed_cb), this); - } - - virtual GtkWidget *getWidget() - { return m_widget; } - - virtual void updateType (Ypp::Package::Type type) - { - m_model->setType (type); - - g_signal_handlers_block_by_func (m_combo, (gpointer) changed_cb, this); - gtk_combo_box_set_active (GTK_COMBO_BOX (m_combo), 0); - g_signal_handlers_unblock_by_func (m_combo, (gpointer) changed_cb, this); - } - - virtual void updateList (Ypp::PkgList list) - { m_model->updateList (list); } - - virtual bool begsUpdate() { return dynamic_sidebar; } - - virtual bool writeQuery (Ypp::QueryAnd *query) - { - GtkTreeIter iter; - if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (m_combo), &iter)) - return m_model->writeQuery (query, &iter); - return false; - } - - static void changed_cb (GtkComboBox *combo, StatusCombo *pThis) - { pThis->notify(); } -}; - -#if 0 -class StatusView : public _QueryWidget -{ -GtkWidget *m_widget, *m_view; -StatusModel *m_model; - -public: - StatusView() : _QueryWidget() - { - m_model = new StatusModel - m_view = tree_view_new(); - - GtkWidget *label = gtk_label_new_with_mnemonic ("_Statuses:"); - gtk_misc_set_alignment (GTK_MISC (label), 0, 0); - gtk_label_set_mnemonic_widget (GTK_LABEL (label), m_view); - GtkWidget *scroll = scrolled_window_new (m_view); - m_widget = gtk_vbox_new (FALSE, 4); - gtk_box_pack_start (GTK_BOX (m_widget), label, FALSE, TRUE, 0); - gtk_box_pack_start (GTK_BOX (m_widget), scroll, TRUE, TRUE, 0); - - GtkListStore *store; - GtkTreeIter iter; - store = gtk_list_store_new (3, G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_INT); - m_model = GTK_TREE_MODEL (store); - gtk_list_store_append (store, &iter); - if (!dynamic_sidebar) - gtk_list_store_set (store, &iter, 0, _("All packages"), -1); - gtk_list_store_set (store, &iter, 1, TRUE, 2, 0, -1); - gtk_list_store_append (store, &iter); - if (!dynamic_sidebar) - gtk_list_store_set (store, &iter, 0, _("Available"), -1); - gtk_list_store_set (store, &iter, 1, TRUE, 2, 1, -1); - gtk_list_store_append (store, &iter); - if (!dynamic_sidebar) - gtk_list_store_set (store, &iter, 0, _("Installed"), -1); - gtk_list_store_set (store, &iter, 1, TRUE, 2, 2, -1); - gtk_list_store_append (store, &iter); - if (!dynamic_sidebar) - gtk_list_store_set (store, &iter, 0, _("Upgrades"), -1); - gtk_list_store_set (store, &iter, 1, TRUE, 2, 3, -1); - gtk_list_store_append (store, &iter); - if (!dynamic_sidebar) - gtk_list_store_set (store, &iter, 0, _("Summary"), -1); - gtk_list_store_set (store, &iter, 1, TRUE, 2, 4, -1); - - GtkTreeModel *filter_model = gtk_tree_model_filter_new (m_model, NULL); - gtk_tree_model_filter_set_visible_column (GTK_TREE_MODEL_FILTER (filter_model), 1); - gtk_tree_view_set_model (GTK_TREE_VIEW (m_view), filter_model); - g_object_unref (G_OBJECT (store)); - g_object_unref (G_OBJECT (filter_model)); - - GtkTreeSelection *selection; - selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (m_view)); - gtk_tree_model_get_iter_first (filter_model, &iter); - gtk_tree_selection_select_iter (selection, &iter); - g_signal_connect (G_OBJECT (selection), "changed", - G_CALLBACK (selection_changed_cb), this); - } - - virtual GtkWidget *getWidget() - { return m_widget; } - - virtual void updateType (Ypp::Package::Type type) {} - - virtual void updateList (Ypp::PkgList list) - { - int installedNb = 0, upgradableNb = 0, notInstalledNb = 0, modifiedNb = 0; - for (int i = 0; i < list.size(); i++) { - Ypp::Package *pkg = list.get (i); - if (pkg->isInstalled()) { - installedNb++; - if (pkg->hasUpgrade()) - upgradableNb++; - } - else - notInstalledNb++; - if (pkg->toModify()) - modifiedNb++; - } - - GtkTreeModel *model = m_model; - GtkTreeIter iter; - GtkListStore *store = GTK_LIST_STORE (model); - gtk_tree_model_iter_nth_child (model, &iter, NULL, 0); - list_store_set_text_count (store, &iter, _("Any Status"), list.size()); - gtk_tree_model_iter_nth_child (model, &iter, NULL, 1); - list_store_set_text_count (store, &iter, _("Not Installed"), notInstalledNb); - gtk_tree_model_iter_nth_child (model, &iter, NULL, 2); - list_store_set_text_count (store, &iter, _("Installed"), installedNb); - gtk_tree_model_iter_nth_child (model, &iter, NULL, 3); - list_store_set_text_count (store, &iter, _("Upgradable"), upgradableNb); - gtk_tree_model_iter_nth_child (model, &iter, NULL, 4); - list_store_set_text_count (store, &iter, _("Modified"), modifiedNb); - } - - virtual bool begsUpdate() { return dynamic_sidebar; } - - virtual bool writeQuery (Ypp::QueryAnd *query) - { - GtkTreeIter iter; - GtkTreeSelection *selection; - selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (m_view)); - if (gtk_tree_selection_get_selected (selection, NULL, &iter)) - return m_model->writeQuery (query, &iter); - return false; - } -}; -#endif - -#define BROWSER_PATH "/usr/bin/firefox" - -class DetailBox -{ -GtkWidget *m_widget, *m_text, *m_pkg_view, *m_link_popup; -std::string m_link_str; - -public: - GtkWidget *getWidget() { return m_widget; } - - DetailBox() - : m_link_popup (NULL) - { - m_text = ygtk_rich_text_new(); -/* - ygtk_rich_text_set_text (YGTK_RICH_TEXT (m_text), - _("Write a little introductory text here")); -*/ - YGtkPackageView *view = ygtk_package_view_new (TRUE); - m_pkg_view = GTK_WIDGET (view); - //gtk_widget_set_size_request (m_pkg_view, -1, 200); - - GtkWidget *vbox = gtk_vbox_new (FALSE, 18); - gtk_box_pack_start (GTK_BOX (vbox), m_text, FALSE, TRUE, 0); - gtk_box_pack_start (GTK_BOX (vbox), m_pkg_view, TRUE, TRUE, 0); - - m_widget = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (m_widget), - GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (m_widget), vbox); - - g_signal_connect (G_OBJECT (m_text), "link-clicked", - G_CALLBACK (link_clicked_cb), this); - g_signal_connect (G_OBJECT (vbox), "expose-event", - G_CALLBACK (expose_cb), NULL); - } - - ~DetailBox() - { - if (m_link_popup) - gtk_widget_destroy (m_link_popup); - } - - void setPackage (Ypp::Package *package) - { - if (package) { - std::string text = package->description (HTML_MARKUP); - ygtk_rich_text_set_text (YGTK_RICH_TEXT (m_text), text.c_str()); - gtk_widget_show (m_widget); - } - else - ygtk_rich_text_set_plain_text (YGTK_RICH_TEXT (m_text), ""); + else + ygtk_rich_text_set_plain_text (YGTK_RICH_TEXT (m_text), ""); if (package && package->type() != Ypp::Package::PACKAGE_TYPE) { Ypp::QueryBase *query = new Ypp::QueryCollection (package); @@ -2894,18 +2758,6 @@ gtk_widget_hide (m_pkg_view); } - static gboolean expose_cb (GtkWidget *widget, GdkEventExpose *event) - { - cairo_t *cr = gdk_cairo_create (widget->window); - GdkColor color = { 0, 255 << 8, 255 << 8, 255 << 8 }; - gdk_cairo_set_source_color (cr, &color); - cairo_rectangle (cr, event->area.x, event->area.y, - event->area.width, event->area.height); - cairo_fill (cr); - cairo_destroy (cr); - return FALSE; - } - static void link_clicked_cb (YGtkRichText *text, const gchar *link, DetailBox *pThis) { if (!pThis->m_link_popup) { @@ -3065,6 +2917,327 @@ } }; +static GtkWidget *gtk_vpaned_append (GtkWidget *vpaned, GtkWidget *child) +{ + if (!vpaned) + return child; + if (!GTK_IS_VPANED (vpaned) || gtk_paned_get_child2 (GTK_PANED (vpaned))) { + GtkWidget *ret = gtk_vpaned_new(); + gtk_paned_pack1 (GTK_PANED (ret), vpaned, TRUE, FALSE); + gtk_paned_pack2 (GTK_PANED (ret), child, TRUE, FALSE); + return ret; + } + gtk_paned_pack2 (GTK_PANED (vpaned), child, TRUE, FALSE); + return vpaned; +} + +static void ygtk_expander_box_size_allocate (GtkWidget *vbox, GtkAllocation *alloc) +{ + GtkContainer *container = GTK_CONTAINER (vbox); + GList *children = gtk_container_get_children (container); + int expandable_height = alloc->height, expand_nb = 0; + for (GList *i = children; i; i = i->next) { + GtkWidget *child = (GtkWidget *) i->data; + if (!gtk_expander_get_expanded (GTK_EXPANDER (child))) { + GtkRequisition req; + gtk_widget_get_child_requisition (child, &req); + expandable_height -= req.height; + } + else + expand_nb++; + } + int each_expandable_height = 0; + if (expand_nb) + each_expandable_height = expandable_height / expand_nb; + int y = 0; + for (GList *i = children; i; i = i->next) { + GtkWidget *child = (GtkWidget *) i->data; + if (gtk_expander_get_expanded (GTK_EXPANDER (child))) { + GtkAllocation child_alloc = { alloc->x, alloc->y + y, alloc->width, each_expandable_height }; + gtk_widget_size_allocate (child, &child_alloc); + y += child_alloc.height; + } + else { + GtkRequisition req; + gtk_widget_get_child_requisition (child, &req); + + GtkAllocation child_alloc = { alloc->x, alloc->y + y, alloc->width, req.height }; + gtk_widget_size_allocate (child, &child_alloc); + y += child_alloc.height; + } + } + g_list_free (children); +} + +typedef struct YGtkExpanderBox +{ GtkVBox parent; } YGtkExpanderBox; + +typedef struct YGtkExpanderBoxClass +{ GtkVBoxClass parent_class; } YGtkExpanderBoxClass; + +G_DEFINE_TYPE (YGtkExpanderBox, ygtk_expander_box, GTK_TYPE_VBOX) + +static void ygtk_expander_box_init (YGtkExpanderBox *box) +{ +} + +static void ygtk_expander_box_class_init (YGtkExpanderBoxClass *klass) +{ + ygtk_expander_box_parent_class = g_type_class_peek_parent (klass); + + GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); + widget_class->size_allocate = ygtk_expander_box_size_allocate; +} + +static GtkWidget *gtk_expander_vbox_new (int spacing) +{ + GtkWidget *widget = (GtkWidget *) g_object_new (ygtk_expander_box_get_type(), NULL); + GTK_BOX (widget)->spacing = spacing; + return widget; +} + +class StackWidget +{ +GtkWidget *m_combo, *m_placeholder, *m_widget; +std::vector <GtkWidget *> m_children; + +public: + GtkWidget *getWidget() + { return m_widget; } + + StackWidget() + { + if (layered_tabs_sidebar) { + m_widget = gtk_notebook_new(); + gtk_notebook_set_tab_pos (GTK_NOTEBOOK (m_widget), GTK_POS_LEFT); + } + else { + m_combo = gtk_combo_box_new_text(); + m_placeholder = gtk_event_box_new(); + m_widget = gtk_vbox_new (FALSE, 2); + gtk_box_pack_start (GTK_BOX (m_widget), m_combo, FALSE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (m_widget), m_placeholder, TRUE, TRUE, 0); + g_signal_connect (G_OBJECT (m_combo), "changed", + G_CALLBACK (combo_changed_cb), this); + } + } + + ~StackWidget() + { + for (unsigned int i = 0; i < m_children.size(); i++) + g_object_unref (G_OBJECT (m_children[i])); + } + + void append (const char *title, GtkWidget *widget) + { + m_children.push_back (widget); + g_object_ref_sink (G_OBJECT (widget)); + gtk_widget_show_all (widget); + if (layered_tabs_sidebar) { + GtkWidget *label = gtk_label_new (title); + gtk_label_set_angle (GTK_LABEL (label), 90); + gtk_notebook_append_page (GTK_NOTEBOOK (m_widget), widget, label); + } + else { + gtk_combo_box_append_text (GTK_COMBO_BOX (m_combo), title); + if (gtk_combo_box_get_active (GTK_COMBO_BOX (m_combo)) == -1) + gtk_combo_box_set_active (GTK_COMBO_BOX (m_combo), 0); + } + } + + static void combo_changed_cb (GtkComboBox *combo, StackWidget *pThis) + { + int i = gtk_combo_box_get_active (combo); + GtkWidget *child = pThis->m_children[i]; + GtkWidget *old_child = GTK_BIN (pThis->m_placeholder)->child; + if (old_child) + gtk_container_remove (GTK_CONTAINER (pThis->m_placeholder), old_child); + gtk_container_add (GTK_CONTAINER (pThis->m_placeholder), child); + } +}; + +#define COLS_NB 5 + +class StartupMenu : public _QueryWidget +{ +GtkWidget *m_widget, *m_list_widget, *m_parent; +Ypp::Node *m_category; +int m_status; + +public: + StartupMenu (GtkWidget *list_widget) : _QueryWidget(), m_category (NULL), m_status (-1) + { + m_parent = 0; + m_list_widget = list_widget; + + m_widget = gtk_vbox_new (FALSE, 12); + gtk_container_set_border_width (GTK_CONTAINER (m_widget), 12); + g_signal_connect (G_OBJECT (m_widget), "expose-event", + G_CALLBACK (paint_white_expose_cb), NULL); + + GtkWidget *header, *table; + header = header_new (_("Categories")); + int categories_nb = 0; + for (Ypp::Node *i = Ypp::get()->getFirstCategory2 (Ypp::Package::PACKAGE_TYPE); + i; i = i->next()) + categories_nb++; + table = table_new (categories_nb+1); + GtkWidget *button = button_new (NULL, _("All Packages")); + table_pack (table, button); + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (category_clicked_cb), this); + for (Ypp::Node *i = Ypp::get()->getFirstCategory2 (Ypp::Package::PACKAGE_TYPE); + i; i = i->next()) { + GtkWidget *button = button_new (i->icon, i->name.c_str()); + table_pack (table, button); + g_object_set_data (G_OBJECT (button), "category", i); + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (category_clicked_cb), this); + } + gtk_box_pack_start (GTK_BOX (m_widget), header, FALSE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (m_widget), table, FALSE, TRUE, 0); + + header = header_new (_("Status")); + table = table_new (4); + button = button_new (GTK_STOCK_NETWORK, _("Available")); + g_object_set_data (G_OBJECT (button), "status", GINT_TO_POINTER (0)); + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (status_clicked_cb), this); + table_pack (table, button); + button = button_new (GTK_STOCK_HARDDISK, _("Installed")); + g_object_set_data (G_OBJECT (button), "status", GINT_TO_POINTER (1)); + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (status_clicked_cb), this); + table_pack (table, button); + button = button_new (GTK_STOCK_GO_UP, _("Upgrades")); + g_object_set_data (G_OBJECT (button), "status", GINT_TO_POINTER (2)); + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (status_clicked_cb), this); + table_pack (table, button); + button = button_new (GTK_STOCK_UNDO, _("Modified")); + g_object_set_data (G_OBJECT (button), "status", GINT_TO_POINTER (3)); + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (status_clicked_cb), this); + table_pack (table, button); + gtk_box_pack_start (GTK_BOX (m_widget), header, FALSE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (m_widget), table, FALSE, TRUE, 0); + + g_object_ref_sink (m_list_widget); + g_object_ref_sink (m_widget); + gtk_widget_show_all (m_widget); + } + + ~StartupMenu() + { + g_object_unref (G_OBJECT (m_widget)); + g_object_unref (G_OBJECT (m_list_widget)); + } + + static GtkWidget *header_new (const char *title) + { + GtkWidget *label = gtk_label_new (title); + YGUtils::setWidgetFont (label, PANGO_STYLE_NORMAL, PANGO_WEIGHT_BOLD, PANGO_SCALE_LARGE); + GdkColor gray = { 0, 200 << 8, 200 << 8, 200 << 8 }; + gtk_widget_modify_fg (label, GTK_STATE_NORMAL, &gray); + GtkWidget *header = gtk_hbox_new (FALSE, 2); + gtk_box_pack_start (GTK_BOX (header), label, FALSE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (header), gtk_hseparator_new(), TRUE, TRUE, 0); + return header; + } + + static GtkWidget *table_new (int nb) + { + int rows = nb / COLS_NB, cols = COLS_NB; + if (nb % COLS_NB != 0) + rows++; + GtkWidget *table = gtk_table_new (rows, cols, TRUE); + gtk_table_set_row_spacings (GTK_TABLE (table), 6); + gtk_table_set_col_spacings (GTK_TABLE (table), 6); + return table; + } + + static void table_pack (GtkWidget *table, GtkWidget *child) + { // unlike gtk_table_attach(), no need to pass the exact positioning + // and no, gtk_container_add() doesn't work + GList *children = gtk_container_get_children (GTK_CONTAINER (table)); + guint pos = g_list_length (children); + g_list_free (children); + guint cols_nb; + g_object_get (G_OBJECT (table), "n-columns", &cols_nb, NULL); + guint col = pos % cols_nb, row = pos / cols_nb; + gtk_table_attach (GTK_TABLE (table), child, col, col+1, row, row+1, + GTK_FILL, GTK_FILL, 0, 0); + } + + static GtkWidget *button_new (const char *icon, const char *title) + { + GtkWidget *button = gtk_button_new_with_label (title); + if (icon) { + GtkWidget *image = gtk_image_new_from_icon_name (icon, GTK_ICON_SIZE_BUTTON); + gtk_button_set_image (GTK_BUTTON (button), image); + gtk_widget_show (image); + } + return button; + } + + virtual GtkWidget *getWidget() { return m_widget; } + + virtual void updateType (Ypp::Package::Type type) {} + virtual void updateList (Ypp::PkgList list) {} + virtual bool begsUpdate() { return false; } + + virtual bool writeQuery (Ypp::QueryAnd *query) + { + if (m_category) { + query->add (new Ypp::QueryCategory (m_category, true)); + return true; + } + switch (m_status) { + case 0: + query->add (new Ypp::QueryProperty ("is-installed", false)); + return true; + case 1: + query->add (new Ypp::QueryProperty ("is-installed", true)); + return true; + case 2: + query->add (new Ypp::QueryProperty ("has-upgrade", true)); + return true; + case 3: + query->add (new Ypp::QueryProperty ("to-modify", true)); + return true; + case -1: default: break; + } + return false; + } + + void applySelection() + { + if (!m_parent) + m_parent = gtk_widget_get_parent (m_widget); + gtk_container_remove (GTK_CONTAINER (m_parent), m_widget); + gtk_container_add (GTK_CONTAINER (m_parent), m_list_widget); + notify(); + } + + void restore() + { + gtk_container_remove (GTK_CONTAINER (m_parent), m_list_widget); + gtk_container_add (GTK_CONTAINER (m_parent), m_widget); + } + + static void category_clicked_cb (GtkButton *button, StartupMenu *pThis) + { + pThis->m_category = (Ypp::Node *) g_object_get_data (G_OBJECT (button), "category"); + pThis->applySelection(); + } + + static void status_clicked_cb (GtkButton *button, StartupMenu *pThis) + { + pThis->m_status = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (button), "status")); + pThis->applySelection(); + } +}; + class UI : public YGtkPackageView::Listener, _QueryListener, Ypp::Disk::Listener { GtkWidget *m_widget, *m_disk_label, *m_arrange_combo; @@ -3072,6 +3245,7 @@ std::list <_QueryWidget *> m_query; DetailBox *m_details; DiskView *m_disk; +StartupMenu *m_startup_menu; Ypp::Package::Type m_type; Toolbar *m_toolbar; @@ -3099,36 +3273,11 @@ gtk_widget_set_size_request (search_entry->getWidget(), 160, -1); } - CategoryCombo *category_combo = 0; - if (categories_top) { - category_combo = new CategoryCombo(); - m_query.push_back (category_combo); - } - StatusCombo *status_combo = 0; - if (status_top) { - status_combo = new StatusCombo(); - m_query.push_back (status_combo); - } - UndoView *undo_view = 0; if (undo_side || undo_tab) undo_view = new UndoView(); - GtkWidget *arrange_box = 0; - if (arrange_by) { - arrange_box = gtk_hbox_new (FALSE, 4); - gtk_box_pack_start (GTK_BOX (arrange_box), gtk_label_new (_("Software arranged by")), FALSE, TRUE, 0); - m_arrange_combo = gtk_combo_box_new_text(); - gtk_combo_box_append_text (GTK_COMBO_BOX (m_arrange_combo), _("Groups")); - gtk_combo_box_append_text (GTK_COMBO_BOX (m_arrange_combo), _("Repositories")); - gtk_combo_box_append_text (GTK_COMBO_BOX (m_arrange_combo), _("Status")); - gtk_combo_box_set_active (GTK_COMBO_BOX (m_arrange_combo), 0); - gtk_box_pack_start (GTK_BOX (arrange_box), m_arrange_combo, FALSE, TRUE, 0); - g_signal_connect (G_OBJECT (m_arrange_combo), "changed", - G_CALLBACK (arrange_combo_changed_cb), this); - } - - GtkWidget *packages_box; + GtkWidget *packages_view; if (status_tabs) { m_installed_view = ygtk_package_view_new (TRUE); m_installed_view->setListener (this); @@ -3137,7 +3286,7 @@ m_upgrades_view = ygtk_package_view_new (TRUE); m_upgrades_view->setListener (this); - packages_box = ygtk_notebook_new(); + packages_view = ygtk_notebook_new(); const char **labels; if (status_tabs_as_actions) { const char *t[] = { _("_Install"), _("_Upgrade"), _("_Remove"), _("Undo") }; @@ -3147,71 +3296,92 @@ const char *t[] = { _("_Available"), _("_Upgrades"), _("_Installed"), _("Summary") }; labels = t; } - gtk_notebook_append_page (GTK_NOTEBOOK (packages_box), + gtk_notebook_append_page (GTK_NOTEBOOK (packages_view), GTK_WIDGET (m_available_view), gtk_label_new_with_mnemonic (labels[0])); - gtk_notebook_append_page (GTK_NOTEBOOK (packages_box), + gtk_notebook_append_page (GTK_NOTEBOOK (packages_view), GTK_WIDGET (m_upgrades_view), gtk_label_new_with_mnemonic (labels[1])); - gtk_notebook_append_page (GTK_NOTEBOOK (packages_box), + gtk_notebook_append_page (GTK_NOTEBOOK (packages_view), GTK_WIDGET (m_installed_view), gtk_label_new_with_mnemonic (labels[2])); if (undo_tab) { GtkWidget *box = gtk_event_box_new(); gtk_container_add (GTK_CONTAINER (box), undo_view->createView (this, true)); gtk_container_set_border_width (GTK_CONTAINER (box), 6); - gtk_notebook_append_page (GTK_NOTEBOOK (packages_box), + gtk_notebook_append_page (GTK_NOTEBOOK (packages_view), box, gtk_label_new_with_mnemonic (labels[3])); } if (search_entry) { // FIXME: only the entry itself is shown, without the "Find:" label ygtk_notebook_set_corner_widget ( - YGTK_NOTEBOOK (packages_box), search_entry->getWidget()); + YGTK_NOTEBOOK (packages_view), search_entry->getWidget()); } } else { m_all_view = ygtk_package_view_new (TRUE); m_all_view->setListener (this); gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (m_all_view), GTK_SHADOW_IN); + packages_view = GTK_WIDGET (m_all_view); + } + + GtkWidget *packages_box = gtk_vbox_new (FALSE, 4); + if (arrange_by) { + GtkWidget *arrange_box = gtk_hbox_new (FALSE, 4); + gtk_box_pack_start (GTK_BOX (arrange_box), gtk_label_new (_("Software arranged by")), FALSE, TRUE, 0); + m_arrange_combo = gtk_combo_box_new_text(); + gtk_combo_box_append_text (GTK_COMBO_BOX (m_arrange_combo), _("Groups")); + gtk_combo_box_append_text (GTK_COMBO_BOX (m_arrange_combo), _("Repositories")); + gtk_combo_box_append_text (GTK_COMBO_BOX (m_arrange_combo), _("Status")); + gtk_combo_box_set_active (GTK_COMBO_BOX (m_arrange_combo), 0); + gtk_box_pack_start (GTK_BOX (arrange_box), m_arrange_combo, FALSE, TRUE, 0); + g_signal_connect (G_OBJECT (m_arrange_combo), "changed", + G_CALLBACK (arrange_combo_changed_cb), this); - packages_box = gtk_vbox_new (FALSE, 4); + gtk_box_pack_start (GTK_BOX (packages_box), arrange_box, FALSE, TRUE, 0); + } + + { GtkWidget *header_box = gtk_hbox_new (FALSE, 6); - if (arrange_box) { - gtk_box_pack_start (GTK_BOX (header_box), arrange_box, FALSE, TRUE, 0); - gtk_box_pack_start (GTK_BOX (header_box), gtk_event_box_new(), TRUE, TRUE, 0); + GtkWidget *header = gtk_label_new_with_mnemonic (_("_Listing:")); + gtk_misc_set_alignment (GTK_MISC (header), 0, .5); + gtk_label_set_mnemonic_widget (GTK_LABEL (header), GTK_WIDGET (m_all_view)); + gtk_box_pack_start (GTK_BOX (header_box), header, TRUE, TRUE, 0); + + if (status_top) { + PropertyCombo *combo = new PropertyCombo (new StatusModel()); + m_query.push_back (combo); + gtk_box_pack_start (GTK_BOX (header_box), combo->getWidget(), FALSE, TRUE, 0); + } + if (categories_top) { + PropertyCombo *combo = new PropertyCombo (new CategoryModel()); + m_query.push_back (combo); + gtk_box_pack_start (GTK_BOX (header_box), combo->getWidget(), FALSE, TRUE, 0); + } + if (repositories_top) { + PropertyCombo *combo = new PropertyCombo (new RepositoryModel()); + m_query.push_back (combo); + gtk_box_pack_start (GTK_BOX (header_box), combo->getWidget(), FALSE, TRUE, 0); } - else { - GtkWidget *header = gtk_label_new_with_mnemonic (_("_Listing:")); - gtk_misc_set_alignment (GTK_MISC (header), 0, .5); - gtk_label_set_mnemonic_widget (GTK_LABEL (header), GTK_WIDGET (m_all_view)); - gtk_box_pack_start (GTK_BOX (header_box), header, TRUE, TRUE, 0); - } - if (category_combo) - gtk_box_pack_start (GTK_BOX (header_box), category_combo->getWidget(), FALSE, TRUE, 0); - if (status_combo) - gtk_box_pack_start (GTK_BOX (header_box), status_combo->getWidget(), FALSE, TRUE, 0); - if (search_entry) + if (search_entry && !status_tabs) gtk_box_pack_start (GTK_BOX (header_box), search_entry->getWidget(), FALSE, TRUE, 0); + + if (startup_menu) { + GtkWidget *button = gtk_button_new_from_stock (GTK_STOCK_GO_BACK); + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (back_clicked_cb), this); + gtk_box_pack_start (GTK_BOX (header_box), button, FALSE, TRUE, 0); + } + gtk_box_pack_start (GTK_BOX (packages_box), header_box, FALSE, TRUE, 0); - gtk_box_pack_start (GTK_BOX (packages_box), GTK_WIDGET (m_all_view), TRUE, TRUE, 0); } - GtkWidget *packages_button_box = gtk_vbox_new (FALSE, 4); - if (status_tabs && (arrange_box || category_combo || status_combo)) { - GtkWidget *hbox = gtk_hbox_new (FALSE, 6); - if (arrange_box) - gtk_box_pack_start (GTK_BOX (hbox), arrange_box, FALSE, TRUE, 0); - if (category_combo) - gtk_box_pack_start (GTK_BOX (hbox), category_combo->getWidget(), FALSE, TRUE, 0); - if (status_combo) - gtk_box_pack_start (GTK_BOX (hbox), status_combo->getWidget(), FALSE, TRUE, 0); - gtk_box_pack_start (GTK_BOX (packages_button_box), hbox, FALSE, TRUE, 0); - } - gtk_box_pack_start (GTK_BOX (packages_button_box), packages_box, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (packages_box), packages_view, TRUE, TRUE, 0); + if (!toolbar_top && toolbar_yast) - gtk_box_pack_start (GTK_BOX (packages_button_box), (m_toolbar = new Toolbar (true))->getWidget(), FALSE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (packages_box), (m_toolbar = new Toolbar (true))->getWidget(), FALSE, TRUE, 0); GtkWidget *packages_pane = gtk_hpaned_new(); - gtk_paned_pack1 (GTK_PANED (packages_pane), packages_button_box, TRUE, FALSE); + gtk_paned_pack1 (GTK_PANED (packages_pane), packages_box, TRUE, FALSE); ChangesPane *changes_pane = 0; GtkWidget *undo_widget; if (undo_side) { @@ -3268,34 +3438,77 @@ gtk_box_pack_start (GTK_BOX (side_vbox), search_entry->getWidget(), FALSE, TRUE, 0); } - GtkWidget *cat_pane = gtk_vpaned_new(); + _QueryWidget *category_view; + GtkWidget *vpaned = 0, *vbox = 0; + StackWidget *stack1 = 0, *stack2 = 0; + if (expander_sidebar) + vbox = gtk_expander_vbox_new (2); + if (layered_sidebar) { + stack1 = new StackWidget(); + stack2 = new StackWidget(); + } + if (categories_side) { - _QueryWidget *categories = new CategoryView(); - m_query.push_back (categories); - gtk_paned_pack1 (GTK_PANED (cat_pane), categories->getWidget(), TRUE, FALSE); + _QueryWidget *view = new PropertyView (new CategoryModel()); + category_view = view; + m_query.push_back (view); + if (expander_sidebar) { + gtk_expander_set_expanded (GTK_EXPANDER (view->getWidget()), TRUE); + gtk_box_pack_start (GTK_BOX (vbox), view->getWidget(), FALSE, TRUE, 0); + } + else if (grid_sidebar) + ; + else if (stack1) + stack1->append (_("Categories"), view->getWidget()); + else + vpaned = gtk_vpaned_append (vpaned, view->getWidget()); + } + if (repositories_side) { + _QueryWidget *view = new PropertyView (new RepositoryModel()); + m_query.push_back (view); + if (expander_sidebar) + gtk_box_pack_start (GTK_BOX (vbox), view->getWidget(), FALSE, TRUE, 0); + else if (stack1) + stack1->append (_("Repositories"), view->getWidget()); + else + vpaned = gtk_vpaned_append (vpaned, view->getWidget()); } if (status_side) { - _QueryWidget *statuses = new StatusView(); - m_query.push_back (statuses); - gtk_paned_pack2 (GTK_PANED (cat_pane), statuses->getWidget(), TRUE, FALSE); + _QueryWidget *view = new PropertyView (new StatusModel()); + m_query.push_back (view); + if (expander_sidebar) { + gtk_expander_set_expanded (GTK_EXPANDER (view->getWidget()), TRUE); + gtk_box_pack_start (GTK_BOX (vbox), view->getWidget(), FALSE, TRUE, 0); + } + else if (stack2) + stack2->append (_("Status"), view->getWidget()); + else + vpaned = gtk_vpaned_append (vpaned, view->getWidget()); + } + if (grid_sidebar && category_view && vpaned) { + GtkWidget *hpaned = gtk_hpaned_new(); + gtk_paned_pack1 (GTK_PANED (hpaned), category_view->getWidget(), TRUE, FALSE); + gtk_paned_pack2 (GTK_PANED (hpaned), vpaned, TRUE, FALSE); + vpaned = hpaned; + } + + if (vpaned) + gtk_box_pack_start (GTK_BOX (side_vbox), vpaned, TRUE, TRUE, 0); + if (vbox) + gtk_box_pack_start (GTK_BOX (side_vbox), vbox, TRUE, TRUE, 0); + if (layered_sidebar) { + GtkWidget *vpaned = gtk_vpaned_new(); + gtk_paned_pack1 (GTK_PANED (vpaned), stack1->getWidget(), TRUE, FALSE); + gtk_paned_pack2 (GTK_PANED (vpaned), stack2->getWidget(), TRUE, FALSE); + gtk_box_pack_start (GTK_BOX (side_vbox), vpaned, TRUE, TRUE, 0); } - gtk_box_pack_start (GTK_BOX (side_vbox), cat_pane, TRUE, TRUE, 0); GtkWidget *side_pane = gtk_hpaned_new(); gtk_paned_pack1 (GTK_PANED (side_pane), side_vbox, FALSE, TRUE); gtk_paned_pack2 (GTK_PANED (side_pane), view_pane, TRUE, FALSE); - gtk_paned_set_position (GTK_PANED (side_pane), 150); - - for (std::list <_QueryWidget *>::const_iterator it = m_query.begin(); - it != m_query.end(); it++) { - (*it)->updateType (m_type); - (*it)->setListener (this); - } - refresh(); - updateDisk(); - Ypp::get()->getDisk()->addListener (this); + gtk_paned_set_position (GTK_PANED (side_pane), grid_sidebar ? 250 : 150); - GtkWidget *vbox = gtk_vbox_new (FALSE, 6); + vbox = gtk_vbox_new (FALSE, 6); if (toolbar_top) { m_toolbar = new Toolbar (false); gtk_box_pack_start (GTK_BOX (vbox), m_toolbar->getWidget(), FALSE, TRUE, 0); @@ -3312,6 +3525,21 @@ gtk_widget_hide (side_vbox); if (changes_pane) changes_pane->startHack(); + + if (startup_menu) { + m_startup_menu = new StartupMenu (m_widget); + m_query.push_back (m_startup_menu); + m_widget = m_startup_menu->getWidget(); + } + + for (std::list <_QueryWidget *>::const_iterator it = m_query.begin(); + it != m_query.end(); it++) { + (*it)->updateType (m_type); + (*it)->setListener (this); + } + refresh(); + updateDisk(); + Ypp::get()->getDisk()->addListener (this); } ~UI() @@ -3320,6 +3548,7 @@ it != m_query.end(); it++) delete *it; delete m_disk; + delete m_startup_menu; } private: @@ -3488,6 +3717,11 @@ { pThis->refresh(); } + + static void back_clicked_cb (GtkButton *button, UI *pThis) + { + pThis->m_startup_menu->restore(); + } }; #include "pkg-selector-help.h" Modified: trunk/gtk/src/pkg/ygtkpackageview.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpackageview.cc?r… ============================================================================== --- trunk/gtk/src/pkg/ygtkpackageview.cc (original) +++ trunk/gtk/src/pkg/ygtkpackageview.cc Fri Jan 15 03:22:46 2010 @@ -20,7 +20,8 @@ #include <string.h> extern bool status_col, action_col, action_col_as_button, action_col_as_check, - action_col_label, version_col, colorful_rows, single_line_rows; + action_col_label, version_col, colorful_rows, italicize_changed_row, + golden_changed_row, single_line_rows; //** Icons resources @@ -114,6 +115,7 @@ SIZE_PROP, INSTALLED_VERSION_PROP, AVAILABLE_VERSION_PROP, // checks TO_INSTALL_PROP, TO_UPGRADE_PROP, TO_REMOVE_PROP, TO_MODIFY_PROP, + IS_INSTALLED_PROP, // internal STYLE_PROP, WEIGHT_PROP, SENSITIVE_PROP, CHECK_VISIBLE_PROP, FOREGROUND_PROP, VERSION_FOREGROUND_PROP, BACKGROUND_PROP, XPAD_PROP, @@ -145,6 +147,7 @@ case TO_UPGRADE_PROP: case TO_REMOVE_PROP: case TO_MODIFY_PROP: + case IS_INSTALLED_PROP: case SENSITIVE_PROP: case CHECK_VISIBLE_PROP: return G_TYPE_BOOLEAN; @@ -185,6 +188,7 @@ case TO_UPGRADE_PROP: case TO_REMOVE_PROP: case TO_MODIFY_PROP: + case IS_INSTALLED_PROP: g_value_set_boolean (value, FALSE); break; case STYLE_PROP: @@ -507,15 +511,25 @@ case TO_MODIFY_PROP: g_value_set_boolean (value, package->toModify()); break; + case IS_INSTALLED_PROP: // if is-installed at the end + bool installed; + if (package->toInstall()) + installed = true; + else if (package->toRemove()) + installed = false; + else + installed = package->isInstalled(); + g_value_set_boolean (value, installed); + break; case SENSITIVE_PROP: { bool sensitive = !package->isLocked(); g_value_set_boolean (value, sensitive); break; } case STYLE_PROP: { - if (colorful_rows) { + if (italicize_changed_row) { PangoStyle style = PANGO_STYLE_NORMAL; - if (package->isAuto()) + if (package->toModify()) style = PANGO_STYLE_ITALIC; g_value_set_int (value, style); } @@ -525,17 +539,23 @@ } case VERSION_FOREGROUND_PROP: case FOREGROUND_PROP: { + const char *color = 0; if (colorful_rows) { - const char *color = NULL; if (!package->isInstalled()) color = "darkgray"; if (col == VERSION_FOREGROUND_PROP) if (package->hasUpgrade()) color = "blue"; - g_value_set_string (value, color); } - else - _getValueDefault (col, value); + g_value_set_string (value, color); + break; + } + case BACKGROUND_PROP: { + const char *color = 0; + if (golden_changed_row) + if (package->toModify()) + color = "yellow"; + g_value_set_string (value, color); break; } case WEIGHT_PROP: { @@ -668,6 +688,8 @@ return SIZE_PROP; if (prop == "to-install") return TO_INSTALL_PROP; + if (prop == "is-installed") + return IS_INSTALLED_PROP; return (Property) 0; } @@ -706,10 +728,10 @@ clear(); if (action_col) { - if (action_col_as_button) + if (action_col_as_check) + appendCheckColumn ("is-installed"); //("to-install"); + else //if (action_col_as_button) appendButtonColumn (NULL, "to-install"); - else // if (action_col_as_check) - appendCheckColumn ("to-install"); } if (status_col) appendIconColumn (NULL, "icon"); @@ -864,6 +886,8 @@ return REMOVE_ACTION; case TO_MODIFY_PROP: return UNDO_ACTION; + case IS_INSTALLED_PROP: + return TOGGLE_ACTION; } } @@ -1181,6 +1205,12 @@ case INSTALL_ACTION: package->install (0); break; case REMOVE_ACTION: package->remove(); break; case UNDO_ACTION: package->undo(); break; + case TOGGLE_ACTION: + if (package->isInstalled()) + package->remove(); + else + package->install(0); + break; case NONE_ACTION: break; } /* else @@ -1236,6 +1266,12 @@ case INSTALL_ACTION: packages.install(); break; case REMOVE_ACTION: packages.remove(); break; case UNDO_ACTION: packages.undo(); break; + case TOGGLE_ACTION: + if (packages.installed()) + packages.remove(); + else + packages.install(); + break; case NONE_ACTION: break; } } Modified: trunk/gtk/src/pkg/ygtkpackageview.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpackageview.h?re… ============================================================================== --- trunk/gtk/src/pkg/ygtkpackageview.h (original) +++ trunk/gtk/src/pkg/ygtkpackageview.h Fri Jan 15 03:22:46 2010 @@ -35,7 +35,7 @@ bool isVisible (const std::string &property); void setRulesHint (bool hint); - enum Action { NONE_ACTION, INSTALL_ACTION, REMOVE_ACTION, UNDO_ACTION }; + enum Action { NONE_ACTION, INSTALL_ACTION, REMOVE_ACTION, UNDO_ACTION, TOGGLE_ACTION }; void setActivateAction (Action action); struct Listener { Added: trunk/gtk/tests/Label-Underline.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/tests/Label-Underline.ycp?re… ============================================================================== --- trunk/gtk/tests/Label-Underline.ycp (added) +++ trunk/gtk/tests/Label-Underline.ycp Fri Jan 15 03:22:46 2010 @@ -0,0 +1,31 @@ +// Underline Example - bug 559226 +// +// Escape literal '&' + +{ + import "Wizard"; + import "Popup"; + import "Label"; + + Wizard::CreateDialog (); + Wizard::SetContentsButtons ("Default button demo", + `VBox( + `PushButton("&One"), + `PushButton("&Tw&o"), + `PushButton("Escape&&"), + `PushButton("&Escape &&2"), + `PushButton("&Escape &&2&&&&"), + `PushButton("Escape &&&2&&&&"), + `PushButton("_gtk1"), + `PushButton("__gtk2") + ), + "Help", + Label::BackButton(), + Label::NextButton() + ); + + + Wizard::UserInput(); + Wizard::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] r60385 - in /trunk/ca-management: src/YaPI/CaManagement.pm src/YaPI/caUtils.pm src/common_cert.ycp yast2-ca-management.spec.in
by mcalmer＠svn.opensuse.org 14 Jan '10

14 Jan '10

Author: mcalmer Date: Thu Jan 14 18:21:53 2010 New Revision: 60385 URL: http://svn.opensuse.org/viewcvs/yast?rev=60385&view=rev Log: start implementing remove server certificate feature (fate#306590) Modified: trunk/ca-management/src/YaPI/CaManagement.pm trunk/ca-management/src/YaPI/caUtils.pm trunk/ca-management/src/common_cert.ycp trunk/ca-management/yast2-ca-management.spec.in Modified: trunk/ca-management/src/YaPI/CaManagement.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/src/YaPI/CaManagem… ============================================================================== --- trunk/ca-management/src/YaPI/CaManagement.pm (original) +++ trunk/ca-management/src/YaPI/CaManagement.pm Thu Jan 14 18:21:53 2010 @@ -162,6 +162,10 @@ and copy them to a place where other YaST modules look for such a common certificate. +$bool = RemoveCommonServerCertificate($valueMap) + + Remove a common server certificate + $bool = ReadFile($valueMap) Returns a certificate or CRL as plain text or parsed map. @@ -6115,7 +6119,32 @@ return 1; } +=item * +C<$bool = RemoveCommonServerCertificate($valueMap)> + +Remove a common server certificate from disk + +=cut + +BEGIN { $TYPEINFO{RemoveCommonServerCertificate} = ["function", "boolean"]; } +sub RemoveCommonServerCertificate { + my $self = shift; + + if ( -e "/etc/ssl/servercerts/servercert.pem" ) + { + unlink("/etc/ssl/servercerts/servercert.pem"); + } + if ( -e "/etc/ssl/servercerts/serverkey.pem" ) + { + unlink("/etc/ssl/servercerts/serverkey.pem"); + } + if ( -e "/etc/ssl/certs/YaST-CA.pem" ) + { + unlink("/etc/ssl/certs/YaST-CA.pem"); + } + return 1; +} =item * C<$bool = ReadFile($valueMap)> Modified: trunk/ca-management/src/YaPI/caUtils.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/src/YaPI/caUtils.p… ============================================================================== --- trunk/ca-management/src/YaPI/caUtils.pm (original) +++ trunk/ca-management/src/YaPI/caUtils.pm Thu Jan 14 18:21:53 2010 @@ -56,7 +56,7 @@ 'X509v3 Subject Key Identifier' => 'subjectKeyIdentifier', 'X509v3 Certificate Policies' => 'certificatePolicies', 'Authority Information Access' => 'authorityInfoAccess', - + 'nsCaRevocationUrl' => 'Netscape CA Revocation Url' , 'nsCaPolicyUrl' => 'Netscape CA Policy Url' , 'nsBaseUrl' => 'Netscape Base Url' , @@ -70,12 +70,12 @@ 'keyUsage' => 'X509v3 Key Usage' , 'issuserAltName' => 'X509v3 Issuer Alternative Name', 'subjectAltName' => 'X509v3 Subject Alternative Name', - 'authorityKeyIdentifier' => 'X509v3 Authority Key Identifier', + 'authorityKeyIdentifier' => 'X509v3 Authority Key Identifier', 'extendedKeyUsage' => 'X509v3 Extended Key Usage' , 'subjectKeyIdentifier' => 'X509v3 Subject Key Identifier' , 'certificatePolicies' => 'X509v3 Certificate Policies' , 'authorityInfoAccess' => 'Authority Information Access' , - + # double entry 'email' => 'email', 'URI' => 'URI', 'DNS' => 'DNS', @@ -100,17 +100,17 @@ 'msEFS' => 'Microsoft Encrypted File System', 'nsSGC' => 'Netscape Server Gated Crypto', - 'SSL/TLS Web Server Authentication' => 'serverAuth' , - 'SSL/TLS Web Client Authentication' => 'clientAuth' , - 'Code signing' => 'codeSigning' , + 'SSL/TLS Web Server Authentication' => 'serverAuth' , + 'SSL/TLS Web Client Authentication' => 'clientAuth' , + 'Code signing' => 'codeSigning' , 'E-mail Protection' => 'emailProtection', - 'Trusted Timestamping' => 'timeStamping' , - 'Microsoft Individual Code Signing' => 'msCodeInd' , - 'Microsoft Commercial Code Signing' => 'msCodeCom' , - 'Microsoft Trust List Signing' => 'msCTLSign' , - 'Microsoft Server Gated Crypto' => 'msSGC' , - 'Microsoft Encrypted File System' => 'msEFS' , - 'Netscape Server Gated Crypto' => 'nsSGC' , + 'Trusted Timestamping' => 'timeStamping' , + 'Microsoft Individual Code Signing' => 'msCodeInd' , + 'Microsoft Commercial Code Signing' => 'msCodeCom' , + 'Microsoft Trust List Signing' => 'msCTLSign' , + 'Microsoft Server Gated Crypto' => 'msSGC' , + 'Microsoft Encrypted File System' => 'msEFS' , + 'Netscape Server Gated Crypto' => 'nsSGC' , 'client' => 'SSL Client', 'server' => 'SSL Server', @@ -132,15 +132,15 @@ 'decipherOnly' => 'Decipher Only', - 'SSL Client' => 'client' , - 'SSL Server' => 'server' , - 'S/MIME' => 'email' , - 'Object Signing' => 'objsign' , + 'SSL Client' => 'client' , + 'SSL Server' => 'server' , + 'S/MIME' => 'email' , + 'Object Signing' => 'objsign' , 'Unused' => 'reserved', 'SSL CA' => 'sslCA' , 'S/MIME CA' => 'emailCA' , 'Object Signing CA' => 'objCA' , - + 'Digital Signature' => 'digitalSignature', 'Non Repudiation' => 'nonRepudiation' , 'Key Encipherment' => 'keyEncipherment' , @@ -165,7 +165,7 @@ if($p eq "critical") { $crit = 1; next; - } + } if(uc($p) eq "CA:TRUE") { $ca = 1; next; @@ -184,9 +184,9 @@ my $bc = new LIMAL::CaMgm::BasicConstraintsExt(); if(!defined $value || $value eq "") { - + $bc->setPresent(0); - + } else { $bc->setBasicConstraints($ca, $pathl); @@ -194,7 +194,7 @@ $bc->setCritical($crit); } } - + $exts->setBasicConstraints($bc); return 1; } @@ -208,7 +208,7 @@ my $crit = 0; my $string = ""; - if ( !grep( ($_ eq $type), + if ( !grep( ($_ eq $type), ("nsComment", "nsBaseUrl", "nsRevocationUrl", "nsCaRevocationUrl", "nsRenewalUrl", "nsCaPolicyUrl", "nsSslServerName") ) ) { @@ -224,16 +224,16 @@ } if(defined $2) { $string = $2; - } + } } - + if($type eq "nsComment") { my $e = new LIMAL::CaMgm::NsCommentExt(); if(!defined $value || $value eq "") { - + $e->setPresent(0); - + } else { $e->setValue($string); @@ -241,16 +241,16 @@ $e->setCritical($crit); } } - + $exts->setNsComment($e); - + } elsif($type eq "nsBaseUrl") { my $e = new LIMAL::CaMgm::NsBaseUrlExt(); if(!defined $value || $value eq "") { - + $e->setPresent(0); - + } else { $e->setValue($string); @@ -258,16 +258,16 @@ $e->setCritical($crit); } } - + $exts->setNsBaseUrl($e); } elsif($type eq "nsRevocationUrl") { my $e = new LIMAL::CaMgm::NsRevocationUrlExt(); if(!defined $value || $value eq "") { - + $e->setPresent(0); - + } else { $e->setValue($string); @@ -275,16 +275,16 @@ $e->setCritical($crit); } } - + $exts->setNsRevocationUrl($e); } elsif($type eq "nsCaRevocationUrl") { my $e = new LIMAL::CaMgm::NsCaRevocationUrlExt(); if(!defined $value || $value eq "") { - + $e->setPresent(0); - + } else { $e->setValue($string); @@ -292,16 +292,16 @@ $e->setCritical($crit); } } - + $exts->setNsCaRevocationUrl($e); } elsif($type eq "nsRenewalUrl") { my $e = new LIMAL::CaMgm::NsRenewalUrlExt(); if(!defined $value || $value eq "") { - + $e->setPresent(0); - + } else { $e->setValue($string); @@ -309,16 +309,16 @@ $e->setCritical($crit); } } - + $exts->setNsRenewalUrl($e); } elsif($type eq "nsCaPolicyUrl") { my $e = new LIMAL::CaMgm::NsCaPolicyUrlExt(); if(!defined $value || $value eq "") { - + $e->setPresent(0); - + } else { $e->setValue($string); @@ -326,16 +326,16 @@ $e->setCritical($crit); } } - + $exts->setNsCaPolicyUrl($e); } elsif($type eq "nsSslServerName") { my $e = new LIMAL::CaMgm::NsSslServerNameExt(); if(!defined $value || $value eq "") { - + $e->setPresent(0); - + } else { $e->setValue($string); @@ -343,7 +343,7 @@ $e->setCritical($crit); } } - + $exts->setNsSslServerName($e); } return 1; @@ -361,7 +361,7 @@ if($p eq "critical") { $crit = 1; next; - } + } if(lc($p) eq "client") { $ct |= $LIMAL::CaMgm::NsCertTypeExt::client; @@ -395,13 +395,13 @@ $ct |= $LIMAL::CaMgm::NsCertTypeExt::objCA; } - } - + } + my $e = new LIMAL::CaMgm::NsCertTypeExt(); if(!defined $value || $value eq "") { - + $e->setPresent(0); - + } else { $e->setNsCertType($ct); @@ -409,7 +409,7 @@ $e->setCritical($crit); } } - + $exts->setNsCertType($e); return 1; @@ -427,7 +427,7 @@ if($p eq "critical") { $crit = 1; next; - } + } if(lc($p) eq "digitalsignature") { $ku |= $LIMAL::CaMgm::KeyUsageExt::digitalSignature; @@ -465,13 +465,13 @@ $ku |= $LIMAL::CaMgm::KeyUsageExt::decipherOnly; } - } - + } + my $e = new LIMAL::CaMgm::KeyUsageExt(); if(!defined $value || $value eq "") { - + $e->setPresent(0); - + } else { $e->setKeyUsage($ku); @@ -479,7 +479,7 @@ $e->setCritical($crit); } } - + $exts->setKeyUsage($e); return 1; @@ -511,9 +511,9 @@ my $e = new LIMAL::CaMgm::SubjectKeyIdentifierExt(); if(!defined $value || $value eq "") { - + $e->setPresent(0); - + } else { $e->setSubjectKeyIdentifier($auto, $hv); @@ -521,7 +521,7 @@ $e->setCritical($crit); } } - + $exts->setSubjectKeyIdentifier($e); return 1; } @@ -560,9 +560,9 @@ my $e = new LIMAL::CaMgm::AuthorityKeyIdentifierGenerateExt(); if(!defined $value || $value eq "") { - + $e->setPresent(0); - + } else { $e->setKeyID($keyID); @@ -571,7 +571,7 @@ $e->setCritical($crit); } } - + $exts->setAuthorityKeyIdentifier($e); return 1; @@ -582,7 +582,7 @@ my $exts = shift; my $value = shift || ""; my $forDefaults = shift || 0; - + my $crit = 0; my $emailCopy = 0; my $list = new LIMAL::CaMgm::LiteralValueList(); @@ -612,15 +612,15 @@ } next; } - + $list->push_back(new LIMAL::CaMgm::LiteralValue($p)); } my $e = new LIMAL::CaMgm::SubjectAlternativeNameExt(); if(!defined $value || $value eq "") { - + $e->setPresent(0); - + } else { $e->setCopyEmail($emailCopy); @@ -629,7 +629,7 @@ $e->setCritical($crit); } } - + $exts->setSubjectAlternativeName($e); return 1; @@ -640,7 +640,7 @@ my $exts = shift; my $value = shift || ""; my $forDefaults = shift || 0; - + my $crit = 0; my $issuerCopy = 0; my $list = new LIMAL::CaMgm::LiteralValueList(); @@ -676,18 +676,18 @@ my $e = new LIMAL::CaMgm::IssuerAlternativeNameExt(); if(!defined $value || $value eq "") { - + $e->setPresent(0); - + } else { - + $e->setCopyIssuer($issuerCopy); $e->setAlternativeNameList($list); if($crit) { $e->setCritical($crit); } } - + $exts->setIssuerAlternativeName($e); return 1; @@ -700,7 +700,7 @@ my $crit = 0; my $list = new LIMAL::StringList(); - + foreach my $p (split(/\s*,\s*/ , $value)) { if($p eq "critical") { $crit = 1; @@ -711,17 +711,17 @@ my $e = new LIMAL::CaMgm::ExtendedKeyUsageExt(); if(!defined $value || $value eq "") { - + $e->setPresent(0); - + } else { - + $e->setExtendedKeyUsage($list); if($crit) { $e->setCritical($crit); } } - + $exts->setExtendedKeyUsage($e); return 1; @@ -734,7 +734,7 @@ my $crit = 0; my $list = new LIMAL::CaMgm::AuthorityInformationList(); - + foreach my $p (split(/\s*,\s*/ , $value)) { if($p eq "critical") { $crit = 1; @@ -743,7 +743,7 @@ my($accessOID, $location) = split(/\s*;\s*/ , $p, 2); if ( $accessOID eq "OCSP" || $accessOID eq "caIssuers" || $accessOID =~ /^(\d+\.)+\d+$/ ) { - + my $lv = new LIMAL::CaMgm::LiteralValue($location); my $ai = new LIMAL::CaMgm::AuthorityInformation($accessOID, $lv); @@ -753,17 +753,17 @@ my $e = new LIMAL::CaMgm::AuthorityInfoAccessExt(); if(!defined $value || $value eq "") { - + $e->setPresent(0); - + } else { - + $e->setAuthorityInformation($list); if($crit) { $e->setCritical($crit); } } - + $exts->setAuthorityInfoAccess($e); return 1; @@ -787,17 +787,17 @@ my $e = new LIMAL::CaMgm::CRLDistributionPointsExt(); if(!defined $value || $value eq "") { - + $e->setPresent(0); - + } else { - + $e->setCRLDistributionPoints($list); if($crit) { $e->setCritical($crit); } } - + $exts->setCRLDistributionPoints($e); return 1; @@ -865,7 +865,7 @@ } push @vals, $ext->getValue(); - + $ret->{$type} = join(', ', @vals); return 1; @@ -889,7 +889,7 @@ push @vals , "critical"; } - + if($ext->isEnabledFor($LIMAL::CaMgm::NsCertTypeExt::client)) { push @vals, "client"; } @@ -914,7 +914,7 @@ if($ext->isEnabledFor($LIMAL::CaMgm::NsCertTypeExt::objCA)) { push @vals, "objCA"; } - + $ret->{'nsCertType'} = join(', ', @vals); return 1; @@ -938,7 +938,7 @@ push @vals , "critical"; } - + if($ext->isEnabledFor($LIMAL::CaMgm::KeyUsageExt::digitalSignature)) { push @vals, "digitalSignature"; } @@ -966,7 +966,7 @@ if($ext->isEnabledFor($LIMAL::CaMgm::KeyUsageExt::decipherOnly)) { push @vals, "decipherOnly"; } - + $ret->{'keyUsage'} = join(', ', @vals); return 1; @@ -990,7 +990,7 @@ push @vals , "critical"; } - + if($ext->isAutoDetectionEnabled()) { push @vals, "hash"; @@ -1000,7 +1000,7 @@ push @vals, $ext->getKeyID(); } - + $ret->{'subjectKeyIdentifier'} = join(', ', @vals); return 1; @@ -1042,7 +1042,7 @@ { push @vals, "issuer:always"; } - + $ret->{'authorityKeyIdentifier'} = join(', ', @vals); return 1; @@ -1077,7 +1077,7 @@ for(my $it = $list->begin(); !$list->iterator_equal($it, $list->end()); - $list->iterator_incr($it)) + $list->iterator_incr($it)) { if($list->iterator_value($it)->getType() eq "1.3.6.1.4.1.311.20.2.3") { @@ -1092,7 +1092,7 @@ push @vals, $list->iterator_value($it)->toString(); } } - + $ret->{'subjectAltName'} = join(', ', @vals); return 1; @@ -1127,7 +1127,7 @@ for(my $it = $list->begin(); !$list->iterator_equal($it, $list->end()); - $list->iterator_incr($it)) + $list->iterator_incr($it)) { if($list->iterator_value($it)->getType() eq "1.3.6.1.4.1.311.20.2.3") { @@ -1142,7 +1142,7 @@ push @vals, $list->iterator_value($it)->toString(); } } - + $ret->{'issuerAltName'} = join(', ', @vals); return 1; @@ -1171,13 +1171,13 @@ for(my $it = $list->begin(); !$list->iterator_equal($it, $list->end()); - $list->iterator_incr($it)) + $list->iterator_incr($it)) { push @vals, $list->iterator_value($it); - + } - + $ret->{'extendedKeyUsage'} = join(', ', @vals); return 1; @@ -1206,13 +1206,13 @@ for(my $it = $list->begin(); !$list->iterator_equal($it, $list->end()); - $list->iterator_incr($it)) + $list->iterator_incr($it)) { my $ai = $list->iterator_value($it); my $str = $ai->getAccessOID().";".$ai->getLocation()->toString(); push @vals, $str; } - + $ret->{'authorityInfoAccess'} = join(', ', @vals); return 1; @@ -1241,11 +1241,11 @@ for(my $it = $list->begin(); !$list->iterator_equal($it, $list->end()); - $list->iterator_incr($it)) + $list->iterator_incr($it)) { push @vals, $list->iterator_value($it)->toString(); } - + $ret->{'crlDistributionPoints'} = join(', ', @vals); return 1; @@ -1273,7 +1273,7 @@ ref($ret->{$1}) eq "ARRAY") { my @a = @{$ret->{$1}}; - + push(@a, $2); $ret->{$1} = \@a; @@ -1291,9 +1291,9 @@ my $self = shift; my $cert = shift; my $ret = {}; - + $ret->{PLAIN_EXTENSIONS} = $cert->getExtensionsAsText(); - + $ret->{DN_HASH} = $self->parseDN($cert->getSubjectDN()); $ret->{ISSUER_HASH} = $self->parseDN($cert->getIssuerDN()); @@ -1303,9 +1303,9 @@ my @a = split('\n', $cert->getCertificateAsText()); my $found = 0; - + my $val = ""; - + foreach my $line (@a) { chomp($line); @@ -1324,7 +1324,10 @@ $ret->{NOTBEFORE} = $self->time2human($cert->getStartDate()); $ret->{NOTAFTER} = $self->time2human($cert->getEndDate()); - + $ret->{NOTBEFORE_UNIX} = $cert->getStartDate(); + $ret->{NOTAFTER_UNIX} = $cert->getEndDate(); + $ret->{EXPIRED} = ($cert->getEndDate() < time)?1:0; + $ret->{FINGERPRINT} = $cert->getFingerprint(); $ret->{KEYSIZE} = $cert->getKeysize(); @@ -1371,7 +1374,7 @@ if(exists $ret->{DN_HASH}->{emailAddress}) { @em = @{$ret->{DN_HASH}->{emailAddress}}; } - + if($cert->getExtensions()->getSubjectAlternativeName()->isPresent()) { my $list = $cert->getExtensions()->getSubjectAlternativeName()->getAlternativeNameList(); @@ -1379,9 +1382,9 @@ for(my $it = $list->begin(); !$list->iterator_equal($it, $list->end()); $list->iterator_incr($it)) { - + if($list->iterator_value($it)->getType() eq "email") { - + push @em, $list->iterator_value($it)->getValue(); } } @@ -1416,15 +1419,15 @@ my $self = shift; my $crl = shift; my $ret = {}; - + $ret->{PLAIN_EXTENSIONS} = $crl->getExtensionsAsText(); - + $ret->{ISSUER_HASH} = $self->parseDN($crl->getIssuerDN()); $ret->{ISSUER} = $crl->getIssuerDN()->getOpenSSLString(); $ret->{LASTUPDATE} = $self->time2human($crl->getLastUpdateDate()); $ret->{NEXTUPDATE} = $self->time2human($crl->getNextUpdateDate()); - + $ret->{FINGERPRINT} = $crl->getFingerprint(); if($crl->getSignatureAlgorithm() == $LIMAL::CaMgm::E_SHA1RSA) { @@ -1503,18 +1506,18 @@ my $self = shift; my $req = shift; my $ret = {}; - + $ret->{PLAIN_EXTENSIONS} = $req->getExtensionsAsText(); - + $ret->{SUBJECT_HASH} = $self->parseDN($req->getSubjectDN()); $ret->{DN} = $req->getSubjectDN()->getOpenSSLString(); my @a = split('\n', $req->getRequestAsText()); my $found = 0; - + my $val = ""; - + foreach my $line (@a) { chomp($line); @@ -1581,7 +1584,7 @@ if(exists $ret->{SUBJECT_HASH}->{emailAddress}) { @em = @{$ret->{SUBJECT_HASH}->{emailAddress}}; } - + if($req->getExtensions()->getSubjectAlternativeName()->isPresent()) { my $list = $req->getExtensions()->getSubjectAlternativeName()->getAlternativeNameList(); @@ -1589,11 +1592,11 @@ for(my $it = $list->begin(); !$list->iterator_equal($it, $list->end()); $list->iterator_incr($it)) { - + if($list->iterator_value($it)->getType() eq "email") { - + push @em, $list->iterator_value($it)->getValue(); - + } } } @@ -1666,13 +1669,13 @@ for(my $it = $list->begin(); !$list->iterator_equal($it, $list->end()); $list->iterator_incr($it)) { - - if($list->iterator_value($it)->getType() eq "1.3.6.1.4.1.311.20.2.3") + + if($list->iterator_value($it)->getType() eq "1.3.6.1.4.1.311.20.2.3") { $val .= "MS-UPN:".$list->iterator_value($it)->getValue().", "; - + } - elsif($list->iterator_value($it)->getType() eq "1.3.6.1.5.2.2") + elsif($list->iterator_value($it)->getType() eq "1.3.6.1.5.2.2") { $val .= "K5PN:".$list->iterator_value($it)->getValue().", "; } @@ -1695,18 +1698,18 @@ my $ext = {}; my $newExt = {}; - + $ext = $data->{OPENSSL_EXTENSIONS}; delete $data->{OPENSSL_EXTENSIONS}; foreach my $a (keys %$ext) { - + my $newKey = $transMap->{$a}; - + $newExt->{$newKey}->{description} = $a; $newExt->{$newKey}->{critical} = 0; $newExt->{$newKey}->{value} = []; - + foreach my $b (@{$ext->{$a}}) { if($b =~ /^\s*critical/) { @@ -1762,7 +1765,7 @@ # not supported by openssl next; } - + my $h = {}; $h->{type} = $transMap->{$sp1[0]}; if(!defined $h->{type}) { @@ -1810,9 +1813,9 @@ my $self = shift; my $data = shift || return $self->SetError(summary => __("Missing 'data' map."), code => "PARAM_CHECK_FAILED"); - + foreach my $key (keys %{$data}) { - # we check only common values. + # we check only common values. # It is possible that keys appear which could not be checked. if ( $key eq "caName" || $key eq "newCaName") { if (! defined $data->{$key} || @@ -1863,10 +1866,10 @@ code => "PARAM_CHECK_FAILED"); } } elsif ( $key eq "crlReason") { - if ( !grep( ($_ eq $data->{$key}), + if ( !grep( ($_ eq $data->{$key}), ("unspecified", "keyCompromise", "CACompromise", - "affiliationChanged", "superseded", - "cessationOfOperation", "certificateHold") ) ) + "affiliationChanged", "superseded", + "cessationOfOperation", "certificateHold") ) ) { return $self->SetError(summary => sprintf(__("Invalid value '%s' for parameter '%s'."),$data->{$key}, $key), code => "PARAM_CHECK_FAILED"); @@ -1890,7 +1893,7 @@ } } elsif ( $key eq "basicConstraints") { # test critical - if ($data->{$key} =~ /critical/ && + if ($data->{$key} =~ /critical/ && $data->{$key} !~ /^\s*critical/) { return $self->SetError(summary => sprintf(__("Wrong use of 'critical' in '%s'."),$key), code => "PARAM_CHECK_FAILED"); @@ -1904,21 +1907,21 @@ __("Unknown value '%s' in '%s'."), $p, $key), code => "PARAM_CHECK_FAILED"); - } + } if ($data->{$key} =~ /^\s*(critical)?\s*$/) { return $self->SetError(summary => sprintf(__("Invalid value '%s' for parameter '%s'."),$data->{$key}, $key), code => "PARAM_CHECK_FAILED"); } } elsif ( $key eq "nsComment") { # test critical - if ($data->{$key} =~ /critical/ && + if ($data->{$key} =~ /critical/ && $data->{$key} !~ /^\s*critical/) { return $self->SetError(summary => sprintf(__("Wrong use of 'critical' in '%s'."),$key), code => "PARAM_CHECK_FAILED"); } } elsif ( $key eq "nsCertType") { # test critical - if ($data->{$key} =~ /critical/ && + if ($data->{$key} =~ /critical/ && $data->{$key} !~ /^\s*critical/) { return $self->SetError(summary => sprintf(__("Wrong use of 'critical' in '%s'."),$key), code => "PARAM_CHECK_FAILED"); @@ -1937,7 +1940,7 @@ } } elsif ( $key eq "keyUsage") { # test critical - if ($data->{$key} =~ /critical/ && + if ($data->{$key} =~ /critical/ && $data->{$key} !~ /^\s*critical/) { return $self->SetError(summary => sprintf(__("Wrong use of 'critical' in '%s'."),$key), code => "PARAM_CHECK_FAILED"); @@ -1948,7 +1951,7 @@ "keyEncipherment", "dataEncipherment", "keyAgreement", "keyCertSign", "cRLSign", "encipherOnly", "decipherOnly"))) - { + { return $self->SetError(summary => sprintf(__("Invalid value '%s' for parameter '%s'."),$data->{$key}, $key), code => "PARAM_CHECK_FAILED"); } @@ -1959,7 +1962,7 @@ } } elsif ( $key eq "subjectKeyIdentifier") { # test critical - if ($data->{$key} =~ /critical/ && + if ($data->{$key} =~ /critical/ && $data->{$key} !~ /^\s*critical/) { return $self->SetError(summary => sprintf(__("Wrong use of 'critical' in '%s'."),$key), code => "PARAM_CHECK_FAILED"); @@ -1977,7 +1980,7 @@ } } elsif ( $key eq "authorityKeyIdentifier") { # test critical - if ($data->{$key} =~ /critical/ && + if ($data->{$key} =~ /critical/ && $data->{$key} !~ /^\s*critical/) { return $self->SetError(summary => sprintf(__("Wrong use of 'critical' in '%s'."),$key), code => "PARAM_CHECK_FAILED"); @@ -1986,7 +1989,7 @@ next if($p eq "critical"); next if(grep( ($_ eq $p), ("issuer:always", "keyid:always", "issuer", "keyid"))); - + return $self->SetError(summary => sprintf(__("Invalid value '%s' for parameter '%s'."),$data->{$key}, $key), code => "PARAM_CHECK_FAILED"); } @@ -1996,7 +1999,7 @@ } } elsif ( $key eq "subjectAltName" || $key eq "issuerAltName") { # test critical - if ($data->{$key} =~ /critical/ && + if ($data->{$key} =~ /critical/ && $data->{$key} !~ /^\s*critical/) { return $self->SetError(summary => sprintf(__("Wrong use of 'critical' in '%s'."),$key), code => "PARAM_CHECK_FAILED"); @@ -2071,7 +2074,7 @@ $key eq "nsCaRevocationUrl" || $key eq "nsRenewalUrl" || $key eq "nsCaPolicyUrl" ) { # test critical - if ($data->{$key} =~ /critical/ && + if ($data->{$key} =~ /critical/ && $data->{$key} !~ /^\s*critical/) { return $self->SetError(summary => sprintf(__("Wrong use of 'critical' in '%s'."),$key), code => "PARAM_CHECK_FAILED"); @@ -2085,7 +2088,7 @@ } } elsif ( $key eq "nsSslServerName") { # test critical - if ($data->{$key} =~ /critical/ && + if ($data->{$key} =~ /critical/ && $data->{$key} !~ /^\s*critical/) { return $self->SetError(summary => sprintf(__("Wrong use of 'critical' in '%s'."),$key), code => "PARAM_CHECK_FAILED"); @@ -2096,7 +2099,7 @@ } } elsif ( $key eq "extendedKeyUsage") { # test critical - if ($data->{$key} =~ /critical/ && + if ($data->{$key} =~ /critical/ && $data->{$key} !~ /^\s*critical/) { return $self->SetError(summary => sprintf(__("Wrong use of 'critical' in '%s'."),$key), code => "PARAM_CHECK_FAILED"); @@ -2110,17 +2113,17 @@ "msSGC", "msEFS", "nsSGC", "msSmartcardLogin"))); return $self->SetError(summary => sprintf( __("Invalid value '%s' for parameter '%s'."), - $p, $key), + $p, $key), code => "PARAM_CHECK_FAILED"); } if ($data->{$key} =~ /^\s*(critical)?\s*$/) { return $self->SetError(summary => sprintf(__("Invalid value '%s' for parameter '%s'."),$data->{$key}, $key), code => "PARAM_CHECK_FAILED"); } - + } elsif ( $key eq "authorityInfoAccess") { # test critical - if ($data->{$key} =~ /critical/ && + if ($data->{$key} =~ /critical/ && $data->{$key} !~ /^\s*critical/) { return $self->SetError(summary => sprintf(__("Wrong use of 'critical' in '%s'."),$key), code => "PARAM_CHECK_FAILED"); @@ -2184,7 +2187,7 @@ } } elsif ( $key eq "crlDistributionPoints") { # test critical - if ($data->{$key} =~ /critical/ && + if ($data->{$key} =~ /critical/ && $data->{$key} !~ /^\s*critical/) { return $self->SetError(summary => sprintf(__("Wrong use of 'critical' in '%s'."),$key), code => "PARAM_CHECK_FAILED"); @@ -2217,12 +2220,12 @@ sub exception2String { my $self = shift; my $err = shift || undef; - - if(!defined $err) + + if(!defined $err) { return ""; } - elsif(ref($err) eq "HASH") + elsif(ref($err) eq "HASH") { my $msg = ""; if(exists $err->{type} && defined $err->{type}) Modified: trunk/ca-management/src/common_cert.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/src/common_cert.yc… ============================================================================== --- trunk/ca-management/src/common_cert.ycp (original) +++ trunk/ca-management/src/common_cert.ycp Thu Jan 14 18:21:53 2010 @@ -37,58 +37,97 @@ Wizard::CreateDialog(); Wizard::SetDesktopIcon("ca-management"); -// help text 1/4 +// help text 1/5 string helptext = _("The Common Server Certificate will be used by other YaST modules."); -// help text 2/4 +// help text 2/5 helptext = helptext + _("This certificate can be exchanged by importing a certificate from a file."); -// help text 3/4 +// help text 3/5 helptext = helptext + _("Certificates can be written to a file using Export to File in section Certificate in the CA Management module."); -// help text 3/4 +// help text 4/5 helptext = helptext + _("Certificates to import from disk must have been written in PKCS12 format with CA chain."); +// help text 5/5 +helptext = helptext + _("You can remove the Certificates from disk. But make sure, that it is not used anymore by other services."); + symbol ui = nil; repeat { string ret = (string) YaPI::CaManagement::ReadFile ($[ "inFile":"/etc/ssl/servercerts/servercert.pem", - "datatype":"CERTIFICATE", - "inForm":"PEM", - "type":"plain"]); - - y2milestone("ReadCertificate(/etc/ssl/certs/YaST-CA.pem): %1", ret); + "datatype":"CERTIFICATE", + "inForm":"PEM", + "type":"plain"]); + + y2milestone("ReadCertificate(/etc/ssl/servercerts/servercert.pem): %1", ret); if (ret == nil) { - ret = "<pre>Common Server Certificate not found.\nYou can import a certificate from disk</pre>"; + ret = "<pre>Common Server Certificate not found.\nYou can import a certificate from disk</pre>"; } else { - ret = "<pre>" + ret + "</pre>"; + ret = "<pre>" + ret + "</pre>"; } - term contents = `VBox ( - `Left(`Label (_("Description"))), - `VSpacing (0.5), - `RichText (ret), - `VSpacing (0.5), - `Right (`PushButton (`id(`importDisk), _("&Import"))) - ); - + `Left(`Label (_("Description"))), + `VSpacing (0.5), + `RichText (ret), + `VSpacing (0.5), + `HBox ( // push button label + `HStretch(), + `PushButton (`id(`remove), _("&Remove")), + `PushButton (`id(`importDisk), _("&Import"))) + ); + // To translators: dialog label Wizard::SetContents (_("Common Server Certificate"), contents, helptext, false, true); Wizard::SetNextButton(`next, Label::FinishButton() ); - + ui = (symbol) UI::UserInput (); if (ui == `importDisk) { - importCertificateFromDisk(); - ui = `again; + importCertificateFromDisk(); + ui = `again; + } + if (ui == `remove) + { + map crt = (map) YaPI::CaManagement::ReadFile ($[ "inFile":"/etc/ssl/servercerts/servercert.pem", + "datatype":"CERTIFICATE", + "inForm":"PEM", + "type":"parsed"]); + integer expired = (integer) crt["EXPIRED"]:0; + boolean reallyRemove = false; + if (expired == 1) + { + // To translators: popup yes/no question + reallyRemove = Popup::YesNo( "Really remove the Certificate?" ); + } + else + { + //removeCertificateFromDisk(); + reallyRemove = Popup::AnyQuestion( Label::WarningMsg(), + // To translators: warning popup yes/no question (1/3) + _("The certificate is not yet expired.\n")+ + // To translators: warning popup yes/no question (2/3) + _("Please make sure, that no service use this certificate anymore.\n\n")+ + // To translators: warning popup yes/no question (3/3) + _("Are you sure, that you want to remove the certificate?"), + Label::YesButton(), + Label::NoButton(), + `focus_no ); + } + y2milestone ("Remove certificate? => %1", reallyRemove); + if ( reallyRemove ) + { + YaPI::CaManagement::RemoveCommonServerCertificate(); + } + ui = `again; + } + if(ui == `cancel) + { + ui = `abort; } - if(ui == `cancel) - { - ui = `abort; - } } until (contains ([`back, `next, `abort], ui)); Wizard::CloseDialog(); Modified: trunk/ca-management/yast2-ca-management.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/yast2-ca-managemen… ============================================================================== --- trunk/ca-management/yast2-ca-management.spec.in (original) +++ trunk/ca-management/yast2-ca-management.spec.in Thu Jan 14 18:21:53 2010 @@ -45,3 +45,5 @@ /usr/bin/generateCRL.pl /usr/bin/exportCRL.pl %attr(600, root, root) %config(noreplace) /etc/generateCRL.conf + +%changelog -- 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] r60384 - /tags/stable-2_19_6/network/
by mzugec＠svn.opensuse.org 14 Jan '10

14 Jan '10

Author: mzugec Date: Thu Jan 14 18:00:32 2010 New Revision: 60384 URL: http://svn.opensuse.org/viewcvs/yast?rev=60384&view=rev Log: Created tag stable-2_19_6 for network Added: tags/stable-2_19_6/network/ - copied from r60383, trunk/network/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60383 - in /trunk/network: VERSION package/yast2-network.changes src/clients/save_network.ycp src/modules/Lan.ycp src/modules/LanItems.ycp yast2-network.spec.in
by mzugec＠svn.opensuse.org 14 Jan '10

14 Jan '10

Author: mzugec Date: Thu Jan 14 18:00:25 2010 New Revision: 60383 URL: http://svn.opensuse.org/viewcvs/yast?rev=60383&view=rev Log: support for BOOTPROTO=ibft option (bnc#551380) Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/clients/save_network.ycp trunk/network/src/modules/Lan.ycp trunk/network/src/modules/LanItems.ycp trunk/network/yast2-network.spec.in Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=60383&r1=603… ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Thu Jan 14 18:00:25 2010 @@ -1 +1 @@ -2.19.5 +2.19.6 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Thu Jan 14 18:00:25 2010 @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jan 14 17:59:48 CET 2010 - mzugec(a)suse.cz + +- support for BOOTPROTO=ibft option (bnc#551380) +- 2.19.6 + ------------------------------------------------------------------ Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz Modified: trunk/network/src/clients/save_network.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/clients/save_network… ============================================================================== --- trunk/network/src/clients/save_network.ycp (original) +++ trunk/network/src/clients/save_network.ycp Thu Jan 14 18:00:25 2010 @@ -31,7 +31,7 @@ map <string, any> InstallInf = $[]; // global variable because chrooted environment -boolean network_disk=false; +integer network_disk=0; /** * Read one install.inf item @@ -206,34 +206,61 @@ } -map <string,any> hwcfg=$[]; +//map <string,any> hwcfg=$[]; +list<map> hardware=ReadHardware("netcard"); +y2milestone("hardware %1", hardware); + + void CreateIfcfg(){ string network_configuration=""; - // set BOOTPROTO=[ static | dhcp ] - if (InstallInf["bootproto"]:"dhcp"=="static") - { - // add broadcast interface #suse49131 - network_configuration=sformat("BOOTPROTO='static'\nIPADDR='%1/%2'\nBROADCAST='%3'\n", - InstallInf["ipaddr"]:"", Netmask::ToBits(InstallInf["netmask"]:""), InstallInf["bcast"]:""); - if(size(InstallInf["ipaddr6"]:"")>0){ - network_configuration=sformat("%1\n%2", network_configuration, - sformat("LABEL_ipv6='ipv6'\nIPADDR_ipv6='%1'\n", InstallInf["ipaddr6"]:"") - ); - } - } - else - { - //DHCP (also for IPv6) setup - if (InstallInf["bootproto"]:""=="dhcp") network_configuration="BOOTPROTO='dhcp4'\n"; - else if (InstallInf["bootproto"]:""=="dhcp6") network_configuration="BOOTPROTO='dhcp6'\n"; - else if (InstallInf["bootproto"]:""=="dhcp,dhcp6") network_configuration="BOOTPROTO='dhcp'\n"; - - // set DHCP_SET_HOSTNAME=yes #suse30528 - y2milestone("set DHCLIENT_SET_HOSTNAME=yes on installed system"); - SCR::Execute(.target.bash_output, "sed -i s/\"DHCLIENT_SET_HOSTNAME=.*\"/'DHCLIENT_SET_HOSTNAME=\"yes\"'/g /etc/sysconfig/network/dhcp"); + + if (network_disk==1 && contains(NetworkStorage::getiBFTDevices(), InstallInf["netdevice"]:"")){ + network_configuration = sformat("%1STARTMODE='nfsroot'\nBOOTPROTO='ibft'\n", network_configuration); + } else { + + // set BOOTPROTO=[ static | dhcp ] + if (InstallInf["bootproto"]:"dhcp"=="static") + { + // add broadcast interface #suse49131 + network_configuration=sformat("BOOTPROTO='static'\nIPADDR='%1/%2'\nBROADCAST='%3'\n", + InstallInf["ipaddr"]:"", Netmask::ToBits(InstallInf["netmask"]:""), InstallInf["bcast"]:""); + if(size(InstallInf["ipaddr6"]:"")>0){ + network_configuration=sformat("%1\n%2", network_configuration, + sformat("LABEL_ipv6='ipv6'\nIPADDR_ipv6='%1'\n", InstallInf["ipaddr6"]:"") + ); + } + } + else + { + //DHCP (also for IPv6) setup + if (InstallInf["bootproto"]:""=="dhcp") network_configuration="BOOTPROTO='dhcp4'\n"; + else if (InstallInf["bootproto"]:""=="dhcp6") network_configuration="BOOTPROTO='dhcp6'\n"; + else if (InstallInf["bootproto"]:""=="dhcp,dhcp6") network_configuration="BOOTPROTO='dhcp'\n"; + + // set DHCP_SET_HOSTNAME=yes #suse30528 + y2milestone("set DHCLIENT_SET_HOSTNAME=yes on installed system"); + SCR::Execute(.target.bash_output, "sed -i s/\"DHCLIENT_SET_HOSTNAME=.*\"/'DHCLIENT_SET_HOSTNAME=\"yes\"'/g /etc/sysconfig/network/dhcp"); + } + + switch(network_disk) + { + case 0: + network_configuration = sformat("%1STARTMODE='onboot'\n", network_configuration); + break; + case 1: + if (!contains(NetworkStorage::getiBFTDevices(), InstallInf["netdevice"]:"")){ + network_configuration = sformat("%1STARTMODE='nfsroot'\n", network_configuration); + } + break; + case 2: + network_configuration = sformat("%1STARTMODE='nfsroot'\n", network_configuration); + break; + } + } + // wireless devices (bnc#223570) if ( size(InstallInf["WESSID"]:"")>0 ) { @@ -274,25 +301,11 @@ network_configuration = sformat("%1LLADDR='%2'\n", network_configuration, InstallInf["hwaddr"]:""); - if (network_disk) - { - network_configuration = sformat("%1STARTMODE='nfsroot'\n", network_configuration); - } - else - { - network_configuration = sformat("%1STARTMODE='auto'\n", network_configuration); - } - - // reference to hardware configuration - // network_configuration = sformat("%1_nm_name='%2'\n", network_configuration, hwcfg); // point to point interface if (size(InstallInf["remote_ip"]:"")>0) network_configuration = sformat("%1REMOTE_IPADDR='%2'\n", network_configuration, InstallInf["remote_ip"]:""); - list<map> hardware=ReadHardware("netcard"); - y2milestone("hardware %1", hardware); - string ifcfg = sformat("ifcfg-%1", InstallInf["netdevice"]:""); string hw_name = BuildDescription(NetworkInterfaces::device_type(InstallInf["netdevice"]:""), NetworkInterfaces::device_num(ifcfg), $["dev_name":InstallInf["netdevice"]:""], hardware); @@ -411,7 +424,7 @@ y2milestone("Copy %1 into %2", copy_from, copy_to); string cmd = sformat("cp %1 %2", copy_from, copy_to); y2internal("cml %1:%2", cmd, SCR::Execute(.target.bash_output, cmd)); - }); + }); // merge files with default installed by sysconfig foreach(string file, ["dhcp", "config"], { Modified: trunk/network/src/modules/Lan.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Lan.ycp?rev=… ============================================================================== --- trunk/network/src/modules/Lan.ycp (original) +++ trunk/network/src/modules/Lan.ycp Thu Jan 14 18:00:25 2010 @@ -26,7 +26,7 @@ import "NetworkConfig"; import "NetworkInterfaces"; import "NetworkService"; -import "NetworkStorage"; +//import "NetworkStorage"; import "Package"; import "ProductFeatures"; import "Routing"; Modified: trunk/network/src/modules/LanItems.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/LanItems.ycp… ============================================================================== --- trunk/network/src/modules/LanItems.ycp (original) +++ trunk/network/src/modules/LanItems.ycp Thu Jan 14 18:00:25 2010 @@ -1384,7 +1384,7 @@ netmask = ""; bootproto = "dhcp"; // #176804 - if (NetworkStorage::isDiskOnNetwork ( NetworkStorage::getDevice("/") )) + if (NetworkStorage::isDiskOnNetwork ( NetworkStorage::getDevice("/") )>0) { startmode = "nfsroot"; y2milestone ("startmode nfsroot"); Modified: trunk/network/yast2-network.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/yast2-network.spec.in?re… ============================================================================== --- trunk/network/yast2-network.spec.in (original) +++ trunk/network/yast2-network.spec.in Thu Jan 14 18:00:25 2010 @@ -9,10 +9,10 @@ BuildRequires: yast2-devtools yast2-testsuite BuildRequires: yast2-country BuildRequires: yast2-installation >= 2.15.27 -BuildRequires: yast2 >= 2.16.6 -# ProductControl::Disable* - yast2-2.18.23 -Requires: yast2 >= 2.18.23 +# NetworkStorage: adapt functions needed for iBFT (bnc#551380) +BuildRequires: yast2 >= 2.19.3 +Requires: yast2 >= 2.19.3 #netconfig (FaTE #303618) Requires: sysconfig >= 0.71.2 #GetLanguageCountry -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0