Changeset 401

Timestamp:

05/28/07 20:19:36 (18 months ago)

Author:

krobillard

Message:

Orca Qt - A label can now be initialized from a word.

Location:

trunk/orca/qt

Files:

• project.r (modified) (1 diff)
• qorca.cpp (modified) (15 diffs)

trunk/orca/qt/project.r

@@ -17 +17 @@
     ]
     linux [
-        libs %fam
+        ;libs %fam
         libs %bz2
         ;libs_from %/usr/X11R6/lib

trunk/orca/qt/qorca.cpp

@@ -324 +324 @@
 
 
-static const char* valueStr( OValue* val )
-{
-    OString* str = orSTRING( val );
-    orTermCStr( str );
-    return orStrChars( str, val );
+static void valueToQString( const OValue* val, QString& str )
+{
+    if( orIsString( val->type ) )
+    {
+        str = cstring( val );
+    }
+    else if( val->type == OT_INTEGER )
+    {
+        str.setNum( val->integer );
+    }
+    else if( val->type == OT_DECIMAL )
+    {
+        str.setNum( val->num.decimal );
+    }
+    else if( val->type == OT_NONE )
+    {
+        str.clear();
+    }
+    else
+    {
+        AOString ts;
+        str = ts.mold( val );
+    }
 }
 
@@ -414 +432 @@
                 parent.addWidget( pw );
                 setWID( setWord, pw->_wid );
-                pw->setText( valueStr( cbp.values + 1 ) );
+
+                val = cbp.values + 1;
+                if( orIs(val, OT_WORD) )
+                {
+                    orWordVal( val, blk, val );
+                }
+                QString txt;
+                valueToQString( val, txt );
+                pw->setText( txt );
+
                 wid = pw;
             }
@@ -427 +454 @@
                 parent.addWidget( pw );
                 setWID( setWord, pw->_wid );
-                pw->setText( valueStr( cbp.values + 1 ) );
+                pw->setText( cstring( cbp.values + 1 ) );
                 pw->setBlock( cbp.values + 2 );
                 wid = pw;
@@ -441 +468 @@
                 parent.addWidget( pw );
                 setWID( setWord, pw->_wid );
-                pw->setText( valueStr( cbp.values + 1 ) );
+                pw->setText( cstring( cbp.values + 1 ) );
                 wid = pw;
             }
@@ -466 +493 @@
                     {
                         if( orIs(it, OT_STRING) )
-                            pw->addItem( valueStr( it ) );
+                            pw->addItem( cstring( it ) );
                         ++it;
                     }
@@ -472 +499 @@
                 else
                 {
-                    pw->addItem( valueStr( val ) );
+                    pw->addItem( cstring( val ) );
                 }
             }
@@ -496 +523 @@
             case LD_TIP:
                 if( wid )
-                    wid->setToolTip( valueStr(cbp.values + 1) );
+                    wid->setToolTip( cstring(cbp.values + 1) );
                 break;
 
@@ -502 +529 @@
             {
                 if( qEnv.curWidget )
-                    qEnv.curWidget->setWindowTitle( valueStr(cbp.values + 1) );
+                    qEnv.curWidget->setWindowTitle( cstring(cbp.values + 1) );
             }
                 break;
@@ -528 +555 @@
 
                 if( match->integer == LD_LINE_EDITS )
-                    pw->setText( valueStr( cbp.values + 1 ) );
+                    pw->setText( cstring( cbp.values + 1 ) );
             }
                 break;
@@ -545 +572 @@
                 if( match->integer == LD_TEXT_EDITS )
                 {
-                    const char* str = valueStr( cbp.values + 1 );
+                    const char* str = cstring( cbp.values + 1 );
                     if( *str == '<' )
                         pw->setHtml( str );
@@ -565 +592 @@
 
                 val = cbp.values + 1;
-                pw->setTitle( valueStr( val ) );
+                pw->setTitle( cstring( val ) );
 
                 ++val;
@@ -598 +625 @@
                     if( combo )
                     {
-                        combo->addItem( valueStr( cbp.values ) );
+                        combo->addItem( cstring( cbp.values ) );
                         break;
                     }
@@ -605 +632 @@
                     if( texted )
                     {
-                        const char* str = valueStr( cbp.values );
+                        const char* str = cstring( cbp.values );
                         if( *str == '<' )
                             texted->setHtml( str );
@@ -982 +1009 @@
                 break;
         }
-    }
-}
-
-
-static void valueToQString( const OValue* val, QString& str )
-{
-    if( orIsString( val->type ) )
-    {
-        str = cstring( val );
-    }
-    else if( val->type == OT_INTEGER )
-    {
-        str.setNum( val->integer );
-    }
-    else if( val->type == OT_DECIMAL )
-    {
-        str.setNum( val->num.decimal );
-    }
-    else if( val->type == OT_NONE )
-    {
-        str.clear();
-    }
-    else
-    {
-        AOString ts;
-        str = ts.mold( val );
     }
 }
@@ -1226 +1227 @@
   "  2 ['spacer]\n"
   "  3 ['label string!]\n"
+  "  3 ['label word!]\n"
   "  4 ['button string! block!]\n"
   "  5 ['checkbox string!]\n"