February 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r45115 - in /trunk/network: VERSION package/yast2-network.changes src/provider/dialogs.ycp
by mzugec＠svn.opensuse.org 29 Feb '08

29 Feb '08

Author: mzugec Date: Fri Feb 29 11:00:48 2008 New Revision: 45115 URL: http://svn.opensuse.org/viewcvs/yast?rev=45115&view=rev Log: automatic refresh of selection list box (bnc#363423) Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/provider/dialogs.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=45115&r1=451… ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Fri Feb 29 11:00:48 2008 @@ -1 +1 @@ -2.16.22 +2.16.23 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Fri Feb 29 11:00:48 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Feb 26 18:18:54 CET 2008 - mzugec(a)suse.de + +- automatic refresh of selection list box (bnc#363423) +- 2.16.23 + +------------------------------------------------------------------- Wed Feb 20 07:58:15 CET 2008 - coolo(a)suse.de - fix the spec file header Modified: trunk/network/src/provider/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/provider/dialogs.ycp… ============================================================================== --- trunk/network/src/provider/dialogs.ycp (original) +++ trunk/network/src/provider/dialogs.ycp Fri Feb 29 11:00:48 2008 @@ -80,7 +80,7 @@ `HBox( `HSpacing(3.4), /* SelectionBox label */ - `SelectionBox(`id(`countries), `opt(`notify), _("C&ountry:"), Provider::GetCountries()) + `SelectionBox(`id(`countries), `opt(`notify, `immediate), _("C&ountry:"), Provider::GetCountries()) ) )), `HSpacing(), @@ -125,7 +125,7 @@ y2debug("provs=%1", provs); UI::ReplaceWidget(`id(`providers_rep), /* SelectionBox label */ - `SelectionBox(`id(`providers), `opt(`notify), _("&Providers"), provs)); + `SelectionBox(`id(`providers), `opt(`notify, `immediate), _("&Providers"), provs)); Provider::LastCountry = country; } } -- 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] r45114 - /tags/stable-2_16_8/printer/
by mzugec＠svn.opensuse.org 29 Feb '08

29 Feb '08

Author: mzugec Date: Fri Feb 29 10:39:36 2008 New Revision: 45114 URL: http://svn.opensuse.org/viewcvs/yast?rev=45114&view=rev Log: Created tag stable-2_16_8 for printer Added: tags/stable-2_16_8/printer/ - copied from r45113, trunk/printer/ -- 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] r45113 - in /trunk/printer: VERSION package/yast2-printer.changes src/common/dialogs.ycp
by mzugec＠svn.opensuse.org 29 Feb '08

29 Feb '08

Author: mzugec Date: Fri Feb 29 10:39:26 2008 New Revision: 45113 URL: http://svn.opensuse.org/viewcvs/yast?rev=45113&view=rev Log: automatic refresh of selection list box (bnc#363423) Modified: trunk/printer/VERSION trunk/printer/package/yast2-printer.changes trunk/printer/src/common/dialogs.ycp Modified: trunk/printer/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/VERSION?rev=45113&r1=451… ============================================================================== --- trunk/printer/VERSION (original) +++ trunk/printer/VERSION Fri Feb 29 10:39:26 2008 @@ -1 +1 @@ -2.16.7 +2.16.8 Modified: trunk/printer/package/yast2-printer.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/package/yast2-printer.ch… ============================================================================== --- trunk/printer/package/yast2-printer.changes (original) +++ trunk/printer/package/yast2-printer.changes Fri Feb 29 10:39:26 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Feb 26 17:56:01 CET 2008 - mzugec(a)suse.de + +- automatic refresh of selection list box (bnc#363423) + +- 2.16.8 + +------------------------------------------------------------------- Mon Jan 28 14:23:51 CET 2008 - mzugec(a)suse.de - dropped strict requires to netcat (#264309) Modified: trunk/printer/src/common/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/common/dialogs.ycp?r… ============================================================================== --- trunk/printer/src/common/dialogs.ycp (original) +++ trunk/printer/src/common/dialogs.ycp Fri Feb 29 10:39:26 2008 @@ -74,7 +74,7 @@ Printerdb::loadFoomaticIfNeeded (); // selection box label - term manufsel = `SelectionBox (`id (`manufsel), `opt (`notify), + term manufsel = `SelectionBox (`id (`manufsel), `opt (`notify, `immediate), // selection boc title _("Manufacturer"), maplist (string k, map v, Printerdb::foomatic, ``( -- 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] r45112 - in /trunk/testsuite: VERSION package/yast2-testsuite.changes yast2-testsuite.spec.in
by coolo＠svn.opensuse.org 29 Feb '08

