diff options
| author | Simon Rettberg | 2019-05-30 01:14:31 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2019-05-30 01:14:31 +0200 |
| commit | df168536ca1aaf0b147e67ef214bf35dfd34e441 (patch) | |
| tree | 7ffcd8e12318c57440e733728de71cf556705c12 /src/globals.h | |
| parent | Add 'disable screensaver' checkbox (diff) | |
| download | vmchooser2-df168536ca1aaf0b147e67ef214bf35dfd34e441.tar.gz vmchooser2-df168536ca1aaf0b147e67ef214bf35dfd34e441.tar.xz vmchooser2-df168536ca1aaf0b147e67ef214bf35dfd34e441.zip | |
Cleanup, and rewrite cmdline + settings handling
Command line parsing now uses QCommandLineXXX classes
Old unused options have been removed, like the "pools" feature
Closes #3599
Diffstat (limited to 'src/globals.h')
| -rw-r--r-- | src/globals.h | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/src/globals.h b/src/globals.h index 860048e..81bf2f5 100644 --- a/src/globals.h +++ b/src/globals.h @@ -5,6 +5,10 @@ #define VMCHOOSER_SESSION_START_SCRIPT "/opt/openslx/vmchooser/sessionstart" #define VMCHOOSER_THEME_BASE "/opt/openslx/vmchooser/themes" +#define VMCHOOSER_X_SESSIONS_PATH "/usr/share/xsessions" +#define RUN_VIRT_PATH "/opt/openslx/scripts/vmchooser-run_virt" + +#define CONFIG_FILE_GLOBAL "/opt/openslx/vmchooser/config/vmchooser.conf" #define VMCHOOSER_DEFAULT_WIDTH 800 #define VMCHOOSER_DEFAULT_HEIGHT 600 @@ -14,40 +18,21 @@ class Session; extern bool g_debugMode; -extern bool g_pvsEnabled; -extern bool g_pvsChecked; +extern bool g_fullscreen; extern int g_autoQuitSeconds; -extern bool g_allowVmEdit; -extern QString g_xSessionPath; - -extern QString g_runVmScript; -extern QString printerScript; -extern QString scannerScript; // Script that is run before the xsession/vsession is started extern const QString SESSION_START_SCRIPT; -extern const QString CONFIG_FILE_GLOBAL; extern const QString CONFIG_FILE_USER; extern const QString CONFIG_FILE_XSESSIONS; extern const QString PREVIOUS_SESSION_USER; -extern QString g_currentPoolName; -extern QString g_themeName; -extern QString g_vmBasePath; - extern const QString TEMP_PATH_ICONS; extern const QString TEMP_PATH_XML_LIST; extern const QString TEMP_PATH_HELP; extern const QString TEMP_PATH_NEWS; -extern QString g_urlBase; -extern QString g_urlList; -extern QString g_urlNews; -extern QString g_urlHelp; - -extern bool g_fullscreen; - #define TEMPLATES_IGNORE (0) #define TEMPLATES_BUMP (1) extern int g_templateHandling; |