YaST Commits July 2007

yast-commit@lists.opensuse.org

26 participants
747 discussions

[yast-commit] r39837 - in /trunk/packager: package/yast2-packager.changes src/modules/ProductLicense.ycp
by locilka＠svn.opensuse.org 31 Jul '07

31 Jul '07

Author: locilka Date: Tue Jul 31 14:28:01 2007 New Revision: 39837 URL: http://svn.opensuse.org/viewcvs/yast?rev=39837&view=rev Log: - New location of licenses on the media - in /media.1/license/ directory in uncompressed state (FATE #302018). Staying backward compatible by supporting /media.1/license.zip as well. Modified: trunk/packager/package/yast2-packager.changes trunk/packager/src/modules/ProductLicense.ycp Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Tue Jul 31 14:28:01 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Jul 31 14:24:52 CEST 2007 - locilka(a)suse.cz + +- New location of licenses on the media - in /media.1/license/ + directory in uncompressed state (FATE #302018). Staying backward + compatible by supporting /media.1/license.zip as well. + +------------------------------------------------------------------- Mon Jul 30 16:21:44 CEST 2007 - locilka(a)suse.cz - Adding new informative text where to find just displayed license Modified: trunk/packager/src/modules/ProductLicense.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/ProductLice… ============================================================================== --- trunk/packager/src/modules/ProductLicense.ycp (original) +++ trunk/packager/src/modules/ProductLicense.ycp Tue Jul 31 14:28:01 2007 @@ -23,6 +23,7 @@ import "Mode"; import "FileUtils"; import "ProductFeatures"; +import "String"; // IMPORTANT: maintainer of yast2-installation is responsible for this module @@ -190,7 +191,9 @@ */ void CleanUpLicense (string tmpdir) { if (tmpdir != nil) - SCR::Execute (.target.bash_output, sformat("rm -rf '%1'", tmpdir)); + SCR::Execute (.target.bash_output, + sformat ("rm -rf '%1'", String::Quote(tmpdir)) + ); } /** @@ -202,6 +205,9 @@ */ map<string,string> LicenseFiles (string dir, list<string> patterns) { map<string,string> ret = $[]; + + if (dir == nil) return ret; + list<string> files = (list<string>)SCR::Read (.target.dir, dir); y2milestone ("All files in license directory: %1", files); @@ -234,7 +240,78 @@ return ret; } +string tmpdir = nil; +string license_dir = nil; +string info_file = nil; + +void GetSourceLicenseDirectory (integer src_id, string fallback_dir) { + y2milestone ("Searching for licenses..."); + + // Base-product license not in installation + if (! Stage::initial() && src_id == nil) { + y2milestone ("Using default license directory %1", fallback_dir); + license_dir = fallback_dir; + if (FileUtils::Exists ("/info.txt")) + info_file = "/info.txt"; + + // First-Stage & Add-on-product license + } else { + y2milestone ("Getting license info from repository %1", src_id); + + info_file = Pkg::SourceProvideOptionalFile (src_id, 1, "/media.1/info.txt"); + + // FATE #302018 + // Licenses are unzipped under 1stMedia:/media.1/license/ + // Don't unzip, just use the directory + license_dir = Pkg::SourceProvideOptionalFile (src_id, 1, "/media.1/license/license.txt"); + if (license_dir != nil) { + license_dir = Pkg::SourceProvideDir (src_id, 1, "/media.1/license/"); + // return from the function + return; + } + y2milestone ("Licenses in /media.1/license/... not supported"); + + // New format didn't work, try the old one 1stMedia:/media.1/license.zip + // using a separate license directory for all products + tmpdir = sformat ("%1/product-license/%2/", (string) SCR::Read(.target.tmpdir), src_id); + license_dir = tmpdir; + string license_file = Pkg::SourceProvideOptionalFile (src_id, 1, "/media.1/license.zip"); + + // no license present + if (license_file == nil) { + y2milestone ("No license present"); + license_dir = nil; + tmpdir = nil; + // return from the function + return; + } + + y2milestone("Product has a license"); + map out = (map)SCR::Execute (.target.bash_output, + sformat ( + " +rm -rf '%1' && \ +mkdir -p '%1' && \ +cd '%1' && \ +unzip -qqo '%2' +", + String::Quote (tmpdir), + String::Quote (license_file) + ) + ); + // Extracting license failed, cannot accept the license + if (out["exit"]:0 != 0) { + y2error("Cannot unzip license -> %1", out); + // popup error + Report::Error (_("An error occurred while preparing the installation system.")); + CleanUpLicense (tmpdir); + license_dir = nil; + } else { + license_dir = tmpdir; + } + } +} /** * Ask user to confirm license agreement @@ -251,59 +328,12 @@ list<string> patterns, string action, boolean enable_back, boolean base_product) { - string tmpdir = nil; - string info_file = nil; string lic_lang = ""; - map<string,string> licenses = $[]; - list<string> available_langs = []; - string license_dir = nil; - - // Base-product license - if (src_id == nil) - { - if (Stage::initial ()) - { - license_dir = Directory::vardir + "/license"; - } - else - { - license_dir = dir; - } - if (FileUtils::Exists ("/info.txt")) - info_file = "/info.txt"; - } - // Add-on-product license - else - { - y2milestone ("Getting license info from repository %1", src_id); - // using a separate license directory for all products - tmpdir = sformat("%1/product-license/%2/", (string) SCR::Read(.target.tmpdir), src_id); - license_dir = tmpdir; - string license_file = Pkg::SourceProvideOptionalFile (src_id, 1, - "/media.1/license.zip"); + map <string, string> licenses = $[]; + list <string> available_langs = []; - // license is part of the add-on product - if (license_file != nil) { - y2milestone("Product has a license"); - map out = (map)SCR::Execute (.target.bash_output, sformat (" -rm -rf '%1' && \ -mkdir -p '%1' && \ -cd '%1' && \ -unzip -qqo '%2' -", tmpdir, license_file)); + GetSourceLicenseDirectory (src_id, dir); - // Extracting license failed, cannot accept the license - if (out["exit"]:0 != 0) - { - y2error("Cannot unzip license -> %1", out); - // popup error - Report::Error (_("An error occurred while preparing the installation system.")); - CleanUpLicense(tmpdir); - return nil; // FIXME - } - } - info_file = Pkg::SourceProvideOptionalFile (src_id, 1, "/media.1/info.txt"); - } licenses = LicenseFiles (license_dir, ["license.txt", "license\\.%1\\.txt"]); if (info_file == nil && size (licenses) == 0) @@ -345,11 +375,11 @@ DisplayLicenseDialog (available_langs, enable_back, lic_lang, licenses); // Display info as a popup if exists if (info_file != nil) - InstShowInfo::show_info_txt(info_file); + InstShowInfo::show_info_txt (info_file); if (lic_lang == nil) { - CleanUpLicense(tmpdir); + if (tmpdir != nil) CleanUpLicense (tmpdir); return `auto; } -- 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] r39838 - in /branches/tmp/mvidner/ui-as-namespace/gtk: ./ mockups/ package/ po/ src/
by mvidner＠svn.opensuse.org 31 Jul '07

31 Jul '07