29 Feb '08

Author: coolo Date: Fri Feb 29 10:17:11 2008 New Revision: 45112 URL: http://svn.opensuse.org/viewcvs/yast?rev=45112&view=rev Log: another package to fix Modified: trunk/testsuite/VERSION trunk/testsuite/package/yast2-testsuite.changes trunk/testsuite/yast2-testsuite.spec.in Modified: trunk/testsuite/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/testsuite/VERSION?rev=45112&r1=4… ============================================================================== --- trunk/testsuite/VERSION (original) +++ trunk/testsuite/VERSION Fri Feb 29 10:17:11 2008 @@ -1 +1 @@ -2.16.0 +2.16.1 Modified: trunk/testsuite/package/yast2-testsuite.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/testsuite/package/yast2-testsuit… ============================================================================== --- trunk/testsuite/package/yast2-testsuite.changes (original) +++ trunk/testsuite/package/yast2-testsuite.changes Fri Feb 29 10:17:11 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Feb 29 10:17:09 CET 2008 - coolo(a)suse.de + +- fix buildrequires after yast2-core split +- 2.16.1 + +------------------------------------------------------------------- Mon Nov 5 14:17:08 CET 2007 - mvidner(a)suse.cz - Use ./test.ycp instead of test.ycp when building (#330965). Modified: trunk/testsuite/yast2-testsuite.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/testsuite/yast2-testsuite.spec.i… ============================================================================== --- trunk/testsuite/yast2-testsuite.spec.in (original) +++ trunk/testsuite/yast2-testsuite.spec.in Fri Feb 29 10:17:11 2008 @@ -1,7 +1,7 @@ @HEADER-COMMENT@ @HEADER@ -BuildRequires: openslp-devel perl-XML-Writer popt-devel yast2-core-devel yast2-devtools +BuildRequires: openslp-devel perl-XML-Writer popt-devel yast2-core-devel yast2-devtools yast2-ycp-ui-bindings Requires: expect dejagnu Requires: yast2-core Summary: YaST2 testsuite -- 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] r45111 - in /trunk/gtk: package/yast2-gtk.changes src/Makefile.am src/Y2CCGtk.cc src/YGPackageSelector.cc src/yzyppwrapper.cc
by coolo＠svn.opensuse.org 28 Feb '08

28 Feb '08

