Changed Fraction and Script to be GridLayouts

3 files changed, 86 insertions, 78 deletions

diff --git a/sigmodr/ScriptWidget.cpp b/sigmodr/ScriptWidget.cpp
index 9a944035..3399074d 100644
--- a/sigmodr/ScriptWidget.cpp
+++ b/sigmodr/ScriptWidget.cpp
@@ -70,7 +70,7 @@ Sigmodr::ScriptWidget::ScriptWidget(QWidget* parent, const Sigcore::Script& valu
         collection->action("edit_cut")->setVisible(false);
         collection->action("edit_copy")->setVisible(false);
         collection->action("edit_paste")->setVisible(false);
-        m_view->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding);
+        m_view->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
         m_view->setMinimumHeight(300);
         KXmlGuiWindow* topLevel = qobject_cast<KXmlGuiWindow*>(KApplication::kApplication()->activeWindow());
         if (topLevel)
@@ -79,7 +79,7 @@ Sigmodr::ScriptWidget::ScriptWidget(QWidget* parent, const Sigcore::Script& valu
             if (menu)
                 m_view->setContextMenu(menu);
         }
-        layoutScript->addWidget(m_view);
+        gridLayout->addWidget(m_view, 1, 1);
         connect(m_document, SIGNAL(textChanged(KTextEditor::Document*)), this, SLOT(scriptChanged()));
         connect(m_view, SIGNAL(focusIn(KTextEditor::View*)), this, SLOT(focused(KTextEditor::View*)));
         connect(m_view, SIGNAL(focusOut(KTextEditor::View*)), this, SLOT(unfocused(KTextEditor::View*)));
@@ -88,9 +88,9 @@ Sigmodr::ScriptWidget::ScriptWidget(QWidget* parent, const Sigcore::Script& valu
     {
         KMessageBox::information(this, "A KDE text-editor component could not be found.\nPlease check your KDE installation.\n\nEnhanced editing will not be used.", "KDE editor component not found", "kte-component");
         m_simpleEdit = new KTextEdit(m_value.script(), this);
-        m_simpleEdit->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding);
+        m_simpleEdit->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
         m_simpleEdit->setMinimumHeight(300);
-        layoutScript->addWidget(m_simpleEdit);
+        gridLayout->addWidget(m_simpleEdit, 1, 1);
         connect(m_simpleEdit, SIGNAL(textChanged()), this, SLOT(scriptChanged()));
         return;
     }
diff --git a/sigmodr/gui/fraction.ui b/sigmodr/gui/fraction.ui
index f0b70c2b..ccbc2dd1 100644
--- a/sigmodr/gui/fraction.ui
+++ b/sigmodr/gui/fraction.ui
@@ -1,51 +1,74 @@
 <ui version="4.0" >
  <class>formFraction</class>
  <widget class="QWidget" name="formFraction" >
-  <layout class="QVBoxLayout" >
-   <item>
-    <layout class="QHBoxLayout" >
-     <item>
-      <widget class="KIntNumInput" name="varNumerator" >
-       <property name="label" >
-        <string>Numerator</string>
-       </property>
-       <property name="toolTip" >
-        <string>Numerator of the fraction</string>
-       </property>
-       <property name="statusTip" >
-        <string>Numerator of the fraction</string>
-       </property>
-       <property name="whatsThis" >
-        <string>Numerator of the fraction</string>
-       </property>
-       <property name="minimum" >
-        <number>0</number>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="KIntNumInput" name="varDenominator" >
-       <property name="label" >
-        <string>Denominator</string>
-       </property>
-       <property name="toolTip" >
-        <string>Denominator of the fraction</string>
-       </property>
-       <property name="statusTip" >
-        <string>Denominator of the fraction</string>
-       </property>
-       <property name="whatsThis" >
-        <string>Denominator of the fraction</string>
-       </property>
-       <property name="minimum" >
-        <number>1</number>
-       </property>
-      </widget>
-     </item>
-    </layout>
+  <layout class="QGridLayout" >
+   <item row="0" column="0" >
+    <widget class="QLabel" name="labelNumerator" >
+     <property name="text" >
+      <string>Numerator:</string>
+     </property>
+     <property name="alignment" >
+      <set>Qt::AlignRight|Qt::AlignVCenter</set>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1" >
+    <widget class="KIntNumInput" name="varNumerator" >
+     <property name="toolTip" >
+      <string>Numerator of the fraction</string>
+     </property>
+     <property name="statusTip" >
+      <string>Numerator of the fraction</string>
+     </property>
+     <property name="whatsThis" >
+      <string>Numerator of the fraction</string>
+     </property>
+     <property name="minimum" >
+      <number>0</number>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0" >
+    <widget class="QLabel" name="labelDenominator" >
+     <property name="text" >
+      <string>Denominator:</string>
+     </property>
+     <property name="alignment" >
+      <set>Qt::AlignRight|Qt::AlignVCenter</set>
+     </property>
+    </widget>
    </item>