Author: mvidner Date: Tue Jul 31 14:28:02 2007 New Revision: 39838 URL: http://svn.opensuse.org/viewcvs/yast?rev=39838&view=rev Log: Merged revisions 39047-39835 via svnmerge from http://svn.opensuse.org/svn/yast/trunk/gtk ........ r39098 | rpmcruz | 2007-06-29 18:08:29 +0200 (Pá, 29 čen 2007) | 1 line Check image reference to see if it was well loaded to avoid warnings. ........ r39099 | rpmcruz | 2007-06-29 18:28:59 +0200 (Pá, 29 čen 2007) | 1 line Written MAINTAINER. ........ r39100 | rpmcruz | 2007-06-29 19:45:31 +0200 (Pá, 29 čen 2007) | 3 lines * src/ygtkwizard.c: bug fix: rolled out «let the selection event be fired, when yast programatically selects a tree view item» (was breaking sudo and firewall tools). ........ r39193 | rpmcruz | 2007-07-05 20:11:03 +0200 (Čt, 05 čec 2007) | 1 line Line break confuses auto-stuff. ........ r39427 | rpmcruz | 2007-07-16 13:50:44 +0200 (Po, 16 čec 2007) | 4 lines * src/YGPackageSelector.cc: ported to zypp3 from alpha6: + the SourceManager/Source API has been renamed to RepoManager/Repository /RepoInfo and suffered some changes. + missing include: zypp/Package.h ........ r39437 | rpmcruz | 2007-07-16 16:06:06 +0200 (Po, 16 čec 2007) | 1 line Added a wiki mockup (I am pretty sure from Jakub). ........ r39438 | rpmcruz | 2007-07-16 16:06:58 +0200 (Po, 16 čec 2007) | 1 line Replaced Jakub mockup by a JPEG image (from PNG). ........ r39439 | rpmcruz | 2007-07-16 16:09:06 +0200 (Po, 16 čec 2007) | 1 line Added a couple of TODOs. ........ r39441 | jsrain | 2007-07-16 16:22:02 +0200 (Po, 16 čec 2007) | 3 lines moved changelog to package subdir, added .spec.in and -yast2-gtk-rpmlint files ........ r39442 | jsrain | 2007-07-16 16:26:35 +0200 (Po, 16 čec 2007) | 3 lines Moved the ChangeLog file back, imported package/yast2-gtk.changes from autobuild ........ r39446 | jsrain | 2007-07-16 17:09:46 +0200 (Po, 16 čec 2007) | 2 lines added support for localization ........ r39447 | jsrain | 2007-07-16 17:14:29 +0200 (Po, 16 čec 2007) | 2 lines bump ........ r39517 | rpmcruz | 2007-07-19 06:27:59 +0200 (Čt, 19 čec 2007) | 9 lines * src/YGPackageSelector.cc: Jiri has added gettext support (not sure if it is completed as I don't see the place for PO files and the rules to compile them), so set package selector strings as translatable _( ... ). * po/pt.po: created this translation; dunno how to make the thing being used now... * src/YGPackageSelector.cc: added pre-3 zypp version compatibility; just uncomment #define PRE_ZYPP_3 ........ r39587 | michael_meeks | 2007-07-23 11:56:25 +0200 (Po, 23 čec 2007) | 8 lines 2007-07-23 Michael Meeks <michael.meeks(a)novell.com> * src/YGPackageSelector.cc: handle 0 size partitions, also don't warn for "out of space" errors on < 1Mb partitions: discarding the annoying warning dialog. (PROGRESS): guard against divide-by-zero too. ........ r39590 | michael_meeks | 2007-07-23 13:43:28 +0200 (Po, 23 čec 2007) | 6 lines 2007-07-23 Michael Meeks <michael.meeks(a)novell.com> * src/YGPackageSelector.cc (induceObjects): fix tribool related crasher. ........ r39596 | michael_meeks | 2007-07-23 14:35:44 +0200 (Po, 23 čec 2007) | 10 lines 2007-07-23 Michael Meeks <michael.meeks(a)novell.com> * src/YGPackageSelector.cc * (compat_gtk_tree_model_filter_convert_child_iter_to_iter): back-compat method for older gtk+s (SLED10). * configure.in: autodetect pre ZYPP 3 version, and adapt accordingly. ........ r39605 | michael_meeks | 2007-07-23 16:30:48 +0200 (Po, 23 čec 2007) | 8 lines 2007-07-23 Michael Meeks <michael.meeks(a)novell.com> * src/YGPackageSelector.cc (sync_tree_views_scroll): this needs re-writing to be more efficient in corner cases: eg. no zypp sources. For now use an iteration timeout of 10 loops before bailing out for a big speed win. ........ r39606 | michael_meeks | 2007-07-23 16:34:09 +0200 (Po, 23 čec 2007) | 5 lines 2007-07-23 Michael Meeks <michael.meeks(a)novell.com> * Version 2.15.6, Revison 39597 ........ r39607 | michael_meeks | 2007-07-23 16:34:24 +0200 (Po, 23 čec 2007) | 2 lines get rev right. ........ r39689 | jsrain | 2007-07-26 07:46:15 +0200 (Čt, 26 čec 2007) | 3 lines removed yast2-devel from BuildRequires ........ r39697 | jsrain | 2007-07-26 10:58:04 +0200 (Čt, 26 čec 2007) | 2 lines bump ........ Added: branches/tmp/mvidner/ui-as-namespace/gtk/mockups/jakub-installer-mockup.jpg - copied unchanged from r39697, trunk/gtk/mockups/jakub-installer-mockup.jpg branches/tmp/mvidner/ui-as-namespace/gtk/package/ - copied from r39697, trunk/gtk/package/ branches/tmp/mvidner/ui-as-namespace/gtk/package/yast2-gtk-rpmlintrc - copied unchanged from r39697, trunk/gtk/package/yast2-gtk-rpmlintrc branches/tmp/mvidner/ui-as-namespace/gtk/package/yast2-gtk.changes - copied unchanged from r39697, trunk/gtk/package/yast2-gtk.changes branches/tmp/mvidner/ui-as-namespace/gtk/po/ - copied from r39697, trunk/gtk/po/ branches/tmp/mvidner/ui-as-namespace/gtk/po/pt.po - copied unchanged from r39697, trunk/gtk/po/pt.po branches/tmp/mvidner/ui-as-namespace/gtk/src/YGi18n.h - copied unchanged from r39697, trunk/gtk/src/YGi18n.h branches/tmp/mvidner/ui-as-namespace/gtk/yast2-gtk.spec.in - copied unchanged from r39697, trunk/gtk/yast2-gtk.spec.in Modified: branches/tmp/mvidner/ui-as-namespace/gtk/ (props changed) branches/tmp/mvidner/ui-as-namespace/gtk/ChangeLog branches/tmp/mvidner/ui-as-namespace/gtk/MAINTAINER branches/tmp/mvidner/ui-as-namespace/gtk/POTFILES branches/tmp/mvidner/ui-as-namespace/gtk/TODO branches/tmp/mvidner/ui-as-namespace/gtk/VERSION branches/tmp/mvidner/ui-as-namespace/gtk/configure.in.in branches/tmp/mvidner/ui-as-namespace/gtk/src/YGImage.cc branches/tmp/mvidner/ui-as-namespace/gtk/src/YGPackageSelector.cc branches/tmp/mvidner/ui-as-namespace/gtk/src/YGRichText.cc branches/tmp/mvidner/ui-as-namespace/gtk/src/YGUtils.cc branches/tmp/mvidner/ui-as-namespace/gtk/src/ygtkrichtext.c branches/tmp/mvidner/ui-as-namespace/gtk/src/ygtksteps.c branches/tmp/mvidner/ui-as-namespace/gtk/src/ygtkwizard.c Modified: branches/tmp/mvidner/ui-as-namespace/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/g… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/gtk/ChangeLog (original) +++ branches/tmp/mvidner/ui-as-namespace/gtk/ChangeLog Tue Jul 31 14:28:02 2007 @@ -1,3 +1,63 @@ +2007-07-23 Michael Meeks <michael.meeks(a)novell.com> + + * Version 2.15.6, Revison 39606 + +2007-07-23 Michael Meeks <michael.meeks(a)novell.com> + + * src/YGPackageSelector.cc (sync_tree_views_scroll): this + needs re-writing to be more efficient in corner cases: eg. + no zypp sources. For now use an iteration timeout of 10 + loops before bailing out for a big speed win. + + * src/YGPackageSelector.cc (compat_gtk_tree_model_filter_convert_child_iter_to_iter): + back-compat method for older gtk+s (SLED10). + + * configure.in: autodetect pre ZYPP 3 version, and adapt + accordingly. + + * src/YGPackageSelector.cc (induceObjects): fix tribool related + crasher n#293065. + (PackageSelector): remove m_searching, in favour of the more robust + !m_search_queries.empty() + + * src/YGImage.cc (YGImage::initOptions): set m_isScaled, m_isTiled + before we use them; kill valgrind uninitialized value error churn. + + * src/YGPackageSelector.cc: handle 0 size partitions, + also don't warn for "out of space" errors on < 1Mb partitions: + discarding the annoying warning dialog. + (PROGRESS): guard against divide-by-zero too. + +2007-07-19 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + + * src/YGPackageSelector.cc: Jiri has added gettext support (not sure + if it is completed as I don't see the place for PO files and the rules + to compile them), so set package selector strings as translatable _( ... ). + + * po/pt.po: created this translation; dunno how to make the thing + being used now... + + * src/YGPackageSelector.cc: added pre-3 zypp version compatibility; just + uncomment #define PRE_ZYPP_3 + +2007-71-16 Jiri Srain <jsrain(a)suse.cz> + + * moved changelog to package subdir, added .spec.in and -yast2-gtk-rpmlint + files + +2007-07-16 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + + * src/YGPackageSelector.cc: ported to zypp3 from alpha6: + + the SourceManager/Source API has been renamed to RepoManager/Repository + /RepoInfo and suffered some changes. + + missing include: zypp/Package.h + +2007-06-29 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> + + * src/ygtkwizard.c: bug fix: rolled out Â«let the selection event be + fired, when yast programatically selects a tree view itemÂ» (was + breaking sudo and firewall tools). + 2007-06-21 Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> * src/YGWidget.h/cc (YGScrolledWidget): Because SelectionBox and others don't Modified: branches/tmp/mvidner/ui-as-namespace/gtk/MAINTAINER URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/g… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/gtk/MAINTAINER (original) +++ branches/tmp/mvidner/ui-as-namespace/gtk/MAINTAINER Tue Jul 31 14:28:02 2007 @@ -1 +1,2 @@ -Wild Mongoose <wild.mongoose(a)mongoose.com> \ No newline at end of file +Ricardo Cruz <rpmcruz(a)alunos.dcc.fc.up.pt> \ +Michael Meeks <michael.meeks(a)novell.com> Modified: branches/tmp/mvidner/ui-as-namespace/gtk/POTFILES URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/g… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/gtk/POTFILES (original) +++ branches/tmp/mvidner/ui-as-namespace/gtk/POTFILES Tue Jul 31 14:28:02 2007 @@ -1,25 +0,0 @@ -./src/QY2DiskUsageList.cc -./src/QY2FloppyMountDialog.cc -./src/YQDialog.cc -./src/YQPackageSelector.cc -./src/YQPackageSelectorHelp.cc -./src/YQPkgChangesDialog.cc -./src/YQPkgConflictDialog.cc -./src/YQPkgConflictList.cc -./src/YQPkgDependenciesView.cc -./src/YQPkgDescriptionDialog.cc -./src/YQPkgDiskUsageList.cc -./src/YQPkgDiskUsageWarningDialog.cc -./src/YQPkgLangList.cc -./src/YQPkgList.cc -./src/YQPkgObjList.cc -./src/YQPkgRpmGroupTagsFilterView.cc -./src/YQPkgSearchFilterView.cc -./src/YQPkgSelList.cc -./src/YQPkgStatusFilterView.cc -./src/YQPkgTechnicalDetailsView.cc -./src/YQPkgTextDialog.cc -./src/YQPkgUpdateProblemFilterView.cc -./src/YQPkgVersionsView.cc -./src/YQUI_builtins.cc -./src/YQWizard.cc Modified: branches/tmp/mvidner/ui-as-namespace/gtk/TODO URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/g… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/gtk/TODO (original) +++ branches/tmp/mvidner/ui-as-namespace/gtk/TODO Tue Jul 31 14:28:02 2007 @@ -7,16 +7,20 @@ = Look and feel = -* (YGBarGraph / RatioBox): let tiny widgets still have some pixels visible +* YGtkWizard: navigation bar (see sysconfig module) should be GtkPaned. + +* YGtkWizard: support for skin -- some mockups under mockups/. + +* YGBarGraph / RatioBox: let tiny widgets still have some pixels visible for popup menu. -* (YGRichText) should use GtkHtml when available, so that we get support for +* YGRichText: should use GtkHtml when available, so that we get support for tables. -* (RatioBox) Our buttons are too big in some dialogs (eg. run disk.ycp as user). +* RatioBox: Our buttons are too big in some dialogs (eg. run disk.ycp as user). Check where our algorithm differs from yast-core's. -* (YGTextEntry / YGMultiLineEdit) Add undo/redo support. The backend code should +* YGTextEntry / YGMultiLineEdit: Add undo/redo support. The backend code should be shared. We probably want to make an interface for it that is then implemented by those two GTK widgets. Work out a patch for GTK+. @@ -28,7 +32,7 @@ (downgrade of version should work for most cases -- check how qt does it). Probably a tab for this? -* Internationalization needs to be supported. +* Translation support (i18n -- pot files -- gettext!). * Search syntax: add proper Google syntax support. Consider also adding regex support when Glib ships with it (add radio boxes to entry's context menu). Modified: branches/tmp/mvidner/ui-as-namespace/gtk/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/g… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/gtk/VERSION (original) +++ branches/tmp/mvidner/ui-as-namespace/gtk/VERSION Tue Jul 31 14:28:02 2007 @@ -1 +1 @@ -2.15.4 +2.15.7 Modified: branches/tmp/mvidner/ui-as-namespace/gtk/configure.in.in URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/g… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/gtk/configure.in.in (original) +++ branches/tmp/mvidner/ui-as-namespace/gtk/configure.in.in Tue Jul 31 14:28:02 2007 @@ -32,6 +32,14 @@ AC_HEADER_STDC dnl Try to find the Zypp includes +AC_MSG_CHECKING([for zypp 3]) +if test -f /usr/include/zypp/SourceManager.h; then + AC_DEFINE(PRE_ZYPP_3, 1, [defined if using an older SL10.1 era zypp]) + AC_MSG_RESULT([pre 3]) +else + AC_MSG_RESULT([found]) +fi + PKG_CHECK_MODULES( ZYPP, libzypp ) AC_SUBST(ZYPP_LIBS) Modified: branches/tmp/mvidner/ui-as-namespace/gtk/src/YGImage.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/g… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/gtk/src/YGImage.cc (original) +++ branches/tmp/mvidner/ui-as-namespace/gtk/src/YGImage.cc Tue Jul 31 14:28:02 2007 @@ -31,15 +31,15 @@ m_imageLoaded = false; m_hasZeroWidth = opt.zeroWidth.value(); m_hasZeroHeight = opt.zeroHeight.value(); + m_isAnimation = opt.animated.value(); + m_isScaled = opt.scaleToFit.value(); + m_isTiled = opt.tiled.value(); if (m_hasZeroWidth || m_isScaled || m_isTiled) setStretchable (YD_HORIZ, true); if (m_hasZeroHeight || m_isScaled || m_isTiled) setStretchable (YD_VERT, true); - m_isAnimation = opt.animated.value(); - m_isScaled = opt.scaleToFit.value(); - m_isTiled = opt.tiled.value(); if (m_isScaled && m_isTiled) { y2warning ("YImage can't be scaled and tiled at the same time"); m_isTiled = false; @@ -255,15 +255,6 @@ } YGWIDGET_IMPL_COMMON -/* - virtual bool stretchable (YUIDimension dim) const - { - IMPL - if (m_isScaled) - return true; - return (dim == YD_HORIZ) ? m_hasZeroWidth : m_hasZeroHeight; - } -*/ }; YWidget * Modified: branches/tmp/mvidner/ui-as-namespace/gtk/src/YGPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/g… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/gtk/src/YGPackageSelector.cc (original) +++ branches/tmp/mvidner/ui-as-namespace/gtk/src/YGPackageSelector.cc Tue Jul 31 14:28:02 2007 @@ -2,10 +2,15 @@ * YaST2-GTK - http://en.opensuse.org/YaST2-GTK * ********************************************************************/ +/* + Textdomain "yast2-gtk" +*/ + #include <config.h> #include <ycp/y2log.h> #include <YGUI.h> #include "YGUtils.h" +#include "YGi18n.h" #include "YGWidget.h" #include "YPackageSelector.h" #include "ygtkrichtext.h" @@ -23,11 +28,17 @@ #include <zypp/ui/Selectable.h> #include <zypp/Patch.h> #include <zypp/Selection.h> +#include <zypp/Package.h> #include <zypp/Pattern.h> #include <zypp/Language.h> #include <zypp/Product.h> +#ifdef PRE_ZYPP_3 #include <zypp/Source.h> #include <zypp/SourceManager.h> +#else +#include <zypp/Repository.h> +#include <zypp/RepoManager.h> +#endif /* We should consider linking to libgnome and use gnome_url_show(url) here, or at least do some path finding. */ @@ -75,9 +86,9 @@ return true; } - GtkWidget *dialog = gtk_dialog_new_with_buttons ("License Agreement", + GtkWidget *dialog = gtk_dialog_new_with_buttons (_("License Agreement"), YGUI::ui()->currentWindow(), GTK_DIALOG_MODAL, - "_Reject", GTK_RESPONSE_REJECT, "_Accept", GTK_RESPONSE_ACCEPT, NULL); + _("_Reject"), GTK_RESPONSE_REJECT, _("_Accept"), GTK_RESPONSE_ACCEPT, NULL); GtkWidget *license_view, *license_window; #ifdef PLAIN_TEXT @@ -144,7 +155,7 @@ status = zypp::ui::S_Del; } - // debug +#if 0 // debug const char *name = selectable->name().c_str(); switch (status) { case zypp::ui::S_KeepInstalled: @@ -166,6 +177,7 @@ y2milestone ("error: unknown action: should not happen\n"); break; } +#endif return selectable->set_status (status); } @@ -183,9 +195,9 @@ if (problems.empty()) return true; - GtkWidget *dialog = gtk_dialog_new_with_buttons ("Resolve Problems", + GtkWidget *dialog = gtk_dialog_new_with_buttons (_("Resolve Problems"), YGUI::ui()->currentWindow(), GTK_DIALOG_MODAL, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, "C_onfirm", GTK_RESPONSE_ACCEPT, NULL); + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, _("C_onfirm"), GTK_RESPONSE_ACCEPT, NULL); GtkWidget *problems_view; problems_view = gtk_tree_view_new(); @@ -217,7 +229,7 @@ G_CALLBACK (YGUtils::tree_view_radio_toggle_cb), GTK_TREE_MODEL (problems_store)); - column = gtk_tree_view_column_new_with_attributes ("Problems", + column = gtk_tree_view_column_new_with_attributes (_("Problems"), gtk_cell_renderer_text_new(), "text", 1, NULL); gtk_tree_view_append_column (GTK_TREE_VIEW (problems_view), column); @@ -284,6 +296,7 @@ return false; } +#ifdef PRE_ZYPP_3 static string getSourceName (zypp::Source_Ref source) { // based on yast-qt's singleProduct() if (!source.enabled()) @@ -312,6 +325,7 @@ source.alias().c_str()); return ret; } +#endif #define PACKAGE_INFO_HEIGHT 140 #define ADVANCED_INFO_HEIGHT 80 @@ -345,13 +359,13 @@ gtk_notebook_set_tab_pos (GTK_NOTEBOOK (m_notebook), GTK_POS_BOTTOM); gtk_container_add (GTK_CONTAINER (m_widget), m_notebook); - m_about_text = add_text_tab (m_notebook, "Description"); - m_filelist_text = add_text_tab (m_notebook, "File List"); + m_about_text = add_text_tab (m_notebook, _("Description")); + m_filelist_text = add_text_tab (m_notebook, _("File List")); if ((m_use_filemanager = FILEMANAGER_PRESENT())) g_signal_connect (G_OBJECT (m_filelist_text), "link-pressed", G_CALLBACK (dir_pressed_cb), NULL); - m_history_text = add_text_tab (m_notebook, "History"); - m_authors_text = add_text_tab (m_notebook, "Authors"); + m_history_text = add_text_tab (m_notebook, _("History")); + m_authors_text = add_text_tab (m_notebook, _("Authors")); } gtk_widget_set_size_request (gtk_bin_get_child (GTK_BIN (m_widget)), -1, PACKAGE_INFO_HEIGHT); @@ -398,21 +412,26 @@ description += " "; str = package->url(); if (!str.empty()) - description += "Website: " + str + " "; + description += _("Website: ") + str + " "; str = package->license(); if (!str.empty()) - description += "License: " + str + " "; - description += "Size: " + object->size().asString() + "b "; + description += _("License: ") + str + " "; + description += _("Size: ") + object->size().asString() + "b "; } +#ifdef PRE_ZYPP_3 zypp::Source_Ref source = object->source(); str = getSourceName (source); if (str.empty()) str = source.url().asString(); else str = str + " (" + source.url().asString() + ")"; +#else + zypp::Repository repo = object->repository(); + str = repo.info().name(); +#endif if (!str.empty()) - description += "Source: " + str; + description += _("Repository: ") + str; set_text (m_about_text, description); } @@ -474,11 +493,12 @@ string text; if (!packager.empty()) - text = "Packaged by: <blockquote>" + packager + "</blockquote>"; + text = _("Packaged by:") + (" <blockquote>" + packager) + + "</blockquote>"; if (!authors.empty()) { if (!packager.empty()) text += " "; - text += "Developed by: <blockquote>" + authors + + text += _("Developed by:") + (" <blockquote>" + authors) + "</blockquote>"; } set_text (m_authors_text, text); @@ -512,7 +532,7 @@ static void set_text (GtkWidget *widget, const string &text) { - const char *str = "(not available)"; + const char *str = _("(not available)"); if (!text.empty()) str = text.c_str(); ygtk_richtext_set_text (YGTK_RICHTEXT (widget), str, TRUE); @@ -553,6 +573,7 @@ G_TYPE_STRING, G_TYPE_STRING); m_model = GTK_TREE_MODEL (store); +#ifdef PRE_ZYPP_3 zypp::SourceManager_Ptr manager = zypp::SourceManager::sourceManager(); for (zypp::SourceManager::Source_const_iterator it = manager->Source_begin(); it != manager->Source_end(); it++) { @@ -565,6 +586,19 @@ 3, src.alias().c_str(), -1); } } +#else + zypp::RepoManager manager; + std::list <zypp::RepoInfo> repos = manager.knownRepositories(); + for (std::list <zypp::RepoInfo>::iterator it = repos.begin(); + it != repos.end(); it++) { + if (it->enabled()) { + GtkTreeIter iter; + gtk_list_store_append (store, &iter); + gtk_list_store_set (store, &iter, 0, bool(it->enabled()), + 1, it->name().c_str(), 2, it->alias().c_str(), -1); + } + } +#endif GtkWidget *view = gtk_tree_view_new_with_model (m_model); gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (view), FALSE); @@ -585,14 +619,16 @@ G_CALLBACK (source_toggled_cb), this); renderer = gtk_cell_renderer_text_new(); - column = gtk_tree_view_column_new_with_attributes ("Name", + column = gtk_tree_view_column_new_with_attributes ("", renderer, "text", 1, NULL); gtk_tree_view_append_column (GTK_TREE_VIEW (view), column); +#ifdef PRE_ZYPP_3 renderer = gtk_cell_renderer_text_new(); - column = gtk_tree_view_column_new_with_attributes ("URL", + column = gtk_tree_view_column_new_with_attributes ("", renderer, "text", 2, NULL); gtk_tree_view_append_column (GTK_TREE_VIEW (view), column); +#endif m_widget = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (m_widget), @@ -615,6 +651,7 @@ gtk_tree_model_get_iter (model, &iter, path); gtk_tree_path_free (path); +#ifdef PRE_ZYPP_3 gchar *alias; gtk_tree_model_get (model, &iter, 3, &alias, -1); @@ -628,6 +665,20 @@ source.enable(); gtk_list_store_set (GTK_LIST_STORE (model), &iter, 0, source.enabled(), -1); +#else + gchar *alias; + gtk_tree_model_get (model, &iter, 2, &alias, -1); + + zypp::RepoManager manager; + zypp::RepoInfo repo = manager.getRepositoryInfo (alias); + g_free (alias); + + bool enable = !gtk_cell_renderer_toggle_get_active (renderer); + repo.setEnabled (enable); + + gtk_list_store_set (GTK_LIST_STORE (model), &iter, + 0, bool (repo.enabled()), -1); +#endif pThis->m_listener->sources_changed_cb(); } @@ -674,12 +725,12 @@ GtkCellRenderer *renderer; renderer = gtk_cell_renderer_text_new(); - column = gtk_tree_view_column_new_with_attributes ("Mount Point", + column = gtk_tree_view_column_new_with_attributes (_("Mount Point"), renderer, "text", 0, NULL); gtk_tree_view_append_column (GTK_TREE_VIEW (view), column); renderer = gtk_cell_renderer_progress_new(); - column = gtk_tree_view_column_new_with_attributes ("Usage", + column = gtk_tree_view_column_new_with_attributes (_("Usage"), renderer, "value", 1, "text", 2, NULL); gtk_tree_view_append_column (GTK_TREE_VIEW (view), column); @@ -713,14 +764,15 @@ GtkTreeIter iter; gtk_list_store_append (store, &iter); - int usage = (partition.pkg_size * 100) / partition.total_size; + long usage = (partition.pkg_size * 100) / (partition.total_size + 1); string usage_str = sizeToString (partition.pkg_size) + " (of " + sizeToString (partition.total_size) + ")"; gtk_list_store_set (store, &iter, 0, partition.dir.c_str(), 1, usage, 2, usage_str.c_str(), -1); warning = warning || - (partition.total_size - partition.pkg_size < MIN_FREE_MB_WARN); + (partition.total_size > 1024 && + partition.total_size - partition.pkg_size < MIN_FREE_MB_WARN); } } if (warning) @@ -736,9 +788,9 @@ GtkWidget *dialog, *view, *scroll_view; dialog = gtk_message_dialog_new_with_markup (YGUI::ui()->currentWindow(), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_WARNING, - GTK_BUTTONS_OK, "Disk Almost Full !\n\n" + GTK_BUTTONS_OK, _("Disk Almost Full !\n\n" "One of the partitions is reaching its limit of capacity. You may " - "have to remove packages if you wish to install some."); + "have to remove packages if you wish to install some.")); view = gtk_tree_view_new_with_model (m_model); gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (view), FALSE); @@ -747,10 +799,10 @@ GTK_SELECTION_NONE); GtkTreeViewColumn *column; - column = gtk_tree_view_column_new_with_attributes ("Mount Point", + column = gtk_tree_view_column_new_with_attributes (_("Mount Point"), gtk_cell_renderer_text_new(), "text", 0, NULL); gtk_tree_view_append_column (GTK_TREE_VIEW (view), column); - column = gtk_tree_view_column_new_with_attributes ("Usage", + column = gtk_tree_view_column_new_with_attributes (_("Usage"), gtk_cell_renderer_progress_new(), "value", 1, "text", 2, NULL); gtk_tree_view_append_column (GTK_TREE_VIEW (view), column); @@ -790,18 +842,18 @@ YGtkWizard *wizard = YGTK_WIZARD (getWidget()); ygtk_wizard_set_child (YGTK_WIZARD (getWidget()), main_vbox); GtkWindow *window = YGUI::ui()->currentWindow(); - ygtk_wizard_set_header_text (wizard, window, "Patch Selector"); + ygtk_wizard_set_header_text (wizard, window, _("Patch Selector")); ygtk_wizard_set_header_icon (wizard, window, THEMEDIR "/icons/32x32/apps/yast-software.png"); ygtk_wizard_set_help_text (wizard, - "For information on a given patch, just press it and as well as the " + _("For information on a given patch, just press it and as well as the " "Package Information expander to make those informations visible. " "To install a patch you just need to press the check button next to it " - "and then the button Install when you are done." + "and then the button Install when you are done.") ); - ygtk_wizard_set_next_button_label (wizard, "_Install"); + ygtk_wizard_set_next_button_label (wizard, _("_Install")); ygtk_wizard_set_next_button_id (wizard, g_strdup ("install"), g_free); - ygtk_wizard_set_abort_button_label (wizard, "_Cancel"); + ygtk_wizard_set_abort_button_label (wizard, _("_Cancel")); ygtk_wizard_set_abort_button_id (wizard, g_strdup ("cancel"), g_free); g_signal_connect (G_OBJECT (getWidget()), "action-triggered", G_CALLBACK (wizard_action_cb), this); @@ -814,7 +866,7 @@ GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_container_add (GTK_CONTAINER (patches_window), m_patches_view); - m_information_widget = new PackageInformation ("Patch Information", true); + m_information_widget = new PackageInformation (_("Patch Information"), true); GtkWidget *pkg_info_widget = m_information_widget->getWidget(); gtk_box_pack_start (GTK_BOX (main_vbox), patches_window, TRUE, TRUE, 6); @@ -835,11 +887,11 @@ g_signal_connect (G_OBJECT (renderer), "toggled", G_CALLBACK (patch_toggled_cb), this); - column = gtk_tree_view_column_new_with_attributes ("Priority", + column = gtk_tree_view_column_new_with_attributes (_("Priority"), gtk_cell_renderer_text_new(), "text", 1, NULL); gtk_tree_view_append_column (GTK_TREE_VIEW (m_patches_view), column); - column = gtk_tree_view_column_new_with_attributes ("Name", + column = gtk_tree_view_column_new_with_attributes (_("Name"), gtk_cell_renderer_text_new(), "text", 2, NULL); gtk_tree_view_append_column (GTK_TREE_VIEW (m_patches_view), column); @@ -969,7 +1021,6 @@ GtkWidget *m_search_entry, *m_plain_view; guint search_timeout_id; bool name_opt, summary_opt, descr_opt, provides_opt, requires_opt; - bool m_searching; list <string> m_search_queries; // Interface tweak @@ -997,10 +1048,10 @@ allows for more than one model type be used and is also better for speed, since the filter and tree view then installed upon don't have to keep syncing at every item change. */ - installed_box = createListWidget ("Installed Software:", + installed_box = createListWidget (_("Installed Software:"), "computer", computer_xpm, m_installed_view, 1, false); - available_box = createListWidget ("Available Software:", + available_box = createListWidget (_("Available Software:"), "gtk-cdrom", NULL, m_available_view, 2, true); @@ -1024,8 +1075,8 @@ gtk_container_add (GTK_CONTAINER (buttons_minsize), selection_buttons_vbox); ygtk_min_size_set_only_expand (YGTK_MIN_SIZE (buttons_minsize), TRUE); - install_button = createArrowButton ("_install", GTK_ARROW_RIGHT, &m_install_label); - remove_button = createArrowButton ("_remove", GTK_ARROW_LEFT, &m_remove_label); + install_button = createArrowButton (_("_install"), GTK_ARROW_RIGHT, &m_install_label); + remove_button = createArrowButton (_("_remove"), GTK_ARROW_LEFT, &m_remove_label); GtkWidget *install_align = gtk_alignment_new (0, 1, 1, 0); gtk_container_add (GTK_CONTAINER (install_align), install_button); @@ -1045,16 +1096,16 @@ GtkWidget *view_box, *view_label, *view_categories, *view_patterns, *view_languages; - view_label = gtk_label_new ("View Packages:"); + view_label = gtk_label_new (_("View Packages:")); gtk_label_set_use_markup (GTK_LABEL (view_label), TRUE); gtk_misc_set_alignment (GTK_MISC (view_label), 0, 0.5); - m_plain_view = gtk_radio_button_new_with_mnemonic (NULL, "as _plain list"); + m_plain_view = gtk_radio_button_new_with_mnemonic (NULL, _("as _plain list")); view_categories = gtk_radio_button_new_with_mnemonic_from_widget - (GTK_RADIO_BUTTON (m_plain_view), "in _categories"); + (GTK_RADIO_BUTTON (m_plain_view), _("in _categories")); view_patterns = gtk_radio_button_new_with_mnemonic_from_widget - (GTK_RADIO_BUTTON (m_plain_view), "in _patterns"); + (GTK_RADIO_BUTTON (m_plain_view), _("in _patterns")); view_languages = gtk_radio_button_new_with_mnemonic_from_widget - (GTK_RADIO_BUTTON (m_plain_view), "in _languages"); + (GTK_RADIO_BUTTON (m_plain_view), _("in _languages")); view_box = gtk_hbox_new (FALSE, 0); gtk_box_pack_start (GTK_BOX (view_box), view_label, FALSE, TRUE, 0); gtk_box_pack_start (GTK_BOX (view_box), m_plain_view, FALSE, TRUE, 4); @@ -1076,7 +1127,7 @@ GtkWidget *search_hbox, *search_label; search_hbox = gtk_hbox_new (FALSE, 0); - search_label = gtk_label_new_with_mnemonic ("_Search:"); + search_label = gtk_label_new_with_mnemonic (_("_Search:")); gtk_label_set_use_markup (GTK_LABEL (search_label), TRUE); gtk_misc_set_alignment (GTK_MISC (search_label), 0, 0.5); m_search_entry = ygtk_find_entry_new(); @@ -1098,17 +1149,17 @@ gtk_size_group_add_widget (align_labels, search_label); g_object_unref (G_OBJECT (align_labels)); - m_information_widget = new PackageInformation ("Package Information", false); + m_information_widget = new PackageInformation (_("Package Information"), false); GtkWidget *pkg_info_widget = m_information_widget->getWidget(); m_sources_table = new SourcesTable (this); m_disk_table = new DiskTable(); - GtkWidget *advanced_expander = gtk_expander_new ("Advanced"); + GtkWidget *advanced_expander = gtk_expander_new (_("Advanced")); GtkWidget *advanced_notebook = gtk_notebook_new(); GtkWidget *sources_vbox = gtk_vbox_new (FALSE, 4); GtkWidget *sources_label = gtk_label_new ( - "Use the Installation Source tool to manage the sources."); + _("Use the Installation Source tool to manage the sources.")); gtk_misc_set_alignment (GTK_MISC (sources_label), 1, 0); gtk_label_set_use_markup (GTK_LABEL (sources_label), TRUE); gtk_box_pack_start (GTK_BOX (sources_vbox), m_sources_table->getWidget(), @@ -1116,9 +1167,9 @@ gtk_box_pack_start (GTK_BOX (sources_vbox), sources_label, TRUE, TRUE, 0); gtk_notebook_set_tab_pos (GTK_NOTEBOOK (advanced_notebook), GTK_POS_BOTTOM); gtk_notebook_append_page (GTK_NOTEBOOK (advanced_notebook), - sources_vbox, gtk_label_new ("Packages Sources")); + sources_vbox, gtk_label_new (_("Repositories"))); gtk_notebook_append_page (GTK_NOTEBOOK (advanced_notebook), - m_disk_table->getWidget(), gtk_label_new ("Disk Usage")); + m_disk_table->getWidget(), gtk_label_new (_("Disk Usage"))); gtk_container_add (GTK_CONTAINER (advanced_expander), advanced_notebook); gtk_box_pack_start (GTK_BOX (m_widget), packages_hbox, TRUE, TRUE, 0); @@ -1197,7 +1248,7 @@ g_object_set (G_OBJECT (text_renderer), "ellipsize", PANGO_ELLIPSIZE_END, NULL); GtkTreeViewColumn *column; - column = gtk_tree_view_column_new_with_attributes ("Packages", + column = gtk_tree_view_column_new_with_attributes (_("Packages"), text_renderer, "markup", package_name_col, "style", 9, NULL); gtk_tree_view_column_set_expand (column, TRUE); gtk_tree_view_append_column (GTK_TREE_VIEW (list), column); @@ -1244,7 +1295,7 @@ gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); vbox = GTK_DIALOG (dialog)->vbox; // gtk_container_set_border_width (GTK_CONTAINER (vbox), 8); - label = gtk_label_new ("Loading packages list..."); + label = gtk_label_new (_("Loading packages list...")); gtk_misc_set_alignment (GTK_MISC (label), 0, 0); gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, TRUE, 4); progress = gtk_progress_bar_new(); @@ -1286,7 +1337,7 @@ #define SET_PROGRESS(_steps, _jump) int steps = _steps, step = 0, jump = _jump; #define PROGRESS() \ if (progress && ((step++) % jump == 0)) { \ - gdouble fraction = ((gdouble) step) / steps; \ + gdouble fraction = steps > 0 ? ((gdouble) step) / steps : 0; \ gtk_progress_bar_set_fraction (progress, fraction); \ while (gtk_events_pending()) gtk_main_iteration(); } @@ -1520,11 +1571,20 @@ // zypp keeps on the pool objects whose sources we disabled, so we may // need to calculate the candidate object here. +#ifdef PRE_ZYPP_3 if (available_obj != NULL && !available_obj->source().enabled()) { +#else + // beware lurking tribool requires bool cast here. + if (available_obj != NULL && !(bool)(available_obj->repository().info().enabled())) { +#endif available_obj = NULL; for (zypp::ui::Selectable::available_iterator it = selectable->availableBegin(); it != selectable->availableEnd(); it++) { +#ifdef PRE_ZYPP_3 if (!(*it)->source().enabled()) +#else + if (!(*it)->repository().info().enabled()) +#endif ; else if (!available_obj) available_obj = *it; @@ -1538,7 +1598,11 @@ if (available_obj != NULL) { for (zypp::ui::Selectable::available_iterator it = selectable->availableBegin(); it != selectable->availableEnd(); it++) { +#ifdef PRE_ZYPP_3 if (!(*it)->source().enabled()) +#else + if (!(*it)->repository().info().enabled()) +#endif continue; int res = zypp::Edition::compare ((*it)->edition(), available_obj->edition()); @@ -1716,7 +1780,6 @@ GTK_TOGGLE_BUTTON (pThis->m_plain_view)); if (!plain_view) gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (pThis->m_plain_view), TRUE); - pThis->m_searching = strlen (query) > 0; pThis->m_search_queries = YGUtils::splitString (query, ' '); // just re-filter @@ -1732,11 +1795,11 @@ GtkMenu *create_search_menu() { GtkWidget *menu = gtk_menu_new(); - append_option_item (menu, "Name", &name_opt); - append_option_item (menu, "Summary", &summary_opt); - append_option_item (menu, "Description", &descr_opt); - append_option_item (menu, "RPM Provides", &provides_opt); - append_option_item (menu, "RPM Requires", &requires_opt); + append_option_item (menu, _("Name"), &name_opt); + append_option_item (menu, _("Summary"), &summary_opt); + append_option_item (menu, _("Description"), &descr_opt); + append_option_item (menu, _("RPM Provides"), &provides_opt); + append_option_item (menu, _("RPM Requires"), &requires_opt); gtk_widget_show_all (menu); return GTK_MENU (menu); } @@ -1760,7 +1823,7 @@ gtk_tree_model_get (model, iter, visible_col, &visible, 8, &has_children, -1); if (has_children) visible = TRUE; - else if (visible && pThis->m_searching) { + else if (visible && !pThis->m_search_queries.empty()) { ZyppSelectablePtr selectable; gtk_tree_model_get (model, iter, 0, &selectable, -1); visible = pThis->does_package_match (selectable); @@ -1850,6 +1913,38 @@ return false; } + // For SLED10 / older gtk+'s ... + static bool compat_gtk_tree_model_filter_convert_child_iter_to_iter (GtkTreeModelFilter *filter, + GtkTreeIter *filter_iter, + GtkTreeIter *child_iter) + { +#if GTK_CHECK_VERSION(2,10,0) + return gtk_tree_model_filter_convert_child_iter_to_iter (filter, filter_iter, child_iter); +#else // cut/paste from gtk+ HEAD... + gboolean ret; + GtkTreePath *child_path, *path; + + memset (filter_iter, 0, sizeof (GtkTreeIter)); + + GtkTreeModel *child_model; + g_object_get (G_OBJECT (filter), "child-model", &child_model, NULL); + child_path = gtk_tree_model_get_path (child_model, child_iter); + g_return_val_if_fail (child_path != NULL, FALSE); + + path = gtk_tree_model_filter_convert_child_path_to_path (filter, + child_path); + gtk_tree_path_free (child_path); + + if (!path) + return FALSE; + + ret = gtk_tree_model_get_iter (GTK_TREE_MODEL (filter), filter_iter, path); + gtk_tree_path_free (path); + + return ret; +#endif + } + static bool sync_tree_views_scroll (GtkTreeView *current_view, GtkTreeView *other_view, GtkTreePath *current_path, bool select_it) { @@ -1873,12 +1968,17 @@ gtk_tree_model_get_iter (base_model, &iter, _path); gtk_tree_path_free (_path); - while (!gtk_tree_model_filter_convert_child_iter_to_iter ( + int timeout = 0; + // Try to find a a similar item in the other view to synchronise with + while (!compat_gtk_tree_model_filter_convert_child_iter_to_iter ( GTK_TREE_MODEL_FILTER (gtk_tree_view_get_model (other_view)), &other_iter, &iter)) { if (!gtk_tree_model_iter_next (base_model, &iter)) return false; + // This turns into N^3 very quickly if we search too hard + if (timeout++ > 10) + return false; select_it = false; // not the same package -- dont select it then } @@ -1947,33 +2047,34 @@ GtkLabel *install_label = GTK_LABEL (pThis->m_install_label), *remove_label = GTK_LABEL (pThis->m_remove_label); if (selected_rows > 1) { - gtk_label_set_text (install_label, "_install"); - gtk_label_set_text (remove_label, "_remove"); + gtk_label_set_text (install_label, _("_install")); + gtk_label_set_text (remove_label, _("_remove")); } else { // personalize // remove label if (sel && sel->toInstall()) - gtk_label_set_text (remove_label, "_undo"); + gtk_label_set_text (remove_label, _("_undo")); else - gtk_label_set_text (remove_label, "_remove"); + gtk_label_set_text (remove_label, _("_remove")); // install label if (sel && sel->toDelete()) - gtk_label_set_text (install_label, "_undo"); + gtk_label_set_text (install_label, _("_undo")); else if (!install_obj) - gtk_label_set_text (install_label, "_install"); + gtk_label_set_text (install_label, _("_install")); else if (available_obj) { int res = zypp::Edition::compare (install_obj->edition(), available_obj->edition()); if (res < 0) - gtk_label_set_text (install_label, "_upgrade"); + gtk_label_set_text (install_label, _("_upgrade")); else if (res > 0) - gtk_label_set_text (install_label, "_downgrade"); + gtk_label_set_text (install_label, _("_downgrade")); else - gtk_label_set_text (install_label, "re-_install"); + gtk_label_set_text (install_label, _("re-_install")); } } gtk_label_set_use_underline (install_label, TRUE); gtk_label_set_use_underline (remove_label, TRUE); + safeguard = false; } @@ -2005,7 +2106,6 @@ iters[i] = iter; } g_list_free (selected); - for (i = 0; i < selected_len; i++) { GtkTreeIter *iter = &iters[i]; ZyppSelectablePtr sel = 0; @@ -2119,20 +2219,20 @@ ygtk_wizard_set_header_text (wizard, YGUI::ui()->currentWindow(), "Package Selector"); ygtk_wizard_set_help_text (wizard, - "Two pools are presented; one with the available software, the other " + _("Two pools are presented; one with the available software, the other " "with the installed one. To install software you choose a package " "from the install pool and press Install. Similar method for removal " "of software. When you are done press the Accept button. " "Information on a given package is displayed on the Package Information " "expander at the bottom which may be enlarged. " "A categories view of the software is possible, as well as searching " - "for a given package." + "for a given package.") ); - ygtk_wizard_set_abort_button_label (wizard, "_Cancel"); + ygtk_wizard_set_abort_button_label (wizard, _("_Cancel")); ygtk_wizard_set_abort_button_id (wizard, g_strdup ("cancel"), g_free); ygtk_wizard_set_back_button_label (wizard, ""); - ygtk_wizard_set_next_button_label (wizard, "_Accept"); + ygtk_wizard_set_next_button_label (wizard, _("_Accept")); ygtk_wizard_set_next_button_id (wizard, g_strdup ("accept"), g_free); g_signal_connect (G_OBJECT (getWidget()), "action-triggered", G_CALLBACK (wizard_action_cb), this); @@ -2195,14 +2295,14 @@ if (zyppPool().empty <zypp::Package> ()) return false; - GtkWidget *dialog = gtk_dialog_new_with_buttons ("Changes Summary", + GtkWidget *dialog = gtk_dialog_new_with_buttons (_("Changes Summary"), YGUI::ui()->currentWindow(), GtkDialogFlags (GTK_DIALOG_MODAL | GTK_DIALOG_NO_SEPARATOR), - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, "C_onfirm", GTK_RESPONSE_ACCEPT, NULL); + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, _("C_onfirm"), GTK_RESPONSE_ACCEPT, NULL); GtkWidget *install_label, *remove_label, *install_view, *remove_view; - install_label = gtk_label_new ("To install:"); - remove_label = gtk_label_new ("To remove:"); + install_label = gtk_label_new (_("To install:")); + remove_label = gtk_label_new (_("To remove:")); install_view = gtk_tree_view_new(); remove_view = gtk_tree_view_new(); @@ -2233,7 +2333,7 @@ // install view GtkTreeViewColumn *column; - column = gtk_tree_view_column_new_with_attributes ("Install packages", + column = gtk_tree_view_column_new_with_attributes (_("Install packages"), gtk_cell_renderer_text_new(), "text", 0, NULL); gtk_tree_view_append_column (GTK_TREE_VIEW (install_view), column); @@ -2245,7 +2345,7 @@ GTK_TREE_VIEW (install_view)), GTK_SELECTION_NONE);; // remove view - column = gtk_tree_view_column_new_with_attributes ("Remove packages", + column = gtk_tree_view_column_new_with_attributes (_("Remove packages"), gtk_cell_renderer_text_new(), "text", 0, NULL); gtk_tree_view_append_column (GTK_TREE_VIEW (remove_view), column); Modified: branches/tmp/mvidner/ui-as-namespace/gtk/src/YGRichText.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/g… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/gtk/src/YGRichText.cc (original) +++ branches/tmp/mvidner/ui-as-namespace/gtk/src/YGRichText.cc Tue Jul 31 14:28:02 2007 @@ -12,7 +12,6 @@ class YGRichText : public YRichText, public YGScrolledWidget { - bool m_shrinkable; bool m_plainText; public: Modified: branches/tmp/mvidner/ui-as-namespace/gtk/src/YGUtils.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/g… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/gtk/src/YGUtils.cc (original) +++ branches/tmp/mvidner/ui-as-namespace/gtk/src/YGUtils.cc Tue Jul 31 14:28:02 2007 @@ -278,25 +278,7 @@ } continue; } -#if 0 - // ignore comments - char *comment = ""; - for (i = 0; instr[i] != '\0'; i++) { - for (j = 0; j < (signed) sizeof (comment); j++) { - if (instr[i+j] != comment[j]) - break; - } - if (j == sizeof (comment)) - break; - } - continue; - } -#endif + i++; skipSpace (instr, i); Modified: branches/tmp/mvidner/ui-as-namespace/gtk/src/ygtkrichtext.c URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/g… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/gtk/src/ygtkrichtext.c (original) +++ branches/tmp/mvidner/ui-as-namespace/gtk/src/ygtkrichtext.c Tue Jul 31 14:28:02 2007 @@ -349,8 +349,10 @@ else if (!g_ascii_strcasecmp (element_name, "img")) { if (!g_ascii_strcasecmp (attribute_names[0], "src")) { GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (attribute_values[0], NULL); - gtk_text_buffer_insert_pixbuf (state->buffer, &iter, pixbuf); - g_object_unref (G_OBJECT (pixbuf)); + if (pixbuf) { + gtk_text_buffer_insert_pixbuf (state->buffer, &iter, pixbuf); + g_object_unref (G_OBJECT (pixbuf)); + } } else g_warning ("Unknown img attribute: '%s'", attribute_names[0]); Modified: branches/tmp/mvidner/ui-as-namespace/gtk/src/ygtksteps.c URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/g… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/gtk/src/ygtksteps.c (original) +++ branches/tmp/mvidner/ui-as-namespace/gtk/src/ygtksteps.c Tue Jul 31 14:28:02 2007 @@ -51,7 +51,6 @@ steps->current_mark_layout = NULL; ygtk_steps_clear (steps); - GTK_OBJECT_CLASS (ygtk_steps_parent_class)->destroy (object); } Modified: branches/tmp/mvidner/ui-as-namespace/gtk/src/ygtkwizard.c URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/g… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/gtk/src/ygtkwizard.c (original) +++ branches/tmp/mvidner/ui-as-namespace/gtk/src/ygtkwizard.c Tue Jul 31 14:28:02 2007 @@ -564,12 +564,18 @@ if (path == NULL) return FALSE; + g_signal_handlers_block_by_func (wizard->m_navigation_widget, + (gpointer) tree_item_selected_cb, wizard); + GtkWidget *widget = wizard->m_navigation_widget; gtk_tree_view_expand_to_path (GTK_TREE_VIEW (widget), path); gtk_tree_view_set_cursor (GTK_TREE_VIEW (widget), path, NULL, FALSE); gtk_tree_view_scroll_to_cell (GTK_TREE_VIEW (widget), path, NULL, TRUE, 0.5, 0.5); + + g_signal_handlers_unblock_by_func (wizard->m_navigation_widget, + (gpointer) tree_item_selected_cb, wizard); return TRUE; } -- 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] r39836 - in /branches/tmp/mvidner/ui-as-namespace/qt: ./ package/ src/ src/pkg/
by mvidner＠svn.opensuse.org 31 Jul '07