Author: coolo Date: Thu Feb 28 21:14:47 2008 New Revision: 45111 URL: http://svn.opensuse.org/viewcvs/yast?rev=45111&view=rev Log: submitted Modified: trunk/gtk/package/yast2-gtk.changes trunk/gtk/src/Makefile.am trunk/gtk/src/Y2CCGtk.cc trunk/gtk/src/YGPackageSelector.cc trunk/gtk/src/yzyppwrapper.cc Modified: trunk/gtk/package/yast2-gtk.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/package/yast2-gtk.changes?re… ============================================================================== --- trunk/gtk/package/yast2-gtk.changes (original) +++ trunk/gtk/package/yast2-gtk.changes Thu Feb 28 21:14:47 2008 @@ -1,4 +1,14 @@ ------------------------------------------------------------------- +Thu Feb 28 13:54:27 CET 2008 - coolo(a)suse.de + +- fix make dist + +------------------------------------------------------------------- +Wed Feb 27 16:37:02 CET 2008 - coolo(a)suse.de + +- make it link again + +------------------------------------------------------------------- Mon Feb 25 16:24:12 CET 2008 - sh(a)suse.de - V 2.16.5 Modified: trunk/gtk/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/Makefile.am?rev=45111&r1… ============================================================================== --- trunk/gtk/src/Makefile.am (original) +++ trunk/gtk/src/Makefile.am Thu Feb 28 21:14:47 2008 @@ -12,9 +12,9 @@ # plugin, libtool forces 'lib' prefix plugin_LTLIBRARIES = libpy2gtk.la -libpy2gtk_la_LDFLAGS = -version-info 2:0 -libpy2gtk_la_LIBADD = -L$(plugindir) $(PYUI_LIBS) -L$(libdir) -lycp -ly2 \ - $(GTK_LIBS) $(ZYPP_LIBS) $(GTKHTML_LIBS) +libpy2gtk_la_LDFLAGS = -version-info 2:0 -Wl,--no-undefined +libpy2gtk_la_LIBADD = -L$(plugindir) -L$(libdir) -lycp -ly2 -lyui \ + $(GTK_LIBS) $(ZYPP_LIBS) $(GTKHTML_LIBS) -ly2util libpy2gtk_la_SOURCES = \ Y2CCGtk.cc \ YGUtils.cc \ @@ -83,5 +83,7 @@ icons/pkg-unlocked.xpm \ icons/pkg-installed-upgradable-locked.xpm \ icons/pkg-locked.xpm \ + icons/harddisk.xpm \ + icons/harddisk-full.xpm \ pkg-selector-help.h Modified: trunk/gtk/src/Y2CCGtk.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/Y2CCGtk.cc?rev=45111&r1=… ============================================================================== --- trunk/gtk/src/Y2CCGtk.cc (original) +++ trunk/gtk/src/Y2CCGtk.cc Thu Feb 28 21:14:47 2008 @@ -4,8 +4,6 @@ #include <config.h> #include <YGUI.h> -#include <ycp/y2log.h> -#include <ycp-ui/YUIComponent.h> YUI * createUI( bool withThreads ) { Modified: trunk/gtk/src/YGPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGPackageSelector.cc?rev… ============================================================================== --- trunk/gtk/src/YGPackageSelector.cc (original) +++ trunk/gtk/src/YGPackageSelector.cc Thu Feb 28 21:14:47 2008 @@ -3,9 +3,12 @@ ********************************************************************/ #include <config.h> -#include <ycp/y2log.h> +#include <string.h> + +#define YUILogComponent "gtk-pkg" #include "YGUI.h" +#include "YUILog.h" #include "YGUtils.h" #include "YGi18n.h" #include "YGDialog.h" @@ -1940,11 +1943,11 @@ const gchar *action = (gchar *) id; if (!strcmp (action, "accept")) { - y2milestone ("Closing PackageSelector with 'accept'"); + yuiMilestone() << "Closing PackageSelector with 'accept'" << endl; YGUI::ui()->sendEvent (new YMenuEvent ("accept")); } else if (!strcmp (action, "cancel")) { - y2milestone ("Closing PackageSelector with 'cancel'"); + yuiMilestone() << "Closing PackageSelector with 'cancel'" << endl; if (pThis->confirmExit()) YGUI::ui()->sendEvent (new YCancelEvent()); } Modified: trunk/gtk/src/yzyppwrapper.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/yzyppwrapper.cc?rev=4511… ============================================================================== --- trunk/gtk/src/yzyppwrapper.cc (original) +++ trunk/gtk/src/yzyppwrapper.cc Thu Feb 28 21:14:47 2008 @@ -8,8 +8,12 @@ #include <config.h> #include "YGi18n.h" #include "yzyppwrapper.h" +#include <string.h> +#include <string> -#include <ycp/y2log.h> +#define YUILogComponent "gtk-pkg" + +#include <YUILog.h> #include <zypp/ZYppFactory.h> #include <zypp/ResObject.h> #include <zypp/ResPoolProxy.h> @@ -350,7 +354,7 @@ std::string Ypp::Package::changelog() { - string text; + std::string text; ZyppObject object = impl->zyppSel->installedObj(); ZyppPackage package = tryCastToZyppPkg (object); if (package) { @@ -452,8 +456,8 @@ ZyppObject object = selectable->theObj(); ZyppPattern pattern = tryCastToZyppPattern (object); - const set <string> &packages = pattern->install_packages(); - for (set <string>::iterator it = packages.begin(); + const std::set <std::string> &packages = pattern->install_packages(); + for (std::set <std::string>::iterator it = packages.begin(); it != packages.end(); it++) { if (this->impl->zyppSel->name() == *it) return true; @@ -583,8 +587,7 @@ const Version *version = getAvailableVersion (nb); ZyppObject candidate = (ZyppObjectPtr) version->impl; if (!impl->zyppSel->setCandidate (candidate)) { - y2warning ("Error: Could not set package '%s' candidate to '%s'\n", - name().c_str(), version->number.c_str()); + yuiWarning () << "Error: Could not set package '" << name() << "' candidate to '" << version->number << "'\n"; return; } } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r45110 - /trunk/gtk/src/YGPackageSelector.cc
by rpmcruz＠svn.opensuse.org 28 Feb '08

