Author: gs
Date: Thu Nov 15 09:57:41 2007
New Revision: 42068
URL: http://svn.opensuse.org/viewcvs/yast?rev=42068&view=rev
Log:
fill header, obsolete code removed
Modified:
branches/tmp/sh/mod-ui/ncurses/src/NCAskForDirectory.cc
branches/tmp/sh/mod-ui/ncurses/src/NCAskForFile.cc
branches/tmp/sh/mod-ui/ncurses/src/NCFileSelection.cc
Modified: branches/tmp/sh/mod-ui/ncurses/src/NCAskForDirectory.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCAskForDirectory.cc?rev=42068&r1=42067&r2=42068&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/ncurses/src/NCAskForDirectory.cc (original)
+++ branches/tmp/sh/mod-ui/ncurses/src/NCAskForDirectory.cc Thu Nov 15 09:57:41 2007
@@ -233,7 +233,6 @@
postevent.detail = NCursesEvent::NODETAIL;
- //YCPValue currentId = dynamic_cast(postevent.widget)->id();
YWidgetID * currentId = dynamic_cast(postevent.widget)->id();
if ( currentId )
@@ -251,14 +250,9 @@
if ( postevent.result == "" )
return true;
- // FIXME ??? - what about 'i'
-#if 0
- dirName->itemAdded( postevent.result->asString(),
- i,
- true );
-#endif
// show the currently selected directory
- NCMIL << "Add item: " << postevent.result << endl;
+ NCDBG << "Add item: " << postevent.result << endl;
+
dirName->addItem( postevent.result,
true );
Modified: branches/tmp/sh/mod-ui/ncurses/src/NCAskForFile.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCAskForFile.cc?rev=42068&r1=42067&r2=42068&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/ncurses/src/NCAskForFile.cc (original)
+++ branches/tmp/sh/mod-ui/ncurses/src/NCAskForFile.cc Thu Nov 15 09:57:41 2007
@@ -197,9 +197,9 @@
NCLayoutBox * hSplit2 = new NCLayoutBox( split, YD_HORIZ );
// opt.isEditable.setValue( edit );
- // the NCInputField doesn't support mode editable/not editable any longer
- // FIXME or let it like it is ????
-
+ // NCInputField doesn't support mode 'not editable' any longer
+ // -> an InputField IS editable
+
// add the text entry for the file name
fileName = new NCInputField( hSplit2,
// label for text field showing the filename
@@ -210,7 +210,7 @@
fileName->setValue( iniFileName );
// label for text field showing the filter (e.g. *.bak)
- NCComboBox * extension = new NCComboBox( hSplit2, _( "Filter:" ), edit ); // editable as set in edit
+ NCComboBox * extension = new NCComboBox( hSplit2, _( "Filter:" ), true ); // editable = true
extension->setStretchable( YD_HORIZ, true );
extension->addItem( filter,
true ); // selected
@@ -356,13 +356,6 @@
else if ( ( currentId->toString() == idDirList ) &&
( postevent.result != "" ) )
{
- unsigned int i = dirName->getListSize();
-#if 0
- dirName->itemAdded( postevent.result->asString(),
- i,
- true );
-#endif
- //FIXME ??? - what about 'i'
// show the currently selected directory
dirName->addItem( postevent.result,
true );
@@ -402,7 +395,6 @@
{
if ( postevent.result != "" )
{
- // FIXME - check this !!!
fileName->setValue( postevent.result );
}
}
Modified: branches/tmp/sh/mod-ui/ncurses/src/NCFileSelection.cc
URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCFileSelection.cc?rev=42068&r1=42067&r2=42068&view=diff
==============================================================================
--- branches/tmp/sh/mod-ui/ncurses/src/NCFileSelection.cc (original)
+++ branches/tmp/sh/mod-ui/ncurses/src/NCFileSelection.cc Thu Nov 15 09:57:41 2007
@@ -245,7 +245,7 @@
string NCFileSelection::getCurrentLine( )
{
int index = getCurrentItem();
- NCMIL << "Current item: " << index << endl;
+
if ( index != -1 )
{
NCFileInfo info = getFileInfo( index );
@@ -268,7 +268,7 @@
void NCFileSelection::setCurrentDir()
{
string selected = getCurrentLine();
- NCMIL << "Current Line: " << selected << endl;
+ NCMIL << "Current line: " << selected << endl;
if ( selected != ".." )
{
if ( startDir != "/" )
@@ -638,8 +638,7 @@
list<string> tmpList;
list<string>::iterator it;
- // FIXME - set the new header
- //fillHeader(); // create the column headers
+ fillHeader(); // create the column headers
DIR * diskDir = opendir( currentDir.c_str() );
@@ -782,7 +781,7 @@
list<string> tmpList;
list<string>::iterator it;
- //fillHeader(); // create the column headers
+ fillHeader(); // create the column headers
DIR * diskDir = opendir( currentDir.c_str() );
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org