From 9fcf15a06b9ec422dbad53508e8ce71d2d4145c3 Mon Sep 17 00:00:00 2001
From: deva <deva>
Date: Tue, 13 Jan 2009 09:59:22 +0000
Subject: A huge amount of changes, based on the results of two usertest. The
 changes are contained (but not limited to) in the following list:  - Make
 disabled widgets ignored in validation test.  - Do not commit values of
 disabled widgets to the database.  - Make storechildren attribute on
 metawidget, that enables storing of the child widgets in the database.  -
 Implement LUA resume generator.  - Make language attribute on resume tag, and
 switch parser (format/LUA).  - Case insensitive search in combobox.  - Click
 on macro name or line, expands macro.  - Greyed out widgets in AltComboBox
 should be hidden instead.  - Keyboard 'delete' should delete item from
 multilist.  - "Commit" button needs to be more visible? Icon?  - Upon opening
 of a second macro, the first macro should indicate itself as 'not saved'.  -
 After 'add' in multilist, the input widgets should be reset.  - First widget
 in a macro should have keyboard focus after expansion.  - "Endnu ikke
 udfyldt" needs to be more clear (darker).  - Meta widgets must recurse the
 isValid() call to its children.  - Greyed out widgets must be hidden.  -
 Multilist should be read as a list prior to its input fields.  - Visible
 field on widgets. Hides a widget without disabling it.

---
 client/widgets/metawidget.cc | 115 ++++++++++++++++++++++++++++++-------------
 1 file changed, 81 insertions(+), 34 deletions(-)

(limited to 'client/widgets/metawidget.cc')

diff --git a/client/widgets/metawidget.cc b/client/widgets/metawidget.cc
index 5f53153..91c62ec 100644
--- a/client/widgets/metawidget.cc
+++ b/client/widgets/metawidget.cc
@@ -29,6 +29,8 @@
 #include <QHBoxLayout>
 #include <QVBoxLayout>
 
+#include <QMessageBox>
+
 #include "widgetbuilder.h"
 #include "formatparser.h"
 
@@ -38,37 +40,21 @@ MetaWidget::MetaWidget(QDomNode &node, MacroWindow *macrowindow)
   : QFrame(), Widget(node, macrowindow)
 {
   setCommonAttributes(this, node);
-
-  QDomElement elem = node.toElement();
-  if(elem.hasAttribute("layout")) {
-    if(elem.attribute("layout") == "hbox") {
-      QHBoxLayout *layout = new QHBoxLayout();
-      setLayout(layout);
-    } else if (elem.attribute("layout") == "vbox") {
-      QVBoxLayout *layout = new QVBoxLayout();
-      setLayout(layout);      
-    }
-  } else {
-    QHBoxLayout *layout = new QHBoxLayout();
-    setLayout(layout);
-  }
-  
-  layout()->setContentsMargins(0,0,0,0);
+  setCommonLayout(this, node);
   
+  QDomElement elem = node.toElement();
+  storechildren = elem.attribute("storechildren", "false") == "true";
+
+  // Create children
   QDomNodeList children = node.childNodes();
-  
   for (int i=0; i<children.count();i++) {
     QDomNode child = children.at(i);
-    widgets += widgetBuilder(child, this, macrowindow);
-  }
-  macrowindow->addAuxWidgets(widgets);
-  
-  /* // This is done later
-  if(elem.hasAttribute("value")) {
-    setValue(elem.attribute("value"));
+    widgets += widgetBuilder(child, this, macrowindow, false);
   }
-  */
+  if(storechildren) macrowindow->addWidgets(widgets);
+  else macrowindow->addAuxWidgets(widgets);
 
+  // Setup format string
   if(elem.hasAttribute("format")) {
     format = elem.attribute("format");
   } else {
@@ -81,19 +67,18 @@ MetaWidget::MetaWidget(QDomNode &node, MacroWindow *macrowindow)
     }
   }
 
-  if(elem.hasAttribute("width")) {
-    setMinimumWidth(elem.attribute("width").toInt());
+  // Connect all children wasChanged signal, to catch changes.
+  QVector< Widget* >::iterator i = widgets.begin();
+  while (i != widgets.end()) {
+    Widget* w = *i;
+    w->connectFrom(SIGNAL(wasChanged()), this, SLOT(changed()));
+    i++;
   }
-
-  if(elem.hasAttribute("height")) {
-    setMinimumHeight(elem.attribute("height").toInt());
-  }
-
-  layout()->setContentsMargins(0,0,0,0);
 }
 
 void MetaWidget::changed()
 {
+  emit wasChanged();
 }
 
 QString MetaWidget::getValue()
@@ -101,7 +86,7 @@ QString MetaWidget::getValue()
   return format_parser(format, widgets);
 }
 
-void MetaWidget::setValue(QString /*values*/)
+void MetaWidget::setValue(QString, QString)
 {
   // Nothing reasonable we can do here.
 }
@@ -115,3 +100,65 @@ void MetaWidget::disable()
 {
   setEnabled(false);
 }
+
+bool MetaWidget::isValid()
+{
+  // If children are stored they will validate themselves.
+  if(!storechildren) {
+    QVector< Widget* >::iterator i = widgets.begin();
+    while (i != widgets.end()) {
+      Widget* w = *i;
+      if(w->isValid() == false) {
+        QMessageBox::critical(NULL, "Fejl",
+                              "Et af inputfelterne (" + w->getName()
+                              + ") er ikke udfyldt korrekt, prøv igen.\n"
+                              , QMessageBox::Ok);
+        return false;
+      }
+      i++;
+    }
+  }
+
+  return regexpValidator() && luaValidator();
+}
+
+void MetaWidget::connectFrom(const char *signal,
+                           const QObject *receiver, const char *method)
+{
+  connect(this, signal, receiver, method);
+}
+
+void MetaWidget::connectTo(const QObject *sender, const char *signal,
+                         const char *method)
+{
+  connect(sender, signal, this, method);
+}
+
+bool MetaWidget::setKeyboardFocus()
+{
+  QVector< Widget* >::iterator i = widgets.begin();
+  while (i != widgets.end()) {
+    Widget* w = *i;
+    if(w->setKeyboardFocus()) return true;
+    i++;
+  }
+  return false;
+}
+
+void MetaWidget::reset()
+{
+  // If children are stored they will be reset individually.
+  if(!storechildren) {
+    QVector< Widget* >::iterator i = widgets.begin();
+    while (i != widgets.end()) {
+      Widget* w = *i;
+      w->reset();
+      i++;
+    }
+  }
+}
+
+void MetaWidget::setVisibility(bool visible)
+{
+  setVisible(visible);
+}
-- 
cgit v1.2.3