28 Feb '08

Author: rpmcruz Date: Thu Feb 28 18:39:45 2008 New Revision: 45110 URL: http://svn.opensuse.org/viewcvs/yast?rev=45110&view=rev Log: "Selector" -> "Selection". Makes a more clear title... Modified: trunk/gtk/src/YGPackageSelector.cc Modified: trunk/gtk/src/YGPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGPackageSelector.cc?rev… ============================================================================== --- trunk/gtk/src/YGPackageSelector.cc (original) +++ trunk/gtk/src/YGPackageSelector.cc Thu Feb 28 18:39:45 2008 @@ -1904,7 +1904,7 @@ ygtk_wizard_set_header_icon (wizard, window, THEMEDIR "/icons/22x22/apps/yast-software.png"); ygtk_wizard_set_header_text (wizard, window, - onlineUpdateMode() ? _("Patch Selector") : _("Package Selector")); + onlineUpdateMode() ? _("Patch Selection") : _("Package Selection")); ygtk_wizard_set_abort_button_label (wizard, _("_Cancel")); ygtk_wizard_set_abort_button_str_id (wizard, "cancel"); -- 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] r45109 - in /trunk/ncurses: package/yast2-ncurses.changes src/YNCursesUI.cc
by kmachalkova＠svn.opensuse.org 28 Feb '08

28 Feb '08

Author: kmachalkova Date: Thu Feb 28 18:28:53 2008 New Revision: 45109 URL: http://svn.opensuse.org/viewcvs/yast?rev=45109&view=rev Log: Enhancement: show module name in window title (e.g. YaST - http-server @ host) Modified: trunk/ncurses/package/yast2-ncurses.changes trunk/ncurses/src/YNCursesUI.cc Modified: trunk/ncurses/package/yast2-ncurses.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/package/yast2-ncurses.ch… ============================================================================== --- trunk/ncurses/package/yast2-ncurses.changes (original) +++ trunk/ncurses/package/yast2-ncurses.changes Thu Feb 28 18:28:53 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Feb 28 18:25:29 CET 2008 - kmachalkova(a)suse.cz + +- Enhancement: show module name in window title + (e.g. YaST - http-server @ host) + +------------------------------------------------------------------- Wed Feb 27 11:44:57 CET 2008 - coolo(a)suse.de - fix package build Modified: trunk/ncurses/src/YNCursesUI.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/YNCursesUI.cc?rev=45… ============================================================================== --- trunk/ncurses/src/YNCursesUI.cc (original) +++ trunk/ncurses/src/YNCursesUI.cc Thu Feb 28 18:28:53 2008 @@ -26,6 +26,7 @@ #include <YUI.h> #include <YEvent.h> #include <YDialog.h> +#include <YCommandLine.h> #include <YMacro.h> #define YUILogComponent "ncurses" @@ -272,14 +273,27 @@ void YNCursesUI::init_title() { string title_ti( "YaST" ); + string module; char hostname_ti[256]; hostname_ti[0] = hostname_ti[255] = '\0'; + // get command line args, usually in the form + // '/usr/lib/whatever/y2base' 'module_name' 'selected_ui' + // (e.g. 'y2base' 'lan' 'ncurses') -> we need 'lan' item + YCommandLine *cmdline = new YCommandLine(); + YUI_CHECK_NEW( cmdline ); + module = (*cmdline)[1]; + // check for valid hostname, suppress "(none)" as hostname if ( gethostname( hostname_ti, 255 ) != -1 && hostname_ti[0] && hostname_ti[0] != '(' ) { + if ( !module.empty() ) + { + title_ti += " - "; + title_ti += module; + } title_ti += " @ "; title_ti += hostname_ti; } -- 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] r45108 - in /branches/tmp/bubli/ncurses-pkg/src: NCPackageSelector.cc NCPkgPopupTree.cc NCPkgPopupTree.h
by kmachalkova＠svn.opensuse.org 28 Feb '08