-   <item>
+   <item row="1" column="1" >
+    <widget class="KIntNumInput" name="varDenominator" >
+     <property name="toolTip" >
+      <string>Denominator of the fraction</string>
+     </property>
+     <property name="statusTip" >
+      <string>Denominator of the fraction</string>
+     </property>
+     <property name="whatsThis" >
+      <string>Denominator of the fraction</string>
+     </property>
+     <property name="minimum" >
+      <number>1</number>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0" >
+    <widget class="QLabel" name="labelValue" >
+     <property name="text" >
+      <string>Value:</string>
+     </property>
+     <property name="alignment" >
+      <set>Qt::AlignRight|Qt::AlignVCenter</set>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="1" >
     <widget class="KLineEdit" name="varValue" >
+     <property name="alignment" >
+      <set>Qt::AlignRight|Qt::AlignVCenter</set>
+     </property>
      <property name="readOnly" >
       <bool>true</bool>
      </property>
diff --git a/sigmodr/gui/script.ui b/sigmodr/gui/script.ui
index 079f86e6..5086ce22 100644
--- a/sigmodr/gui/script.ui
+++ b/sigmodr/gui/script.ui
@@ -7,43 +7,28 @@
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
-  <layout class="QVBoxLayout" >
-   <item>
-    <widget class="QGroupBox" name="boxInterpreter" >
-     <property name="title" >
-      <string>Interpreter</string>
+  <layout class="QGridLayout" name="gridLayout" >
+   <item row="0" column="0" >
+    <widget class="QLabel" name="label" >
+     <property name="text" >
+      <string>Interpreter:</string>
      </property>
-     <property name="toolTip" >
-      <string>The language the script is written in</string>
+     <property name="alignment" >
+      <set>Qt::AlignRight|Qt::AlignVCenter</set>
      </property>
-     <property name="statusTip" >
-      <string>The language the script is written in</string>
-     </property>
-     <property name="whatsThis" >
-      <string>The language the script is written in</string>
-     </property>
-     <layout class="QHBoxLayout" >
-      <item>
-       <widget class="KComboBox" name="varInterpreter" />
-      </item>
-     </layout>
     </widget>
    </item>
-   <item>
-    <widget class="QGroupBox" name="boxScript" >
-     <property name="title" >
-      <string>Code</string>
-     </property>
-     <property name="toolTip" >
-      <string>The code for the script</string>
-     </property>
-     <property name="statusTip" >
-      <string>The code for the script</string>
+   <item row="0" column="1" >
+    <widget class="KComboBox" name="varInterpreter" />
+   </item>
+   <item row="1" column="0" >
+    <widget class="QLabel" name="label" >
+     <property name="text" >
+      <string>Script:</string>
      </property>
-     <property name="whatsThis" >
-      <string>The code for the script</string>
+     <property name="alignment" >
+      <set>Qt::AlignRight|Qt::AlignTop</set>
      </property>
-     <layout class="QHBoxLayout" name="layoutScript" />
     </widget>
    </item>
   </layout>