Changeset 14

Timestamp:

02/01/06 21:18:20 (3 years ago)

Author:

krobillard

Message:

Qt - Added 'progress and 'weight.

Location:

trunk/orca/qt

Files:

• demos/progress.r (added)
• qorca.cpp (modified) (7 diffs)
• qorca.h (modified) (3 diffs)

trunk/orca/qt/qorca.cpp

@@ -330 +330 @@
 #define LD_SET_WORD     21
 #define LD_GRID         22
+#define LD_PROGRESS     23
+#define LD_WEIGHT       24
 
 
@@ -457 +459 @@
                 QTabWidget* pw = new QTabWidget;
                 parent.addWidget( pw );
+                //setWID( setWord, pw->_wid );
+                wid = pw;
 
                 val = cbp.values + 1;
@@ -462 +466 @@
                 tabWidgetBlock( pw, blk->values + val->series.index,
                                     blk->values + blk->used );
-                wid = pw;
             }
                 break;
@@ -596 +599 @@
                 ++val;
                 qoLayout( lo, val->index, val->series.index );
+                break;
+
+            case LD_PROGRESS:
+            {
+                if( ! parent.layout() )
+                    goto no_layout;
+
+                SProgress* pw = new SProgress;
+                parent.addWidget( pw );
+                setWID( setWord, pw->_wid );
+                pw->setRange( 0, cbp.values[1].integer );
+                wid = pw;
+            }
+                break;
+
+            case LD_WEIGHT:
+                if( parent.box && wid )
+                {
+                    parent.box->setStretchFactor(wid, cbp.values[1].integer);
+                }
                 break;
         }
@@ -975 +998 @@
                 ((QTextEdit*) rec->widget)->setPlainText( txt );
             }
+                break;
+
+            case WT_Progress:
+                if( a2->type == OT_INTEGER )
+                {
+                    ((QProgressBar*) rec->widget)->setValue( a2->integer );
+                }
                 break;
 
@@ -1111 +1141 @@
   " 21 [set-word!]\n"
   " 22 ['grid integer! block!]\n"
+  " 23 ['progress integer!]\n"
+  " 24 ['weight integer!]\n"
   "]\n"
   "protect 'layout-rules\n"
@@ -1383 +1415 @@
 WIDGET_CODE(SLineEdit,WT_LineEdit)
 WIDGET_CODE(STextEdit,WT_TextEdit)
+WIDGET_CODE(SProgress,WT_Progress)
 
 

trunk/orca/qt/qorca.h

@@ -12 +12 @@
 #include <QGroupBox>
 #include <QPushButton>
+#include <QProgressBar>
 #include <QTextEdit>
 
@@ -27 +28 @@
     WT_TextEdit,
     WT_Group,
+    WT_Progress,
     WT_Watcher,
     WT_Widget
@@ -192 +194 @@
 DEF_WIDGET(SLineEdit,QLineEdit);
 DEF_WIDGET(STextEdit,QTextEdit);
+DEF_WIDGET(SProgress,QProgressBar);