28 Feb '08

Author: kmachalkova Date: Thu Feb 28 17:25:10 2008 New Revision: 45108 URL: http://svn.opensuse.org/viewcvs/yast?rev=45108&view=rev Log: Filtering pkgs by group moved Modified: branches/tmp/bubli/ncurses-pkg/src/NCPackageSelector.cc branches/tmp/bubli/ncurses-pkg/src/NCPkgPopupTree.cc branches/tmp/bubli/ncurses-pkg/src/NCPkgPopupTree.h Modified: branches/tmp/bubli/ncurses-pkg/src/NCPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/bubli/ncurses-pkg/src/NCP… ============================================================================== --- branches/tmp/bubli/ncurses-pkg/src/NCPackageSelector.cc (original) +++ branches/tmp/bubli/ncurses-pkg/src/NCPackageSelector.cc Thu Feb 28 17:25:10 2008 @@ -80,14 +80,14 @@ // // CompFunc // -bool sortByName( ZyppSel ptr1, ZyppSel ptr2 ) -{ - if ( ptr1->name() < ptr2->name() ) - { - return true; - } - return false; -} +//bool sortByName( ZyppSel ptr1, ZyppSel ptr2 ) +//{ +// if ( ptr1->name() < ptr2->name() ) +// { +// return true; +// } +// return false; +//} /////////////////////////////////////////////////////////////////// // @@ -511,8 +511,7 @@ retVal = CancelHandler( event ); else if ( event.widget == filterPopup ) { - retVal = true; - NCINT << "porn.bat" << endl; + retVal = filterPopup->handleEvent(); } } else if ( event == NCursesEvent::menu ) @@ -2840,12 +2839,12 @@ } } case NCPkgTable::T_Packages: { - YStringTreeItem * defaultGroup = getDefaultRpmGroup(); + YStringTreeItem * defaultGroup = filterPopup->getDefaultRpmGroup(); if ( defaultGroup ) { NCMIL << "default RPM group: " << defaultGroup->value().translation() << endl; - fillPackageList ( defaultGroup->value().translation(), defaultGroup ); + filterPopup->fillPackageList ( defaultGroup->value().translation(), defaultGroup ); // set the visible info to package description setVisibleInfo ( pkginfoItem ); @@ -2864,5 +2863,4 @@ pkgList->setKeyboardFocus(); - return true; -} + return true;} Modified: branches/tmp/bubli/ncurses-pkg/src/NCPkgPopupTree.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/bubli/ncurses-pkg/src/NCP… ============================================================================== --- branches/tmp/bubli/ncurses-pkg/src/NCPkgPopupTree.cc (original) +++ branches/tmp/bubli/ncurses-pkg/src/NCPkgPopupTree.cc Thu Feb 28 17:25:10 2008 @@ -84,15 +84,32 @@ : NCTree( parent, label ) , filterTree( this ) , packager ( pkg ) + , _rpmGroupsTree (0) { // create the layout (the NCTree) //createLayout( NCPkgNames::RpmTreeLabel() ); - setNotify(true); + + _rpmGroupsTree = new YRpmGroupsTree (); + + ZyppPoolIterator b = zyppPkgBegin (); + ZyppPoolIterator e = zyppPkgEnd (); + ZyppPoolIterator i; + + for ( i = b; i != e; ++i ) + { + ZyppPkg zyppPkg = tryCastToZyppPkg( (*i)->theObj() ); + if ( zyppPkg ) + { + _rpmGroupsTree->addRpmGroup (zyppPkg->group ()); + NCDBG << "Adding group: " << zyppPkg->group() << endl; + } + } + if ( pkg->rpmGroupsTree() ) { // clone the tree (fill the NCTree) - cloneTree( pkg->rpmGroupsTree()->root(), 0 ); + cloneTree( _rpmGroupsTree->root(), 0 ); } } @@ -136,8 +153,8 @@ // // DESCRIPTION : // -//NCursesEvent NCPkgPopupTree::showFilterPopup( ) -//{ +bool NCPkgPopupTree::handleEvent( ) +{ // postevent = NCursesEvent(); // // // event loop @@ -150,42 +167,148 @@ // if ( !packager || !filterTree ) // return postevent; // -// YStringTreeItem * origItem; + YStringTreeItem * origItem; // // // get the currently selected rpm group and show the package list // if ( postevent.detail == NCursesEvent::USERDEF ) // { -// const YTreeItem * item = filterTree->getCurrentItem(); -// -// if ( item ) -// { -// const NCRpmGroupItem * rpmGroupItem = dynamic_cast<const NCRpmGroupItem *>(item); -// -// if ( rpmGroupItem ) -// { -// // get the original rpm group item (YStringTreeItem) -// origItem = rpmGroupItem->getOrigItem(); -// -// if ( origItem ) -// { -// string label = origItem->value().translation(); -// -// // fill the package list -// packager->fillPackageList( label, origItem ); -// -// NCMIL << "Selected RPM group: " << label << endl; -// } -// } -// } -// else -// { -// NCERR << "Current item not valid" << endl; -// } -// } -// -// return postevent; -//} + const YTreeItem * item = filterTree->getCurrentItem(); + + if ( item ) + { + const NCRpmGroupItem * rpmGroupItem = dynamic_cast<const NCRpmGroupItem *>(item); + + if ( rpmGroupItem ) + { + // get the original rpm group item (YStringTreeItem) + origItem = rpmGroupItem->getOrigItem(); + + if ( origItem ) + { + string label = origItem->value().translation(); + + // fill the package list + fillPackageList( label, origItem ); + + NCMIL << "Selected RPM group: " << label << endl; + } + } + } + else + { + NCERR << "Current item not valid" << endl; + } + + return true; +} + +YStringTreeItem * NCPkgPopupTree::getDefaultRpmGroup() +{ + if ( _rpmGroupsTree && + _rpmGroupsTree->root() ) + return _rpmGroupsTree->root()->firstChild(); + else + return 0; +} + + +bool NCPkgPopupTree::checkPackage( ZyppObj opkg, ZyppSel slb, + YStringTreeItem * rpmGroup ) +{ + ZyppPkg pkg = tryCastToZyppPkg (opkg); + if ( ! pkg || ! rpmGroup ) + return false; + + NCPkgTable * packageList = packager->PackageList(); + + if ( !packageList ) + { + UIERR << "Widget is not a valid NCPkgTable widget" << endl; + return false; + } + + string group_str = _rpmGroupsTree->rpmGroup (rpmGroup); + NCINT << group_str << endl; + // is the requested rpm group a prefix of this package's group? + if ( pkg->group ().find (group_str) == 0 ) + { + NCINT << slb->name() << endl; + packageList->createListEntry( pkg, slb ); + + return true; + } + else + { + return false; + } +} + +bool NCPkgPopupTree::fillPackageList ( const string & label, YStringTreeItem *rpmGroup ) +{ + NCPkgTable * packageList = packager->PackageList(); + + if ( !packageList ) + { + UIERR << "No valid NCPkgTable widget" << endl; + return false; + } + + // clear the package table + packageList->itemsCleared (); + + // get the package list and sort it + list<ZyppSel> pkgList( zyppPkgBegin (), zyppPkgEnd () ); + pkgList.sort( sortByName ); + // fill the package table + list<ZyppSel>::iterator listIt; + ZyppPkg pkgPtr; + + + for ( listIt = pkgList.begin(); listIt != pkgList.end(); ++listIt ) + { + ZyppSel selectable = *listIt; + + // Multiple instances of this package may or may not be in the same + // RPM group, so let's check both the installed version (if there + // is any) and the candidate version. + // + // Make sure we emit only one filterMatch() signal if both exist + // and both are in the same RPM group. We don't want multiple list + // entries for the same package! + + bool match = + checkPackage( selectable->candidateObj(), selectable, rpmGroup ) || + checkPackage( selectable->installedObj(), selectable, rpmGroup ); + + // If there is neither an installed nor a candidate package, check + // any other instance. + + if ( ! match && + ! selectable->installedObj() && + ! selectable->candidateObj() ) + checkPackage( selectable->theObj(), selectable, rpmGroup ); + + } + + // show the package list + packageList->drawList(); + + NCMIL << "Fill package list" << endl; + + if ( ! label.empty() ) + { + YLabel *packageLabel = packager->PackageLabel(); + // show the selected filter label + if ( packageLabel ) + { + packageLabel->setText( label ); + } + } + + return true; + +} /////////////////////////////////////////////////////////////////// // // Modified: branches/tmp/bubli/ncurses-pkg/src/NCPkgPopupTree.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/bubli/ncurses-pkg/src/NCP… ============================================================================== --- branches/tmp/bubli/ncurses-pkg/src/NCPkgPopupTree.h (original) +++ branches/tmp/bubli/ncurses-pkg/src/NCPkgPopupTree.h Thu Feb 28 17:25:10 2008 @@ -28,6 +28,7 @@ #include "NCTree.h" #include "NCLabel.h" #include "NCRichText.h" +#include "NCZypp.h" #include <YRpmGroupsTree.h> @@ -52,6 +53,8 @@ NCPackageSelector * packager; // connection to the PackageSelector + YRpmGroupsTree * _rpmGroupsTree; // rpm groups of the found packages + // internal use (copies tree items) void cloneTree( YStringTreeItem * parentOrig, NCRpmGroupItem * parentClone ); @@ -76,6 +79,14 @@ void createLayout( const string & label ); + bool handleEvent(); + + YStringTreeItem * getDefaultRpmGroup(); + + bool checkPackage( ZyppObj opkg, ZyppSel slb, YStringTreeItem *rpmGroup); + + bool fillPackageList ( const string & label, YStringTreeItem *rpmGroup ); + void addItem( YTreeItem * newItem ); //NCursesEvent showFilterPopup( ); -- 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] r45107 - /branches/tmp/bubli/ncurses-pkg/src/NCZypp.h
by kmachalkova＠svn.opensuse.org 28 Feb '08