31 Jul '07

Author: mvidner Date: Tue Jul 31 14:14:45 2007 New Revision: 39836 URL: http://svn.opensuse.org/viewcvs/yast?rev=39836&view=rev Log: Merged revisions 39048-39834 via svnmerge from http://svn.opensuse.org/svn/yast/trunk/qt ........ r39270 | sh-sh-sh | 2007-07-10 11:57:03 +0200 (Út, 10 čec 2007) | 3 lines Don't over-simplify whitespace (replacing newlines with blanks) in dependency problem reports ........ r39311 | sh-sh-sh | 2007-07-11 11:02:30 +0200 (St, 11 čec 2007) | 1 line fixed crazy abuild change log sequence complaint ........ r39450 | jdsn | 2007-07-16 17:15:17 +0200 (Po, 16 čec 2007) | 2 lines syncronisation commit on behalf of coolo ........ r39458 | kmachalkova | 2007-07-17 10:15:45 +0200 (Út, 17 čec 2007) | 3 lines Merged changes from libzypp refactoring branch back to trunk (-r39209:HEAD) + require new libzypp ........ r39460 | kmachalkova | 2007-07-17 10:23:13 +0200 (Út, 17 čec 2007) | 2 lines Fix changelog entry order ........ r39617 | sh-sh-sh | 2007-07-23 18:01:34 +0200 (Po, 23 čec 2007) | 1 line consistent naming ........ r39618 | sh-sh-sh | 2007-07-23 18:09:04 +0200 (Po, 23 čec 2007) | 1 line consistent naming ........ r39632 | sh-sh-sh | 2007-07-24 11:00:19 +0200 (Út, 24 čec 2007) | 1 line Fixed bug #285915: Can't cancel package search ........ r39658 | sh-sh-sh | 2007-07-25 13:46:01 +0200 (St, 25 čec 2007) | 1 line removed cruft ........ Added: branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgRepoFilterView.cc - copied unchanged from r39658, trunk/qt/src/pkg/YQPkgRepoFilterView.cc branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgRepoFilterView.h - copied unchanged from r39658, trunk/qt/src/pkg/YQPkgRepoFilterView.h branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgRepoList.cc - copied unchanged from r39658, trunk/qt/src/pkg/YQPkgRepoList.cc branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgRepoList.h - copied unchanged from r39658, trunk/qt/src/pkg/YQPkgRepoList.h Removed: branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgInstSrcFilterView.cc branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgInstSrcFilterView.h branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgInstSrcList.cc branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgInstSrcList.h Modified: branches/tmp/mvidner/ui-as-namespace/qt/ (props changed) branches/tmp/mvidner/ui-as-namespace/qt/VERSION branches/tmp/mvidner/ui-as-namespace/qt/package/yast2-qt.changes branches/tmp/mvidner/ui-as-namespace/qt/src/QY2BarGraph.h branches/tmp/mvidner/ui-as-namespace/qt/src/QY2CharValidator.h branches/tmp/mvidner/ui-as-namespace/qt/src/QY2ComboTabWidget.h branches/tmp/mvidner/ui-as-namespace/qt/src/QY2DiskUsageList.h branches/tmp/mvidner/ui-as-namespace/qt/src/QY2FloppyMountDialog.h branches/tmp/mvidner/ui-as-namespace/qt/src/QY2LayoutUtils.h branches/tmp/mvidner/ui-as-namespace/qt/src/QY2ListView.h branches/tmp/mvidner/ui-as-namespace/qt/src/QY2Settings.h branches/tmp/mvidner/ui-as-namespace/qt/src/YFrameBuffer.h branches/tmp/mvidner/ui-as-namespace/qt/src/YQAlignment.h branches/tmp/mvidner/ui-as-namespace/qt/src/YQBarGraph.h branches/tmp/mvidner/ui-as-namespace/qt/src/YQCheckBox.h branches/tmp/mvidner/ui-as-namespace/qt/src/YQCheckBoxFrame.h branches/tmp/mvidner/ui-as-namespace/qt/src/YQColoredLabel.h branches/tmp/mvidner/ui-as-namespace/qt/src/YQComboBox.h branches/tmp/mvidner/ui-as-namespace/qt/src/YQDate.h branches/tmp/mvidner/ui-as-namespace/qt/src/YQDialog.h branches/tmp/mvidner/ui-as-namespace/qt/src/YQDownloadProgress.h branches/tmp/mvidner/ui-as-namespace/qt/src/YQDumbTab.h branches/tmp/mvidner/ui-as-namespace/qt/src/YQEBunny.h branches/tmp/mvidner/ui-as-namespace/qt/src/YQEmpty.h branches/tmp/mvidner/ui-as-namespace/qt/src/YQFrame.h branches/tmp/mvidner/ui-as-namespace/qt/src/YQGenericButton.h branches/tmp/mvidner/ui-as-namespace/qt/src/YQIconPool.h branches/tmp/mvidner/ui-as-namespace/qt/src/YQImage.h branches/tmp/mvidner/ui-as-namespace/qt/src/YQIntField.h branches/tmp/mvidner/ui-as-namespace/qt/src/YQLabel.h branches/tmp/mvidner/ui-as-namespace/qt/src/YQLogView.h branches/tmp/mvidner/ui-as-namespace/qt/src/YQMenuButton.h branches/tmp/mvidner/ui-as-namespace/qt/src/YQMultiLineEdit.h branches/tmp/mvidner/ui-as-namespace/qt/src/YQMultiProgressMeter.h branches/tmp/mvidner/ui-as-namespace/qt/src/YQMultiSelectionBox.h branches/tmp/mvidner/ui-as-namespace/qt/src/YQPackageSelectorPlugin.h branches/tmp/mvidner/ui-as-namespace/qt/src/YQPartitionSplitter.h branches/tmp/mvidner/ui-as-namespace/qt/src/YQProgressBar.h branches/tmp/mvidner/ui-as-namespace/qt/src/YQPushButton.h branches/tmp/mvidner/ui-as-namespace/qt/src/YQReplacePoint.h branches/tmp/mvidner/ui-as-namespace/qt/src/YQRichText.h branches/tmp/mvidner/ui-as-namespace/qt/src/YQSelectionBox.h branches/tmp/mvidner/ui-as-namespace/qt/src/YQSlider.h branches/tmp/mvidner/ui-as-namespace/qt/src/YQSpacing.h branches/tmp/mvidner/ui-as-namespace/qt/src/YQSplit.h branches/tmp/mvidner/ui-as-namespace/qt/src/YQSquash.h branches/tmp/mvidner/ui-as-namespace/qt/src/YQTextEntry.h branches/tmp/mvidner/ui-as-namespace/qt/src/YQTime.h branches/tmp/mvidner/ui-as-namespace/qt/src/YQTree.h branches/tmp/mvidner/ui-as-namespace/qt/src/YQWizard.h branches/tmp/mvidner/ui-as-namespace/qt/src/YQWizardButton.h branches/tmp/mvidner/ui-as-namespace/qt/src/YQi18n.h branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/Makefile.am branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPackageSelector.cc branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPackageSelector.h branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPackageSelectorBase.h branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPatternSelector.h branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgChangeLogView.h branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgChangesDialog.h branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgConflictDialog.h branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgConflictList.cc branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgConflictList.h branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgDependenciesView.h branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgDescriptionDialog.h branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgDescriptionView.h branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgDiskUsageList.h branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgDiskUsageWarningDialog.h branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgFileListView.h branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgGenericDetailsView.h branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgLangList.h branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgList.h branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgObjList.h branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgPatchFilterView.h branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgPatchList.h branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgPatternList.h branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgProductDialog.h branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgProductList.h branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgRpmGroupTagsFilterView.h branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgSearchFilterView.cc branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgSearchFilterView.h branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgSelDescriptionView.h branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgSelList.h branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgSelMapper.h branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgStatusFilterView.h branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgTechnicalDetailsView.cc branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgTechnicalDetailsView.h branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgTextDialog.h branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgUpdateProblemFilterView.h branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgVersionsView.cc branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgVersionsView.h branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQSimplePatchSelector.h branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQZypp.h branches/tmp/mvidner/ui-as-namespace/qt/src/utf8.h branches/tmp/mvidner/ui-as-namespace/qt/yast2-qt.spec.in Modified: branches/tmp/mvidner/ui-as-namespace/qt/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/VERSION (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/VERSION Tue Jul 31 14:14:45 2007 @@ -1 +1 @@ -2.15.5 +2.15.7 Modified: branches/tmp/mvidner/ui-as-namespace/qt/package/yast2-qt.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/package/yast2-qt.changes (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/package/yast2-qt.changes Tue Jul 31 14:14:45 2007 @@ -1,4 +1,35 @@ ------------------------------------------------------------------- +Tue Jul 24 10:59:06 CEST 2007 - sh(a)suse.de + +- Fixed bug #285915: Can't cancel package search +- Consistent naming scheme: inst source -> repository + +------------------------------------------------------------------- +Tue Jul 17 10:12:25 CEST 2007 - kmachalkova(a)suse.cz + +- Require new libzypp (>= 3.11.8) +- Changes from libzypp refactoring branches merges back to trunk + +------------------------------------------------------------------- +Tue Jul 10 11:55:26 CEST 2007 - sh(a)suse.de + +- Don't over-simplify whitespace (replacing newlines with blanks) + in dependency problem reports +- V 2.15.7 + +------------------------------------------------------------------- +Fri Jul 6 14:03:15 CEST 2007 - ma(a)suse.de + +- Adapt to new libzypp. Installation sources were replaced by + repositories. +- V 2.15.6 + +------------------------------------------------------------------- +Thu Jun 21 17:40:44 CEST 2007 - adrian(a)suse.de + +- fix changelog entry order + +------------------------------------------------------------------- Mon Apr 23 15:33:26 CEST 2007 - sh(a)suse.de - Load qt_pkg plugin for PatternSelector widget, too @@ -1148,6 +1179,11 @@ (no wizard decorations, suppress wizard help) ------------------------------------------------------------------- +Sun Apr 4 22:19:57 CEST 2004 - adrian(a)suse.de + +- the old (bad) qxembed solution is back .. :/ + +------------------------------------------------------------------- Fri Apr 2 16:24:00 CEST 2004 - sh(a)suse.de - License change to GPL @@ -1192,11 +1228,6 @@ Restored old button order ------------------------------------------------------------------- -Sun Apr 4 22:19:57 CEST 2004 - adrian(a)suse.de - -- the old (bad) qxembed solution is back .. :/ - -------------------------------------------------------------------- Wed Mar 17 15:07:36 CET 2004 - sh(a)suse.de - Fixed bug #35645: Wizard layout looks strange @@ -2227,17 +2258,17 @@ - V 2.3.7 ------------------------------------------------------------------- -Thu Mar 29 09:25:54 CEST 2001 - kkaempf(a)suse.de - -- dont install lib, only plugin is needed - -------------------------------------------------------------------- Thu Mar 29 14:33:53 CEST 2001 - sh(a)suse.de - moved shared libs from /usr/lib/YaST2/lib to /usr/lib - V 2.3.5 ------------------------------------------------------------------- +Thu Mar 29 09:25:54 CEST 2001 - kkaempf(a)suse.de + +- dont install lib, only plugin is needed + +------------------------------------------------------------------- Tue Mar 27 15:56:27 CEST 2001 - kkaempf(a)suse.de - minimize file list for yast2-ui-qt package Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/QY2BarGraph.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/QY2BarGraph.h (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/QY2BarGraph.h Tue Jul 31 14:14:45 2007 @@ -18,7 +18,6 @@ /-*/ -// -*- c++ -*- #ifndef QY2BarGraph_h Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/QY2CharValidator.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/QY2CharValidator.h (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/QY2CharValidator.h Tue Jul 31 14:14:45 2007 @@ -18,7 +18,6 @@ /-*/ -// -*- c++ -*- #ifndef QY2CharValidator_h Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/QY2ComboTabWidget.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/QY2ComboTabWidget.h (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/QY2ComboTabWidget.h Tue Jul 31 14:14:45 2007 @@ -18,7 +18,6 @@ /-*/ -// -*- c++ -*- #ifndef QY2ComboTabWidget_h Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/QY2DiskUsageList.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/QY2DiskUsageList.h (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/QY2DiskUsageList.h Tue Jul 31 14:14:45 2007 @@ -18,7 +18,6 @@ /-*/ -// -*- c++ -*- #ifndef QY2DiskUsageList_h Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/QY2FloppyMountDialog.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/QY2FloppyMountDialog.h (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/QY2FloppyMountDialog.h Tue Jul 31 14:14:45 2007 @@ -18,7 +18,6 @@ /-*/ -// -*- c++ -*- #ifndef QY2FloppyMountDialog_h Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/QY2LayoutUtils.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/QY2LayoutUtils.h (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/QY2LayoutUtils.h Tue Jul 31 14:14:45 2007 @@ -18,7 +18,6 @@ /-*/ -// -*- c++ -*- #ifndef QY2LayoutUtils_h #define QY2LayoutUtils_h Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/QY2ListView.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/QY2ListView.h (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/QY2ListView.h Tue Jul 31 14:14:45 2007 @@ -18,7 +18,6 @@ /-*/ -// -*- c++ -*- #ifndef QY2ListView_h Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/QY2Settings.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/QY2Settings.h (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/QY2Settings.h Tue Jul 31 14:14:45 2007 @@ -18,7 +18,6 @@ /-*/ -// -*- c++ -*- #ifndef QY2Settings_h Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/YFrameBuffer.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/YFrameBuffer.h (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/YFrameBuffer.h Tue Jul 31 14:14:45 2007 @@ -16,7 +16,6 @@ /-*/ -// -*- c++ -*- #ifndef YFrameBuffer_h Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/YQAlignment.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/YQAlignment.h (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/YQAlignment.h Tue Jul 31 14:14:45 2007 @@ -17,7 +17,6 @@ /-*/ -// -*- c++ -*- #ifndef YQAlignment_h #define YQAlignment_h Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/YQBarGraph.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/YQBarGraph.h (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/YQBarGraph.h Tue Jul 31 14:14:45 2007 @@ -16,7 +16,6 @@ /-*/ -// -*- c++ -*- #ifndef YQBarGraph_h #define YQBarGraph_h Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/YQCheckBox.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/YQCheckBox.h (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/YQCheckBox.h Tue Jul 31 14:14:45 2007 @@ -17,7 +17,6 @@ /-*/ -// -*- c++ -*- #ifndef YQCheckBox_h Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/YQCheckBoxFrame.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/YQCheckBoxFrame.h (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/YQCheckBoxFrame.h Tue Jul 31 14:14:45 2007 @@ -17,7 +17,6 @@ /-*/ -// -*- c++ -*- #ifndef YQCheckBoxFrame_h #define YQCheckBoxFrame_h Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/YQColoredLabel.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/YQColoredLabel.h (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/YQColoredLabel.h Tue Jul 31 14:14:45 2007 @@ -16,7 +16,6 @@ /-*/ -// -*- c++ -*- #ifndef YQColoredLabel_h #define YQColoredLabel_h Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/YQComboBox.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/YQComboBox.h (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/YQComboBox.h Tue Jul 31 14:14:45 2007 @@ -16,7 +16,6 @@ /-*/ -// -*- c++ -*- #ifndef YQComboBox_h #define YQComboBox_h Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/YQDate.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/YQDate.h (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/YQDate.h Tue Jul 31 14:14:45 2007 @@ -16,7 +16,6 @@ /-*/ -// -*- c++ -*- #ifndef YQDate_h #define YQDate_h Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/YQDialog.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/YQDialog.h (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/YQDialog.h Tue Jul 31 14:14:45 2007 @@ -17,7 +17,6 @@ /-*/ -// -*- c++ -*- #ifndef YQDialog_h #define YQDialog_h Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/YQDownloadProgress.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/YQDownloadProgress.h (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/YQDownloadProgress.h Tue Jul 31 14:14:45 2007 @@ -16,7 +16,6 @@ /-*/ -// -*- c++ -*- #ifndef YQDownloadProgress_h #define YQDownloadProgress_h Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/YQDumbTab.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/YQDumbTab.h (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/YQDumbTab.h Tue Jul 31 14:14:45 2007 @@ -16,7 +16,6 @@ /-*/ -// -*- c++ -*- #ifndef YQDumbTab_h #define YQDumbTab_h Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/YQEBunny.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/YQEBunny.h (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/YQEBunny.h Tue Jul 31 14:14:45 2007 @@ -16,7 +16,6 @@ /-*/ -// -*- c++ -*- #include "YFrameBuffer.h" Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/YQEmpty.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/YQEmpty.h (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/YQEmpty.h Tue Jul 31 14:14:45 2007 @@ -17,7 +17,6 @@ /-*/ -// -*- c++ -*- #ifndef YQEmpty_h #define YQEmpty_h Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/YQFrame.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/YQFrame.h (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/YQFrame.h Tue Jul 31 14:14:45 2007 @@ -17,7 +17,6 @@ /-*/ -// -*- c++ -*- #ifndef YQFrame_h #define YQFrame_h Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/YQGenericButton.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/YQGenericButton.h (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/YQGenericButton.h Tue Jul 31 14:14:45 2007 @@ -16,7 +16,6 @@ /-*/ -// -*- c++ -*- #ifndef YQGenericButton_h #define YQGenericButton_h Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/YQIconPool.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/YQIconPool.h (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/YQIconPool.h Tue Jul 31 14:14:45 2007 @@ -16,7 +16,6 @@ /-*/ -// -*- c++ -*- #ifndef YQIconPool_h Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/YQImage.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/YQImage.h (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/YQImage.h Tue Jul 31 14:14:45 2007 @@ -17,7 +17,6 @@ /-*/ -// -*- c++ -*- #ifndef YQImage_h #define YQImage_h Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/YQIntField.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/YQIntField.h (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/YQIntField.h Tue Jul 31 14:14:45 2007 @@ -16,7 +16,6 @@ /-*/ -// -*- c++ -*- #ifndef YQIntField_h #define YQIntField_h Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/YQLabel.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/YQLabel.h (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/YQLabel.h Tue Jul 31 14:14:45 2007 @@ -17,7 +17,6 @@ /-*/ -// -*- c++ -*- #ifndef YQLabel_h #define YQLabel_h Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/YQLogView.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/YQLogView.h (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/YQLogView.h Tue Jul 31 14:14:45 2007 @@ -16,7 +16,6 @@ /-*/ -// -*- c++ -*- #ifndef YQLogView_h #define YQLogView_h Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/YQMenuButton.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/YQMenuButton.h (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/YQMenuButton.h Tue Jul 31 14:14:45 2007 @@ -16,7 +16,6 @@ /-*/ -// -*- c++ -*- #ifndef YQMenuButton_h #define YQMenuButton_h Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/YQMultiLineEdit.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/YQMultiLineEdit.h (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/YQMultiLineEdit.h Tue Jul 31 14:14:45 2007 @@ -16,7 +16,6 @@ /-*/ -// -*- c++ -*- #ifndef YQMultiLineEdit_h #define YQMultiLineEdit_h Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/YQMultiProgressMeter.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/YQMultiProgressMeter.h (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/YQMultiProgressMeter.h Tue Jul 31 14:14:45 2007 @@ -16,7 +16,6 @@ /-*/ -// -*- c++ -*- #ifndef YQMultiProgressMeter_h #define YQMultiProgressMeter_h Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/YQMultiSelectionBox.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/YQMultiSelectionBox.h (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/YQMultiSelectionBox.h Tue Jul 31 14:14:45 2007 @@ -16,7 +16,6 @@ /-*/ -// -*- c++ -*- #ifndef YQMultiSelectionBox_h #define YQMultiSelectionBox_h Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/YQPackageSelectorPlugin.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/YQPackageSelectorPlugin.h (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/YQPackageSelectorPlugin.h Tue Jul 31 14:14:45 2007 @@ -16,7 +16,6 @@ /-*/ -// -*- c++ -*- #ifndef YQPackageSelectorPlugin_h #define YQPackageSelectorPlugin_h Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/YQPartitionSplitter.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/YQPartitionSplitter.h (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/YQPartitionSplitter.h Tue Jul 31 14:14:45 2007 @@ -16,7 +16,6 @@ /-*/ -// -*- c++ -*- #ifndef YQPartitionSplitter_h #define YQPartitionSplitter_h Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/YQProgressBar.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/YQProgressBar.h (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/YQProgressBar.h Tue Jul 31 14:14:45 2007 @@ -17,7 +17,6 @@ /-*/ -// -*- c++ -*- #ifndef YQProgressBar_h #define YQProgressBar_h Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/YQPushButton.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/YQPushButton.h (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/YQPushButton.h Tue Jul 31 14:14:45 2007 @@ -16,7 +16,6 @@ /-*/ -// -*- c++ -*- #ifndef YQPushButton_h #define YQPushButton_h Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/YQReplacePoint.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/YQReplacePoint.h (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/YQReplacePoint.h Tue Jul 31 14:14:45 2007 @@ -17,7 +17,6 @@ /-*/ -// -*- c++ -*- #ifndef YQReplacePoint_h #define YQReplacePoint_h Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/YQRichText.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/YQRichText.h (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/YQRichText.h Tue Jul 31 14:14:45 2007 @@ -17,7 +17,6 @@ /-*/ -// -*- c++ -*- #ifndef YQRichText_h #define YQRichText_h Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/YQSelectionBox.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/YQSelectionBox.h (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/YQSelectionBox.h Tue Jul 31 14:14:45 2007 @@ -17,7 +17,6 @@ /-*/ -// -*- c++ -*- #ifndef YQSelectionBox_h #define YQSelectionBox_h Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/YQSlider.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/YQSlider.h (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/YQSlider.h Tue Jul 31 14:14:45 2007 @@ -16,7 +16,6 @@ /-*/ -// -*- c++ -*- #ifndef YQSlider_h #define YQSlider_h Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/YQSpacing.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/YQSpacing.h (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/YQSpacing.h Tue Jul 31 14:14:45 2007 @@ -16,7 +16,6 @@ /-*/ -// -*- c++ -*- #ifndef YQSpacing_h #define YQSpacing_h Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/YQSplit.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/YQSplit.h (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/YQSplit.h Tue Jul 31 14:14:45 2007 @@ -17,7 +17,6 @@ /-*/ -// -*- c++ -*- #ifndef YQSplit_h #define YQSplit_h Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/YQSquash.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/YQSquash.h (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/YQSquash.h Tue Jul 31 14:14:45 2007 @@ -17,7 +17,6 @@ /-*/ -// -*- c++ -*- #ifndef YQSquash_h #define YQSquash_h Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/YQTextEntry.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/YQTextEntry.h (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/YQTextEntry.h Tue Jul 31 14:14:45 2007 @@ -17,7 +17,6 @@ /-*/ -// -*- c++ -*- #ifndef YQTextEntry_h #define YQTextEntry_h Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/YQTime.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/YQTime.h (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/YQTime.h Tue Jul 31 14:14:45 2007 @@ -16,7 +16,6 @@ /-*/ -// -*- c++ -*- #ifndef YQTime_h #define YQTime_h Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/YQTree.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/YQTree.h (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/YQTree.h Tue Jul 31 14:14:45 2007 @@ -17,7 +17,6 @@ /-*/ -// -*- c++ -*- #ifndef YQTree_h #define YQTree_h Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/YQWizard.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/YQWizard.h (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/YQWizard.h Tue Jul 31 14:14:45 2007 @@ -16,7 +16,6 @@ /-*/ -// -*- c++ -*- #ifndef YQWizard_h #define YQWizard_h Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/YQWizardButton.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/YQWizardButton.h (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/YQWizardButton.h Tue Jul 31 14:14:45 2007 @@ -16,7 +16,6 @@ /-*/ -// -*- c++ -*- #ifndef YQWizardButton_h #define YQWizardButton_h Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/YQi18n.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/YQi18n.h (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/YQi18n.h Tue Jul 31 14:14:45 2007 @@ -16,7 +16,6 @@ /-*/ -// -*- c++ -*- #ifndef YQi18n_h #define YQi18n_h Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/Makefile.am (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/Makefile.am Tue Jul 31 14:14:45 2007 @@ -48,8 +48,8 @@ YQPkgDiskUsageWarningDialog.cc \ YQPkgFileListView.cc \ YQPkgGenericDetailsView.cc \ - YQPkgInstSrcFilterView.cc \ - YQPkgInstSrcList.cc \ + YQPkgRepoFilterView.cc \ + YQPkgRepoList.cc \ YQPkgLangList.cc \ YQPkgList.cc \ YQPkgObjList.cc \ @@ -86,8 +86,8 @@ YQPkgDiskUsageWarningDialog.moc \ YQPkgFileListView.moc \ YQPkgGenericDetailsView.moc \ - YQPkgInstSrcFilterView.moc \ - YQPkgInstSrcList.moc \ + YQPkgRepoFilterView.moc \ + YQPkgRepoList.moc \ YQPkgLangList.moc \ YQPkgList.moc \ YQPkgObjList.moc \ @@ -124,8 +124,8 @@ YQPkgDiskUsageWarningDialog.o YQPkgDiskUsageWarningDialog.lo: YQPkgDiskUsageWarningDialog.moc YQPkgFileListView.o YQPkgFileListView.lo: YQPkgFileListView.moc YQPkgGenericDetailsView.o YQPkgGenericDetailsView.lo: YQPkgGenericDetailsView.moc -YQPkgInstSrcFilterView.o YQPkgInstSrcFilterView.lo: YQPkgInstSrcFilterView.moc -YQPkgInstSrcList.o YQPkgInstSrcList.lo: YQPkgInstSrcList.moc +YQPkgRepoFilterView.o YQPkgRepoFilterView.lo: YQPkgRepoFilterView.moc +YQPkgRepoList.o YQPkgRepoList.lo: YQPkgRepoList.moc YQPkgLangList.o YQPkgLangList.lo: YQPkgLangList.moc YQPkgList.o YQPkgList.lo: YQPkgList.moc YQPkgObjList.o YQPkgObjList.lo: YQPkgObjList.moc @@ -161,8 +161,8 @@ YQPkgDiskUsageWarningDialog.moc: YQPkgDiskUsageWarningDialog.h YQPkgFileListView.moc: YQPkgFileListView.h YQPkgGenericDetailsView.moc: YQPkgGenericDetailsView.h -YQPkgInstSrcFilterView.moc: YQPkgInstSrcFilterView.h -YQPkgInstSrcList.moc: YQPkgInstSrcList.h +YQPkgRepoFilterView.moc: YQPkgRepoFilterView.h +YQPkgRepoList.moc: YQPkgRepoList.h YQPkgLangList.moc: YQPkgLangList.h YQPkgList.moc: YQPkgList.h YQPkgObjList.moc: YQPkgObjList.h Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPackageSelector.cc (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPackageSelector.cc Tue Jul 31 14:14:45 2007 @@ -59,8 +59,8 @@ #include "YQPkgDiskUsageList.h" #include "YQPkgDiskUsageWarningDialog.h" #include "YQPkgFileListView.h" -#include "YQPkgInstSrcFilterView.h" -#include "YQPkgInstSrcList.h" +#include "YQPkgRepoFilterView.h" +#include "YQPkgRepoList.h" #include "YQPkgLangList.h" #include "YQPkgList.h" #include "YQPkgPatchFilterView.h" @@ -106,7 +106,7 @@ _detailsViews = 0; _diskUsageList = 0; _filters = 0; - _instSrcFilterView = 0; + _repoFilterView = 0; _langList = 0; _patternList = 0; _pkgChangeLogView = 0; @@ -152,16 +152,16 @@ _patchList->filter(); } } - else if ( _instSrcFilterView && _instSourcesMode ) + else if ( _repoFilterView && _instSourcesMode ) { - if ( YQPkgInstSrcList::countEnabledSources() > 1 ) + if ( YQPkgRepoList::countEnabledRepositories() > 1 ) { - _filters->showPage( _instSrcFilterView ); - _instSrcFilterView->filter(); + _filters->showPage( _repoFilterView ); + _repoFilterView->filter(); } else if ( _searchFilterView ) { - y2milestone( "No multiple inst sources - falling back to search mode" ); + y2milestone( "No multiple repositories - falling back to search mode" ); _filters->showPage( _searchFilterView ); _searchFilterView->filter(); QTimer::singleShot( 0, _searchFilterView, SLOT( setFocus() ) ); @@ -368,12 +368,12 @@ // - // Inst source view + // Repository view // - _instSrcFilterView = new YQPkgInstSrcFilterView( parent ); - CHECK_PTR( _instSrcFilterView ); - _filters->addPage( _( "Installation Sources" ), _instSrcFilterView ); + _repoFilterView = new YQPkgRepoFilterView( parent ); + CHECK_PTR( _repoFilterView ); + _filters->addPage( _( "Repositories" ), _repoFilterView ); // @@ -843,7 +843,7 @@ connectFilter( _updateProblemFilterView, _pkgList, false ); connectFilter( _patternList, _pkgList ); connectFilter( _selList, _pkgList ); - connectFilter( _instSrcFilterView, _pkgList, false ); + connectFilter( _repoFilterView, _pkgList, false ); connectFilter( _rpmGroupTagsFilterView, _pkgList, false ); connectFilter( _langList, _pkgList ); connectFilter( _statusFilterView, _pkgList, false ); @@ -855,9 +855,9 @@ _pkgList, SLOT ( message( const QString & ) ) ); } - if ( _instSrcFilterView && _pkgList ) + if ( _repoFilterView && _pkgList ) { - connect( _instSrcFilterView, SIGNAL( filterNearMatch ( ZyppSel, ZyppPkg ) ), + connect( _repoFilterView, SIGNAL( filterNearMatch ( ZyppSel, ZyppPkg ) ), _pkgList, SLOT ( addPkgItemDimmed ( ZyppSel, ZyppPkg ) ) ); } Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPackageSelector.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPackageSelector.h (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPackageSelector.h Tue Jul 31 14:14:45 2007 @@ -16,7 +16,6 @@ /-*/ -// -*- c++ -*- #ifndef YQPackageSelector_h #define YQPackageSelector_h @@ -46,7 +45,7 @@ class YQPkgDescriptionView; class YQPkgDiskUsageList; class YQPkgFileListView; -class YQPkgInstSrcFilterView; +class YQPkgRepoFilterView; class YQPkgLangList; class YQPkgList; class YQPkgPatternList; @@ -307,7 +306,7 @@ YQPkgDependenciesView * _pkgDependenciesView; YQPkgDescriptionView * _pkgDescriptionView; YQPkgFileListView * _pkgFileListView; - YQPkgInstSrcFilterView * _instSrcFilterView; + YQPkgRepoFilterView * _repoFilterView; YQPkgLangList * _langList; YQPkgList * _pkgList; YQPkgPatternList * _patternList; Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPackageSelectorBase.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPackageSelectorBase.h (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPackageSelectorBase.h Tue Jul 31 14:14:45 2007 @@ -16,7 +16,6 @@ /-*/ -// -*- c++ -*- #ifndef YQPackageSelectorBase_h #define YQPackageSelectorBase_h Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPatternSelector.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPatternSelector.h (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPatternSelector.h Tue Jul 31 14:14:45 2007 @@ -16,7 +16,6 @@ /-*/ -// -*- c++ -*- #ifndef YQPatternSelector_h #define YQPatternSelector_h Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgChangeLogView.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgChangeLogView.h (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgChangeLogView.h Tue Jul 31 14:14:45 2007 @@ -16,7 +16,6 @@ /-*/ -// -*- c++ -*- #ifndef YQPkgChangeLogView_h Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgChangesDialog.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgChangesDialog.h (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgChangesDialog.h Tue Jul 31 14:14:45 2007 @@ -16,7 +16,6 @@ /-*/ -// -*- c++ -*- #ifndef YQPkgChangesDialog_h Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgConflictDialog.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgConflictDialog.h (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgConflictDialog.h Tue Jul 31 14:14:45 2007 @@ -16,7 +16,6 @@ /-*/ -// -*- c++ -*- #ifndef YQPkgConflictDialog_h Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgConflictList.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgConflictList.cc (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgConflictList.cc Tue Jul 31 14:14:45 2007 @@ -256,7 +256,7 @@ parent->setOpen( true ); } - QStringList lines = QStringList::split( '\n', longText.simplifyWhiteSpace(), + QStringList lines = QStringList::split( '\n', longText, true ); // allowEmptyEntries QValueList<QString>::const_iterator it = lines.begin(); Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgConflictList.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgConflictList.h (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgConflictList.h Tue Jul 31 14:14:45 2007 @@ -16,7 +16,6 @@ /-*/ -// -*- c++ -*- #ifndef YQPkgConflictList_h Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgDependenciesView.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgDependenciesView.h (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgDependenciesView.h Tue Jul 31 14:14:45 2007 @@ -16,7 +16,6 @@ /-*/ -// -*- c++ -*- #ifndef YQPkgDependenciesView_h Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgDescriptionDialog.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgDescriptionDialog.h (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgDescriptionDialog.h Tue Jul 31 14:14:45 2007 @@ -16,7 +16,6 @@ /-*/ -// -*- c++ -*- #ifndef YQPkgDescriptionDialog_h Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgDescriptionView.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgDescriptionView.h (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgDescriptionView.h Tue Jul 31 14:14:45 2007 @@ -16,7 +16,6 @@ /-*/ -// -*- c++ -*- #ifndef YQPkgDescriptionView_h Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgDiskUsageList.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgDiskUsageList.h (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgDiskUsageList.h Tue Jul 31 14:14:45 2007 @@ -16,7 +16,6 @@ /-*/ -// -*- c++ -*- #ifndef YQPkgDiskUsageList_h Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgDiskUsageWarningDialog.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgDiskUsageWarningDialog.h (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgDiskUsageWarningDialog.h Tue Jul 31 14:14:45 2007 @@ -16,7 +16,6 @@ /-*/ -// -*- c++ -*- #ifndef YQPkgDiskUsageWarningDialog_h Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgFileListView.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgFileListView.h (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgFileListView.h Tue Jul 31 14:14:45 2007 @@ -16,7 +16,6 @@ /-*/ -// -*- c++ -*- #ifndef YQPkgFileListView_h Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgGenericDetailsView.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgGenericDetailsView.h (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgGenericDetailsView.h Tue Jul 31 14:14:45 2007 @@ -16,7 +16,6 @@ /-*/ -// -*- c++ -*- #ifndef YQPkgGenericDetailsView_h Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgLangList.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgLangList.h (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgLangList.h Tue Jul 31 14:14:45 2007 @@ -16,7 +16,6 @@ /-*/ -// -*- c++ -*- #ifndef YQPkgLangList_h Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgList.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgList.h (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgList.h Tue Jul 31 14:14:45 2007 @@ -16,7 +16,6 @@ /-*/ -// -*- c++ -*- #ifndef YQPkgList_h Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgObjList.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgObjList.h (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgObjList.h Tue Jul 31 14:14:45 2007 @@ -16,7 +16,6 @@ /-*/ -// -*- c++ -*- #ifndef YQPkgObjList_h Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgPatchFilterView.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgPatchFilterView.h (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgPatchFilterView.h Tue Jul 31 14:14:45 2007 @@ -16,7 +16,6 @@ /-*/ -// -*- c++ -*- #ifndef YQPkgPatchFilterView_h Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgPatchList.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgPatchList.h (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgPatchList.h Tue Jul 31 14:14:45 2007 @@ -16,7 +16,6 @@ /-*/ -// -*- c++ -*- #ifndef YQPkgPatchList_h @@ -65,7 +64,7 @@ **/ virtual ~YQPkgPatchList(); - + enum FilterCriteria { RelevantPatches, // needed + broken @@ -291,7 +290,7 @@ **/ virtual void applyChanges(); - + // Data members YQPkgPatchList * _patchList; Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgPatternList.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgPatternList.h (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgPatternList.h Tue Jul 31 14:14:45 2007 @@ -16,7 +16,6 @@ /-*/ -// -*- c++ -*- #ifndef YQPkgPatternList_h Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgProductDialog.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgProductDialog.h (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgProductDialog.h Tue Jul 31 14:14:45 2007 @@ -16,7 +16,6 @@ /-*/ -// -*- c++ -*- #ifndef YQPkgProductDialog_h Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgProductList.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgProductList.h (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgProductList.h Tue Jul 31 14:14:45 2007 @@ -16,7 +16,6 @@ /-*/ -// -*- c++ -*- #ifndef YQPkgProductList_h Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgRpmGroupTagsFilterView.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgRpmGroupTagsFilterView.h (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgRpmGroupTagsFilterView.h Tue Jul 31 14:14:45 2007 @@ -16,7 +16,6 @@ /-*/ -// -*- c++ -*- #ifndef YQPkgRpmGroupTagsFilterView_h Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgSearchFilterView.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgSearchFilterView.cc (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgSearchFilterView.cc Tue Jul 31 14:14:45 2007 @@ -222,7 +222,7 @@ int count = 0; for ( ZyppPoolIterator it = zyppPkgBegin(); - it != zyppPkgEnd(); + it != zyppPkgEnd() && ! progress.wasCancelled(); ++it ) { ZyppSel selectable = *it; Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgSearchFilterView.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgSearchFilterView.h (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgSearchFilterView.h Tue Jul 31 14:14:45 2007 @@ -16,7 +16,6 @@ /-*/ -// -*- c++ -*- #ifndef YQPkgSearchFilterView_h Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgSelDescriptionView.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgSelDescriptionView.h (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgSelDescriptionView.h Tue Jul 31 14:14:45 2007 @@ -16,7 +16,6 @@ /-*/ -// -*- c++ -*- #ifndef YQPkgSelDescriptionView_h Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgSelList.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgSelList.h (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgSelList.h Tue Jul 31 14:14:45 2007 @@ -16,7 +16,6 @@ /-*/ -// -*- c++ -*- #ifndef YQPkgSelList_h Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgSelMapper.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgSelMapper.h (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgSelMapper.h Tue Jul 31 14:14:45 2007 @@ -16,7 +16,6 @@ /-*/ -// -*- c++ -*- #ifndef YQPkgSelMapper_h #define YQPkgSelMapper_h @@ -62,8 +61,7 @@ /** * Rebuild the shared cache. This is expensive. Call this only when the - * ZyppPool has changed, i.e. after installation sources were added or - * removed. + * ZyppPool has changed, i.e. after repositories were added or removed. * * Since the cache is shared, this affects all instances of this class. **/ Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgStatusFilterView.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgStatusFilterView.h (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgStatusFilterView.h Tue Jul 31 14:14:45 2007 @@ -16,7 +16,6 @@ /-*/ -// -*- c++ -*- #ifndef YQPkgStatusFilterView_h Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgTechnicalDetailsView.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgTechnicalDetailsView.cc (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgTechnicalDetailsView.cc Tue Jul 31 14:14:45 2007 @@ -133,7 +133,7 @@ row( hcell( _( "Package Group:" ) ) + cell( formatRpmGroup( pkg ) ) ) + row( hcell( _( "License:" ) ) + cell( pkg->license() ) ) + row( hcell( _( "Installed Size:" ) ) + cell( pkg->size().asString() ) ) + - row( hcell( _( "Archive Size:" ) ) + cell( pkg->archivesize().asString() ) ) + + row( hcell( _( "Download Size:" ) ) + cell( pkg->downloadSize().asString() ) ) + row( hcell( _( "Distribution:" ) ) + cell( pkg->distribution() ) ) + row( hcell( _( "Vendor:" ) ) + cell( pkg->vendor() ) ) + row( hcell( _( "Packager:" ) ) + cell( pkg->packager() ) ) + @@ -144,7 +144,7 @@ #ifdef FIXME_missing_in_zypp row( hcell( _( "Source RPM:" ) ) + cell( pkg->sourceloc() ) ) + #endif - row( hcell( _( "Media No.:" ) ) + cell( pkg->sourceMediaNr() ) ) + + row( hcell( _( "Media No.:" ) ) + cell( pkg->mediaNr() ) ) + row( hcell( _( "Authors:" ) ) + authorsListCell( pkg ) ) ); @@ -173,7 +173,7 @@ row( hcell( _( "Package Group:" ) ) + cell( formatRpmGroup( p1 ) ) + cell( formatRpmGroup( p2 ) ) ) + row( hcell( _( "License:" ) ) + cell( p1->license() ) + cell( p2->license() ) ) + row( hcell( _( "Installed Size:" ) ) + cell( p1->size().asString() ) + cell( p2->size().asString() ) ) + - row( hcell( _( "Archive Size:" ) ) + cell( p1->archivesize().asString() ) + cell( p2->archivesize().asString() ) ) + + row( hcell( _( "Download Size:" ) ) + cell( p1->downloadSize().asString() ) + cell( p2->downloadSize().asString() ) ) + row( hcell( _( "Distribution:" ) ) + cell( p1->distribution() ) + cell( p2->distribution() ) ) + row( hcell( _( "Vendor:" ) ) + cell( p1->vendor() ) + cell( p2->vendor() ) ) + row( hcell( _( "Packager:" ) ) + cell( p1->packager() ) + cell( p2->packager() ) ) + @@ -184,7 +184,7 @@ #ifdef FIXME_missing_in_zypp row( hcell( _( "Source RPM:" ) ) + cell( p1->sourceloc() ) + cell( p2->sourceloc() ) ) + #endif - row( hcell( _( "Media No.:" ) ) + cell( p1->sourceMediaNr() ) + cell( p2->sourceMediaNr() ) ) + + row( hcell( _( "Media No.:" ) ) + cell( p1->mediaNr() ) + cell( p2->mediaNr() ) ) + row( hcell( _( "Authors:" ) ) + authorsListCell( p1 ) + authorsListCell( p2 ) ) ); Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgTechnicalDetailsView.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgTechnicalDetailsView.h (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgTechnicalDetailsView.h Tue Jul 31 14:14:45 2007 @@ -16,7 +16,6 @@ /-*/ -// -*- c++ -*- #ifndef YQPkgTechnicalDetailsView_h Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgTextDialog.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgTextDialog.h (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgTextDialog.h Tue Jul 31 14:14:45 2007 @@ -16,7 +16,6 @@ /-*/ -// -*- c++ -*- #ifndef YQPkgTextDialog_h Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgUpdateProblemFilterView.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgUpdateProblemFilterView.h (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgUpdateProblemFilterView.h Tue Jul 31 14:14:45 2007 @@ -16,7 +16,6 @@ /-*/ -// -*- c++ -*- #ifndef YQPkgUpdateProblemFilterView_h Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgVersionsView.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgVersionsView.cc (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgVersionsView.cc Tue Jul 31 14:14:45 2007 @@ -21,14 +21,14 @@ #define y2log_component "qt-pkg" #include <YQZypp.h> -#include <zypp/Source.h> +#include <zypp/Repository.h> #include <ycp/y2log.h> #include <qtabwidget.h> #include <qregexp.h> #include <qheader.h> #include "YQPkgVersionsView.h" -#include "YQPkgInstSrcList.h" +#include "YQPkgRepoList.h" #include "YQIconPool.h" #include "YQi18n.h" #include "utf8.h" @@ -45,21 +45,21 @@ _archCol = -42; _productCol = -42; _urlCol = -42; - _instSrcCol = -42; + _repoCol = -42; _statusCol = -42; _nameCol = -42; _summaryCol = -42; int numCol = 0; - addColumn( _( "Version" ) ); _versionCol = numCol++; - addColumn( _( "Arch." ) ); _archCol = numCol++; - addColumn( _( "Product" ) ); _productCol = numCol++; - addColumn( _( "Installation Source" ) ); _instSrcCol = numCol++; - addColumn( _( "URL" ) ); _urlCol = numCol++; + addColumn( _( "Version" ) ); _versionCol = numCol++; + addColumn( _( "Arch." ) ); _archCol = numCol++; + addColumn( _( "Product" ) ); _productCol = numCol++; + addColumn( _( "Repository" ) ); _repoCol = numCol++; + addColumn( _( "URL" ) ); _urlCol = numCol++; _statusCol = _productCol; _nameCol = _versionCol; - _summaryCol = _instSrcCol; + _summaryCol = _repoCol; // saveColumnWidths(); // Minimize column widths // header()->hide(); @@ -248,17 +248,22 @@ if ( versionCol() >= 0 ) setText( versionCol(), zyppObj->edition().asString().c_str() ); if ( archCol() >= 0 ) setText( archCol(), zyppObj->arch().asString().c_str() ); - if ( instSrcCol() >= 0 ) setText( instSrcCol(), zyppObj->source().alias().c_str() ); + if ( repoCol() >= 0 ) setText( repoCol(), zyppObj->repository().info().alias().c_str() ); if ( productCol() >= 0 ) { - ZyppProduct product = YQPkgInstSrcListItem::singleProduct( zyppObj->source() ); + ZyppProduct product = YQPkgRepoListItem::singleProduct( zyppObj->repository() ); if ( product ) setText( productCol(), product->summary() ); } if ( urlCol() >= 0 ) { - setText( urlCol(), zyppObj->source().url().asString().c_str() ); + zypp::Url repoUrl; + if ( ! zyppObj->repository().info().baseUrlsEmpty() ) + { + repoUrl = *zyppObj->repository().info().baseUrlsBegin(); + } + setText( urlCol(), repoUrl.asString().c_str() ); } if ( _selectable->hasInstalledObj() ) Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgVersionsView.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgVersionsView.h (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQPkgVersionsView.h Tue Jul 31 14:14:45 2007 @@ -16,7 +16,6 @@ /-*/ -// -*- c++ -*- #ifndef YQPkgVersionsView_h @@ -31,7 +30,7 @@ /** * @short Package version selector: Display a list of available versions from - * all the different installation sources and let the user change the candidate + * all the different repositories and let the user change the candidate * version for installation / update. **/ class YQPkgVersionsView : public QY2ListView @@ -66,7 +65,7 @@ int archCol() const { return _archCol; } int productCol() const { return _productCol; } int urlCol() const { return _urlCol; } - int instSrcCol() const { return _instSrcCol; } + int repoCol() const { return _repoCol; } int nameCol() const { return _nameCol; } int summaryCol() const { return _summaryCol; } int statusCol() const { return _statusCol; } @@ -124,7 +123,7 @@ int _archCol; int _productCol; int _urlCol; - int _instSrcCol; + int _repoCol; int _nameCol; int _summaryCol; int _statusCol; @@ -187,7 +186,7 @@ int versionCol() const { return _pkgVersionList->versionCol(); } int productCol() const { return _pkgVersionList->productCol(); } int urlCol() const { return _pkgVersionList->urlCol(); } - int instSrcCol() const { return _pkgVersionList->instSrcCol(); } + int repoCol() const { return _pkgVersionList->repoCol(); } int statusCol() const { return _pkgVersionList->statusCol(); } int archCol() const { return _pkgVersionList->archCol(); } Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQSimplePatchSelector.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQSimplePatchSelector.h (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQSimplePatchSelector.h Tue Jul 31 14:14:45 2007 @@ -16,7 +16,6 @@ /-*/ -// -*- c++ -*- #ifndef YQSimplePatchSelector_h #define YQSimplePatchSelector_h Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQZypp.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQZypp.h (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/pkg/YQZypp.h Tue Jul 31 14:14:45 2007 @@ -16,7 +16,6 @@ /-*/ -// -*- c++ -*- #ifndef YQZypp_h #define YQZypp_h @@ -35,16 +34,16 @@ #include <zypp/ResPoolProxy.h> -using zypp::ui::S_Protected; -using zypp::ui::S_Taboo; -using zypp::ui::S_Del; -using zypp::ui::S_Update; -using zypp::ui::S_Install; -using zypp::ui::S_AutoDel; -using zypp::ui::S_AutoUpdate; -using zypp::ui::S_AutoInstall; -using zypp::ui::S_KeepInstalled; -using zypp::ui::S_NoInst; +using zypp::ui::S_Protected; +using zypp::ui::S_Taboo; +using zypp::ui::S_Del; +using zypp::ui::S_Update; +using zypp::ui::S_Install; +using zypp::ui::S_AutoDel; +using zypp::ui::S_AutoUpdate; +using zypp::ui::S_AutoInstall; +using zypp::ui::S_KeepInstalled; +using zypp::ui::S_NoInst; // @@ -63,7 +62,7 @@ typedef zypp::ResPoolProxy ZyppPool; typedef zypp::ResPoolProxy::const_iterator ZyppPoolIterator; - +typedef zypp::ResPoolProxy::repository_iterator ZyppRepositoryIterator; inline ZyppPool zyppPool() { return zypp::getZYpp()->poolProxy(); } @@ -88,6 +87,8 @@ inline ZyppPoolIterator zyppProductsBegin() { return zyppBegin<zypp::Product>(); } inline ZyppPoolIterator zyppProductsEnd() { return zyppEnd<zypp::Product>(); } +inline ZyppRepositoryIterator ZyppRepositoriesBegin() { return zyppPool().knownRepositoriesBegin(); } +inline ZyppRepositoryIterator ZyppRepositoriesEnd() { return zyppPool().knownRepositoriesEnd(); } inline ZyppPkg tryCastToZyppPkg( ZyppObj zyppObj ) { Modified: branches/tmp/mvidner/ui-as-namespace/qt/src/utf8.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/src/utf8.h (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/src/utf8.h Tue Jul 31 14:14:45 2007 @@ -17,7 +17,6 @@ /-*/ -// -*- c++ -*- #ifndef utf8_h #define utf8_h Modified: branches/tmp/mvidner/ui-as-namespace/qt/yast2-qt.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/q… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/qt/yast2-qt.spec.in (original) +++ branches/tmp/mvidner/ui-as-namespace/qt/yast2-qt.spec.in Tue Jul 31 14:14:45 2007 @@ -6,7 +6,7 @@ Summary: - BuildRequires: yast2-core-devel >= 2.15.6 -Requires: libzypp >= 2.13.0 +Requires: libzypp >= 3.11.8 Provides: yast2_ui Provides: y2base:/var/lib/YaST2/servers/qt Provides: y2base:/usr/lib/YaST2/servers/qt -- 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] r39835 - /branches/tmp/mvidner/ui-as-namespace/gtk/
by mvidner＠svn.opensuse.org 31 Jul '07

