diff options
Diffstat (limited to 'client')
32 files changed, 312 insertions, 63 deletions
diff --git a/client/client.pro b/client/client.pro index e002942..5e16942 100644 --- a/client/client.pro +++ b/client/client.pro @@ -16,15 +16,15 @@ debug { DEFINES+=USE_DEBUG } -DEFINES+=VERSION=\\\"2.2.1\\\" +DEFINES+=VERSION=\\\"2.2.2\\\" win32 { - LIBPATH += lua/lib + QMAKE_LIBDIR += lua/lib INCLUDEPATH += lua/include LIBS += -llua51 DEFINES += HOST_WIN32 # debug { - CONFIG += console + CONFIG += # } } diff --git a/client/collapser.cc b/client/collapser.cc index 2057a0e..abbe295 100644 --- a/client/collapser.cc +++ b/client/collapser.cc @@ -32,7 +32,7 @@ #include "debug.h" -#define ANIM_TIME 100 // ms +#define ANIM_TIME 200 // ms #define ANIM_INTERVAL 50 // ms Collapser::Collapser(QWidget *current, QScrollArea *scroll) diff --git a/client/docgen/doc.h b/client/docgen/doc.h index ae693f5..5678476 100644 --- a/client/docgen/doc.h +++ b/client/docgen/doc.h @@ -69,6 +69,9 @@ public: QString title; QString name; QString tag; + bool serverside; + bool clientside; + QString classname; QString extends; bool container; QString description; diff --git a/client/docgen/docgen.cc b/client/docgen/docgen.cc index e4af0a3..4eb2e08 100644 --- a/client/docgen/docgen.cc +++ b/client/docgen/docgen.cc @@ -32,6 +32,7 @@ #include <QDir> #include <QMap> #include <QDate> +#include <QFileInfo> #include <stdio.h> @@ -39,7 +40,9 @@ #include "parse.h" #include "generate.h" -#define INPUT "../widgets" +#define WIDGETS_DIR "../widgets" +#define SERVER_DIR "../../server/src" +#define CLIENT_DIR ".." #define OUTPUT "html" QString output; @@ -94,16 +97,46 @@ void writeIndex(QMap<QString, Doc> &docs) out += "<h1>Pracro "VERSION" Documentation</h1>\n"; out += "<h2>Overview</h2>\n"; + out += "<h3>Clientside</h3>\n"; + out += "<h4>Widgets</h4>\n"; out += "<ul>\n"; QMap<QString, Doc>::iterator i = docs.begin(); while(i != docs.end()) { Doc &doc = *i; - out += "<li><a href=\""+doc.name+".html\">["+doc.name+"]</a> - "+ - doc.title+"</li>\n"; + if(doc.tag != "") { + out += "<li><a href=\""+doc.name+".html\">["+doc.name+"]</a> - "+ + doc.title+"</li>\n"; + } + i++; + } + out += "</ul>\n"; + out += "<h4>Classes</h4>\n"; + out += "<ul>\n"; + i = docs.begin(); + while(i != docs.end()) { + Doc &doc = *i; + if(doc.classname != "" && doc.clientside) { + out += "<li><a href=\""+doc.name+".html\">["+doc.name+"]</a> - "+ + doc.title+"</li>\n"; + } i++; } out += "</ul>\n"; + out += "<h3>Serverside</h3>\n"; + out += "<ul>\n"; + i = docs.begin(); + while(i != docs.end()) { + Doc &doc = *i; + if(doc.classname != "" && doc.serverside) { + out += "<li><a href=\""+doc.name+".html\">["+doc.name+"]</a> - "+ + doc.title+"</li>\n"; + } + i++; + } + out += "</ul>\n"; + + QFile::remove(output + "/index.html"); QFile ofile(output + "/index.html"); ofile.open(QIODevice::ReadWrite | QIODevice::Text); @@ -133,15 +166,47 @@ int main(int argc, char *argv[]) QFile::remove(output + "/style.css"); QFile::copy("style.css", output + "/style.css"); - QDir dir(INPUT); - QStringList filter; filter << "*.h"; - dir.setNameFilters(filter); + QStringList files; + + // Widgets + { + QDir dir(WIDGETS_DIR); + QStringList filter; filter << "*.h"; + dir.setNameFilters(filter); + if(!dir.exists()) return 1; + QFileInfoList inflst = dir.entryInfoList(QDir::Files); + foreach(QFileInfo inf, inflst) { + files.append(inf.absoluteFilePath()); + } + } + + // Client + { + QDir dir(CLIENT_DIR); + QStringList filter; filter << "*.h"; + dir.setNameFilters(filter); + if(!dir.exists()) return 1; + QFileInfoList inflst = dir.entryInfoList(QDir::Files); + foreach(QFileInfo inf, inflst) { + files.append(inf.absoluteFilePath()); + } + } + + // Server + { + QDir dir(SERVER_DIR); + QStringList filter; filter << "*.h"; + dir.setNameFilters(filter); + if(!dir.exists()) return 1; + QFileInfoList inflst = dir.entryInfoList(QDir::Files); + foreach(QFileInfo inf, inflst) { + files.append(inf.absoluteFilePath()); + } + } - if(!dir.exists()) return 1; - QStringList l = dir.entryList(QDir::Files); - foreach(QString file, l) { - Doc doc = parse(QString(INPUT) + "/" + file); - if(doc.title != "" || doc.tag != "") + foreach(QString file, files) { + Doc doc = parse(file); + if(doc.title != "" || doc.tag != "" || doc.classname != "") docs[doc.name] = doc; } diff --git a/client/docgen/generate.cc b/client/docgen/generate.cc index b521f1f..f418b24 100644 --- a/client/docgen/generate.cc +++ b/client/docgen/generate.cc @@ -219,6 +219,18 @@ QString generate(Doc &doc, QMap<QString, QVector<Method> > &meths, highlight("<" + doc.tag + " />", xml) + "</pre></div>\n"; } + if(doc.serverside) + out += " <div class=\"availablility\">Available serverside.</div>\n"; + + if(doc.clientside) + out += " <div class=\"availablility\">Available clientside.</div>\n"; + + + if(doc.classname != "" ){ + out += " <div class=\"classname\">Class<pre class=\"code\">" + + doc.classname + "</pre></div>\n"; + } + if(doc.container) { out += " <div class=\"container\">Widget is a container.</div>\n"; } @@ -248,21 +260,23 @@ QString generate(Doc &doc, QMap<QString, QVector<Method> > &meths, out += generateExamples(doc.examples, xml); - out += " <h2>Attributes</h2>\n"; - out += " <div class=\"attributes\">\n"; - if(doc.attributes.size()) { - out += generateAttributes(doc.attributes); - } + if(doc.tag != "") { + out += " <h2>Attributes</h2>\n"; + out += " <div class=\"attributes\">\n"; + if(doc.attributes.size()) { + out += generateAttributes(doc.attributes); + } - QMap<QString, QVector<Attribute> >::iterator i = atts.begin(); - while(i != atts.end()) { - out += " <h3>Attributes inherited from <a href=\"" + i.key() + - ".html\">"+i.key()+"</a>:</h3>\n"; - out += generateAttributes(i.value()); - i++; + QMap<QString, QVector<Attribute> >::iterator i = atts.begin(); + while(i != atts.end()) { + out += " <h3>Attributes inherited from <a href=\"" + i.key() + + ".html\">"+i.key()+"</a>:</h3>\n"; + out += generateAttributes(i.value()); + i++; + } + out += " </div>\n"; } - out += " </div>\n"; - + out += generateMethodOverview(doc, meths); out += " <h2>Methods</h2>\n"; diff --git a/client/docgen/parse.cc b/client/docgen/parse.cc index 64c2aa7..0354f57 100644 --- a/client/docgen/parse.cc +++ b/client/docgen/parse.cc @@ -89,6 +89,8 @@ Doc parse(QString filename) { Doc doc; doc.container = false; + doc.serverside = false; + doc.clientside = false; QFileInfo fi(filename); QString name = fi.fileName(); @@ -134,10 +136,26 @@ Doc parse(QString filename) continue; } + if(state == none && line.left(6) == "@class") { + doc.classname = line.right(line.length() - line.indexOf(" ") - 1); + doc.name = doc.classname; + continue; + } + if(state == none && line.left(8) == "@extends") { doc.extends = line.right(line.length() - line.indexOf(" ") - 1); continue; } + + if(state == none && line.left(11) == "@serverside") { + doc.serverside = true; + continue; + } + + if(state == none && line.left(11) == "@clientside") { + doc.clientside = true; + continue; + } if(state == none && line.left(11) == "@screenshot") { Screenshot s; diff --git a/client/docgen/style.css b/client/docgen/style.css index e938648..17f087e 100644 --- a/client/docgen/style.css +++ b/client/docgen/style.css @@ -26,6 +26,11 @@ a:hover { } .doc .tagname { + font-size: 1.5em; + text-align: center; +} +.doc .classname { + font-size: 1.5em; text-align: center; } .doc .extends {} diff --git a/client/luadb.cc b/client/luadb.cc index 317831f..a848f36 100644 --- a/client/luadb.cc +++ b/client/luadb.cc @@ -77,7 +77,7 @@ typedef struct db_userdata { DB *db; } db_userdata; -static int db_value(lua_State *L) +int db_value(lua_State *L) { db_userdata *dbu; @@ -91,7 +91,7 @@ static int db_value(lua_State *L) return 1; } -static int db_exec(lua_State *L) +int db_exec(lua_State *L) { db_userdata *dbu; @@ -105,7 +105,7 @@ static int db_exec(lua_State *L) return 0; } -static int db_next(lua_State *L) +int db_next(lua_State *L) { db_userdata *dbu; @@ -119,7 +119,7 @@ static int db_next(lua_State *L) return 1; } -static int db_new(lua_State *L) +int db_new(lua_State *L) { const char *driver = luaL_checkstring(L, 1); const char *host = luaL_checkstring(L, 2); diff --git a/client/luadb.h b/client/luadb.h index a87baf5..91c8777 100644 --- a/client/luadb.h +++ b/client/luadb.h @@ -30,6 +30,59 @@ #include <lua.hpp> +/*** + * Database Class + * @class DB + * @clientside + * The DB class connects and handles communication with the an SQL server using + * the QDatabase API. + */ + +/*** + * @method object DB.new(string driver, string host, string database, string user, string password, int port) + * Create a new DB connection object. + * @param driver A string containing the QT SQL driver name. QPSQL: postgresql + * driver. + * @param host The hostname to connect to. + * @param database The database to open. + * @param user The username to use for authentication. + * @param password The password to use for authentication. + * @param port The port to connect to. + * @return The newly created communication object. + * @example Create a new database object: + * px = DB.new('QPSQL', 'localhost', 'mydb', 'user01', 'verysecret', '5432') + */ +int db_new(lua_State *L); + +/*** + * @method nil exec(string query) + * Execute an SQL query. + * @param query A string containing the SQL query to execute. + */ +int db_exec(lua_State *L); + +/*** + * @method string value(int index) + * Get current value from the result of the last query. + * @param index The column index number to use for the value retrieval. + * @return A string containing the value in the result cell. + */ +int db_value(lua_State *L); + +/*** + * @method boolean next() + * Iterate to next row in result set. + * @return true if another row is availble, false if the end of the list has + * been reached. + * @example Iterate through a result list and print the value in column 0 in each row: + * while db:next() + * do + * local item = db:value(0) + * print(item) + * end + */ +int db_next(lua_State *L); + void register_db(lua_State *L); #endif/*__PRACRO_LUADB_H__*/ diff --git a/client/luapraxisd.cc b/client/luapraxisd.cc index 11d619e..00ed961 100644 --- a/client/luapraxisd.cc +++ b/client/luapraxisd.cc @@ -72,7 +72,9 @@ static int px_getcave(lua_State *L) int top = lua_gettop(L); for(int i = 0; i < cavelist.size(); i++) { - lua_pushstring(L, QString::fromUtf8(cavelist[i].toStdString().c_str()).toStdString().c_str()); + QString c = cavelist[i]; + DEBUG(cavelist, "CAVE '%s'\n", c.toStdString().c_str()); + lua_pushstring(L, c.toStdString().c_str()); lua_rawseti(L, top, i); } @@ -85,7 +87,7 @@ static int px_cavelist(lua_State *L) pxu = (px_userdata *)luaL_checkudata(L, 1, "Praxisd"); luaL_argcheck(L, pxu, 1, "Praxisd expected"); - QVector<cave_t> cavelist = pxu->px->diverse_get_cave(""); + QVector<cave_t> cavelist = pxu->px->diverse_get_cave("C"); if(pxu->px->hasError()) { lua_pushstring(L, pxu->px->errorString().toStdString().c_str()); lua_error(L); @@ -96,7 +98,9 @@ static int px_cavelist(lua_State *L) int top = lua_gettop(L); for(size_t i = 0; i < (size_t)cavelist.size(); i++) { - lua_pushstring(L, QString::fromUtf8(cavelist[i].cave.toStdString().c_str()).toStdString().c_str()); + QString c = cavelist[i].cave; + DEBUG(cavelist, "CAVE '%s'\n", c.toStdString().c_str()); + lua_pushstring(L, c.toStdString().c_str()); lua_rawseti(L, top, i); } diff --git a/client/mainwindow.cc b/client/mainwindow.cc index 9e62e5d..756f759 100644 --- a/client/mainwindow.cc +++ b/client/mainwindow.cc @@ -172,7 +172,7 @@ void MainWindow::closeCommit() return; } netcom.commit(); - isStored = true; + // isStored = true; closing = true; } @@ -186,7 +186,7 @@ void MainWindow::closeNoCommit() return; } netcom.nocommit(); - isStored = true; + // isStored = true; closing = true; } @@ -210,7 +210,7 @@ void MainWindow::closeDiscard() if(res == MessageBox::Yes) { netcom.discard(); - isStored = true; + // isStored = true; closing = true; } } @@ -233,7 +233,7 @@ void MainWindow::closeEvent(QCloseEvent *event) == MessageBox::Yes) { if(!isStored) { netcom.discard(); - isStored = true; + // isStored = true; closing = true; event->ignore(); return; @@ -343,6 +343,9 @@ void MainWindow::updateMacros(QDomNodeList &nodes) break; } } + + QVBoxLayout *l = (QVBoxLayout*)central->layout(); + l->addStretch(1); } } @@ -391,8 +394,6 @@ void MainWindow::setTemplate(QString name) void MainWindow::handle(QDomDocument &doc) { - if(closing) close(); - DEBUG(mainwindow, "Handle %s\n", doc.toString().toStdString().c_str()); @@ -403,6 +404,7 @@ void MainWindow::handle(QDomDocument &doc) if(element.tagName() == "error") { showError("Pracro Server Error", element.text()); + closing = false; continue; } @@ -433,4 +435,9 @@ void MainWindow::handle(QDomDocument &doc) } } + + if(closing) { + isStored = true; + close(); + } } diff --git a/client/pcpviewer/pcpviewer.cc b/client/pcpviewer/pcpviewer.cc index 5853e0a..ea59edb 100644 --- a/client/pcpviewer/pcpviewer.cc +++ b/client/pcpviewer/pcpviewer.cc @@ -42,6 +42,9 @@ PCPViewer::PCPViewer(QString patientid) : praxisd("sarge", 10000) { + setWindowTitle(tr("Pracro Patient View")); + setWindowIcon(QIcon(":/icons/icon.png")); + this->patientid = patientid; setLayout(new QVBoxLayout()); diff --git a/client/pracro_dk.ts b/client/pracro_dk.ts index 9c7fd40..2582280 100644 --- a/client/pracro_dk.ts +++ b/client/pracro_dk.ts @@ -2,6 +2,19 @@ <!DOCTYPE TS> <TS version="2.0" language="da_DK"> <context> + <name>AboutBox</name> + <message> + <location filename="aboutbox.cc" line="40"/> + <source>About Pracro</source> + <translation>Om Pracro</translation> + </message> + <message> + <location filename="aboutbox.cc" line="72"/> + <source><h1>Pracro Client</h1><h2>v.</source> + <translation><h1>Pracro Client</h1><h2>v.</translation> + </message> +</context> +<context> <name>DBWidget</name> <message> <source>Write something in the searchfield</source> @@ -53,43 +66,43 @@ et CPR nummer på 10 cifre.</translation> <context> <name>MacroWindow</name> <message> - <location filename="macrowindow.cc" line="177"/> + <location filename="macrowindow.cc" line="181"/> <source>Error</source> <translation>Der er sket en fejl</translation> </message> <message> - <location filename="macrowindow.cc" line="178"/> + <location filename="macrowindow.cc" line="182"/> <source>The macro </source> <translation>Makroen </translation> </message> <message> - <location filename="macrowindow.cc" line="179"/> + <location filename="macrowindow.cc" line="183"/> <source> was not filled out correctly, please try again. </source> <translation> er ikke.udfyldt korrekt. Prøv igen.</translation> </message> <message> - <location filename="macrowindow.cc" line="213"/> + <location filename="macrowindow.cc" line="219"/> <source>Save the macro changes?</source> <translation>Gem makro ændringer?</translation> </message> <message> - <location filename="macrowindow.cc" line="214"/> + <location filename="macrowindow.cc" line="220"/> <source>you have choosen to close the macro </source> <translation>Du har valgt at lukke makroen </translation> </message> <message> - <location filename="macrowindow.cc" line="216"/> + <location filename="macrowindow.cc" line="222"/> <source>do you want to save before closing?</source> <translation>ønsker du at gemme dine ændringer først?</translation> </message> <message> - <location filename="macrowindow.cc" line="241"/> + <location filename="macrowindow.cc" line="247"/> <source>Close first</source> <translation>Luk først</translation> </message> <message> - <location filename="macrowindow.cc" line="242"/> + <location filename="macrowindow.cc" line="248"/> <source>Close other one first.</source> <translation>Luk den åbne makro først.</translation> </message> @@ -97,26 +110,26 @@ et CPR nummer på 10 cifre.</translation> <context> <name>MainWindow</name> <message> - <location filename="mainwindow.cc" line="112"/> + <location filename="mainwindow.cc" line="124"/> <source>Close and commit</source> <translation>Gem i journal</translation> </message> <message> - <location filename="mainwindow.cc" line="115"/> + <location filename="mainwindow.cc" line="127"/> <source>Close no commit</source> <translation>Gem som kladde</translation> </message> <message> - <location filename="mainwindow.cc" line="150"/> - <location filename="mainwindow.cc" line="162"/> - <location filename="mainwindow.cc" line="174"/> + <location filename="mainwindow.cc" line="168"/> + <location filename="mainwindow.cc" line="180"/> + <location filename="mainwindow.cc" line="192"/> <source>Close first.</source> <translation>Luk først.</translation> </message> <message> - <location filename="mainwindow.cc" line="151"/> - <location filename="mainwindow.cc" line="163"/> - <location filename="mainwindow.cc" line="175"/> + <location filename="mainwindow.cc" line="169"/> + <location filename="mainwindow.cc" line="181"/> + <location filename="mainwindow.cc" line="193"/> <source>Close open macros first.</source> <translation>Luk åbne makroer først.</translation> </message> @@ -133,14 +146,14 @@ et CPR nummer på 10 cifre.</translation> <translation type="obsolete">Denne session bliver husket på denne specifikke maskine. For at genåbne på et senere tidspunkt, skal du blot genåbne på samme patient.</translation> </message> <message> - <location filename="mainwindow.cc" line="181"/> - <location filename="mainwindow.cc" line="203"/> + <location filename="mainwindow.cc" line="199"/> + <location filename="mainwindow.cc" line="221"/> <source>Discard</source> <translation>Kassér</translation> </message> <message> - <location filename="mainwindow.cc" line="182"/> - <location filename="mainwindow.cc" line="204"/> + <location filename="mainwindow.cc" line="200"/> + <location filename="mainwindow.cc" line="222"/> <source>This session will <strong>NOT</strong> be stored in the journal.<br/>Are you sure you want to continue?</source> <translation>Dette vil slette alle indtastede data. Denne session vil <strong>IKKE</strong> blive gemt i journalen hvis du fortsætter. Fortsætter du kan dataene <strong>IKKE</strong> gendannes.<br/>Er du sikker på du vil fortsætte?</translation> </message> @@ -158,6 +171,25 @@ et CPR nummer på 10 cifre.</translation> <oldsource>Remove form list</oldsource> <translation>Fjern fra listen</translation> </message> + <message> + <location filename="widgets/multilist.cc" line="133"/> + <source>Inner widget changed.</source> + <translation>Data er ændret</translation> + </message> + <message> + <location filename="widgets/multilist.cc" line="134"/> + <source>The inner widget changed, and you didn't add it to the list. +Do you want to continue and discard the change?</source> + <translation>Der er indtastet data, som ikke er tilføjet til listen. Ønsker du at fortsætte og glemme disse data?</translation> + </message> +</context> +<context> + <name>PCPViewer</name> + <message> + <location filename="pcpviewer/pcpviewer.cc" line="45"/> + <source>Pracro Patient View</source> + <translation>Pracro Patient Oversigt</translation> + </message> </context> <context> <name>QObject</name> @@ -252,9 +284,17 @@ et CPR nummer på 10 cifre.</translation> <translation>Ignorér</translation> </message> <message> - <location filename="macro.cc" line="121"/> + <location filename="macro.cc" line="122"/> <source>Depends on: </source> <translation>Afhænger af: </translation> </message> </context> +<context> + <name>Template</name> + <message> + <location filename="template.cc" line="54"/> + <source>Open</source> + <translation>Åbn</translation> + </message> +</context> </TS> diff --git a/client/praxisd.cc b/client/praxisd.cc index 161b471..2fbaddc 100644 --- a/client/praxisd.cc +++ b/client/praxisd.cc @@ -221,7 +221,7 @@ void Praxisd::replyFinished(QNetworkReply *reply) break; } } else { - emit networkError(reply->errorString()); + emit networkError(reply->errorString() + " - " + reply->readAll()); } replytypes.erase(replytypes.find(reply)); } diff --git a/client/widgets/altcombobox.cc b/client/widgets/altcombobox.cc index 9956fff..082601a 100644 --- a/client/widgets/altcombobox.cc +++ b/client/widgets/altcombobox.cc @@ -107,6 +107,12 @@ AltComboBox::~AltComboBox() { } +bool AltComboBox::setKeyboardFocus() +{ + combobox->setFocus(); + return true; +} + QComboBox *AltComboBox::qcombobox() { return combobox; diff --git a/client/widgets/altcombobox.h b/client/widgets/altcombobox.h index e6a21d7..73dee10 100644 --- a/client/widgets/altcombobox.h +++ b/client/widgets/altcombobox.h @@ -43,6 +43,7 @@ /*** * ComboBox Widget with Alternate Value * @tag altcombobox + * @clientside * @extends combobox * @screenshot Example: altitem selected. * <altcombobox name="ex" layout="vbox" value="altitem" type="select"> @@ -94,6 +95,8 @@ public: QComboBox *qcombobox(); + bool setKeyboardFocus(); + public slots: void comboChanged(); void onChildChange(); diff --git a/client/widgets/button.h b/client/widgets/button.h index 0bd7db9..d9053a6 100644 --- a/client/widgets/button.h +++ b/client/widgets/button.h @@ -34,6 +34,7 @@ /*** * PushButton Widget * @tag button + * @clientside * @screenshot Example button * <button caption="Click me"/> * @screenshot Example cancel button diff --git a/client/widgets/checkbox.h b/client/widgets/checkbox.h index ce31a62..5fef7cb 100644 --- a/client/widgets/checkbox.h +++ b/client/widgets/checkbox.h @@ -38,6 +38,7 @@ /*** * CheckBox Widget * @tag checkbox + * @clientside * @screenshot An example checkbox * <checkbox name="example" truevalue="true" falsevalue="false" value="true" * caption="A simple checkbox"/> diff --git a/client/widgets/checkgroupbox.h b/client/widgets/checkgroupbox.h index 5dfa7fb..96056a4 100644 --- a/client/widgets/checkgroupbox.h +++ b/client/widgets/checkgroupbox.h @@ -41,6 +41,7 @@ /*** * Checkable GroupBox Widget * @tag checkgroupbox + * @clientside * @extends checkbox * @screenshot Example 1: type="framed" * <checkgroupbox name="example" caption="Example" type="framed" layout="vbox" diff --git a/client/widgets/combobox.cc b/client/widgets/combobox.cc index eed2d10..935f620 100644 --- a/client/widgets/combobox.cc +++ b/client/widgets/combobox.cc @@ -93,6 +93,8 @@ ComboBox::ComboBox(QDomNode &node, MacroWindow *macrowindow) // Make empty default selection. combobox->setCurrentIndex(-1); + combobox->installEventFilter(this); + QDomElement elem = node.toElement(); combotype = SELECT; @@ -213,15 +215,26 @@ void ComboBox::changed() emit eventOnChange(); } +#include <QKeyEvent> bool ComboBox::eventFilter(QObject *obj, QEvent *event) { if(ignoreChangeEvents == true) return false; + if(combotype == SELECT) { if(event->type() == QEvent::MouseButtonRelease) { if(enabled()) combobox->showPopup(); } } + if(event->type() == QEvent::KeyPress) { + QKeyEvent *ke = (QKeyEvent*)event; + // printf("KEY: %d\n", ke->key()); + // if(ke->key() == Qt::Key_Up || ke->key() == Qt::Key_Down) { + if(ke->key() == Qt::Key_Space) { + if(enabled()) combobox->showPopup(); + } + } + return QObject::eventFilter(obj, event); } diff --git a/client/widgets/combobox.h b/client/widgets/combobox.h index bf61b1a..448a0ff 100644 --- a/client/widgets/combobox.h +++ b/client/widgets/combobox.h @@ -40,6 +40,7 @@ /*** * ComboBox Widget * @tag combobox + * @clientside * @screenshot Example * <combobox name="ex" layout="vbox" value="item" type="select"> * <item caption="Item" value="item"/> diff --git a/client/widgets/datetime.h b/client/widgets/datetime.h index 84df018..a36d87b 100644 --- a/client/widgets/datetime.h +++ b/client/widgets/datetime.h @@ -35,6 +35,7 @@ /*** * Date and Time Widget * @tag datetime + * @clientside * @screenshot Example with fuzziness="1" and value="1234567890" * <datetime name="x" fuzziness="1" value="1234567890"/> * @screenshot Example with fuzziness="7" and value="1234567890" diff --git a/client/widgets/groupbox.h b/client/widgets/groupbox.h index 58e52bb..9198a5a 100644 --- a/client/widgets/groupbox.h +++ b/client/widgets/groupbox.h @@ -37,6 +37,7 @@ /*** * Layout or Frame Widget * @tag frame + * @clientside * @screenshot Example with caption. * <frame caption="Caption" layout="vbox"> * <label caption="Label"/> diff --git a/client/widgets/label.h b/client/widgets/label.h index b303d0d..eae97b8 100644 --- a/client/widgets/label.h +++ b/client/widgets/label.h @@ -34,6 +34,7 @@ /*** * Label Widget * @tag label + * @clientside * @screenshot Example * <label width="300" caption="A nice label with a caption"/> * @extends widget diff --git a/client/widgets/lineedit.h b/client/widgets/lineedit.h index 08230a6..d482c15 100644 --- a/client/widgets/lineedit.h +++ b/client/widgets/lineedit.h @@ -39,6 +39,7 @@ /*** * Line Edit Widget * @tag lineedit + * @clientside * @screenshot Example * <lineedit name="myname" value="some text"/> * @extends widget diff --git a/client/widgets/listbox.h b/client/widgets/listbox.h index 82c5dfc..f9d967a 100644 --- a/client/widgets/listbox.h +++ b/client/widgets/listbox.h @@ -38,6 +38,7 @@ /*** * ListBox Widget + * @clientside * @tag listbox * @screenshot Example * <listbox name="x" value="item1"> diff --git a/client/widgets/metawidget.h b/client/widgets/metawidget.h index c6bf5d0..c6a7224 100644 --- a/client/widgets/metawidget.h +++ b/client/widgets/metawidget.h @@ -36,6 +36,7 @@ /*** * Meta Widget + * @clientside * @extends widget * @tag metawidget * @screenshot An example of a metawidget with two inner widgets. The metawidget is not in itself visible. diff --git a/client/widgets/multilist.h b/client/widgets/multilist.h index f7da8fa..a7c5332 100644 --- a/client/widgets/multilist.h +++ b/client/widgets/multilist.h @@ -37,6 +37,7 @@ /*** * Multi List Widget * @tag multilist + * @clientside * @container * @screenshot Example of multilist containing a metawidget. * <multilist name="x" layout="vbox" innerwidget="in" value="Abc: Def diff --git a/client/widgets/radiobuttons.h b/client/widgets/radiobuttons.h index 4b9ce67..e09d4e8 100644 --- a/client/widgets/radiobuttons.h +++ b/client/widgets/radiobuttons.h @@ -35,6 +35,7 @@ /*** * Radio Button Group Widget * @tag radiobuttons + * @clientside * @extends widget * @screenshot Example with four radiobuttons * <radiobuttons name="x" value="item2"> diff --git a/client/widgets/textedit.h b/client/widgets/textedit.h index 542dd6f..fbbb040 100644 --- a/client/widgets/textedit.h +++ b/client/widgets/textedit.h @@ -35,6 +35,7 @@ /*** * Multiline Text Edit Widget * @tag textedit + * @clientside * @screenshot Example of a textedit. * <textedit name="x" value="This is a multiline textfield. * It may contain all text in the universe, it will simply add a scrollbar."/> diff --git a/client/widgets/widget.h b/client/widgets/widget.h index 6199aa4..f2bf278 100644 --- a/client/widgets/widget.h +++ b/client/widgets/widget.h @@ -44,6 +44,7 @@ /*** * Virtual Base Widget * This tag is purely virtual. It is inherited by all other widgets. + * @clientside * @att name The name of the widget. This is also the name used by the scripts. * @att value The initial value of the widget. It is overwritten if there is a * map with a recent value or if the database contains a recent value. diff --git a/client/widgets/window.h b/client/widgets/window.h index ea3af0a..8fb5c59 100644 --- a/client/widgets/window.h +++ b/client/widgets/window.h @@ -34,6 +34,7 @@ * Widgets Outer Container * @tag widgets * @container + * @clientside * This is the outer tag of the macro widgets. * @att caption This is the name that will be shown in the macro. * @att layout this is the layout that is used by the macro. It can be one of |