diff options
Diffstat (limited to 'src/fbgui/main.cpp')
| -rw-r--r-- | src/fbgui/main.cpp | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/src/fbgui/main.cpp b/src/fbgui/main.cpp index e8b65f9..4c7daf8 100644 --- a/src/fbgui/main.cpp +++ b/src/fbgui/main.cpp @@ -80,12 +80,12 @@ int main(int argc, char *argv[]) { // parse command line arguments using getopt QMap<QString, QString> clOpts; int longIndex = 0; - static const char *optString = "c:u:d:s:t:D:hl:"; + static const char *optString = "c:u:d:s:t:D:hl:n"; static const struct option longOpts[] = { { "config", required_argument, NULL, 'c' }, { "url", required_argument, NULL, 'u' }, { "download", required_argument, NULL, 'd' }, { "serial", required_argument, NULL, 's' }, { "trigger", required_argument, NULL, 't' }, { "debug", required_argument, NULL, 'D' }, { "help", no_argument, NULL, 'h' }, { "log", - required_argument, NULL, 'l' }, + required_argument, NULL, 'l' }, { "nd", no_argument, NULL, 'n' } , { "server", required_argument, NULL, 'S' }, { "autoup", no_argument, NULL, 'a' }, { "socketserverpath", required_argument, NULL, 'p' }, @@ -118,6 +118,9 @@ int main(int argc, char *argv[]) { case 'h': clOpts.insert("help", "help"); break; + case 'n': + clOpts.insert("nd", "nd"); + break; case 'S': clOpts.insert("server", optarg); break; @@ -289,12 +292,19 @@ int main(int argc, char *argv[]) { //QWSServer::instance()->setDefaultMouse("IntelliMouse:/dev/mice"); - // start ndgui - LOG4CXX_DEBUG(logger, "Initializing ndgui..."); - ndgui ngui; fbgui gui; + ndgui ngui; + + if (clOpts.contains("nd") || confFileSettings.contains("default/nd")) { + LOG4CXX_DEBUG(logger, "Initializing ndgui..."); + QObject::connect(&ngui, SIGNAL(initFbgui()), &gui, SLOT(init())); + ngui.init(); + ngui.show(); + } + else { + gui.init(); + gui.show(); + } - QObject::connect(&ngui, SIGNAL(initFbgui()), &gui, SLOT(init())); - ngui.show(); return app.exec(); } |