31 Jul '07

Author: mvidner Date: Tue Jul 31 14:06:53 2007 New Revision: 39835 URL: http://svn.opensuse.org/viewcvs/yast?rev=39835&view=rev Log: Initialized merge tracking via "svnmerge" with revisions "1-39046" from http://svn.opensuse.org/svn/yast/trunk/gtk Modified: branches/tmp/mvidner/ui-as-namespace/gtk/ (props changed) -- 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] r39834 - /branches/tmp/mvidner/ui-as-namespace/qt/
by mvidner＠svn.opensuse.org 31 Jul '07

31 Jul '07

Author: mvidner Date: Tue Jul 31 14:00:12 2007 New Revision: 39834 URL: http://svn.opensuse.org/viewcvs/yast?rev=39834&view=rev Log: Initialized merge tracking via "svnmerge" with revisions "1-39047" from http://svn.opensuse.org/svn/yast/trunk/qt Modified: branches/tmp/mvidner/ui-as-namespace/qt/ (props changed) -- 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] r39833 - in /branches/tmp/mvidner/ui-as-namespace/ncurses: ./ package/ src/ src/pkg/
by mvidner＠svn.opensuse.org 31 Jul '07

31 Jul '07

Author: mvidner Date: Tue Jul 31 13:43:10 2007 New Revision: 39833 URL: http://svn.opensuse.org/viewcvs/yast?rev=39833&view=rev Log: Merged revisions 39049-39832 via svnmerge from http://svn.opensuse.org/svn/yast/trunk/ncurses ........ r39137 | kmachalkova | 2007-07-03 11:32:45 +0200 (Út, 03 čec 2007) | 2 lines Merged adrian's changelog fix ........ r39443 | kmachalkova | 2007-07-16 16:30:49 +0200 (Po, 16 čec 2007) | 2 lines Merged zypp refactoring branch back to trunk ........ r39449 | mvidner | 2007-07-16 17:14:51 +0200 (Po, 16 čec 2007) | 2 lines fixed changelog duplicates ........ r39455 | kmachalkova | 2007-07-17 09:33:53 +0200 (Út, 17 čec 2007) | 2 lines Require refactored libzypp ........ r39456 | kmachalkova | 2007-07-17 09:34:55 +0200 (Út, 17 čec 2007) | 2 lines Merged libzypp refactoring changes ........ r39457 | kmachalkova | 2007-07-17 09:52:41 +0200 (Út, 17 čec 2007) | 2 lines Again and better ........ r39494 | gs | 2007-07-18 12:26:15 +0200 (St, 18 čec 2007) | 2 lines change shortcut to prevent duplicates (bug #289771) ........ r39519 | kmachalkova | 2007-07-19 11:32:54 +0200 (Čt, 19 čec 2007) | 4 lines - New helper classes NCPkgRepoTag and NCPkgRepoTable - Make it work: list all repositories (+ their products), collect packages for selected repository ........ r39522 | kmachalkova | 2007-07-19 13:11:05 +0200 (Čt, 19 čec 2007) | 2 lines Documenting and commenting the whole stuff ........ r39523 | kmachalkova | 2007-07-19 13:23:37 +0200 (Čt, 19 čec 2007) | 2 lines Fixed syntax errors ;-) ........ r39524 | kmachalkova | 2007-07-19 13:24:02 +0200 (Čt, 19 čec 2007) | 2 lines BuildRequires: dejagnu++ ........ r39533 | kmachalkova | 2007-07-19 14:41:30 +0200 (Čt, 19 čec 2007) | 2 lines version 2.15.21 ........ r39535 | kmachalkova | 2007-07-19 14:45:37 +0200 (Čt, 19 čec 2007) | 2 lines changelog up ;-) ........ Added: branches/tmp/mvidner/ui-as-namespace/ncurses/src/pkg/NCPkgPopupRepo.cc - copied unchanged from r39535, trunk/ncurses/src/pkg/NCPkgPopupRepo.cc branches/tmp/mvidner/ui-as-namespace/ncurses/src/pkg/NCPkgPopupRepo.h - copied unchanged from r39535, trunk/ncurses/src/pkg/NCPkgPopupRepo.h Modified: branches/tmp/mvidner/ui-as-namespace/ncurses/ (props changed) branches/tmp/mvidner/ui-as-namespace/ncurses/VERSION branches/tmp/mvidner/ui-as-namespace/ncurses/package/yast2-ncurses.changes branches/tmp/mvidner/ui-as-namespace/ncurses/src/NCPkgTable.cc branches/tmp/mvidner/ui-as-namespace/ncurses/src/pkg/Makefile.am branches/tmp/mvidner/ui-as-namespace/ncurses/src/pkg/NCPackageSelector.cc branches/tmp/mvidner/ui-as-namespace/ncurses/src/pkg/NCPackageSelector.h branches/tmp/mvidner/ui-as-namespace/ncurses/src/pkg/NCPkgNames.cc branches/tmp/mvidner/ui-as-namespace/ncurses/src/pkg/NCPkgNames.h branches/tmp/mvidner/ui-as-namespace/ncurses/src/pkg/NCPkgPopupDeps.cc branches/tmp/mvidner/ui-as-namespace/ncurses/src/pkg/NCPkgPopupSelection.cc branches/tmp/mvidner/ui-as-namespace/ncurses/src/pkg/NCZypp.h branches/tmp/mvidner/ui-as-namespace/ncurses/src/pkg/pkg_layout.ycp branches/tmp/mvidner/ui-as-namespace/ncurses/yast2-ncurses.spec.in Modified: branches/tmp/mvidner/ui-as-namespace/ncurses/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/n… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/ncurses/VERSION (original) +++ branches/tmp/mvidner/ui-as-namespace/ncurses/VERSION Tue Jul 31 13:43:10 2007 @@ -1 +1 @@ -2.15.19 +2.15.21 Modified: branches/tmp/mvidner/ui-as-namespace/ncurses/package/yast2-ncurses.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/n… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/ncurses/package/yast2-ncurses.changes (original) +++ branches/tmp/mvidner/ui-as-namespace/ncurses/package/yast2-ncurses.changes Tue Jul 31 13:43:10 2007 @@ -1,4 +1,43 @@ ------------------------------------------------------------------- +Thu Jul 19 13:24:01 CEST 2007 - kmachalkova(a)suse.cz + +- Make repositories list popup work (FaTE #301810 - part II) - + show repositories (and their products), show packages for selected + repository +- Added dejagnu to BuildRequires (needed to run testsuite during pkg + build) +- Changed kbd shortcut to prevent duplicates (bug #289771) - by gs +- 2.15.21 + +------------------------------------------------------------------- +Tue Jul 17 09:51:36 CEST 2007 - kmachalkova(a)suse.cz + +- Require new libzypp (>= 3.11.8) +- Correct svn merge from refactoring branch + +------------------------------------------------------------------- +Mon Jul 16 17:12:46 CEST 2007 - mvidner(a)suse.cz + +- fixed changelog duplicates + +------------------------------------------------------------------- +Mon Jul 16 16:27:38 CEST 2007 - kmachalkova(a)suse.cz + +- Added repositories list popup (FaTE #301810 - part II) - does + not do anything useful yet + +------------------------------------------------------------------- +Wed Jul 4 14:40:23 CEST 2007 - gs(a)suse.de + +- adapted to libzypp-3.10 +- 2.15.20 + +------------------------------------------------------------------- +Thu Jun 21 17:38:48 CEST 2007 - adrian(a)suse.de + +- fix changelog entry order + +------------------------------------------------------------------- Thu Jun 14 16:41:04 CEST 2007 - kmachalkova(a)suse.cz - Use environment variable Y2NCURSES_COLOR_THEME to set color theme @@ -1334,12 +1373,6 @@ - improvements for package installation dialog ------------------------------------------------------------------- -Thu Nov 14 20:56:17 CET 2002 - ma(a)suse.de - -- V 2.7.2 -- Fixed bug that inhibits logging on big-endian architectures. - -------------------------------------------------------------------- Tue Nov 26 15:36:02 CET 2002 - gs(a)suse.de - V 2.6.24 @@ -1347,13 +1380,19 @@ (preserve newlines) ------------------------------------------------------------------- +Thu Nov 14 20:56:17 CET 2002 - ma(a)suse.de + +- V 2.7.2 +- Fixed bug that inhibits logging on big-endian architectures. + +------------------------------------------------------------------- Thu Nov 14 19:34:31 CET 2002 - ma(a)suse.de - V 2.6.23 - Fixed bug that inhibits logging on big-endian architectures. -------------------------------------------------------------------- +------------------------------------------------------------------ Wed Nov 13 12:35:21 CET 2002 - gs(a)suse.de - V 2.6.22 Modified: branches/tmp/mvidner/ui-as-namespace/ncurses/src/NCPkgTable.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/n… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/ncurses/src/NCPkgTable.cc (original) +++ branches/tmp/mvidner/ui-as-namespace/ncurses/src/NCPkgTable.cc Tue Jul 31 13:43:10 2007 @@ -646,8 +646,8 @@ version = pkgPtr->edition().asString(); pkgLine.push_back( version ); - // is alias the right string? id? - pkgLine.push_back( pkgPtr->source().alias() ); // show the installation source + // show the repository (the installation source) + pkgLine.push_back( pkgPtr->repository().info().alias() ); // set package status either to S_NoInst or S_KeepInstalled status = S_NoInst; Modified: branches/tmp/mvidner/ui-as-namespace/ncurses/src/pkg/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/n… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/ncurses/src/pkg/Makefile.am (original) +++ branches/tmp/mvidner/ui-as-namespace/ncurses/src/pkg/Makefile.am Tue Jul 31 13:43:10 2007 @@ -24,6 +24,7 @@ NCPkgPopupDiskspace.h \ NCPkgPopupDescr.h \ NCPkgPopupTable.h \ + NCPkgPopupRepo.h \ NCPkgPopupSearch.h \ NCPkgPopupSelection.h \ NCPkgPopupTree.h \ @@ -38,6 +39,7 @@ NCPkgPopupDiskspace.cc \ NCPkgPopupDescr.cc \ NCPkgPopupTable.cc \ + NCPkgPopupRepo.cc \ NCPkgPopupSearch.cc \ NCPkgPopupSelection.cc \ NCPkgPopupTree.cc \ Modified: branches/tmp/mvidner/ui-as-namespace/ncurses/src/pkg/NCPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/n… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/ncurses/src/pkg/NCPackageSelector.cc (original) +++ branches/tmp/mvidner/ui-as-namespace/ncurses/src/pkg/NCPackageSelector.cc Tue Jul 31 13:43:10 2007 @@ -27,6 +27,7 @@ #include "NCSelectionBox.h" #include "NCMenuButton.h" #include "NCPkgPopupSelection.h" +#include "NCPkgPopupRepo.h" #include "NCPkgPopupDeps.h" #include "NCPkgPopupDiskspace.h" #include "NCPkgPopupTable.h" @@ -104,6 +105,7 @@ , selectionPopup( 0 ) , patternPopup( 0 ) , languagePopup( 0 ) + , repoPopup( 0 ) , diskspacePopup( 0 ) , searchPopup( 0 ) , youMode( false ) @@ -123,6 +125,7 @@ eventHandlerMap[ NCPkgNames::Selections()->toString() ] = &NCPackageSelector::FilterHandler; eventHandlerMap[ NCPkgNames::Patterns()->toString() ] = &NCPackageSelector::FilterHandler; eventHandlerMap[ NCPkgNames::Languages()->toString() ] = &NCPackageSelector::FilterHandler; + eventHandlerMap[ NCPkgNames::Repositories()->toString() ] = &NCPackageSelector::FilterHandler; eventHandlerMap[ NCPkgNames::UpdateList()->toString() ] = &NCPackageSelector::FilterHandler; eventHandlerMap[ NCPkgNames::Installed()->toString() ] = &NCPackageSelector::FilterHandler; eventHandlerMap[ NCPkgNames::Whatif()->toString() ] = &NCPackageSelector::FilterHandler; @@ -219,6 +222,9 @@ // create language popup languagePopup = new NCPkgPopupSelection( wpos( 1,1 ), this, NCPkgPopupSelection::S_Language ); + // create repositories popup + repoPopup = new NCPkgPopupRepo( wpos( 1,1), this ); + // create the filter popup filterPopup = new NCPkgPopupTree( wpos( 1, 1 ), this ); @@ -257,6 +263,10 @@ { delete languagePopup; } + if ( repoPopup ) + { + delete repoPopup; + } if ( depsPopup ) { delete depsPopup; @@ -1153,6 +1163,76 @@ /////////////////////////////////////////////////////////////////// // +// fillRepoFilterList +// +// Fills the package table with packages from selected repository +// + +bool NCPackageSelector::fillRepoFilterList( ZyppRepo repo) +{ + NCMIL << "Collecting packages in selected repository" << endl; + + NCPkgTable *pkgList = getPackageList(); + //clean the pkg table first + pkgList->itemsCleared (); + + //sets to store matching packages + set <ZyppSel> exactMatch; + set <ZyppSel> nearMatch; + + //iterate through the package pool + for ( ZyppPoolIterator it = zyppPkgBegin(); + it != zyppPkgEnd(); + ++it ) + { + //we have candidate object in this repository + if ( (*it)->candidateObj() && + (*it)->candidateObj()->repository() == repo ) + { + exactMatch.insert( *it ); + } + //something else (?) + else + { + zypp::ui::Selectable::available_iterator pkg_it = (*it)->availableBegin(); + + while ( pkg_it != (*it)->availableEnd() ) + { + if ( (*pkg_it)->repository() == repo ) + nearMatch.insert( *it ); + + ++pkg_it; + } + } + + } + + //finally create pkg table list entries + set<ZyppSel>::const_iterator e_it = exactMatch.begin(); + while ( e_it != exactMatch.end() ) + { + ZyppPkg pkg = tryCastToZyppPkg( (*e_it)->theObj() ); + pkgList->createListEntry ( pkg, *e_it); + e_it++; + } + + set<ZyppSel>::const_iterator n_it = nearMatch.begin(); + while ( n_it != nearMatch.end() ) + { + ZyppPkg pkg = tryCastToZyppPkg( (*n_it)->theObj() ); + pkgList->createListEntry ( pkg, *n_it); + n_it++; + } + + //and show the whole stuff to the user + pkgList->drawList(); + + return true; + +} + +/////////////////////////////////////////////////////////////////// +// // match // @@ -1732,6 +1812,15 @@ retEvent = languagePopup->showSelectionPopup( ); } } + else if ( event.selection->compare( NCPkgNames::Repositories() ) == YO_EQUAL ) + { + if ( repoPopup ) + { + // show the selection popup + retEvent = repoPopup->showRepoPopup( ); + } + } + // patches else if ( event.selection->compare( NCPkgNames::Recommended() ) == YO_EQUAL ) { @@ -2702,7 +2791,7 @@ // add the media nr text += NCPkgNames::MediaNo(); char num[5]; - int medianr = package->sourceMediaNr (); + int medianr = package->mediaNr (); sprintf( num, "%d", medianr ); text += num; text += " "; Modified: branches/tmp/mvidner/ui-as-namespace/ncurses/src/pkg/NCPackageSelector.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/n… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/ncurses/src/pkg/NCPackageSelector.h (original) +++ branches/tmp/mvidner/ui-as-namespace/ncurses/src/pkg/NCPackageSelector.h Tue Jul 31 13:43:10 2007 @@ -40,6 +40,7 @@ #include "NCPkgSelMapper.h" class NCPkgPopupSelection; +class NCPkgPopupRepo; class LangCode; class NCPkgPopupDeps; class NCPkgPopupDiskspace; @@ -82,6 +83,7 @@ NCPkgPopupSelection * selectionPopup; // the selections popup NCPkgPopupSelection * patternPopup; // the pattern popup NCPkgPopupSelection * languagePopup; // language popup + NCPkgPopupRepo * repoPopup; NCPkgPopupDiskspace * diskspacePopup; // the popup showing the disk usage @@ -190,6 +192,12 @@ bool checkRequires ); bool fillPatchSearchList( const YCPString & expr ); + + /** + *Fills the package table with packages from selected repository + *@param repo zypp::Repository + */ + bool fillRepoFilterList ( ZyppRepo repo ); bool isYouMode() { return youMode; } /** Modified: branches/tmp/mvidner/ui-as-namespace/ncurses/src/pkg/NCPkgNames.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/n… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/ncurses/src/pkg/NCPkgNames.cc (original) +++ branches/tmp/mvidner/ui-as-namespace/ncurses/src/pkg/NCPkgNames.cc Tue Jul 31 13:43:10 2007 @@ -289,6 +289,13 @@ static const YCPValue value = createIdValue ( "languages" ); return value; } + +const YCPValue& NCPkgNames::Repositories () +{ + static const YCPValue value = createIdValue ( "repos"); + return value; +} + // menu selection Installation Summary const YCPValue& NCPkgNames::Whatif () { @@ -622,6 +629,13 @@ return value; } +const string NCPkgNames::RepoLabel() +{ + // the label of language table + static const string value = _( "Available Repositories" ); + return value; +} + const string NCPkgNames::YOUPatches() { // A label for a list of YOU Patches - keep it short - max 25 chars! @@ -1235,7 +1249,7 @@ const string NCPkgNames::MenuEntryRPMGroups() { // menu entry RpmGroups - static const string value = _( "&RPM Groups" ); + static const string value = _( "RPM &Groups" ); return value; } @@ -1253,6 +1267,13 @@ return value; } +const string NCPkgNames::MenuEntryRepos() +{ + // menu entry Repositories + static const string value = _( "&Repositories" ); + return value; +} + const string NCPkgNames::MenuEntryPatterns() { // menu entry Patterns @@ -1632,6 +1653,13 @@ return value; } +const string NCPkgNames::RepoURL() +{ + static const string value = _("URL"); + return value; + +} + const string NCPkgNames::Partition() { // column header name of the partition (keep it short!) Modified: branches/tmp/mvidner/ui-as-namespace/ncurses/src/pkg/NCPkgNames.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/n… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/ncurses/src/pkg/NCPkgNames.h (original) +++ branches/tmp/mvidner/ui-as-namespace/ncurses/src/pkg/NCPkgNames.h Tue Jul 31 13:43:10 2007 @@ -200,6 +200,7 @@ static const YCPValue& Selections (); static const YCPValue& Patterns (); static const YCPValue& Languages (); + static const YCPValue& Repositories (); /** * Widget id of the menu item update list @@ -418,6 +419,10 @@ static const string LanguageLabel(); /** + * The label of the repositories selections popup + */ + static const string RepoLabel(); + /** * The label Filter: YOU Patches */ static const string YOUPatches(); @@ -849,6 +854,8 @@ static const string LangCode(); static const string LangName(); + static const string RepoURL(); + static const string Partition(); static const string UsedSpace(); static const string FreeSpace(); @@ -890,6 +897,7 @@ static const string MenuFilter(); static const string MenuEntryRPMGroups(); static const string MenuEntryLanguages(); + static const string MenuEntryRepos(); static const string MenuEntrySelections(); static const string MenuEntryPatterns(); static const string MenuEntrySearch(); Modified: branches/tmp/mvidner/ui-as-namespace/ncurses/src/pkg/NCPkgPopupDeps.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/n… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/ncurses/src/pkg/NCPkgPopupDeps.cc (original) +++ branches/tmp/mvidner/ui-as-namespace/ncurses/src/pkg/NCPkgPopupDeps.cc Tue Jul 31 13:43:10 2007 @@ -154,7 +154,7 @@ // add the package list containing the dependencies solutionw = new NCSolutionSelectionBox ( vSplit, opt, - _("P&ossible Solutions"), + _("Possible &Solutions"), this); vSplit->addChild( solutionw ); Modified: branches/tmp/mvidner/ui-as-namespace/ncurses/src/pkg/NCPkgPopupSelection.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/n… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/ncurses/src/pkg/NCPkgPopupSelection.cc (original) +++ branches/tmp/mvidner/ui-as-namespace/ncurses/src/pkg/NCPkgPopupSelection.cc Tue Jul 31 13:43:10 2007 @@ -134,6 +134,7 @@ opt.notifyMode.setValue( true ); + NCLabel * help = new NCLabel( split, opt, YCPString(NCPkgNames::DepsHelpLine()) ); split->addChild( help ); @@ -444,6 +445,7 @@ slbList.sort( orderLang ); break; } + default: NCERR << "Selecion type not handled: " << type << endl; } Modified: branches/tmp/mvidner/ui-as-namespace/ncurses/src/pkg/NCZypp.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/n… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/ncurses/src/pkg/NCZypp.h (original) +++ branches/tmp/mvidner/ui-as-namespace/ncurses/src/pkg/NCZypp.h Tue Jul 31 13:43:10 2007 @@ -28,6 +28,7 @@ #include <zypp/Package.h> #include <zypp/Selection.h> #include <zypp/Pattern.h> +#include <zypp/Product.h> #include <zypp/Language.h> #include <zypp/Patch.h> #include <zypp/ZYppFactory.h> @@ -58,9 +59,12 @@ typedef zypp::Pattern::constPtr ZyppPattern; typedef zypp::Language::constPtr ZyppLang; typedef zypp::Patch::constPtr ZyppPatch; +typedef zypp::Product::constPtr ZyppProduct; +typedef zypp::Repository ZyppRepo; typedef zypp::ResPoolProxy ZyppPool; typedef zypp::ResPoolProxy::const_iterator ZyppPoolIterator; +typedef zypp::ResPoolProxy::repository_iterator ZyppRepositoryIterator; inline ZyppPool zyppPool() { return zypp::getZYpp()->poolProxy(); } @@ -83,6 +87,12 @@ inline ZyppPoolIterator zyppPatchesBegin() { return zyppBegin<zypp::Patch>(); } inline ZyppPoolIterator zyppPatchesEnd() { return zyppEnd<zypp::Patch>(); } +inline ZyppPoolIterator zyppProductsBegin() { return zyppBegin<zypp::Product>(); } +inline ZyppPoolIterator zyppProductsEnd() { return zyppEnd<zypp::Product>(); } + +inline ZyppRepositoryIterator ZyppRepositoriesBegin() { return zyppPool().knownRepositoriesBegin(); } +inline ZyppRepositoryIterator ZyppRepositoriesEnd() { return zyppPool().knownRepositoriesEnd(); } + inline ZyppPkg tryCastToZyppPkg( ZyppObj zyppObj ) { @@ -109,6 +119,10 @@ return zypp::dynamic_pointer_cast<const zypp::Patch>( zyppObj ); } +inline ZyppProduct tryCastToZyppProduct( ZyppObj zyppObj ) +{ + return zypp::dynamic_pointer_cast<const zypp::Product>( zyppObj ); +} template<typename T> bool contains( const std::set<T> & container, T search ) { Modified: branches/tmp/mvidner/ui-as-namespace/ncurses/src/pkg/pkg_layout.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/n… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/ncurses/src/pkg/pkg_layout.ycp (original) +++ branches/tmp/mvidner/ui-as-namespace/ncurses/src/pkg/pkg_layout.ycp Tue Jul 31 13:43:10 2007 @@ -18,9 +18,10 @@ `Left(`ReplacePoint(`id(`replacefilter),`MenuButton( `opt(`key_F4), _( "&Filter" ), // begin: menu items of the filter menu // please note: use unique hotkeys until end: - [`item( `id("groups"), _( "&RPM Groups" ) ), + [`item( `id("groups"), _( "RPM &Groups" ) ), `item( `id("patterns"), _( "Pa&tterns" ) ), `item( `id("languages"), _( "&Languages" ) ), + `item( `id("repos"), _( "&Repositories") ), `item( `id("search"), _( "&Search" ) ), `item( `id("installed"), _( "Installed &Packages" ) ), `item( `id("whatif"), _( "&Installation Summary" ) ), Modified: branches/tmp/mvidner/ui-as-namespace/ncurses/yast2-ncurses.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/mvidner/ui-as-namespace/n… ============================================================================== --- branches/tmp/mvidner/ui-as-namespace/ncurses/yast2-ncurses.spec.in (original) +++ branches/tmp/mvidner/ui-as-namespace/ncurses/yast2-ncurses.spec.in Tue Jul 31 13:43:10 2007 @@ -2,7 +2,7 @@ @HEADER@ -BuildRequires: doxygen gcc-c++ yast2-core-devel yast2-devtools libzypp-devel +BuildRequires: doxygen dejagnu gcc-c++ yast2-core-devel yast2-devtools libzypp-devel BuildRequires: libxcrypt-devel blocxx-devel ncurses-devel Summary: - @@ -17,8 +17,8 @@ Provides: y2curses Obsoletes: y2curses Requires: glibc-locale -#Resolver::verifySystem -Requires: libzypp >= 2.12.1 +#adapted to libzypp 3.11 refactoring +Requires: libzypp >= 3.11.8 #UI plugins - YPackageSelectorPlugin.h Requires: yast2-core >= 2.15.6 %description -- 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] r39832 - /branches/tmp/mvidner/ui-as-namespace/ncurses/
by mvidner＠svn.opensuse.org 31 Jul '07

