Hello community,
here is the log from the commit of package yast2-ncurses
checked in at Fri Apr 20 01:19:04 CEST 2007.
--------
--- yast2-ncurses/yast2-ncurses.changes 2007-03-21 17:31:10.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-ncurses/yast2-ncurses.changes 2007-04-19 14:40:10.000000000 +0200
@@ -1,0 +2,20 @@
+Thu Apr 19 14:37:04 CEST 2007 - gs@suse.de
+
+- Enable/disable the RadioButtons in a RadioButtonGroup correctly
+ (bug #168770)
+- ncurses-devel added to BuildRequires
+- 2.15.14
+
+-------------------------------------------------------------------
+Thu Apr 19 14:12:15 CEST 2007 - kmachalkova@suse.cz
+
+- Package selector: added filter for languages (zypp::Language) -
+ beta version (FaTE #301810 - part I)
+
+-------------------------------------------------------------------
+Thu Apr 19 10:34:58 CEST 2007 - gs@suse.de
+
+- Inform the user that all dependencies/the system are/is OK after
+ a check from 'Etc.' menu (bug #249281)
+
+-------------------------------------------------------------------
Old:
----
yast2-ncurses-2.15.13.tar.bz2
New:
----
yast2-ncurses-2.15.14.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-ncurses.spec ++++++
--- /var/tmp/diff_new_pack.t18333/_old 2007-04-20 01:18:22.000000000 +0200
+++ /var/tmp/diff_new_pack.t18333/_new 2007-04-20 01:18:22.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-ncurses (Version 2.15.13)
+# spec file for package yast2-ncurses (Version 2.15.14)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,15 +11,15 @@
# norootforbuild
Name: yast2-ncurses
-Version: 2.15.13
+Version: 2.15.14
Release: 1
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-ncurses-2.15.13.tar.bz2
+Source0: yast2-ncurses-2.15.14.tar.bz2
prefix: /usr
BuildRequires: doxygen gcc-c++ libzypp-devel yast2-core-devel yast2-devtools
-BuildRequires: blocxx-devel libxcrypt-devel
+BuildRequires: blocxx-devel libxcrypt-devel ncurses-devel
Summary: YaST2 - Character Based User Interface
Provides: yast2_ui
Provides: y2base:/var/lib/YaST2/servers/ncurses
@@ -44,7 +44,7 @@
%prep
-%setup -n yast2-ncurses-2.15.13
+%setup -n yast2-ncurses-2.15.14
%build
%{prefix}/bin/y2tool y2autoconf
@@ -77,6 +77,17 @@
%doc %{prefix}/share/doc/packages/yast2-ncurses
%changelog
+* Thu Apr 19 2007 - gs@suse.de
+- Enable/disable the RadioButtons in a RadioButtonGroup correctly
+ (bug #168770)
+- ncurses-devel added to BuildRequires
+- 2.15.14
+* Thu Apr 19 2007 - kmachalkova@suse.cz
+- Package selector: added filter for languages (zypp::Language) -
+ beta version (FaTE #301810 - part I)
+* Thu Apr 19 2007 - gs@suse.de
+- Inform the user that all dependencies/the system are/is OK after
+ a check from 'Etc.' menu (bug #249281)
* Wed Mar 21 2007 - kmachalkova@suse.cz
- Correct pkg/pattern/patch state transition from S_AutoInstall to
S_Taboo on toggle with SPACE key (#254816)
++++++ yast2-ncurses-2.15.13.tar.bz2 -> yast2-ncurses-2.15.14.tar.bz2 ++++++
++++ 6084 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-2.15.13/configure.in new/yast2-ncurses-2.15.14/configure.in
--- old/yast2-ncurses-2.15.13/configure.in 2007-03-21 16:00:20.000000000 +0100
+++ new/yast2-ncurses-2.15.14/configure.in 2007-04-19 14:59:50.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-ncurses, 2.15.12, http://bugs.opensuse.org/, yast2-ncurses)
+AC_INIT(yast2-ncurses, 2.15.14, http://bugs.opensuse.org/, yast2-ncurses)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.15.12"
+VERSION="2.15.14"
RPMNAME="yast2-ncurses"
MAINTAINER="Katarina Machalkova "
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-2.15.13/missing new/yast2-ncurses-2.15.14/missing
--- old/yast2-ncurses-2.15.13/missing 2007-03-21 16:00:38.000000000 +0100
+++ new/yast2-ncurses-2.15.14/missing 2007-04-19 15:00:17.000000000 +0200
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2005-06-08.21
+scriptversion=2006-05-10.23
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
@@ -33,6 +33,8 @@
fi
run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -44,7 +46,7 @@
msg="missing on your system"
-case "$1" in
+case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -77,6 +79,7 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -106,7 +109,7 @@
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
# the program).
-case "$1" in
+case $1 in
lex|yacc)
# Not GNU programs, they don't have --version.
;;
@@ -135,7 +138,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case "$1" in
+case $1 in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -164,7 +167,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -192,8 +195,8 @@
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
@@ -214,25 +217,25 @@
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
@@ -244,18 +247,18 @@
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
@@ -267,11 +270,9 @@
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- fi
- if [ -f "$file" ]; then
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
@@ -289,11 +290,17 @@
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
# ... or it is derived from the source name (dir/f.texi becomes f.info)
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
@@ -317,13 +324,13 @@
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
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-2.15.13/src/NCPkgTable.cc new/yast2-ncurses-2.15.14/src/NCPkgTable.cc
--- old/yast2-ncurses-2.15.13/src/NCPkgTable.cc 2007-02-27 10:37:03.000000000 +0100
+++ new/yast2-ncurses-2.15.14/src/NCPkgTable.cc 2007-04-19 14:15:27.000000000 +0200
@@ -547,6 +547,13 @@
header.push_back( "L" + PkgNames::SelectionLabel() );
break;
}
+ case T_Languages: {
+ header.reserve(4);
+ header.push_back( "L" + PkgNames::PkgStatus() );
+ header.push_back( "L" + PkgNames::LangCode() );
+ header.push_back( "L" + PkgNames::LangName() );
+ break;
+ }
case T_Availables: {
header.reserve(6);
header.push_back( "L" + PkgNames::PkgStatus() );
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-2.15.13/src/NCPkgTable.h new/yast2-ncurses-2.15.14/src/NCPkgTable.h
--- old/yast2-ncurses-2.15.13/src/NCPkgTable.h 2007-01-04 12:52:37.000000000 +0100
+++ new/yast2-ncurses-2.15.14/src/NCPkgTable.h 2007-04-19 14:15:27.000000000 +0200
@@ -93,6 +93,7 @@
T_Update,
T_PatchPkgs,
T_Selections,
+ T_Languages,
T_Unknown
};
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-2.15.13/src/NCPopupDeps.cc new/yast2-ncurses-2.15.14/src/NCPopupDeps.cc
--- old/yast2-ncurses-2.15.13/src/NCPopupDeps.cc 2007-01-17 16:10:28.000000000 +0100
+++ new/yast2-ncurses-2.15.14/src/NCPopupDeps.cc 2007-04-03 13:19:00.000000000 +0200
@@ -189,7 +189,7 @@
// showDependencies
//
//
-bool NCPopupDeps::showDependencies( NCPkgSolverAction action )
+bool NCPopupDeps::showDependencies( NCPkgSolverAction action, bool * ok )
{
if ( !problemw )
return true;
@@ -203,7 +203,8 @@
// evaluate the result and fill the list with packages
// which have unresolved deps
bool success = solve (problemw, action );
-
+ *ok = success;
+
if (!success)
{
// show first dependency
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-2.15.13/src/NCPopupDeps.h new/yast2-ncurses-2.15.14/src/NCPopupDeps.h
--- old/yast2-ncurses-2.15.13/src/NCPopupDeps.h 2007-01-04 12:50:12.000000000 +0100
+++ new/yast2-ncurses-2.15.14/src/NCPopupDeps.h 2007-04-03 13:19:07.000000000 +0200
@@ -99,7 +99,7 @@
NCursesEvent showDependencyPopup( NCPkgSolverAction action );
- bool showDependencies( NCPkgSolverAction action );
+ bool showDependencies( NCPkgSolverAction action, bool * ok );
bool solve( NCSelectionBox * problemw, NCPkgSolverAction action );
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-2.15.13/src/NCPopupSelection.cc new/yast2-ncurses-2.15.14/src/NCPopupSelection.cc
--- old/yast2-ncurses-2.15.13/src/NCPopupSelection.cc 2006-10-31 16:07:07.000000000 +0100
+++ new/yast2-ncurses-2.15.14/src/NCPopupSelection.cc 2007-04-19 14:15:27.000000000 +0200
@@ -48,8 +48,23 @@
, sel( 0 )
, okButton( 0 )
, packager( pkg )
+ , type( type )
{
- createLayout( YCPString(PkgNames::SelectionLabel()) );
+ switch ( type )
+ {
+ case S_Pattern:
+ case S_Selection: {
+ createLayout( YCPString(PkgNames::SelectionLabel()) );
+ break;
+ }
+ case S_Language: {
+ createLayout( YCPString(PkgNames::LanguageLabel()) );
+ break;
+ }
+ default:
+ break;
+ }
+
fillSelectionList( sel, type );
}
@@ -88,8 +103,8 @@
//the headline
opt.isHeading.setValue( true );
-
- NCLabel * head = new NCLabel( split, opt, PkgNames::SelectionLabel() );
+
+ NCLabel * head = new NCLabel( split, opt, label );
split->addChild( head );
// add the selection list
@@ -97,7 +112,23 @@
sel->setPackager( packager );
// set status strategy
ObjectStatStrategy * strat = new SelectionStatStrategy();
- sel->setTableType( NCPkgTable::T_Selections, strat );
+
+ switch (type) {
+ case S_Pattern:
+ case S_Selection: {
+ sel->setTableType( NCPkgTable::T_Selections, strat );
+ break;
+ }
+ case S_Language: {
+ sel->setTableType( NCPkgTable::T_Languages, strat );
+ break;
+ }
+ default: {
+ NCERR << "Unknown selection type" << endl;
+ break;
+ }
+ }
+
sel->fillHeader();
split->addChild( sel );
@@ -156,6 +187,7 @@
std::setstd::string packages;
ZyppSelection selPtr = tryCastToZyppSelection (objPtr);
ZyppPattern patPtr = tryCastToZyppPattern (objPtr);
+ ZyppLang langPtr = tryCastToZyppLang (objPtr);
if (selPtr)
packages = selPtr->install_packages ();
else if (patPtr)
@@ -163,6 +195,40 @@
zypp::ui::PatternContents patternContents( patPtr );
packages = patternContents.install_packages();
}
+ else if (langPtr)
+ {
+ string currentLang = langPtr->name();
+
+ for ( ZyppPoolIterator it = zyppPkgBegin(); it != zyppPkgEnd(); ++it )
+ {
+ ZyppObj zyppObj = (*it)->theObj();
+
+ if ( zyppObj )
+ {
+ //find all 'freshens' dependencies of this object
+ zypp::CapSet freshens = zyppObj->dep( zypp::Dep::FRESHENS );
+
+ for ( zypp::CapSet::const_iterator cap_it = freshens.begin();
+ cap_it != freshens.end();
+ ++cap_it )
+ {
+ if ( (*cap_it).index() == currentLang ) // obj freshens this language
+ {
+ ZyppPkg pkg = tryCastToZyppPkg( zyppObj );
+
+ if ( pkg )
+ {
+ NCDBG << "Found pkg " << pkg->name().c_str() << "for lang "
+ << currentLang.c_str() << endl;
+
+ packages.insert( pkg->name() );
+ }
+ }
+ }
+ }
+ }
+
+ }
packager->showSelPackages( getCurrentLine(), packages );
// showDiskSpace() moved to NCPkgTable.cc (show/check diskspace
@@ -290,6 +356,20 @@
///////////////////////////////////////////////////////////////////
//
+// OrderFuncLang
+//
+bool orderLang( ZyppSel slb1, ZyppSel slb2 )
+{
+ ZyppLang ptr1 = tryCastToZyppLang (slb1->theObj());
+ ZyppLang ptr2 = tryCastToZyppLang (slb2->theObj());
+ if ( !ptr1 || !ptr2 )
+ return false;
+ else
+ return ptr1->name() < ptr2->name();
+}
+
+///////////////////////////////////////////////////////////////////
+//
//
// METHOD NAME : NCPopupSelection::fillSelectionList
// METHOD TYPE : bool
@@ -348,6 +428,22 @@
slbList.sort( orderPattern );
break;
}
+ case S_Language:
+ {
+ for (i = zyppLangBegin (); i != zyppLangEnd (); ++i )
+ {
+ ZyppObj resPtr = (*i)->theObj();
+
+ ZyppLang langPtr = tryCastToZyppLang (resPtr);
+
+ NCMIL << resPtr->kind () <<": " << resPtr->name()
+ << ", initial status: " << (*i)->status() << endl;
+ slbList.push_back (*i);
+
+ }
+ slbList.sort( orderLang );
+ break;
+ }
default:
NCERR << "Selecion type not handled: " << type << endl;
}
@@ -358,7 +454,21 @@
{
ZyppObj resPtr = (*listIt)->theObj();
pkgLine.clear();
- pkgLine.push_back( resPtr->summary(LOCALE) ); // the description
+
+ switch (type) {
+ case S_Pattern:
+ case S_Selection: {
+ pkgLine.push_back( resPtr->summary(LOCALE) ); // the description
+ break;
+ }
+ case S_Language: {
+ pkgLine.push_back( resPtr->name() );
+ pkgLine.push_back( resPtr->summary(LOCALE) );
+ break;
+ }
+ default:
+ break;
+ }
sel->addLine( (*listIt)->status(), // the status
pkgLine,
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-2.15.13/src/NCPopupSelection.h new/yast2-ncurses-2.15.14/src/NCPopupSelection.h
--- old/yast2-ncurses-2.15.13/src/NCPopupSelection.h 2006-08-18 13:12:32.000000000 +0200
+++ new/yast2-ncurses-2.15.14/src/NCPopupSelection.h 2007-04-19 14:15:27.000000000 +0200
@@ -59,6 +59,7 @@
enum SelType {
S_Selection,
S_Pattern,
+ S_Language,
S_Unknown
};
@@ -82,7 +83,9 @@
*/
NCursesEvent & showSelectionPopup( );
+private:
+ SelType type;
};
///////////////////////////////////////////////////////////////////
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-2.15.13/src/NCRadioButtonGroup.cc new/yast2-ncurses-2.15.14/src/NCRadioButtonGroup.cc
--- old/yast2-ncurses-2.15.13/src/NCRadioButtonGroup.cc 2006-08-18 13:12:33.000000000 +0200
+++ new/yast2-ncurses-2.15.14/src/NCRadioButtonGroup.cc 2007-04-19 13:12:14.000000000 +0200
@@ -106,7 +106,8 @@
focusId = 0;
NCRadioButton * button = dynamic_cast(buttonlist[focusId]);
- button->setKeyboardFocus();
+ if ( button )
+ button->setKeyboardFocus();
}
///////////////////////////////////////////////////////////////////
@@ -125,5 +126,18 @@
focusId = buttonlist.size() -1;
NCRadioButton * button = dynamic_cast(buttonlist[focusId]);
- button->setKeyboardFocus();
+ if ( button )
+ button->setKeyboardFocus();
+}
+
+void NCRadioButtonGroup::setEnabling( bool do_bv )
+{
+ NCRadioButton * button;
+
+ for ( unsigned int i = 0; i < buttonlist.size(); i++ )
+ {
+ button = dynamic_cast(buttonlist[i]);
+ if ( button )
+ button->setEnabling( enabled=do_bv );
+ }
}
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-2.15.13/src/NCRadioButtonGroup.h new/yast2-ncurses-2.15.14/src/NCRadioButtonGroup.h
--- old/yast2-ncurses-2.15.13/src/NCRadioButtonGroup.h 2006-08-18 13:12:35.000000000 +0200
+++ new/yast2-ncurses-2.15.14/src/NCRadioButtonGroup.h 2007-04-19 13:02:40.000000000 +0200
@@ -58,7 +58,7 @@
virtual void addRadioButton(YRadioButton *button);
virtual void removeRadioButton(YRadioButton *button);
- virtual void setEnabling( bool do_bv ) { NCWidget::setEnabling( enabled=do_bv ); }
+ virtual void setEnabling( bool do_bv );
void focusNextButton( );
void focusPrevButton( );
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-2.15.13/src/PackageSelector.cc new/yast2-ncurses-2.15.14/src/PackageSelector.cc
--- old/yast2-ncurses-2.15.13/src/PackageSelector.cc 2007-02-27 10:37:03.000000000 +0100
+++ new/yast2-ncurses-2.15.14/src/PackageSelector.cc 2007-04-19 14:57:34.000000000 +0200
@@ -106,6 +106,7 @@
, depsPopup( 0 )
, selectionPopup( 0 )
, patternPopup( 0 )
+ , languagePopup( 0 )
, diskspacePopup( 0 )
, searchPopup( 0 )
, filePopup( 0 )
@@ -125,6 +126,7 @@
eventHandlerMap[ PkgNames::RpmGroups()->toString() ] = &PackageSelector::FilterHandler;
eventHandlerMap[ PkgNames::Selections()->toString() ] = &PackageSelector::FilterHandler;
eventHandlerMap[ PkgNames::Patterns()->toString() ] = &PackageSelector::FilterHandler;
+ eventHandlerMap[ PkgNames::Languages()->toString() ] = &PackageSelector::FilterHandler;
eventHandlerMap[ PkgNames::UpdateList()->toString() ] = &PackageSelector::FilterHandler;
eventHandlerMap[ PkgNames::Installed()->toString() ] = &PackageSelector::FilterHandler;
eventHandlerMap[ PkgNames::Whatif()->toString() ] = &PackageSelector::FilterHandler;
@@ -219,6 +221,10 @@
_rpmGroupsTree->addRpmGroup (zyppPkg->group ());
}
}
+
+ // create language popup
+ languagePopup = new NCPopupSelection( wpos( 1,1 ), this, NCPopupSelection::S_Language );
+
// create the filter popup
filterPopup = new NCPopupTree( wpos( 1, 1 ), this );
@@ -255,6 +261,10 @@
{
delete patternPopup;
}
+ if ( languagePopup )
+ {
+ delete languagePopup;
+ }
if ( depsPopup )
{
delete depsPopup;
@@ -1553,10 +1563,24 @@
return false;
}
+ NCPopupInfo info( wpos(10, 10), YCPString( "" ),
+ YCPString(_( "All package dependencies are OK." )),
+ PkgNames::OKLabel() );
+ info.setNiceSize( 30, 5 );
+
if ( event.selection->compare( PkgNames::ShowDeps() ) == YO_EQUAL )
{
- // show the dependency popup
- showPackageDependencies( true ); // do the check
+ bool ok = false;
+
+ if ( depsPopup )
+ {
+ NCMIL << "Checking dependencies" << endl;
+ depsPopup->showDependencies( NCPopupDeps::S_Solve, &ok );
+ }
+
+ if ( ok )
+ info.showInfoPopup();
+
// update the package list and the disk space info
updatePackageList();
showDiskSpace();
@@ -1702,7 +1726,15 @@
// show the selection popup
retEvent = patternPopup->showSelectionPopup( );
}
- }
+ }
+ else if ( event.selection->compare( PkgNames::Languages() ) == YO_EQUAL )
+ {
+ if ( languagePopup )
+ {
+ // show the selection popup
+ retEvent = languagePopup->showSelectionPopup( );
+ }
+ }
// patches
else if ( event.selection->compare( PkgNames::Recommended() ) == YO_EQUAL )
{
@@ -2533,13 +2565,14 @@
//
bool PackageSelector::showPackageDependencies ( bool doit )
{
+ bool ok = false;
bool cancel = false;
if ( depsPopup
&& (doit || autoCheck) )
{
NCMIL << "Checking dependencies" << endl;
- cancel = depsPopup->showDependencies( NCPopupDeps::S_Solve );
+ cancel = depsPopup->showDependencies( NCPopupDeps::S_Solve, &ok );
}
return cancel;
@@ -2547,13 +2580,21 @@
bool PackageSelector::verifyPackageDependencies ()
{
+ bool ok = false;
bool cancel = false;
+
+ NCPopupInfo info( wpos(10, 10), YCPString( "" ),
+ YCPString(_( "System dependencies verify OK." )),
+ PkgNames::OKLabel() );
+ info.setNiceSize( 30, 5 );
+
NCMIL << "Verifying system" << endl;
+
if ( depsPopup )
{
saveState();
//call the solver (with S_Verify it displays no popup)
- cancel = depsPopup->showDependencies( NCPopupDeps::S_Verify );
+ cancel = depsPopup->showDependencies( NCPopupDeps::S_Verify, &ok );
//display the popup with automatic changes
NCPopupPkgTable autoChangePopup( wpos( 1, 1), this );
NCursesEvent input = autoChangePopup.showInfoPopup();
@@ -2564,6 +2605,11 @@
restoreState();
cancel = true;
}
+ if ( ok && input == NCursesEvent::button )
+ {
+ // dependencies OK, no automatic changes/the user has accepted the changes
+ info.showInfoPopup();
+ }
}
return cancel;
}
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-2.15.13/src/PackageSelector.h new/yast2-ncurses-2.15.14/src/PackageSelector.h
--- old/yast2-ncurses-2.15.13/src/PackageSelector.h 2007-02-21 13:26:30.000000000 +0100
+++ new/yast2-ncurses-2.15.14/src/PackageSelector.h 2007-04-19 14:15:27.000000000 +0200
@@ -80,6 +80,8 @@
NCPopupSelection * selectionPopup; // the selections popup
NCPopupSelection * patternPopup; // the pattern popup
+ NCPopupSelection * languagePopup; // language popup
+
NCPopupDiskspace * diskspacePopup; // the popup showing the disk usage
NCPopupSearch * searchPopup; // the package search popup
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-2.15.13/src/pkg_layout.ycp new/yast2-ncurses-2.15.14/src/pkg_layout.ycp
--- old/yast2-ncurses-2.15.13/src/pkg_layout.ycp 2007-01-10 17:50:55.000000000 +0100
+++ new/yast2-ncurses-2.15.14/src/pkg_layout.ycp 2007-04-19 14:15:27.000000000 +0200
@@ -7,7 +7,7 @@
*
* ncurses layout for package selection
*
- * $Id: pkg_layout.ycp 35211 2007-01-10 16:50:49Z kmachalkova $
+ * $Id: pkg_layout.ycp 37572 2007-04-19 12:04:13Z kmachalkova $
*/
{
textdomain "packages";
@@ -20,6 +20,7 @@
// please note: use unique hotkeys until end:
[`item( `id("groups"), _( "&RPM Groups" ) ),
`item( `id("patterns"), _( "Pa&tterns" ) ),
+ `item( `id("languages"), _( "&Languages" ) ),
`item( `id("search"), _( "&Search" ) ),
`item( `id("installed"), _( "Installed &Packages" ) ),
`item( `id("whatif"), _( "&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-2.15.13/src/PkgNames.cc new/yast2-ncurses-2.15.14/src/PkgNames.cc
--- old/yast2-ncurses-2.15.13/src/PkgNames.cc 2007-03-02 11:11:45.000000000 +0100
+++ new/yast2-ncurses-2.15.14/src/PkgNames.cc 2007-04-19 14:15:27.000000000 +0200
@@ -283,6 +283,12 @@
return value;
}
+// menu selection Languages
+const YCPValue& PkgNames::Languages ()
+{
+ static const YCPValue value = createIdValue ( "languages" );
+ return value;
+}
// menu selection Installation Summary
const YCPValue& PkgNames::Whatif ()
{
@@ -609,6 +615,13 @@
return value;
}
+const string PkgNames::LanguageLabel()
+{
+ // the label of language table
+ static const string value = _( "Available Languages" );
+ return value;
+}
+
const string PkgNames::YOUPatches()
{
// A label for a list of YOU Patches - keep it short - max 25 chars!
@@ -1207,15 +1220,22 @@
const string PkgNames::MenuEntryRPMGroups()
{
- // menu entry Selections
+ // menu entry RpmGroups
static const string value = _( "&RPM Groups" );
return value;
}
+const string PkgNames::MenuEntryLanguages()
+{
+ // menu entry Languages
+ static const string value = _( "&Languages" );
+ return value;
+}
+
const string PkgNames::MenuEntrySelections()
{
// menu entry Selections
- static const string value = _( "Se&lections" );
+ static const string value = _( "S&elections" );
return value;
}
@@ -1586,6 +1606,18 @@
return value;
}
+const string PkgNames::LangCode()
+{
+ static const string value = _("Code");
+ return value;
+}
+
+const string PkgNames::LangName()
+{
+ static const string value = _("Language");
+ return value;
+}
+
const string PkgNames::Partition()
{
// column header name of the partition (keep it short!)
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-2.15.13/src/PkgNames.h new/yast2-ncurses-2.15.14/src/PkgNames.h
--- old/yast2-ncurses-2.15.13/src/PkgNames.h 2007-01-10 17:35:52.000000000 +0100
+++ new/yast2-ncurses-2.15.14/src/PkgNames.h 2007-04-19 14:15:27.000000000 +0200
@@ -199,6 +199,7 @@
*/
static const YCPValue& Selections ();
static const YCPValue& Patterns ();
+ static const YCPValue& Languages ();
/**
* Widget id of the menu item update list
@@ -412,6 +413,11 @@
static const string SelectionLabel();
/**
+ * The label of the language selections popup
+ */
+ static const string LanguageLabel();
+
+ /**
* The label Filter: YOU Patches
*/
static const string YOUPatches();
@@ -830,6 +836,9 @@
*/
static const string PkgStatus();
+ static const string LangCode();
+ static const string LangName();
+
static const string Partition();
static const string UsedSpace();
static const string FreeSpace();
@@ -870,6 +879,7 @@
static const string MenuFilter();
static const string MenuEntryRPMGroups();
+ static const string MenuEntryLanguages();
static const string MenuEntrySelections();
static const string MenuEntryPatterns();
static const string MenuEntrySearch();
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-2.15.13/VERSION new/yast2-ncurses-2.15.14/VERSION
--- old/yast2-ncurses-2.15.13/VERSION 2007-03-21 17:19:55.000000000 +0100
+++ new/yast2-ncurses-2.15.14/VERSION 2007-04-19 14:40:23.000000000 +0200
@@ -1 +1 @@
-2.15.13
+2.15.14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org