From 9bacddf36631572b610f042e17b5ee631dfebbca Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Sun, 30 Oct 2022 12:03:43 +0100 Subject: Modernize cmake file and project structure a bit --- CMakeLists.txt | 118 +- gui/client/connect.ui | 216 -- gui/client/toolbar.ui | 233 -- gui/server_normal/mainwindow.ui | 339 -- gui/server_normal/numerickeyboard.ui | 173 - gui/server_normal/reloadroom.ui | 73 - gui/server_normal/sessionname.ui | 66 - icons/altexit.svg | 301 -- icons/altterm.svg | 498 --- icons/broadcast.svg | 32 - icons/cam32.svg | 99 - icons/cf_icon_cam.svg | 142 - icons/cf_icon_eye.svg | 31 - icons/cf_icon_lock.svg | 55 - icons/chat_msg16.svg | 97 - icons/dark-green-check-mark.svg | 65 - icons/darrow16.svg | 75 - icons/dozent.svg | 2363 ------------ icons/exit.svg | 301 -- icons/eye.svg | 227 -- icons/graduate.svg | 1932 ---------- icons/hand-raise-red.svg | 37 - icons/hand-raise.svg | 36 - icons/help.svg | 212 -- icons/keyboard_key.svg | 152 - icons/lock-single.svg | 980 ----- icons/lock.svg | 1835 --------- icons/log-out.svg | 284 -- icons/ok16.svg | 75 - icons/photo.svg | 1003 ----- icons/refresh.svg | Bin 8103 -> 0 bytes icons/reloadClassroom.svg | 516 --- icons/screen.svg | 469 --- icons/space.svg | 62 - icons/stopprojection.svg | 2531 ------------ icons/student2all.svg | 2663 ------------- icons/student2tutor.svg | 2506 ------------ icons/student2tutor_extension.svg | 3805 ------------------ icons/terminal.svg | 390 -- icons/trash.svg | 1187 ------ icons/tutor2all.svg | 4025 -------------------- icons/tutor2student.svg | 2494 ------------ icons/view-restore.svg | 422 -- pvs2.config | 1 - pvs2.creator | 1 - pvs2.files | 93 - pvs2.includes | 18 - pvsclient.qrc | 21 - pvsmgr.qrc | 31 - res/icons/altexit.svg | 301 ++ res/icons/altterm.svg | 498 +++ res/icons/broadcast.svg | 32 + res/icons/cam32.svg | 99 + res/icons/cf_icon_cam.svg | 142 + res/icons/cf_icon_eye.svg | 31 + res/icons/cf_icon_lock.svg | 55 + res/icons/chat_msg16.svg | 97 + res/icons/dark-green-check-mark.svg | 65 + res/icons/darrow16.svg | 75 + res/icons/dozent.svg | 2363 ++++++++++++ res/icons/exit.svg | 301 ++ res/icons/eye.svg | 227 ++ res/icons/graduate.svg | 1932 ++++++++++ res/icons/hand-raise-red.svg | 37 + res/icons/hand-raise.svg | 36 + res/icons/help.svg | 212 ++ res/icons/keyboard_key.svg | 152 + res/icons/lock-single.svg | 980 +++++ res/icons/lock.svg | 1835 +++++++++ res/icons/log-out.svg | 284 ++ res/icons/ok16.svg | 75 + res/icons/photo.svg | 1003 +++++ res/icons/refresh.svg | Bin 0 -> 8103 bytes res/icons/reloadClassroom.svg | 516 +++ res/icons/screen.svg | 469 +++ res/icons/space.svg | 62 + res/icons/stopprojection.svg | 2531 ++++++++++++ res/icons/student2all.svg | 2663 +++++++++++++ res/icons/student2tutor.svg | 2506 ++++++++++++ res/icons/student2tutor_extension.svg | 3805 ++++++++++++++++++ res/icons/terminal.svg | 390 ++ res/icons/trash.svg | 1187 ++++++ res/icons/tutor2all.svg | 4025 ++++++++++++++++++++ res/icons/tutor2student.svg | 2494 ++++++++++++ res/icons/view-restore.svg | 422 ++ res/pvsclient.qrc | 15 + res/pvsclient_ts.qrc | 9 + res/pvsmgr.qrc | 25 + res/pvsmgr_ts.qrc | 9 + src/client/clientapp/clientapp.cpp | 6 +- src/client/connectwindow/connectwindow.cpp | 6 +- src/client/connectwindow/connectwindow.h | 1 + src/client/connectwindow/connectwindow.ui | 216 ++ src/client/toolbar/toolbar.ui | 233 ++ src/server/mainwindow/mainwindow.cpp | 23 +- src/server/mainwindow/mainwindow.ui | 339 ++ src/server/numerickeyboard/numerickeyboard.ui | 173 + src/server/reloadroomwindow/reloadroomwindow.cpp | 25 +- src/server/reloadroomwindow/reloadroomwindow.h | 15 +- src/server/reloadroomwindow/reloadroomwindow.ui | 73 + src/server/sessionnamewindow/sessionnamewindow.cpp | 2 +- src/server/sessionnamewindow/sessionnamewindow.ui | 66 + 102 files changed, 33141 insertions(+), 33282 deletions(-) delete mode 100644 gui/client/connect.ui delete mode 100644 gui/client/toolbar.ui delete mode 100644 gui/server_normal/mainwindow.ui delete mode 100644 gui/server_normal/numerickeyboard.ui delete mode 100644 gui/server_normal/reloadroom.ui delete mode 100644 gui/server_normal/sessionname.ui delete mode 100644 icons/altexit.svg delete mode 100644 icons/altterm.svg delete mode 100644 icons/broadcast.svg delete mode 100644 icons/cam32.svg delete mode 100644 icons/cf_icon_cam.svg delete mode 100644 icons/cf_icon_eye.svg delete mode 100644 icons/cf_icon_lock.svg delete mode 100644 icons/chat_msg16.svg delete mode 100644 icons/dark-green-check-mark.svg delete mode 100644 icons/darrow16.svg delete mode 100644 icons/dozent.svg delete mode 100644 icons/exit.svg delete mode 100644 icons/eye.svg delete mode 100644 icons/graduate.svg delete mode 100644 icons/hand-raise-red.svg delete mode 100644 icons/hand-raise.svg delete mode 100644 icons/help.svg delete mode 100644 icons/keyboard_key.svg delete mode 100644 icons/lock-single.svg delete mode 100644 icons/lock.svg delete mode 100644 icons/log-out.svg delete mode 100644 icons/ok16.svg delete mode 100644 icons/photo.svg delete mode 100644 icons/refresh.svg delete mode 100644 icons/reloadClassroom.svg delete mode 100644 icons/screen.svg delete mode 100644 icons/space.svg delete mode 100644 icons/stopprojection.svg delete mode 100644 icons/student2all.svg delete mode 100644 icons/student2tutor.svg delete mode 100644 icons/student2tutor_extension.svg delete mode 100644 icons/terminal.svg delete mode 100644 icons/trash.svg delete mode 100644 icons/tutor2all.svg delete mode 100644 icons/tutor2student.svg delete mode 100644 icons/view-restore.svg delete mode 100644 pvs2.config delete mode 100644 pvs2.creator delete mode 100644 pvs2.files delete mode 100644 pvs2.includes delete mode 100644 pvsclient.qrc delete mode 100644 pvsmgr.qrc create mode 100644 res/icons/altexit.svg create mode 100644 res/icons/altterm.svg create mode 100644 res/icons/broadcast.svg create mode 100644 res/icons/cam32.svg create mode 100644 res/icons/cf_icon_cam.svg create mode 100644 res/icons/cf_icon_eye.svg create mode 100644 res/icons/cf_icon_lock.svg create mode 100644 res/icons/chat_msg16.svg create mode 100644 res/icons/dark-green-check-mark.svg create mode 100644 res/icons/darrow16.svg create mode 100644 res/icons/dozent.svg create mode 100644 res/icons/exit.svg create mode 100644 res/icons/eye.svg create mode 100644 res/icons/graduate.svg create mode 100644 res/icons/hand-raise-red.svg create mode 100644 res/icons/hand-raise.svg create mode 100644 res/icons/help.svg create mode 100644 res/icons/keyboard_key.svg create mode 100644 res/icons/lock-single.svg create mode 100644 res/icons/lock.svg create mode 100644 res/icons/log-out.svg create mode 100644 res/icons/ok16.svg create mode 100644 res/icons/photo.svg create mode 100644 res/icons/refresh.svg create mode 100644 res/icons/reloadClassroom.svg create mode 100644 res/icons/screen.svg create mode 100644 res/icons/space.svg create mode 100644 res/icons/stopprojection.svg create mode 100644 res/icons/student2all.svg create mode 100644 res/icons/student2tutor.svg create mode 100644 res/icons/student2tutor_extension.svg create mode 100644 res/icons/terminal.svg create mode 100644 res/icons/trash.svg create mode 100644 res/icons/tutor2all.svg create mode 100644 res/icons/tutor2student.svg create mode 100644 res/icons/view-restore.svg create mode 100644 res/pvsclient.qrc create mode 100644 res/pvsclient_ts.qrc create mode 100644 res/pvsmgr.qrc create mode 100644 res/pvsmgr_ts.qrc create mode 100644 src/client/connectwindow/connectwindow.ui create mode 100644 src/client/toolbar/toolbar.ui create mode 100644 src/server/mainwindow/mainwindow.ui create mode 100644 src/server/numerickeyboard/numerickeyboard.ui create mode 100644 src/server/reloadroomwindow/reloadroomwindow.ui create mode 100644 src/server/sessionnamewindow/sessionnamewindow.ui diff --git a/CMakeLists.txt b/CMakeLists.txt index 5e1b550..69efa33 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,6 +17,10 @@ SET(CMAKE_CXX_STANDARD 11) SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11 ${EXTRA_C_FLAGS}") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 ${EXTRA_CXX_FLAGS}") +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) +set(CMAKE_AUTOUIC ON) + # local cmake modules SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake) @@ -26,14 +30,13 @@ FIND_PACKAGE(X11 REQUIRED) FIND_PACKAGE(VNC REQUIRED) SET(CMAKE_INCLUDE_CURRENT_DIR ON) -SET(CMAKE_AUTOMOC ON) # some includes -INCLUDE_DIRECTORIES( - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_BINARY_DIR} - ${X11_INCLUDE_DIR} -) +#INCLUDE_DIRECTORIES( +# ${CMAKE_CURRENT_SOURCE_DIR} +# ${CMAKE_CURRENT_BINARY_DIR} +# ${X11_INCLUDE_DIR} +#) IF(X11_Xscreensaver_FOUND) ADD_DEFINITIONS(-DX11_Xscreensaver_FOUND) @@ -78,20 +81,27 @@ FILE(GLOB PVSCLIENT_SRCS ################################################################################ # .ui files -FILE(GLOB PVSMGR_UIS - gui/server_normal/*.ui +FILE(GLOB_RECURSE PVSMGR_UIS + src/server/*.ui ) -FILE(GLOB PVSCLIENT_UIS - gui/client/*.ui +FILE(GLOB_RECURSE PVSCLIENT_UIS + src/client/*.ui ) # .qrc files +# Copy these to build dir since the paths inside are relative, and this is where the translations end up +configure_file(res/pvsmgr_ts.qrc ${CMAKE_CURRENT_BINARY_DIR} COPYONLY) +configure_file(res/pvsclient_ts.qrc ${CMAKE_CURRENT_BINARY_DIR} COPYONLY) + FILE(GLOB PVSMGR_RC_SRCS - pvsmgr.qrc + res/pvsmgr.qrc + ${CMAKE_CURRENT_BINARY_DIR}/pvsmgr_ts.qrc + ) FILE(GLOB PVSCLIENT_RC_SRCS - pvsclient.qrc + res/pvsclient.qrc + ${CMAKE_CURRENT_BINARY_DIR}/pvsclient_ts.qrc ) # i18n @@ -103,57 +113,12 @@ FILE(GLOB PVSCLIENT_TSS i18n/client/*.ts ) - -# this will run uic on .ui files -QT5_WRAP_UI(PVSMGR_UI_HDRS ${PVSMGR_UIS}) -QT5_WRAP_UI(PVSCLIENT_UI_HDRS ${PVSCLIENT_UIS}) - -# this will run moc -#QT4_WRAP_CPP(PVSMGR_MOC_SRCS ${PVSMGR_MOC_HDRS}) -#QT4_WRAP_CPP(PVSCLIENT_MOC_SRCS ${PVSCLIENT_MOC_HDRS}) - -option(UPDATE_TRANSLATIONS "Update .ts files (WARNING: make clean will delete the .ts files!)" OFF) - if(PVSMGR_TSS) - - if (UPDATE_TRANSLATIONS) - set(FILES_TO_TRANSLATE ${PVSMGR_SRCS} ${PVSMGR_UIS}) - QT5_CREATE_TRANSLATION(PVSMGR_QMS ${FILES_TO_TRANSLATE} ${PVSMGR_TSS} OPTIONS -noobsolete) - message(STATUS ".tr files have been updated") - else (UPDATE_TRANSLATIONS) - QT5_ADD_TRANSLATION(PVSMGR_QMS ${PVSMGR_TSS}) - endif (UPDATE_TRANSLATIONS) - # # write a resource file for qm files - # set(resource_file_content "\n \n") - # foreach(file ${PVSMGR_QMS}) - # get_filename_component(filename ${file} NAME) - # set(resource_file_content "${resource_file_content} ${filename}\n") - # endforeach(file) - # set(resource_file_content "${resource_file_content} \n\n") - # file(WRITE "${CMAKE_BINARY_DIR}/ts_pvsmgr.qrc" "${resource_file_content}") - # set(PVSMGR_RESOURCES ${PVSMGR_RESOURCES} "${CMAKE_BINARY_DIR}/ts_pvsmgr.qrc") - + QT5_CREATE_TRANSLATION(PVSMGR_QMS ${PVSMGR_UIS} ${PVSMGR_SRCS} ${PVSMGR_TSS} OPTIONS -noobsolete) endif(PVSMGR_TSS) if(PVSCLIENT_TSS) - - if (UPDATE_TRANSLATIONS) - set(FILES_TO_TRANSLATE ${PVSCLIENT_SRCS} ${PVSCLIENT_UIS}) - QT5_CREATE_TRANSLATION(PVSCLIENT_QMS ${FILES_TO_TRANSLATE} ${PVSCLIENT_TSS} OPTIONS -noobsolete) - message(STATUS ".tr files have been updated") - else (UPDATE_TRANSLATIONS) - QT5_ADD_TRANSLATION(PVSCLIENT_QMS ${PVSCLIENT_TSS}) - endif (UPDATE_TRANSLATIONS) - # # write a resource file for qm files - # set(resource_file_content "\n \n") - # foreach(file ${PVSCLIENT_QMS}) - # get_filename_component(filename ${file} NAME) - # set(resource_file_content "${resource_file_content} ${filename}\n") - # endforeach(file) - # set(resource_file_content "${resource_file_content} \n\n") - # file(WRITE "${CMAKE_BINARY_DIR}/ts_pvsclient.qrc" "${resource_file_content}") - # set(PVSCLIENT_RESOURCES ${PVSCLIENT_RESOURCES} "${CMAKE_BINARY_DIR}/ts_pvsclient.qrc") - + QT5_CREATE_TRANSLATION(PVSCLIENT_QMS ${PVSCLIENT_UIS} ${PVSCLIENT_SRCS} ${PVSCLIENT_TSS} OPTIONS -noobsolete) endif(PVSCLIENT_TSS) # this will run rcc on .qrc files @@ -167,8 +132,6 @@ QT5_ADD_RESOURCES(PVSCLIENT_RCS ${PVSCLIENT_RC_SRCS}) ADD_EXECUTABLE(pvsmgr ${PVSMGR_SRCS} ${PVSMGR_RCS} -# ${PVSMGR_MOC_SRCS} - ${PVSMGR_UI_HDRS} ${PVSMGR_RC_SRCS} ${PVSMGR_QMS} ) @@ -176,8 +139,6 @@ ADD_EXECUTABLE(pvsmgr ADD_EXECUTABLE(pvsclient ${PVSCLIENT_SRCS} ${PVSCLIENT_RCS} -# ${PVSCLIENT_MOC_SRCS} - ${PVSCLIENT_UI_HDRS} ${PVSCLIENT_RC_SRCS} ${PVSCLIENT_QMS} ) @@ -188,7 +149,6 @@ TARGET_LINK_LIBRARIES(pvsmgr Qt5::Widgets Qt5::Svg Qt5::X11Extras -# ${VNC_LIBRARIES} ${X11_LIBRARIES} ${X11_Xscreensaver_LIB} ) @@ -204,33 +164,3 @@ SET_PROPERTY(TARGET pvsmgr PROPERTY COMPILE_DEFINITIONS MAINWINDOW_USE_NORMALGUI # install INSTALL(TARGETS pvsmgr pvsclient RUNTIME DESTINATION bin) -#INSTALL(PROGRAMS misc/pvs-vncsrv DESTINATION bin) -#INSTALL(FILES misc/pvsclient.conf misc/pvsmgr.conf DESTINATION /etc/openslx) -#INSTALL(FILES misc/pvsclient.desktop DESTINATION /etc/xdg/autostart) - -# uninstall -CONFIGURE_FILE( - "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Uninstall.cmake" - "${CMAKE_CURRENT_BINARY_DIR}/cmake/Uninstall.cmake" - IMMEDIATE @ONLY -) -ADD_CUSTOM_TARGET(uninstall - "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake/Uninstall.cmake" -) - -# package -SET( CPACK_GENERATOR "DEB" ) -SET( CPACK_SET_DESTDIR "ON" ) -SET( CPACK_PACKAGE_NAME "pvs" ) -SET( CPACK_PACKAGE_VERSION_MAJOR "3" ) -SET( CPACK_PACKAGE_VERSION_MINOR "1" ) -SET( CPACK_PACKAGE_VERSION_PATCH "2" ) -SET( CPACK_PACKAGE_DESCRIPTION_SUMMARY "Pool Video Switch" ) -SET( CPACK_PACKAGE_DESCRIPTION "") -SET( CPACK_PACKAGE_CONTACT "Johann Latocha " ) -SET( CPACK_DEBIAN_PACKAGE_DEPENDS "libvncserver0 (>= 0.9.3.dfsg.1-2), libqtgui4 (>= 4:4.5.3-4), libqt4-dbus (>= 4:4.5.3-4), libqt4-network (>= 4:4.5.3-4)" ) -SET( CPACK_DEBIAN_PACKAGE_ARCHITECTURE "i386" ) -SET( CPACK_DEBIAN_PACKAGE_SECTION "Network" ) -SET( CPACK_DEBIAN_PACKAGE_PRIORITY "optional" ) -SET( CPACK_DEBIAN_PACKAGE_RECOMMENDS "x11vnc (>= 0.9.9-1)" ) -INCLUDE( CPack ) diff --git a/gui/client/connect.ui b/gui/client/connect.ui deleted file mode 100644 index 0bfc654..0000000 --- a/gui/client/connect.ui +++ /dev/null @@ -1,216 +0,0 @@ - - - ConnectWindow - - - Qt::WindowModal - - - - 0 - 0 - 512 - 233 - - - - - 512 - 92 - - - - Connect to PVS session - - - - - - false - - - 0 - - - - - 0 - - - 0 - - - 0 - - - 0 - - - - - Connection - - - - - - Connect to - - - - - - - - - - - - - - 0 - 0 - - - - Manual Connection - - - - - - Session Name - - - - - - - - 0 - 0 - - - - - - - - - - - - - 0 - - - 0 - - - 0 - - - 0 - - - - - true - - - - 0 - 0 - - - - - 94 - 72 - - - - :/dark-green-check-mark.svg - - - true - - - - - - - - - - - 6 - - - - - Close - - - false - - - false - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Connect - - - true - - - true - - - - - - - - - - - - diff --git a/gui/client/toolbar.ui b/gui/client/toolbar.ui deleted file mode 100644 index 9908dda..0000000 --- a/gui/client/toolbar.ui +++ /dev/null @@ -1,233 +0,0 @@ - - - Toolbar - - - - 0 - 0 - 281 - 28 - - - - Form - - - #Toolbar { - background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #f6f7fa, stop: 1 #dadbde); - border-radius: 0px; -} -QLabel { - background-color: none; -} -/* QPushButton */ -QPushButton { - background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #f6f7fa, stop: 1 #dadbde); - border: 2px solid #8f8f91; - border-radius: 4px; - min-width: 80px; -} -QPushButton:hover { - border: 2px solid rgb(0, 170, 255); -} -QPushButton:pressed { - background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #dadbde, stop: 1 #f6f7fa); -} -QPushButton:checked { - background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #cacbce, stop: 1 #e6e7ea); -} -QPushButton::menu-indicator { - image: url(:/darrow16.svg); -} - - - - - 1 - - - 2 - - - 2 - - - 2 - - - 2 - - - - - - 0 - 0 - - - - - 84 - 24 - - - - Menu - - - Menu - - - - - - - Qt::Horizontal - - - - 20 - 20 - - - - - - - - color:red - - - Offline - - - - - - - Qt::Horizontal - - - - 19 - 20 - - - - - - - - - 16 - 16 - - - - - 16 - 16 - - - - - - - true - - - - - - - - 10 - 75 - true - true - true - - - - color:#05f; - - - PVS - - - - - - - Qt::Horizontal - - - - 20 - 20 - - - - - - - - - - - - 0 - 0 - - - - - 30 - 24 - - - - - 30 - 16777215 - - - - - 30 - 0 - - - - - 30 - 0 - - - - - - - - :/hand-raise - :/hand-raise-red:/hand-raise - - - - 22 - 22 - - - - true - - - - - - - - - - diff --git a/gui/server_normal/mainwindow.ui b/gui/server_normal/mainwindow.ui deleted file mode 100644 index 62b92f7..0000000 --- a/gui/server_normal/mainwindow.ui +++ /dev/null @@ -1,339 +0,0 @@ - - - MainWindow - - - - 0 - 0 - 846 - 801 - - - - PVS2 Manager - - - QToolButton { - border-radius: 8px; - padding: 4px; - margin: 5px; - border: 1px solid #777; -} -QToolButton:enabled { -background-color: #f8f8f8; -border: 1px solid #555; -} -QToolButton:enabled:hover { - background: qradialgradient(cx: 0.4, cy: -0.1, -fx: 0.4, fy: -0.1, -radius: 1.35, stop: 0 #fff, stop: 1 #ddd); -} - -QToolButton:enabled:checked, -QToolButton:enabled:pressed { -background: qradialgradient(cx: 0.4, cy: -0.1, -fx: 0.4, fy: -0.1, -radius: 1.35, stop: 0 #888, stop: 1 #aaa); -} -QLabel#examModeLabel { - width: 71px; - margin: 5px; - border-radius: 8px; - background-color: rgb(170, 170, 170); -} - - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - 3 - - - - - QFrame::StyledPanel - - - QFrame::Sunken - - - 2 - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - - 1 - 1 - - - - 0 - - - - - - - - - - - - - - - - toolBar - - - Qt::LeftToRight - - - true - - - false - - - - 48 - 48 - - - - LeftToolBarArea - - - false - - - - - - - - - - - - - - - - - - - :/exit - :/exit:/exit - - - Exit - - - Exit - - - Ctrl+Q - - - - - true - - - - :/lock:/lock - - - This will show a black screen on all connected clients, except the tutor's client. - - - Lock/Unlock all clients - - - Ctrl+A - - - - - - :/student2tutor:/student2tutor - - - Stream currently selected client's screen content to the tutor's client. - - - Student's Screen to Tutor - - - - - - :/student2tutorextension:/student2tutorextension - - - Stream currently selected client's screen content to the tutor's client while showing a locked black screen on all other clients. - - - Student's Screen to Tutor, others blanked - - - - - - :/tutor2student:/tutor2student - - - Stream the tutor's screen contents to the currently selected client. - - - Tutor's Screen to Student - - - - - - :/tutor2all:/tutor2all - - - Stream the tutor's screen contents to everyone. - - - Tutor's Screen to Everyone - - - - - - :/reset:/reset - - - Unlock all clients, stop any running screen content streaming. - - - Reset - - - R - - - - - - :/dozent:/dozent - - - Declare the currently selected client as tutor. The tutor will be excluded from screen locking and can be used as a fixed source/target for screen content streaming. - - - Declare tutor - - - T - - - - - - :/trash:/trash - - - Delete currently selected client. Only allowed for disconnected clients. - - - Delete Client - - - Del - - - true - - - - - - :/helpme:/helpme - - - Show this help text. - - - Help - - - F1 - - - true - - - - - - :/reloadClassroom:/reloadClassroom - - - This shows a list of preconfigured rooms which you can load. This will reset the currently shown layout and disconnect all clients. - - - Load a new room layout - - - - - - :/lock-single:/lock-single - - - Lock or unlock the selected client only. - - - Lock/Unlock single client - - - L - - - - - - - - - - diff --git a/gui/server_normal/numerickeyboard.ui b/gui/server_normal/numerickeyboard.ui deleted file mode 100644 index 2f83a2b..0000000 --- a/gui/server_normal/numerickeyboard.ui +++ /dev/null @@ -1,173 +0,0 @@ - - - NumericKeyboard - - - - 0 - 0 - 438 - 300 - - - - - 0 - 300 - - - - GroupBox - - - Keyboard - - - - - - - 0 - 40 - - - - 0 - - - - - - - - 0 - 40 - - - - Del - - - - - - - - 0 - 40 - - - - 1 - - - - - - - - 0 - 40 - - - - 8 - - - - - - - - 0 - 40 - - - - 4 - - - - - - - - 0 - 40 - - - - 2 - - - - - - - - 0 - 40 - - - - 5 - - - - - - - - 0 - 40 - - - - 7 - - - - - - - - 0 - 40 - - - - 3 - - - - - - - - 0 - 40 - - - - 6 - - - - - - - - 0 - 40 - - - - 9 - - - - - - - - diff --git a/gui/server_normal/reloadroom.ui b/gui/server_normal/reloadroom.ui deleted file mode 100644 index 2fb723e..0000000 --- a/gui/server_normal/reloadroom.ui +++ /dev/null @@ -1,73 +0,0 @@ - - - ReloadRoom - - - - 0 - 0 - 432 - 400 - - - - Reload Room - - - true - - - - - - - 11 - - - - Choose room configuration to reload: - - - - - - - - 20 - PreferDefault - - - - Qt::DefaultContextMenu - - - Qt::LeftToRight - - - QListView::Adjust - - - - - - - - 20 - - - - * {font-size: 20pt;} - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - false - - - - - - - - diff --git a/gui/server_normal/sessionname.ui b/gui/server_normal/sessionname.ui deleted file mode 100644 index 299df3d..0000000 --- a/gui/server_normal/sessionname.ui +++ /dev/null @@ -1,66 +0,0 @@ - - - SessionName - - - Qt::ApplicationModal - - - - 0 - 0 - 400 - 226 - - - - - 0 - 0 - - - - Set session name - - - - - - New session name - - - - - - - - 14 - 75 - true - true - - - - - - - - - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - - - - - Random name - - - - - - - - diff --git a/icons/altexit.svg b/icons/altexit.svg deleted file mode 100644 index 5331ab6..0000000 --- a/icons/altexit.svg +++ /dev/null @@ -1,301 +0,0 @@ - - - -image/svg+xml \ No newline at end of file diff --git a/icons/altterm.svg b/icons/altterm.svg deleted file mode 100644 index 2197700..0000000 --- a/icons/altterm.svg +++ /dev/null @@ -1,498 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - Terminal - 2005-10-15 - - - Andreas Nilsson - - - - - terminal - emulator - term - command line - - - - - - Jakub Steiner - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/icons/broadcast.svg b/icons/broadcast.svg deleted file mode 100644 index 9d8b2f5..0000000 --- a/icons/broadcast.svg +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - image/svg+xml - - - - - - - - diff --git a/icons/cam32.svg b/icons/cam32.svg deleted file mode 100644 index c3f085c..0000000 --- a/icons/cam32.svg +++ /dev/null @@ -1,99 +0,0 @@ - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - diff --git a/icons/cf_icon_cam.svg b/icons/cf_icon_cam.svg deleted file mode 100644 index c51ab6d..0000000 --- a/icons/cf_icon_cam.svg +++ /dev/null @@ -1,142 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - diff --git a/icons/cf_icon_eye.svg b/icons/cf_icon_eye.svg deleted file mode 100644 index cfda228..0000000 --- a/icons/cf_icon_eye.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - diff --git a/icons/cf_icon_lock.svg b/icons/cf_icon_lock.svg deleted file mode 100644 index 5700e7d..0000000 --- a/icons/cf_icon_lock.svg +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/icons/chat_msg16.svg b/icons/chat_msg16.svg deleted file mode 100644 index 1e4be83..0000000 --- a/icons/chat_msg16.svg +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - diff --git a/icons/dark-green-check-mark.svg b/icons/dark-green-check-mark.svg deleted file mode 100644 index ac4238d..0000000 --- a/icons/dark-green-check-mark.svg +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - image/svg+xml - - - - - - - Green Check Mark - - Layer 1 - - - - - diff --git a/icons/darrow16.svg b/icons/darrow16.svg deleted file mode 100644 index 4b1609a..0000000 --- a/icons/darrow16.svg +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - - - - image/svg+xml - - - - - - - - - diff --git a/icons/dozent.svg b/icons/dozent.svg deleted file mode 100644 index 056a339..0000000 --- a/icons/dozent.svg +++ /dev/null @@ -1,2363 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - Person - - - Jakub Steiner - - - http://jimmac.musichall.cz - - - user - person - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/icons/exit.svg b/icons/exit.svg deleted file mode 100644 index d8766c9..0000000 --- a/icons/exit.svg +++ /dev/null @@ -1,301 +0,0 @@ - - - -image/svg+xml \ No newline at end of file diff --git a/icons/eye.svg b/icons/eye.svg deleted file mode 100644 index 86518ca..0000000 --- a/icons/eye.svg +++ /dev/null @@ -1,227 +0,0 @@ - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/icons/graduate.svg b/icons/graduate.svg deleted file mode 100644 index 63f9f88..0000000 --- a/icons/graduate.svg +++ /dev/null @@ -1,1932 +0,0 @@ - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/icons/hand-raise-red.svg b/icons/hand-raise-red.svg deleted file mode 100644 index 1391d3e..0000000 --- a/icons/hand-raise-red.svg +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - image/svg+xml - - - - - - - - - diff --git a/icons/hand-raise.svg b/icons/hand-raise.svg deleted file mode 100644 index 8dcbab1..0000000 --- a/icons/hand-raise.svg +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - image/svg+xml - - - - - - - - - diff --git a/icons/help.svg b/icons/help.svg deleted file mode 100644 index 2e97f37..0000000 --- a/icons/help.svg +++ /dev/null @@ -1,212 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/icons/keyboard_key.svg b/icons/keyboard_key.svg deleted file mode 100644 index c6cc88e..0000000 --- a/icons/keyboard_key.svg +++ /dev/null @@ -1,152 +0,0 @@ - - - -image/svg+xmlReset - \ No newline at end of file diff --git a/icons/lock-single.svg b/icons/lock-single.svg deleted file mode 100644 index 5e0cd95..0000000 --- a/icons/lock-single.svg +++ /dev/null @@ -1,980 +0,0 @@ - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/icons/lock.svg b/icons/lock.svg deleted file mode 100644 index 6359f2c..0000000 --- a/icons/lock.svg +++ /dev/null @@ -1,1835 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/icons/log-out.svg b/icons/log-out.svg deleted file mode 100644 index e94c873..0000000 --- a/icons/log-out.svg +++ /dev/null @@ -1,284 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - System-log-out - 2007-08-27 - - - Lapo Calamandrei - - - - - - - Kalle Persson - - - - - logout - exit - man - sign - running - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/icons/ok16.svg b/icons/ok16.svg deleted file mode 100644 index 3d60d49..0000000 --- a/icons/ok16.svg +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - - - - image/svg+xml - - - - - - - - - diff --git a/icons/photo.svg b/icons/photo.svg deleted file mode 100644 index 6552735..0000000 --- a/icons/photo.svg +++ /dev/null @@ -1,1003 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - Jakub Steiner - - - http://jimmac.musichall.cz - - Photo Camera - - - snapshot - camera - photo - compact - snap - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/icons/refresh.svg b/icons/refresh.svg deleted file mode 100644 index e499882..0000000 Binary files a/icons/refresh.svg and /dev/null differ diff --git a/icons/reloadClassroom.svg b/icons/reloadClassroom.svg deleted file mode 100644 index e3dfe62..0000000 --- a/icons/reloadClassroom.svg +++ /dev/null @@ -1,516 +0,0 @@ - - - - - -Created by potrace 1.11, written by Peter Selinger 2001-2013 - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/icons/screen.svg b/icons/screen.svg deleted file mode 100644 index 17abe8b..0000000 --- a/icons/screen.svg +++ /dev/null @@ -1,469 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - Luca Ferretti <elle.uca@libero.it> - - - - - - monitor - display - video - screen - LCD - CRT - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/icons/space.svg b/icons/space.svg deleted file mode 100644 index 797cbc8..0000000 --- a/icons/space.svg +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - diff --git a/icons/stopprojection.svg b/icons/stopprojection.svg deleted file mode 100644 index 90e6425..0000000 --- a/icons/stopprojection.svg +++ /dev/null @@ -1,2531 +0,0 @@ - - - -image/svg+xml \ No newline at end of file diff --git a/icons/student2all.svg b/icons/student2all.svg deleted file mode 100644 index 5971d45..0000000 --- a/icons/student2all.svg +++ /dev/null @@ -1,2663 +0,0 @@ - - - -image/svg+xml \ No newline at end of file diff --git a/icons/student2tutor.svg b/icons/student2tutor.svg deleted file mode 100644 index c40c478..0000000 --- a/icons/student2tutor.svg +++ /dev/null @@ -1,2506 +0,0 @@ - - - -image/svg+xml \ No newline at end of file diff --git a/icons/student2tutor_extension.svg b/icons/student2tutor_extension.svg deleted file mode 100644 index 5a8cf5e..0000000 --- a/icons/student2tutor_extension.svg +++ /dev/null @@ -1,3805 +0,0 @@ - - - -image/svg+xml \ No newline at end of file diff --git a/icons/terminal.svg b/icons/terminal.svg deleted file mode 100644 index d9b5a2d..0000000 --- a/icons/terminal.svg +++ /dev/null @@ -1,390 +0,0 @@ - - - -image/svg+xmlTerminal2005-10-15Andreas Nilssonterminalemulatortermcommand lineJakub Steiner \ No newline at end of file diff --git a/icons/trash.svg b/icons/trash.svg deleted file mode 100644 index e217a09..0000000 --- a/icons/trash.svg +++ /dev/null @@ -1,1187 +0,0 @@ - - - - - trash - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - trash - - - hrum - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/icons/tutor2all.svg b/icons/tutor2all.svg deleted file mode 100644 index cf46921..0000000 --- a/icons/tutor2all.svg +++ /dev/null @@ -1,4025 +0,0 @@ - - - -image/svg+xml \ No newline at end of file diff --git a/icons/tutor2student.svg b/icons/tutor2student.svg deleted file mode 100644 index 2f88720..0000000 --- a/icons/tutor2student.svg +++ /dev/null @@ -1,2494 +0,0 @@ - - - -image/svg+xml \ No newline at end of file diff --git a/icons/view-restore.svg b/icons/view-restore.svg deleted file mode 100644 index 000c826..0000000 --- a/icons/view-restore.svg +++ /dev/null @@ -1,422 +0,0 @@ - - - - - - - image/svg+xml - - Restore View - - - - - - - http://jimmac.musichall.cz - - - Jakub Steiner - - - - - window - fullscreen - view. restore - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pvs2.config b/pvs2.config deleted file mode 100644 index 8cec188..0000000 --- a/pvs2.config +++ /dev/null @@ -1 +0,0 @@ -// ADD PREDEFINED MACROS HERE! diff --git a/pvs2.creator b/pvs2.creator deleted file mode 100644 index e94cbbd..0000000 --- a/pvs2.creator +++ /dev/null @@ -1 +0,0 @@ -[General] diff --git a/pvs2.files b/pvs2.files deleted file mode 100644 index 599b005..0000000 --- a/pvs2.files +++ /dev/null @@ -1,93 +0,0 @@ -build/CMakeFiles/2.8.12.2/CompilerIdC/CMakeCCompilerId.c -build/CMakeFiles/2.8.12.2/CompilerIdCXX/CMakeCXXCompilerId.cpp -build/src/client/connectwindow/moc_connectwindow.cxx -build/src/client/net/moc_serverconnection.cxx -build/src/client/net/moc_serverdiscovery.cxx -build/src/client/toolbar/moc_toolbar.cxx -build/src/client/util/platform/moc_blankscreen.cxx -build/src/client/util/moc_util.cxx -build/src/client/vnc/moc_vncserver.cxx -build/src/client/vnc/moc_vncthread.cxx -build/src/client/vnc/moc_vncwindow.cxx -build/src/server/clicklabel/moc_clicklabel.cxx -build/src/server/connectionframe/moc_connectionframe.cxx -build/src/server/helpwindow/moc_helpwindow.cxx -build/src/server/mainwindow/moc_mainwindow.cxx -build/src/server/net/moc_certmanager.cxx -build/src/server/net/moc_client.cxx -build/src/server/net/moc_discoverylistener.cxx -build/src/server/net/moc_filedownloader.cxx -build/src/server/net/moc_listenserver.cxx -build/src/server/net/moc_sslserver.cxx -build/src/server/reloadroomwindow/moc_reloadroomwindow.cxx -build/src/server/reloadwindow/moc_reloadwindow.cxx -build/src/server/sessionnamewindow/moc_sessionnamewindow.cxx -build/src/server/util/moc_global.cxx -build/src/server/util/moc_util.cxx -build/qrc_pvsclient.cxx -build/qrc_pvsmgr.cxx -build/ui_connect.h -build/ui_help.h -build/ui_mainwindow.h -build/ui_reloadroom.h -build/ui_sessionname.h -build/ui_toolbar.h -src/client/connectwindow/connectwindow.cpp -src/client/connectwindow/connectwindow.h -src/client/net/serverconnection.cpp -src/client/net/serverconnection.h -src/client/net/serverdiscovery.cpp -src/client/net/serverdiscovery.h -src/client/toolbar/toolbar.cpp -src/client/toolbar/toolbar.h -src/client/util/platform/blankscreen.h -src/client/util/platform/blankscreen_Win32.cpp -src/client/util/platform/blankscreen_X11.cpp -src/client/util/util.cpp -src/client/util/util.h -src/client/vnc/vncserver.cpp -src/client/vnc/vncserver.h -src/client/vnc/vncthread.cpp -src/client/vnc/vncthread.h -src/client/vnc/vncwindow.cpp -src/client/vnc/vncwindow.h -src/client/main.cpp -src/server/clicklabel/clicklabel.cpp -src/server/clicklabel/clicklabel.h -src/server/connectionframe/connectionframe.cpp -src/server/connectionframe/connectionframe.h -src/server/helpwindow/helpwindow.cpp -src/server/helpwindow/helpwindow.h -src/server/mainwindow/mainwindow.cpp -src/server/mainwindow/mainwindow.h -src/server/net/certmanager.cpp -src/server/net/certmanager.h -src/server/net/client.cpp -src/server/net/client.h -src/server/net/discoverylistener.cpp -src/server/net/discoverylistener.h -src/server/net/filedownloader.cpp -src/server/net/filedownloader.h -src/server/net/listenserver.cpp -src/server/net/listenserver.h -src/server/net/sslserver.cpp -src/server/net/sslserver.h -src/server/reloadroomwindow/reloadroomwindow.cpp -src/server/reloadroomwindow/reloadroomwindow.h -src/server/sessionnamewindow/sessionnamewindow.cpp -src/server/sessionnamewindow/sessionnamewindow.h -src/server/util/global.cpp -src/server/util/global.h -src/server/util/util.cpp -src/server/util/util.h -src/server/main.cpp -src/shared/network.cpp -src/shared/network.h -src/shared/networkmessage.cpp -src/shared/networkmessage.h -src/shared/settings.h -src/shared/util.cpp -src/shared/util.h -src/server/numerickeyboard/numerickeyboard.h -src/server/numerickeyboard/numerickeyboard.cpp -gui/numerickeyboard.ui diff --git a/pvs2.includes b/pvs2.includes deleted file mode 100644 index 0d3fb41..0000000 --- a/pvs2.includes +++ /dev/null @@ -1,18 +0,0 @@ -build -src/client/connectwindow -src/client/net -src/client/toolbar -src/client/util -src/client/util/platform -src/client/vnc -src/server/clicklabel -src/server/connectionframe -src/server/helpwindow -src/server/mainwindow -src/server/net -src/server/reloadroomwindow -src/server/sessionnamewindow -src/server/util -src/shared -gui -src/server/numerickeyboard diff --git a/pvsclient.qrc b/pvsclient.qrc deleted file mode 100644 index b5fcd79..0000000 --- a/pvsclient.qrc +++ /dev/null @@ -1,21 +0,0 @@ - - - icons/dark-green-check-mark.svg - icons/darrow16.svg - icons/ok16.svg - icons/cam32.svg - icons/eye.svg - icons/chat_msg16.svg - icons/keyboard_key.svg - icons/space.svg - icons/help.svg - icons/hand-raise.svg - icons/hand-raise-red.svg - AUTHORS - build/pvsclient_de_DE.qm - build/pvsclient_fr_FR.qm - build/pvsclient_es_MX.qm - build/pvsclient_ar_JO.qm - build/pvsclient_pl_PL.qm - - diff --git a/pvsmgr.qrc b/pvsmgr.qrc deleted file mode 100644 index b6bd891..0000000 --- a/pvsmgr.qrc +++ /dev/null @@ -1,31 +0,0 @@ - - - icons/exit.svg - icons/terminal.svg - icons/photo.svg - icons/lock.svg - icons/lock-single.svg - icons/dozent.svg - icons/eye.svg - icons/cam32.svg - icons/student2all.svg - icons/tutor2all.svg - icons/student2tutor.svg - icons/tutor2student.svg - icons/stopprojection.svg - icons/keyboard_key.svg - icons/student2tutor_extension.svg - icons/help.svg - icons/trash.svg - icons/reloadClassroom.svg - AUTHORS - icons/cf_icon_cam.svg - icons/cf_icon_eye.svg - icons/cf_icon_lock.svg - build/pvsmgr_de_DE.qm - build/pvsmgr_fr_FR.qm - build/pvsmgr_es_MX.qm - build/pvsmgr_ar_JO.qm - build/pvsmgr_pl_PL.qm - - diff --git a/res/icons/altexit.svg b/res/icons/altexit.svg new file mode 100644 index 0000000..5331ab6 --- /dev/null +++ b/res/icons/altexit.svg @@ -0,0 +1,301 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/res/icons/altterm.svg b/res/icons/altterm.svg new file mode 100644 index 0000000..2197700 --- /dev/null +++ b/res/icons/altterm.svg @@ -0,0 +1,498 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Terminal + 2005-10-15 + + + Andreas Nilsson + + + + + terminal + emulator + term + command line + + + + + + Jakub Steiner + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/icons/broadcast.svg b/res/icons/broadcast.svg new file mode 100644 index 0000000..9d8b2f5 --- /dev/null +++ b/res/icons/broadcast.svg @@ -0,0 +1,32 @@ + + + + + + + + image/svg+xml + + + + + + + + diff --git a/res/icons/cam32.svg b/res/icons/cam32.svg new file mode 100644 index 0000000..c3f085c --- /dev/null +++ b/res/icons/cam32.svg @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/res/icons/cf_icon_cam.svg b/res/icons/cf_icon_cam.svg new file mode 100644 index 0000000..c51ab6d --- /dev/null +++ b/res/icons/cf_icon_cam.svg @@ -0,0 +1,142 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/res/icons/cf_icon_eye.svg b/res/icons/cf_icon_eye.svg new file mode 100644 index 0000000..cfda228 --- /dev/null +++ b/res/icons/cf_icon_eye.svg @@ -0,0 +1,31 @@ + + + + + + diff --git a/res/icons/cf_icon_lock.svg b/res/icons/cf_icon_lock.svg new file mode 100644 index 0000000..5700e7d --- /dev/null +++ b/res/icons/cf_icon_lock.svg @@ -0,0 +1,55 @@ + + + + + + image/svg+xml + + + + + + + + diff --git a/res/icons/chat_msg16.svg b/res/icons/chat_msg16.svg new file mode 100644 index 0000000..1e4be83 --- /dev/null +++ b/res/icons/chat_msg16.svg @@ -0,0 +1,97 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/res/icons/dark-green-check-mark.svg b/res/icons/dark-green-check-mark.svg new file mode 100644 index 0000000..ac4238d --- /dev/null +++ b/res/icons/dark-green-check-mark.svg @@ -0,0 +1,65 @@ + + + + + + image/svg+xml + + + + + + + Green Check Mark + + Layer 1 + + + + + diff --git a/res/icons/darrow16.svg b/res/icons/darrow16.svg new file mode 100644 index 0000000..4b1609a --- /dev/null +++ b/res/icons/darrow16.svg @@ -0,0 +1,75 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/res/icons/dozent.svg b/res/icons/dozent.svg new file mode 100644 index 0000000..056a339 --- /dev/null +++ b/res/icons/dozent.svg @@ -0,0 +1,2363 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + Person + + + Jakub Steiner + + + http://jimmac.musichall.cz + + + user + person + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/icons/exit.svg b/res/icons/exit.svg new file mode 100644 index 0000000..d8766c9 --- /dev/null +++ b/res/icons/exit.svg @@ -0,0 +1,301 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/res/icons/eye.svg b/res/icons/eye.svg new file mode 100644 index 0000000..86518ca --- /dev/null +++ b/res/icons/eye.svg @@ -0,0 +1,227 @@ + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/icons/graduate.svg b/res/icons/graduate.svg new file mode 100644 index 0000000..63f9f88 --- /dev/null +++ b/res/icons/graduate.svg @@ -0,0 +1,1932 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/icons/hand-raise-red.svg b/res/icons/hand-raise-red.svg new file mode 100644 index 0000000..1391d3e --- /dev/null +++ b/res/icons/hand-raise-red.svg @@ -0,0 +1,37 @@ + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/res/icons/hand-raise.svg b/res/icons/hand-raise.svg new file mode 100644 index 0000000..8dcbab1 --- /dev/null +++ b/res/icons/hand-raise.svg @@ -0,0 +1,36 @@ + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/res/icons/help.svg b/res/icons/help.svg new file mode 100644 index 0000000..2e97f37 --- /dev/null +++ b/res/icons/help.svg @@ -0,0 +1,212 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/icons/keyboard_key.svg b/res/icons/keyboard_key.svg new file mode 100644 index 0000000..c6cc88e --- /dev/null +++ b/res/icons/keyboard_key.svg @@ -0,0 +1,152 @@ + + + +image/svg+xmlReset + \ No newline at end of file diff --git a/res/icons/lock-single.svg b/res/icons/lock-single.svg new file mode 100644 index 0000000..5e0cd95 --- /dev/null +++ b/res/icons/lock-single.svg @@ -0,0 +1,980 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/icons/lock.svg b/res/icons/lock.svg new file mode 100644 index 0000000..6359f2c --- /dev/null +++ b/res/icons/lock.svg @@ -0,0 +1,1835 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/icons/log-out.svg b/res/icons/log-out.svg new file mode 100644 index 0000000..e94c873 --- /dev/null +++ b/res/icons/log-out.svg @@ -0,0 +1,284 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + System-log-out + 2007-08-27 + + + Lapo Calamandrei + + + + + + + Kalle Persson + + + + + logout + exit + man + sign + running + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/icons/ok16.svg b/res/icons/ok16.svg new file mode 100644 index 0000000..3d60d49 --- /dev/null +++ b/res/icons/ok16.svg @@ -0,0 +1,75 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/res/icons/photo.svg b/res/icons/photo.svg new file mode 100644 index 0000000..6552735 --- /dev/null +++ b/res/icons/photo.svg @@ -0,0 +1,1003 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Jakub Steiner + + + http://jimmac.musichall.cz + + Photo Camera + + + snapshot + camera + photo + compact + snap + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/icons/refresh.svg b/res/icons/refresh.svg new file mode 100644 index 0000000..e499882 Binary files /dev/null and b/res/icons/refresh.svg differ diff --git a/res/icons/reloadClassroom.svg b/res/icons/reloadClassroom.svg new file mode 100644 index 0000000..e3dfe62 --- /dev/null +++ b/res/icons/reloadClassroom.svg @@ -0,0 +1,516 @@ + + + + + +Created by potrace 1.11, written by Peter Selinger 2001-2013 + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/icons/screen.svg b/res/icons/screen.svg new file mode 100644 index 0000000..17abe8b --- /dev/null +++ b/res/icons/screen.svg @@ -0,0 +1,469 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + Luca Ferretti <elle.uca@libero.it> + + + + + + monitor + display + video + screen + LCD + CRT + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/icons/space.svg b/res/icons/space.svg new file mode 100644 index 0000000..797cbc8 --- /dev/null +++ b/res/icons/space.svg @@ -0,0 +1,62 @@ + + + + + + + + + + image/svg+xml + + + + + + + + diff --git a/res/icons/stopprojection.svg b/res/icons/stopprojection.svg new file mode 100644 index 0000000..90e6425 --- /dev/null +++ b/res/icons/stopprojection.svg @@ -0,0 +1,2531 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/res/icons/student2all.svg b/res/icons/student2all.svg new file mode 100644 index 0000000..5971d45 --- /dev/null +++ b/res/icons/student2all.svg @@ -0,0 +1,2663 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/res/icons/student2tutor.svg b/res/icons/student2tutor.svg new file mode 100644 index 0000000..c40c478 --- /dev/null +++ b/res/icons/student2tutor.svg @@ -0,0 +1,2506 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/res/icons/student2tutor_extension.svg b/res/icons/student2tutor_extension.svg new file mode 100644 index 0000000..5a8cf5e --- /dev/null +++ b/res/icons/student2tutor_extension.svg @@ -0,0 +1,3805 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/res/icons/terminal.svg b/res/icons/terminal.svg new file mode 100644 index 0000000..d9b5a2d --- /dev/null +++ b/res/icons/terminal.svg @@ -0,0 +1,390 @@ + + + +image/svg+xmlTerminal2005-10-15Andreas Nilssonterminalemulatortermcommand lineJakub Steiner \ No newline at end of file diff --git a/res/icons/trash.svg b/res/icons/trash.svg new file mode 100644 index 0000000..e217a09 --- /dev/null +++ b/res/icons/trash.svg @@ -0,0 +1,1187 @@ + + + + + trash + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + trash + + + hrum + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/icons/tutor2all.svg b/res/icons/tutor2all.svg new file mode 100644 index 0000000..cf46921 --- /dev/null +++ b/res/icons/tutor2all.svg @@ -0,0 +1,4025 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/res/icons/tutor2student.svg b/res/icons/tutor2student.svg new file mode 100644 index 0000000..2f88720 --- /dev/null +++ b/res/icons/tutor2student.svg @@ -0,0 +1,2494 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/res/icons/view-restore.svg b/res/icons/view-restore.svg new file mode 100644 index 0000000..000c826 --- /dev/null +++ b/res/icons/view-restore.svg @@ -0,0 +1,422 @@ + + + + + + + image/svg+xml + + Restore View + + + + + + + http://jimmac.musichall.cz + + + Jakub Steiner + + + + + window + fullscreen + view. restore + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/pvsclient.qrc b/res/pvsclient.qrc new file mode 100644 index 0000000..3e04631 --- /dev/null +++ b/res/pvsclient.qrc @@ -0,0 +1,15 @@ + + + icons/dark-green-check-mark.svg + icons/darrow16.svg + icons/ok16.svg + icons/cam32.svg + icons/eye.svg + icons/chat_msg16.svg + icons/keyboard_key.svg + icons/space.svg + icons/help.svg + icons/hand-raise.svg + icons/hand-raise-red.svg + + diff --git a/res/pvsclient_ts.qrc b/res/pvsclient_ts.qrc new file mode 100644 index 0000000..1640f3f --- /dev/null +++ b/res/pvsclient_ts.qrc @@ -0,0 +1,9 @@ + + + pvsclient_de_DE.qm + pvsclient_fr_FR.qm + pvsclient_es_MX.qm + pvsclient_ar_JO.qm + pvsclient_pl_PL.qm + + diff --git a/res/pvsmgr.qrc b/res/pvsmgr.qrc new file mode 100644 index 0000000..1070fe7 --- /dev/null +++ b/res/pvsmgr.qrc @@ -0,0 +1,25 @@ + + + icons/exit.svg + icons/terminal.svg + icons/photo.svg + icons/lock.svg + icons/lock-single.svg + icons/dozent.svg + icons/eye.svg + icons/cam32.svg + icons/student2all.svg + icons/tutor2all.svg + icons/student2tutor.svg + icons/tutor2student.svg + icons/stopprojection.svg + icons/keyboard_key.svg + icons/student2tutor_extension.svg + icons/help.svg + icons/trash.svg + icons/reloadClassroom.svg + icons/cf_icon_cam.svg + icons/cf_icon_eye.svg + icons/cf_icon_lock.svg + + diff --git a/res/pvsmgr_ts.qrc b/res/pvsmgr_ts.qrc new file mode 100644 index 0000000..8ba5846 --- /dev/null +++ b/res/pvsmgr_ts.qrc @@ -0,0 +1,9 @@ + + + pvsmgr_de_DE.qm + pvsmgr_fr_FR.qm + pvsmgr_es_MX.qm + pvsmgr_ar_JO.qm + pvsmgr_pl_PL.qm + + diff --git a/src/client/clientapp/clientapp.cpp b/src/client/clientapp/clientapp.cpp index 2447526..8131e6f 100644 --- a/src/client/clientapp/clientapp.cpp +++ b/src/client/clientapp/clientapp.cpp @@ -23,14 +23,14 @@ ClientApp::ClientApp(int& argc, char** argv) // System strings QTranslator *qtTranslator = new QTranslator(this); if (!qtTranslator->load(QLocale::system(), "qt", "_", QLibraryInfo::location(QLibraryInfo::TranslationsPath))) { - qDebug() << "Could not load system string translations"; + qDebug() << "Could not load system string translations" << QLocale::system() << QLibraryInfo::location(QLibraryInfo::TranslationsPath); } else { installTranslator(qtTranslator); } // App specific QTranslator *translator = new QTranslator(this); - if (!translator->load(QLocale::system(), ":", "l_")) { - qDebug() << "Could not load app translations"; + if (!translator->load(QLocale::system(), ":/", "l_")) { + qDebug() << "Could not load app translations" << QLocale::system(); } else { installTranslator(translator); } diff --git a/src/client/connectwindow/connectwindow.cpp b/src/client/connectwindow/connectwindow.cpp index 7674cc2..8c47eea 100644 --- a/src/client/connectwindow/connectwindow.cpp +++ b/src/client/connectwindow/connectwindow.cpp @@ -12,11 +12,15 @@ #include "../net/serverconnection.h" #include "../clientapp/clientapp.h" #include "connectwindow.h" -#include "ui_connect.h" +#include "ui_connectwindow.h" #define UDPBUFSIZ 9000 #define SALT_LEN 18 +namespace Ui { + class ConnectWindow; +} + /** * Initialize Connection Window. * @param parent diff --git a/src/client/connectwindow/connectwindow.h b/src/client/connectwindow/connectwindow.h index 9fcaf4e..2df672d 100644 --- a/src/client/connectwindow/connectwindow.h +++ b/src/client/connectwindow/connectwindow.h @@ -28,6 +28,7 @@ namespace Ui { class ConnectWindow; } + class ServerConnection; /** diff --git a/src/client/connectwindow/connectwindow.ui b/src/client/connectwindow/connectwindow.ui new file mode 100644 index 0000000..0bfc654 --- /dev/null +++ b/src/client/connectwindow/connectwindow.ui @@ -0,0 +1,216 @@ + + + ConnectWindow + + + Qt::WindowModal + + + + 0 + 0 + 512 + 233 + + + + + 512 + 92 + + + + Connect to PVS session + + + + + + false + + + 0 + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + Connection + + + + + + Connect to + + + + + + + + + + + + + + 0 + 0 + + + + Manual Connection + + + + + + Session Name + + + + + + + + 0 + 0 + + + + + + + + + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + true + + + + 0 + 0 + + + + + 94 + 72 + + + + :/dark-green-check-mark.svg + + + true + + + + + + + + + + + 6 + + + + + Close + + + false + + + false + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Connect + + + true + + + true + + + + + + + + + + + + diff --git a/src/client/toolbar/toolbar.ui b/src/client/toolbar/toolbar.ui new file mode 100644 index 0000000..9908dda --- /dev/null +++ b/src/client/toolbar/toolbar.ui @@ -0,0 +1,233 @@ + + + Toolbar + + + + 0 + 0 + 281 + 28 + + + + Form + + + #Toolbar { + background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #f6f7fa, stop: 1 #dadbde); + border-radius: 0px; +} +QLabel { + background-color: none; +} +/* QPushButton */ +QPushButton { + background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #f6f7fa, stop: 1 #dadbde); + border: 2px solid #8f8f91; + border-radius: 4px; + min-width: 80px; +} +QPushButton:hover { + border: 2px solid rgb(0, 170, 255); +} +QPushButton:pressed { + background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #dadbde, stop: 1 #f6f7fa); +} +QPushButton:checked { + background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #cacbce, stop: 1 #e6e7ea); +} +QPushButton::menu-indicator { + image: url(:/darrow16.svg); +} + + + + + 1 + + + 2 + + + 2 + + + 2 + + + 2 + + + + + + 0 + 0 + + + + + 84 + 24 + + + + Menu + + + Menu + + + + + + + Qt::Horizontal + + + + 20 + 20 + + + + + + + + color:red + + + Offline + + + + + + + Qt::Horizontal + + + + 19 + 20 + + + + + + + + + 16 + 16 + + + + + 16 + 16 + + + + + + + true + + + + + + + + 10 + 75 + true + true + true + + + + color:#05f; + + + PVS + + + + + + + Qt::Horizontal + + + + 20 + 20 + + + + + + + + + + + + 0 + 0 + + + + + 30 + 24 + + + + + 30 + 16777215 + + + + + 30 + 0 + + + + + 30 + 0 + + + + + + + + :/hand-raise + :/hand-raise-red:/hand-raise + + + + 22 + 22 + + + + true + + + + + + + + + + diff --git a/src/server/mainwindow/mainwindow.cpp b/src/server/mainwindow/mainwindow.cpp index f6ff566..b63545f 100644 --- a/src/server/mainwindow/mainwindow.cpp +++ b/src/server/mainwindow/mainwindow.cpp @@ -38,7 +38,6 @@ #include "../util/platform/screensaver.h" // Auto-generated ui class #include "ui_mainwindow.h" -#include "ui_reloadroom.h" #include #include @@ -711,20 +710,20 @@ void MainWindow::startVncServerIfNecessary(int from) void MainWindow::onButtonReloadRoomConfig() { - connect(_reloadWindow->ui->buttonBox, SIGNAL(accepted()), this, SLOT(onReloadRoomOk())); - connect(_reloadWindow->ui->buttonBox, SIGNAL(rejected()), this, SLOT(onReloadRoomCancel())); + connect(_reloadWindow->buttonBox(), SIGNAL(accepted()), this, SLOT(onReloadRoomOk())); + connect(_reloadWindow->buttonBox(), SIGNAL(rejected()), this, SLOT(onReloadRoomCancel())); QList keyList = serverApp->getRooms().keys(); for (QList::iterator it = keyList.begin(); it != keyList.end() ; it++) { - _reloadWindow->ui->roomList->addItem(*it); + _reloadWindow->addRoom(*it); } _reloadWindow->show(); } void MainWindow::onReloadRoomCancel() { - disconnect(_reloadWindow->ui->buttonBox, SIGNAL(accepted()), this, SLOT(onReloadRoomOk())); - disconnect(_reloadWindow->ui->buttonBox, SIGNAL(rejected()), this, SLOT(onReloadRoomCancel())); - _reloadWindow->ui->roomList->clear(); + disconnect(_reloadWindow->buttonBox(), SIGNAL(accepted()), this, SLOT(onReloadRoomOk())); + disconnect(_reloadWindow->buttonBox(), SIGNAL(rejected()), this, SLOT(onReloadRoomCancel())); + _reloadWindow->clearRoomList(); _reloadWindow->hide(); } @@ -785,7 +784,8 @@ void MainWindow::reloadCurrentRoom() void MainWindow::onReloadRoomOk() { - if (_reloadWindow->ui->roomList->currentItem() == nullptr) { + QString roomToReload = _reloadWindow->currentRoom(); + if (roomToReload.isEmpty()) { QMessageBox::critical(this, "Warning", tr("No item selected, please select room!"), 0, 1); return; } @@ -794,8 +794,8 @@ void MainWindow::onReloadRoomOk() "Note that all clients will be deleted."), QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes); if (ret == QMessageBox::Yes) { - disconnect(_reloadWindow->ui->buttonBox, SIGNAL(accepted()), this, SLOT(onReloadRoomOk())); - disconnect(_reloadWindow->ui->buttonBox, SIGNAL(rejected()), this, SLOT(onReloadRoomCancel())); + disconnect(_reloadWindow->buttonBox(), SIGNAL(accepted()), this, SLOT(onReloadRoomOk())); + disconnect(_reloadWindow->buttonBox(), SIGNAL(rejected()), this, SLOT(onReloadRoomCancel())); // Delete all clients. for (QList::iterator it = _clientFrames.begin(); it != _clientFrames.end(); it++) { (*it)->hide(); @@ -804,11 +804,10 @@ void MainWindow::onReloadRoomOk() _clientFrames.clear(); // Load new room configuration. - QString roomToReload = _reloadWindow->ui->roomList->currentItem()->data(0).toString(); serverApp->setCurrentRoom(roomToReload); reloadCurrentRoom(); - _reloadWindow->ui->roomList->clear(); + _reloadWindow->clearRoomList(); _reloadWindow->hide(); } diff --git a/src/server/mainwindow/mainwindow.ui b/src/server/mainwindow/mainwindow.ui new file mode 100644 index 0000000..62b92f7 --- /dev/null +++ b/src/server/mainwindow/mainwindow.ui @@ -0,0 +1,339 @@ + + + MainWindow + + + + 0 + 0 + 846 + 801 + + + + PVS2 Manager + + + QToolButton { + border-radius: 8px; + padding: 4px; + margin: 5px; + border: 1px solid #777; +} +QToolButton:enabled { +background-color: #f8f8f8; +border: 1px solid #555; +} +QToolButton:enabled:hover { + background: qradialgradient(cx: 0.4, cy: -0.1, +fx: 0.4, fy: -0.1, +radius: 1.35, stop: 0 #fff, stop: 1 #ddd); +} + +QToolButton:enabled:checked, +QToolButton:enabled:pressed { +background: qradialgradient(cx: 0.4, cy: -0.1, +fx: 0.4, fy: -0.1, +radius: 1.35, stop: 0 #888, stop: 1 #aaa); +} +QLabel#examModeLabel { + width: 71px; + margin: 5px; + border-radius: 8px; + background-color: rgb(170, 170, 170); +} + + + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + 3 + + + + + QFrame::StyledPanel + + + QFrame::Sunken + + + 2 + + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 1 + 1 + + + + 0 + + + + + + + + + + + + + + + + toolBar + + + Qt::LeftToRight + + + true + + + false + + + + 48 + 48 + + + + LeftToolBarArea + + + false + + + + + + + + + + + + + + + + + + + :/exit + :/exit:/exit + + + Exit + + + Exit + + + Ctrl+Q + + + + + true + + + + :/lock:/lock + + + This will show a black screen on all connected clients, except the tutor's client. + + + Lock/Unlock all clients + + + Ctrl+A + + + + + + :/student2tutor:/student2tutor + + + Stream currently selected client's screen content to the tutor's client. + + + Student's Screen to Tutor + + + + + + :/student2tutorextension:/student2tutorextension + + + Stream currently selected client's screen content to the tutor's client while showing a locked black screen on all other clients. + + + Student's Screen to Tutor, others blanked + + + + + + :/tutor2student:/tutor2student + + + Stream the tutor's screen contents to the currently selected client. + + + Tutor's Screen to Student + + + + + + :/tutor2all:/tutor2all + + + Stream the tutor's screen contents to everyone. + + + Tutor's Screen to Everyone + + + + + + :/reset:/reset + + + Unlock all clients, stop any running screen content streaming. + + + Reset + + + R + + + + + + :/dozent:/dozent + + + Declare the currently selected client as tutor. The tutor will be excluded from screen locking and can be used as a fixed source/target for screen content streaming. + + + Declare tutor + + + T + + + + + + :/trash:/trash + + + Delete currently selected client. Only allowed for disconnected clients. + + + Delete Client + + + Del + + + true + + + + + + :/helpme:/helpme + + + Show this help text. + + + Help + + + F1 + + + true + + + + + + :/reloadClassroom:/reloadClassroom + + + This shows a list of preconfigured rooms which you can load. This will reset the currently shown layout and disconnect all clients. + + + Load a new room layout + + + + + + :/lock-single:/lock-single + + + Lock or unlock the selected client only. + + + Lock/Unlock single client + + + L + + + + + + + + + + diff --git a/src/server/numerickeyboard/numerickeyboard.ui b/src/server/numerickeyboard/numerickeyboard.ui new file mode 100644 index 0000000..2f83a2b --- /dev/null +++ b/src/server/numerickeyboard/numerickeyboard.ui @@ -0,0 +1,173 @@ + + + NumericKeyboard + + + + 0 + 0 + 438 + 300 + + + + + 0 + 300 + + + + GroupBox + + + Keyboard + + + + + + + 0 + 40 + + + + 0 + + + + + + + + 0 + 40 + + + + Del + + + + + + + + 0 + 40 + + + + 1 + + + + + + + + 0 + 40 + + + + 8 + + + + + + + + 0 + 40 + + + + 4 + + + + + + + + 0 + 40 + + + + 2 + + + + + + + + 0 + 40 + + + + 5 + + + + + + + + 0 + 40 + + + + 7 + + + + + + + + 0 + 40 + + + + 3 + + + + + + + + 0 + 40 + + + + 6 + + + + + + + + 0 + 40 + + + + 9 + + + + + + + + diff --git a/src/server/reloadroomwindow/reloadroomwindow.cpp b/src/server/reloadroomwindow/reloadroomwindow.cpp index 3070148..aea6a96 100644 --- a/src/server/reloadroomwindow/reloadroomwindow.cpp +++ b/src/server/reloadroomwindow/reloadroomwindow.cpp @@ -1,5 +1,5 @@ #include "reloadroomwindow.h" -#include "ui_reloadroom.h" +#include "ui_reloadroomwindow.h" ReloadRoomWindow::ReloadRoomWindow(QWidget *parent) : QDialog(parent), ui(new Ui::ReloadRoom) @@ -11,3 +11,26 @@ ReloadRoomWindow::~ReloadRoomWindow() { delete ui; } + +QDialogButtonBox *ReloadRoomWindow::buttonBox() const +{ + return ui->buttonBox; +} + +void ReloadRoomWindow::addRoom(const QString &roomName) +{ + ui->roomList->addItem(roomName); +} + +void ReloadRoomWindow::clearRoomList() +{ + ui->roomList->clear(); +} + +QString ReloadRoomWindow::currentRoom() const +{ + auto *cur = ui->roomList->currentItem(); + if (cur == nullptr) + return QLatin1String(); + return cur->data(0).toString(); +} diff --git a/src/server/reloadroomwindow/reloadroomwindow.h b/src/server/reloadroomwindow/reloadroomwindow.h index 2d2ae85..2baf53f 100644 --- a/src/server/reloadroomwindow/reloadroomwindow.h +++ b/src/server/reloadroomwindow/reloadroomwindow.h @@ -8,19 +8,28 @@ namespace Ui class ReloadRoom; } +class QDialogButtonBox; + class ReloadRoomWindow : public QDialog { Q_OBJECT public: - explicit ReloadRoomWindow(QWidget *parent = 0); + explicit ReloadRoomWindow(QWidget *parent = nullptr); ~ReloadRoomWindow(); - Ui::ReloadRoom *ui; - // void show(); + QDialogButtonBox* buttonBox() const; + + void addRoom(const QString &roomName); + + void clearRoomList(); + + QString currentRoom() const; private: + Ui::ReloadRoom *ui; + }; #endif diff --git a/src/server/reloadroomwindow/reloadroomwindow.ui b/src/server/reloadroomwindow/reloadroomwindow.ui new file mode 100644 index 0000000..2fb723e --- /dev/null +++ b/src/server/reloadroomwindow/reloadroomwindow.ui @@ -0,0 +1,73 @@ + + + ReloadRoom + + + + 0 + 0 + 432 + 400 + + + + Reload Room + + + true + + + + + + + 11 + + + + Choose room configuration to reload: + + + + + + + + 20 + PreferDefault + + + + Qt::DefaultContextMenu + + + Qt::LeftToRight + + + QListView::Adjust + + + + + + + + 20 + + + + * {font-size: 20pt;} + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + false + + + + + + + + diff --git a/src/server/sessionnamewindow/sessionnamewindow.cpp b/src/server/sessionnamewindow/sessionnamewindow.cpp index 5671c39..f79efbf 100644 --- a/src/server/sessionnamewindow/sessionnamewindow.cpp +++ b/src/server/sessionnamewindow/sessionnamewindow.cpp @@ -18,7 +18,7 @@ #include "sessionnamewindow.h" #include "../serverapp/serverapp.h" #include "../numerickeyboard/numerickeyboard.h" -#include "ui_sessionname.h" +#include "ui_sessionnamewindow.h" SessionNameWindow::SessionNameWindow(QWidget *parent) : diff --git a/src/server/sessionnamewindow/sessionnamewindow.ui b/src/server/sessionnamewindow/sessionnamewindow.ui new file mode 100644 index 0000000..299df3d --- /dev/null +++ b/src/server/sessionnamewindow/sessionnamewindow.ui @@ -0,0 +1,66 @@ + + + SessionName + + + Qt::ApplicationModal + + + + 0 + 0 + 400 + 226 + + + + + 0 + 0 + + + + Set session name + + + + + + New session name + + + + + + + + 14 + 75 + true + true + + + + + + + + + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + + + + + Random name + + + + + + + + -- cgit v1.2.3-55-g7522