Patch from Jim Wilson:

[flightgear.git] / src / GUI / prop_picker.cxx

diff --git a/src/GUI/prop_picker.cxx b/src/GUI/prop_picker.cxx
index 83e90005c29874e998e56f459553119fff9632e0..38002a0a6dd5a71c514351a77e0276514cb8bbc7 100755 (executable)
--- a/src/GUI/prop_picker.cxx
+++ b/src/GUI/prop_picker.cxx
@@ -471,7 +471,7 @@ void fgPropPicker::find_props ()
   for (i = 0; i < (int)node->nChildren(); i++) {
            SGPropertyNode * child = node->getChild(i);
            name = child->getName();
-           if ( node->getChild(name, 1) != 0 ) {
+           if ( node->getChild(name.c_str(), 1) != 0 ) {
                iindex = child->getIndex();
                sprintf(sindex, "[%d]", iindex);
                name += sindex;
@@ -487,11 +487,11 @@ void fgPropPicker::find_props ()
                values[ pi ] = new char[ 2 ] ;
            } else {
                 dflag[ pi ] = 0 ;
-               value = node->getStringValue ( name, "" );
+               value = node->getStringValue ( name.c_str(), "" );
                values[ pi ] = new char[ strlen(value.c_str())+2 ] ;
                 strcpy ( values [pi], value.c_str() );
                line += " = '" + value + "' " + "(";
-               line += getValueTypeString( node->getNode( name ) );
+               line += getValueTypeString( node->getNode( name.c_str() ) );
                 line += ")";
                 files[ pi ] = new char[ strlen(line.c_str())+2 ] ;
                strcpy ( files [ pi ], line.c_str() ) ;
@@ -500,6 +500,11 @@ void fgPropPicker::find_props ()
             ++pi;
   }
 
+  // truncate entries to 80 characters (plib pui limit)
+  for (i = 0; i < num_files; i++) {
+    if (strlen(files[i]) > 80) files[i][79] = '\0';
+  }
+
   files [ num_files ] = NULL ;
 
   // leave the . and .. alone...
@@ -530,8 +535,8 @@ void fgPropPicker::find_props ()
 
   // if non-empty list, adjust the size of the slider...
   if (num_files > 1) {
-    if ((11.0f/(num_files-1)) < 1) {
-      slider->setSliderFraction (11.0f/(num_files-1)) ;
+    if ((11.0f/(num_files)) < 1) {
+      slider->setSliderFraction (11.0f/(num_files)) ;
       slider->reveal();
       up_arrow->reveal();
       down_arrow->reveal();
@@ -608,4 +613,3 @@ fgPropEdit::fgPropEdit ( char *name, char *value, char *proppath ) : puDialogBox
     FG_FINALIZE_PUI_DIALOG( this );
 }
 
-