Changeset 91 for trunk/orca

Timestamp:

03/14/06 22:00:21 (3 years ago)

Author:

krobillard

Message:

Qt - Added 'question native and widgets.r demo.

Location:

trunk/orca/qt

Files:

• demos/widgets.r (added)
• qorca.cpp (modified) (4 diffs)

trunk/orca/qt/qorca.cpp

@@ -533 +533 @@
 
                 if( match->integer == LD_TEXT_EDITS )
-                    pw->setPlainText( valueStr( cbp.values + 1 ) );
+                {
+                    const char* str = valueStr( cbp.values + 1 );
+                    if( *str == '<' )
+                        pw->setHtml( str );
+                    else
+                        pw->setPlainText( str );
+                }
             }
                 break;
@@ -1136 +1142 @@
     else
         QMessageBox::information( 0, cp1, cp2 );
+}
+
+
+OR_NATIVE( questionNative )
+{
+#define REF_QUESTION_DEF    a1+4
+#define REF_QUESTION_BTN    a1+5
+    OString* ostr;
+    QString str[4];
+    int def = 0;
+    int i;
+
+    for( i = 0; i < 4; ++i )
+    {
+        OValue* val = a1 + i;
+        ostr = orSTRING(val);
+        orTermCStr(ostr);
+        str[i] = orStrChars(ostr, val);
+    }
+
+    if( orRefineSet( REF_QUESTION_DEF ) )
+        def = orInt(REF_QUESTION_BTN) - 1;
+
+    i = QMessageBox::question( 0, str[0], str[1], str[2], str[3],
+                               QString(), def );
+    if( i < 0 )
+    {
+        orResultNONE;
+    }
+    else
+    {
+        orResult( OT_INTEGER, i + 1 );
+    }
 }
 
@@ -1166 +1205 @@
   "append-text: native [wid [integer!] val]\n"
   "message: native [title [string!] msg [string!] /warn]\n"
+  "question: native [\n"
+  "  title [string!] msg [string!]\n"
+  "  button1 [string!] button2 [string!]\n"
+  "  /default button [integer!]\n"
+  "]\n"
   "layout-rules: [\n"
   "  0 ['hbox block!]\n"
@@ -1234 +1278 @@
     orNative( (void*) appendTextNative,     "append-text" );
     orNative( (void*) messageNative,        "message" );
+    orNative( (void*) questionNative,       "question" );
 
     {