diff options
Diffstat (limited to 'client')
| -rw-r--r-- | client/client.pro | 1 | ||||
| -rw-r--r-- | client/macrowindow.cc | 15 | ||||
| -rw-r--r-- | client/pracro.cc | 6 |
3 files changed, 13 insertions, 9 deletions
diff --git a/client/client.pro b/client/client.pro index 7523dac..c2e3ccf 100644 --- a/client/client.pro +++ b/client/client.pro @@ -4,7 +4,6 @@ TEMPLATE = app TARGET = pracro DEPENDPATH += . widgets INCLUDEPATH += . widgets -SUBDIRS += editor QT += core gui network xml # For debugging diff --git a/client/macrowindow.cc b/client/macrowindow.cc index 764bf79..551c804 100644 --- a/client/macrowindow.cc +++ b/client/macrowindow.cc @@ -71,12 +71,17 @@ void MacroWindow::initMacro(QDomNode &node) if(xml_elem.hasAttribute("name")) macro = xml_elem.attribute("name"); if(xml_elem.hasAttribute("version")) version = xml_elem.attribute("version"); - } else if(xml_elem.tagName() == "luaprograms") { + } else if(xml_elem.tagName() == "scripts") { // Nothing to do here - } else if(xml_elem.tagName() == "luaprogram") { - - if(xml_elem.hasAttribute("name")) { - luaprograms[xml_elem.attribute("name")] = xml_elem.text(); + } else if(xml_elem.tagName() == "script") { + + if(xml_elem.hasAttribute("language") && + xml_elem.attribute("language") == "lua") { + if(xml_elem.hasAttribute("name")) { + luaprograms[xml_elem.attribute("name")] = xml_elem.text(); + } + } else { + printf("Unknown script type %s\n", xml_elem.attribute("language").toStdString().c_str()); } } else if(xml_elem.tagName() == "window") { diff --git a/client/pracro.cc b/client/pracro.cc index 754dff2..051fe2b 100644 --- a/client/pracro.cc +++ b/client/pracro.cc @@ -34,9 +34,9 @@ #define VERSION "1.0" -#define CPR_DEFAULT "0000000000" -#define MACRO_DEFAULT "example" -#define COURSE_DEFAULT "example" +#define CPR_DEFAULT "" +#define MACRO_DEFAULT "" +#define COURSE_DEFAULT "" #define USER_DEFAULT "testuser" #define CONFIG_DEFAULT "pracro.ini" |