Hello community, here is the log from the commit of package libyui-ncurses for openSUSE:Factory checked in at 2014-07-29 16:48:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libyui-ncurses (Old) and /work/SRC/openSUSE:Factory/.libyui-ncurses.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libyui-ncurses" Changes: -------- --- /work/SRC/openSUSE:Factory/libyui-ncurses/libyui-ncurses.changes 2014-07-13 14:06:24.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libyui-ncurses.new/libyui-ncurses.changes 2014-07-29 16:48:04.000000000 +0200 @@ -1,0 +2,9 @@ +Thu Jul 10 12:09:39 CEST 2014 - [email protected] + +- Improve table sorting: interpret numbers correctly (related to + previous fix for bnc #885653), + Multiselection table: don't set focus to last line (partial + bug-fix for bnc #885278) +- 2.46.6 + +------------------------------------------------------------------- Old: ---- libyui-ncurses-2.46.5.tar.bz2 New: ---- libyui-ncurses-2.46.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libyui-ncurses-doc.spec ++++++ --- /var/tmp/diff_new_pack.nX9WYs/_old 2014-07-29 16:48:05.000000000 +0200 +++ /var/tmp/diff_new_pack.nX9WYs/_new 2014-07-29 16:48:05.000000000 +0200 @@ -17,7 +17,7 @@ Name: libyui-ncurses-doc -Version: 2.46.5 +Version: 2.46.6 Release: 0 Source: libyui-ncurses-%{version}.tar.bz2 ++++++ libyui-ncurses.spec ++++++ --- /var/tmp/diff_new_pack.nX9WYs/_old 2014-07-29 16:48:05.000000000 +0200 +++ /var/tmp/diff_new_pack.nX9WYs/_new 2014-07-29 16:48:05.000000000 +0200 @@ -17,7 +17,7 @@ Name: libyui-ncurses -Version: 2.46.5 +Version: 2.46.6 Release: 0 Source: libyui-ncurses-%{version}.tar.bz2 ++++++ libyui-ncurses-2.46.5.tar.bz2 -> libyui-ncurses-2.46.6.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-ncurses-2.46.5/ChangeLog new/libyui-ncurses-2.46.6/ChangeLog --- old/libyui-ncurses-2.46.5/ChangeLog 2014-07-09 14:26:30.000000000 +0200 +++ new/libyui-ncurses-2.46.6/ChangeLog 2014-07-28 14:21:43.000000000 +0200 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Thu Jul 10 12:09:39 CEST 2014 - [email protected] + +- Improve table sorting: interpret numbers correctly (related to + previous fix for bnc #885653), + Multiselection table: don't set focus to last line (partial + bug-fix for bnc #885278) +- 2.46.6 + +------------------------------------------------------------------- Wed Jul 9 12:10:11 CEST 2014 - [email protected] - Table sorting: always sort as strings, don't try interpreting diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-ncurses-2.46.5/VERSION.cmake new/libyui-ncurses-2.46.6/VERSION.cmake --- old/libyui-ncurses-2.46.5/VERSION.cmake 2014-07-09 14:26:30.000000000 +0200 +++ new/libyui-ncurses-2.46.6/VERSION.cmake 2014-07-28 10:26:45.000000000 +0200 @@ -1,6 +1,6 @@ SET( VERSION_MAJOR "2" ) SET( VERSION_MINOR "46" ) -SET( VERSION_PATCH "5" ) +SET( VERSION_PATCH "6" ) SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${GIT_SHA1_VERSION}" ) ##### This is need for the libyui core, ONLY. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-ncurses-2.46.5/src/NCTable.cc new/libyui-ncurses-2.46.6/src/NCTable.cc --- old/libyui-ncurses-2.46.5/src/NCTable.cc 2014-02-21 11:37:26.000000000 +0100 +++ new/libyui-ncurses-2.46.6/src/NCTable.cc 2014-07-28 10:26:45.000000000 +0200 @@ -372,10 +372,9 @@ } else { - setCurrentItem( line->getIndex() ); YTable::selectItem( item, selected ); - yuiMilestone() << item->label() << " is selected: " << (selected?"yes":"no") << endl; + yuiDebug() << item->label() << " is selected: " << (selected?"yes":"no") << endl; NCTableTag *tag = static_cast<NCTableTag *>( line->GetCol( 0 ) ); tag->SetSelected( selected ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-ncurses-2.46.5/src/NCTablePad.h new/libyui-ncurses-2.46.6/src/NCTablePad.h --- old/libyui-ncurses-2.46.5/src/NCTablePad.h 2014-07-09 14:26:30.000000000 +0200 +++ new/libyui-ncurses-2.46.6/src/NCTablePad.h 2014-07-28 10:26:45.000000000 +0200 @@ -82,11 +82,24 @@ { std::wstring w1 = first->GetCol( _uiCol )->Label().getText().begin()->str(); std::wstring w2 = second->GetCol( _uiCol )->Label().getText().begin()->str(); + wchar_t *endptr1 = 0; + wchar_t *endptr2 = 0; - // compare strings using collating information - int result = std::wcscoll ( w1.data(), w2.data() ); + long int number1 = std::wcstol( w1.c_str(), &endptr1, 10 ); + long int number2 = std::wcstol( w2.c_str(), &endptr2, 10 ); - return ( result < 0 ); + if ( *endptr1 == L'\0' && *endptr2 == L'\0' ) + { + // both are numbers + return number1 < number2; + } + else + { + // compare strings using collating information + int result = std::wcscoll ( w1.c_str(), w2.c_str() ); + + return result < 0; + } } private: -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
