diff options
| author | Fabian Schillinger | 2010-07-10 02:14:20 +0200 |
|---|---|---|
| committer | Fabian Schillinger | 2010-07-10 02:14:20 +0200 |
| commit | 99021fc683c36f57fdad8dc812e2267fca4cbcf7 (patch) | |
| tree | 5fd77585e4e5dbd171427186e4c31ad09ca18e68 /src/pvs.cpp | |
| parent | Inserted some Buttons in GUI and TouchGUI and modified handling of commands i... (diff) | |
| parent | Configuration by pvs via D-Bus. Old .allow ist now deprecated, config file: .... (diff) | |
| download | pvs-99021fc683c36f57fdad8dc812e2267fca4cbcf7.tar.gz pvs-99021fc683c36f57fdad8dc812e2267fca4cbcf7.tar.xz pvs-99021fc683c36f57fdad8dc812e2267fca4cbcf7.zip | |
Merge branch 'master' of openslx.org:pvs
Conflicts:
i18n/pvs_ar_JO.ts
i18n/pvs_de_DE.ts
i18n/pvs_es_MX.ts
i18n/pvs_fr_FR.ts
i18n/pvs_pl_PL.ts
Diffstat (limited to 'src/pvs.cpp')
| -rw-r--r-- | src/pvs.cpp | 33 |
1 files changed, 15 insertions, 18 deletions
diff --git a/src/pvs.cpp b/src/pvs.cpp index 66a1c88..d09d407 100644 --- a/src/pvs.cpp +++ b/src/pvs.cpp @@ -330,24 +330,9 @@ bool PVS::allowExists() */ bool PVS::getVNCAllow() { - if (allowExists()) - { - if (getAllowed()) - { - _vncAllowed = true; - } - else - { - _vncAllowed = false; - } - } - else - { - ConsoleLog writeError("No .allow file found."); - _vncAllowed = false; - //make sure the vncsever is off - ConsoleLog writeError("Shutting down vnc-server because we have no .allow file."); - } + + QString value = getConfigValue("Permissions/vnc_lecturer"); + _vncAllowed = (value == "rw" || value == "ro"); if (_vncAllowed && _vncRequested) { @@ -640,3 +625,15 @@ void PVS::signalHandler(int signal) } +void PVS::setConfigValue(QString key, QString value) +{ + _settings.setValue(key, value); + _settings.sync(); + getVNCAllow(); +} + +QString PVS::getConfigValue(QString key) +{ + return _settings.value(key).toString(); +} + |