28 Feb '08

Author: kmachalkova Date: Thu Feb 28 17:24:50 2008 New Revision: 45107 URL: http://svn.opensuse.org/viewcvs/yast?rev=45107&view=rev Log: sort function moved here Modified: branches/tmp/bubli/ncurses-pkg/src/NCZypp.h Modified: branches/tmp/bubli/ncurses-pkg/src/NCZypp.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/bubli/ncurses-pkg/src/NCZ… ============================================================================== --- branches/tmp/bubli/ncurses-pkg/src/NCZypp.h (original) +++ branches/tmp/bubli/ncurses-pkg/src/NCZypp.h Thu Feb 28 17:24:50 2008 @@ -135,5 +135,8 @@ return binary_search( sorted_vector.begin(), sorted_vector.end(), search); } - +inline bool sortByName( ZyppSel ptr1, ZyppSel ptr2 ) +{ + return( ptr1->name() < ptr2->name() ); +} #endif // NCZypp_h -- 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] r45106 - /branches/tmp/bubli/ncurses-pkg/src/NCPkgTable.cc
by kmachalkova＠svn.opensuse.org 28 Feb '08

28 Feb '08

Author: kmachalkova Date: Thu Feb 28 17:24:32 2008 New Revision: 45106 URL: http://svn.opensuse.org/viewcvs/yast?rev=45106&view=rev Log: show cool label Modified: branches/tmp/bubli/ncurses-pkg/src/NCPkgTable.cc Modified: branches/tmp/bubli/ncurses-pkg/src/NCPkgTable.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/bubli/ncurses-pkg/src/NCP… ============================================================================== --- branches/tmp/bubli/ncurses-pkg/src/NCPkgTable.cc (original) +++ branches/tmp/bubli/ncurses-pkg/src/NCPkgTable.cc Thu Feb 28 17:24:32 2008 @@ -749,6 +749,7 @@ case T_Update: // show the required package info packager->showPackageInformation( objPtr, slbPtr ); + packager->PackageLabel()->setLabel( slbPtr->name() ); break; case T_Patches: // show the patch info @@ -761,6 +762,7 @@ 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