diff options
author | Simon Rettberg | 2016-01-04 11:07:53 +0100 |
---|---|---|
committer | Simon Rettberg | 2016-01-04 11:07:53 +0100 |
commit | 42cd0a3f7e3b502693c1ef4be2a57886c86b006a (patch) | |
tree | b6655340f987f9ef7c2d737420f64aa4d0cac80f /src/main.cpp | |
parent | Update vmware icon (diff) | |
download | vmchooser2-42cd0a3f7e3b502693c1ef4be2a57886c86b006a.tar.gz vmchooser2-42cd0a3f7e3b502693c1ef4be2a57886c86b006a.tar.xz vmchooser2-42cd0a3f7e3b502693c1ef4be2a57886c86b006a.zip |
Update images
Diffstat (limited to 'src/main.cpp')
-rw-r--r-- | src/main.cpp | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/src/main.cpp b/src/main.cpp index b3dbce1..83c93de 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -45,6 +45,7 @@ int main(int argc, char *argv[]) { " -v, --version print version and exit\n" " -h, --help print usage information and exit\n" " -S, --runscript change path to run-virt.sh\n" + " -T --tab default tab (0=xsession, 1=my vms, 2=all vms)\n" "\nFILE can be a vmware .xml or an X .desktop file\n").toUtf8().data()); if (cmdOptions.contains("error")) { @@ -99,13 +100,14 @@ int main(int argc, char *argv[]) { QSettings settings(confFile, QSettings::IniFormat); settings.setIniCodec("UTF-8"); - QString defaultSession; - if (cmdOptions.contains("default")) { - defaultSession = cmdOptions.value("default"); - } else if (settings.contains("default")) { - defaultSession = settings.value("default").toString(); - } else { - defaultSession = ChooserSettings::getSetting("last-session"); + if (ChooserSettings::getSetting("last-session").isEmpty()) { + QString defaultSession; + if (cmdOptions.contains("default")) { + defaultSession = cmdOptions.value("default"); + } else if (settings.contains("default")) { + defaultSession = settings.value("default").toString(); + } + ChooserSettings::setSetting("last-session", defaultSession); } if (cmdOptions.contains("xpath")) { @@ -197,10 +199,15 @@ int main(int argc, char *argv[]) { basePath = settings.value("path").toString(); } + int defaultTab = -1; + if (cmdOptions.contains("tab")) { + defaultTab = cmdOptions.value("tab").toInt(); + } + /* read session files */ QList<Session*> xsessions(XSession::readSessions(xSessionPath)); - Dialog w; + Dialog w(defaultTab); /* DOWNLOAD VSESSIONS */ HttpXmlDownloader httpxmldownloader; |