diff options
| author | Sebastien Braun | 2010-10-06 00:04:49 +0200 |
|---|---|---|
| committer | Sebastien Braun | 2010-10-06 00:04:49 +0200 |
| commit | f07fc3b426815e28fde23313242fbbb998a08d45 (patch) | |
| tree | ba9eda1a83135a1727d2d35661d6facabee53b95 /misc | |
| parent | Fix recognition of letters in keyboard handler (diff) | |
| parent | Merge remote branch 'openslx/master' into mcastft (diff) | |
| download | pvs-f07fc3b426815e28fde23313242fbbb998a08d45.tar.gz pvs-f07fc3b426815e28fde23313242fbbb998a08d45.tar.xz pvs-f07fc3b426815e28fde23313242fbbb998a08d45.zip | |
Merge remote branch 'openslx/mcastft' into input
Conflicts:
CMakeLists.txt
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
i18n/pvsmgr_ar_JO.ts
i18n/pvsmgr_de_DE.ts
i18n/pvsmgr_es_MX.ts
i18n/pvsmgr_fr_FR.ts
i18n/pvsmgr_pl_PL.ts
icons/README
pvsmgr.qrc
src/gui/mainWindow.cpp
src/pvs.cpp
src/pvs.h
src/pvsDaemon.cpp
src/util/clientGUIUtils.h
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/pvs.conf | 17 | ||||
| -rw-r--r-- | misc/pvsgui.conf | 3 | ||||
| -rw-r--r-- | misc/pvsgui.desktop | 4 | ||||
| -rw-r--r-- | misc/pvsmgr.conf | 12 |
4 files changed, 15 insertions, 21 deletions
diff --git a/misc/pvs.conf b/misc/pvs.conf index a6fe1f0..93c4ac5 100644 --- a/misc/pvs.conf +++ b/misc/pvs.conf @@ -1,10 +1,9 @@ -[General] -chatstate=on -chatmode=community -VNCPermit= +[VNC] +script=/usr/local/bin/pvs-vncsrv + +[Permissions] +vnc_lecturer=ro +vnc_other=no +allow_chat=T +allow_filetransfer=T -[room] -room=2 -background= -clientorder= -tag= diff --git a/misc/pvsgui.conf b/misc/pvsgui.conf new file mode 100644 index 0000000..9725bf5 --- /dev/null +++ b/misc/pvsgui.conf @@ -0,0 +1,3 @@ +[Display] +location=1 + diff --git a/misc/pvsgui.desktop b/misc/pvsgui.desktop new file mode 100644 index 0000000..676248d --- /dev/null +++ b/misc/pvsgui.desktop @@ -0,0 +1,4 @@ +[Desktop Entry] +Exec=/usr/local/bin/pvsgui +Type=Application +Name=pvsgui diff --git a/misc/pvsmgr.conf b/misc/pvsmgr.conf index 3ff7b40..e69de29 100644 --- a/misc/pvsmgr.conf +++ b/misc/pvsmgr.conf @@ -1,12 +0,0 @@ -[Chat] -chatstate=on -chatmode=bossmode - -[Room] -roomId=123 - -[VNC] -quality=high - -[General] -chatmode=private |