31 Jul '07

Author: mvidner Date: Tue Jul 31 13:23:47 2007 New Revision: 39832 URL: http://svn.opensuse.org/viewcvs/yast?rev=39832&view=rev Log: Initialized merge tracking via "svnmerge" with revisions "1-39048" from http://svn.opensuse.org/svn/yast/trunk/ncurses Modified: branches/tmp/mvidner/ui-as-namespace/ncurses/ (props changed) -- 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] r39831 - /trunk/add-on-creator/src/complex.ycp
by jsuchome＠svn.opensuse.org 31 Jul '07

31 Jul '07

Author: jsuchome Date: Tue Jul 31 12:34:20 2007 New Revision: 39831 URL: http://svn.opensuse.org/viewcvs/yast?rev=39831&view=rev Log: offer more (SP1) products Modified: trunk/add-on-creator/src/complex.ycp Modified: trunk/add-on-creator/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/src/complex.ycp?r… ============================================================================== --- trunk/add-on-creator/src/complex.ycp (original) +++ trunk/add-on-creator/src/complex.ycp Tue Jul 31 12:34:20 2007 @@ -213,10 +213,22 @@ // radio button label _("SUSE Linux &Enterprise Server 10"), requires == "sles-release-10")), + `Left (`RadioButton(`id(`sles10sp1), `opt (`notify), + // radio button label + _("SUSE &Linux Enterprise Server 10 SP1"), + requires == "product:SUSE_SLES = 10.1")), `Left (`RadioButton(`id(`sled10), `opt (`notify), // radio button label _("SUSE Linux Enterprise &Desktop 10"), requires == "sled-release-10")), + `Left (`RadioButton(`id(`sled10sp1), `opt (`notify), + // radio button label + _("SUSE L&inux Enterprise &Desktop 10 SP1"), + requires == "product:SUSE_SLED = 10.1")), + `Left (`RadioButton(`id(`sle10sp1), `opt (`notify), + // radio button label + _("S&USE Linux Enterprise 10 SP1"), + requires == "product:SUSE_SLE = 10.1")), `HBox ( `Left(`RadioButton(`id(`other), `opt (`notify), // radio button label @@ -295,10 +307,22 @@ requires = "sles-release-10"; UI::ChangeWidget (`id(`other_val), `Enabled, false); } + else if (ret == `sles10sp1) { + requires = "product:SUSE_SLES = 10.1"; + UI::ChangeWidget (`id(`other_val), `Enabled, false); + } else if (ret == `sled10) { requires = "sled-release-10"; UI::ChangeWidget (`id(`other_val), `Enabled, false); } + else if (ret == `sled10sp1) { + requires = "product:SUSE_SLED = 10.1"; + UI::ChangeWidget (`id(`other_val), `Enabled, false); + } + else if (ret == `sle10sp1) { + requires = "product:SUSE_SLE = 10.1"; + UI::ChangeWidget (`id(`other_val), `Enabled, false); + } else if (ret == `suse101) { requires = "suse-release-10.1"; UI::ChangeWidget (`id(`other_val), `Enabled, false); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r39830 - in /branches/tmp/sh/qt4-port/qt/src: YQDialog.cc YQUI.h YQUI_core.cc YQUI_x11.cc YQWizard.cc YQWizard.h
by sh-sh-sh＠svn.opensuse.org 31 Jul '07

