summaryrefslogtreecommitdiff
path: root/client/widgets/combobox.cc
diff options
context:
space:
mode:
authordeva <deva>2009-01-13 09:59:22 +0000
committerdeva <deva>2009-01-13 09:59:22 +0000
commit9fcf15a06b9ec422dbad53508e8ce71d2d4145c3 (patch)
treed54147e52b1939ba9ebaf356e7047dfebea02887 /client/widgets/combobox.cc
parent9d982a5b4fc9c7efaa56c8f7a4130361f26b0302 (diff)
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.
Diffstat (limited to 'client/widgets/combobox.cc')
-rw-r--r--client/widgets/combobox.cc54
1 files changed, 44 insertions, 10 deletions
diff --git a/client/widgets/combobox.cc b/client/widgets/combobox.cc
index 630a449..4db6172 100644
--- a/client/widgets/combobox.cc
+++ b/client/widgets/combobox.cc
@@ -77,7 +77,6 @@ ComboBox::ComboBox(QDomNode &node, MacroWindow *macrowindow)
setEditable(true);
connect(this, SIGNAL(editTextChanged(QString)), this, SLOT(changed()));
- //setEditText(elem.attribute("value"));
break;
case SEARCH:
@@ -90,6 +89,7 @@ ComboBox::ComboBox(QDomNode &node, MacroWindow *macrowindow)
}
rxs += ")";
rx = QRegExp(rxs);
+ rx.setCaseSensitivity(Qt::CaseInsensitive);
}
{
QCompleter *completer = new QCompleter(itemlist, this);
@@ -100,11 +100,12 @@ ComboBox::ComboBox(QDomNode &node, MacroWindow *macrowindow)
}
connect(this, SIGNAL(editTextChanged(QString)), this, SLOT(changed()));
- //setEditText(elem.attribute("value"));
break;
}
+ ischangingbyuser = false;
changed();
+ ischangingbyuser = true;
}
QString ComboBox::getValue()
@@ -119,13 +120,20 @@ QString ComboBox::getValue()
return value;
}
-void ComboBox::setValue(QString value)
+void ComboBox::setValue(QString value, QString source)
{
+ if(isUserSource(source)) emit wasChanged();
+
int idx = findData(value);
printf("setValue(\"%s\") - %d\n", value.toStdString().c_str(), idx);
+ ischangingbyuser = false;
setCurrentIndex(idx);
+ ischangingbyuser = true;
+
+ setInitialValue(value);
+
}
bool ComboBox::isValid()
@@ -134,17 +142,12 @@ bool ComboBox::isValid()
if(currentIndex() != -1) return true;
else return false;
}
- return rx.exactMatch(currentText());
+ return rx.exactMatch(currentText()) && luaValidator();
}
void ComboBox::changed()
{
- /*
- if(combotype == SELECT) {
- luaValidator();
- return;
- }
- */
+ if(ischangingbyuser) emit wasChanged();
QPalette palette;
@@ -169,3 +172,34 @@ void ComboBox::disable()
{
setEnabled(false);
}
+
+void ComboBox::connectFrom(const char *signal,
+ const QObject *receiver, const char *method)
+{
+ connect(this, signal, receiver, method);
+}
+
+void ComboBox::connectTo(const QObject *sender, const char *signal,
+ const char *method)
+{
+ connect(sender, signal, this, method);
+}
+
+/*
+bool ComboBox::eventFilter(QObject *, QEvent *event)
+{
+ if (event->type() == QEvent::KeyPress) emit wasChanged();
+ return false;
+}
+*/
+
+bool ComboBox::setKeyboardFocus()
+{
+ setFocus();
+ return true;
+}
+
+void ComboBox::setVisibility(bool visible)
+{
+ setVisible(visible);
+}