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/button.cc | 53 ++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 51 insertions(+), 2 deletions(-)

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

diff --git a/client/widgets/button.cc b/client/widgets/button.cc
index c524084..6032678 100644
--- a/client/widgets/button.cc
+++ b/client/widgets/button.cc
@@ -32,6 +32,7 @@
 Button::Button(QDomNode &node, MacroWindow *macrowindow)
   : QPushButton(), Widget(node, macrowindow)
 {
+  resetToDisabled = false;
   setCommonAttributes(this, node);
 
   QDomElement elem = node.toElement();
@@ -49,12 +50,27 @@ Button::Button(QDomNode &node, MacroWindow *macrowindow)
   if(elem.hasAttribute("action")) {
     if(elem.attribute("action") == "commit") {
       connect(this, SIGNAL(clicked()), this, SLOT(commit()));
+      setIcon(QPixmap(":icons/add.png"));
+      setEnabled(false);
+
+      //
+      // Hack to re-disable the commit button when the macro is reset.
+      //
+      resetToDisabled = true;
+      widget_name = "commit_button_" + QString::number((int)this);
+      QVector< Widget* > ws;
+      ws.push_back(this);
+      macrowindow->addAuxWidgets(ws);
+
     } else if(elem.attribute("action") == "reset") {
-      connect(this, SIGNAL(clicked()), this, SLOT(reset()));
+      connect(this, SIGNAL(clicked()), this, SLOT(_reset()));
+      setIcon(QPixmap(":icons/del.png"));
     } else if(elem.attribute("action") == "cancel") {
       connect(this, SIGNAL(clicked()), this, SLOT(cancel()));
+      setIcon(QPixmap(":icons/del.png"));
     } else if(elem.attribute("action") == "continue") {
       connect(this, SIGNAL(clicked()), this, SLOT(cont()));
+      setIcon(QPixmap(":icons/add.png"));
     } else if(elem.attribute("action") == "continue_nocommit") {
       connect(this, SIGNAL(clicked()), this, SLOT(cont_nocommit()));
     } 
@@ -69,7 +85,7 @@ void Button::commit()
   printf("Emit: commit\n");
 }
 
-void Button::reset()
+void Button::_reset()
 {
   emit act_reset();
   printf("Emit: reset\n");
@@ -92,3 +108,36 @@ void Button::cont_nocommit()
   emit act_continue_nocommit(field);
   printf("Emit: continue_nocommit\n");
 }
+
+void Button::do_enable()
+{
+  setEnabled(true);
+}
+
+void Button::connectFrom(const char *signal,
+                           const QObject *receiver, const char *method)
+{
+  connect(this, signal, receiver, method);
+}
+
+void Button::connectTo(const QObject *sender, const char *signal,
+                         const char *method)
+{
+  connect(sender, signal, this, method);
+}
+
+void Button::setVisibility(bool visible)
+{
+  setVisible(visible);
+}
+
+bool Button::setKeyboardFocus()
+{
+  setFocus();
+  return true;
+}
+
+void Button::reset()
+{
+  if(resetToDisabled) setEnabled(false);
+}
-- 
cgit v1.2.3