31 Jul '07

Author: sh-sh-sh Date: Tue Jul 31 11:54:04 2007 New Revision: 39830 URL: http://svn.opensuse.org/viewcvs/yast?rev=39830&view=rev Log: fixed events for defaultsize dialogs thanks to dmueller Modified: branches/tmp/sh/qt4-port/qt/src/YQDialog.cc branches/tmp/sh/qt4-port/qt/src/YQUI.h branches/tmp/sh/qt4-port/qt/src/YQUI_core.cc branches/tmp/sh/qt4-port/qt/src/YQUI_x11.cc branches/tmp/sh/qt4-port/qt/src/YQWizard.cc branches/tmp/sh/qt4-port/qt/src/YQWizard.h Modified: branches/tmp/sh/qt4-port/qt/src/YQDialog.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQDial… ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQDialog.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/YQDialog.cc Tue Jul 31 11:54:04 2007 @@ -44,7 +44,7 @@ QWidget * qt_parent, bool default_size ) : QWidget( qt_parent, - default_size ? Qt::Widget : Qt::WType_Dialog ) // WFlags + default_size ? Qt::Widget : Qt::Window ) // WFlags , YDialog( opt ) { _userResized = false; @@ -54,7 +54,9 @@ setWidgetRep( this ); setCaption( hasDefaultSize() ? "YaST2" : "" ); setFocusPolicy( Qt::StrongFocus ); - setWindowModality( Qt::WindowModal ); + + if ( ! default_size ) + setWindowModality( Qt::WindowModal ); if ( hasWarnColor() || hasInfoColor() ) { Modified: branches/tmp/sh/qt4-port/qt/src/YQUI.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQUI.h… ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQUI.h (original) +++ branches/tmp/sh/qt4-port/qt/src/YQUI.h Tue Jul 31 11:54:04 2007 @@ -36,8 +36,8 @@ #define YQWidgetSpacing 4 #define YQButtonBorder 3 -class Q3VBox; -class Q3WidgetStack; +class QWidget; +class QStackedWidget; class QCursor; class QEvent; class QEventLoop; @@ -72,12 +72,6 @@ static YQUI * ui() { return _ui; } /** - * Set the parent widget for embedding the UI into a KPart or KCMShell. - * Used by kyast. - **/ - static void setEmbeddingParent( QWidget * p ); - - /** * Returns the UI's default font. **/ const QFont & currentFont(); @@ -204,18 +198,6 @@ bool autoActivateDialogs() const { return _auto_activate_dialogs; } /** - * Are we running embedded into another application, e.g., inside the KDE - * control center? - **/ - bool runningEmbedded() const; - - /** - * Returns true if debugging embedding mode is on, i.e., when cmd line arg - * --debug-embedding was given. - **/ - bool debugEmbedding() const { return _debug_embedding; } - - /** * Block (or unblock) events. If events are blocked, any event sent * should be ignored until events are unblocked again. * @@ -616,7 +598,7 @@ /** * Returns the normal color palette **/ - QPalette normalPalette() const { return _normalPalette; } + QPalette normalPalette() const { return * _normalPalette; } /** * Toggle between the vision impaired and the normal color palette. @@ -739,31 +721,28 @@ bool _decorate_toplevel_window; /** - * Fake embedding mode (for layout debugging in embedding mode) - **/ - bool _debug_embedding; - - /** * Container for the widget stack. QWidgetStack cannot handle a WFlags * argument, so this needs to be embedded into something else - and a QVBox * at least handles all the sizeHint and resize stuff. **/ - Q3VBox * _main_win; + QWidget * _main_win; /** * Stack for the Qt widgets inside the main window. **/ - Q3WidgetStack * _widget_stack; + QStackedWidget * _widget_stack; /** * Stack to keep track of the stacking order of popup dialogs. **/ vector<QWidget *> _popup_stack; +#ifdef FIXME_OBSOLETE /** * Numeric ID for defaultsize dialogs for the widget stack **/ int _main_dialog_id; +#endif /** * Size for `opt(`defaultsize) dialogs. @@ -866,21 +845,10 @@ **/ QTranslator _qtTranslations; - - /** - * Parent widget for embedding in a KPart or KCMShell - **/ - static QWidget * _embeddingParent; - - /** - * Flag that indicates if we are running embedded - **/ - bool _running_embedded; - /** * Saved normal palette **/ - QPalette _normalPalette; + QPalette * _normalPalette; /** * Flag: currently using special palette for vision impaired users? Modified: branches/tmp/sh/qt4-port/qt/src/YQUI_core.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQUI_c… ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQUI_core.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/YQUI_core.cc Tue Jul 31 11:54:04 2007 @@ -26,7 +26,7 @@ #include <qmessagebox.h> #include <qsocketnotifier.h> #include <q3vbox.h> -#include <q3widgetstack.h> +#include <qstackedwidget.h> #include <QtGui/qdesktopwidget.h> #include <ycp/YCPTerm.h> @@ -46,20 +46,21 @@ #define BUSY_CURSOR_TIMEOUT 200 // milliseconds -#define KYAST_EMBEDDING 0 -YQUI * YQUI::_ui = 0; -QWidget * YQUI::_embeddingParent = 0; +YQUI * YQUI::_ui = 0; static void qMessageHandler( QtMsgType type, const char * msg ); + YQUI::YQUI( int argc, char **argv, bool with_threads, const char * macro_file ) : QObject() , YUI( with_threads ) , _main_win( NULL ) +#ifdef FIXME , _main_dialog_id(0) +#endif , _eventLoop( 0 ) , _font_family( "Sans Serif" ) , _lang_fonts( 0 ) @@ -77,8 +78,6 @@ _have_wm = true; _fullscreen = false; _decorate_toplevel_window = true; - _debug_embedding = false; - _running_embedded = false; _usingVisionImpairedPalette = false; _leftHandedMouse = false; _askedForLeftHandedMouse = false; @@ -86,14 +85,12 @@ qInstallMsgHandler( qMessageHandler ); - _running_embedded = false; - // DEBUG // DEBUG // DEBUG char ** argv_copy = (char **) malloc( (argc+1) * sizeof( const char * ) ); - + for ( int i=0; i < argc; i++ ) argv_copy[i+1] = strdup( argv[i] ); @@ -110,14 +107,16 @@ int argc_copy = argc; new QApplication( argc_copy, argv_copy, true ); // GUI enabled - + loadPredefinedQtTranslations(); - _normalPalette = qApp->palette(); + _normalPalette = new QPalette( qApp->palette() ); // Qt keeps track to a global QApplication in qApp. Q_CHECK_PTR( qApp ); +#ifdef FIXME qApp->installEventFilter( this ); +#endif processCommandLineArgs( argc_copy, argv_copy ); calcDefaultSize(); @@ -129,33 +128,28 @@ // Create main window for `opt(`defaultsize) dialogs. // - // We have to use something else than QWidgetStack since QWidgetStack + // We have to use something else than QStackedWidget since QStackedWidget // doesn't accept a WFlags arg which we badly need here. - Qt::WFlags wflags = Qt::WType_TopLevel; + Qt::WFlags wflags = Qt::Window; if ( ! _decorate_toplevel_window ) { y2debug( "Suppressing WM decorations for toplevel window" ); - wflags |= Qt::WStyle_Customize | Qt::WStyle_NoBorder; + wflags |= Qt::FramelessWindowHint; } - // if we have a window already, delete it - if (_main_win) - delete _main_win; - - if ( _embeddingParent ) - _main_win = new Q3VBox( _embeddingParent ); - else - _main_win = new Q3VBox( 0, 0, wflags ); // parent, name, wflags - + _main_win = new Q3VBox( 0, 0, wflags ); // parent, name, wflags + _main_win->setFocusPolicy( Qt::StrongFocus ); // Create widget stack for `opt(`defaultsize) dialogs - _widget_stack = new Q3WidgetStack( _main_win ); + _widget_stack = new QStackedWidget( _main_win ); _widget_stack->setFocusPolicy( Qt::StrongFocus ); - qApp->setMainWidget( _main_win ); + +#if 0 _main_win->installEventFilter( this ); +#endif _main_win->resize( _default_size ); if ( _fullscreen || ! _have_wm ) @@ -174,8 +168,7 @@ if ( strlen( hostname ) > 0 ) { if ( ( strcmp( hostname, "(none)" ) != 0 && - strcmp( hostname, "linux" ) != 0 ) - || runningEmbedded() ) + strcmp( hostname, "linux" ) != 0 ) ) { title += "@"; title += hostname; @@ -186,26 +179,13 @@ _main_win->setCaption( title ); - // Hide the main window unless we are running embedded. The first call to - // UI::OpenDialog() on an `opt(`defaultSize) dialog will trigger a - // showDialog() call that shows the main window - there is nothing to - // display yet. - // - // In embedded mode, keep the main window open so the embedding application - // (kcontrol) catches the main window as YaST2's first window and not some - // popup window that may appear before this. An empty grey area for the - // main window (that will appear for a while) is a lot better than a - // "please wait" popup zoomed to near full screen that may be embedded - - // with a large main window that opens somewhere else on the screen. - - if ( ! runningEmbedded() ) - _main_win->hide(); - else - { - _main_win->show(); - y2milestone( "Running in embedded mode - leaving main window open" ); - } + // Hide the main window. The first call to UI::OpenDialog() on an + // `opt(`defaultSize) dialog will trigger a showDialog() call that shows + // the main window - there is nothing to display yet. +#if 0 + _main_win->hide(); +#endif // Ugly hack as a workaround of bug #121872 (Segfault at program exit // if no Qt style defined): @@ -225,7 +205,7 @@ // Workaround: Keep one more reference to libqt-mt open - dlopen() it here // and make sure there is no corresponding dlclose(). -#if 0 +#ifdef FIXME QString qt_lib_name = QString( QTLIBDIR "/libqt-mt.so.%1" ).arg( QT_VERSION >> 16 );; void * qt_lib = dlopen( (const char *) qt_lib_name, RTLD_GLOBAL ); y2milestone( "Forcing %s open %s", (const char *) qt_lib_name, @@ -237,7 +217,9 @@ // Init other stuff +#ifdef FIXME qApp->setFont( currentFont() ); +#endif busyCursor(); connect( & _user_input_timer, SIGNAL( timeout() ), @@ -271,7 +253,6 @@ if ( opt == QString( "-no-wm" ) ) _have_wm = false; else if ( opt == QString( "-fullscreen" ) ) _fullscreen = true; else if ( opt == QString( "-noborder" ) ) _decorate_toplevel_window = false; - else if ( opt == QString( "-debug-embedding") ) _debug_embedding = true; else if ( opt == QString( "-auto-font" ) ) _auto_fonts = true; else if ( opt == QString( "-auto-fonts" ) ) _auto_fonts = true; // --macro is handled by YUI_component @@ -314,6 +295,9 @@ if ( _lang_fonts ) delete _lang_fonts; + if ( _normalPalette ) + delete _normalPalette; + // Intentionally NOT calling dlclose() to libqt-mt // (see constructor for explanation) } @@ -398,22 +382,14 @@ void YQUI::idleLoop( int fd_ycp ) { _leave_idle_loop = false; - const int timeout_millisec = 100; // process Qt events until fd_ycp is readable. QSocketNotifier * notifier = new QSocketNotifier( fd_ycp, QSocketNotifier::Read ); QObject::connect(notifier, SIGNAL( activated( int ) ), this, SLOT( leaveIdleLoop( int ) ) ); notifier->setEnabled( true ); - y2debug( "Entering loop" ); - while ( !_leave_idle_loop ) - { - // qApp->processOneEvent(); - qApp->processEvents( QEventLoop::AllEvents, timeout_millisec ); - } - - y2debug( "loop done" ); + qApp->processOneEvent(); delete notifier; } @@ -456,8 +432,6 @@ qApp->focusWidget()->setFocus(); normalCursor(); - - y2debug( "Processing events" ); _do_exit_loop = true; // should exit_loop() be called in sendEvent()? while ( ! pendingEvent() ) @@ -466,8 +440,7 @@ } _do_exit_loop = false; - y2debug( "QApp::processEvents() done" ); - + event = _event_handler.consumePendingEvent(); dialog->activate( false ); @@ -498,7 +471,7 @@ if ( dialog ) { dialog->activate( true ); - qApp->processEvents(); + //qApp->processEvents(); event = _event_handler.consumePendingEvent(); dialog->activate( false ); } @@ -521,18 +494,10 @@ YDialog * YQUI::createDialog( YWidgetOpt & opt ) { bool has_defaultsize = opt.hasDefaultSize.value(); - QWidget * qt_parent = _main_win; - - - // Popup dialogs get the topmost other popup dialog as their parent since - // some window managers (e.g., fvwm2 as used in the inst-sys) otherwise - // tend to confuse the stacking order of popup dialogs. - // - // This _popup_stack handling would be better placed in showDialog(), but we - // need the parent here for QWidget creation. libyui guarantees that each - // createDialog() will be followed by showDialog() for the same dialog - // without any chance for other dialogs to get in between. + QWidget * qt_parent = + has_defaultsize ? _widget_stack : _main_win; + // FIXME: Probably obsolete if ( ! has_defaultsize && ! _popup_stack.empty() ) qt_parent = _popup_stack.back(); @@ -558,8 +523,8 @@ if ( dialog->hasDefaultSize() ) { - _widget_stack->addWidget ( qw, ++_main_dialog_id ); - _widget_stack->raiseWidget( qw ); // maybe this is not necessary (?) + _widget_stack->addWidget ( qw ); + _widget_stack->setCurrentWidget( qw ); if ( ! _main_win->isVisible() ) { @@ -580,9 +545,7 @@ ( (YQDialog *) dialog)->ensureOnlyOneDefaultButton(); - y2debug( "processing events" ); - qApp->processEvents(); - y2debug( "processing events done" ); + //qApp->processEvents(); } @@ -600,24 +563,17 @@ { _widget_stack->removeWidget( qw ); - if ( --_main_dialog_id < 1 ) // nothing left on the stack + if ( _widget_stack->count() < 0 ) // nothing left on the stack { - if ( ! runningEmbedded() ) - { - // y2milestone( "Hiding main window" ); - _main_win->hide(); - } - else - { - y2milestone( "Running embedded - keeping (empty) main window open" ); - } - - _main_dialog_id = 0; // this should not be necessary - but better be safe than sorry + // y2milestone( "Hiding main window" ); + _main_win->hide(); } +#ifdef FIXME_OBSOLETE else { _widget_stack->raiseWidget( _main_dialog_id ); } +#endif } else // non-defaultsize dialog { @@ -656,22 +612,6 @@ } -void YQUI::setEmbeddingParent( QWidget * p ) -{ - _embeddingParent = p; -} - - -bool YQUI::runningEmbedded() const -{ -#if KYAST_EMBEDDING - return _embeddingParent != 0; -#else - return _running_embedded; -#endif -} - - void YQUI::setTextdomain( const char * domain ) { Modified: branches/tmp/sh/qt4-port/qt/src/YQUI_x11.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQUI_x… ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQUI_x11.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/YQUI_x11.cc Tue Jul 31 11:54:04 2007 @@ -369,23 +369,24 @@ { if ( obj == _main_win ) { - if ( _main_dialog_id > 0 ) +#ifdef FIXME_PROBABLY_OBSOLETE + if ( _widget_stack->count() > 0 ) { // Work around QWidgetStack bug: The last raiseWidget() call // (from closeDialog() ) might have failed if the widget was // invisible at that time, e.g., because the user had switched to // some other virtual desktop (bugzilla bug #11310) - _widget_stack->raiseWidget( _main_dialog_id ); + _widget_stack->setCurrentWidget( whatever ); } +#endif } else { return showEventFilter( obj, ev ); } } - - return false; // Don't stop event processing + return QObject::eventFilter( obj, ev ); } Modified: branches/tmp/sh/qt4-port/qt/src/YQWizard.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQWiza… ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQWizard.cc (original) +++ branches/tmp/sh/qt4-port/qt/src/YQWizard.cc Tue Jul 31 11:54:04 2007 @@ -147,11 +147,6 @@ _protectNextButton = false; _stepsDirty = false; _direction = YQWizard::Forward; - _runningEmbedded = YQUI::ui()->runningEmbedded() || YQUI::ui()->debugEmbedding(); - - if ( _treeEnabled ) - _runningEmbedded = false; - _sideBar = 0; _stepsPanel = 0; _stepsBox = 0; @@ -187,41 +182,32 @@ // Load graphics // - if ( ! runningEmbedded() ) - { #if ENABLE_GRADIENTS - loadGradientPixmaps(); + loadGradientPixmaps(); #endif - if ( _stepsEnabled ) - loadStepsIcons(); - } - + if ( _stepsEnabled ) + loadStepsIcons(); // // Create widgets // - if ( ! runningEmbedded() ) - { #if ENABLE_TITLEBAR - layoutTitleBar( this ); + layoutTitleBar( this ); #else - QWidget * spacer = addVSpacing( this, WORK_AREA_TOP_MARGIN ); - Q_CHECK_PTR( spacer ); + QWidget * spacer = addVSpacing( this, WORK_AREA_TOP_MARGIN ); + Q_CHECK_PTR( spacer ); -# if ENABLE_GRADIENTS - spacer->setPaletteBackgroundColor( _gradientCenterColor ); -# endif +# if ENABLE_GRADIENTS + spacer->setPaletteBackgroundColor( _gradientCenterColor ); +# endif #endif - } Q3HBox * hBox = new Q3HBox( this ); Q_CHECK_PTR( hBox ); - if ( ! runningEmbedded() ) - layoutSideBar( hBox ); - + layoutSideBar( hBox ); layoutWorkArea( hBox ); y2debug( "Constructor finished." ); @@ -1079,14 +1065,11 @@ layoutButtonBox( workAreaVBox ); - if ( ! runningEmbedded() ) - { - // - // Spacer (purely decorative) at the right of the client area - // - - addGradientColumn( parentHBox, WORK_AREA_RIGHT_MARGIN ); - } + // + // Spacer (purely decorative) at the right of the client area + // + + addGradientColumn( parentHBox, WORK_AREA_RIGHT_MARGIN ); } @@ -1247,8 +1230,7 @@ vbox->addSpacing( WORK_AREA_BOTTOM_MARGIN ); #if ENABLE_GRADIENTS - if ( ! runningEmbedded() ) - setBottomCroppedGradient( buttonBox, _bottomGradientPixmap, buttonBox->sizeHint().height() ); + setBottomCroppedGradient( buttonBox, _bottomGradientPixmap, buttonBox->sizeHint().height() ); #endif buttonBox->setSizePolicy( QSizePolicy( QSizePolicy::Preferred, QSizePolicy::Fixed ) ); // hor/vert Modified: branches/tmp/sh/qt4-port/qt/src/YQWizard.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/qt4-port/qt/src/YQWiza… ============================================================================== --- branches/tmp/sh/qt4-port/qt/src/YQWizard.h (original) +++ branches/tmp/sh/qt4-port/qt/src/YQWizard.h Tue Jul 31 11:54:04 2007 @@ -442,14 +442,6 @@ **/ void sendEvent( YCPValue id ); - - /** - * Check if we are running embedded as a KCMShell or KPart or something - * similar. This is really just a (chached) shortcut to - * YQUI::runningEmbedded(). - **/ - bool runningEmbedded() const { return _runningEmbedded; } - /** * Returns 'true' if the application is running on a high-color display, * i.e., on an X visual with more than 8 bit depth. @@ -580,7 +572,6 @@ bool _verboseCommands; bool _protectNextButton; bool _stepsDirty; - bool _runningEmbedded; bool _sendButtonEvents; Direction _direction; -- 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] r39829 - in /trunk/installation: package/yast2-installation.changes src/clients/inst_extrasources.ycp
by lslezak＠svn.opensuse.org 31 Jul '07

