diff options
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/src/main.cpp b/src/main.cpp index 4172d79..08e9246 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -6,10 +6,10 @@ #include <iostream> #include "fbgui.h" -extern QUrl baseUrl; +extern QUrl baseURL; // temporary settings testing stuff -QMap<QString, QString> options; +QMap<QString, QString> clo; void printHelp() { @@ -28,7 +28,6 @@ int main(int argc, char *argv[]) app->setApplicationName("fbgui"); app->setObjectName("test"); - /* Parse cmdline argus. */ int longIndex = 0; static const char *optString = "u:h"; @@ -43,31 +42,29 @@ int main(int argc, char *argv[]) switch(opt) { case 'u': - options.insert("url", optarg); + clo.insert("url", optarg); break; case 'h': - options.insert("help", "help"); + clo.insert("help", "help"); break; } opt = getopt_long(argc, argv, optString, longOpts, &longIndex); } - // - if (options.contains("help")) + if (clo.contains("help")) { printHelp(); exit(EXIT_SUCCESS); } - // + // Read the config file, for now hardcoded expected name. + QSettings confFileSettings(app->applicationDirPath() + "/fbgui.conf", QSettings::IniFormat); + confFileSettings.setIniCodec("UTF-8"); - if (options.contains("url")) - // TODO: also check in conf before settings this. - baseUrl = options.value("url"); + if (clo.contains("url")) + baseURL = clo.value("url"); + else if (confFileSettings.contains("default/url")) + baseURL = confFileSettings.value("default/url").toUrl(); else - { - std::cout << "No URL specified. Exiting..."; - exit(EXIT_FAILURE); - } - // TODO: Read INI. + baseURL = DEFAULT_URL; // Start fbgui. fbgui *gui = new fbgui(); |