Changeset 18

Timestamp:

02/02/06 17:07:30 (3 years ago)

Author:

krobillard

Message:

Qt - Improved control of tab, text-edit, & progress.

Location:

trunk/orca/qt

Files:

• qorca.cpp (modified) (6 diffs)
• qorca.h (modified) (2 diffs)

trunk/orca/qt/qorca.cpp

@@ -7 +7 @@
 #include <QHBoxLayout>
 #include <QVBoxLayout>
-#include <QTabWidget>
 #include <QMessageBox>
 #include <QTextCursor>
@@ -457 +456 @@
                     goto no_layout;
 
-                QTabWidget* pw = new QTabWidget;
+                STabWidget* pw = new STabWidget;
                 parent.addWidget( pw );
-                //setWID( setWord, pw->_wid );
+                setWID( setWord, pw->_wid );
                 wid = pw;
 
@@ -566 +565 @@
                     SCombo* combo = qobject_cast<SCombo*>( wid );
                     if( combo )
+                    {
                         combo->addItem( valueStr( cbp.values ) );
+                        break;
+                    }
+
+                    STextEdit* texted = qobject_cast<STextEdit*>( wid );
+                    if( texted )
+                    {
+                        const char* str = valueStr( cbp.values );
+                        if( *str == '<' )
+                            texted->setHtml( str );
+                        else
+                            texted->setPlainText( str );
+                    }
                 }
                 break;
@@ -905 +917 @@
             {
                 QString text = ((QLineEdit*) rec->widget)->text();
+                orResultSTRING( orMakeCString( text.toAscii(), -1 ) );
+            }
+                break;
+
+            case WT_TextEdit:
+            {
+                QString text = ((QTextEdit*) rec->widget)->toPlainText();
                 orResultSTRING( orMakeCString( text.toAscii(), -1 ) );
             }
@@ -1004 +1023 @@
                 {
                     ((QProgressBar*) rec->widget)->setValue( a2->integer );
+                }
+                else if( a2->type == OT_NONE )
+                {
+                    ((QProgressBar*) rec->widget)->reset();
                 }
                 break;
@@ -1414 +1437 @@
 WIDGET_CODE(SLabel,WT_Label)
 WIDGET_CODE(SLineEdit,WT_LineEdit)
+WIDGET_CODE(SProgress,WT_Progress)
+WIDGET_CODE(STabWidget,WT_Tab)
 WIDGET_CODE(STextEdit,WT_TextEdit)
-WIDGET_CODE(SProgress,WT_Progress)
 
 

trunk/orca/qt/qorca.h

@@ -13 +13 @@
 #include <QPushButton>
 #include <QProgressBar>
+#include <QTabWidget>
 #include <QTextEdit>
 
@@ -193 +194 @@
 DEF_WIDGET(SLabel,QLabel);
 DEF_WIDGET(SLineEdit,QLineEdit);
+DEF_WIDGET(STabWidget,QTabWidget);
 DEF_WIDGET(STextEdit,QTextEdit);
 DEF_WIDGET(SProgress,QProgressBar);