31 Jul '07

Author: lslezak Date: Tue Jul 31 11:37:40 2007 New Revision: 39829 URL: http://svn.opensuse.org/viewcvs/yast?rev=39829&view=rev Log: - inst_extrasources - register the extra repositories in content file automatically without asking user (#290040), do not download metadata from the extra sources (offline registration) (#290040, #288640) Modified: trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/inst_extrasources.ycp 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 Tue Jul 31 11:37:40 2007 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Tue Jul 31 11:29:53 CEST 2007 - lslezak(a)suse.cz + +- inst_extrasources - register the extra repositories in content + file automatically without asking user (#290040), do not download + metadata from the extra sources (offline registration) (#290040, + #288640) + +------------------------------------------------------------------- Mon Jul 30 12:38:31 CEST 2007 - locilka(a)suse.cz - Added inst_upgrade_urls client which offers URLs used on the Modified: trunk/installation/src/clients/inst_extrasources.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_ex… ============================================================================== --- trunk/installation/src/clients/inst_extrasources.ycp (original) +++ trunk/installation/src/clients/inst_extrasources.ycp Tue Jul 31 11:37:40 2007 @@ -1,7 +1,7 @@ /** * File: clients/inst_extrasources.ycp * Package: yast2-installation - * Summary: Add extra installation sources from content file + * Summary: Automatically register software repositories from content file * Authors: Ladislav SlezÃ¡k <lslezak(a)suse.cz> * * Assumptions: @@ -9,6 +9,8 @@ * (bugzilla #263289) * - the sources will be saved afterwards * (which means that running this client alone will not work) + * - the added sources are disabled by default and they are added + * in offline mode (no metadata is dowloaded) * * $Id$ */ @@ -18,177 +20,22 @@ textdomain "installation"; import "GetInstArgs"; -import "Popup"; import "SourceManager"; -import "Label"; import "Mode"; -import "String"; -import "Internet"; import "PackageLock"; -import "Installation"; - -// editUrl() -include "packager/inst_source_dialogs.ycp"; // the tag providing location of the additional sources in content file string content_file_tag = "EXTRAURLS"; string optional_tag = "OPTIONALURLS"; /** - * Show a confirmation dialog with list of the extra sources. - * @param urls list of URLs - * @return boolean true if the user wants to register the sources - */ -list<string> ConfirmExtraSources(map<string,boolean> urls) -{ - list<term> items = []; - - // display the enabled sources at the beginning of the list - foreach(string url, boolean deflt, urls, - { - if (deflt) - { - items = add(items, `item(`id(url), url, deflt)); - } - } - ); - - foreach(string url, boolean deflt, urls, - { - if (!deflt) - { - items = add(items, `item(`id(url), url, deflt)); - } - } - ); - - integer width = 76; - integer height = 8; - - term popup = `HBox( - `HSpacing(1), - `VBox( - `VSpacing(0.2), - // heading in a popup window - `Heading(_("Additional Repositories")), - `VSpacing(0.2), - `VBox( - `HSpacing(width), - `HBox( - `VSpacing(height), - // label - `MultiSelectionBox(`id(`multi), _("Repository to Register"), items) - ) - ), - `VSpacing(0.2), - // label - use more lines for the translated message (no more than about 60 characters per line) - `Label(_("Later you can install additional software from these external repositories.\nRegister the repository now?")), - `VSpacing(0.5), - `HBox( - `HStretch(), - `PushButton(`id(`yes), `opt(`default, `key_F10), Label::YesButton()), - `HSpacing(2), - `PushButton(`id(`no), `opt(`key_F9), Label::NoButton()), - `HStretch() - ), - `VSpacing(0.5) - ), - `HSpacing(1) - ); - - UI::OpenDialog(`opt(`decorated), popup); - - symbol ui = (symbol)UI::UserInput(); - y2milestone("Extra sources confirmed: %1", ui); - - list<string> selected_items = (list<string>) UI::QueryWidget(`id(`multi), `SelectedItems); - y2milestone("Selected items: %1", selected_items); - - UI::CloseDialog(); - - return (ui == `yes) ? selected_items : []; -} - -/** - * Temporarily start the network - * @return map The network status before starting - */ -define map<string,boolean> NetworkStart() -{ - // network connection status - boolean already_up = false; - - // flag: demand has been changed - boolean i_set_demand = false; - - if (!Mode::test()) - already_up = Internet::Status(); - - if (!already_up) - { - // label - text in a popup window, progress indicator - UI::OpenDialog(`opt(`decorated), `Label(_("Testing the Internet Connection..."))); - - // this code is from inst_you.ycp - if (!Internet::demand) - { - Internet::SetDemand (true); - i_set_demand = true; - } - - Internet::Start (""); - - integer i = 150; - while (i > 0) - { - if (!Internet::Status ()) - break; - - if (Internet::Connected ()) - break; - - // ping anything (www.suse.com) to trigger dod connections - // - // This ping should only set the network up, - // The IP now is different to the current www.suse.com's IP - // but it doesn't matter, what we need is just a network traffic. - SCR::Execute (.target.bash_background, - "/bin/ping -c 1 -w 1 213.95.15.200"); - - sleep (1000); - } - - UI::CloseDialog(); - } - - return $["already_up" : already_up, "i_set_demand" : i_set_demand]; -} - -/** - * Restore the network status - * @param original_status original status before starting the network - */ -define void NetworkStop(map<string,boolean> original_status) -{ - if (!original_status["already_up"]:false) - { - Internet::Stop(""); - - if (original_status["i_set_demand"]:false) - { - Internet::SetDemand(false); - } - } -} - -/** * Dowload and parse content files from current installation sources - * @param registered - * @return map Extra URLs for each source: $[ string source_url : list<string> extra_urls ] + * @param registered URLs of already registered repositories (they will be ignored to not register the same repository one more) + * @return list<string> Extra URLs to register */ -define map<string,boolean> GetExtraURLs(list<string> registered) +define list<string> GetExtraURLs(list<string> registered) { - map<string,boolean> extra_urls = $[]; + list<string> extra_urls = []; list<map> products = Pkg::ResolvableProperties("", `product, ""); y2milestone("Products: %1", products); @@ -206,7 +53,7 @@ // is the URL already registered? if (!contains(registered, url)) { - extra_urls = add(extra_urls, url, true); + extra_urls = add(extra_urls, url); } else { @@ -223,7 +70,7 @@ // is the URL already registered? if (!contains(registered, url)) { - extra_urls = add(extra_urls, url, false); + extra_urls = add(extra_urls, url); } else { @@ -241,45 +88,41 @@ } /** - * Register the installation sources + * Register the installation sources in offline mode (no network connection required). + * The repository metadata will be downloaded by sw_single (or another yast module) when the repostory is enabled * @param url_list list of the sources to register * @return list<integer> list of created source IDs */ -define list<integer> RegisterSources(list<string> url_list) +define list<integer> RegisterRepos(list<string> url_list) { list<integer> ret = []; + y2milestone("Repositories to register: %1", url_list); foreach(string new_url, url_list, { - boolean again = true; - while (again) + // map with repository parameters: $[ "enabled" : boolean, + // "autorefresh" : boolean, "name" : string, "alias" : string, + // "base_urls" : list<string>, "prod_dir" : string, "type" : string ] + map<string,any> repo_prop = $[]; + + // extra repos are disabled by default + repo_prop["enabled"] = false; + repo_prop["autorefresh"] = true; + repo_prop["name"] = new_url; + repo_prop["alias"] = new_url; + repo_prop["base_urls"] = [ new_url ]; + + integer new_repo_id = Pkg::RepositoryAdd(repo_prop); + + if (new_repo_id >= 0) { - integer srcid = Pkg::SourceCreate(new_url, "/"); - y2milestone ("Created source %1: %2", srcid, new_url); + y2milestone("Registered extra repository: %1: %2", new_repo_id, repo_prop); - if (srcid == -1) - { - // popup message - if (Popup::YesNo (_("An error occurred while creating the installation source.") + "\n" - // popup message - + _("Details:") + "\n" + Pkg::LastError() + "\n" + _("Try again?"))) - { - new_url = editUrl (new_url); - } - else - { - again = false; - } - } - else - { - // disable the source - Pkg::SourceSetEnabled(srcid, false); - - // remember the ID - ret = add (ret, srcid); - again = false; - } + ret = add(ret, new_repo_id); + } + else + { + y2error("Cannot register: %1", repo_prop); } } ); @@ -341,16 +184,6 @@ return `auto; } -// remember the original network status -map<string,boolean> net_config = NetworkStart(); - -if (!Internet::Connected()) -{ - y2warning("Cannot connect to the internet, skipping extra source configuration"); - NetworkStop(net_config); - return `auto; -} - // bugzilla #263289 if (! InitializePackager()) { y2error ("Cannot connect to the Packager"); @@ -360,33 +193,23 @@ list <string> already_registered = RegisteredUrls(); // $[ string url : boolean default ] -map<string,boolean> register_url = GetExtraURLs(already_registered); - +list<string> register_url = GetExtraURLs(already_registered); // any confirmed source to register? if (size(register_url) > 0) { - list<string> confirmed_sources = ConfirmExtraSources(register_url); - { - // register (create) the sources - list<integer> added_ids = RegisterSources(confirmed_sources); + // register (create) the sources + list<integer> added_ids = RegisterRepos(register_url); - // synchronize the sources if any source has been added - if (size(added_ids) > 0) - { - // reload (disable) the resolvables - Pkg::SourceLoad(); - - y2milestone ("syncing to zmd"); - boolean synced = SourceManager::SyncAddedAndDeleted (added_ids, []); - y2milestone ("sync status: %1", synced); - } + // synchronize the sources if any source has been added + if (size(added_ids) > 0) + { + y2milestone ("syncing to zmd"); + boolean synced = SourceManager::SyncAddedAndDeleted (added_ids, []); + y2milestone ("sync status: %1", synced); } } -// restore the network status -NetworkStop(net_config); - return `auto; /* EOF */ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

Jump to page:

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

YaST Commits July 2007