Author: gs
Date: Tue Jul 24 15:05:03 2007
New Revision: 39635
URL: http://svn.opensuse.org/viewcvs/yast?rev=39635&view=rev
Log:
replace getNotify() by notify(), adapt to new YCheckBox
Modified:
branches/tmp/sh/mod-ui/ncurses/src/NCAlignment.cc
branches/tmp/sh/mod-ui/ncurses/src/NCAlignment.h
branches/tmp/sh/mod-ui/ncurses/src/NCCheckBox.cc
branches/tmp/sh/mod-ui/ncurses/src/NCCheckBox.h
branches/tmp/sh/mod-ui/ncurses/src/NCCheckBoxFrame.cc
branches/tmp/sh/mod-ui/ncurses/src/NCComboBox.cc
branches/tmp/sh/mod-ui/ncurses/src/NCInputField.cc
branches/tmp/sh/mod-ui/ncurses/src/NCIntField.cc
branches/tmp/sh/mod-ui/ncurses/src/NCMultiLineEdit.cc
branches/tmp/sh/mod-ui/ncurses/src/NCMultiSelectionBox.cc
branches/tmp/sh/mod-ui/ncurses/src/NCPackageSelectorPlugin.cc
branches/tmp/sh/mod-ui/ncurses/src/NCPackageSelectorPlugin.h
branches/tmp/sh/mod-ui/ncurses/src/NCPackageSelectorStart.cc
branches/tmp/sh/mod-ui/ncurses/src/NCRadioButton.cc
branches/tmp/sh/mod-ui/ncurses/src/NCSelectionBox.cc
branches/tmp/sh/mod-ui/ncurses/src/NCTable.cc
branches/tmp/sh/mod-ui/ncurses/src/NCTree.cc
branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPkgPopupSearch.cc
Modified: branches/tmp/sh/mod-ui/ncurses/src/NCAlignment.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCAlignment.cc?rev=39635&r1=39634&r2=39635&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/ncurses/src/NCAlignment.cc (original)
+++ branches/tmp/sh/mod-ui/ncurses/src/NCAlignment.cc Tue Jul 24 15:05:03 2007
@@ -65,7 +65,7 @@
YAlignment::setSize( newwidth, newheight);
}
-void NCAlignmet::setEnabled( bool do_bv )
+void NCAlignment::setEnabled( bool do_bv )
{
NCWidget::setEnabled( do_bv );
YAlignment::setEnabled( do_bv );
Modified: branches/tmp/sh/mod-ui/ncurses/src/NCAlignment.h
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCAlignment.h?rev=39635&r1=39634&r2=39635&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/ncurses/src/NCAlignment.h (original)
+++ branches/tmp/sh/mod-ui/ncurses/src/NCAlignment.h Tue Jul 24 15:05:03 2007
@@ -62,7 +62,7 @@
virtual void setSize( int newWidth, int newHeight );
virtual void moveChild( YWidget * child, int newx, int newy );
- //virtual void setEnabling( bool do_bv ) { NCWidget::setEnabling( enabled=do_bv ); }
+
virtual void setEnabled( bool do_bv );
};
Modified: branches/tmp/sh/mod-ui/ncurses/src/NCCheckBox.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCCheckBox.cc?rev=39635&r1=39634&r2=39635&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/ncurses/src/NCCheckBox.cc (original)
+++ branches/tmp/sh/mod-ui/ncurses/src/NCCheckBox.cc Tue Jul 24 15:05:03 2007
@@ -36,12 +36,11 @@
// DESCRIPTION :
//
NCCheckBox::NCCheckBox( YWidget * parent,
- const string & nlabel,
- bool check )
- : YCheckBox( parent, nlabel, check )
+ const string & nlabel )
+ : YCheckBox( parent, nlabel )
, NCWidget( parent )
, tristate( false )
- , checkstate( check ? S_ON : S_OFF )
+ , checkstate( isChecked() ? S_ON : S_OFF )
{
WIDDBG << endl;
setLabel( nlabel );
@@ -241,7 +240,7 @@
break;
}
Redraw();
- if ( getNotify() )
+ if ( notify() )
ret = NCursesEvent::ValueChanged;
break;
}
Modified: branches/tmp/sh/mod-ui/ncurses/src/NCCheckBox.h
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCCheckBox.h?rev=39635&r1=39634&r2=39635&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/ncurses/src/NCCheckBox.h (original)
+++ branches/tmp/sh/mod-ui/ncurses/src/NCCheckBox.h Tue Jul 24 15:05:03 2007
@@ -64,8 +64,7 @@
public:
NCCheckBox( YWidget * parent,
- const string & label,
- bool checked );
+ const string & label );
virtual ~NCCheckBox();
virtual long nicesize( YUIDimension dim );
Modified: branches/tmp/sh/mod-ui/ncurses/src/NCCheckBoxFrame.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCCheckBoxFrame.cc?rev=39635&r1=39634&r2=39635&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/ncurses/src/NCCheckBoxFrame.cc (original)
+++ branches/tmp/sh/mod-ui/ncurses/src/NCCheckBoxFrame.cc Tue Jul 24 15:05:03 2007
@@ -156,9 +156,9 @@
c = c->Next() ) {
if ( c->Value()->GetState() != NC::WSdumb )
{
- c->Value()->setEnabled( enabled );
+ c->Value()->setEnabled( do_bv );
// explicitely set the state (needed for first run - bug #268352)
- c->Value()->SetState(enabled?NC::WSnormal:NC::WSdisabeled, true);
+ c->Value()->SetState(do_bv?NC::WSnormal:NC::WSdisabeled, true);
}
}
}
@@ -256,7 +256,7 @@
}
Redraw();
- if ( getNotify() )
+ if ( notify() )
ret = NCursesEvent::ValueChanged;
else
setEnabled( getValue() );
Modified: branches/tmp/sh/mod-ui/ncurses/src/NCComboBox.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCComboBox.cc?rev=39635&r1=39634&r2=39635&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/ncurses/src/NCComboBox.cc (original)
+++ branches/tmp/sh/mod-ui/ncurses/src/NCComboBox.cc Tue Jul 24 15:05:03 2007
@@ -225,14 +225,14 @@
void NCComboBox::setCurrentItem( int nindex )
{
int idx = 0;
- list<YCPString>::const_iterator entry;
+ list<string>::iterator entry;
for ( entry = deflist.begin(); entry != deflist.end(); ++entry, ++idx ) {
if ( idx == nindex ) {
- string strip( (*entry)->value() );
+ string strip = *entry;
string::size_type h = strip.find( '&' );
if ( h != string::npos )
strip.erase( h, 1 );
- setValue( YCPString( strip ) );
+ setValue( strip );
index = idx;
break;
}
@@ -264,7 +264,7 @@
//
void NCComboBox::setValue( const string & ntext )
{
- privText = ntext;
+ privText = NCstring( ntext );
buffer = privText.str();
modified = false;
fldstart = 0;
@@ -277,7 +277,7 @@
void NCComboBox::setText( const string & ntext )
{
- privText = ntext;
+ privText = NCstring( ntext );
buffer = privText.str();
modified = false;
fldstart = 0;
@@ -619,7 +619,7 @@
if ( beep )
::beep();
- if ( getNotify() && oval != buffer )
+ if ( notify() && oval != buffer )
ret = NCursesEvent::ValueChanged;
return ret;
Modified: branches/tmp/sh/mod-ui/ncurses/src/NCInputField.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCInputField.cc?rev=39635&r1=39634&r2=39635&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/ncurses/src/NCInputField.cc (original)
+++ branches/tmp/sh/mod-ui/ncurses/src/NCInputField.cc Tue Jul 24 15:05:03 2007
@@ -538,7 +538,7 @@
break;
case KEY_RETURN:
- if ( getNotify() || returnOnReturn_b )
+ if ( notify() || returnOnReturn_b )
ret = NCursesEvent::Activated;
break;
@@ -640,7 +640,7 @@
if ( update ) {
tUpdate();
- if ( getNotify() )
+ if ( notify() )
ret = NCursesEvent::ValueChanged;
}
Modified: branches/tmp/sh/mod-ui/ncurses/src/NCIntField.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCIntField.cc?rev=39635&r1=39634&r2=39635&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/ncurses/src/NCIntField.cc (original)
+++ branches/tmp/sh/mod-ui/ncurses/src/NCIntField.cc Tue Jul 24 15:05:03 2007
@@ -390,7 +390,7 @@
if ( beep )
::beep();
- if ( getNotify() && ovlue != cvalue )
+ if ( notify() && ovlue != cvalue )
ret = NCursesEvent::ValueChanged;
return ret;
Modified: branches/tmp/sh/mod-ui/ncurses/src/NCMultiLineEdit.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCMultiLineEdit.cc?rev=39635&r1=39634&r2=39635&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/ncurses/src/NCMultiLineEdit.cc (original)
+++ branches/tmp/sh/mod-ui/ncurses/src/NCMultiLineEdit.cc Tue Jul 24 15:05:03 2007
@@ -187,7 +187,7 @@
{
NCursesEvent ret;
handleInput( key );
- if ( getNotify() )
+ if ( notify() )
ret = NCursesEvent::ValueChanged;
return ret;
}
Modified: branches/tmp/sh/mod-ui/ncurses/src/NCMultiSelectionBox.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCMultiSelectionBox.cc?rev=39635&r1=39634&r2=39635&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/ncurses/src/NCMultiSelectionBox.cc (original)
+++ branches/tmp/sh/mod-ui/ncurses/src/NCMultiSelectionBox.cc Tue Jul 24 15:05:03 2007
@@ -375,7 +375,7 @@
}
}
- if ( getNotify() )
+ if ( notify() )
{
if ( valueChanged )
ret = NCursesEvent::ValueChanged;
Modified: branches/tmp/sh/mod-ui/ncurses/src/NCPackageSelectorPlugin.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCPackageSelectorPlugin.cc?rev=39635&r1=39634&r2=39635&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/ncurses/src/NCPackageSelectorPlugin.cc (original)
+++ branches/tmp/sh/mod-ui/ncurses/src/NCPackageSelectorPlugin.cc Tue Jul 24 15:05:03 2007
@@ -76,7 +76,7 @@
NCWidget * firstChild = dynamic_cast