Hello community, here is the log from the commit of package yast2-ncurses-pkg checked in at Fri Jul 25 12:59:17 CEST 2008. -------- --- yast2-ncurses-pkg/yast2-ncurses-pkg.changes 2008-07-21 15:36:22.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-ncurses-pkg/yast2-ncurses-pkg.changes 2008-07-25 10:54:26.203164000 +0200 @@ -1,0 +2,14 @@ +Wed Jul 23 16:55:55 CEST 2008 - kmachalkova@suse.cz + +- Added pkg search modes (contains, regexp etc.) selection (uses + zypp::PoolQuery) +- Search view is now default (bnc#404694) +- Reset info text area on switching to/from search filter + +------------------------------------------------------------------- +Wed Jul 23 16:12:56 CEST 2008 ma@suse.de + +- Remove references to obsolete freshens dependencies. +- 2.17.5 + +------------------------------------------------------------------- @@ -9 +23 @@ -- 2.17.4 +- 2.17.4 Old: ---- yast2-ncurses-pkg-2.17.4.tar.bz2 New: ---- yast2-ncurses-pkg-2.17.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ncurses-pkg.spec ++++++ --- /var/tmp/diff_new_pack.He4576/_old 2008-07-25 12:59:08.000000000 +0200 +++ /var/tmp/diff_new_pack.He4576/_new 2008-07-25 12:59:08.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-ncurses-pkg (Version 2.17.4) +# spec file for package yast2-ncurses-pkg (Version 2.17.5) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,12 +12,12 @@ Name: yast2-ncurses-pkg -Version: 2.17.4 +Version: 2.17.5 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-ncurses-pkg-2.17.4.tar.bz2 +Source0: yast2-ncurses-pkg-2.17.5.tar.bz2 Prefix: /usr BuildRequires: dejagnu doxygen gcc-c++ yast2-core-devel yast2-devtools BuildRequires: blocxx-devel libxcrypt-devel ncurses-devel yast2-ncurses-devel @@ -38,7 +38,7 @@ %prep -%setup -n yast2-ncurses-pkg-2.17.4 +%setup -n yast2-ncurses-pkg-2.17.5 %build %{prefix}/bin/y2tool y2autoconf @@ -67,7 +67,16 @@ %{_libdir}/YaST2/plugin/libpy2ncurses_pkg.so.* %{_libdir}/YaST2/plugin/libpy2ncurses_pkg.so %doc %{prefix}/share/doc/packages/yast2-ncurses-pkg + %changelog +* Wed Jul 23 2008 kmachalkova@suse.cz +- Added pkg search modes (contains, regexp etc.) selection (uses + zypp::PoolQuery) +- Search view is now default (bnc#404694) +- Reset info text area on switching to/from search filter + Wed Jul 23 16:12:56 CEST 2008 ma@suse.de +- Remove references to obsolete freshens dependencies. +- 2.17.5 * Mon Jul 21 2008 kmachalkova@suse.cz - Some look&feel fixes * Show locale (language) description ++++++ yast2-ncurses-pkg-2.17.4.tar.bz2 -> yast2-ncurses-pkg-2.17.5.tar.bz2 ++++++ ++++ 5370 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-pkg-2.17.4/configure.in new/yast2-ncurses-pkg-2.17.5/configure.in --- old/yast2-ncurses-pkg-2.17.4/configure.in 2008-06-25 12:18:17.000000000 +0200 +++ new/yast2-ncurses-pkg-2.17.5/configure.in 2008-03-27 18:04:30.000000000 +0100 @@ -1,9 +1,9 @@ dnl configure.in for yast2-ncurses-pkg dnl -dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.15.9 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-ncurses-pkg, 2.17.2, http://bugs.opensuse.org/, yast2-ncurses-pkg) +AC_INIT(yast2-ncurses-pkg, 2.16.5, http://bugs.opensuse.org/, yast2-ncurses-pkg) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -14,11 +14,10 @@ AC_PREFIX_DEFAULT(/usr) -dnl long filenames; we use GNU Make extensions and that's ok -AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) +AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.17.2" +VERSION="2.16.5" RPMNAME="yast2-ncurses-pkg" MAINTAINER="Katarina Machalkova <kmachalkova@suse.cz>" @@ -108,7 +107,7 @@ dnl no need for AC_ARG_VAR AC_PATH_PROG(XGETTEXT, xgettext) if test -z "$XGETTEXT" ; then - AC_MSG_ERROR(xgettext is missing; please install gettext-tools.) + AC_MSG_ERROR(xgettext is missing; please install gettext-devel.) fi Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools` diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-pkg-2.17.4/COPYRIGHT.english new/yast2-ncurses-pkg-2.17.5/COPYRIGHT.english --- old/yast2-ncurses-pkg-2.17.4/COPYRIGHT.english 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-ncurses-pkg-2.17.5/COPYRIGHT.english 2008-07-23 17:15:43.000000000 +0200 @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + <signature of Ty Coon>, 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-pkg-2.17.4/Makefile.am new/yast2-ncurses-pkg-2.17.5/Makefile.am --- old/yast2-ncurses-pkg-2.17.4/Makefile.am 2008-06-25 12:18:18.000000000 +0200 +++ new/yast2-ncurses-pkg-2.17.5/Makefile.am 2008-03-27 18:04:30.000000000 +0100 @@ -23,14 +23,13 @@ ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) -COPYRIGHT_files_gpl = README COPYING +COPYRIGHT_files_gpl = README COPYING COPYRIGHT.english COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl)) -# less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip # where devtools instal m4 snippets # argh, executed literally diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-pkg-2.17.4/README new/yast2-ncurses-pkg-2.17.5/README --- old/yast2-ncurses-pkg-2.17.4/README 2008-07-21 16:04:55.000000000 +0200 +++ new/yast2-ncurses-pkg-2.17.5/README 2008-07-23 17:15:43.000000000 +0200 @@ -1,2 +1,2 @@ This program/library is part of YaST2 -See the file COPYING for license terms +See the file COPYRIGHT.english for license terms diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-pkg-2.17.4/src/NCPackageSelector.cc new/yast2-ncurses-pkg-2.17.5/src/NCPackageSelector.cc --- old/yast2-ncurses-pkg-2.17.4/src/NCPackageSelector.cc 2008-07-21 15:49:00.000000000 +0200 +++ new/yast2-ncurses-pkg-2.17.5/src/NCPackageSelector.cc 2008-07-23 16:55:22.000000000 +0200 @@ -722,6 +722,7 @@ } } + /////////////////////////////////////////////////////////////////// // // showPatchPackages @@ -791,6 +792,15 @@ } } +void NCPackageSelector::clearInfoArea() +{ + if ( infoText ) + infoText->setText(""); + if ( versionsList ) + versionsList->itemsCleared(); + + packageLabel->setText("....................................."); +} void NCPackageSelector::replaceFilter( FilterMode mode) { @@ -884,6 +894,7 @@ if (mode == Search) { pkgList->itemsCleared(); + clearInfoArea(); } else { @@ -1604,13 +1615,12 @@ filterMain = new NCPkgFilterMain (l, NCPkgStrings::Filter(), this ); replPoint = YUI::widgetFactory()->createReplacePoint( vv ); - YTableHeader *hhh = new YTableHeader(); - patternPopup = new NCPkgFilterPattern( replPoint, hhh, this ); + //Search view is now default (#404694) + searchPopup = new NCPkgFilterSearch( replPoint, YD_VERT, this ); YAlignment *l1 = YUI::widgetFactory()->createLeft( vbox_left ); patternLabel = new NCLabel( l1, " " ); - // add the package table YTableHeader * tableHeader = new YTableHeader(); @@ -1636,33 +1646,33 @@ // set the pointer to the packager object pkgList->setPackager( this ); - // HBox for Filter and Disk Space (both in additional HBoxes ) + // label text + actions menu YLayoutBox * hSplit2 = YUI::widgetFactory()->createHBox( v ); - - // label text - keep it short new NCLabel( hSplit2, NCPkgStrings::PackageName() ); packageLabel = YUI::widgetFactory()->createLabel ( hSplit2, "......................" ); - new NCSpacing( hSplit2, YD_HORIZ, true, 0.5 ); - actionMenu = new NCPkgMenuAction ( hSplit2, NCPkgStrings::Actions(), this ); + //Search parameters resp. filter description replPoint2 = YUI::widgetFactory()->createReplacePoint( hbox_bottom ); replPoint2->setWeight(YD_HORIZ, 1); - filter_desc = new NCRichText( replPoint2, " " ); + searchSet = new NCPkgSearchSettings( replPoint2, NCPkgStrings::SearchIn() ); + + //Package description resp. package version table YLayoutBox * vSplit = YUI::widgetFactory()->createVBox( hbox_bottom ); vSplit->setWeight(YD_HORIZ, 2); replacePoint = YUI::widgetFactory()->createReplacePoint( vSplit ); - infoText = new NCPkgPackageDetails( replacePoint, " ", this ); YUI_CHECK_NEW( infoText ); + //Bottom button bar YAlignment *ll = YUI::widgetFactory()->createLeft( bottom_bar ); helpMenu = new NCPkgMenuHelp (ll, _("&Help")); YUI_CHECK_NEW( helpMenu ); - YAlignment *r = YUI::widgetFactory()->createRight( bottom_bar ); - YLayoutBox * hSplit = YUI::widgetFactory()->createHBox( r ); + //right-alignment for OK-Cancel + YAlignment *right = YUI::widgetFactory()->createRight( bottom_bar ); + YLayoutBox * hSplit = YUI::widgetFactory()->createHBox( right ); // add the Cancel button cancelButton = new NCPushButton( hSplit, _( "&Cancel" ) ); @@ -1695,6 +1705,7 @@ pkgList->setVisibleInfo(NCPkgTable::I_PatchDescr); // show the patch description of the current item pkgList->showInformation (); + pkgList->setKeyboardFocus(); break; } case NCPkgTable::T_Update: { @@ -1709,21 +1720,15 @@ } } case NCPkgTable::T_Packages: { - + //Search view is the default (#404694) pkgList->setVisibleInfo(NCPkgTable::I_Technical); - // update the pattern status which is available only after the initial - // solver run - patternPopup->updateTable(); - patternPopup->showPatternPackages(); - // show the package inforamtion of the current item - pkgList->showInformation (); + searchField->setKeyboardFocus(); break; } default: break; } - pkgList->setKeyboardFocus(); return true; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-pkg-2.17.4/src/NCPackageSelector.h new/yast2-ncurses-pkg-2.17.5/src/NCPackageSelector.h --- old/yast2-ncurses-pkg-2.17.4/src/NCPackageSelector.h 2008-06-11 18:24:26.000000000 +0200 +++ new/yast2-ncurses-pkg-2.17.5/src/NCPackageSelector.h 2008-07-23 16:55:22.000000000 +0200 @@ -306,6 +306,8 @@ * @return void */ void showInformation(); + + void clearInfoArea(); wrect deleteReplacePoint(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-pkg-2.17.4/src/NCPkgFilterMain.cc new/yast2-ncurses-pkg-2.17.5/src/NCPkgFilterMain.cc --- old/yast2-ncurses-pkg-2.17.4/src/NCPkgFilterMain.cc 2008-06-11 18:24:26.000000000 +0200 +++ new/yast2-ncurses-pkg-2.17.5/src/NCPkgFilterMain.cc 2008-07-23 16:55:22.000000000 +0200 @@ -53,6 +53,7 @@ items.push_back( repositories ); search = new YItem( _("Search") ); + search->setSelected(); items.push_back( search ); inst_summary = new YItem( _("Installation Summary") ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-pkg-2.17.4/src/NCPkgFilterSearch.cc new/yast2-ncurses-pkg-2.17.5/src/NCPkgFilterSearch.cc --- old/yast2-ncurses-pkg-2.17.4/src/NCPkgFilterSearch.cc 2008-07-21 15:33:50.000000000 +0200 +++ new/yast2-ncurses-pkg-2.17.5/src/NCPkgFilterSearch.cc 2008-07-23 16:55:22.000000000 +0200 @@ -17,6 +17,7 @@ /-*/ #define YUILogComponent "ncurses-pkg" #include <YUILog.h> +#include <string> #include <sstream> #include <boost/format.hpp> @@ -85,25 +86,35 @@ // add the input field (a editable combo box) NCLayoutBox * vSplit = new NCLayoutBox ( frame0, YD_VERT); - new NCSpacing( vSplit, YD_VERT, true, 0.5 ); + //new NCSpacing( vSplit, YD_VERT, true, 0.5 ); searchExpr = new NCInputField( vSplit, NCPkgStrings::SearchPhrase() ); searchExpr->setStretchable( YD_HORIZ, true ); searchExpr->setReturnOnReturn( true ); packager->setSearchField( searchExpr ); - new NCSpacing( vSplit, YD_VERT, false, 0.5 ); + //new NCSpacing( vSplit, YD_VERT, false, 0.5 ); if ( !packager->isYouMode() ) { // add the checkBox ignore case - NCAlignment *left = new NCAlignment( vSplit, YAlignBegin, YAlignUnchanged ); + NCAlignment *left1 = new NCAlignment( vSplit, YAlignBegin, YAlignUnchanged ); - ignoreCase = new NCCheckBox( left, _( "&Ignore Case" ), true ); + ignoreCase = new NCCheckBox( left1, _( "&Ignore Case" ), true ); new NCSpacing( vSplit, YD_VERT, true, 0.5 ); } - + + NCAlignment *left2 = new NCAlignment( vSplit, YAlignBegin, YAlignUnchanged ); + searchMode = new NCComboBox (left2, _("Search &Mode"), false); + + searchMode->addItem( _("Contains"), false); + searchMode->addItem( _("Begins with"), false); + searchMode->addItem( _("Exact Match"), false); + searchMode->addItem( _("Use Wildcards"), false); + searchMode->addItem( _("Use RegExp"), false); + + new NCSpacing( vSplit, YD_VERT, true, 0.5 ); } @@ -147,7 +158,7 @@ } -bool NCPkgFilterSearch::fillSearchList( const string & expr, +bool NCPkgFilterSearch::fillSearchList( string & expr, bool ignoreCase, bool checkName, bool checkSummary, @@ -166,6 +177,26 @@ packageList->itemsCleared (); zypp::PoolQuery q; + + switch ( searchMode->getCurrentItem() ) + { + case Contains: + q.setMatchSubstring(); + break; + case BeginsWith: + expr = '^' + expr; + q.setMatchRegex(); + break; + case ExactMatch: + break; + case UseWildcard: + q.setMatchGlob(); + break; + case UseRegexp: + q.setMatchRegex(); + break; + } + q.addString( expr ); q.addKind( zypp::ResKind::package ); //no clue what this means, but it segfaults if it's not here :) @@ -203,7 +234,10 @@ { packageList->setCurrentItem( 0 ); packageList->showInformation(); + packageList->setKeyboardFocus(); } + else + packager->clearInfoArea(); return true; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-pkg-2.17.4/src/NCPkgFilterSearch.h new/yast2-ncurses-pkg-2.17.5/src/NCPkgFilterSearch.h --- old/yast2-ncurses-pkg-2.17.4/src/NCPkgFilterSearch.h 2008-06-11 18:24:26.000000000 +0200 +++ new/yast2-ncurses-pkg-2.17.5/src/NCPkgFilterSearch.h 2008-07-23 16:55:22.000000000 +0200 @@ -32,6 +32,7 @@ #include "NCLayoutBox.h" #include "NCRichText.h" #include "NCCheckBox.h" +#include "NCComboBox.h" #include "NCPushButton.h" class NCPackageSelector; @@ -49,8 +50,17 @@ private: + enum SearchMode { + Contains = 0, + BeginsWith, + ExactMatch, + UseWildcard, + UseRegexp + }; + NCInputField * searchExpr; NCCheckBox * ignoreCase; + NCComboBox * searchMode; NCPackageSelector * packager; // connection to the package selector @@ -70,7 +80,7 @@ virtual bool showSearchResultPackages(); bool match ( string s1, string s2, bool ignoreCase ); - bool fillSearchList( const string & expr, + bool fillSearchList( string & expr, bool ignoreCase, bool checkName, bool checkSummary, diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-pkg-2.17.4/src/NCPkgPackageDetails.cc new/yast2-ncurses-pkg-2.17.5/src/NCPkgPackageDetails.cc --- old/yast2-ncurses-pkg-2.17.4/src/NCPkgPackageDetails.cc 2008-07-16 11:22:15.000000000 +0200 +++ new/yast2-ncurses-pkg-2.17.5/src/NCPkgPackageDetails.cc 2008-07-23 16:55:22.000000000 +0200 @@ -86,7 +86,7 @@ string NCPkgPackageDetails::commonHeader( ZyppObj pkgPtr ) { string text; - text += "<h3>" + pkgPtr->name() + " - "; + text += "<h3>" + pkgPtr->name() + " - "; text += pkgPtr->summary() + "</h3>"; return text; @@ -94,8 +94,8 @@ void NCPkgPackageDetails::longDescription ( ZyppObj pkgPtr ) { - string text = ""; - + string text = ""; + //text += commonHeader( pkgPtr ); text += pkgPtr->description(); @@ -108,12 +108,12 @@ string instVersion = ""; string version = ""; string text = ""; - + text += commonHeader( pkgPtr ); //text += " - "; - + //text += pkgPtr->summary(); - + if ( slbPtr->hasBothObjects () ) { ZyppObj io = slbPtr->installedObj (); @@ -131,7 +131,7 @@ version += "-"; version += pkgPtr->edition().release(); } - + text += NCPkgStrings::Version(); text += version; if ( instVersion != "" ) @@ -141,12 +141,12 @@ text += instVersion; } text += "<br>"; - + // show the size text += NCPkgStrings::Size(); text += pkgPtr->installsize().asString(); text += " "; - + ZyppPkg package = tryCastToZyppPkg (pkgPtr); if ( package ) { @@ -157,18 +157,18 @@ sprintf( num, "%d", medianr ); text += num; text += "<br>"; - + // the license text += NCPkgStrings::License(); text += package->license(); text += " "; text += "<br>"; - + // the rpm group text += NCPkgStrings::RpmGroup(); text += package->group (); text += "<br>"; - + //authors, in one line text += NCPkgStrings::Authors(); list<string> authors = package->authors(); // zypp::Package @@ -185,17 +185,17 @@ string text = ""; // the file list is available only for installed packages ZyppPkg package = tryCastToZyppPkg (slbPtr->installedObj()); - + if ( package ) { - text += commonHeader( slbPtr->theObj() ); + text += commonHeader( slbPtr->theObj() ); text += NCPkgStrings::ListOfFiles(); // get the file list from the package manager/show the list list<string> fileList = package->filenames(); text += createText( fileList, false ) ; } - else + else text = _("<i>This information is available for installed packages only</i>"); setValue(text); @@ -203,7 +203,7 @@ void NCPkgPackageDetails::dependencyList( ZyppObj pkgPtr, ZyppSel slbPtr ) { - string text = commonHeader( pkgPtr ); + string text = commonHeader( pkgPtr ); // show the relations, all of them except provides which is above zypp::Dep deptypes[] = { zypp::Dep::PROVIDES, @@ -213,7 +213,6 @@ zypp::Dep::OBSOLETES, zypp::Dep::RECOMMENDS, zypp::Dep::SUGGESTS, - zypp::Dep::FRESHENS, zypp::Dep::ENHANCES, zypp::Dep::SUPPLEMENTS, }; @@ -231,7 +230,7 @@ } setValue (text); - + } bool NCPkgPackageDetails::patchDescription( ZyppObj objPtr, ZyppSel selectable ) @@ -243,7 +242,7 @@ yuiError() << "Patch not valid" << endl; return false; } - + string descr; descr += "<p>"; descr += NCPkgStrings::Patch(); @@ -260,7 +259,7 @@ descr += NCPkgStrings::Version(); descr += patchPtr->edition().asString(); descr += "</p>"; - + if ( !selectable->installedEmpty() && selectable->installedObj().isBroken() ) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-pkg-2.17.4/VERSION new/yast2-ncurses-pkg-2.17.5/VERSION --- old/yast2-ncurses-pkg-2.17.4/VERSION 2008-07-21 16:03:02.000000000 +0200 +++ new/yast2-ncurses-pkg-2.17.5/VERSION 2008-07-23 16:55:22.000000000 +0200 @@ -1 +1 @@ -2.17.4 +2.17.5 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org