Hello community, here is the log from the commit of package libyui-ncurses for openSUSE:Factory checked in at 2012-10-05 13:45:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libyui-ncurses (Old) and /work/SRC/openSUSE:Factory/.libyui-ncurses.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libyui-ncurses", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/libyui-ncurses/libyui-ncurses.changes 2012-09-11 09:12:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libyui-ncurses.new/libyui-ncurses.changes 2012-10-06 18:39:01.000000000 +0200 @@ -1,0 +2,8 @@ +Thu Oct 4 11:20:57 CEST 2012 - [email protected] + +- NCTablePad: bug-fix for sorting of tables +- NCDialog: code cleanup, setStatusLine() added + +- V 2.43.0 + +------------------------------------------------------------------- Old: ---- libyui-ncurses-2.42.2.tar.bz2 New: ---- libyui-ncurses-2.43.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libyui-ncurses-doc.spec ++++++ --- /var/tmp/diff_new_pack.AkCHDZ/_old 2012-10-06 18:39:05.000000000 +0200 +++ /var/tmp/diff_new_pack.AkCHDZ/_new 2012-10-06 18:39:05.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package libyui-ncurses (Version 2.42.2) +# spec file for package libyui-ncurses (Version 2.43.0) # # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -16,7 +16,7 @@ # Name: libyui-ncurses-doc -Version: 2.42.2 +Version: 2.43.0 Release: 0 License: LGPL-2.1 or LGPL-3.0 Source: libyui-ncurses-%{version}.tar.bz2 ++++++ libyui-ncurses.spec ++++++ --- /var/tmp/diff_new_pack.AkCHDZ/_old 2012-10-06 18:39:05.000000000 +0200 +++ /var/tmp/diff_new_pack.AkCHDZ/_new 2012-10-06 18:39:05.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package libyui-ncurses (Version 2.42.2) +# spec file for package libyui-ncurses (Version 2.43.0) # # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -17,7 +17,7 @@ # norootforbuild Name: libyui-ncurses -Version: 2.42.2 +Version: 2.43.0 Release: 0 License: LGPL-2.1 or LGPL-3.0 Source: libyui-ncurses-%{version}.tar.bz2 ++++++ libyui-ncurses-2.42.2.tar.bz2 -> libyui-ncurses-2.43.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-ncurses-2.42.2/ChangeLog new/libyui-ncurses-2.43.0/ChangeLog --- old/libyui-ncurses-2.42.2/ChangeLog 2012-09-07 14:14:20.000000000 +0200 +++ new/libyui-ncurses-2.43.0/ChangeLog 2012-10-04 12:00:06.000000000 +0200 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Thu Oct 4 11:20:57 CEST 2012 - [email protected] + +- NCTablePad: bug-fix for sorting of tables +- NCDialog: code cleanup, setStatusLine() added + +- V 2.43.0 + +------------------------------------------------------------------- Fri Sep 7 13:50:36 CEST 2012 - [email protected] - V 2.42.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-ncurses-2.42.2/VERSION.cmake new/libyui-ncurses-2.43.0/VERSION.cmake --- old/libyui-ncurses-2.42.2/VERSION.cmake 2012-09-07 14:14:20.000000000 +0200 +++ new/libyui-ncurses-2.43.0/VERSION.cmake 2012-10-04 12:00:06.000000000 +0200 @@ -1,6 +1,6 @@ SET( VERSION_MAJOR "2" ) -SET( VERSION_MINOR "42" ) -SET( VERSION_PATCH "2" ) +SET( VERSION_MINOR "43" ) +SET( VERSION_PATCH "0" ) SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" ) ##### This is need for the libyui core, ONLY. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-ncurses-2.42.2/src/NCDialog.cc new/libyui-ncurses-2.43.0/src/NCDialog.cc --- old/libyui-ncurses-2.42.2/src/NCDialog.cc 2012-09-07 14:14:20.000000000 +0200 +++ new/libyui-ncurses-2.43.0/src/NCDialog.cc 2012-10-04 12:00:06.000000000 +0200 @@ -106,7 +106,6 @@ dlgstyle = &NCurses::style()[mystyleset]; eventReason = YEvent::UnknownReason; - helpPopup = 0; yuiDebug() << "+++ " << this << std::endl; } @@ -165,10 +164,6 @@ pan = 0; yuiDebug() << "---destroyed " << this << std::endl; - if ( helpPopup ) - { - YDialog::deleteTopmostDialog(); - } } @@ -528,6 +523,11 @@ } } +void NCDialog::setStatusLine() +{ + NCurses::SetStatusLine( describeFunctionKeys() ); + doUpdate(); +} void NCDialog::wUpdate( bool forced_br ) { @@ -1164,18 +1164,7 @@ switch ( hch ) { case WEOF: // no 2nd char, handle ch - - if ( helpPopup ) - { - helpPopup->popdown(); - YDialog::deleteTopmostDialog(); - helpPopup = 0; - } - else - { - pendingEvent = getInputEvent( ch ); - } - + pendingEvent = getInputEvent( ch ); break; case KEY_ESC: @@ -1191,72 +1180,15 @@ break; -#if 0 - case KEY_F( 1 ): - - if ( !helpPopup ) - { - std::string helpText = ""; - std::string helpIntro = ""; - bool hasF1 = describeFunctionKeys( helpText ); - - if ( hasF1 ) - { - // part of help for textmode navigation (shown if there is further help available) - helpIntro = _( "<p>Press <b>F1</b> again to get further help or <b>ESC</b> to close this dialog.</p>" ); - } - else - { - // part of help for text mode navigation - helpIntro = _( "<p>Press <b>F1</b> or <b>ESC</b> to close this dialog.</p>" ); - } - - helpPopup = new NCPopupInfo( wpos( NCurses::lines() / 3, NCurses::cols() / 3 ), - - // headline of the text mode help - _( "Text Mode Navigation" ), - helpIntro + _( "<p>Function key bindings:</p>" ) - + helpText, - "" ); - } - - if ( helpPopup ) - { - helpPopup->setPreferredSize( NCurses::cols() / 3, NCurses::lines() / 3 ); - - if ( !helpPopup->isVisible() ) - { - helpPopup->popup(); - } - else - { - helpPopup->popdown(); - // don't call 'delete' for helpPopup use deleteTopmostDialog() instead - YDialog::deleteTopmostDialog(); - helpPopup = 0; - pendingEvent = getHotkeyEvent( ch ); - } - } - - break; - -#endif - default: - // only handle keys if the help popup is not existing or not visible - - if ( !helpPopup - || ( helpPopup && !helpPopup->isVisible() ) ) + if ( ch >= KEY_F( 1 ) && ch <= KEY_F( 24 ) ) + { + pendingEvent = getHotkeyEvent( ch ); + } + else { - if ( ch >= KEY_F( 1 ) && ch <= KEY_F( 24 ) ) - { - pendingEvent = getHotkeyEvent( ch ); - } - else - { - pendingEvent = getInputEvent( ch ); - } - } + pendingEvent = getInputEvent( ch ); + } break; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-ncurses-2.42.2/src/NCDialog.h new/libyui-ncurses-2.43.0/src/NCDialog.h --- old/libyui-ncurses-2.42.2/src/NCDialog.h 2012-09-07 14:14:20.000000000 +0200 +++ new/libyui-ncurses-2.43.0/src/NCDialog.h 2012-10-04 12:00:06.000000000 +0200 @@ -72,8 +72,6 @@ NCursesEvent pendingEvent; YEvent::EventReason eventReason; - NCPopupInfo *helpPopup; - // wrapper for wHandle... calls in processInput() NCursesEvent getInputEvent( wint_t ch ); NCursesEvent getHotkeyEvent( wint_t key ); @@ -170,6 +168,8 @@ virtual void setSize( int newWidth, int newHeight ); + void setStatusLine(); + /** * Activate this dialog: Make sure that it is shown as the topmost dialog * of this application and that it can receive input. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-ncurses-2.42.2/src/NCTablePad.h new/libyui-ncurses-2.43.0/src/NCTablePad.h --- old/libyui-ncurses-2.42.2/src/NCTablePad.h 2012-09-07 14:14:20.000000000 +0200 +++ new/libyui-ncurses-2.43.0/src/NCTablePad.h 2012-10-04 12:00:06.000000000 +0200 @@ -97,7 +97,7 @@ { int result = std::wcscoll ( w1.data(), w2.data() ); - if ( result <= 0 ) + if ( result < 0 ) return true; else return false; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
