diff options
| author | Sebastian | 2010-05-12 19:42:27 +0200 |
|---|---|---|
| committer | Sebastian | 2010-05-12 19:42:27 +0200 |
| commit | ce3329047d378a14006ce74ec273ac59e3375303 (patch) | |
| tree | 782430f270b4c7aca1b35d5b7813518e3797c555 | |
| download | pvs-ce3329047d378a14006ce74ec273ac59e3375303.tar.gz pvs-ce3329047d378a14006ce74ec273ac59e3375303.tar.xz pvs-ce3329047d378a14006ce74ec273ac59e3375303.zip | |
initial import of latest svn version
215 files changed, 34184 insertions, 0 deletions
@@ -0,0 +1,20 @@ +Initial design and first versions: +Simon Wittenberg <wittenb@informatik.uni-freiburg.de> + +Involved team members at the moment: +Johann Betz <jbetz@informatik.uni-freiburg.de> +Javier Castillo <castillf@informatik.uni-freiburg.de> +Johann Latocha <johann@latocha.de> +Achille Nana <achille.achille@gmail.com> +Simon Rettberg <simon.rettberg@gmail.com> +Fadi Salameh <fadi84@hotmail.com> +Alexander Hoppe <a.hoppe@gmail.com> +Benjamin Lieberwirt <benjamin.lieberwirth@googlemail.com> + +Credits of left team members: +- + +Project management, supervision: +Dirk von Suchodoletz <dvs@openslx.com> +Sebastian Schmelzer <sebastian@schmelzer.ws> +Simon Wittenberg <wittenb@informatik.uni-freiburg.de>
\ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000..00de7a5 --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,344 @@ +################################################################################ +# General +################################################################################ + +# set project's name +PROJECT( pvs ) + +# cmake min version +CMAKE_MINIMUM_REQUIRED( VERSION 2.6.2 ) + +# set compiler optimizations for debug and release +SET(CMAKE_BUILD_TYPE Debug) +SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g -Wall") +SET(CMAKE_CXX_FLAGS_RELEASE "-O3 -march=native") +# -DQT_NO_DEBUG_OUTPUT") + +# local cmake modules +SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}) + +#Test +SET(CMAKE_EDIT_COMMAND ${CMAKE_SOURCE_DIR}) + +# this command finds libraries and sets all required variables +FIND_PACKAGE( Qt4 4.5.0 REQUIRED ) +FIND_PACKAGE( X11 REQUIRED ) +FIND_PACKAGE( VNC REQUIRED ) + +# some includes +INCLUDE_DIRECTORIES( + ${CMAKE_SOURCE_DIR} + ${CMAKE_BINARY_DIR} +) + +################################################################################ +# Variables +################################################################################ + +# with SET() command you can change variables or define new ones. +# we define PVSMGR_SRCS variable that contains a list of all .cpp files +SET( PVSMGR_SRCS + src/pvsmgr.cpp + src/core/pvsClient.cpp + src/core/pvsConnectionManager.cpp + src/core/vncConnection.cpp + src/core/pvsServer.cpp + src/gui/mainWindow.cpp + src/gui/connectionWindow.cpp + src/gui/frame.cpp + src/util/vncClientThread.cpp + src/gui/connectionFrame.cpp + src/gui/connectionList.cpp + src/gui/profileDialog.cpp + src/gui/dialog.cpp + src/gui/serverChatDialog.cpp + src/gui/projectionDialog.cpp + src/gui/serverFileTransfert.cpp + src/net/pvsMsg.cpp + src/net/pvsListenServer.cpp + src/net/pvsClientConnection.cpp + src/net/pvsServiceBroadcast.cpp + src/util/consoleLogger.cpp + src/util/pvsSettingsManager.cpp + src/util/util.cpp + src/net/SslServer.cpp + src/util/CertManager.cpp + src/util/TextFile.cpp + src/util/serviceDiscoveryUtil.cpp + src/gui/aboutDialog.cpp +) + +# pvs +SET( PVS_SRCS + src/pvsDaemon.cpp + src/pvs.cpp + src/net/pvsMsg.cpp + src/core/pvsChatMsg.cpp + src/net/pvsServerConnection.cpp + src/net/pvsLocalhostCommunicator.cpp + src/util/util.cpp + src/util/consoleLogger.cpp + src/util/clientGUIUtils.cpp + src/util/pvsSettingsManager.cpp + src/core/pvsChatClient.cpp + src/net/pvsServiceDiscovery.cpp + src/net/pvsDiscoveredServer.cpp + src/util/TextFile.cpp + src/util/serviceDiscoveryUtil.cpp +) + +# pvsgui +SET( PVSGUI_SRCS + src/pvsgui.cpp + src/gui/clientConfigDialog.cpp + src/gui/clientFileSendDialog.cpp + src/gui/clientFileReceiveDialog.cpp + src/gui/clientChatDialog.cpp + src/gui/clientVNCViewer.cpp + src/gui/clientInfoDialog.cpp + src/util/vncClientThread.cpp + src/util/TextFile.cpp + src/gui/aboutDialog.cpp +) + + +################################################################################ +# Qt +################################################################################ + +# some .ui files (Qt) +SET( PVSMGR_UIS + src/gui/ui/mainwindow.ui + src/gui/ui/profileDialog.ui + src/gui/ui/dialog.ui + src/gui/ui/projectionDialog.ui + src/gui/ui/aboutDialog.ui + src/gui/ui/serverChatDialog.ui + src/gui/ui/clientFileSendDialog.ui +) + +SET( PVSMGRTOUCH_UIS + src/gui/ui/mainwindowtouch.ui + src/gui/ui/profileDialog.ui + src/gui/ui/dialog.ui + src/gui/ui/projectionDialog.ui + src/gui/ui/aboutDialog.ui + src/gui/ui/serverChatDialog.ui +) + +SET( PVSGUI_UIS + src/gui/ui/clientConfigDialog.ui + src/gui/ui/clientFileSendDialog.ui + src/gui/ui/clientFileReceiveDialog.ui + src/gui/ui/clientChatDialog.ui + src/gui/ui/clientInfoDialog.ui + src/gui/ui/aboutDialog.ui + src/gui/ui/clientToolbar.ui + src/gui/ui/clientNicklistDialog.ui +) + +# resource file (Qt) +SET( PVSMGR_RCS + pvsmgr.qrc +) + +SET( PVS_RCS + pvs.qrc +) + +SET( PVSGUI_RCS + pvsgui.qrc +) + +# includes all header files that should be treated with moc (Qt) +SET( PVSMGR_MOC_HDRS + src/gui/mainWindow.h + src/gui/connectionWindow.h + src/gui/frame.h + src/util/vncClientThread.h + src/gui/connectionList.h + src/gui/connectionFrame.h + src/gui/profileDialog.h + src/gui/dialog.h + src/gui/projectionDialog.h + src/gui/serverChatDialog.h + src/gui/serverFileTransfert.h + src/net/pvsClientConnection.h + src/net/pvsListenServer.h + src/core/pvsClient.h + src/core/vncConnection.h + src/net/pvsServiceBroadcast.h + src/net/SslServer.h + src/gui/aboutDialog.h +) + +SET( PVS_MOC_HDRS + src/pvs.h + src/net/pvsLocalhostCommunicator.h + src/net/pvsServerConnection.h + src/net/pvsServiceDiscovery.h + src/net/pvsDiscoveredServer.h +) + +SET( PVSGUI_MOC_HDRS + src/pvsgui.h + src/gui/clientConfigDialog.h + src/gui/clientFileSendDialog.h + src/gui/clientFileReceiveDialog.h + src/gui/clientChatDialog.h + src/gui/clientVNCViewer.h + src/gui/clientInfoDialog.h + src/util/vncClientThread.h + src/gui/aboutDialog.h +) + +# i18n (Qt) +SET( PVSMGR_TSS + i18n/pvsmgr_de_DE.ts + i18n/pvsmgr_fr_FR.ts + i18n/pvsmgr_es_MX.ts + i18n/pvsmgr_ar_JO.ts + i18n/pvsmgr_pl_PL.ts +) + +SET( PVS_TSS + i18n/pvs_de_DE.ts + i18n/pvs_fr_FR.ts + i18n/pvs_es_MX.ts + i18n/pvs_ar_JO.ts + i18n/pvs_pl_PL.ts +) + +SET( PVSGUI_TSS + i18n/pvsgui_de_DE.ts + i18n/pvsgui_fr_FR.ts + i18n/pvsgui_es_MX.ts + i18n/pvsgui_ar_JO.ts + i18n/pvsgui_pl_PL.ts +) + + +# by default only QtCore and QtGui modules are enabled +# other modules must be enabled like this: +SET( QT_USE_QTDBUS TRUE ) +SET( QT_USE_QTNETWORK TRUE ) + +# add some useful macros and variables +# (QT_USE_FILE is a variable defined by FIND_PACKAGE( Qt4 ) that contains +# a path to CMake script) +INCLUDE( ${QT_USE_FILE} ) + +# this command will generate rules that will run rcc on all files from +# PVSCLIENTGUI_RCS. in result PVSCLIENTGUI_RC_SRCS variable will contain paths +# to files produced by rcc +QT4_ADD_RESOURCES( PVSMGR_RC_SRCS ${PVSMGR_RCS} ) +QT4_ADD_RESOURCES( PVS_RC_SRCS ${PVS_RCS} ) +QT4_ADD_RESOURCES( PVSGUI_RC_SRCS ${PVSGUI_RCS} ) + +# this will run uic on .ui files: +QT4_WRAP_UI( PVSMGR_UI_HDRS ${PVSMGR_UIS} ) +QT4_WRAP_UI( PVSMGRTOUCH_UI_HDRS ${PVSMGRTOUCH_UIS} ) +QT4_WRAP_UI( PVSGUI_UI_HDRS ${PVSGUI_UIS} ) + +# this will run moc: +QT4_WRAP_CPP( PVSMGR_MOC_SRCS ${PVSMGR_MOC_HDRS} ) +QT4_WRAP_CPP( PVS_MOC_SRCS ${PVS_MOC_HDRS} ) +QT4_WRAP_CPP( PVSGUI_MOC_SRCS ${PVSGUI_MOC_HDRS} ) + +# run qdbuscpp2xml +QT4_GENERATE_DBUS_INTERFACE( src/pvs.h org.openslx.pvs.xml ) + +# run qdbusxml2cpp +QT4_ADD_DBUS_ADAPTOR( PVS_SRCS ${CMAKE_BINARY_DIR}/org.openslx.pvs.xml src/pvs.h PVS ) +QT4_ADD_DBUS_INTERFACE( PVSGUI_SRCS ${CMAKE_BINARY_DIR}/org.openslx.pvs.xml pvsinterface ) + +# i18n, run lupdate and lrelease) +QT4_CREATE_TRANSLATION( PVSMGR_QMS ${PVSMGR_SRCS} ${PVSMGR_UI_HDRS} ${PVSMGR_TSS} ) +QT4_CREATE_TRANSLATION( PVS_QMS ${PVS_SRCS} ${PVS_TSS} ) +QT4_CREATE_TRANSLATION( PVSGUI_QMS ${PVSGUI_SRCS} ${PVSGUI_UI_HDRS} ${PVSGUI_TSS} ) + +################################################################################ +# Build +################################################################################ + +## here we instruct CMake to build our executable from all of the source files +ADD_EXECUTABLE( pvsmgr + ${PVSMGR_SRCS} + ${PVSMGR_MOC_SRCS} + ${PVSMGR_UI_HDRS} + ${PVSMGR_RC_SRCS} + ${PVSMGR_QMS} +) + +ADD_EXECUTABLE( pvsmgrtouch + ${PVSMGR_SRCS} + ${PVSMGR_MOC_SRCS} + ${PVSMGRTOUCH_UI_HDRS} + ${PVSMGR_RC_SRCS} + ${PVSMGR_QMS} +) + +ADD_EXECUTABLE( pvs + ${PVS_SRCS} + ${PVS_MOC_SRCS} + ${PVS_RC_SRCS} + ${PVS_QMS} +) + +ADD_EXECUTABLE( pvsgui + ${PVSGUI_SRCS} + ${PVSGUI_MOC_SRCS} + ${PVSGUI_UI_HDRS} + ${PVSGUI_RC_SRCS} + ${PVSGUI_QMS} +) + +# last thing we have to do is to tell CMake what libraries our executable needs, +# luckily FIND_PACKAGE prepared variables for us: +TARGET_LINK_LIBRARIES( pvsmgr + ${QT_LIBRARIES} + ${VNC_LIBRARIES} + ${X11_LIBRARIES} +) + +TARGET_LINK_LIBRARIES( pvsmgrtouch + ${QT_LIBRARIES} + ${VNC_LIBRARIES} + ${X11_LIBRARIES} +) + +TARGET_LINK_LIBRARIES( pvs + ${QT_LIBRARIES} + ${VNC_LIBRARIES} + ${X11_LIBRARIES} +) + +TARGET_LINK_LIBRARIES( pvsgui + ${QT_LIBRARIES} + ${VNC_LIBRARIES} +) + +SET_PROPERTY(TARGET pvsmgrtouch PROPERTY COMPILE_DEFINITIONS MAINWINDOW_USE_TOUCHGUI) +SET_PROPERTY(TARGET pvsmgr PROPERTY COMPILE_DEFINITIONS MAINWINDOW_USE_NORMALGUI) + +# add install target to our makefile +CONFIGURE_FILE( org.openslx.pvs.service ${CMAKE_BINARY_DIR}/org.openslx.pvs.service ) +INSTALL( TARGETS pvsmgr pvs pvsgui pvsmgrtouch RUNTIME DESTINATION bin ) +INSTALL( FILES ${CMAKE_BINARY_DIR}/org.openslx.pvs.service DESTINATION share/dbus-1/services ) + +# add package target to our makefile +SET( CPACK_GENERATOR "DEB" ) +SET( CPACK_SET_DESTDIR "ON" ) +SET( CPACK_PACKAGE_NAME "pvs" ) +SET( CPACK_PACKAGE_VERSION_MAJOR "1" ) +SET( CPACK_PACKAGE_VERSION_MINOR "7" ) +SET( CPACK_PACKAGE_VERSION_PATCH "9" ) +SET( CPACK_PACKAGE_DESCRIPTION_SUMMARY "Pool Video Switch" ) +SET( CPACK_PACKAGE_DESCRIPTION "") +SET( CPACK_PACKAGE_CONTACT "Simon Wittenberg <wittenb@informatik.uni-freiburg.de>" ) +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 ) # must be last! @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + <signature of Ty Coon>, 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. diff --git a/FindVNC.cmake b/FindVNC.cmake new file mode 100644 index 0000000..8b460d3 --- /dev/null +++ b/FindVNC.cmake @@ -0,0 +1,17 @@ +FIND_PATH(VNC_INCLUDES rfb.h /usr/include/rfb /usr/local/include/rfb) + +FIND_LIBRARY(VNC_LIBRARIES NAMES libvncclient.so PATH /usr/lib /usr/local/lib) + +IF (VNC_INCLUDES AND VNC_LIBRARIES) + SET(VNC_FOUND TRUE) +ENDIF (VNC_INCLUDES AND VNC_LIBRARIES) + +IF (VNC_FOUND) + IF (NOT VNC_FIND_QUIETLY) + MESSAGE(STATUS "Found VNC: ${VNC_LIBRARIES}") + ENDIF (NOT VNC_FIND_QUIETLY) +ELSE (VNC_FOUND) + IF (VNC_FIND_REQUIRED) + MESSAGE(FATAL_ERROR "Could not find VNC") + ENDIF (VNC_FIND_REQUIRED) +ENDIF (VNC_FOUND)
\ No newline at end of file @@ -0,0 +1,58 @@ +**** Installation Guide (Debian/Ubuntu/Suse) **** + + +*** Prerequisites *** + +The following packages are required: + libvncserver-dev + libx11-dev + libqt4-dev >= 4.5.3 + qt4-dev-tools >= 4.5.3 + cmake >= 2.4.0 + +*** Installation *** + +After the svn-checkout, change to the root folder pvs and enter: + mkdir -p build + cd build/ + cmake .. + make + +or execute: + build.sh + +Ignore compile time warnings. +If you succeed, all binaries are located at build/ +So change the current directory with: + cd build/ + +As superuser (root) you can install the application on your system: + make install + +It is also possible to build distribution specific packages (currently DEB only) + make package + +The Serverapplication is started with + pvsmgr + +the Clientdaemon with + pvs + +and the Clientgui with + pvsgui + + +*** VNC-Server for the PVS-Client *** + +Additionally a script/program has to be supplied to start/stop the vnc-server on the pvs-client. +The program/script is expected to have the following signature: + + program/script(start/stop, port, password) + +All paramters are passed as strings. The first paramter is either "start" or "stop", the second one defines the port on which the +vnc-server should run, the third which password should be set. +Password and port are randomized by the PVS-Client. The port is chosen in the range of [59000, 59100]. + +*** Contact *** + +In case of problems, questions or any kind of feedback, mail me : wittenb@informatik.uni-freiburg.de diff --git a/KNOWNBUGS b/KNOWNBUGS new file mode 100644 index 0000000..7b051c4 --- /dev/null +++ b/KNOWNBUGS @@ -0,0 +1,26 @@ + +Pattern: + + #number Where? + Description + + + + + + +#1 Frametable + Frametable seems to spread out if you return from fullscreen/closeup. + doesnt seem to happen when you chose the upper, rightmost connection for fullscreen, + but every other... + +#2 Closeup + When returning from fullscreen to closeup, the picture isnt scaled down and looks silly + +#3 Closeup + Sometimes closeup seems to grow without stopping and so never showing a picture + +#4 Fullscreen + When the connection breaks down while in fullscreen, fullscreen is not canceled + + @@ -0,0 +1,15 @@ +For installation guidance, consult the INSTALL file. + +ATTENTION! + An external vnc service is necessary on the client side (e.g. x11vnc). + +Furthermore, the client (pvs) expects a .pvs directory in the home directory of the user (will be created on the first launch of +the client). In this directory, it expects a .pass file with the vnc-password and a file name .allow which contains a representation +of true/false ({1,0}, {true,false}) whether the vnc access should be allowed or disallowed. + +For Now, the Projection feature expects the VNC-Server on the PVS-Servers machine to accept no password or "viewonly" as password. +A listing of client commands is following. + +For further information regarding options of the PVS-Client: + + pvs -h or pvs --help
\ No newline at end of file diff --git a/TRANSLATION b/TRANSLATION new file mode 100644 index 0000000..74a10cb --- /dev/null +++ b/TRANSLATION @@ -0,0 +1,4 @@ +Javier Castillo <castillf@informatik.uni-freiburg.de> +Johann Latocha <johann@latocha.de> +Achille Nana <achille.achille@gmail.com> +Fadi Salameh <fadi84@hotmail.com>
\ No newline at end of file diff --git a/build.sh b/build.sh new file mode 100755 index 0000000..6b76686 --- /dev/null +++ b/build.sh @@ -0,0 +1,5 @@ +#!/bin/sh +mkdir -p build +cd build/ +cmake .. +make -s -j2
\ No newline at end of file diff --git a/doc/LaTeX/appendix/0000-chapter.tex b/doc/LaTeX/appendix/0000-chapter.tex new file mode 100644 index 0000000..97e98c3 --- /dev/null +++ b/doc/LaTeX/appendix/0000-chapter.tex @@ -0,0 +1,6 @@ +\begin{figure}[h] + \begin{center} + \includegraphics[scale=0.7]{bilder/Klassendiagramm} + \label{png:kd} + \end{center} +\end{figure}
\ No newline at end of file diff --git a/doc/LaTeX/bilder/ConnectionList.png b/doc/LaTeX/bilder/ConnectionList.png Binary files differnew file mode 100755 index 0000000..93140cb --- /dev/null +++ b/doc/LaTeX/bilder/ConnectionList.png diff --git a/doc/LaTeX/bilder/DBus.pdf b/doc/LaTeX/bilder/DBus.pdf Binary files differnew file mode 100644 index 0000000..90331d6 --- /dev/null +++ b/doc/LaTeX/bilder/DBus.pdf diff --git a/doc/LaTeX/bilder/Klassendiagramm.pdf b/doc/LaTeX/bilder/Klassendiagramm.pdf Binary files differnew file mode 100644 index 0000000..ab5dc9c --- /dev/null +++ b/doc/LaTeX/bilder/Klassendiagramm.pdf diff --git a/doc/LaTeX/bilder/Klassendiagramm.svg b/doc/LaTeX/bilder/Klassendiagramm.svg new file mode 100644 index 0000000..8b4ea29 --- /dev/null +++ b/doc/LaTeX/bilder/Klassendiagramm.svg @@ -0,0 +1,581 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="744.09448" + height="1052.3622" + id="svg2" + version="1.1" + inkscape:version="0.47 r22583" + sodipodi:docname="Klassendiagramm.svg"> + <defs + id="defs4"> + <marker + inkscape:stockid="Arrow2Mend" + orient="auto" + refY="0" + refX="0" + id="Arrow2Mend" + style="overflow:visible"> + <path + id="path4076" + style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round" + d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" + transform="scale(-0.6,-0.6)" /> + </marker> + <marker + inkscape:stockid="Arrow2Mstart" + orient="auto" + refY="0" + refX="0" + id="Arrow2Mstart" + style="overflow:visible"> + <path + id="path4073" + style="font-size:12px;fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round" + d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" + transform="scale(0.6,0.6)" /> + </marker> + </defs> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="0.98994949" + inkscape:cx="341.88526" + inkscape:cy="745.76182" + inkscape:document-units="px" + inkscape:current-layer="layer1" + showgrid="true" + objecttolerance="10000" + guidetolerance="10000" + inkscape:window-width="1920" + inkscape:window-height="1150" + inkscape:window-x="-4" + inkscape:window-y="-3" + inkscape:window-maximized="1"> + <inkscape:grid + type="xygrid" + id="grid2816" + empspacing="5" + visible="true" + enabled="true" + snapvisiblegridlinesonly="true" + dotted="true" /> + </sodipodi:namedview> + <metadata + id="metadata7"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="Ebene 1" + inkscape:groupmode="layer" + id="layer1"> + <g + id="g9855" + transform="translate(10,-245)"> + <g + id="g4008"> + <text + xml:space="preserve" + style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" + x="94.885742" + y="332.36218" + id="text2818"><tspan + sodipodi:role="line" + id="tspan2820" + x="94.885742" + y="332.36218">PVSGUI</tspan></text> + <rect + style="fill:none;stroke:#000000;stroke-opacity:1" + id="rect3618" + width="215" + height="20" + x="10" + y="317.36218" /> + </g> + <g + transform="translate(-90,20)" + id="g3642"> + <text + xml:space="preserve" + style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" + x="125" + y="402.36218" + id="text2826"><tspan + sodipodi:role="line" + id="tspan2828" + x="125" + y="402.36218">ClientConfigDialog</tspan></text> + <rect + style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" + id="rect3622" + width="110" + height="20" + x="120" + y="79.094482" + transform="translate(0,308.2677)" /> + </g> + <g + transform="translate(-105,-35)" + id="g3647"> + <text + xml:space="preserve" + style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" + x="130" + y="427.36218" + id="text2830"><tspan + sodipodi:role="line" + id="tspan2832" + x="130" + y="427.36218">ClientInfoDialog</tspan></text> + <rect + style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" + id="rect3624" + width="95" + height="20" + x="125" + y="104.09448" + transform="translate(0,308.2677)" /> + </g> + <g + transform="translate(-185,-105)" + id="g3652"> + <text + xml:space="preserve" + style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" + x="200" + y="467.36218" + id="text2838"><tspan + sodipodi:role="line" + id="tspan2840" + x="200" + y="467.36218">AboutDialog</tspan></text> + <rect + style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" + id="rect3626" + width="75" + height="20" + x="195" + y="144.09448" + transform="translate(0,308.2677)" /> + </g> + <g + transform="translate(80,-175)" + id="g3657"> + <text + xml:space="preserve" + style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" + x="165" + y="507.36218" + id="text2842"><tspan + sodipodi:role="line" + id="tspan2844" + x="165" + y="507.36218">OrgOpenslxPvsInterface</tspan></text> + <rect + style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" + id="rect3630" + width="140" + height="20" + x="160" + y="184.09448" + transform="translate(0,308.2677)" /> + </g> + <path + inkscape:connector-type="polyline" + transform="translate(0,308.2677)" + id="path3673" + d="m 45,39.094482 0,-10" + style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-start:url(#Arrow2Mstart)" /> + <path + inkscape:connector-type="polyline" + transform="translate(0,308.2677)" + id="path3675" + d="m 100,69.094482 0,-40" + style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-start:url(#Arrow2Mstart)" /> + <path + inkscape:connector-type="polyline" + transform="translate(0,308.2677)" + id="path3677" + d="m 125,99.094482 0,-70" + style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-start:url(#Arrow2Mstart)" /> + <path + inkscape:connector-type="polyline" + transform="translate(0,308.2677)" + id="path3679" + d="M 149.64286,128.73734 150,29.094482" + style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-start:url(#Arrow2Mstart)" /> + <path + transform="translate(0,308.2677)" + inkscape:connector-type="polyline" + id="path3681" + d="M 180,159.09448 180,29.094482" + style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-start:url(#Arrow2Mstart)" /> + <path + inkscape:connector-type="polyline" + transform="translate(0,308.2677)" + id="path3683" + d="m 225,19.094482 15,0" + style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend)" /> + <g + transform="translate(65,140)" + id="g3637"> + <text + xml:space="preserve" + style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" + x="110" + y="372.36218" + id="text2822"><tspan + sodipodi:role="line" + id="tspan2824" + x="110" + y="372.36218">ClientChatDialog</tspan></text> + <rect + style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" + id="rect3620" + width="100" + height="20" + x="105" + y="49.094482" + transform="translate(0,308.2677)" /> + </g> + <g + transform="translate(50,2e-6)" + id="g3662"> + <text + xml:space="preserve" + style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" + x="45" + y="482.36218" + id="text2834"><tspan + sodipodi:role="line" + id="tspan2836" + x="45" + y="482.36218">ClientVNCViewer</tspan></text> + <rect + style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" + id="rect3628" + width="105" + height="20" + x="40" + y="159.09448" + transform="translate(0,308.2677)" /> + </g> + <g + transform="translate(-90,-15)" + id="g3727"> + <g + id="g3657-3" + transform="translate(-60,50)"> + <text + id="text2842-6" + y="507.36218" + x="165" + style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" + xml:space="preserve"><tspan + y="507.36218" + x="165" + id="tspan2844-1" + sodipodi:role="line">OrgOpenslxPvsInterface</tspan></text> + <rect + transform="translate(0,308.2677)" + y="184.09448" + x="160" + height="20" + width="140" + id="rect3630-2" + style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /> + </g> + </g> + <g + transform="translate(-45,-10)" + id="g3722"> + <text + xml:space="preserve" + style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" + x="60" + y="522.36218" + id="text3685"><tspan + sodipodi:role="line" + id="tspan3687" + x="60" + y="522.36218">VNCClientThread</tspan></text> + <rect + style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" + id="rect3720" + width="105" + height="20" + x="55" + y="199.09448" + transform="translate(0,308.2677)" /> + </g> + <g + transform="translate(-135,20)" + id="g3751"> + <text + xml:space="preserve" + style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" + x="310" + y="522.36218" + id="text3739"><tspan + sodipodi:role="line" + id="tspan3741" + x="310" + y="522.36218">ClientFileSendDialog</tspan></text> + <rect + style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" + id="rect3747" + width="120" + height="20" + x="305" + y="199.09448" + transform="translate(0,308.2677)" /> + </g> + <g + transform="translate(-280,-115)" + id="g3756"> + <text + xml:space="preserve" + style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" + x="310" + y="567.36218" + id="text3743"><tspan + sodipodi:role="line" + id="tspan3745" + x="310" + y="567.36218">ClientFileReceiveDialog</tspan></text> + <rect + style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" + id="rect3749" + width="135" + height="20" + x="305" + y="244.09448" + transform="translate(0,308.2677)" /> + </g> + <path + inkscape:connector-type="polyline" + transform="translate(0,308.2677)" + id="path3811" + d="m 100,189.09448 0,-10" + style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-start:url(#Arrow2Mstart)" /> + <path + inkscape:connector-type="polyline" + transform="translate(0,308.2677)" + id="path3813" + d="m 125,219.09448 0,-40" + style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-start:url(#Arrow2Mstart)" /> + <g + transform="translate(120,4.9999998)" + id="g3657-9"> + <text + xml:space="preserve" + style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" + x="165" + y="507.36218" + id="text2842-3"><tspan + sodipodi:role="line" + id="tspan2844-19" + x="165" + y="507.36218">OrgOpenslxPvsInterface</tspan></text> + <rect + style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" + id="rect3630-4" + width="140" + height="20" + x="160" + y="184.09448" + transform="translate(0,308.2677)" /> + </g> + <path + inkscape:connector-type="polyline" + transform="translate(0,308.2677)" + id="path3846" + d="m 220,219.09448 0,-10" + style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-start:url(#Arrow2Mstart)" /> + <g + transform="translate(140,35)" + id="g3657-9-7"> + <text + xml:space="preserve" + style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" + x="165" + y="507.36218" + id="text2842-3-8"><tspan + sodipodi:role="line" + id="tspan2844-19-4" + x="165" + y="507.36218">OrgOpenslxPvsInterface</tspan></text> + <rect + style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" + id="rect3630-4-5" + width="140" + height="20" + x="160" + y="184.09448" + transform="translate(0,308.2677)" /> + </g> + <path + inkscape:connector-type="polyline" + transform="translate(0,308.2677)" + id="path3881" + d="m 270,199.09448 10,0" + style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-start:none;marker-end:url(#Arrow2Mend)" /> + <path + inkscape:connector-type="polyline" + transform="translate(0,308.2677)" + id="path3908" + d="m 290,229.09448 10,0" + style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-start:none;marker-end:url(#Arrow2Mend)" /> + <path + inkscape:connector-type="polyline" + transform="translate(0,308.2677)" + id="path3912" + d="m 205,29.094482 0,159.999998" + style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-start:none;marker-end:url(#Arrow2Mend)" /> + <g + transform="translate(-65,-150)" + id="g3751-0"> + <text + xml:space="preserve" + style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" + x="310" + y="522.36218" + id="text3739-3"><tspan + sodipodi:role="line" + id="tspan3741-6" + x="310" + y="522.36218">ClientFileSendDialog</tspan></text> + <rect + style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" + id="rect3747-1" + width="120" + height="20" + x="305" + y="199.09448" + transform="translate(0,308.2677)" /> + </g> + <g + transform="translate(80,-100)" + id="g3657-9-7-0"> + <text + xml:space="preserve" + style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" + x="165" + y="507.36218" + id="text2842-3-8-6"><tspan + sodipodi:role="line" + id="tspan2844-19-4-3" + x="165" + y="507.36218">OrgOpenslxPvsInterface</tspan></text> + <rect + style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" + id="rect3630-4-5-2" + width="140" + height="20" + x="160" + y="184.09448" + transform="translate(0,308.2677)" /> + </g> + <path + inkscape:connector-type="polyline" + transform="translate(0,308.2677)" + id="path3960" + d="m 280,84.094482 0,-15" + style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-start:url(#Arrow2Mstart)" /> + <path + inkscape:connector-type="polyline" + transform="translate(0,308.2677)" + id="path3962" + d="m 240,59.094482 -25,0" + style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-start:url(#Arrow2Mstart)" /> + <path + inkscape:connector-type="polyline" + transform="translate(0,308.2677)" + id="path3964" + d="m 215,29.094482 0,30" + style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + </g> + <g + id="g10143" + transform="translate(5,55.000003)"> + <g + transform="translate(-510.33301,80)" + id="g4000"> + <text + xml:space="preserve" + style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" + x="620.33301" + y="332.36218" + id="text2818-1"><tspan + sodipodi:role="line" + id="tspan2820-5" + x="620.33301" + y="332.36218">PVS</tspan></text> + <rect + style="fill:none;stroke:#000000;stroke-opacity:1" + id="rect3618-5" + width="215" + height="20" + x="525" + y="317.36218" /> + </g> + <g + transform="translate(85,-95)" + id="g3657-4"> + <text + xml:space="preserve" + style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" + x="165" + y="507.36218" + id="text2842-7"><tspan + sodipodi:role="line" + id="tspan2844-6" + x="165" + y="507.36218">OrgOpenslxPvsInterface</tspan></text> + <rect + style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" + id="rect3630-5" + width="140" + height="20" + x="160" + y="184.09448" + transform="translate(0,308.2677)" /> + </g> + <path + inkscape:connector-type="polyline" + id="path9955" + d="m 230,407.36218 15,0" + style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Mend)" /> + </g> + <text + xml:space="preserve" + style="font-size:16px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial" + x="307.87537" + y="25.037045" + id="text10196"><tspan + sodipodi:role="line" + id="tspan10198" + x="307.87537" + y="25.037045">Klassendiagramm</tspan></text> + </g> +</svg> diff --git a/doc/LaTeX/bilder/clientChatDialog.png b/doc/LaTeX/bilder/clientChatDialog.png Binary files differnew file mode 100644 index 0000000..cab6b26 --- /dev/null +++ b/doc/LaTeX/bilder/clientChatDialog.png diff --git a/doc/LaTeX/bilder/clientConfigDialog.png b/doc/LaTeX/bilder/clientConfigDialog.png Binary files differnew file mode 100644 index 0000000..c7e7732 --- /dev/null +++ b/doc/LaTeX/bilder/clientConfigDialog.png diff --git a/doc/LaTeX/bilder/clientToolbar.png b/doc/LaTeX/bilder/clientToolbar.png Binary files differnew file mode 100644 index 0000000..e892c0e --- /dev/null +++ b/doc/LaTeX/bilder/clientToolbar.png diff --git a/doc/LaTeX/bilder/connectionframe.png b/doc/LaTeX/bilder/connectionframe.png Binary files differnew file mode 100755 index 0000000..ba158b9 --- /dev/null +++ b/doc/LaTeX/bilder/connectionframe.png diff --git a/doc/LaTeX/bilder/dum.jpg b/doc/LaTeX/bilder/dum.jpg Binary files differnew file mode 100644 index 0000000..231ffb1 --- /dev/null +++ b/doc/LaTeX/bilder/dum.jpg diff --git a/doc/LaTeX/bilder/dum.png b/doc/LaTeX/bilder/dum.png Binary files differnew file mode 100644 index 0000000..9284736 --- /dev/null +++ b/doc/LaTeX/bilder/dum.png diff --git a/doc/LaTeX/bilder/mainwindow.png b/doc/LaTeX/bilder/mainwindow.png Binary files differnew file mode 100755 index 0000000..b7ba8c4 --- /dev/null +++ b/doc/LaTeX/bilder/mainwindow.png diff --git a/doc/LaTeX/bilder/pvsmgr.jpg b/doc/LaTeX/bilder/pvsmgr.jpg Binary files differnew file mode 100755 index 0000000..ec5ae30 --- /dev/null +++ b/doc/LaTeX/bilder/pvsmgr.jpg diff --git a/doc/LaTeX/bilder/pvsmgrAll.jpg b/doc/LaTeX/bilder/pvsmgrAll.jpg Binary files differnew file mode 100755 index 0000000..a522424 --- /dev/null +++ b/doc/LaTeX/bilder/pvsmgrAll.jpg diff --git a/doc/LaTeX/bilder/siegel-neu.jpg b/doc/LaTeX/bilder/siegel-neu.jpg Binary files differnew file mode 100644 index 0000000..3bb83a9 --- /dev/null +++ b/doc/LaTeX/bilder/siegel-neu.jpg diff --git a/doc/LaTeX/bilder/siegel-neu.png b/doc/LaTeX/bilder/siegel-neu.png Binary files differnew file mode 100644 index 0000000..1cff269 --- /dev/null +++ b/doc/LaTeX/bilder/siegel-neu.png diff --git a/doc/LaTeX/bilder/studentctlpanel.png b/doc/LaTeX/bilder/studentctlpanel.png Binary files differnew file mode 100644 index 0000000..84930f5 --- /dev/null +++ b/doc/LaTeX/bilder/studentctlpanel.png diff --git a/doc/LaTeX/devel/0000-chapter.tex b/doc/LaTeX/devel/0000-chapter.tex new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/doc/LaTeX/devel/0000-chapter.tex diff --git a/doc/LaTeX/devel/0100-build.tex b/doc/LaTeX/devel/0100-build.tex new file mode 100644 index 0000000..f5cf05e --- /dev/null +++ b/doc/LaTeX/devel/0100-build.tex @@ -0,0 +1,67 @@ +\chapter{Erzeugen und Installieren der Applikation} +\index{Installieren} +Um den Pool Video Switch erfolgreich zu kompilieren, müssen zunächst die Quelldateien heruntergeladen werden. Hierzu sollte auf dem Arbeitsrechner ein Subversion-Client installiert sein. Ein Checkout kann in einem beliebigen Terminal erfolgen, wobei es zwei unterschiedliche Arten des Zugriffs gibt.\\ + +Anonym, nur Leserechte:\\ +\textbf{svn co http://svn.openslx.org/svn/pvs/trunk/pvs}\\ + +Mit Account, auch Schreibrechte (benutzer mit SSH Login ersetzen):\\ +\textbf{svn co svn+ssh://benutzer@openslx.org/srv/svn/pvs}\\ + + +\section{Voraussetzungen} +Der Pool Video Switch benötigt zum Kompilieren folgende Pakete (und ihre Abhängigkeiten): +\begin{itemize} + \item libvncserver-dev >= 0.9.3\\ + Eine angenehm kleine, wenn auch in C geschriebene, Bibliothek für die Erstellung von VNC Servern und Clients. + \item libx11-dev >= 1.3.3\\ + Diese Bibliothek wurde eingesetzt, um ausgewählten oder allen Zielrechnern den Zugriff auf Maus und Tastatur zu entziehen und den Bildschirm schwarz zu schalten. + \item libqt4-dev >= 4.5.3\\ + Sowohl die Server als auch die ClientGUI benutzen das Qt Framework in der Version 4. Ferner wird QtNetwork zur Kommunikation zwischen Server und Client benötigt und QtDbus zur Interprozesskommunikation zwischen Client-Daemon und GUI. + \item qt4-dev-tools >= 4.5.3\\ + Dies wird nur benötigt, falls Unterstützung weiterer Sprachen implementiert werden soll, da in diesem Paket das Hilfsprogramm \textbf{linguist} enthalten ist. + \item cmake >= 2.4.0\\ + Eingesetztes Buildsystem und der Makefile-Generator. Um distributionsspezifische Pakete zu erzeugen wird CPack benutzt. +\end{itemize} + +\section{Kompilieren aus Quellen} +Sobald alle Voraussetzungen erfüllt und die Quellen installiert sind, kann das ausführbare Programm erzeugt werden. Falls gewünscht, kann zusätzlich in der Datei \textit{CMakeLists.txt} der Build-Type eingestellt werden. Gültige Werte sind \texttt{Debug} und \texttt{Release} und ihre Wirkung den zwei weiteren Zeilen zu entnehmen. +\begin{verbatim} +SET(CMAKE_BUILD_TYPE Debug) +SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g -Wall") +SET(CMAKE_CXX_FLAGS_RELEASE "-O3 -march=native") +\end{verbatim} +Damit das Wurzelverzeichnis des Projekts weiterhin sauber bleibt (Übersicht beibehalten, Arbeit mit SVN erleichtern), werden wir hier einen Out-Of-Source Build durchführen. Dies bedeutet, dass zum Kompilieren ein seperates Verzeichnis benutzt wird und sämtliche automatisch generierten Dateien sowie das Kompilat selbst hier abgelegt wird. In einem Terminal sollte nun in das Verzeichnis indem sich das Projekt befindet gewechselt werden, um folgende Befehle ausführen zu können:\\ + +\textbf{mkdir -p build}\\ +\textbf{cd build/}\\ +\textbf{cmake ..}\\ +\textbf{make}\\ + +Die verschiedenen Applikationen können nun folgendermaßen (in \textit{build/}) ausgeführt und getestet werden: +\begin{itemize} + \item Den Server starten: \textbf{./pvsmgr} + \item Den Server mit Touchscreenoberfläche starten: \textbf{./pvsmgrtouch} + \item Den ClientDaemon starten: \textbf{./pvs} + \item Die ClientGUI starten: \textbf{./pvsgui} +\end{itemize} + +\section{Installation} +\index{Paket!RPM} \index{Paket!DPKG} +Nachdem das Projekt kompiliert wurde, kann es (als Superuser z.B. root) auf dem lokalen System installiert werden:\\ +\textbf{make install}\\ + +Dabei werden folgende Dateien auf das aktuelle System übertragen:\\ +\textit{/usr/local/bin/pvsmgr}\\ +\textit{/usr/local/bin/pvs}\\ +\textit{/usr/local/bin/pvsgui}\\ +\textit{/usr/local/bin/pvsmgrtouch}\\ +\textit{/usr/local/share/dbus-1/services/org.openslx.pvs.service}\\ + +Ein Vorteil ist, dass nun ein seperates Ausführen des Client-Daemon nicht mehr notwendig ist. Dieser wird ab sofort automatisch gestartet und beendet, sobald die ClientGUI ausgeführt wurde.\\ + +Es ist ebenfalls möglich, distributionsspezifische Pakete zu erstellen (zur Zeit nur .deb):\\ +\textbf{make package}\\ + +Falls erfolgreich, befindet sich nun eine Installationsdatei (pvs-<version>-Linux.deb) in \textit{build/} die z.B. auf Debian-Derivaten mit \textbf{dpkg -i} installiert werden kann.\\ +Anmerkung: Falls Pakete für Rechner gebaut werden sollen, die vom Erstellungssystem her verschieden sind, muß der Schalter \texttt{-march=native} in der Datei \textit{CMakeLists.txt} angepasst werden! diff --git a/doc/LaTeX/devel/0200-gui-lib.tex b/doc/LaTeX/devel/0200-gui-lib.tex new file mode 100644 index 0000000..05730da --- /dev/null +++ b/doc/LaTeX/devel/0200-gui-lib.tex @@ -0,0 +1,31 @@ +\chapter{Eingesetzte GUI-Bibliothek} +\index{QT} \index{GUI} +Die komplette Benutzerschnittstelle des Clients wurde mit Hilfe des von Nokia (früher Trolltech) entwickelten Frameworks Qt in der Version 4 implementiert. Der Grund hierfür sind folgende Vorteile: +\begin{itemize} + \item Qt wird bereits in einer Vielzahl von großen Projekten eingesetzt (KDE, Opera, Skype, Google Earth,...) und ist somit solide und erprobt. + \item Das komplette Framework besteht nicht nur aus einer GUI-Bibliothek sondern beinhaltet noch viele weitere nützliche Module, die bei der Entwicklung ebenfalls zum Einsatz kamen (QtNetwork, QtDBus, Internationalisierung). + \item Qt ist plattformunabhängig: Projekte können für Linux, OSX und Windows erstellt werden + \item Moderne Konzepte und Werkzeuge werden bereitgestellt. So wird das Signal-Slot-Konzept durchgängig eingehalten und mit dem GUI-Builder (\textbf{designer}) können einfach und professionell grafische Interfaces erstellt werden. + \item Duales Lizenzmodell: Qt gibt es sowohl unter einer proprietären Lizenz als auch unter der (L)GPL. +\end{itemize} +Leider unterstützte das bisher eingesetzte Build System (Autotools) Qt nicht vollständig. Dies liegt daran dass Qt zum Erzeugen von Makefiles ein eigenes Werkzeug mitbringt (QMake). Aus diesem Grund wurde eine Umstellung auf das neue CMake durchgeführt. Dies ist nicht nur flexibler als Autotools (plattformunabhängig) sondern auch einfacher in der Einrichtung und Wartung (und wird übrigens vom KDE-Projekt seit der Version 4 eingesetzt). Des Weiteren ist es mit CMake nicht nur möglich Qt-Anwendungen zu erstellen sondern auch die komplette Qt-Toolchain (\textbf{moc}, \textbf{uic}, \textbf{rcc}, \textbf{qdbuscpp2xml}, \textbf{qdbusxml2cpp}, \textbf{lupdate}, \mbox{\textbf{lrelease}},...) komfortabel zu nutzen. So kann z.B. die Interface Erstellung für D-Bus oder das Internationalisieren der Software automatisiert werden. + +\section{Internationalisierung} +\index{Internationalisierung} +Wie oben bereits erwähnt wurde zur Internationalisierung das von Qt4 bereitgestellte System benutzt und mit CMake automatisiert. Der interne Ablauf sieht folgendermaßen aus (\textit{CMakeLists.txt}): +\begin{enumerate} + \item Mit \texttt{SET} werden Variablen mit Quelldateien definiert, die die zu übersetzenden Zeichenketten beinhalten. Diese dienen gleichzeitig zum Kompilieren. + \item Danach werden ebenfalls mit \texttt{SET} Variablen definiert, die später die vom Benutzer zu übersetzenden .ts Dateien enthalten (z.B. \textit{i18n/pvsgui\_de\_DE.ts}). + \item \texttt{QT4\_CREATE\_TRANSLATION} erzeugt im Build-Verzeichnis binäre Internationalisierungs Dateien, die beim Kompilieren eingebunden werden müssen. +\end{enumerate} + +\textbf{Beispiel:} +\begin{verbatim} +SET( PVSGUI_SRCS src/pvsgui.cpp src/gui/clientConfigDialog.cpp ) +SET( PVSGUI_TSS i18n/pvsgui_de_DE.ts i18n/pvsgui_fr_FR.ts ) +QT4_CREATE_TRANSLATION( PVSGUI_QMS ${PVSGUI_SRCS} ${PVSGUI_TSS} ) +ADD_EXECUTABLE( pvsgui ${PVSGUI_SRCS} ${PVSGUI_QMS} ) +\end{verbatim} + +Jede so erzeugte .ts Datei kann nun mit dem Programm \textbf{linguist} von einem Übersetzer bearbeitet werden. Damit die Zeichenketten später während der Ausführung übersetzt werden, müssen diese allerdings mit der Funktion \texttt{QObject::tr()} im Quellcode erzeugt worden sein. + diff --git a/doc/LaTeX/devel/0300-pvs.tex b/doc/LaTeX/devel/0300-pvs.tex new file mode 100644 index 0000000..329e03a --- /dev/null +++ b/doc/LaTeX/devel/0300-pvs.tex @@ -0,0 +1,222 @@ +\chapter{Aufbau und Funktionsweise des PVS} +\index{Aufbau} \index{Funktionsweise} \index{Konzept} + +Generelles Konzept + +\section{Einzelne Komponenten} +\index{Komponenten} + +\subsection{Zuordnung von Konsole und Clients} +\input{devel/0310-service-discovery} + +\subsection{Überblick über Aktivitäten auf Clients} + +\subsection{Projektion an Alle} +\index{Projektion} +Eine wichtige Eigenschaft des PVS ist die Verwaltung von Projektionen zwischen mehreren Clients. Eine Projektion ist hierbei das Anzeigen des Bildschirminhalts eines Clients - der sogenannten Source oder Quelle - auf einem oder mehreren anderen Clients - den Targets oder Zielen der Projektion. +Die für die Projektion benötigten Verbindungsdaten wie Passwort und IP werden von jedem Client bei der Anmeldung an der Steuerkonsole übermittelt und in einer Liste von PVSConnection Objekten in der Klasse \textit{PVSConnectionManager} gespeichert. Diese zentrale Verwaltung hat mehrere Vorteile: +\begin{itemize} + \item Die Quelle einer Projektion muss keine Aktion ausführen und kann passiv bleiben. + \item Redundanz der Daten wird verhindert, da diese auch in der Steuerkonsole zur Darstellung der Thumbnails benötigt werden. + \item Das Nachrichtenaufkommen wird reduziert, da lediglich eine Nachricht bei der Anmeldung an der Steuerkonsole übermittelt wird. +\end{itemize} + +Bei der Auswahl der Quelle und Ziele ist zu beachten, dass man für jede Projektion jeweils nur eine Quelle jedoch mehrere Ziele auswählen kann. +Quelle und Ziel müssen außerdem verschiedenen Kriterien genügen. +\begin{itemize} + \item Eine Quelle darf nicht gleichzeitig Ziel einer Projektion sein. + \item Ein Ziel einer Projektion darf nicht Ziel einer anderen Projektion sein. + \item Eine Quelle darf mehrfach als Quelle ausgewählt werden. +\end{itemize} +Diese Einschränkungen werden in der Steuerkonsole durchgesetzt, indem im Zielauswahldialog die Zielmenge eingeschränkt wird. +Siehe hierzu auch \ref{pvs-console-projection} Projektion. + +Der Projektionsvorgang an sich besteht aus mehreren Teilen. Wird eine Projektion angefordert, wird überprüft, ob auf der Quelle ein VNC Server gestartet ist. Falls nicht, wird versucht, einen VNC Server zu starten. Ist dies erfolgreich, so sendet die Steuerkonsole das entsprechende Tripel (IP, Passwort und Port der Quelle) an alle ausgewählten Ziele. Clients, welche eine Projektionsaufforderung erhalten, verbinden sich dann mit den Verbindungsdaten zum VNC Server der Quelle. Um die Einstellbarkeit der Qualität einer Projektion zu ermöglichen, kann die Steuerkonsole einen von drei Qualitätswerten an die Zielclients übermitteln. Siehe hierzu auch \ref{pvs-console-quality} Qualitätsoptionen. + + +\subsection{Projektion eines Clients auf dem Beamer} +\index{Beamer} + +Die Projektion eines Clients an den Beamer unterscheidet sich im Wesentlichen nicht von anderen Projektionen. Lediglich ist das Ziel der Projektion hierbei der Dozentenpc bzw. der PC, welcher an den Beamer angeschlossen ist. Eine spezielle Auszeichnung des Beamers erfolgt nicht. Die Anzahl der Ziele wird hierbei nicht beschränkt, da es wünschenswert sein kann, den auf dem Beamer dargestellten Bildschirminhalt auch gleichzeitig auf anderen Clients darzustellen. + +\subsection{Chat- und Informationskanal} +\index{Chat} + +Es gibt 2 Möglichkeiten um Kontakt mit den Clients aufzunehmen. Die erste ist über den Chat, wo Nachrichten sowohl über den offentlichen Kanal als +auch über einen privaten Kanäle verteilt werden können, und die zweite vom PVSManager aus über den Informationskanal. +Der Informationskanal ermöglich das Versenden von Nachrichten, die dringend zu lesen sind, an die Clients. +Im Gegenteil zum Chat erscheinen solche Nachrichten nicht im Chatfenster sondern in einem Pop-Up-Fenster und werden vom Bildschirm entfernt erst wenn man sie +als gelesen markiert durch das Drucken auf dem Knopf \textit{'OK'}. +\\ +\\ +\textbf{Behandlung der Nachrichten im Server} +\\ +\\ +Chat-Nachtichten werden von Server in der Klasse 'PVSConnectionManager' mittels der Methode 'onChat' behandelt. Dort wird aus der Nachrit den Empfänger +und den Absender ausglesen und die Nachricht an beide versendet. So gilt das Empfangen eine eigene Nachricht als Bestätigung, dass die Nachricht ordentlich vom Server +behandelt und versendet wurde. Das Gestalt von solchen Nachrichten sieht folgendermaßen aus + +\begin{center} + PVSMSG +\end{center} +\begin{center} +\begin{tabular}{l | l | p{4cm} | p{4cm}} +\hline +Type & Ident & Msg & sndID\\ +\hline +PVSMESSAGE & <Username des Empfängers> & <Username des Absenders>:<Die eigentliche nachrich> & <Vom server zugewissene ID des Absenders>\\ +\end{tabular} +\end{center} + +Informationsnachrichten werden ausschließlich vom PVSManager versendet.Dies geschiet in der Klasse 'ConnectionList' mittels der Methode 'on\_Message'. + +\begin{center} + PVSMSG +\end{center} +\begin{center} +\begin{tabular}{l | l | p{4cm} | p{4cm}} +\hline +Type & Ident & Msg\\ +\hline +PVSMESSAGE & BROADCAST & <Die eigentliche nachrich> \\ +\end{tabular} +\end{center} + +Informationnachrichten können außerdem einen oder mehrere Clients sperren, wenn sie den Ident 'LOCKSTATION' enthalten. Sobald ein Client die Nachricht empfängt, +wird diese auf dem Bilschirm angezeigt und 10 Sekunden später wird der Client gesperrt. + +Abgesehen von der Behandlung der Nachrichten muss sich der Server darum kümmern, dass jeder verbunde Client über alle nötige Informationionen verfügt damit er +Nachrichten mit andren Clients austauschen kann. Dies wird folgendermaßen erledigt: +\begin{itemize} + \item \textbf{Einfügen eines Clients:} um die Verwaltung von Clients kümmert sich die Klasse 'PVSConnectionManager', in der die Methode 'onClientNew' für das Einfügen +von neuen Clients zuständigt ist. Sowald ein neuer Client in der Client-Liste des Servers eingefügt wird, wird an ihn die Liste aller im Server bereits angemeldete +Clients geschickt. Dazu dient die Methode 'sendEventToClients'. + +Bis hier ist der neue Client noch unbekannt für den Rest der Nutzer. Der neuer Client wird erst bekannt gegeben sobald er vom Server einen Benutzername +zugewissen bekommen hat. Da es sein kann, dass den Name, mit dem der neue Client sich beim Server anmelden wollte, +bereits vergeben ist und muss unter Umständen verändert werden. Diese Zuweisung findet in der Methode 'onLoginUsername' statt, +wo nicht nur alle andere Clients sondern auch der neue Client darüber informiert werden. Auch hier kümmert sich die Methoder 'sendEventToClients' +ums Vesenden der entsprechenden Informationen. + + \item \textbf{Entfernen eines Clients:} das Entfernen von Clients wird von der Methode 'onClientRemove' erledigt, wo analog wie +Oben alle Clients darüber informiert werden. +\end{itemize} + +Für dei Übermittlung solche Informationen werden Nachrichten mit folgenden Gestal benutzt + +\begin{center} + PVSMSG +\end{center} +\begin{center} +\begin{tabular}{l | l | p{4cm} | p{4cm}} +\hline +Type & Ident & Msg\\ +\hline +PVSMESSAGE & <Befehl> & <Benutzername>:<IP-Adresse> \\ +\end{tabular} +\end{center} + +Es gibt drei unterschiedliche Befehle, die welche Änderung in der localen Client-Liste der Clients vorgenommen werden soll angeben. +\begin{enumerate} + \item 'clientToAdd' +\item 'clientToRemove' +\item 'assignedName' +\end{enumerate} + +Wie es bei Servern gewöhnt ist, werden alle relevante Ereignisse in Log-Dateien protokolliert. Ereignisse werden im Chat-Log mit folgendem +Befehl eingetragen + +\begin{center} +'ConsoleLog writeChat(<Beschreibung des Ereignisses>)' +\end{center} + +\textbf{Chat-Interface der Steuerkonsole} +\\ +\\ +So wie alle Clients ist der PVSManager auch ein Teilnehmer im Chat. Der PVSManager steht wie alle andere Teilnehmer auch in der Nutzer-Liste +jedes Chat-Fenster und kann ebenfalls über private Nachrichten direkt angesprochen werden. Die Arbeitsweise dieser Chat-Interface ist sehr simple. +Da sie sich im Server befindet, müssen einfach alle Ereignise (Nachrichten senden ist die einzige Ausnahme) von der Klasse 'PVSConnectionManager' +an die Klasse 'MainWindow' weitergegeben werden. Dies kümmert sich darum, alle Informationen zu verarbeiten und diesein der Chat-Fenster der +Steuerkonsole anzuzeigen. + +Folgende Methoden der Klasse 'MainWindow' ermöglichen das Anzeigen einer empfangenen Nachricht im Chat-Fenster der Steuerkonsole und Änderungen (Clients einfügen +und entfernen) in der sowohl im Chat-Fenster als auch in der Steuerkonsole angezeigten Client-Liste. +\\ +\\ +'receiveChatMsg(<Absender>, <Empfänger>, <Nachricht>)' +\\ +'removeConnection(*pvsClient)' +\\ +'addConnection(*pvsClient)' +\\ +\\ +Alle diese Methoden werden im Gegensatz von der Methode 'sendChatMsg(PVSMsg myMsg)' von der Klasse 'PVSConnectionManager' aus ausgeführt. Da alle durchs +Netz empfangene Nachrichten müssen an die GUI-Weitergegeben werden. Beim Versenden von Nachrichten funktioniert es genau umgekehrt. Die Nachricht wird +vom Nutzer in der GUI eingegeben und muss an die Klasse 'PVSConnectionManager' weitergeleitet werden, damit diese ins Netz gesendet wird. Darum kümmert +sich die Methode in der Klasse 'MainWindow' +\\ +\\ +'MainWindow::sendChatMsg(PVSMsg myMsg)' +\\ +\\ +\textbf{Chat-Clients} +\\ +\\ +So weit haben wir die Funtionsweisen des Servers im Bezug auf dem Chat kennengelernt. +Nun wird erläutert wie die einzelnen Clients die Nachrichten bearbeiten. +\\ +\\ +Auf der Client-Seite in der Klasse 'PVSConnectionServer' werden alle Nachrichten des PVS-Protokolls empfangen und gefiltert (Siehe Methode 'handleClientMsg'). +Nachrichten mit dem Ident 'PVSMESSAGE' werden durch den Dispatcher direkt an die Klasse 'PVSChatClient' weitergeleitet, wo die Methode 'receive' feststellen wird, +ob es sich dabei um eine Gespräch-Nachricht oder eine Befehl-Nachricht handelt. Um es feststellen zu können, wird aus der empfangenen Nachricht ein PVSChatMsg-Objekt +erzeugt (siehe Konstruktor 'PVSChatMsg::PVSChatMsg(PVSMsg pvsMsg)') und mittels der Methode 'isCommand' erfährt man ob es sich um einen Befehl handelt oder nicht. +Falls ja leitet der Dispatche die Nachricht an die Stelle 'PVS::UpdateChatClients' sonst an die Stelle 'PVS::chat\_receive', wo die Änderungen in der Client-Liste +vorgenommen werden oder die Gespräch-Nachricht der GUI abgegeben wird. + + +\section{Netzwerkkommunikation} +\index{Netzwerkkommunikation} + +\subsection{PVS-Protokoll} +\index{Protokoll!PVS} \index{Protokoll} +Im Zuge der Entwicklung des PVS wurde ein sehr einfaches Messagingprotokoll entwickelt. +Die Nachrichten bzw. Messages bestehen dabei aus Header, Nachrichtentyp, Ident und dem eigentlichen Nachrichtentext. Die einzelnen Nachrichtenteile, welche bis auf den Header selbst definiert werden können, werden verknüpft und versendet. Es sind schon Nachrichtentypen vordefiniert, welche sich nur durch unterschiedliche Dispatcher unterscheiden. +Bereits vorhandene Typen sind COMMAND, LOGIN, MESSAGE und UNKNOWN. Die Dispatcher (\_commandDispatcher, \_loginDispatcher und \_chatDispatcher) befinden sich im Client in der Klasse \texttt{ServerConnection}, in der Steuerkonsole in der Klasse \texttt{ClientConnection} bzw. \texttt{ListenServer}. Ein Ident wie z.B. Username, Befehl oder Beschreibung des Nachrichteninhalts dient zur Unterscheidung verschiedener Nachrichten mit demselben Nachrichtentyp, wobei die Nachricht dann den dem Ident entsprechenden Nachrichtentext enthält. +Um eine Funktion zur Behandlung einer bestimmten Nachricht zu definieren, wird diese Funktion als Handler mit dem entsprechenden Dispatcher verknüpft. Im PVS-Client beispielsweise befindet sich der Dispatcher für Nachrichten vom Typ Command in der Klasse \texttt{pvsServerConnection}, daher wird in der Klasse \texttt{pvs} die Funktion \verb|void PVS::onCommand(PVSMsg cmdMessage)| wie folgt als Handler registriert: \verb|_pvsServerConnection->addCommandHandler("*", this, &PVS::onCommand)|. Erhält nun der Client eine Nachricht vom Typ COMMAND, so wird die Funktion onCommand mit dem entsprechenden Nachrichtenobjekt aufgerufen. Auf die eigentliche Nachricht kann dann über die Methoden \texttt{getIdent()} und \texttt{getMessage()} des Objektes zugegriffen werden. + +\subsection{PVS-Messages} +\index{Message!PVS} \index{Message} +Im Folgenden sind die Messages, die zwischen den einzelnen PVS Komponenenten ausgetauscht werden, aufgelistet. +Der Nachrichtentyp gibt dabei an, welcher Dispatcher die Nachricht behandelt. +Der Ident einer Nachricht wird zur Verarbeitung einer empfangenen Nachricht in der aufzurufenden Funktion benötigt (Unterscheidung von anderen Nachrichten gleichen Typs). + +\begin{center} +\small +\begin{tabular}{l | l | p{2cm} | p{4cm}} +\label{pvs-msg-liste} +Nachrichtentyp & Nachrichten Ident & Inhalt & Beschreibung \\ +\hline +PVSCOMMAND & PROJECT & hostname port password quality & Hostname, Port, Passwort und Qualität des VNC Servers zu dem verbunden werden soll (durch Space getrennt) \\ +PVSCOMMAND & UNPROJECT & & \\ +PVSCOMMAND & LOCKSTATION & & \\ +PVSCOMMAND & LOCKSTATION & Message & Client mit Nachricht sperren \\ +PVSCOMMAND & UNLOCKSTATION & & \\ +PVSLOGIN & USERNAME & username & Client Benutzername \\ +PVSLOGIN & PASSWORD & password & Serverpasswort \\ +PVSLOGIN & ID & id & \\ +PVSLOGIN & FAILED & "`Wrong Password"' & Wird bei falschem Passwort gesendet \\ "` +PVSCOMMAND & PORT & port & \\ +PVSCOMMAND & PASSWORD & password & VNC Passwort\\ +PVSCOMMAND & RWPASSWORD & rwpassword & Passwort für den Zugriff auf die Tastatur und Maus \\ +PVSCOMMAND & VNC & YES & Erlaube Zugriff \\ +PVSCOMMAND & VNC & NO & Verbiete Zugriff \\ +PVSCOMMAND & PING & & \\ +PVSCOMMAND & VNCREQUEST & & \\ +PVSCOMMAND & VNCSRVRESULT & result code & Der Rückgabewert des pvs-vncsrv Skripts \\ +PVSMESSAGE & BROADCAST & MESSAGE &\\ +PVSMESSAGE & clientToAdd & & Client hinzufügen (Chat)\\ +PVSMESSAGE & clientToRemove & & Client entfernen (Chat)\\ +PVSMESSAGE & assignedName & & Festgelegter Name (Chat)\\ +\end{tabular} +\end{center} + diff --git a/doc/LaTeX/devel/0310-service-discovery.tex b/doc/LaTeX/devel/0310-service-discovery.tex new file mode 100644 index 0000000..307234f --- /dev/null +++ b/doc/LaTeX/devel/0310-service-discovery.tex @@ -0,0 +1,84 @@ +Die Zuordnung von Clients zur Konsole erfolgt halb automatisch über ein
+Service-Discovery-Modul. Jede Konsole sendet im Intervall von 7 Sekunden
+einen Broadcast ins lokale Subnetz, um ihre Verfügbarkeit bekannt zu geben.
+Die Clients können dadurch eine Liste von verfügbaren Servern anzeigen,
+aus der der Benutzer nur noch den gewünschten auswählen muss.
+Das Intervall sowie die verwendeten UDP-Ports für das Service-Discovery
+können vor dem Kompilieren in der \textit{setup.h} festgelegt werden
+\begin{verbatim}
+#define SB_INTERVAL 7 // Broadcast interval in seconds
+#define SD_PORT_CONSOLE 3491 // Not really used, Qt just wants a bind
+#define SD_PORT_CLIENT 3492 // This is where we expect announcements
+\end{verbatim}
+Die zuständigen Klassen sind \textit{PVSServiceBroadcast} (Serverseitig) und
+\textit{PVSServiceDiscovery} (Clientseitig).\\
+Auf Seite des Clients erfolgt außerdem eine Kommunikation mit der GUI
+über DBus, um verfügbare Sitzungen anzeigen zu lassen, und damit
+die GUI den Daemon veranlassen kann, zu einer bestimmten Sitzung
+zu verbinden.
+Die Methode \textit{connectToSession} in \textit{PVSServiceDiscovery}
+ist dafür zuständig, zu einem gegebenem Sitzungsnamen die nötigen
+Daten zu ermitteln und eine Verbindung zu initialisieren.
+
+\subsubsection{Absicherung und Verifikation der Identität}
+
+Um das Fälschen bzw. Manipulieren von diesen Broadcasts zu verhindern,
+sodass es nicht möglich ist, Man-in-the-Middle Angriffe oder ähnliches
+durchzuführen, soll gewährleistet werden, dass eine angezeigte Sitzung
+auch die ist, für die man sie hält.
+
+Dafür wird auf das SSL-Protokoll zurückgegriffen. Zum einen bietet SSL
+Verschlüsselung für Verbindungen an, und das Qt-Framework hat hierfür
+auch schon einige Klassen parat. Zum anderen ist mit SSL durch seine
+Zertifikate auch Identitätsverifikation möglich. Dazu kann das Zertifikat
+des Servers anhand des Fingerprints auf Echtheit überprüft werden.
+Beim Start der Konsole wird also, falls noch nicht vorhanden, ein neues
+Serverzertifikat inklusive Schlüsselpaar erstellt, mit welchem Verbindungen
+mit Clients fortan verschlüsselt werden. Außerdem wird der Fingerprint des
+Zertifikats in den Service-Broadcasts übertragen, sodass die Clients
+bereits vor der Verbindung den zu erwartenden Fingerprint kennen.
+Somit kann beim Aufbau der Verbindung zur Konsole der Fingerprint
+verglichen und eine eventuelle Manipulation erkannt werden.
+
+Für die Eindeutigkeit ist nur noch eine feste Zuordnung von Sitzungsnamen,
+welcher dem Benutzer angezeigt wird, zum Fingerprint der zugehörigen
+Konsole notwendig. Dies wird mit Hilfe eines einfachen Algorithmus erreicht,
+der aus dem Fingerprint einen lesbaren String erzeugt. Wichtig ist, dass
+Konsole und Client hier denselben Algorithmus verwenden, damit der
+Dozent an der Konsole den Studenten den korrekten Sitzungsnamen mitteilen
+kann. Wird der Algorithmus auf Seite der Konsole verändert, müssen auch
+alle Clients aktualisiert werden. Er befindet sich in der \textit{serviceDiscoveryUtil.h}
+und heißt \textit{sha1ToReadable}.
+
+Empfängt der Client einen Broadcast über einen neuen Server, baut dieser
+zunächst zur Überprüfung eine Verbindung zu diesem Server auf und sofort wieder
+ab, um den Fingerprint überprüfen zu können. Nur wenn dieser mit dem
+angekündigten Fingerprint aus dem Broadcast übereinstimmt, wird die Sitzung
+dem Benutzer zur Auswahl angezeigt.
+
+Die Überprüfung geschieht nicht sofort beim Empfang eines Service-Announcements
+sondern verzögert in einem Timer, und dabei auch jeweils nur ein Server
+in jedem Timer-Aufruf. Dies soll Missbrauch durch gefälschte Broadcastpakete
+verhindern oder zumindest stark verlangsamen. Entsprechende Mechanismen gegen
+Missbrauch finden sich in \textit{PVSServiceDiscovery::handleDiscovery} sowie
+\textit{PVSServiceDiscovery::timerEvent}.
+
+\subsubsection{Generierung von Sitzungsnamen}
+
+Hier ist prinzipiell viel Spielraum für Kreativität vorhanden, beachtet werden
+sollte lediglich, dass die Zahl der möglichen Namen, die durch den Algorithmus
+erzeugt werden können, hoch genug ist, um nicht in kurzer Zeit durch einen
+Brute-Force-Angriff einen Fingerprint mit dem selben Sitzungsnamen erzeugen zu
+können. Außerdem sollte die Verteilung der zufälligen Namen über den Raum der
+möglichen Namen etwa gleichmäßig sein.
+
+Der momentan verwendete Algorithmus generiert fünfsilbige Wörter, wobei jede
+Silbe aus einem Konsonanten und einem Vokal besteht. Die Konsonanten werden
+aus einer Liste von 13 Stück ausgewählt, wobei identisch oder zu ähnlich klingende
+Konsonanten herausgefiltert wurden, um bei der mündlichen Übertragung keine
+Ambiguitäten zu erzeugen. mit einer Wahrscheinlichkeit von 25\% wird einer Silbe
+ein \textbf{n} angehängt. Damit sind $130^5 = 37.129.300.000$ (37 Mrd.)
+unterschiedliche Sitzungsnamen möglich, was zwar deutlich weniger sind, als bei
+einem 160Bit langen SHA1-Hash, allerdings ist dies bezogen auf das Einsatzgebiet
+mehr als ausreichend. Alternativ bleibt natürlich nach wie vor das verwenden
+alternativer Algorithmen die einen größeren Raum an möglichen Namen haben.
\ No newline at end of file diff --git a/doc/LaTeX/devel/0400-pvs-console.tex b/doc/LaTeX/devel/0400-pvs-console.tex new file mode 100644 index 0000000..495f52a --- /dev/null +++ b/doc/LaTeX/devel/0400-pvs-console.tex @@ -0,0 +1,181 @@ +\chapter{PVS-Steuerkonsole} + +Die Steuerkonsole ist das Hauptquartier des \textbf{Pool Video Switch}. Sie wird auf der Dozentmaschine oder +einer geeigneten weiteren Maschine ausgef{\"u}hrt und sie ist für die Steuerung der Clients-Maschine zuständig. +Alleine diese Rolle der Steuerkonsole setzt schon voraus, dass das GUI so benutzerfreundlich aufgebaut werden soll, +dass diese Aufgabe vereinfacht wird.~\\ + +Wir werden uns in den n{\"a}chsten Punkten auf den technischen Aufbau der Steuerkonsole fokussieren. +Wir werden als erstes die Auswahl von Qt zum Aufbau des Server-GUI, dann werden wir die GUI Server-Konsole vorstellen und zum +Schluss werden wir die Beziehung Server-Client unter die Lupe nehmen. + +\section{pvsmgr in Qt} +Das Server-GUI wurde erstmal in GTK/Gnome implementiert. Dank der Flexibilit{\"a}t, die von Qt erm{\"o}glicht wird, wurde die komplette +Anwendung in Qt umgeschrieben. Qt ist ein UI Framework und ermöglicht die Implementierung von Anwendungen, die unter Linux (Unix), +Windows, mobile und eingebettete Systemen ausf{\"u}hrbar sind. Wir werden also den pvs-Manager(Server-GUI) komplett in Qt umschreiben und mit +zus{\"a}tzlichen Features gestalten. + +\section{GUI Server-Konsole} +Hier sollte die Hauptsteuerung des PVS abgewickelt werden. +\subsection{Die Architektur} +Es wird u.a. m{\"o}glich sein, Funktionen auszuführen wie: die Frame der einzelnen Clients ansehen, ein Profil anlegen, +Screenshot aufnehmen, ein (Un)Projektion ausf{\"u}hren, eine Nachricht an Clients verschicken, usw... Die Grundstruktur +des pvsmgr wird in der Abbildung \ref{fig:pvsmgr} illustriert. Das Bild zeigt uns das Hauptfenster (\textit{MainWindow}) +der Anwendung und seine unterschiedlichen Komponenten:~\\ ~\\ ~\\ ~\\ ~\\ +\begin{figure}[h] + \centering + \includegraphics[width=0.80\textwidth]{bilder/pvsmgr.jpg} + \caption{pvsmgr-Architektur} + \label{fig:pvsmgr} +\end{figure} +\textbf{MainWindow}~\\ +Die Klasse MainWindow wird vom QMainWindow abgeleitet; das ist der Parent an der Spitze der Hierachie; +Sie zu zerst{\"o}ren, bedeutet ein automatisches +Schließen der einzelnen Komponente, also der gesammten Anwendung. Alle anderen Komponenten bauen auf ihr auf. +Die Abbildung \ref{fig:mainwindow} zeigt ihr Abh{\"a}ngigkeitsdiagramm. +~\\ +Alle andere Komponenten (Klasse) der Anwendung haben die Klasse MainWindow als Parent. Qt verwaltet eine Struktur der +Art \textit{parent-child} Beziehung, so dass wenn ein Parent zerst{\"o}rt wird, werden alle seine Kinder (\textit{child}) +automatisch mit zers{\"o}rt; Das ist der sogenannte \textit{Domino-Effekt}. +~\\ +\begin{figure}[h] + \centering + \includegraphics[width=0.80\textwidth]{bilder/mainwindow.png} + \caption{Abh{\"a}ngigkeitsdiagram: MainWindow} + \label{fig:mainwindow} +\end{figure} +~\\ + +\textbf{Menubar}~\\ +Diese Klasse enth{\"a}lt eine Liste von \textit{pull-down}-Menu und QMainWindow speichert diese im QMenuBar. Die Klasse +wird also vom QMenuBar abgeleitet. Die gespeicherten Men{\"u}s enthalten jeweils die Menu-Items, die nichts anderes als \textit{QAction} sind. +Beim Betätigen einer Aktion (Menü-Item) wird ein korrespondiertes \textit{SIGNAL} gesendet, wir verbinden dann dieses zu einem \textit{SLOTS}, +wie hier gezeigt wird \textit{connect(actionCreate-profile, SIGNAL(triggered()), MainWindow, SLOT(createProfile()))}; Also beim Clicken auf das Menü-Item +"File->Profile manager" wird das Signal \textit{triggered()} gesendet, das automatisch das Slot \textit{createProfile()} aufruft. Genau dieses Prinzip +wird auch auf die Aktionen im Toolbar angewandt. ~\\ + +\textbf{Toolbar}~\\ +Die Klasse wird vom QToolBatr abgeleitet und enth{\"a}lt eine Liste von Aktionen, die man unmittelbar auf die gesamten +oder die ausgew{\"a}hlten Clients in der ConnectionList anwenden kann. ~\\ ~\\ + +\textbf{ConnectionList}~\\ +Sie enth{\"a}lt die Liste der verbundenen Clients. Sie ist vom QTableView abgeleitet. Die vorhandenen Clients in der Liste k{\"o}nnen +in unterschiedlichen Bezeichnungen angezeigt werden. Es ist also m{\"o}glich die Clients unter verschiedenen Sichten anzuzeigen. +Die Clients k{\"o}nnen mit Name, IP-Adresse oder Username angezeigt werden. Wir entnehmen also, dass das QTableView genauer gesehen +3 Spalten enth{\"a}lt, von denen nur eins davon immer sichtbar wird. Dieses Geschehen l{\"a}sst sich ganz trivial ausführen. + Man soll lediglich daf{\"u}r sorgen, dass wenn eine Spalte angezeigt wird, sollen die 2 anderen ausgeblendet werden. +Das QTableView steht zu diesem Zweck die Methode \textit{setColumnHidden(int column, bool hidden)} zur Verfügung, wobei \textit{column} + die betroffene Spaltenummer (die erste Spalte hat den Index 0) ist und \textit{hidden} legt dann fest, ob die Spalte +ein-(\textit{true}) oder ausgeblendet(\textit{false}) bleiben soll. Angesichts des angewandten Selection-Model + (\textit{QItemSelectionModel}) ist es möglich mehrere Clients (\textit{QAbstractItemView::ExtendedSelection}) aufzufassen und +die entsprechenden verfügbaren Aktionen aus dem Tollbar oder der ContexMenu auszuf{\"u}hren.~\\ + +\textbf{ConnectionWindow}~\\ +Die Klasse ist wie der zentrale Widget der Anwendung. Sie ist vom QWidget abgeleitet und enth{\"a}lt die Frame der +jeweiligen verbundenen Clients. Klarerweise hat diese Komponente die MainWindow-Klasse als Parent.~\\ + +\textbf{ConsoleLog}~\\ +Abgeleitet von QTextEdit, hier werden alle Logs angezeigt. Der Log-Bereich ist per Default ausgeblendet. +Man kann ihn aber anzeigen lassen. Man unterscheidet mehrere Arte von Logs: Chat, Error, Normal, Network und Terminal. +~\\ + +Die richtig konfigurierten Clients werden mit dem pvs-Server verbunden und werden auf der GUI Server-Konsole angezeigt. + Der Server bietet 2 unterschiedliche Sichten zur Anzeige der verbundenen Clients an. + +\subsubsection{Clientliste-Ansicht} +Diese Sicht ist eine Liste, die aus einem \textit{QTableview}-Object abgeleitet wird. Die Client-Liste ist definiert +durch die ConnectionList-Klasse die Abbildung \ref{fig:connectionlist} zeigt uns die Abh{\"a}ngigkeitsdiagramm dieser Klasse. +\begin{figure}[h] + \centering + \includegraphics[width=0.80\textwidth]{bilder/ConnectionList.png} + \caption{Abh{\"a}ngigkeitsdiagramm der ConnectionList-Klasse} + \label{fig:ConnectionList} +\end{figure} + +Die Tabelle enth{\"a}lt 3 Spalten, von denen nur eine angezeigt werden kann. Mit Hilfe passender Tastenkombinationen +können die anderen Spalten angezeigt werden. Die Spalten enthalten jeweils den Name der Clients, seine IP-Adresse und seinen Username. Außerdem +haben wir hier ein Kontextmenü per Überschreibung der Methode \textit{mouseReleaseEvent(QMouseEvent * e)} aus der Mutter-Klasse (QTableView) +zur Verfügung gestellt. Das Kontextmenü ist hier im Grunde ein Popup-Menü, das Menü-Item enthält. Diese Menü-Items sind nichts anderes als Actionen +und sie werden behandelt wie wir es schon oben beschrieben haben. Das Popup-Menü wird angezeigt, wenn die rechte Mause-Taste auf einem Item in +\textit{QTableView} losgelassen wird.\\ +Von der jeweiligen Clients in der ConnectionList wollen wir jetzt die entsprechenden VNC-Ansichten vorstellen. + +\subsubsection{VNC-Ansicht} + +Die zweite Anzeigem{\"o}glichkeit, die vom Server angeboten wird ist die Anzeige der VNC-Verbindung zwischen +Client und Server. Genauer gesagt, auf dem pvsmgr kann der Dozent jeder Zeit nachvollziehen, was auf der Client-Maschine +passiert, dies wird vom rfb (Remote Frame Buffer) ermöglicht. Zu dem jeweiligen Client wird vom Manager ein \textit{VNCClientThread()} initialisiert +und in dieser Klasse wird der rfb-Client instanziiert. Die Klasse\textit{VNCClientThread()} wird vom QThread abgeleitet, somit wird eine kontinuierliche +Abfrage des Client rfb gesichert. Als QThread kann man mit der Methode \textit{msleep(int updatefreq)} den Thread für eine bestimmte Zeit +(in Millisekunde) schlafen lassen; dies ermöglicht also den pvsmgr die Abfragefrequenz des Client-rfb zu steuern. Darüberhinaus wird +dem Dozent die Möglichkeit gegeben die Qualität der VNC-Qualität jeder Zeit festzulegen. Da es quasi nicht möglich ist, eine VNC-Qualität bei laufender +Verbindung zu ändern, ist es dann notwendig dem Thread der entsprechenden Client zu terminieren und einen neuen mit dem gewünschten +Quality zu starten und danach dem Client diesen neuen Thread wieder zuzuordnen.~\\ +\begin{figure}[h] + \centering + \includegraphics[width=0.80\textwidth]{bilder/connectionframe.png} + \caption{Abh{\"a}ngigkeitsdiagramm der ConnectionFrame-Klasse} + \label{fig:Connectionframe} +\end{figure} +Die VNC-Ströme werden in der ConnectionFrame-Klasse verwaltet. Die ConnectionFrame ist vom QGroupBox abgeleitet. Die Abbildung \ref{connectionframe} +das Abhängigkeitsdiagramm der Klasse. Die Klasse wird vom QGroupBox abgeleitet und enthält das Object QLabel, das die eigentlichen VNC-Ströme +anzeigt, denn QLabel ist im Qt eine optimale Unterstützung zum Anzeigen und zum skalieren von Bildern. Jede ConnectionFrame hat ein Kontextmenü und diese +werden genau so wie wir es in der ConnectionList beschrieben haben, verwaltet. \\ + +Wir fahren mit der Vorstellung der pvsmgr-Struktur fort. Wir wollen uns in den nächsten Punkten der Verbindung zwischen Client und Server +annähen, in dem wir dieser Aushandlung diese Verbindung betrachten. Allerdings werden wir nähere Details darüber in anderen Abschnitten erläutern. + +\subsection{Client-Seite} + +Wir wollen davon ausgehen, dass im Subnetz, indem sich die Client-Maschine befindet, bereits ein pvsmgr gestartet wurde. + Die Abwicklung auf dem server werden wir im n{\"a}chsten Punkt erl{\"a}utern. Nach dem Start eines Server sendet dieser eine +Broadcast-Nachricht, die von allen verf{\"u}gbaren Client erhalten wird. Erh{\"a}lt ein Client diese Nachricht, dann weiß er, +dass ein Server gerade am laufen ist. Anschließend f{\"u}gt der Client diesen Server in seiner Server-Liste hinzu. +Wird es eine von einen anderen Server gesendetete Broadcast-Nachricht empfangen, wird ebenfalls den entsprechenden +Server in die Server-Liste des Client hinzugenommen. +Der Client verf{\"u}gt also {\"u}ber eine Liste von potentiellen Server, mit denen er eine PVS-Verbindung aufbauen kann, die dann schließlich +eine VNC-Verbindung wird und erst dann kann die Remote Frame Buffer initialisiert werden. Verläuft diese Initiliasierung erfolgreich, wird bei dem Server +der VNC-Frame angezeigt. +Aus seiner Server-Liste kann der Client freiwillig den Server ausw{\"a}hlen, mit dem er sich verbinden m{\"o}chte. Allerdings +erfolgt die eigentliche Verbindung zwischen Server und Client erst, nachdem der Client das vom Dozent gesetzte Passwort +richtig eingegeben hat. Beim Start des Server wird vom System ein zuf{\"a}lliges Passwort generiert und der Dozent soll dieses den Client +im Raum bekanntgegeben, so dass ein anderer Client, der im Nebenraum steht und auch die Server-Broadcast-Nachricht erhalten hat, +keine M{\"0}glichkeit hat, mit diesem Server eine Verbindung aufbauen zu k{\"o}nnen. +%Die genaue Spezifikation der Abwicklung der Verbindung zwischen und Client und Server kann in ServAppTech und in Service-Discovery entnommen werden. +Also nun hat ein Client das richtige Passwort eingeben und die Verbindung mit dem Server konnte erfolgreich aufgebaut werden. An dieser Stelle wollen +wir noch betonen, dass der Dozent selbst entscheiden kann, ob ein Passwort zum Verbindungsaufbau mit dem PVS-Server vom Client aus eingegeben werden +soll oder nicht. Dafür wird eine Checkbox auf dem pvsmgr-GUI eingebaut, die beim Ankreuzen per SIGNAL-SLOT die Funktion +\textit{PVSConnectionManager::getManager()->setNeedPassword(bool needed)} aufruft, wobei mit \textit{needed=TRUE} wird ein Passwort ben{\"o}tigt. \\ +Nun wollen wir erl{\"a}utern wie der Server mit einer bestehenden Verbindung umgeht.~\\ + +\subsection{Server-Seite} + +Wir hatten schon erw{\"a}hnt, dass der Server 2 Ansichtsmöglichkeiten zur Annzeige eines verbundenen Client verf{\"u}gt. +Nachdem ein Client mit dem Server eine Verbindung erfolgreich aufgebaut hat, wird fast zeitgleich erstmal der Client +links in der Connection-Liste angezeigt und dann wird eine VNC-Verbindung zwischen Client und Server so aufgebaut, dass auf der rechten +Seite (\textit{Connectionwindow}) das Client-Frame angezeigt werden kann. Jeder Frame wird so beschriftet, +dass es jeder Zeit m{\"o}glich wird, aus einem Client in der Liste (links) den entsprechenden Frame (recht) anzuordnen.\\ + +Somit hat der Server einen besseren {\"U}berblick {\"u}ber die gesamten vorhandenen Verbindungen. Der Server kann also jegliche verf{\"u}gbare + Aktion ausf{\"u}hren. Der Betreiber (der Dozent) des pvsmgr verf{\"u}gt {\"u}ber eine zweite Maschine, die an einen Beamer angeschlossen +wird und auf dieser Maschine l{\"a}uft ein PVS-Client. Dieser Client wird als \textit{Superclient} bezeichnet +und verf{\"u}gt dementsprechend gegen{\"u}ber anderen Clients über einen Sonderstatus. Z.B: bei einer LockAll-Aktion wird er nicht +gesperrt und dabei muss geachtet werden, dass ein auf dem Superclient projektierter Client auch nicht gesperrt wird.\\ + +\section{Verbindungsverwaltung und Projektion} + +Meldet sich ein Client an der PVS-Steuerkonsole an, wird der Bildschirminhalt des Clients zur Thumbnail Darstellung angefordert. Hierzu sendet der Client seine Verbindungsdaten, d.h. Passwort, RW Passwort und Port, an die Steuerkonsole (s.h. Liste der PVS Messages \ref{pvs-msg-liste}). Die Verbindungsdaten werden in der Klasse \texttt{pvsConnectionManager} in einer Liste \texttt{std::list<PVSClient*> \_listClients} von PVSClient Objekten verwaltet. Ein solches Clientobjekt enthält unter anderem Port, Passwort, RW Passwort sowie Flags, ob eine VNC Verbindung erlaubt ist, ob ein VNC Passwort vorhanden ist, und ob der Client gerade projeziert wird (siehe hierzu auch \texttt{/core/pvsClient.h}). Der pvsConnectionManager wird in allen Klassen verwendet, welche auf die Verbindungsdaten der Clients zugreifen müssen, daher ist er als Singleton implementiert und auf die entsprechende Instanz kann über \texttt{PVSConnectionManager::getManager()} zugegriffen werden. + +\subsection{Projektion} +\label{pvs-console-projection} +Um zu gewährleisten, dass bei einer Projektion ein als Quelle ausgewählter Client nicht als Ziel einer Projektion gewählt werden kann, werden in der Klasse \texttt{ConnectionList} +eine Liste \texttt{QList<QString> targetList} mit den Projektionszielen und eine Map \texttt{QMap<QString, QList<QString> > sourceMap} mit der Quelle und der zugehörigen Liste von Zielen geführt. Wird ein Client als Projektionsquelle ausgewählt, wird zunächst überprüft, ob dieser Client schon in der Liste der Projektionsziele vorhanden ist. Ist er nicht vorhanden, wird ein Auswahldialog \texttt{projectionDialog} mit allen verfügbaren Projektionszielen angezeigt (ProjectionDialog erhält die entsprechende Liste durch\\ \texttt{MainWindow::getWindow()->getConnectionList()->getTargetToDisplay(source)}). Projektionsziele können hierbei alle angemeldeten Clients sein, die nicht Ziel oder Quelle einer anderen Projektion sind. Die Auswahl der Ziele im \texttt{projectionDialog} erfolgt durch Checkboxen. Die hierdurch gewählten Clients werden zurück an die den \texttt{projectionDialog} aufrufende Klasse übergeben. Nachdem Quelle und Ziel ausgewählt wurden, wird die Funktion \texttt{projectStations}, welche zunächst prüft, ob auf dem Quell-Client überhaupt ein VNC Server läuft, in der Klasse \texttt{ConnectionWindow} mit dem Quell-Client als Parameter aufgerufen. Ist ein VNC Server gestartet, so werden die Verbindungsdaten des Quell-Clients, die über die get-Methoden des entsprechenden PVSClient Objekts ausgelesen werden, an alle Ziel-Clients als durch Leerzeichen separierte Liste gesendet. Auf Clientseite werden diese Verbindungsdaten dann in ein Array transformiert und an den \texttt{clientVNCViewer} übergeben (via DBus). +Soll ein Client als Ziel zu einer existierenden Projektion hinzugefügt werden, wird der entsprechende Quellclient und alle neuen bzw. zusätzlichen Projektionsziele gewählt. Die Zielclients werden dann einfach der in der \texttt{sourceMap} gespeicherten Liste der Quelle sowie der \texttt{targetList} hinzugefügt. +\subsubsection{Qualitätsoptionen} +\label{pvs-console-quality} +Zusätzlich zu den Verbindungsdaten werden Qualitätsoptionen zu der gesendeten Nachricht hinzugefügt. Die Qualitätsoption ist ein Integerwert 0,1 oder 2 wobei 0 der besten Qualität, 2 der schlechtesten Qualität entspricht. Dieser Wert wird an den Zielclient einer Projektion gesendet, welcher die Qualitätseinstellungen des VNC-Viewers entsprechend anpasst. Aktuell wird die Qualität immer auf 0 gesetzt, da noch die Einstellungsmöglichkeiten in der GUI fehlen. +\subsection{Remote Help} + +Remote Help funktioniert analog zur Projektion, jedoch ist hier zu gewährleisten, dass jeweils nur ein Quellclient und ein Zielclient ausgewählt werden, da es nicht sinnvoll ist, Tastatur und Maus eines Clients von mehreren anderen Clients aus zu steuern. Anstelle des Passworts wird das RW-Passwort des Clients verwendet. Die Möglichkeit, die Maus und die Tastatur eines Clients zu steuern, ist mit dem verwendeten VNC-Server schon gegeben, für die Steuerkonsole ändert sich hier nichts, lediglich der VNC Viewer muss die Tastatureingaben und die Mausbewegung an den VNC Server weitergeben (siehe hierzu auch \ref{}. + + diff --git a/doc/LaTeX/devel/0500-pvs-client.tex b/doc/LaTeX/devel/0500-pvs-client.tex new file mode 100644 index 0000000..9c0b572 --- /dev/null +++ b/doc/LaTeX/devel/0500-pvs-client.tex @@ -0,0 +1,231 @@ +\chapter{PVS-Client} +Der PVS-Client ist in ein Backend (\textbf{pvs}) und ein Frontend (\textbf{pvsgui}) aufgeteilt. Erster läuft als Daemon im Hintergrund und kommuniziert über ein gegebenes Netzwerk mit der Steuerkonsole (\textbf{pvsmgr}). Die Interprozesskommunikation (inter-process communication, IPC) zwischen Back- und Frontend erfolgt über D-Bus und wurde mit Hilfe der von Qt4 bereitgestellten Bibliothek QtDBus realisiert. Um das Backend von einer GUI komplett unabhängig zu halten, wurde darauf geachtet, dass alle Nachrichten, die an die GUI gerichtet sind, vom Backend als Signale über D-Bus verteilt werden. Umgekehrt, wenn das Frontend eine Nachricht an das Backend schicken will, muss es sich der im Backend implementierten Slots bedienen (s. Abbildung \ref{pdf:dbus}). Somit ist es sogar möglich, dass mehrere GUIs gleichzeitig ein und das selbe Backend benutzen. Ein weiteres Feature ist, dass das Frontend beim Start das Backend durch einen D-Bus Aufruf automatisch startet. Hierzu muss allerdings die Applikation zuvor mit \textbf{make install} auf dem System installiert worden sein.\\ + +\begin{figure} + \begin{center} + \includegraphics[scale=0.7]{bilder/DBus} + \caption{Back- und Frontend des PVS-Clients kommunizieren über D-Bus} + \label{pdf:dbus} + \end{center} +\end{figure} +Zunächst muss in der Hauptklasse des Backends (\textit{pvs.cpp}) das Qt-Makro +\begin{verbatim} +Q_CLASSINFO("D-Bus Interface","org.openslx.pvs") +\end{verbatim} +eingefügt werden, um dem späteren D-Bus-Interface einen Namen zu geben. Als nächstes werden alle zu exportierenden Slots wie gewohnt mit \texttt{Q\_SLOTS} bzw. Signale mit \texttt{Q\_SIGNALS} in der \textit{pvs.h} gekennzeichnet. Schließlich folgen ein paar Definitionen in der \textit{\mbox{CMakeLists.txt}}, deren Bedeutung aus den Kommentaren entnommen werden kann: +\begin{verbatim} +# QtDBus Modul aktivieren +SET( QT_USE_QTDBUS TRUE ) +# Signale und Slots aus pvs.h ins XML-Format exportieren +QT4_GENERATE_DBUS_INTERFACE( src/pvs.h org.openslx.pvs.xml ) +# D-Bus Adapter für Backend erzeugen +QT4_ADD_DBUS_ADAPTOR( PVS_SRCS ${CMAKE_BINARY_DIR}/org.openslx.pvs.xml + src/pvs.h PVS ) +# Aus der zuvor erstellten XML-Datei ein Interface in C++ Syntax +# generieren +QT4_ADD_DBUS_INTERFACE( PVSGUI_SRCS + ${CMAKE_BINARY_DIR}/org.openslx.pvs.xml pvsinterface ) +\end{verbatim} +Sind die Vorbedingungen erfüllt, wird beim ersten Kompilieren eine Datei namens \textit{pvsinterface.h} erstellt, in der die Definition der Klasse \texttt{\mbox{OrgOpenslxPvsInterface}} gespeichert wurde. Diese Klasse kann nun in anderen Programmen (wie z.B. in der \textbf{pvsgui}) dazu benutzt werden, um Zugriff auf die freigegebenen Ressourcen des Backends zu erhalten. + +\section{Grafische Benutzeroberfläche} +Die Hauptklasse der Benutzeroberfläche des Clients heißt \texttt{PVSGUI} und befindet sich in der Datei \textit{pvsgui.cpp}. In dieser werden Referenzen auf alle benutzten Dialoge, das System Tray Icon sowie das D-Bus Interface zur Kommunikation mit dem Backend erzeugt. Weiter beinhaltet diese Klasse die \texttt{main()}-Funktion und bildet somit den Einstiegt für das Betriebssystem. Damit der Zugriff auf die Toolbar immer gewährleistet bleibt (auch wenn Videos oder eine virtuelle Maschine im Vollbild laufen), muss beim Zeichnen dieser der laufende Windowmanager umgangen werden. Hierbei hilft uns Qt mit der Anweisung: +\begin{verbatim} +setWindowFlags(Qt::WindowStaysOnTopHint|Qt::X11BypassWindowManagerHint); +\end{verbatim} +Wie bereits in der Einleitung erwähnt, wird das komplette Projekt mit Hilfe von CMake erstellt. Aus diesem Grund soll an dieser Stelle ebenfalls eine kleine Beschreibung folgen, wie man mit CMake Qt-Klassen einbindet, die mit dem Qt-Werkzeug \textbf{designer} erstellt worden sind. Als Beispiel dient die Klasse \texttt{PVSGUI}, wobei wir hier nicht auf die Qt eigenen Details eingehen werden. +\begin{verbatim} +# CMake anweisen, Qt4 auf lokalem System zu suchen +FIND_PACKAGE( Qt4 4.5.0 REQUIRED ) +INCLUDE( ${QT_USE_FILE} ) +# Sowohl Quell- als auch Zielverzeichnis auf Quelldateien durchsuchen +INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ) + +# Alle von der Software benötigten Quelldateien +SET( PVSGUI_SRCS src/pvsgui.cpp ) +# Vom Meta Object Compiler benötigte Header-Dateien +SET( PVSGUI_MOC_HDRS src/pvsgui.h ) +# Auflistung aller benötigten .ui Dateien +SET( PVSGUI_UIS src/gui/ui/clientToolbar.ui ) +# Ressourcendateien +SET( PVSGUI_RCS pvsgui.qrc ) + +# Qt Meta Object Compiler ausführen (moc) +QT4_WRAP_CPP( PVSGUI_MOC_SRCS ${PVSGUI_MOC_HDRS} ) +# Qt User Interface Compiler ausführen (uic) +QT4_WRAP_UI( PVSGUI_UI_HDRS ${PVSGUI_UIS} ) +# Qt Resource Compiler ausführen (rrc) +QT4_ADD_RESOURCES( PVSGUI_RC_SRCS ${PVSGUI_RCS} ) + +# Applikation mit allen benötigten Variablen bauen +ADD_EXECUTABLE( pvs ${PVS_SRCS} ${PVS_MOC_SRCS} ${PVS_RC_SRCS} ) +# Mit der Qt-Bibliothek linken +TARGET_LINK_LIBRARIES( pvsgui ${QT_LIBRARIES} ) +\end{verbatim} + +\section{User-Interface für Benutzerkonfiguration} +Der eingebaute Konfigurationsdialog besteht hauptsächlich aus der Klasse \texttt{ClientConfig\-Dialog} und ist in der Datei \textit{clientConfigDialog.cpp} definiert. Es handelt sich hierbei um einen gewöhnlichen \texttt{QDialog}, dessen graphische Implementierung in der Datei \textit{clientConfigDialog.ui} gespeichert ist.\\ +Den Kern dieser Klasse bildet ein \texttt{QSettings} Objekt, das sowohl zum Speichern als auch zum Laden der Benutzerkonfiguration benutzt wird. Ablage aller Einstellungen ist die Datei \textit{\textasciitilde/.config/openslx/pvsgui.conf}. Diese kann jedoch zentral für die gesamte Applikation in der Funktion \texttt{PVSGUI::main(int argc, char *argv[])} geändert werden.\\ +Um weitere Komponenten der GUI über Änderungen der aktuellen Konfiguration zu informieren, wird das Signal \texttt{configChanged()} emittiert. + +\section{Darstellung von VNC-Datenströmen} +\label{pvsclient-datenstrom} +Die übertragenen Bildinformationen können in einem separaten Fenster oder im Vollbildmodus dargestellt werden. Hierzu wählt der Dozent über die Steuerkonsole (\textbf{pvsmgr}) eine Quelle und ein oder mehrere Ziele zur Projektion aus, was zur Folge hat, dass an alle gewählten Clients (\textbf{pvs}) eine Nachricht mit den benötigten Informationen geschickt wird. Als nächstes sendet das Backend ein Signal über D-Bus an sein Frontend, das die benötigten Informationen (Host, Port, Passwort, Qualität) enthält. Somit kann nun die GUI eine Verbindung zum gegebenen VNC-Server aufbauen und den Datenstrom darstellen.\\ + +Der Aufbau des VNC-Viewers besteht aus zwei Klassen: +\begin{itemize} + \item Die Klasse \texttt{VNCClientThread} stellt mit Hilfe eines \texttt{rfbclient} (aus libvncserver0) eine Verbindung zum VNC-Server her. Zunächst werden sämtliche Verbindungsparameter über den Konstruktor definiert und nach einem Aufruf von \texttt{VNCClientThread::start()} eine Verbindung aufgebaut. Da diese Klasse selbst von \texttt{QThread} abgeleitet ist, läuft sie in einem eigenständigem Thread, um die GUI nicht zu blockieren. Der Informationsaustausch erfolgt über das Signal \texttt{VNCClientThread::imageUpdated(int x, int y, int w, int h)}, welches die Koordinaten einer Änderung des Framebuffers enthält. + \item Die Darstellung des Datenstroms wird von der Klasse \texttt{ClientVNCViewer} übernommen. Da beide Klassen auf ein und den selben Ressourcen arbeiten, müssen die Signale des \texttt{VNCClientThread} mit dem Parameter \texttt{Qt::BlockingQueuedConnection} verbunden werden. Dies stellt sicher, dass der Thread solange pausiert, bis der Slot des \texttt{ClientVNCViewer} abgearbeitet wurde (\texttt{ClientVNCViewer::updateImage(int x, int y, int w, int h)}). +\end{itemize} +Bei der Entwicklung des VNC-Viewers musste stark auf die Performanz geachtet werden. Das Ziel ist es, sowohl Bandbreite als auch CPU-Last einzusparen. Um die Netzwerkauslastung konfigurierbar zu machen, stehen drei Qualitätsstufen zur Wahl, von denen eine gewählt werden muss. Durch diese serverseitige Konfiguration wird beispielsweise auf der niedrigsten Qualitätsstufe die Farbtiefe verringert und die Kompressionsstufe erhöht (verlustbehaftet), was die zu übertragenen Bildinformationen minimiert. Um den Prozessor des Zielrechners nicht unnötig zu belasten, werden wie im VNC-Protokoll vorgesehen, nur die Bereiche des Framebuffers neu gezeichnet und skaliert, die sich auch geändert haben. + +\section{Chat-Interface} +Die vom Chat-Interface verwendeten Klassen und Dialoge befinden sich in den Dateien \textit{clientChatDialog.cpp} und \textit{clientChatDialog.ui}. Der Informationsaustausch erfolgt hier wieder über D-Bus direkt mit dem Backend.\\ +Zum Versenden einer Nachricht wird der Slot \texttt{PVS::chat\_send()} und zum Empfang das Signal \texttt{PVS::chat\_receive()} des Backends benutzt. Um die Liste aller Chatteilnehmer aktuell zu halten, wird analog vorgegangen. Hierzu existieren die Slots \texttt{PVS::chat\_client\_add()} und \texttt{PVS::chat\_client\_remove()}.\\ +Um neben dem öffentlichen Chat auch private Unterhaltungen zwischen zwei Teilnehmern zu ermöglichen, wurde ein \texttt{QTabWidget} benutzt. Auf diesem wird bei jeder neu begonnenen Unterhaltung ein \texttt{QTextEdit} platziert, dass dem Gesprächspartner durch ein \texttt{QHash<QString, QTextEdit*>} direkt zugeordnet wird. + +\section{Dateiübertragung und Interface} +Die graphische Benutzerschnittstelle des Clients ermöglicht allen Chatteilnehmern binäre Dateien untereinander zu tauschen. Dazu wurden zwei Dialoge entwickelt -- einer zum Senden und einer zum Empfang. Diese Dialoge stellen nicht nur das Benutzerinterface dar sondern bilden ebenfalls die komplette Grundlage (Client-Server) zur Übertragung binärer Daten. Die hierfür entworfenen Klassen sind \texttt{ClientFileSendDialog} und \texttt{ClientFileReceiveDialog}, zu denen die gleichnamigen .ui Dateien gehören.\\ + +Daten senden:\\ +Um eine Datei zu senden, sind der Name des Chatteilnehmers (Nickname) sowie der Pfad der zu sendenden Datei erforderlich. Falls diese Informationen nicht vorhanden sind, wird der Benutzer durch Pop-Ups danach gefragt. Der nächste Schritt besteht darin, die IP bzw. den Hostnamen des Chatteilnehmers zu erfragen. Dies geschieht automatisch, indem das Backend (\textbf{pvs}) diesbezüglich über D-Bus befragt wird. Stehen alle Angaben zur Verfügung, wird an den Zielrechner ein kleiner Header mit folgenden Informationen geschickt: +\begin{verbatim} +Nickname_des_Senders;Dateiname;Dateigröße\n +\end{verbatim} +Sollte sich der Kommunikationspartner für den Empfang der angebotenen Datei entscheiden, wird von diesem eine Bestätigung verschickt (ack), die den eigentlichen Übertragungsvorgang startet. Das Ende der Übertragung wird dem Empfänger durch das Schließen des benutzen Sockets signalisiert.\\ +Während der Übertragung wird ein Dialog angezeigt der den Sender über den Fortschritt mit Hilfe einer \texttt{QProgressBar} informiert. Der Vorgang kann jederzeit abgebrochen werden und über aufgetretene Fehler wird durch Pop-Ups informiert.\\ + +Daten empfangen:\\ +Sobald die graphische Benutzeroberfläche des Clients startet, wird durch eine Instanz des \texttt{QTcpServer} der Port 29481 geöffnet und auf eingehende Verbindungen gewartet. Wird nun von einem anderen Teilnehmer eine Datei angeboten, so wird eine Instanz des \texttt{ClientFile\-ReceiveDialog} angelegt, die sich um den weiteren Verlauf kümmert. Der Empfänger kann nun, die Übertragung akzeptieren und einen Speicherort wählen. Danach wird eine Bestätigung an den Sender verschickt und die eigentliche Datenübertragung gestartet.\\ +Auch der Empfänger wird durch einen Dialog über den Fortschritt informiert und kann die Übertragung jederzeit abbrechen.\\ + +Wichtig an dieser Stelle ist die Speicherfreigabe beendeter Übertragungsdialoge. Da wir gleichzeitig beliebig viele Übertragungen erlauben wollen, muss natürlich für jede ein eigenständiger Dialog erzeugt werden. Um keine Liste mit laufenden Dialogen führen zu müssen (und einzelne zu löschen) wird hier auf einen komfortablen Qt-Mechanismus zurückgegriffen. Sobald ein Dialog mit \texttt{accept()} oder \texttt{reject()} beendet wird, sendet dieser das Signal \mbox{\texttt{finished(int)}}. Auf der anderen Seite besitzt jede Klasse, die von \texttt{QObject} abgeleitet wurde, den Slot \texttt{deleteLater()}. Die Qt-API garantiert, dass Qt nach dem Aufruf dieser Methode dieses Objekt selbstständig aus dem Speicher entfernt. Also müssen wir dieses Signal dem Slot zuordnen (in \texttt{ClientFileSendDialog} und \texttt{ClientFileReceiveDialog}): +\begin{verbatim} +connect(this, SIGNAL(finished(int)), this, SLOT(deleteLater())); +\end{verbatim} + +\section{VNC Server} +Um den Bildschirminhalt von Clients zum einen in der Übersicht (Thumbnails) der Steuerkonsole und zum anderen auf anderen Clients und dem Beamer darstellen zu können, wird das sogenannte Remote Framebuffer Protokoll (RFB), welches auch der Virtual Network Computing (VNC) Software zugrundeliegt, benutzt. Um VNC bzw RFB nutzen zu können, wird ein VNC Server und ein VNC Viewer benötigt. Aktuell wird als VNC Server \texttt{x11vnc} verwendet sowie der, wie in \ref{pvsclient-datenstrom} beschrieben, in den den PVS-Client integrierte rfbclient bzw. ClientVNCViewer. Bei der VNC Verbindung wird zwischen einer Verbindung ohne Maus und Tastatursteuerung, dem sogenannten Viewonly oder Readonly Modus, und einer Verbindung mit Maus und Tastatursteuerung, im folgendenden Read-Write (RW) Modus genannt, unterschieden. + +\subsection{Vergleich von VNC Servern} +Es gibt zwei Arten von VNC Servern. Server, die eine laufende Sitzung bzw. ein vorhandenes Display darstellen bzw. übermitteln können, und Server, die eine eigene Sitzung bzw. ein eigenes Display bereitstellen (virtuell). Für PVS ist die zweite Art, welche auf dem ursprünglichen VNC basiert, nicht verwendbar, da man hierbei nicht den aktuellen Bildschirminhalt der Clients in der Steuerkonsole anzeigen bzw. projezieren kann. Daher wurden folgende VNC Server im Weiteren nicht betrachtet: Xvnc (RealVNC), vnc4server, TightVNC. + +Motivation für den eigentlichen Vergleich ist die Integration mancher VNC Server in die Desktopumgebung. Hier müsste der x11vnc nicht extra installiert werden. Wichtig für den Einsatz im PVS ist vor allem die Unterstützung von Shared Modus, d.h. mehrere VNC Viewer können sich gleichzeitig mit dem VNC Server verbinden, und Forever Modus, d.h. der VNC Server wird nicht nach Trennung des letzten Clients beendet. Sicherheitsoptionen wie die Vergabe von Passwörtern und die Unterscheidung von RW und Viewonly Modus sind ebenso nicht zu vernachlässigen. + +\paragraph{Vino} +~\\ +Vino ist der VNC Server der Gnome Desktopumgebung. +Er wird standardmäßig über die graphische Oberfläche \textbf{vino-preferences} konfiguriert. Über die Kommandozeile ist Vino entweder über \textbf{gconftool-2} oder über direktes editieren der Datei \\ +\textit{\~{}/.gconf/desktop/gnome/remote\_access/\%gconf.xml} konfigurierbar. +Parameter können nicht übergeben werden, was die Verwendbarkeit im PVS einschränkt. +Vino benutzt standardmäßig den Port 5900, um auf eingehende Verbindungen zu warten. Dieser Port kann nur durch \\ +\small \texttt{gconftool-2 -s -t int /desktop/gnome/remote\_access/alternative\_port <portnumber>} bzw. das Einfügen von z.B. \\ +\small \verb|<entry name="alternative_port" mtime="1259858032" type="int" value="<portnumber>"/>| +in die entsprechende \%gconf.xml Datei geändert werden. Hierbei ist zu beachten, dass nicht überprüft wird, ob der entsprechende Port schon belegt ist. Dementsprechend wird auch kein anderer freier Port gewählt. %TODO Formulierung. +Außerdem wird eine Änderung des Ports erst nach dem Neustart der grafischen Oberfläche aktiv. +Vino unterstützt die Vergabe eines Passworts, welches base64 kodiert in der gconf Datei abgelegt wird. Ebenso kann man den Zugriff auf den Viewonly Modus beschränken. Unterschiedliche Passwörter für den RW Modus und den Viewonly Modus können jedoch nicht vergeben werden. Der Shared und Forever Modus sind standardmäßig aktiv. + +\paragraph{Krfb} +~\\ +Krfb ist das Pendant zu Vino der KDE Desktopumgebung und kann entweder über eine Konfigurationsdatei oder über die grafische Oberfläche konfiguriert werden. Es kann entweder das Einladungssystem verwendet werden, bei dem eine Einladung mit einem Einmalpasswort generiert wird, oder man erlaubt uneingeladene Verbindungen und vergibt ein eigenes Passwort. Um Krfb über eine Konfigurationsdatei mit einem selbstgewählten Passwort für uneingeladene Verbindungen zu konfigurieren, erstellt man die Datei wie in \ref{pvs-client-krfbconfig} angegeben und übergibt sie an krfb mit \texttt{krfb --config <Pfad> } bzw überschreibt oder bearbeitet die eigentliche Konfigurationsdatei in \textit{~/.kde/share/config/krfbrc}. +%\label{pvs-client-krfbconfig} +\begin{verbatim} +[Security] +allowDesktopControl=false +allowUninvitedConnections=true +uninvitedConnectionPassword=<passwort> + +[TCP] +port=<port> +useDefaultPort=false +\end{verbatim} + +Mit allowDesktopControl kann zwischen RW und Viewonly Modus gewechselt werden, unterschiedliche Passwörter können hierfür nicht vergeben werden. Zu beachten ist, dass die Passwörter für uneingeladene Verbindungen unverschlüsselt gespeichert werden. Wie auch Vino läuft Krfb standardmäßig im Shared und Forever Modus. + +\paragraph{x11vnc} +~\\ +x11vnc ist ein auf libvncserver basierender VNC-Server, der von Karl Runge entwickelt wurde, um unter Linux/Unix Systemen existierende Displays über VNC anzeigen zu lassen. +x11vnc wird über Parameter von der Kommandozeile aus konfiguriert. +Eine ausführliche Liste aller verfügbaren Parameter findet sich unter +\url{http://www.karlrunge.com/x11vnc/x11vnc_opts.html}. Zu beachten ist hierbei, dass alle Parameter, die an x11vnc übergeben werden (also beispielsweise auch Passwörter), in der z.B. durch \textbf{ps aux} abrufbaren Prozessliste anzeigbar sind. +Daher sollte eine Passwortdatei, welche auch nach dem Auslesen automatisch von x11vnc gelöscht werden kann (s.h. \ref{pvs-vnc-script}), benutzt werden. Die Struktur einer solchen Passwortdatei ist wie folgt: +\begin{verbatim} + rwpassword1 + . + . + [rwpasswordX] + [\_\_BEGIN_VIEWONLY\_\_] + [password1] + . + . + [passwordX] +\end{verbatim} +Es muss mindestens ein Passwort vorhanden sein. Alle Passwörter bis zu der Zeile, welche \_\_BEGIN\_VIEWONLY\_\_ enthält, werden als rw-Passwörter angesehen (außer in dem Spezialfall, dass nur zwei Passwörter und keine Zeile mit BEGIN\_VIEWONLY vorhanden sind, dann wird das zweite Passwort automatisch als Viewonly Passwort behandelt). Alle Passwörter nach der entsprechenden Viewonly-Zeile werden als Viewonly Passwörter gesehen. So ist es möglich beliebig viele Viewonly und bzw. oder RW-Passwörter zu generieren. + + +\subsection{VNC Script} +\label{pvs-vnc-script} +Der VNC Server wird durch ein Bash-Skript (\textit{/misc/pvs-vncsrv}) von der Klasse \textit{pvs} gestartet. Es wird zufällig jeweils ein Passwort für Standardzugriff und ein Passwort für den Zugriff mit Maus und Tastaturunterstützung generiert. Die generierten Passwörter werden dem Skript als Parameter übergeben. \textbf{pvs-vncsrv} wird zum Starten wie folgt aufgerufen: +\texttt{pvs-vncsrv start port passwort [rwpasswort]}. +Der Parameter \texttt{rwpasswort} ist optional und kann beim Starten des x11vnc zur Verwendung im Viewonly Modus weggelassen werden. +Um den VNC Server zu stoppen, kann das VNC Script mit dem Parameter \texttt{stop} aufgerufen werden. +Die übergebenen Passwörter werden zunächst auf folgende Weise in die Datei \textit{~/.pvs/vncpassword} geschrieben: \verb|rwpasswort __BEGIN_VIEWONLY__ passwort|. +Als nächstes wird x11vnc mit folgenden Parametern ausgeführt: +\begin{itemize} + \item -auth ... - die Xauthority Datei + \item -bg - im Hintergrund starten + \item -forever - den X Server nicht beenden, wenn sich ein Client trennt + \item -display :0 - das anzuzeigende Display + \item -passwdfile rm:... - Pfad der Passwortdatei + \item -o ... - Pfad der Logdatei (~/.pvs/log.vncsrv) + \item -shared - erlaube mehreren Clients, sich zu verbinden +\end{itemize} + +Zu beachten ist vor allem das \texttt{rm:} vor der Pfadangabe bei \texttt{-passwdfile}. Dies bewirkt das Löschen der Passwortdatei, nachdem x11vnc sie eingelesen hat. +Die Passwortdatei wird verwendet, da man ansonsten Passwörter, die nur als Parameter im Klartext an x11vnc übergeben werden, mittels \textbf{ps aux} lesen könnte. + +Um einen Mehrfachstart des VNC Servers zu verhindern, wird zunächst immer ein \texttt{pvs-vncsrv stop} ausgeführt, welches nach der Prozessid des x11vnc sucht und diesen mit kill -9 beendet. + +\section{VNC Viewer} +Der VNC Viewer ist, wie in der \ref{pvsclient-datenstrom} Darstellung von VNC-Datenströmen beschrieben, implementiert. +Die direkte Integration des Viewers im Gegensatz zum Einsatz eines externen VNC Servers bietet sich hier wegen der Integrationsmöglichkeiten in die GUI an (der VNC-Server ist GUI unabhängig). Jedoch muss der VNC-Viewer zur Unterstützung des RW-Modus des VNC-Servers noch verändert werden. +\subsection{Tastatur und Maussteuerung} +Um die Maus- und Tastatureingaben an den VNC-Server weiterzuleiten, müssen zunächst die Eingaben in der Klasse \texttt{ClientVNCViewer} abgefangen und verarbeitet werden. Dies kann durch Überschreiben der geerbten Methode \texttt{event} erreicht werden \verb|bool ClientVNCViewer::event(QEvent *event)|. Hier kann durch \verb|event->type()| der Typ des Events herausgefunden werden. +Zu behandelnde Eventtypen sind: + +\begin{itemize} +\item QEvent:KeyPress - Eine Taste wurde gedrückt +\item QEvent:KeyRelease - Eine Taste wurde losgelassen +\item QEvent:MouseButtonDblClick - Mausdoppelklick +\item QEvent:MouseButtonPress - Maustaste gedrückt +\item QEvent:MouseButtonRelease - Maustaste losgelassen +\item QEvent:MouseMove - Maus wurde bewegt +\item QEvent:Wheel - Mausrad wurde bewegt +\end{itemize} + +Hier können nun die jeweils zuständigen Funktionen aufgerufen werden. Dabei ist zu beachten, dass die Methode \texttt{event()} bei allen Eingaben, die von einer eigenen Funktion behandelt werden, true zurückgibt (d.h. das Event wurde akzeptiert und behandelt). In den aufgerufenen Methoden kann dann zwischen den verschiedenen Maustasten (Qt:LeftButton, Qt:MidButton, Qt:RightButton) und den verschiedenen Tasten der Tastatur (z.B. Qt:Key\_A, Qt:Key\_B, Qt:Key\_Alt siehe hierzu auch \url{http://doc.trolltech.com/4.6/qt.html#Key-enum}) unterschieden werden. +Die Tastatur- und Mauseingaben müssen dann entsprechend an \texttt{vncClientThread} weitergeleitet werden. +In der Klasse vncClientThread werden die Eingaben dann in Objekte gekapselt in einer Queue, welche regelmäßig geleert wird, gespeichert. Die Objekte sind dabei zum einen ein \texttt{PointerEvent} und ein \texttt{KeyEvent}. \texttt{PointerEvents} enthalten die Koordinaten des Mauszeigers (x,y) und einen hexadezimalen Wert, der die Maustasten und deren Zustand repräsentiert. +Werte sind dabei: +\begin{itemize} + \item 0x01 = linke Maustaste gedrückt + \item 0x02 = mittlere Maustaste gedrückt + \item 0x03 = rechte Maustaste gedrückt + \item 0xfe = linke Maustaste losgelassen + \item 0xfd = mittlere Maustaste losgelassen + \item 0xfb = rechte Maustaste losgelassen +\end{itemize} +\texttt{KeyEvents} bestehen aus einem hexadezimalen Wert, der die Taste repräsentiert, und True oder False je nachdem, ob die Taste gedrückt wurde oder nicht. Die hexadezimalen Werte entsprechen den Werten in einem X Window System und können in der Headerdatei \texttt{<X11/keysymdef.h>} nachgeschlagen werden (siehe hierzu auch \url{http://www.realvnc.com/docs/rfbproto.pdf} - RFB Protokollspezifikation, Abschnitt KeyEvent). Beim Leeren der Queue werden die Methoden der rfbclient Klasse der libvnc Bibliothek \verb|SendPointerEvent(cl, _x, _y, _buttonMask)| und \verb|SendKeyEvent(cl, _key, _pressed)| mit den entsprechenden Werten aufgerufen (cl entspricht dabei einem Pointer auf die eigentliche rfbClient Instanz). + +\section{Signalbehandlung} + +Um zu gewährleisten, dass bei einer Terminierung des PVS-Clients auch der gegebenenfalls gestartete VNC-Server gestoppt wird, werden Sigterm, Sighup, Sigquit und Sigint Signale abgefangen und weiterbehandelt. +Um die Signale behandeln zu können, muss die C Bibliothek \texttt{signals.h} eingebunden werden und ein sigaction Objekt erstellt werden. Das Feld sa\_handler des sigaction Objektes gibt dabei die aufzurufende Funktion an (Pointer auf die Funktion). Diese Funktion (in der Klasse \texttt{pvs} die Funktion \texttt{signalHandler}) muss dabei vom Typ void sein und die Signalnummer als Parameter erwarten (\texttt{void PVS::signalHandler(int signal)}). +\begin{verbatim} + struct sigaction act; + act.sa_handler = &PVS::signalHandler; +\end{verbatim} + +Um Signale abfangen zu können, muss nun noch das sigaction Objekt durch \verb|sigaction(SIGTERM, &act, 0)| mit den entsprechenden Signalen (hier SIGTERM) verknüpft werden (muss für alle zu behandelnde Signale durchgeführt werden). +Danach wird, sobald ein entsprechendes Signal erhalten wird, die Funktion aufgerufen und die Signalnummer übergeben. +Für alle Signale kann die gleiche Funktion aufgerufen werden, hier kann die Unterscheidung dann mittels der in \texttt{signal.h} vorhandenen Konstanten SIGHUP, SIGTERM, SIGQUIT usw. erfolgen. Zu beachten ist hierbei, dass ein SIGKILL nicht abgefangen werden kann.
\ No newline at end of file diff --git a/doc/LaTeX/header.tex b/doc/LaTeX/header.tex new file mode 100644 index 0000000..06488b5 --- /dev/null +++ b/doc/LaTeX/header.tex @@ -0,0 +1,58 @@ + +\thispagestyle{empty} +\vspace*{\stretch{0.5}} +{\center +\hspace*{5mm}{\huge \bf Pool Video Switch}\\ +\hspace*{5mm}{\huge Benutzer- und Entwicklerdokumentation \\ +\vspace*{\stretch{1}}} +\begin{figure}[h] +\center +\includegraphics[width=9cm]{bilder/siegel-neu.jpg} +\end{figure} +\vspace*{\stretch{0.5}} +\Large Entwickler-Team\\ \vspace*{\stretch{0.5}} +\large {\it Projekt des Lehrstuhls für Kommunikationssysteme} \\ +\vspace*{\stretch{0.3}} +Rechenzentrum / Institut für Informatik \\ +\vspace*{\stretch{0.3}} +\vspace*{\stretch{0.5}} +April 2010 \\} +\normalsize +\newpage +\thispagestyle{empty} +{\small back of titlepage} +\newpage + +\thispagestyle{empty} +\newcommand{\HRule}{\rule{\linewidth}{1mm}} +\setlength{\parindent}{0mm} +\setlength{\parskip}{0mm} +\vspace*{\stretch{1}} +\HRule +\begin{center} +\Huge Pool Video Switch\\[5mm] +\Large Benutzer- und Entwicklerdokumentation +\end{center} +\HRule +\vspace*{\stretch{2}} +\begin{center} +\large\textsc{OpenSLX Project\\Freiburg\\2010} +\end{center} + +\newpage +\thispagestyle{empty} + +. \\ +OpenSLX Project \\ +Lehrstuhl für Kommunikationssysteme \\ +Rechenzentrum \& Institut für Informatik an der Technischen Fakultät \\ +Herrmann-Herder-Str. 10 \\ +79104 FREIBURG i.Br. \\ +pvs@uni-freiburg.de \\ + + +\vspace*{\stretch{2}} + + +\newpage + diff --git a/doc/LaTeX/intro/0000-chapter.tex b/doc/LaTeX/intro/0000-chapter.tex new file mode 100644 index 0000000..0339907 --- /dev/null +++ b/doc/LaTeX/intro/0000-chapter.tex @@ -0,0 +1,15 @@ +\chapter{Idee} +\label{einleitung} +\index{Einleitung} \index{Video Switch} \index{Laptop} \index{VGA} \index{DVI} \index{Klassenraum} \index{Student Control Panel} \index{Idee} + +Video-Switches für Klassenräume sind schon seit langem auf dem Markt: Sie setzen typischerweise auf eine Hardware-Lösung, die das Verlegen von vielen Metern Kabel bei dadurch erzwungener statischer Anordnung der Rechner verlangt. Sie sind nicht nur aufgrund des Einsatzes spezieller Hardware relativ teuer, sondern unflexibel bei technischen Weiterentwicklungen: Höhere Bildschirmauflösungen oder der Wechsel vom VGA auf den DVI oder PS2 auf den USB-Stecker sind nur durch einen Komplettaustausch oder unangenehme Kompromisse zu haben. Ziemlich ungeeignet erweisen sich hardware-basierte Lösungen beim Einsatz mobiler Geräte wie Laptops. Zudem erschweren sie die Veränderung der ursprünglichen Aufstellung der Maschinen und schaffen damit ungünstige Bedingungen für neue didaktische Konzepte. +\begin{figure}[h] +\center +\includegraphics[width=11.5cm]{bilder/studentctlpanel.png} +\caption{Student Control Panel des Edubuntu-Pakets, welches im Umfeld von Linux-Terminalservern eingesetzt werden kann.\label{uscp}} +\end{figure} +Neben den Hardware-basierten Varianten existieren inzwischen eine Reihe von Software-Produkten. Leider bieten sie keine optimalen Lösungen: Neben oft exorbitanten Lizenzkosten, die oft mit einem didaktisch und konzeptionell fragwürdigen Feature-Set begründet werden, orientieren sie sich an einem einzigen auf den Schulungs-PCs festinstalliertem Betriebssystem. Oft stehen sie nur für ausgewählte Microsoft-Betriebssysteme zur Verfügung und können damit nicht dem Anspruch einer breiten und allgemeinen universitären Umgebung entsprechen. Zudem kommen regelmäßige, typischerweise kostenpflichtige Produkt-Updates hinzu, denen sich nur begrenzt ausweichen läßt. + +Dem soll ein eigener Ansatz entgegengesetzt werden, der die eingangs genannten Beschränkungen aufhebt und dem Anspruch einer modernen universitären computer-gestützten Lehre entgegenkommt. Das Projekt soll stufenweise von einer einfachen Basislösung in Rückmeldung mit den Lehrenden weiterentwickelt werden. Ein Open-Source-Ansatz gewährleistet zudem eine größere Nachhaltigkeit. Selbst bei einer Projekteinstellung können andere auf den Code weiterhin zurückgreifen und damit einerseits bestehende Installationen aktualisieren und andererseits eigene Entwicklungen schneller vorantreiben. + +Bei der Entwicklung steht nicht die Neuerfindung bereits vorhandener Technologien, sondern deren intelligente Verknüpfung im Vordergrund. So bieten bereits Techniken wie VNC oder Xorg/X11 viele notwendige Grundlagen, die um pfiffige Werkzeuge mit intuitiven Oberflächen erweitert werden sollen. Eine gute Anschauung bietet beispielsweise die Open Source Software ''Student Control Panel'' des Edubuntu-Linux (\ref{uscp}). diff --git a/doc/LaTeX/intro/0100-funktionen.tex b/doc/LaTeX/intro/0100-funktionen.tex new file mode 100644 index 0000000..0c4536a --- /dev/null +++ b/doc/LaTeX/intro/0100-funktionen.tex @@ -0,0 +1,17 @@ +\chapter{Funktionen eines Software-Video-Switchs} +\label{funktionen} +\index{Funktion} + +Damit ein Software-Video-Switch Hardwarelösungen ersetzen kann, muss zumindest eine gewisse Grundmenge an Funktionalität bereitgestellt werden. Diese Funktionen lassen sich in weiteren Schritten erweitern und können dabei über die der Hardwareimplementierungen hinausgehen. Gegebenenfalls muss eine Softwarelösung sich um Aspekte kümmern, die bei einer Hardwarelösung kaum ein Problem darstellen. Hierzu zählt das Thema der Abhörsicherheit. + +\section{Wünschenswerte Basisfunktionen} + +\begin{figure}[h] +\center +\includegraphics[width=11.5cm]{bilder/studentctlpanel.png} +\caption{Student Control Panel des Edubuntu-Pakets, welches im Umfeld von Linux-Terminalservern eingesetzt werden kann.\label{uscp}} +\end{figure} + +\section{Funktionserweiterungen} + + diff --git a/doc/LaTeX/intro/0900-textaufbau.tex b/doc/LaTeX/intro/0900-textaufbau.tex new file mode 100644 index 0000000..2bdc9a9 --- /dev/null +++ b/doc/LaTeX/intro/0900-textaufbau.tex @@ -0,0 +1,12 @@ +\chapter{Aufbau dieses Handbuchs} +\label{aufbau} +\index{Schreibweise} \index{Kommando} \index{Quelltext} \index{Konfiguration} +\index{Formatierung} \index{Verzeichnis} \index{Dateiname} + +Das Handbuch ist in drei Teile gegliedert, wobei der erste Teil mit diesen Erläuterungen bereits abgeschlossen wird. Der zweite Teil wendet sich an die Endanwender dieses Projekts, der dritte Teil umfasst die Entwicklerdokumentation. + +\section{Heraushebungen und Formatierungen} + +Zur besseren Lesbarkeit gibt es einige Konventionen zur Formatierung von einfachen Kommandos, Kommandozeilen oder Verzeichnis- und Dateinamen. Ebenso sind Skripte oder Auszüge aus C++-Quelltexten zur Heraushebung anders gesetzt. + +Hierbei gelten folgende Regelungen: Ein einfaches Kommando wird \textbf{fett} gesetzt, wie beispielsweise \textbf{pvsmgr}. Dieses lässt sich in einem Terminalfenster absetzen oder über die Ausführenoption der grafischen Desktops. Kommandos mit Optionen und bei Bedarf Parametern werden so wie Skripten und Quelltexte in \texttt{Schreibmaschinenschrift} gesetzt aber nicht aus dem allgemeinen Textsatz herausgehoben. Solche Heraushebungen werden jedoch ab zwei Druckzeilen aufwärts sinnvoll. Verzeichnis- und Dateinamen, wobei es bei letzteren dann nicht um den Programmnamen, sondern Quelltexte, Konfigurationen etc. geht, werden \textit{kursiv} gedruckt, wie beispielsweise \textit{/etc/pvs}. diff --git a/doc/LaTeX/mystyle-pdf.tex b/doc/LaTeX/mystyle-pdf.tex new file mode 100644 index 0000000..d2993f4 --- /dev/null +++ b/doc/LaTeX/mystyle-pdf.tex @@ -0,0 +1,110 @@ +\documentclass[12pt,a4paper,ngerman]{book} + +\usepackage[ngerman]{babel} +\usepackage{ucs} +\usepackage[T1]{fontenc} +\usepackage[utf8x]{inputenc} +%\usepackage[latin1]{inputenc} +\usepackage{multicol} +\usepackage{graphicx} +\usepackage{makeidx} +\usepackage{ulem} +\usepackage{xcolor} +\usepackage{moreverb} + +%using serif-less Font +\renewcommand{\familydefault}{\sfdefault} + +% european A4 paper format---------> +\setlength{\textwidth}{15.8cm} % width of main text +\setlength{\textheight}{23.5cm} % height of main text +\setlength{\topmargin}{-1in} % Subtract default offset +\addtolength{\topmargin}{2.2cm} % Topmargin +\setlength{\topskip}{30pt} % between header and text +%%\setlength{\headheight}{0.0in} % no header +%%\setlength{\headsep}{0.0in} % +\setlength{\hoffset}{-1in} % Subtract default offset +\addtolength{\hoffset}{2.2cm} +\setlength{\evensidemargin}{\paperwidth} +\addtolength{\evensidemargin}{-\textwidth} +\addtolength{\evensidemargin}{-\oddsidemargin} +\addtolength{\evensidemargin}{-2in} +\addtolength{\evensidemargin}{-\hoffset} +\addtolength{\evensidemargin}{-\hoffset} +\addtolength{\oddsidemargin}{-1.5mm} +% <end european A4 paper format----- + +%own commands +\newcommand{\graybox}[1]{\colorbox{gray}{\makebox[10cm][l]{\color{white}{\bf{#1}}}}} +%\newcommand{\graybox}[1]{\colorbox{mygray}{\color{white}{\bf{#1}}}} + +%header styling--------------------> + +\usepackage{fancyhdr} +\fancyhf{} +\renewcommand{\headrulewidth}{0pt} +\setlength{\fboxsep}{3mm} +\addtolength{\headwidth}{\marginparsep} +\addtolength{\headwidth}{\marginparwidth} +%\renewcommand{\chaptermark}[1]% +% {\markboth{#1}{}} +%\renewcommand{\sectionmark}[1]% +% {\markright{\thesection\ #1}} + +%define pagenumberbox +\newcommand{\mylthepage}{\colorbox{gray}{\makebox[1.8cm][r]{\color{white}{\bf{\thepage}}}}} +\newcommand{\myrthepage}{\colorbox{gray}{\makebox[1.8cm][l]{\color{white}{\bf{\thepage}}}}} + +%set pagenumber and chapter information +\lhead[\mylthepage]{\bf{\color{gray}{\rightmark}}} +\rhead[\bf{\color{gray}{\leftmark}}]{\myrthepage} +\cfoot{} +\pagestyle{fancy} +\fancypagestyle{plain}{ +\renewcommand{\headrulewidth}{0pt} +\setlength{\fboxsep}{3mm} +%\addtolength{\headwidth}{\marginparsep} +%\addtolength{\headwidth}{\marginparwidth} +%\lhead[\mylthepage]{ } +%\rhead[ ]{\myrthepage} +\cfoot{} +} +%<end header styling---------------- + +% Bildunterschr. +\usepackage[bf]{caption2} +\renewcommand{\captionfont}{\small} +\renewcommand{\figurename}{Abb.} +\renewcommand{\thefigure}{\arabic{chapter}.\arabic{figure}} +%no leading chapter-----------------> +\makeatletter +\renewcommand\thechapter{\arabic{chapter}} +\def\@makechapterhead#1{% + \vspace*{50\p@}% + {\parindent \z@ \raggedright \normalfont + \ifnum \c@secnumdepth >\m@ne + \if@mainmatter + \par\nobreak + \vskip 20\p@ + \fi + \fi + \interlinepenalty\@M + \Huge \bfseries \thechapter\ #1\par\nobreak + \vskip 40\p@ + }} +\makeatother +%<no leading chapter------------------ + + +\usepackage[ + pdftex, + pdfpagelabels, + plainpages=false, + colorlinks, + urlcolor=blue, + linkcolor=black, + citecolor=black, + pdfauthor={Dirk von Suchodoletz, ..., ...}, +% pdftitle={PVS Dokumentation} + pdftitle={GZ:if expand("\%") == ""|browse confirm w|else|confirm w|endif} +]{hyperref} diff --git a/doc/LaTeX/pvs-doc.tex b/doc/LaTeX/pvs-doc.tex new file mode 100644 index 0000000..efe2adc --- /dev/null +++ b/doc/LaTeX/pvs-doc.tex @@ -0,0 +1,37 @@ +\makeindex +\input{mystyle-pdf} + +\begin{document} +\input{header} +\pagenumbering{Roman} +\addcontentsline{toc}{chapter}{Inhaltsverzeichnis} +\tableofcontents +\clearpage +\input{zusfassung} +%\newpage +\pagenumbering{arabic} +\part{Idee und Ãœberblick} +\input{intro/0000-chapter} +\input{intro/0100-funktionen} +\input{intro/0900-textaufbau} +\part{Bedienungsanleitung} +\input{user/0001-chapter} +\input{user/0000-chapter} + +\part{Entwicklerdokumentation} +\input{devel/0000-chapter} +\input{devel/0100-build} +\input{devel/0200-gui-lib} +\input{devel/0300-pvs} +\input{devel/0400-pvs-console} +\input{devel/0500-pvs-client} + +\part{Anhang} +\appendix +\input{appendix/0000-chapter} +%\bibliographystyle{natdin} +%\bibliography{099-Bibliographie/mybib} +%\addcontentsline{toc}{chapter}{Literaturverzeichnis} +\printindex +%\addcontentsline{toc}{chapter}{Index} +\end{document} diff --git a/doc/LaTeX/user/0000-chapter.tex b/doc/LaTeX/user/0000-chapter.tex new file mode 100644 index 0000000..ae9276d --- /dev/null +++ b/doc/LaTeX/user/0000-chapter.tex @@ -0,0 +1,63 @@ +\chapter{PVS-Client} +Eine der Anforderungen an die Software ist, dass sie den Benutzer nicht an der Arbeit hindert und im Hintergrund laufen soll. Dies wurde mit Hilfe einer Applikation realisiert, die nur aus einer Toolbar besteht und bei Nichtgebrauch automatisch ausgeblendet wird. Falls der aktuelle Windowmanager dies unterstützt, wird zusätzlich ein Symbol (schwarze Kamera) im Systemabschnitt der Taskleiste (System Tray) abgelegt. In diesem Fall, werden dem Benutzer bei diversen Ereignissen Meldungen über sogenannte "`Sprechblasen"' angezeigt. Wenn der Windowmanager keinen Systemabschnitt besitzt, werden diese Meldungen über konventionelle Dialoge präsentiert. Des Weiteren informiert das Symbol über den Verbindungsstatus. Im Falle einer erfolgreichen Verbindung zu einer Steuerkonsole, wechselt die kleine Lampe von rot auf grün.\\ +Eine weitere Anforderung ist der ständige Zugriff auf die Benutzerschnittstelle damit zu jeder Zeit Einstellungen vorgenommen werden können. Dies wird ebenfalls gewährleistet wenn ein Video oder eine virtuelle Maschine im Vollbildmodus dargestellt wird. Des Weiteren kann die Toolbar entweder am oberen oder unteren Bildschirmrand an einer variablen waagerechten Position angeordnet werden. Dies ist deshalb wichtig, da diverse Windowmanager ihre eigenen Toolbars an unterschiedlichen Orten platzieren.\\ +Die Toolbar des PVS-Clients (Abb. \ref{png:toolbar}) besteht aus einer Reihe von Bedienelementen, die nachfolgend erklärt werden: +\begin{enumerate} + \item Die wichtigste Schaltfläche der Toolbar -- ein Klick auf diese öffnet das Hauptmenü. Das Menü bietet Zugang zu allen Funktionen die dem Benutzer zur Verfügung stehen. Zusätzlich ist dieses Menü über einen Rechtsklick auf das Symbol im Systemabschnitt der Taskleiste (System Tray) abrufbar. + \item Die Schaltfläche links neben der Beschriftung "`Host"' erlaubt eine schnelle Wahl der Steuerkonsole. Durch einen Klick auf diese öffnet sich ein Menü mit einer Auswahl der verfügbaren Server. Durch einen weiteren Klick auf einen der angezeigten Namen kann nach der Eingabe eines Passwortes zu der gewählten Steuerkonsole verbunden werden. Falls kein Passwort benötigt wird, kann das Feld leer bleiben.\\ + Die Beschriftung dieser Schaltfläche wird nach einer erfolgreichen Verbindung an den Namen der Steuerkonsole angepasst, wobei ein "`-"' signalisiert, dass keine Verbindung besteht. Die Liste möglicher Server wird zur Laufzeit automatisch aktualisiert. + \item Diese Checkbox erlaubt es dem Benutzer zu bestimmen ob die verbundene Steuerkonsole das Recht hat eine VNC-Verbindung zum Client aufzubauen. Falls aktiviert, kann der Benutzer der die Steuerkonsole gestartet hat das Verhalten des Benutzers am Client beobachten und bei Bedarf dessen Bild im Netzwerk verteilen. +\end{enumerate} +\begin{figure}[h] + \begin{center} + \includegraphics[scale=0.7]{bilder/clientToolbar} + \caption{Toolbar des PVS-Clients} + \label{png:toolbar} + \end{center} +\end{figure} +Das Hauptmenü des PVS-Clients besteht aus folgenden Elementen: +\begin{itemize} + \item Connect: Zu einer Steuerkonsole verbinden. Der Vorgang ist dabei analog zur Schnellwahl in der Toolbar. + \item Disconnect: Eine bestehende Verbindung trennen. + \item Information: Zeigt in einem Dialog den Namen der aktuell verbundenen Steuerkonsole sowie das zugehörige Passwort. Diese Funktion ist für Dozenten nützlich, um beispielsweise über einen angeschlossenen Projektor die Daten für alle Clients bekannt zu geben. + \item Chat: Öffnet den Chat-Dialog. + \item Send File: Ermöglicht das Senden einer Datei an einen Teilnehmer. + \item Config: Öffnet den Konfigurationsdialog. + \item About: Zeigt Versionsinformationen an. + \item Quit: Beendet die Applikation sowie das zugehörige Backend. +\end{itemize} + +\section{Chat} +Abbildung \ref{png:chat} zeigt das Chatfenster des PVS-Clients. Mit diesem ist es möglich mit anderen Teilnehmern gemeinsam zu kommunizieren oder private Gespräche zwischen zwei Teilnehmern zu führen. +\begin{enumerate} + \item Dies ist eine Liste aller aktuell am Chat teilnehmenden Benutzer. Ein Doppelklick auf einen Namen ermöglicht ein privates Gespräch, mit einem Rechtsklick kann dem gewählten Benutzer eine Datei geschickt werden. + \item Das Hauptfenster des Dialogs zeigt den aktuellen Gesprächsverlauf an. Dabei wird jeder Nachricht die Uhrzeit sowie der Name des Absenders hinzugefügt. Hier erscheinen ebenfalls diverse Ereignisse, wie der Beitritt eines neuen Benutzers oder der Wechsel des Verbindungsstatus. + \item Durch diese Reiter kann das aktuelle Hauptfenster und somit der Gesprächspartner gewechselt werden. Private Unterhaltungen können durch das kleine "`x"' geschlossen werden. Bei neuen, also noch nicht gelesenen Nachrichten, erscheint eine grüne Lampe. + \item Hier wird die eigene Nachricht eingegeben. + \item Ein Klick auf "`Send"' verschickt die eingegebene Nachricht entweder an den öffentlichen Kanal oder bei einer privaten Unterhaltung direkt an den Kommunikationspartner. Der Empfänger ist dabei stets derjenige dessen Gesprächsverlauf im Hauptfenster angezeigt wird. Es ist auch möglich nach der Eingabe einer Nachricht zum Abschicken die Enter-Taste zu betätigen. +\end{enumerate} +Das Chatfenster unterstützt ebenfalls "`Drag \& Drop"'. Das Ablegen einer Datei innerhalb des Fensters bewirkt eine Anfrage beim aktuellen Gesprächspartner zur Dateiübertragung.\\ +Sollte eine Nachricht eingegangen sein obwohl der Chat-Dialog geschlossen ist, so wird dies dem Benutzer über eine "`Sprechblase"' im Systemabschnitt der Taskleiste mitgeteilt. +\begin{figure}[h] + \begin{center} + \includegraphics[scale=0.5]{bilder/clientChatDialog} + \caption{Chat-Dialog des PVS-Clients} + \label{png:chat} + \end{center} +\end{figure} + +\section{Konfiguration} +Der Konfigurationsdialog (Abb. \ref{png:config}) erlaubt es dem Benutzer des PVS-Clients diverse Einstellungen vornehmen: +\begin{enumerate} + \item Mit diesen Reitern kann die Gruppe der zur Verfügung stehenden Optionen gewechselt werden. Unter "`Permissions"' sind Einstellungen zu finden mit denen der Benutzer seine Privatsphäre schützen kann. Unter "`Display"' ist es möglich das Verhalten der Toolbar anzupassen (z.B. die Position selbiger). + \item Hier wird dem Dozenten das Recht erteilt eine VNC-Verbindung aufbauen zu können (z.Z ohne Funktion). + \item Hier wird allen anderen Benutzern das Recht erteilt eine VNC-Verbindung aufbauen zu können (z.Z ohne Funktion). + \item Durch diese zwei Checkboxen kann die Teilnahme am Chat oder das Akzeptieren von Dateiübertragungen aktiviert werden (z.Z ohne Funktion). +\end{enumerate} +\begin{figure}[h] + \begin{center} + \includegraphics[scale=0.7]{bilder/clientConfigDialog} + \caption{Konfigurationsdialog des PVS-Clients} + \label{png:config} + \end{center} +\end{figure} diff --git a/doc/LaTeX/user/0001-chapter.tex b/doc/LaTeX/user/0001-chapter.tex new file mode 100644 index 0000000..35f1128 --- /dev/null +++ b/doc/LaTeX/user/0001-chapter.tex @@ -0,0 +1,90 @@ +\chapter{PVS-Steuerkonsole} +Die PVS-Steuerkonsole auch PVS-Manager genannt, wurde so benutzerfreundlich aufgebaut, dass die wichtigsten Funktionen durch einen Mouseklick +entfernt werden. wir wollen in diesem Teil die unterschiedlichen Funktionen, die von der PVS-Steuerkonsole aus angeboten werden, vorstellen. +\section{Allgemein} +Die Abbildung \ref{fig:pvsmgra} zeigt den PVS-Manager in seinem Gesamtbild. Ganz links steht die Liste der verbundenen Clients und +rechts befinden sich die entsprechenden VNC-Frames. + +\begin{figure}[h] + \centering + \includegraphics[width=0.80\textwidth]{bilder/pvsmgrAll.jpg} + \caption{Die PVS-Steuerkonsole} + \label{fig:pvsmgra} +\end{figure} + +\subsection{Die Client-Liste} +\label{clientliste} +Die angezeigten Clients in dieser Liste haben mit dem Server eine erfolgreiche Verbindung aufbauen können. Mit dem entsprechenden +Tastenkürzel wie es im \ref{Taste} aufgelistet wird, kann man die Clients in unterschiedlichen Bezeichnung anzeigen lassen. Beim Rechtsklick +auf die einzelnen Clients sind folgenden Aktionen möglich:\\ +\textbf{Lock Client(s)}: Damit werden die selektierten Clients gesperrt und dabei werden der Superclient und ein möglicher auf den Superclient +projektierten Client ausgeschloßen. \\ +\textbf{Unlock Client(s)}: Die gesperrten Clients werden wieder entsperrt. \\ +\textbf{MsgLock Client(s)}: Idem wie beim \textit{Lock Client(s)} aber hier bekommt der Client vor der Sperrung eine Nachricht vom pvsmgr.\\ +\textbf{MsgLock All Client(s)}: Ein \textit{MsgLock Client(s)} für alle Clients.\\ +\textbf{Message Clients}: Nachricht an den selektierten Clients schicken.\\ +\textbf{Projection}: Es wird benutzt, um den VNC-Frame eines Clients zu einem anderen zu verschicken. Die Ausführung der Projektion verlangt, dass nur +einen einzigen Client selektiert wird. Der selektierte Client ist die Quelle der Projektion. Die Ziele der Projektion werden über ein Popup-Fenster +ausgewählt. Es wird auch möglich einen Client in einem schon existierenden Projektion mit einbeziehen zu lassen. Es ist natürlich nicht möglich +ein Client gleichzeitig als Quelle und Ziel einer Projetion zu haben.\\ +\textbf{Unprojektion}: Wird ausgewählt um eine existierende Projektion zu beenden. Ausgeführt auf eine Quelle (source-projection) +einer Projektion werden alle betroffenen Clients (target-projection) wieder freigegeben. Die Quelle wird dann im Anschluß auch freigegeben.\\ + +\subsection{Die VNC-Frames} +Die VNC-Frames werden im ConnectionWindow angezeigt. Für den jeweiligen verbundenen Client wird ein kleines Fenster mit änderbarer Größe bereitgestellt. +Die verfügbaren Aktionen per Rechtsklick auf die vorhandenen VNC-Frames sind ähnlich wie im \ref{clientliste} beschrieben wurde. Im ConnectionWindow kann man +zwei Arten von Frames unterscheiden. Die Abbildung \ref{fig:pvsdummy} zeigt einen \textit{Dummy-} und einen \textit{Nicht Dummy-Frame}.\\ +\\ +\textbf{Dummy-Frame}: Ein \textit{Dummy-Frame} lässt sich mit einem schwarzen Punkt rechts unten unterscheiden. Ein \textit{Dummy-Frame} ist eine Art Template +oder besser ein Platzhalter für den eigentlichen VNC-Frame. Man kann sie erzeugen oder löschen. Die +Erzeugung erfolgt durch einen Rechtsmouseklick auf dem ConnectionWindow und das Löschen durch den Rechtsklick auf dem +betroffenen Client. Die \textit{dummy-Clients} werden meistens zur Definition von Profilen erzeugt. Sie werden also erzeugt und je nach +Wunsch angeordnet und unter dem Menü \textit{Profile manager} wird ein Dialog gestartet, in dem man das Profil nach dem Klick auf dem Knopf \textit{new} +unter den gewunschten Name speichern kann. Ausserdem unter dem Menü \textit{Load profil} kann man ein existierendes Profil laden.\\ +\begin{figure}[h] + \centering + \includegraphics[width=0.80\textwidth]{bilder/dum.jpg} + \caption{Dummy und Nicht Dummy Frames} + \label{fig:pvsdummy} +\end{figure} \\ +\textbf{Nicht dummy-Frame}: Nach dem ein Client mit dem pvsmgr eine Verbindung erfolgreich aufgebaut hat, wird er im ConnectionWindow als ein +richtiger VNC-Frame angezeigt. Der \textit{Nicht dummy-Frame} hat einen grünen Punkt an seine rechte Ecke. Der Manager kann also diese Frame manipulieren. +Dem Dozent steht dafür mehrere Funktionen zur Verfügung. Wir werden aber hier +nur die wichtigsten erläutern, denn die anderen lassen sich ganz trivial auf dem Gui nachvollziehen. Also auf ein VNC-Frame kann per Rechtsmouseklick die +im \ref{clientliste} definerten Aktionen angewandt werden. Die VNC-Qualität und die Größe der Frames können geändert werden, um den CPU-Last zu minimieren. +Auf dem Bild \ref{fig:pvsdummy} kann man verbundene Clients (\textit{Nicht dummy-Frame}) und nicht verbundene Clients (\textit{Dummy-Frame}) ansehen . Der Titel des Fensters ist der Benutzername des Clients und unter dem Frame +befindet sich die korrespondierte IP-Adresse. Der grüne Punkt ganz rechts im Gegenteil zum dummy-Frame zeigt, dass der Client gerade Online ist.\\ +Für die Verbundene Clients besteht die Möglichkeit die VNC-Quality (HIGH, MEDIUM oder LOW) jeder Zeit einzustellen. Mit \textit{Set Password} kann der Manager ganz bequem +festlegen, ob die Clients zur Verbindung mit dem pvsmgr ein von System generiertes Passwort eingeben müssen oder nicht. Auf dem Toolbar werden weitere Funktionen wie: +Screeshots aufnehmen, Chat mit dem einzelnen Client starten oder alle Clients auf einem Klick zu blockieren. Das Blockieren der Clients schließt natürlich der Dozent-Rechner +aus. Der Dozent-Rechner hebt sich von einem anderer verbundenen Machine durch den Rot-Blau Zeichnen neben dem grünen Punkt hervor. +\\ \\ +Im letzten Punkt dieser Abschnitt wollen wir die vorhandenen Tastenkürzel vorstellen. + +\subsection{Tastenkürzel für PVS-Server} +\label{Taste} +Einige schlaue Tastenkombinationen sollen die Ausnutzung der PVS-Konsole erleichten. +Wir werden z.B für einige Funktionen, die in der Popup-Menü zur Verfügung gestellten sind, den Aufruf durch +Tastenkombination ermöglichen.\\ + +Wichtig ist, eine Rückkopplung mit den Anwendern vorzunehmen (Rückmeldung, was die Dozenten denken und welche Funktionen sie für sinnvoll erachten, was sie sich wünschen ...)\\ + +Hier folgt eine Liste von den bisherigen eingebauten Tastenkombinationen:\\ +\textit{Alt+F}: Anzeige des Menüs unter "File" \\ +\textit{Alt+C}: Anzeige des Menüs unter "Clients" \\ +\textit{Alt+L}: Anzeige des Menüs unter "Logging" \\ +\textit{Alt+H}: Anzeige des Menüs unter "Help" \\ +\textit{Ctrl+M}: Anzeige des Profilmanager-Dialogs \\ +\textit{Ctrl+Q}: Die Anwendung verlassen (Exit) \\ +\textit{Ctrl+1}: Name in Client-Liste anzeigen lassen \\ +\textit{Ctrl+2}: IP in Client-Liste anzeigen lassen \\ +\textit{Ctrl+3}: Username in Client-Liste anzeigen lassen \\ +\textit{Ctrl+L}: Log anzeigen lassen \\ +\textit{Ctrl+O}: Normal Log anzeigen lassen \\ +\textit{Ctrl+R}: Error Log anzeigen lassen \\ +\textit{Ctrl+N}: Network Log anzeigen lassen \\ +\textit{Ctrl+T}: Terminal Log anzeigen lassen \\ +\textit{Ctrl+D}: Chat Log anzeigen lassen \\ +\textit{Ctrl+F}: Screenshort der ausgewählten Clients machen \\ +\textit{Ctrl+V}: Ausgewählter Client in voller Auflösung anzeigen lassen \\ +\textit{Ctrl+A}: Alle Clients Un- bzw. Lock \\ diff --git a/doc/LaTeX/zusfassung.tex b/doc/LaTeX/zusfassung.tex new file mode 100644 index 0000000..213fedd --- /dev/null +++ b/doc/LaTeX/zusfassung.tex @@ -0,0 +1,10 @@ +\markboth{}{} +\small +\section*{Zusammenfassung} +Der Pool Video Switch (PVS) ist eine Applikation, die seit einiger Zeit im Zuge des OpenSLX-Projekts am Rechenzentrum der Universität Freiburg und am Lehrstuhl für Kommunikationssysteme entwickelt wird. + +Inzwischen liegt die Version 3 vor ... + + +\normalsize +\newpage diff --git a/doc/build_doc.sh b/doc/build_doc.sh new file mode 100755 index 0000000..c25df82 --- /dev/null +++ b/doc/build_doc.sh @@ -0,0 +1,2 @@ +#!/bin/sh +doxygen doxconf diff --git a/doc/doxconf b/doc/doxconf new file mode 100644 index 0000000..50334c7 --- /dev/null +++ b/doc/doxconf @@ -0,0 +1,1510 @@ +# Doxyfile 1.5.8 + +# This file describes the settings to be used by the documentation system +# doxygen (www.doxygen.org) for a project +# +# All text after a hash (#) is considered a comment and will be ignored +# The format is: +# TAG = value [value, ...] +# For lists items can also be appended using: +# TAG += value [value, ...] +# Values that contain spaces should be placed between quotes (" ") + +#--------------------------------------------------------------------------- +# Project related configuration options +#--------------------------------------------------------------------------- + +# This tag specifies the encoding used for all characters in the config file +# that follow. The default is UTF-8 which is also the encoding used for all +# text before the first occurrence of this tag. Doxygen uses libiconv (or the +# iconv built into libc) for the transcoding. See +# http://www.gnu.org/software/libiconv for the list of possible encodings. + +DOXYFILE_ENCODING = UTF-8 + +# The PROJECT_NAME tag is a single word (or a sequence of words surrounded +# by quotes) that should identify the project. + +PROJECT_NAME = "Pool Video Switch" + +# The PROJECT_NUMBER tag can be used to enter a project or revision number. +# This could be handy for archiving the generated documentation or +# if some version control system is used. + +PROJECT_NUMBER = 17 + +# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) +# base path where the generated documentation will be put. +# If a relative path is entered, it will be relative to the location +# where doxygen was started. If left blank the current directory will be used. + +OUTPUT_DIRECTORY = . + +# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create +# 4096 sub-directories (in 2 levels) under the output directory of each output +# format and will distribute the generated files over these directories. +# Enabling this option can be useful when feeding doxygen a huge amount of +# source files, where putting all generated files in the same directory would +# otherwise cause performance problems for the file system. + +CREATE_SUBDIRS = YES + +# The OUTPUT_LANGUAGE tag is used to specify the language in which all +# documentation generated by doxygen is written. Doxygen will use this +# information to generate all constant output in the proper language. +# The default language is English, other supported languages are: +# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, +# Croatian, Czech, Danish, Dutch, Farsi, Finnish, French, German, Greek, +# Hungarian, Italian, Japanese, Japanese-en (Japanese with English messages), +# Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, Polish, +# Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak, Slovene, +# Spanish, Swedish, and Ukrainian. + +OUTPUT_LANGUAGE = English + +# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will +# include brief member descriptions after the members that are listed in +# the file and class documentation (similar to JavaDoc). +# Set to NO to disable this. + +BRIEF_MEMBER_DESC = YES + +# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend +# the brief description of a member or function before the detailed description. +# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the +# brief descriptions will be completely suppressed. + +REPEAT_BRIEF = YES + +# This tag implements a quasi-intelligent brief description abbreviator +# that is used to form the text in various listings. Each string +# in this list, if found as the leading text of the brief description, will be +# stripped from the text and the result after processing the whole list, is +# used as the annotated text. Otherwise, the brief description is used as-is. +# If left blank, the following values are used ("$name" is automatically +# replaced with the name of the entity): "The $name class" "The $name widget" +# "The $name file" "is" "provides" "specifies" "contains" +# "represents" "a" "an" "the" + +ABBREVIATE_BRIEF = + +# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then +# Doxygen will generate a detailed section even if there is only a brief +# description. + +ALWAYS_DETAILED_SEC = YES + +# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all +# inherited members of a class in the documentation of that class as if those +# members were ordinary class members. Constructors, destructors and assignment +# operators of the base classes will not be shown. + +INLINE_INHERITED_MEMB = NO + +# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full +# path before files name in the file list and in the header files. If set +# to NO the shortest path that makes the file name unique will be used. + +FULL_PATH_NAMES = NO + +# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag +# can be used to strip a user-defined part of the path. Stripping is +# only done if one of the specified strings matches the left-hand part of +# the path. The tag can be used to show relative paths in the file list. +# If left blank the directory from which doxygen is run is used as the +# path to strip. + +STRIP_FROM_PATH = + +# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of +# the path mentioned in the documentation of a class, which tells +# the reader which header file to include in order to use a class. +# If left blank only the name of the header file containing the class +# definition is used. Otherwise one should specify the include paths that +# are normally passed to the compiler using the -I flag. + +STRIP_FROM_INC_PATH = + +# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter +# (but less readable) file names. This can be useful is your file systems +# doesn't support long names like on DOS, Mac, or CD-ROM. + +SHORT_NAMES = NO + +# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen +# will interpret the first line (until the first dot) of a JavaDoc-style +# comment as the brief description. If set to NO, the JavaDoc +# comments will behave just like regular Qt-style comments +# (thus requiring an explicit @brief command for a brief description.) + +JAVADOC_AUTOBRIEF = YES + +# If the QT_AUTOBRIEF tag is set to YES then Doxygen will +# interpret the first line (until the first dot) of a Qt-style +# comment as the brief description. If set to NO, the comments +# will behave just like regular Qt-style comments (thus requiring +# an explicit \brief command for a brief description.) + +QT_AUTOBRIEF = NO + +# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen +# treat a multi-line C++ special comment block (i.e. a block of //! or /// +# comments) as a brief description. This used to be the default behaviour. +# The new default is to treat a multi-line C++ comment block as a detailed +# description. Set this tag to YES if you prefer the old behaviour instead. + +MULTILINE_CPP_IS_BRIEF = NO + +# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented +# member inherits the documentation from any documented member that it +# re-implements. + +INHERIT_DOCS = YES + +# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce +# a new page for each member. If set to NO, the documentation of a member will +# be part of the file/class/namespace that contains it. + +SEPARATE_MEMBER_PAGES = NO + +# The TAB_SIZE tag can be used to set the number of spaces in a tab. +# Doxygen uses this value to replace tabs by spaces in code fragments. + +TAB_SIZE = 4 + +# This tag can be used to specify a number of aliases that acts +# as commands in the documentation. An alias has the form "name=value". +# For example adding "sideeffect=\par Side Effects:\n" will allow you to +# put the command \sideeffect (or @sideeffect) in the documentation, which +# will result in a user-defined paragraph with heading "Side Effects:". +# You can put \n's in the value part of an alias to insert newlines. + +ALIASES = + +# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C +# sources only. Doxygen will then generate output that is more tailored for C. +# For instance, some of the names that are used will be different. The list +# of all members will be omitted, etc. + +OPTIMIZE_OUTPUT_FOR_C = NO + +# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java +# sources only. Doxygen will then generate output that is more tailored for +# Java. For instance, namespaces will be presented as packages, qualified +# scopes will look different, etc. + +OPTIMIZE_OUTPUT_JAVA = NO + +# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran +# sources only. Doxygen will then generate output that is more tailored for +# Fortran. + +OPTIMIZE_FOR_FORTRAN = NO + +# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL +# sources. Doxygen will then generate output that is tailored for +# VHDL. + +OPTIMIZE_OUTPUT_VHDL = NO + +# Doxygen selects the parser to use depending on the extension of the files it parses. +# With this tag you can assign which parser to use for a given extension. +# Doxygen has a built-in mapping, but you can override or extend it using this tag. +# The format is ext=language, where ext is a file extension, and language is one of +# the parsers supported by doxygen: IDL, Java, Javascript, C#, C, C++, D, PHP, +# Objective-C, Python, Fortran, VHDL, C, C++. For instance to make doxygen treat +# .inc files as Fortran files (default is PHP), and .f files as C (default is Fortran), +# use: inc=Fortran f=C + +EXTENSION_MAPPING = + +# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want +# to include (a tag file for) the STL sources as input, then you should +# set this tag to YES in order to let doxygen match functions declarations and +# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. +# func(std::string) {}). This also make the inheritance and collaboration +# diagrams that involve STL classes more complete and accurate. + +BUILTIN_STL_SUPPORT = NO + +# If you use Microsoft's C++/CLI language, you should set this option to YES to +# enable parsing support. + +CPP_CLI_SUPPORT = NO + +# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. +# Doxygen will parse them like normal C++ but will assume all classes use public +# instead of private inheritance when no explicit protection keyword is present. + +SIP_SUPPORT = NO + +# For Microsoft's IDL there are propget and propput attributes to indicate getter +# and setter methods for a property. Setting this option to YES (the default) +# will make doxygen to replace the get and set methods by a property in the +# documentation. This will only work if the methods are indeed getting or +# setting a simple type. If this is not the case, or you want to show the +# methods anyway, you should set this option to NO. + +IDL_PROPERTY_SUPPORT = YES + +# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC +# tag is set to YES, then doxygen will reuse the documentation of the first +# member in the group (if any) for the other members of the group. By default +# all members of a group must be documented explicitly. + +DISTRIBUTE_GROUP_DOC = NO + +# Set the SUBGROUPING tag to YES (the default) to allow class member groups of +# the same type (for instance a group of public functions) to be put as a +# subgroup of that type (e.g. under the Public Functions section). Set it to +# NO to prevent subgrouping. Alternatively, this can be done per class using +# the \nosubgrouping command. + +SUBGROUPING = YES + +# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum +# is documented as struct, union, or enum with the name of the typedef. So +# typedef struct TypeS {} TypeT, will appear in the documentation as a struct +# with name TypeT. When disabled the typedef will appear as a member of a file, +# namespace, or class. And the struct will be named TypeS. This can typically +# be useful for C code in case the coding convention dictates that all compound +# types are typedef'ed and only the typedef is referenced, never the tag name. + +TYPEDEF_HIDES_STRUCT = NO + +# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to +# determine which symbols to keep in memory and which to flush to disk. +# When the cache is full, less often used symbols will be written to disk. +# For small to medium size projects (<1000 input files) the default value is +# probably good enough. For larger projects a too small cache size can cause +# doxygen to be busy swapping symbols to and from disk most of the time +# causing a significant performance penality. +# If the system has enough physical memory increasing the cache will improve the +# performance by keeping more symbols in memory. Note that the value works on +# a logarithmic scale so increasing the size by one will rougly double the +# memory usage. The cache size is given by this formula: +# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, +# corresponding to a cache size of 2^16 = 65536 symbols + +SYMBOL_CACHE_SIZE = 0 + +#--------------------------------------------------------------------------- +# Build related configuration options +#--------------------------------------------------------------------------- + +# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in +# documentation are documented, even if no documentation was available. +# Private class members and static file members will be hidden unless +# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES + +EXTRACT_ALL = YES + +# If the EXTRACT_PRIVATE tag is set to YES all private members of a class +# will be included in the documentation. + +EXTRACT_PRIVATE = NO + +# If the EXTRACT_STATIC tag is set to YES all static members of a file +# will be included in the documentation. + +EXTRACT_STATIC = YES + +# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) +# defined locally in source files will be included in the documentation. +# If set to NO only classes defined in header files are included. + +EXTRACT_LOCAL_CLASSES = YES + +# This flag is only useful for Objective-C code. When set to YES local +# methods, which are defined in the implementation section but not in +# the interface are included in the documentation. +# If set to NO (the default) only methods in the interface are included. + +EXTRACT_LOCAL_METHODS = NO + +# If this flag is set to YES, the members of anonymous namespaces will be +# extracted and appear in the documentation as a namespace called +# 'anonymous_namespace{file}', where file will be replaced with the base +# name of the file that contains the anonymous namespace. By default +# anonymous namespace are hidden. + +EXTRACT_ANON_NSPACES = YES + +# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all +# undocumented members of documented classes, files or namespaces. +# If set to NO (the default) these members will be included in the +# various overviews, but no documentation section is generated. +# This option has no effect if EXTRACT_ALL is enabled. + +HIDE_UNDOC_MEMBERS = NO + +# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all +# undocumented classes that are normally visible in the class hierarchy. +# If set to NO (the default) these classes will be included in the various +# overviews. This option has no effect if EXTRACT_ALL is enabled. + +HIDE_UNDOC_CLASSES = NO + +# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all +# friend (class|struct|union) declarations. +# If set to NO (the default) these declarations will be included in the +# documentation. + +HIDE_FRIEND_COMPOUNDS = NO + +# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any +# documentation blocks found inside the body of a function. +# If set to NO (the default) these blocks will be appended to the +# function's detailed documentation block. + +HIDE_IN_BODY_DOCS = NO + +# The INTERNAL_DOCS tag determines if documentation +# that is typed after a \internal command is included. If the tag is set +# to NO (the default) then the documentation will be excluded. +# Set it to YES to include the internal documentation. + +INTERNAL_DOCS = NO + +# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate +# file names in lower-case letters. If set to YES upper-case letters are also +# allowed. This is useful if you have classes or files whose names only differ +# in case and if your file system supports case sensitive file names. Windows +# and Mac users are advised to set this option to NO. + +CASE_SENSE_NAMES = YES + +# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen +# will show members with their full class and namespace scopes in the +# documentation. If set to YES the scope will be hidden. + +HIDE_SCOPE_NAMES = NO + +# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen +# will put a list of the files that are included by a file in the documentation +# of that file. + +SHOW_INCLUDE_FILES = YES + +# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] +# is inserted in the documentation for inline members. + +INLINE_INFO = YES + +# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen +# will sort the (detailed) documentation of file and class members +# alphabetically by member name. If set to NO the members will appear in +# declaration order. + +SORT_MEMBER_DOCS = YES + +# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the +# brief documentation of file, namespace and class members alphabetically +# by member name. If set to NO (the default) the members will appear in +# declaration order. + +SORT_BRIEF_DOCS = NO + +# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the +# hierarchy of group names into alphabetical order. If set to NO (the default) +# the group names will appear in their defined order. + +SORT_GROUP_NAMES = NO + +# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be +# sorted by fully-qualified names, including namespaces. If set to +# NO (the default), the class list will be sorted only by class name, +# not including the namespace part. +# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. +# Note: This option applies only to the class list, not to the +# alphabetical list. + +SORT_BY_SCOPE_NAME = NO + +# The GENERATE_TODOLIST tag can be used to enable (YES) or +# disable (NO) the todo list. This list is created by putting \todo +# commands in the documentation. + +GENERATE_TODOLIST = YES + +# The GENERATE_TESTLIST tag can be used to enable (YES) or +# disable (NO) the test list. This list is created by putting \test +# commands in the documentation. + +GENERATE_TESTLIST = YES + +# The GENERATE_BUGLIST tag can be used to enable (YES) or +# disable (NO) the bug list. This list is created by putting \bug +# commands in the documentation. + +GENERATE_BUGLIST = YES + +# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or +# disable (NO) the deprecated list. This list is created by putting +# \deprecated commands in the documentation. + +GENERATE_DEPRECATEDLIST= YES + +# The ENABLED_SECTIONS tag can be used to enable conditional +# documentation sections, marked by \if sectionname ... \endif. + +ENABLED_SECTIONS = + +# The MAX_INITIALIZER_LINES tag determines the maximum number of lines +# the initial value of a variable or define consists of for it to appear in +# the documentation. If the initializer consists of more lines than specified +# here it will be hidden. Use a value of 0 to hide initializers completely. +# The appearance of the initializer of individual variables and defines in the +# documentation can be controlled using \showinitializer or \hideinitializer +# command in the documentation regardless of this setting. + +MAX_INITIALIZER_LINES = 30 + +# Set the SHOW_USED_FILES tag to NO to disable the list of files generated +# at the bottom of the documentation of classes and structs. If set to YES the +# list will mention the files that were used to generate the documentation. + +SHOW_USED_FILES = YES + +# If the sources in your project are distributed over multiple directories +# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy +# in the documentation. The default is NO. + +SHOW_DIRECTORIES = YES + +# Set the SHOW_FILES tag to NO to disable the generation of the Files page. +# This will remove the Files entry from the Quick Index and from the +# Folder Tree View (if specified). The default is YES. + +SHOW_FILES = YES + +# Set the SHOW_NAMESPACES tag to NO to disable the generation of the +# Namespaces page. +# This will remove the Namespaces entry from the Quick Index +# and from the Folder Tree View (if specified). The default is YES. + +SHOW_NAMESPACES = YES + +# The FILE_VERSION_FILTER tag can be used to specify a program or script that +# doxygen should invoke to get the current version for each file (typically from +# the version control system). Doxygen will invoke the program by executing (via +# popen()) the command <command> <input-file>, where <command> is the value of +# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file +# provided by doxygen. Whatever the program writes to standard output +# is used as the file version. See the manual for examples. + +FILE_VERSION_FILTER = + +# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed by +# doxygen. The layout file controls the global structure of the generated output files +# in an output format independent way. The create the layout file that represents +# doxygen's defaults, run doxygen with the -l option. You can optionally specify a +# file name after the option, if omitted DoxygenLayout.xml will be used as the name +# of the layout file. + +LAYOUT_FILE = + +#--------------------------------------------------------------------------- +# configuration options related to warning and progress messages +#--------------------------------------------------------------------------- + +# The QUIET tag can be used to turn on/off the messages that are generated +# by doxygen. Possible values are YES and NO. If left blank NO is used. + +QUIET = NO + +# The WARNINGS tag can be used to turn on/off the warning messages that are +# generated by doxygen. Possible values are YES and NO. If left blank +# NO is used. + +WARNINGS = YES + +# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings +# for undocumented members. If EXTRACT_ALL is set to YES then this flag will +# automatically be disabled. + +WARN_IF_UNDOCUMENTED = YES + +# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for +# potential errors in the documentation, such as not documenting some +# parameters in a documented function, or documenting parameters that +# don't exist or using markup commands wrongly. + +WARN_IF_DOC_ERROR = YES + +# This WARN_NO_PARAMDOC option can be abled to get warnings for +# functions that are documented, but have no documentation for their parameters +# or return value. If set to NO (the default) doxygen will only warn about +# wrong or incomplete parameter documentation, but not about the absence of +# documentation. + +WARN_NO_PARAMDOC = NO + +# The WARN_FORMAT tag determines the format of the warning messages that +# doxygen can produce. The string should contain the $file, $line, and $text +# tags, which will be replaced by the file and line number from which the +# warning originated and the warning text. Optionally the format may contain +# $version, which will be replaced by the version of the file (if it could +# be obtained via FILE_VERSION_FILTER) + +WARN_FORMAT = "$file:$line: $text" + +# The WARN_LOGFILE tag can be used to specify a file to which warning +# and error messages should be written. If left blank the output is written +# to stderr. + +WARN_LOGFILE = ./doxwarnlog + +#--------------------------------------------------------------------------- +# configuration options related to the input files +#--------------------------------------------------------------------------- + +# The INPUT tag can be used to specify the files and/or directories that contain +# documented source files. You may enter file names like "myfile.cpp" or +# directories like "/usr/src/myproject". Separate the files or directories +# with spaces. + +INPUT = ./pvsClient.h ./pvsClient.cpp ./pvs.h ./pvs.cpp ./pvsDaemon.h ./pvsDaemon.cpp ./src + +# This tag can be used to specify the character encoding of the source files +# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is +# also the default input encoding. Doxygen uses libiconv (or the iconv built +# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for +# the list of possible encodings. + +INPUT_ENCODING = UTF-8 + +# If the value of the INPUT tag contains directories, you can use the +# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp +# and *.h) to filter out the source-files in the directories. If left +# blank the following patterns are tested: +# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx +# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90 + +FILE_PATTERNS = + +# The RECURSIVE tag can be used to turn specify whether or not subdirectories +# should be searched for input files as well. Possible values are YES and NO. +# If left blank NO is used. + +RECURSIVE = YES + +# The EXCLUDE tag can be used to specify files and/or directories that should +# excluded from the INPUT source files. This way you can easily exclude a +# subdirectory from a directory tree whose root is specified with the INPUT tag. + +EXCLUDE = ./tests + +# The EXCLUDE_SYMLINKS tag can be used select whether or not files or +# directories that are symbolic links (a Unix filesystem feature) are excluded +# from the input. + +EXCLUDE_SYMLINKS = NO + +# If the value of the INPUT tag contains directories, you can use the +# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude +# certain files from those directories. Note that the wildcards are matched +# against the file with absolute path, so to exclude all test directories +# for example use the pattern */test/* + +EXCLUDE_PATTERNS = + +# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names +# (namespaces, classes, functions, etc.) that should be excluded from the +# output. The symbol name can be a fully qualified name, a word, or if the +# wildcard * is used, a substring. Examples: ANamespace, AClass, +# AClass::ANamespace, ANamespace::*Test + +EXCLUDE_SYMBOLS = + +# The EXAMPLE_PATH tag can be used to specify one or more files or +# directories that contain example code fragments that are included (see +# the \include command). + +EXAMPLE_PATH = + +# If the value of the EXAMPLE_PATH tag contains directories, you can use the +# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp +# and *.h) to filter out the source-files in the directories. If left +# blank all files are included. + +EXAMPLE_PATTERNS = + +# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be +# searched for input files to be used with the \include or \dontinclude +# commands irrespective of the value of the RECURSIVE tag. +# Possible values are YES and NO. If left blank NO is used. + +EXAMPLE_RECURSIVE = NO + +# The IMAGE_PATH tag can be used to specify one or more files or +# directories that contain image that are included in the documentation (see +# the \image command). + +IMAGE_PATH = ./documentation/images + +# The INPUT_FILTER tag can be used to specify a program that doxygen should +# invoke to filter for each input file. Doxygen will invoke the filter program +# by executing (via popen()) the command <filter> <input-file>, where <filter> +# is the value of the INPUT_FILTER tag, and <input-file> is the name of an +# input file. Doxygen will then use the output that the filter program writes +# to standard output. +# If FILTER_PATTERNS is specified, this tag will be +# ignored. + +INPUT_FILTER = + +# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern +# basis. +# Doxygen will compare the file name with each pattern and apply the +# filter if there is a match. +# The filters are a list of the form: +# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further +# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER +# is applied to all files. + +FILTER_PATTERNS = + +# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using +# INPUT_FILTER) will be used to filter the input files when producing source +# files to browse (i.e. when SOURCE_BROWSER is set to YES). + +FILTER_SOURCE_FILES = NO + +#--------------------------------------------------------------------------- +# configuration options related to source browsing +#--------------------------------------------------------------------------- + +# If the SOURCE_BROWSER tag is set to YES then a list of source files will +# be generated. Documented entities will be cross-referenced with these sources. +# Note: To get rid of all source code in the generated output, make sure also +# VERBATIM_HEADERS is set to NO. + +SOURCE_BROWSER = YES + +# Setting the INLINE_SOURCES tag to YES will include the body +# of functions and classes directly in the documentation. + +INLINE_SOURCES = NO + +# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct +# doxygen to hide any special comment blocks from generated source code +# fragments. Normal C and C++ comments will always remain visible. + +STRIP_CODE_COMMENTS = YES + +# If the REFERENCED_BY_RELATION tag is set to YES +# then for each documented function all documented +# functions referencing it will be listed. + +REFERENCED_BY_RELATION = NO + +# If the REFERENCES_RELATION tag is set to YES +# then for each documented function all documented entities +# called/used by that function will be listed. + +REFERENCES_RELATION = NO + +# If the REFERENCES_LINK_SOURCE tag is set to YES (the default) +# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from +# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will +# link to the source code. +# Otherwise they will link to the documentation. + +REFERENCES_LINK_SOURCE = YES + +# If the USE_HTAGS tag is set to YES then the references to source code +# will point to the HTML generated by the htags(1) tool instead of doxygen +# built-in source browser. The htags tool is part of GNU's global source +# tagging system (see http://www.gnu.org/software/global/global.html). You +# will need version 4.8.6 or higher. + +USE_HTAGS = NO + +# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen +# will generate a verbatim copy of the header file for each class for +# which an include is specified. Set to NO to disable this. + +VERBATIM_HEADERS = YES + +#--------------------------------------------------------------------------- +# configuration options related to the alphabetical class index +#--------------------------------------------------------------------------- + +# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index +# of all compounds will be generated. Enable this if the project +# contains a lot of classes, structs, unions or interfaces. + +ALPHABETICAL_INDEX = NO + +# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then +# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns +# in which this list will be split (can be a number in the range [1..20]) + +COLS_IN_ALPHA_INDEX = 5 + +# In case all classes in a project start with a common prefix, all +# classes will be put under the same header in the alphabetical index. +# The IGNORE_PREFIX tag can be used to specify one or more prefixes that +# should be ignored while generating the index headers. + +IGNORE_PREFIX = + +#--------------------------------------------------------------------------- +# configuration options related to the HTML output +#--------------------------------------------------------------------------- + +# If the GENERATE_HTML tag is set to YES (the default) Doxygen will +# generate HTML output. + +GENERATE_HTML = YES + +# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `html' will be used as the default path. + +HTML_OUTPUT = html + +# The HTML_FILE_EXTENSION tag can be used to specify the file extension for +# each generated HTML page (for example: .htm,.php,.asp). If it is left blank +# doxygen will generate files with .html extension. + +HTML_FILE_EXTENSION = .html + +# The HTML_HEADER tag can be used to specify a personal HTML header for +# each generated HTML page. If it is left blank doxygen will generate a +# standard header. + +HTML_HEADER = + +# The HTML_FOOTER tag can be used to specify a personal HTML footer for +# each generated HTML page. If it is left blank doxygen will generate a +# standard footer. + +HTML_FOOTER = + +# The HTML_STYLESHEET tag can be used to specify a user-defined cascading +# style sheet that is used by each HTML page. It can be used to +# fine-tune the look of the HTML output. If the tag is left blank doxygen +# will generate a default style sheet. Note that doxygen will try to copy +# the style sheet file to the HTML output directory, so don't put your own +# stylesheet in the HTML output directory as well, or it will be erased! + +HTML_STYLESHEET = + +# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, +# files or namespaces will be aligned in HTML using tables. If set to +# NO a bullet list will be used. + +HTML_ALIGN_MEMBERS = YES + +# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML +# documentation will contain sections that can be hidden and shown after the +# page has loaded. For this to work a browser that supports +# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox +# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari). + +HTML_DYNAMIC_SECTIONS = NO + +# If the GENERATE_DOCSET tag is set to YES, additional index files +# will be generated that can be used as input for Apple's Xcode 3 +# integrated development environment, introduced with OSX 10.5 (Leopard). +# To create a documentation set, doxygen will generate a Makefile in the +# HTML output directory. Running make will produce the docset in that +# directory and running "make install" will install the docset in +# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find +# it at startup. +# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html for more information. + +GENERATE_DOCSET = NO + +# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the +# feed. A documentation feed provides an umbrella under which multiple +# documentation sets from a single provider (such as a company or product suite) +# can be grouped. + +DOCSET_FEEDNAME = "Doxygen generated docs" + +# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that +# should uniquely identify the documentation set bundle. This should be a +# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen +# will append .docset to the name. + +DOCSET_BUNDLE_ID = org.doxygen.Project + +# If the GENERATE_HTMLHELP tag is set to YES, additional index files +# will be generated that can be used as input for tools like the +# Microsoft HTML help workshop to generate a compiled HTML help file (.chm) +# of the generated HTML documentation. + +GENERATE_HTMLHELP = NO + +# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can +# be used to specify the file name of the resulting .chm file. You +# can add a path in front of the file if the result should not be +# written to the html output directory. + +CHM_FILE = + +# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can +# be used to specify the location (absolute path including file name) of +# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run +# the HTML help compiler on the generated index.hhp. + +HHC_LOCATION = + +# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag +# controls if a separate .chi index file is generated (YES) or that +# it should be included in the master .chm file (NO). + +GENERATE_CHI = NO + +# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING +# is used to encode HtmlHelp index (hhk), content (hhc) and project file +# content. + +CHM_INDEX_ENCODING = + +# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag +# controls whether a binary table of contents is generated (YES) or a +# normal table of contents (NO) in the .chm file. + +BINARY_TOC = NO + +# The TOC_EXPAND flag can be set to YES to add extra items for group members +# to the contents of the HTML help documentation and to the tree view. + +TOC_EXPAND = NO + +# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and QHP_VIRTUAL_FOLDER +# are set, an additional index file will be generated that can be used as input for +# Qt's qhelpgenerator to generate a Qt Compressed Help (.qch) of the generated +# HTML documentation. + +GENERATE_QHP = NO + +# If the QHG_LOCATION tag is specified, the QCH_FILE tag can +# be used to specify the file name of the resulting .qch file. +# The path specified is relative to the HTML output folder. + +QCH_FILE = + +# The QHP_NAMESPACE tag specifies the namespace to use when generating +# Qt Help Project output. For more information please see +# http://doc.trolltech.com/qthelpproject.html#namespace + +QHP_NAMESPACE = + +# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating +# Qt Help Project output. For more information please see +# http://doc.trolltech.com/qthelpproject.html#virtual-folders + +QHP_VIRTUAL_FOLDER = doc + +# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to add. +# For more information please see +# http://doc.trolltech.com/qthelpproject.html#custom-filters + +QHP_CUST_FILTER_NAME = + +# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the custom filter to add.For more information please see +# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">Qt Help Project / Custom Filters</a>. + +QHP_CUST_FILTER_ATTRS = + +# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this project's +# filter section matches. +# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes">Qt Help Project / Filter Attributes</a>. + +QHP_SECT_FILTER_ATTRS = + +# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can +# be used to specify the location of Qt's qhelpgenerator. +# If non-empty doxygen will try to run qhelpgenerator on the generated +# .qhp file. + +QHG_LOCATION = + +# The DISABLE_INDEX tag can be used to turn on/off the condensed index at +# top of each HTML page. The value NO (the default) enables the index and +# the value YES disables it. + +DISABLE_INDEX = NO + +# This tag can be used to set the number of enum values (range [1..20]) +# that doxygen will group on one line in the generated HTML documentation. + +ENUM_VALUES_PER_LINE = 4 + +# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index +# structure should be generated to display hierarchical information. +# If the tag value is set to FRAME, a side panel will be generated +# containing a tree-like index structure (just like the one that +# is generated for HTML Help). For this to work a browser that supports +# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, +# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are +# probably better off using the HTML help feature. Other possible values +# for this tag are: HIERARCHIES, which will generate the Groups, Directories, +# and Class Hierarchy pages using a tree view instead of an ordered list; +# ALL, which combines the behavior of FRAME and HIERARCHIES; and NONE, which +# disables this behavior completely. For backwards compatibility with previous +# releases of Doxygen, the values YES and NO are equivalent to FRAME and NONE +# respectively. + +GENERATE_TREEVIEW = YES + +# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be +# used to set the initial width (in pixels) of the frame in which the tree +# is shown. + +TREEVIEW_WIDTH = 250 + +# Use this tag to change the font size of Latex formulas included +# as images in the HTML documentation. The default is 10. Note that +# when you change the font size after a successful doxygen run you need +# to manually remove any form_*.png images from the HTML output directory +# to force them to be regenerated. + +FORMULA_FONTSIZE = 10 + +#--------------------------------------------------------------------------- +# configuration options related to the LaTeX output +#--------------------------------------------------------------------------- + +# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will +# generate Latex output. + +GENERATE_LATEX = NO + +# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `latex' will be used as the default path. + +LATEX_OUTPUT = latex + +# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be +# invoked. If left blank `latex' will be used as the default command name. + +LATEX_CMD_NAME = latex + +# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to +# generate index for LaTeX. If left blank `makeindex' will be used as the +# default command name. + +MAKEINDEX_CMD_NAME = makeindex + +# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact +# LaTeX documents. This may be useful for small projects and may help to +# save some trees in general. + +COMPACT_LATEX = NO + +# The PAPER_TYPE tag can be used to set the paper type that is used +# by the printer. Possible values are: a4, a4wide, letter, legal and +# executive. If left blank a4wide will be used. + +PAPER_TYPE = a4wide + +# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX +# packages that should be included in the LaTeX output. + +EXTRA_PACKAGES = + +# The LATEX_HEADER tag can be used to specify a personal LaTeX header for +# the generated latex document. The header should contain everything until +# the first chapter. If it is left blank doxygen will generate a +# standard header. Notice: only use this tag if you know what you are doing! + +LATEX_HEADER = + +# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated +# is prepared for conversion to pdf (using ps2pdf). The pdf file will +# contain links (just like the HTML output) instead of page references +# This makes the output suitable for online browsing using a pdf viewer. + +PDF_HYPERLINKS = YES + +# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of +# plain latex in the generated Makefile. Set this option to YES to get a +# higher quality PDF documentation. + +USE_PDFLATEX = YES + +# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. +# command to the generated LaTeX files. This will instruct LaTeX to keep +# running if errors occur, instead of asking the user for help. +# This option is also used when generating formulas in HTML. + +LATEX_BATCHMODE = NO + +# If LATEX_HIDE_INDICES is set to YES then doxygen will not +# include the index chapters (such as File Index, Compound Index, etc.) +# in the output. + +LATEX_HIDE_INDICES = NO + +#--------------------------------------------------------------------------- +# configuration options related to the RTF output +#--------------------------------------------------------------------------- + +# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output +# The RTF output is optimized for Word 97 and may not look very pretty with +# other RTF readers or editors. + +GENERATE_RTF = NO + +# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `rtf' will be used as the default path. + +RTF_OUTPUT = rtf + +# If the COMPACT_RTF tag is set to YES Doxygen generates more compact +# RTF documents. This may be useful for small projects and may help to +# save some trees in general. + +COMPACT_RTF = NO + +# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated +# will contain hyperlink fields. The RTF file will +# contain links (just like the HTML output) instead of page references. +# This makes the output suitable for online browsing using WORD or other +# programs which support those fields. +# Note: wordpad (write) and others do not support links. + +RTF_HYPERLINKS = NO + +# Load stylesheet definitions from file. Syntax is similar to doxygen's +# config file, i.e. a series of assignments. You only have to provide +# replacements, missing definitions are set to their default value. + +RTF_STYLESHEET_FILE = + +# Set optional variables used in the generation of an rtf document. +# Syntax is similar to doxygen's config file. + +RTF_EXTENSIONS_FILE = + +#--------------------------------------------------------------------------- +# configuration options related to the man page output +#--------------------------------------------------------------------------- + +# If the GENERATE_MAN tag is set to YES (the default) Doxygen will +# generate man pages + +GENERATE_MAN = NO + +# The MAN_OUTPUT tag is used to specify where the man pages will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `man' will be used as the default path. + +MAN_OUTPUT = man + +# The MAN_EXTENSION tag determines the extension that is added to +# the generated man pages (default is the subroutine's section .3) + +MAN_EXTENSION = .3 + +# If the MAN_LINKS tag is set to YES and Doxygen generates man output, +# then it will generate one additional man file for each entity +# documented in the real man page(s). These additional files +# only source the real man page, but without them the man command +# would be unable to find the correct page. The default is NO. + +MAN_LINKS = NO + +#--------------------------------------------------------------------------- +# configuration options related to the XML output +#--------------------------------------------------------------------------- + +# If the GENERATE_XML tag is set to YES Doxygen will +# generate an XML file that captures the structure of +# the code including all documentation. + +GENERATE_XML = NO + +# The XML_OUTPUT tag is used to specify where the XML pages will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be +# put in front of it. If left blank `xml' will be used as the default path. + +XML_OUTPUT = xml + +# The XML_SCHEMA tag can be used to specify an XML schema, +# which can be used by a validating XML parser to check the +# syntax of the XML files. + +XML_SCHEMA = + +# The XML_DTD tag can be used to specify an XML DTD, +# which can be used by a validating XML parser to check the +# syntax of the XML files. + +XML_DTD = + +# If the XML_PROGRAMLISTING tag is set to YES Doxygen will +# dump the program listings (including syntax highlighting +# and cross-referencing information) to the XML output. Note that +# enabling this will significantly increase the size of the XML output. + +XML_PROGRAMLISTING = YES + +#--------------------------------------------------------------------------- +# configuration options for the AutoGen Definitions output +#--------------------------------------------------------------------------- + +# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will +# generate an AutoGen Definitions (see autogen.sf.net) file +# that captures the structure of the code including all +# documentation. Note that this feature is still experimental +# and incomplete at the moment. + +GENERATE_AUTOGEN_DEF = NO + +#--------------------------------------------------------------------------- +# configuration options related to the Perl module output +#--------------------------------------------------------------------------- + +# If the GENERATE_PERLMOD tag is set to YES Doxygen will +# generate a Perl module file that captures the structure of +# the code including all documentation. Note that this +# feature is still experimental and incomplete at the +# moment. + +GENERATE_PERLMOD = NO + +# If the PERLMOD_LATEX tag is set to YES Doxygen will generate +# the necessary Makefile rules, Perl scripts and LaTeX code to be able +# to generate PDF and DVI output from the Perl module output. + +PERLMOD_LATEX = NO + +# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be +# nicely formatted so it can be parsed by a human reader. +# This is useful +# if you want to understand what is going on. +# On the other hand, if this +# tag is set to NO the size of the Perl module output will be much smaller +# and Perl will parse it just the same. + +PERLMOD_PRETTY = YES + +# The names of the make variables in the generated doxyrules.make file +# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. +# This is useful so different doxyrules.make files included by the same +# Makefile don't overwrite each other's variables. + +PERLMOD_MAKEVAR_PREFIX = + +#--------------------------------------------------------------------------- +# Configuration options related to the preprocessor +#--------------------------------------------------------------------------- + +# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will +# evaluate all C-preprocessor directives found in the sources and include +# files. + +ENABLE_PREPROCESSING = YES + +# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro +# names in the source code. If set to NO (the default) only conditional +# compilation will be performed. Macro expansion can be done in a controlled +# way by setting EXPAND_ONLY_PREDEF to YES. + +MACRO_EXPANSION = NO + +# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES +# then the macro expansion is limited to the macros specified with the +# PREDEFINED and EXPAND_AS_DEFINED tags. + +EXPAND_ONLY_PREDEF = NO + +# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files +# in the INCLUDE_PATH (see below) will be search if a #include is found. + +SEARCH_INCLUDES = YES + +# The INCLUDE_PATH tag can be used to specify one or more directories that +# contain include files that are not input files but should be processed by +# the preprocessor. + +INCLUDE_PATH = + +# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard +# patterns (like *.h and *.hpp) to filter out the header-files in the +# directories. If left blank, the patterns specified with FILE_PATTERNS will +# be used. + +INCLUDE_FILE_PATTERNS = + +# The PREDEFINED tag can be used to specify one or more macro names that +# are defined before the preprocessor is started (similar to the -D option of +# gcc). The argument of the tag is a list of macros of the form: name +# or name=definition (no spaces). If the definition and the = are +# omitted =1 is assumed. To prevent a macro definition from being +# undefined via #undef or recursively expanded use the := operator +# instead of the = operator. + +PREDEFINED = + +# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then +# this tag can be used to specify a list of macro names that should be expanded. +# The macro definition that is found in the sources will be used. +# Use the PREDEFINED tag if you want to use a different macro definition. + +EXPAND_AS_DEFINED = + +# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then +# doxygen's preprocessor will remove all function-like macros that are alone +# on a line, have an all uppercase name, and do not end with a semicolon. Such +# function macros are typically used for boiler-plate code, and will confuse +# the parser if not removed. + +SKIP_FUNCTION_MACROS = YES + +#--------------------------------------------------------------------------- +# Configuration::additions related to external references +#--------------------------------------------------------------------------- + +# The TAGFILES option can be used to specify one or more tagfiles. +# Optionally an initial location of the external documentation +# can be added for each tagfile. The format of a tag file without +# this location is as follows: +# +# TAGFILES = file1 file2 ... +# Adding location for the tag files is done as follows: +# +# TAGFILES = file1=loc1 "file2 = loc2" ... +# where "loc1" and "loc2" can be relative or absolute paths or +# URLs. If a location is present for each tag, the installdox tool +# does not have to be run to correct the links. +# Note that each tag file must have a unique name +# (where the name does NOT include the path) +# If a tag file is not located in the directory in which doxygen +# is run, you must also specify the path to the tagfile here. + +TAGFILES = + +# When a file name is specified after GENERATE_TAGFILE, doxygen will create +# a tag file that is based on the input files it reads. + +GENERATE_TAGFILE = + +# If the ALLEXTERNALS tag is set to YES all external classes will be listed +# in the class index. If set to NO only the inherited external classes +# will be listed. + +ALLEXTERNALS = NO + +# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed +# in the modules index. If set to NO, only the current project's groups will +# be listed. + +EXTERNAL_GROUPS = YES + +# The PERL_PATH should be the absolute path and name of the perl script +# interpreter (i.e. the result of `which perl'). + +PERL_PATH = /usr/bin/perl + +#--------------------------------------------------------------------------- +# Configuration options related to the dot tool +#--------------------------------------------------------------------------- + +# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will +# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base +# or super classes. Setting the tag to NO turns the diagrams off. Note that +# this option is superseded by the HAVE_DOT option below. This is only a +# fallback. It is recommended to install and use dot, since it yields more +# powerful graphs. + +CLASS_DIAGRAMS = YES + +# You can define message sequence charts within doxygen comments using the \msc +# command. Doxygen will then run the mscgen tool (see +# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the +# documentation. The MSCGEN_PATH tag allows you to specify the directory where +# the mscgen tool resides. If left empty the tool is assumed to be found in the +# default search path. + +MSCGEN_PATH = + +# If set to YES, the inheritance and collaboration graphs will hide +# inheritance and usage relations if the target is undocumented +# or is not a class. + +HIDE_UNDOC_RELATIONS = YES + +# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is +# available from the path. This tool is part of Graphviz, a graph visualization +# toolkit from AT&T and Lucent Bell Labs. The other options in this section +# have no effect if this option is set to NO (the default) + +HAVE_DOT = NO + +# By default doxygen will write a font called FreeSans.ttf to the output +# directory and reference it in all dot files that doxygen generates. This +# font does not include all possible unicode characters however, so when you need +# these (or just want a differently looking font) you can specify the font name +# using DOT_FONTNAME. You need need to make sure dot is able to find the font, +# which can be done by putting it in a standard location or by setting the +# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory +# containing the font. + +DOT_FONTNAME = FreeSans + +# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs. +# The default size is 10pt. + +DOT_FONTSIZE = 10 + +# By default doxygen will tell dot to use the output directory to look for the +# FreeSans.ttf font (which doxygen will put there itself). If you specify a +# different font using DOT_FONTNAME you can set the path where dot +# can find it using this tag. + +DOT_FONTPATH = + +# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for each documented class showing the direct and +# indirect inheritance relations. Setting this tag to YES will force the +# the CLASS_DIAGRAMS tag to NO. + +CLASS_GRAPH = YES + +# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for each documented class showing the direct and +# indirect implementation dependencies (inheritance, containment, and +# class references variables) of the class with other documented classes. + +COLLABORATION_GRAPH = YES + +# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen +# will generate a graph for groups, showing the direct groups dependencies + +GROUP_GRAPHS = YES + +# If the UML_LOOK tag is set to YES doxygen will generate inheritance and +# collaboration diagrams in a style similar to the OMG's Unified Modeling +# Language. + +UML_LOOK = NO + +# If set to YES, the inheritance and collaboration graphs will show the +# relations between templates and their instances. + +TEMPLATE_RELATIONS = NO + +# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT +# tags are set to YES then doxygen will generate a graph for each documented +# file showing the direct and indirect include dependencies of the file with +# other documented files. + +INCLUDE_GRAPH = YES + +# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and +# HAVE_DOT tags are set to YES then doxygen will generate a graph for each +# documented header file showing the documented files that directly or +# indirectly include this file. + +INCLUDED_BY_GRAPH = YES + +# If the CALL_GRAPH and HAVE_DOT options are set to YES then +# doxygen will generate a call dependency graph for every global function +# or class method. Note that enabling this option will significantly increase +# the time of a run. So in most cases it will be better to enable call graphs +# for selected functions only using the \callgraph command. + +CALL_GRAPH = NO + +# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then +# doxygen will generate a caller dependency graph for every global function +# or class method. Note that enabling this option will significantly increase +# the time of a run. So in most cases it will be better to enable caller +# graphs for selected functions only using the \callergraph command. + +CALLER_GRAPH = NO + +# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen +# will graphical hierarchy of all classes instead of a textual one. + +GRAPHICAL_HIERARCHY = YES + +# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES +# then doxygen will show the dependencies a directory has on other directories +# in a graphical way. The dependency relations are determined by the #include +# relations between the files in the directories. + +DIRECTORY_GRAPH = YES + +# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images +# generated by dot. Possible values are png, jpg, or gif +# If left blank png will be used. + +DOT_IMAGE_FORMAT = png + +# The tag DOT_PATH can be used to specify the path where the dot tool can be +# found. If left blank, it is assumed the dot tool can be found in the path. + +DOT_PATH = + +# The DOTFILE_DIRS tag can be used to specify one or more directories that +# contain dot files that are included in the documentation (see the +# \dotfile command). + +DOTFILE_DIRS = + +# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of +# nodes that will be shown in the graph. If the number of nodes in a graph +# becomes larger than this value, doxygen will truncate the graph, which is +# visualized by representing a node as a red box. Note that doxygen if the +# number of direct children of the root node in a graph is already larger than +# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note +# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH. + +DOT_GRAPH_MAX_NODES = 50 + +# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the +# graphs generated by dot. A depth value of 3 means that only nodes reachable +# from the root by following a path via at most 3 edges will be shown. Nodes +# that lay further from the root node will be omitted. Note that setting this +# option to 1 or 2 may greatly reduce the computation time needed for large +# code bases. Also note that the size of a graph can be further restricted by +# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction. + +MAX_DOT_GRAPH_DEPTH = 0 + +# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent +# background. This is disabled by default, because dot on Windows does not +# seem to support this out of the box. Warning: Depending on the platform used, +# enabling this option may lead to badly anti-aliased labels on the edges of +# a graph (i.e. they become hard to read). + +DOT_TRANSPARENT = YES + +# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output +# files in one run (i.e. multiple -o and -T options on the command line). This +# makes dot run faster, but since only newer versions of dot (>1.8.10) +# support this, this feature is disabled by default. + +DOT_MULTI_TARGETS = NO + +# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will +# generate a legend page explaining the meaning of the various boxes and +# arrows in the dot generated graphs. + +GENERATE_LEGEND = YES + +# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will +# remove the intermediate dot files that are used to generate +# the various graphs. + +DOT_CLEANUP = YES + +#--------------------------------------------------------------------------- +# Options related to the search engine +#--------------------------------------------------------------------------- + +# The SEARCHENGINE tag specifies whether or not a search engine should be +# used. If set to NO the values of all tags below this one will be ignored. + +SEARCHENGINE = NO diff --git a/format.sh b/format.sh new file mode 100755 index 0000000..d2a218f --- /dev/null +++ b/format.sh @@ -0,0 +1,14 @@ +#!/bin/bash + +echo "Do not use, it sucks..." +exit +# Note: As astyle seems to change the way of indenting things in detail in every release, +# it makes no sense to use this frequently, cause it would require everyone to use the +# same version of astyle, otherwise you get lots of modified files on every commit :( + +FILES=`find src/ -name \*.cpp && find src/ -name \*.h` + +# option -j would add { } to every if-statement, but not supported in <1.24 +for i in $FILES; do + astyle --style=ansi -A1 $i +done diff --git a/i18n/pvs_ar_JO.ts b/i18n/pvs_ar_JO.ts new file mode 100644 index 0000000..0b4c72f --- /dev/null +++ b/i18n/pvs_ar_JO.ts @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.0"> +<context> + <name>PVS</name> + <message> + <location filename="../src/pvs.cpp" line="259"/> + <source>Message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvs.cpp" line="352"/> + <source>VNC connection</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvs.cpp" line="352"/> + <source>The host </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvs.cpp" line="354"/> + <source> requested your screen!</source> + <translation type="unfinished"></translation> + </message> +</context> +</TS> diff --git a/i18n/pvs_de_DE.ts b/i18n/pvs_de_DE.ts new file mode 100644 index 0000000..0b4c72f --- /dev/null +++ b/i18n/pvs_de_DE.ts @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.0"> +<context> + <name>PVS</name> + <message> + <location filename="../src/pvs.cpp" line="259"/> + <source>Message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvs.cpp" line="352"/> + <source>VNC connection</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvs.cpp" line="352"/> + <source>The host </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvs.cpp" line="354"/> + <source> requested your screen!</source> + <translation type="unfinished"></translation> + </message> +</context> +</TS> diff --git a/i18n/pvs_es_MX.ts b/i18n/pvs_es_MX.ts new file mode 100644 index 0000000..0b4c72f --- /dev/null +++ b/i18n/pvs_es_MX.ts @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.0"> +<context> + <name>PVS</name> + <message> + <location filename="../src/pvs.cpp" line="259"/> + <source>Message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvs.cpp" line="352"/> + <source>VNC connection</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvs.cpp" line="352"/> + <source>The host </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvs.cpp" line="354"/> + <source> requested your screen!</source> + <translation type="unfinished"></translation> + </message> +</context> +</TS> diff --git a/i18n/pvs_fr_FR.ts b/i18n/pvs_fr_FR.ts new file mode 100644 index 0000000..0b4c72f --- /dev/null +++ b/i18n/pvs_fr_FR.ts @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.0"> +<context> + <name>PVS</name> + <message> + <location filename="../src/pvs.cpp" line="259"/> + <source>Message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvs.cpp" line="352"/> + <source>VNC connection</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvs.cpp" line="352"/> + <source>The host </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvs.cpp" line="354"/> + <source> requested your screen!</source> + <translation type="unfinished"></translation> + </message> +</context> +</TS> diff --git a/i18n/pvs_pl_PL.ts b/i18n/pvs_pl_PL.ts new file mode 100644 index 0000000..0b4c72f --- /dev/null +++ b/i18n/pvs_pl_PL.ts @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.0"> +<context> + <name>PVS</name> + <message> + <location filename="../src/pvs.cpp" line="259"/> + <source>Message</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvs.cpp" line="352"/> + <source>VNC connection</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvs.cpp" line="352"/> + <source>The host </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvs.cpp" line="354"/> + <source> requested your screen!</source> + <translation type="unfinished"></translation> + </message> +</context> +</TS> diff --git a/i18n/pvsgui_ar_JO.ts b/i18n/pvsgui_ar_JO.ts new file mode 100644 index 0000000..f3e6d65 --- /dev/null +++ b/i18n/pvsgui_ar_JO.ts @@ -0,0 +1,487 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.0"> +<context> + <name>AboutDialog</name> + <message> + <location filename="../src/gui/aboutDialog.cpp" line="27"/> + <source>Version: </source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>AboutDialogClass</name> + <message> + <location filename="../build/ui_aboutDialog.h" line="213"/> + <source>PVS - About</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_aboutDialog.h" line="215"/> + <source><a href="http://www.gnu.org/licenses/gpl-2.0.txt">License: GNU General Public License Version 2</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_aboutDialog.h" line="216"/> + <source>About</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_aboutDialog.h" line="218"/> + <source>Authors</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_aboutDialog.h" line="219"/> + <source>Translation</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>ClientChatDialog</name> + <message> + <location filename="../src/gui/clientChatDialog.cpp" line="65"/> + <source>&Send File...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/clientChatDialog.cpp" line="178"/> + <source> has joined the chat.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/clientChatDialog.cpp" line="184"/> + <source> has left the chat.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/clientChatDialog.cpp" line="211"/> + <source>PVS File Transfer</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/clientChatDialog.cpp" line="212"/> + <source>Send file '</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/clientChatDialog.cpp" line="212"/> + <source>' to </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/clientChatDialog.cpp" line="231"/> + <source>Connected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/clientChatDialog.cpp" line="241"/> + <source>Disconnected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/clientChatDialog.cpp" line="280"/> + <source>Message from <</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>ClientChatDialogClass</name> + <message> + <location filename="../build/ui_clientChatDialog.h" line="115"/> + <source>PVS - Chat </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientChatDialog.h" line="116"/> + <source>&Send</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>ClientConfigDialogClass</name> + <message> + <location filename="../build/ui_clientConfigDialog.h" line="200"/> + <source>PVS - Configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientConfigDialog.h" line="201"/> + <source>Allow vnc access to lecturer?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientConfigDialog.h" line="202"/> + <location filename="../build/ui_clientConfigDialog.h" line="206"/> + <source>Full access</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientConfigDialog.h" line="203"/> + <location filename="../build/ui_clientConfigDialog.h" line="207"/> + <source>View only</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientConfigDialog.h" line="204"/> + <location filename="../build/ui_clientConfigDialog.h" line="208"/> + <source>None</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientConfigDialog.h" line="205"/> + <source>Allow vnc access to other?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientConfigDialog.h" line="209"/> + <source>Accept chat messages</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientConfigDialog.h" line="210"/> + <source>Accept file transfers</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientConfigDialog.h" line="211"/> + <source>Permissions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientConfigDialog.h" line="214"/> + <source>Top Left</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientConfigDialog.h" line="215"/> + <source>Top Center</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientConfigDialog.h" line="216"/> + <source>Top Right</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientConfigDialog.h" line="217"/> + <source>Bottom Left</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientConfigDialog.h" line="218"/> + <source>Bottom Center</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientConfigDialog.h" line="219"/> + <source>Bottom Right</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientConfigDialog.h" line="221"/> + <source>Display</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>ClientFileReceiveDialog</name> + <message> + <location filename="../src/gui/clientFileReceiveDialog.cpp" line="63"/> + <source>PVS File Transfer</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/clientFileReceiveDialog.cpp" line="63"/> + <source>User '</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/clientFileReceiveDialog.cpp" line="64"/> + <source>' would like to send you a file: </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/clientFileReceiveDialog.cpp" line="75"/> + <source>Open File</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/clientFileReceiveDialog.cpp" line="150"/> + <location filename="../src/gui/clientFileReceiveDialog.cpp" line="156"/> + <source>PVS - File Transfer</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/clientFileReceiveDialog.cpp" line="151"/> + <source>File Transfer complete.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/clientFileReceiveDialog.cpp" line="157"/> + <source>File Transfer canceled!</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>ClientFileReceiveDialogClass</name> + <message> + <location filename="../build/ui_clientFileReceiveDialog.h" line="123"/> + <source>PVS - File Transfer</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientFileReceiveDialog.h" line="125"/> + <source>Receiving from:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientFileReceiveDialog.h" line="126"/> + <source>unknown</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientFileReceiveDialog.h" line="127"/> + <location filename="../build/ui_clientFileReceiveDialog.h" line="129"/> + <source>0</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientFileReceiveDialog.h" line="128"/> + <source>/</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientFileReceiveDialog.h" line="130"/> + <source>&Cancel</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>ClientFileSendDialog</name> + <message> + <location filename="../src/gui/clientFileSendDialog.cpp" line="68"/> + <source>Open File</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/clientFileSendDialog.cpp" line="186"/> + <location filename="../src/gui/clientFileSendDialog.cpp" line="192"/> + <source>PVS - File Transfer</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/clientFileSendDialog.cpp" line="187"/> + <source>File Transfer complete.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/clientFileSendDialog.cpp" line="193"/> + <source>File Transfer canceled!</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>ClientFileSendDialogClass</name> + <message> + <location filename="../build/ui_clientFileSendDialog.h" line="123"/> + <source>PVS - File Transfer</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientFileSendDialog.h" line="125"/> + <source>Sending to:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientFileSendDialog.h" line="126"/> + <source>unknown</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientFileSendDialog.h" line="127"/> + <location filename="../build/ui_clientFileSendDialog.h" line="129"/> + <source>0</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientFileSendDialog.h" line="128"/> + <source>/</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientFileSendDialog.h" line="130"/> + <source>&Cancel</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>ClientNicklistDialogClass</name> + <message> + <location filename="../build/ui_clientNicklistDialog.h" line="84"/> + <source>PVS - Users</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientNicklistDialog.h" line="85"/> + <source>Select user:</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>ClientToolbarClass</name> + <message> + <location filename="../build/ui_clientToolbar.h" line="179"/> + <source>Form</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientToolbar.h" line="181"/> + <source>Menu</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientToolbar.h" line="183"/> + <source>Host:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientToolbar.h" line="185"/> + <source>Click to connect</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientToolbar.h" line="187"/> + <source>-</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientToolbar.h" line="189"/> + <source>Enable/Disable VNC only for this session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientToolbar.h" line="191"/> + <source>Allow VNC</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientToolbar.h" line="192"/> + <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt; font-weight:600; font-style:italic; color:#0055ff;">Pool Video Switch</span></p></body></html></source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>InfoDialogClass</name> + <message> + <location filename="../build/ui_clientInfoDialog.h" line="64"/> + <source>PVS - Information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientInfoDialog.h" line="65"/> + <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:72pt; font-weight:600; color:#0000ff;">HOST</span></p></body></html></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientInfoDialog.h" line="70"/> + <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:48pt; font-weight:600; color:#ff0000;">PASSWD</span></p></body></html></source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>PVSGUI</name> + <message> + <location filename="../src/pvsgui.cpp" line="28"/> + <source>Connect</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsgui.cpp" line="189"/> + <source>&Disconnect</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsgui.cpp" line="190"/> + <source>C&hat</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsgui.cpp" line="191"/> + <source>&Send File</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsgui.cpp" line="192"/> + <source>&Config</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsgui.cpp" line="193"/> + <source>&Information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsgui.cpp" line="194"/> + <source>&About</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsgui.cpp" line="195"/> + <source>&Quit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsgui.cpp" line="282"/> + <location filename="../src/pvsgui.cpp" line="297"/> + <location filename="../src/pvsgui.cpp" line="377"/> + <source>PVS Connection</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsgui.cpp" line="282"/> + <source>Please enter password (If not needed leave blank):</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsgui.cpp" line="298"/> + <source>Are you sure you want to disconnect?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsgui.cpp" line="321"/> + <location filename="../src/pvsgui.cpp" line="343"/> + <source>PVS connection</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsgui.cpp" line="321"/> + <location filename="../src/pvsgui.cpp" line="335"/> + <source>Connected to </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsgui.cpp" line="343"/> + <location filename="../src/pvsgui.cpp" line="355"/> + <source>Disconnected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsgui.cpp" line="377"/> + <source>New host available: </source> + <translation type="unfinished"></translation> + </message> +</context> +</TS> diff --git a/i18n/pvsgui_de_DE.ts b/i18n/pvsgui_de_DE.ts new file mode 100644 index 0000000..9acab81 --- /dev/null +++ b/i18n/pvsgui_de_DE.ts @@ -0,0 +1,487 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.0" language="de_DE" sourcelanguage="en_US"> +<context> + <name>AboutDialog</name> + <message> + <location filename="../src/gui/aboutDialog.cpp" line="27"/> + <source>Version: </source> + <translation>Version:</translation> + </message> +</context> +<context> + <name>AboutDialogClass</name> + <message> + <location filename="../build/ui_aboutDialog.h" line="213"/> + <source>PVS - About</source> + <translation>PVS -Ãœber</translation> + </message> + <message> + <location filename="../build/ui_aboutDialog.h" line="215"/> + <source><a href="http://www.gnu.org/licenses/gpl-2.0.txt">License: GNU General Public License Version 2</a></source> + <translation></translation> + </message> + <message> + <location filename="../build/ui_aboutDialog.h" line="216"/> + <source>About</source> + <translation>Ãœber</translation> + </message> + <message> + <location filename="../build/ui_aboutDialog.h" line="218"/> + <source>Authors</source> + <translation>Autoren</translation> + </message> + <message> + <location filename="../build/ui_aboutDialog.h" line="219"/> + <source>Translation</source> + <translation>Ãœbersetzung</translation> + </message> +</context> +<context> + <name>ClientChatDialog</name> + <message> + <location filename="../src/gui/clientChatDialog.cpp" line="65"/> + <source>&Send File...</source> + <translation>Datei &Senden...</translation> + </message> + <message> + <location filename="../src/gui/clientChatDialog.cpp" line="178"/> + <source> has joined the chat.</source> + <translation> ist dem Chat beigetreten.</translation> + </message> + <message> + <location filename="../src/gui/clientChatDialog.cpp" line="184"/> + <source> has left the chat.</source> + <translation> hat den Chat verlassen.</translation> + </message> + <message> + <location filename="../src/gui/clientChatDialog.cpp" line="211"/> + <source>PVS File Transfer</source> + <translation>PVS Dateiübertragung</translation> + </message> + <message> + <location filename="../src/gui/clientChatDialog.cpp" line="212"/> + <source>Send file '</source> + <translation>Datei senden '</translation> + </message> + <message> + <location filename="../src/gui/clientChatDialog.cpp" line="212"/> + <source>' to </source> + <translation>' an </translation> + </message> + <message> + <location filename="../src/gui/clientChatDialog.cpp" line="231"/> + <source>Connected.</source> + <translation>Verbunden.</translation> + </message> + <message> + <location filename="../src/gui/clientChatDialog.cpp" line="241"/> + <source>Disconnected.</source> + <translation>Getrennt.</translation> + </message> + <message> + <location filename="../src/gui/clientChatDialog.cpp" line="280"/> + <source>Message from <</source> + <translation>Nachricht von <</translation> + </message> +</context> +<context> + <name>ClientChatDialogClass</name> + <message> + <location filename="../build/ui_clientChatDialog.h" line="115"/> + <source>PVS - Chat </source> + <translation>PVS - Chat</translation> + </message> + <message> + <location filename="../build/ui_clientChatDialog.h" line="116"/> + <source>&Send</source> + <translation>&Senden</translation> + </message> +</context> +<context> + <name>ClientConfigDialogClass</name> + <message> + <location filename="../build/ui_clientConfigDialog.h" line="200"/> + <source>PVS - Configuration</source> + <translation>PVS - Konfiguration</translation> + </message> + <message> + <location filename="../build/ui_clientConfigDialog.h" line="201"/> + <source>Allow vnc access to lecturer?</source> + <translation>Dozenten VNC Zugriff erlauben?</translation> + </message> + <message> + <location filename="../build/ui_clientConfigDialog.h" line="202"/> + <location filename="../build/ui_clientConfigDialog.h" line="206"/> + <source>Full access</source> + <translation>Voller Zugriff</translation> + </message> + <message> + <location filename="../build/ui_clientConfigDialog.h" line="203"/> + <location filename="../build/ui_clientConfigDialog.h" line="207"/> + <source>View only</source> + <translation>Nur zuschauen</translation> + </message> + <message> + <location filename="../build/ui_clientConfigDialog.h" line="204"/> + <location filename="../build/ui_clientConfigDialog.h" line="208"/> + <source>None</source> + <translation>Kein</translation> + </message> + <message> + <location filename="../build/ui_clientConfigDialog.h" line="205"/> + <source>Allow vnc access to other?</source> + <translation>Anderen VNC Zugriff erlauben?</translation> + </message> + <message> + <location filename="../build/ui_clientConfigDialog.h" line="209"/> + <source>Accept chat messages</source> + <translation>Chat Nachrichten erlauben</translation> + </message> + <message> + <location filename="../build/ui_clientConfigDialog.h" line="210"/> + <source>Accept file transfers</source> + <translation>Dateiübertragung erlauben</translation> + </message> + <message> + <location filename="../build/ui_clientConfigDialog.h" line="211"/> + <source>Permissions</source> + <translation>Rechte</translation> + </message> + <message> + <location filename="../build/ui_clientConfigDialog.h" line="214"/> + <source>Top Left</source> + <translation>Oben Links</translation> + </message> + <message> + <location filename="../build/ui_clientConfigDialog.h" line="215"/> + <source>Top Center</source> + <translation>Oben Mitte</translation> + </message> + <message> + <location filename="../build/ui_clientConfigDialog.h" line="216"/> + <source>Top Right</source> + <translation>Oben Rechts</translation> + </message> + <message> + <location filename="../build/ui_clientConfigDialog.h" line="217"/> + <source>Bottom Left</source> + <translation>Unten Links</translation> + </message> + <message> + <location filename="../build/ui_clientConfigDialog.h" line="218"/> + <source>Bottom Center</source> + <translation>Unten Mitte</translation> + </message> + <message> + <location filename="../build/ui_clientConfigDialog.h" line="219"/> + <source>Bottom Right</source> + <translation>Unten Rechts</translation> + </message> + <message> + <location filename="../build/ui_clientConfigDialog.h" line="221"/> + <source>Display</source> + <translation>Anzeige</translation> + </message> +</context> +<context> + <name>ClientFileReceiveDialog</name> + <message> + <location filename="../src/gui/clientFileReceiveDialog.cpp" line="63"/> + <source>PVS File Transfer</source> + <translation>PVS Dateiübertragung</translation> + </message> + <message> + <location filename="../src/gui/clientFileReceiveDialog.cpp" line="63"/> + <source>User '</source> + <translation>Benutzer '</translation> + </message> + <message> + <location filename="../src/gui/clientFileReceiveDialog.cpp" line="64"/> + <source>' would like to send you a file: </source> + <translation>' möchte ihnen eine Datei senden:</translation> + </message> + <message> + <location filename="../src/gui/clientFileReceiveDialog.cpp" line="75"/> + <source>Open File</source> + <translation>Datei Öffnen</translation> + </message> + <message> + <location filename="../src/gui/clientFileReceiveDialog.cpp" line="150"/> + <location filename="../src/gui/clientFileReceiveDialog.cpp" line="156"/> + <source>PVS - File Transfer</source> + <translation>PVS - Dateiübertragung</translation> + </message> + <message> + <location filename="../src/gui/clientFileReceiveDialog.cpp" line="151"/> + <source>File Transfer complete.</source> + <translation>Dateiübertragung beendet.</translation> + </message> + <message> + <location filename="../src/gui/clientFileReceiveDialog.cpp" line="157"/> + <source>File Transfer canceled!</source> + <translation>Dateiübertragung abgebrochen!</translation> + </message> +</context> +<context> + <name>ClientFileReceiveDialogClass</name> + <message> + <location filename="../build/ui_clientFileReceiveDialog.h" line="123"/> + <source>PVS - File Transfer</source> + <translation>PVS - Dateiübertragung</translation> + </message> + <message> + <location filename="../build/ui_clientFileReceiveDialog.h" line="125"/> + <source>Receiving from:</source> + <translation>Empfang von:</translation> + </message> + <message> + <location filename="../build/ui_clientFileReceiveDialog.h" line="126"/> + <source>unknown</source> + <translation>unbekannt</translation> + </message> + <message> + <location filename="../build/ui_clientFileReceiveDialog.h" line="127"/> + <location filename="../build/ui_clientFileReceiveDialog.h" line="129"/> + <source>0</source> + <translation>0</translation> + </message> + <message> + <location filename="../build/ui_clientFileReceiveDialog.h" line="128"/> + <source>/</source> + <translation>/</translation> + </message> + <message> + <location filename="../build/ui_clientFileReceiveDialog.h" line="130"/> + <source>&Cancel</source> + <translation>&Abbruch</translation> + </message> +</context> +<context> + <name>ClientFileSendDialog</name> + <message> + <location filename="../src/gui/clientFileSendDialog.cpp" line="68"/> + <source>Open File</source> + <translation>Datei Öffnen</translation> + </message> + <message> + <location filename="../src/gui/clientFileSendDialog.cpp" line="186"/> + <location filename="../src/gui/clientFileSendDialog.cpp" line="192"/> + <source>PVS - File Transfer</source> + <translation>PBS -Dateiübertragung</translation> + </message> + <message> + <location filename="../src/gui/clientFileSendDialog.cpp" line="187"/> + <source>File Transfer complete.</source> + <translation>Dateiübertragung beendet.</translation> + </message> + <message> + <location filename="../src/gui/clientFileSendDialog.cpp" line="193"/> + <source>File Transfer canceled!</source> + <translation>Dateiübertragung abgebrochen!</translation> + </message> +</context> +<context> + <name>ClientFileSendDialogClass</name> + <message> + <location filename="../build/ui_clientFileSendDialog.h" line="123"/> + <source>PVS - File Transfer</source> + <translation>PVS - Dateiübertragung</translation> + </message> + <message> + <location filename="../build/ui_clientFileSendDialog.h" line="125"/> + <source>Sending to:</source> + <translation>Senden an:</translation> + </message> + <message> + <location filename="../build/ui_clientFileSendDialog.h" line="126"/> + <source>unknown</source> + <translation>unbekannt</translation> + </message> + <message> + <location filename="../build/ui_clientFileSendDialog.h" line="127"/> + <location filename="../build/ui_clientFileSendDialog.h" line="129"/> + <source>0</source> + <translation>0</translation> + </message> + <message> + <location filename="../build/ui_clientFileSendDialog.h" line="128"/> + <source>/</source> + <translation>/</translation> + </message> + <message> + <location filename="../build/ui_clientFileSendDialog.h" line="130"/> + <source>&Cancel</source> + <translation>&Abbruch</translation> + </message> +</context> +<context> + <name>ClientNicklistDialogClass</name> + <message> + <location filename="../build/ui_clientNicklistDialog.h" line="84"/> + <source>PVS - Users</source> + <translation>PVS - Benutzer</translation> + </message> + <message> + <location filename="../build/ui_clientNicklistDialog.h" line="85"/> + <source>Select user:</source> + <translation>Benutzer auswählen:</translation> + </message> +</context> +<context> + <name>ClientToolbarClass</name> + <message> + <location filename="../build/ui_clientToolbar.h" line="179"/> + <source>Form</source> + <translation></translation> + </message> + <message> + <location filename="../build/ui_clientToolbar.h" line="181"/> + <source>Menu</source> + <translation>Menü</translation> + </message> + <message> + <location filename="../build/ui_clientToolbar.h" line="183"/> + <source>Host:</source> + <translation></translation> + </message> + <message> + <location filename="../build/ui_clientToolbar.h" line="185"/> + <source>Click to connect</source> + <translation>Zum Verbinden Klicken</translation> + </message> + <message> + <location filename="../build/ui_clientToolbar.h" line="187"/> + <source>-</source> + <translation></translation> + </message> + <message> + <location filename="../build/ui_clientToolbar.h" line="189"/> + <source>Enable/Disable VNC only for this session</source> + <translation>VNC nur für diese Sitzung ein- und ausschalten</translation> + </message> + <message> + <location filename="../build/ui_clientToolbar.h" line="191"/> + <source>Allow VNC</source> + <translation>VNC erlauben</translation> + </message> + <message> + <location filename="../build/ui_clientToolbar.h" line="192"/> + <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt; font-weight:600; font-style:italic; color:#0055ff;">Pool Video Switch</span></p></body></html></source> + <translation></translation> + </message> +</context> +<context> + <name>InfoDialogClass</name> + <message> + <location filename="../build/ui_clientInfoDialog.h" line="64"/> + <source>PVS - Information</source> + <translation>PVS - Information</translation> + </message> + <message> + <location filename="../build/ui_clientInfoDialog.h" line="65"/> + <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:72pt; font-weight:600; color:#0000ff;">HOST</span></p></body></html></source> + <translation></translation> + </message> + <message> + <location filename="../build/ui_clientInfoDialog.h" line="70"/> + <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:48pt; font-weight:600; color:#ff0000;">PASSWD</span></p></body></html></source> + <translation></translation> + </message> +</context> +<context> + <name>PVSGUI</name> + <message> + <location filename="../src/pvsgui.cpp" line="28"/> + <source>Connect</source> + <translation>Verbinden</translation> + </message> + <message> + <location filename="../src/pvsgui.cpp" line="189"/> + <source>&Disconnect</source> + <translation>&Trennen</translation> + </message> + <message> + <location filename="../src/pvsgui.cpp" line="190"/> + <source>C&hat</source> + <translation></translation> + </message> + <message> + <location filename="../src/pvsgui.cpp" line="191"/> + <source>&Send File</source> + <translation>Datei &Senden</translation> + </message> + <message> + <location filename="../src/pvsgui.cpp" line="192"/> + <source>&Config</source> + <translation>&Konfiguration</translation> + </message> + <message> + <location filename="../src/pvsgui.cpp" line="193"/> + <source>&Information</source> + <translation>&Information</translation> + </message> + <message> + <location filename="../src/pvsgui.cpp" line="194"/> + <source>&About</source> + <translation>&Ãœber</translation> + </message> + <message> + <location filename="../src/pvsgui.cpp" line="195"/> + <source>&Quit</source> + <translation>&Beenden</translation> + </message> + <message> + <location filename="../src/pvsgui.cpp" line="282"/> + <location filename="../src/pvsgui.cpp" line="297"/> + <location filename="../src/pvsgui.cpp" line="377"/> + <source>PVS Connection</source> + <translation>PVS Verbindung</translation> + </message> + <message> + <location filename="../src/pvsgui.cpp" line="282"/> + <source>Please enter password (If not needed leave blank):</source> + <translation>Bitte geben sie ein Passwor ein (Falls nicht erforderlich einfach leer lassen):</translation> + </message> + <message> + <location filename="../src/pvsgui.cpp" line="298"/> + <source>Are you sure you want to disconnect?</source> + <translation>Sind sie sicher dass sie die Verbindung trennen möchten?</translation> + </message> + <message> + <location filename="../src/pvsgui.cpp" line="321"/> + <location filename="../src/pvsgui.cpp" line="343"/> + <source>PVS connection</source> + <translation>PVS Verbindung</translation> + </message> + <message> + <location filename="../src/pvsgui.cpp" line="321"/> + <location filename="../src/pvsgui.cpp" line="335"/> + <source>Connected to </source> + <translation>Verbunden mit </translation> + </message> + <message> + <location filename="../src/pvsgui.cpp" line="343"/> + <location filename="../src/pvsgui.cpp" line="355"/> + <source>Disconnected</source> + <translation>Getrennt</translation> + </message> + <message> + <location filename="../src/pvsgui.cpp" line="377"/> + <source>New host available: </source> + <translation>Neuer Host verfügbar: </translation> + </message> +</context> +</TS> diff --git a/i18n/pvsgui_es_MX.ts b/i18n/pvsgui_es_MX.ts new file mode 100644 index 0000000..f3e6d65 --- /dev/null +++ b/i18n/pvsgui_es_MX.ts @@ -0,0 +1,487 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.0"> +<context> + <name>AboutDialog</name> + <message> + <location filename="../src/gui/aboutDialog.cpp" line="27"/> + <source>Version: </source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>AboutDialogClass</name> + <message> + <location filename="../build/ui_aboutDialog.h" line="213"/> + <source>PVS - About</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_aboutDialog.h" line="215"/> + <source><a href="http://www.gnu.org/licenses/gpl-2.0.txt">License: GNU General Public License Version 2</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_aboutDialog.h" line="216"/> + <source>About</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_aboutDialog.h" line="218"/> + <source>Authors</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_aboutDialog.h" line="219"/> + <source>Translation</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>ClientChatDialog</name> + <message> + <location filename="../src/gui/clientChatDialog.cpp" line="65"/> + <source>&Send File...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/clientChatDialog.cpp" line="178"/> + <source> has joined the chat.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/clientChatDialog.cpp" line="184"/> + <source> has left the chat.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/clientChatDialog.cpp" line="211"/> + <source>PVS File Transfer</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/clientChatDialog.cpp" line="212"/> + <source>Send file '</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/clientChatDialog.cpp" line="212"/> + <source>' to </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/clientChatDialog.cpp" line="231"/> + <source>Connected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/clientChatDialog.cpp" line="241"/> + <source>Disconnected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/clientChatDialog.cpp" line="280"/> + <source>Message from <</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>ClientChatDialogClass</name> + <message> + <location filename="../build/ui_clientChatDialog.h" line="115"/> + <source>PVS - Chat </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientChatDialog.h" line="116"/> + <source>&Send</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>ClientConfigDialogClass</name> + <message> + <location filename="../build/ui_clientConfigDialog.h" line="200"/> + <source>PVS - Configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientConfigDialog.h" line="201"/> + <source>Allow vnc access to lecturer?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientConfigDialog.h" line="202"/> + <location filename="../build/ui_clientConfigDialog.h" line="206"/> + <source>Full access</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientConfigDialog.h" line="203"/> + <location filename="../build/ui_clientConfigDialog.h" line="207"/> + <source>View only</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientConfigDialog.h" line="204"/> + <location filename="../build/ui_clientConfigDialog.h" line="208"/> + <source>None</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientConfigDialog.h" line="205"/> + <source>Allow vnc access to other?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientConfigDialog.h" line="209"/> + <source>Accept chat messages</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientConfigDialog.h" line="210"/> + <source>Accept file transfers</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientConfigDialog.h" line="211"/> + <source>Permissions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientConfigDialog.h" line="214"/> + <source>Top Left</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientConfigDialog.h" line="215"/> + <source>Top Center</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientConfigDialog.h" line="216"/> + <source>Top Right</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientConfigDialog.h" line="217"/> + <source>Bottom Left</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientConfigDialog.h" line="218"/> + <source>Bottom Center</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientConfigDialog.h" line="219"/> + <source>Bottom Right</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientConfigDialog.h" line="221"/> + <source>Display</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>ClientFileReceiveDialog</name> + <message> + <location filename="../src/gui/clientFileReceiveDialog.cpp" line="63"/> + <source>PVS File Transfer</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/clientFileReceiveDialog.cpp" line="63"/> + <source>User '</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/clientFileReceiveDialog.cpp" line="64"/> + <source>' would like to send you a file: </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/clientFileReceiveDialog.cpp" line="75"/> + <source>Open File</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/clientFileReceiveDialog.cpp" line="150"/> + <location filename="../src/gui/clientFileReceiveDialog.cpp" line="156"/> + <source>PVS - File Transfer</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/clientFileReceiveDialog.cpp" line="151"/> + <source>File Transfer complete.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/clientFileReceiveDialog.cpp" line="157"/> + <source>File Transfer canceled!</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>ClientFileReceiveDialogClass</name> + <message> + <location filename="../build/ui_clientFileReceiveDialog.h" line="123"/> + <source>PVS - File Transfer</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientFileReceiveDialog.h" line="125"/> + <source>Receiving from:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientFileReceiveDialog.h" line="126"/> + <source>unknown</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientFileReceiveDialog.h" line="127"/> + <location filename="../build/ui_clientFileReceiveDialog.h" line="129"/> + <source>0</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientFileReceiveDialog.h" line="128"/> + <source>/</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientFileReceiveDialog.h" line="130"/> + <source>&Cancel</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>ClientFileSendDialog</name> + <message> + <location filename="../src/gui/clientFileSendDialog.cpp" line="68"/> + <source>Open File</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/clientFileSendDialog.cpp" line="186"/> + <location filename="../src/gui/clientFileSendDialog.cpp" line="192"/> + <source>PVS - File Transfer</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/clientFileSendDialog.cpp" line="187"/> + <source>File Transfer complete.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/clientFileSendDialog.cpp" line="193"/> + <source>File Transfer canceled!</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>ClientFileSendDialogClass</name> + <message> + <location filename="../build/ui_clientFileSendDialog.h" line="123"/> + <source>PVS - File Transfer</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientFileSendDialog.h" line="125"/> + <source>Sending to:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientFileSendDialog.h" line="126"/> + <source>unknown</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientFileSendDialog.h" line="127"/> + <location filename="../build/ui_clientFileSendDialog.h" line="129"/> + <source>0</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientFileSendDialog.h" line="128"/> + <source>/</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientFileSendDialog.h" line="130"/> + <source>&Cancel</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>ClientNicklistDialogClass</name> + <message> + <location filename="../build/ui_clientNicklistDialog.h" line="84"/> + <source>PVS - Users</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientNicklistDialog.h" line="85"/> + <source>Select user:</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>ClientToolbarClass</name> + <message> + <location filename="../build/ui_clientToolbar.h" line="179"/> + <source>Form</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientToolbar.h" line="181"/> + <source>Menu</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientToolbar.h" line="183"/> + <source>Host:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientToolbar.h" line="185"/> + <source>Click to connect</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientToolbar.h" line="187"/> + <source>-</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientToolbar.h" line="189"/> + <source>Enable/Disable VNC only for this session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientToolbar.h" line="191"/> + <source>Allow VNC</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientToolbar.h" line="192"/> + <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt; font-weight:600; font-style:italic; color:#0055ff;">Pool Video Switch</span></p></body></html></source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>InfoDialogClass</name> + <message> + <location filename="../build/ui_clientInfoDialog.h" line="64"/> + <source>PVS - Information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientInfoDialog.h" line="65"/> + <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:72pt; font-weight:600; color:#0000ff;">HOST</span></p></body></html></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientInfoDialog.h" line="70"/> + <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:48pt; font-weight:600; color:#ff0000;">PASSWD</span></p></body></html></source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>PVSGUI</name> + <message> + <location filename="../src/pvsgui.cpp" line="28"/> + <source>Connect</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsgui.cpp" line="189"/> + <source>&Disconnect</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsgui.cpp" line="190"/> + <source>C&hat</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsgui.cpp" line="191"/> + <source>&Send File</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsgui.cpp" line="192"/> + <source>&Config</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsgui.cpp" line="193"/> + <source>&Information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsgui.cpp" line="194"/> + <source>&About</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsgui.cpp" line="195"/> + <source>&Quit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsgui.cpp" line="282"/> + <location filename="../src/pvsgui.cpp" line="297"/> + <location filename="../src/pvsgui.cpp" line="377"/> + <source>PVS Connection</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsgui.cpp" line="282"/> + <source>Please enter password (If not needed leave blank):</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsgui.cpp" line="298"/> + <source>Are you sure you want to disconnect?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsgui.cpp" line="321"/> + <location filename="../src/pvsgui.cpp" line="343"/> + <source>PVS connection</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsgui.cpp" line="321"/> + <location filename="../src/pvsgui.cpp" line="335"/> + <source>Connected to </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsgui.cpp" line="343"/> + <location filename="../src/pvsgui.cpp" line="355"/> + <source>Disconnected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsgui.cpp" line="377"/> + <source>New host available: </source> + <translation type="unfinished"></translation> + </message> +</context> +</TS> diff --git a/i18n/pvsgui_fr_FR.ts b/i18n/pvsgui_fr_FR.ts new file mode 100644 index 0000000..f3e6d65 --- /dev/null +++ b/i18n/pvsgui_fr_FR.ts @@ -0,0 +1,487 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.0"> +<context> + <name>AboutDialog</name> + <message> + <location filename="../src/gui/aboutDialog.cpp" line="27"/> + <source>Version: </source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>AboutDialogClass</name> + <message> + <location filename="../build/ui_aboutDialog.h" line="213"/> + <source>PVS - About</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_aboutDialog.h" line="215"/> + <source><a href="http://www.gnu.org/licenses/gpl-2.0.txt">License: GNU General Public License Version 2</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_aboutDialog.h" line="216"/> + <source>About</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_aboutDialog.h" line="218"/> + <source>Authors</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_aboutDialog.h" line="219"/> + <source>Translation</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>ClientChatDialog</name> + <message> + <location filename="../src/gui/clientChatDialog.cpp" line="65"/> + <source>&Send File...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/clientChatDialog.cpp" line="178"/> + <source> has joined the chat.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/clientChatDialog.cpp" line="184"/> + <source> has left the chat.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/clientChatDialog.cpp" line="211"/> + <source>PVS File Transfer</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/clientChatDialog.cpp" line="212"/> + <source>Send file '</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/clientChatDialog.cpp" line="212"/> + <source>' to </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/clientChatDialog.cpp" line="231"/> + <source>Connected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/clientChatDialog.cpp" line="241"/> + <source>Disconnected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/clientChatDialog.cpp" line="280"/> + <source>Message from <</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>ClientChatDialogClass</name> + <message> + <location filename="../build/ui_clientChatDialog.h" line="115"/> + <source>PVS - Chat </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientChatDialog.h" line="116"/> + <source>&Send</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>ClientConfigDialogClass</name> + <message> + <location filename="../build/ui_clientConfigDialog.h" line="200"/> + <source>PVS - Configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientConfigDialog.h" line="201"/> + <source>Allow vnc access to lecturer?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientConfigDialog.h" line="202"/> + <location filename="../build/ui_clientConfigDialog.h" line="206"/> + <source>Full access</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientConfigDialog.h" line="203"/> + <location filename="../build/ui_clientConfigDialog.h" line="207"/> + <source>View only</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientConfigDialog.h" line="204"/> + <location filename="../build/ui_clientConfigDialog.h" line="208"/> + <source>None</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientConfigDialog.h" line="205"/> + <source>Allow vnc access to other?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientConfigDialog.h" line="209"/> + <source>Accept chat messages</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientConfigDialog.h" line="210"/> + <source>Accept file transfers</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientConfigDialog.h" line="211"/> + <source>Permissions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientConfigDialog.h" line="214"/> + <source>Top Left</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientConfigDialog.h" line="215"/> + <source>Top Center</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientConfigDialog.h" line="216"/> + <source>Top Right</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientConfigDialog.h" line="217"/> + <source>Bottom Left</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientConfigDialog.h" line="218"/> + <source>Bottom Center</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientConfigDialog.h" line="219"/> + <source>Bottom Right</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientConfigDialog.h" line="221"/> + <source>Display</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>ClientFileReceiveDialog</name> + <message> + <location filename="../src/gui/clientFileReceiveDialog.cpp" line="63"/> + <source>PVS File Transfer</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/clientFileReceiveDialog.cpp" line="63"/> + <source>User '</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/clientFileReceiveDialog.cpp" line="64"/> + <source>' would like to send you a file: </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/clientFileReceiveDialog.cpp" line="75"/> + <source>Open File</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/clientFileReceiveDialog.cpp" line="150"/> + <location filename="../src/gui/clientFileReceiveDialog.cpp" line="156"/> + <source>PVS - File Transfer</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/clientFileReceiveDialog.cpp" line="151"/> + <source>File Transfer complete.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/clientFileReceiveDialog.cpp" line="157"/> + <source>File Transfer canceled!</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>ClientFileReceiveDialogClass</name> + <message> + <location filename="../build/ui_clientFileReceiveDialog.h" line="123"/> + <source>PVS - File Transfer</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientFileReceiveDialog.h" line="125"/> + <source>Receiving from:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientFileReceiveDialog.h" line="126"/> + <source>unknown</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientFileReceiveDialog.h" line="127"/> + <location filename="../build/ui_clientFileReceiveDialog.h" line="129"/> + <source>0</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientFileReceiveDialog.h" line="128"/> + <source>/</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientFileReceiveDialog.h" line="130"/> + <source>&Cancel</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>ClientFileSendDialog</name> + <message> + <location filename="../src/gui/clientFileSendDialog.cpp" line="68"/> + <source>Open File</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/clientFileSendDialog.cpp" line="186"/> + <location filename="../src/gui/clientFileSendDialog.cpp" line="192"/> + <source>PVS - File Transfer</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/clientFileSendDialog.cpp" line="187"/> + <source>File Transfer complete.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/clientFileSendDialog.cpp" line="193"/> + <source>File Transfer canceled!</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>ClientFileSendDialogClass</name> + <message> + <location filename="../build/ui_clientFileSendDialog.h" line="123"/> + <source>PVS - File Transfer</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientFileSendDialog.h" line="125"/> + <source>Sending to:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientFileSendDialog.h" line="126"/> + <source>unknown</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientFileSendDialog.h" line="127"/> + <location filename="../build/ui_clientFileSendDialog.h" line="129"/> + <source>0</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientFileSendDialog.h" line="128"/> + <source>/</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientFileSendDialog.h" line="130"/> + <source>&Cancel</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>ClientNicklistDialogClass</name> + <message> + <location filename="../build/ui_clientNicklistDialog.h" line="84"/> + <source>PVS - Users</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientNicklistDialog.h" line="85"/> + <source>Select user:</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>ClientToolbarClass</name> + <message> + <location filename="../build/ui_clientToolbar.h" line="179"/> + <source>Form</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientToolbar.h" line="181"/> + <source>Menu</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientToolbar.h" line="183"/> + <source>Host:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientToolbar.h" line="185"/> + <source>Click to connect</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientToolbar.h" line="187"/> + <source>-</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientToolbar.h" line="189"/> + <source>Enable/Disable VNC only for this session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientToolbar.h" line="191"/> + <source>Allow VNC</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientToolbar.h" line="192"/> + <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt; font-weight:600; font-style:italic; color:#0055ff;">Pool Video Switch</span></p></body></html></source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>InfoDialogClass</name> + <message> + <location filename="../build/ui_clientInfoDialog.h" line="64"/> + <source>PVS - Information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientInfoDialog.h" line="65"/> + <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:72pt; font-weight:600; color:#0000ff;">HOST</span></p></body></html></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientInfoDialog.h" line="70"/> + <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:48pt; font-weight:600; color:#ff0000;">PASSWD</span></p></body></html></source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>PVSGUI</name> + <message> + <location filename="../src/pvsgui.cpp" line="28"/> + <source>Connect</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsgui.cpp" line="189"/> + <source>&Disconnect</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsgui.cpp" line="190"/> + <source>C&hat</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsgui.cpp" line="191"/> + <source>&Send File</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsgui.cpp" line="192"/> + <source>&Config</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsgui.cpp" line="193"/> + <source>&Information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsgui.cpp" line="194"/> + <source>&About</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsgui.cpp" line="195"/> + <source>&Quit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsgui.cpp" line="282"/> + <location filename="../src/pvsgui.cpp" line="297"/> + <location filename="../src/pvsgui.cpp" line="377"/> + <source>PVS Connection</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsgui.cpp" line="282"/> + <source>Please enter password (If not needed leave blank):</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsgui.cpp" line="298"/> + <source>Are you sure you want to disconnect?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsgui.cpp" line="321"/> + <location filename="../src/pvsgui.cpp" line="343"/> + <source>PVS connection</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsgui.cpp" line="321"/> + <location filename="../src/pvsgui.cpp" line="335"/> + <source>Connected to </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsgui.cpp" line="343"/> + <location filename="../src/pvsgui.cpp" line="355"/> + <source>Disconnected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsgui.cpp" line="377"/> + <source>New host available: </source> + <translation type="unfinished"></translation> + </message> +</context> +</TS> diff --git a/i18n/pvsgui_pl_PL.ts b/i18n/pvsgui_pl_PL.ts new file mode 100644 index 0000000..f3e6d65 --- /dev/null +++ b/i18n/pvsgui_pl_PL.ts @@ -0,0 +1,487 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.0"> +<context> + <name>AboutDialog</name> + <message> + <location filename="../src/gui/aboutDialog.cpp" line="27"/> + <source>Version: </source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>AboutDialogClass</name> + <message> + <location filename="../build/ui_aboutDialog.h" line="213"/> + <source>PVS - About</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_aboutDialog.h" line="215"/> + <source><a href="http://www.gnu.org/licenses/gpl-2.0.txt">License: GNU General Public License Version 2</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_aboutDialog.h" line="216"/> + <source>About</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_aboutDialog.h" line="218"/> + <source>Authors</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_aboutDialog.h" line="219"/> + <source>Translation</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>ClientChatDialog</name> + <message> + <location filename="../src/gui/clientChatDialog.cpp" line="65"/> + <source>&Send File...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/clientChatDialog.cpp" line="178"/> + <source> has joined the chat.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/clientChatDialog.cpp" line="184"/> + <source> has left the chat.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/clientChatDialog.cpp" line="211"/> + <source>PVS File Transfer</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/clientChatDialog.cpp" line="212"/> + <source>Send file '</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/clientChatDialog.cpp" line="212"/> + <source>' to </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/clientChatDialog.cpp" line="231"/> + <source>Connected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/clientChatDialog.cpp" line="241"/> + <source>Disconnected.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/clientChatDialog.cpp" line="280"/> + <source>Message from <</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>ClientChatDialogClass</name> + <message> + <location filename="../build/ui_clientChatDialog.h" line="115"/> + <source>PVS - Chat </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientChatDialog.h" line="116"/> + <source>&Send</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>ClientConfigDialogClass</name> + <message> + <location filename="../build/ui_clientConfigDialog.h" line="200"/> + <source>PVS - Configuration</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientConfigDialog.h" line="201"/> + <source>Allow vnc access to lecturer?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientConfigDialog.h" line="202"/> + <location filename="../build/ui_clientConfigDialog.h" line="206"/> + <source>Full access</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientConfigDialog.h" line="203"/> + <location filename="../build/ui_clientConfigDialog.h" line="207"/> + <source>View only</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientConfigDialog.h" line="204"/> + <location filename="../build/ui_clientConfigDialog.h" line="208"/> + <source>None</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientConfigDialog.h" line="205"/> + <source>Allow vnc access to other?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientConfigDialog.h" line="209"/> + <source>Accept chat messages</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientConfigDialog.h" line="210"/> + <source>Accept file transfers</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientConfigDialog.h" line="211"/> + <source>Permissions</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientConfigDialog.h" line="214"/> + <source>Top Left</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientConfigDialog.h" line="215"/> + <source>Top Center</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientConfigDialog.h" line="216"/> + <source>Top Right</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientConfigDialog.h" line="217"/> + <source>Bottom Left</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientConfigDialog.h" line="218"/> + <source>Bottom Center</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientConfigDialog.h" line="219"/> + <source>Bottom Right</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientConfigDialog.h" line="221"/> + <source>Display</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>ClientFileReceiveDialog</name> + <message> + <location filename="../src/gui/clientFileReceiveDialog.cpp" line="63"/> + <source>PVS File Transfer</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/clientFileReceiveDialog.cpp" line="63"/> + <source>User '</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/clientFileReceiveDialog.cpp" line="64"/> + <source>' would like to send you a file: </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/clientFileReceiveDialog.cpp" line="75"/> + <source>Open File</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/clientFileReceiveDialog.cpp" line="150"/> + <location filename="../src/gui/clientFileReceiveDialog.cpp" line="156"/> + <source>PVS - File Transfer</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/clientFileReceiveDialog.cpp" line="151"/> + <source>File Transfer complete.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/clientFileReceiveDialog.cpp" line="157"/> + <source>File Transfer canceled!</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>ClientFileReceiveDialogClass</name> + <message> + <location filename="../build/ui_clientFileReceiveDialog.h" line="123"/> + <source>PVS - File Transfer</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientFileReceiveDialog.h" line="125"/> + <source>Receiving from:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientFileReceiveDialog.h" line="126"/> + <source>unknown</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientFileReceiveDialog.h" line="127"/> + <location filename="../build/ui_clientFileReceiveDialog.h" line="129"/> + <source>0</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientFileReceiveDialog.h" line="128"/> + <source>/</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientFileReceiveDialog.h" line="130"/> + <source>&Cancel</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>ClientFileSendDialog</name> + <message> + <location filename="../src/gui/clientFileSendDialog.cpp" line="68"/> + <source>Open File</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/clientFileSendDialog.cpp" line="186"/> + <location filename="../src/gui/clientFileSendDialog.cpp" line="192"/> + <source>PVS - File Transfer</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/clientFileSendDialog.cpp" line="187"/> + <source>File Transfer complete.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/clientFileSendDialog.cpp" line="193"/> + <source>File Transfer canceled!</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>ClientFileSendDialogClass</name> + <message> + <location filename="../build/ui_clientFileSendDialog.h" line="123"/> + <source>PVS - File Transfer</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientFileSendDialog.h" line="125"/> + <source>Sending to:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientFileSendDialog.h" line="126"/> + <source>unknown</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientFileSendDialog.h" line="127"/> + <location filename="../build/ui_clientFileSendDialog.h" line="129"/> + <source>0</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientFileSendDialog.h" line="128"/> + <source>/</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientFileSendDialog.h" line="130"/> + <source>&Cancel</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>ClientNicklistDialogClass</name> + <message> + <location filename="../build/ui_clientNicklistDialog.h" line="84"/> + <source>PVS - Users</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientNicklistDialog.h" line="85"/> + <source>Select user:</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>ClientToolbarClass</name> + <message> + <location filename="../build/ui_clientToolbar.h" line="179"/> + <source>Form</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientToolbar.h" line="181"/> + <source>Menu</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientToolbar.h" line="183"/> + <source>Host:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientToolbar.h" line="185"/> + <source>Click to connect</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientToolbar.h" line="187"/> + <source>-</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientToolbar.h" line="189"/> + <source>Enable/Disable VNC only for this session</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientToolbar.h" line="191"/> + <source>Allow VNC</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientToolbar.h" line="192"/> + <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt; font-weight:600; font-style:italic; color:#0055ff;">Pool Video Switch</span></p></body></html></source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>InfoDialogClass</name> + <message> + <location filename="../build/ui_clientInfoDialog.h" line="64"/> + <source>PVS - Information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientInfoDialog.h" line="65"/> + <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:72pt; font-weight:600; color:#0000ff;">HOST</span></p></body></html></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientInfoDialog.h" line="70"/> + <source><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:48pt; font-weight:600; color:#ff0000;">PASSWD</span></p></body></html></source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>PVSGUI</name> + <message> + <location filename="../src/pvsgui.cpp" line="28"/> + <source>Connect</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsgui.cpp" line="189"/> + <source>&Disconnect</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsgui.cpp" line="190"/> + <source>C&hat</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsgui.cpp" line="191"/> + <source>&Send File</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsgui.cpp" line="192"/> + <source>&Config</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsgui.cpp" line="193"/> + <source>&Information</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsgui.cpp" line="194"/> + <source>&About</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsgui.cpp" line="195"/> + <source>&Quit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsgui.cpp" line="282"/> + <location filename="../src/pvsgui.cpp" line="297"/> + <location filename="../src/pvsgui.cpp" line="377"/> + <source>PVS Connection</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsgui.cpp" line="282"/> + <source>Please enter password (If not needed leave blank):</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsgui.cpp" line="298"/> + <source>Are you sure you want to disconnect?</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsgui.cpp" line="321"/> + <location filename="../src/pvsgui.cpp" line="343"/> + <source>PVS connection</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsgui.cpp" line="321"/> + <location filename="../src/pvsgui.cpp" line="335"/> + <source>Connected to </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsgui.cpp" line="343"/> + <location filename="../src/pvsgui.cpp" line="355"/> + <source>Disconnected</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/pvsgui.cpp" line="377"/> + <source>New host available: </source> + <translation type="unfinished"></translation> + </message> +</context> +</TS> diff --git a/i18n/pvsmgr_ar_JO.ts b/i18n/pvsmgr_ar_JO.ts new file mode 100644 index 0000000..bc5c69c --- /dev/null +++ b/i18n/pvsmgr_ar_JO.ts @@ -0,0 +1,838 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.0"> +<context> + <name>AboutDialog</name> + <message> + <location filename="../src/gui/aboutDialog.cpp" line="27"/> + <source>Version: </source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>AboutDialogClass</name> + <message> + <location filename="../build/ui_aboutDialog.h" line="213"/> + <source>PVS - About</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_aboutDialog.h" line="215"/> + <source><a href="http://www.gnu.org/licenses/gpl-2.0.txt">License: GNU General Public License Version 2</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_aboutDialog.h" line="216"/> + <source>About</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_aboutDialog.h" line="218"/> + <source>Authors</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_aboutDialog.h" line="219"/> + <source>Translation</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>ClientFileSendDialogClass</name> + <message> + <location filename="../build/ui_clientFileSendDialog.h" line="123"/> + <source>PVS - File Transfer</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientFileSendDialog.h" line="125"/> + <source>Sending to:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientFileSendDialog.h" line="126"/> + <source>unknown</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientFileSendDialog.h" line="127"/> + <location filename="../build/ui_clientFileSendDialog.h" line="129"/> + <source>0</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientFileSendDialog.h" line="128"/> + <source>/</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientFileSendDialog.h" line="130"/> + <source>&Cancel</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>ConnectionFrame</name> + <message> + <location filename="../src/gui/connectionFrame.cpp" line="100"/> + <source>&Remove dummy...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionFrame.cpp" line="102"/> + <source>&Lock Client(s)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionFrame.cpp" line="104"/> + <source>&Unlock Client(s)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionFrame.cpp" line="112"/> + <source>&MsgLock Client(s)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionFrame.cpp" line="114"/> + <source>&MsgLock all Client(s)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionFrame.cpp" line="116"/> + <source>&Message Client(s)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionFrame.cpp" line="118"/> + <source>&Projection</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionFrame.cpp" line="120"/> + <source>&Unprojection</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>ConnectionList</name> + <message> + <location filename="../src/gui/connectionList.cpp" line="31"/> + <source>Name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionList.cpp" line="32"/> + <source>IP</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionList.cpp" line="33"/> + <source>Username</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionList.cpp" line="70"/> + <source>&Lock Client(s)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionList.cpp" line="72"/> + <source>&Unlock Client(s)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionList.cpp" line="80"/> + <source>&MsgLock Client(s)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionList.cpp" line="82"/> + <source>&MsgLock all Client(s)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionList.cpp" line="84"/> + <source>&Message Client(s)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionList.cpp" line="87"/> + <source>&Projection</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionList.cpp" line="89"/> + <source>&Unprojection</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionList.cpp" line="309"/> + <source>No Target is available for a projection! +Perform an unprojection to get a target.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionList.cpp" line="317"/> + <source>This source is already in a projection process involved. + You can perform a unprojection on it to get it free.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionList.cpp" line="349"/> + <location filename="../src/gui/connectionList.cpp" line="355"/> + <location filename="../src/gui/connectionList.cpp" line="430"/> + <source>To perform a projection you have to select only one source in a list with more than one index!</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionList.cpp" line="372"/> + <location filename="../src/gui/connectionList.cpp" line="378"/> + <source>An unprojection is only possible on a selected source that is involved in a projection process, in a list with more than one index!</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionList.cpp" line="391"/> + <source>No Target is available for remote Help! +Perform an unprojection or remove remote help to get a target.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionList.cpp" line="399"/> + <source>This source is already in a projection or remote Help process involved. + You can perform a unprojection or remove remote Help on it to get it free.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>ConnectionWindow</name> + <message> + <location filename="../src/gui/connectionWindow.cpp" line="34"/> + <source>&Add a dummy...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionWindow.cpp" line="342"/> + <location filename="../src/gui/connectionWindow.cpp" line="479"/> + <location filename="../src/gui/connectionWindow.cpp" line="516"/> + <source>You have to set a Superclient-machine before performing this action.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>Dialog</name> + <message> + <location filename="../src/gui/dialog.cpp" line="29"/> + <source>Enter the Text for the client(s)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_profileDialog.h" line="167"/> + <source>ProfileDialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_profileDialog.h" line="168"/> + <source>background-color: rgb(255, 255, 255);</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_profileDialog.h" line="169"/> + <source>&Remove</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_profileDialog.h" line="170"/> + <source>&Edit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_profileDialog.h" line="171"/> + <source>&New</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_profileDialog.h" line="172"/> + <source>&Load</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_profileDialog.h" line="173"/> + <source>Add</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_profileDialog.h" line="174"/> + <source>Close</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>Frame</name> + <message> + <location filename="../src/gui/frame.cpp" line="49"/> + <source>View</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/frame.cpp" line="50"/> + <source>Foto</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/frame.cpp" line="51"/> + <location filename="../src/gui/frame.cpp" line="276"/> + <source>Lock this client</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/frame.cpp" line="53"/> + <source>Set as Superclient</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/frame.cpp" line="271"/> + <source>Unlock this client</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/frame.cpp" line="311"/> + <source>You can't lock a Superclient-machine.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/frame.cpp" line="320"/> + <source>Set client as Superclient</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/frame.cpp" line="327"/> + <source>Unset client as Superclient</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>MainWindow</name> + <message> + <location filename="../build/ui_mainwindow.h" line="403"/> + <location filename="../src/gui/mainWindow.cpp" line="120"/> + <source>Exit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/mainWindow.cpp" line="122"/> + <source>Remove the vnc-Connection for the selected client(s)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/mainWindow.cpp" line="125"/> + <source>Show the selected client in the whole window</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/mainWindow.cpp" line="129"/> + <source>Make a screenshot for the selected client(s)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="418"/> + <location filename="../src/gui/mainWindow.cpp" line="130"/> + <source>Lock or Unlock all Clients</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/mainWindow.cpp" line="151"/> + <source>The pvs manager</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/mainWindow.cpp" line="740"/> + <source>This operation can only be performed for one selected Client!</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/mainWindow.cpp" line="792"/> + <source>This operation can only be performed for at least one selected Client!</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/mainWindow.cpp" line="1061"/> + <source>You have to set a Superclient-machine before performing this action.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/mainWindow.cpp" line="1141"/> + <source>Open Image</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/mainWindow.cpp" line="1141"/> + <source>Image Files (*.png *.jpg *.svg)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="376"/> + <source>PVSmgr</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="377"/> + <source>Show Username</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="378"/> + <source>Ctrl+3</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="379"/> + <source>Show IP</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="380"/> + <source>Ctrl+2</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="381"/> + <source>VNC-Placeholders</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="382"/> + <source>Show Log</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="383"/> + <source>Ctrl+L</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="384"/> + <source>Show Normal</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="385"/> + <source>Ctrl+O</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="386"/> + <source>Show Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="387"/> + <source>Ctrl+E</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="388"/> + <source>Show Network</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="389"/> + <source>Ctrl+N</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="390"/> + <source>Show Terminal</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="391"/> + <source>Ctrl+T</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="392"/> + <source>Show Chat</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="393"/> + <source>Ctrl+G</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="394"/> + <source>About pvs</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="395"/> + <source>Ctrl+P</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="396"/> + <source>100 x 100</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="397"/> + <source>200 x 200</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="398"/> + <source>500 x 500</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="399"/> + <source>&Disconnect</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="400"/> + <source>Ctrl+W</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="401"/> + <source>&Exit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="405"/> + <source>Ctrl+Q</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="406"/> + <location filename="../build/ui_mainwindow.h" line="408"/> + <source>Foto</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="410"/> + <source>Ctrl+F</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="411"/> + <source>view</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="413"/> + <source>View</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="415"/> + <source>Ctrl+V</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="416"/> + <source>lock</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="420"/> + <source>Ctrl+A</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="421"/> + <source>Profile &manager</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="422"/> + <source>Ctrl+M</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="423"/> + <source>Show Name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="424"/> + <source>Ctrl+1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="425"/> + <source>Chat</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="427"/> + <source>Start Chat with client(s)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="429"/> + <source>Ctrl+D</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="430"/> + <source>-</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="431"/> + <source>border-color: rgb(0, 0, 0);</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="432"/> + <source>VNC quality</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="435"/> + <source>HIGH</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="436"/> + <source>MEDIUM</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="437"/> + <source>LOW</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="439"/> + <source>Set password</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="442"/> + <source>Thumbnailratio</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="443"/> + <source>Thumbnailrate</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="445"/> + <source> 0</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="446"/> + <source>%</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="447"/> + <source>background-color: rgb(255, 255, 255);</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="448"/> + <source>background-color: rgb(150, 150, 150);</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="449"/> + <source>&File</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="450"/> + <source>Load profile </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="451"/> + <source>&Clients</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="452"/> + <source>&Logging</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="453"/> + <source>&Help</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="454"/> + <source>toolBar</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>MsgDialog</name> + <message> + <location filename="../build/ui_dialog.h" line="85"/> + <source>Dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_dialog.h" line="86"/> + <source>Cancel</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_dialog.h" line="87"/> + <source>Send</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>ProjectionDialog</name> + <message> + <location filename="../src/gui/projectionDialog.cpp" line="28"/> + <source>Target for Projection</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>ServerChatDialog</name> + <message> + <location filename="../src/gui/serverChatDialog.cpp" line="39"/> + <source>&Send File...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/serverChatDialog.cpp" line="119"/> + <source> has joined the chat.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/serverChatDialog.cpp" line="125"/> + <source> has left the chat.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/serverChatDialog.cpp" line="231"/> + <source>PVS File Transfer with </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/serverChatDialog.cpp" line="232"/> + <source>Send file '</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/serverChatDialog.cpp" line="232"/> + <source>' to </source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>ServerChatDialogClass</name> + <message> + <location filename="../build/ui_serverChatDialog.h" line="115"/> + <source>PVSmgr - Chat </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_serverChatDialog.h" line="116"/> + <source>&Send</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>ServerFileTransfert</name> + <message> + <location filename="../src/gui/serverFileTransfert.cpp" line="35"/> + <location filename="../src/gui/serverFileTransfert.cpp" line="130"/> + <source>Open File</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/serverFileTransfert.cpp" line="118"/> + <source>PVS File Transfer</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/serverFileTransfert.cpp" line="118"/> + <source>User '</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/serverFileTransfert.cpp" line="119"/> + <source>' would like to send you a file: </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/serverFileTransfert.cpp" line="238"/> + <location filename="../src/gui/serverFileTransfert.cpp" line="244"/> + <source>PVS - File Transfer</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/serverFileTransfert.cpp" line="239"/> + <source>File Transfer complete.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/serverFileTransfert.cpp" line="245"/> + <source>File Transfer canceled!</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>profileDialog</name> + <message> + <location filename="../src/gui/profileDialog.cpp" line="32"/> + <source>Profile</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/profileDialog.cpp" line="96"/> + <source>This field can't be empty.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/profileDialog.cpp" line="102"/> + <source>This name is already in the list.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/profileDialog.cpp" line="150"/> + <source>You can only load one profile at time</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>projectionDialog</name> + <message> + <location filename="../build/ui_projectionDialog.h" line="120"/> + <source>Dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_projectionDialog.h" line="121"/> + <source>Select all</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_projectionDialog.h" line="122"/> + <source>Cancel</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_projectionDialog.h" line="123"/> + <source>Project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_projectionDialog.h" line="124"/> + <source>Select Target for projection</source> + <translation type="unfinished"></translation> + </message> +</context> +</TS> diff --git a/i18n/pvsmgr_de_DE.ts b/i18n/pvsmgr_de_DE.ts new file mode 100644 index 0000000..fd6d56b --- /dev/null +++ b/i18n/pvsmgr_de_DE.ts @@ -0,0 +1,838 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.0" language="de_DE" sourcelanguage="en_US"> +<context> + <name>AboutDialog</name> + <message> + <location filename="../src/gui/aboutDialog.cpp" line="27"/> + <source>Version: </source> + <translation>Version:</translation> + </message> +</context> +<context> + <name>AboutDialogClass</name> + <message> + <location filename="../build/ui_aboutDialog.h" line="213"/> + <source>PVS - About</source> + <translation>PVS - Ãœber</translation> + </message> + <message> + <location filename="../build/ui_aboutDialog.h" line="215"/> + <source><a href="http://www.gnu.org/licenses/gpl-2.0.txt">License: GNU General Public License Version 2</a></source> + <translation></translation> + </message> + <message> + <location filename="../build/ui_aboutDialog.h" line="216"/> + <source>About</source> + <translation>Ãœber</translation> + </message> + <message> + <location filename="../build/ui_aboutDialog.h" line="218"/> + <source>Authors</source> + <translation>Autoren</translation> + </message> + <message> + <location filename="../build/ui_aboutDialog.h" line="219"/> + <source>Translation</source> + <translation>Ãœbersetzung</translation> + </message> +</context> +<context> + <name>ClientFileSendDialogClass</name> + <message> + <location filename="../build/ui_clientFileSendDialog.h" line="123"/> + <source>PVS - File Transfer</source> + <translation>PVS - Dateiübertragung</translation> + </message> + <message> + <location filename="../build/ui_clientFileSendDialog.h" line="125"/> + <source>Sending to:</source> + <translation>Senden an:</translation> + </message> + <message> + <location filename="../build/ui_clientFileSendDialog.h" line="126"/> + <source>unknown</source> + <translation>unbekannt</translation> + </message> + <message> + <location filename="../build/ui_clientFileSendDialog.h" line="127"/> + <location filename="../build/ui_clientFileSendDialog.h" line="129"/> + <source>0</source> + <translation>0</translation> + </message> + <message> + <location filename="../build/ui_clientFileSendDialog.h" line="128"/> + <source>/</source> + <translation>/</translation> + </message> + <message> + <location filename="../build/ui_clientFileSendDialog.h" line="130"/> + <source>&Cancel</source> + <translation>&Abbruch</translation> + </message> +</context> +<context> + <name>ConnectionFrame</name> + <message> + <location filename="../src/gui/connectionFrame.cpp" line="100"/> + <source>&Remove dummy...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionFrame.cpp" line="102"/> + <source>&Lock Client(s)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionFrame.cpp" line="104"/> + <source>&Unlock Client(s)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionFrame.cpp" line="112"/> + <source>&MsgLock Client(s)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionFrame.cpp" line="114"/> + <source>&MsgLock all Client(s)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionFrame.cpp" line="116"/> + <source>&Message Client(s)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionFrame.cpp" line="118"/> + <source>&Projection</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionFrame.cpp" line="120"/> + <source>&Unprojection</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>ConnectionList</name> + <message> + <location filename="../src/gui/connectionList.cpp" line="31"/> + <source>Name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionList.cpp" line="32"/> + <source>IP</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionList.cpp" line="33"/> + <source>Username</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionList.cpp" line="70"/> + <source>&Lock Client(s)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionList.cpp" line="72"/> + <source>&Unlock Client(s)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionList.cpp" line="80"/> + <source>&MsgLock Client(s)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionList.cpp" line="82"/> + <source>&MsgLock all Client(s)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionList.cpp" line="84"/> + <source>&Message Client(s)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionList.cpp" line="87"/> + <source>&Projection</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionList.cpp" line="89"/> + <source>&Unprojection</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionList.cpp" line="309"/> + <source>No Target is available for a projection! +Perform an unprojection to get a target.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionList.cpp" line="317"/> + <source>This source is already in a projection process involved. + You can perform a unprojection on it to get it free.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionList.cpp" line="349"/> + <location filename="../src/gui/connectionList.cpp" line="355"/> + <location filename="../src/gui/connectionList.cpp" line="430"/> + <source>To perform a projection you have to select only one source in a list with more than one index!</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionList.cpp" line="372"/> + <location filename="../src/gui/connectionList.cpp" line="378"/> + <source>An unprojection is only possible on a selected source that is involved in a projection process, in a list with more than one index!</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionList.cpp" line="391"/> + <source>No Target is available for remote Help! +Perform an unprojection or remove remote help to get a target.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionList.cpp" line="399"/> + <source>This source is already in a projection or remote Help process involved. + You can perform a unprojection or remove remote Help on it to get it free.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>ConnectionWindow</name> + <message> + <location filename="../src/gui/connectionWindow.cpp" line="34"/> + <source>&Add a dummy...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionWindow.cpp" line="342"/> + <location filename="../src/gui/connectionWindow.cpp" line="479"/> + <location filename="../src/gui/connectionWindow.cpp" line="516"/> + <source>You have to set a Superclient-machine before performing this action.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>Dialog</name> + <message> + <location filename="../src/gui/dialog.cpp" line="29"/> + <source>Enter the Text for the client(s)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_profileDialog.h" line="167"/> + <source>ProfileDialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_profileDialog.h" line="168"/> + <source>background-color: rgb(255, 255, 255);</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_profileDialog.h" line="169"/> + <source>&Remove</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_profileDialog.h" line="170"/> + <source>&Edit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_profileDialog.h" line="171"/> + <source>&New</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_profileDialog.h" line="172"/> + <source>&Load</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_profileDialog.h" line="173"/> + <source>Add</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_profileDialog.h" line="174"/> + <source>Close</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>Frame</name> + <message> + <location filename="../src/gui/frame.cpp" line="49"/> + <source>View</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/frame.cpp" line="50"/> + <source>Foto</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/frame.cpp" line="51"/> + <location filename="../src/gui/frame.cpp" line="276"/> + <source>Lock this client</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/frame.cpp" line="53"/> + <source>Set as Superclient</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/frame.cpp" line="271"/> + <source>Unlock this client</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/frame.cpp" line="311"/> + <source>You can't lock a Superclient-machine.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/frame.cpp" line="320"/> + <source>Set client as Superclient</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/frame.cpp" line="327"/> + <source>Unset client as Superclient</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>MainWindow</name> + <message> + <location filename="../build/ui_mainwindow.h" line="403"/> + <location filename="../src/gui/mainWindow.cpp" line="120"/> + <source>Exit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/mainWindow.cpp" line="122"/> + <source>Remove the vnc-Connection for the selected client(s)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/mainWindow.cpp" line="125"/> + <source>Show the selected client in the whole window</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/mainWindow.cpp" line="129"/> + <source>Make a screenshot for the selected client(s)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="418"/> + <location filename="../src/gui/mainWindow.cpp" line="130"/> + <source>Lock or Unlock all Clients</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/mainWindow.cpp" line="151"/> + <source>The pvs manager</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/mainWindow.cpp" line="740"/> + <source>This operation can only be performed for one selected Client!</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/mainWindow.cpp" line="792"/> + <source>This operation can only be performed for at least one selected Client!</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/mainWindow.cpp" line="1061"/> + <source>You have to set a Superclient-machine before performing this action.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/mainWindow.cpp" line="1141"/> + <source>Open Image</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/mainWindow.cpp" line="1141"/> + <source>Image Files (*.png *.jpg *.svg)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="376"/> + <source>PVSmgr</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="377"/> + <source>Show Username</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="378"/> + <source>Ctrl+3</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="379"/> + <source>Show IP</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="380"/> + <source>Ctrl+2</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="381"/> + <source>VNC-Placeholders</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="382"/> + <source>Show Log</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="383"/> + <source>Ctrl+L</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="384"/> + <source>Show Normal</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="385"/> + <source>Ctrl+O</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="386"/> + <source>Show Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="387"/> + <source>Ctrl+E</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="388"/> + <source>Show Network</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="389"/> + <source>Ctrl+N</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="390"/> + <source>Show Terminal</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="391"/> + <source>Ctrl+T</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="392"/> + <source>Show Chat</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="393"/> + <source>Ctrl+G</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="394"/> + <source>About pvs</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="395"/> + <source>Ctrl+P</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="396"/> + <source>100 x 100</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="397"/> + <source>200 x 200</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="398"/> + <source>500 x 500</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="399"/> + <source>&Disconnect</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="400"/> + <source>Ctrl+W</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="401"/> + <source>&Exit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="405"/> + <source>Ctrl+Q</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="406"/> + <location filename="../build/ui_mainwindow.h" line="408"/> + <source>Foto</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="410"/> + <source>Ctrl+F</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="411"/> + <source>view</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="413"/> + <source>View</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="415"/> + <source>Ctrl+V</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="416"/> + <source>lock</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="420"/> + <source>Ctrl+A</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="421"/> + <source>Profile &manager</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="422"/> + <source>Ctrl+M</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="423"/> + <source>Show Name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="424"/> + <source>Ctrl+1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="425"/> + <source>Chat</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="427"/> + <source>Start Chat with client(s)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="429"/> + <source>Ctrl+D</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="430"/> + <source>-</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="431"/> + <source>border-color: rgb(0, 0, 0);</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="432"/> + <source>VNC quality</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="435"/> + <source>HIGH</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="436"/> + <source>MEDIUM</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="437"/> + <source>LOW</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="439"/> + <source>Set password</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="442"/> + <source>Thumbnailratio</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="443"/> + <source>Thumbnailrate</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="445"/> + <source> 0</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="446"/> + <source>%</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="447"/> + <source>background-color: rgb(255, 255, 255);</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="448"/> + <source>background-color: rgb(150, 150, 150);</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="449"/> + <source>&File</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="450"/> + <source>Load profile </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="451"/> + <source>&Clients</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="452"/> + <source>&Logging</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="453"/> + <source>&Help</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="454"/> + <source>toolBar</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>MsgDialog</name> + <message> + <location filename="../build/ui_dialog.h" line="85"/> + <source>Dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_dialog.h" line="86"/> + <source>Cancel</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_dialog.h" line="87"/> + <source>Send</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>ProjectionDialog</name> + <message> + <location filename="../src/gui/projectionDialog.cpp" line="28"/> + <source>Target for Projection</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>ServerChatDialog</name> + <message> + <location filename="../src/gui/serverChatDialog.cpp" line="39"/> + <source>&Send File...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/serverChatDialog.cpp" line="119"/> + <source> has joined the chat.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/serverChatDialog.cpp" line="125"/> + <source> has left the chat.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/serverChatDialog.cpp" line="231"/> + <source>PVS File Transfer with </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/serverChatDialog.cpp" line="232"/> + <source>Send file '</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/serverChatDialog.cpp" line="232"/> + <source>' to </source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>ServerChatDialogClass</name> + <message> + <location filename="../build/ui_serverChatDialog.h" line="115"/> + <source>PVSmgr - Chat </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_serverChatDialog.h" line="116"/> + <source>&Send</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>ServerFileTransfert</name> + <message> + <location filename="../src/gui/serverFileTransfert.cpp" line="35"/> + <location filename="../src/gui/serverFileTransfert.cpp" line="130"/> + <source>Open File</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/serverFileTransfert.cpp" line="118"/> + <source>PVS File Transfer</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/serverFileTransfert.cpp" line="118"/> + <source>User '</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/serverFileTransfert.cpp" line="119"/> + <source>' would like to send you a file: </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/serverFileTransfert.cpp" line="238"/> + <location filename="../src/gui/serverFileTransfert.cpp" line="244"/> + <source>PVS - File Transfer</source> + <translation type="unfinished">PVS - Dateiübertragung</translation> + </message> + <message> + <location filename="../src/gui/serverFileTransfert.cpp" line="239"/> + <source>File Transfer complete.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/serverFileTransfert.cpp" line="245"/> + <source>File Transfer canceled!</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>profileDialog</name> + <message> + <location filename="../src/gui/profileDialog.cpp" line="32"/> + <source>Profile</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/profileDialog.cpp" line="96"/> + <source>This field can't be empty.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/profileDialog.cpp" line="102"/> + <source>This name is already in the list.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/profileDialog.cpp" line="150"/> + <source>You can only load one profile at time</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>projectionDialog</name> + <message> + <location filename="../build/ui_projectionDialog.h" line="120"/> + <source>Dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_projectionDialog.h" line="121"/> + <source>Select all</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_projectionDialog.h" line="122"/> + <source>Cancel</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_projectionDialog.h" line="123"/> + <source>Project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_projectionDialog.h" line="124"/> + <source>Select Target for projection</source> + <translation type="unfinished"></translation> + </message> +</context> +</TS> diff --git a/i18n/pvsmgr_es_MX.ts b/i18n/pvsmgr_es_MX.ts new file mode 100644 index 0000000..bc5c69c --- /dev/null +++ b/i18n/pvsmgr_es_MX.ts @@ -0,0 +1,838 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.0"> +<context> + <name>AboutDialog</name> + <message> + <location filename="../src/gui/aboutDialog.cpp" line="27"/> + <source>Version: </source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>AboutDialogClass</name> + <message> + <location filename="../build/ui_aboutDialog.h" line="213"/> + <source>PVS - About</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_aboutDialog.h" line="215"/> + <source><a href="http://www.gnu.org/licenses/gpl-2.0.txt">License: GNU General Public License Version 2</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_aboutDialog.h" line="216"/> + <source>About</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_aboutDialog.h" line="218"/> + <source>Authors</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_aboutDialog.h" line="219"/> + <source>Translation</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>ClientFileSendDialogClass</name> + <message> + <location filename="../build/ui_clientFileSendDialog.h" line="123"/> + <source>PVS - File Transfer</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientFileSendDialog.h" line="125"/> + <source>Sending to:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientFileSendDialog.h" line="126"/> + <source>unknown</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientFileSendDialog.h" line="127"/> + <location filename="../build/ui_clientFileSendDialog.h" line="129"/> + <source>0</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientFileSendDialog.h" line="128"/> + <source>/</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientFileSendDialog.h" line="130"/> + <source>&Cancel</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>ConnectionFrame</name> + <message> + <location filename="../src/gui/connectionFrame.cpp" line="100"/> + <source>&Remove dummy...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionFrame.cpp" line="102"/> + <source>&Lock Client(s)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionFrame.cpp" line="104"/> + <source>&Unlock Client(s)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionFrame.cpp" line="112"/> + <source>&MsgLock Client(s)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionFrame.cpp" line="114"/> + <source>&MsgLock all Client(s)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionFrame.cpp" line="116"/> + <source>&Message Client(s)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionFrame.cpp" line="118"/> + <source>&Projection</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionFrame.cpp" line="120"/> + <source>&Unprojection</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>ConnectionList</name> + <message> + <location filename="../src/gui/connectionList.cpp" line="31"/> + <source>Name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionList.cpp" line="32"/> + <source>IP</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionList.cpp" line="33"/> + <source>Username</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionList.cpp" line="70"/> + <source>&Lock Client(s)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionList.cpp" line="72"/> + <source>&Unlock Client(s)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionList.cpp" line="80"/> + <source>&MsgLock Client(s)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionList.cpp" line="82"/> + <source>&MsgLock all Client(s)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionList.cpp" line="84"/> + <source>&Message Client(s)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionList.cpp" line="87"/> + <source>&Projection</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionList.cpp" line="89"/> + <source>&Unprojection</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionList.cpp" line="309"/> + <source>No Target is available for a projection! +Perform an unprojection to get a target.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionList.cpp" line="317"/> + <source>This source is already in a projection process involved. + You can perform a unprojection on it to get it free.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionList.cpp" line="349"/> + <location filename="../src/gui/connectionList.cpp" line="355"/> + <location filename="../src/gui/connectionList.cpp" line="430"/> + <source>To perform a projection you have to select only one source in a list with more than one index!</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionList.cpp" line="372"/> + <location filename="../src/gui/connectionList.cpp" line="378"/> + <source>An unprojection is only possible on a selected source that is involved in a projection process, in a list with more than one index!</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionList.cpp" line="391"/> + <source>No Target is available for remote Help! +Perform an unprojection or remove remote help to get a target.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionList.cpp" line="399"/> + <source>This source is already in a projection or remote Help process involved. + You can perform a unprojection or remove remote Help on it to get it free.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>ConnectionWindow</name> + <message> + <location filename="../src/gui/connectionWindow.cpp" line="34"/> + <source>&Add a dummy...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionWindow.cpp" line="342"/> + <location filename="../src/gui/connectionWindow.cpp" line="479"/> + <location filename="../src/gui/connectionWindow.cpp" line="516"/> + <source>You have to set a Superclient-machine before performing this action.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>Dialog</name> + <message> + <location filename="../src/gui/dialog.cpp" line="29"/> + <source>Enter the Text for the client(s)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_profileDialog.h" line="167"/> + <source>ProfileDialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_profileDialog.h" line="168"/> + <source>background-color: rgb(255, 255, 255);</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_profileDialog.h" line="169"/> + <source>&Remove</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_profileDialog.h" line="170"/> + <source>&Edit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_profileDialog.h" line="171"/> + <source>&New</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_profileDialog.h" line="172"/> + <source>&Load</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_profileDialog.h" line="173"/> + <source>Add</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_profileDialog.h" line="174"/> + <source>Close</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>Frame</name> + <message> + <location filename="../src/gui/frame.cpp" line="49"/> + <source>View</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/frame.cpp" line="50"/> + <source>Foto</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/frame.cpp" line="51"/> + <location filename="../src/gui/frame.cpp" line="276"/> + <source>Lock this client</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/frame.cpp" line="53"/> + <source>Set as Superclient</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/frame.cpp" line="271"/> + <source>Unlock this client</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/frame.cpp" line="311"/> + <source>You can't lock a Superclient-machine.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/frame.cpp" line="320"/> + <source>Set client as Superclient</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/frame.cpp" line="327"/> + <source>Unset client as Superclient</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>MainWindow</name> + <message> + <location filename="../build/ui_mainwindow.h" line="403"/> + <location filename="../src/gui/mainWindow.cpp" line="120"/> + <source>Exit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/mainWindow.cpp" line="122"/> + <source>Remove the vnc-Connection for the selected client(s)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/mainWindow.cpp" line="125"/> + <source>Show the selected client in the whole window</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/mainWindow.cpp" line="129"/> + <source>Make a screenshot for the selected client(s)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="418"/> + <location filename="../src/gui/mainWindow.cpp" line="130"/> + <source>Lock or Unlock all Clients</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/mainWindow.cpp" line="151"/> + <source>The pvs manager</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/mainWindow.cpp" line="740"/> + <source>This operation can only be performed for one selected Client!</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/mainWindow.cpp" line="792"/> + <source>This operation can only be performed for at least one selected Client!</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/mainWindow.cpp" line="1061"/> + <source>You have to set a Superclient-machine before performing this action.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/mainWindow.cpp" line="1141"/> + <source>Open Image</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/mainWindow.cpp" line="1141"/> + <source>Image Files (*.png *.jpg *.svg)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="376"/> + <source>PVSmgr</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="377"/> + <source>Show Username</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="378"/> + <source>Ctrl+3</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="379"/> + <source>Show IP</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="380"/> + <source>Ctrl+2</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="381"/> + <source>VNC-Placeholders</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="382"/> + <source>Show Log</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="383"/> + <source>Ctrl+L</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="384"/> + <source>Show Normal</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="385"/> + <source>Ctrl+O</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="386"/> + <source>Show Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="387"/> + <source>Ctrl+E</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="388"/> + <source>Show Network</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="389"/> + <source>Ctrl+N</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="390"/> + <source>Show Terminal</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="391"/> + <source>Ctrl+T</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="392"/> + <source>Show Chat</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="393"/> + <source>Ctrl+G</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="394"/> + <source>About pvs</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="395"/> + <source>Ctrl+P</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="396"/> + <source>100 x 100</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="397"/> + <source>200 x 200</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="398"/> + <source>500 x 500</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="399"/> + <source>&Disconnect</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="400"/> + <source>Ctrl+W</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="401"/> + <source>&Exit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="405"/> + <source>Ctrl+Q</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="406"/> + <location filename="../build/ui_mainwindow.h" line="408"/> + <source>Foto</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="410"/> + <source>Ctrl+F</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="411"/> + <source>view</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="413"/> + <source>View</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="415"/> + <source>Ctrl+V</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="416"/> + <source>lock</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="420"/> + <source>Ctrl+A</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="421"/> + <source>Profile &manager</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="422"/> + <source>Ctrl+M</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="423"/> + <source>Show Name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="424"/> + <source>Ctrl+1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="425"/> + <source>Chat</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="427"/> + <source>Start Chat with client(s)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="429"/> + <source>Ctrl+D</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="430"/> + <source>-</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="431"/> + <source>border-color: rgb(0, 0, 0);</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="432"/> + <source>VNC quality</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="435"/> + <source>HIGH</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="436"/> + <source>MEDIUM</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="437"/> + <source>LOW</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="439"/> + <source>Set password</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="442"/> + <source>Thumbnailratio</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="443"/> + <source>Thumbnailrate</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="445"/> + <source> 0</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="446"/> + <source>%</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="447"/> + <source>background-color: rgb(255, 255, 255);</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="448"/> + <source>background-color: rgb(150, 150, 150);</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="449"/> + <source>&File</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="450"/> + <source>Load profile </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="451"/> + <source>&Clients</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="452"/> + <source>&Logging</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="453"/> + <source>&Help</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="454"/> + <source>toolBar</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>MsgDialog</name> + <message> + <location filename="../build/ui_dialog.h" line="85"/> + <source>Dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_dialog.h" line="86"/> + <source>Cancel</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_dialog.h" line="87"/> + <source>Send</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>ProjectionDialog</name> + <message> + <location filename="../src/gui/projectionDialog.cpp" line="28"/> + <source>Target for Projection</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>ServerChatDialog</name> + <message> + <location filename="../src/gui/serverChatDialog.cpp" line="39"/> + <source>&Send File...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/serverChatDialog.cpp" line="119"/> + <source> has joined the chat.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/serverChatDialog.cpp" line="125"/> + <source> has left the chat.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/serverChatDialog.cpp" line="231"/> + <source>PVS File Transfer with </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/serverChatDialog.cpp" line="232"/> + <source>Send file '</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/serverChatDialog.cpp" line="232"/> + <source>' to </source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>ServerChatDialogClass</name> + <message> + <location filename="../build/ui_serverChatDialog.h" line="115"/> + <source>PVSmgr - Chat </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_serverChatDialog.h" line="116"/> + <source>&Send</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>ServerFileTransfert</name> + <message> + <location filename="../src/gui/serverFileTransfert.cpp" line="35"/> + <location filename="../src/gui/serverFileTransfert.cpp" line="130"/> + <source>Open File</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/serverFileTransfert.cpp" line="118"/> + <source>PVS File Transfer</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/serverFileTransfert.cpp" line="118"/> + <source>User '</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/serverFileTransfert.cpp" line="119"/> + <source>' would like to send you a file: </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/serverFileTransfert.cpp" line="238"/> + <location filename="../src/gui/serverFileTransfert.cpp" line="244"/> + <source>PVS - File Transfer</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/serverFileTransfert.cpp" line="239"/> + <source>File Transfer complete.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/serverFileTransfert.cpp" line="245"/> + <source>File Transfer canceled!</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>profileDialog</name> + <message> + <location filename="../src/gui/profileDialog.cpp" line="32"/> + <source>Profile</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/profileDialog.cpp" line="96"/> + <source>This field can't be empty.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/profileDialog.cpp" line="102"/> + <source>This name is already in the list.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/profileDialog.cpp" line="150"/> + <source>You can only load one profile at time</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>projectionDialog</name> + <message> + <location filename="../build/ui_projectionDialog.h" line="120"/> + <source>Dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_projectionDialog.h" line="121"/> + <source>Select all</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_projectionDialog.h" line="122"/> + <source>Cancel</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_projectionDialog.h" line="123"/> + <source>Project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_projectionDialog.h" line="124"/> + <source>Select Target for projection</source> + <translation type="unfinished"></translation> + </message> +</context> +</TS> diff --git a/i18n/pvsmgr_fr_FR.ts b/i18n/pvsmgr_fr_FR.ts new file mode 100644 index 0000000..bc5c69c --- /dev/null +++ b/i18n/pvsmgr_fr_FR.ts @@ -0,0 +1,838 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.0"> +<context> + <name>AboutDialog</name> + <message> + <location filename="../src/gui/aboutDialog.cpp" line="27"/> + <source>Version: </source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>AboutDialogClass</name> + <message> + <location filename="../build/ui_aboutDialog.h" line="213"/> + <source>PVS - About</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_aboutDialog.h" line="215"/> + <source><a href="http://www.gnu.org/licenses/gpl-2.0.txt">License: GNU General Public License Version 2</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_aboutDialog.h" line="216"/> + <source>About</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_aboutDialog.h" line="218"/> + <source>Authors</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_aboutDialog.h" line="219"/> + <source>Translation</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>ClientFileSendDialogClass</name> + <message> + <location filename="../build/ui_clientFileSendDialog.h" line="123"/> + <source>PVS - File Transfer</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientFileSendDialog.h" line="125"/> + <source>Sending to:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientFileSendDialog.h" line="126"/> + <source>unknown</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientFileSendDialog.h" line="127"/> + <location filename="../build/ui_clientFileSendDialog.h" line="129"/> + <source>0</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientFileSendDialog.h" line="128"/> + <source>/</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientFileSendDialog.h" line="130"/> + <source>&Cancel</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>ConnectionFrame</name> + <message> + <location filename="../src/gui/connectionFrame.cpp" line="100"/> + <source>&Remove dummy...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionFrame.cpp" line="102"/> + <source>&Lock Client(s)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionFrame.cpp" line="104"/> + <source>&Unlock Client(s)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionFrame.cpp" line="112"/> + <source>&MsgLock Client(s)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionFrame.cpp" line="114"/> + <source>&MsgLock all Client(s)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionFrame.cpp" line="116"/> + <source>&Message Client(s)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionFrame.cpp" line="118"/> + <source>&Projection</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionFrame.cpp" line="120"/> + <source>&Unprojection</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>ConnectionList</name> + <message> + <location filename="../src/gui/connectionList.cpp" line="31"/> + <source>Name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionList.cpp" line="32"/> + <source>IP</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionList.cpp" line="33"/> + <source>Username</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionList.cpp" line="70"/> + <source>&Lock Client(s)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionList.cpp" line="72"/> + <source>&Unlock Client(s)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionList.cpp" line="80"/> + <source>&MsgLock Client(s)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionList.cpp" line="82"/> + <source>&MsgLock all Client(s)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionList.cpp" line="84"/> + <source>&Message Client(s)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionList.cpp" line="87"/> + <source>&Projection</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionList.cpp" line="89"/> + <source>&Unprojection</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionList.cpp" line="309"/> + <source>No Target is available for a projection! +Perform an unprojection to get a target.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionList.cpp" line="317"/> + <source>This source is already in a projection process involved. + You can perform a unprojection on it to get it free.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionList.cpp" line="349"/> + <location filename="../src/gui/connectionList.cpp" line="355"/> + <location filename="../src/gui/connectionList.cpp" line="430"/> + <source>To perform a projection you have to select only one source in a list with more than one index!</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionList.cpp" line="372"/> + <location filename="../src/gui/connectionList.cpp" line="378"/> + <source>An unprojection is only possible on a selected source that is involved in a projection process, in a list with more than one index!</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionList.cpp" line="391"/> + <source>No Target is available for remote Help! +Perform an unprojection or remove remote help to get a target.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionList.cpp" line="399"/> + <source>This source is already in a projection or remote Help process involved. + You can perform a unprojection or remove remote Help on it to get it free.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>ConnectionWindow</name> + <message> + <location filename="../src/gui/connectionWindow.cpp" line="34"/> + <source>&Add a dummy...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionWindow.cpp" line="342"/> + <location filename="../src/gui/connectionWindow.cpp" line="479"/> + <location filename="../src/gui/connectionWindow.cpp" line="516"/> + <source>You have to set a Superclient-machine before performing this action.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>Dialog</name> + <message> + <location filename="../src/gui/dialog.cpp" line="29"/> + <source>Enter the Text for the client(s)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_profileDialog.h" line="167"/> + <source>ProfileDialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_profileDialog.h" line="168"/> + <source>background-color: rgb(255, 255, 255);</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_profileDialog.h" line="169"/> + <source>&Remove</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_profileDialog.h" line="170"/> + <source>&Edit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_profileDialog.h" line="171"/> + <source>&New</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_profileDialog.h" line="172"/> + <source>&Load</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_profileDialog.h" line="173"/> + <source>Add</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_profileDialog.h" line="174"/> + <source>Close</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>Frame</name> + <message> + <location filename="../src/gui/frame.cpp" line="49"/> + <source>View</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/frame.cpp" line="50"/> + <source>Foto</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/frame.cpp" line="51"/> + <location filename="../src/gui/frame.cpp" line="276"/> + <source>Lock this client</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/frame.cpp" line="53"/> + <source>Set as Superclient</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/frame.cpp" line="271"/> + <source>Unlock this client</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/frame.cpp" line="311"/> + <source>You can't lock a Superclient-machine.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/frame.cpp" line="320"/> + <source>Set client as Superclient</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/frame.cpp" line="327"/> + <source>Unset client as Superclient</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>MainWindow</name> + <message> + <location filename="../build/ui_mainwindow.h" line="403"/> + <location filename="../src/gui/mainWindow.cpp" line="120"/> + <source>Exit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/mainWindow.cpp" line="122"/> + <source>Remove the vnc-Connection for the selected client(s)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/mainWindow.cpp" line="125"/> + <source>Show the selected client in the whole window</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/mainWindow.cpp" line="129"/> + <source>Make a screenshot for the selected client(s)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="418"/> + <location filename="../src/gui/mainWindow.cpp" line="130"/> + <source>Lock or Unlock all Clients</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/mainWindow.cpp" line="151"/> + <source>The pvs manager</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/mainWindow.cpp" line="740"/> + <source>This operation can only be performed for one selected Client!</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/mainWindow.cpp" line="792"/> + <source>This operation can only be performed for at least one selected Client!</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/mainWindow.cpp" line="1061"/> + <source>You have to set a Superclient-machine before performing this action.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/mainWindow.cpp" line="1141"/> + <source>Open Image</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/mainWindow.cpp" line="1141"/> + <source>Image Files (*.png *.jpg *.svg)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="376"/> + <source>PVSmgr</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="377"/> + <source>Show Username</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="378"/> + <source>Ctrl+3</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="379"/> + <source>Show IP</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="380"/> + <source>Ctrl+2</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="381"/> + <source>VNC-Placeholders</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="382"/> + <source>Show Log</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="383"/> + <source>Ctrl+L</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="384"/> + <source>Show Normal</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="385"/> + <source>Ctrl+O</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="386"/> + <source>Show Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="387"/> + <source>Ctrl+E</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="388"/> + <source>Show Network</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="389"/> + <source>Ctrl+N</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="390"/> + <source>Show Terminal</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="391"/> + <source>Ctrl+T</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="392"/> + <source>Show Chat</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="393"/> + <source>Ctrl+G</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="394"/> + <source>About pvs</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="395"/> + <source>Ctrl+P</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="396"/> + <source>100 x 100</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="397"/> + <source>200 x 200</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="398"/> + <source>500 x 500</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="399"/> + <source>&Disconnect</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="400"/> + <source>Ctrl+W</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="401"/> + <source>&Exit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="405"/> + <source>Ctrl+Q</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="406"/> + <location filename="../build/ui_mainwindow.h" line="408"/> + <source>Foto</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="410"/> + <source>Ctrl+F</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="411"/> + <source>view</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="413"/> + <source>View</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="415"/> + <source>Ctrl+V</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="416"/> + <source>lock</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="420"/> + <source>Ctrl+A</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="421"/> + <source>Profile &manager</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="422"/> + <source>Ctrl+M</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="423"/> + <source>Show Name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="424"/> + <source>Ctrl+1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="425"/> + <source>Chat</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="427"/> + <source>Start Chat with client(s)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="429"/> + <source>Ctrl+D</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="430"/> + <source>-</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="431"/> + <source>border-color: rgb(0, 0, 0);</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="432"/> + <source>VNC quality</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="435"/> + <source>HIGH</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="436"/> + <source>MEDIUM</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="437"/> + <source>LOW</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="439"/> + <source>Set password</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="442"/> + <source>Thumbnailratio</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="443"/> + <source>Thumbnailrate</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="445"/> + <source> 0</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="446"/> + <source>%</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="447"/> + <source>background-color: rgb(255, 255, 255);</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="448"/> + <source>background-color: rgb(150, 150, 150);</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="449"/> + <source>&File</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="450"/> + <source>Load profile </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="451"/> + <source>&Clients</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="452"/> + <source>&Logging</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="453"/> + <source>&Help</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="454"/> + <source>toolBar</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>MsgDialog</name> + <message> + <location filename="../build/ui_dialog.h" line="85"/> + <source>Dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_dialog.h" line="86"/> + <source>Cancel</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_dialog.h" line="87"/> + <source>Send</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>ProjectionDialog</name> + <message> + <location filename="../src/gui/projectionDialog.cpp" line="28"/> + <source>Target for Projection</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>ServerChatDialog</name> + <message> + <location filename="../src/gui/serverChatDialog.cpp" line="39"/> + <source>&Send File...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/serverChatDialog.cpp" line="119"/> + <source> has joined the chat.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/serverChatDialog.cpp" line="125"/> + <source> has left the chat.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/serverChatDialog.cpp" line="231"/> + <source>PVS File Transfer with </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/serverChatDialog.cpp" line="232"/> + <source>Send file '</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/serverChatDialog.cpp" line="232"/> + <source>' to </source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>ServerChatDialogClass</name> + <message> + <location filename="../build/ui_serverChatDialog.h" line="115"/> + <source>PVSmgr - Chat </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_serverChatDialog.h" line="116"/> + <source>&Send</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>ServerFileTransfert</name> + <message> + <location filename="../src/gui/serverFileTransfert.cpp" line="35"/> + <location filename="../src/gui/serverFileTransfert.cpp" line="130"/> + <source>Open File</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/serverFileTransfert.cpp" line="118"/> + <source>PVS File Transfer</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/serverFileTransfert.cpp" line="118"/> + <source>User '</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/serverFileTransfert.cpp" line="119"/> + <source>' would like to send you a file: </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/serverFileTransfert.cpp" line="238"/> + <location filename="../src/gui/serverFileTransfert.cpp" line="244"/> + <source>PVS - File Transfer</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/serverFileTransfert.cpp" line="239"/> + <source>File Transfer complete.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/serverFileTransfert.cpp" line="245"/> + <source>File Transfer canceled!</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>profileDialog</name> + <message> + <location filename="../src/gui/profileDialog.cpp" line="32"/> + <source>Profile</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/profileDialog.cpp" line="96"/> + <source>This field can't be empty.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/profileDialog.cpp" line="102"/> + <source>This name is already in the list.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/profileDialog.cpp" line="150"/> + <source>You can only load one profile at time</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>projectionDialog</name> + <message> + <location filename="../build/ui_projectionDialog.h" line="120"/> + <source>Dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_projectionDialog.h" line="121"/> + <source>Select all</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_projectionDialog.h" line="122"/> + <source>Cancel</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_projectionDialog.h" line="123"/> + <source>Project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_projectionDialog.h" line="124"/> + <source>Select Target for projection</source> + <translation type="unfinished"></translation> + </message> +</context> +</TS> diff --git a/i18n/pvsmgr_pl_PL.ts b/i18n/pvsmgr_pl_PL.ts new file mode 100644 index 0000000..bc5c69c --- /dev/null +++ b/i18n/pvsmgr_pl_PL.ts @@ -0,0 +1,838 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.0"> +<context> + <name>AboutDialog</name> + <message> + <location filename="../src/gui/aboutDialog.cpp" line="27"/> + <source>Version: </source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>AboutDialogClass</name> + <message> + <location filename="../build/ui_aboutDialog.h" line="213"/> + <source>PVS - About</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_aboutDialog.h" line="215"/> + <source><a href="http://www.gnu.org/licenses/gpl-2.0.txt">License: GNU General Public License Version 2</a></source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_aboutDialog.h" line="216"/> + <source>About</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_aboutDialog.h" line="218"/> + <source>Authors</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_aboutDialog.h" line="219"/> + <source>Translation</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>ClientFileSendDialogClass</name> + <message> + <location filename="../build/ui_clientFileSendDialog.h" line="123"/> + <source>PVS - File Transfer</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientFileSendDialog.h" line="125"/> + <source>Sending to:</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientFileSendDialog.h" line="126"/> + <source>unknown</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientFileSendDialog.h" line="127"/> + <location filename="../build/ui_clientFileSendDialog.h" line="129"/> + <source>0</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientFileSendDialog.h" line="128"/> + <source>/</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_clientFileSendDialog.h" line="130"/> + <source>&Cancel</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>ConnectionFrame</name> + <message> + <location filename="../src/gui/connectionFrame.cpp" line="100"/> + <source>&Remove dummy...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionFrame.cpp" line="102"/> + <source>&Lock Client(s)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionFrame.cpp" line="104"/> + <source>&Unlock Client(s)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionFrame.cpp" line="112"/> + <source>&MsgLock Client(s)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionFrame.cpp" line="114"/> + <source>&MsgLock all Client(s)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionFrame.cpp" line="116"/> + <source>&Message Client(s)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionFrame.cpp" line="118"/> + <source>&Projection</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionFrame.cpp" line="120"/> + <source>&Unprojection</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>ConnectionList</name> + <message> + <location filename="../src/gui/connectionList.cpp" line="31"/> + <source>Name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionList.cpp" line="32"/> + <source>IP</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionList.cpp" line="33"/> + <source>Username</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionList.cpp" line="70"/> + <source>&Lock Client(s)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionList.cpp" line="72"/> + <source>&Unlock Client(s)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionList.cpp" line="80"/> + <source>&MsgLock Client(s)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionList.cpp" line="82"/> + <source>&MsgLock all Client(s)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionList.cpp" line="84"/> + <source>&Message Client(s)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionList.cpp" line="87"/> + <source>&Projection</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionList.cpp" line="89"/> + <source>&Unprojection</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionList.cpp" line="309"/> + <source>No Target is available for a projection! +Perform an unprojection to get a target.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionList.cpp" line="317"/> + <source>This source is already in a projection process involved. + You can perform a unprojection on it to get it free.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionList.cpp" line="349"/> + <location filename="../src/gui/connectionList.cpp" line="355"/> + <location filename="../src/gui/connectionList.cpp" line="430"/> + <source>To perform a projection you have to select only one source in a list with more than one index!</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionList.cpp" line="372"/> + <location filename="../src/gui/connectionList.cpp" line="378"/> + <source>An unprojection is only possible on a selected source that is involved in a projection process, in a list with more than one index!</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionList.cpp" line="391"/> + <source>No Target is available for remote Help! +Perform an unprojection or remove remote help to get a target.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionList.cpp" line="399"/> + <source>This source is already in a projection or remote Help process involved. + You can perform a unprojection or remove remote Help on it to get it free.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>ConnectionWindow</name> + <message> + <location filename="../src/gui/connectionWindow.cpp" line="34"/> + <source>&Add a dummy...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/connectionWindow.cpp" line="342"/> + <location filename="../src/gui/connectionWindow.cpp" line="479"/> + <location filename="../src/gui/connectionWindow.cpp" line="516"/> + <source>You have to set a Superclient-machine before performing this action.</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>Dialog</name> + <message> + <location filename="../src/gui/dialog.cpp" line="29"/> + <source>Enter the Text for the client(s)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_profileDialog.h" line="167"/> + <source>ProfileDialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_profileDialog.h" line="168"/> + <source>background-color: rgb(255, 255, 255);</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_profileDialog.h" line="169"/> + <source>&Remove</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_profileDialog.h" line="170"/> + <source>&Edit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_profileDialog.h" line="171"/> + <source>&New</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_profileDialog.h" line="172"/> + <source>&Load</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_profileDialog.h" line="173"/> + <source>Add</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_profileDialog.h" line="174"/> + <source>Close</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>Frame</name> + <message> + <location filename="../src/gui/frame.cpp" line="49"/> + <source>View</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/frame.cpp" line="50"/> + <source>Foto</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/frame.cpp" line="51"/> + <location filename="../src/gui/frame.cpp" line="276"/> + <source>Lock this client</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/frame.cpp" line="53"/> + <source>Set as Superclient</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/frame.cpp" line="271"/> + <source>Unlock this client</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/frame.cpp" line="311"/> + <source>You can't lock a Superclient-machine.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/frame.cpp" line="320"/> + <source>Set client as Superclient</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/frame.cpp" line="327"/> + <source>Unset client as Superclient</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>MainWindow</name> + <message> + <location filename="../build/ui_mainwindow.h" line="403"/> + <location filename="../src/gui/mainWindow.cpp" line="120"/> + <source>Exit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/mainWindow.cpp" line="122"/> + <source>Remove the vnc-Connection for the selected client(s)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/mainWindow.cpp" line="125"/> + <source>Show the selected client in the whole window</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/mainWindow.cpp" line="129"/> + <source>Make a screenshot for the selected client(s)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="418"/> + <location filename="../src/gui/mainWindow.cpp" line="130"/> + <source>Lock or Unlock all Clients</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/mainWindow.cpp" line="151"/> + <source>The pvs manager</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/mainWindow.cpp" line="740"/> + <source>This operation can only be performed for one selected Client!</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/mainWindow.cpp" line="792"/> + <source>This operation can only be performed for at least one selected Client!</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/mainWindow.cpp" line="1061"/> + <source>You have to set a Superclient-machine before performing this action.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/mainWindow.cpp" line="1141"/> + <source>Open Image</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/mainWindow.cpp" line="1141"/> + <source>Image Files (*.png *.jpg *.svg)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="376"/> + <source>PVSmgr</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="377"/> + <source>Show Username</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="378"/> + <source>Ctrl+3</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="379"/> + <source>Show IP</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="380"/> + <source>Ctrl+2</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="381"/> + <source>VNC-Placeholders</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="382"/> + <source>Show Log</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="383"/> + <source>Ctrl+L</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="384"/> + <source>Show Normal</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="385"/> + <source>Ctrl+O</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="386"/> + <source>Show Error</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="387"/> + <source>Ctrl+E</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="388"/> + <source>Show Network</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="389"/> + <source>Ctrl+N</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="390"/> + <source>Show Terminal</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="391"/> + <source>Ctrl+T</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="392"/> + <source>Show Chat</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="393"/> + <source>Ctrl+G</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="394"/> + <source>About pvs</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="395"/> + <source>Ctrl+P</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="396"/> + <source>100 x 100</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="397"/> + <source>200 x 200</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="398"/> + <source>500 x 500</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="399"/> + <source>&Disconnect</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="400"/> + <source>Ctrl+W</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="401"/> + <source>&Exit</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="405"/> + <source>Ctrl+Q</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="406"/> + <location filename="../build/ui_mainwindow.h" line="408"/> + <source>Foto</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="410"/> + <source>Ctrl+F</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="411"/> + <source>view</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="413"/> + <source>View</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="415"/> + <source>Ctrl+V</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="416"/> + <source>lock</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="420"/> + <source>Ctrl+A</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="421"/> + <source>Profile &manager</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="422"/> + <source>Ctrl+M</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="423"/> + <source>Show Name</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="424"/> + <source>Ctrl+1</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="425"/> + <source>Chat</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="427"/> + <source>Start Chat with client(s)</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="429"/> + <source>Ctrl+D</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="430"/> + <source>-</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="431"/> + <source>border-color: rgb(0, 0, 0);</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="432"/> + <source>VNC quality</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="435"/> + <source>HIGH</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="436"/> + <source>MEDIUM</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="437"/> + <source>LOW</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="439"/> + <source>Set password</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="442"/> + <source>Thumbnailratio</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="443"/> + <source>Thumbnailrate</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="445"/> + <source> 0</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="446"/> + <source>%</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="447"/> + <source>background-color: rgb(255, 255, 255);</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="448"/> + <source>background-color: rgb(150, 150, 150);</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="449"/> + <source>&File</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="450"/> + <source>Load profile </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="451"/> + <source>&Clients</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="452"/> + <source>&Logging</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="453"/> + <source>&Help</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_mainwindow.h" line="454"/> + <source>toolBar</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>MsgDialog</name> + <message> + <location filename="../build/ui_dialog.h" line="85"/> + <source>Dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_dialog.h" line="86"/> + <source>Cancel</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_dialog.h" line="87"/> + <source>Send</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>ProjectionDialog</name> + <message> + <location filename="../src/gui/projectionDialog.cpp" line="28"/> + <source>Target for Projection</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>ServerChatDialog</name> + <message> + <location filename="../src/gui/serverChatDialog.cpp" line="39"/> + <source>&Send File...</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/serverChatDialog.cpp" line="119"/> + <source> has joined the chat.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/serverChatDialog.cpp" line="125"/> + <source> has left the chat.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/serverChatDialog.cpp" line="231"/> + <source>PVS File Transfer with </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/serverChatDialog.cpp" line="232"/> + <source>Send file '</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/serverChatDialog.cpp" line="232"/> + <source>' to </source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>ServerChatDialogClass</name> + <message> + <location filename="../build/ui_serverChatDialog.h" line="115"/> + <source>PVSmgr - Chat </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_serverChatDialog.h" line="116"/> + <source>&Send</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>ServerFileTransfert</name> + <message> + <location filename="../src/gui/serverFileTransfert.cpp" line="35"/> + <location filename="../src/gui/serverFileTransfert.cpp" line="130"/> + <source>Open File</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/serverFileTransfert.cpp" line="118"/> + <source>PVS File Transfer</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/serverFileTransfert.cpp" line="118"/> + <source>User '</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/serverFileTransfert.cpp" line="119"/> + <source>' would like to send you a file: </source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/serverFileTransfert.cpp" line="238"/> + <location filename="../src/gui/serverFileTransfert.cpp" line="244"/> + <source>PVS - File Transfer</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/serverFileTransfert.cpp" line="239"/> + <source>File Transfer complete.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/serverFileTransfert.cpp" line="245"/> + <source>File Transfer canceled!</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>profileDialog</name> + <message> + <location filename="../src/gui/profileDialog.cpp" line="32"/> + <source>Profile</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/profileDialog.cpp" line="96"/> + <source>This field can't be empty.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/profileDialog.cpp" line="102"/> + <source>This name is already in the list.</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../src/gui/profileDialog.cpp" line="150"/> + <source>You can only load one profile at time</source> + <translation type="unfinished"></translation> + </message> +</context> +<context> + <name>projectionDialog</name> + <message> + <location filename="../build/ui_projectionDialog.h" line="120"/> + <source>Dialog</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_projectionDialog.h" line="121"/> + <source>Select all</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_projectionDialog.h" line="122"/> + <source>Cancel</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_projectionDialog.h" line="123"/> + <source>Project</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../build/ui_projectionDialog.h" line="124"/> + <source>Select Target for projection</source> + <translation type="unfinished"></translation> + </message> +</context> +</TS> diff --git a/icons/cam32.svg b/icons/cam32.svg new file mode 100644 index 0000000..99a4b06 --- /dev/null +++ b/icons/cam32.svg @@ -0,0 +1,96 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="32" + height="32" + id="svg2" + sodipodi:version="0.32" + inkscape:version="0.46" + sodipodi:docname="cam.svg" + inkscape:output_extension="org.inkscape.output.svg.inkscape" + version="1.0" + style="display:inline" + enable-background="new"> + <defs + id="defs4"> + <inkscape:perspective + sodipodi:type="inkscape:persp3d" + inkscape:vp_x="0 : 16 : 1" + inkscape:vp_y="0 : 1000 : 0" + inkscape:vp_z="32 : 16 : 1" + inkscape:persp3d-origin="16 : 10.666667 : 1" + id="perspective2476" /> + <filter + inkscape:collect="always" + id="filter3249"> + <feBlend + inkscape:collect="always" + mode="lighten" + in2="BackgroundImage" + id="feBlend3251" /> + </filter> + </defs> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="11.2" + inkscape:cx="3.9355814" + inkscape:cy="22.577414" + inkscape:document-units="px" + inkscape:current-layer="layer2" + showgrid="true" + objecttolerance="10000" + gridtolerance="10000" + guidetolerance="10000" + inkscape:window-width="1920" + inkscape:window-height="1150" + inkscape:window-x="-4" + inkscape:window-y="-3"> + <inkscape:grid + type="xygrid" + id="grid2410" + visible="true" + enabled="true" + dotted="false" /> + </sodipodi:namedview> + <metadata + id="metadata7"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:groupmode="layer" + id="layer2" + inkscape:label="Zeichnung" + style="display:inline;filter:url(#filter3249)"> + <path + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.31199998;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + d="M 7.7249594,2.1626795 C 4.4957594,2.1626795 1.8749594,4.7834796 1.8749594,8.0126796 C 1.8749594,10.095133 2.9648234,11.924089 4.6049594,12.960804 L 4.6049594,19.32268 C 4.6049594,20.18692 5.3007194,20.88268 6.1649594,20.88268 L 9.2264598,20.88268 L 4.5869594,28.275054 C 4.3708994,28.649282 4.5003554,29.126622 4.8745754,29.34268 L 5.5473314,29.73268 C 5.9215634,29.94874 6.3988994,29.819277 6.6149594,29.445054 L 11.927204,20.88268 L 13.662704,20.88268 L 18.97496,29.445054 C 19.19102,29.819282 19.668356,29.948735 20.042576,29.73268 L 20.715332,29.34268 C 21.089564,29.12662 21.21902,28.649278 21.00296,28.275054 L 16.36346,20.88268 L 20.20496,20.88268 C 21.0692,20.88268 21.76496,20.18692 21.76496,19.32268 L 21.76496,18.46468 C 22.325624,18.204431 24.411872,17.382582 26.28896,18.54268 C 27.179144,19.092846 27.270764,20.488512 28.16096,21.03868 C 28.758116,21.407742 29.279804,21.407742 29.87696,21.03868 C 30.322052,20.763596 30.032288,20.31392 30.03296,19.79068 C 30.035804,17.190681 30.035804,15.214679 30.03296,12.61468 C 30.032288,12.09144 30.322052,11.641764 29.87696,11.36668 C 29.279804,10.997616 28.758116,10.997616 28.16096,11.36668 C 27.270764,11.916846 27.179144,13.312512 26.28896,13.86268 C 24.411668,15.02291 22.325348,14.195954 21.76496,13.935804 L 21.76496,12.960804 C 23.405096,11.924089 24.49496,10.095133 24.49496,8.0126796 C 24.49496,4.7834796 21.87416,2.1626795 18.64496,2.1626795 C 16.155776,2.1626795 14.029412,3.7187916 13.18496,5.911554 C 12.340496,3.7187916 10.214132,2.1626795 7.7249594,2.1626795 z" + id="rect3212" + sodipodi:nodetypes="csccccccccccccccccccssssssssccsscc" /> + <rect + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="rect3235" + width="0" + height="3" + x="-25" + y="-26" /> + </g> +</svg> diff --git a/icons/cam_off32.svg b/icons/cam_off32.svg new file mode 100644 index 0000000..2df7e9c --- /dev/null +++ b/icons/cam_off32.svg @@ -0,0 +1,109 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="32" + height="32" + id="svg2" + sodipodi:version="0.32" + inkscape:version="0.47 r22583" + sodipodi:docname="cam_on32.svg" + inkscape:output_extension="org.inkscape.output.svg.inkscape" + version="1.0" + style="display:inline" + enable-background="new"> + <defs + id="defs4"> + <inkscape:perspective + sodipodi:type="inkscape:persp3d" + inkscape:vp_x="0 : 16 : 1" + inkscape:vp_y="0 : 1000 : 0" + inkscape:vp_z="32 : 16 : 1" + inkscape:persp3d-origin="16 : 10.666667 : 1" + id="perspective2476" /> + <filter + inkscape:collect="always" + id="filter3249"> + <feBlend + inkscape:collect="always" + mode="lighten" + in2="BackgroundImage" + id="feBlend3251" /> + </filter> + </defs> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="11.02381" + inkscape:cx="10.394302" + inkscape:cy="19.913197" + inkscape:document-units="px" + inkscape:current-layer="layer2" + showgrid="true" + objecttolerance="10000" + gridtolerance="10000" + guidetolerance="10000" + inkscape:window-width="1024" + inkscape:window-height="710" + inkscape:window-x="-4" + inkscape:window-y="-3" + inkscape:window-maximized="1"> + <inkscape:grid + type="xygrid" + id="grid2410" + visible="true" + enabled="true" + dotted="false" /> + </sodipodi:namedview> + <metadata + id="metadata7"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:groupmode="layer" + id="layer2" + inkscape:label="Zeichnung" + style="display:inline;filter:url(#filter3249)"> + <path + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.31199998;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + d="M 7.7249594,2.1626795 C 4.4957594,2.1626795 1.8749594,4.7834796 1.8749594,8.0126796 C 1.8749594,10.095133 2.9648234,11.924089 4.6049594,12.960804 L 4.6049594,19.32268 C 4.6049594,20.18692 5.3007194,20.88268 6.1649594,20.88268 L 9.2264598,20.88268 L 4.5869594,28.275054 C 4.3708994,28.649282 4.5003554,29.126622 4.8745754,29.34268 L 5.5473314,29.73268 C 5.9215634,29.94874 6.3988994,29.819277 6.6149594,29.445054 L 11.927204,20.88268 L 13.662704,20.88268 L 18.97496,29.445054 C 19.19102,29.819282 19.668356,29.948735 20.042576,29.73268 L 20.715332,29.34268 C 21.089564,29.12662 21.21902,28.649278 21.00296,28.275054 L 16.36346,20.88268 L 20.20496,20.88268 C 21.0692,20.88268 21.76496,20.18692 21.76496,19.32268 L 21.76496,18.46468 C 22.325624,18.204431 24.411872,17.382582 26.28896,18.54268 C 27.179144,19.092846 27.270764,20.488512 28.16096,21.03868 C 28.758116,21.407742 29.279804,21.407742 29.87696,21.03868 C 30.322052,20.763596 30.032288,20.31392 30.03296,19.79068 C 30.035804,17.190681 30.035804,15.214679 30.03296,12.61468 C 30.032288,12.09144 30.322052,11.641764 29.87696,11.36668 C 29.279804,10.997616 28.758116,10.997616 28.16096,11.36668 C 27.270764,11.916846 27.179144,13.312512 26.28896,13.86268 C 24.411668,15.02291 22.325348,14.195954 21.76496,13.935804 L 21.76496,12.960804 C 23.405096,11.924089 24.49496,10.095133 24.49496,8.0126796 C 24.49496,4.7834796 21.87416,2.1626795 18.64496,2.1626795 C 16.155776,2.1626795 14.029412,3.7187916 13.18496,5.911554 C 12.340496,3.7187916 10.214132,2.1626795 7.7249594,2.1626795 z" + id="rect3212" + sodipodi:nodetypes="csccccccccccccccccccssssssssccsscc" /> + <rect + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="rect3235" + width="0" + height="3" + x="-25" + y="-26" /> + <path + sodipodi:type="arc" + style="fill:#ff0000;fill-opacity:1;stroke:none" + id="path3595" + sodipodi:cx="18.438444" + sodipodi:cy="15.612311" + sodipodi:rx="3.5615551" + sodipodi:ry="3.3876889" + d="m 21.999999,15.612311 a 3.5615551,3.3876889 0 1 1 -7.12311,0 3.5615551,3.3876889 0 1 1 7.12311,0 z" + transform="translate(8.5615559,12)" /> + </g> +</svg> diff --git a/icons/cam_on32.svg b/icons/cam_on32.svg new file mode 100644 index 0000000..9f381fe --- /dev/null +++ b/icons/cam_on32.svg @@ -0,0 +1,109 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="32" + height="32" + id="svg2" + sodipodi:version="0.32" + inkscape:version="0.47 r22583" + sodipodi:docname="cam32.svg" + inkscape:output_extension="org.inkscape.output.svg.inkscape" + version="1.0" + style="display:inline" + enable-background="new"> + <defs + id="defs4"> + <inkscape:perspective + sodipodi:type="inkscape:persp3d" + inkscape:vp_x="0 : 16 : 1" + inkscape:vp_y="0 : 1000 : 0" + inkscape:vp_z="32 : 16 : 1" + inkscape:persp3d-origin="16 : 10.666667 : 1" + id="perspective2476" /> + <filter + inkscape:collect="always" + id="filter3249"> + <feBlend + inkscape:collect="always" + mode="lighten" + in2="BackgroundImage" + id="feBlend3251" /> + </filter> + </defs> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="11.02381" + inkscape:cx="10.394302" + inkscape:cy="19.913197" + inkscape:document-units="px" + inkscape:current-layer="layer2" + showgrid="true" + objecttolerance="10000" + gridtolerance="10000" + guidetolerance="10000" + inkscape:window-width="1024" + inkscape:window-height="710" + inkscape:window-x="-4" + inkscape:window-y="-3" + inkscape:window-maximized="1"> + <inkscape:grid + type="xygrid" + id="grid2410" + visible="true" + enabled="true" + dotted="false" /> + </sodipodi:namedview> + <metadata + id="metadata7"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:groupmode="layer" + id="layer2" + inkscape:label="Zeichnung" + style="display:inline;filter:url(#filter3249)"> + <path + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.31199998;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + d="M 7.7249594,2.1626795 C 4.4957594,2.1626795 1.8749594,4.7834796 1.8749594,8.0126796 C 1.8749594,10.095133 2.9648234,11.924089 4.6049594,12.960804 L 4.6049594,19.32268 C 4.6049594,20.18692 5.3007194,20.88268 6.1649594,20.88268 L 9.2264598,20.88268 L 4.5869594,28.275054 C 4.3708994,28.649282 4.5003554,29.126622 4.8745754,29.34268 L 5.5473314,29.73268 C 5.9215634,29.94874 6.3988994,29.819277 6.6149594,29.445054 L 11.927204,20.88268 L 13.662704,20.88268 L 18.97496,29.445054 C 19.19102,29.819282 19.668356,29.948735 20.042576,29.73268 L 20.715332,29.34268 C 21.089564,29.12662 21.21902,28.649278 21.00296,28.275054 L 16.36346,20.88268 L 20.20496,20.88268 C 21.0692,20.88268 21.76496,20.18692 21.76496,19.32268 L 21.76496,18.46468 C 22.325624,18.204431 24.411872,17.382582 26.28896,18.54268 C 27.179144,19.092846 27.270764,20.488512 28.16096,21.03868 C 28.758116,21.407742 29.279804,21.407742 29.87696,21.03868 C 30.322052,20.763596 30.032288,20.31392 30.03296,19.79068 C 30.035804,17.190681 30.035804,15.214679 30.03296,12.61468 C 30.032288,12.09144 30.322052,11.641764 29.87696,11.36668 C 29.279804,10.997616 28.758116,10.997616 28.16096,11.36668 C 27.270764,11.916846 27.179144,13.312512 26.28896,13.86268 C 24.411668,15.02291 22.325348,14.195954 21.76496,13.935804 L 21.76496,12.960804 C 23.405096,11.924089 24.49496,10.095133 24.49496,8.0126796 C 24.49496,4.7834796 21.87416,2.1626795 18.64496,2.1626795 C 16.155776,2.1626795 14.029412,3.7187916 13.18496,5.911554 C 12.340496,3.7187916 10.214132,2.1626795 7.7249594,2.1626795 z" + id="rect3212" + sodipodi:nodetypes="csccccccccccccccccccssssssssccsscc" /> + <rect + style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="rect3235" + width="0" + height="3" + x="-25" + y="-26" /> + <path + sodipodi:type="arc" + style="fill:#00a000;fill-opacity:1;stroke:none" + id="path3595" + sodipodi:cx="18.438444" + sodipodi:cy="15.612311" + sodipodi:rx="3.5615551" + sodipodi:ry="3.3876889" + d="m 21.999999,15.612311 a 3.5615551,3.3876889 0 1 1 -7.12311,0 3.5615551,3.3876889 0 1 1 7.12311,0 z" + transform="translate(8.5615559,12)" /> + </g> +</svg> diff --git a/icons/chat.png b/icons/chat.png Binary files differnew file mode 100644 index 0000000..66a3430 --- /dev/null +++ b/icons/chat.png diff --git a/icons/chat_msg16.svg b/icons/chat_msg16.svg new file mode 100644 index 0000000..1e4be83 --- /dev/null +++ b/icons/chat_msg16.svg @@ -0,0 +1,97 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="16" + height="16" + id="svg2" + version="1.1" + inkscape:version="0.47 r22583" + sodipodi:docname="chat_msg16.svg"> + <defs + id="defs4"> + <linearGradient + id="linearGradient3590"> + <stop + style="stop-color:#00ff00;stop-opacity:1;" + offset="0" + id="stop3592" /> + <stop + style="stop-color:#006400;stop-opacity:1;" + offset="1" + id="stop3594" /> + </linearGradient> + <inkscape:perspective + sodipodi:type="inkscape:persp3d" + inkscape:vp_x="0 : 526.18109 : 1" + inkscape:vp_y="0 : 1000 : 0" + inkscape:vp_z="744.09448 : 526.18109 : 1" + inkscape:persp3d-origin="372.04724 : 350.78739 : 1" + id="perspective10" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3590" + id="radialGradient3596" + cx="140.41119" + cy="140.19443" + fx="140.41119" + fy="140.19443" + r="79.791901" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.86519943,0.92220815,-0.87022772,0.81643229,140.92859,-103.75317)" /> + </defs> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="22.4" + inkscape:cx="13.435304" + inkscape:cy="7.4195703" + inkscape:document-units="px" + inkscape:current-layer="layer1" + showgrid="false" + inkscape:window-width="1920" + inkscape:window-height="1150" + inkscape:window-x="-4" + inkscape:window-y="-3" + inkscape:window-maximized="1" /> + <metadata + id="metadata7"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="Ebene 1" + inkscape:groupmode="layer" + id="layer1" + transform="translate(-151.60409,-146.84165)"> + <path + sodipodi:type="arc" + style="fill:url(#radialGradient3596);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.39215686;stroke-dasharray:2, 2;stroke-dashoffset:0" + id="path2816" + sodipodi:cx="159.6041" + sodipodi:cy="154.84164" + sodipodi:rx="78.791901" + sodipodi:ry="78.791901" + d="m 238.396,154.84164 a 78.791901,78.791901 0 1 1 -157.583805,0 78.791901,78.791901 0 1 1 157.583805,0 z" + transform="matrix(0.0501304,0,0,0.0501304,151.60308,147.07937)" /> + </g> +</svg> diff --git a/icons/darrow16.svg b/icons/darrow16.svg new file mode 100644 index 0000000..4b1609a --- /dev/null +++ b/icons/darrow16.svg @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="16" + height="16" + id="svg2" + version="1.1" + inkscape:version="0.47 r22583" + sodipodi:docname="darrow16.svg" + inkscape:export-filename="/home/jjl/ok.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + <defs + id="defs4" /> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="44.8" + inkscape:cx="9.5866317" + inkscape:cy="8.5407368" + inkscape:document-units="px" + inkscape:current-layer="layer1" + showgrid="true" + inkscape:window-width="1920" + inkscape:window-height="1150" + inkscape:window-x="-4" + inkscape:window-y="-3" + inkscape:window-maximized="1" + guidetolerance="10000" + objecttolerance="10000"> + <inkscape:grid + type="xygrid" + id="grid4187" + empspacing="5" + visible="true" + enabled="true" + snapvisiblegridlinesonly="true" /> + </sodipodi:namedview> + <metadata + id="metadata7"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="Ebene 1" + inkscape:groupmode="layer" + id="layer1" + transform="translate(0,-1036.3622)"> + <path + style="fill:none;stroke:#000000;stroke-width:1.50000000000000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" + d="M 4,6 C 5.3333333,7.3333333 6.6666667,8.6666667 8,10 9.3333333,8.6666667 10.666667,7.3333333 12,6" + id="path4344" + transform="translate(0,1036.3622)" + sodipodi:nodetypes="ccc" /> + </g> +</svg> diff --git a/icons/disconnet.png b/icons/disconnet.png Binary files differnew file mode 100644 index 0000000..bfc05b7 --- /dev/null +++ b/icons/disconnet.png diff --git a/icons/dozent.png b/icons/dozent.png Binary files differnew file mode 100644 index 0000000..847d63e --- /dev/null +++ b/icons/dozent.png diff --git a/icons/dozent.svg b/icons/dozent.svg new file mode 100644 index 0000000..85a74d6 --- /dev/null +++ b/icons/dozent.svg @@ -0,0 +1,303 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://web.resource.org/cc/" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="48px" + height="48px" + id="svg2108" + sodipodi:version="0.32" + inkscape:version="0.45" + sodipodi:docbase="/home/dobey/Projects/gnome-icon-theme/scalable/stock/generic" + sodipodi:docname="stock_person.svg" + inkscape:export-filename="/home/jimmac/src/cvs/gnome/gnome-icon-theme/48x48/stock/generic/stock_person.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" + inkscape:output_extension="org.inkscape.output.svg.inkscape"> + <defs + id="defs3"> + <linearGradient + id="linearGradient4562"> + <stop + style="stop-color:#ffffff;stop-opacity:1;" + offset="0" + id="stop4564" /> + <stop + style="stop-color:#d6d6d2;stop-opacity:1;" + offset="1" + id="stop4566" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient4356"> + <stop + style="stop-color:#000000;stop-opacity:1;" + offset="0" + id="stop4358" /> + <stop + style="stop-color:#000000;stop-opacity:0;" + offset="1" + id="stop4360" /> + </linearGradient> + <linearGradient + id="linearGradient3824"> + <stop + style="stop-color:#ffffff;stop-opacity:1;" + offset="0" + id="stop3826" /> + <stop + style="stop-color:#c9c9c9;stop-opacity:1.0000000;" + offset="1.0000000" + id="stop3828" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient3816"> + <stop + style="stop-color:#000000;stop-opacity:1;" + offset="0" + id="stop3818" /> + <stop + style="stop-color:#000000;stop-opacity:0;" + offset="1" + id="stop3820" /> + </linearGradient> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3816" + id="radialGradient3822" + cx="31.112698" + cy="19.008621" + fx="31.112698" + fy="19.008621" + r="8.6620579" + gradientUnits="userSpaceOnUse" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4356" + id="linearGradient4362" + x1="20.661695" + y1="35.817974" + x2="22.626925" + y2="36.217758" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.3161,0.243028,-0.243028,1.3161,-9.262129,-16.07396)" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4356" + id="linearGradient4366" + gradientUnits="userSpaceOnUse" + x1="22.686766" + y1="36.390400" + x2="21.408455" + y2="35.739632" + gradientTransform="matrix(-1.308485,0.281154,0.281154,1.308485,57.41196,-17.2385)" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4356" + id="linearGradient1366" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(-1.308485,0.281154,0.281154,1.308485,39.09106,-26.21225)" + x1="22.686766" + y1="36.390400" + x2="21.408455" + y2="35.739632" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3824" + id="linearGradient1372" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.338350,0.000000,0.000000,1.338350,-33.47918,-20.70004)" + x1="30.935921" + y1="29.553486" + x2="30.935921" + y2="35.803486" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient4562" + id="radialGradient4568" + cx="24.753788" + cy="26.814409" + fx="24.753788" + fy="26.814409" + r="17.986024" + gradientTransform="matrix(1.354517,4.451877e-16,-3.340511e-8,1.366395,-8.947464,-9.871365)" + gradientUnits="userSpaceOnUse" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient4562" + id="radialGradient3816" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.558489,1.477485e-16,-1.377346e-8,0.563387,14.87134,4.364123)" + cx="29.922075" + cy="17.727694" + fx="29.922075" + fy="17.727694" + r="17.986024" /> + <filter + inkscape:collect="always" + x="-0.076111111" + width="1.1522222" + y="-0.28344828" + height="1.5668966" + id="filter5655"> + <feGaussianBlur + inkscape:collect="always" + stdDeviation="1.4531044" + id="feGaussianBlur5657" /> + </filter> + </defs> + <sodipodi:namedview + inkscape:showpageshadow="false" + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="0.16862745" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="1" + inkscape:cx="31.500535" + inkscape:cy="28.945566" + inkscape:current-layer="layer2" + showgrid="false" + inkscape:grid-bbox="true" + inkscape:document-units="px" + fill="#9db029" + stroke="#727e0a" + inkscape:window-width="872" + inkscape:window-height="815" + inkscape:window-x="202" + inkscape:window-y="68" /> + <metadata + id="metadata4"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title>Person</dc:title> + <dc:creator> + <cc:Agent> + <dc:title>Jakub Steiner</dc:title> + </cc:Agent> + </dc:creator> + <dc:source>http://jimmac.musichall.cz</dc:source> + <dc:subject> + <rdf:Bag> + <rdf:li>user</rdf:li> + <rdf:li>person</rdf:li> + </rdf:Bag> + </dc:subject> + <cc:license + rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" /> + </cc:Work> + <cc:License + rdf:about="http://creativecommons.org/licenses/GPL/2.0/"> + <cc:permits + rdf:resource="http://web.resource.org/cc/Reproduction" /> + <cc:permits + rdf:resource="http://web.resource.org/cc/Distribution" /> + <cc:requires + rdf:resource="http://web.resource.org/cc/Notice" /> + <cc:permits + rdf:resource="http://web.resource.org/cc/DerivativeWorks" /> + <cc:requires + rdf:resource="http://web.resource.org/cc/ShareAlike" /> + <cc:requires + rdf:resource="http://web.resource.org/cc/SourceCode" /> + </cc:License> + </rdf:RDF> + </metadata> + <g + id="layer1" + inkscape:label="cipek" + inkscape:groupmode="layer" + style="display:inline"> + <path + style="opacity:1;color:#000000;fill:url(#linearGradient1372);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" + d="M 13.365469,24.850231 L 19.043607,24.850231 L 15.731361,21.774572 L 15.021593,22.720929 L 14.311825,22.011162 L 13.365469,24.850231 z " + id="path4173" /> + <path + sodipodi:nodetypes="cccc" + id="path4370" + d="M 19.882923,32.490544 C 21.530768,31.712992 22.297815,29.810737 22.297815,29.810737 C 21.014177,24.39981 16.976336,20.652646 16.976336,20.652646 C 16.976336,20.652646 20.274824,29.141269 19.882923,32.490544 z " + style="opacity:0.22784807;color:#000000;fill:url(#linearGradient1366);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" /> + </g> + <g + inkscape:groupmode="layer" + id="layer2" + inkscape:label="dalsi cipek" + style="display:inline"> + <rect + style="opacity:0.34857143;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible;filter:url(#filter5655);enable-background:accumulate" + id="rect4608" + width="38.183765" + height="10.253048" + x="5.3033009" + y="35.448853" + rx="5.126524" + ry="5.126524" + transform="matrix(0.9351852,0,0,0.9351852,1.5811694,2.2763322)" /> + <path + style="opacity:1;color:#000000;fill:url(#radialGradient4568);fill-opacity:1.0;fill-rule:evenodd;stroke:#888a85;stroke-width:0.99999982px;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" + d="M 17.918908,43.517006 L 32.114254,43.517006 C 36.136269,43.517006 40.118235,42.042236 41.577816,37.838868 C 42.963864,33.847271 41.814406,26.246002 32.824021,20.094686 L 16.026195,20.094686 C 7.0358098,25.772823 5.9122958,33.538186 7.9821665,38.075456 C 10.090864,42.697836 13.660304,43.517006 17.918908,43.517006 z " + id="path4308" + sodipodi:nodetypes="cczcczc" /> + <path + sodipodi:nodetypes="cccc" + id="path4364" + d="M 38.203826,41.464292 C 39.851671,40.68674 40.618718,38.784486 40.618718,38.784486 C 39.33508,33.373558 35.297238,29.626395 35.297238,29.626395 C 35.297238,29.626395 38.595727,38.115017 38.203826,41.464292 z " + style="opacity:0.29120878;color:#000000;fill:url(#linearGradient4366);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" + inkscape:r_cx="true" + inkscape:r_cy="true" /> + <path + style="opacity:0.54945056;color:#000000;fill:url(#linearGradient4362);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" + d="M 11.642995,42.046125 C 9.9732599,41.316765 9.2259419,39.559099 9.2259419,39.559099 C 10.351871,34.11317 14.204505,30.128795 14.204505,30.128795 C 14.204505,30.128795 11.153975,38.709646 11.642995,42.046125 z " + id="path4354" + sodipodi:nodetypes="cccc" + inkscape:r_cx="true" + inkscape:r_cy="true" /> + <path + sodipodi:nodetypes="cczcczc" + id="path4314" + d="M 17.593144,42.482789 L 32.120832,42.452196 C 35.775407,42.452196 39.393589,41.112158 40.719828,37.292799 C 41.97925,33.665864 40.58869,26.759027 32.419643,21.169679 L 16.464198,20.833163 C 8.295151,25.99256 6.714018,33.0485 8.6253819,37.507773 C 10.536748,41.967046 13.325894,42.452196 17.593144,42.482789 z " + style="opacity:0.64285714;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.99999988px;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" /> + <path + d="M 39.774755 19.008621 A 8.6620579 8.6620579 0 1 1 22.45064,19.008621 A 8.6620579 8.6620579 0 1 1 39.774755 19.008621 z" + sodipodi:ry="8.6620579" + sodipodi:rx="8.6620579" + sodipodi:cy="19.008621" + sodipodi:cx="31.112698" + id="path4318" + style="opacity:1;color:#000000;fill:url(#radialGradient3822);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" + sodipodi:type="arc" + transform="matrix(1.338350,0.000000,0.000000,1.338350,-17.02698,-7.522361)" /> + <path + sodipodi:type="arc" + style="opacity:1;color:#000000;fill:url(#radialGradient3816);fill-opacity:1;fill-rule:evenodd;stroke:#888a85;stroke-width:0.74718857px;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" + id="path4320" + sodipodi:cx="31.112698" + sodipodi:cy="19.008621" + sodipodi:rx="8.6620579" + sodipodi:ry="8.6620579" + d="M 39.774755 19.008621 A 8.6620579 8.6620579 0 1 1 22.45064,19.008621 A 8.6620579 8.6620579 0 1 1 39.774755 19.008621 z" + transform="matrix(1.338350,0.000000,0.000000,1.338350,-16.85969,-12.20659)" /> + <path + d="M 39.774755 19.008621 A 8.6620579 8.6620579 0 1 1 22.45064,19.008621 A 8.6620579 8.6620579 0 1 1 39.774755 19.008621 z" + sodipodi:ry="8.6620579" + sodipodi:rx="8.6620579" + sodipodi:cy="19.008621" + sodipodi:cx="31.112698" + id="path4322" + style="opacity:0.19620254;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.82296228px;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" + sodipodi:type="arc" + transform="matrix(1.215123,0.000000,0.000000,1.215123,-13.02574,-9.864199)" /> + </g> +</svg> diff --git a/icons/exit.png b/icons/exit.png Binary files differnew file mode 100644 index 0000000..85368f1 --- /dev/null +++ b/icons/exit.png diff --git a/icons/exit.svg b/icons/exit.svg new file mode 100644 index 0000000..a31d252 --- /dev/null +++ b/icons/exit.svg @@ -0,0 +1,367 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://web.resource.org/cc/" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="48" + height="48" + id="svg2" + inkscape:label="PozadÃ" + sodipodi:version="0.32" + inkscape:version="0.45" + version="1.0" + sodipodi:docname="application-exit.svg" + inkscape:output_extension="org.inkscape.output.svg.inkscape" + sodipodi:docbase="/home/dobey/Projects/gnome-icon-theme/scalable/actions"> + <defs + id="defs3"> + <linearGradient + inkscape:collect="always" + id="linearGradient5837"> + <stop + style="stop-color:#ffffff;stop-opacity:1;" + offset="0" + id="stop5839" /> + <stop + style="stop-color:#ffffff;stop-opacity:0;" + offset="1" + id="stop5841" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient5771"> + <stop + style="stop-color:#000000;stop-opacity:1;" + offset="0" + id="stop5773" /> + <stop + style="stop-color:#000000;stop-opacity:0;" + offset="1" + id="stop5775" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient5757"> + <stop + style="stop-color:#eeeeec;stop-opacity:1;" + offset="0" + id="stop5759" /> + <stop + style="stop-color:#b6b9b2;stop-opacity:1" + offset="1" + id="stop5761" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient5749"> + <stop + style="stop-color:#555753;stop-opacity:1;" + offset="0" + id="stop5751" /> + <stop + style="stop-color:#d3d7cf;stop-opacity:1" + offset="1" + id="stop5753" /> + </linearGradient> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5060" + id="radialGradient5031" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(-2.774389,0,0,1.969706,444.1734,-872.88106)" + cx="605.71429" + cy="486.64789" + fx="605.71429" + fy="486.64789" + r="117.14286" /> + <linearGradient + inkscape:collect="always" + id="linearGradient5060"> + <stop + style="stop-color:black;stop-opacity:1;" + offset="0" + id="stop5062" /> + <stop + style="stop-color:black;stop-opacity:0;" + offset="1" + id="stop5064" /> + </linearGradient> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5060" + id="radialGradient5029" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.7182065,0,0,1.969706,-1790.093,-872.88106)" + cx="605.71429" + cy="486.64789" + fx="605.71429" + fy="486.64789" + r="117.14286" /> + <linearGradient + id="linearGradient5048"> + <stop + style="stop-color:black;stop-opacity:0;" + offset="0" + id="stop5050" /> + <stop + id="stop5056" + offset="0.5" + style="stop-color:black;stop-opacity:1;" /> + <stop + style="stop-color:black;stop-opacity:0;" + offset="1" + id="stop5052" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient5048" + id="linearGradient5027" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.242688,0,0,1.969706,-1503.9583,-872.8854)" + x1="302.85715" + y1="366.64789" + x2="302.85715" + y2="609.50507" /> + <linearGradient + inkscape:collect="always" + id="linearGradient5551"> + <stop + style="stop-color:#d80000;stop-opacity:1;" + offset="0" + id="stop5553" /> + <stop + style="stop-color:#ff1919;stop-opacity:1" + offset="1" + id="stop5555" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient4962"> + <stop + style="stop-color:#4f7633;stop-opacity:1;" + offset="0" + id="stop4964" /> + <stop + style="stop-color:#000000;stop-opacity:1" + offset="1" + id="stop4966" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4962" + id="linearGradient4968" + x1="36" + y1="24" + x2="36" + y2="6.8892298" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.8011917,0,0,1.8095239,-36.032773,-5.4523814)" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient5551" + id="linearGradient5569" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.8216585,0,0,1.8541455,19.808292,-28.322168)" + x1="-5" + y1="30.485746" + x2="-5" + y2="28" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient5749" + id="linearGradient5755" + x1="20.736568" + y1="8" + x2="12.734337" + y2="8" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.1250002,0,0,1.8421053,-12.062503,-6.4736843)" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient5757" + id="linearGradient5763" + x1="15" + y1="10" + x2="20" + y2="10" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.888889,0,0,1.8421053,-9.1111132,-6.4736842)" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient5771" + id="linearGradient5777" + x1="19" + y1="3" + x2="19" + y2="10" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.4863836,0,0,1.5000001,-25.26852,-4.0000006)" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient5837" + id="linearGradient5848" + gradientUnits="userSpaceOnUse" + x1="10" + y1="44.016026" + x2="10" + y2="12.805173" + gradientTransform="matrix(0.9130435,0,0,0.9130435,1.7173913,2.2608696)" /> + </defs> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="13.455176" + inkscape:cx="39.875591" + inkscape:cy="17.816185" + inkscape:document-units="px" + inkscape:current-layer="layer1" + width="48px" + height="48px" + inkscape:showpageshadow="false" + gridtolerance="10000" + inkscape:window-width="1278" + inkscape:window-height="965" + inkscape:window-x="0" + inkscape:window-y="0"> + <inkscape:grid + type="xygrid" + id="grid4948" /> + </sodipodi:namedview> + <metadata + id="metadata6"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="Vrstva 1" + inkscape:groupmode="layer" + id="layer1"> + <g + style="display:inline" + id="g5022" + transform="matrix(2.080446e-2,0,0,1.7667008e-2,41.56675,40.26266)"> + <rect + y="-150.69685" + x="-1234.8357" + height="478.35718" + width="1082.8979" + id="rect4173" + style="opacity:0.39195981;color:#000000;fill:url(#linearGradient5027);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" /> + <path + sodipodi:nodetypes="cccc" + id="path5058" + d="M -151.93764,-150.67604 C -151.93764,-150.67604 -151.93764,327.65475 -151.93764,327.65475 C -11.956731,328.5552 186.46809,220.48509 186.46801,88.458574 C 186.46801,-43.567963 30.259854,-150.67602 -151.93764,-150.67604 z" + style="opacity:0.40206185;color:#000000;fill:url(#radialGradient5029);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" /> + <path + style="opacity:0.40206185;color:#000000;fill:url(#radialGradient5031);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" + d="M -1227.8411,-150.67604 C -1227.8411,-150.67604 -1227.8411,327.65475 -1227.8411,327.65475 C -1370.7153,328.5552 -1573.2413,220.48509 -1573.2413,88.458573 C -1573.2413,-43.567964 -1413.8045,-150.67602 -1227.8411,-150.67604 z" + id="path5018" + sodipodi:nodetypes="cccc" /> + </g> + <rect + style="opacity:1;color:#000000;fill:url(#linearGradient4968);fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect4960" + width="27.017878" + height="38" + x="13.5" + y="4.5" /> + <path + style="fill:none;fill-rule:evenodd;stroke:#73d216;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.36486487" + d="M 15.574321,41.529642 L 39.5115,41.529642 L 39.5115,5.7229624" + id="path5547" + sodipodi:nodetypes="ccc" /> + <path + style="color:#000000;fill:url(#linearGradient5763);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient5755);stroke-width:0.99999987999999995px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + d="M 14.5,5.5000001 L 31.5,5.5000001 L 31.5,33.131579 L 14.5,40.5 L 14.5,5.5000001 z" + id="rect5746" + sodipodi:nodetypes="ccccc" /> + <path + style="opacity:1;color:#000000;fill:url(#linearGradient5569);fill-opacity:1;fill-rule:nonzero;stroke:#a60f11;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + d="M 13.482087,14.5 L 13.482087,20.466898 L 2.5025365,20.466898 L 2.5025365,31.574563 L 13.482087,31.574563 L 13.482087,37.499999 L 26.500001,26.375127 L 13.482087,14.5 z" + id="rect5549" + sodipodi:nodetypes="cccccccc" /> + <path + style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.99999988px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.23873877;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + d="M 14.503737,16.777476 L 14.503737,21.515111 L 3.5201752,21.515111 L 3.5201752,30.552669 L 14.503737,30.552669 L 14.503737,35.259942 L 24.866255,26.31942 L 14.503737,16.777476 z" + id="path5561" + sodipodi:nodetypes="cccccccc" /> + <path + style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.61261261" + d="M 30.546104,7.3868349 L 30.528133,32.373144 L 15.500001,38.969853" + id="path5765" + sodipodi:nodetypes="ccc" /> + <path + style="fill:url(#linearGradient5777);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="M 17,5 L 29.431919,11 L 36.89107,11 L 36.89107,5 L 17,5 z" + id="path5769" /> + <rect + style="opacity:1;color:#000000;fill:#555753;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect5797" + width="1" + height="1" + x="28" + y="19" /> + <rect + y="20" + x="29" + height="1" + width="1" + id="rect5799" + style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <rect + style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect5805" + width="0.99999976" + height="1" + x="29" + y="21" /> + <rect + y="21" + x="28" + height="1" + width="0.99999976" + id="rect5807" + style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <rect + style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect5829" + width="0.99999976" + height="1" + x="27" + y="22" /> + <rect + y="20" + x="28" + height="1" + width="1" + id="rect5831" + style="opacity:1;color:#000000;fill:#555753;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <rect + style="opacity:1;color:#000000;fill:#555753;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect5833" + width="1" + height="1" + x="28" + y="22" /> + <path + style="opacity:0.52401747;color:#000000;fill:url(#linearGradient5848);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.23873876999999999;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + d="M 14.014946,15.5 L 14.014946,20.949728 L 4,20.949728 L 4,23.432065 C 6.3080298,24.978602 10.143561,26 14.5,26 C 18.0582,26 21.283715,25.321421 23.601902,24.230978 L 14.014946,15.5 z" + id="path5835" /> + </g> +</svg> diff --git a/icons/finder.png b/icons/finder.png Binary files differnew file mode 100644 index 0000000..80dbb1d --- /dev/null +++ b/icons/finder.png diff --git a/icons/keyboard.jpg b/icons/keyboard.jpg Binary files differnew file mode 100644 index 0000000..0e9648b --- /dev/null +++ b/icons/keyboard.jpg diff --git a/icons/lock.png b/icons/lock.png Binary files differnew file mode 100644 index 0000000..6e7c19c --- /dev/null +++ b/icons/lock.png diff --git a/icons/lock.svg b/icons/lock.svg new file mode 100644 index 0000000..95f8452 --- /dev/null +++ b/icons/lock.svg @@ -0,0 +1,526 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://web.resource.org/cc/" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="48.000000px" + height="48.000000px" + id="svg3304" + sodipodi:version="0.32" + inkscape:version="0.45" + sodipodi:docbase="/home/dobey/Projects/gnome-icon-theme/scalable/actions" + sodipodi:docname="system-lock-screen.svg" + inkscape:output_extension="org.inkscape.output.svg.inkscape"> + <defs + id="defs3306"> + <linearGradient + id="linearGradient3877"> + <stop + style="stop-color:white;stop-opacity:1;" + offset="0" + id="stop3879" /> + <stop + id="stop3895" + offset="0.84337348" + style="stop-color:white;stop-opacity:1;" /> + <stop + style="stop-color:white;stop-opacity:0;" + offset="1" + id="stop3881" /> + </linearGradient> + <linearGradient + id="linearGradient3866"> + <stop + id="stop3868" + offset="0" + style="stop-color:white;stop-opacity:1;" /> + <stop + id="stop3870" + offset="1" + style="stop-color:#d3d7cf;stop-opacity:1" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient3858"> + <stop + style="stop-color:black;stop-opacity:1" + offset="0" + id="stop3860" /> + <stop + style="stop-color:#c4a000;stop-opacity:0;" + offset="1" + id="stop3862" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient3776"> + <stop + style="stop-color:black;stop-opacity:1;" + offset="0" + id="stop3778" /> + <stop + style="stop-color:black;stop-opacity:0;" + offset="1" + id="stop3780" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient3734"> + <stop + style="stop-color:white;stop-opacity:1;" + offset="0" + id="stop3736" /> + <stop + style="stop-color:white;stop-opacity:0;" + offset="1" + id="stop3738" /> + </linearGradient> + <linearGradient + id="linearGradient2833"> + <stop + style="stop-color:#edd400;stop-opacity:1" + offset="0" + id="stop2835" /> + <stop + id="stop2841" + offset="0.2" + style="stop-color:#fce94f;stop-opacity:1;" /> + <stop + style="stop-color:#fce94f;stop-opacity:1;" + offset="0.5" + id="stop2843" /> + <stop + style="stop-color:#edd400;stop-opacity:1" + offset="1" + id="stop2837" /> + </linearGradient> + <linearGradient + id="linearGradient2817"> + <stop + style="stop-color:white;stop-opacity:1;" + offset="0" + id="stop2819" /> + <stop + id="stop3899" + offset="0.50602412" + style="stop-color:white;stop-opacity:1;" /> + <stop + style="stop-color:#d3d7cf;stop-opacity:1" + offset="1" + id="stop2821" /> + </linearGradient> + <linearGradient + id="linearGradient5233"> + <stop + style="stop-color:#555753;stop-opacity:1" + offset="0" + id="stop5235" /> + <stop + style="stop-color:black;stop-opacity:1" + offset="1" + id="stop5237" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient5225"> + <stop + style="stop-color:black;stop-opacity:1;" + offset="0" + id="stop5227" /> + <stop + style="stop-color:black;stop-opacity:0;" + offset="1" + id="stop5229" /> + </linearGradient> + <linearGradient + id="linearGradient5137"> + <stop + style="stop-color:#eeeeec;stop-opacity:1;" + offset="0" + id="stop5139" /> + <stop + style="stop-color:#e6e6e3;stop-opacity:1;" + offset="1" + id="stop5141" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient6240"> + <stop + style="stop-color:#ffffff;stop-opacity:1;" + offset="0" + id="stop6242" /> + <stop + style="stop-color:#ffffff;stop-opacity:0;" + offset="1" + id="stop6244" /> + </linearGradient> + <linearGradient + id="linearGradient11400"> + <stop + style="stop-color:#000000;stop-opacity:1;" + offset="0" + id="stop11402" /> + <stop + style="stop-color:#000000;stop-opacity:0;" + offset="1" + id="stop11404" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient11400" + id="linearGradient11406" + x1="23.154902" + y1="34.572548" + x2="23.529411" + y2="40.219608" + gradientUnits="userSpaceOnUse" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient6240" + id="linearGradient6246" + x1="20.156862" + y1="5.0996137" + x2="20.156862" + y2="26.039215" + gradientUnits="userSpaceOnUse" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient5137" + id="linearGradient5147" + gradientUnits="userSpaceOnUse" + x1="17.247635" + y1="6.3760414" + x2="39.904388" + y2="38.876041" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient5137" + id="linearGradient5223" + gradientUnits="userSpaceOnUse" + x1="31.743324" + y1="37.842293" + x2="31.86105" + y2="43.82579" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5225" + id="radialGradient5231" + cx="23.9375" + cy="42.6875" + fx="23.9375" + fy="42.6875" + r="23.75956" + gradientTransform="matrix(1,0,0,0.24763,4.590511e-16,32.1168)" + gradientUnits="userSpaceOnUse" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5233" + id="radialGradient5239" + cx="24.006104" + cy="32.997028" + fx="24.006104" + fy="32.997028" + r="19.00016" + gradientTransform="matrix(1.232634,1.948681e-23,-1.1422e-23,0.778392,-5.584638,2.154377)" + gradientUnits="userSpaceOnUse" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3866" + id="radialGradient3795" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.870643,0,0,1.866263,-24.33718,-15.74392)" + cx="27.953125" + cy="18.315439" + fx="27.953125" + fy="18.315439" + r="5.128125" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3776" + id="linearGradient3801" + gradientUnits="userSpaceOnUse" + x1="42.4706" + y1="32.399456" + x2="13.479223" + y2="22.632544" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3734" + id="linearGradient3822" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1,0,0,0.864869,0,2.770198)" + x1="18.21875" + y1="20.46875" + x2="19.1875" + y2="30.4375" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient2833" + id="linearGradient3830" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1,0,0,1.006994,0,-1.136389)" + x1="17.871288" + y1="23.875" + x2="29.689016" + y2="23.875" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient2817" + id="radialGradient3833" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.57668,0,0,1.800344,-31.2679,-10.37657)" + cx="19.468771" + cy="12.116604" + fx="19.468771" + fy="12.116604" + r="6.0156319" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3776" + id="linearGradient3846" + gradientUnits="userSpaceOnUse" + x1="42.4706" + y1="32.399456" + x2="13.479223" + y2="22.632544" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3776" + id="linearGradient3848" + gradientUnits="userSpaceOnUse" + x1="42.4706" + y1="32.399456" + x2="13.479223" + y2="22.632544" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3776" + id="linearGradient3850" + gradientUnits="userSpaceOnUse" + x1="42.4706" + y1="32.399456" + x2="13.479223" + y2="22.632544" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3858" + id="linearGradient3864" + x1="13.5" + y1="17.84375" + x2="36" + y2="19.5" + gradientUnits="userSpaceOnUse" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3877" + id="radialGradient3893" + cx="23.582689" + cy="19.995197" + fx="23.582689" + fy="19.995197" + r="7.9999981" + gradientTransform="matrix(0.913714,-6.637959e-2,2.992885e-2,0.41197,1.45598,13.32316)" + gradientUnits="userSpaceOnUse" /> + </defs> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#849193" + borderopacity="1.0000000" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="1" + inkscape:cx="14.458556" + inkscape:cy="27.346585" + inkscape:current-layer="layer1" + showgrid="false" + inkscape:grid-bbox="true" + inkscape:document-units="px" + inkscape:showpageshadow="false" + showborder="false" + inkscape:window-width="1350" + inkscape:window-height="901" + inkscape:window-x="122" + inkscape:window-y="66" + showguides="true" + inkscape:guide-bbox="true" + inkscape:grid-points="true" /> + <metadata + id="metadata3309"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title>Video display</dc:title> + <dc:creator> + <cc:Agent> + <dc:title>Luca Ferretti <elle.uca@libero.it></dc:title> + </cc:Agent> + </dc:creator> + <cc:license + rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" /> + <dc:subject> + <rdf:Bag> + <rdf:li>monitor</rdf:li> + <rdf:li>display</rdf:li> + <rdf:li>video</rdf:li> + <rdf:li>screen</rdf:li> + <rdf:li>LCD</rdf:li> + <rdf:li>CRT</rdf:li> + </rdf:Bag> + </dc:subject> + </cc:Work> + <cc:License + rdf:about="http://creativecommons.org/licenses/GPL/2.0/"> + <cc:permits + rdf:resource="http://web.resource.org/cc/Reproduction" /> + <cc:permits + rdf:resource="http://web.resource.org/cc/Distribution" /> + <cc:requires + rdf:resource="http://web.resource.org/cc/Notice" /> + <cc:permits + rdf:resource="http://web.resource.org/cc/DerivativeWorks" /> + <cc:requires + rdf:resource="http://web.resource.org/cc/ShareAlike" /> + <cc:requires + rdf:resource="http://web.resource.org/cc/SourceCode" /> + </cc:License> + </rdf:RDF> + </metadata> + <g + id="layer1" + inkscape:label="Layer 1" + inkscape:groupmode="layer"> + <rect + style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" + id="rect4784" + width="48.000000" + height="48.000000" + x="0.0000000" + y="0.0000000" /> + <path + sodipodi:type="arc" + style="opacity:0.4;fill:url(#radialGradient5231);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + id="path13582" + sodipodi:cx="23.9375" + sodipodi:cy="42.6875" + sodipodi:rx="23.75956" + sodipodi:ry="5.8835783" + d="M 47.69706 42.6875 A 23.75956 5.8835783 0 1 1 0.17794037,42.6875 A 23.75956 5.8835783 0 1 1 47.69706 42.6875 z" + transform="matrix(0.968245,0,0,0.863797,1.447631,6.096332)" /> + <path + style="fill:url(#linearGradient5223);fill-opacity:1;fill-rule:evenodd;stroke:#888a85;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;opacity:1;color:black;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;visibility:visible;display:inline;overflow:visible" + d="M 14.375479,35.533351 C 14.375479,35.533351 15.592355,40.467951 10.519150,40.514275 C 8.0888743,40.536180 8.5866723,44.549426 8.5866723,44.549426 L 39.433139,44.518053 C 39.433139,44.518053 39.851577,40.622690 37.410922,40.577021 C 32.423455,40.484882 33.600393,35.470606 33.600393,35.470606 L 14.375479,35.533351 z " + id="path9222" + sodipodi:nodetypes="csccscc" /> + <path + style="fill:url(#linearGradient5147);fill-opacity:1;fill-rule:evenodd;stroke:#888a85;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1" + d="M 4.8886262,3.4784362 L 43.01746,3.4784362 C 45.042579,3.4784362 46.518438,4.9060907 46.518438,7.104577 L 46.529388,33.308416 C 46.529388,35.000483 46.001041,35.523645 44.494732,35.523645 L 3.5320635,35.50471 C 2.3527922,35.475917 1.513468,35.010049 1.4976345,33.485407 L 1.5128113,6.9168325 C 1.5128113,5.1430066 3.0522187,3.4784362 4.8886262,3.4784362 z " + id="rect5040" + sodipodi:nodetypes="ccccccccc" /> + <rect + style="fill:url(#radialGradient5239);fill-opacity:1.0;fill-rule:evenodd;stroke:black;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" + id="rect9208" + width="37.000320" + height="22.996691" + x="5.5059438" + y="7.5018229" /> + <path + sodipodi:type="inkscape:offset" + inkscape:radius="-0.875" + inkscape:original="M 4.875 3.46875 C 3.0385925 3.46875 1.5 5.1324242 1.5 6.90625 L 1.5 33.5 C 1.5158335 35.024642 2.3519787 35.471206 3.53125 35.5 L 44.5 35.53125 C 46.006309 35.53125 46.53125 35.004569 46.53125 33.3125 L 46.53125 7.09375 C 46.53125 4.8952637 45.056369 3.46875 43.03125 3.46875 L 4.875 3.46875 z " + xlink:href="#rect5040" + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:white;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1" + id="path5145" + inkscape:href="#rect5040" + d="M 4.875,4.34375 C 3.5670572,4.34375 2.375,5.6383996 2.375,6.90625 L 2.375,33.5 C 2.3812651,34.103278 2.5206964,34.290591 2.65625,34.40625 C 2.7918036,34.521909 3.0781685,34.613174 3.5625,34.625 L 44.5,34.65625 C 45.151173,34.65625 45.356981,34.55523 45.4375,34.46875 C 45.518019,34.38227 45.65625,34.068049 45.65625,33.3125 L 45.65625,7.09375 C 45.65625,5.2865999 44.645463,4.34375 43.03125,4.34375 L 4.875,4.34375 z " /> + <path + style="fill:url(#linearGradient11406);fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;opacity:0.60000000" + d="M 13.992156,36.039216 C 14.075817,38.211765 13.708803,38.950659 12.358532,39.714447 L 35.973934,41.011765 C 35.024915,39.843137 33.644523,38.078431 34.020993,36.02353 L 13.992156,36.039216 z " + id="path10672" + sodipodi:nodetypes="ccccc" /> + <path + style="fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#8d8d8f;stroke-width:1.0000000px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:0.43902439" + d="M 9.9921262,41.496063 C 16.698819,41.498032 37.788910,41.496063 37.788910,41.496063" + id="path6575" + sodipodi:nodetypes="cc" /> + <path + sodipodi:nodetypes="cc" + id="path8029" + d="M 9.6479280,42.503937 C 16.354621,42.505906 38.367789,42.503937 38.367789,42.503937" + style="fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.0000000px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1.0000000" /> + <rect + style="color:black;fill:url(#linearGradient3830);fill-opacity:1;fill-rule:nonzero;stroke:#b09000;stroke-width:0.99999988;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" + id="rect1918" + width="15.031246" + height="8.9999886" + x="16.500002" + y="18.500006" + rx="0.97487032" + ry="0.97487032" /> + <g + id="g3770" + style="opacity:0.3;fill-opacity:1;stroke:url(#linearGradient3801)" + transform="translate(0,1)"> + <path + id="path3762" + d="M 17,20.5 L 31,20.5" + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3846);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + <path + id="path3764" + d="M 17,22.5 L 31,22.5" + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3848);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + <path + id="path3766" + d="M 17,24.5 L 31,24.5" + style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3850);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + </g> + <rect + style="opacity:0.7;color:black;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3822);stroke-width:0.9999997;stroke-linecap:square;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" + id="rect2845" + width="13.031249" + height="6.0000048" + x="17.499998" + y="20.500004" + rx="0" + ry="0" /> + <rect + style="opacity:0.2;color:black;fill:url(#linearGradient3864);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.20000057;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" + id="rect3856" + width="14" + height="1" + x="17" + y="19" + rx="0.5" + ry="0.5" /> + <path + style="color:black;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#radialGradient3833);stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:1.20000057;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible" + d="M 19,19 L 19,14.953132 C 19,12.763097 21.23,11 24,11 C 26.77,11 29,12.763097 29,14.953132 L 29,19" + id="rect2811" + sodipodi:nodetypes="ccccc" /> + <path + style="color:black;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#radialGradient3795);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:1.20000057;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible" + d="M 28.5,19 L 28.5,14.96875 C 28.5,13.12461 26.551869,11.5 24,11.5 C 21.448131,11.5 19.5,13.12461 19.5,14.96875 L 19.5,19" + id="path3750" + sodipodi:nodetypes="ccccc" /> + <path + style="color:black;fill:none;fill-opacity:1.0;fill-rule:nonzero;stroke:url(#radialGradient3893);stroke-width:0.99999976;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:1.20000057;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible" + d="M 31.499996,19.509653 C 31.499996,20.058305 31.065204,20.5 30.525126,20.5 L 17.47487,20.5 C 16.934792,20.5 16.5,20.058305 16.5,19.509653 L 16.5,19.490353" + id="rect3872" + sodipodi:nodetypes="ccccc" /> + <path + style="fill:url(#linearGradient6246);fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;opacity:0.65" + d="M 6.0235294,8.0313725 L 6.0235294,26.039216 C 22.467974,24.684967 28.622222,15.926797 41.992156,15.011764 L 41.992157,8.0000000 L 6.0235294,8.0313725 z " + id="path4073" + sodipodi:nodetypes="ccccc" /> + </g> +</svg> diff --git a/icons/locksingle.png b/icons/locksingle.png Binary files differnew file mode 100644 index 0000000..ced4e80 --- /dev/null +++ b/icons/locksingle.png diff --git a/icons/log-out.png b/icons/log-out.png Binary files differnew file mode 100644 index 0000000..905ec90 --- /dev/null +++ b/icons/log-out.png diff --git a/icons/log-out.svg b/icons/log-out.svg new file mode 100644 index 0000000..e94c873 --- /dev/null +++ b/icons/log-out.svg @@ -0,0 +1,284 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://web.resource.org/cc/" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="48" + height="48" + id="svg5157" + sodipodi:version="0.32" + inkscape:version="0.45" + version="1.0" + sodipodi:docname="system-log-out.svg" + sodipodi:docbase="/home/dobey/Projects/gnome-icon-theme/scalable/actions" + inkscape:output_extension="org.inkscape.output.svg.inkscape"> + <defs + id="defs5159"> + <linearGradient + inkscape:collect="always" + id="linearGradient7130"> + <stop + style="stop-color:#4e9a06;stop-opacity:1" + offset="0" + id="stop7132" /> + <stop + style="stop-color:#73d216;stop-opacity:1" + offset="1" + id="stop7134" /> + </linearGradient> + <linearGradient + id="linearGradient7121"> + <stop + style="stop-color:#ffffff;stop-opacity:1;" + offset="0" + id="stop7123" /> + <stop + style="stop-color:#8ae234;stop-opacity:1" + offset="1" + id="stop7125" /> + </linearGradient> + <linearGradient + id="linearGradient6998" + inkscape:collect="always"> + <stop + id="stop7000" + offset="0" + style="stop-color:#000000;stop-opacity:1;" /> + <stop + id="stop7002" + offset="1" + style="stop-color:#000000;stop-opacity:0;" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient7130" + id="linearGradient7145" + gradientUnits="userSpaceOnUse" + x1="11.5" + y1="68.75" + x2="-13.247213" + y2="21.843145" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient7121" + id="linearGradient7147" + gradientUnits="userSpaceOnUse" + x1="-33.040741" + y1="10.966461" + x2="-30.919424" + y2="17.448257" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient6998" + id="radialGradient7161" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1,0,0,0.3222749,0,20.728756)" + cx="19.688505" + cy="30.585787" + fx="19.688505" + fy="30.585787" + r="4.6624851" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient6998" + id="radialGradient7163" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1,0,0,0.3222749,0,20.728756)" + cx="19.688505" + cy="30.585787" + fx="19.688505" + fy="30.585787" + r="4.6624851" /> + </defs> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + gridtolerance="10000" + guidetolerance="10" + objecttolerance="10" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="1" + inkscape:cx="197.95843" + inkscape:cy="28.49025" + inkscape:document-units="px" + inkscape:current-layer="layer2" + width="48px" + height="48px" + inkscape:window-width="872" + inkscape:window-height="624" + inkscape:window-x="684" + inkscape:window-y="208" + showborder="false" + inkscape:showpageshadow="false" + showgrid="false" + showguides="true" + inkscape:guide-bbox="true" + gridspacingx="0.5px" + gridspacingy="0.5px" + gridempspacing="2" + inkscape:grid-points="true" /> + <metadata + id="metadata5162"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title>System-log-out</dc:title> + <dc:date>2007-08-27</dc:date> + <dc:creator> + <cc:Agent> + <dc:title>Lapo Calamandrei</dc:title> + </cc:Agent> + </dc:creator> + <dc:source /> + <cc:license + rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" /> + <dc:contributor> + <cc:Agent> + <dc:title>Kalle Persson</dc:title> + </cc:Agent> + </dc:contributor> + <dc:subject> + <rdf:Bag> + <rdf:li>logout</rdf:li> + <rdf:li>exit</rdf:li> + <rdf:li>man</rdf:li> + <rdf:li>sign</rdf:li> + <rdf:li>running</rdf:li> + </rdf:Bag> + </dc:subject> + </cc:Work> + <cc:License + rdf:about="http://creativecommons.org/licenses/GPL/2.0/"> + <cc:permits + rdf:resource="http://web.resource.org/cc/Reproduction" /> + <cc:permits + rdf:resource="http://web.resource.org/cc/Distribution" /> + <cc:requires + rdf:resource="http://web.resource.org/cc/Notice" /> + <cc:permits + rdf:resource="http://web.resource.org/cc/DerivativeWorks" /> + <cc:requires + rdf:resource="http://web.resource.org/cc/ShareAlike" /> + <cc:requires + rdf:resource="http://web.resource.org/cc/SourceCode" /> + </cc:License> + </rdf:RDF> + </metadata> + <g + inkscape:label="shadow" + inkscape:groupmode="layer" + id="layer1" + style="display:inline"> + <g + id="g6227" + transform="matrix(0.6759778,0,0,0.8422279,-72.059226,25.879981)" + style="opacity:0.33000004" /> + <g + id="g7008" + style="opacity:0.5" + transform="matrix(1.2209709,0,0,1.465165,4.32932,-3.7089664)"> + <path + transform="matrix(1.356682,0,0,1.1785115,-7.0105312,-5.8165354)" + d="M 24.35099 30.585787 A 4.6624851 1.5026019 0 1 1 15.02602,30.585787 A 4.6624851 1.5026019 0 1 1 24.35099 30.585787 z" + sodipodi:ry="1.5026019" + sodipodi:rx="4.6624851" + sodipodi:cy="30.585787" + sodipodi:cx="19.688505" + id="path6984" + style="opacity:0.5;fill:url(#radialGradient7161);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.69999992;stroke-opacity:1" + sodipodi:type="arc" /> + <path + transform="matrix(3.7061179,0,0,1.3310245,-58.247641,-11.710432)" + d="M 24.35099 30.585787 A 4.6624851 1.5026019 0 1 1 15.02602,30.585787 A 4.6624851 1.5026019 0 1 1 24.35099 30.585787 z" + sodipodi:ry="1.5026019" + sodipodi:rx="4.6624851" + sodipodi:cy="30.585787" + sodipodi:cx="19.688505" + id="path6986" + style="opacity:0.25;fill:url(#radialGradient7163);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.69999992;stroke-opacity:1" + sodipodi:type="arc" /> + </g> + </g> + <g + inkscape:groupmode="layer" + id="layer2" + inkscape:label="omino"> + <g + id="g7138" + transform="translate(40,0)"> + <g + id="g7094"> + <path + id="path5955" + d="M -7.5,5.5 C -9.708,5.5 -11.5,7.292 -11.5,9.5 C -11.5,11.708 -9.7080001,13.5 -7.5,13.5 C -5.292,13.5 -3.5000001,11.708 -3.5,9.5 C -3.5,7.292 -5.2920001,5.5 -7.5,5.5 z M -20.6875,11.5 C -21.228728,11.552698 -21.725172,11.823486 -22.0625,12.25 L -26.0625,17.25 C -26.752856,18.112945 -26.612945,19.372144 -25.75,20.0625 C -24.887055,20.752856 -23.627856,20.612945 -22.9375,19.75 L -19.53125,15.5 L -15.75,15.5 L -22.1875,23.3125 C -22.420945,23.645583 -22.50685,24.06221 -22.5,24.5 L -22.5,31.5 L -30.5,31.5 L -30.5,35.5 L -20.5,35.5 C -19.395476,35.49989 -18.50011,34.604524 -18.5,33.5 L -18.5,27.3125 L -13.5,32.3125 L -13.5,40.5 L -9.5,40.5 L -9.5,31.5 L -9.5,30.65625 L -10.09375,30.09375 L -14.84375,25.34375 L -11.5,21.28125 L -11.5,22.5 C -11.49989,23.604524 -10.604524,24.49989 -9.5,24.5 L -2.5,24.5 C -1.778728,24.510201 -1.113613,24.122995 -0.75,23.5 C -0.386387,22.877006 -0.386387,22.122995 -0.75,21.5 C -1.113613,20.877004 -1.778728,20.489799 -2.5,20.5 L -7.5,20.5 L -7.5,16 C -10.390638,16 -12.843604,14.110886 -13.6875,11.5 L -20.5,11.5 C -20.562466,11.497069 -20.625034,11.497069 -20.6875,11.5 z " + style="opacity:1;fill:url(#linearGradient7145);fill-opacity:1;fill-rule:evenodd;stroke:#4e9a06;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" /> + </g> + <path + d="M -20.625,12.5 C -20.883516,12.532601 -21.119099,12.669978 -21.28125,12.875 L -25.28125,17.875 C -25.632167,18.313646 -25.563646,18.930333 -25.125,19.28125 C -24.686354,19.632167 -24.069667,19.563646 -23.71875,19.125 L -20.3125,14.875 C -20.122073,14.638438 -19.834933,14.500611 -19.53125,14.5 L -15.75,14.5 C -15.36741,14.504084 -15.020291,14.724946 -14.854508,15.069775 C -14.688724,15.414605 -14.733008,15.823641 -14.96875,16.125 L -21.375,23.875 C -21.378721,23.880309 -21.37135,23.900494 -21.375,23.90625 L -21.40625,23.9375 C -21.46879,24.048638 -21.50412,24.205427 -21.5,24.46875 C -21.499838,24.479166 -21.499838,24.489584 -21.5,24.5 L -21.5,31.5 C -21.503016,32.051031 -21.948969,32.496984 -22.5,32.5 L -29.5,32.5 L -29.5,34.5 L -20.5,34.5 C -19.938773,34.499944 -19.500056,34.061227 -19.5,33.5 L -19.5,27.3125 C -19.504078,26.903415 -19.259899,26.532643 -18.882467,26.374807 C -18.505035,26.216972 -18.069603,26.303544 -17.78125,26.59375 L -12.78125,31.59375 C -12.595622,31.786381 -12.494406,32.045043 -12.5,32.3125 L -12.5,39.5 L -10.5,39.5 L -10.5,31.5 L -10.5,31.09375 L -10.78125,30.8125 C -10.791666,30.812662 -10.802084,30.812662 -10.8125,30.8125 L -15.5625,26.0625 C -15.923992,25.696513 -15.95096,25.116711 -15.625,24.71875 L -12.28125,20.65625 C -12.013038,20.330928 -11.570348,20.207488 -11.172497,20.347084 C -10.774646,20.486681 -10.506139,20.859664 -10.5,21.28125 L -10.5,22.5 C -10.499944,23.061227 -10.061227,23.499944 -9.5,23.5 L -2.5,23.5 C -2.1471898,23.50499 -1.8109749,23.318639 -1.625,23 C -1.439414,22.682027 -1.4394134,22.317974 -1.625,22 C -1.8109749,21.68136 -2.1471889,21.49501 -2.5,21.5 L -7.5,21.5 C -8.0510308,21.496984 -8.4969843,21.051031 -8.5,20.5 L -8.5,16.84375 C -11.109944,16.483168 -13.278833,14.83457 -14.3125,12.5 L -20.5,12.5 C -20.520828,12.500648 -20.541672,12.500648 -20.5625,12.5 C -20.578034,12.499271 -20.578204,12.5 -20.59375,12.5 C -20.609296,12.5 -20.609466,12.499271 -20.625,12.5 z " + id="path7104" + style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#8ae234;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" + inkscape:original="M -20.6875 11.5 C -21.228728 11.552698 -21.725172 11.823486 -22.0625 12.25 L -26.0625 17.25 C -26.752856 18.112945 -26.612945 19.372144 -25.75 20.0625 C -24.887055 20.752856 -23.627856 20.612945 -22.9375 19.75 L -19.53125 15.5 L -15.75 15.5 L -22.1875 23.3125 C -22.420945 23.645583 -22.50685 24.06221 -22.5 24.5 L -22.5 31.5 L -30.5 31.5 L -30.5 35.5 L -20.5 35.5 C -19.395476 35.49989 -18.50011 34.604524 -18.5 33.5 L -18.5 27.3125 L -13.5 32.3125 L -13.5 40.5 L -9.5 40.5 L -9.5 31.5 L -9.5 30.65625 L -10.09375 30.09375 L -14.84375 25.34375 L -11.5 21.28125 L -11.5 22.5 C -11.49989 23.604524 -10.604524 24.49989 -9.5 24.5 L -2.5 24.5 C -1.778728 24.510201 -1.113613 24.122995 -0.75 23.5 C -0.386387 22.877006 -0.386387 22.122995 -0.75 21.5 C -1.113613 20.877004 -1.778728 20.489799 -2.5 20.5 L -7.5 20.5 L -7.5 16 C -10.390638 16 -12.843604 14.110886 -13.6875 11.5 L -20.5 11.5 C -20.562466 11.497069 -20.625034 11.497069 -20.6875 11.5 z " + inkscape:radius="-1.0054175" + sodipodi:type="inkscape:offset" /> + <path + sodipodi:nodetypes="cccccccsscccscccccccccccccsccccc" + id="path7106" + d="M -1.625,22 C -1.810975,21.68136 -2.147189,21.49501 -2.5,21.5 L -7.5,21.5 C -8.051031,21.496984 -8.496984,21.051031 -8.5,20.5 L -8.5,16.84375 C -11.109944,16.483168 -13.278833,14.83457 -14.3125,12.5 L -20.5,12.5 C -20.520828,12.500648 -20.541672,12.500648 -20.5625,12.5 C -20.578034,12.499271 -20.578204,12.5 -20.59375,12.5 C -20.609296,12.5 -20.609466,12.499271 -20.625,12.5 C -20.883516,12.532601 -21.119099,12.669978 -21.28125,12.875 L -25.28125,17.875 C -25.632167,18.313646 -25.563646,18.930333 -25.125,19.28125 M -10.5,31.5 L -10.5,31.09375 L -10.78125,30.8125 C -10.791666,30.812662 -10.802084,30.812662 -10.8125,30.8125 L -15.5625,26.0625 C -15.923992,25.696513 -15.95096,25.116711 -15.625,24.71875 M -12.5,32.3125 L -12.5,39.5 M -14.854508,15.069775 C -14.688724,15.414605 -14.733008,15.823641 -14.96875,16.125 L -21.375,23.875 C -21.378721,23.880309 -21.37135,23.900494 -21.375,23.90625 L -21.40625,23.9375 C -21.46879,24.048638 -21.50412,24.205427 -21.5,24.46875 C -21.499838,24.479166 -21.499838,24.489584 -21.5,24.5 L -21.5,31.5 C -21.503016,32.051031 -21.948969,32.496984 -22.5,32.5 L -29.5,32.5 L -29.5,34.5" + style="opacity:0.3;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;display:inline" /> + <path + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/kalle/Desktop/system-log-out.png" + sodipodi:type="arc" + style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient7147);stroke-width:0.6666649;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path7119" + sodipodi:cx="-31.5" + sodipodi:cy="16" + sodipodi:rx="2" + sodipodi:ry="2" + d="M -29.5 16 A 2 2 0 1 1 -33.5,16 A 2 2 0 1 1 -29.5 16 z" + transform="matrix(1.500004,0,0,1.500004,39.750134,-14.500064)" /> + </g> + <g + id="g7055" + transform="translate(130,0)"> + <path + sodipodi:nodetypes="ccc" + id="path7045" + d="M -28.5,33.5 L -20.5,33.5 L -20.5,24.5" + style="opacity:0.4089219;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" /> + <path + sodipodi:nodetypes="ccc" + id="path7047" + d="M -24.5,18.5 L -20.5,13.5 L -11.5,13.5" + style="opacity:0.5;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + <path + sodipodi:nodetypes="ccc" + id="path7049" + d="M -2.5,22.5 L -9.5,22.5 L -9.5,13.5" + style="opacity:0.5;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + <path + sodipodi:nodetypes="ccc" + id="path7051" + d="M -11.5,38.5 L -11.5,31.5 L -18.5,24.5" + style="opacity:0.5;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + <path + sodipodi:nodetypes="cc" + id="path7053" + d="M -10,14 L -19.5,25.5" + style="opacity:0.5;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:7;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + </g> + </g> +</svg> diff --git a/icons/offline.png b/icons/offline.png Binary files differnew file mode 100644 index 0000000..dca8899 --- /dev/null +++ b/icons/offline.png diff --git a/icons/ok16.svg b/icons/ok16.svg new file mode 100644 index 0000000..3d60d49 --- /dev/null +++ b/icons/ok16.svg @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="16" + height="16" + id="svg2" + version="1.1" + inkscape:version="0.47 r22583" + sodipodi:docname="darrow16.svg" + inkscape:export-filename="/home/jjl/ok.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + <defs + id="defs4" /> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="44.8" + inkscape:cx="9.5866317" + inkscape:cy="8.5407368" + inkscape:document-units="px" + inkscape:current-layer="layer1" + showgrid="true" + inkscape:window-width="1920" + inkscape:window-height="1150" + inkscape:window-x="-4" + inkscape:window-y="-3" + inkscape:window-maximized="1" + guidetolerance="10000" + objecttolerance="10000"> + <inkscape:grid + type="xygrid" + id="grid4187" + empspacing="5" + visible="true" + enabled="true" + snapvisiblegridlinesonly="true" /> + </sodipodi:namedview> + <metadata + id="metadata7"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="Ebene 1" + inkscape:groupmode="layer" + id="layer1" + transform="translate(0,-1036.3622)"> + <path + style="fill:none;stroke:#000000;stroke-width:1.50000000000000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" + d="m 4,9 c 1.3333333,1.333333 2.6666667,2.666667 4,4 1.6666667,-3 3.333333,-6 5,-9" + id="path4344" + transform="translate(0,1036.3622)" + sodipodi:nodetypes="ccc" /> + </g> +</svg> diff --git a/icons/online.png b/icons/online.png Binary files differnew file mode 100644 index 0000000..e2a0018 --- /dev/null +++ b/icons/online.png diff --git a/icons/photo.png b/icons/photo.png Binary files differnew file mode 100644 index 0000000..ba5a00f --- /dev/null +++ b/icons/photo.png diff --git a/icons/photo.svg b/icons/photo.svg new file mode 100644 index 0000000..6552735 --- /dev/null +++ b/icons/photo.svg @@ -0,0 +1,1003 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://web.resource.org/cc/" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="48" + height="48" + id="svg7854" + sodipodi:version="0.32" + inkscape:version="0.45" + version="1.0" + sodipodi:docbase="/home/dobey/Projects/gnome-icon-theme/scalable/devices" + sodipodi:docname="camera-photo.svg" + inkscape:output_extension="org.inkscape.output.svg.inkscape"> + <defs + id="defs7856"> + <linearGradient + inkscape:collect="always" + id="linearGradient8954"> + <stop + style="stop-color:#000000;stop-opacity:1;" + offset="0" + id="stop8956" /> + <stop + style="stop-color:#000000;stop-opacity:0;" + offset="1" + id="stop8958" /> + </linearGradient> + <linearGradient + id="linearGradient8940"> + <stop + id="stop8942" + offset="0" + style="stop-color:#72776c;stop-opacity:1;" /> + <stop + style="stop-color:#e0e0e0;stop-opacity:1;" + offset="0.5" + id="stop8944" /> + <stop + id="stop8946" + offset="0.75" + style="stop-color:#8f9587;stop-opacity:1;" /> + <stop + id="stop8948" + offset="1" + style="stop-color:#c1c1c1;stop-opacity:1;" /> + </linearGradient> + <linearGradient + id="linearGradient8928"> + <stop + style="stop-color:#ffffff;stop-opacity:1;" + offset="0" + id="stop8930" /> + <stop + style="stop-color:#cccccc;stop-opacity:1;" + offset="1" + id="stop8932" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient8909"> + <stop + style="stop-color:#edd400;stop-opacity:1;" + offset="0" + id="stop8911" /> + <stop + style="stop-color:#edd400;stop-opacity:0;" + offset="1" + id="stop8913" /> + </linearGradient> + <linearGradient + id="linearGradient8895"> + <stop + id="stop8899" + offset="0" + style="stop-color:#204a87;stop-opacity:0;" /> + <stop + style="stop-color:#204a87;stop-opacity:0;" + offset="0.5" + id="stop8905" /> + <stop + id="stop8897" + offset="1" + style="stop-color:#204a87;stop-opacity:1;" /> + </linearGradient> + <linearGradient + id="linearGradient8735"> + <stop + style="stop-color:#ffffff;stop-opacity:1;" + offset="0" + id="stop8737" /> + <stop + style="stop-color:#8b8b8b;stop-opacity:1;" + offset="1" + id="stop8739" /> + </linearGradient> + <linearGradient + id="linearGradient8700"> + <stop + id="stop8702" + offset="0" + style="stop-color:#babdb6;stop-opacity:1;" /> + <stop + style="stop-color:#e0e0e0;stop-opacity:1;" + offset="0.5" + id="stop8704" /> + <stop + id="stop8706" + offset="0.75" + style="stop-color:#c0c3bb;stop-opacity:1;" /> + <stop + id="stop8708" + offset="1" + style="stop-color:#dbdbdb;stop-opacity:1;" /> + </linearGradient> + <linearGradient + id="linearGradient8680"> + <stop + style="stop-color:#000000;stop-opacity:1;" + offset="0" + id="stop8682" /> + <stop + id="stop8688" + offset="0.5" + style="stop-color:#000000;stop-opacity:1;" /> + <stop + style="stop-color:#afafaf;stop-opacity:1;" + offset="1" + id="stop8684" /> + </linearGradient> + <linearGradient + id="linearGradient8670"> + <stop + style="stop-color:#ffffff;stop-opacity:1;" + offset="0" + id="stop8672" /> + <stop + id="stop8950" + offset="0.32142857" + style="stop-color:#ebebeb;stop-opacity:1;" /> + <stop + id="stop8678" + offset="0.5" + style="stop-color:#909090;stop-opacity:1;" /> + <stop + style="stop-color:#fafafa;stop-opacity:1;" + offset="1" + id="stop8674" /> + </linearGradient> + <linearGradient + id="linearGradient8658"> + <stop + id="stop8660" + offset="0" + style="stop-color:#ffffff;stop-opacity:1;" /> + <stop + id="stop8662" + offset="1" + style="stop-color:#a5a5a5;stop-opacity:1;" /> + </linearGradient> + <linearGradient + id="linearGradient8644"> + <stop + style="stop-color:#717171;stop-opacity:1;" + offset="0" + id="stop8646" /> + <stop + style="stop-color:#000000;stop-opacity:1;" + offset="1" + id="stop8648" /> + </linearGradient> + <linearGradient + id="linearGradient8632"> + <stop + style="stop-color:#2e3436;stop-opacity:1;" + offset="0" + id="stop8634" /> + <stop + id="stop8640" + offset="0.5" + style="stop-color:#6b797d;stop-opacity:1;" /> + <stop + style="stop-color:#2e3436;stop-opacity:1;" + offset="1" + id="stop8636" /> + </linearGradient> + <linearGradient + id="linearGradient2230"> + <stop + style="stop-color:#eeeeee;stop-opacity:1;" + offset="0" + id="stop2232" /> + <stop + style="stop-color:#a2a2a2;stop-opacity:1.0000000;" + offset="1.0000000" + id="stop2234" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient2230" + id="linearGradient1458" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.13066,0,0,0.6747171,28.550675,-1.9552823)" + x1="7.9151335" + y1="30.816841" + x2="7.9151335" + y2="24.700985" /> + <linearGradient + id="linearGradient3301"> + <stop + id="stop3303" + offset="0.0000000" + style="stop-color:#ffffff;stop-opacity:1.0000000;" /> + <stop + id="stop3305" + offset="1.0000000" + style="stop-color:#cbcbcb;stop-opacity:1.0000000;" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3301" + id="linearGradient1456" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.2673265,0,0,1.7297296,28.430708,-34.581052)" + x1="6.5595827" + y1="29.373810" + x2="6.5595827" + y2="30.191154" /> + <linearGradient + id="linearGradient5895"> + <stop + style="stop-color:#888a85;stop-opacity:1;" + offset="0" + id="stop5897" /> + <stop + style="stop-color:#ffffff;stop-opacity:1;" + offset="1" + id="stop5899" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient5871"> + <stop + style="stop-color:#ffffff;stop-opacity:1;" + offset="0" + id="stop5873" /> + <stop + style="stop-color:#ffffff;stop-opacity:0;" + offset="1" + id="stop5875" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient5841"> + <stop + style="stop-color:#ffffff;stop-opacity:1;" + offset="0" + id="stop5843" /> + <stop + style="stop-color:#ffffff;stop-opacity:0;" + offset="1" + id="stop5845" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient5829"> + <stop + style="stop-color:#000000;stop-opacity:1;" + offset="0" + id="stop5831" /> + <stop + style="stop-color:#000000;stop-opacity:0;" + offset="1" + id="stop5833" /> + </linearGradient> + <linearGradient + id="linearGradient5819"> + <stop + style="stop-color:#ffffff;stop-opacity:1;" + offset="0" + id="stop5821" /> + <stop + style="stop-color:#a5a5a5;stop-opacity:0;" + offset="1" + id="stop5823" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient5788"> + <stop + style="stop-color:#ffffff;stop-opacity:1;" + offset="0" + id="stop5790" /> + <stop + style="stop-color:#ffffff;stop-opacity:0;" + offset="1" + id="stop5792" /> + </linearGradient> + <linearGradient + id="linearGradient5776"> + <stop + style="stop-color:#babdb6;stop-opacity:1;" + offset="0" + id="stop5778" /> + <stop + id="stop5784" + offset="0.5" + style="stop-color:#ffffff;stop-opacity:1;" /> + <stop + style="stop-color:#c0c3bb;stop-opacity:1;" + offset="0.75" + id="stop5786" /> + <stop + style="stop-color:#ffffff;stop-opacity:1;" + offset="1" + id="stop5780" /> + </linearGradient> + <linearGradient + id="linearGradient5759"> + <stop + style="stop-color:#898b86;stop-opacity:1;" + offset="0" + id="stop5761" /> + <stop + id="stop5767" + offset="0.16071428" + style="stop-color:#b3b3b0;stop-opacity:1;" /> + <stop + style="stop-color:#71746f;stop-opacity:1;" + offset="0.56037414" + id="stop5769" /> + <stop + style="stop-color:#555753;stop-opacity:1;" + offset="1" + id="stop5763" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient5788" + id="linearGradient5794" + x1="24.038181" + y1="18.620981" + x2="24.038181" + y2="15.495981" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.9755756,0,0,1,0.1099098,-4)" /> + <filter + inkscape:collect="always" + x="-0.0533544" + width="1.1067088" + y="-0.25483746" + height="1.5096749" + id="filter5813"> + <feGaussianBlur + inkscape:collect="always" + stdDeviation="1.2104779" + id="feGaussianBlur5815" /> + </filter> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient5819" + id="linearGradient5825" + x1="31.5" + y1="39" + x2="31.5" + y2="34.498264" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.9490741,0,0,1,-1.1788194,-4)" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient5829" + id="linearGradient5835" + x1="44.5" + y1="32.25" + x2="40.625" + y2="32.25" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.9512194,0,0,0.9756096,0.6707319,-3.304878)" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient8700" + id="linearGradient5839" + gradientUnits="userSpaceOnUse" + x1="6.0052037" + y1="7.1100197" + x2="37.575378" + y2="44" + gradientTransform="matrix(0.9756098,0,0,1,8.5365854e-2,-4)" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient5841" + id="linearGradient5847" + x1="25.84375" + y1="27.124889" + x2="25.84375" + y2="45" + gradientUnits="userSpaceOnUse" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient5871" + id="linearGradient5877" + x1="13.928617" + y1="29.084788" + x2="35.02602" + y2="29.084787" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,-4)" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient5776" + id="linearGradient5887" + x1="22.992924" + y1="42.25816" + x2="39.224056" + y2="19.704054" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.9780423,0,0,0.9730736,1.5876454,-1.307902)" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient5895" + id="linearGradient5901" + x1="22.0625" + y1="22.125" + x2="24" + y2="24.9375" + gradientUnits="userSpaceOnUse" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient5895" + id="linearGradient5905" + gradientUnits="userSpaceOnUse" + x1="22.0625" + y1="22.125" + x2="24" + y2="24.9375" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient8940" + id="linearGradient8604" + x1="25.632622" + y1="33.150757" + x2="39.421204" + y2="33.150757" + gradientUnits="userSpaceOnUse" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient8658" + id="linearGradient8628" + x1="32.753944" + y1="29.525757" + x2="32.671204" + y2="39.484386" + gradientUnits="userSpaceOnUse" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient8632" + id="linearGradient8638" + x1="28.3125" + y1="33.375" + x2="35.8125" + y2="33.375" + gradientUnits="userSpaceOnUse" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient8644" + id="radialGradient8650" + cx="33.717392" + cy="34.229168" + fx="33.717392" + fy="34.229168" + r="3.5" + gradientTransform="matrix(0.9597076,0,0,1.4285709,-0.6258796,-20.549066)" + gradientUnits="userSpaceOnUse" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient8670" + id="radialGradient8676" + cx="9.2365828" + cy="16.462448" + fx="9.2365828" + fy="16.462448" + r="2.9610097" + gradientTransform="matrix(1.9559599,0,0,1.02177,-8.8298023,0.2455734)" + gradientUnits="userSpaceOnUse" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient8680" + id="radialGradient8686" + cx="9.2365828" + cy="15.62961" + fx="9.2365828" + fy="15.62961" + r="2.9610097" + gradientTransform="matrix(1.5304128,0,0,0.7994693,-4.8992018,4.1359504)" + gradientUnits="userSpaceOnUse" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient5759" + id="linearGradient8711" + gradientUnits="userSpaceOnUse" + x1="5" + y1="29.951863" + x2="20" + y2="29.951863" + gradientTransform="translate(0,-4)" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient8735" + id="linearGradient8741" + x1="24.75" + y1="14.559897" + x2="24.75" + y2="17.5625" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.9747923,0,0,1,9.6892066e-2,-4)" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient8670" + id="radialGradient8745" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.1327366,0,0,1.114116,-10.462615,-1.2746684)" + cx="9.2365828" + cy="15.667007" + fx="9.1956778" + fy="16.975967" + r="2.9610097" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient8670" + id="radialGradient8749" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.1327366,0,0,1.114116,-10.462615,-1.2746684)" + cx="9.2365828" + cy="15.667007" + fx="9.1956778" + fy="16.975967" + r="2.9610097" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient8670" + id="radialGradient8753" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.1327366,0,0,1.114116,-10.462615,-1.2746684)" + cx="9.2365828" + cy="15.667007" + fx="9.1956778" + fy="16.975967" + r="2.9610097" /> + <clipPath + clipPathUnits="userSpaceOnUse" + id="clipPath8924"> + <rect + ry="1.1324512" + rx="1.1324512" + y="29" + x="28.475426" + height="5" + width="8.17838" + id="rect8926" + style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + </clipPath> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient8928" + id="radialGradient8934" + cx="35.132233" + cy="38.144695" + fx="35.132233" + fy="38.144695" + r="5.9602366" + gradientUnits="userSpaceOnUse" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient8895" + id="radialGradient8936" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.953696,0,0,0.953696,1.4961981,1.4354241)" + cx="32.3125" + cy="31" + fx="32.3125" + fy="31" + r="2.6875" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient8909" + id="radialGradient8938" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.4953887,0,0,0.4953887,16.642078,14.429586)" + cx="32.104324" + cy="27.799385" + fx="32.104324" + fy="27.799385" + r="4.125" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient8954" + id="radialGradient8960" + cx="7.375" + cy="35.875" + fx="7.375" + fy="35.875" + r="11.5" + gradientTransform="matrix(1,0,0,0.5,0,17.9375)" + gradientUnits="userSpaceOnUse" /> + <filter + inkscape:collect="always" + x="-0.34117647" + width="1.6823529" + y="-0.34117647" + height="1.6823529" + id="filter9094"> + <feGaussianBlur + inkscape:collect="always" + stdDeviation="0.28648224" + id="feGaussianBlur9096" /> + </filter> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient8940" + id="linearGradient9105" + gradientUnits="userSpaceOnUse" + x1="25.632622" + y1="33.150757" + x2="39.421204" + y2="33.150757" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient8928" + id="radialGradient9107" + gradientUnits="userSpaceOnUse" + cx="32.753944" + cy="29.525757" + fx="32.753944" + fy="29.525757" + r="5.9602366" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient8658" + id="linearGradient9109" + gradientUnits="userSpaceOnUse" + x1="32.753944" + y1="29.525757" + x2="32.671204" + y2="39.484386" /> + </defs> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#e0e0e0" + borderopacity="1" + gridtolerance="10000" + guidetolerance="10" + objecttolerance="10" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="1" + inkscape:cx="37.755423" + inkscape:cy="22.242989" + inkscape:document-units="px" + inkscape:current-layer="layer1" + width="48px" + height="48px" + inkscape:showpageshadow="false" + inkscape:window-width="1042" + inkscape:window-height="958" + inkscape:window-x="480" + inkscape:window-y="187" + showgrid="false" /> + <metadata + id="metadata7859"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:creator> + <cc:Agent> + <dc:title>Jakub Steiner</dc:title> + </cc:Agent> + </dc:creator> + <dc:source>http://jimmac.musichall.cz</dc:source> + <cc:license + rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" /> + <dc:title>Photo Camera</dc:title> + <dc:subject> + <rdf:Bag> + <rdf:li>snapshot</rdf:li> + <rdf:li>camera</rdf:li> + <rdf:li>photo</rdf:li> + <rdf:li>compact</rdf:li> + <rdf:li>snap</rdf:li> + </rdf:Bag> + </dc:subject> + </cc:Work> + <cc:License + rdf:about="http://creativecommons.org/licenses/GPL/2.0/"> + <cc:permits + rdf:resource="http://web.resource.org/cc/Reproduction" /> + <cc:permits + rdf:resource="http://web.resource.org/cc/Distribution" /> + <cc:requires + rdf:resource="http://web.resource.org/cc/Notice" /> + <cc:permits + rdf:resource="http://web.resource.org/cc/DerivativeWorks" /> + <cc:requires + rdf:resource="http://web.resource.org/cc/ShareAlike" /> + <cc:requires + rdf:resource="http://web.resource.org/cc/SourceCode" /> + </cc:License> + </rdf:RDF> + </metadata> + <g + inkscape:label="Layer 1" + inkscape:groupmode="layer" + id="layer1"> + <path + sodipodi:type="arc" + style="opacity:0.24117647;color:#000000;fill:url(#radialGradient8960);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path8952" + sodipodi:cx="7.375" + sodipodi:cy="35.875" + sodipodi:rx="11.5" + sodipodi:ry="5.75" + d="M 18.875 35.875 A 11.5 5.75 0 1 1 -4.125,35.875 A 11.5 5.75 0 1 1 18.875 35.875 z" + transform="translate(3.875,0.5)" /> + <path + style="opacity:0.34705882;color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;filter:url(#filter5813);enable-background:accumulate" + d="M 9.25,30.5 C 7.8238976,30.5 6.4967572,30.783497 5.375,31.25 L 4.75,31.25 C 2.9495,31.25 1.5,32.6995 1.5,34.5 C 1.5,35.319227 1.8158092,36.054579 2.3125,36.625 C 2.3168879,36.634445 2.3080247,36.64683 2.3125,36.65625 C 3.2308853,38.589435 5.998375,40 9.25,40 C 11.85114,40 14.12695,39.099285 15.40625,37.75 L 43.625,37.75 C 45.4255,37.75 46.875,36.3005 46.875,34.5 C 46.875,32.6995 45.4255,31.25 43.625,31.25 L 13.125,31.25 C 12.003243,30.783497 10.676102,30.5 9.25,30.5 z " + id="rect5796" + transform="matrix(0.9766246,0,0,1,3.5063146e-2,0)" /> + <path + style="opacity:1;color:#000000;fill:url(#linearGradient5839);fill-opacity:1;fill-rule:evenodd;stroke:#888a85;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + d="M 5.2073173,9.5 C 4.2556608,9.5 3.5000002,10.260522 3.5000002,11.1875 L 3.5000002,15.71875 L 3.5000002,35.0625 L 3.5000002,35.28125 C 3.5000002,37.62061 6.110732,39.5 9.353659,39.5 C 11.880769,39.5 14.018446,38.17441 14.841464,36.5625 L 41.792685,36.5625 C 42.744341,36.5625 43.500002,35.80198 43.500002,34.875 L 43.500002,11.1875 C 43.500002,10.260522 42.744339,9.5 41.792685,9.5 L 5.2073173,9.5 z " + id="rect4783" + sodipodi:nodetypes="cccccscccccc" /> + <path + sodipodi:nodetypes="cccccscccccc" + id="path5827" + d="M 5.6646343,9.865852 C 4.736769,9.865852 4,10.607826 4,11.512196 L 4,15.932926 L 4,34.55488 L 4,34.768294 C 4,37.050594 6.5454633,38.884148 9.7073169,38.884148 C 12.171249,38.884148 14.255485,37.590886 15.057927,36.018292 L 41.335367,36.018292 C 42.263232,36.018292 43,35.27632 43,34.371952 L 43,11.512196 C 43,10.607826 42.26323,9.865852 41.335367,9.865852 L 5.6646343,9.865852 z " + style="opacity:0.28823529;color:#000000;fill:url(#linearGradient5835);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <rect + style="opacity:0.47647059;color:#000000;fill:url(#linearGradient5825);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect5817" + width="25.625" + height="4.5" + x="14.125" + y="30.5" + rx="0.5931713" + ry="0.625" /> + <path + style="opacity:1;color:#000000;fill:url(#linearGradient5887);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + d="M 30.4375 15 C 24.161402 15 19.0625 20.068286 19.0625 26.3125 C 19.0625 30.442697 21.327842 34.027952 24.65625 36 L 36.21875 36 C 39.547157 34.027952 41.8125 30.442696 41.8125 26.3125 C 41.8125 20.068287 36.713597 15 30.4375 15 z " + id="path5879" /> + <path + style="opacity:1;color:#000000;fill:url(#linearGradient8711);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + d="M 4,33.763325 C 3.5625,38.391398 12.590192,39.218272 14.116117,35.107075 L 17,35.107075 C 17.577468,35.107075 18,34.735332 18,33.9375 L 18,16 C 18,15.377795 17.742047,15.0625 17.125,15.0625 L 13.928617,15.0625 C 11.234482,18.288094 4.7735018,15.204428 4,13.125 L 4,33.763325 z " + id="path5757" + sodipodi:nodetypes="ccccccccc" /> + <path + style="opacity:1;color:#000000;fill:#f6f6f6;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient5794);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + d="M 4.5,10.93566 L 4.5,12.28125 C 4.5,14.62061 6.0131178,16.4375 9.255931,16.4375 C 11.782953,16.4375 13.005952,15.17441 13.828942,13.5625 L 41.267005,13.5625 C 42.218629,13.5625 42.5,12.80198 42.5,11.875 L 42.5,11.053243 C 42.5,10.481627 41.903642,10.06066 41.314344,10.06066 L 5.4755756,10.06066 C 4.9569242,10.021822 4.5350381,10.148297 4.5,10.93566 z " + id="path5771" + sodipodi:nodetypes="ccsccccccc" /> + <rect + style="opacity:0.14705882;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect5849" + width="1.5" + height="19.5" + x="7" + y="17.75" + rx="0.5931713" + ry="0.625" /> + <path + sodipodi:nodetypes="ccccccc" + id="path5869" + d="M 14.116117,35.107075 L 17,35.107075 C 17.577468,35.107075 18,34.735332 18,33.9375 L 18,16 C 18,15.377795 17.742047,15.0625 17.125,15.0625 L 13.928617,15.0625 C 13.928617,15.0625 14.116117,35.107075 14.116117,35.107075 z " + style="opacity:0.2;color:#000000;fill:url(#linearGradient5877);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <path + sodipodi:type="inkscape:offset" + inkscape:radius="-1.1642135" + inkscape:original="M 5.21875 9.5 C 4.2670934 9.5 3.5 10.260522 3.5 11.1875 L 3.5 15.71875 L 3.5 35.0625 L 3.5 35.28125 C 3.5 37.62061 6.100823 39.5 9.34375 39.5 C 11.87086 39.5 14.020732 38.17441 14.84375 36.5625 L 41.78125 36.5625 C 42.732905 36.5625 43.5 35.80198 43.5 34.875 L 43.5 11.1875 C 43.499998 10.260522 42.732904 9.5 41.78125 9.5 L 5.21875 9.5 z " + xlink:href="#rect4783" + style="opacity:0.37058824;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient5847);stroke-width:0.99793345;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path5837" + inkscape:href="#rect4783" + d="M 5.21875,10.65625 C 4.8873522,10.65625 4.65625,10.902796 4.65625,11.1875 L 4.65625,15.71875 L 4.65625,35.0625 L 4.65625,35.28125 C 4.65625,36.019485 5.0486842,36.715787 5.875,37.3125 C 6.7013158,37.909213 7.9471874,38.34375 9.34375,38.34375 C 11.463736,38.34375 13.245322,37.142088 13.8125,36.03125 C 14.013191,35.647273 14.410489,35.406486 14.84375,35.40625 L 41.78125,35.40625 C 42.112647,35.40625 42.34375,35.159706 42.34375,34.875 L 42.34375,11.1875 C 42.343749,10.902795 42.112644,10.65625 41.78125,10.65625 L 5.21875,10.65625 z " + transform="matrix(1.0041459,0,0,1,-1.9304654e-2,0)" /> + <path + sodipodi:type="arc" + style="opacity:1;color:#000000;fill:#2e3436;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient5901);stroke-width:0.90909094;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path5893" + sodipodi:cx="22.6875" + sodipodi:cy="23.0625" + sodipodi:rx="1.875" + sodipodi:ry="1.875" + d="M 24.5625 23.0625 A 1.875 1.875 0 1 1 20.8125,23.0625 A 1.875 1.875 0 1 1 24.5625 23.0625 z" + transform="matrix(1.1,0,0,1.1,0.60625,-8.93125)" /> + <path + transform="matrix(0.5333333,0,0,0.5333333,8.400001,4.2000007)" + d="M 24.5625 23.0625 A 1.875 1.875 0 1 1 20.8125,23.0625 A 1.875 1.875 0 1 1 24.5625 23.0625 z" + sodipodi:ry="1.875" + sodipodi:rx="1.875" + sodipodi:cy="23.0625" + sodipodi:cx="22.6875" + id="path5903" + style="opacity:1;color:#000000;fill:#2e3436;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient5905);stroke-width:1.87500012;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + sodipodi:type="arc" /> + <rect + ry="1.3120532" + rx="1.2894175" + y="14.5" + x="33.5" + height="3.9999995" + width="7.9999967" + id="rect3297" + style="color:#000000;fill:url(#linearGradient1456);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient1458);stroke-width:1.00000036;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;font-family:Bitstream Vera Sans" /> + <path + transform="matrix(1.355599,0,0,1.3453973,-14.966671,-18.75734)" + d="M 39.421205 33.150757 A 5.833631 5.833631 0 1 1 27.753943,33.150757 A 5.833631 5.833631 0 1 1 39.421205 33.150757 z" + sodipodi:ry="5.833631" + sodipodi:rx="5.833631" + sodipodi:cy="33.150757" + sodipodi:cx="33.587574" + id="path8596" + style="opacity:1;color:#000000;fill:url(#linearGradient8604);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + sodipodi:type="arc" /> + <path + sodipodi:type="arc" + style="opacity:1;color:#000000;fill:url(#radialGradient8934);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient8628);stroke-width:0.23515993;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path8594" + sodipodi:cx="33.587574" + sodipodi:cy="33.150757" + sodipodi:rx="5.833631" + sodipodi:ry="5.833631" + d="M 39.421205 33.150757 A 5.833631 5.833631 0 1 1 27.753943,33.150757 A 5.833631 5.833631 0 1 1 39.421205 33.150757 z" + transform="matrix(1.2939177,0,0,1.257793,-12.894941,-15.094093)" /> + <path + sodipodi:type="arc" + style="opacity:1;color:#000000;fill:url(#linearGradient9105);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path9101" + sodipodi:cx="33.587574" + sodipodi:cy="33.150757" + sodipodi:rx="5.833631" + sodipodi:ry="5.833631" + d="M 39.421205 33.150757 A 5.833631 5.833631 0 1 1 27.753943,33.150757 A 5.833631 5.833631 0 1 1 39.421205 33.150757 z" + transform="matrix(1.0635279,0,0,1.0465458,-5.1567141,-7.5886238)" /> + <path + transform="matrix(1.0151362,0,0,0.9686302,-3.5313497,-4.797608)" + d="M 39.421205 33.150757 A 5.833631 5.833631 0 1 1 27.753943,33.150757 A 5.833631 5.833631 0 1 1 39.421205 33.150757 z" + sodipodi:ry="5.833631" + sodipodi:rx="5.833631" + sodipodi:cy="33.150757" + sodipodi:cx="33.587574" + id="path9103" + style="opacity:1;color:#000000;fill:url(#radialGradient9107);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient9109);stroke-width:0.3025381;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + sodipodi:type="arc" /> + <path + sodipodi:type="arc" + style="opacity:1;color:#000000;fill:url(#linearGradient8638);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path8630" + sodipodi:cx="32.0625" + sodipodi:cy="33.375" + sodipodi:rx="3.75" + sodipodi:ry="3.75" + d="M 35.8125 33.375 A 3.75 3.75 0 1 1 28.3125,33.375 A 3.75 3.75 0 1 1 35.8125 33.375 z" + transform="matrix(1.2702988,0,0,1.2700836,-10.164339,-15.06132)" /> + <rect + ry="1.2356688" + rx="0.94875419" + y="25.375658" + x="26.475426" + height="4.5649796" + width="8.17838" + id="rect8664" + style="opacity:0.47058824;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <rect + style="opacity:1;color:#000000;fill:url(#radialGradient8650);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect8642" + width="8.17838" + height="5" + x="26.475426" + y="24.808058" + rx="1.1324512" + ry="1.1324512" /> + <path + sodipodi:type="arc" + style="opacity:0.78235294;color:#000000;fill:url(#radialGradient8686);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path8666" + sodipodi:cx="9.2365828" + sodipodi:cy="17.726992" + sodipodi:rx="2.9610097" + sodipodi:ry="1.5467961" + d="M 12.197592 17.726992 A 2.9610097 1.5467961 0 1 1 6.275573,17.726992 A 2.9610097 1.5467961 0 1 1 12.197592 17.726992 z" + transform="matrix(1,0,0,0.9697467,0,-2.6906916)" /> + <path + transform="matrix(0.8598222,0,0,0.7359198,1.2947636,1.3521018)" + d="M 12.197592 17.726992 A 2.9610097 1.5467961 0 1 1 6.275573,17.726992 A 2.9610097 1.5467961 0 1 1 12.197592 17.726992 z" + sodipodi:ry="1.5467961" + sodipodi:rx="2.9610097" + sodipodi:cy="17.726992" + sodipodi:cx="9.2365828" + id="path8668" + style="opacity:1;color:#000000;fill:url(#radialGradient8676);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + sodipodi:type="arc" /> + <path + style="opacity:1;color:#000000;fill:url(#linearGradient8741);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + d="M 3.84375,11.28125 L 3.9960613,17.25 L 4.3616084,13.375 C 4.3616084,11.78401 5.9456459,11.75 5.9456459,11.75 L 41.647414,11.75 C 42.80498,11.71875 42.865905,13.875 42.865905,13.875 C 42.865905,13.875 42.987754,11.375 42.987754,11.375 C 43.073914,10.579505 42.713593,9.96875 41.647414,9.875 L 5.2145517,9.875 C 4.54369,9.875 3.84375,10.48781 3.84375,11.28125 z " + id="path8733" + sodipodi:nodetypes="cccccccccc" /> + <path + sodipodi:type="arc" + style="opacity:1;color:#000000;fill:url(#radialGradient8745);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path8743" + sodipodi:cx="9.2365828" + sodipodi:cy="17.726992" + sodipodi:rx="2.9610097" + sodipodi:ry="1.5467961" + d="M 12.197592 17.726992 A 2.9610097 1.5467961 0 1 1 6.275573,17.726992 A 2.9610097 1.5467961 0 1 1 12.197592 17.726992 z" + transform="matrix(0.5065839,0,0,0.6464973,24.820896,-0.4604517)" /> + <path + transform="matrix(0.5065839,0,0,0.6464973,28.820896,-0.4604517)" + d="M 12.197592 17.726992 A 2.9610097 1.5467961 0 1 1 6.275573,17.726992 A 2.9610097 1.5467961 0 1 1 12.197592 17.726992 z" + sodipodi:ry="1.5467961" + sodipodi:rx="2.9610097" + sodipodi:cy="17.726992" + sodipodi:cx="9.2365828" + id="path8747" + style="opacity:1;color:#000000;fill:url(#radialGradient8749);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + sodipodi:type="arc" /> + <path + sodipodi:type="arc" + style="opacity:1;color:#000000;fill:url(#radialGradient8753);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path8751" + sodipodi:cx="9.2365828" + sodipodi:cy="17.726992" + sodipodi:rx="2.9610097" + sodipodi:ry="1.5467961" + d="M 12.197592 17.726992 A 2.9610097 1.5467961 0 1 1 6.275573,17.726992 A 2.9610097 1.5467961 0 1 1 12.197592 17.726992 z" + transform="matrix(0.5065839,0,0,0.6464973,32.820896,-0.4604517)" /> + <g + id="g8919" + clip-path="url(#clipPath8924)" + transform="translate(-2,-4.1919416)"> + <path + transform="translate(0.375,-0.125)" + d="M 35 31 A 2.6875 2.6875 0 1 1 29.625,31 A 2.6875 2.6875 0 1 1 35 31 z" + sodipodi:ry="2.6875" + sodipodi:rx="2.6875" + sodipodi:cy="31" + sodipodi:cx="32.3125" + id="path8893" + style="opacity:1;color:#000000;fill:url(#radialGradient8936);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.30000001;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + sodipodi:type="arc" /> + <path + transform="matrix(0.6764706,0,0,0.6764706,9.9834559,13.224265)" + d="M 35.6875 26 A 2.125 2.125 0 1 1 31.4375,26 A 2.125 2.125 0 1 1 35.6875 26 z" + sodipodi:ry="2.125" + sodipodi:rx="2.125" + sodipodi:cy="26" + sodipodi:cx="33.5625" + id="path8907" + style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#radialGradient8938);stroke-width:1.47826087;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + sodipodi:type="arc" /> + <path + transform="matrix(0.6676229,0,0,0.6675098,10.635888,7.577028)" + d="M 32.1875 33.0625 A 0.875 0.875 0 1 1 30.4375,33.0625 A 0.875 0.875 0 1 1 32.1875 33.0625 z" + sodipodi:ry="0.875" + sodipodi:rx="0.875" + sodipodi:cy="33.0625" + sodipodi:cx="31.3125" + id="path8652" + style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + sodipodi:type="arc" /> + </g> + <path + sodipodi:type="arc" + style="opacity:0.34705882;color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path8962" + sodipodi:cx="27.577164" + sodipodi:cy="16.44536" + sodipodi:rx="0.83968931" + sodipodi:ry="0.83968931" + d="M 28.416853 16.44536 A 0.83968931 0.83968931 0 1 1 26.737474,16.44536 A 0.83968931 0.83968931 0 1 1 28.416853 16.44536 z" + transform="translate(-2,0)" /> + <path + d="M 28.416853 16.44536 A 0.83968931 0.83968931 0 1 1 26.737474,16.44536 A 0.83968931 0.83968931 0 1 1 28.416853 16.44536 z" + sodipodi:ry="0.83968931" + sodipodi:rx="0.83968931" + sodipodi:cy="16.44536" + sodipodi:cx="27.577164" + id="path8964" + style="opacity:0.30588235;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;filter:url(#filter9094);enable-background:accumulate" + sodipodi:type="arc" + transform="matrix(0.7105263,0,0,0.7105263,6.3585135,5.4745378)" /> + </g> +</svg> diff --git a/icons/photo2.png b/icons/photo2.png Binary files differnew file mode 100644 index 0000000..fce4aa3 --- /dev/null +++ b/icons/photo2.png diff --git a/icons/profile.png b/icons/profile.png Binary files differnew file mode 100644 index 0000000..efbda90 --- /dev/null +++ b/icons/profile.png diff --git a/icons/projection.png b/icons/projection.png Binary files differnew file mode 100644 index 0000000..9d28c96 --- /dev/null +++ b/icons/projection.png diff --git a/icons/reset.png b/icons/reset.png Binary files differnew file mode 100644 index 0000000..292f56e --- /dev/null +++ b/icons/reset.png diff --git a/icons/source.png b/icons/source.png Binary files differnew file mode 100644 index 0000000..dc11ad7 --- /dev/null +++ b/icons/source.png diff --git a/icons/target.png b/icons/target.png Binary files differnew file mode 100644 index 0000000..faeeb61 --- /dev/null +++ b/icons/target.png diff --git a/icons/terminal.png b/icons/terminal.png Binary files differnew file mode 100644 index 0000000..adaa002 --- /dev/null +++ b/icons/terminal.png diff --git a/icons/terminal.svg b/icons/terminal.svg new file mode 100644 index 0000000..2197700 --- /dev/null +++ b/icons/terminal.svg @@ -0,0 +1,498 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://web.resource.org/cc/" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="48px" + height="48px" + id="svg1306" + sodipodi:version="0.32" + inkscape:version="0.43+devel" + sodipodi:docbase="/home/jimmac/src/cvs/tango-icon-theme/scalable/apps" + sodipodi:docname="utilities-terminal.svg" + inkscape:export-filename="/home/andreas/projekt/bild/tango/terminal4.png" + inkscape:export-xdpi="240.00000" + inkscape:export-ydpi="240.00000"> + <defs + id="defs1308"> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5060" + id="radialGradient5031" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)" + cx="605.71429" + cy="486.64789" + fx="605.71429" + fy="486.64789" + r="117.14286" /> + <linearGradient + inkscape:collect="always" + id="linearGradient5060"> + <stop + style="stop-color:black;stop-opacity:1;" + offset="0" + id="stop5062" /> + <stop + style="stop-color:black;stop-opacity:0;" + offset="1" + id="stop5064" /> + </linearGradient> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5060" + id="radialGradient5029" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)" + cx="605.71429" + cy="486.64789" + fx="605.71429" + fy="486.64789" + r="117.14286" /> + <linearGradient + id="linearGradient5048"> + <stop + style="stop-color:black;stop-opacity:0;" + offset="0" + id="stop5050" /> + <stop + id="stop5056" + offset="0.5" + style="stop-color:black;stop-opacity:1;" /> + <stop + style="stop-color:black;stop-opacity:0;" + offset="1" + id="stop5052" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient5048" + id="linearGradient5027" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)" + x1="302.85715" + y1="366.64789" + x2="302.85715" + y2="609.50507" /> + <linearGradient + inkscape:collect="always" + id="linearGradient6447"> + <stop + style="stop-color:#777973;stop-opacity:1;" + offset="0" + id="stop6449" /> + <stop + style="stop-color:#777973;stop-opacity:0;" + offset="1" + id="stop6451" /> + </linearGradient> + <linearGradient + id="linearGradient4254"> + <stop + style="stop-color:#616161;stop-opacity:1.0000000;" + offset="0.0000000" + id="stop4256" /> + <stop + style="stop-color:#a0a0a0;stop-opacity:1.0000000;" + offset="1.0000000" + id="stop4258" /> + </linearGradient> + <linearGradient + id="linearGradient5176"> + <stop + id="stop5178" + offset="0.0000000" + style="stop-color:#a2a59c;stop-opacity:1.0000000;" /> + <stop + id="stop5180" + offset="1.0000000" + style="stop-color:#535750;stop-opacity:1.0000000;" /> + </linearGradient> + <linearGradient + id="linearGradient2667"> + <stop + id="stop2669" + offset="0.0000000" + style="stop-color:#ffffff;stop-opacity:1.0000000;" /> + <stop + id="stop2671" + offset="1.0000000" + style="stop-color:#fcfcff;stop-opacity:0.0000000;" /> + </linearGradient> + <linearGradient + gradientUnits="userSpaceOnUse" + y2="26.729263" + x2="17.199417" + y1="1.6537577" + x1="11.492236" + gradientTransform="matrix(1.236157,0.000000,0.000000,0.896051,-1.081820,2.830699)" + id="linearGradient2673" + xlink:href="#linearGradient2667" + inkscape:collect="always" /> + <linearGradient + inkscape:collect="always" + id="linearGradient2238"> + <stop + style="stop-color:#ffffff;stop-opacity:1;" + offset="0" + id="stop2240" /> + <stop + style="stop-color:#ffffff;stop-opacity:0;" + offset="1" + id="stop2242" /> + </linearGradient> + <linearGradient + id="linearGradient2224"> + <stop + style="stop-color:#32342f;stop-opacity:0.54639173;" + offset="0.0000000" + id="stop2226" /> + <stop + style="stop-color:#32342f;stop-opacity:0;" + offset="1" + id="stop2228" /> + </linearGradient> + <linearGradient + id="linearGradient2214"> + <stop + style="stop-color:#a9aaa7;stop-opacity:1.0000000;" + offset="0.0000000" + id="stop2216" /> + <stop + style="stop-color:#676964;stop-opacity:1.0000000;" + offset="1.0000000" + id="stop2218" /> + </linearGradient> + <linearGradient + id="linearGradient2206"> + <stop + style="stop-color:#777973;stop-opacity:1.0000000;" + offset="0.0000000" + id="stop2208" /> + <stop + style="stop-color:#cbccca;stop-opacity:1.0000000;" + offset="1.0000000" + id="stop2210" /> + </linearGradient> + <linearGradient + id="linearGradient2198"> + <stop + style="stop-color:#748f48;stop-opacity:1.0000000;" + offset="0.0000000" + id="stop2200" /> + <stop + style="stop-color:#1f2816;stop-opacity:1.0000000;" + offset="1.0000000" + id="stop2202" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient2198" + id="linearGradient2204" + x1="23.118565" + y1="9.5830288" + x2="22.440805" + y2="34.225887" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.950085,0.000000,0.000000,0.965659,1.243978,0.255342)" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient2206" + id="linearGradient2212" + x1="29.870447" + y1="32.285740" + x2="24.841814" + y2="14.157946" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.957412,0.000000,0.000000,0.952331,1.022766,0.133307)" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient5176" + id="linearGradient2220" + x1="8.6529236" + y1="9.5865316" + x2="21.305075" + y2="32.497993" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.957412,0.000000,0.000000,0.952331,1.022766,0.133307)" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient2224" + id="radialGradient2230" + cx="24.041630" + cy="42.242130" + fx="24.041630" + fy="42.242130" + r="17.576654" + gradientTransform="matrix(1.000000,0.000000,0.000000,0.304598,-1.841788e-16,29.37527)" + gradientUnits="userSpaceOnUse" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient2238" + id="linearGradient2244" + x1="20.338758" + y1="19.636894" + x2="48.845253" + y2="49.730762" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.953506,0.000000,0.000000,0.947873,1.141528,1.205591)" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4254" + id="linearGradient4260" + x1="11.048059" + y1="9.1463490" + x2="26.178129" + y2="30.343304" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.997583,0.000000,0.000000,0.989941,0.104141,7.028871e-2)" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient2214" + id="linearGradient5719" + x1="40.253334" + y1="42.318577" + x2="36.451904" + y2="37.999615" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.000000,0.000000,0.000000,0.744756,0.000000,9.569132)" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient6447" + id="radialGradient6453" + cx="37.495606" + cy="39.510023" + fx="37.495606" + fy="39.510023" + r="2.5100370" + gradientTransform="matrix(1.000000,0.000000,0.000000,0.737790,0.000000,9.844321)" + gradientUnits="userSpaceOnUse" /> + </defs> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="0.19607843" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="1" + inkscape:cx="23.810703" + inkscape:cy="12.124648" + inkscape:current-layer="layer1" + showgrid="false" + inkscape:grid-bbox="true" + inkscape:document-units="px" + inkscape:window-width="926" + inkscape:window-height="975" + inkscape:window-x="397" + inkscape:window-y="25" + showguides="true" + inkscape:guide-bbox="true" + inkscape:showpageshadow="false" /> + <metadata + id="metadata1311"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title>Terminal</dc:title> + <dc:date>2005-10-15</dc:date> + <dc:creator> + <cc:Agent> + <dc:title>Andreas Nilsson</dc:title> + </cc:Agent> + </dc:creator> + <dc:subject> + <rdf:Bag> + <rdf:li>terminal</rdf:li> + <rdf:li>emulator</rdf:li> + <rdf:li>term</rdf:li> + <rdf:li>command line</rdf:li> + </rdf:Bag> + </dc:subject> + <cc:license + rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" /> + <dc:contributor> + <cc:Agent> + <dc:title>Jakub Steiner</dc:title> + </cc:Agent> + </dc:contributor> + </cc:Work> + <cc:License + rdf:about="http://creativecommons.org/licenses/by-sa/2.0/"> + <cc:permits + rdf:resource="http://web.resource.org/cc/Reproduction" /> + <cc:permits + rdf:resource="http://web.resource.org/cc/Distribution" /> + <cc:requires + rdf:resource="http://web.resource.org/cc/Notice" /> + <cc:requires + rdf:resource="http://web.resource.org/cc/Attribution" /> + <cc:permits + rdf:resource="http://web.resource.org/cc/DerivativeWorks" /> + <cc:requires + rdf:resource="http://web.resource.org/cc/ShareAlike" /> + </cc:License> + </rdf:RDF> + </metadata> + <g + id="layer1" + inkscape:label="Layer 1" + inkscape:groupmode="layer"> + <g + id="g5022" + transform="matrix(2.454499e-2,0,0,2.086758e-2,46.14369,39.34109)"> + <rect + y="-150.69685" + x="-1559.2523" + height="478.35718" + width="1339.6335" + id="rect4173" + style="opacity:0.40206185;color:black;fill:url(#linearGradient5027);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" /> + <path + sodipodi:nodetypes="cccc" + id="path5058" + d="M -219.61876,-150.68038 C -219.61876,-150.68038 -219.61876,327.65041 -219.61876,327.65041 C -76.744594,328.55086 125.78146,220.48075 125.78138,88.454235 C 125.78138,-43.572302 -33.655436,-150.68036 -219.61876,-150.68038 z " + style="opacity:0.40206185;color:black;fill:url(#radialGradient5029);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" /> + <path + style="opacity:0.40206185;color:black;fill:url(#radialGradient5031);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" + d="M -1559.2523,-150.68038 C -1559.2523,-150.68038 -1559.2523,327.65041 -1559.2523,327.65041 C -1702.1265,328.55086 -1904.6525,220.48075 -1904.6525,88.454235 C -1904.6525,-43.572302 -1745.2157,-150.68036 -1559.2523,-150.68038 z " + id="path5018" + sodipodi:nodetypes="cccc" /> + </g> + <rect + style="opacity:1.0000000;fill:url(#linearGradient2212);fill-opacity:1.0000000;fill-rule:evenodd;stroke:url(#linearGradient2220);stroke-width:0.99999946;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000" + id="rect1316" + width="44.996037" + height="38.998734" + x="1.5026338" + y="3.5015533" + rx="4.8517075" + ry="4.8517079" /> + <rect + style="opacity:1.0000000;fill:url(#linearGradient2204);fill-opacity:1.0000000;fill-rule:evenodd;stroke:url(#linearGradient4260);stroke-width:0.99495775;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000" + id="rect1314" + width="37.088005" + height="29.022322" + x="5.4962788" + y="7.4827089" + rx="1.6452150" + ry="1.6452144" /> + <g + id="g2286" + style="opacity:0.25568182"> + <path + id="path1345" + d="M 8.0152033,11.500361 L 39.994145,11.500361" + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#181f10;stroke-width:1.00072134;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + <path + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#181f10;stroke-width:1.00072134;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 8.0152033,13.500361 L 39.994145,13.500361" + id="path2264" /> + <path + id="path2266" + d="M 8.0152033,15.500361 L 39.994145,15.500361" + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#181f10;stroke-width:1.00072134;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + <path + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#181f10;stroke-width:1.00072134;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 8.0152033,17.500361 L 39.994145,17.500361" + id="path2268" /> + <path + id="path2270" + d="M 8.0152033,19.500361 L 39.994145,19.500361" + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#181f10;stroke-width:1.00072134;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + <path + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#181f10;stroke-width:1.00072134;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 8.0152033,21.500361 L 39.994145,21.500361" + id="path2272" /> + <path + id="path2274" + d="M 8.0152033,23.500361 L 39.994145,23.500361" + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#181f10;stroke-width:1.00072134;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + <path + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#181f10;stroke-width:1.00072134;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 8.0152033,25.500361 L 39.994145,25.500361" + id="path2276" /> + <path + id="path2278" + d="M 8.0152033,27.500361 L 39.994145,27.500361" + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#181f10;stroke-width:1.00072134;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + <path + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#181f10;stroke-width:1.00072134;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 8.0152033,29.500361 L 39.994145,29.500361" + id="path2280" /> + <path + id="path2282" + d="M 8.0152033,31.500361 L 39.994145,31.500361" + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#181f10;stroke-width:1.00072134;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + <path + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#181f10;stroke-width:1.00072134;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 8.0152033,33.500361 L 39.994145,33.500361" + id="path2284" /> + </g> + <rect + style="opacity:0.76373626;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2244);stroke-width:0.99999946;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="rect2232" + width="42.945141" + height="37.000587" + x="2.5542557" + y="4.5007114" + rx="3.7910469" + ry="3.7910469" /> + <path + style="font-size:18.585011px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125.00000%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1.0000000;stroke:#6ed66e;stroke-width:1.0000000pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.27868852;font-family:Bitstream Vera Sans Mono" + d="M 11.625000,20.679392 L 11.625000,17.625000 L 20.609828,21.685794 L 20.609828,23.541713 L 11.625000,27.629147 L 11.625000,24.583829 L 18.589396,22.729971 L 11.625000,20.679392 z M 30.517635,30.705752 L 30.517635,32.679948 L 19.614229,32.679948 L 19.614229,30.705752 L 30.517635,30.705752" + id="text1340" + sodipodi:nodetypes="ccccccccccccc" /> + <path + sodipodi:nodetypes="ccccccc" + style="opacity:0.53142856;fill:url(#linearGradient2673);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.25pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="M 7.625388,8 C 7.102102,8 6.05153,8.190188 6.05153,9.0259761 L 6.16958,25.542519 C 23.841567,24.579133 20.294433,17.286426 42,13.633318 L 41.937264,9.2913791 C 41.859002,8.1662868 41.397947,8.0594548 40.327115,8.066071 L 7.625388,8 z " + id="path2443" /> + <rect + style="opacity:0.71428573;fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.9999992;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000" + id="rect1340" + width="34.026031" + height="26.057468" + x="6.9894562" + y="8.9805145" + rx="0.11773217" + ry="0.11773217" /> + <rect + style="opacity:1;fill:url(#radialGradient6453);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient5719);stroke-width:1.00000119;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="rect5025" + width="4.0200734" + height="2.9590063" + x="35.485569" + y="37.514935" + rx="0.35819405" + ry="0.56022596" /> + <rect + style="opacity:1;fill:#93d94c;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="rect6458" + width="2" + height="2" + x="32" + y="38" + rx="0.56022543" + ry="0.56022543" /> + <path + sodipodi:type="arc" + style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" + id="path2300" + sodipodi:cx="28.3125" + sodipodi:cy="38.75" + sodipodi:rx="0.5625" + sodipodi:ry="0.5625" + d="M 28.875 38.75 A 0.5625 0.5625 0 1 1 27.75,38.75 A 0.5625 0.5625 0 1 1 28.875 38.75 z" + transform="translate(4.375000,-6.250000e-2)" /> + </g> +</svg> diff --git a/icons/touch.jpg b/icons/touch.jpg Binary files differnew file mode 100644 index 0000000..3bfc35f --- /dev/null +++ b/icons/touch.jpg diff --git a/icons/unlocksingle.png b/icons/unlocksingle.png Binary files differnew file mode 100644 index 0000000..d9f962c --- /dev/null +++ b/icons/unlocksingle.png diff --git a/icons/unprojection.png b/icons/unprojection.png Binary files differnew file mode 100644 index 0000000..0878b0c --- /dev/null +++ b/icons/unprojection.png diff --git a/icons/view-restore.png b/icons/view-restore.png Binary files differnew file mode 100644 index 0000000..d6ba59c --- /dev/null +++ b/icons/view-restore.png diff --git a/icons/view-restore.svg b/icons/view-restore.svg new file mode 100644 index 0000000..000c826 --- /dev/null +++ b/icons/view-restore.svg @@ -0,0 +1,422 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://web.resource.org/cc/" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + version="1.0" + x="0.0000000" + y="0.0000000" + width="48.000000" + height="48.000000" + id="svg11300" + sodipodi:version="0.32" + inkscape:version="0.45" + sodipodi:docname="view-restore.svg" + sodipodi:docbase="/home/dobey/Projects/gnome-icon-theme/scalable/actions" + inkscape:output_extension="org.inkscape.output.svg.inkscape"> + <metadata + id="metadata66"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title>Restore View</dc:title> + <dc:contributor> + <cc:Agent> + <dc:title /> + </cc:Agent> + </dc:contributor> + <cc:license + rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" /> + <dc:source>http://jimmac.musichall.cz</dc:source> + <dc:creator> + <cc:Agent> + <dc:title>Jakub Steiner</dc:title> + </cc:Agent> + </dc:creator> + <dc:subject> + <rdf:Bag> + <rdf:li>window</rdf:li> + <rdf:li>fullscreen</rdf:li> + <rdf:li>view. restore</rdf:li> + </rdf:Bag> + </dc:subject> + </cc:Work> + <cc:License + rdf:about="http://creativecommons.org/licenses/GPL/2.0/"> + <cc:permits + rdf:resource="http://web.resource.org/cc/Reproduction" /> + <cc:permits + rdf:resource="http://web.resource.org/cc/Distribution" /> + <cc:requires + rdf:resource="http://web.resource.org/cc/Notice" /> + <cc:permits + rdf:resource="http://web.resource.org/cc/DerivativeWorks" /> + <cc:requires + rdf:resource="http://web.resource.org/cc/ShareAlike" /> + <cc:requires + rdf:resource="http://web.resource.org/cc/SourceCode" /> + </cc:License> + </rdf:RDF> + </metadata> + <sodipodi:namedview + inkscape:window-height="889" + inkscape:window-width="924" + inkscape:pageshadow="2" + inkscape:pageopacity="0.0" + borderopacity="0.31764706" + bordercolor="#666" + pagecolor="#ffffff" + id="base" + inkscape:zoom="8" + inkscape:cx="21.684252" + inkscape:cy="19.196453" + inkscape:window-x="2237" + inkscape:window-y="144" + inkscape:current-layer="svg11300" + showgrid="true" + inkscape:showpageshadow="false" /> + <defs + id="defs3"> + <linearGradient + inkscape:collect="always" + id="linearGradient2905"> + <stop + style="stop-color:#729fcf;stop-opacity:1;" + offset="0" + id="stop2907" /> + <stop + style="stop-color:#729fcf;stop-opacity:0;" + offset="1" + id="stop2909" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient2897"> + <stop + style="stop-color:#204a87;stop-opacity:1;" + offset="0" + id="stop2899" /> + <stop + style="stop-color:#204a87;stop-opacity:0;" + offset="1" + id="stop2901" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient2889"> + <stop + style="stop-color:white;stop-opacity:1;" + offset="0" + id="stop2891" /> + <stop + style="stop-color:white;stop-opacity:0;" + offset="1" + id="stop2893" /> + </linearGradient> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5060" + id="radialGradient5031" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)" + cx="605.71429" + cy="486.64789" + fx="605.71429" + fy="486.64789" + r="117.14286" /> + <linearGradient + inkscape:collect="always" + id="linearGradient5060"> + <stop + style="stop-color:black;stop-opacity:1;" + offset="0" + id="stop5062" /> + <stop + style="stop-color:black;stop-opacity:0;" + offset="1" + id="stop5064" /> + </linearGradient> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5060" + id="radialGradient5029" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)" + cx="605.71429" + cy="486.64789" + fx="605.71429" + fy="486.64789" + r="117.14286" /> + <linearGradient + id="linearGradient5048"> + <stop + style="stop-color:black;stop-opacity:0;" + offset="0" + id="stop5050" /> + <stop + id="stop5056" + offset="0.5" + style="stop-color:black;stop-opacity:1;" /> + <stop + style="stop-color:black;stop-opacity:0;" + offset="1" + id="stop5052" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient5048" + id="linearGradient5027" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)" + x1="302.85715" + y1="366.64789" + x2="302.85715" + y2="609.50507" /> + <linearGradient + id="linearGradient4816"> + <stop + style="stop-color:#204a87;stop-opacity:1.0000000" + offset="0.0000000" + id="stop4818" /> + <stop + style="stop-color:#204a87;stop-opacity:0.0000000" + offset="1.0000000" + id="stop4820" /> + </linearGradient> + <linearGradient + id="linearGradient3832"> + <stop + style="stop-color:#ffffff;stop-opacity:1.0000000" + offset="0.0000000" + id="stop3834" /> + <stop + style="stop-color:#e0e0e0;stop-opacity:1.0000000" + offset="1.0000000" + id="stop3836" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4816" + id="linearGradient2264" + gradientUnits="userSpaceOnUse" + x1="13.050564" + y1="11.353518" + x2="13.050564" + y2="5.6173568" + gradientTransform="matrix(1.116479,0,0,1.28466,-1.813167,16.33649)" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3832" + id="linearGradient2267" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.181102,0,0,1.133215,-2.996059,16.44342)" + x1="17.880680" + y1="11.072588" + x2="17.880680" + y2="21.767578" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient5048" + id="linearGradient1983" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)" + x1="302.85715" + y1="366.64789" + x2="302.85715" + y2="609.50507" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5060" + id="radialGradient1985" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)" + cx="605.71429" + cy="486.64789" + fx="605.71429" + fy="486.64789" + r="117.14286" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5060" + id="radialGradient1987" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)" + cx="605.71429" + cy="486.64789" + fx="605.71429" + fy="486.64789" + r="117.14286" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3832" + id="linearGradient1989" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.181102,0,0,1.133215,7.003941,8.44342)" + x1="17.880680" + y1="11.072588" + x2="17.880680" + y2="21.767578" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4816" + id="linearGradient1991" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.116479,0,0,1.28466,8.186833,8.33649)" + x1="13.050564" + y1="11.353518" + x2="13.050564" + y2="5.6173568" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient2889" + id="linearGradient2895" + x1="24.75" + y1="13.984375" + x2="41.96875" + y2="13.984375" + gradientUnits="userSpaceOnUse" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient2897" + id="linearGradient2903" + x1="35.100983" + y1="12.375624" + x2="43.349266" + y2="4.4381237" + gradientUnits="userSpaceOnUse" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient2905" + id="linearGradient2911" + x1="35.100983" + y1="12.375624" + x2="43.349266" + y2="4.4381237" + gradientUnits="userSpaceOnUse" /> + </defs> + <g + id="g1993" + style="opacity:0.6"> + <g + style="opacity:0.58730164;display:inline" + id="g1969" + transform="matrix(1.32174e-2,0,0,1.145603e-2,35.17455,34.53806)"> + <rect + y="-150.69685" + x="-1559.2523" + height="478.35718" + width="1339.6335" + id="rect1971" + style="opacity:0.40206185;color:black;fill:url(#linearGradient1983);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" /> + <path + sodipodi:nodetypes="cccc" + id="path1973" + d="M -219.61876,-150.68038 C -219.61876,-150.68038 -219.61876,327.65041 -219.61876,327.65041 C -76.744594,328.55086 125.78146,220.48075 125.78138,88.454235 C 125.78138,-43.572302 -33.655436,-150.68036 -219.61876,-150.68038 z " + style="opacity:0.40206185;color:black;fill:url(#radialGradient1985);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" /> + <path + style="opacity:0.40206185;color:black;fill:url(#radialGradient1987);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" + d="M -1559.2523,-150.68038 C -1559.2523,-150.68038 -1559.2523,327.65041 -1559.2523,327.65041 C -1702.1265,328.55086 -1904.6525,220.48075 -1904.6525,88.454235 C -1904.6525,-43.572302 -1745.2157,-150.68036 -1559.2523,-150.68038 z " + id="path1975" + sodipodi:nodetypes="cccc" /> + </g> + <rect + width="18.999998" + height="18.000006" + rx="0.46699828" + ry="0.48554277" + x="13.500001" + y="17.5" + style="color:black;fill:url(#linearGradient1989);fill-opacity:1;fill-rule:evenodd;stroke:#8d8d8d;stroke-width:1.00000119;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" + id="rect1977" /> + <rect + width="16" + height="3.2133625" + rx="0.084674627" + ry="0.10203383" + x="15" + y="19" + style="color:black;fill:url(#linearGradient1991);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" + id="rect1979" /> + <rect + width="16.999989" + height="15.99999" + rx="0.15984313" + ry="0.14619765" + x="14.500002" + y="18.499994" + style="color:black;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:white;stroke-width:1.00000167;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.47878789;visibility:visible;display:inline;overflow:visible" + id="rect1981" /> + </g> + <g + style="opacity:0.58730164;display:inline" + id="g5022" + transform="matrix(1.32174e-2,0,0,1.145603e-2,25.17455,42.53806)"> + <rect + y="-150.69685" + x="-1559.2523" + height="478.35718" + width="1339.6335" + id="rect4173" + style="opacity:0.40206185;color:black;fill:url(#linearGradient5027);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" /> + <path + sodipodi:nodetypes="cccc" + id="path5058" + d="M -219.61876,-150.68038 C -219.61876,-150.68038 -219.61876,327.65041 -219.61876,327.65041 C -76.744594,328.55086 125.78146,220.48075 125.78138,88.454235 C 125.78138,-43.572302 -33.655436,-150.68036 -219.61876,-150.68038 z " + style="opacity:0.40206185;color:black;fill:url(#radialGradient5029);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" /> + <path + style="opacity:0.40206185;color:black;fill:url(#radialGradient5031);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" + d="M -1559.2523,-150.68038 C -1559.2523,-150.68038 -1559.2523,327.65041 -1559.2523,327.65041 C -1702.1265,328.55086 -1904.6525,220.48075 -1904.6525,88.454235 C -1904.6525,-43.572302 -1745.2157,-150.68036 -1559.2523,-150.68038 z " + id="path5018" + sodipodi:nodetypes="cccc" /> + </g> + <rect + width="18.999998" + height="18.000006" + rx="0.46699828" + ry="0.48554277" + x="3.5000007" + y="25.5" + style="color:black;fill:url(#linearGradient2267);fill-opacity:1;fill-rule:evenodd;stroke:#8d8d8d;stroke-width:1.00000119;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" + id="rect3818" /> + <rect + width="16" + height="3.2133625" + rx="0.084674627" + ry="0.10203383" + x="5" + y="27" + style="color:black;fill:url(#linearGradient2264);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" + id="rect3820" /> + <rect + width="16.999989" + height="15.99999" + rx="0.15984313" + ry="0.14619765" + x="4.5000014" + y="26.499994" + style="color:black;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:white;stroke-width:1.00000167;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.47878789;visibility:visible;display:inline;overflow:visible" + id="rect4962" /> + <path + id="path2890" + d="M 35.983085,20.557267 L 32.986379,17.741128 L 47.536767,1.0012484 L 29.463656,14.208861 L 26.28779,11.024392 L 24.100981,22.5 L 35.983085,20.557267 z " + style="opacity:1;color:black;fill:url(#linearGradient2911);fill-opacity:1.0;fill-rule:evenodd;stroke:url(#linearGradient2903);stroke-width:0.99999994;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" + sodipodi:nodetypes="ccccccc" /> + <path + sodipodi:type="inkscape:offset" + inkscape:radius="-0.92676479" + inkscape:original="M 47.53125 1 L 29.46875 14.21875 L 26.28125 11.03125 L 24.09375 22.5 L 35.96875 20.5625 L 33 17.75 L 47.53125 1 z " + xlink:href="#path2890" + style="opacity:0.40703518;color:black;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2895);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" + id="path2887" + inkscape:href="#path2890" + d="M 41.46875,6.59375 L 30.03125,14.96875 C 29.659036,15.247768 29.137662,15.207663 28.8125,14.875 L 26.875,12.9375 L 25.25,21.375 L 33.96875,19.96875 L 32.375,18.4375 C 32.014256,18.09614 31.986693,17.5311 32.3125,17.15625 L 41.46875,6.59375 z " /> +</svg> diff --git a/misc/pvs-vncsrv b/misc/pvs-vncsrv new file mode 100755 index 0000000..a8e0621 --- /dev/null +++ b/misc/pvs-vncsrv @@ -0,0 +1,112 @@ +#!/bin/bash +# ----------------------------------------------------------------------------- +# Copyright (c) 2009 - RZ Uni FR +# Copyright (c) 2009 - OpenSLX GmbH +# +# This program is free software distributed under the GPL version 2. +# See http://openslx.org/COPYING +# +# If you have any feedback please consult http://openslx.org/feedback and +# send your suggestions, praise, or complaints to feedback@openslx.org +# +# General information about OpenSLX can be found at http://openslx.org/ +# ----------------------------------------------------------------------------- +# pvs-vncsrv +# - This is a generic wrapper script for starting any userspace VNC server +# to offer connectivity from the pvs contol console. The script expects +# start/stop in $1, the port to start on in $2, the password in $3 and +# the rwpassword in $4. +# The latter one should be changed to piping for security reasons ... +# ----------------------------------------------------------------------------- + +# parameters for x11vnc +X11VNC_PARAMS="-bg -forever -display :0 -passwdfile rm:$HOME/.pvs/vncpasswd -o $HOME/.pvs/log.vncsrv -shared" +X11VNC_X11="0" + +# at the moment the poolVSClient is expected to use the ~/.pvs directory +[ -d ~/.pvs ] || mkdir ~/.pvs + +# write the password file +if [ -z "$4" ]; then + echo -e "__BEGIN_VIEWONLY__\n$3" > ~/.pvs/vncpasswd +else + echo -e "$4\n__BEGIN_VIEWONLY__\n$3" > ~/.pvs/vncpasswd +fi + +# find xauthority file +find_xauth () { + FOUND=0 + RETRIES=4 + [ -z "$1" ] || RETRIES="$1" + + [ -e "/var/lib/kdm/" ] && + XAUTHFILE_KDM=`find /var/lib/kdm/ -iname "A\:0-*"` + [ -e "/var/run/xauth/" ] && + XAUTHFILE_KDM2=$(find /var/run/xauth/ -iname "A\:0-*") + [ -e "/var/lib/xdm/authdir/authfiles/" ] && + XAUTHFILE_XDM=$(find /var/lib/xdm/authdir/authfiles/ -iname "A\:0-*") + [ -e "/var/lib/gdm/" ] && + XAUTHFILE_GDM=$(find /var/lib/gdm/ -iname *Xauth*) + + [ -f "$XAUTHFILE_KDM" ] && FOUND=1 && XAUTHORITY="$XAUTHFILE_KDM" + [ -f "$XAUTHFILE_KDM2" ] && FOUND=1 && XAUTHORITY="$XAUTHFILE_KDM2" + [ -f "$XAUTHFILE_XDM" ] && FOUND=1 && XAUTHORITY="$XAUTHFILE_XDM" + [ -f "$XAUTHFILE_GDM" ] && FOUND=1 && XAUTHORITY="$XAUTHFILE_GDM" + + if [ "$FOUND" -eq "0" ]; then + if [ "$RETRIES" -gt "0" ]; then + let "RETRIES-=1" + find_xauth "$RETRIES" + else + echo "start FAILED (can't find way to authenticate myself against X)" \ + >>~/.pvs/log.vncsrv + exit 1 + fi + else + echo "found authfile ($XAUTHORITY)" >>~/.pvs/log.vncsrv + fi +} + +START_COMMAND="x11vnc" + +case "$1" in + start) + [ -z "$2" -o -z "$3" ] && echo " Port and/or Password not set" \ + >>~/.pvs/log.vncsrv + echo "$2 $3" >>~/.pvs/log.test + if [ ! -f ~/.pvs/vncpasswd ]; then + echo " Start FAILED (~/.pvs/vncpasswd not found)" >>~/.pvs/log.vncsrv + echo " Create it manualy and retry starting x11vnc" >>~/.pvs/log.vncsrv + exit 2; + fi + + if [ $X11VNC_X11 = 1 ]; then + # find_xauth + START_COMMAND="$START_COMMAND -auth $XAUTHORITY $X11VNC_PARAMS" + else + START_COMMAND="$START_COMMAND $X11VNC_PARAMS" + fi + echo "$START_COMMAND" >>~/.pvs/log.vncsrv + echo "$OUTPUT" >>~/.pvs/log.vncsrv + OUTPUT=$($START_COMMAND -rfbport $2) + # return codes: http://tldp.org/LDP/abs/html/exitcodes.html + exit $? + ;; + stop) + pid=$(pidof x11vnc) + if [ -z "$pid" ] + then + echo "x11vnc not running" >>~/.pvs/log.vncsrv + exit 1; + else + kill -9 $pid 2>/dev/null + echo "x11vnc stopped" >>~/.pvs/log.vncsrv + fi + ;; + *) + echo "x11vnc startscript" + echo "Usage: $0 (start|stop)" + ;; +esac +exit 0 + diff --git a/misc/pvs.conf b/misc/pvs.conf new file mode 100644 index 0000000..a6fe1f0 --- /dev/null +++ b/misc/pvs.conf @@ -0,0 +1,10 @@ +[General] +chatstate=on +chatmode=community +VNCPermit= + +[room] +room=2 +background= +clientorder= +tag= diff --git a/misc/pvsmgr.conf b/misc/pvsmgr.conf new file mode 100644 index 0000000..3ff7b40 --- /dev/null +++ b/misc/pvsmgr.conf @@ -0,0 +1,12 @@ +[Chat] +chatstate=on +chatmode=bossmode + +[Room] +roomId=123 + +[VNC] +quality=high + +[General] +chatmode=private diff --git a/org.openslx.pvs.service b/org.openslx.pvs.service new file mode 100644 index 0000000..0398081 --- /dev/null +++ b/org.openslx.pvs.service @@ -0,0 +1,4 @@ +[D-BUS Service] +Name=org.openslx.pvs +Exec=@CMAKE_INSTALL_PREFIX@/bin/pvs + @@ -0,0 +1,32 @@ +<RCC> + <qresource prefix="/" lang="de_DE"> + <file alias="pvs.qm">build/pvs_de_DE.qm</file> + </qresource> + <qresource prefix="/" lang="de"> + <file alias="pvs.qm">build/pvs_de_DE.qm</file> + </qresource> + <qresource prefix="/" lang="fr_FR"> + <file alias="pvs.qm">build/pvs_fr_FR.qm</file> + </qresource> + <qresource prefix="/" lang="fr"> + <file alias="pvs.qm">build/pvs_fr_FR.qm</file> + </qresource> + <qresource prefix="/" lang="es_MX"> + <file alias="pvs.qm">build/pvs_es_MX.qm</file> + </qresource> + <qresource prefix="/" lang="es"> + <file alias="pvs.qm">build/pvs_es_MX.qm</file> + </qresource> + <qresource prefix="/" lang="ar_JO"> + <file alias="pvs.qm">build/pvs_ar_JO.qm</file> + </qresource> + <qresource prefix="/" lang="ar"> + <file alias="pvs.qm">build/pvs_ar_JO.qm</file> + </qresource> + <qresource prefix="/" lang="pl_PL"> + <file alias="pvs.qm">build/pvs_pl_PL.qm</file> + </qresource> + <qresource prefix="/" lang="pl"> + <file alias="pvs.qm">build/pvs_pl_PL.qm</file> + </qresource> +</RCC> diff --git a/pvsgui.qrc b/pvsgui.qrc new file mode 100644 index 0000000..e8f76e5 --- /dev/null +++ b/pvsgui.qrc @@ -0,0 +1,43 @@ +<RCC> + <qresource prefix="/"> + <file alias="darrow16.svg">icons/darrow16.svg</file> + <file alias="ok16.svg">icons/ok16.svg</file> + + <file alias="cam32.svg">icons/cam32.svg</file> + <file alias="cam_on32.svg">icons/cam_on32.svg</file> + <file alias="cam_off32.svg">icons/cam_off32.svg</file> + <file alias="chat_msg16.svg">icons/chat_msg16.svg</file> + <file alias="AUTHORS">AUTHORS</file> + <file alias="TRANSLATION">TRANSLATION</file> + </qresource> + <qresource prefix="/" lang="de_DE"> + <file alias="pvsgui.qm">build/pvsgui_de_DE.qm</file> + </qresource> + <qresource prefix="/" lang="de"> + <file alias="pvsgui.qm">build/pvsgui_de_DE.qm</file> + </qresource> + <qresource prefix="/" lang="fr_FR"> + <file alias="pvsgui.qm">build/pvsgui_fr_FR.qm</file> + </qresource> + <qresource prefix="/" lang="fr"> + <file alias="pvsgui.qm">build/pvsgui_fr_FR.qm</file> + </qresource> + <qresource prefix="/" lang="es_MX"> + <file alias="pvsgui.qm">build/pvsgui_es_MX.qm</file> + </qresource> + <qresource prefix="/" lang="es"> + <file alias="pvsgui.qm">build/pvsgui_es_MX.qm</file> + </qresource> + <qresource prefix="/" lang="ar_JO"> + <file alias="pvsgui.qm">build/pvsgui_ar_JO.qm</file> + </qresource> + <qresource prefix="/" lang="ar"> + <file alias="pvsgui.qm">build/pvsgui_ar_JO.qm</file> + </qresource> + <qresource prefix="/" lang="pl_PL"> + <file alias="pvsgui.qm">build/pvsgui_pl_PL.qm</file> + </qresource> + <qresource prefix="/" lang="pl"> + <file alias="pvsgui.qm">build/pvsgui_pl_PL.qm</file> + </qresource> +</RCC> diff --git a/pvsmgr.qrc b/pvsmgr.qrc new file mode 100644 index 0000000..171412e --- /dev/null +++ b/pvsmgr.qrc @@ -0,0 +1,58 @@ +<RCC> + <qresource prefix="/" > + <file>icons/projection.png</file> + <file>icons/reset.png</file> + <file alias="finder" >icons/finder.png</file> + <file alias="exit" >icons/exit.png</file> + <file alias="terminal" >icons/terminal.png</file> + <file alias="photo" >icons/photo.png</file> + <file alias="photos" >icons/photo2.png</file> + <file alias="logout" >icons/log-out.png</file> + <file alias="restore" >icons/view-restore.png</file> + <file alias="lock" >icons/lock.png</file> + <file alias="profile" >icons/profile.png</file> + <file alias="dozent" >icons/dozent.svg</file> + <file alias="offline" >icons/offline.png</file> + <file alias="online" >icons/online.png</file> + <file alias="source" >icons/source.png</file> + <file alias="target" >icons/target.png</file> + <file alias="dozent2" >icons/dozent.png</file> + <file alias="chat" >icons/chat.png</file> + <file alias="cam32" >icons/cam32.svg</file> + <file alias="AUTHORS">AUTHORS</file> + <file alias="TRANSLATION">TRANSLATION</file> + </qresource> + <qresource prefix="/" lang="de_DE" > + <file>icons/unprojection.png</file> + <file>icons/unlocksingle.png</file> + <file>icons/locksingle.png</file> + <file alias="pvsmgr.qm" >build/pvsmgr_de_DE.qm</file> + </qresource> + <qresource prefix="/" lang="de" > + <file alias="pvsmgr.qm" >build/pvsmgr_de_DE.qm</file> + </qresource> + <qresource prefix="/" lang="fr_FR" > + <file alias="pvsmgr.qm" >build/pvsmgr_fr_FR.qm</file> + </qresource> + <qresource prefix="/" lang="fr" > + <file alias="pvsmgr.qm" >build/pvsmgr_fr_FR.qm</file> + </qresource> + <qresource prefix="/" lang="es_MX" > + <file alias="pvsmgr.qm" >build/pvsmgr_es_MX.qm</file> + </qresource> + <qresource prefix="/" lang="es" > + <file alias="pvsmgr.qm" >build/pvsmgr_es_MX.qm</file> + </qresource> + <qresource prefix="/" lang="ar_JO" > + <file alias="pvsmgr.qm" >build/pvsmgr_ar_JO.qm</file> + </qresource> + <qresource prefix="/" lang="ar" > + <file alias="pvsmgr.qm" >build/pvsmgr_ar_JO.qm</file> + </qresource> + <qresource prefix="/" lang="pl_PL" > + <file alias="pvsmgr.qm" >build/pvsmgr_pl_PL.qm</file> + </qresource> + <qresource prefix="/" lang="pl" > + <file alias="pvsmgr.qm" >build/pvsmgr_pl_PL.qm</file> + </qresource> +</RCC> @@ -0,0 +1,5 @@ +#!/bin/bash + +while [ 1 -lt 2 ]; do + wget --secure-protocol=SSLv3 --no-check-certificate -O index.html https://localhost:3490/ +done diff --git a/src/core/pvsChatClient.cpp b/src/core/pvsChatClient.cpp new file mode 100644 index 0000000..6717e34 --- /dev/null +++ b/src/core/pvsChatClient.cpp @@ -0,0 +1,151 @@ +/* +# Copyright (c) 2009,2010 - OpenSLX Project, Computer Center University of +# Freiburg +# +# This program is free software distributed under the GPL version 2. +# See http://openslx.org/COPYING +# +# If you have any feedback please consult http://openslx.org/feedback and +# send your suggestions, praise, or complaints to feedback@openslx.org +# +# General information about OpenSLX can be found at http://openslx.org/ +# ----------------------------------------------------------------------------- +# pvsChatClient.cpp +# - Methods of the chat service. +# ----------------------------------------------------------------------------- +*/ + +#include "pvsChatClient.h" + +using namespace std; + +// Constructor +PVSChatClient::PVSChatClient() +{ + _chatServerConnection = NULL; + _source = getFullUsername(); + _registered = true; +} + +PVSChatClient::~PVSChatClient() +{ + +} + +// Get Chat login name. +QString PVSChatClient::getSource() +{ + return _source; +} + +// Set (from server) assigned username. +void PVSChatClient::setSource(QString name) +{ + _source = name; + _registered = true; +} + +bool PVSChatClient::isRegistered() +{ + return _registered; +} + +// Set PVSServerConnection +void PVSChatClient::setServerConnection(PVSServerConnection* sc) +{ + if (sc) + { + _chatServerConnection = sc; + _chatServerConnection->addChatHandler("*", this, &PVSChatClient::receive); + } +} + +// Send a message to Server. +void PVSChatClient::send(QString tar, QString msg) +{ + // Append username to msg. + QString username = _source; + username.append(":"); + msg = username.append(msg) ; + + // Create a Msg. + PVSMsg myMsg(PVSMESSAGE, tar, msg, 0); + + // Send the message. + if (_chatServerConnection) + _chatServerConnection->sendMessage(myMsg); + else + ConsoleLog writeError("[CHAT] Chat get no server connection"); // no ServerConnection + +} + +// Handle messages from server. +void PVSChatClient::receive(PVSMsg recv) +{ + PVSChatMsg chatMsg(recv); + + if(chatMsg.isCommand()) // command message for update of the client list. + { + _chatCommandDispatcher.fire(chatMsg); + } + else // conversation message. + { + if(chatMsg.getMsg().size()) + _chatMessageDispatcher.fire(chatMsg); + } +} + +// Return the current list of logged Clients. +QStringList PVSChatClient::getClients() +{ + return _clients; +} + +// Return the ip of the username. +QString PVSChatClient::getIPFromUsername(QString username) +{ + if(_clientsData.contains(username)) + { + return _clientsData.value(username); + } + else + { + ConsoleLog writeError("[CHAT] Wanted key was not found in clients hash table."); + return QString("ip not found"); + } +} + +// Add the name and ip of a new client. +void PVSChatClient::addClient(QString name, QString ip) +{ + if(!_clients.contains(name)) + { + _clients.append(name); + _clientsData[name] = ip; + } + else + { + ConsoleLog writeError("[CHAT] The new client wasn't added, because exists allready."); + } +} + +// Remove the name and ip of a removed client. +void PVSChatClient::removeClient(QString name) +{ + if(_clients.contains(name)) + { + _clients.removeOne(name); + _clientsData.remove(name); + } + else + { + ConsoleLog writeError("[CHAT] The new client can not be removed, because doesn't exist."); + } +} + +// Delete all infomation about client. +void PVSChatClient::clearClients() +{ + _clients.clear(); + _clientsData.clear(); +} diff --git a/src/core/pvsChatClient.h b/src/core/pvsChatClient.h new file mode 100644 index 0000000..2cb5d9f --- /dev/null +++ b/src/core/pvsChatClient.h @@ -0,0 +1,71 @@ +/* +# Copyright (c) 2009 - OpenSLX Project, Computer Center University of Freiburg +# +# This program is free software distributed under the GPL version 2. +# See http://openslx.org/COPYING +# +# If you have any feedback please consult http://openslx.org/feedback and +# send your suggestions, praise, or complaints to feedback@openslx.org +# +# General information about OpenSLX can be found at http://openslx.org/ +*/ + +// pvsChatClient.h + +#ifndef PVSCHATCLIENT_H_ +#define PVSCHATCLIENT_H_ + +#include <iostream> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <sstream> +#include <fstream> +#include <QStringList> +#include <QHash> +#include "src/net/pvsMsg.h" +#include "src/core/pvsChatMsg.h" +#include "src/net/pvsServerConnection.h" +#include "src/util/consoleLogger.h" +#include "src/util/util.h" + +class PVS; // forward declaration. + +class PVSChatClient +{ + +public: + + PVSChatClient(); + ~PVSChatClient(); + void setServerConnection(PVSServerConnection* sc); + void setSource(QString name); + QString getSource(); + QStringList getClients(); + QString getIPFromUsername(QString username); + void addClient(QString name, QString ip); + void removeClient(QString name); + void clearClients(); + void send(QString tar, QString msg); + void receive(PVSMsg recv); + bool isRegistered(); + EventDispatcher<PVSChatMsg>& getChatMsgHandler() + { + return _chatMessageDispatcher; + }; + EventDispatcher<PVSChatMsg>& getChatCommandHandler() + { + return _chatCommandDispatcher; + }; + +private: + + QString _source; + bool _registered; + QStringList _clients; + QHash<QString, QString> _clientsData; + PVSServerConnection *_chatServerConnection; + EventDispatcher<PVSChatMsg> _chatMessageDispatcher; + EventDispatcher<PVSChatMsg> _chatCommandDispatcher; +}; +#endif diff --git a/src/core/pvsChatMsg.cpp b/src/core/pvsChatMsg.cpp new file mode 100644 index 0000000..7a2d755 --- /dev/null +++ b/src/core/pvsChatMsg.cpp @@ -0,0 +1,108 @@ +/* +# Copyright (c) 2009 - OpenSLX Project, Computer Center University of Freiburg +# +# This program is free software distributed under the GPL version 2. +# See http://openslx.org/COPYING +# +# If you have any feedback please consult http://openslx.org/feedback and +# send your suggestions, praise, or complaints to feedback@openslx.org +# +# General information about OpenSLX can be found at http://openslx.org/ +*/ + +// pvsChatMsg.cpp + +#include "src/core/pvsChatMsg.h" +#include <QStringList> + +PVSChatMsg::PVSChatMsg(PVSMsg pvsMsg) +{ + QStringList l = pvsMsg.getMessage().split(":"); + + if(l[0] == "") + { + _command = pvsMsg.getIdent(); + _nickFrom = "unseted"; + _nickTo = "unseted"; + _msg = "unseted"; + + if(l[2] == "local") + { + _username = l[1]; + _ip = pvsMsg.getRemoteIp(); + } + else + { + _username = l[1]; + _ip = l[2]; + } + } + else + { + _nickFrom = l[0]; + _msg = pvsMsg.getMessage().remove(0, l[0].size()+1); + _nickTo = pvsMsg.getIdent(); + _command = "unseted"; + _username = "unseted"; + _ip = "unseted"; + } +} + +PVSChatMsg::~PVSChatMsg(){}; + +void PVSChatMsg::setNickFrom(QString nick) +{ + _nickFrom = nick; +} + +void PVSChatMsg::setNickTo(QString nick) +{ + _nickTo = nick; +} + +void PVSChatMsg::setMsg(QString msg) +{ + _msg = msg; +} + +QString PVSChatMsg::getNickFrom() +{ + return _nickFrom; +} + +QString PVSChatMsg::getNickTo() +{ + return _nickTo; +} + +QString PVSChatMsg::getMsg() +{ + return _msg; +} + +QString PVSChatMsg::getCommand() +{ + return _command; +} + +QString PVSChatMsg::getUsername() +{ + return _username; +} + +QString PVSChatMsg::getIp() +{ + return _ip; +} + +bool PVSChatMsg::isCommand() +{ + if(_command == "unseted") + { + return false; + } + else + { + return true; + } +} diff --git a/src/core/pvsChatMsg.h b/src/core/pvsChatMsg.h new file mode 100644 index 0000000..0a9793e --- /dev/null +++ b/src/core/pvsChatMsg.h @@ -0,0 +1,48 @@ +/* +# Copyright (c) 2009 - OpenSLX Project, Computer Center University of Freiburg +# +# This program is free software distributed under the GPL version 2. +# See http://openslx.org/COPYING +# +# If you have any feedback please consult http://openslx.org/feedback and +# send your suggestions, praise, or complaints to feedback@openslx.org +# +# General information about OpenSLX can be found at http://openslx.org/ +*/ + +// pvsChatMsg.h + +#include "src/net/pvsMsg.h" + +#ifndef PVSCHATMSG_H_ +#define PVSCHATMSG_H_ + +class PVSChatMsg +{ +public: + + PVSChatMsg(PVSMsg pvsMsg); + ~PVSChatMsg(); + + void setNickFrom(QString nick); + void setNickTo(QString nick); + void setMsg(QString msg); + QString getNickFrom(); + QString getNickTo(); + QString getMsg(); + QString getCommand(); + QString getUsername(); + QString getIp(); + bool isCommand(); + + +private: + QString _msg; + QString _nickFrom; + QString _nickTo; + QString _command; + QString _username; + QString _ip; +}; + +#endif /* PVSCHATMSG_H_ */ diff --git a/src/core/pvsClient.cpp b/src/core/pvsClient.cpp new file mode 100644 index 0000000..0d08b1d --- /dev/null +++ b/src/core/pvsClient.cpp @@ -0,0 +1,301 @@ +/* +# Copyright (c) 2009 - OpenSLX Project, Computer Center University of Freiburg +# +# This program is free software distributed under the GPL version 2. +# See http://openslx.org/COPYING +# +# If you have any feedback please consult http://openslx.org/feedback and +# send your suggestions, praise, or complaints to feedback@openslx.org +# +# General information about OpenSLX can be found at http://openslx.org/ +# ----------------------------------------------------------------------------- +# src/core/pvsConnection.cpp +# - ... +# ----------------------------------------------------------------------------- +*/ + +#include "pvsClient.h" +#include "pvsServer.h" +#include "pvsConnectionManager.h" +#include "src/util/consoleLogger.h" +#include "src/core/vncConnection.h" +#include "src/gui/mainWindow.h" + +#define CONST_PASS "" + +PVSClient::PVSClient(PVSClientConnection *newClient) +{ + newClient->setParent(this); // so the object will be deleted when this object dies + _pvsClientConnection = newClient; + _vncConnection = NULL; + _vncRwPasswordReceived = _vncPasswordReceived = _vncAllowed = false; + _vncInitMutex = false; + _hostString = newClient->getAddress(); + _hostName = _hostString; // for now + //_gotFrame = false; + _vncPort = -1; + _vncProject = false; + _connectionFrame = NULL; + _loginName = "unseted"; +} + +PVSClient::~PVSClient() +{ + if (_vncConnection) + { + disconnect(_vncConnection, SIGNAL(finished()), this, SLOT(vncFinished())); + _vncConnection->clear(); + delete _vncConnection; + _vncConnection = NULL; + } +} + +/* TODO: Call this method from an extra thread. + * Imo there should be one thread (probably in ConnectionManager) that does this job. + * Also, this function should just receive the data etc, but the actual drawing has to happen + * in the Qt main thread (the thread the window belongs to) + * Right now with GTK it would, but pay attention when switching to Qt + * */ + +void PVSClient::tick() +{ + if (_vncInitMutex) return; + if (_vncPasswordReceived && _vncAllowed && _vncRequested && _vncConnection == NULL) + { + vncProbe(); + } +} + +QString PVSClient::getIp() +{ + return _hostString; +} + +QString PVSClient::getDesktopName() +{ + if (_vncConnection) + { + return _vncConnection->getDesktopName(); + } + + return _hostName; +} + +QString PVSClient::getUserName() +{ + return _userName; +} + +QString PVSClient::getLoginName() +{ + return _loginName; +} + +//Returns Port +int PVSClient::getPort(){ + return _vncPort; +} + + +bool PVSClient::getVNCAllowed() +{ + return _vncAllowed; +} + +void PVSClient::requestVNCConnect() +{ + _vncRequested = true; + _pvsClientConnection->push_back_send(PVSMsg(PVSCOMMAND, "VNCREQUEST", "YES")); +} + +void PVSClient::setVncPassword(QString password) +{ + _vncPassword = password; + _vncPasswordReceived = true; +} + +void PVSClient::setVncRwPassword(QString password) +{ + _vncRwPassword = password; + _vncRwPasswordReceived = true; +} + +QString PVSClient::getPassword() +{ + return _vncPassword; +} + +QString PVSClient::getRWPassword() +{ + return _vncRwPassword; +} + +void PVSClient::setProject(bool value) +{ + _vncProject = value; + +} + +void PVSClient::setVncPort(int newPort) +{ + if (newPort < 1) + { + ConsoleLog writeNetwork("Client sent invalid vnc-port."); + return; + } + _vncPort = newPort; + ConsoleLog writeNetwork(QString("Received new vnc-port: ").append(int2String(newPort))); +} +void PVSClient::setAllowed(bool allow) +{ + _vncAllowed = allow; + + if (allow) + { + ConsoleLog writeLine(QString("VNCConnection was granted by the Client.")); + _vncRequested = true; + } + else + { + ConsoleLog writeLine(QString("VNCConnection was denied by the Client.")); + _vncPort = 0; + _vncPasswordReceived = false; + } + + if(_vncProject){ + if(allow){ + MainWindow::getConnectionWindow()->projectStations(_hostString); + } + else{ + _vncProject = false; + } + } +} + +void PVSClient::shutDownVNC() +{ + if (_vncConnection) + { + disconnect(_vncConnection, SIGNAL(finished()), this, SLOT(vncFinished())); + _vncConnection->clear(); + delete _vncConnection; + _vncConnection = NULL; + } +} + +void PVSClient::shutDownClient() +{ + if (_pvsClientConnection) + { + _pvsClientConnection->closeConnection(); + } +} + +void PVSClient::onClientDisconnected() +{ + _pvsClientConnection = NULL; + +} + +bool PVSClient::getLocked() +{ + // TODO: Implement! + // Previously "_pvsClientConnection->isLocked()" war returned, + // but that method always returned "false" and was removed now. + // It really didn't make any sense to put that there anyways, it has + // to be taken care of in this class. + return false; +} + + +bool PVSClient::sendMessage(PVSMsgType type, QString ident, QString message) +{ + if (_pvsClientConnection) + { + _pvsClientConnection->push_back_send(PVSMsg(type, (char*)ident.toUtf8().data(), message)); + return true; + } + return false; +} + +bool PVSClient::sendMessage(PVSMsg message) +{ + if (_pvsClientConnection) + { + _pvsClientConnection->push_back_send(message); + return true; + } + return false; +} + +void PVSClient::vncProbe() +{ + _vncInitMutex = true; + if (_vncPasswordReceived && _vncAllowed && _vncRequested) + { +#ifndef local_test + QString portString; + if (_vncPort > 0) + { + portString = int2String(_vncPort); + } + else + { + portString = int2String(5900); //std port + ConsoleLog writeError("WARNING: Using default vnc-port 5900"); + } +#else + QString portString; + portString = int2String(5900); +#endif + + if (_hostString.length() > 0) + { + char ** args = new char*[1]; + QString fullstring(_hostString); + fullstring.append(":"); + fullstring.append(portString); + args[0] = new char[fullstring.length()+1]; + std::cout << "[pvsC]connecting to: " << fullstring.toStdString() << std::endl; + ConsoleLog writeNetwork(QString("connecting to: ").append(fullstring)); + //strcpy(args[0], host); + strcpy(args[0], fullstring.toUtf8().data()); + VNCConnectInfo tmpInfo(1, args, _vncPassword); + + VNCConnection* newConnection = new VNCConnection(tmpInfo.getPassword()); + if (newConnection) + { + if (newConnection->initClient(&tmpInfo)) + { + _vncProject = false; + if (_vncConnection) _vncConnection->setDead(); + _vncConnection = newConnection; + connect(_vncConnection, SIGNAL(finished()), this, SLOT(vncFinished())); + //TODO: comment beachten !!!!! + //vncAllowed = false; // to make sure we recheck if the allowance wasnt revoked in the meantime to prevent + // another connection + ConsoleLog writeLine(QString("VNC connection attempt succeeded.")); + MainWindow::getWindow()->getConnectionWindow()->onVNCAdd(this); + } + else + { + delete newConnection; + // TODO: post on the log console + ConsoleLog writeError(QString("VNC connection attempt failed.")); + _vncRequested = false; // otherwise loop of death + } + } + } + } + _vncInitMutex = false; +} + +void PVSClient::vncFinished() +{ + disconnect(_vncConnection, SIGNAL(finished()), this, SLOT(vncFinished())); + delete _vncConnection; + _vncConnection = NULL; + _vncPort = 0; + _vncPasswordReceived = false; +} + diff --git a/src/core/pvsClient.h b/src/core/pvsClient.h new file mode 100644 index 0000000..180995a --- /dev/null +++ b/src/core/pvsClient.h @@ -0,0 +1,129 @@ +/** + * PVSConnection + * + * the representation of a connection from a PVSClient to the PVSServer + * it holds a pointer the PVSClientConnection we got from a PVS(Listen)Server + * and (if present) a pointer to a VNCConnection to the same host as the PVSClientConnection + */ + + + + +#ifndef _PVSCONNECTION_H_ +#define _PVSCONNECTION_H_ +#include "vncConnection.h" +#include "src/net/pvsClientConnection.h" +#include "src/gui/frame.h" +#include <QtCore/QThread> + +class PVSServer; +class VNCConnection; +class PVSClient; +class ConnectionFrame; +class Frame; + +class PVSClient : public QObject +{ + Q_OBJECT + friend class PVSServer; + friend class VNCConnection; + +public: + // C'Tor and D'Tor + PVSClient(PVSClientConnection *newClient); + ~PVSClient(); + + // heartbeat + void tick(); + + + //general stuff + char* getHost(); + QString getIp(); + QString getDesktopName(); + QString getUserName(); + QString getLoginName(); + bool getVNCAllowed(); + int getPort(); + void setUsername(QString name) + { + _userName = name; + }; + void setLoginName(QString ln) + { + _loginName = ln; + }; + + // methods for/from vnConnection + void requestVNCConnect(); + void setVncPassword(QString password); + void setVncRwPassword(QString password); + + QString getPassword(); + QString getRWPassword(); + + void setProject(bool value); + void setAllowed(bool allow); + void setVncPort(int newPort); + void shutDownVNC(); + void shutDownClient(); + /*bool gotFrame(){return _gotFrame;}; + void setFrame(bool gotFrame){_gotFrame = gotFrame;};*/ + ConnectionFrame* getConnectionFrame() + { + return _connectionFrame; + }; + void setConnectionFrame(ConnectionFrame* nFrame) + { + _connectionFrame = nFrame; + }; + void setFrame(Frame *f) + { + _vncFrame = f; + }; + Frame* getFrame() + { + return _vncFrame; + }; + VNCConnection* getVNCConnection() + { + return _vncConnection; + }; + PVSClientConnection* getPVSClientConnection() + { + return _pvsClientConnection; + }; + + // methods for/from PVSClientConnection + void onClientDisconnected(); + bool getLocked(); + bool sendMessage(PVSMsgType type, QString ident, QString message); + bool sendMessage(PVSMsg message); + + void setClientindex(int ind) { _clientIndex = ind; } + int getClientindex() { return _clientIndex; } + int getConnectionId() { return _pvsClientConnection->getID(); } + +private Q_SLOTS: + void vncFinished(); + +private: + + void vncProbe(); + Frame* _vncFrame; + VNCConnection* _vncConnection; + PVSClientConnection *_pvsClientConnection; + ConnectionFrame* _connectionFrame; + int _vncPort; + bool _gotFrame; + QString _hostString; + QString _hostName; + QString _userName; + QString _loginName; + QString _vncPassword; + QString _vncRwPassword; + int _clientIndex; + bool _vncAllowed, _vncRequested, _vncPasswordReceived, _vncRwPasswordReceived, _vncInitMutex, _vncProject; +}; + +#endif diff --git a/src/core/pvsConnectionManager.cpp b/src/core/pvsConnectionManager.cpp new file mode 100644 index 0000000..8a35ca9 --- /dev/null +++ b/src/core/pvsConnectionManager.cpp @@ -0,0 +1,483 @@ +/* +# Copyright (c) 2009 - OpenSLX Project, Computer Center University of Freiburg +# +# This program is free software distributed under the GPL version 2. +# See http://openslx.org/COPYING +# +# If you have any feedback please consult http://openslx.org/feedback and +# send your suggestions, praise, or complaints to feedback@openslx.org +# +# General information about OpenSLX can be found at http://openslx.org/ +# ----------------------------------------------------------------------------- +# src/core/pvsConnectionManager.cpp +# ----------------------------------------------------------------------------- +*/ + +#include "pvsConnectionManager.h" +#include "src/gui/mainWindow.h" +#include <QApplication> +#include "src/setup.h" +#include "src/util/CertManager.h" +#include "src/util/serviceDiscoveryUtil.h" + +PVSConnectionManager* PVSConnectionManager::singleCM; + + +PVSConnectionManager* PVSConnectionManager::getManager() +{ + if (!singleCM) + singleCM = new PVSConnectionManager(); + return singleCM; +} + +PVSConnectionManager::PVSConnectionManager() +{ + _busy = false; + _needPassword = false; + loadCommands(); + ConsoleLog writeLine(QString("Connection Manager created.")); + ConsoleLog writeChat("Log for chat is now running"); + + if (!(_pvsServer.startListen(SERVER_PORT_INT))) + ConsoleLog writeError(QString("Server listening failed!")); + setUpdateRate(500); + _sdBroadcaster.setFingerprint( + CertManager::getCertificate("manager").digest(QCryptographicHash::Sha1) + ); + _timerId = startTimer(1000); +} + +PVSConnectionManager::~PVSConnectionManager() +{ + killTimer(_timerId); +} + +void PVSConnectionManager::setUpdateRate(int newRate) +{ + // TODO: Iterate over list of clients and set the updateRate on each vncConnection + // Object. The timer does not influence the update rate of the thumbs, thus the code + // here was removed. +} + +void PVSConnectionManager::timerEvent(QTimerEvent *event) +{ + update(); +} + +void PVSConnectionManager::onClientNew(PVSClientConnection* newConnection) +{ + PVSClient* tmp = getClientFromConnection(newConnection); + if (tmp == NULL) + { + PVSClient* newCon = new PVSClient(newConnection); + _listClients.push_back(newCon); + sendEventToClients(QString("addedConnection"), newConnection, ""); + } + else + { + // already got that one... strange, eh? + } +} + +void PVSConnectionManager::onClientRemove(PVSClientConnection* removedConnection) +{ + PVSClient* tmp = getClientFromConnection(removedConnection); + if (tmp == NULL) return; + MainWindow::getWindow()->removeConnection(tmp); + removeConnection(tmp); + if(tmp->getUserName().length() > 0) + { + ConsoleLog writeChat(tmp->getUserName()+" has left the chat."); + sendEventToClients("removedClient", removedConnection , tmp->getUserName()+":"+tmp->getIp()); + } +} + +// Inform all chat clients about a new event. +void PVSConnectionManager::sendEventToClients(QString event, PVSClientConnection* connection, QString clientName) +{ + if(event.compare("addedConnection") == 0) + { + // send the client list to new Connection. + for (std::list<PVSClient*>::iterator it = _listClients.begin(); it != _listClients.end(); it++) + { + QString name = (**it).getUserName(); + QString ip = (**it).getIp(); + if (name.length() == 0) continue; + connection->push_back_send(PVSMsg(PVSMESSAGE, "clientToAdd", ":" + name + ":" + ip, 0)); + } + } + if(event.compare("addedClient") == 0) + { + // send name to everybody to all connected clients. + _pvsServer.sendToAll(PVSMsg(PVSMESSAGE, "clientToAdd", ":" + clientName, 0)); + connection->push_back_send(PVSMsg(PVSMESSAGE, "assignedName", ":" + clientName, 0)); + connection->push_back_send(PVSMsg(PVSMESSAGE, "clientToAdd", ":PVSMGR:local", 0)); + } + if(event.compare("removedClient") == 0) + { + // send name of removed client to connected clients. + _pvsServer.sendToAll(PVSMsg(PVSMESSAGE, "clientToRemove", ":"+ clientName, 0)); + } +} + +PVSClient* PVSConnectionManager::getClientFromConnection(PVSClientConnection* client) +{ + if (!_listClients.empty()) + { + + for (std::list<PVSClient*>::iterator it = _listClients.begin(); it != _listClients.end(); it++) + { + if ((*it)->getPVSClientConnection()) + { + if ((*it)->getPVSClientConnection() == client) + { + return (*it); + } + } + } + } + return NULL; +} + +PVSClient* PVSConnectionManager::getClientFromConnectionId(int id) +{ + if (_listClients.empty()) return NULL; + for (std::list<PVSClient*>::iterator it = _listClients.begin(); it != _listClients.end(); it++) + { + if ((*it)->getConnectionId() == id) return (*it); + } + return NULL; +} + +PVSClient* PVSConnectionManager::getClientFromVNCConnection(VNCConnection* client) +{ + if (!_listClients.empty()) + { + + for (std::list<PVSClient*>::iterator it = _listClients.begin(); it != _listClients.end(); it++) + { + if ((*it)->getVNCConnection()) + { + if ((*it)->getVNCConnection() == client) + { + return (*it); + } + } + } + } + return NULL; +} + +PVSClient* PVSConnectionManager::getClientFromIp(QString ip) +{ + if (!_listClients.empty()) + { + for (std::list<PVSClient*>::iterator it = _listClients.begin(); it != _listClients.end(); it++) + { + // ok, probably this could be handled better inside the PVSConnection itself + // but makeshift for now + if ((*it)->getPVSClientConnection()) + { + if ((*it)->getIp() == ip) + { + return (*it); + } + } + } + } + return NULL; +} + +void PVSConnectionManager::onCommand(PVSMsg command) +{ + QString message = command.getMessage(); + QString ident = command.getIdent(); + if (ident.compare("VNCSRVRESULT") == 0) + { + int e = string2Int(message); + QString id = int2String(command.getSndID()); + switch (e) + { + case 0: + ConsoleLog writeLine("[Client: " + id + ", VNCSRV] Server should be running"); + break; + case 1: + ConsoleLog writeError("[Client: " + id + ", VNCSRV] Server returned general error"); + break; + case 2: + ConsoleLog writeError("[Client: " + id + ", VNCSRV] ~/.pvs/vncpasswd not found"); + break; + case 3: + ConsoleLog writeError("[Client: " + id + ", VNCSRV] VNC-Script not found"); + break; + case 127: + ConsoleLog writeError("[Client: " + id + ", VNCSRV] command not found (vnc-server installed?)"); + break; + default: + ConsoleLog writeError("[Client: " + id + ", VNCSRV] unknown error"); + break; + } + } +} +void PVSConnectionManager::onChat(PVSMsg chatMsg) +{ + + QString nick_to = chatMsg.getIdent(); + int sndID = chatMsg.getSndID(); + PVSClientConnection* clientConnection = NULL; + PVSClient* client; + QStringList l = chatMsg.getMessage().split(":"); + QString nick_from = l[0]; + QString msg = chatMsg.getMessage().remove(0, l[0].size()+1); + + if (nick_to == "@all") // public message. + { + _pvsServer.sendToAll(chatMsg); + MainWindow::getWindow()->receiveChatMsg(nick_from, nick_to, msg);// get Msg on PVSMgr's Chat-GUI. + ConsoleLog writeChat(nick_from +" wrote '"+msg+"' in @all-Channel."); + } + else // private message. + { + if(nick_from == "PVSMGR") //Msg from Server + { + MainWindow::getWindow()->receiveChatMsg(nick_from, nick_to, msg); // get Msg on PVSMgr's Chat-GUI. + ConsoleLog writeChat(nick_from+" wrote '" + msg + "' to " + nick_to); // write the event to the chat log. + } + else + { + clientConnection = _pvsServer.getConnectionFromId(sndID); // become your own message. + if (clientConnection) + { + clientConnection->push_back_send(chatMsg); + } + else + { + ConsoleLog writeError("Got Chat Message from unknown ID"); + } + } + if(nick_to == "PVSMGR") //Msg to Server + { + MainWindow::getWindow()->receiveChatMsg(nick_from, nick_to, msg); // get Msg on PVSMgr's Chat-GUI. + ConsoleLog writeChat(nick_from+" wrote '" + msg + "' to " + nick_to);// write the event to the chat log. + } + else + { + client = getClientFromUsername(nick_to); // private receiver become the message. + if (client) + { + client->sendMessage(chatMsg); + ConsoleLog writeChat(nick_from+" wrote '" + msg + "' to " + nick_to);// write the event to the chat log. + } + else + { + ConsoleLog writeError("[CHAT] There is no client with username: " + nick_to); + } + } + + } +} + +PVSClient* PVSConnectionManager::getClientFromUsername(QString name) +{ + if (!(_listClients.empty())) + { + // Check for ping timeout + for (std::list<PVSClient*>::iterator it = _listClients.begin(); it!= _listClients.end(); it++) + { + PVSClient *client = *it; + if (client) + if (client->getUserName() == name) + return client; + } + } + return NULL; +} + +void PVSConnectionManager::onLoginPassword(PVSMsg command) +{ + if (!_needPassword) return; // No password required + if (_password == command.getMessage()) return; // No password set + PVSClient* tmp = getClientFromConnectionId(command.getSndID()); + tmp->sendMessage( + PVSMsg(PVSLOGIN, "FAILED", "Wrong password.") + ); + tmp->shutDownClient(); +} + +// Set usernamen and loginname a client. +void PVSConnectionManager::onLoginUsername(PVSMsg command) +{ + QStringList l = command.getMessage().split(","); + PVSClient* tmp = getClientFromConnectionId(command.getSndID()); + if (tmp->getUserName().length() > 0) return; + ConsoleLog writeError("(PVSConnectionManager::onUsername) was fired."); + if(l[0] == "PVSMGR") + { + l[0] = "fake_PVSMGR"; + } + int counter = 0; + QString uname = l[0]; + while (getClientFromUsername(uname) != NULL) + { + uname = l[0].append(QString::number(counter++, 16)); + } + if (tmp) + { + tmp->setUsername(uname); + tmp->setLoginName(l[1]); + MainWindow::getWindow()->addConnection(tmp); + ConsoleLog writeChat(tmp->getUserName()+" has joined the chat."); + sendEventToClients(QString("addedClient"), tmp->getPVSClientConnection(), tmp->getUserName() +":"+ tmp->getIp()); + } + else + ConsoleLog writeError("(PVSConnectionManager::onUsername) Couldnt find connection to user-id"); +} + +void PVSConnectionManager::onVncPassword(PVSMsg command) +{ + PVSClient* tmp = getClientFromConnectionId(command.getSndID()); + + if (tmp) + { + tmp->setVncPassword(command.getMessage()); + return; + } + else + ConsoleLog writeError("couldnt find matching connection to id!"); +} + +void PVSConnectionManager::onVncRwPassword(PVSMsg command) +{ + PVSClient* tmp = getClientFromConnectionId(command.getSndID()); + + if (tmp) + { + tmp->setVncRwPassword(command.getMessage()); + return; + } + else + ConsoleLog writeError("couldnt find matching connection to id!"); +} + +void PVSConnectionManager::onVncAllow(PVSMsg command) +{ + PVSClient* tmp = getClientFromConnectionId(command.getSndID()); + + if (tmp) + { + if (command.getMessage().compare("YES") == 0) + { + tmp->setAllowed(true); + return; + } + tmp->setAllowed(false); + } +} + +void PVSConnectionManager::onVncPort(PVSMsg command) +{ + PVSClient* tmp = getClientFromConnectionId(command.getSndID()); + if (tmp) + { + int port = string2Int(command.getMessage()); + if (port > 0) + tmp->setVncPort(port); + } + +} + +void PVSConnectionManager::onVncProjection(PVSMsg command) +{ + if (command.getMessage().compare(QString("YES")) == 0) + ConsoleLog writeLine("Client is watching.(connected via vnc)"); + if (command.getMessage().compare(QString("NO")) == 0) + ConsoleLog writeLine("Client failed to connect via vnc."); +} + +void PVSConnectionManager::removeConnection(PVSClient* newConnection) +{ + if (newConnection != NULL) + { + for (std::list<PVSClient*>::iterator it = _listClients.begin(); it != _listClients.end(); it++) + { + if (newConnection == (*it)) + { + // remove it from the list to keep this method from causing trouble when being called more than + // once in the process + _listClients.remove(newConnection); + + // it is important to tell the GUI that the vnc is gone (or ... will be) + // before we really shut it down, since the removal procedure of the + // frames shouldnt be messed with from here. + MainWindow::getWindow()->onConnectionRemoved(newConnection); // to kill vncConnection + + // now that the gui nows about it and does no longer call the vnc-stuff + newConnection->shutDownVNC(); + // and its gone... + + // clean up on the connection + newConnection->shutDownClient(); // just to be sure + newConnection->onClientDisconnected(); + + + newConnection->deleteLater(); + return; + } + } + } + else + { + // well, not our problem obviously + } +} + +bool PVSConnectionManager::update() +{ + if (_busy) return true; // already ongoing, so scrap that. + + _busy = true; // lock method + + if (!_listClients.empty()) + { + // now update the rest and check if they are alive + // otherwise mark dead connections + for (std::list<PVSClient*>::iterator it = _listClients.begin(); it != _listClients.end(); it++) + { + PVSClient* current = (*it); + current->tick(); + } + } + + //QApplication::processEvents(QEventLoop::AllEvents, 5); + + _busy = false; // we're done, so unlock + return true; +} + +void PVSConnectionManager::loadCommands() +{ + _pvsServer.addLoginHandler("USERNAME", this, &PVSConnectionManager::onLoginUsername); + _pvsServer.addLoginHandler("PASSWORD", this, &PVSConnectionManager::onLoginPassword); + _pvsServer.addCommandHandler("*", this, &PVSConnectionManager::onCommand); + _pvsServer.addCommandHandler("VNC", this, &PVSConnectionManager::onVncAllow); + _pvsServer.addCommandHandler("PORT", this, &PVSConnectionManager::onVncPort); + _pvsServer.addCommandHandler("PASSWORD", this, &PVSConnectionManager::onVncPassword); + _pvsServer.addCommandHandler("RWPASSWORD", this, &PVSConnectionManager::onVncRwPassword); + _pvsServer.addCommandHandler("PROJECTING", this, &PVSConnectionManager::onVncProjection); + _pvsServer.addChatHandler("*", this, &PVSConnectionManager::onChat); +} + +QString PVSConnectionManager::setNeedPassword(bool enabled) +{ + _needPassword = enabled; + if (enabled && _password.isEmpty()) + { + _password = QString::number(getRandom(1000, 9999), 10); + } + return _password; +} + +QString PVSConnectionManager::getSessionName() +{ + return sha1ToReadable(CertManager::getCertificate("manager").digest(QCryptographicHash::Sha1)); +} diff --git a/src/core/pvsConnectionManager.h b/src/core/pvsConnectionManager.h new file mode 100644 index 0000000..5f5fcca --- /dev/null +++ b/src/core/pvsConnectionManager.h @@ -0,0 +1,118 @@ +/** + * The PVSConnection Manager is the heart and core of the PVS. He creates, updates, delivers and deletes the connections. + * + */ + + + +// TODO: +// make it look good ;-) + + + +#include <QtGui> +#include <iostream> +#include <fstream> +#include <list> +#include <src/core/pvsClient.h> +#include <src/gui/mainWindow.h> +#include <src/core/pvsServer.h> +#ifndef _PVSCONNECTIONMANAGER_H_ +#define _PVSCONNECTIONMANAGER_H_ +#ifndef RFBCLIENT_H +extern "C" +{ +#include <rfb/rfbclient.h> +} +#endif + +#define PROFILE +#include <src/util/timeUtil.h> +#include <src/util/consoleLogger.h> +#include "src/net/pvsServiceBroadcast.h" + + + +class PVSConnectionManager; //forward declaration +class PVSClient; +class PVSListenSever; +class MainWindow; + +class PVSConnectionManager : public QObject +{ +public: + // singleton getter + static PVSConnectionManager* getManager(); + + ~PVSConnectionManager(); + + // PVSServer control/get/set methods + PVSServer* getServer() + { + return &_pvsServer; + }; + + // VNCConnection related static method + //static void onFBUpdate(rfbClient* client, int x, int y, int w, int h); + + + // gui update frequency + void setUpdateRate(int newRate); + + + // PVSConnection control/get/set methods + std::list<PVSClient*> getConnections() + { + return _listClients; + }; + void onClientNew(PVSClientConnection* newConnection); // called by the server when a new client connects + void onClientRemove(PVSClientConnection* removedConnection); // called by the server when a new client disconnects (on its own) + PVSClient* getClientFromConnection(PVSClientConnection* client); + PVSClient* getClientFromConnectionId(int id); + PVSClient* getClientFromVNCConnection(VNCConnection* client); + PVSClient* getClientFromIp(QString ip); // returns connection with hostname 'host' + PVSClient* getClientFromUsername(QString name); // returns connection with username 'name' + // these methods are called by the PVSServer which forwards the command/etc handling to the CM + void onCommand(PVSMsg command); + void onChat(PVSMsg chatMsg); + void onVncPassword(PVSMsg command); + void onVncRwPassword(PVSMsg command); + void onLoginUsername(PVSMsg command); + void onLoginPassword(PVSMsg command); + void onVncAllow(PVSMsg command); + void onVncPort(PVSMsg command); + void onVncProjection(PVSMsg command); + + void sendEventToClients(QString event, PVSClientConnection* newConnection, QString newClientName); // informs every connected clients about a new client or a removed client. + + void removeConnection(PVSClient* removedConnection); // removes and deletes the connection !DOES NOT DISCONNECT DIRECTLY! + PVSClient* getNewConnection(VNCConnectInfo* newConInfo); // returns a new connection object based on the VNCConnectInfo or NULL + + bool isBusy() { return _busy; } + + QString setNeedPassword(bool enabled); + QString getSessionName(); + +protected: + void timerEvent(QTimerEvent *event); + +private: + // C'Tor + PVSConnectionManager(); // private due to singleton pattern + // internal control methods + bool update(); // does the update and cleaning routines and makes sure the framebuffers in the connection objects are up to date + void loadCommands(); + + // Member + std::list<PVSClient*> _listClients; // list of all verified clients + PVSServer _pvsServer; // the server that handles the pvsConnections + static PVSConnectionManager* singleCM; // the CM itself + bool _busy; // to keep timed calls from starting another update before the old one is thru. + PVSServiceBroadcast _sdBroadcaster; ///< Service discovery handling + + QString _password; ///< Password required to connect (can be empty) + bool _needPassword; + int _timerId; +}; + +#endif diff --git a/src/core/pvsServer.cpp b/src/core/pvsServer.cpp new file mode 100644 index 0000000..916ad89 --- /dev/null +++ b/src/core/pvsServer.cpp @@ -0,0 +1,22 @@ +#include "pvsConnectionManager.h" +#undef Q_FOREACH +#include "pvsServer.h" + + +PVSServer::PVSServer(int port) + :PVSListenServer(port,0) +{ +} + + +void PVSServer::onClientConnected(PVSClientConnection* connected) +{ + PVSListenServer::onClientConnected(connected); + PVSConnectionManager::getManager()->onClientNew(connected); +} +void PVSServer::onClientDisconnected(PVSClientConnection* disconnected) +{ + PVSConnectionManager::getManager()->onClientRemove(disconnected); + PVSListenServer::onClientDisconnected(disconnected); +} + diff --git a/src/core/pvsServer.h b/src/core/pvsServer.h new file mode 100644 index 0000000..acd9c61 --- /dev/null +++ b/src/core/pvsServer.h @@ -0,0 +1,24 @@ +/** + * A derivate of PVSListenServer and used by the PVSConnectionManager to handle incoming connections + * which then return pointers to their PVSClientConnections to the manager to handle + * in and outgoing messsages/commands + * + */ + + + +#include <src/net/pvsListenServer.h> + +#ifndef _PVSSERVER_H_ +#define _PVSSERVER_H_ + +class PVSServer : public PVSListenServer +{ +public: + PVSServer(int port = 0); +private: + virtual void onClientConnected(PVSClientConnection* connected); + virtual void onClientDisconnected(PVSClientConnection* disconnected); +}; + +#endif diff --git a/src/core/vncConnection.cpp b/src/core/vncConnection.cpp new file mode 100644 index 0000000..1864e77 --- /dev/null +++ b/src/core/vncConnection.cpp @@ -0,0 +1,261 @@ +/* +# Copyright (c) 2009 - OpenSLX Project, Computer Center University of Freiburg +# +# This program is free software distributed under the GPL version 2. +# See http://openslx.org/COPYING +# +# If you have any feedback please consult http://openslx.org/feedback and +# send your suggestions, praise, or complaints to feedback@openslx.org +# +# General information about OpenSLX can be found at http://openslx.org/ +# ----------------------------------------------------------------------------- +# src/core/vncConnection.cpp +# ----------------------------------------------------------------------------- +*/ + + +#include "vncConnection.h" +#include <iostream> +#include <src/core/pvsConnectionManager.h> +#include <src/core/pvsClient.h> +#include <src/gui/connectionFrame.h> + + +//***********************************************************************************// +// VNCConnection // +//***********************************************************************************// + + + +VNCConnection::VNCConnection(QString newPass) +{ + thread = NULL; + pwSet = false; + if (newPass != "") + { + password = newPass; + pwSet = true; + } + else + password = ""; + first = true; + view_only = true; + locked = false; + myFrame = NULL; +} + +VNCConnection::~VNCConnection() +{ + setDead(); +} + +bool VNCConnection::initClient(VNCConnectInfo* newConInfo) +{ + int argc = newConInfo->getCount(); + char** argv = newConInfo->getArguments(); + + if (argc > 0) + { + + stringHost = QString(argv[0]); + + /*QString cropHost = colonSplitter(stringHost, true); + QString cropPort = colonSplitter(stringHost, false);*/ + _host = colonSplitter(stringHost, true); + _port = colonSplitter(stringHost, false); + /*if (!(cropHost.size())) + cropHost = stringHost; + if (!(cropPort.size())) + _port = 5900; + password = newConInfo->getPassword(); + _host = cropHost; + thread = new VNCClientThread(_host, 5900, password , 0, 500);*/ + if (!(_host.size())) + _host = stringHost; + if (!(_port.size())) + _port = QString("5900"); + thread = new VNCClientThread(_host, string2Int(_port), newConInfo->getPassword(), 0, 500); + connect(thread, SIGNAL(finished()), this, SIGNAL(finished())); + + return true; + } + + rfbClientLog("init failed\n"); + emit finished(); + return false; +} + +/* + * disconnect and terminate the current connection and set a new one. + */ +void VNCConnection::reInitClientWithQuality(int quality) +{ + disconnect(thread, SIGNAL(finished()), this, SIGNAL(finished())); + thread->terminate = true; + thread = new VNCClientThread(_host, string2Int(_port), password , quality, 500); + connect(thread, SIGNAL(finished()), this, SIGNAL(finished())); +} + +bool VNCConnection::isOK() +{ + return thread != NULL && thread->isRunning(); +} + +bool VNCConnection::viewOnly() +{ + return view_only; +} + +void VNCConnection::setDead() +{ + if (thread != NULL) + { + disconnect(thread, SIGNAL(finished()), this, SIGNAL(finished())); + if (thread->isRunning()) + { + thread->terminate = true; + thread->wait(2000); + } + delete thread; + thread = NULL; + } +} + +void VNCConnection::clear() +{ + setDead(); + + if (myFrame) + { + myFrame = NULL; + } +} + +void VNCConnection::setFrame(ConnectionFrame* newFrame) +{ + if (newFrame) + { + if (myFrame) + { + // TODO: Tell it that we left? + } + myFrame = newFrame; + if (thread != NULL) myFrame->setToolTip(thread->getDesktopName()); + myFrame->setRatio(ratio); + myFrame->setOversized(overSized); + } +} + +ConnectionFrame* VNCConnection::getFrame() +{ + return myFrame; +} + +char* VNCConnection::getPassword(rfbClient* myClient) +{ + // better off somewhere else? + + QString tmpPassword; + QString serverHost(myClient->serverHost); + QString cropHost = colonSplitter(serverHost, true); + if (!(cropHost.size())) + cropHost = serverHost; + if (PVSClient* selfConnection = PVSConnectionManager::getManager()->getClientFromIp(cropHost)) // no candidate means false call anyway + { + tmpPassword = selfConnection->getPassword(); + } + else + { + tmpPassword = ""; + ConsoleLog writeError("Couldn't find a matching connection to retrieve a password from!"); + } + if (tmpPassword.length() > 8) // shorten if pw is too long + { + std::cout << "VNCConnection::getPassword() given password too long, cutting it down to 8 chars!" << std::endl; + tmpPassword = tmpPassword.mid(0,8); + } + + + char* pw = new char[9]; + strcpy(pw, tmpPassword.toUtf8().data()); + return pw; +} + +QString VNCConnection::getPassword() +{ + return password; +} + +bool VNCConnection::getPWSet() +{ + return pwSet; +} + +QString VNCConnection::getDesktopName() +{ + if (_desktopName.isNull() && thread != NULL && thread->isRunning()) _desktopName = thread->getDesktopName(); + return _desktopName; +} + +VNCClientThread* VNCConnection::getVNCClientThread() +{ + if (thread) + return thread; + return NULL; +} + + + +//***********************************************************************************// +// VNCConnectInfo // +//***********************************************************************************// + + + +VNCConnectInfo::VNCConnectInfo() +{ + count = 0; + arguments = NULL; + password = ""; + passwordSupplied = false; +} + +VNCConnectInfo::VNCConnectInfo(int newCount, char** newArgs, QString pass) +{ + if (pass == "") + setArguments(newCount, newArgs); + else + setArguments(newCount, newArgs, pass); +} + +VNCConnectInfo::~VNCConnectInfo() +{ + if (arguments) + delete[] arguments; +} + +void VNCConnectInfo::setArguments(int newCount, char** newArgs, QString pass) +{ + count = newCount; + arguments = newArgs; + if (pass != "") + { + password = pass; + passwordSupplied = true; + } +} + +int VNCConnectInfo::getCount() +{ + return count; +} + +char** VNCConnectInfo::getArguments() +{ + return arguments; +} + +QString VNCConnectInfo::getPassword() +{ + return password; +} diff --git a/src/core/vncConnection.h b/src/core/vncConnection.h new file mode 100644 index 0000000..6893135 --- /dev/null +++ b/src/core/vncConnection.h @@ -0,0 +1,99 @@ +/** + * + * VNCConnection + * + * The VNCConnection and the VNCConnectInfo are the Classes containing the information about the vnc-connections. + * While the VNCConnectInfo just holds the information about the token and password / parameters given on + * create time of a new connection, the connection itself contains the C-Object from the vnc library and is + * maintained by the PVSConnectionManger. + */ + + +#ifndef _VNCCONNECTION_H_ +#define _VNCCONNECTION_H_ +extern "C" +{ +#include <rfb/rfbclient.h> +} + +#include <QtGui> +#include "../util/vncClientThread.h" +#include <src/gui/connectionFrame.h> +#include <iostream> +#include <QtCore/QObject> + +#define PROFILE +#include <src/util/timeUtil.h> + + +class VNCConnection; // forward declaration +class ConnectionFrame; +class PVSConnectionManager; +class VNCConnectInfo +{ + //Q_OBJECT +public: + VNCConnectInfo(); //Constructor + VNCConnectInfo(int newCount, char** newArgs, QString pass = ""); // Constructor with instant information feed + ~VNCConnectInfo(); + void setArguments(int newCount, char** newArgs, QString pass = ""); // (re)feed of information + int getCount(); // returns count + bool pwSet() + { + return passwordSupplied; + }; // returns wether a password was set or not + char ** getArguments(); // returns pointer to an array of char arrays holding the given arguments + QString getPassword(); // returns (if given) the password + +private: + char** arguments; + bool passwordSupplied; + QString password; + int count; +}; + +class VNCConnection : public QObject +{ + Q_OBJECT +public: + VNCConnection(QString newPass = ""); // Constructor + ~VNCConnection(); + bool initClient(VNCConnectInfo* newConInfo); // initiates the connection based on the information given with the VNCConnectInfo object + void reInitClientWithQuality(int quality); + bool isOK(); // returns true if not dead, false otherwise + bool viewOnly(); + void setDead(); // marks the connection for removal + void clear(); // does internal cleanup + void setFrame(ConnectionFrame* newFrame); // sets the given frame as its own + ConnectionFrame* getFrame(); // if present, returns the frame + static char* getPassword(rfbClient* client); // is called if a rfbclient-object asks for a password and starts the upward chain to ask for a password + QString getPassword(); // bad overload, since it returns the stored password (if any was given) + QString getHost() + { + return _host; + } + bool getPWSet(); // returns true if a password was given, false otherwise + //Glib::RefPtr<Gdk::Pixbuf> getBuffer(); + bool getBusy() { return busy; } + QString getDesktopName(); + VNCClientThread* getVNCClientThread(); + +Q_SIGNALS: + void finished(); + +private: + VNCClientThread *thread; + ConnectionFrame* myFrame; + QImage img; + QString password, stringHost, _host, _port; + bool pwSet; + bool first; + bool view_only; + bool overSized; + float ratio; + bool busy; + bool locked; + QString _desktopName; +}; + +#endif diff --git a/src/gui/aboutDialog.cpp b/src/gui/aboutDialog.cpp new file mode 100644 index 0000000..a52f70b --- /dev/null +++ b/src/gui/aboutDialog.cpp @@ -0,0 +1,58 @@ +/* + # Copyright (c) 2009, 2010 - OpenSLX Project, Computer Center University of + # Freiburg + # + # This program is free software distributed under the GPL version 2. + # See http://openslx.org/COPYING + # + # If you have any feedback please consult http://openslx.org/feedback and + # send your suggestions, praise, or complaints to feedback@openslx.org + # + # General information about OpenSLX can be found at http://openslx.org/ + # ----------------------------------------------------------------------------- + # aboutDialog.cpp + # - shows about dialog + # ----------------------------------------------------------------------------- + */ + +#include "aboutDialog.h" +#include "src/version.h" + +AboutDialog::AboutDialog(QWidget *parent) : + QDialog(parent) +{ + setupUi(this); + + // set version + QString version = tr("Version: ") + (VERSION_STRING); + label_version->setText(version); + + // read authors and write to textEdit + QString authors = ""; + QFile f1(":/AUTHORS"); + if (f1.open(QIODevice::ReadOnly | QIODevice::Text)) + { + QTextStream in(&f1); + authors = in.readAll(); + f1.close(); + } + plainTextEdit_authors->insertPlainText(authors); + plainTextEdit_authors->moveCursor(QTextCursor::Start); + + // read translation and write to textEdit + QString translation = ""; + QFile f2(":/TRANSLATION"); + if (f2.open(QIODevice::ReadOnly | QIODevice::Text)) + { + QTextStream in(&f2); + translation = in.readAll(); + f2.close(); + } + plainTextEdit_translation->insertPlainText(translation); + plainTextEdit_translation->moveCursor(QTextCursor::Start); + +} + +AboutDialog::~AboutDialog() +{ +} diff --git a/src/gui/aboutDialog.h b/src/gui/aboutDialog.h new file mode 100644 index 0000000..5f0489a --- /dev/null +++ b/src/gui/aboutDialog.h @@ -0,0 +1,30 @@ +/* + # Copyright (c) 2009, 2010 - OpenSLX Project, Computer Center University of + # Freiburg + # + # This program is free software distributed under the GPL version 2. + # See http://openslx.org/COPYING + # + # If you have any feedback please consult http://openslx.org/feedback and + # send your suggestions, praise, or complaints to feedback@openslx.org + # + # General information about OpenSLX can be found at http://openslx.org/ + */ + +#ifndef ABOUTDIALOG_H_ +#define ABOUTDIALOG_H_ + +#include <QtGui> +#include "ui_aboutDialog.h" + +class AboutDialog: public QDialog, private Ui::AboutDialogClass +{ +Q_OBJECT + +public: + AboutDialog(QWidget *parent = 0); + ~AboutDialog(); + +}; + +#endif /* ABOUTDIALOG_H_ */ diff --git a/src/gui/clientChatDialog.cpp b/src/gui/clientChatDialog.cpp new file mode 100644 index 0000000..7c32790 --- /dev/null +++ b/src/gui/clientChatDialog.cpp @@ -0,0 +1,298 @@ +/* + # Copyright (c) 2009, 2010 - OpenSLX Project, Computer Center University of + # Freiburg + # + # This program is free software distributed under the GPL version 2. + # See http://openslx.org/COPYING + # + # If you have any feedback please consult http://openslx.org/feedback and + # send your suggestions, praise, or complaints to feedback@openslx.org + # + # General information about OpenSLX can be found at http://openslx.org/ + # ----------------------------------------------------------------------------- + # clientChatDialog.cpp + # - graphical chat interface + # ----------------------------------------------------------------------------- + */ + +#include "clientChatDialog.h" + +ClientChatDialog::ClientChatDialog(QWidget *parent) : + QDialog(parent) +{ + _trayIcon = NULL; + _nickname = ""; + + setupUi(this); + setAcceptDrops(true); + connect(pushButton, SIGNAL(clicked()), this, SLOT(send())); + + // connect to D-Bus and get interface + QDBusConnection dbus = QDBusConnection::sessionBus(); + dbus.registerObject("/chat", this); + dbus.registerService("org.openslx.pvsgui"); + _ifaceDBus = new OrgOpenslxPvsInterface("org.openslx.pvs", "/", dbus, this); + connect(_ifaceDBus, SIGNAL(chat_receive(QString, QString, QString)), this, + SLOT(receive(QString, QString, QString))); + + // add first tab for public messages + tabWidget->clear(); + QTextEdit *t = new QTextEdit(); + t->setReadOnly(true); + tabWidget->addTab(t, "@all"); + _hash = new QHash<QString, QTextEdit*> (); + _hash->insert(tabWidget->tabText(0), t); + + // already connected? + QDBusPendingReply<QString> reply = _ifaceDBus->isConnected(); + reply.waitForFinished(); + if (reply.isValid() && reply.value() != "") + { + // get available nicknames if already connected + QDBusPendingReply<QStringList> reply1 = _ifaceDBus->chat_getNicknames(); + reply1.waitForFinished(); + QStringList nicknames = reply1.value(); + if (reply1.isValid() && !nicknames.isEmpty()) + listWidget->addItems(nicknames); + + connected(); + } + else + disconnected(); + + // setup menu + _menu = new QMenu(); + _sendFileAction = new QAction(tr("&Send File..."), this); + _menu->addAction(_sendFileAction); + + connect(listWidget, SIGNAL(doubleClicked(QModelIndex)), this, + SLOT(addTab(QModelIndex))); + connect(tabWidget, SIGNAL(tabCloseRequested(int)), this, + SLOT(removeTab(int))); + connect(tabWidget, SIGNAL(currentChanged(int)), this, SLOT(removeIcon(int))); + connect(listWidget, SIGNAL(customContextMenuRequested(QPoint)), this, + SLOT(showMenu(QPoint))); + connect(_sendFileAction, SIGNAL(triggered()), this, + SLOT(sendFile())); + + connect(_ifaceDBus, SIGNAL(chat_client_add(QString)), this, + SLOT(addClient(QString))); + connect(_ifaceDBus, SIGNAL(chat_client_remove(QString)), this, + SLOT(removeClient(QString))); + connect(_ifaceDBus, SIGNAL(disconnected()), listWidget, + SLOT(clear())); + connect(_ifaceDBus, SIGNAL(connected(QString)), this, + SLOT(connected())); + connect(_ifaceDBus, SIGNAL(disconnected()), this, + SLOT(disconnected())); + + lineEdit->setFocus(); +} + +ClientChatDialog::~ClientChatDialog() +{ +} + +//////////////////////////////////////////////////////////////////////////////// +// Public + +void ClientChatDialog::setTrayIcon(QSystemTrayIcon *trayIcon) +{ + _trayIcon = trayIcon; + // FIXME: messageClicked() is always emitted, not only on chat msg + //connect(_trayIcon, SIGNAL(messageClicked()), this, SLOT(open())); +} + +//////////////////////////////////////////////////////////////////////////////// +// Protected + +void ClientChatDialog::dragEnterEvent(QDragEnterEvent *event) +{ + if (event->mimeData()->hasUrls()) + event->accept(); +} + +void ClientChatDialog::dropEvent(QDropEvent *event) +{ + event->accept(); + sendFile(event->mimeData()->urls().first().toLocalFile()); +} + +//////////////////////////////////////////////////////////////////////////////// +// Private + +void ClientChatDialog::send() +{ + QString msg = lineEdit->text(); + if (msg != "") + { + QString nick_to = tabWidget->tabText(tabWidget->currentIndex()); + _ifaceDBus->chat_send(nick_to, _nickname, msg); + lineEdit->clear(); + lineEdit->setFocus(); + + qDebug("[%s] S %s -> %s : %s", metaObject()->className(), + qPrintable(_nickname), qPrintable(nick_to), qPrintable(msg)); + } +} + +void ClientChatDialog::receive(QString nick_from, QString nick_to, QString msg) +{ + qDebug("[%s] R %s <- %s : %s", metaObject()->className(), + qPrintable(nick_to), qPrintable(nick_from), qPrintable(msg)); + + if (nick_to == tabWidget->tabText(0) || nick_from == _nickname) + printMsg(nick_from, msg, getTab(nick_to)); // public message or own msg + else + printMsg(nick_from, msg, getTab(nick_from)); // private message +} + +void ClientChatDialog::addTab(QModelIndex i) +{ + QString text = i.data().toString(); + if (_hash->contains(text)) + tabWidget->setCurrentWidget(_hash->value(text)); + else + { + QTextEdit *t = new QTextEdit(); + t->setReadOnly(true); + tabWidget->setCurrentIndex(tabWidget->addTab(t, text)); + _hash->insert(text, t); + } + lineEdit->setFocus(); +} + +void ClientChatDialog::removeTab(int i) +{ + if (i != 0) + { + _hash->remove(tabWidget->tabText(i)); + tabWidget->removeTab(i); + lineEdit->setFocus(); + } +} + +void ClientChatDialog::addClient(QString nick) +{ + listWidget->addItem(nick); + printEvent("-> " + nick + tr(" has joined the chat.")); +} + +void ClientChatDialog::removeClient(QString nick) +{ + delete listWidget->findItems(nick, Qt::MatchExactly).first(); + printEvent("<- " + nick + tr(" has left the chat.")); +} + +void ClientChatDialog::removeIcon(int i) +{ + tabWidget->setTabIcon(i, QIcon()); +} + +void ClientChatDialog::showMenu(QPoint p) +{ + _menu->popup(listWidget->mapToGlobal(p)); +} + +void ClientChatDialog::sendFile() +{ + ClientFileSendDialog *d = new ClientFileSendDialog(this); + d->open(listWidget->currentItem()->text()); +} + +void ClientChatDialog::sendFile(QString filename) +{ + if (tabWidget->currentIndex() == 0 || filename == "") + return; + + // ask user + QString nick = tabWidget->tabText(tabWidget->currentIndex()); + QMessageBox::StandardButton result = QMessageBox::question(0, + tr("PVS File Transfer"), + tr("Send file '") + filename + tr("' to ") + nick + "?", + QMessageBox::Ok | QMessageBox::Cancel, QMessageBox::Ok); + + if (result != QMessageBox::Ok) + return; + + ClientFileSendDialog *d = new ClientFileSendDialog(this); + d->open(nick, filename); +} + +void ClientChatDialog::connected() +{ + // get current users name from backend + QDBusPendingReply<QString> reply = _ifaceDBus->chat_getNickname(); + reply.waitForFinished(); + if (reply.isValid()) + { + _nickname = reply.value(); + pushButton->setEnabled(true); + printEvent("!!! " + tr("Connected.")); + } + + qDebug("[%s] Nickname: '%s'", metaObject()->className(), + qPrintable(_nickname)); +} + +void ClientChatDialog::disconnected() +{ + pushButton->setEnabled(false); + printEvent("!!! " + tr("Disconnected.")); +} + +QTextEdit* ClientChatDialog::getTab(QString text) +{ + if (!_hash->contains(text)) + { + QTextEdit *t = new QTextEdit(); + t->setReadOnly(true); + tabWidget->addTab(t, text); + _hash->insert(text, t); + } + lineEdit->setFocus(); + return _hash->value(text); +} + +void ClientChatDialog::printMsg(QString nick_from, QString msg, QTextEdit *t) +{ + // move cursor at the end + t->moveCursor(QTextCursor::End); + + // print time + t->setTextColor(QColor(0, 100, 0)); + t->append("[" + QTime::currentTime().toString("hh:mm") + "] "); + + // print nickname + t->setTextColor(QColor(0, 0, 255)); + t->insertPlainText("<" + nick_from + "> "); + + // print message + t->setTextColor(QColor(0, 0, 0)); + t->insertPlainText(msg); + + // show icon if not current tab + if (tabWidget->currentIndex() != tabWidget->indexOf(t)) + tabWidget->setTabIcon(tabWidget->indexOf(t), QIcon(":chat_msg16.svg")); + + // show balloon message if supported and chat-dialog is not visible + if (!isVisible() && _trayIcon && QSystemTrayIcon::supportsMessages()) + _trayIcon->showMessage(tr("Message from <") + nick_from + ">", msg, + QSystemTrayIcon::Information, 20000); +} + +void ClientChatDialog::printEvent(QString msg) +{ + QTextEdit *t = _hash->value(tabWidget->tabText(0)); + + // move cursor at the end + t->moveCursor(QTextCursor::End); + + t->setTextColor(QColor(150, 150, 150)); + + // print time + t->append("[" + QTime::currentTime().toString("hh:mm") + "] "); + + // print message + t->insertPlainText(msg); +} diff --git a/src/gui/clientChatDialog.h b/src/gui/clientChatDialog.h new file mode 100644 index 0000000..42bbb75 --- /dev/null +++ b/src/gui/clientChatDialog.h @@ -0,0 +1,63 @@ +/* + # Copyright (c) 2009, 2010 - OpenSLX Project, Computer Center University of + # Freiburg + # + # This program is free software distributed under the GPL version 2. + # See http://openslx.org/COPYING + # + # If you have any feedback please consult http://openslx.org/feedback and + # send your suggestions, praise, or complaints to feedback@openslx.org + # + # General information about OpenSLX can be found at http://openslx.org/ + */ + +#ifndef CLIENTCHATDIALOG_H_ +#define CLIENTCHATDIALOG_H_ + +#include <QtGui> +#include "pvsinterface.h" +#include "clientFileSendDialog.h" +#include "ui_clientChatDialog.h" + +class ClientChatDialog: public QDialog, private Ui::ClientChatDialogClass +{ +Q_OBJECT + +public: + ClientChatDialog(QWidget *parent = 0); + ~ClientChatDialog(); + void setTrayIcon(QSystemTrayIcon *trayIcon); + +private Q_SLOTS: + void send(); + void receive(QString nick_from, QString nick_to, QString msg); + void addTab(QModelIndex i); + void removeTab(int i); + void addClient(QString nick); + void removeClient(QString nick); + void showMenu(QPoint p); + void removeIcon(int i); + void sendFile(); + void sendFile(QString filename); + void connected(); + void disconnected(); + +protected: + void dragEnterEvent(QDragEnterEvent *event); + void dropEvent(QDropEvent *event); + +private: + QTextEdit* getTab(QString text); + void printMsg(QString nick_from, QString msg, QTextEdit *t); + void printEvent(QString msg); + + OrgOpenslxPvsInterface *_ifaceDBus; + QHash<QString, QTextEdit*> *_hash; + QSystemTrayIcon *_trayIcon; + QString _nickname; + QMenu *_menu; + QAction *_sendFileAction; + +}; + +#endif /* CLIENTCHATDIALOG_H_ */ diff --git a/src/gui/clientConfigDialog.cpp b/src/gui/clientConfigDialog.cpp new file mode 100644 index 0000000..76b4f5e --- /dev/null +++ b/src/gui/clientConfigDialog.cpp @@ -0,0 +1,105 @@ +/* + # Copyright (c) 2009, 2010 - OpenSLX Project, Computer Center University of + # Freiburg + # + # This program is free software distributed under the GPL version 2. + # See http://openslx.org/COPYING + # + # If you have any feedback please consult http://openslx.org/feedback and + # send your suggestions, praise, or complaints to feedback@openslx.org + # + # General information about OpenSLX can be found at http://openslx.org/ + # ----------------------------------------------------------------------------- + # clientConfigDialog.cpp + # - graphical interface + # - all configuration used by pvs/pvsgui is done here + # ----------------------------------------------------------------------------- + */ + +#include "clientConfigDialog.h" + +ClientConfigDialog::ClientConfigDialog(QWidget *parent) : + QDialog(parent) +{ + setupUi(this); + connect(this, SIGNAL(accepted()), this, SLOT(writeSettings())); + connect(radioButtonOtherRO, SIGNAL(clicked()), this, + SLOT(checkPermissions())); + +} + +ClientConfigDialog::~ClientConfigDialog() +{ + +} + +//////////////////////////////////////////////////////////////////////////////// +// Public + +void ClientConfigDialog::open() +{ + readSettings(); + setVisible(true); +} + +void ClientConfigDialog::readSettings() +{ + if (_settings.value("Display/location").isNull()) + comboBox->setCurrentIndex(1); + else + comboBox->setCurrentIndex(_settings.value("Display/location").toInt()); + + if (_settings.value("Permissions/vnc_lecturer").toString() == "rw") + radioButtonLecturerRW->setChecked(true); + else if (_settings.value("Permissions/vnc_lecturer").toString() == "ro") + radioButtonLecturerRO->setChecked(true); + else + radioButtonLecturerNO->setChecked(true); + if (_settings.value("Permissions/vnc_other").toString() == "rw") + radioButtonOtherRW->setChecked(true); + else if (_settings.value("Permissions/vnc_other").toString() == "ro") + radioButtonOtherRO->setChecked(true); + else + radioButtonOtherNO->setChecked(true); + checkBoxAllowChat->setChecked( + _settings.value("Permissions/allow_chat").toBool()); + checkBoxAllowFiletransfer->setChecked(_settings.value( + "Permissions/allow_filetransfer").toBool()); + + qDebug("[%s] Setting read from: '%s'", metaObject()->className(), + qPrintable(_settings.fileName())); +} + +void ClientConfigDialog::writeSettings() +{ + _settings.setValue("Display/location", comboBox->currentIndex()); + if (radioButtonLecturerRW->isChecked()) + _settings.setValue("Permissions/vnc_lecturer", "rw"); + else if (radioButtonLecturerRO->isChecked()) + _settings.setValue("Permissions/vnc_lecturer", "ro"); + else + _settings.setValue("Permissions/vnc_lecturer", "no"); + if (radioButtonOtherRW->isChecked()) + _settings.setValue("Permissions/vnc_other", "rw"); + else if (radioButtonOtherRO->isChecked()) + _settings.setValue("Permissions/vnc_other", "ro"); + else + _settings.setValue("Permissions/vnc_other", "no"); + _settings.setValue("Permissions/allow_chat", checkBoxAllowChat->isChecked()); + _settings.setValue("Permissions/allow_filetransfer", + checkBoxAllowFiletransfer->isChecked()); + _settings.sync(); + emit configChanged(); + + qDebug("[%s] Settings written to: '%s'.", metaObject()->className(), + qPrintable(_settings.fileName())); +} + +//////////////////////////////////////////////////////////////////////////////// +// Private + +void ClientConfigDialog::checkPermissions() +{ + if (radioButtonLecturerNO->isChecked() && radioButtonOtherRO->isChecked()) + radioButtonLecturerRO->setChecked(true); +} diff --git a/src/gui/clientConfigDialog.h b/src/gui/clientConfigDialog.h new file mode 100644 index 0000000..706bd8a --- /dev/null +++ b/src/gui/clientConfigDialog.h @@ -0,0 +1,44 @@ +/* + # Copyright (c) 2009, 2010 - OpenSLX Project, Computer Center University of + # Freiburg + # + # This program is free software distributed under the GPL version 2. + # See http://openslx.org/COPYING + # + # If you have any feedback please consult http://openslx.org/feedback and + # send your suggestions, praise, or complaints to feedback@openslx.org + # + # General information about OpenSLX can be found at http://openslx.org/ + */ + +#ifndef CLIENTCONFIGDIALOG_H_ +#define CLIENTCONFIGDIALOG_H_ + +#include <QtGui> +#include "ui_clientConfigDialog.h" + +class ClientConfigDialog: public QDialog, private Ui::ClientConfigDialogClass +{ +Q_OBJECT + +public: + ClientConfigDialog(QWidget *parent = 0); + ~ClientConfigDialog(); + +public Q_SLOTS: + void open(); + void readSettings(); + void writeSettings(); + +Q_SIGNALS: + void configChanged(); + +private Q_SLOTS: + void checkPermissions(); + +private: + QSettings _settings; + +}; + +#endif /* CLIENTCONFIGDIALOG_H_ */ diff --git a/src/gui/clientFileReceiveDialog.cpp b/src/gui/clientFileReceiveDialog.cpp new file mode 100644 index 0000000..669ca81 --- /dev/null +++ b/src/gui/clientFileReceiveDialog.cpp @@ -0,0 +1,181 @@ +/* + # Copyright (c) 2009, 2010 - OpenSLX Project, Computer Center University of + # Freiburg + # + # This program is free software distributed under the GPL version 2. + # See http://openslx.org/COPYING + # + # If you have any feedback please consult http://openslx.org/feedback and + # send your suggestions, praise, or complaints to feedback@openslx.org + # + # General information about OpenSLX can be found at http://openslx.org/ + # ----------------------------------------------------------------------------- + # clientFileReceiveDialog.cpp + # - filechooser and progress dialog + # ----------------------------------------------------------------------------- + */ + +#include "clientFileReceiveDialog.h" + +ClientFileReceiveDialog::ClientFileReceiveDialog(QTcpSocket *socket, QWidget *parent) : + QDialog(parent) +{ + setupUi(this); + + _file = NULL; + _bytesToRead = 0; + _socket = socket; + + connect(_socket, SIGNAL(readyRead()), this, SLOT(receiveHeader())); + connect(_socket, SIGNAL(disconnected()), this, SLOT(close())); + connect(_socket, SIGNAL(error(QAbstractSocket::SocketError)), + this, SLOT(error(QAbstractSocket::SocketError))); + + qDebug("[%s] New Connection: %s", metaObject()->className(), + qPrintable(_socket->peerAddress().toString())); + + connect(this, SIGNAL(finished(int)), this, SLOT(deleteLater())); +} + +ClientFileReceiveDialog::~ClientFileReceiveDialog() +{ + _socket->deleteLater(); + qDebug("[%s] Deleted!", metaObject()->className()); +} + +//////////////////////////////////////////////////////////////////////////////// +// Private + +void ClientFileReceiveDialog::receiveHeader() +{ + // parse header + QString header = QString::fromUtf8(_socket->readLine()); + QStringList args = header.split(";"); + QString nick = args[0]; + QString filename = args[1]; + _bytesToRead = args[2].toLongLong(); + div = 1 + _bytesToRead / 1000000000; // bc. progressBar supports only int + + qDebug("[%s] Received header.", metaObject()->className()); + + // ask user + QMessageBox::StandardButton result = QMessageBox::question(0, + tr("PVS File Transfer"),tr("User '") + nick + + tr("' would like to send you a file: ") + filename + + " (" + formatSize(_bytesToRead) + ").", + QMessageBox::Ok | QMessageBox::Cancel, QMessageBox::Ok); + + if (result != QMessageBox::Ok) + { + sendAck(false); + return; + } + + // open file + QString saveAs = QFileDialog::getSaveFileName(this, tr("Open File"), + QDir::homePath() + QDir::separator() + filename, ""); + if (saveAs == "") + { + sendAck(false); + return; + } + _file = new QFile(saveAs); + _file->open(QIODevice::WriteOnly); + + // gui + filenameLabel->setText(saveAs); + progressBar->setValue(0); + progressBar->setMaximum(_bytesToRead/div); + labelNick->setText(nick); + labelB->setText(formatSize(_bytesToRead)); + connect(cancelButton, SIGNAL(clicked()), this, SLOT(close())); + + sendAck(true); + show(); +} + +void ClientFileReceiveDialog::sendAck(bool b) +{ + disconnect(_socket, SIGNAL(readyRead()), this, SLOT(receiveHeader())); + + if (b) + { + QString ack = QString("ok\n"); + _socket->write(ack.toUtf8()); + qDebug("[%s] Sending ack...", metaObject()->className()); + connect(_socket, SIGNAL(readyRead()), this, SLOT(receiveFile())); + } + else + { + QString ack = QString("no\n"); + _socket->write(ack.toUtf8()); + qDebug("[%s] Sending nack!!!", metaObject()->className()); + close(); + } +} + +void ClientFileReceiveDialog::receiveFile() +{ + qint64 bytesRead = _file->write(_socket->readAll()); + _bytesToRead -= bytesRead; + progressBar->setValue(progressBar->value() + bytesRead/div); + labelA->setText(formatSize(progressBar->value()*div)); +} + +void ClientFileReceiveDialog::close() +{ + if (_file && _file->isOpen()) + { + _file->flush(); + _file->close(); + qDebug("[%s] File closed.", metaObject()->className()); + } + + if (_socket && _socket->isOpen()) + { + disconnect(_socket, SIGNAL(readyRead()), this, SLOT(receiveHeader())); + disconnect(_socket, SIGNAL(readyRead()), this, SLOT(receiveFile())); + disconnect(_socket, SIGNAL(disconnected()), this, SLOT(close())); + disconnect(_socket, SIGNAL(error(QAbstractSocket::SocketError)), + this, SLOT(error(QAbstractSocket::SocketError))); + _socket->disconnectFromHost(); + qDebug("[%s] Connection closed.", metaObject()->className()); + } + + disconnect(cancelButton, SIGNAL(clicked()), this, SLOT(close())); + + if (_bytesToRead == 0) + { + accept(); + QMessageBox::information(0, tr("PVS - File Transfer"), + tr("File Transfer complete.")); + } + else + { + reject(); + QMessageBox::warning(0, tr("PVS - File Transfer"), + tr("File Transfer canceled!")); + } +} + +void ClientFileReceiveDialog::error(QAbstractSocket::SocketError error) +{ + if (error == QAbstractSocket::RemoteHostClosedError) + qDebug("[%s] Socket closed by remote host.", metaObject()->className()); + else + qDebug("[%s] Socket error: %i", metaObject()->className(), error); + + close(); +} + +QString ClientFileReceiveDialog::formatSize(qint64 size) +{ + if (size >= 1000000000) // GB + return QString("%1GB").arg((qreal)size / 1000000000, 0, 'f',1); + else if (size >= 1000000) // MB + return QString("%1MB").arg((qreal)size / 1000000, 0, 'f',1); + else if (size >= 1000) // KB + return QString("%1KB").arg((qreal)size / 1000, 0, 'f',1); + else // B + return QString("%1B").arg((qreal)size, 0, 'f',1); +} diff --git a/src/gui/clientFileReceiveDialog.h b/src/gui/clientFileReceiveDialog.h new file mode 100644 index 0000000..c13d7b7 --- /dev/null +++ b/src/gui/clientFileReceiveDialog.h @@ -0,0 +1,47 @@ +/* + # Copyright (c) 2009, 2010 - OpenSLX Project, Computer Center University of + # Freiburg + # + # This program is free software distributed under the GPL version 2. + # See http://openslx.org/COPYING + # + # If you have any feedback please consult http://openslx.org/feedback and + # send your suggestions, praise, or complaints to feedback@openslx.org + # + # General information about OpenSLX can be found at http://openslx.org/ + */ + +#ifndef CLIENTFILERECEIVEDIALOG_H_ +#define CLIENTFILERECEIVEDIALOG_H_ + +#include <QtGui> +#include <QtNetwork> +#include "ui_clientFileReceiveDialog.h" + +class ClientFileReceiveDialog: public QDialog, + private Ui::ClientFileReceiveDialogClass +{ +Q_OBJECT + +public: + ClientFileReceiveDialog(QTcpSocket *socket, QWidget *parent = 0); + ~ClientFileReceiveDialog(); + +private Q_SLOTS: + void receiveHeader(); + void receiveFile(); + void close(); + void error(QAbstractSocket::SocketError error); + +private: + void sendAck(bool b); + QString formatSize(qint64 size); + + QTcpSocket *_socket; + QFile *_file; + qint64 _bytesToRead; + int div; + +}; + +#endif /* CLIENTFILERECEIVEDIALOG_H_ */ diff --git a/src/gui/clientFileSendDialog.cpp b/src/gui/clientFileSendDialog.cpp new file mode 100644 index 0000000..ccb44b3 --- /dev/null +++ b/src/gui/clientFileSendDialog.cpp @@ -0,0 +1,248 @@ +/* + # Copyright (c) 2009, 2010 - OpenSLX Project, Computer Center University of + # Freiburg + # + # This program is free software distributed under the GPL version 2. + # See http://openslx.org/COPYING + # + # If you have any feedback please consult http://openslx.org/feedback and + # send your suggestions, praise, or complaints to feedback@openslx.org + # + # General information about OpenSLX can be found at http://openslx.org/ + # ----------------------------------------------------------------------------- + # clientFileSendDialog.cpp + # - filechooser and progress dialog + # ----------------------------------------------------------------------------- + */ + +#include "clientFileSendDialog.h" + +ClientFileSendDialog::ClientFileSendDialog(QWidget *parent) : + QDialog(parent) +{ + setupUi(this); + + _file = NULL; + _socket = NULL; + _clientNicklistDialog = new ClientNicklistDialog(this); + + // connect to D-Bus and get interface + QDBusConnection dbus = QDBusConnection::sessionBus(); + dbus.registerObject("/filesend", this); + dbus.registerService("org.openslx.pvsgui"); + _ifaceDBus = new OrgOpenslxPvsInterface("org.openslx.pvs", "/", dbus, this); + + // get current users name from backend + QDBusPendingReply<QString> reply = _ifaceDBus->chat_getNickname(); + reply.waitForFinished(); + if (reply.isValid()) + _nickname = reply.value(); + else + _nickname = "unknown"; + + connect(this, SIGNAL(finished(int)), this, SLOT(deleteLater())); +} + +ClientFileSendDialog::~ClientFileSendDialog() +{ + qDebug("[%s] Deleted!", metaObject()->className()); +} + +//////////////////////////////////////////////////////////////////////////////// +// Public + +void ClientFileSendDialog::open() +{ + // get nick of remote user + int result = _clientNicklistDialog->exec(); + if (result == 0) // User canceled + { + reject(); + return; + } + open(_clientNicklistDialog->getNick()); +} + +void ClientFileSendDialog::open(QString nick) +{ + QString filename = QFileDialog::getOpenFileName(this, tr("Open File"), + QDir::homePath(), ""); + if (filename == "") + { + reject(); + return; + } + open(nick, filename); +} + +void ClientFileSendDialog::open(QString nick, QString filename) +{ + // open file + _file = new QFile(filename); + _file->open(QIODevice::ReadOnly); + _bytesToWrite = _file->size(); + div = 1 + _bytesToWrite / 1000000000; // bc. progressBar supports only int + + // get host from backend + QString host = ""; + QDBusPendingReply<QString> reply = _ifaceDBus->getIpByNick(nick); + reply.waitForFinished(); + if (reply.isValid()) + host = reply.value(); + else // DBus Error, hostname + qDebug("[%s] D-Bus ERROR, no hostname available!", metaObject()->className()); + + // gui + filenameLabel->setText(filename); + progressBar->setValue(0); + progressBar->setMaximum(_bytesToWrite/div); + labelNick->setText(nick); + labelB->setText(formatSize(_bytesToWrite)); + connect(cancelButton, SIGNAL(clicked()), this, SLOT(close())); + + // open socket + _socket = new QTcpSocket(); + _socket->connectToHost(host, 29481); + qDebug("[%s] Remote host: %s", metaObject()->className(), qPrintable(host)); + + connect(_socket, SIGNAL(connected()), this, SLOT(sendHeader())); + connect(_socket, SIGNAL(disconnected()), this, SLOT(close())); + connect(_socket, SIGNAL(error(QAbstractSocket::SocketError)), + this, SLOT(error(QAbstractSocket::SocketError))); +} + +//////////////////////////////////////////////////////////////////////////////// +// Private + +void ClientFileSendDialog::sendHeader() +{ + QFileInfo info(_file->fileName()); + QString size = QString::number(_bytesToWrite); + QString header = _nickname + ";" + info.fileName() + ";" + size + "\n"; + _socket->write(header.toLocal8Bit()); + connect(_socket, SIGNAL(readyRead()), this, SLOT(receiveAck())); + qDebug("[%s] Sending header...", metaObject()->className()); +} + +void ClientFileSendDialog::receiveAck() +{ + QString ack = QString::fromUtf8(_socket->readLine()); + if (ack != "ok\n") + { + qDebug("[%s] Received nack!", metaObject()->className()); + close(); + return; + } + qDebug("[%s] Received ack.", metaObject()->className()); + + disconnect(_socket, SIGNAL(readyRead()), this, SLOT(receiveAck())); + connect(_socket, SIGNAL(bytesWritten(qint64)), this, SLOT(sendFile())); + show(); + qDebug("[%s] Sending file...", metaObject()->className()); + sendFile(); +} + +void ClientFileSendDialog::sendFile() +{ + if (_bytesToWrite == 0) + { + qDebug("[%s] Transfer completed.", metaObject()->className()); + close(); // finished + } + else + { + qint64 bytesWritten = _socket->write(_file->read(1024)); // data left + _bytesToWrite -= bytesWritten; + progressBar->setValue(progressBar->value() + bytesWritten/div); + labelA->setText(formatSize(progressBar->value()*div)); + } +} + +void ClientFileSendDialog::close() +{ + if (_file && _file->isOpen()) + { + _file->close(); + qDebug("[%s] File closed.", metaObject()->className()); + } + + if (_socket && _socket->isOpen()) + { + disconnect(_socket, SIGNAL(readyRead()), this, SLOT(receiveAck())); + disconnect(_socket, SIGNAL(bytesWritten(qint64)), this, SLOT(sendFile())); + disconnect(_socket, SIGNAL(disconnected()), this, SLOT(close())); + disconnect(_socket, SIGNAL(connected()), this, SLOT(sendHeader())); + disconnect(_socket, SIGNAL(error(QAbstractSocket::SocketError)), + this, SLOT(error(QAbstractSocket::SocketError))); + _socket->disconnectFromHost(); + qDebug("[%s] Connection closed.", metaObject()->className()); + } + + disconnect(cancelButton, SIGNAL(clicked()), this, SLOT(close())); + + if (_bytesToWrite == 0) + { + accept(); + QMessageBox::information(0, tr("PVS - File Transfer"), + tr("File Transfer complete.")); + } + else + { + reject(); + QMessageBox::warning(0, tr("PVS - File Transfer"), + tr("File Transfer canceled!")); + } +} + +void ClientFileSendDialog::error(QAbstractSocket::SocketError error) +{ + qDebug("[%s] Socket error: %i", metaObject()->className(), error); + close(); +} + +QString ClientFileSendDialog::formatSize(qint64 size) +{ + if (size >= 1000000000) // GB + return QString("%1GB").arg((qreal)size / 1000000000, 0, 'f',1); + else if (size >= 1000000) // MB + return QString("%1MB").arg((qreal)size / 1000000, 0, 'f',1); + else if (size >= 1000) // KB + return QString("%1KB").arg((qreal)size / 1000, 0, 'f',1); + else // B + return QString("%1B").arg((qreal)size, 0, 'f',1); +} + +//////////////////////////////////////////////////////////////////////////////// +//////////////////////////////////////////////////////////////////////////////// + +ClientNicklistDialog::ClientNicklistDialog(QWidget *parent) : + QDialog(parent) +{ + setupUi(this); + + // connect to D-Bus and get interface + QDBusConnection dbus = QDBusConnection::sessionBus(); + dbus.registerObject("/nicklist", this); + dbus.registerService("org.openslx.pvsgui"); + _ifaceDBus = new OrgOpenslxPvsInterface("org.openslx.pvs", "/", dbus, this); + + // get available nicknames + QDBusPendingReply<QStringList> reply = _ifaceDBus->chat_getNicknames(); + reply.waitForFinished(); + QStringList nicknames = reply.value(); + if (!reply.isValid() || nicknames.isEmpty()) // DBus Error, nicknames + qDebug("[%s] D-Bus ERROR, no nicknames available!", metaObject()->className()); + + listWidget->addItems(nicknames); + listWidget->setCurrentRow(0); +} + +ClientNicklistDialog::~ClientNicklistDialog() +{ + +} + +QString ClientNicklistDialog::getNick() +{ + return listWidget->currentItem()->text(); +} diff --git a/src/gui/clientFileSendDialog.h b/src/gui/clientFileSendDialog.h new file mode 100644 index 0000000..d8afc3a --- /dev/null +++ b/src/gui/clientFileSendDialog.h @@ -0,0 +1,76 @@ +/* + # Copyright (c) 2009, 2010 - OpenSLX Project, Computer Center University of + # Freiburg + # + # This program is free software distributed under the GPL version 2. + # See http://openslx.org/COPYING + # + # If you have any feedback please consult http://openslx.org/feedback and + # send your suggestions, praise, or complaints to feedback@openslx.org + # + # General information about OpenSLX can be found at http://openslx.org/ + */ + +#ifndef CLIENTFILESENDDIALOG_H_ +#define CLIENTFILESENDDIALOG_H_ + +#include <QtGui> +#include <QtNetwork> +#include "pvsinterface.h" +#include "ui_clientFileSendDialog.h" +#include "ui_clientNicklistDialog.h" + +class ClientNicklistDialog: public QDialog, + private Ui::ClientNicklistDialogClass +{ +Q_OBJECT + +public: + ClientNicklistDialog(QWidget *parent = 0); + ~ClientNicklistDialog(); + + QString getNick(); + +private: + OrgOpenslxPvsInterface *_ifaceDBus; + +}; + +//////////////////////////////////////////////////////////////////////////////// +//////////////////////////////////////////////////////////////////////////////// + +class ClientFileSendDialog: public QDialog, + private Ui::ClientFileSendDialogClass +{ +Q_OBJECT + +public: + ClientFileSendDialog(QWidget *parent = 0); + ~ClientFileSendDialog(); + + void open(); + void open(QString nick); + void open(QString nick, QString filename); + +private Q_SLOTS: + void sendHeader(); + void receiveAck(); + void sendFile(); + void close(); + void error(QAbstractSocket::SocketError error); + +private: + QString formatSize(qint64 size); + + QTcpSocket *_socket; + QFile *_file; + qint64 _bytesToWrite; + int div; + + ClientNicklistDialog *_clientNicklistDialog; + OrgOpenslxPvsInterface *_ifaceDBus; + QString _nickname; + +}; + +#endif /* CLIENTFILESENDDIALOG_H_ */ diff --git a/src/gui/clientInfoDialog.cpp b/src/gui/clientInfoDialog.cpp new file mode 100644 index 0000000..02a6fd8 --- /dev/null +++ b/src/gui/clientInfoDialog.cpp @@ -0,0 +1,60 @@ +/* + # Copyright (c) 2009, 2010 - OpenSLX Project, Computer Center University of + # Freiburg + # + # This program is free software distributed under the GPL version 2. + # See http://openslx.org/COPYING + # + # If you have any feedback please consult http://openslx.org/feedback and + # send your suggestions, praise, or complaints to feedback@openslx.org + # + # General information about OpenSLX can be found at http://openslx.org/ + # ----------------------------------------------------------------------------- + # clientInfoDialog.cpp + # - shows big info dialog (connected host and passwd) + # ----------------------------------------------------------------------------- + */ + +#include "clientInfoDialog.h" + +ClientInfoDialog::ClientInfoDialog(QWidget *parent) : + QDialog(parent) +{ + setupUi(this); +} + +ClientInfoDialog::~ClientInfoDialog() +{ + +} + +//////////////////////////////////////////////////////////////////////////////// +// Public + +void ClientInfoDialog::setHost(QString host) +{ + hostLabel->setText("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" " + "\"http://www.w3.org/TR/REC-html40/strict.dtd\"><html>" + "<head><meta name=\"qrichtext\" content=\"1\" />" + "<style type=\"text/css\">p, li { white-space: pre-wrap; }</style>" + "</head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; " + "font-weight:400; font-style:normal;\"><p style=\" margin-top:0px; " + "margin-bottom:0px; margin-left:0px; margin-right:0px; " + "-qt-block-indent:0; text-indent:0px;\"><span style=\" " + "font-size:72pt; font-weight:600; color:#0000ff;\">" + + host + "</span></p></body></html>"); +} + +void ClientInfoDialog::setPasswd(QString passwd) +{ + passwdLabel->setText("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" " + "\"http://www.w3.org/TR/REC-html40/strict.dtd\"><html>" + "<head><meta name=\"qrichtext\" content=\"1\" />" + "<style type=\"text/css\">p, li { white-space: pre-wrap; }</style>" + "</head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; " + "font-weight:400; font-style:normal;\"><p style=\" margin-top:0px; " + "margin-bottom:0px; margin-left:0px; margin-right:0px; " + "-qt-block-indent:0; text-indent:0px;\"><span style=\" " + "font-size:48pt; font-weight:600; color:#ff0000;\">" + + passwd + "</span></p></body></html>"); +} diff --git a/src/gui/clientInfoDialog.h b/src/gui/clientInfoDialog.h new file mode 100644 index 0000000..770b5b7 --- /dev/null +++ b/src/gui/clientInfoDialog.h @@ -0,0 +1,32 @@ +/* + # Copyright (c) 2009, 2010 - OpenSLX Project, Computer Center University of + # Freiburg + # + # This program is free software distributed under the GPL version 2. + # See http://openslx.org/COPYING + # + # If you have any feedback please consult http://openslx.org/feedback and + # send your suggestions, praise, or complaints to feedback@openslx.org + # + # General information about OpenSLX can be found at http://openslx.org/ + */ + +#ifndef CLIENTINFODIALOG_H_ +#define CLIENTINFODIALOG_H_ + +#include <QtGui> +#include "ui_clientInfoDialog.h" + +class ClientInfoDialog: public QDialog, private Ui::InfoDialogClass +{ +Q_OBJECT + +public: + ClientInfoDialog(QWidget *parent = 0); + ~ClientInfoDialog(); + + void setHost(QString host); + void setPasswd(QString passwd); +}; + +#endif /* CLIENTINFODIALOG_H_ */ diff --git a/src/gui/clientVNCViewer.cpp b/src/gui/clientVNCViewer.cpp new file mode 100644 index 0000000..d6a218b --- /dev/null +++ b/src/gui/clientVNCViewer.cpp @@ -0,0 +1,273 @@ +/* + # Copyright (c) 2009, 2010 - OpenSLX Project, Computer Center University of + # Freiburg + # + # This program is free software distributed under the GPL version 2. + # See http://openslx.org/COPYING + # + # If you have any feedback please consult http://openslx.org/feedback and + # send your suggestions, praise, or complaints to feedback@openslx.org + # + # General information about OpenSLX can be found at http://openslx.org/ + # ----------------------------------------------------------------------------- + # clientVNCViewer.cpp + # - connetct to vnc server and show remote screen (window/full) + # ----------------------------------------------------------------------------- + */ + +#include "clientVNCViewer.h" + +ClientVNCViewer::ClientVNCViewer(QWidget *parent) : + QDialog(parent), _thread(0), _viewOnly(true), _buttonMask(0) +{ + // connect to D-Bus and get interface + QDBusConnection dbus = QDBusConnection::sessionBus(); + dbus.registerObject("/vnc", this); + dbus.registerService("org.openslx.pvsgui"); + _ifaceDBus = new OrgOpenslxPvsInterface("org.openslx.pvs", "/", dbus, this); + connect(_ifaceDBus, SIGNAL(project(QString, int, QString, bool, bool, int)), + this, SLOT(open(QString, int, QString, bool, bool, int))); + connect(_ifaceDBus, SIGNAL(unproject()), this, SLOT(close())); +} + +ClientVNCViewer::~ClientVNCViewer() +{ + close(); +} + +//////////////////////////////////////////////////////////////////////////////// +// Public + +void ClientVNCViewer::open(QString host, int port, QString passwd, bool fs, + bool mode, int quality) +{ + // start thread for vnc-updates + _thread = new VNCClientThread(host, port, passwd, quality); + _thread->start(); + //_rfbclient = _thread->getRfbClient(); + //installEventFilter(this); + setMouseTracking(true); // get mouse events even when there is no mousebutton pressed + setFocusPolicy(Qt::WheelFocus); //needed?!? + + setAttribute(Qt::WA_OpaquePaintEvent); + + // smooth transformation? + if (mode) + _mode = Qt::SmoothTransformation; + else + _mode = Qt::FastTransformation; + + // fullscreen? + if (fs) + { + setWindowFlags(Qt::WindowStaysOnTopHint); + showFullScreen(); + activateWindow(); + raise(); + } + else + showNormal(); + + connect(this, SIGNAL(rejected()), this, SLOT(close())); + connect(_thread, SIGNAL(imageUpdated(int,int,int,int)), this, + SLOT(updateImage(int,int,int,int)), Qt::BlockingQueuedConnection); +} + +void ClientVNCViewer::close() +{ + setVisible(false); + if (_thread) + { + disconnect(_thread, SIGNAL(imageUpdated(int,int,int,int)), this, + SLOT(updateImage(int,int,int,int))); + + _thread->terminate = true; + _thread->wait(1000); + delete _thread; + _thread = NULL; + } + disconnect(this, SIGNAL(rejected()), this, SLOT(close())); +} + +void ClientVNCViewer::updateImage(int x, int y, int w, int h) +{ + if (_thread->getSize() != size()) // scaling needed? + { + // grow the update rectangle to avoid artifacts + x -= 1; + y -= 1; + w += 2; + h += 2; + + _img = _thread->getImage().copy(x, y, w, h); + + qreal sx = qreal(width()) / qreal(_thread->getSize().width()); + qreal sy = qreal(height()) / qreal(_thread->getSize().height()); + + x = qRound(qreal(x) * sx); + y = qRound(qreal(y) * sy); + w = qRound(qreal(w) * sx); + h = qRound(qreal(h) * sy); + } + else + { + _img = _thread->getImage().copy(x, y, w, h); + } + + repaint(x, y, w, h); +} + +//////////////////////////////////////////////////////////////////////////////// +// Protected + +void ClientVNCViewer::paintEvent(QPaintEvent *event) +{ + if (_img.isNull()) + return; + + QPainter painter(this); + QRect r = event->rect(); + + if (r == rect()) + _img = _thread->getImage(); // redraw complete image (e.g. on resize) + + if (_thread->getSize() == size()) + { + painter.drawImage(r.topLeft(), _img); // don't scale + } + else + { + QImage i = _img.scaled(r.size(), Qt::IgnoreAspectRatio, _mode); + painter.drawImage(r.topLeft(), i); + } + event->accept(); +} +//returns true if event was processed +/*bool ClientVNCViewer::event(QEvent *event) +{ + switch (event->type()) { + case QEvent::KeyPress: + case QEvent::KeyRelease: + + keyEventHandler(static_cast<QKeyEvent*>(event)); + return true; + break; + case QEvent::MouseButtonDblClick: + case QEvent::MouseButtonPress: + case QEvent::MouseButtonRelease: + case QEvent::MouseMove: + mouseEventHandler(static_cast<QMouseEvent*>(event)); + return true; + break; + case QEvent::Wheel: + wheelEventHandler(static_cast<QWheelEvent*>(event)); + return true; + break; + default: + return false; + } +}*/ + +//handles mouseevents +void ClientVNCViewer::mouseEventHandler(QMouseEvent *e) +{ + if (e->type() != QEvent::MouseMove) { + if ((e->type() == QEvent::MouseButtonPress) || + (e->type() == QEvent::MouseButtonDblClick)) { + if (e->button() & Qt::LeftButton) + _buttonMask |= 0x01; + if (e->button() & Qt::MidButton) + _buttonMask |= 0x02; + if (e->button() & Qt::RightButton) + _buttonMask |= 0x04; + } else if (e->type() == QEvent::MouseButtonRelease) { + if (e->button() & Qt::LeftButton) + _buttonMask &= 0xfe; + if (e->button() & Qt::MidButton) + _buttonMask &= 0xfd; + if (e->button() & Qt::RightButton) + _buttonMask &= 0xfb; + } + } + qreal sx = qreal(width()) / qreal(_thread->getSize().width()); + qreal sy = qreal(height()) / qreal(_thread->getSize().height()); + _thread->mouseEvent(qRound(e->x() / sx), qRound(e->y() / sy), _buttonMask); +} + +//handles mousewheel +void ClientVNCViewer::wheelEventHandler(QWheelEvent *event) +{ + int eb = 0; + if (event->delta() < 0) + eb |= 0x10; + else + eb |= 0x8; + + qreal sx = qreal(width()) / qreal(_thread->getSize().width()); + qreal sy = qreal(height()) / qreal(_thread->getSize().height()); + const int x = qRound(event->x() / sx); + const int y = qRound(event->y() / sy); + + _thread->mouseEvent(x, y, eb | _buttonMask); + _thread->mouseEvent(x, y, _buttonMask); +} + +//Handles keypress +void ClientVNCViewer::keyEventHandler(QKeyEvent *e) +{ + rfbKeySym k = e->nativeVirtualKey(); + + // do not handle Key_Backtab separately because the Shift-modifier + // is already enabled + if (e->key() == Qt::Key_Backtab) { + k = XK_Tab; + } + + const bool pressed = (e->type() == QEvent::KeyPress); + + // handle modifiers + if (k == XK_Shift_L || k == XK_Control_L || k == XK_Meta_L || k == XK_Alt_L) { + if (pressed) { + _modkeys[k] = true; + } else if (_modkeys.contains(k)) { + _modkeys.remove(k); + } else { + unpressModifiers(); + } + } + + if (k) { + _thread->keyEvent(k, pressed); + } +} + +//removes modifier keys which have been pressed +void ClientVNCViewer::unpressModifiers() +{ + const QList<unsigned int> keys = _modkeys.keys(); + QList<unsigned int>::const_iterator it = keys.constBegin(); + while (it != keys.end()) { + _thread->keyEvent(*it, false); + it++; + } + _modkeys.clear(); +} + +//(QT Function) Filters events, if _viewOnly is set, true is returned and the event is ignored +//TODO use this function when implementing viewonly switch +bool ClientVNCViewer::eventFilter(QObject *obj, QEvent *event) +{ + if (_viewOnly) { + if (event->type() == QEvent::KeyPress || + event->type() == QEvent::KeyRelease || + event->type() == QEvent::MouseButtonDblClick || + event->type() == QEvent::MouseButtonPress || + event->type() == QEvent::MouseButtonRelease || + event->type() == QEvent::Wheel || + event->type() == QEvent::MouseMove) + return true; + } + + return false; + //return RemoteView::eventFilter(obj, event); +} diff --git a/src/gui/clientVNCViewer.h b/src/gui/clientVNCViewer.h new file mode 100644 index 0000000..6ff9c33 --- /dev/null +++ b/src/gui/clientVNCViewer.h @@ -0,0 +1,67 @@ +/* + # Copyright (c) 2009, 2010 - OpenSLX Project, Computer Center University of + # Freiburg + # + # This program is free software distributed under the GPL version 2. + # See http://openslx.org/COPYING + # + # If you have any feedback please consult http://openslx.org/feedback and + # send your suggestions, praise, or complaints to feedback@openslx.org + # + # General information about OpenSLX can be found at http://openslx.org/ + */ + +#ifndef CLIENTVNCVIEWER_H_ +#define CLIENTVNCVIEWER_H_ + +#include <QtGui> +#include <QMouseEvent> +#include "pvsinterface.h" +#include "../util/vncClientThread.h" + +// Definition of key modifier mask constants +#define KMOD_Alt_R 0x01 +#define KMOD_Alt_L 0x02 +#define KMOD_Meta_L 0x04 +#define KMOD_Control_L 0x08 +#define KMOD_Shift_L 0x10 + +class ClientVNCViewer: public QDialog +{ +Q_OBJECT + +public: + ClientVNCViewer(QWidget *parent = 0); + virtual ~ClientVNCViewer(); + +public Q_SLOTS: + void open(QString host, int port, QString passwd, bool fullscreen = false, + bool smoothTransformation = false, int quality = 0); + void close(); + void updateImage(int x, int y, int w, int h); + +protected: + void paintEvent(QPaintEvent *event); + //bool event(QEvent *event); + //bool eventFilter(QObject *obj, QEvent *event); + +private: + VNCClientThread *_thread; + //rfbClient *_rfbclient; + QImage _img; + bool _viewOnly; + int _buttonMask; + QMap<unsigned int, bool> _modkeys; + bool eventFilter(QObject *obj, QEvent *event); + void keyEventHandler(QKeyEvent *e); + void unpressModifiers(); + void wheelEventHandler(QWheelEvent *event); + void mouseEventHandler(QMouseEvent *event); + + + Qt::TransformationMode _mode; + + OrgOpenslxPvsInterface *_ifaceDBus; +}; + +#endif /* CLIENTVNCVIEWER_H_ */ diff --git a/src/gui/connectionDialog.cpp b/src/gui/connectionDialog.cpp new file mode 100644 index 0000000..8c5b743 --- /dev/null +++ b/src/gui/connectionDialog.cpp @@ -0,0 +1,216 @@ +#include "connectionDialog.h" + +ConnectionDialog::ConnectionDialog(MainWindow* newParent, const Glib::ustring& title) + : buttonOK("OK"), + buttonCancel("Cancel") + +{ + set_default_size(300, 100); + if (newParent) + myParent = newParent; + else + ; // handle errors + + set_title(title); + buttonOK.signal_clicked().connect(sigc::mem_fun(*this, &ConnectionDialog::on_button_ok_click)); + buttonCancel.signal_clicked().connect(sigc::mem_fun(*this, &ConnectionDialog::on_button_cancel_click)); + + + windowBox.pack_start(contentBox, Gtk::PACK_SHRINK); + windowBox.pack_start(buttonBox, Gtk::PACK_SHRINK); + buttonBox.pack_end(buttonOK, Gtk::PACK_SHRINK); + buttonBox.pack_end(buttonCancel, Gtk::PACK_SHRINK); + + + add(windowBox); + show_all_children(); +} + +ConnectionDialog::~ConnectionDialog() +{} + +void ConnectionDialog::on_button_ok_click() +{ + hide(); +} + +void ConnectionDialog::on_button_cancel_click() +{ + hide(); +} + + + +PasswordDialog::PasswordDialog(MainWindow* newParent, const Glib::ustring& title, QString* newTargetPW) + : ConnectionDialog(newParent, title), + frameIP(*newTargetPW), + targetPW(newTargetPW) + +{ + *newTargetPW = ""; + entryPW.signal_activate().connect(sigc::mem_fun(*this, &PasswordDialog::on_enter_password)); + + frameIP.add(entryPW); + contentBox.add(frameIP); + + show_all_children(); + +} + +PasswordDialog::~PasswordDialog() +{} + +void PasswordDialog::on_button_ok_click() +{ + if (password != "") // there was a password set by pressing enter in the pw-entry + { + *targetPW = password; + ConnectionDialog::on_button_ok_click(); + } + else // it was just typed or not supplied + { + *targetPW = entryPW.get_text(); + if (*targetPW != "") + ConnectionDialog::on_button_ok_click(); + + } + +} + +void PasswordDialog::on_button_cancel_click() +{ + *targetPW = ""; + ConnectionDialog::on_button_cancel_click(); +} + +void PasswordDialog::on_enter_password() +{ + password = entryPW.get_text(); + if (password != "") + on_button_ok_click(); +} + +NewConDialog::NewConDialog(MainWindow* newParent, const Glib::ustring& title) + : ConnectionDialog(newParent, title), + frameIP("Host"), + framePW("Password"), + buttonFromFile("From File") +{ + entryIP.signal_activate().connect(sigc::mem_fun(*this, &NewConDialog::on_enter_IP)); + entryPW.signal_activate().connect(sigc::mem_fun(*this, &NewConDialog::on_enter_password)); + buttonFromFile.signal_clicked().connect(sigc::mem_fun(*this, &NewConDialog::on_button_fromFile_click)); + + frameIP.add(entryIP); + framePW.add(entryPW); + contentBox.add(frameIP); + contentBox.add(framePW); + contentBox.add(buttonFromFile); + show_all_children(); +} + +NewConDialog::~NewConDialog() +{} + +void NewConDialog::on_enter_password() +{ + if (entryIP.get_text() != "") // if the IP/hostname was already supplied, we proceed without putting the focus + // back on the IP field. + // we also proceed if theres no password given, because theres either no password + // needed or the password dialog will take care of that later on + on_button_ok_click(); + else + entryIP.grab_focus(); +} + +void NewConDialog::on_enter_IP() +{ + if (entryIP.get_text() != "") + { + if (entryPW.get_text() == "") // if no password was supplied we put the focus on the password + entryPW.grab_focus(); + else + on_button_ok_click(); + } + else + return; +} + + +void NewConDialog::on_button_ok_click() +{ + connection_IP = entryIP.get_text(); + if (connection_IP != "") // we only proceed if the IP/hostname field isnt empty + { + connection_password = entryPW.get_text(); + QString infoLine; + infoLine = connection_IP; + if (connection_password.length() > 0) // if the password was supplied, we assemble the string + // with the necessary information + { + infoLine.append(" "); + infoLine.append(connection_password); + } + + // VNCConnectInfo* newCon = getConInfo(infoLine); + +// myParent->addConnection(newCon); + + ConnectionDialog::on_button_ok_click(); + } +} + +void NewConDialog::on_button_fromFile_click() +{ +// myParent->readClientsFromFile(); + ConnectionDialog::on_button_ok_click(); +} + + + + + + + + + + + + + + + +MessageDialog::MessageDialog(MainWindow* newParent, const Glib::ustring& title, QString* newMessage) + : ConnectionDialog(newParent, title), + frameMsg("Message") +{ + message = newMessage; + entryMsg.signal_activate().connect(sigc::mem_fun(*this, &MessageDialog::on_enter_message)); + + frameMsg.add(entryMsg); + + contentBox.add(frameMsg); + + show_all_children(); +} + +MessageDialog::~MessageDialog() +{} + +void MessageDialog::on_enter_message() +{ + if (entryMsg.get_text() != "") + { + on_button_ok_click(); + } +} + + +void MessageDialog::on_button_ok_click() +{ + if (entryMsg.get_text().empty()) + return; + + *message = entryMsg.get_text(); + + ConnectionDialog::on_button_ok_click(); +} diff --git a/src/gui/connectionDialog.h b/src/gui/connectionDialog.h new file mode 100644 index 0000000..8f268d4 --- /dev/null +++ b/src/gui/connectionDialog.h @@ -0,0 +1,123 @@ +#ifndef _CONNECTIONDIALOG_H_ +#define _CONNECTIONDIALOG_H_ +#include <src/gui/mainWindow.h> +//#include <src/core/pvsCore.h> +//#include <src/util/pvsUtil.h> + + +class MainWindow; + +/** ConnectionDialog + * Abstract base class for dialogs + */ + +class ConnectionDialog : public Gtk::Window +{ + +public: + ConnectionDialog(MainWindow* newParent, const Glib::ustring& title); + ~ConnectionDialog(); + +protected: + + virtual void on_button_ok_click(); // callback for ok button + virtual void on_button_cancel_click(); // callback for cancel button + + Gtk::VBox contentBox; // box containing the individual content of the dialogs + Gtk::HBox buttonBox; // box containing the shared buttons (ok & cancel) of the dialogs + Gtk::VBox windowBox; // box containing content and button boxes + Gtk::Button buttonOK; // the ok button + Gtk::Button buttonCancel; // the cancel button + MainWindow* myParent; // pointer to the parenting window + +}; + + +/** PasswordDialog + * dialog with the sole purpose to ask for a password (if requested) + */ + + +class PasswordDialog : public ConnectionDialog +{ + +public: + + PasswordDialog(MainWindow* newParent, const Glib::ustring& title, QString* newTargetPW); // the PasswordDialog constructor takes a pointer to a string for the sole + // reason that it is not connected to the connection that asks for a password and therefore cannot tell the user to which + // connection it belongs. So the connection puts the hostname in the string which the pointer is pointing to for the password + // dialog to read out and show to the user. The string is then overwritten with the password the user entered and then used + // inside the connection to feed the password request. + ~PasswordDialog(); + +protected: + + void on_enter_password(); + void on_button_ok_click(); + void on_button_cancel_click(); + + Gtk::Frame frameIP; + Gtk::Entry entryPW; + +private: + QString password, *targetPW; +}; + +/** NewConDialog + * dialog to open up a new connection to a vnc server + * offers the options + * * to enter a password to not come up + * with a password dialog later + * * to read prefab connections from a file + */ + + +class NewConDialog : public ConnectionDialog +{ + +public: + NewConDialog(MainWindow* newParent, const Glib::ustring& title); + ~NewConDialog(); + +protected: + + void on_enter_password(); // callback when enter was hit in the password text field. + void on_enter_IP(); // callback when enter was hit in the IP/Host text field + + void on_button_ok_click(); // ok button callback + void on_button_fromFile_click();// read-from-file button callback + + Gtk::Frame frameIP; // just a frame around the IP text field + Gtk::Frame framePW; // the same for the pw field + Gtk::Button buttonFromFile; // button to read out a file + Gtk::Entry entryIP; // text field for the IP/Hostname + Gtk::Entry entryPW; // text field for the password (optional) + +private: + QString connection_password; + QString connection_IP; +}; + +class MessageDialog : public ConnectionDialog +{ + +public: + MessageDialog(MainWindow* newParent, const Glib::ustring& title, QString* newMessage); + ~MessageDialog(); + +protected: + + void on_enter_message(); // callback when enter was hit in the text field. + + void on_button_ok_click(); // ok button callback + void on_button_fromFile_click();// read-from-file button callback + + Gtk::Frame frameMsg; // just a frame around the text + Gtk::Entry entryMsg; // text field for the message + +private: + QString * message; +}; + + +#endif diff --git a/src/gui/connectionFrame.cpp b/src/gui/connectionFrame.cpp new file mode 100644 index 0000000..e889991 --- /dev/null +++ b/src/gui/connectionFrame.cpp @@ -0,0 +1,557 @@ +/* +# Copyright (c) 2009 - OpenSLX Project, Computer Center University of Freiburg +# +# This program is free software distributed under the GPL version 2. +# See http://openslx.org/COPYING +# +# If you have any feedback please consult http://openslx.org/feedback and +# send your suggestions, praise, or complaints to feedback@openslx.org +# +# General information about OpenSLX can be found at http://openslx.org/ +# ----------------------------------------------------------------------------- +# src/gui/connectionFrame.cpp +# ----------------------------------------------------------------------------- +*/ + + +#include <src/gui/connectionFrame.h> +#include <src/gui/dialog.h> +#include <src/gui/mainWindow.h> +#include <iostream> +extern "C" +{ +#include <rfb/rfbclient.h> +} +#include <src/core/pvsConnectionManager.h> + + +ConnectionFrame::ConnectionFrame(QWidget *parent) : + QGroupBox(parent) +{ + + //defines the ui-stuff + + _gL = new QGridLayout(this); + _gL->setSpacing(6); + _gL->setMargin(1); + + _split = new QSplitter(this); + _split->setOrientation(Qt::Vertical); + + _frame = new Frame("", _split); + _frame->setConFrame(this); + _split->addWidget(_frame); + + _conFrameTaskbar = new QWidget(_split); + _conFrameTaskbar->setMaximumHeight(30); + + _gLayout = new QGridLayout(_conFrameTaskbar); + _gLayout->setMargin(0); + _gLayout->setSpacing(0); + + _hLayoutInCfTaskbar = new QHBoxLayout(); + + _username = new QLabel(_conFrameTaskbar); + _username->setStyleSheet(QString::fromUtf8("background-color: rgb(150, 150, 168);")); + _username->setAlignment(Qt::AlignLeft); + + _hLayoutInCfTaskbar->addWidget(_username); + + _dozentContaimner = new QLabel(_conFrameTaskbar); + _dozentContaimner->setStyleSheet(QString::fromUtf8("background-color: rgb(150, 150, 168);")); + _dozentContaimner->setAlignment(Qt::AlignRight); + _dozentContaimner->setMaximumSize(QSize(20, 20)); + _dozentContaimner->setScaledContents(true); + + _hLayoutInCfTaskbar->addWidget(_dozentContaimner); + + _dozentContaimner->setDisabled(true); + + _status = new QLabel(_conFrameTaskbar); + _status->setStyleSheet(QString::fromUtf8("background-color: rgb(150, 150, 168);")); + _status->setAlignment(Qt::AlignRight); + _status->setMaximumSize(QSize(22, 21)); + + _hLayoutInCfTaskbar->addWidget(_status); + + _gLayout->addLayout(_hLayoutInCfTaskbar, 0, 0, 1, 1); + _split->addWidget(_conFrameTaskbar); + + _gL->addWidget(_split, 0, 0, 1, 1); + + this->setLayout(_gL); + + setInitSize(190,168); + + initFrame(); + + nat_height = 0; + nat_width = 0; + _ratio = 100; + overSized = false; + _fullscreen = false; + _closeup = false; + active = false; + _isOnProjekt = false; + isClientOnline = true; + + //slots and signals + + DelDummy = new QAction(tr("&Remove dummy..."),this); + connect(DelDummy, SIGNAL(triggered()), this, SLOT(delDummy())); + lockClient = new QAction(tr("&Lock Client(s)"),this); + connect(lockClient, SIGNAL(triggered()), this, SLOT(on_lock())); + uLockClient = new QAction(tr("&Unlock Client(s)"),this); + connect(uLockClient, SIGNAL(triggered()), this, SLOT(on_unlock())); + /*invertlockClient = new QAction(tr("&Invertlock Client(s)"),this); + connect(invertlockClient, SIGNAL(triggered()), this, SLOT(on_lock_invert())); + LockAllClient = new QAction(tr("&Lock all Client(s)"),this); + connect(LockAllClient, SIGNAL(triggered()), this, SLOT(on_lock_all())); + uLockAllClient = new QAction(tr("&Unlock all Client(s)"),this); + connect(uLockAllClient, SIGNAL(triggered()), this, SLOT(on_unlock_all()));*/ + msgLockClient = new QAction(tr("&MsgLock Client(s)"),this); + connect(msgLockClient, SIGNAL(triggered()), this, SLOT(on_lock_with_message())); + msgLockAllClient = new QAction(tr("&MsgLock all Client(s)"),this); + connect(msgLockAllClient, SIGNAL(triggered()), this, SLOT(on_lock_all_with_message())); + msgClient = new QAction(tr("&Message Client(s)"),this); + connect(msgClient, SIGNAL(triggered()), this, SLOT(on_message())); + project = new QAction(tr("&Projection"),this); + connect(project, SIGNAL(triggered()), this, SLOT(on_projection())); + uproject = new QAction(tr("&Unprojection"),this); + connect(uproject, SIGNAL(triggered()), this, SLOT(on_unprojection())); + /*rHelp = new QAction(tr("&Remote Help"),this); + connect(rHelp, SIGNAL(triggered()), this, SLOT(on_remoteHelp()));*/ + + //connect(_frame, SIGNAL(clicked()), this, SLOT(on_click())); + + //menu entries + + menu = new QMenu(this); + menu->addAction(DelDummy); + menu->addSeparator(); + menu->addAction(lockClient); + menu->addAction(uLockClient); + /*menu->addAction(invertlockClient); + menu->addAction(LockAllClient); + menu->addAction(uLockAllClient);*/ + menu->addAction(msgLockClient); + menu->addAction(msgLockAllClient); + menu->addAction(msgClient); + menu->addAction(project); + menu->addAction(uproject); + //menu->addAction(rHelp); + + this->show(); +} + +ConnectionFrame::~ConnectionFrame() +{ + +} + +QString ConnectionFrame::getTitle() // get frame title +{ + return title(); +} + +void ConnectionFrame::setTheTitle(QString title) // set frame title +{ + if (title.isNull()) return; + setTitle(title); +} + +QString ConnectionFrame::getTaskbarTitle() // get taskbar title +{ + if (!_username->text().isNull()) + return _username->text(); + else + return _myConnection->getIp(); +} + +void ConnectionFrame::setTaskbarTitle(QString title) // set taskbar title +{ + _username->setText(title); + _frame->ip = title; +} + +void ConnectionFrame::setInitSize(int w, int h) +{ + resize(w, h); + _frame->resize(w, h); + _conFrameTaskbar->resize(w, h); + prev_height = h; + prev_width = w; + init_w = w; + init_h = h; +} + +void ConnectionFrame::Resize(int w, int h) +{ + resize(w, h); + _frame->resize(w, h); +} + +void ConnectionFrame::initFrame() +{ + _clientStatus = QPixmap(":/offline"); + _clientDozent = QPixmap(":/dozent2"); + _dozentContaimner->setPixmap(_clientDozent.scaled(3*_dozentContaimner->size()/4, + Qt::KeepAspectRatio, Qt::SmoothTransformation)); +} + + +void ConnectionFrame::setConnection(PVSClient* newConnection) +{ + if (newConnection) + { + _myConnection = newConnection; + _myConnection->setConnectionFrame(this); + const QString userName = QString( + _myConnection->getUserName().toUtf8().data()); + if (_myConnection->getVNCConnection() && _myConnection->getVNCConnection()->getVNCClientThread()) + { + _myConnection->getVNCConnection()->setFrame(this); + _frame->setVNCThreadConnection(_myConnection->getVNCConnection()->getVNCClientThread()); + setActive(true); + setToolTip(userName); + setTitle(userName); + } + else + { + setToolTip(userName); + setTitle(userName); + } + } + +} + +/* + * We set a new VNCConnection to the pvsmgr with a new quality. + * To do this, that is very easy. At this point we have already a ruuning + * Connection between the server an the client. This connection is controlled in a thread. + * So we disconnect all Qt-Signals on this thread and we terminate the thread. + * After do this we have to set a new thread(VNCClientThread) and connect the signals again. + * + * When you want to read about this, please check the developper's book. + */ +void ConnectionFrame::resetConnectionWithQuality(int quality) +{ + if (getFrame()) + { + _myConnection->getVNCConnection()->reInitClientWithQuality(quality); + getFrame()->stopVNCThreadConnection(); + getFrame()->setVNCThreadConnection(_myConnection->getVNCConnection()->getVNCClientThread()); + getFrame()->update(); + } +} + +void ConnectionFrame::delDummy() +{ + MainWindow::getConnectionWindow()->removeFromList(this); +} + +void ConnectionFrame::on_projection() +{ + MainWindow::getConnectionList()->on_projection(); +} + +void ConnectionFrame::on_unprojection() +{ + MainWindow::getConnectionList()->on_unprojection(); +} + +void ConnectionFrame::on_lock() +{ + if (_myConnection->getVNCConnection()) + MainWindow::getConnectionWindow()->lockStation(_myConnection); +} + +void ConnectionFrame::on_unlock() +{ + if (_myConnection->getVNCConnection()) + MainWindow::getConnectionWindow()->unlockStation(_myConnection); +} + +void ConnectionFrame::on_message() +{ + Dialog msgD; + QString myString = NULL; + int result = msgD.exec(); + + if (result == 1) + { + myString = MainWindow::getWindow()->getMsgDialog(); + if(!myString.isEmpty()) + MainWindow::getConnectionWindow()->messageStations("BROADCAST",myString); + } +} + +void ConnectionFrame::on_lock_with_message() +{ + Dialog msgD; + QString myString = NULL; + int result = msgD.exec(); + + if(result == 1) + { + myString = MainWindow::getWindow()->getMsgDialog(); + if(!myString.isEmpty()) + { + MainWindow::getConnectionWindow()->lockStationsWithMessage(myString); + } + } +} + +void ConnectionFrame::on_lock_all_with_message() +{ + QString myString = NULL; + Dialog msgD; + int result = msgD.exec(); + + if(result == 1) + { + myString = MainWindow::getWindow()->getMsgDialog(); + if(!myString.isEmpty()) + { + MainWindow::getConnectionWindow()->lockAllStationsWithMessage(myString); + } + } +} + +void ConnectionFrame::on_lock_all() +{ + MainWindow::getConnectionWindow()->lockAllStations(); +} + +void ConnectionFrame::on_unlock_all() +{ + MainWindow::getConnectionWindow()->unlockAllStations(); +} + +void ConnectionFrame::on_lock_invert() +{ + //MainWindow::getConnectionWindow()->lockInvertStations(); +} + +void ConnectionFrame::on_remoteHelp() +{ + +} + +void ConnectionFrame::setIgnoreRatio(bool ignore) +{ + ignore_ratio = ignore; +} + +void ConnectionFrame::setFullscreen(bool fs) +{ + _fullscreen = fs; + setIgnoreRatio(!fs); +} + +void ConnectionFrame::setCloseup(bool cu) +{ + _closeup = cu; + setIgnoreRatio(false); +} + +void ConnectionFrame::setInteractive(bool doit) +{ + viewOnly = !doit; +} + +void ConnectionFrame::setActive(bool activate) +{ + active = activate; +} + +void ConnectionFrame::setDummy(bool dummy) +{ + _dummy = dummy; + if (_dummy) + { + _clientStatus = QPixmap(0, 0); //ein leeres Pixmap erstellen + _clientStatus.fill(Qt::white); // benöigt bevor man drin zeichen + _clientStatus = QPixmap(":/offline"); + _status->setMaximumSize(QSize(30, 30)); + _status->setPixmap(_clientStatus.scaled(29,27, + Qt::KeepAspectRatio, Qt::SmoothTransformation)); + //_status->setPixmap(clientStatus.scaled(3*_status->size()/4, + // Qt::KeepAspectRatio, Qt::SmoothTransformation)); + //setConnection(NULL); + } + else + { + _clientStatus = QPixmap(0, 0); //ein leeres Pixmap erstellen + _clientStatus.fill(Qt::white); // benöigt bevor man drin zeichen + _clientStatus = QPixmap(":/online"); + _status->setMaximumSize(QSize(30, 30)); + _status->setPixmap(_clientStatus.scaled(29,27, + Qt::KeepAspectRatio, Qt::SmoothTransformation)); + //_status->setPixmap(clientStatus.scaled(3*_status->size()/4, + // Qt::KeepAspectRatio, Qt::SmoothTransformation)); + } + // } +} + +void ConnectionFrame::setFrameRate(int newRate) +{ + //newRate = 5000; +} + +void ConnectionFrame::mouseReleaseEvent ( QMouseEvent * e ) +{ + if (e->button() == Qt::LeftButton) + { + QPoint relPoint = mapToParent(e->pos()); + QRect r = MainWindow::getConnectionWindow()->frameGeometry(); + /* + * We don't want to move the client in a position where we can't catch it again! + */ + if (relPoint.x() > r.width() || relPoint.y() > r.height() || + relPoint.x() < 0 || relPoint.y() < 0) + move(_previousPoint); + QApplication::setOverrideCursor(QCursor(Qt::OpenHandCursor)); + } +} + +void ConnectionFrame::enterEvent ( QEvent * event ) +{ + update(); + QApplication::setOverrideCursor(QCursor(Qt::OpenHandCursor)); + if (!_dummy) + _frame->setToolButtonListVisible(true); +} + +void ConnectionFrame::leaveEvent ( QEvent * event ) +{ + QApplication::setOverrideCursor(QCursor(Qt::ArrowCursor)); + if (!_dummy) + _frame->setToolButtonListVisible(false); +} + +void ConnectionFrame::mousePressEvent(QMouseEvent *event) +{ + if (event->button() == Qt::RightButton) + { + if (!_dummy) + { + DelDummy->setDisabled(true); + menu->exec(QCursor::pos()); + } + else + { + foreach (QAction* a, menu->actions()) + a->setDisabled(true); + DelDummy->setDisabled(false); + menu->exec(QCursor::pos()); + } + } + else + { + _clickPoint = event->pos(); + _previousPoint = pos(); + QApplication::setOverrideCursor(QCursor(Qt::ClosedHandCursor)); + } + /* + * On click, the window have to be on the top-level. + */ + activateWindow(); + raise(); + update(); +} + +void ConnectionFrame::mouseMoveEvent(QMouseEvent *event) +{ + QApplication::setOverrideCursor(QCursor(Qt::ClosedHandCursor)); + move(mapToParent(event->pos()-_clickPoint)); +} + +void ConnectionFrame::paintCloseUp(int w, int h) +{ + + + if (!_frame->image().isNull()) + { + /*this->setFixedWidth(w); + _conFrameTaskbar->setMaximumWidth(w); + resize(w, h);*/ + resizeComponent(w, h); + setMaximumSize(w,h); + resize(w, h); + } + else + { + std::cout << "pixel is NULL" << std::endl; + } + +} + +void ConnectionFrame::resizeComponent(int w, int h) +{ + int th = (h*_conFrameTaskbar->width())/w; + int uh = (h*_username->width())/w; + _conFrameTaskbar->setMaximumSize(w, th); + _conFrameTaskbar->resize(w, th); + _username->setMaximumSize(w, uh); + _username->resize(w,uh); +} + +void ConnectionFrame::setSource() +{ + _clientStatus = QPixmap(0, 0); //ein leeres Pixmap erstellen + _clientStatus.fill(Qt::white); // benöigt bevor man drin zeichen + _clientStatus = QPixmap(":/source"); + _status->setMaximumSize(QSize(62, 30)); + _status->setPixmap(_clientStatus.scaled(61,29, + Qt::KeepAspectRatio, Qt::SmoothTransformation)); + _isOnProjekt = true; +} + +void ConnectionFrame::setTarget() +{ + _clientStatus = QPixmap(0, 0); //ein leeres Pixmap erstellen + _clientStatus.fill(Qt::white); // benöigt bevor man drin zeichen + _clientStatus = QPixmap(":/target"); + _status->setMaximumSize(QSize(62, 30)); + _status->setPixmap(_clientStatus.scaled(61,29, + Qt::KeepAspectRatio, Qt::SmoothTransformation)); +} + +void ConnectionFrame::setUnproject() +{ + _clientStatus = QPixmap(0, 0); //ein leeres Pixmap erstellen + _clientStatus.fill(Qt::white); // benöigt bevor man drin zeichen + _clientStatus = QPixmap(":/online"); + _status->setMaximumSize(QSize(30, 30)); + _status->setPixmap(_clientStatus.scaled(29,27, + Qt::KeepAspectRatio, Qt::SmoothTransformation)); + _isOnProjekt = false; +} + +void ConnectionFrame::setDozent(bool isDozent) +{ + if (isDozent) + _dozentContaimner->setDisabled(false); + else + _dozentContaimner->setDisabled(true); +} + +void ConnectionFrame::on_click() +{ + //std::cout << "HALLO! WAS?" << std::endl; +} + +const QPixmap* ConnectionFrame::getFramePixmap() +{ + if (_frame == NULL) return NULL; + return _frame->pixmap(); +} + +Frame* ConnectionFrame::getFrame() +{ + if(_myConnection && _myConnection->getVNCConnection()) return _frame; + return NULL; +}; + +//Frame* ConnectionFrame::_frame = NULL; diff --git a/src/gui/connectionFrame.h b/src/gui/connectionFrame.h new file mode 100644 index 0000000..a199102 --- /dev/null +++ b/src/gui/connectionFrame.h @@ -0,0 +1,199 @@ +#ifndef _CONNECTIONFRAME_H_ +#define _CONNECTIONFRAME_H_ +#include <QtGui> +#include <fstream> +#include <iostream> +#include <QImage> +#include <QPixmap> +#include <QLabel> +#include <src/core/pvsClient.h> +#include <src/gui/frame.h> +//#include <src/gui/mainWindow.h> +#include <src/gui/dialog.h> +extern "C" +{ +#include <rfb/rfbclient.h> +} + +#define PROFILE +#include <src/util/timeUtil.h> + +/** + * Container for the drawable area that shows the corresponding servers desktop + * + */ + +class PVSClient; +class VNCConnection; +class ConnectionWindow; +class Frame; +class Dialog; +class MainWindow; + +class ConnectionFrame : public QGroupBox +{ + + Q_OBJECT + +public: + ConnectionFrame(QWidget* parent=0); // on width and height being zero, defaults values are used + virtual ~ConnectionFrame(); + + QString getTitle(); + void setTheTitle(QString title); + QString getTaskbarTitle(); + void setTaskbarTitle(QString title); + void setInitSize(int w, int h); + void Resize(int w, int h); + void initFrame(); + + int getPrevWidth(){return prev_width;}; + void setPrevWidth(int w){prev_width = w;} + int getPrevHeight(){return prev_height;}; + void setPrevHeight(int h){prev_height = h;} + + void setConnection(PVSClient* newConnection); + void resetConnectionWithQuality(int quality); + PVSClient* getConnection() + { + return _myConnection; + } + ; + //bool drawFrame(); // call to ask for a redraw of the frames content + void setIgnoreRatio(bool ignore); // sets wether it should force square on the content or not + void setFullscreen(bool fs); // toggles wether this frame is requested to shown fullscreen or not + bool getFullscreen() + { + return _fullscreen; + } + ; // returns wether the frame is fullscreen (or requested to be) or not + void setCloseup(bool cu); // toggles wether this frame is requested to shown fullscreen or not + bool getCloseup() + { + return _closeup; + } + ; // returns wether the frame is fullscreen (or requested to be) or not + + void setInteractive(bool doit); + float getRatio() + { + return _ratio; + } + ; // returns the native ratio of the source buffer (h/w) + void setRatio(int newRatio) + { + _ratio = newRatio; + } + ; + bool getOversized() + { + return overSized; + } + ; // returns wether the frame is reasonably wider than other frames (e.g. dual screen displays) + void setOversized(bool over) + { + overSized = over; + } + ; + void setActive(bool activate); + bool getActive() + { + return active; + } + ; + void setDummy(bool dummy); + bool isDummy() + { + return _dummy; + } + ; + bool isOnProjekt() + { + return _isOnProjekt; + } + ; + void setFrameRate(int newRate); + bool isClientOnline; + void paintCloseUp(int w, int h); + void resizeComponent(int w, int h); + void setSource(); + void setTarget(); + void setUnproject(); + void setDozent(bool isDozent); + const QPixmap* getFramePixmap(); + Frame* getFrame(); + int init_w, init_h; + +public Q_SLOTS: + virtual void delDummy(); + virtual void on_projection(); + virtual void on_unprojection(); + virtual void on_lock(); + virtual void on_unlock(); + virtual void on_message(); + virtual void on_lock_with_message(); + virtual void on_lock_all_with_message(); + virtual void on_lock_all(); + virtual void on_unlock_all(); + virtual void on_lock_invert(); + virtual void on_remoteHelp(); + virtual void on_click(); + +protected: + //virtual void paintEvent(QPaintEvent *event); + void mouseReleaseEvent ( QMouseEvent * e ); + virtual void enterEvent ( QEvent * event ); + virtual void leaveEvent ( QEvent * event ); + void mousePressEvent(QMouseEvent *event); + void mouseMoveEvent(QMouseEvent *event); + //void mouseReleaseEvent ( QMouseEvent * event ); + +private: + + Frame *_frame; + //clickableLabel *frame; + QSplitter *_split; + QGridLayout* _gL; + QLabel* _username; + QLabel* _status; + QLabel* _dozentContaimner; + QWidget* _conFrameTaskbar; + QGridLayout* _gLayout; + QHBoxLayout* _hLayoutInCfTaskbar; + + PVSClient* _myConnection; + QPixmap _clientPix; + QPixmap _clientStatus; + QPixmap _clientDozent; + int nat_height, nat_width; // native height and width of the source buffer + int cu_height, cu_width; + int prev_height, prev_width; + // uint8_t prev_buttonMask; /* bits 0-7 are buttons 1-8, 0=up, 1=down */ + int _ratio; + bool _dummy; + bool ignore_ratio, overSized, first; + bool _fullscreen, _closeup, _isOnProjekt; + + bool viewOnly, active; + rfbClient* myClient; + + QMenu *menu; + QAction *DelDummy; + QAction *lockClient ; + QAction *uLockClient ; + /*QAction *invertlockClient ; + QAction *LockAllClient ; + QAction *uLockAllClient ;*/ + QAction *msgLockAllClient ; + QAction *msgClient ; + QAction *msgLockClient ; + QAction *project ; + QAction *uproject ; + //QAction *rHelp ; + + + QPoint _clickPoint; + QPoint _previousPoint; +}; + +#endif diff --git a/src/gui/connectionList.cpp b/src/gui/connectionList.cpp new file mode 100644 index 0000000..2f9829e --- /dev/null +++ b/src/gui/connectionList.cpp @@ -0,0 +1,603 @@ +/* +# Copyright (c) 2009 - OpenSLX Project, Computer Center University of Freiburg +# +# This program is free software distributed under the GPL version 2. +# See http://openslx.org/COPYING +# +# If you have any feedback please consult http://openslx.org/feedback and +# send your suggestions, praise, or complaints to feedback@openslx.org +# +# General information about OpenSLX can be found at http://openslx.org/ +# ----------------------------------------------------------------------------- +# src/gui/connectionList.cpp +# ----------------------------------------------------------------------------- +*/ + +#include <QtGui> +#include <iostream> +#include "connectionList.h" +#include <src/gui/dialog.h> +//#include <src/gui/projectionDialog.h> +//#include "mainWindow.h" +#define COL_FULLNAME 0 +#define COL_IP 1 +#define COL_USERNAME 2 + +ConnectionList::ConnectionList(QWidget *parent): + QTableView(parent) +{ + /*Das Modelfestlegen, wo die Clientname angezeigt werden.*/ + model = new QStandardItemModel(0,3,this); //Leere Tabelle mit einer Spalte erstellen + model->setHeaderData(0, Qt::Horizontal, tr("Name")); //Spalte name definieren + model->setHeaderData(1, Qt::Horizontal, tr("IP")); //IP-column will be hide + model->setHeaderData(2, Qt::Horizontal, tr("Username")); + setModel(model); + this->setColumnHidden(1, true); + this->setColumnHidden(2, true); + + QItemSelectionModel *selectionModel = new QItemSelectionModel(model); + setSelectionModel(selectionModel); + QHeaderView *headerView = horizontalHeader(); + headerView->setStretchLastSection(true); + /*Das popup einstellen*/ + preparePopup(); + + _useUserName = true; + + setEditTriggers(QAbstractItemView::NoEditTriggers); //Die Einträge in der Tabelle werden nicht editierbar. + setSelectionMode(QAbstractItemView::ExtendedSelection); //Damit mehere Einträge selektierbar werden. + + resizeColumnToContents(0); + clientindex = 0; + isOnProjection = false; //No projection on progress now! + projSourceName = ""; //The projection source name is empty. +} + +ConnectionList::~ConnectionList() +{ +} + +void ConnectionList::preparePopup() +{ + + /*Aktion definieren*/ + /* a1 = new QAction(tr("&Remove Clients (debug)"),model); + connect(a1, SIGNAL(triggered()), this, SLOT(on_removeClient())); + a2 = new QAction(tr("&Request VNC-Window"),model); + connect(a2, SIGNAL(triggered()), this, SLOT(on_vnc_add())); + a3 = new QAction(tr("&Remove VNC-Window"),model); + connect(a3, SIGNAL(triggered()), this, SLOT(on_vnc_remove()));*/ + _lockClient = new QAction(tr("&Lock Client(s)"),model); + connect(_lockClient, SIGNAL(triggered()), this, SLOT(on_lock())); + _uLockClient = new QAction(tr("&Unlock Client(s)"),model); + connect(_uLockClient, SIGNAL(triggered()), this, SLOT(on_unlock())); + /* invertlockClient = new QAction(tr("&Invertlock Client(s)"),model); + connect(invertlockClient, SIGNAL(triggered()), this, SLOT(on_lock_invert())); + LockAllClient = new QAction(tr("&Lock all Client(s)"),model); + connect(LockAllClient, SIGNAL(triggered()), this, SLOT(on_lock_all())); + uLockAllClient = new QAction(tr("&Unlock all Client(s)"),model); + connect(uLockAllClient, SIGNAL(triggered()), this, SLOT(on_unlock_all()));*/ + _msgLockClient = new QAction(tr("&MsgLock Client(s)"),model); + connect(_msgLockClient, SIGNAL(triggered()), this, SLOT(on_lock_with_message())); + _msgLockAllClient = new QAction(tr("&MsgLock all Client(s)"),model); + connect(_msgLockAllClient, SIGNAL(triggered()), this, SLOT(on_lock_all_with_message())); + _msgClient = new QAction(tr("&Message Client(s)"),model); + connect(_msgClient, SIGNAL(triggered()), this, SLOT(on_message())); + //msgClient = createToolbarButton(tr("&Message Client(s)"), SLOT(on_message())); + _project = new QAction(tr("&Projection"),model); + connect(_project, SIGNAL(triggered()), this, SLOT(on_projection())); + _uproject = new QAction(tr("&Unprojection"),model); + connect(_uproject, SIGNAL(triggered()), this, SLOT(on_unprojection())); + /* rHelp = new QAction(tr("&Remote Help"),model); + connect(rHelp, SIGNAL(triggered()), this, SLOT(on_remoteHelp()));*/ + + /*Menü definieren*/ + _popupMenu = new QMenu(this); + + /*Aktionen in Menü aufnehmen*/ + /* menu->addAction(a1); + menu->addAction(a2); + menu->addAction(a3);*/ + _popupMenu->addAction(_lockClient); + _popupMenu->addAction(_uLockClient); + /* menu->addAction(invertlockClient); + menu->addAction(LockAllClient); + menu->addAction(uLockAllClient);*/ + _popupMenu->addAction(_msgLockClient); + _popupMenu->addAction(_msgLockAllClient); + _popupMenu->addAction(_msgClient); + _popupMenu->addAction(_project); + _popupMenu->addAction(_uproject); + // menu->addAction(rHelp); + +} + +QAction* ConnectionList::createToolbarButton(const QString &name, const char *slot) +{ + QAction *action = new QAction(name, model); + connect(action, SIGNAL(triggered()), this, slot); + _popupMenu->addAction(action); + + return action; +} + +void ConnectionList::mouseReleaseEvent(QMouseEvent * e ) +{ + // setCurrentIndex ( currentIndex () ); + if (e->button() == Qt::RightButton) + { + if (model->rowCount(QModelIndex()) > 0) + foreach (QAction *a, _popupMenu->actions()) + { + a->setDisabled(false); + } + else + foreach (QAction *a, _popupMenu->actions()) + { + a->setDisabled(true); + } + _popupMenu->exec(QCursor::pos()); + } +} + +void ConnectionList::onAddClient(PVSClient* newConnection) +{ + if (newConnection) + { + //clientindex = model->rowCount(QModelIndex())+1; + model->insertRow(clientindex, QModelIndex()); + //QString uname = newConnection->getPVSClientConnection()->getNameUser(); + QString uname = newConnection->getLoginName(); + if (_useUserName) + { + QString username = newConnection->getUserName(); + QString ip = newConnection->getIp(); + model->setData(model->index(clientindex, COL_FULLNAME, QModelIndex()),username); + model->setData(model->index(clientindex, COL_IP, QModelIndex()),ip); + model->setData(model->index(clientindex, COL_USERNAME, QModelIndex()),uname); + newConnection->getConnectionFrame()->setTaskbarTitle(ip); + addClientToList(username); + } + else + { + QString desktopname = QString(newConnection->getDesktopName().toUtf8().data()); + QString ip = newConnection->getIp(); + model->setData(model->index(clientindex, COL_FULLNAME, QModelIndex()),desktopname); + model->setData(model->index(clientindex, COL_IP, QModelIndex()),ip); + model->setData(model->index(clientindex, COL_USERNAME, QModelIndex()),uname); + } + setCurrentIndex(model->index(clientindex, 0)); + on_vnc_add(); // triggert the automatic vnc request! + setCurrentIndex(model->index(-1, 0)); + newConnection->setClientindex(clientindex); + clientindex++; + } +} + +void ConnectionList::onRemoveClient(PVSClient* newCon) +{ + if (newCon && model->rowCount(QModelIndex()) > 0) + { + QString host = newCon->getIp(); + for (int i=0; i<model->rowCount(QModelIndex()); i++) + { + if (model->index(i, 1, QModelIndex()).data(Qt::DisplayRole).toString() + .compare(host) == 0) + { + removeClientToList(model->index(i, 1, QModelIndex()).data(Qt::DisplayRole).toString()); + model->removeRow(i, QModelIndex()); + clientindex--; + break; + } + } + /* + * We have to check, if this disconnected client is involved in a projection process. + * If true, we have to unproject it, this will unproject the others clients that becomme + * the projection. + */ + if (targetList.contains(host) || sourceList.contains(host)) + unproject(host); + + + } +} + +void ConnectionList::addClientToList(QString clientname) +{ + if (!_clientNames.contains(clientname)) + _clientNames.append(clientname); +} + +void ConnectionList::removeClientToList(QString clientname) +{ + if (_clientNames.contains(clientname)) + { + _clientNames.removeOne(clientname); + } +} + +void ConnectionList::onUpdateClient(PVSClient* newConnection) +{ + + if (model->rowCount(QModelIndex()) > 0) + { + for (int i=0; i<model->rowCount(QModelIndex()); i++) + { + if (model->index(i, 1, QModelIndex()).data(Qt::DisplayRole).toString() + .compare(newConnection->getIp()) == 0) + { + if (_useUserName) + { + newConnection->getConnectionFrame()->setTheTitle(newConnection->getUserName()); + model->setData(model->index(i, COL_FULLNAME, QModelIndex()),newConnection->getUserName()); + } + else + { + newConnection->getConnectionFrame()->setTheTitle(newConnection->getDesktopName()); + model->setData(model->index(i, COL_FULLNAME, QModelIndex()),newConnection->getDesktopName()); + } + break; + } + } + } + else + { + // something went awfully wrong! + } +} + +bool ConnectionList::useUserName() +{ + return _useUserName; +} + +bool ConnectionList::useUserName(bool use) +{ + + if (use != _useUserName) + { + _useUserName = use; + } + return useUserName(); +} + +void ConnectionList::on_vnc_add() +{ + MainWindow::getConnectionWindow()->addVNC(); +} + +void ConnectionList::on_vnc_remove() +{ + MainWindow::getConnectionWindow()->removeVNC(); +} + +void ConnectionList::unproject(QString source) +{ + if (sourceList.contains(source)) + { + QList<QString> target; + if (sourceMap.contains(source)) + { + QString item; + foreach (item, sourceMap.value(source)) + { + MainWindow::getConnectionWindow()->unprojectStations(item); //Nur target must be unproject + targetList.removeOne(item); + } + sourceMap.take(source); + } + MainWindow::getConnectionWindow()->unprojectStations(source); //the source schould be too unprojected. + sourceList.removeOne(source); + } + else + { + MainWindow::getConnectionWindow()->unprojectStations(source); //unproject a target + targetList.removeOne(source); + } + /*if (targetList.size() == 1) + targetList.clear();*/ +} + +void ConnectionList::on_projection() +{ + if(model->rowCount(QModelIndex())>1) + { + std::list<QString>* cuList = getSelectedClients(); + + if (targetList.size() == (model->rowCount(QModelIndex())-1)) + { + QString message = QString(tr("No Target is available for a projection!\nPerform an unprojection to get a target.")); + QMessageBox::information(this, "PVS", message); + } + else if(cuList->size() == 1) + { + QString source = cuList->front(); + if (targetList.contains(source)) + { + QString message = QString(tr("This source is already in a projection process involved.\n You can perform a unprojection on it to get it free.")); + QMessageBox::information(this, "PVS", message); + } + else + { + ProjectionDialog projDialog; + int result = projDialog.exec(); + + if(result == 1) + { + if(projectList.size()>0) + { + QList<QString> list; + QString item; + foreach(item, projectList) + { + list.append(item); + } + sourceMap.insert(projSourceName, list); + if (!sourceList.contains(source)) + sourceList.append(source); + MainWindow::getConnectionWindow()->projectStations(projSourceName); + } + else + ConsoleLog writeError( "Strange...the selected target aren't be transmitted to the MainWindow."); + } + else + ; // :( + } + } + else if(cuList->size() > 1) + { + QString message = QString(tr("To perform a projection you have to select only one source in a list with more than one index!")); + QMessageBox::information(this, "PVS", message); + } + } + else + { + QString message = QString(tr("To perform a projection you have to select only one source in a list with more than one index!")); + QMessageBox::information(this, "PVS", message); + } +} + +void ConnectionList::on_unprojection() +{ + if(model->rowCount(QModelIndex())>1) + { + std::list<QString>* cuList = getSelectedClients(); + if(cuList->size() == 1) + { + QString source = cuList->front(); + unproject(source); + } + else + { + QString message = QString(tr("An unprojection is only possible on a selected source that is involved in a projection process, in a list with more than one index!")); + QMessageBox::information(this, "PVS", message); + } + } + else + { + QString message = QString(tr("An unprojection is only possible on a selected source that is involved in a projection process, in a list with more than one index!")); + QMessageBox::information(this, "PVS", message); + } +} + +void ConnectionList::on_remoteHelp() +{ + if(model->rowCount(QModelIndex())>1) + { + std::list<QString>* cuList = getSelectedClients(); + + if (targetList.size() == (model->rowCount(QModelIndex())-1)) + { + QString message = QString(tr("No Target is available for remote Help!\nPerform an unprojection or remove remote help to get a target.")); + QMessageBox::information(this, "PVS", message); + } + else if(cuList->size() == 1) + { + QString source = cuList->front(); + if (targetList.contains(source)) + { + QString message = QString(tr("This source is already in a projection or remote Help process involved.\n You can perform a unprojection or remove remote Help on it to get it free.")); + QMessageBox::information(this, "PVS", message); + } + else + { + ProjectionDialog projDialog; + int result = projDialog.exec(); + + if(result == 1) + { + if(projectList.size() > 0 && projectList.size() < 2) + { + QList<QString> list; + QString item; + foreach(item, projectList) + { + list.append(item); + } + sourceMap.insert(projSourceName, list); + MainWindow::getConnectionWindow()->remoteHelp(projSourceName); + } + else + ConsoleLog writeError( "Strange...the selected targets aren't be transmitted to the MainWindow."); + } + else + ; // :( + } + } + } + else + { + QString message = QString(tr("To perform a projection you have to select only one source in a list with more than one index!")); + QMessageBox::information(this, "PVS", message); + } +} + +void ConnectionList::on_lock() +{ + MainWindow::getConnectionWindow()->lockStations(); +} + +void ConnectionList::on_unlock() +{ + MainWindow::getConnectionWindow()->unlockStations(); +} + +void ConnectionList::on_message() +{ + Dialog msgD; + QString myString = NULL; + int result = msgD.exec(); + + if (result == 1) + { + myString = MainWindow::getWindow()->getMsgDialog(); + if(!myString.isEmpty()) + MainWindow::getConnectionWindow()->messageStations("BROADCAST",myString); + } + +} + +void ConnectionList::on_lock_with_message() +{ + Dialog msgD; + QString myString = NULL; + int result = msgD.exec(); + + if(result == 1) + { + myString = MainWindow::getWindow()->getMsgDialog(); + if(!myString.isEmpty()) + { + MainWindow::getConnectionWindow()->lockStationsWithMessage(myString); + } + } +} + +void ConnectionList::on_lock_all_with_message() +{ + QString myString = NULL; + Dialog msgD; + int result = msgD.exec(); + + if(result == 1) + { + myString = MainWindow::getWindow()->getMsgDialog(); + if(!myString.isEmpty()) + { + MainWindow::getConnectionWindow()->lockAllStationsWithMessage(myString); + } + } +} + + +void ConnectionList::on_lock_all() +{ + MainWindow::getConnectionWindow()->lockAllStations(); +} +void ConnectionList::on_unlock_all() +{ + MainWindow::getConnectionWindow()->unlockAllStations(); +} + +void ConnectionList::on_unproject_all() +{ + MainWindow::getConnectionWindow()->unprojectAllStations(); +} + + +void ConnectionList::on_lock_invert() +{ + MainWindow::getConnectionWindow()->lockInvertStations(); +} + + +void ConnectionList::on_removeClient() +{ + QTableView *temp = static_cast<QTableView*>(this); + QItemSelectionModel *selectionModel = temp->selectionModel(); + + QModelIndexList indexes = selectionModel->selectedRows(); + removeClient(indexes); +} + +void ConnectionList::removeClient(QModelIndexList indexes) +{ + + QModelIndex index; + + foreach(index, indexes) + { + int row = currentIndex().row(); + QString current = model->index(row, 0).data(Qt::DisplayRole).toString(); + removeClientToList(current); + model->removeRow(row, QModelIndex()); + } +} + +std::list<QString>* ConnectionList::getSelectedClients(bool isClickOnWindow) +{ + + std::list<QString>* currentList = new std::list<QString>; + + + QTableView *temp = static_cast<QTableView*>(this); + QItemSelectionModel *selectionModel = temp->selectionModel(); + QModelIndexList indexes = selectionModel->selectedIndexes(); + QModelIndex index; + if (indexes.size() > 0) + { + foreach (index, indexes) + { + QString current = model->index(index.row(), 1).data(Qt::DisplayRole).toString(); + currentList->push_back(current); + } + } + + return currentList; +} + +void ConnectionList::setProjectProporties(QString source) +{ + projSourceName = source; // The source for this projection + sourceList.append(source); // The list for all source in pvsmgr +} + +QList<QString> ConnectionList::getTargetToDisplay(QString source) +{ + displayList.clear(); + projectList.clear(); + + for (int i=0; i<model->rowCount(QModelIndex()); i++) + { + QString item = model->index(i, 1, QModelIndex()).data(Qt::DisplayRole).toString(); + if (item.compare(source) != 0 && !targetList.contains(item) && !sourceList.contains(item)) + { + displayList.append(item); + } + } + + return displayList; + +} + +void ConnectionList::addTargetToProjectList(QString name) +{ + if (!targetList.contains(name)) + { + projectList.append(name); + targetList .append(name); + } +} + +QList<QString> ConnectionList::getTargetForTheProject(QString source) +{ + QList<QString> target; + if(sourceMap.contains(source)){ + target = sourceMap.value(source); + } + return target; +} + + + +bool ConnectionList::isOnProjection = false; diff --git a/src/gui/connectionList.h b/src/gui/connectionList.h new file mode 100644 index 0000000..50d8924 --- /dev/null +++ b/src/gui/connectionList.h @@ -0,0 +1,134 @@ +#ifndef _CONNECTIONLIST_H_ +#define _CONNECTIONLIST_H_ + +#include <QtGui> +#include <src/core/pvsClient.h> +#include <QTableView> +#include <QObject> +#include <QMap> +#include <QItemSelection> +#include <src/gui/mainWindow.h> +#include <src/gui/dialog.h> +#include <src/gui/projectionDialog.h> + +class PVSClient; + +//class QAbstractItemView; + + +/** + * The Sidebar showing the connected servers + * also used to determine to which connection + * contextual actions should be applied + */ + +class QVBoxLayout; +class QSortFilterProxyModel; +class QAbstractItemModel; +class QAbstractItemView; +class QItemSelectionModel; +class MainWindow; +class Dialog; +class ProjectionDialog; +//class ConnectionList; + +class ConnectionList: public QTableView +{ + Q_OBJECT + +public: + ConnectionList(QWidget *parent=0); + ~ ConnectionList(); + + void onAddClient(PVSClient* newConnection); // called if a new connection is added + void onUpdateClient(PVSClient* newConnection); // update the username*/ + void addClientToList(QString clientname); + void onRemoveClient(PVSClient* newCon); + void removeClientToList(QString clientname); + QList<QString> getClientist() + { + return _clientNames; + }; + // void updateAllClients(); + bool useUserName(); + bool useUserName(bool use); + QList<QString> projectList; + QList<QString> targetList; + QList<QString> displayList; + QList<QString> sourceList; + QMap<QString, QList<QString> > sourceMap; + QString projSourceName; + std::list<QString>* getSelectedClients(bool isClickOnWindow=false); // returns the currently selected clients + //void setTargetToDisplay(QString source); // return the list for the projection + void setProjectProporties(QString source); + QList<QString> getTargetToDisplay(QString source); + void addTargetToProjectList(QString name); + QList<QString> getTargetForTheProject(QString source); + QList<QString>getTargetToProject() + { + return projectList; + } + // void removeFromList(PVSConnection* newConnection); // called if a connection is removed + // void setMultipleSelection(bool on); + + QAbstractItemModel *model; + +private: + QItemSelectionModel *_selectionModel; + QList<QString> _clientNames; + + int clientindex; //Index of clientname in the list. + + static bool isOnProjection; + + QMenu *_popupMenu; // in der PopupMenu + /*Die Aktionen in der PopupMenu*/ + /* QAction *a1 ; + QAction *a2 ; + QAction *a3 ;*/ + QAction *_lockClient ; + QAction *_uLockClient ; + /*QAction *invertlockClient ; + QAction *LockAllClient ; + QAction *uLockAllClient ;*/ + QAction *_msgLockClient ; + QAction *_msgLockAllClient ; + QAction *_msgClient ; + QAction *_project ; + QAction *_uproject ; + // QAction *rHelp ; + + void preparePopup(); + void unproject(QString source); + QAction* createToolbarButton(const QString &name, const char *slot); + +public slots: + //Signal handlers: + + virtual void on_projection(); + virtual void on_unprojection(); + virtual void on_lock(); + virtual void on_unlock(); + virtual void on_message(); + virtual void on_lock_with_message(); + virtual void on_lock_all_with_message(); + virtual void on_lock_all(); + virtual void on_unlock_all(); + virtual void on_unproject_all(); + virtual void on_lock_invert(); + virtual void on_remoteHelp(); + void on_vnc_add(); + void on_vnc_remove(); + void on_removeClient(); + void removeClient(QModelIndexList indexes); + /*virtual void on_menu_file_remove_connection();*/ + +signals: + void selectionChanged (const QItemSelection &selected); + +protected: + bool _useUserName; + virtual void mouseReleaseEvent (QMouseEvent * e ); +}; + +#endif diff --git a/src/gui/connectionWindow.cpp b/src/gui/connectionWindow.cpp new file mode 100644 index 0000000..cf51051 --- /dev/null +++ b/src/gui/connectionWindow.cpp @@ -0,0 +1,763 @@ +/* + # Copyright (c) 2009 - OpenSLX Project, Computer Center University of Freiburg + # + # This program is free software distributed under the GPL version 2. + # See http://openslx.org/COPYING + # + # If you have any feedback please consult http://openslx.org/feedback and + # send your suggestions, praise, or complaints to feedback@openslx.org + # + # General information about OpenSLX can be found at http://openslx.org/ + # ----------------------------------------------------------------------------- + # src/gui/connectionWindow.cpp + # ----------------------------------------------------------------------------- + */ + +#include "connectionWindow.h" +#include <src/core/pvsConnectionManager.h> +#include <src/gui/mainWindow.h> + +ConnectionWindow::ConnectionWindow(QWidget *parent) : + QWidget(parent) { + + //initialize the position for the frame in the clientView + posX = 4; + posY = 4; + + _closeupFrame = NULL; + hasDozent = false; // at the begin we don't have a dozent machine + + QPalette newPalette = palette(); + newPalette.setColor(QPalette::Window, Qt::white); + setPalette(newPalette); + + newDummy = new QAction(tr("&Add a dummy..."), this); // set a dummy + connect(newDummy, SIGNAL(triggered()), this, SLOT(addDummy())); + + menu = new QMenu(this); + menu->addAction(newDummy); + + setAcceptDrops(true); //drag&drop should be enabled +} + +ConnectionWindow::~ConnectionWindow() { + // +} + +void ConnectionWindow::addFrame(ConnectionFrame *cF) { + bool found = false; + foreach (ConnectionFrame* cFr, AllFrameOnWindow) + { + if (QString::compare(cF->getTaskbarTitle(), cFr->getTaskbarTitle(), Qt::CaseInsensitive) == 0) + { + QPoint cuP = currentPosition(cFr); + cF->move(cuP); + AllFrameOnWindow.append(cF); + AllFrameOnWindow.removeOne(cFr); //we don't need this dummy any more + cFr->deleteLater(); + found = true; + return; + } + } + + /* If the Frame don't belong to the profile + * we have to move it at the default position for now. + * The user can move this later to his favorite position. + */ + if (!found) + { + foreach (clientLocation cur, ClientLocationList) + { + if (QString::compare(cF->getTaskbarTitle(), cur.first, Qt::CaseInsensitive) == 0) + { + cF->move(cur.second); + found = true; + return; + } + } + } + + if (!found) + cF->move(10, 10); +} + +void ConnectionWindow::addFrameBySettings(QString client, QPoint pos) { + clientLocation cur(client, pos); + ClientLocationList.append(cur); +} + +void ConnectionWindow::showFrameFromSettings() { + foreach (clientLocation cur, ClientLocationList) + { + ConnectionFrame* dummy = new ConnectionFrame( + MainWindow::getConnectionWindow()); + AllFrameOnWindow.append(dummy); + dummy->setTheTitle("[No name]"); + dummy->setTaskbarTitle(cur.first); + dummy->setDummy(true); + dummy->move(cur.second); + } +} + +void ConnectionWindow::addDummy() { //function to add a dummy + ConnectionFrame* dummy = new ConnectionFrame( + MainWindow::getConnectionWindow()); + dummy->setTheTitle("[No name]"); + dummy->setTaskbarTitle("[0.0.0.0]"); + QPoint p = QPoint(10, 10);//the default move position, when created a dummy screen + AllFrameOnWindow.append(dummy); + clientLocation cur("[No name]", p); + ClientLocationList.append(cur); + dummy->setDummy(true); + dummy->move(p); + dummy->setStyleSheet(QString::fromUtf8( + "background-color: rgb(150, 150, 168);")); +} + +void ConnectionWindow::mousePressEvent(QMouseEvent *event) { //catch the mouse press event + if (event->button() == Qt::RightButton) + menu->exec(QCursor::pos()); +} + +QPoint ConnectionWindow::currentPosition(ConnectionFrame* cF) { + QPoint pos = QPoint(10, 10); + clientLocation cur; + foreach (cur, ClientLocationList) + { + if (QString::compare(cF->getTaskbarTitle(), cur.first, Qt::CaseInsensitive) == 0) + return cur.second; + } + return pos; +} + +int ConnectionWindow::itemAt(ConnectionFrame* cf) +{ + for (int i = AllFrameOnWindow.size() - 1; i >= 0; --i) + { + ConnectionFrame* item = AllFrameOnWindow.at(i); + if (cf->pos().x() == item->pos().x() && cf->pos().y() == item->pos().y()) + return i; + } + return -1; +} + +void ConnectionWindow::removeFromList(ConnectionFrame* cF) { + //dummyList.removeOne(cF); + if(AllFrameOnWindow.contains(cF)) + AllFrameOnWindow.removeOne(cF); + cF->deleteLater(); +} + +void ConnectionWindow::onChangeConnections() { + + //clear the view + if (!frameList.empty()) { + ConnectionFrame* tmpIt; + foreach (tmpIt, frameList) + { + if (tmpIt != currentSingleFrame) + tmpIt->setActive(false); + tmpIt->hide(); + } + } + +} + +bool ConnectionWindow::projectStations(QString sname) { + QString password, hostname; + int port, quality; + ConsoleLog writeLine(QString("Projecting from: ").append(sname)); + //TODO add method parameter for this + quality = 0; + + QList<QString> projectList = + MainWindow::getConnectionList()->getTargetForTheProject(sname); + + if (!projectList.isEmpty()) { + PVSClient* tmpSrcConnection = + PVSConnectionManager::getManager()->getClientFromIp(sname); + if (tmpSrcConnection) { + if (!tmpSrcConnection->getVNCAllowed()) { + ConsoleLog writeError(QString("VNC is not allowed on Projection Source: ").append(sname)); + ConsoleLog writeError(QString("Trying to start VNC-Server on Client: ").append(sname)); + tmpSrcConnection->setProject(true); + return false; + } + password = tmpSrcConnection->getPassword(); + port = tmpSrcConnection->getPort(); + hostname = sname; + tmpSrcConnection->getConnectionFrame()->setSource(); + ConsoleLog writeError (QString("port: ").append(int2String(port))); + ConsoleLog writeError (QString("passwort: ").append(password)); + ConsoleLog writeError (QString("pr-sourcename: ").append(sname)); + + } + else + { + return false; + } + + ConsoleLog writeError (QString("port as int: ").append(port)); + ConsoleLog writeError (QString("port as String: ").append(int2String(port))); + + QString item; + foreach (item, projectList) + { + PVSClient* tmpConnection = PVSConnectionManager::getManager()->getClientFromIp(item); + if (tmpConnection) + { + ConsoleLog writeError (QString("sending vnc data to: ").append(tmpConnection->getIp())); + tmpConnection->sendMessage(PVSCOMMAND,"PROJECT", hostname + " " + int2String(port) + " " + password + " " + int2String(quality)); + tmpConnection->getConnectionFrame()->setTarget(); + } + else + { + // scream in agony + } + } + } + return true; +} + +bool ConnectionWindow::remoteHelp(QString sname) { + + //TODO Finish this... + QString password, hostname; + int port; + + PVSClient* tmpSrcConnection = + PVSConnectionManager::getManager()->getClientFromIp(sname); + QList<QString> projectList = + MainWindow::getConnectionList()->getTargetForTheProject(sname); + if (tmpSrcConnection) { + if (!tmpSrcConnection->getVNCAllowed()) { + tmpSrcConnection->requestVNCConnect(); + tmpSrcConnection->setProject(true); + return false; + } + password = tmpSrcConnection->getRWPassword(); + port = tmpSrcConnection->getPort(); + hostname = sname; + tmpSrcConnection->getConnectionFrame()->setSource(); + } else { + return false; + } + + QString item; + foreach (item, projectList) + { + PVSClient + * tmpConnection = + PVSConnectionManager::getManager()->getClientFromIp(item); + if (tmpConnection) { + ConsoleLog writeError(QString("sending vnc data to: ").append( + tmpConnection->getIp())); + tmpConnection->sendMessage(PVSCOMMAND, "PROJECT", hostname + + " " + int2String(port) + " " + password); + tmpConnection->getConnectionFrame()->setTarget(); + } else { + // scream in agony + } + } + return true; + +} + + + +bool ConnectionWindow::lockStations() { + if (std::list<QString>* lockList = MainWindow::getConnectionList()->getSelectedClients()) { + if (!lockList->empty()) { + for (std::list<QString>::iterator tmpIt = lockList->begin(); tmpIt + != lockList->end(); tmpIt++) { + PVSClient + * tmpConnection = + PVSConnectionManager::getManager()->getClientFromIp( + (*tmpIt).toUtf8().data()); + if (tmpConnection->getConnectionFrame()->getFrame()) + { + // we don't want to lock the dozent machine + if (tmpConnection && !tmpConnection->getConnectionFrame()->getFrame()->isDozent() + && !tmpConnection->getConnectionFrame()->isOnProjekt()) + lockStation(tmpConnection); + else { + // scream in agony + } + } + } + } + delete lockList; + } + return true; +} + +void ConnectionWindow::lockStation(PVSClient* pvsCon) { + if (pvsCon->getVNCConnection()) + { + pvsCon->getConnectionFrame()->getFrame()->setLockStatus(true); + // we call the update to force Qt to paint the lockicon on the frame + pvsCon->getConnectionFrame()->getFrame()->update(); + pvsCon->sendMessage(PVSCOMMAND, "LOCKSTATION", ""); + } +} + +bool ConnectionWindow::unlockStations() { + if (std::list<QString>* unlockList = MainWindow::getConnectionList()->getSelectedClients()) { + if (!unlockList->empty()) { + for (std::list<QString>::iterator tmpIt = unlockList->begin(); tmpIt + != unlockList->end(); tmpIt++) { + PVSClient + * tmpConnection = + PVSConnectionManager::getManager()->getClientFromIp( + (*tmpIt).toUtf8().data()); + if (tmpConnection && tmpConnection->getConnectionFrame()->getFrame() && + tmpConnection->getVNCConnection()) { + tmpConnection->getConnectionFrame()->getFrame()->setLockStatus(false); + tmpConnection->getConnectionFrame()->getFrame()->update(); // we call the update to force Qt to paint the lock on the frame + tmpConnection->sendMessage(PVSCOMMAND, "UNLOCKSTATION", ""); + } else { + // scream in agony + } + } + } + delete unlockList; + } + return true; +} + +void ConnectionWindow::unlockStation(PVSClient* pvsCon) { + if (pvsCon->getVNCConnection()) + { + pvsCon->getConnectionFrame()->getFrame()->setLockStatus(false); + // we call the update to force Qt to paint the lockicon on the frame + pvsCon->getConnectionFrame()->getFrame()->update(); + pvsCon->sendMessage(PVSCOMMAND, "UNLOCKSTATION", ""); + } +} + +bool ConnectionWindow::lockAllStations() +{ + if (!hasDozent) + { + QString message = QString(tr("You have to set a Superclient-machine before performing this action.")); + QMessageBox::information(this, "PVS", message); + return false; + } + std::list<PVSClient*> listAll = + PVSConnectionManager::getManager()->getConnections(); + for (std::list<PVSClient*>::iterator it = listAll.begin(); it + != listAll.end(); it++) + { + if (*it == NULL || (*it)->getConnectionFrame() == NULL) continue; + // we don't want to lock the superclient machine + if ((*it)->getConnectionFrame()->getFrame() && + !(*it)->getConnectionFrame()->getFrame()->isDozent() && + (*it)->getVNCConnection()) + (*it)->sendMessage(PVSCOMMAND, "LOCKSTATION", ""); + else if (!(*it)->getConnectionFrame()->getFrame()) + ConsoleLog writeError(QString("The Frame connection from client: "). + append((*it)->getConnectionFrame()->getTaskbarTitle()). + append(QString(" is corrupted. Reconned the client it again."))); + } + return true; +} + +bool ConnectionWindow::unlockAllStations() { + std::list<PVSClient*> listAll = + PVSConnectionManager::getManager()->getConnections(); + for (std::list<PVSClient*>::iterator it = listAll.begin(); it + != listAll.end(); it++) + { + if ((*it)->getVNCConnection()) + { + (*it)->getConnectionFrame()->getFrame()->setLockStatus(false); + (*it)->getConnectionFrame()->getFrame()->update(); // we call the update to force Qt to repaint the frame + (*it)->sendMessage(PVSCOMMAND, "UNLOCKSTATION", ""); + } + // otherwise this will get scattered all over the place + } + return true; +} + +bool ConnectionWindow::unprojectStations(QString sname) { + PVSClient* tmpConnection = + PVSConnectionManager::getManager()->getClientFromIp(sname); + if (tmpConnection && tmpConnection->getVNCConnection()) { + tmpConnection->sendMessage(PVSCOMMAND, "UNPROJECT", ""); + tmpConnection->getConnectionFrame()->setUnproject(); + } else { + // scream in agony + } + + return true; +} + +bool ConnectionWindow::unprojectAllStations() { + std::list<PVSClient*> listAll = + PVSConnectionManager::getManager()->getConnections(); + for (std::list<PVSClient*>::iterator it = listAll.begin(); it + != listAll.end(); it++) + { + if ((*it)->getVNCConnection()) + { + (*it)->sendMessage(PVSCOMMAND, "UNPROJECT", ""); + (*it)->getConnectionFrame()->setUnproject(); + } + } + return true; +} + +bool ConnectionWindow::lockInvertStations() { + // ok, this method is highly imperformant i guess + // we're going thru all existing connections, and if they dont equal one of the selected (another loop) + // we lock them... + if (std::list<QString>* lockList = MainWindow::getConnectionList()->getSelectedClients()) { + std::list<PVSClient*> listAll = + PVSConnectionManager::getManager()->getConnections(); + bool skip = false; + for (std::list<PVSClient*>::iterator it = listAll.begin(); it + != listAll.end(); it++) { + if (!lockList->empty()) { + for (std::list<QString>::iterator tmpIt = lockList->begin(); tmpIt + != lockList->end(); tmpIt++) { + PVSClient + * tmpConnection = + PVSConnectionManager::getManager()->getClientFromIp( + (*tmpIt).toUtf8().data()); + if (tmpConnection == (*it)) { + skip = true; + break; + } + } + } + if (!skip) + (*it)->sendMessage(PVSCOMMAND, "LOCKSTATION", "");//TODO define some standard to grab this from... + // otherwise this will get scattered all over the place + } + delete lockList; + } + return true; +} + +void ConnectionWindow::lockInvertStation(PVSClient* pvsCon) { + pvsCon->sendMessage(PVSCOMMAND, "LOCKSTATION", ""); +} + +bool ConnectionWindow::messageStations(QString ident, QString message) { + if (std::list<QString>* messageList = MainWindow::getConnectionList()->getSelectedClients()) { + if (!messageList->empty()) { + for (std::list<QString>::iterator tmpIt = messageList->begin(); tmpIt + != messageList->end(); tmpIt++) { + PVSClient + * tmpConnection = + PVSConnectionManager::getManager()->getClientFromIp( + (*tmpIt).toUtf8().data()); + // we don't want to lock the dozent machine + if (tmpConnection && tmpConnection->getConnectionFrame()->getFrame() && + !tmpConnection->getConnectionFrame()->getFrame()->isDozent()) + { + messageStation(ident, message, tmpConnection); + } else { + // scream in agony + } + } + } + delete messageList; + } + return true; +} + +void ConnectionWindow::messageStation(QString ident, QString message, + PVSClient* pvsCon) { + pvsCon->sendMessage(PVSMESSAGE, ident, message); +} + +bool ConnectionWindow::lockStationsWithMessage(QString message) +{ + if (!hasDozent) + { + QString message = QString(tr("You have to set a Superclient-machine before performing this action.")); + QMessageBox::information(this, "PVS", message); + return false; + } + if (std::list<QString>* messageList = MainWindow::getConnectionList()->getSelectedClients()) { + if (!messageList->empty()) { + for (std::list<QString>::iterator tmpIt = messageList->begin(); tmpIt + != messageList->end(); tmpIt++) { + PVSClient + * tmpConnection = + PVSConnectionManager::getManager()->getClientFromIp( + (*tmpIt).toUtf8().data()); + // we don't want to lock the dozent machine + if (tmpConnection && !tmpConnection->getConnectionFrame()->getFrame()->isDozent()) + { + lockStationsWithMessage(message, tmpConnection); + + } else { + // scream in agony + } + } + } + delete messageList; + } + return true; +} + +void ConnectionWindow::lockStationsWithMessage(QString message, + PVSClient* pvsCon) +{ + pvsCon->sendMessage(PVSCOMMAND, "LOCKSTATION", message); +} + +bool ConnectionWindow::lockAllStationsWithMessage(QString message) { + + if (!hasDozent) + { + QString message = QString(tr("You have to set a Superclient-machine before performing this action.")); + QMessageBox::information(this, "PVS", message); + return false; + } + std::list<PVSClient*> listAll = + PVSConnectionManager::getManager()->getConnections(); + for (std::list<PVSClient*>::iterator it = listAll.begin(); it + != listAll.end(); it++) + { + if ((*it) && !(*it)->getConnectionFrame()->getFrame()->isDozent()) // we don't want to lock the dozent machine + (*it)->sendMessage(PVSCOMMAND, "LOCKSTATION", message); + } + return true; +} + +void ConnectionWindow::addConnection(PVSClient* newCon) { + if (newCon) { + // QList<QString> ClientList= MainWindow::getConnectionList()->getClientist(); + + //Check if this client already in the list, before we add it. + //We don't want to have two clients with the same names. + //We comments it for test. + /*if (!ClientList.contains(newCon->getHostString())) + {*/ + onVNCAdd(newCon); + MainWindow::getConnectionList()->onAddClient(newCon); + /* + * We check if the pvsmgr run a lockAll on the already connected + * clients. If yes, we lock the new conencted client too. + */ + if (MainWindow::getWindow()->isLockAllStatus() && newCon->getConnectionFrame()->getFrame()) + { + newCon->getConnectionFrame()->getFrame()->setLockStatus(true); + // we call the update to force Qt to paint the lockicon on the frame + newCon->getConnectionFrame()->getFrame()->update(); + lockStation(newCon); + } + //} + } +} + +void ConnectionWindow::removeConnection(PVSClient* newCon) { + if (newCon == NULL) return; + ConnectionFrame* frame = newCon->getConnectionFrame(); + if (frame != NULL) + { + removeFromList(frame); + //frame->deleteLater(); + } + MainWindow::getConnectionList()->onRemoveClient(newCon); +} + +void ConnectionWindow::onView() { + if (std::list<QString>* selectedClient = MainWindow::getConnectionList()->getSelectedClients()) { + if (!selectedClient->empty()) { + if (selectedClient->size() == 1) + ;//TODO + + } + } +} + +void ConnectionWindow::updateConnection(PVSClient* newCon) { + if (newCon) { + MainWindow::getConnectionList()->onUpdateClient(newCon); + } +} + +void ConnectionWindow::addVNC() { + if (std::list<QString>* vncAddList = MainWindow::getConnectionList()->getSelectedClients()) { + if (!vncAddList->empty()) { + for (std::list<QString>::iterator tmpIt = vncAddList->begin(); tmpIt + != vncAddList->end(); tmpIt++) { + PVSClient + * tmpConnection = + PVSConnectionManager::getManager()->getClientFromIp( + (*tmpIt).toUtf8().data()); + if (tmpConnection) { + tmpConnection->requestVNCConnect(); + } else { + // scream in agony + } + } + } + } +} + +void ConnectionWindow::onVNCAdd(PVSClient* newCon) { + + if (!newCon->getConnectionFrame()) { + ConnectionFrame* newFrame = newConFrame(newCon); + newFrame->setConnection(newCon); + newFrame->setTaskbarTitle(newFrame->getTaskbarTitle()); + newFrame->setDummy(false); + newFrame->setFrameRate(500); + addFrame(newFrame); + if (!frameList.contains(newFrame)) + frameList.append(newFrame); + if (!AllFrameOnWindow.contains(newFrame)) + AllFrameOnWindow.append(newFrame); + newFrame->show(); + } else + // now we have already a pvsconnection, we should set the existing vncconnection to it + newCon->getConnectionFrame()->setConnection(newCon); + // addFrame(newFrame); +} + +void ConnectionWindow::removeVNC() { + std::list<QString>* vncRemoveList = + MainWindow::getConnectionList()->getSelectedClients(); + + // if(!vncRemoveList->empty()) + // { + for (std::list<QString>::iterator tmpIt = vncRemoveList->begin(); tmpIt + != vncRemoveList->end(); tmpIt++) { + PVSClient* tmpConnection = + PVSConnectionManager::getManager()->getClientFromIp( + (*tmpIt).toUtf8().data()); + if (tmpConnection) { + if (tmpConnection->getVNCConnection()) { + ConnectionFrame* tmpFrame = + tmpConnection->getVNCConnection()->getFrame(); + if (tmpFrame) { + frameList.removeOne(tmpFrame); + onChangeConnections(); + tmpFrame->setConnection(NULL); + tmpFrame->initFrame(); + //delete tmpFrame; + } + tmpConnection->shutDownVNC(); + } + } else { + // scream in agony + } + } + // + // } +} + +void ConnectionWindow::onRemoveConnection() { + if (std::list<QString>* removeList = MainWindow::getConnectionList()->getSelectedClients()) { + if (!removeList->empty()) { + for (std::list<QString>::iterator tmpIt = removeList->begin(); tmpIt + != removeList->end(); tmpIt++) { + PVSClient + * tmpConnection = + PVSConnectionManager::getManager()->getClientFromIp( + (*tmpIt).toUtf8().data()); + if (tmpConnection) { + // removal should start from the CM, so hes linking back to the ConnectionWindow::onConnectionRemoved() method + // to finish the removal procedure here + PVSConnectionManager::getManager()->removeConnection( + tmpConnection); + } else { + // scream in agony + } + } + // onChangeConnections(); + } + delete removeList; + return; + } +} + +void ConnectionWindow::onConnectionRemoved(PVSClient* newConnection) { + + + if (newConnection->getVNCConnection()) + + // check for associated frames! + if (newConnection->getVNCConnection()) { + ConnectionFrame* tmpFrame = + newConnection->getVNCConnection()->getFrame(); + // now handle the case that the client disconnects while we are in fullscreen mode + // the vncconnection would be cut nevertheless, so this: + if (tmpFrame) { + frameList.removeOne(tmpFrame); + // now handle the case that the client disconnects while we are in fullscreen mode + // the vncconnection would be cut nevertheless, so this: + if (tmpFrame == currentSingleFrame) { + currentSingleFrame = NULL; + } + + // no longer needed + delete tmpFrame; + newConnection->getVNCConnection()->setFrame(NULL); + } + } +} + +void ConnectionWindow::setSize(int width, int height, bool forceSquare) { + if (height >= 100 && width >= 100) { + MainWindow::getWindow()->setPrevWidth(width); + MainWindow::getWindow()->setPrevHeight(height); + } + + ignoreRatio = forceSquare; + + if (!frameList.empty()) { + ConnectionFrame* item; + foreach (item, frameList) + { + item->setIgnoreRatio(ignoreRatio); + } + } +} + +void ConnectionWindow::getCloseupSize(int &width, int &height) { + if (!onCloseup) { + width = height = 0; + return; + } + + width = 150; + height = 150; +} + +bool ConnectionWindow::getShowDummies() { + return _showDummies; +} + +void ConnectionWindow::setShowDummies(bool show) { + +} + +ConnectionFrame* ConnectionWindow::newConFrame(PVSClient* newConnection) { + if (newConnection->getConnectionFrame()) { + return NULL; + } + ConnectionFrame* temp = new ConnectionFrame( + MainWindow::getConnectionWindow()); + if (!temp) { + return NULL; + } + return temp; +} + +void ConnectionWindow::setCloseupFrame(ConnectionFrame* cFrame) { + _closeupFrame = cFrame; +} + +ConnectionFrame* ConnectionWindow::getCloseupFrame() { + if (_closeupFrame) + return _closeupFrame; + + return NULL; +} + diff --git a/src/gui/connectionWindow.h b/src/gui/connectionWindow.h new file mode 100644 index 0000000..81b5033 --- /dev/null +++ b/src/gui/connectionWindow.h @@ -0,0 +1,125 @@ +#ifndef _CONNECTIONWINDOW_H_ +#define _CONNECTIONWINDOW_H_ + +#include <QtGui> +#include <src/gui/connectionFrame.h> +#include <src/gui/connectionList.h> +#include <src/gui/mainWindow.h> +#include <list> +#include <iostream> +#include <math.h> +#include <QSettings> +#define FRAME_DELAY 1000 // to comply with the standard value in the gui + + +typedef std::pair<QString, QPoint> clientLocation; +typedef QList<clientLocation> clientLocationList; + +class ConnectionList; +class PVSClient; +class PVSConnectionManager; +class MainWindow; +class ConnectionFrame; +class QDragEnterEvent; +class QDropEvent; + + +class ConnectionWindow : public QWidget +{ + Q_OBJECT +public: + enum FILLORDER + { + ROW, + COLUMN, + SQUARE, + }; + + enum VIEWSTYLE + { + FULLSCREEN, + TABLE, + }; + + + + ConnectionWindow(QWidget *parent=0); + ~ConnectionWindow(); + void addFrame(ConnectionFrame *conFrame); + void addFrameBySettings(QString client, QPoint pos); + void showFrameFromSettings(); + void onChangeConnections(); // if connections are added or removed, this method makes sure the window changes accordingly + void addConnection(PVSClient* newCon); // handle newly connected clients (forward to con-list) + void removeConnection(PVSClient* newCon); // Remove client on disconnect + void onView(); + void updateConnection(PVSClient* newCon); // update stuff like username etc on a present connection + void addVNC(); + void onVNCAdd(PVSClient* newCon); + void removeVNC(); + void onRemoveConnection(); // tells the PVSConnectionManager to remove the connections that are marked in the sidebar + void onConnectionRemoved(PVSClient* newConnection); // does some cleanup and tells the gui elements that this connection is removed + void setSize(int width, int height, bool forceSquare); // tell the frames to use this size settings + void getCloseupSize(int &width, int &height); + bool getShowDummies(); + void setShowDummies(bool show); + QList<ConnectionFrame*> dummyList; + QList<ConnectionFrame*> AllFrameOnWindow; + QList<ConnectionFrame*> getAllFrameOnWindow() + { + return AllFrameOnWindow; + } + void removeFromList(ConnectionFrame* cF); + + bool remoteHelp(QString sname); + bool projectStations(QString sname); + bool unprojectStations(QString sname); + bool lockStations(); + void lockStation(PVSClient* pvsCon); + bool unlockStations(); + void unlockStation(PVSClient* pvsCon); + bool lockAllStations(); + bool unlockAllStations(); + bool unprojectAllStations(); + bool lockInvertStations(); + void lockInvertStation(PVSClient* pvsCon); + bool messageStations(QString ident, QString message); + void messageStation(QString ident, QString message, PVSClient* pvsCon); + bool lockStationsWithMessage(QString message); + void lockStationsWithMessage(QString message, PVSClient* pvsCon); + bool lockAllStationsWithMessage(QString message); + + void setCloseupFrame(ConnectionFrame* cFrame); + int itemAt(ConnectionFrame* cf); + ConnectionFrame* getCloseupFrame(); + QList<ConnectionFrame*> getFrameList(){ return frameList; }; + clientLocationList ClientLocationList; + bool hasDozent; //if a Dozent machine is available this will be set to true else false + //Frame position in the window + int posX; + int posY; + +public Q_SLOTS: + void addDummy(); + + +protected: + QList<ConnectionFrame*> frameList; // list of all connected frames + void mousePressEvent(QMouseEvent *event); + +private: + ConnectionFrame* newConFrame(PVSClient* newConnection); // returns a new frame for the given connection + ConnectionFrame* currentSingleFrame; // pointer to the frame thats currently in FullScreen + ConnectionFrame* _closeupFrame; + QPoint currentPosition (ConnectionFrame* cF); + QMenu *menu; + QAction *newDummy; + bool ignoreRatio; // wether the native ratio should be ignored or not + bool onFullscreen; // wether on fullscreen or not + bool onCloseup; // wether on closeup or not + int defaultWidth, defaultHeight; // obvious + unsigned int frameRate; // also obvious*/ + bool _showDummies; + +}; + +#endif diff --git a/src/gui/dialog.cpp b/src/gui/dialog.cpp new file mode 100644 index 0000000..3c9b7a2 --- /dev/null +++ b/src/gui/dialog.cpp @@ -0,0 +1,74 @@ +/* +# Copyright (c) 2009 - OpenSLX Project, Computer Center University of Freiburg +# +# This program is free software distributed under the GPL version 2. +# See http://openslx.org/COPYING +# +# If you have any feedback please consult http://openslx.org/feedback and +# send your suggestions, praise, or complaints to feedback@openslx.org +# +# General information about OpenSLX can be found at http://openslx.org/ +# ----------------------------------------------------------------------------- +# dialog.cpp + Dialog to get message to send to client +# ----------------------------------------------------------------------------- +*/ + +#include "dialog.h" +#include "ui_dialog.h" +#include <src/gui/mainWindow.h> + +Dialog::Dialog(QWidget *parent) : + QDialog(parent), + dui(new Ui::MsgDialog) +{ + dui->setupUi(this); + + dui->send->setDisabled(true); + + setWindowTitle(tr("Enter the Text for the client(s)")); + + connect( dui->send, SIGNAL( clicked()), this, SLOT( send())); + connect( dui->cancel, SIGNAL( clicked()), this, SLOT( NotSend())); + connect(dui->message, SIGNAL(textChanged()), this, SLOT(textchange())); +} + +Dialog::~Dialog() +{ + delete dui; +} + +void Dialog::send() +{ + QString mesge = dui->message->toPlainText(); + MainWindow::getWindow()->setMsgDialog(mesge); + dui->message->clear(); + emit accept(); +} + +void Dialog::NotSend() +{ + dui->message->clear(); + emit reject(); +} + +void Dialog::textchange() +{ + QString message = dui->message->toPlainText(); + if(message.length()>0) + dui->send->setDisabled(false); + else + dui->send->setDisabled(true); +} + +void Dialog::changeEvent(QEvent *e) +{ + QDialog::changeEvent(e); + switch (e->type()) { + case QEvent::LanguageChange: + dui->retranslateUi(this); + break; + default: + break; + } +} diff --git a/src/gui/dialog.h b/src/gui/dialog.h new file mode 100644 index 0000000..689cbb4 --- /dev/null +++ b/src/gui/dialog.h @@ -0,0 +1,33 @@ +#ifndef DIALOG_H +#define DIALOG_H + +#include <QDialog> +#include <QtGui> +//#include <src/gui/mainWindow.h> + + +namespace Ui { + class MsgDialog; +} + +class MainWindow; + +class Dialog : public QDialog { + Q_OBJECT +public: + Dialog(QWidget *parent = 0); + ~Dialog(); + +protected: + void changeEvent(QEvent *e); + +private: + Ui::MsgDialog *dui; + +private slots: + void send(); + void NotSend(); + void textchange(); +}; + +#endif // DIALOG_H diff --git a/src/gui/frame.cpp b/src/gui/frame.cpp new file mode 100644 index 0000000..cb79643 --- /dev/null +++ b/src/gui/frame.cpp @@ -0,0 +1,332 @@ +/* +# Copyright (c) 2009 - OpenSLX Project, Computer Center University of Freiburg +# +# This program is free software distributed under the GPL version 2. +# See http://openslx.org/COPYING +# +# If you have any feedback please consult http://openslx.org/feedback and +# send your suggestions, praise, or complaints to feedback@openslx.org +# +# General information about OpenSLX can be found at http://openslx.org/ +# ----------------------------------------------------------------------------- +# src/gui/frame.cpp +# This is the drawingarea, it will be set to the suitable ConnectionFrame. +# Each instance of this class has is own VNCThread, this way is more simple +# to show, update and scale the image from the suitable client. Only the point +# on the image that need to be drawed or scaled will be processed. Thus the CPU +# performance will not be affected. The pvsmgr can manage in this way a lot of clients. +# ----------------------------------------------------------------------------- +*/ + +#include "frame.h" +#include <src/gui/mainWindow.h> +#include <iostream> +#include <QPixmap> + +Frame::Frame(const QString & text, QWidget * parent) : + QLabel(parent), _clientVNCThread(0) +{ + _clientVNCThread = NULL; + + X = 0; + Y = 0; + setBackgroundRole(QPalette::Base); + + setStyleSheet(QString::fromUtf8("QLabel{border-radius:10px;\n" + "background-color: rgb(150,150,150);}")); + + setAlignment(Qt::AlignCenter); + + setAutoFillBackground(true); + setFrameStyle(QFrame::StyledPanel | QFrame::Sunken); + + _isLocked = false; + _dozent = false; + _uy = _ux = 0; + + //QIcon icon; + //icon.addFile(QString::fromUtf8(), QSize(), QIcon::Normal, QIcon::Off); + button_closeUp = createToolButton(tr("View"), QIcon(":/restore"),SLOT(closeUp())); + button_foto = createToolButton(tr("Foto"), QIcon(":/photos"),SLOT(foto())); + button_lock = createToolButton(tr("Lock this client"), QIcon(":/lock"),SLOT(setLock())); + //button_unlock = createToolButton(tr("Unlock this client"), QIcon(":/lock"),SLOT(setLock())); + button_dozent = createToolButton(tr("Set as Superclient"), QIcon(":/dozent2"),SLOT(setDozent())); + + connect(this, SIGNAL(clicked()), this, SLOT(slotClicked())); + ip = ""; + setToolButtonListVisible(false); +} + +Frame::~Frame() +{ + if (_clientVNCThread) + { + disconnect(_clientVNCThread, SIGNAL(imageUpdated(int,int,int,int)), this, + SLOT(updateImage(int,int,int,int))); + disconnect(_clientVNCThread, SIGNAL(finished()), this, + SLOT(iamDown())); + if (_clientVNCThread->isRunning()) + { + _clientVNCThread->terminate = true; + _clientVNCThread->wait(_clientVNCThread->getUpdatefreq()+2000); + } + } +} + + +void Frame::setVNCThreadConnection(VNCClientThread * vncClientThread) +{ + // initialize the vncthread for this connection + //printf("Starting VNC thread for %s\n", ip.toUtf8().data()); + _clientVNCThread = vncClientThread; + + connect(_clientVNCThread, SIGNAL(imageUpdated(int,int,int,int)), this, + SLOT(updateImage(int,int,int,int)), Qt::BlockingQueuedConnection); + connect(_clientVNCThread, SIGNAL(finished()), this, + SLOT(iamDown())); + + // start the thread + if(!_clientVNCThread->terminate) + _clientVNCThread->start(); +} + +/* + * To stop the vncThreadConnection, we only disconnect all connected signals on _clientVNCThread + * We don't need here to terminate the thread, this will appear in vncconnection, because + * we have set this thread there (in vncconnection). + */ +void Frame::stopVNCThreadConnection() +{ + disconnect(_clientVNCThread, SIGNAL(imageUpdated(int,int,int,int)), this, + SLOT(updateImage(int,int,int,int))); + disconnect(_clientVNCThread, SIGNAL(finished()), this, + SLOT(iamDown())); +} + +void Frame::updateImage(int x, int y, int w, int h) +{ + if (_clientVNCThread == NULL) + return; + + if (_clientVNCThread->getSize() != size()) + { + // grow the update rectangle to avoid artifacts + x -= 3; + y -= 3; + w += 6; + h += 6; + + _clientImg = _clientVNCThread->getImage().copy(x, y, w, h); + + qreal sx = qreal(width()) / qreal(_clientVNCThread->getSize().width()); + qreal sy = qreal(height()) / qreal(_clientVNCThread->getSize().height()); + + x = qRound(qreal(x) * sx); + y = qRound(qreal(y) * sy); + w = qRound(qreal(w) * sx); + h = qRound(qreal(h) * sy); + } + else + { + _clientImg = _clientVNCThread->getImage().copy(x, y, w, h); + } + + _ux = w; + _uy = h; + repaint(x, y, w, h); // this will trigger the PaintEvent +} + +void Frame::iamDown() +{ + if (_clientVNCThread == NULL) return; + _clientVNCThread = NULL; + update(); +} + +void Frame::paintEvent(QPaintEvent *event) +{ + QPainter painter(this); + QRect r = event->rect(); + event->accept(); + + if (_clientImg.isNull()) + { + _clientImg = QImage(":/terminal"); + painter.drawImage(28,0, _clientImg.scaled(145,123, Qt::KeepAspectRatio, Qt::SmoothTransformation)); + setAlignment(Qt::AlignCenter); + return; + } + + if(_isLocked) + { + _clientImg = QImage(":/lock"); + painter.drawImage(28,0, _clientImg.scaled(145,123, Qt::KeepAspectRatio, Qt::SmoothTransformation)); + setAlignment(Qt::AlignCenter); + return; + } + + if (_clientVNCThread != NULL) + { + if (r.width() != _ux || r.height() != _uy) + { + _clientImg = _clientVNCThread->getImage(); // redraw complete image (e.g. on resize) + r = rect(); + } + else + { + _ux = -1; + } + + if (_clientVNCThread->getSize() == size()) + { + + painter.drawImage(r.topLeft(), _clientImg); // don't scale + } + else + { + QImage i = _clientImg.scaled(r.size(), Qt::IgnoreAspectRatio, Qt::SmoothTransformation); + painter.drawImage(r.topLeft(), i); + } + } + else + { + _clientImg = QImage(":/terminal"); + painter.drawImage(28,0, _clientImg.scaled(145,123, Qt::KeepAspectRatio, Qt::SmoothTransformation)); + setAlignment(Qt::AlignCenter); + } +} + +void Frame::slotClicked() +{ + //qDebug() << "clickableLabel :: Clicked, searching for" << ip; + + if (ip != "") { + for (int i=0; i<MainWindow::getConnectionList()->model->rowCount(QModelIndex()); i++) + { + if (MainWindow::getConnectionList()->model->index(i, 1, QModelIndex()).data(Qt::DisplayRole).toString() + .compare(ip) == 0) + { + MainWindow::getConnectionList()->selectRow(i); + MainWindow::getConnectionList()->setCurrentIndex(MainWindow::getConnectionList()->currentIndex()); + break; + } + } + } +} + +void Frame::mousePressEvent(QMouseEvent* event) +{ + emit clicked(); + if (event->button() == Qt::RightButton) + { + /*if (!_dummy) + DelDummy->setDisabled(true); + menu->exec(QCursor::pos());*/ + } + else + { + + } + QLabel::mousePressEvent(event); +} + +void Frame::mouseReleaseEvent ( QMouseEvent * event ) +{ + QLabel::mouseReleaseEvent(event); +} + +QToolButton* Frame::createToolButton(const QString &toolTip, const QIcon &icon, const char *member) + { + QToolButton *button = new QToolButton(this); + button->setToolTip(toolTip); + button->setIcon(icon); + button->setIconSize(QSize(15, 15)); + button->setStyleSheet(QString::fromUtf8("background-color: rgb(230, 230, 230);")); + addButton(button); + toolButtonList.append(button); + connect(button, SIGNAL(clicked()), this, member); + + return button; +} + +void Frame::addButton(QToolButton *button) +{ + button->move(X,Y); + Y += button->size().height()-5; +} + +void Frame::setToolButtonListVisible(bool visible) +{ + foreach (QToolButton* tb, toolButtonList) + tb->setVisible(visible); + if (visible && MainWindow::getConnectionWindow()->hasDozent && !_dozent) + button_dozent->setVisible(false);//At this time this button should only be visible on the dozent machine (the superclient). + +} + +void Frame::setLockStatus(bool lock) +{ + if (lock) + { + button_lock->setToolTip(tr("Unlock this client")); + //button_lock->setIcon() TODO + } + else + { + button_lock->setToolTip(tr("Lock this client")); + //button_lock->setIcon() TODO + } + _isLocked = lock; +} + +QImage Frame::getImageForFoto() +{ + return _clientVNCThread->getImage(); +} + +void Frame::closeUp() +{ + emit clicked(); + MainWindow::getWindow()->closeUp(); +} + +void Frame::foto() +{ + emit clicked(); + MainWindow::getWindow()->foto(); +} + +void Frame::setLock() +{ + if (!_dozent) + { + emit clicked(); + if (_isLocked) + MainWindow::getConnectionWindow()->unlockStations(); + else + MainWindow::getConnectionWindow()->lockStations(); + } + else + { + QString message = QString(tr("You can't lock a Superclient-machine.")); + QMessageBox::information(this, "PVS", message); + } +} + +void Frame::setDozent() +{ + if (_dozent) + { + button_dozent->setToolTip(tr("Set client as Superclient")); + _dozent = false; + MainWindow::getConnectionWindow()->hasDozent = false; + getConFrame()->setDozent(false); + } + else + { + button_dozent->setToolTip(tr("Unset client as Superclient")); + _dozent = true; + MainWindow::getConnectionWindow()->hasDozent = true; + getConFrame()->setDozent(true); + } +} diff --git a/src/gui/frame.h b/src/gui/frame.h new file mode 100644 index 0000000..3004e0c --- /dev/null +++ b/src/gui/frame.h @@ -0,0 +1,90 @@ +#ifndef FRAME_H_ +#define FRAME_H_ + +#include <QtGui> +#include "../util/vncClientThread.h" + +class VNCClientThread; +class ConnectionWindow; +class ConnectionFrame; +class MainWindow; + +class Frame: public QLabel +{ + Q_OBJECT + +public: + Frame(const QString & text, QWidget * parent = 0 ); + virtual ~Frame(); + void setVNCThreadConnection(VNCClientThread * VNCclientThread); + void stopVNCThreadConnection(); + VNCClientThread * getVNCClientThread() + { + return _clientVNCThread; + } + void setConFrame (ConnectionFrame* cf) + { + _cFrame = cf; + } + ConnectionFrame* getConFrame() + { + return _cFrame; + } + void setToolButtonListVisible(bool visible); + void setLockStatus(bool lock); + bool getLockStatus() + { + return _isLocked; + } + bool isDozent() + { + return _dozent; + } + int X,Y; + + QString ip; + QToolButton* button_closeUp; + QToolButton* button_foto; + QToolButton* button_lock; + QToolButton* button_unlock; + QToolButton* button_dozent; + QList<QToolButton*> toolButtonList; + +public Q_SLOTS: + void updateImage(int x, int y, int w, int h); + void iamDown(); + void slotClicked(); + QImage image() + { + return _clientImg; + }; + void setImage(QImage img) + { + _clientImg = img; + }; + QImage getImageForFoto(); + void closeUp(); + void foto(); + void setLock(); + //void unlock(); + void setDozent(); + +signals: + void clicked(); +protected: + void paintEvent(QPaintEvent *event); + void mousePressEvent ( QMouseEvent * event ); + void mouseReleaseEvent ( QMouseEvent * event ); + +private: + QToolButton* createToolButton(const QString &toolTip, const QIcon &icon, const char *member); + void addButton(QToolButton *button); + VNCClientThread *_clientVNCThread; + ConnectionFrame *_cFrame; + QImage _clientImg; + bool _isLocked; + bool _dozent; + int _ux, _uy; +}; + +#endif /* FRAME_H_ */ diff --git a/src/gui/mainWindow.cpp b/src/gui/mainWindow.cpp new file mode 100644 index 0000000..eb15e82 --- /dev/null +++ b/src/gui/mainWindow.cpp @@ -0,0 +1,1205 @@ +/* + # Copyright (c) 2009 - OpenSLX Project, Computer Center University of Freiburg + # + # This program is free software distributed under the GPL version 2. + # See http://openslx.org/COPYING + # + # If you have any feedback please consult http://openslx.org/feedback and + # send your suggestions, praise, or complaints to feedback@openslx.org + # + # General information about OpenSLX can be found at http://openslx.org/ + # ----------------------------------------------------------------------------- + # mainWindow.cpp + This is the Main class for the pvsManager. The GUI is contructed here. + # ----------------------------------------------------------------------------- + */ + +#include <QtGui> +#include <QFileDialog> +#include <src/gui/mainWindow.h> +using namespace std; + +// setting the IF-DEF Block for the touchgui and the normal gui, for later use + +#ifdef MAINWINDOW_USE_TOUCHGUI +#include "ui_mainwindowtouch.h" +#endif + +#ifdef MAINWINDOW_USE_NORMALGUI +#include "ui_mainwindow.h" +#endif + +#include <src/gui/connectionList.h> +#include <src/gui/connectionWindow.h> +#include <src/gui/profileDialog.h> +//#include <src/gui/dialog.h> +#include <src/core/pvsConnectionManager.h> +#include <iostream> + +MainWindow::MainWindow(QWidget *parent) : + QMainWindow(parent), ui(new Ui::MainWindow) + +{ + + ui->setupUi(this); + + ui->horizontalSlider->setValue(100); + ui->label_2->setText("100"); + + ui->separator->setVisible(false); + + myself = this; + conWin = new ConnectionWindow(ui->widget); + ui->VconWinLayout->addWidget(conWin); + conList = new ConnectionList(ui->ClWidget); + ui->ClientGLayout->addWidget(conList); + + bgimage = false; + + _aboutDialog = new AboutDialog(this); + + PVSConnectionManager::getManager(); + + //set the maximum width for list content + ui->ClWidget->setMaximumWidth(160); + + ui->pvsLog->setReadOnly(true); + ui->pvsLog->hide(); + + onToggleLog(false); + // add ourself to the log listeners, so we can output them too + ConsoleLog addListener(this, &MainWindow::on_log_line); + + _firstResize = 1; + _oldRatio = "100"; + _isThumbnailrate = false; + is_closeup = false; + is_fullscreen = false; + _isLockAll = false; + locked = false; + + /* + * _sessionName: The session name for this Connection + * _pwdCon: Password needed to connect to the session with the name _sessionName + */ + _pwdCon = PVSConnectionManager::getManager()->setNeedPassword(false); + _sessionName = PVSConnectionManager::getManager()->getSessionName(); + + ui->setPassword->setCheckState(Qt::Checked); + +#ifdef MAINWINDOW_USE_TOUCHGUI //only used for the touchgui + + // define the slots we want to use + connect(ui->comboBox_touch1, SIGNAL(currentIndexChanged(int)), this, SLOT(combobox1(int))); // Combobox 1 verknüpfen mit IndexChangend Signal + connect(ui->comboBox_touch1, SIGNAL(currentIndexChanged(int)), this, SLOT(setindexback())); + + + connect(ui->pushButton, SIGNAL(clicked()), this, SLOT(createProfile())); // profile button + connect(ui->pushButton_2, SIGNAL(clicked()), this, SLOT(clientlisthide())); // clienlist button + + // toolbar slots + connect(ui->actionresetall, SIGNAL(triggered()), this, SLOT(resetall())); + connect(ui->actionLocksingle, SIGNAL(triggered()), this, SLOT(locksingle())); + connect(ui->actionUnlocksingle, SIGNAL(triggered()), this, SLOT(unlocksingle())); + connect(ui->actionProjection, SIGNAL(triggered()), this, SLOT(projecttoolbar())); + connect(ui->actionUnprojection, SIGNAL(triggered()), this, SLOT(unprojecttoolbar())); + connect(ui->actionDozent, SIGNAL(triggered()), this, SLOT(setdozenttoolbar())); + + // Ui specific settings + + ui->ClWidget->hide(); + ui->progressBar->hide(); + ui->pvsLog->hide(); + + +#endif + + + // toolbar and actions in pvsmgr + connect(ui->action_Exit, SIGNAL(triggered()), this, SLOT(close())); + ui->action_Exit->setStatusTip(tr("Exit")); + connect(ui->action_Disconnect, SIGNAL(triggered()), this, SLOT(disconnect())); + ui->action_Disconnect->setStatusTip(tr("Remove the vnc-Connection for the selected client(s)")); + ui->action_Disconnect->setVisible(false);//we need it only for debug + connect(ui->actionView, SIGNAL(triggered()), this, SLOT(closeUp())); + ui->actionView->setStatusTip(tr("Show the selected client in the whole window")); + connect(ui->actionFoto, SIGNAL(triggered()), this, SLOT(foto())); + connect(ui->actionLock, SIGNAL(triggered()), this, SLOT(lockalltoolbar())); + connect(ui->actionChat, SIGNAL(triggered()), this, SLOT(startChatDialog())); + ui->actionFoto->setStatusTip(tr("Make a screenshot for the selected client(s)")); + ui->actionLock->setStatusTip(tr("Lock or Unlock all Clients")); + connect(ui->actionCreate_profile, SIGNAL(triggered()), this, SLOT(createProfile())); + + connect(ui->actionShow_Username, SIGNAL(triggered()), this, SLOT(showusername())); + connect(ui->actionShow_Hostname_IP, SIGNAL(triggered()), this, SLOT(showip())); + connect(ui->actionShow_Fullname, SIGNAL(triggered()), this, SLOT(showname())); + connect(ui->horizontalSlider, SIGNAL(valueChanged (int)), this, SLOT(changeRatio(int))); + connect(ui->setPassword, SIGNAL(stateChanged (int)), this, SLOT(setPasswordForConnection(int))); + connect(ui->vncQuality, SIGNAL(currentIndexChanged (int)), this, SLOT(setVNCQuality(int))); + connect(ui->thumbStatus, SIGNAL(currentIndexChanged(int)), this, SLOT(changeStatus(int))); + connect(ui->actionShow_Log, SIGNAL(toggled(bool)), this, SLOT(setLogConsoleDisabled(bool))); + connect(ui->actionShow_Network, SIGNAL(toggled(bool)), this, SLOT(onToggleLog(bool))); + connect(ui->actionShow_Chat, SIGNAL(toggled(bool)), this, SLOT(onToggleLog(bool))); + connect(ui->actionShow_Terminal, SIGNAL(toggled(bool)), this, SLOT(onToggleLog(bool))); + connect(ui->actionShow_Normal, SIGNAL(toggled(bool)), this, SLOT(onToggleLog(bool))); + connect(ui->actionShow_Error, SIGNAL(toggled(bool)), this, SLOT(onToggleLog(bool))); + connect(ui->actionAbout_pvs, SIGNAL(triggered()), _aboutDialog, SLOT(open())); + + loadSettings(); //we load the appliocation settings + + setUnifiedTitleAndToolBarOnMac(true); + statusBar()->showMessage(tr("The pvs manager")); + this->showMaximized(); // show the Mainwindow maximized + + // listen on port 29481 for incoming file transfers + _serverSocket = new QTcpServer(); + _serverSocket->listen(QHostAddress::Any, 29481); + connect(_serverSocket, SIGNAL(newConnection()), this, SLOT(incomingFile())); + + +} + +MainWindow::~MainWindow() +{ + delete ui; +} + +/* + * This signal is received when the mainwindow is going to be closed. + * We have to check if the the chat-dialog is open. In this case we close + * this dialog and accept the event, the rest will be execute from Qt. + * Qt will be call the destroyer ~MainWindow(). + */ +void MainWindow::closeEvent(QCloseEvent *e) +{ + if (sChatDialog.isVisible()) + sChatDialog.close(); + e->accept(); +} + +MainWindow* MainWindow::getWindow() // catches the window +{ + + if (myself) + { + return myself; + } + else + { + return myself = new MainWindow; + } +} + +ConnectionWindow* MainWindow::getConnectionWindow() // catches the ConnectionWindow +{ + if (conWin) + { + return conWin; + } + else + { + conWin = new ConnectionWindow; + return conWin; + } +} + +ConnectionList* MainWindow::getConnectionList() // catches the ConnectionList +{ + if (conList) + return conList; + else + { + conList = new ConnectionList; + return conList; + } +} + +int MainWindow::getConnectionWindowWidth() // returns the width of the ConnectionWindow +{ + return ui->widget->width(); +} + +int MainWindow::getConnectionWindowHeight() // returns the height of the CoonectionWindow +{ + return ui->widget->height(); +} + +QStringList MainWindow::getProfilList() // loads the profile list +{ + QSettings settings("openslx", "pvsmgr"); + profilList = settings.childGroups(); + return profilList; +} + +#ifdef MAINWINDOW_USE_NORMALGUI +void MainWindow::addProfileInMenu(QString name) +{ + QAction* action = new QAction(name,this); + ui->menuLoad_profile->addAction(action); + connect(ui->menuLoad_profile, SIGNAL(triggered(QAction*)), this, SLOT(loadProfile(QAction*))); + _mapProfileToAction.insert(name, action); +} + +void MainWindow::removeProfileInMenu(QString name) +{ + if (_mapProfileToAction.contains(name)) + { + QAction* action = _mapProfileToAction.value(name); + ui->menuLoad_profile->removeAction(action); + _mapProfileToAction.take(name); + } + +} + +#endif +void MainWindow::loadSettings() +{ + QSettings settings("openslx", "pvsmgr"); + QString current = settings.value("current", "default").toString(); + currentProfi = current; + _profilName = current; + + //When no profile is available, we define a default one whith 9 dummy screens + if (current.compare("default") == 0) + { + setWindowTitle("PVSmgr - Default"); + QPoint pos1 = settings.value("default/1", QPoint(0, 0)).toPoint(); + MainWindow::getConnectionWindow()->addFrameBySettings("1", pos1); + QPoint pos2 = + settings.value("default/2", QPoint(194, 0)).toPoint(); + MainWindow::getConnectionWindow()->addFrameBySettings("2", pos2); + QPoint pos3 = + settings.value("default/3", QPoint(388, 0)).toPoint(); + MainWindow::getConnectionWindow()->addFrameBySettings("3", pos3); + QPoint pos4 = + settings.value("default/4", QPoint(582, 0)).toPoint(); + MainWindow::getConnectionWindow()->addFrameBySettings("4", pos4); + QPoint pos5 = + settings.value("default/5", QPoint(0, 173)).toPoint(); + MainWindow::getConnectionWindow()->addFrameBySettings("5", pos5); + QPoint pos6 = + settings.value("default/6", QPoint(194, 173)).toPoint(); + MainWindow::getConnectionWindow()->addFrameBySettings("6", pos6); + QPoint pos7 = + settings.value("default/7", QPoint(388, 173)).toPoint(); + MainWindow::getConnectionWindow()->addFrameBySettings("7", pos7); + QPoint pos8 = + settings.value("default/8", QPoint(582, 173)).toPoint(); + MainWindow::getConnectionWindow()->addFrameBySettings("8", pos8); + QPoint pos9 = + settings.value("default/9", QPoint(293, 346)).toPoint(); + MainWindow::getConnectionWindow()->addFrameBySettings("9", pos9); + + QString title = "PVSmgr - "; + title.append(_profilName); + title.append(" ["+_sessionName + " : "); + title.append(_pwdCon+"]"); + setWindowTitle(title); + } + else + { + QString title = "PVSmgr - "; + title.append(_profilName); + title.append(" ["+_sessionName + " : "); + title.append(_pwdCon+"]"); + setWindowTitle(title); + settings.beginGroup(current); + QStringList keys = settings.childKeys(); + for (int i=0; i<keys.size(); i++) + { + QString profil = current; + profil = profil.append("/").append(keys.at(i)); + QPoint pos = settings.value(keys.at(i)).toPoint(); + MainWindow::getConnectionWindow()->addFrameBySettings(keys.at(i), pos); + } + } + + MainWindow::getConnectionWindow()->showFrameFromSettings(); +#ifdef MAINWINDOW_USE_NORMALGUI + foreach (QString profile, getProfilList()) + addProfileInMenu(profile); +#endif +} + +void MainWindow::loadProfile(QAction* actiontriggered) +{ + QString profilename = actiontriggered->text(); + loadSettings(profilename); +} + +void MainWindow::loadSettings(QString profilname) // loads the current profile +{ + QList<ConnectionFrame*> AllFrameOnWindow = + MainWindow::getConnectionWindow()->getAllFrameOnWindow(); + + if (AllFrameOnWindow.size() > 0) + { + _profilName = profilname; + MainWindow::getConnectionWindow()->ClientLocationList.clear(); + QSettings settings("openslx", "pvsmgr"); + settings.setValue("current", _profilName); + ConnectionFrame* cFrame; + foreach (cFrame, AllFrameOnWindow) + { + if (cFrame->isDummy()) + { + AllFrameOnWindow.removeOne(cFrame); + MainWindow::getConnectionWindow()->removeFromList(cFrame); + cFrame->deleteLater(); + } + } + settings.beginGroup(_profilName); + QStringList keys = settings.childKeys(); + int rest = AllFrameOnWindow.size(); + int init = 1; + for (int i = 0; i < keys.size(); i++) + { + if (init <= rest) + { + ConnectionFrame* cF = AllFrameOnWindow.at(i); + QString profil = _profilName; + profil = profil.append("/").append(cF->getTaskbarTitle()); + if (!cF->isDummy()) + cF->move(settings.value(keys.at(i)).toPoint()); + else + cF->move(settings.value(profil, QPoint(10,(10+(5*i)))).toPoint()); + + init += 1; + } + else + { + MainWindow::getConnectionWindow()->addFrameBySettings( + keys.at(i), settings.value(keys.at(i)).toPoint()); + } + } + + MainWindow::getConnectionWindow()->showFrameFromSettings(); + + QString title = "PVSmgr - "; + title.append(_profilName); + title.append(" ["+_sessionName + " : "); + title.append(_pwdCon+"]"); + setWindowTitle(title); + } +} + +void MainWindow::saveSettings(QString profilname) +{ + QList<ConnectionFrame*> AllFrameOnWindow = + MainWindow::getConnectionWindow()->getAllFrameOnWindow(); + QSettings settings("openslx", "pvsmgr"); + settings.setValue("current", profilname); + settings.setValue("size", QString("%1").arg(AllFrameOnWindow.size())); + + for (int i = 0; i < AllFrameOnWindow.size(); i++) + { + ConnectionFrame* current = AllFrameOnWindow.at(i); + QString profil = ""; + profil = settings.value("current").toString().append("/"); + if (!current->isDummy()) + profil.append(QString(current->getTaskbarTitle())); + else + profil.append(QString("%1").arg(i + 1)); + settings.setValue(profil, current->pos()); + } +#ifdef MAINWINDOW_USE_NORMALGUI +addProfileInMenu(profilname); +#endif +} + +void MainWindow::removeProfil(QString profilname) +{ + QSettings settings("openslx", "pvsmgr"); + settings.remove(profilname); +#ifdef MAINWINDOW_USE_NORMALGUI +removeProfileInMenu(profilname); +#endif +} + +void MainWindow::addConnection(PVSClient* newCon) +{ + conWin->addConnection(newCon); + if (!_chatListClients.contains(newCon->getUserName())) + { + _chatListClients.append(newCon->getUserName()); + sChatDialog.chat_client_add(newCon->getUserName()); + sChatDialog.chat_nicklist_update(); + } + // sChatDialog->chat_nicklist_update(newCon->getUserName()); +} + +void MainWindow::removeConnection(PVSClient* newCon) +{ + conWin->removeConnection(newCon); + if (_chatListClients.contains(newCon->getUserName())) + { + _chatListClients.removeOne(newCon->getUserName()); + sChatDialog.chat_client_remove(newCon->getUserName()); + sChatDialog.chat_nicklist_update(); + } +} + +void MainWindow::onConnectionFailed(QString host) +{ +#ifdef never + // code is voided because the info-management will be overhauled sometime + + if (pwDiag) // assume this thing failed after the pw-question... so a wrong password, ey? + + { + onPasswordFailed(host); + return; + } + + QString caption, secondary; + if (host != "") + { + caption = ("PVSConnection with hostname \""); + caption.append(host); + caption.append("\" failed."); + secondary = "PVSConnection attempt for this hostname failed.Maybe the host is not prepared to accept vnc connections. Please make sure hostname and (if needed) password are correct."; + } + else + { + caption = "No IP given"; + secondary = "PVSConnection attempt for this host failed. There was either no or an errorous Hostname given."; + } + QMessageBox::information(*this, caption, secondary); + /* Gtk::MessageDialog dialog(*this, Glib::ustring(caption)); + dialog.set_secondary_text(secondary); + dialog.run();*/ +#endif +} + +void MainWindow::onConnectionTerminated(PVSClient* newConnection) +{ +#ifdef never + // code is voided because the info-management will be overhauled sometime + + QString host; + if (newConnection) + { + host = newConnection->getIp(); // copy hostname for message + } + else + host = "spooky unknown"; + + // now inform + QString caption, secondary; + + caption = "Hostname \""; + caption.append(host); + caption.append("\" terminated connection."); + secondary = "The server has closed the connection to your client."; + + QMessageBox::information(*this, caption, secondary); + /*Gtk::MessageDialog dialog(*this, Glib::ustring(caption)); + dialog.set_secondary_text(secondary); + dialog.run();*/ +#endif +} + +void MainWindow::onConnectionRemoved(PVSClient* newConnection) +{ + // TODO this would be the place to handle the rest of the fullscreen issue + conWin->onConnectionRemoved(newConnection); +} + +void MainWindow::onPasswordFailed(QString Qhost) +{ +#ifdef never + // code is voided because the info-management will be overhauled sometime + QString caption, secondary; + if (Qhost != "") + { + caption = "Hostname \""; + caption.append(Qhost); + caption.append("\" refused password."); + secondary = "You have entered no or a wrong password."; + } + else + return; // unknown connection was terminated? too spooky + QMessageBox::information(*this, caption, secondary); + /* Gtk::MessageDialog dialog(*this, Glib::ustring(caption)); + dialog.set_secondary_text(secondary); + Gtk::Main::run(dialog);*/ +#endif +} + +void MainWindow::sendChatMsg(PVSMsg myMsg) +{ + PVSConnectionManager::getManager()->onChat(myMsg); +} + +void MainWindow::receiveChatMsg(QString nick_from, QString nick_to, QString msg) +{ + sChatDialog.chat_receive(nick_from, nick_to, msg); +} + +int MainWindow::getPrevWidth() // PVSConnectionManager::getManager()->getPrevWidth() +{ + return prev_width; +} + +void MainWindow::setPrevWidth(int newWidth) +{ + if (newWidth > 100) + prev_width = newWidth; + else + prev_width = 100; +} + +int MainWindow::getPrevHeight() +{ + return prev_height; +} + +void MainWindow::setPrevHeight(int newHeight) +{ + if (newHeight > 100) + prev_height = newHeight; + else + prev_height = 100; +} + +void MainWindow::changeEvent(QEvent *e) +{ + QMainWindow::changeEvent(e); + switch (e->type()) + { + case QEvent::LanguageChange: + ui->retranslateUi(this); + break; + default: + break; + } +} + +/* + * The resize Event is called when the mainwindow is resized! + * Whe need this event to resize the Frame on the Connectionwindow. + * The Frames are resized proportionally to the new size of the mainwindow. + * But this Function is called by Qt 3 times before the whole + * mainwdow is constructed. We can only resize the Frame on Window and + * get the initial size of the Connectionwindow after this 3 times. + */ +void MainWindow::resizeEvent(QResizeEvent *event) +{ + + if (bgimage == true){ + repaintbackgroundpicture(); // repaint the backgroundpicture scaled to the window size + } + + if (_firstResize == 3) + { + QSize oldSize = event->oldSize(); + _initW = ui->widget->width(); + _initH = ui->widget->height(); + _firstResize++; + } + std::list<QString>* selectedClients = + MainWindow::getConnectionList()->getSelectedClients(); + if (is_closeup && selectedClients->size() == 1) + { + PVSClient* pvsClient = + PVSConnectionManager::getManager()->getClientFromIp( + selectedClients->front().toStdString().c_str()); + pvsClient->getConnectionFrame()->paintCloseUp(ui->widget->width(), + ui->widget->height()); + } + else if (!is_closeup && _firstResize > 3) + { + int ratio_w = (ui->widget->width()*100)/_initW; + int ratio_h = (ui->widget->height()*100)/_initH; + foreach (ConnectionFrame* cf, getConnectionWindow()->getFrameList()) + { + /*int margin = ui->widget->style()->pixelMetric(QStyle::PM_DefaultTopLevelMargin); + int x = ui->widget->width() - margin; + int y = ui->widget->height() - margin; + updatePos(cf, x, y);*/ + int w = (cf->init_w * ratio_w) / 100; + int h = (cf->init_h * ratio_h) / 100; + cf->paintCloseUp(w,h); + } + } + + if (_firstResize < 3) + _firstResize++; +} + +void MainWindow::updatePos(ConnectionFrame* cf, int x, int y) +{ + int posx = (x*cf->pos().x())/_initW; + int posy = (y*cf->pos().y())/_initH; + cf->move(posx, posy); + /*QSize size = cf->sizeHint(); + cf->setGeometry(x - size.rwidth(), y - size.rheight(), + size.rwidth(), size.rheight());*/ +} + +void MainWindow::on_log_line(LogEntry consoleEntry) +{ + ConsoleLogger::LOG_LEVEL level = consoleEntry.getLevel(); + if (level == ConsoleLogger::LOG_ERROR && !showError) + return; + if (level == ConsoleLogger::LOG_NORMAL && !showNormal) + return; + if (level == ConsoleLogger::LOG_NETWORK && !showNetwork) + return; + if (level == ConsoleLogger::LOG_TERMINAL && !showTerminal) + return; + if (level == ConsoleLogger::LOG_CHAT && !showChat) + return; + + ui->pvsLog->insertPlainText(consoleEntry.getLine()); + +} + +void MainWindow::onToggleLog(bool showtime) +{ + if (showtime) + ;//to kill the system warning due "unused variable" + showError = ui->actionShow_Error->isChecked(); + showTerminal = ui->actionShow_Terminal->isChecked(); + showNetwork = ui->actionShow_Network->isChecked(); + showChat = ui->actionShow_Chat->isChecked(); + showNormal = ui->actionShow_Normal->isChecked(); + //showAtAll = ui->logAtAllAction->get_active(); + + + ConsoleLog dump2Listener(this, &MainWindow::on_log_line); +} + +void MainWindow::setLogConsoleDisabled(bool visible) +{ + if (!visible) + ui->pvsLog->hide(); + else + ui->pvsLog->show(); +} + +/*void MainWindow::close() +{ + //sChatDialog.close(); + QApplication::closeAllWindows(); +}*/ + +void MainWindow::disconnect() +{ + conWin->removeVNC(); +} + +void MainWindow::lockUnlockAll() +{ + if (_isLockAll) + { + //ui->actionLock set icon to unlock + MainWindow::getConnectionWindow()->unlockAllStations(); + _isLockAll = false; + } + else + { + //ui->actionLock set icon to lock + MainWindow::getConnectionWindow()->lockAllStations(); + _isLockAll = true; //tell the manager all the clients are locked + } +} + +void MainWindow::closeUp() +{ + std::list<QString>* selectedClients = + MainWindow::getConnectionList()->getSelectedClients(); + if (!is_closeup) + { + if (selectedClients->size() == 1) + { + PVSClient + * pvsClient = + PVSConnectionManager::getManager()->getClientFromIp( + selectedClients->front().toStdString().c_str()); + _framePosOnCloseUp = pvsClient->getConnectionFrame()->pos();//get the actualy position before run closeup + if (pvsClient->getVNCConnection()) + { + conWin->setCloseupFrame(pvsClient->getConnectionFrame()); + _updatefreq = pvsClient->getConnectionFrame()->getFrame()->getVNCClientThread()->getUpdatefreq(); + pvsClient->getConnectionFrame()->getFrame()->getVNCClientThread()->setUpdatefreq(50); + pvsClient->getConnectionFrame()->move(5,5); + pvsClient->getConnectionFrame()->setWindowFlags(Qt::WindowStaysOnTopHint); + pvsClient->getConnectionFrame()->raise(); + pvsClient->getConnectionFrame()->paintCloseUp(ui->widget->width(),ui->widget->height()); + + is_closeup = true; + conWin->setCloseupFrame(pvsClient->getConnectionFrame()); + } + } + else + { + QString + message = + QString( + tr( + "This operation can only be performed for one selected Client!")); + QMessageBox::information(this, "PVS", message); + } + } + else if (conWin->getCloseupFrame()) + { + /*PVSClient* pvsClient = + PVSConnectionManager::getManager()->getClientFromIp( + selectedClients->front().toStdString().c_str());*/ + conWin->getCloseupFrame()->setWindowFlags(Qt::Widget); + conWin->getCloseupFrame()->paintCloseUp(conWin->getCloseupFrame()->getPrevWidth(), conWin->getCloseupFrame()->getPrevHeight()); + conWin->getCloseupFrame()->move(_framePosOnCloseUp);//back to the position before the closeup + if (conWin->getCloseupFrame()->getConnection()->getVNCConnection()) + conWin->getCloseupFrame()->getFrame()->getVNCClientThread()->setUpdatefreq(_updatefreq); + + is_closeup = false; + conWin->setCloseupFrame(NULL); + } +} + +void MainWindow::foto() // makes a screenshot of the selected client +{ + std::list<QString>* selectedClients = + MainWindow::getConnectionList()->getSelectedClients(); + if (selectedClients->size() > 0) + { + QString format = "png"; + for (std::list<QString>::iterator tmpIt = selectedClients->begin(); tmpIt + != selectedClients->end(); tmpIt++) + { + + QString path = QDir::homePath().append("/").append(*tmpIt).append( + ".png"); + PVSClient + * pvsClient = + PVSConnectionManager::getManager()->getClientFromIp( + (*tmpIt).toUtf8().data()); + if (pvsClient->getVNCConnection()) + { + const QImage img = pvsClient->getConnectionFrame()->getFrame()->getImageForFoto(); + if (!img.isNull()) + img.save(path, format.toAscii()); + } + else printf("Cannot save screen: Image is null.\n"); + } + } + else + { + QString + message = + QString( + tr( + "This operation can only be performed for at least one selected Client!")); + QMessageBox::information(this, "PVS", message); + } +} + +void MainWindow::createProfile() +{ + profileDialog proDiag; + proDiag.exec(); +} + +void MainWindow::showusername() +{ + MainWindow::getConnectionList()->setColumnHidden(2, false); + MainWindow::getConnectionList()->setColumnHidden(0, true); + MainWindow::getConnectionList()->setColumnHidden(1, true); +} + +void MainWindow::showname() +{ + MainWindow::getConnectionList()->setColumnHidden(0, false); + MainWindow::getConnectionList()->setColumnHidden(1, true); + MainWindow::getConnectionList()->setColumnHidden(2, true); +} + +void MainWindow::showip() +{ + MainWindow::getConnectionList()->setColumnHidden(1, false); + MainWindow::getConnectionList()->setColumnHidden(2, true); + MainWindow::getConnectionList()->setColumnHidden(0, true); +} + +void MainWindow::incomingFile() +{ + QTcpSocket *socket = _serverSocket->nextPendingConnection(); + ServerFileTransfert* sft = new ServerFileTransfert(this); + sft->receiveFileFromHost(socket); +} + +void MainWindow::changeRatio(int ratio) // needed the change the size of the vnc-screens +{ + + if (!_isThumbnailrate) + { + QString str; + str.append(QString("%1").arg(ratio)); + ui->label_2->setText(str); + + std::list<QString>* selClients = getConnectionList()->getSelectedClients(); + if (selClients->size() > 0) + { + for (std::list<QString>::iterator client = selClients->begin(); client + != selClients->end(); client++) + { + PVSClient* pvsClient = + PVSConnectionManager::getManager()->getClientFromIp( + (*client).toUtf8().data()); + ConnectionFrame *frame = pvsClient->getConnectionFrame(); + int w = (frame->init_w * ratio) / 100; + int h = (frame->init_h * ratio) / 100; + frame->setPrevWidth(w); + frame->setPrevHeight(h); + frame->paintCloseUp(w, h); + frame->setRatio(ratio); + } + } + else + { + QList<ConnectionFrame *> frameList = + MainWindow::getConnectionWindow()->getFrameList(); + ConnectionFrame *frame; + foreach(frame, frameList) + { + int w = (frame->init_w * ratio) / 100; + int h = (frame->init_h * ratio) / 100; + frame->setPrevWidth(w); + frame->setPrevHeight(h); + frame->paintCloseUp(w, h); + } + } + } + else + { + int updatefreq = (ratio*500)/100; + QString str; + str.append(QString("%1").arg(updatefreq)); + ui->label_2->setText(str); + std::list<QString>* selClients = getConnectionList()->getSelectedClients(); + if (selClients->size() > 0) + { + for (std::list<QString>::iterator client = selClients->begin(); client + != selClients->end(); client++) + { + PVSClient* pvsClient = + PVSConnectionManager::getManager()->getClientFromIp( + (*client).toUtf8().data()); + if (pvsClient->getVNCConnection()) + pvsClient->getConnectionFrame()->getFrame()->getVNCClientThread()->setUpdatefreq(updatefreq); + } + } + else + { + std::list<PVSClient*> clients = PVSConnectionManager::getManager()->getConnections(); + foreach (PVSClient* client, clients) + { + if (client->getVNCConnection()) + client->getConnectionFrame()->getFrame()->getVNCClientThread()->setUpdatefreq(updatefreq); + } + } + + } +} + +/* + * We can change the status for the action that we want to assign to the thumbnails. + * The actions are to be perform over the horizontalslider from QSlider only on the not dummies clients. + * The dummies clients aren't involved. + * We distingue two status: + * -Thumbnailratio:hier we can change the ratio of the thumbnails. + * -Thumbnailrate:we change the rate of the VNCClientThread of the frames. These actions are perform on the selected clients. + * If no clients are selected, we change the ratio of the whole clients on the clientlist * + */ +void MainWindow::changeStatus(int index) +{ + QString status = ui->thumbStatus->currentText (); + + if (status == "Thumbnailratio") + { + _isThumbnailrate = false; + ui->label_3->setText("%"); + std::list<QString>* selClients = getConnectionList()->getSelectedClients(); + if (selClients->size() == 1) + { + PVSClient* pvsClient = + PVSConnectionManager::getManager()->getClientFromIp( + selClients->front().toStdString().c_str()); + int ratio = pvsClient->getConnectionFrame()->getRatio(); + ui->label_2->setText(QString::number(ratio)); + ui->horizontalSlider->setValue(ratio); + } + else + { + ui->label_2->setText("100"); + ui->horizontalSlider->setValue(100); + } + + } + else if (status == "Thumbnailrate") + { + _isThumbnailrate = true; + ui->label_3->setText("ms"); + std::list<QString>* selClients = getConnectionList()->getSelectedClients(); + if (selClients->size() == 1) + { + PVSClient* pvsClient = + PVSConnectionManager::getManager()->getClientFromIp( + selClients->front().toStdString().c_str()); + if (pvsClient->getVNCConnection()) + { + int updatefreq = pvsClient->getConnectionFrame()->getFrame()->getVNCClientThread()->getUpdatefreq(); + int showfreq = (updatefreq*100)/500; + ui->label_2->setText(QString::number(updatefreq)); + ui->horizontalSlider->setValue(showfreq); + } + } + else + { + ui->label_2->setText("500"); + ui->horizontalSlider->setValue(100); + } + } +} + + +/* + * Going to run a new vncthread with quality: quality + */ +void MainWindow::setVNCQuality(int quality) +{ + std::list<QString>* selClients = getConnectionList()->getSelectedClients(); + if (selClients->size() > 0) + { + for (std::list<QString>::iterator client = selClients->begin(); client + != selClients->end(); client++) + { + PVSClient* pvsClient = + PVSConnectionManager::getManager()->getClientFromIp( + (*client).toUtf8().data()); + pvsClient->getConnectionFrame()->resetConnectionWithQuality(quality); + pvsClient->getConnectionFrame()->update(); + } + } + else + { + QList<ConnectionFrame*> FrameList = MainWindow::getConnectionWindow()->getFrameList(); + foreach(ConnectionFrame* frame, FrameList) + { + frame->resetConnectionWithQuality(quality); + frame->update(); + } + } + +} + + +void MainWindow::setPasswordForConnection(int enabled) +{ + if(enabled == 0)//the checkbox isn't checked, so no passowrd needed, we remove it in the titlebar + { + QString dummy = PVSConnectionManager::getManager()->setNeedPassword(false); + _sessionName = PVSConnectionManager::getManager()->getSessionName(); + QString title = "PVSmgr - "; + title.append(_profilName); + title.append(" ["+_sessionName + " : ]"); + setWindowTitle(title); + } + else if (enabled == 2) //password is needed, we show it in the titlebar + { + _pwdCon = PVSConnectionManager::getManager()->setNeedPassword(true); + _sessionName = PVSConnectionManager::getManager()->getSessionName(); + QString title = "PVSmgr - "; + title.append(_profilName); + title.append(" ["+_sessionName + " : "); + title.append(_pwdCon+"]"); + setWindowTitle(title); + } +} +//#endif + + +void MainWindow::setindexback() //sets the index of the combobox back +{ +#ifdef MAINWINDOW_USE_TOUCHGUI + ui->comboBox_touch1->setCurrentIndex(0); +#endif +} + +void MainWindow::clientlisthide() // hide or show the clientlist +{ + + if (locked1 == false) + { + ui->ClWidget->show(); + locked1 = true; + } + + else + { + ui->ClWidget->hide(); + locked1 = false; + } + +} + + +void MainWindow::lockalltoolbar() // locks all if a dozent is set +{ + + + if (locked == false) + { + if (MainWindow::getConnectionWindow()->hasDozent) + { + MainWindow::getConnectionList()->on_lock_all(); + locked = true; + } + else + { + QString message = QString(tr("You have to set a Superclient-machine before performing this action.")); + QMessageBox::information(this, "PVS", message); + } + } + + else + { + MainWindow::getConnectionList()->on_unlock_all(); + locked = false; + } + +} + +void MainWindow::locksingle() // locks a single client +{ + + MainWindow::getConnectionList()->on_lock(); + +} + +void MainWindow::unlocksingle() // unlocks a single client +{ + + MainWindow::getConnectionList()->on_unlock(); + +} + + +void MainWindow::combobox1(int menuindex1) // defines the functions to call from the combobox +{ + switch (menuindex1) + // index comes from the slot definition + { + case 1: + // Lock all + MainWindow::getConnectionList()->on_lock_all(); + break; + + case 2: + // UnLock all + MainWindow::getConnectionList()->on_unlock_all(); + break; + + case 3: + // UnProject all + MainWindow::getConnectionList()->on_unproject_all(); + break; + + case 4: + //Background Picture + backgroundpicture(); + break; + } +} + +void MainWindow::resetall() // unlock and unproject all in toolbar + { + MainWindow::getConnectionList()->on_unlock_all(); + MainWindow::getConnectionList()->on_unproject_all(); + } + + +void MainWindow::projecttoolbar() // projection from toolbar button + { + + MainWindow::getConnectionList()->on_projection(); + + } +void MainWindow::unprojecttoolbar() // unproject all in toolbar + { + + MainWindow::getConnectionList()->on_unprojection(); + + } + +void MainWindow::backgroundpicture() + { + + + fileName = QFileDialog::getOpenFileName(this, + tr("Open Image"), "/home", tr("Image Files (*.png *.jpg *.svg)")); // user chooses a file + + QImage img(""+fileName+""); // set image + QString test("/tmp/test.png"); // set path for saving the scaled picture + QImage img2 = img.scaled(ui->widget->size(),Qt::IgnoreAspectRatio,Qt::FastTransformation); // scale it + + img2.save(""+test+""); // save it + + ui->widget->setStyleSheet("background-image: url(/tmp/test.png);background-repeat:no-repeat; background-position:center;"); //set the picture as background + foreach (ConnectionFrame* cf, MainWindow::getConnectionWindow()->getAllFrameOnWindow()) + { + cf->setStyleSheet(QString::fromUtf8("background-color: rgb(150, 150, 168);")); + } + + bgimage=true; // for the resize event, set background true + + + } + +void MainWindow::repaintbackgroundpicture() // same as backgroundpicture but called when mainwindow is resized + { + + QImage img("/tmp/test.png"); + QString test("/tmp/test.png"); + QImage img2 = img.scaled(ui->widget->size(),Qt::IgnoreAspectRatio,Qt::FastTransformation); + + img2.save(""+test+""); + + ui->widget->setStyleSheet("background-image: url(/tmp/test.png);background-repeat:no-repeat; background-position:center;"); + + + } + +void MainWindow::setdozenttoolbar() // set the dozents pc which is not locked with lockedall +{ + + std::list<QString>* selectedClients = + MainWindow::getConnectionList()->getSelectedClients(); + + if (selectedClients->size() == 1) + { + + PVSClient* pvsClient = + PVSConnectionManager::getManager()->getClientFromIp( + selectedClients->front().toStdString().c_str()); + if (pvsClient->getVNCConnection()) + pvsClient->getConnectionFrame()->getFrame()->setDozent(); + } + +} + +void MainWindow::startChatDialog() +{ + if (!sChatDialog.isVisible()) + sChatDialog.show(); //show the chat dialog + else + sChatDialog.raise();//show the chat dialog on top level +} + + + +MainWindow* MainWindow::myself = NULL; +ConnectionList* MainWindow::conList = NULL; +ConnectionWindow* MainWindow::conWin = NULL; +bool MainWindow::_isLockAll = false; diff --git a/src/gui/mainWindow.h b/src/gui/mainWindow.h new file mode 100644 index 0000000..00bd927 --- /dev/null +++ b/src/gui/mainWindow.h @@ -0,0 +1,200 @@ +#ifndef _MAINWINDOW_H_ +#define _MAINWINDOW_H_ + +#include <QtGui> +#include <QtNetwork> +#include <QMainWindow> +#include <QFileDialog> +#include <src/gui/connectionList.h> +#include <src/util/consoleLogger.h> +#include <src/gui/connectionWindow.h> +#include <src/gui/profileDialog.h> +//#include <src/gui/dialog.h> +#include <src/core/pvsClient.h> +#include <src/core/pvsConnectionManager.h> +#include "src/gui/aboutDialog.h" +#include "src/gui/serverChatDialog.h" +#include <src/gui/serverFileTransfert.h> + + +namespace Ui +{ +class MainWindow; +} + + +class PVSClient; +class ConnectionList; +class ConnectionWindow; +class profileDialog; +class ServerChatDialog; +//class Dialog; + + +class MainWindow : public QMainWindow +{ + friend class PVSConnectionManager; + + Q_OBJECT + + +public: + MainWindow(QWidget *parent = 0); + ~MainWindow(); + + //singleton methods + static MainWindow* getWindow(); + static ConnectionWindow* getConnectionWindow(); + static ConnectionList* getConnectionList(); + + ServerChatDialog sChatDialog; + + + int getConnectionWindowWidth(); + int getConnectionWindowHeight(); + int x,y; + QImage img; + QImage img2; + QString test; + QStringList profilList; + QStringList getProfilList(); + void addProfileInMenu(QString name); + void removeProfileInMenu(QString name); + QString currentProfi; + QString getCurrentProfi() + { + return currentProfi; + } + void loadSettings(); + void loadSettings(QString profilname); + void saveSettings(QString profilname); + void removeProfil(QString profilname); + + // connection add/remove and dialog methods + void addConnection(PVSClient* newCon); + void removeConnection(PVSClient* newCon); + //ConnectionFrame* getNewFrame(); + void onConnectionFailed(QString host = ""); + void onConnectionTerminated(PVSClient* newConnection); + void onConnectionRemoved(PVSClient* newConnection); + void onPasswordFailed(QString Qhost = ""); + + void sendChatMsg(PVSMsg myMsg); + void receiveChatMsg(QString nick_from, QString nick_to, QString msg); + + // view mode related methods + unsigned int getGlobalFrameRate(); + void setGlobalFrameRate(unsigned int newRate); + int getPrevWidth(); + void setPrevWidth(int newWidth); + int getPrevHeight(); + void setPrevHeight(int newHeight); + + // int createMsgDiag(); + void setMsgDialog(QString msgd){msgDialog = msgd;}; + QString getMsgDialog(){return msgDialog;}; + + bool isLockAllStatus() + { + return _isLockAll; + } + + void appendLogMsg(); + + + +protected: + void closeEvent(QCloseEvent *e); + void changeEvent(QEvent *e); + void resizeEvent(QResizeEvent *event); //We need this to resize the frame in the window when window are resized. + void updatePos(ConnectionFrame* cf, int x, int y); + virtual void on_log_line(LogEntry consoleEntry); + + + + +private: + Ui::MainWindow *ui; + static ConnectionWindow* conWin; + static ConnectionList* conList; + //Dialog messageDiag; + static MainWindow* myself; + QString _pwdCon; + QString _sessionName; + QString _profilName; + + QStringList _chatListClients; + + + + /*ConnectionDialog* myConDiag; + ConnectionDialog* pwDiag; + ConnectionDialog* messageDiag;*/ + + AboutDialog *_aboutDialog; + + QString msgDialog; + bool bgimage; + bool locked, locked1; + bool force_square; + bool is_fullscreen; + bool is_closeup; + static bool _isLockAll; + bool showError, showNormal, showNetwork, showTerminal, showChat, showAtAll; + bool isDozent; + QString fileName; + + int _initW, _initH, _firstResize; + + unsigned int updateRate, frameRate; + int prev_width, prev_height, menuindex1, menuindex2; + + QTcpServer *_serverSocket; + QPoint _framePosOnCloseUp; + + bool _isThumbnailrate; + int _updatefreq; + QString _oldRatio; + + QMenu* _profileMenuList; + QMap<QString, QAction*> _mapProfileToAction; + +public slots: + void loadProfile(QAction* actiontriggered); + void setindexback(); + //void setindexback2(); + void lockalltoolbar(); + void resetall(); + void locksingle(); + void unlocksingle(); + void clientlisthide(); + void projecttoolbar(); + void unprojecttoolbar(); + void closeUp(); + void foto(); + void backgroundpicture(); + void repaintbackgroundpicture(); + void setdozenttoolbar(); + void startChatDialog(); + +private slots: + void onToggleLog(bool showtime); + void setLogConsoleDisabled(bool visible); + //void close(); + void disconnect(); + void lockUnlockAll(); + void createProfile(); + void showusername(); + void showname(); + void showip(); + void incomingFile(); + void changeRatio(int ratio); + void changeStatus (int index); + void setVNCQuality(int quality); + void setPasswordForConnection(int enabled); + void combobox1(int menuindex1); // Funktion um index der combobox auszulesen und weiterzuverarbeiten s. Ticker 671 + //void combobox2(int menuindex2); // Funktion um index der combobox auszulesen und weiterzuverarbeiten +}; + + +#endif diff --git a/src/gui/profileDialog.cpp b/src/gui/profileDialog.cpp new file mode 100644 index 0000000..2cbc155 --- /dev/null +++ b/src/gui/profileDialog.cpp @@ -0,0 +1,179 @@ +/* + # Copyright (c) 2009 - OpenSLX Project, Computer Center University of Freiburg + # + # This program is free software distributed under the GPL version 2. + # See http://openslx.org/COPYING + # + # If you have any feedback please consult http://openslx.org/feedback and + # send your suggestions, praise, or complaints to feedback@openslx.org + # + # General information about OpenSLX can be found at http://openslx.org/ + # ----------------------------------------------------------------------------- + # profileDialog.cpp + # - GUI to define the profile. + # ----------------------------------------------------------------------------- + */ + +#include "profileDialog.h" +#include "ui_profileDialog.h" +#include <src/gui/mainWindow.h> +#include <iostream> + +profileDialog::profileDialog(QWidget * parent): + QDialog(parent), + uidiag(new Ui::Dialog) +{ + uidiag->setupUi(this); + content = new QTableView(uidiag->widget); + uidiag->gridLayout->addWidget(content); + + /*Das Modelfestlegen, wo die Clientname angezeigt werden.*/ + model = new QStandardItemModel(0,1,content); //Leere Tabelle mit einer Spalte erstellen + model->setHeaderData(0, Qt::Horizontal, tr("Profile")); //Spalte name definieren + content->setModel(model); + + QItemSelectionModel *selectionModel = new QItemSelectionModel(model); + content->setSelectionModel(selectionModel); + QHeaderView *headerView = content->horizontalHeader(); + headerView->setStretchLastSection(true); + + content->setEditTriggers(QAbstractItemView::NoEditTriggers); //Die Einträge in der Tabelle werden nicht editierbar. + content->setSelectionMode(QAbstractItemView::ExtendedSelection); //Damit mehere Einträge selektierbar werden. + + content->resizeColumnToContents(0); + + + + uidiag->add->setDisabled(true); + uidiag->edit->setDisabled(true); + uidiag->edit->setVisible(false); + uidiag->remove->setDisabled(true); + uidiag->load->setDisabled(true); + uidiag->lineEdit->setDisabled(true); + + setUpProfile(); + + connect(uidiag->add, SIGNAL(clicked ()), this, SLOT(AddProfile())); + connect(uidiag->new_2, SIGNAL(clicked ()), this, SLOT(onNew())); + connect(uidiag->load, SIGNAL(clicked ()), this, SLOT(onLoad())); + connect(uidiag->remove, SIGNAL(clicked ()), this, SLOT(removeProfile())); + connect(uidiag->close, SIGNAL(clicked ()), this, SLOT(accept())); + connect(content, SIGNAL(clicked(const QModelIndex)), this, SLOT(selectionChange(const QModelIndex))); + //show(); + +} + +profileDialog::~profileDialog() +{ + // TODO Auto-generated destructor stub +} + +void profileDialog::setUpProfile() +{ + QStringList list = MainWindow::getWindow()->getProfilList(); + for (int i=0; i<list.size(); i++) + { + model->insertRow(0, QModelIndex()); + model->setData(model->index(0, 0, QModelIndex()),list.at(i)); + } +} + +void profileDialog::AddProfile() +{ + QString name = QString(uidiag->lineEdit->text()); + if (!ProfilList.contains(name)) + { + if (!name.isEmpty()) + { + model->insertRow(0, QModelIndex()); + model->setData(model->index(0, 0, QModelIndex()),name); + ProfilList.append(name); + MainWindow::getWindow()->saveSettings(name); + uidiag->lineEdit->setText(""); + } + else + { + QString message = QString(tr("This field can't be empty.")); + QMessageBox::information(this, "PVS", message); + } + } + else + { + QString message = QString(tr("This name is already in the list.")); + QMessageBox::information(this, "PVS", message); + } +} + +void profileDialog::removeProfile() +{ + QTableView *temp = static_cast<QTableView*>(content); + QItemSelectionModel *selectionModel = temp->selectionModel(); + + QModelIndexList indexes = selectionModel->selectedRows(); + QModelIndex index; + + foreach(index, indexes) + { + int row = content->currentIndex().row(); + QString current = model->index(content->currentIndex().row(), 0).data(Qt::DisplayRole).toString(); + model->removeRow(row, QModelIndex()); + ProfilList.removeOne(current); + MainWindow::getWindow()->removeProfil(current); + } + + + /* if (temp->model()->rowCount()<=0) + {*/ + uidiag->remove->setDisabled(true); + uidiag->edit->setDisabled(true); + uidiag->add->setDisabled(true); + uidiag->load->setDisabled(true); + //} +} + +void profileDialog::onNew() +{ + uidiag->add->setDisabled(false); + uidiag->lineEdit->setDisabled(false); + uidiag->lineEdit->setFocus(); +} + +void profileDialog::onLoad() +{ + QTableView *temp = static_cast<QTableView*>(content); + QItemSelectionModel *selectionModel = temp->selectionModel(); + + QModelIndexList indexes = selectionModel->selectedRows(); + QModelIndex index; + if (indexes.size()>1) + { + QMessageBox::information(this, "PVS", tr("You can only load one profile at time")); + } + else if(indexes.size() == 1) + { + foreach(index, indexes) + { + //int row = content->currentIndex().row(); + QString current = model->index(content->currentIndex().row(), 0).data(Qt::DisplayRole).toString(); + MainWindow::getWindow()->loadSettings(current); + } + } + + emit accept(); +} + +void profileDialog::selectionChange(const QModelIndex & index) +{ + uidiag->remove->setDisabled(false); + uidiag->edit->setDisabled(false); + uidiag->add->setDisabled(false); + uidiag->load->setDisabled(false); + +} + +void profileDialog::close() +{ + close(); +} + + diff --git a/src/gui/profileDialog.h b/src/gui/profileDialog.h new file mode 100644 index 0000000..5caebfa --- /dev/null +++ b/src/gui/profileDialog.h @@ -0,0 +1,46 @@ +#ifndef PROFILEDIALOG_H_ +#define PROFILEDIALOG_H_ + +#include <QtGui> +#include <QDialog> +#include <src/gui/mainWindow.h> + +namespace Ui +{ +class Dialog; +} + +class MainWindow; + +class profileDialog : public QDialog +{ + Q_OBJECT + +public: + profileDialog(QWidget * parent = 0); + virtual ~profileDialog(); + + void setUpProfile(); + + + +signals: + void selectionChanged (const QItemSelection &selected); + +private: + Ui::Dialog *uidiag; + QTableView *content; + QAbstractItemModel *model; + QItemSelectionModel *selectionModel; + QList<QString> ProfilList; + +private Q_SLOTS: + void AddProfile(); + void removeProfile(); + void onNew(); + void onLoad(); + void selectionChange(const QModelIndex & index); + void close(); +}; + +#endif /* PROFILEDIALOG_H_ */ diff --git a/src/gui/projectionDialog.cpp b/src/gui/projectionDialog.cpp new file mode 100644 index 0000000..c091f54 --- /dev/null +++ b/src/gui/projectionDialog.cpp @@ -0,0 +1,140 @@ +/* +# Copyright (c) 2009 - OpenSLX Project, Computer Center University of Freiburg +# +# This program is free software distributed under the GPL version 2. +# See http://openslx.org/COPYING +# +# If you have any feedback please consult http://openslx.org/feedback and +# send your suggestions, praise, or complaints to feedback@openslx.org +# +# General information about OpenSLX can be found at http://openslx.org/ +# ----------------------------------------------------------------------------- +# projectionDialog.cpp + Dialog to select client for the projection +# ----------------------------------------------------------------------------- +*/ + +#include "projectionDialog.h" +#include "ui_projectionDialog.h" +#include <src/gui/mainWindow.h> +#include <QtGui> +#include <iostream> + +ProjectionDialog::ProjectionDialog(QWidget *parent) : + QDialog(parent), + pui(new Ui::projectionDialog) +{ + pui->setupUi(this); + this->setWindowTitle(tr("Target for Projection")); + + source = MainWindow::getConnectionList()->getSelectedClients()->front(); + setupContent(MainWindow::getWindow()->getConnectionList()->getTargetToDisplay(source)); + + pui->send->setDisabled(true); + + connect( pui->send, SIGNAL( clicked() ), this, SLOT( sendListToProject() ) ); + connect( pui->cancel, SIGNAL( clicked() ), this, SLOT( cancelProject() ) ); + connect( pui->checkBox, SIGNAL( clicked() ), this, SLOT( selectAll() ) ); +} + +ProjectionDialog::~ProjectionDialog() +{ + delete pui; + QCheckBox* cbox; + foreach(cbox, checkList) + { + disconnect( cbox, SIGNAL( clicked() ), this, SLOT( sendState() ) ); + } +} + +void ProjectionDialog::setupContent(QList<QString> content) +{ + if (!content.isEmpty()) + { + QString item; + foreach(item, content) + { + QCheckBox *checkbox = new QCheckBox(item,this); + pui->verticalLayout_2->addWidget(checkbox); + checkList.push_back(checkbox); + connect( checkbox, SIGNAL( clicked() ), this, SLOT( sendState() ) ); + } + } + else + { + QLabel *textInfo = new QLabel(this); + textInfo->setText("No Target available"); + pui->verticalLayout_2->addWidget(textInfo); + pui->checkBox->setDisabled(true); + } +} + +void ProjectionDialog::sendListToProject() +{ + MainWindow::getConnectionList()->setProjectProporties(source); + QCheckBox* cbox; + + foreach(cbox, checkList) + { + if (cbox->isChecked()) + { + MainWindow::getConnectionList()->addTargetToProjectList(cbox->text()); + } + } + emit accept(); +} + +void ProjectionDialog::cancelProject() +{ + emit reject(); +} + +void ProjectionDialog::sendState() +{ + QCheckBox* cbox; + bool set = false; + + foreach(cbox, checkList) + { + if (cbox->isChecked()) + { + pui->send->setDisabled(false); + set = true; + break; + } + } + + if (!set) + pui->send->setDisabled(true); + +} + +void ProjectionDialog::selectAll() +{ + if(pui->checkBox->isChecked()) + { + QCheckBox* cbox; + foreach(cbox, checkList) + cbox->setChecked(true); + pui->send->setDisabled(false); + } + else + { + QCheckBox* cbox; + foreach(cbox, checkList) + cbox->setChecked(false); + pui->send->setDisabled(true); + } +} + +void ProjectionDialog::changeEvent(QEvent *e) +{ + QDialog::changeEvent(e); + switch (e->type()) { + case QEvent::LanguageChange: + pui->retranslateUi(this); + break; + default: + break; + } +} diff --git a/src/gui/projectionDialog.h b/src/gui/projectionDialog.h new file mode 100644 index 0000000..842d255 --- /dev/null +++ b/src/gui/projectionDialog.h @@ -0,0 +1,46 @@ +/* + * projectionDialog.h + * + * Created on: 28.02.2010 + * Author: achillenana + */ + +#ifndef PROJECTIONDIALOG_H_ +#define PROJECTIONDIALOG_H_ + +#include <QDialog> +#include <QCheckBox> +//#include <src/gui/mainWindow.h> + + +class MainWindow; + +namespace Ui { + class projectionDialog; +} + +class ProjectionDialog : public QDialog { + Q_OBJECT +public: + ProjectionDialog(QWidget *parent = 0); + ~ProjectionDialog(); + + void setupContent(QList<QString> content); + +protected: + void changeEvent(QEvent *e); + +private: + Ui::projectionDialog *pui; + std::list<QCheckBox *> checkList; + QString source; + +private slots: + void sendListToProject(); + void cancelProject(); + void sendState(); + void selectAll(); +}; + + +#endif /* PROJECTIONDIALOG_H_ */ diff --git a/src/gui/serverChatDialog.cpp b/src/gui/serverChatDialog.cpp new file mode 100644 index 0000000..ec1f299 --- /dev/null +++ b/src/gui/serverChatDialog.cpp @@ -0,0 +1,281 @@ +/* + # Copyright (c) 2009, 2010 - OpenSLX Project, Computer Center University of + # Freiburg + # + # This program is free software distributed under the GPL version 2. + # See http://openslx.org/COPYING + # + # If you have any feedback please consult http://openslx.org/feedback and + # send your suggestions, praise, or complaints to feedback@openslx.org + # + # General information about OpenSLX can be found at http://openslx.org/ + # ----------------------------------------------------------------------------- + # serverChatDialog.cpp + # - graphical chat interface for the pvsmgr + # ----------------------------------------------------------------------------- + */ + +#include "serverChatDialog.h" +#include <src/gui/mainWindow.h> +#include "ui_serverChatDialog.h" + +ServerChatDialog::ServerChatDialog(QWidget *parent) : + QDialog(parent), uichat(new Ui::ServerChatDialogClass) +{ + uichat->setupUi(this); + _nickname = "PVSMGR"; + connect(uichat->pushButton, SIGNAL(clicked()), this, SLOT(chat_send())); + + // add first tab for public messages + uichat->tabWidget->clear(); + QTextEdit *t = new QTextEdit(); + t->setReadOnly(true); + uichat->tabWidget->addTab(t, "@all"); + _hash = new QHash<QString, QTextEdit*> (); + _hash->insert(uichat->tabWidget->tabText(0), t); + + // setup menu + _menu = new QMenu(); + _sendFileAction = new QAction(tr("&Send File..."), this); + _menu->addAction(_sendFileAction); + + connect(uichat->listWidget, SIGNAL(doubleClicked(QModelIndex)), this, + SLOT(addTab(QModelIndex))); + connect(uichat->tabWidget, SIGNAL(tabCloseRequested(int)), this, + SLOT(removeTab(int))); + connect(uichat->tabWidget, SIGNAL(currentChanged(int)), this, SLOT(removeIcon(int))); + connect(uichat->listWidget, SIGNAL(customContextMenuRequested(QPoint)), this, + SLOT(showMenu(QPoint))); + connect(_sendFileAction, SIGNAL(triggered()), this, SLOT(sendFile())); + + this->setAcceptDrops(true); +} + +ServerChatDialog::~ServerChatDialog() +{ +} + +void ServerChatDialog::setTrayIcon(QSystemTrayIcon *trayIcon) +{ + // _trayIcon = trayIcon; + // FIXME: messageClicked() is always emitted, not only on chat msg + //connect(_trayIcon, SIGNAL(messageClicked()), this, SLOT(open())); +} + +//////////////////////////////////////////////////////////////////////////////// +// Slots + +void ServerChatDialog::open() +{ + uichat->lineEdit->setFocus(); + setVisible(true); +} + +void ServerChatDialog::chat_receive(QString nick_from, QString nick_to, + QString msg) +{ + qDebug("[%s] R %s <- %s : %s", metaObject()->className(), + qPrintable(nick_to), qPrintable(nick_from), qPrintable(msg)); + + if (nick_to == uichat->tabWidget->tabText(0)) + showMsg(nick_from, msg, getTab(nick_to)); // public message or own msg + else + { + if (nick_to == "PVSMGR") + showMsg(nick_from, msg, getTab(nick_from)); // private message + else if (nick_from == "PVSMGR") + showMsg(nick_from, msg, getTab(nick_to)); // private message + } +} + +void ServerChatDialog::chat_send() +{ + QString msg = uichat->lineEdit->text(); + if (msg != "") + { + msg = "PVSMGR:"+ msg; + QString nick_to = uichat->tabWidget->tabText(uichat->tabWidget->currentIndex()); + PVSMsg myMsg(PVSMESSAGE, nick_to, msg, 0); + MainWindow::getWindow()->sendChatMsg(myMsg); + uichat->lineEdit->clear(); + uichat->lineEdit->setFocus(); + + qDebug("[%s] S %s -> %s : %s", metaObject()->className(), + qPrintable(_nickname), qPrintable(nick_to), qPrintable(msg)); + + } +} + +void ServerChatDialog::chat_nicklist_update() +{ + uichat->listWidget->clear(); + uichat->listWidget->addItems(_nickList); +} + +void ServerChatDialog::chat_client_add(QString nick) +{ + if (!_nickList.contains(nick)) + _nickList.append(nick); + showEvent("-> " + nick + tr(" has joined the chat.")); +} + +void ServerChatDialog::chat_client_remove(QString nick) +{ + _nickList.removeOne(nick); + showEvent("<- " + nick + tr(" has left the chat.")); +} + +void ServerChatDialog::addTab(QModelIndex i) +{ + QString text = i.data().toString(); + if (_hash->contains(text)) + { + uichat->tabWidget->setCurrentWidget(_hash->value(text)); + } + else + { + QTextEdit *t = new QTextEdit(); + t->setReadOnly(true); + uichat->tabWidget->setCurrentIndex(uichat->tabWidget->addTab(t, text)); + _hash->insert(text, t); + } + uichat->lineEdit->setFocus(); +} + +void ServerChatDialog::removeTab(int i) +{ + if (i != 0) + { + _tabList.removeOne(_hash->value(uichat->tabWidget->tabText(i))); + _hash->remove(uichat->tabWidget->tabText(i)); + uichat->tabWidget->removeTab(i); + uichat->lineEdit->setFocus(); + } +} + +void ServerChatDialog::removeIcon(int i) +{ + uichat->tabWidget->setTabIcon(i, QIcon()); +} + +//////////////////////////////////////////////////////////////////////////////// +// Private + +QTextEdit* ServerChatDialog::getTab(QString text) +{ + if (!_hash->contains(text)) + { + QTextEdit *t = new QTextEdit(); + t->setReadOnly(true); + uichat->tabWidget->addTab(t, text); + _hash->insert(text, t); + _tabList.append(t); + } + uichat->lineEdit->setFocus(); + return _hash->value(text); +} + +void ServerChatDialog::showMsg(QString nick_from, QString msg, QTextEdit *t) +{ + // move cursor at the end + t->moveCursor(QTextCursor::End); + + // print time + if (nick_from == "PVSMGR") + t->setTextColor(QColor(0, 100, 100)); + else + t->setTextColor(QColor(0, 100, 0)); + t->append("[" + QTime::currentTime().toString("hh:mm") + "] "); + + // print nickname + if (nick_from == "PVSMGR") + t->setTextColor(QColor(0, 100, 255)); + else + t->setTextColor(QColor(0, 0, 255)); + t->insertPlainText("<" + nick_from + "> "); + + // print message + if (nick_from == "PVSMGR") + t->setTextColor(QColor(100, 100, 100)); + else + t->setTextColor(QColor(0, 0, 0)); + t->insertPlainText(msg); + + // show icon if not current tab + if (uichat->tabWidget->currentIndex() != uichat->tabWidget->indexOf(t)) + uichat->tabWidget->setTabIcon(uichat->tabWidget->indexOf(t), QIcon(":chat_msg16.svg")); +} + +void ServerChatDialog::showMenu(QPoint p) +{ + _menu->popup(uichat->listWidget->mapToGlobal(p)); +} + +void ServerChatDialog::sendFile() +{ + ServerFileTransfert* sft = new ServerFileTransfert(this); + QString cTab = uichat->listWidget->currentItem()->text(); + QString hostIP = PVSConnectionManager::getManager()->getClientFromUsername(cTab)->getIp(); + if (hostIP != "") + sft->sendFileToHost(hostIP); +} + +void ServerChatDialog::sendFile(QString filename) +{ + if (uichat->tabWidget->currentIndex() == 0 || filename == "") + return; + + // ask user + QString nick = uichat->tabWidget->tabText(uichat->tabWidget->currentIndex()); + QMessageBox::StandardButton result = QMessageBox::question(0, + tr("PVS File Transfer with ")+nick, + tr("Send file '") + filename + tr("' to ") + nick + "?", + QMessageBox::Ok | QMessageBox::Cancel, QMessageBox::Ok); + + if (result != QMessageBox::Ok) + return; + + ServerFileTransfert* sft = new ServerFileTransfert(this); + QString hostIP = PVSConnectionManager::getManager()->getClientFromUsername(nick)->getIp(); + if (hostIP != "") + sft->sendFileToHost(hostIP, filename); +} + + +void ServerChatDialog::showEvent(QString msg) +{ + QTextEdit *t = _hash->value(uichat->tabWidget->tabText(0)); + + // move cursor at the end + t->moveCursor(QTextCursor::End); + + t->setTextColor(QColor(150, 150, 150)); + + // print time + t->append("[" + QTime::currentTime().toString("hh:mm") + "] "); + + // print message + t->insertPlainText(msg); +} + +void ServerChatDialog::dragEnterEvent(QDragEnterEvent *event) +{ + event->accept(); +} + +void ServerChatDialog::dragMoveEvent(QDragMoveEvent *event) +{ + event->accept(); +} + +void ServerChatDialog::dragLeaveEvent(QDragLeaveEvent *event) +{ + event->accept(); +} + +void ServerChatDialog::dropEvent(QDropEvent *event) +{ + event->accept(); + if (event->mimeData()->hasUrls()) + sendFile(event->mimeData()->urls()[0].toLocalFile()); +} diff --git a/src/gui/serverChatDialog.h b/src/gui/serverChatDialog.h new file mode 100644 index 0000000..728af05 --- /dev/null +++ b/src/gui/serverChatDialog.h @@ -0,0 +1,67 @@ +#ifndef SERVERCHATDIALOG_H_ +#define SERVERCHATDIALOG_H_ + +#include <QtGui> +#include <src/gui/serverFileTransfert.h> +#include "pvsinterface.h" + +class MainWindow; + +namespace Ui +{ + class ServerChatDialogClass; +} + +class ServerChatDialog: public QDialog +{ + Q_OBJECT + +public: + ServerChatDialog(QWidget *parent = 0); + ~ServerChatDialog(); + void setTrayIcon(QSystemTrayIcon *trayIcon); + void chat_nicklist_update(); + void chat_client_add(QString nick); + void chat_client_remove(QString nick); + +public Q_SLOTS: + void open(); + void chat_receive(QString nick_from, QString nick_to, QString msg); + void chat_send(); + + +private Q_SLOTS: + void addTab(QModelIndex i); + void sendFile(); + void showMenu(QPoint p); + void removeTab(int i); + void removeIcon(int i); + +private: + Ui::ServerChatDialogClass *uichat; + QTextEdit* getTab(QString text); + void showMsg(QString nick_from, QString msg, QTextEdit *t); + void sendFile(QString filename); + void showEvent(QString msg); + + QList<QTextEdit *> _tabList; + + QHash<QString, QTextEdit*> *_hash; + + QString _nickname; + QStringList _nickList; + + QMenu* _menu; + QAction* _sendFileAction; + +protected: + void dragEnterEvent(QDragEnterEvent *event); + void dragMoveEvent(QDragMoveEvent *event); + void dragLeaveEvent(QDragLeaveEvent *event); + void dropEvent(QDropEvent *event); + +}; + + + +#endif /* SERVERCHATDIALOG_H_ */ diff --git a/src/gui/serverFileTransfert.cpp b/src/gui/serverFileTransfert.cpp new file mode 100644 index 0000000..22e268b --- /dev/null +++ b/src/gui/serverFileTransfert.cpp @@ -0,0 +1,265 @@ +/* +# Copyright (c) 2009 - OpenSLX Project, Computer Center University of Freiburg +# +# This program is free software distributed under the GPL version 2. +# See http://openslx.org/COPYING +# +# If you have any feedback please consult http://openslx.org/feedback and +# send your suggestions, praise, or complaints to feedback@openslx.org +# +# General information about OpenSLX can be found at http://openslx.org/ +# ----------------------------------------------------------------------------- +# src/gui/serverFileTransfert.cpp +# This class manage any file transfert from and to server. +# ----------------------------------------------------------------------------- +*/ + +#include "serverFileTransfert.h" + +ServerFileTransfert::ServerFileTransfert(QWidget *parent): + QDialog(parent) +{ + setupUi(this); + _file = NULL; + _socket = NULL; + + connect(this, SIGNAL(finished(int)), this, SLOT(deleteLater())); +} + +ServerFileTransfert::~ServerFileTransfert() +{ +} + +void ServerFileTransfert::sendFileToHost(QString host) +{ + QString filename = QFileDialog::getOpenFileName(this, tr("Open File"), + QDir::homePath(), ""); + if (filename == "") + { + reject(); + return; + } + sendFileToHost(host, filename); +} + +void ServerFileTransfert::sendFileToHost(QString host, QString filename) +{ + // open file + _file = new QFile(filename); + _file->open(QIODevice::ReadOnly); + _bytesToWrite = _file->size(); + div = 1 + _bytesToWrite / 1000000000; // bc. progressBar supports only int + + // get host from backend + + // gui + filenameLabel->setText(filename); + progressBar->setValue(0); + progressBar->setMaximum(_bytesToWrite/div); + labelB->setText(formatSize(_bytesToWrite)); + connect(cancelButton, SIGNAL(clicked()), this, SLOT(close())); + + // open socket + _socket = new QTcpSocket(); + _socket->connectToHost(host, 29481); + if (_socket->isOpen()) + qDebug("connection open"); + else + qDebug("connection closed"); + qDebug("[%s] Remote host: %s", metaObject()->className(), qPrintable(host)); + + connect(_socket, SIGNAL(connected()), this, SLOT(sendHeader())); + connect(_socket, SIGNAL(disconnected()), this, SLOT(close())); + connect(_socket, SIGNAL(error(QAbstractSocket::SocketError)), + this, SLOT(error(QAbstractSocket::SocketError))); + qDebug("connect is set"); +} + +void ServerFileTransfert::receiveFileFromHost(QTcpSocket* socket) +{ + + _bytesToRead = 0; + _socket = socket; + + connect(_socket, SIGNAL(readyRead()), this, SLOT(receiveHeader())); + connect(_socket, SIGNAL(disconnected()), this, SLOT(close())); + connect(_socket, SIGNAL(error(QAbstractSocket::SocketError)), + this, SLOT(error(QAbstractSocket::SocketError))); + + qDebug("[%s] New Connection: %s", metaObject()->className(), + qPrintable(_socket->peerAddress().toString())); +} + +void ServerFileTransfert::sendHeader() +{ + qDebug("[%s] Sending header(1)...", metaObject()->className()); + QFileInfo info(_file->fileName()); + QString size = QString::number(_bytesToWrite); + QString header = "PVSMGR;" + info.fileName() + ";" + size + "\n"; + _socket->write(header.toLocal8Bit()); + connect(_socket, SIGNAL(readyRead()), this, SLOT(receiveAck())); + qDebug("[%s] Sending header...", metaObject()->className()); +} + +void ServerFileTransfert::receiveHeader() +{ + // parse header + QString header = QString::fromUtf8(_socket->readLine()); + QStringList args = header.split(";"); + QString nick = args[0]; + QString filename = args[1]; + _bytesToRead = args[2].toLongLong(); + div = 1 + _bytesToRead / 1000000000; // bc. progressBar supports only int + + qDebug("[%s] Received header.", metaObject()->className()); + + // ask user + QMessageBox::StandardButton result = QMessageBox::question(0, + tr("PVS File Transfer"),tr("User '") + nick + + tr("' would like to send you a file: ") + filename + + " (" + formatSize(_bytesToRead) + ").", + QMessageBox::Ok | QMessageBox::Cancel, QMessageBox::Ok); + + if (result != QMessageBox::Ok) + { + sendAck(false); + return; + } + + // open file + QString saveAs = QFileDialog::getSaveFileName(this, tr("Open File"), + QDir::homePath() + QDir::separator() + filename, ""); + if (saveAs == "") + { + sendAck(false); + return; + } + _file = new QFile(saveAs); + _file->open(QIODevice::WriteOnly); + + // gui + filenameLabel->setText(saveAs); + progressBar->setValue(0); + progressBar->setMaximum(_bytesToRead/div); + labelB->setText(formatSize(_bytesToRead)); + connect(cancelButton, SIGNAL(clicked()), this, SLOT(close())); + + sendAck(true); + show(); +} + +void ServerFileTransfert::sendAck(bool b) +{ + disconnect(_socket, SIGNAL(readyRead()), this, SLOT(receiveHeader())); + + if (b) + { + QString ack = QString("ok\n"); + _socket->write(ack.toUtf8()); + qDebug("[%s] Sending ack...", metaObject()->className()); + connect(_socket, SIGNAL(readyRead()), this, SLOT(receiveFile())); + } + else + { + QString ack = QString("no\n"); + _socket->write(ack.toUtf8()); + qDebug("[%s] Sending nack!!!", metaObject()->className()); + close(); + } +} + +void ServerFileTransfert::receiveAck() +{ + QString ack = QString::fromUtf8(_socket->readLine()); + if (ack != "ok\n") + { + qDebug("[%s] Received nack!", metaObject()->className()); + close(); + return; + } + qDebug("[%s] Received ack.", metaObject()->className()); + + disconnect(_socket, SIGNAL(readyRead()), this, SLOT(receiveAck())); + connect(_socket, SIGNAL(bytesWritten(qint64)), this, SLOT(sendFile())); + this->show(); + qDebug("[%s] Sending file...", metaObject()->className()); + sendFile(); +} + +void ServerFileTransfert::sendFile() +{ + if (_bytesToWrite == 0) + { + qDebug("[%s] Transfer completed.", metaObject()->className()); + close(); // finished + } + else + { + qint64 bytesWritten = _socket->write(_file->read(1024)); // data left + _bytesToWrite -= bytesWritten; + progressBar->setValue(progressBar->value() + bytesWritten/div); + labelA->setText(formatSize(progressBar->value()*div)); + } +} + +void ServerFileTransfert::receiveFile() +{ + qint64 bytesRead = _file->write(_socket->readAll()); + _bytesToRead -= bytesRead; + progressBar->setValue(progressBar->value() + bytesRead/div); + labelA->setText(formatSize(progressBar->value()*div)); +} + +void ServerFileTransfert::close() +{ + if (_file && _file->isOpen()) + { + _file->close(); + qDebug("[%s] File closed.", metaObject()->className()); + } + + if (_socket && _socket->isOpen()) + { + disconnect(_socket, SIGNAL(readyRead()), this, SLOT(receiveAck())); + disconnect(_socket, SIGNAL(bytesWritten(qint64)), this, SLOT(sendFile())); + disconnect(_socket, SIGNAL(disconnected()), this, SLOT(close())); + disconnect(_socket, SIGNAL(connected()), this, SLOT(sendHeader())); + disconnect(_socket, SIGNAL(error(QAbstractSocket::SocketError)), + this, SLOT(error(QAbstractSocket::SocketError))); + _socket->disconnectFromHost(); + qDebug("[%s] Connection closed.", metaObject()->className()); + } + + disconnect(cancelButton, SIGNAL(clicked()), this, SLOT(close())); + + if (_bytesToWrite == 0) + { + accept(); + QMessageBox::information(0, tr("PVS - File Transfer"), + tr("File Transfer complete.")); + } + else + { + reject(); + QMessageBox::warning(0, tr("PVS - File Transfer"), + tr("File Transfer canceled!")); + } +} + +void ServerFileTransfert::error(QAbstractSocket::SocketError error) +{ + qDebug("[%s] Socket error: %i", metaObject()->className(), error); + close(); +} + +QString ServerFileTransfert::formatSize(qint64 size) +{ + if (size >= 1000000000) // GB + return QString("%1GB").arg((qreal)size / 1000000000, 0, 'f',1); + else if (size >= 1000000) // MB + return QString("%1MB").arg((qreal)size / 1000000, 0, 'f',1); + else if (size >= 1000) // KB + return QString("%1KB").arg((qreal)size / 1000, 0, 'f',1); + else // B + return QString("%1B").arg((qreal)size, 0, 'f',1); +} diff --git a/src/gui/serverFileTransfert.h b/src/gui/serverFileTransfert.h new file mode 100644 index 0000000..96b30e5 --- /dev/null +++ b/src/gui/serverFileTransfert.h @@ -0,0 +1,52 @@ +#ifndef SERVERFILETRANSFERT_H_ +#define SERVERFILETRANSFERT_H_ + + +#include <QtGui> +#include <QtNetwork> +#include "ui_clientFileSendDialog.h" + +/*namespace Ui +{ + class ClientFileSendDialogClass; +}*/ + +class ServerFileTransfert: public QDialog, + private Ui::ClientFileSendDialogClass + +{ + Q_OBJECT + +public: + ServerFileTransfert (QWidget *parent=0); + ~ServerFileTransfert (); + + void sendFileToHost(QString host); + void sendFileToHost(QString host, QString filename); + void receiveFileFromHost(QTcpSocket* socket); + + //Ui::ClientFileSendDialogClass* uitr; + +private Q_SLOTS: + void sendHeader(); + void receiveHeader(); + void receiveAck(); + void sendFile(); + void receiveFile(); + void close(); + void error(QAbstractSocket::SocketError error); + +private: + void sendAck(bool b); + QString formatSize(qint64 size); + + QTcpSocket *_socket; + QFile *_file; + qint64 _bytesToWrite; + qint64 _bytesToRead; + int div; + +}; + + +#endif /* SERVERFILETRANSFERT_H_ */ diff --git a/src/gui/ui/aboutDialog.ui b/src/gui/ui/aboutDialog.ui new file mode 100644 index 0000000..07d9852 --- /dev/null +++ b/src/gui/ui/aboutDialog.ui @@ -0,0 +1,251 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>AboutDialogClass</class> + <widget class="QDialog" name="AboutDialogClass"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>460</width> + <height>363</height> + </rect> + </property> + <property name="windowTitle"> + <string>PVS - About</string> + </property> + <property name="windowIcon"> + <iconset resource="../../../pvsgui.qrc"> + <normaloff>:/cam32.svg</normaloff>:/cam32.svg</iconset> + </property> + <property name="locale"> + <locale language="English" country="UnitedStates"/> + </property> + <layout class="QVBoxLayout" name="verticalLayout_2"> + <item> + <layout class="QHBoxLayout" name="horizontalLayout_2"> + <item> + <spacer name="horizontalSpacer_2"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QLabel" name="label_7"> + <property name="text"> + <string/> + </property> + <property name="pixmap"> + <pixmap resource="../../../pvsgui.qrc">:/cam32.svg</pixmap> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="label_5"> + <property name="text"> + <string notr="true"><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:24pt; font-weight:600;">PVS</span></p></body></html></string> + </property> + </widget> + </item> + <item> + <spacer name="horizontalSpacer_3"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + </layout> + </item> + <item> + <layout class="QHBoxLayout" name="horizontalLayout_3"> + <item> + <spacer name="horizontalSpacer_4"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QLabel" name="label_version"> + <property name="text"> + <string notr="true">Version: xx.xx.xx</string> + </property> + </widget> + </item> + <item> + <spacer name="horizontalSpacer_5"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + </layout> + </item> + <item> + <widget class="QTabWidget" name="tabWidget"> + <property name="currentIndex"> + <number>0</number> + </property> + <widget class="QWidget" name="tab"> + <attribute name="title"> + <string>About</string> + </attribute> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QLabel" name="label_2"> + <property name="text"> + <string notr="true">Pool Video Switch</string> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="label_3"> + <property name="text"> + <string notr="true">feedback@openslx.org</string> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="label_4"> + <property name="text"> + <string notr="true">(c) 2009-2010, OpenSLX Project, University of Freiburg</string> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="label"> + <property name="text"> + <string notr="true"><a href="http://lab.openslx.org/projects/pvs">http://lab.openslx.org/projects/pvs</a></string> + </property> + <property name="openExternalLinks"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="label_6"> + <property name="text"> + <string><a href="http://www.gnu.org/licenses/gpl-2.0.txt">License: GNU General Public License Version 2</a></string> + </property> + <property name="openExternalLinks"> + <bool>true</bool> + </property> + </widget> + </item> + </layout> + </widget> + <widget class="QWidget" name="tab_1"> + <attribute name="title"> + <string>Authors</string> + </attribute> + <layout class="QVBoxLayout" name="verticalLayout_3"> + <item> + <widget class="QPlainTextEdit" name="plainTextEdit_authors"> + <property name="lineWrapMode"> + <enum>QPlainTextEdit::NoWrap</enum> + </property> + <property name="readOnly"> + <bool>true</bool> + </property> + <property name="plainText"> + <string/> + </property> + <property name="centerOnScroll"> + <bool>false</bool> + </property> + </widget> + </item> + </layout> + </widget> + <widget class="QWidget" name="tab_2"> + <attribute name="title"> + <string>Translation</string> + </attribute> + <layout class="QVBoxLayout" name="verticalLayout_4"> + <item> + <widget class="QPlainTextEdit" name="plainTextEdit_translation"> + <property name="readOnly"> + <bool>true</bool> + </property> + </widget> + </item> + </layout> + </widget> + </widget> + </item> + <item> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <spacer name="horizontalSpacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="standardButtons"> + <set>QDialogButtonBox::Close</set> + </property> + </widget> + </item> + </layout> + </item> + </layout> + </widget> + <resources> + <include location="../../../pvsgui.qrc"/> + </resources> + <connections> + <connection> + <sender>buttonBox</sender> + <signal>rejected()</signal> + <receiver>AboutDialogClass</receiver> + <slot>reject()</slot> + <hints> + <hint type="sourcelabel"> + <x>388</x> + <y>351</y> + </hint> + <hint type="destinationlabel"> + <x>109</x> + <y>333</y> + </hint> + </hints> + </connection> + </connections> +</ui> diff --git a/src/gui/ui/clientChatDialog.ui b/src/gui/ui/clientChatDialog.ui new file mode 100644 index 0000000..43f64a9 --- /dev/null +++ b/src/gui/ui/clientChatDialog.ui @@ -0,0 +1,121 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>ClientChatDialogClass</class> + <widget class="QDialog" name="ClientChatDialogClass"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>641</width> + <height>659</height> + </rect> + </property> + <property name="windowTitle"> + <string>PVS - Chat </string> + </property> + <property name="windowIcon"> + <iconset resource="../../../pvsgui.qrc"> + <normaloff>:/cam32.svg</normaloff>:/cam32.svg</iconset> + </property> + <property name="locale"> + <locale language="English" country="UnitedStates"/> + </property> + <layout class="QVBoxLayout" name="verticalLayout_2"> + <item> + <widget class="QSplitter" name="splitter"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <widget class="QListWidget" name="listWidget"> + <property name="maximumSize"> + <size> + <width>150</width> + <height>16777215</height> + </size> + </property> + <property name="contextMenuPolicy"> + <enum>Qt::CustomContextMenu</enum> + </property> + <property name="sortingEnabled"> + <bool>true</bool> + </property> + </widget> + <widget class="QTabWidget" name="tabWidget"> + <property name="tabPosition"> + <enum>QTabWidget::South</enum> + </property> + <property name="tabsClosable"> + <bool>true</bool> + </property> + <widget class="QWidget" name="tab"> + <attribute name="title"> + <string notr="true">@all</string> + </attribute> + <layout class="QVBoxLayout" name="verticalLayout"/> + </widget> + </widget> + </widget> + </item> + <item> + <widget class="QLineEdit" name="lineEdit"/> + </item> + <item> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <spacer name="horizontalSpacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QPushButton" name="pushButton"> + <property name="text"> + <string>&Send</string> + </property> + <property name="autoDefault"> + <bool>false</bool> + </property> + <property name="default"> + <bool>true</bool> + </property> + </widget> + </item> + </layout> + </item> + </layout> + </widget> + <resources> + <include location="../../../pvsgui.qrc"/> + </resources> + <connections> + <connection> + <sender>lineEdit</sender> + <signal>returnPressed()</signal> + <receiver>pushButton</receiver> + <slot>click()</slot> + <hints> + <hint type="sourcelabel"> + <x>252</x> + <y>560</y> + </hint> + <hint type="destinationlabel"> + <x>529</x> + <y>589</y> + </hint> + </hints> + </connection> + </connections> +</ui> diff --git a/src/gui/ui/clientConfigDialog.ui b/src/gui/ui/clientConfigDialog.ui new file mode 100644 index 0000000..3262b6b --- /dev/null +++ b/src/gui/ui/clientConfigDialog.ui @@ -0,0 +1,280 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>ClientConfigDialogClass</class> + <widget class="QDialog" name="ClientConfigDialogClass"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>438</width> + <height>257</height> + </rect> + </property> + <property name="windowTitle"> + <string>PVS - Configuration</string> + </property> + <property name="windowIcon"> + <iconset resource="../../../pvsgui.qrc"> + <normaloff>:/cam32.svg</normaloff>:/cam32.svg</iconset> + </property> + <property name="locale"> + <locale language="English" country="UnitedStates"/> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QTabWidget" name="tabWidget"> + <property name="tabPosition"> + <enum>QTabWidget::North</enum> + </property> + <property name="currentIndex"> + <number>0</number> + </property> + <widget class="QWidget" name="tabPermissions"> + <attribute name="title"> + <string>Permissions</string> + </attribute> + <layout class="QVBoxLayout" name="verticalLayout_6"> + <item> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <widget class="QGroupBox" name="groupBox"> + <property name="title"> + <string>Allow vnc access to lecturer?</string> + </property> + <property name="flat"> + <bool>true</bool> + </property> + <property name="checkable"> + <bool>false</bool> + </property> + <layout class="QVBoxLayout" name="verticalLayout_4"> + <item> + <widget class="QRadioButton" name="radioButtonLecturerRW"> + <property name="text"> + <string>Full access</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <widget class="QRadioButton" name="radioButtonLecturerRO"> + <property name="text"> + <string>View only</string> + </property> + </widget> + </item> + <item> + <widget class="QRadioButton" name="radioButtonLecturerNO"> + <property name="text"> + <string>None</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <widget class="Line" name="line_2"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + </widget> + </item> + <item> + <widget class="QGroupBox" name="groupBox_2"> + <property name="title"> + <string>Allow vnc access to other?</string> + </property> + <property name="flat"> + <bool>true</bool> + </property> + <layout class="QVBoxLayout" name="verticalLayout_2"> + <item> + <widget class="QRadioButton" name="radioButtonOtherRW"> + <property name="text"> + <string>Full access</string> + </property> + </widget> + </item> + <item> + <widget class="QRadioButton" name="radioButtonOtherRO"> + <property name="text"> + <string>View only</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <widget class="QRadioButton" name="radioButtonOtherNO"> + <property name="text"> + <string>None</string> + </property> + <property name="checked"> + <bool>false</bool> + </property> + </widget> + </item> + </layout> + </widget> + </item> + </layout> + </item> + <item> + <widget class="Line" name="line"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + </widget> + </item> + <item> + <layout class="QVBoxLayout" name="verticalLayout_5"> + <item> + <widget class="QCheckBox" name="checkBoxAllowChat"> + <property name="text"> + <string>Accept chat messages</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="checkBoxAllowFiletransfer"> + <property name="text"> + <string>Accept file transfers</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + </widget> + </item> + </layout> + </item> + </layout> + </widget> + <widget class="QWidget" name="tabDisplay"> + <attribute name="title"> + <string>Display</string> + </attribute> + <layout class="QVBoxLayout" name="verticalLayout_3"> + <item> + <widget class="QComboBox" name="comboBox"> + <item> + <property name="text"> + <string>Top Left</string> + </property> + </item> + <item> + <property name="text"> + <string>Top Center</string> + </property> + </item> + <item> + <property name="text"> + <string>Top Right</string> + </property> + </item> + <item> + <property name="text"> + <string>Bottom Left</string> + </property> + </item> + <item> + <property name="text"> + <string>Bottom Center</string> + </property> + </item> + <item> + <property name="text"> + <string>Bottom Right</string> + </property> + </item> + </widget> + </item> + </layout> + </widget> + </widget> + </item> + <item> + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="standardButtons"> + <set>QDialogButtonBox::Cancel|QDialogButtonBox::Save</set> + </property> + </widget> + </item> + </layout> + </widget> + <resources> + <include location="../../../pvsgui.qrc"/> + </resources> + <connections> + <connection> + <sender>buttonBox</sender> + <signal>accepted()</signal> + <receiver>ClientConfigDialogClass</receiver> + <slot>accept()</slot> + <hints> + <hint type="sourcelabel"> + <x>62</x> + <y>274</y> + </hint> + <hint type="destinationlabel"> + <x>4</x> + <y>37</y> + </hint> + </hints> + </connection> + <connection> + <sender>buttonBox</sender> + <signal>rejected()</signal> + <receiver>ClientConfigDialogClass</receiver> + <slot>reject()</slot> + <hints> + <hint type="sourcelabel"> + <x>195</x> + <y>274</y> + </hint> + <hint type="destinationlabel"> + <x>233</x> + <y>32</y> + </hint> + </hints> + </connection> + <connection> + <sender>radioButtonOtherRW</sender> + <signal>clicked()</signal> + <receiver>radioButtonLecturerRW</receiver> + <slot>click()</slot> + <hints> + <hint type="sourcelabel"> + <x>87</x> + <y>167</y> + </hint> + <hint type="destinationlabel"> + <x>198</x> + <y>56</y> + </hint> + </hints> + </connection> + <connection> + <sender>radioButtonLecturerNO</sender> + <signal>clicked()</signal> + <receiver>radioButtonOtherNO</receiver> + <slot>click()</slot> + <hints> + <hint type="sourcelabel"> + <x>149</x> + <y>106</y> + </hint> + <hint type="destinationlabel"> + <x>84</x> + <y>219</y> + </hint> + </hints> + </connection> + </connections> +</ui> diff --git a/src/gui/ui/clientFileReceiveDialog.ui b/src/gui/ui/clientFileReceiveDialog.ui new file mode 100644 index 0000000..af3a135 --- /dev/null +++ b/src/gui/ui/clientFileReceiveDialog.ui @@ -0,0 +1,134 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>ClientFileReceiveDialogClass</class> + <widget class="QDialog" name="ClientFileReceiveDialogClass"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>208</width> + <height>108</height> + </rect> + </property> + <property name="windowTitle"> + <string>PVS - File Transfer</string> + </property> + <property name="windowIcon"> + <iconset resource="../../../pvsgui.qrc"> + <normaloff>:/cam32.svg</normaloff>:/cam32.svg</iconset> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QLabel" name="filenameLabel"> + <property name="text"> + <string/> + </property> + </widget> + </item> + <item> + <widget class="QProgressBar" name="progressBar"> + <property name="value"> + <number>0</number> + </property> + </widget> + </item> + <item> + <layout class="QHBoxLayout" name="horizontalLayout_2"> + <item> + <widget class="QLabel" name="label"> + <property name="text"> + <string>Receiving from:</string> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="labelNick"> + <property name="text"> + <string>unknown</string> + </property> + </widget> + </item> + <item> + <spacer name="horizontalSpacer_2"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + </layout> + </item> + <item> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <widget class="QLabel" name="labelA"> + <property name="text"> + <string>0</string> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="label_2"> + <property name="text"> + <string>/</string> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="labelB"> + <property name="text"> + <string>0</string> + </property> + </widget> + </item> + <item> + <spacer name="horizontalSpacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QPushButton" name="cancelButton"> + <property name="text"> + <string>&Cancel</string> + </property> + </widget> + </item> + </layout> + </item> + </layout> + </widget> + <resources> + <include location="../../../pvsgui.qrc"/> + </resources> + <connections> + <connection> + <sender>cancelButton</sender> + <signal>clicked()</signal> + <receiver>ClientFileReceiveDialogClass</receiver> + <slot>reject()</slot> + <hints> + <hint type="sourcelabel"> + <x>220</x> + <y>242</y> + </hint> + <hint type="destinationlabel"> + <x>345</x> + <y>270</y> + </hint> + </hints> + </connection> + </connections> +</ui> diff --git a/src/gui/ui/clientFileSendDialog.ui b/src/gui/ui/clientFileSendDialog.ui new file mode 100644 index 0000000..d2d9c75 --- /dev/null +++ b/src/gui/ui/clientFileSendDialog.ui @@ -0,0 +1,134 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>ClientFileSendDialogClass</class> + <widget class="QDialog" name="ClientFileSendDialogClass"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>186</width> + <height>108</height> + </rect> + </property> + <property name="windowTitle"> + <string>PVS - File Transfer</string> + </property> + <property name="windowIcon"> + <iconset resource="../../../pvsgui.qrc"> + <normaloff>:/cam32.svg</normaloff>:/cam32.svg</iconset> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QLabel" name="filenameLabel"> + <property name="text"> + <string/> + </property> + </widget> + </item> + <item> + <widget class="QProgressBar" name="progressBar"> + <property name="value"> + <number>0</number> + </property> + </widget> + </item> + <item> + <layout class="QHBoxLayout" name="horizontalLayout_2"> + <item> + <widget class="QLabel" name="label"> + <property name="text"> + <string>Sending to:</string> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="labelNick"> + <property name="text"> + <string>unknown</string> + </property> + </widget> + </item> + <item> + <spacer name="horizontalSpacer_2"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + </layout> + </item> + <item> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <widget class="QLabel" name="labelA"> + <property name="text"> + <string>0</string> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="label_2"> + <property name="text"> + <string>/</string> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="labelB"> + <property name="text"> + <string>0</string> + </property> + </widget> + </item> + <item> + <spacer name="horizontalSpacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QPushButton" name="cancelButton"> + <property name="text"> + <string>&Cancel</string> + </property> + </widget> + </item> + </layout> + </item> + </layout> + </widget> + <resources> + <include location="../../../pvsgui.qrc"/> + </resources> + <connections> + <connection> + <sender>cancelButton</sender> + <signal>clicked()</signal> + <receiver>ClientFileSendDialogClass</receiver> + <slot>reject()</slot> + <hints> + <hint type="sourcelabel"> + <x>116</x> + <y>61</y> + </hint> + <hint type="destinationlabel"> + <x>38</x> + <y>55</y> + </hint> + </hints> + </connection> + </connections> +</ui> diff --git a/src/gui/ui/clientInfoDialog.ui b/src/gui/ui/clientInfoDialog.ui new file mode 100644 index 0000000..a186641 --- /dev/null +++ b/src/gui/ui/clientInfoDialog.ui @@ -0,0 +1,60 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>InfoDialogClass</class> + <widget class="QDialog" name="InfoDialogClass"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>312</width> + <height>203</height> + </rect> + </property> + <property name="windowTitle"> + <string>PVS - Information</string> + </property> + <property name="windowIcon"> + <iconset resource="../../../pvsgui.qrc"> + <normaloff>:/cam32.svg</normaloff>:/cam32.svg</iconset> + </property> + <property name="styleSheet"> + <string notr="true">QDialog { + background-color: white; +}</string> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QLabel" name="hostLabel"> + <property name="text"> + <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:72pt; font-weight:600; color:#0000ff;">HOST</span></p></body></html></string> + </property> + <property name="alignment"> + <set>Qt::AlignCenter</set> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="passwdLabel"> + <property name="text"> + <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:48pt; font-weight:600; color:#ff0000;">PASSWD</span></p></body></html></string> + </property> + <property name="alignment"> + <set>Qt::AlignCenter</set> + </property> + </widget> + </item> + </layout> + </widget> + <resources> + <include location="../../../pvsgui.qrc"/> + </resources> + <connections/> +</ui> diff --git a/src/gui/ui/clientNicklistDialog.ui b/src/gui/ui/clientNicklistDialog.ui new file mode 100644 index 0000000..afd84f1 --- /dev/null +++ b/src/gui/ui/clientNicklistDialog.ui @@ -0,0 +1,110 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>ClientNicklistDialogClass</class> + <widget class="QDialog" name="ClientNicklistDialogClass"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>264</width> + <height>396</height> + </rect> + </property> + <property name="windowTitle"> + <string>PVS - Users</string> + </property> + <property name="windowIcon"> + <iconset resource="../../../pvsgui.qrc"> + <normaloff>:/cam32.svg</normaloff>:/cam32.svg</iconset> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QLabel" name="label"> + <property name="text"> + <string>Select user:</string> + </property> + </widget> + </item> + <item> + <widget class="QListWidget" name="listWidget"/> + </item> + <item> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <spacer name="horizontalSpacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="standardButtons"> + <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> + </property> + </widget> + </item> + </layout> + </item> + </layout> + </widget> + <resources> + <include location="../../../pvsgui.qrc"/> + </resources> + <connections> + <connection> + <sender>buttonBox</sender> + <signal>accepted()</signal> + <receiver>ClientNicklistDialogClass</receiver> + <slot>accept()</slot> + <hints> + <hint type="sourcelabel"> + <x>258</x> + <y>390</y> + </hint> + <hint type="destinationlabel"> + <x>373</x> + <y>526</y> + </hint> + </hints> + </connection> + <connection> + <sender>buttonBox</sender> + <signal>rejected()</signal> + <receiver>ClientNicklistDialogClass</receiver> + <slot>reject()</slot> + <hints> + <hint type="sourcelabel"> + <x>258</x> + <y>390</y> + </hint> + <hint type="destinationlabel"> + <x>428</x> + <y>525</y> + </hint> + </hints> + </connection> + <connection> + <sender>listWidget</sender> + <signal>doubleClicked(QModelIndex)</signal> + <receiver>ClientNicklistDialogClass</receiver> + <slot>accept()</slot> + <hints> + <hint type="sourcelabel"> + <x>88</x> + <y>120</y> + </hint> + <hint type="destinationlabel"> + <x>27</x> + <y>375</y> + </hint> + </hints> + </connection> + </connections> +</ui> diff --git a/src/gui/ui/clientToolbar.ui b/src/gui/ui/clientToolbar.ui new file mode 100644 index 0000000..5a59c5f --- /dev/null +++ b/src/gui/ui/clientToolbar.ui @@ -0,0 +1,214 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>ClientToolbarClass</class> + <widget class="QWidget" name="ClientToolbarClass"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>577</width> + <height>28</height> + </rect> + </property> + <property name="windowTitle"> + <string>Form</string> + </property> + <property name="styleSheet"> + <string notr="true">QFrame { + 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::menu-indicator { + image: url(:/darrow16.svg); +} +/* QCheckBox */ +QCheckBox { +} +QCheckBox::indicator { + background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #f6f7fa, stop: 1 #dadbde); + border: 2px solid #8f8f91; + border-radius: 4px; + width: 16px; + height: 16px; +} +QCheckBox::indicator:unchecked { +} +QCheckBox::indicator:unchecked:hover { + border: 2px solid rgb(0, 170, 255); +} +QCheckBox::indicator:unchecked:pressed { + background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #dadbde, stop: 1 #f6f7fa); +} +QCheckBox::indicator:checked { + image: url(:/ok16.svg); +} +QCheckBox::indicator:checked:hover { + border: 2px solid rgb(0, 170, 255); +} +QCheckBox::indicator:checked:pressed { + background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #dadbde, stop: 1 #f6f7fa); +} +</string> + </property> + <layout class="QHBoxLayout" name="horizontalLayout_2"> + <property name="margin"> + <number>0</number> + </property> + <item> + <widget class="QFrame" name="frame"> + <property name="frameShape"> + <enum>QFrame::StyledPanel</enum> + </property> + <property name="frameShadow"> + <enum>QFrame::Raised</enum> + </property> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <widget class="QPushButton" name="pvsButton"> + <property name="toolTip"> + <string>Menu</string> + </property> + <property name="text"> + <string notr="true">Menu</string> + </property> + </widget> + </item> + <item> + <spacer name="horizontalSpacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QLabel" name="label_2"> + <property name="text"> + <string>Host:</string> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="hostButton"> + <property name="toolTip"> + <string>Click to connect</string> + </property> + <property name="text"> + <string>-</string> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="statusLabel"> + <property name="text"> + <string notr="true"><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" color:#ff0000;">Offline</span></p></body></html></string> + </property> + </widget> + </item> + <item> + <spacer name="horizontalSpacer_3"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QCheckBox" name="vncCheckBox"> + <property name="minimumSize"> + <size> + <width>0</width> + <height>0</height> + </size> + </property> + <property name="toolTip"> + <string>Enable/Disable VNC only for this session</string> + </property> + <property name="text"> + <string>Allow VNC</string> + </property> + </widget> + </item> + <item> + <spacer name="horizontalSpacer_2"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QLabel" name="label"> + <property name="text"> + <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt; font-weight:600; font-style:italic; color:#0055ff;">Pool Video Switch</span></p></body></html></string> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="label_3"> + <property name="maximumSize"> + <size> + <width>16</width> + <height>16</height> + </size> + </property> + <property name="text"> + <string/> + </property> + <property name="pixmap"> + <pixmap resource="../../../pvsgui.qrc">:/cam32.svg</pixmap> + </property> + <property name="scaledContents"> + <bool>true</bool> + </property> + </widget> + </item> + </layout> + </widget> + </item> + </layout> + </widget> + <resources> + <include location="../../../pvsgui.qrc"/> + </resources> + <connections/> +</ui> diff --git a/src/gui/ui/dialog.ui b/src/gui/ui/dialog.ui new file mode 100644 index 0000000..ec16160 --- /dev/null +++ b/src/gui/ui/dialog.ui @@ -0,0 +1,66 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>MsgDialog</class> + <widget class="QDialog" name="MsgDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>400</width> + <height>193</height> + </rect> + </property> + <property name="windowTitle"> + <string>Dialog</string> + </property> + <widget class="QWidget" name="layoutWidget"> + <property name="geometry"> + <rect> + <x>20</x> + <y>20</y> + <width>351</width> + <height>171</height> + </rect> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QTextEdit" name="message"/> + </item> + <item> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <spacer name="horizontalSpacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>108</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QPushButton" name="cancel"> + <property name="text"> + <string>Cancel</string> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="send"> + <property name="text"> + <string>Send</string> + </property> + </widget> + </item> + </layout> + </item> + </layout> + </widget> + </widget> + <layoutdefault spacing="6" margin="11"/> + <resources/> + <connections/> +</ui> diff --git a/src/gui/ui/mainwindow.ui b/src/gui/ui/mainwindow.ui new file mode 100644 index 0000000..eb49d1b --- /dev/null +++ b/src/gui/ui/mainwindow.ui @@ -0,0 +1,540 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>MainWindow</class> + <widget class="QMainWindow" name="MainWindow"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>838</width> + <height>607</height> + </rect> + </property> + <property name="windowTitle"> + <string>PVSmgr</string> + </property> + <widget class="QWidget" name="centralWidget"> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <widget class="QScrollArea" name="scrollArea"> + <property name="styleSheet"> + <string>border-color: rgb(0, 0, 0);</string> + </property> + <property name="widgetResizable"> + <bool>true</bool> + </property> + <widget class="QWidget" name="scrollAreaWidgetContents"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>776</width> + <height>534</height> + </rect> + </property> + <layout class="QGridLayout" name="gridLayout_2"> + <item row="0" column="0"> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <widget class="QLabel" name="label"> + <property name="text"> + <string>VNC quality</string> + </property> + </widget> + </item> + <item> + <widget class="QComboBox" name="vncQuality"> + <item> + <property name="text"> + <string>HIGH</string> + </property> + </item> + <item> + <property name="text"> + <string>MEDIUM</string> + </property> + </item> + <item> + <property name="text"> + <string>LOW</string> + </property> + </item> + </widget> + </item> + <item> + <widget class="Line" name="separator"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="setPassword"> + <property name="text"> + <string>Set password</string> + </property> + </widget> + </item> + <item> + <widget class="Line" name="line"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + </widget> + </item> + <item> + <widget class="QComboBox" name="thumbStatus"> + <item> + <property name="text"> + <string>Thumbnailratio</string> + </property> + </item> + <item> + <property name="text"> + <string>Thumbnailrate</string> + </property> + </item> + </widget> + </item> + <item> + <widget class="QSlider" name="horizontalSlider"> + <property name="minimum"> + <number>25</number> + </property> + <property name="maximum"> + <number>200</number> + </property> + <property name="singleStep"> + <number>25</number> + </property> + <property name="pageStep"> + <number>25</number> + </property> + <property name="value"> + <number>25</number> + </property> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="tickPosition"> + <enum>QSlider::TicksBothSides</enum> + </property> + <property name="tickInterval"> + <number>0</number> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="label_2"> + <property name="text"> + <string> 0</string> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="label_3"> + <property name="text"> + <string>%</string> + </property> + </widget> + </item> + </layout> + </item> + <item> + <widget class="QSplitter" name="splitter_2"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <widget class="QSplitter" name="splitter"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <widget class="QWidget" name="ClWidget" native="true"> + <property name="minimumSize"> + <size> + <width>150</width> + <height>240</height> + </size> + </property> + <property name="styleSheet"> + <string>background-color: rgb(255, 255, 255);</string> + </property> + <layout class="QGridLayout" name="gridLayout_5"> + <item row="0" column="0"> + <layout class="QGridLayout" name="ClientGLayout"/> + </item> + </layout> + </widget> + <widget class="QWidget" name="widget" native="true"> + <property name="styleSheet"> + <string>background-color: rgb(150, 150, 150);</string> + </property> + <layout class="QGridLayout" name="gridLayout_4"> + <item row="0" column="0"> + <layout class="QVBoxLayout" name="VconWinLayout"/> + </item> + </layout> + </widget> + </widget> + <widget class="QTextEdit" name="pvsLog"/> + </widget> + </item> + </layout> + </item> + </layout> + </widget> + </widget> + </item> + </layout> + </widget> + <widget class="QMenuBar" name="menuBar"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>838</width> + <height>28</height> + </rect> + </property> + <widget class="QMenu" name="menu_File"> + <property name="title"> + <string>&File</string> + </property> + <widget class="QMenu" name="menuLoad_profile"> + <property name="title"> + <string>Load profile </string> + </property> + </widget> + <addaction name="action_Disconnect"/> + <addaction name="separator"/> + <addaction name="actionCreate_profile"/> + <addaction name="separator"/> + <addaction name="menuLoad_profile"/> + <addaction name="separator"/> + <addaction name="action_Exit"/> + </widget> + <widget class="QMenu" name="menuClients"> + <property name="title"> + <string>&Clients</string> + </property> + <addaction name="actionShow_Fullname"/> + <addaction name="actionShow_Hostname_IP"/> + <addaction name="actionShow_Username"/> + <addaction name="separator"/> + <addaction name="actionVNC_Placeholders"/> + </widget> + <widget class="QMenu" name="menuLogging"> + <property name="title"> + <string>&Logging</string> + </property> + <addaction name="actionShow_Log"/> + <addaction name="separator"/> + <addaction name="actionShow_Normal"/> + <addaction name="actionShow_Error"/> + <addaction name="actionShow_Network"/> + <addaction name="actionShow_Terminal"/> + <addaction name="actionShow_Chat"/> + </widget> + <widget class="QMenu" name="menu_Help"> + <property name="title"> + <string>&Help</string> + </property> + <addaction name="actionAbout_pvs"/> + </widget> + <addaction name="menu_File"/> + <addaction name="menuClients"/> + <addaction name="menuLogging"/> + <addaction name="menu_Help"/> + </widget> + <widget class="QStatusBar" name="statusBar"/> + <widget class="QToolBar" name="toolBar"> + <property name="maximumSize"> + <size> + <width>129000</width> + <height>12900</height> + </size> + </property> + <property name="windowTitle"> + <string>toolBar</string> + </property> + <property name="layoutDirection"> + <enum>Qt::LeftToRight</enum> + </property> + <property name="autoFillBackground"> + <bool>true</bool> + </property> + <property name="movable"> + <bool>true</bool> + </property> + <property name="toolButtonStyle"> + <enum>Qt::ToolButtonIconOnly</enum> + </property> + <property name="floatable"> + <bool>false</bool> + </property> + <attribute name="toolBarArea"> + <enum>LeftToolBarArea</enum> + </attribute> + <attribute name="toolBarBreak"> + <bool>false</bool> + </attribute> + <addaction name="action_Exit"/> + <addaction name="action_Disconnect"/> + <addaction name="actionFoto"/> + <addaction name="actionView"/> + <addaction name="actionLock"/> + <addaction name="actionChat"/> + </widget> + <action name="actionShow_Username"> + <property name="checkable"> + <bool>false</bool> + </property> + <property name="text"> + <string>Show Username</string> + </property> + <property name="shortcut"> + <string>Ctrl+3</string> + </property> + </action> + <action name="actionShow_Hostname_IP"> + <property name="checkable"> + <bool>false</bool> + </property> + <property name="text"> + <string>Show IP</string> + </property> + <property name="shortcut"> + <string>Ctrl+2</string> + </property> + </action> + <action name="actionVNC_Placeholders"> + <property name="checkable"> + <bool>true</bool> + </property> + <property name="text"> + <string>VNC-Placeholders</string> + </property> + </action> + <action name="actionShow_Log"> + <property name="checkable"> + <bool>true</bool> + </property> + <property name="checked"> + <bool>false</bool> + </property> + <property name="text"> + <string>Show Log</string> + </property> + <property name="shortcut"> + <string>Ctrl+L</string> + </property> + </action> + <action name="actionShow_Normal"> + <property name="checkable"> + <bool>true</bool> + </property> + <property name="text"> + <string>Show Normal</string> + </property> + <property name="shortcut"> + <string>Ctrl+O</string> + </property> + </action> + <action name="actionShow_Error"> + <property name="checkable"> + <bool>true</bool> + </property> + <property name="text"> + <string>Show Error</string> + </property> + <property name="shortcut"> + <string>Ctrl+E</string> + </property> + </action> + <action name="actionShow_Network"> + <property name="checkable"> + <bool>true</bool> + </property> + <property name="text"> + <string>Show Network</string> + </property> + <property name="shortcut"> + <string>Ctrl+N</string> + </property> + </action> + <action name="actionShow_Terminal"> + <property name="checkable"> + <bool>true</bool> + </property> + <property name="text"> + <string>Show Terminal</string> + </property> + <property name="shortcut"> + <string>Ctrl+T</string> + </property> + </action> + <action name="actionShow_Chat"> + <property name="checkable"> + <bool>true</bool> + </property> + <property name="text"> + <string>Show Chat</string> + </property> + <property name="shortcut"> + <string>Ctrl+G</string> + </property> + </action> + <action name="actionAbout_pvs"> + <property name="text"> + <string>About pvs</string> + </property> + <property name="shortcut"> + <string>Ctrl+P</string> + </property> + </action> + <action name="action100_x_100"> + <property name="checkable"> + <bool>true</bool> + </property> + <property name="text"> + <string>100 x 100</string> + </property> + </action> + <action name="action200_x_200"> + <property name="checkable"> + <bool>true</bool> + </property> + <property name="text"> + <string>200 x 200</string> + </property> + </action> + <action name="action500_x_500"> + <property name="checkable"> + <bool>true</bool> + </property> + <property name="text"> + <string>500 x 500</string> + </property> + </action> + <action name="action_Disconnect"> + <property name="icon"> + <iconset resource="../../../pvsmgr.qrc"> + <normaloff>:/logout</normaloff>:/logout</iconset> + </property> + <property name="text"> + <string>&Disconnect</string> + </property> + <property name="shortcut"> + <string>Ctrl+W</string> + </property> + </action> + <action name="action_Exit"> + <property name="icon"> + <iconset resource="../../../pvsmgr.qrc"> + <normaloff>:/exit</normaloff> + <normalon>:/exit</normalon>:/exit</iconset> + </property> + <property name="text"> + <string>&Exit</string> + </property> + <property name="toolTip"> + <string>Exit</string> + </property> + <property name="shortcut"> + <string>Ctrl+Q</string> + </property> + </action> + <action name="actionFoto"> + <property name="icon"> + <iconset resource="../../../pvsmgr.qrc"> + <normaloff>:/photos</normaloff>:/photos</iconset> + </property> + <property name="text"> + <string>Foto</string> + </property> + <property name="toolTip"> + <string>Foto</string> + </property> + <property name="shortcut"> + <string>Ctrl+F</string> + </property> + </action> + <action name="actionView"> + <property name="icon"> + <iconset resource="../../../pvsmgr.qrc"> + <normaloff>:/restore</normaloff>:/restore</iconset> + </property> + <property name="text"> + <string>view</string> + </property> + <property name="toolTip"> + <string>View</string> + </property> + <property name="shortcut"> + <string>Ctrl+V</string> + </property> + </action> + <action name="actionLock"> + <property name="icon"> + <iconset resource="../../../pvsmgr.qrc"> + <normaloff>:/lock</normaloff>:/lock</iconset> + </property> + <property name="text"> + <string>lock</string> + </property> + <property name="toolTip"> + <string>Lock or Unlock all Clients</string> + </property> + <property name="shortcut"> + <string>Ctrl+A</string> + </property> + </action> + <action name="actionCreate_profile"> + <property name="icon"> + <iconset resource="../../../pvsmgr.qrc"> + <normaloff>:/profile</normaloff>:/profile</iconset> + </property> + <property name="text"> + <string>Profile &manager</string> + </property> + <property name="shortcut"> + <string>Ctrl+M</string> + </property> + </action> + <action name="actionShow_Fullname"> + <property name="text"> + <string>Show Name</string> + </property> + <property name="shortcut"> + <string>Ctrl+1</string> + </property> + </action> + <action name="actionChat"> + <property name="icon"> + <iconset resource="../../../pvsmgr.qrc"> + <normaloff>:/chat</normaloff>:/chat</iconset> + </property> + <property name="text"> + <string>Chat</string> + </property> + <property name="toolTip"> + <string>Start Chat with client(s)</string> + </property> + <property name="shortcut"> + <string>Ctrl+D</string> + </property> + </action> + <action name="dummy"> + <property name="text"> + <string>-</string> + </property> + </action> + </widget> + <layoutdefault spacing="6" margin="11"/> + <resources> + <include location="../../../pvsmgr.qrc"/> + </resources> + <connections/> +</ui> diff --git a/src/gui/ui/mainwindowtouch.ui b/src/gui/ui/mainwindowtouch.ui new file mode 100644 index 0000000..9030b17 --- /dev/null +++ b/src/gui/ui/mainwindowtouch.ui @@ -0,0 +1,645 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>MainWindow</class> + <widget class="QMainWindow" name="MainWindow"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>1349</width> + <height>768</height> + </rect> + </property> + <property name="windowTitle"> + <string>PVSmgr</string> + </property> + <widget class="QWidget" name="centralWidget"> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <widget class="QScrollArea" name="scrollArea"> + <property name="styleSheet"> + <string>border-color: rgb(0, 0, 0);</string> + </property> + <property name="widgetResizable"> + <bool>true</bool> + </property> + <widget class="QWidget" name="scrollAreaWidgetContents"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>1327</width> + <height>658</height> + </rect> + </property> + <layout class="QGridLayout" name="gridLayout_3"> + <item row="0" column="0"> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <widget class="QComboBox" name="comboBox_touch1"> + <property name="font"> + <font> + <pointsize>15</pointsize> + </font> + </property> + <item> + <property name="text"> + <string>All</string> + </property> + </item> + <item> + <property name="text"> + <string>Lock</string> + </property> + </item> + <item> + <property name="text"> + <string>Unlock</string> + </property> + </item> + <item> + <property name="text"> + <string>Unproject</string> + </property> + </item> + <item> + <property name="text"> + <string>Backgroundimage</string> + </property> + </item> + </widget> + </item> + <item> + <widget class="Line" name="line_5"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="label"> + <property name="text"> + <string>VNC-Quality</string> + </property> + </widget> + </item> + <item> + <widget class="QComboBox" name="vncQuality"> + <property name="font"> + <font> + <pointsize>15</pointsize> + </font> + </property> + <item> + <property name="text"> + <string>HIGH</string> + </property> + </item> + <item> + <property name="text"> + <string>MEDIUM</string> + </property> + </item> + <item> + <property name="text"> + <string>LOW</string> + </property> + </item> + </widget> + </item> + <item> + <widget class="Line" name="line_3"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="pushButton_2"> + <property name="font"> + <font> + <pointsize>15</pointsize> + </font> + </property> + <property name="text"> + <string>ClientList</string> + </property> + </widget> + </item> + <item> + <widget class="Line" name="line_2"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="pushButton"> + <property name="font"> + <font> + <pointsize>15</pointsize> + </font> + </property> + <property name="text"> + <string>Profile</string> + </property> + </widget> + </item> + <item> + <widget class="Line" name="line_4"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + </widget> + </item> + <item> + <widget class="QProgressBar" name="progressBar"> + <property name="styleSheet"> + <string>border-color: rgb(0, 0, 0);</string> + </property> + <property name="value"> + <number>0</number> + </property> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + </widget> + </item> + <item> + <widget class="Line" name="separator"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="setPassword"> + <property name="font"> + <font> + <pointsize>15</pointsize> + </font> + </property> + <property name="text"> + <string>setPassword</string> + </property> + </widget> + </item> + <item> + <widget class="Line" name="line"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + </widget> + </item> + <item> + <widget class="QComboBox" name="thumbStatus"> + <property name="font"> + <font> + <pointsize>15</pointsize> + </font> + </property> + <item> + <property name="text"> + <string>Thumbnailratio</string> + </property> + </item> + <item> + <property name="text"> + <string>Thumbnailrate</string> + </property> + </item> + </widget> + </item> + <item> + <widget class="QSlider" name="horizontalSlider"> + <property name="minimum"> + <number>25</number> + </property> + <property name="maximum"> + <number>200</number> + </property> + <property name="singleStep"> + <number>25</number> + </property> + <property name="pageStep"> + <number>25</number> + </property> + <property name="value"> + <number>25</number> + </property> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="tickPosition"> + <enum>QSlider::TicksBothSides</enum> + </property> + <property name="tickInterval"> + <number>0</number> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="label_2"> + <property name="text"> + <string> 0</string> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="label_3"> + <property name="text"> + <string>%</string> + </property> + </widget> + </item> + </layout> + </item> + <item row="1" column="0"> + <widget class="QSplitter" name="splitter_2"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <widget class="QSplitter" name="splitter"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <widget class="QWidget" name="ClWidget" native="true"> + <property name="minimumSize"> + <size> + <width>150</width> + <height>240</height> + </size> + </property> + <property name="styleSheet"> + <string>background-color: rgb(255, 255, 255);</string> + </property> + <layout class="QGridLayout" name="gridLayout_5"> + <item row="0" column="0"> + <layout class="QGridLayout" name="ClientGLayout"/> + </item> + </layout> + </widget> + <widget class="QWidget" name="widget" native="true"> + <property name="styleSheet"> + <string>background-color: rgb(150, 150, 150);</string> + </property> + <layout class="QGridLayout" name="gridLayout_4"> + <item row="0" column="0"> + <layout class="QVBoxLayout" name="VconWinLayout"/> + </item> + </layout> + </widget> + </widget> + <widget class="QTextEdit" name="pvsLog"/> + </widget> + </item> + </layout> + </widget> + </widget> + </item> + </layout> + </widget> + <widget class="QStatusBar" name="statusBar"/> + <widget class="QToolBar" name="toolBar"> + <property name="enabled"> + <bool>true</bool> + </property> + <property name="maximumSize"> + <size> + <width>129000</width> + <height>12900</height> + </size> + </property> + <property name="font"> + <font> + <pointsize>15</pointsize> + <kerning>true</kerning> + </font> + </property> + <property name="windowTitle"> + <string>toolBar</string> + </property> + <property name="layoutDirection"> + <enum>Qt::LeftToRight</enum> + </property> + <property name="autoFillBackground"> + <bool>true</bool> + </property> + <property name="movable"> + <bool>false</bool> + </property> + <property name="iconSize"> + <size> + <width>50</width> + <height>50</height> + </size> + </property> + <property name="toolButtonStyle"> + <enum>Qt::ToolButtonIconOnly</enum> + </property> + <property name="floatable"> + <bool>false</bool> + </property> + <attribute name="toolBarArea"> + <enum>TopToolBarArea</enum> + </attribute> + <attribute name="toolBarBreak"> + <bool>false</bool> + </attribute> + <addaction name="action_Exit"/> + <addaction name="separator"/> + <addaction name="actionFoto"/> + <addaction name="separator"/> + <addaction name="actionView"/> + <addaction name="separator"/> + <addaction name="actionProjection"/> + <addaction name="separator"/> + <addaction name="actionUnprojection"/> + <addaction name="separator"/> + <addaction name="actionLocksingle"/> + <addaction name="separator"/> + <addaction name="actionUnlocksingle"/> + <addaction name="separator"/> + <addaction name="actionLock"/> + <addaction name="separator"/> + <addaction name="actionresetall"/> + <addaction name="separator"/> + <addaction name="actionDozent"/> + </widget> + <action name="actionShow_Username"> + <property name="checkable"> + <bool>false</bool> + </property> + <property name="text"> + <string>Show Username</string> + </property> + </action> + <action name="actionShow_Hostname_IP"> + <property name="checkable"> + <bool>false</bool> + </property> + <property name="text"> + <string>Show Hostname/IP</string> + </property> + </action> + <action name="actionVNC_Placeholders"> + <property name="checkable"> + <bool>true</bool> + </property> + <property name="text"> + <string>VNC-Placeholders</string> + </property> + </action> + <action name="actionShow_Log"> + <property name="checkable"> + <bool>true</bool> + </property> + <property name="checked"> + <bool>false</bool> + </property> + <property name="text"> + <string>Show Log</string> + </property> + </action> + <action name="actionShow_Normal"> + <property name="checkable"> + <bool>true</bool> + </property> + <property name="text"> + <string>Show Normal</string> + </property> + </action> + <action name="actionShow_Error"> + <property name="checkable"> + <bool>true</bool> + </property> + <property name="text"> + <string>Show Error</string> + </property> + </action> + <action name="actionShow_Network"> + <property name="checkable"> + <bool>true</bool> + </property> + <property name="text"> + <string>Show Network</string> + </property> + </action> + <action name="actionShow_Terminal"> + <property name="checkable"> + <bool>true</bool> + </property> + <property name="text"> + <string>Show Terminal</string> + </property> + </action> + <action name="actionShow_Chat"> + <property name="checkable"> + <bool>true</bool> + </property> + <property name="text"> + <string>Show Chat</string> + </property> + </action> + <action name="actionAbout_pvs"> + <property name="text"> + <string>About pvs</string> + </property> + </action> + <action name="action100_x_100"> + <property name="checkable"> + <bool>true</bool> + </property> + <property name="text"> + <string>100 x 100</string> + </property> + </action> + <action name="action200_x_200"> + <property name="checkable"> + <bool>true</bool> + </property> + <property name="text"> + <string>200 x 200</string> + </property> + </action> + <action name="action500_x_500"> + <property name="checkable"> + <bool>true</bool> + </property> + <property name="text"> + <string>500 x 500</string> + </property> + </action> + <action name="action_Disconnect"> + <property name="icon"> + <iconset resource="../../../pvsmgr.qrc"> + <normaloff>:/logout</normaloff>:/logout</iconset> + </property> + <property name="text"> + <string>&Disconnect</string> + </property> + <property name="shortcut"> + <string>Ctrl+W</string> + </property> + </action> + <action name="action_Exit"> + <property name="icon"> + <iconset resource="../../../pvsmgr.qrc"> + <normaloff>:/exit</normaloff> + <normalon>:/exit</normalon>:/exit</iconset> + </property> + <property name="text"> + <string>&Exit</string> + </property> + <property name="shortcut"> + <string>Ctrl+Q</string> + </property> + </action> + <action name="actionFoto"> + <property name="icon"> + <iconset resource="../../../pvsmgr.qrc"> + <normaloff>:/photos</normaloff>:/photos</iconset> + </property> + <property name="text"> + <string>Foto</string> + </property> + <property name="toolTip"> + <string>Foto</string> + </property> + </action> + <action name="actionView"> + <property name="icon"> + <iconset resource="../../../pvsmgr.qrc"> + <normaloff>:/restore</normaloff>:/restore</iconset> + </property> + <property name="text"> + <string>view</string> + </property> + <property name="toolTip"> + <string>View</string> + </property> + </action> + <action name="actionLock"> + <property name="icon"> + <iconset resource="../../../pvsmgr.qrc"> + <normaloff>:/lock</normaloff>:/lock</iconset> + </property> + <property name="text"> + <string>lock</string> + </property> + <property name="toolTip"> + <string>Lock All Clients</string> + </property> + </action> + <action name="actionCreate_profile"> + <property name="icon"> + <iconset resource="../../../pvsmgr.qrc"> + <normaloff>:/profile</normaloff>:/profile</iconset> + </property> + <property name="text"> + <string>Create profile</string> + </property> + </action> + <action name="actionresetall"> + <property name="icon"> + <iconset> + <activeon>:/icons/reset.png</activeon> + </iconset> + </property> + <property name="text"> + <string>resetall</string> + </property> + <property name="toolTip"> + <string>Reset Projections and Locks</string> + </property> + <property name="shortcut"> + <string>Ctrl+R</string> + </property> + </action> + <action name="actionLocksingle"> + <property name="icon"> + <iconset resource="../../../pvsmgr.qrc"> + <normaloff>:/icons/locksingle.png</normaloff>:/icons/locksingle.png</iconset> + </property> + <property name="text"> + <string>locksingle</string> + </property> + <property name="toolTip"> + <string>Locks a Single Target</string> + </property> + </action> + <action name="actionUnlocksingle"> + <property name="icon"> + <iconset resource="../../../pvsmgr.qrc"> + <normaloff>:/icons/unlocksingle.png</normaloff>:/icons/unlocksingle.png</iconset> + </property> + <property name="text"> + <string>unlocksingle</string> + </property> + <property name="toolTip"> + <string>Unlocks a single target</string> + </property> + </action> + <action name="actionProjection"> + <property name="icon"> + <iconset resource="../../../pvsmgr.qrc"> + <normaloff>:/icons/projection.png</normaloff>:/icons/projection.png</iconset> + </property> + <property name="text"> + <string>projection</string> + </property> + <property name="toolTip"> + <string>Projects a single target</string> + </property> + </action> + <action name="actionUnprojection"> + <property name="icon"> + <iconset resource="../../../pvsmgr.qrc"> + <normaloff>:/icons/unprojection.png</normaloff>:/icons/unprojection.png</iconset> + </property> + <property name="text"> + <string>unprojection</string> + </property> + <property name="toolTip"> + <string>Unprojects a single target</string> + </property> + </action> + <action name="actionDozent"> + <property name="icon"> + <iconset resource="../../../pvsmgr.qrc"> + <normaloff>:/dozent2</normaloff>:/dozent2</iconset> + </property> + <property name="text"> + <string>dozent</string> + </property> + <property name="toolTip"> + <string>Select Tutor PC</string> + </property> + </action> + <action name="actionShow_Fullname"> + <property name="text"> + <string>Show Name</string> + </property> + </action> + <action name="actionChat"> + <property name="icon"> + <iconset resource="../../../pvsmgr.qrc"> + <normaloff>:/chat</normaloff>:/chat</iconset> + </property> + <property name="text"> + <string>Chat</string> + </property> + <property name="toolTip"> + <string>Start chat with client(s)</string> + </property> + <property name="shortcut"> + <string>Ctrl+D</string> + </property> + </action> + </widget> + <layoutdefault spacing="6" margin="11"/> + <resources> + <include location="../../../pvsmgr.qrc"/> + </resources> + <connections/> +</ui> diff --git a/src/gui/ui/profileDialog.ui b/src/gui/ui/profileDialog.ui new file mode 100644 index 0000000..3302a56 --- /dev/null +++ b/src/gui/ui/profileDialog.ui @@ -0,0 +1,179 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>Dialog</class> + <widget class="QDialog" name="Dialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>332</width> + <height>485</height> + </rect> + </property> + <property name="windowTitle"> + <string>ProfileDialog</string> + </property> + <layout class="QGridLayout" name="gridLayout_3"> + <item row="0" column="0"> + <layout class="QVBoxLayout" name="verticalLayout_2"> + <item> + <widget class="QSplitter" name="splitter"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <widget class="QWidget" name="widget" native="true"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> + <horstretch>1</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="styleSheet"> + <string>background-color: rgb(255, 255, 255);</string> + </property> + <layout class="QGridLayout" name="gridLayout_2"> + <item row="0" column="0"> + <layout class="QGridLayout" name="gridLayout"/> + </item> + </layout> + </widget> + <widget class="QWidget" name="layoutWidget_2"> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QPushButton" name="remove"> + <property name="text"> + <string>&Remove</string> + </property> + </widget> + </item> + <item> + <spacer name="verticalSpacer_6"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>40</height> + </size> + </property> + </spacer> + </item> + <item> + <spacer name="verticalSpacer"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>18</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QPushButton" name="edit"> + <property name="text"> + <string>&Edit</string> + </property> + </widget> + </item> + <item> + <spacer name="verticalSpacer_5"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>40</height> + </size> + </property> + </spacer> + </item> + <item> + <spacer name="verticalSpacer_2"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>18</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QPushButton" name="new_2"> + <property name="text"> + <string>&New</string> + </property> + </widget> + </item> + <item> + <spacer name="verticalSpacer_4"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>40</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QPushButton" name="load"> + <property name="text"> + <string>&Load</string> + </property> + </widget> + </item> + <item> + <spacer name="verticalSpacer_3"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>218</height> + </size> + </property> + </spacer> + </item> + </layout> + </widget> + </widget> + </item> + <item> + <layout class="QHBoxLayout" name="horizontalLayout_2"> + <item> + <widget class="QLineEdit" name="lineEdit"/> + </item> + <item> + <widget class="QPushButton" name="add"> + <property name="text"> + <string>Add</string> + </property> + </widget> + </item> + </layout> + </item> + <item> + <widget class="QPushButton" name="close"> + <property name="text"> + <string>Close</string> + </property> + </widget> + </item> + </layout> + </item> + </layout> + </widget> + <resources/> + <connections/> +</ui> diff --git a/src/gui/ui/projectionDialog.ui b/src/gui/ui/projectionDialog.ui new file mode 100644 index 0000000..17cdf05 --- /dev/null +++ b/src/gui/ui/projectionDialog.ui @@ -0,0 +1,98 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>projectionDialog</class> + <widget class="QDialog" name="projectionDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>234</width> + <height>282</height> + </rect> + </property> + <property name="windowTitle"> + <string>Dialog</string> + </property> + <layout class="QGridLayout" name="gridLayout_2"> + <item row="1" column="0"> + <widget class="QFrame" name="frame"> + <property name="styleSheet"> + <string notr="true">QFrame{ +border-color: rgb(0, 0, 0); +border: 1px outset black; +}</string> + </property> + <property name="frameShape"> + <enum>QFrame::StyledPanel</enum> + </property> + <property name="frameShadow"> + <enum>QFrame::Sunken</enum> + </property> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <layout class="QVBoxLayout" name="verticalLayout_2"/> + </item> + </layout> + </widget> + </item> + <item row="2" column="0"> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QCheckBox" name="checkBox"> + <property name="text"> + <string>Select all</string> + </property> + </widget> + </item> + <item> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <spacer name="horizontalSpacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>108</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QPushButton" name="cancel"> + <property name="text"> + <string>Cancel</string> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="send"> + <property name="text"> + <string>Project</string> + </property> + </widget> + </item> + </layout> + </item> + </layout> + </item> + <item row="0" column="0"> + <widget class="QLabel" name="label"> + <property name="maximumSize"> + <size> + <width>16777215</width> + <height>15</height> + </size> + </property> + <property name="text"> + <string>Select Target for projection</string> + </property> + </widget> + </item> + </layout> + </widget> + <layoutdefault spacing="6" margin="11"/> + <resources/> + <connections/> +</ui> diff --git a/src/gui/ui/serverChatDialog.ui b/src/gui/ui/serverChatDialog.ui new file mode 100644 index 0000000..973d803 --- /dev/null +++ b/src/gui/ui/serverChatDialog.ui @@ -0,0 +1,121 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>ServerChatDialogClass</class> + <widget class="QDialog" name="ServerChatDialogClass"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>641</width> + <height>659</height> + </rect> + </property> + <property name="windowTitle"> + <string>PVSmgr - Chat </string> + </property> + <property name="windowIcon"> + <iconset resource="../../../pvsgui.qrc"> + <normaloff>:/cam32.svg</normaloff>:/cam32.svg</iconset> + </property> + <property name="locale"> + <locale language="English" country="UnitedStates"/> + </property> + <layout class="QVBoxLayout" name="verticalLayout_2"> + <item> + <widget class="QSplitter" name="splitter"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <widget class="QListWidget" name="listWidget"> + <property name="maximumSize"> + <size> + <width>150</width> + <height>16777215</height> + </size> + </property> + <property name="contextMenuPolicy"> + <enum>Qt::CustomContextMenu</enum> + </property> + <property name="sortingEnabled"> + <bool>true</bool> + </property> + </widget> + <widget class="QTabWidget" name="tabWidget"> + <property name="tabPosition"> + <enum>QTabWidget::South</enum> + </property> + <property name="tabsClosable"> + <bool>true</bool> + </property> + <widget class="QWidget" name="tab"> + <attribute name="title"> + <string notr="true">@all</string> + </attribute> + <layout class="QVBoxLayout" name="verticalLayout"/> + </widget> + </widget> + </widget> + </item> + <item> + <widget class="QLineEdit" name="lineEdit"/> + </item> + <item> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <spacer name="horizontalSpacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QPushButton" name="pushButton"> + <property name="text"> + <string>&Send</string> + </property> + <property name="autoDefault"> + <bool>false</bool> + </property> + <property name="default"> + <bool>true</bool> + </property> + </widget> + </item> + </layout> + </item> + </layout> + </widget> + <resources> + <include location="../../../pvsgui.qrc"/> + </resources> + <connections> + <connection> + <sender>lineEdit</sender> + <signal>returnPressed()</signal> + <receiver>pushButton</receiver> + <slot>click()</slot> + <hints> + <hint type="sourcelabel"> + <x>252</x> + <y>560</y> + </hint> + <hint type="destinationlabel"> + <x>529</x> + <y>589</y> + </hint> + </hints> + </connection> + </connections> +</ui> diff --git a/src/gui/ui/startdialog.ui b/src/gui/ui/startdialog.ui new file mode 100644 index 0000000..8001862 --- /dev/null +++ b/src/gui/ui/startdialog.ui @@ -0,0 +1,195 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>Test</class> + <widget class="QDialog" name="Test"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>367</width> + <height>300</height> + </rect> + </property> + <property name="windowTitle"> + <string>Dialog</string> + </property> + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="geometry"> + <rect> + <x>20</x> + <y>250</y> + <width>341</width> + <height>32</height> + </rect> + </property> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="standardButtons"> + <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> + </property> + </widget> + <widget class="QWidget" name="gridLayoutWidget"> + <property name="geometry"> + <rect> + <x>60</x> + <y>10</y> + <width>301</width> + <height>231</height> + </rect> + </property> + <layout class="QGridLayout" name="gridLayout"> + <item row="1" column="0"> + <widget class="QCheckBox" name="checkBox"> + <property name="toolTip"> + <string>Zur Bedienung mit Tastatur und Maus</string> + </property> + <property name="text"> + <string>Standard-Oberfläche</string> + </property> + </widget> + </item> + <item row="3" column="0"> + <widget class="QCheckBox" name="checkBox_2"> + <property name="toolTip"> + <string>Zur Bedienung an einem Touchscreen</string> + </property> + <property name="text"> + <string>Touchscreen-Oberfläche</string> + </property> + </widget> + </item> + <item row="2" column="0"> + <widget class="Line" name="line"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + </widget> + </item> + <item row="0" column="0"> + <widget class="Line" name="line_2"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + </widget> + </item> + <item row="4" column="0"> + <widget class="Line" name="line_3"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + </widget> + </item> + </layout> + </widget> + <widget class="KIconButton" name="kiconbutton"> + <property name="geometry"> + <rect> + <x>0</x> + <y>150</y> + <width>51</width> + <height>41</height> + </rect> + </property> + <property name="styleSheet"> + <string notr="true">background-image: url(:icons/touch.jpg);</string> + </property> + </widget> + <widget class="KIconButton" name="kiconbutton_2"> + <property name="geometry"> + <rect> + <x>0</x> + <y>60</y> + <width>51</width> + <height>41</height> + </rect> + </property> + <property name="styleSheet"> + <string notr="true">background-image: url(:icons/keyboard.jpg);</string> + </property> + </widget> + </widget> + <customwidgets> + <customwidget> + <class>KIconButton</class> + <extends>QPushButton</extends> + <header>kicondialog.h</header> + </customwidget> + </customwidgets> + <tabstops> + <tabstop>buttonBox</tabstop> + <tabstop>kiconbutton_2</tabstop> + <tabstop>checkBox_2</tabstop> + <tabstop>checkBox</tabstop> + <tabstop>kiconbutton</tabstop> + </tabstops> + <resources> + <include location="startdialog.qrc"/> + </resources> + <connections> + <connection> + <sender>buttonBox</sender> + <signal>accepted()</signal> + <receiver>Test</receiver> + <slot>accept()</slot> + <hints> + <hint type="sourcelabel"> + <x>248</x> + <y>254</y> + </hint> + <hint type="destinationlabel"> + <x>157</x> + <y>274</y> + </hint> + </hints> + </connection> + <connection> + <sender>buttonBox</sender> + <signal>rejected()</signal> + <receiver>Test</receiver> + <slot>reject()</slot> + <hints> + <hint type="sourcelabel"> + <x>316</x> + <y>260</y> + </hint> + <hint type="destinationlabel"> + <x>286</x> + <y>274</y> + </hint> + </hints> + </connection> + <connection> + <sender>checkBox</sender> + <signal>toggled(bool)</signal> + <receiver>checkBox_2</receiver> + <slot>setDisabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>180</x> + <y>81</y> + </hint> + <hint type="destinationlabel"> + <x>180</x> + <y>169</y> + </hint> + </hints> + </connection> + <connection> + <sender>checkBox_2</sender> + <signal>toggled(bool)</signal> + <receiver>checkBox</receiver> + <slot>setDisabled(bool)</slot> + <hints> + <hint type="sourcelabel"> + <x>180</x> + <y>169</y> + </hint> + <hint type="destinationlabel"> + <x>180</x> + <y>81</y> + </hint> + </hints> + </connection> + </connections> +</ui> diff --git a/src/gui/ui/touchgui.ui b/src/gui/ui/touchgui.ui new file mode 100644 index 0000000..05d7614 --- /dev/null +++ b/src/gui/ui/touchgui.ui @@ -0,0 +1,322 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>PVSMainWindow</class> + <widget class="QMainWindow" name="PVSMainWindow"> + <property name="windowModality"> + <enum>Qt::NonModal</enum> + </property> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>800</width> + <height>600</height> + </rect> + </property> + <property name="minimumSize"> + <size> + <width>800</width> + <height>600</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>800</width> + <height>600</height> + </size> + </property> + <property name="cursor"> + <cursorShape>PointingHandCursor</cursorShape> + </property> + <property name="windowTitle"> + <string>MainWindow</string> + </property> + <widget class="QWidget" name="centralWidget"> + <widget class="QWidget" name="horizontalLayoutWidget"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>801</width> + <height>41</height> + </rect> + </property> + <layout class="QHBoxLayout" name="ButtonList"> + <item> + <widget class="QComboBox" name="AllUsersBox"> + <property name="font"> + <font> + <pointsize>15</pointsize> + </font> + </property> + <item> + <property name="text"> + <string>Alle</string> + </property> + </item> + <item> + <property name="text"> + <string>Sperren/entsperren</string> + </property> + </item> + <item> + <property name="text"> + <string>Beamerbild verteilen</string> + </property> + </item> + </widget> + </item> + <item> + <widget class="QComboBox" name="MarkedUsersBox"> + <property name="font"> + <font> + <pointsize>15</pointsize> + </font> + </property> + <item> + <property name="text"> + <string>Auswahl</string> + </property> + </item> + <item> + <property name="text"> + <string>Aktualisieren</string> + </property> + </item> + <item> + <property name="text"> + <string>Sperren/Entsperren</string> + </property> + </item> + <item> + <property name="text"> + <string>Einzelansicht</string> + </property> + </item> + <item> + <property name="text"> + <string>Einzelhilfe</string> + </property> + </item> + </widget> + </item> + <item> + <widget class="QPushButton" name="PropertyButton"> + <property name="font"> + <font> + <pointsize>15</pointsize> + </font> + </property> + <property name="text"> + <string>Einstellungen</string> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="ExitButton"> + <property name="font"> + <font> + <pointsize>15</pointsize> + </font> + </property> + <property name="text"> + <string>Beenden</string> + </property> + </widget> + </item> + </layout> + </widget> + <widget class="QWidget" name="horizontalLayoutWidget_2"> + <property name="geometry"> + <rect> + <x>0</x> + <y>530</y> + <width>801</width> + <height>31</height> + </rect> + </property> + <layout class="QHBoxLayout" name="Slider"> + <item> + <widget class="QPushButton" name="NavigateLeft"> + <property name="text"> + <string><-</string> + </property> + </widget> + </item> + <item> + <widget class="QSlider" name="horizontalSlider"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="NavigateRight"> + <property name="text"> + <string>-></string> + </property> + </widget> + </item> + </layout> + </widget> + <widget class="QWidget" name="ClWidget" native="true"> + <property name="geometry"> + <rect> + <x>0</x> + <y>40</y> + <width>151</width> + <height>481</height> + </rect> + </property> + <property name="minimumSize"> + <size> + <width>150</width> + <height>240</height> + </size> + </property> + <property name="styleSheet"> + <string>background-color: rgb(255, 255, 255);</string> + </property> + <layout class="QGridLayout" name="gridLayout_5"> + <item row="0" column="0"> + <layout class="QGridLayout" name="ClientGLayout"/> + </item> + </layout> + </widget> + <widget class="QWidget" name="widget" native="true"> + <property name="geometry"> + <rect> + <x>160</x> + <y>40</y> + <width>631</width> + <height>481</height> + </rect> + </property> + <property name="styleSheet"> + <string>background-color: rgb(150, 150, 150);</string> + </property> + <layout class="QGridLayout" name="gridLayout_4"> + <item row="0" column="0"> + <layout class="QVBoxLayout" name="VconWinLayout"/> + </item> + </layout> + </widget> + </widget> + <widget class="QMenuBar" name="menuBar"> + <property name="enabled"> + <bool>true</bool> + </property> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>800</width> + <height>24</height> + </rect> + </property> + <widget class="QMenu" name="menuTestApp"> + <property name="title"> + <string>Datei</string> + </property> + <addaction name="actionDisconnect"/> + <addaction name="actionBeenden"/> + </widget> + <widget class="QMenu" name="menuAnsicht"> + <property name="title"> + <string>Ansicht</string> + </property> + <addaction name="actionVollbild"/> + </widget> + <widget class="QMenu" name="menuHilfe"> + <property name="title"> + <string>Hilfe</string> + </property> + <addaction name="actionGibts_noch_keine"/> + </widget> + <widget class="QMenu" name="menuLogging"> + <property name="title"> + <string>Logging</string> + </property> + </widget> + <addaction name="menuTestApp"/> + <addaction name="menuAnsicht"/> + <addaction name="menuHilfe"/> + <addaction name="menuLogging"/> + </widget> + <action name="actionBeenden"> + <property name="text"> + <string>Beenden</string> + </property> + <property name="shortcut"> + <string>Alt+B</string> + </property> + </action> + <action name="actionGibts_noch_keine"> + <property name="text"> + <string>Version</string> + </property> + </action> + <action name="actionVollbild"> + <property name="text"> + <string>Vollbild</string> + </property> + </action> + <action name="actionDisconnect"> + <property name="text"> + <string>Disconnect</string> + </property> + </action> + </widget> + <layoutdefault spacing="6" margin="11"/> + <resources/> + <connections> + <connection> + <sender>actionBeenden</sender> + <signal>activated()</signal> + <receiver>PVSMainWindow</receiver> + <slot>close()</slot> + <hints> + <hint type="sourcelabel"> + <x>-1</x> + <y>-1</y> + </hint> + <hint type="destinationlabel"> + <x>399</x> + <y>299</y> + </hint> + </hints> + </connection> + <connection> + <sender>ExitButton</sender> + <signal>clicked()</signal> + <receiver>PVSMainWindow</receiver> + <slot>close()</slot> + <hints> + <hint type="sourcelabel"> + <x>109</x> + <y>129</y> + </hint> + <hint type="destinationlabel"> + <x>299</x> + <y>199</y> + </hint> + </hints> + </connection> + <connection> + <sender>actionVollbild</sender> + <signal>activated()</signal> + <receiver>PVSMainWindow</receiver> + <slot>showMaximized()</slot> + <hints> + <hint type="sourcelabel"> + <x>-1</x> + <y>-1</y> + </hint> + <hint type="destinationlabel"> + <x>399</x> + <y>299</y> + </hint> + </hints> + </connection> + </connections> +</ui> diff --git a/src/net/SslServer.cpp b/src/net/SslServer.cpp new file mode 100644 index 0000000..e353e0a --- /dev/null +++ b/src/net/SslServer.cpp @@ -0,0 +1,130 @@ +/* +# Copyright (c) 2009 - OpenSLX Project, Computer Center University of Freiburg +# +# This program is free software distributed under the GPL version 2. +# See http://openslx.org/COPYING +# +# If you have any feedback please consult http://openslx.org/feedback and +# send your suggestions, praise, or complaints to feedback@openslx.org +# +# General information about OpenSLX can be found at http://openslx.org/ +# ----------------------------------------------------------------------------- +# src/net/SslServer.cpp +# - provide QTcpServer-like behaviour for SSL +# ----------------------------------------------------------------------------- +*/ + +#include "SslServer.h" +#include <QtNetwork/QSslCipher> +#include <QtNetwork/QSslSocket> +#include "src/util/CertManager.h" + + +SslServer::SslServer() +{ + _tmr = startTimer(7000); + //QSslSocket::setDefaultCiphers(QSslSocket::supportedCiphers()); +} + +SslServer::~SslServer() +{ + killTimer((_tmr)); +} + +void SslServer::incomingConnection(int socketDescriptor) +{ + QSslSocket *serverSocket = new QSslSocket(this); + connect(serverSocket, + SIGNAL(sslErrors(const QList<QSslError> &)), + this, + SLOT(sslErrors(const QList<QSslError> &)) + ); + serverSocket->setPrivateKey(CertManager::getPrivateKey("manager")); + serverSocket->setLocalCertificate(CertManager::getCertificate("manager")); + serverSocket->setPeerVerifyMode(QSslSocket::VerifyNone); + serverSocket->setProtocol(QSsl::SslV3); + //printf("Keylen %d\n", serverSocket->privateKey().length()); + if (serverSocket->setSocketDescriptor(socketDescriptor)) + { + // Once the connection is successfully encrypted, raise out newConnection event + connect(serverSocket, SIGNAL(encrypted()), this, SIGNAL(newConnection())); + serverSocket->startServerEncryption(); + _pending.push_back(serverSocket); + } + else + { + delete serverSocket; + } +} + +void SslServer :: sslErrors ( const QList<QSslError> & errors ) +{ + printf("FIXME: SSL ERRORS on SERVER: %s\n", errors.begin()->errorString().toUtf8().data()); +} + +void SslServer::timerEvent (QTimerEvent* event) +{ + // Remove all sockets marked for deletion + for (QList<QSslSocket*>::iterator it = _delete.begin(); it != _delete.end(); it++) + { + (*it)->deleteLater(); + } + _delete.clear(); + // Mark all sockets for deletion where the ssl handshake did not happen after connecting + /* + bool flag; + do + { + flag = false; + for (QList<QSslSocket*>::iterator it = _pending.begin(); it != _pending.end(); it++) + { + if ((*it)->state() != QAbstractSocket::ConnectedState || !(*it)->isEncrypted()) + { + _delete.push_back(*it); + _pending.removeAll(*it); + flag = true; + break; + } + + } + } + while (flag); + */ + _delete.append(_pending); + _pending.clear(); +} + +bool SslServer::hasPendingConnections() +{ + for (QList<QSslSocket*>::iterator it = _pending.begin(); it != _pending.end(); it++) + { + printf("State: %d - Encrypted: %d\n", (int)(*it)->state(), (*it)->isEncrypted()); + if ((*it)->state() == QAbstractSocket::ConnectedState && (*it)->isEncrypted()) return true; + } + return false; +} + +QTcpSocket* SslServer::nextPendingConnection() +{ + for (QList<QSslSocket*>::iterator it = _pending.begin(); it != _pending.end(); it++) + { + if ((*it)->state() == QAbstractSocket::ConnectedState && (*it)->isEncrypted()) + { + _pending.removeAll(*it); + _delete.removeAll(*it); + return *it; + } + } + for (QList<QSslSocket*>::iterator it = _delete.begin(); it != _delete.end(); it++) + { + if ((*it)->state() == QAbstractSocket::ConnectedState && (*it)->isEncrypted()) + { + _pending.removeAll(*it); + _delete.removeAll(*it); + return *it; + } + } + return NULL; +} + + diff --git a/src/net/SslServer.h b/src/net/SslServer.h new file mode 100644 index 0000000..b1efeea --- /dev/null +++ b/src/net/SslServer.h @@ -0,0 +1,50 @@ +/* +# Copyright (c) 2009 - OpenSLX Project, Computer Center University of Freiburg +# +# This program is free software distributed under the GPL version 2. +# See http://openslx.org/COPYING +# +# If you have any feedback please consult http://openslx.org/feedback and +# send your suggestions, praise, or complaints to feedback@openslx.org +# +# General information about OpenSLX can be found at http://openslx.org/ +# ----------------------------------------------------------------------------- +# src/net/SslServer.cpp +# - provide QTcpServer-like behaviour for SSL +# ----------------------------------------------------------------------------- +*/ + +#ifndef SSLSERVER_H_ +#define SSLSERVER_H_ + +#include <QtCore/QList> +#include <QtNetwork/QTcpServer> +#include <QtNetwork/QSslError> + +class QSslSocket; + +class SslServer : public QTcpServer +{ + Q_OBJECT + +private Q_SLOTS: + void sslErrors ( const QList<QSslError> & errors ); + +public: + SslServer(); + virtual ~SslServer(); + + virtual bool hasPendingConnections (); + // This one has to return a TcpSocket as we're overwriting from the base class + // just cast it to QSslSocket later + virtual QTcpSocket* nextPendingConnection(); + +protected: + virtual void incomingConnection(int socketDescriptor); + void timerEvent (QTimerEvent* event); + QList<QSslSocket*> _pending; + QList<QSslSocket*> _delete; + int _tmr; +}; + +#endif /* SSLSERVER_H_ */ diff --git a/src/net/pvsClientConnection.cpp b/src/net/pvsClientConnection.cpp new file mode 100644 index 0000000..dff40d5 --- /dev/null +++ b/src/net/pvsClientConnection.cpp @@ -0,0 +1,178 @@ +/* +# Copyright (c) 2009,2010 - OpenSLX Project, Computer Center University of +# Freiburg +# +# This program is free software distributed under the GPL version 2. +# See http://openslx.org/COPYING +# +# If you have any feedback please consult http://openslx.org/feedback and +# send your suggestions, praise, or complaints to feedback@openslx.org +# +# General information about OpenSLX can be found at http://openslx.org/ +# ----------------------------------------------------------------------------- +# pvsClientConnection.cpp +# - ???. +# ----------------------------------------------------------------------------- +*/ + +#include "pvsClientConnection.h" +#include "pvsListenServer.h" +#include "src/util/consoleLogger.h" + +#include <cassert> +#include <QtNetwork/QHostAddress> + + +PVSClientConnection::PVSClientConnection(PVSListenServer* server, QSslSocket* sock) +{ + assert(sock); + assert(server); + _socket = sock; + _incomplete = NULL; + _toldDisconnect = false; + _server = server; + _lastData = time(NULL); + sock->setParent(this); // for automatic deletion + connect(_socket, SIGNAL(readyRead()), this, SLOT(sock_dataArrival())); + connect(_socket, SIGNAL(disconnected()), this, SLOT(sock_closed())); + connect(_socket, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(sock_error(QAbstractSocket::SocketError))); +} + +PVSClientConnection::~PVSClientConnection() +{ + this->closeConnection(); + if (_incomplete != NULL) delete _incomplete; + if (_socket != NULL) + { + disconnect(_socket, SIGNAL(readyRead()), this, SLOT(sock_dataArrival())); + disconnect(_socket, SIGNAL(disconnected()), this, SLOT(sock_closed())); + disconnect(_socket, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(sock_error(QAbstractSocket::SocketError))); + _socket->abort(); + } +} + +void PVSClientConnection::closeConnection() +{ + if (_toldDisconnect) return; // we already got served + if (_socket == NULL || _socket->state() == QAbstractSocket::UnconnectedState) + { + // should not happen but handled anyway + _toldDisconnect = true; + _server->disconnectClient(this); + return; + } + if (_socket->state() == QAbstractSocket::ClosingState) return; // sock_close() slot should eventually be called, nothing to do + if (_socket->state() == QAbstractSocket::ConnectedState) // this is what should be the case normally + { + _socket->disconnectFromHost(); // graceful shutdown of socket, sock_close() will be called once complete + return; + } + // otherwise the socket is in some unknown state, so do a harsh shutdown + _socket->abort(); + _toldDisconnect = true; + _server->disconnectClient(this); +} + +void PVSClientConnection::sock_dataArrival() +{ + if (_socket == NULL || _socket->state() != QAbstractSocket::ConnectedState) + { + ConsoleLog writeError("dataArrival called in bad state"); + return; + } + + _lastData = time(NULL); + while (_socket->bytesAvailable()) + { + int retval = 0; + do + { + if (_incomplete == NULL) _incomplete = new PVSMsg(); // we need a pvsmsg object + retval = _incomplete->readMessage(_socket); // let the message read data from socket + if (retval == -1) // error parsing msg, disconnect client! + { + this->closeConnection(); + return; + } + if (retval == 1) // message is complete + { + _server->handleClientMsg(_id, *_incomplete); + delete _incomplete; // ...and delete... + _incomplete = NULL; // ...so the next msg can be parsed + } + } while (retval == 1); + } +} + +void PVSClientConnection::sock_closed() +{ + // should this be unreliable in some way i suggest using the signal "stateChanged()" instead + // and check if the state changed to unconnected. + if (_toldDisconnect) return; + _toldDisconnect = true; + _server->disconnectClient(this); +} + +void PVSClientConnection::sock_error(QAbstractSocket::SocketError errcode) +{ + this->closeConnection(); +} + +/* +void PVSClientConnection::push_back_receive(PVSMsg newMsg) +{ + _recQueue.push_back(newMsg); +} +*/ + +bool PVSClientConnection::push_back_send(PVSMsg newMsg) +{ + if (_socket == NULL || _socket->state() != QAbstractSocket::ConnectedState) return false; + newMsg.setSndID(_id); + int len; + char data[2000]; + char *tmp = data; + if (!newMsg.getBinaryData(tmp, len)) + { + printf("Message empty. Ignored.\n"); + return false; + } + QByteArray ba; + ba.append(tmp, len); + int ret = (int)_socket->write(ba); + //printf("Sent %d of %d bytes.\n", ret, len); + if (ret == -1) + { + this->closeConnection(); + return false; + } + return true; +} + +QSslSocket* PVSClientConnection::getSocket() +{ + return _socket; +} + +void PVSClientConnection::setID(unsigned int id) +{ + _id = id; + this->push_back_send(PVSMsg(PVSLOGIN, "ID", int2String(_id))); +} + +void PVSClientConnection::ping() +{ + // still needs flag/timer to check for a ping timeout (and a reply from the client) + this->push_back_send(PVSMsg(PVSCOMMAND, "PING", "HELLO?", _id)); +} + +QString PVSClientConnection::getAddress() +{ + if (_socket == NULL) return QString(); + return _socket->peerAddress().toString(); +} + +QString PVSClientConnection::getNameUser() +{ + return getUserName(); +} diff --git a/src/net/pvsClientConnection.h b/src/net/pvsClientConnection.h new file mode 100644 index 0000000..cfbf98e --- /dev/null +++ b/src/net/pvsClientConnection.h @@ -0,0 +1,67 @@ +/** + * PVSClientConnection + * + * holds and maintains a Connection made from/to a PVSServerConnection (or derivate) + * PVSClientConnections are created by the PVSListenServer if a PVSCLientConnection is accepted + * + */ + +#include "pvsMsg.h" + +#include <QtNetwork/QSslSocket> + + +#ifndef _PVSCLIENTCONNECTION_H_ +#define _PVSCLIENTCONNECTION_H_ + +class PVSListenServer; + +class PVSClientConnection : public QObject +{ + Q_OBJECT + +public: + //C'Tor + PVSClientConnection(PVSListenServer* server, QSslSocket* sock = NULL); + // D'Tor + ~PVSClientConnection(); + + void closeConnection(); + bool isConnected() + { + return _socket != NULL && _socket->state() == QAbstractSocket::ConnectedState; + } + time_t lastData() + { + return _lastData; + } + + //void push_back_receive(PVSMsg newMsg); + bool push_back_send(PVSMsg newMsg); + QSslSocket* getSocket(); + + int getID() { return _id; } + void setID(unsigned int id); + void setServerID(unsigned int id) { _serverId = id; } + + QString getAddress(); + void setUsername(QString username); + QString getNameUser(); + void ping(); + +private Q_SLOTS: + void sock_dataArrival(); + void sock_closed(); + void sock_error(QAbstractSocket::SocketError errcode); + +private: + QSslSocket *_socket; + int _id; + unsigned int _serverId; + PVSMsg *_incomplete; + PVSListenServer *_server; + bool _toldDisconnect; + time_t _lastData; +}; + +#endif diff --git a/src/net/pvsDiscoveredServer.cpp b/src/net/pvsDiscoveredServer.cpp new file mode 100644 index 0000000..dddb5a0 --- /dev/null +++ b/src/net/pvsDiscoveredServer.cpp @@ -0,0 +1,152 @@ +/* +# Copyright (c) 2009 - OpenSLX Project, Computer Center University of Freiburg +# +# This program is free software distributed under the GPL version 2. +# See http://openslx.org/COPYING +# +# If you have any feedback please consult http://openslx.org/feedback and +# send your suggestions, praise, or complaints to feedback@openslx.org +# +# General information about OpenSLX can be found at http://openslx.org/ +# ----------------------------------------------------------------------------- +# src/net/pvsDiscoveredServer.cpp +# - represents an entry in the list of available servers +# - handles some extra things like validating the identity of the remote host +# ----------------------------------------------------------------------------- +*/ + +#include "pvsDiscoveredServer.h" +#include "src/util/serviceDiscoveryUtil.h" +#include <QtNetwork/QSslKey> + +PVSDiscoveredServer::PVSDiscoveredServer(QObject* parent, QHostAddress host, int port, QByteArray fingerprint, QString name) + : QObject(parent) +{ + _validated = false; + _socket = NULL; + _host = host; + _port = port; + _fingerprint = fingerprint; + _name = name; + _lastUpdate = QDateTime::currentDateTime(); + _lastCheck = QDateTime::fromTime_t(1000000); + this->validateCertificate(); +} + +PVSDiscoveredServer::~PVSDiscoveredServer() { + delete _socket; +} + +void PVSDiscoveredServer::ssl_Error( const QList<QSslError> & errors ) +{ + for (QList<QSslError>::const_iterator it = errors.begin(); it != errors.end(); it++) + { + QSslError err = *it; + if (err.error() == QSslError::HostNameMismatch) continue; // We don't pay attention to hostnames for validation + if (err.error() == QSslError::SelfSignedCertificate) { + continue; // Also, this will always be the case; we check the fingerprint later + } + //ConsoleLog writeNetwork(err.errorString().toUtf8().data()); + //ConsoleLog writeNetwork("***** SSL ERROR, ABORTING *****"); + printf("Unhandled SSL Error in SD: %s\n", err.errorString().toUtf8().data()); + return; + } + _socket->ignoreSslErrors(); +} + +void PVSDiscoveredServer::sock_dataArrival() +{ + if (_socket == NULL) return; + + char charbuff[2000]; + while (_socket->bytesAvailable()) + { + _socket->read(charbuff, 2000); + } +} + +void PVSDiscoveredServer::sock_connected() +{ + QByteArray cert = _socket->peerCertificate().digest(QCryptographicHash::Sha1); + if (_socket->peerCertificate().isNull()) + { + printf("**** WARNING - PEER CERTIFICATE IS NULL ****\n"); + } + else + { + printf("%s\n", _socket->peerCertificate().subjectInfo(QSslCertificate::Organization).toUtf8().data()); + printf("%s\n", _socket->peerCertificate().subjectInfo(QSslCertificate::CommonName).toUtf8().data()); + printf("%s\n", _socket->peerCertificate().subjectInfo(QSslCertificate::LocalityName).toUtf8().data()); + printf("%s\n", _socket->peerCertificate().subjectInfo(QSslCertificate::OrganizationalUnitName ).toUtf8().data()); + printf("%s\n", _socket->peerCertificate().subjectInfo(QSslCertificate::CountryName ).toUtf8().data()); + printf("%s\n", _socket->peerCertificate().subjectInfo(QSslCertificate::StateOrProvinceName ).toUtf8().data()); + } + if (cert == _fingerprint && !_validated) + { + _validated = true; + emit validated(this); + printf("Validated certificate of %s :)\n", _socket->peerAddress().toString().toUtf8().data()); + } + else + { + printf("Certificate of %s is invalid :(\n", _socket->peerAddress().toString().toUtf8().data()); + QByteArray is, should; + is = cert.toBase64(); + should = _fingerprint.toBase64(); + printf("Is %s and should be %s\n", is.data(), should.data()); + } + _socket->disconnectFromHost(); +} + +void PVSDiscoveredServer::validateCertificate() +{ + if (_validated) return; // Nothing to do, this one is legit + QDateTime now = QDateTime::currentDateTime(); + if (_lastCheck.secsTo(now) < 30) return; // Too soon! + if (_host.isNull() || _port < 1 || _port > 65535) return; // Invalid + if (_socket != NULL) { + disconnect(_socket, SIGNAL(connected()), this, SLOT(sock_connected())); + disconnect(_socket, SIGNAL(readyRead()), this, SLOT(sock_dataArrival())); + disconnect(_socket, SIGNAL(sslErrors(const QList<QSslError> &)), + this, SLOT(ssl_Error(const QList<QSslError> &)) + ); + _socket->abort(); + _socket->deleteLater(); + } + _socket = new QSslSocket(this); + _socket->setProtocol(QSsl::SslV3); + _socket->setPeerVerifyMode(QSslSocket::VerifyPeer); + connect(_socket, SIGNAL(encrypted()), this, SLOT(sock_connected())); + connect(_socket, SIGNAL(readyRead()), this, SLOT(sock_dataArrival())); + connect(_socket, SIGNAL(sslErrors(const QList<QSslError> &)), + this, SLOT(ssl_Error(const QList<QSslError> &)) + ); + _socket->connectToHostEncrypted(_host.toString(), _port); + _lastCheck = now; +} + +bool PVSDiscoveredServer::hasFingerprint(QByteArray &fingerprint) +{ + return _fingerprint == fingerprint; +} + +bool PVSDiscoveredServer::hasHost(QHostAddress &host) +{ + return _host == host; +} + +void PVSDiscoveredServer::update(int port) +{ + _port = port; + _lastUpdate = QDateTime::currentDateTime(); +} + +int PVSDiscoveredServer::getAge() +{ + return _lastUpdate.secsTo(QDateTime::currentDateTime()); +} + +QString PVSDiscoveredServer::getName() +{ + return _name; +} diff --git a/src/net/pvsDiscoveredServer.h b/src/net/pvsDiscoveredServer.h new file mode 100644 index 0000000..d9f0c01 --- /dev/null +++ b/src/net/pvsDiscoveredServer.h @@ -0,0 +1,63 @@ +/* +# Copyright (c) 2009 - OpenSLX Project, Computer Center University of Freiburg +# +# This program is free software distributed under the GPL version 2. +# See http://openslx.org/COPYING +# +# If you have any feedback please consult http://openslx.org/feedback and +# send your suggestions, praise, or complaints to feedback@openslx.org +# +# General information about OpenSLX can be found at http://openslx.org/ +# ----------------------------------------------------------------------------- +# src/net/pvsDiscoveredServer.h +# - represents an entry in the list of available servers +# - handles some extra things like validating the identity of the remote host +# ----------------------------------------------------------------------------- +*/ + +#ifndef PVSDISCOVEREDSERVER_H_ +#define PVSDISCOVEREDSERVER_H_ + +#include <QtNetwork/QSslSocket> +#include <QtNetwork/QHostAddress> +#include <QtCore/QDateTime> + +class PVSDiscoveredServer; + +class PVSDiscoveredServer : public QObject { + Q_OBJECT + +private: + QHostAddress _host; + int _port; + QByteArray _fingerprint; + bool _validated; + QSslSocket *_socket; + QDateTime _lastCheck; + QDateTime _lastUpdate; + QString _name; + +public: + PVSDiscoveredServer(QObject* parent, QHostAddress host, int port, QByteArray fingerprint, QString name); + virtual ~PVSDiscoveredServer(); + bool isValid() { return _validated; } + bool hasFingerprint(QByteArray &fingerprint); + bool hasHost(QHostAddress &host); + void update(int port); + int getAge(); + QString getName(); + QHostAddress getHost() { return _host; } + QByteArray getFingerprint() { return _fingerprint; } + int getPort() { return _port; } + void validateCertificate(); + +private Q_SLOTS: + void ssl_Error( const QList<QSslError> & errors ); + void sock_dataArrival(); + void sock_connected(); + +Q_SIGNALS: + void validated(PVSDiscoveredServer*); +}; + +#endif /* PVSDISCOVEREDSERVER_H_ */ diff --git a/src/net/pvsListenServer.cpp b/src/net/pvsListenServer.cpp new file mode 100644 index 0000000..1dac9c0 --- /dev/null +++ b/src/net/pvsListenServer.cpp @@ -0,0 +1,308 @@ +/* + # Copyright (c) 2009,2010 - OpenSLX Project, Computer Center University of + # Freiburg + # + # This program is free software distributed under the GPL version 2. + # See http://openslx.org/COPYING + # + # If you have any feedback please consult http://openslx.org/feedback and + # send your suggestions, praise, or complaints to feedback@openslx.org + # + # General information about OpenSLX can be found at http://openslx.org/ + # ----------------------------------------------------------------------------- + # src/net/pvsListenServer.cpp + # - handling of clients (server side) + # - accepting new connections etc. + # ----------------------------------------------------------------------------- + */ + +#include "pvsListenServer.h" +#include "pvsMsg.h" +#include "pvsClientConnection.h" +#include "src/util/consoleLogger.h" +#include <QtNetwork/QSslSocket> +#include "SslServer.h" +#include <cassert> +//#define verbose + +// Create listener +PVSListenServer::PVSListenServer(int port, int clients) +{ + _id = generateID(); + _listenSocket = NULL; + _timer = 0; + if (clients < 1) + _clientsMax = 100; + else + _clientsMax = clients; + _port = port; + init(); + +} + +PVSListenServer::~PVSListenServer() +{ + if (_listenSocket != NULL) + { + disconnect(_listenSocket, SIGNAL(newConnection()), this, SLOT( + server_connectionRequest())); + _listenSocket->deleteLater(); + } +} + +PVSClientConnection* PVSListenServer::getConnectionFromId(int id) +{ + if (!(_clients.empty())) + { + // Check for ping timeout + for (std::list<PVSClientConnection*>::iterator it = _clients.begin(); it + != _clients.end(); it++) + { + PVSClientConnection *client = *it; + if (client) + if (client->getID() == id) + return client; + } + } + return NULL; +} + +void PVSListenServer::sendToAll(PVSMsg msg) +{ + if (!(_clients.empty())) + { + // Check for ping timeout + for (std::list<PVSClientConnection*>::iterator it = _clients.begin(); it + != _clients.end(); it++) + { + PVSClientConnection *client = *it; + if (client) + client->push_back_send(msg); + } + } +} + +// listen on a specific port +bool PVSListenServer::startListen(int port) +{ + if (_listenSocket != NULL) + { + ConsoleLog writeError( + QString("Server already listening on port :").append( + int2String(_port))); + if (shutdown()) + { + ConsoleLog writeError(QString("Server shutdown failed!")); + return false; + } + } + _port = port; + return init(); +} + +// stop listening and free socket descriptor +bool PVSListenServer::shutdown() +{ + if (_timer != 0) + killTimer( _timer); + _timer = 0; + if (_listenSocket != NULL) + { + disconnect(_listenSocket, SIGNAL(newConnection()), this, SLOT( + server_connectionRequest())); + _listenSocket->close(); + _listenSocket->deleteLater(); + } + _listenSocket = NULL; + _fresh = true; + return false; +} + +// timer event, 5 second interval +void PVSListenServer::timerEvent(QTimerEvent *event) +{ + if (!(_clients.empty())) + { + // Check for ping timeout + time_t refval = time(NULL) - 10; + for (std::list<PVSClientConnection*>::iterator it = _clients.begin(); it + != _clients.end(); it++) + { + PVSClientConnection *client = *it; + client->ping(); + if (!client->isConnected()) + { // disconnected + if (disconnectClient(client)) + break; // list was modified, iterator not valid anymore + } + if (client->lastData() < refval) + { // ping timeout + printf("Ping timeout for client %s\n", client->getNameUser().toLocal8Bit().data()); + if (disconnectClient(client)) + break; // list was modified, iterator not valid anymore + } + } + } +} + +// remove a client +bool PVSListenServer::disconnectClient(PVSClientConnection* delinquent) +{ + assert(delinquent); + delinquent->deleteLater(); + if (!(_clients.empty())) + { + for (std::list<PVSClientConnection*>::iterator it = _clients.begin(); it + != _clients.end(); it++) + { + if ((*it) == delinquent) + { + (*it)->closeConnection(); + _clients.remove((*it)); + onClientDisconnected(delinquent); + return true; + } + } + } + return false; +} + +// All sorts of events: + +void PVSListenServer::onConnectionRemoved(PVSClientConnection* delinquent) +{ + +} + +void PVSListenServer::onClientConnected(PVSClientConnection* connected) +{ + connected->setServerID(_id); + connected->setID(generateID()); +} + +void PVSListenServer::onClientDisconnected(PVSClientConnection* disconnected) +{ + // +} + +// Get client class for a given socket +PVSClientConnection* PVSListenServer::getConnectionFromSocket(QSslSocket* sock) +{ + for (std::list<PVSClientConnection*>::iterator it = _clients.begin(); it + != _clients.end(); it++) + { + if ((*it)->getSocket() == sock) // match! + return (*it); + } + return NULL; +} + +// generate a random (unique) id +unsigned int PVSListenServer::generateID() +{ + int random_integer; + do + { + random_integer = getRandom(0, 0); + } + while (getConnectionFromID(random_integer)); + + return (unsigned int) random_integer; +} + +// Get client class for a given id +PVSClientConnection* PVSListenServer::getConnectionFromID(int id) +{ + for (std::list<PVSClientConnection*>::iterator it = _clients.begin(); it + != _clients.end(); it++) + { + if ((*it)->getID() == id || id == _id) + { + return (*it); + } + } + return NULL; +} + +// Initialize listening socket +bool PVSListenServer::init() +{ + if (_listenSocket != NULL) + shutdown(); + + if (_port > 0) + { + // make a socket, bind it, and listen on it: + _listenSocket = new SslServer; + QHostAddress addr(QHostAddress::Any); + _listenSocket->listen(addr, _port); + + if (!_listenSocket->isListening()) + { + ConsoleLog writeNetwork( + QString("Error listening on Port ").append(int2String( + _port))); + return false; + } + ConsoleLog writeNetwork( + QString("Server is listening. Socket: ").append(int2String( + (int) _listenSocket))); + connect(_listenSocket, SIGNAL(newConnection()), this, SLOT( + server_connectionRequest())); + + _fresh = true; + if (_timer != 0) + killTimer( _timer); + _timer = startTimer(5000); + return true; + } + return false; +} + +void PVSListenServer::server_connectionRequest() +{ + //printf("ConnReq\n"); + if (_listenSocket == NULL) + return; // o.O + while (_listenSocket->hasPendingConnections()) + { + QSslSocket* sock = (QSslSocket*)_listenSocket->nextPendingConnection(); + //printf("Got one: %d: %s\n", (int)sock->isEncrypted(), sock->peerAddress().toString().toUtf8().data()); + if (_clients.size() >= _clientsMax) + { + sock->abort(); + sock->deleteLater(); + continue; + } + PVSClientConnection* client = new PVSClientConnection(this, sock); + _clients.push_back(client); // create new client class and add to list + onClientConnected(client); // trigger event + _fresh = false; + } +} + +void PVSListenServer::handleClientMsg(unsigned int clientID, PVSMsg msg) +{ + printf("Got Message for client %ud: [%c][%s][%s]\n", clientID, + (char) msg.getType(), msg.getIdent().toUtf8().data(), + msg.getMessage().toUtf8().data()); + msg.setSndID(clientID); + if (msg.getType() == PVSCOMMAND) + _commandDispatcher.fire(msg.getIdent(), msg); + else if (msg.getType() == PVSMESSAGE) + _chatDispatcher.fire(msg.getIdent(), msg); + else if (msg.getType() == PVSLOGIN) + _loginDispatcher.fire(msg.getIdent(), msg); + else + ConsoleLog + writeNetwork( + QString( + "Could not dispatch Message of unknown Type.\n\t Message was: ").append( + msg.getIdent().append(QString(":").append( + msg.getMessage())))); +} + +bool PVSListenServer::isListening() +{ + return _listenSocket != NULL && _listenSocket->isListening(); +} diff --git a/src/net/pvsListenServer.h b/src/net/pvsListenServer.h new file mode 100644 index 0000000..ab021c7 --- /dev/null +++ b/src/net/pvsListenServer.h @@ -0,0 +1,106 @@ +#ifndef _PVSLISTENSERVER_H_ +#define _PVSLISTENSERVER_H_ +#include <list> +#include <src/util/dispatcher.h> +#include <src/util/consoleLogger.h> +#include <QtNetwork/QSslSocket> +//#include <QtNetwork/QTcpServer> + +class SslServer; + +class PVSClientConnection; +class PVSMsg; + +class PVSListenServer : public QObject +{ + Q_OBJECT + +private: + + // internal control functions + + std::list<PVSClientConnection*> _clients; + + + int _numCon; + bool _fresh; + unsigned int _clientsMax; + int _port; + + //QTcpServer *_listenSocket; + SslServer *_listenSocket; + + int _id; + EventIdentDispatcher<PVSMsg> _loginDispatcher; + EventIdentDispatcher<PVSMsg> _commandDispatcher; + EventIdentDispatcher<PVSMsg> _chatDispatcher; + int _timer; + + // obvious init method is obvious + bool init(); + unsigned int generateID(); + +protected: + void timerEvent(QTimerEvent *event); + +public: + + +// typedef void (A::*function)(void); + // C'Tor + explicit PVSListenServer(int port = 0, int clients = 0); + virtual ~PVSListenServer(); + + PVSClientConnection* getConnectionFromId(int id); + void sendToAll(PVSMsg msg); + // control methods + bool startListen(int port); + bool shutdown(); + bool isListening(); + bool disconnectClient(PVSClientConnection* delinquent); + void onConnectionRemoved(PVSClientConnection* delinquent); + + std::list<PVSClientConnection*>* getClientListPtr() + { + return &_clients; + } + // methods which can/should be overwritten by derivates + virtual void onClientConnected(PVSClientConnection* connected); // you can hook up additional services on client connection here + virtual void onClientDisconnected(PVSClientConnection* disconnected); // deletes the client, but you can hook up stuff here too + + void handleClientMsg(unsigned int clientID, PVSMsg msg); ///< called by a clientconnection if a msg was received + + + template<class T> void addLoginHandler(QString ident, T* who, void (T :: *func)(PVSMsg)) + { + printf("Listener got added to LoginHandler\n"); + _loginDispatcher.addListener(ident, who, func); + }; + template<class T> void removeLoginHandler(QString ident, T* who, void (T :: *func)(PVSMsg)) + { + _loginDispatcher.removeListener(ident, who, func); + }; + template<class T> void addChatHandler(QString ident, T* who, void (T :: *func)(PVSMsg)) + { + _chatDispatcher.addListener(ident, who, func); + }; + template<class T> void removeChatHandler(QString ident, T* who, void (T :: *func)(PVSMsg)) + { + _chatDispatcher.removeListener(ident, who, func); + }; + template<class T> void addCommandHandler(QString ident, T* who, void (T :: *func)(PVSMsg)) + { + _commandDispatcher.addListener(ident, who, func); + }; + template<class T> void removeCommandHandler(QString ident, T* who, void (T :: *func)(PVSMsg)) + { + _commandDispatcher.removeListener(ident, who, func); + }; + PVSClientConnection* getConnectionFromSocket(QSslSocket* sock); + PVSClientConnection* getConnectionFromID(int id); + +private Q_SLOTS: + void server_connectionRequest(); +}; + +#endif diff --git a/src/net/pvsLocalhostCommunicator.cpp b/src/net/pvsLocalhostCommunicator.cpp new file mode 100644 index 0000000..199b39c --- /dev/null +++ b/src/net/pvsLocalhostCommunicator.cpp @@ -0,0 +1,104 @@ +#include "pvsLocalhostCommunicator.h" +#include "src/util/consoleLogger.h" +#include "src/net/pvsMsg.h" + +static QHostAddress localhost(QHostAddress::LocalHost); +#define localport 14913 + +PVSLocalhostCommunicator::PVSLocalhostCommunicator(QString path) +{ + _isServer = _isRunning = false; + _sock = NULL; +} + +void PVSLocalhostCommunicator::run() +{ + if (_isRunning) + return; + + // First try to run as server + _sock = new QUdpSocket(); + // We'll bind only to localhost, so nobody else can send commands (from remote hosts) + // Otherwise we had to check the remote addr when receiving a datagram, but this + // wouldn't be as secure since you can easily fake it + _sock->bind(localhost, localport); // QUdpSocket::DontShareAddress? would need root + connect(_sock, SIGNAL(readyRead()), this, SLOT(sock_dataArrival())); + + if (_sock->state() == QAbstractSocket::BoundState) + { + // OK, we are the first daemon to run + _isServer = true; + _isRunning = true; + return; + } + if (_sock->bind()) + { + _isRunning = true; + } +} + +void PVSLocalhostCommunicator::stop() +{ + _isRunning = false; + _sock->deleteLater(); + _sock = NULL; +} + +void PVSLocalhostCommunicator::sock_dataArrival() +{ + if (_sock == NULL) return; + + qint64 dsize; + while ((dsize = _sock->pendingDatagramSize()) > -1) // returns -1 if no more datagrams are pending + { + if (dsize < 4) // anything shorter than 4 bytes is not a valid PVSMsg anyways, so take a shortcut + { + char x; + _sock->readDatagram(&x, 1, NULL, NULL); + continue; // discard the packet and see if there is more + } + + PVSMsg receiver; + receiver.readMessage(_sock, true); + + if (receiver.isMsgComplete()) + { + // we received a message, so fire away + ConsoleLog writeNetwork(QString("Received UDS command: ").append(receiver.getIdent())); + _daemonDispatcher.fire(receiver.getIdent(), receiver); + } // If the msg is not complete we have to discard it, since UDP + // is packet oriented and we could not say for sure if the next one + // would be the continuation of this msg. + // Usually on the loopback interface it is safe to send datagrams + // up to 8kb, so this is not be an issue anyway. + } +} + +void PVSLocalhostCommunicator::sendCommand(QString ident, QString cmd) +{ + if (_isRunning && !_isServer && _sock != NULL) + { + PVSMsg sender(PVSDAEMON, ident, cmd); + char *data; + int len; + sender.getBinaryData(data, len); + QByteArray qba(data, len); + printf("Sending %d bytes to daemon...\n", qba.length()); + qint64 result = _sock->writeDatagram(qba, localhost, localport); + _sock->waitForBytesWritten(100); + + // simply bail out on an error or disconnect or whatever + if (result != len) + { + if (result == -1) + { + printf("Error sending PVSMsg to daemon: %s\n", _sock->errorString().toUtf8().data()); + } + else + { + printf("Sent PVSMsg was incomplete.\n"); + } + stop(); + } + } +} diff --git a/src/net/pvsLocalhostCommunicator.h b/src/net/pvsLocalhostCommunicator.h new file mode 100644 index 0000000..425cc37 --- /dev/null +++ b/src/net/pvsLocalhostCommunicator.h @@ -0,0 +1,51 @@ +/// test documentation +/// whatever +//! and one more + + + +#ifndef _PVSLocalhostCommunicator_H_ +#define _PVSLocalhostCommunicator_H_ +#include <src/util/dispatcher.h> +#include <QtNetwork/QUdpSocket> + + +class PVSMsg; + +class PVSLocalhostCommunicator : public QObject +{ + Q_OBJECT +public: + PVSLocalhostCommunicator(QString path); + void run(); + bool server() + { + return _isServer; + }; + bool running() + { + return _isRunning; + }; + void stop(); + void sendCommand(QString ident, QString cmd); + EventIdentDispatcher<PVSMsg>* getDispatcher() + { + return &_daemonDispatcher; + }; + +private Q_SLOTS: + void sock_dataArrival(); + +private: + + bool _isServer, _isRunning; + QUdpSocket* _sock; + + + + EventIdentDispatcher<PVSMsg> _daemonDispatcher; //!< Dispatcher for Daemon Commands +}; + +typedef PVSLocalhostCommunicator PVSUDSC; + +#endif diff --git a/src/net/pvsMsg.cpp b/src/net/pvsMsg.cpp new file mode 100644 index 0000000..b56c979 --- /dev/null +++ b/src/net/pvsMsg.cpp @@ -0,0 +1,207 @@ +/* + # Copyright (c) 2010 - OpenSLX Project, Computer Center University of Freiburg + # + # This program is free software distributed under the GPL version 2. + # See http://openslx.org/COPYING + # + # If you have any feedback please consult http://openslx.org/feedback and + # send your suggestions, praise, or complaints to feedback@openslx.org + # + # General information about OpenSLX can be found at http://openslx.org/ + # ----------------------------------------------------------------------------- + # src/net/pvsMsg.cpp + # - ??? . + # ----------------------------------------------------------------------------- + */ + +#include "pvsMsg.h" +#include <cstring> +#include <QtNetwork/QUdpSocket> +#include <QtNetwork/QHostAddress> + +#ifndef min +#define min(a,b) (((a)<(b))?(a):(b)) +#endif + +static unsigned char PVS_ID = 'P'; + +// Several constructors for the PVSMsg class... +PVSMsg::PVSMsg() +{ + _msgType = PVSMESSAGE; + _buffer = NULL; + _buffLen = 0; + _buffFill = 0; +} + +PVSMsg::PVSMsg(PVSMsgType type, QString ident, QString msg, int recID) +{ + this->_recID = recID; + + if (ident.size()) + _msgIdent = ident; + else + _msgIdent = QString("invalid"); + + _msgType = type; + _msgString = msg; + _buffer = NULL; + _buffLen = 0; + _buffFill = 0; +} + +PVSMsg::PVSMsg(PVSMsg const& copyMe) +{ + _msgType = copyMe._msgType; + _msgString = copyMe._msgString; + _msgIdent = copyMe._msgIdent; + _remoteIp = copyMe._remoteIp; + + _buffLen = copyMe._buffLen; + _buffFill = copyMe._buffFill; + if (_buffLen > 0) + { + _buffer = new char[_buffLen]; + memcpy(_buffer, copyMe._buffer, _buffLen); + } + else + _buffer = NULL; + _sndID = copyMe._sndID; + _recID = copyMe._recID; +} + +// Destructor... +PVSMsg::~PVSMsg() +{ + if (_buffer) + delete[] _buffer; +} + +int PVSMsg::readMessage(QAbstractSocket* sock, bool udp) +{ + if (_buffFill > 0 && _buffLen <= _buffFill) + return 1; + qint64 ret = 0; + if (_buffFill < 4) // message header is not complete yet + { + if (_buffer == NULL) + { + _remoteIp = sock->peerAddress().toString(); + if (udp) + _buffer = new char[1000]; + else + _buffer = new char[4]; + } + // Read as many bytes as needed to complete the 4 byte header + if (udp) + ret = ((QUdpSocket*)sock)->readDatagram(_buffer, 1000); + else + ret = sock->read(_buffer + _buffFill, 4 - _buffFill); + if (ret == -1) return -1; + _buffFill += (int)ret; + if (_buffFill == 0) + return 0; + if (_buffer[0] != PVS_ID) + { + // check if the id byte is correct + // otherwise either the message parsing is broken + // or someone is sending garbage + return -1; + } + if (_buffFill >= 4) + { + // header complete, allocate buffer + _buffLen = 4 + (unsigned char)_buffer[2] + (unsigned char)_buffer[3]; + char *nb = new char[_buffLen + 1]; // +1 for \0 + memcpy(nb, _buffer, _buffFill); + delete[] _buffer; + _buffer = nb; + } + } + if (_buffFill >= 4) + { + // got header, assemble rest of msg + if (!udp) + { + ret = sock->read(_buffer + _buffFill, _buffLen - _buffFill); // read remaining bytes + if (ret == -1) return -1; + _buffFill += (int)ret; + } + if (_buffFill >= _buffLen) + { + // message is complete + _buffer[_buffLen] = '\0'; // first, terminate with nullchar + _msgString = QString::fromUtf8(_buffer + 4 + (unsigned char)_buffer[2]); // get message + _buffer[4 + (unsigned char)_buffer[2]] = '\0'; + _msgIdent = QString::fromUtf8(_buffer + 4); // get ident + _msgType = (PVSMsgType)_buffer[1]; // get msg type + return 1; + } + } + return 0; +} + +void PVSMsg::setMessage(QString text) +{ + _msgString = text; +} + +void PVSMsg::setIdent(QString ident) +{ + _msgIdent = ident; +} + +QString PVSMsg::getMessage() +{ + return _msgString; +} + +QString PVSMsg::getIdent() +{ + return _msgIdent; +} + +bool PVSMsg::getBinaryData(char*& data, int& dataLen) +{ + if (_msgIdent.size() == 0) + return false; + this->makeSndBuff(); + data = (char*) _buffer; + dataLen = _buffLen; + return true; +} + +void PVSMsg::setSndID(int id) +{ + _sndID = id; +} + +void PVSMsg::setRecID(int id) +{ + _recID = id; +} + +// Create a send buffer with the necessary size +bool PVSMsg::makeSndBuff() +{ + QByteArray uIdent = _msgIdent.toUtf8(); + QByteArray uString = _msgString.toUtf8(); + uIdent.truncate(255); + uString.truncate(255); + _buffLen = 4 + uIdent.size() + uString.size(); + if (_buffer != NULL) + delete[] _buffer; + unsigned char *tmpBuffer = new unsigned char[_buffLen + 1]; + + tmpBuffer[0] = PVS_ID; + tmpBuffer[1] = (unsigned char) _msgType; + tmpBuffer[2] = (unsigned char) uIdent.size(); + tmpBuffer[3] = (unsigned char) uString.size(); + memcpy(tmpBuffer + 4, uIdent.data(), uIdent.size()); + memcpy(tmpBuffer + 4 + uIdent.size(), uString.data(), uString.size()); + //printf("[%c] '%s' - '%s'\n", (char)_msgType, _msgIdent.toUtf8().data(), _msgString.toUtf8().data()); + tmpBuffer[_buffLen] = '\0'; + //printf("Binary: '%s'\n", _buffer); + _buffer = (char*)tmpBuffer; + return true; +} diff --git a/src/net/pvsMsg.h b/src/net/pvsMsg.h new file mode 100644 index 0000000..6fbcd99 --- /dev/null +++ b/src/net/pvsMsg.h @@ -0,0 +1,73 @@ +/* + * pvsMsg.h + * + * Created on: 08.01.2010 + * Author: sr + */ + +#ifndef PVSMSG_H_ +#define PVSMSG_H_ + + +#include <QtCore/QString> + +enum PVSMsgType +{ + PVSCOMMAND = 'C', + PVSMESSAGE = 'M', + PVSLOGIN = 'L', + PVSDAEMON = 'D', + PVSUNKNOWN = 'U' +}; + +class PVSServerConnection; +class PVSListenServer; +class PVSClientConnection; +class QAbstractSocket; + +class PVSMsg +{ +public: + friend class PVSServerConnection; + friend class PVSListenServer; + friend class PVSClientConnection; + + PVSMsg(); + PVSMsg(PVSMsgType type, QString _ident, QString msg, int recID = 0); + PVSMsg(PVSMsg const& copyMe); + ~PVSMsg(); + + int readMessage(QAbstractSocket* sock, bool udp = false); ///< -1 = error, 0 = incomplete, 1 = complete + unsigned int getLength() + { + return _msgString.size(); + }; + void setIdent(QString ident); + QString getIdent(); + void setMessage(QString text); + QString getMessage(); + PVSMsgType getType() { return _msgType; } + bool getBinaryData(char*& data, int& dataLen); ///< get binary representation of this PVSmsg + + unsigned int getRecID() { return _recID; } + int getSndID() { return _sndID; } + QString getRemoteIp() { return _remoteIp; } + bool isMsgComplete() { return _buffFill > 0 && _buffFill == _buffLen; } + +private: + void setSndID(int id); + void setRecID(int id); + bool makeSndBuff(); + PVSMsgType _msgType; ///< type of message (command, message, login, daemon) + QString _msgIdent; ///< message ident + QString _msgString; ///< message string + char *_buffer; ///< receive buffer + int _buffLen; ///< size of complete message in bytes + int _buffFill; ///< actual number of bytes in buffer + + int _sndID; + int _recID; + QString _remoteIp; +}; + +#endif /* PVSMSG_H_ */ diff --git a/src/net/pvsServerConnection.cpp b/src/net/pvsServerConnection.cpp new file mode 100644 index 0000000..04a1ef6 --- /dev/null +++ b/src/net/pvsServerConnection.cpp @@ -0,0 +1,243 @@ +#include "pvsServerConnection.h" +#include "src/util/consoleLogger.h" +#include "src/util/util.h" +#include "pvsMsg.h" +#include "src/pvs.h" +#include <QtNetwork/QHostAddress> +#include "src/core/pvsChatClient.h" +#include "src/util/serviceDiscoveryUtil.h" +#include "src/net/pvsDiscoveredServer.h" +//#define verbose + +PVSServerConnection::PVSServerConnection(PVS *parent) : QObject(parent) +{ + _client = parent; + _incomplete = NULL; + _socket = NULL; + _timerId = 0; + _timer = 0; + _wasConnected = false; + loadCommands(); +} + +inline void PVSServerConnection::timerStop() +{ + if (_timer == 0) return; + killTimer(_timer); + _timer = 0; +} + +bool PVSServerConnection::connectToServer(PVSDiscoveredServer* server, QString passwd) +{ + QHostAddress host = server->getHost(); + if (_socket != NULL && _socket->state() == QAbstractSocket::ConnectedState + && _socket->peerAddress() == host) return false; + int port = server->getPort(); + if (port < 1 || port > 65535) port = SERVER_PORT_INT; + ConsoleLog writeNetwork("Connecting to host:"); + ConsoleLog writeNetwork(host.toString().toUtf8().data()); + timerStop(); + if (_socket != NULL) + { + _socket->blockSignals(true); + _socket->abort(); + _socket->deleteLater(); + } + _name = server->getName(); + _expectedFingerprint = server->getFingerprint(); + _passwd = passwd; + _socket = new QSslSocket(this); + connect(_socket, SIGNAL(encrypted()), this, SLOT(sock_connected())); + connect(_socket, SIGNAL(readyRead()), this, SLOT(sock_dataArrival())); + connect(_socket, SIGNAL(disconnected()), this, SLOT(sock_closed())); + connect(_socket, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(sock_error(QAbstractSocket::SocketError))); + char tex[2000]; + snprintf(tex, 2000, "Connecting to %s on port %d", host.toString().toUtf8().data(), (int)port); + ConsoleLog writeNetwork(tex); + connect(_socket, + SIGNAL(sslErrors(const QList<QSslError> &)), + this, + SLOT(sslErrors(const QList<QSslError> &)) + ); + _socket->connectToHostEncrypted(host.toString(), port); + if (_timer == 0) _timer = startTimer(10000); + + return true; // we really don't know yet if it will succeed since its async +} + +void PVSServerConnection::sslErrors ( const QList<QSslError> & errors ) +{ + for (QList<QSslError>::const_iterator it = errors.begin(); it != errors.end(); it++) + { + QSslError err = *it; + printf("Connect SSL: %s\n", err.errorString().toUtf8().data()); + if (err.error() == QSslError::HostNameMismatch) continue; // We don't pay attention to hostnames for validation + if (err.error() == QSslError::SelfSignedCertificate) continue; // Also, this will always be the case; we check the fingerprint later + ConsoleLog writeNetwork(err.errorString().toUtf8().data()); + ConsoleLog writeNetwork("***** SSL ERROR, ABORTING *****"); + return; + } + _socket->ignoreSslErrors(); +} + +void PVSServerConnection::disconnectFromServer() +{ + if (_socket == NULL) return; + _socket->disconnectFromHost(); + handleDisconnectInternal(); +} + +void PVSServerConnection::timerEvent(QTimerEvent *event) +{ + if (_socket != NULL && _socket->state() == QAbstractSocket::ConnectedState) return; + // TODO: Check for ping timeout +} + +void PVSServerConnection::sendMessage(PVSMsg newMessage) +{ + if (_socket == NULL || _socket->state() != QAbstractSocket::ConnectedState) return; + char *data; + int len; + newMessage.getBinaryData(data, len); + QByteArray qba(data, len); + _socket->write(qba); +} + +void PVSServerConnection::ping() +{ + sendMessage(PVSMsg(PVSCOMMAND, "PING", "U THERE?"));; +} + +QString PVSServerConnection::getServerName() +{ + if (!isConnected()) return QString(); + return _name; +} + +void PVSServerConnection::loadCommands() +{ + addLoginHandler("ID", this, &PVSServerConnection::onID); + addCommandHandler("PING", this, &PVSServerConnection::onPing); +} + +void PVSServerConnection::onID(PVSMsg idmsg) +{ + _id = (unsigned int)string2Int(idmsg.getMessage()); +} + +void PVSServerConnection::onPing(PVSMsg pingmsg) +{ + if (pingmsg.getMessage().at(pingmsg.getMessage().size()-1) == '?') + { + sendMessage(PVSMsg(PVSCOMMAND, "PING", "HI!")); + } +} + +void PVSServerConnection::handleClientMsg(PVSMsg receiver) +{ + // FIXME: @SimonR, this line cuase problems with pvs in daemon mode and dbus + //qDebug("Got Message for this client: [%c][%s][%s]\n", (char)receiver.getType(), receiver.getIdent().toUtf8().data(), receiver.getMessage().toUtf8().data()); + if (receiver.getType() == PVSCOMMAND) + { + _commandDispatcher.fire(receiver.getIdent(), receiver); +// ConsoleLog writeNetwork(QString("Received a command and handled it.").append(receiver.getIdent().append(QString(":").append(receiver.getMessage())))); + } + else if (receiver.getType() == PVSMESSAGE) + { + _chatDispatcher.fire(receiver.getIdent(), receiver); + ConsoleLog writeNetwork(QString("Received a chat message and handled it.").append(receiver.getIdent().append(QString(":").append(receiver.getMessage())))); + } + else if (receiver.getType() == PVSLOGIN) + { + _loginDispatcher.fire(receiver.getIdent(), receiver); +// ConsoleLog writeNetwork(QString("Received a login and handled it. Ident: ").append(receiver.getIdent().append(QString(":")).append(receiver.getMessage()))); + } + else if (receiver.getType() == PVSUNKNOWN) + { + ConsoleLog writeNetwork(QString("Received an unknown type. Ident : ").append(receiver.getIdent().append(QString(" : ").append(receiver.getMessage())))); + } +} + +void PVSServerConnection::sock_dataArrival() +{ + if (_socket == NULL || _socket->state() != QAbstractSocket::ConnectedState) + { + ConsoleLog writeError("dataArrival called in bad state"); + return; + } + + while (_socket->bytesAvailable()) + { + int retval = 0; + do + { + if (_incomplete == NULL) _incomplete = new PVSMsg(); // we need a pvsmsg object + retval = _incomplete->readMessage(_socket); // let the message read data from socket + if (retval == -1) // error parsing msg, disconnect client! + { + this->disconnectFromServer(); + return; + } + if (retval == 1) // message is complete + { + this->handleClientMsg(*_incomplete); + delete _incomplete; // ...and delete... + _incomplete = NULL; // ...so the next msg can be parsed + } + } while (retval == 1); + } +} + +void PVSServerConnection::sock_closed() +{ + // should this be unreliable in some way i suggest using the signal "stateChanged()" instead + // and check if the state changed to unconnected. + ConsoleLog writeNetwork("Socket was closed... oh well.."); + handleDisconnectInternal(); +} + +void PVSServerConnection::sock_error(QAbstractSocket::SocketError errcode) +{ + char txt[204]; + snprintf(txt, 200, "Connection error: %d", (int)errcode); + ConsoleLog writeNetwork(txt); + handleDisconnectInternal(); +} + +// Send to server username and loginname. +void PVSServerConnection::sock_connected() +{ + QByteArray cert = _socket->peerCertificate().digest(QCryptographicHash::Sha1); + if (_expectedFingerprint != cert) + { // Nich mit mir, Freundchen! + disconnectFromServer(); + // Maybe you want to inform the user that there was a certificate mismatch + // and that it is very possible that the CIA is trying to eavesdrop on the connection + return; + } + ConsoleLog writeNetwork("Connected!"); + _wasConnected = true; + sendMessage( + PVSMsg(PVSLOGIN, "USERNAME", getFullUsername()+","+getenv("USER"))); + sendMessage( + PVSMsg(PVSLOGIN, "PASSWORD", _passwd)); + ConsoleLog writeNetwork("Sent Username and password."); + + _client->onConnected(_name); +} + +void PVSServerConnection::handleDisconnectInternal() +{ + _socket->blockSignals(true); + _socket->abort(); + _socket->deleteLater(); + _socket = NULL; + _name = QString(); + _client->securityUnlock(); + timerStop(); + if (_wasConnected) + { + _wasConnected = false; + _client->onDisconnected(); + } +} diff --git a/src/net/pvsServerConnection.h b/src/net/pvsServerConnection.h new file mode 100644 index 0000000..0669d88 --- /dev/null +++ b/src/net/pvsServerConnection.h @@ -0,0 +1,99 @@ +/** + * PVSServerConnection + * + * holds and maintains a Connection to a PVSListenServer (or derivate) + * + */ + + + +#ifndef _PVSSERVERCONNECTION_H_ +#define _PVSSERVERCONNECTION_H_ + +#include "src/util/dispatcher.h" +#include <QtNetwork/QSslSocket> + +class PVSMsg; +class PVS; +class PVSDiscoveredServer; + +class PVSServerConnection : public QObject +{ + Q_OBJECT +public: + PVSServerConnection(PVS *parent); + ~PVSServerConnection() {} + bool connectToServer(PVSDiscoveredServer* server, QString passwd = QString()); + void disconnectFromServer(); + bool isConnected() + { + return _socket != NULL && _socket->state() == QAbstractSocket::ConnectedState; + } + + void sendMessage(PVSMsg newMessage); + + void ping(); + QString getServerName(); + + virtual void loadCommands(); + void onID(PVSMsg idmsg); + void onPing(PVSMsg pingmsg); + template<class T> void addLoginHandler(QString ident, T* who, void (T :: *func)(PVSMsg)) + { + _loginDispatcher.addListener(ident, who, func); + }; + template<class T> void removeLoginHandler(QString ident, T* who, void (T :: *func)(PVSMsg)) + { + _loginDispatcher.removeListener(ident, who, func); + }; + template<class T> void addChatHandler(QString ident, T* who, void (T :: *func)(PVSMsg)) + { + _chatDispatcher.addListener(ident, who, func); + }; + template<class T> void removeChatHandler(QString ident, T* who, void (T :: *func)(PVSMsg)) + { + _chatDispatcher.removeListener(ident, who, func); + }; + template<class T> void addCommandHandler(QString ident, T* who, void (T :: *func)(PVSMsg)) + { + _commandDispatcher.addListener(ident, who, func); + }; + template<class T> void removeCommandHandler(QString ident, T* who, void (T :: *func)(PVSMsg)) + { + _commandDispatcher.removeListener(ident, who, func); + }; + +protected: + void timerEvent(QTimerEvent *event); + +private Q_SLOTS: + void sslErrors(const QList<QSslError> & errors); // triggered for errors that occur during SSL negotiation + void sock_dataArrival(); // triggered if data is available for reading + void sock_closed(); // triggered if the socket is closed + void sock_error(QAbstractSocket::SocketError errcode); // triggered if an error occurs on the socket + void sock_connected(); // triggered if the connection is established and ready to use + +private: + + inline void timerStop(); + void handleClientMsg(PVSMsg receiver); + void handleDisconnectInternal(); + + EventIdentDispatcher<PVSMsg> _commandDispatcher; + EventIdentDispatcher<PVSMsg> _chatDispatcher; + EventIdentDispatcher<PVSMsg> _loginDispatcher; + PVSMsg *_incomplete; + QSslSocket *_socket; + unsigned int _id; + int _timerId; + //QString _host; + //quint16 _port; + int _timer; + PVS *_client; + bool _wasConnected; + QByteArray _expectedFingerprint; + QString _name; + QString _passwd; +}; + +#endif diff --git a/src/net/pvsServiceBroadcast.cpp b/src/net/pvsServiceBroadcast.cpp new file mode 100644 index 0000000..cf15b5b --- /dev/null +++ b/src/net/pvsServiceBroadcast.cpp @@ -0,0 +1,51 @@ +/*
+# Copyright (c) 2009 - OpenSLX Project, Computer Center University of Freiburg
+#
+# This program is free software distributed under the GPL version 2.
+# See http://openslx.org/COPYING
+#
+# If you have any feedback please consult http://openslx.org/feedback and
+# send your suggestions, praise, or complaints to feedback@openslx.org
+#
+# General information about OpenSLX can be found at http://openslx.org/
+# -----------------------------------------------------------------------------
+# src/net/pvsServiceBroadcast.cpp
+# - broadcast sessionname
+# -----------------------------------------------------------------------------
+*/
+/********** COMPILE-TIME SETTINGS ***************/
+
+#include "pvsServiceBroadcast.h"
+#include "src/setup.h"
+#include <cassert>
+#include "src/util/serviceDiscoveryUtil.h"
+
+PVSServiceBroadcast::PVSServiceBroadcast()
+{
+ _announce = NULL;
+ _timer = 0;
+ _broadcaster.bind(SD_PORT_CONSOLE);
+ _everyone = QHostAddress(QHostAddress::Broadcast);
+}
+
+PVSServiceBroadcast::~PVSServiceBroadcast()
+{
+ if (_announce != NULL) delete _announce;
+ if (_timer != 0) this->killTimer(_timer);
+}
+
+void PVSServiceBroadcast::setFingerprint(QByteArray sha1)
+{
+ if (_announce != NULL) _announce->clear();
+ else _announce = new QByteArray();
+ appendSdField(_announce, "hsh", QString(sha1.toBase64()));
+ appendSdField(_announce, "prt", SERVER_PORT); // TODO: maybe this has to come from somewhere else if configurable
+ appendSdField(_announce, "aut", "SHA1");
+ if (_timer == 0) _timer = this->startTimer(SB_INTERVAL * 1000);
+}
+
+void PVSServiceBroadcast::timerEvent(QTimerEvent *event)
+{
+ if (_announce == NULL) return;
+ _broadcaster.writeDatagram(*_announce, _everyone, SD_PORT_CLIENT);
+}
diff --git a/src/net/pvsServiceBroadcast.h b/src/net/pvsServiceBroadcast.h new file mode 100644 index 0000000..cf3f63d --- /dev/null +++ b/src/net/pvsServiceBroadcast.h @@ -0,0 +1,46 @@ +/*
+# Copyright (c) 2009 - OpenSLX Project, Computer Center University of Freiburg
+#
+# This program is free software distributed under the GPL version 2.
+# See http://openslx.org/COPYING
+#
+# If you have any feedback please consult http://openslx.org/feedback and
+# send your suggestions, praise, or complaints to feedback@openslx.org
+#
+# General information about OpenSLX can be found at http://openslx.org/
+# -----------------------------------------------------------------------------
+# src/net/pvsServiceBroadcast.cpp
+# - broadcast sessionname, port, auth/encryption
+# -----------------------------------------------------------------------------
+*/
+
+#ifndef PVSSERVICEBROADCAST_H_
+#define PVSSERVICEBROADCAST_H_
+
+#include <QtCore/QString>
+#include <QtCore/QObject>
+#include <QtNetwork/QUdpSocket>
+#include "src/net/pvsMsg.h"
+
+class PVSMsg;
+
+class PVSServiceBroadcast : public QObject
+{
+ Q_OBJECT
+
+public:
+ PVSServiceBroadcast();
+ virtual ~PVSServiceBroadcast();
+ void setFingerprint(QByteArray sha1);
+
+protected:
+ void timerEvent(QTimerEvent *event);
+
+private:
+ QByteArray *_announce;
+ QUdpSocket _broadcaster;
+ QHostAddress _everyone;
+ int _timer;
+};
+
+#endif /* PVSSERVICEBROADCAST_H_ */
diff --git a/src/net/pvsServiceDiscovery.cpp b/src/net/pvsServiceDiscovery.cpp new file mode 100644 index 0000000..0a99802 --- /dev/null +++ b/src/net/pvsServiceDiscovery.cpp @@ -0,0 +1,181 @@ +/* +# Copyright (c) 2009 - OpenSLX Project, Computer Center University of Freiburg +# +# This program is free software distributed under the GPL version 2. +# See http://openslx.org/COPYING +# +# If you have any feedback please consult http://openslx.org/feedback and +# send your suggestions, praise, or complaints to feedback@openslx.org +# +# General information about OpenSLX can be found at http://openslx.org/ +# ----------------------------------------------------------------------------- +# src/net/pvsServiceDiscovery.cpp +# - handle console broadcasts, tell client to connect on match +# ----------------------------------------------------------------------------- +*/ + +#include <QtCore/QHash> +#include "src/pvs.h" +#include "pvsServiceDiscovery.h" +#include "pvsDiscoveredServer.h" +#include "src/setup.h" +#include "src/util/serviceDiscoveryUtil.h" +#include <cassert> + + + +PVSServiceDiscovery::PVSServiceDiscovery(PVS* client) +{ + assert(client); + bool ret = _sock.bind(SD_PORT_CLIENT); + if (!ret) + { + printf("Could not open SERVICE DISCOVERY port\n"); + exit(1); + } + connect(&_sock, SIGNAL(readyRead()), this, SLOT(sock_dataArrival())); + _currentServer = 0; + _last = QDateTime::currentDateTime(); + _client = client; + _timerId = startTimer(10000); +} + +PVSServiceDiscovery::~PVSServiceDiscovery() +{ + killTimer(_timerId); +} + +void PVSServiceDiscovery::connectToSession(QString name, QString passwd) +{ + _sessionName = name; + _sessionPasswd = passwd; + if (name.length() == 0) return; + for (tServerList::iterator it = _servers.begin(); it != _servers.end(); it++) + { + PVSDiscoveredServer *ds = *it; + if (ds->isValid() && ds->getName() == name) + { + _client->connectToHost(ds, _sessionPasswd); + } + } +} + +void PVSServiceDiscovery::sock_dataArrival() +{ + int len; + while ((len = _sock.pendingDatagramSize()) > -1) + { + if (len == 0) continue; + char *data = new char[len]; + QHostAddress host; + len = _sock.readDatagram(data, len, &host); + SdFields fields = parseSdFields((unsigned char*)data, len); + QDateTime now = QDateTime::currentDateTime(); + if (fields.contains("hsh") && fields.contains("prt") && fields.contains("aut")) + { + if (fields["aut"] == "SHA1") + { + this->handleDiscovery( + host, + atoi(fields["prt"].toUtf8().data()), + QByteArray::fromBase64(fields["hsh"].toAscii()) + ); + } + } + /* + // DEBUG ONLY: connect to any host without matching the session name + if (_last.secsTo(now) > 9 && fields.contains("prt")) + { + _last = now; + int port = atoi(fields["prt"].toUtf8().data()); + _client->connectToHost(host, QByteArray(), port); + } + // ^^^^^^^^^^ + */ + } +} + +void PVSServiceDiscovery::handleDiscovery(QHostAddress host, int port, QByteArray hash) +{ + int numhosts = 0; ///< while iterating we count how many entries have the same host + for (tServerList::iterator it = _servers.begin(); it != _servers.end(); it++) + { + if ((**it).hasHost(host)) + { + ConsoleLog writeNetwork(host.toString() + " == " + (**it).getHost().toString()); + if (++numhosts >= 5) return; // ddos through faked service broadcasts? ignore... + if ((**it).hasFingerprint(hash) && (**it).getPort() == port) // known entry... + { + if ((*it)->isValid() && (*it)->getName() == _sessionName && _sessionName.length() > 0) + { + ConsoleLog writeNetwork(QString("Connecting to ").append(_sessionName)); + _client->connectToHost((*it), _sessionPasswd); + } + (**it).update(port); + return; + } + } + } + if (_servers.length() >= 30) return; // !? + QString oname = sha1ToReadable(hash); + QString name = oname; + int dup = 0; + while (nameExists(name)) + { + name = "(" + QString::number(++dup) + ") " + oname; + } + PVSDiscoveredServer *ds = new PVSDiscoveredServer(this, host, port, hash, name); + connect(ds, SIGNAL(validated(PVSDiscoveredServer*)), this, SLOT(sendServerToGui(PVSDiscoveredServer*))); + _servers.push_back(ds); + setTimerInterval(); +} + +bool PVSServiceDiscovery::nameExists(QString name) +{ + for (tServerList::iterator it = _servers.begin(); it != _servers.end(); it++) + { + if ((**it).getName() == name) return true; + } + return false; +} + +QStringList PVSServiceDiscovery::getAllServers() +{ + QStringList hosts; + for (tServerList::iterator it = _servers.begin(); it != _servers.end(); it++) + { + if ((**it).isValid()) hosts.append((**it).getName()); + } + return hosts; +} + +void PVSServiceDiscovery::sendServerToGui(PVSDiscoveredServer* ds) +{ + _client->guiAddHost(ds->getName()); +} + +void PVSServiceDiscovery::timerEvent(QTimerEvent *event) +{ + if (_servers.size() == 0) return; + if (_currentServer >= _servers.size()) _currentServer = 0; + PVSDiscoveredServer *ds = _servers.at(_currentServer); + if (ds->getAge() >= SB_INTERVAL*2 + 1) // Entry too old? + { + disconnect(ds, SIGNAL(validated(PVSDiscoveredServer*)), this, SLOT(sendServerToGui(PVSDiscoveredServer*))); + _client->guiDelHost(ds->getName()); + delete ds; + _servers.removeAt(_currentServer); // Clean it up + setTimerInterval(); + } + else + { + ds->validateCertificate(); + } + ++_currentServer; +} + +void PVSServiceDiscovery::setTimerInterval() +{ + killTimer(_timerId); + _timerId = startTimer(10000 / (_servers.size() + 1)); +} diff --git a/src/net/pvsServiceDiscovery.h b/src/net/pvsServiceDiscovery.h new file mode 100644 index 0000000..08a38b8 --- /dev/null +++ b/src/net/pvsServiceDiscovery.h @@ -0,0 +1,57 @@ +/* +# Copyright (c) 2009 - OpenSLX Project, Computer Center University of Freiburg +# +# This program is free software distributed under the GPL version 2. +# See http://openslx.org/COPYING +# +# If you have any feedback please consult http://openslx.org/feedback and +# send your suggestions, praise, or complaints to feedback@openslx.org +# +# General information about OpenSLX can be found at http://openslx.org/ +# ----------------------------------------------------------------------------- +# src/net/pvsServiceDiscovery.cpp +# - handle console broadcasts, tell client to connect on match +# ----------------------------------------------------------------------------- +*/ + +#ifndef PVSSERVICEDISCOVERY_H_ +#define PVSSERVICEDISCOVERY_H_ + +#include <QtNetwork/QUdpSocket> +#include <QtCore/QDateTime> + +class PVS; +class PVSDiscoveredServer; +typedef QList<PVSDiscoveredServer*> tServerList; + +class PVSServiceDiscovery : public QObject +{ + Q_OBJECT +public: + PVSServiceDiscovery(PVS* client); + virtual ~PVSServiceDiscovery(); + void connectToSession(QString name, QString passwd); + bool nameExists(QString name); + QStringList getAllServers(); + +protected: + void timerEvent(QTimerEvent *event); + +private Q_SLOTS: + void sock_dataArrival(); + void sendServerToGui(PVSDiscoveredServer*); + +private: + void handleDiscovery(QHostAddress host, int port, QByteArray hash); + void setTimerInterval(); + QUdpSocket _sock; + QString _sessionName; + QString _sessionPasswd; + PVS *_client; + QDateTime _last; ///< to protect us from being abused as a ddos zombie + tServerList _servers; + int _currentServer; + int _timerId; +}; + +#endif /* PVSSERVICEDISCOVERY_H_ */ diff --git a/src/pvs.cpp b/src/pvs.cpp new file mode 100644 index 0000000..2069e36 --- /dev/null +++ b/src/pvs.cpp @@ -0,0 +1,629 @@ +/* + # Copyright (c) 2009 - OpenSLX Project, Computer Center University of Freiburg + # + # This program is free software distributed under the GPL version 2. + # See http://openslx.org/COPYING + # + # If you have any feedback please consult http://openslx.org/feedback and + # send your suggestions, praise, or complaints to feedback@openslx.org + # + # General information about OpenSLX can be found at http://openslx.org/ + */ + +#include "pvs.h" +#include "src/util/dispatcher.h" +#include "src/net/pvsMsg.h" +#include "src/net/pvsServiceDiscovery.h" +#include "src/net/pvsDiscoveredServer.h" + +// D-Bus +#include "pvsadaptor.h" + +extern PVS *mainClient; + +// !!STATION LOCK TESTING!! +//#define lock_test_unlock_time 3 +// uncomment the following line to test locking in a local context +// it disables the lock of a station #(lock_test_unlock_time) seconds after it has been locked +//#define lock_test + +PVS::PVS() : + QObject() +{ + _pvsServerConnection = new PVSServerConnection(this); + _locked = false; + _vncAllowed = false; + _vncRequested = false; + readPolicyFiles(); + loadCommands(); + _blankScreen = NULL; + _vncPort = -1; + + // add a notify to the allow file, so we get informed when the file is changed + QString watchPath("/home/"); + watchPath.append(getUserName().append(QString("/.pvs/.allow"))); + _notify = new QFileSystemWatcher(this); + _notify->addPath(QString(watchPath.toUtf8().data())); + + connect(_notify, SIGNAL(fileChanged(const QString &)), this, + SLOT(fileChanged(const QString &))); + + // connect to D-Bus + new PvsAdaptor(this); + QDBusConnection dbus = QDBusConnection::sessionBus(); + dbus.registerObject("/", this); + dbus.registerService("org.openslx.pvs"); + + _sdClient = new PVSServiceDiscovery(this); + + _chat = new PVSChatClient(); + _chat->setServerConnection(_pvsServerConnection); + _chat->getChatMsgHandler().addListener(this, &PVS::chat_receive); + _chat->getChatCommandHandler().addListener(this, &PVS::UpdateChatClients); + + _timerLockTest = 0; + _timerLockDelay = 0; + + //add signalhandling for sigterm signals + struct sigaction act; + act.sa_handler = &PVS::signalHandler; + sigemptyset(&act.sa_mask); + act.sa_flags = 0; + + //register signals with actions + sigaction(SIGTERM, &act, 0); + sigaction(SIGHUP, &act, 0); + sigaction(SIGINT, &act, 0); + sigaction(SIGQUIT, &act, 0); + +} + +PVS::~PVS() +{ + // make sure we dont leave a locked computer + if (_notify) + disconnect(_notify, SIGNAL(fileChanged(const QString &)), this, + SLOT(fileChanged(const QString &))); + unlock(); + delete _sdClient; +} + +void PVS::connectToHost(PVSDiscoveredServer* server, QString passwd) +{ + _pvsServerConnection->connectToServer(server, passwd); +} + +/** + * onCommand Callback method + * handles incoming commands + */ +void PVS::onCommand(PVSMsg cmdMessage) +{ + QString message = cmdMessage.getMessage(); + QString ident = cmdMessage.getIdent(); + if (ident.compare("LOCKSTATION") == 0) + { + if (_blankScreen) + { + return; + } + else + { + _lockMsg = message; + //TODO:@Javier: lock it eith message. + // Sent message. + if(message.size() > 0) // Lock client with message. + { + message = message + "\n \n WARNING: Your screen will be blocked in 10 seconds."; + emit showMessage("Lock Message", message, true); + _timerLockDelay = startTimer(10*1000); // 10 sec. + } + else // lock client without message. + { + lock(); + } + } + + return; + } + if (ident.compare("UNLOCKSTATION") == 0) + { + _timerLockDelay = 0; + if (!_blankScreen) + { + return; + } + else + { + ConsoleLog writeLine("Unlocked."); + unlock(); + } + return; + } + if (ident.compare("VNCREQUEST") == 0) + { + // a vnc connection was requested, so lets check if this is against our policies + _vncRequested = (message.compare("YES") == 0); + if (!_vncRequested) return; + getVNCAllow(); + return; + } + if (ident.compare("PROJECT") == 0) + { + std::vector<QString> connDetails; + std::string buf; + std::stringstream ss(message.toStdString()); + while (ss >> buf) + connDetails.push_back(QString::fromStdString(buf)); + + if(connDetails.size() == 4) { + int port, quality; + bool fullscreen, smooth; + fullscreen = smooth = true; + port = connDetails[1].toInt(); + quality = connDetails[3].toInt(); + if(port > 0) { + emit project(connDetails[0], port, connDetails[2], fullscreen, smooth, quality); + lock_inputs(); + ConsoleLog writeNetwork(QString("Received Projection Information: Projsrc: ").append(connDetails[0]).append( " port: ").append(connDetails[1]).append(" pass:").append(connDetails[2])); + } + ConsoleLog writeNetwork(QString("Received illegal port! (").append(port).append(")")); + } + } + if (ident.compare("UNPROJECT") == 0) + { + emit unproject(); + unlock(); + return; + } + +#ifdef never + // prototype + if (command.compare(<<string>>) == 0) + { + // do stuff + return; + } +#endif +} + +/** + * onLogin Callback method + * handles the servers login messages (see PVSListenServer) + */ +void PVS::onLogin(PVSMsg login) +{ + if (login.getIdent().compare(QString("ACCEPTED")) == 0) + { + ConsoleLog writeNetwork("Server accepted connection."); + login.getMessage(); + } + else if (login.getIdent().compare(QString("DENIED")) == 0) + { + + ConsoleLog writeNetwork(QString("Sent Username.")); + } +} + +void PVS::chat_send(QString nick_to, QString nick_from, QString msg) +{ + _chat->send(nick_to, msg); +} + +void PVS::UpdateChatClients(PVSChatMsg chatCommand) +{ + if(chatCommand.getCommand().compare("clientToAdd") == 0) + { + _chat->addClient(chatCommand.getUsername(), chatCommand.getIp()); + emit chat_client_add(chatCommand.getUsername()); + } + + if(chatCommand.getCommand().compare("clientToRemove") == 0) + { + _chat->removeClient(chatCommand.getUsername()); + emit chat_client_remove(chatCommand.getUsername()); + } + + if(chatCommand.getCommand().compare("assignedName") == 0) + { + _chat->setSource(chatCommand.getUsername()); + } +} + +void PVS::chat_receive(PVSChatMsg msg) +{ + emit chat_receive(msg.getNickFrom(), msg.getNickTo(), msg.getMsg()); +} + +/** + * onDaemon Callback method + * handles incoming UDS Communicator messages + */ +void PVS::onDaemonCommand(PVSMsg msg) +{ + if (msg.getIdent().compare(QString("stop")) == 0) + { + stop(); + unlock(); + exit(0); + } +} + +void PVS::onMessage(PVSMsg msg) +{ + QString ident = msg.getIdent(); + QString message = msg.getMessage(); + + if (ident.compare("BROADCAST") == 0) + { + emit showMessage(tr("Message"), message, true); + } +} + +/** + * load custom commands by adding callbacks to the dispatchers + */ +void PVS::loadCommands() +{ + if (_pvsServerConnection) + { + _pvsServerConnection->addCommandHandler("*", this, &PVS::onCommand); + _pvsServerConnection->addLoginHandler("*", this, &PVS::onLogin); + _pvsServerConnection->addChatHandler("*", this, &PVS::onMessage); + } +} + +void PVS::quit() +{ + stop(); + unlock(); + exit(0); +} + +/** + * stops the client + */ +void PVS::stop() +{ + _pvsServerConnection->disconnectFromServer(); + stopVNCScript(); +} + +/** + * used to unlock the client after 3 seconds + * this a maintainance method + * uncomment the define to use it + */ +void PVS::timerEvent(QTimerEvent *event) +{ +#ifdef lock_test + if (_locked && event->timerId()== _timerLockTest) unlock(); +#endif + if(_timerLockDelay == event->timerId()) + { + if (lock()) ConsoleLog writeLine(QString("Locked.")); + _timerLockDelay = 0; + } + killTimer(event->timerId()); +} + +bool PVS::allowExists() +{ + return policyFileExists(QString(".allow")); +} + +/** + * check whether we want to allow vnc connections to this client + */ +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."); + } + + if (_vncAllowed && _vncRequested) + { + // then boot up the vnc-server and set password and port + int result = bootVNC(); + if (result == 0) + { + // now inform the server + _pvsServerConnection->sendMessage(PVSMsg(PVSCOMMAND, "PORT", int2String(_vncPort))); + _pvsServerConnection->sendMessage(PVSMsg(PVSCOMMAND, "PASSWORD", _vncPassword)); + _pvsServerConnection->sendMessage(PVSMsg(PVSCOMMAND, "RWPASSWORD", _vncRwPassword)); + _pvsServerConnection->sendMessage(PVSMsg(PVSCOMMAND, "VNC","YES")); + ConsoleLog writeNetwork(QString("Sent password, port and granted access.")); + // show message on clientgui + emit showMessage(tr("VNC connection"), tr("The host ") + .append(_pvsServerConnection->getServerName() + .append(tr(" requested your screen!")))); + } + _pvsServerConnection->sendMessage(PVSMsg(PVSCOMMAND, "VNCSRVRESULT", int2String(result))); + + } + else if (!_vncAllowed) + { + stopVNCScript(); + _pvsServerConnection->sendMessage(PVSMsg(PVSCOMMAND, "VNC","NO")); + } + return _vncAllowed; +} + +/** + * read the policy files + */ +void PVS::readPolicyFiles() +{ + getVNCAllow(); + // Add more policyfiles here if any +} + +/** + * callback which gets invoked when the watched file is changed + */ +void PVS::fileChanged(const QString& path) +{ + getVNCAllow(); +} + +/** + * lock the client + */ +bool PVS::lock() +{ + +#ifdef lock_test + _timerLockTest = startTimer(lock_test_unlock_time * 1000); + printf("will auto-unlock in %d secs\n", int(lock_test_unlock_time)); +#endif + + if (!_blankScreen) + { + _blankScreen = new BlankScreen(); + if (_blankScreen) + return _locked = _blankScreen->lock(); + else + return false; + } + return true; +} + +/** + * lock the client inputs only + */ +bool PVS::lock_inputs() +{ + +#ifdef lock_test + _timerLockTest = startTimer(lock_test_unlock_time * 1000); + printf("will auto-unlock in %d secs\n", int(lock_test_unlock_time)); +#endif + + if (!_blankScreen) + { + _blankScreen = new BlankScreen(); + if (_blankScreen) + return _locked = _blankScreen->lock_inputs(); + else + return false; + } + return true; +} + +/** + * unlock the client + */ +bool PVS::unlock() +{ + if (_blankScreen) + { + if (_blankScreen->unlock()) + { + delete _blankScreen; + _blankScreen = NULL; + } + } + return false; +} + +void PVS::setScriptPath(QString path) +{ + _vncScriptPath = path; + _vncScriptName = getFilenameFromPath(_vncScriptPath); +} + +bool PVS::gotVNCScript() +{ + if (fileExists(_vncScriptPath)) + return true; + if (policyFileExists(_vncScriptName)) + return true; + return false; + +} +/** + * setup password and port + * the local_test define is used to enable local testing modes without invoking the vnc-script + */ +int PVS::bootVNC() +{ + // #define local_test + + stopVNCScript(); // just to be sure +#ifndef local_test + _vncPassword = int2String(getRandom(0, 99999999)); + do { + _vncRwPassword = int2String(getRandom(0, 99999999)); + } while (_vncRwPassword == _vncPassword); + + _vncPort = getRandom(5901, 6000); + return startVNCScript(_vncPort, _vncPassword, _vncRwPassword); +#else + _vncPassword = QString("1234"); + _vncPort = 5901; + return startVNCScript(_vncPort, _vncPassword); +#endif + //#undef local_test +} + +/** + * launch the vnc script (if present) to start the vnc-server + */ +int PVS::startVNCScript(int port, QString pass, QString rwpass) +{ + if (gotVNCScript()) + { + ConsoleLog writeLine("Starting VNC-Script"); + QString commandLine(_vncScriptPath); + commandLine.append(" "); + commandLine.append("start"); + commandLine.append(" "); + commandLine.append(int2String(port)); + commandLine.append(" "); + commandLine.append(pass); + commandLine.append(" "); + commandLine.append(rwpass); + if (!system(NULL)) + ConsoleLog writeError("No Command processor available"); + + int result = system(commandLine.toUtf8().data()); + result = WEXITSTATUS(result); + if (result != 0) + ConsoleLog writeError(QString("VNC-Server is not running, code: ") + int2String(result)); + else + ConsoleLog writeLine("VNC-Server should be running"); + return result; + } + else + { + ConsoleLog writeError("VNC-Script not found."); + return 3; + } +} + +/** + * launch the vnc script (if present) to stop the vnc-server + */ +int PVS::stopVNCScript() +{ + if (gotVNCScript()) + { + ConsoleLog writeLine("Stopping VNC-Script"); + QString commandLine(_vncScriptPath); + commandLine.append(" "); + commandLine.append("stop"); + commandLine.append(" "); + commandLine.append("dummy"); + commandLine.append(" "); + commandLine.append("dummy"); + ConsoleLog writeLine("VNC-Server should be stopped"); + int result = system(commandLine.toUtf8().data()); + return WEXITSTATUS(result); + } + else + { + return 3; + } +} + +void PVS::start() +{ + _pvsServerConnection->sendMessage(PVSMsg(PVSCOMMAND, "PROJECTING", "YES")); +} + +void PVS::onConnected(QString name) +{ + emit connected(name); +} + +void PVS::onDisconnected() +{ + emit disconnected(); + _chat->clearClients(); + stopVNCScript(); +} + +QString PVS::isConnected() +{ + return _pvsServerConnection->getServerName(); +} + +QString PVS::chat_getNickname() +{ + return _chat->getSource(); +} + +QStringList PVS::chat_getNicknames() +{ + return _chat->getClients(); +} + +void PVS::pvsConnect(QString host, QString passwd) +{ + _pvsServerConnection->disconnectFromServer(); + _sdClient->connectToSession(host, passwd); +} +void PVS::pvsDisconnect() +{ + _chat->clearClients(); + _sdClient->connectToSession("", ""); + stop(); +} + + +QStringList PVS::getAvailableHosts() +{ + return _sdClient->getAllServers(); +} + +void PVS::guiAddHost(QString host) +{ + emit addHost(host); +} + +void PVS::guiDelHost(QString host) +{ + emit delHost(host); +} + +QString PVS::getIpByNick(QString nick) +{ + return _chat->getIPFromUsername(nick); +} + +//Handles signals (SIGTERM and SIGHUP) +void PVS::signalHandler(int signal) +{ + ConsoleLog writeLine(QString("Received Signal ").append (int2String(signal))); + switch (signal) { + case SIGHUP: + mainClient->quit(); + break; + case SIGTERM: + mainClient->quit(); + break; + case SIGINT: + mainClient->quit(); + break; + case SIGQUIT: + mainClient->quit(); + break; + } + +} + diff --git a/src/pvs.h b/src/pvs.h new file mode 100644 index 0000000..4b1e29e --- /dev/null +++ b/src/pvs.h @@ -0,0 +1,146 @@ +/* + # Copyright (c) 2009 - OpenSLX Project, Computer Center University of Freiburg + # + # This program is free software distributed under the GPL version 2. + # See http://openslx.org/COPYING + # + # If you have any feedback please consult http://openslx.org/feedback and + # send your suggestions, praise, or complaints to feedback@openslx.org + # + # General information about OpenSLX can be found at http://openslx.org/ + */ +#ifndef PVSCLIENT_H_ +#define PVSCLIENT_H_ + +#include <QtCore> +#include <X11/Xlib.h> +#include <X11/cursorfont.h> +#include <signal.h> + +#include "setup.h" +#include "src/core/pvsChatClient.h" +#include "src/core/pvsChatMsg.h" +#include "src/net/pvsServerConnection.h" +#include "src/version.h" +#include "src/util/consoleLogger.h" +#include "src/util/clientGUIUtils.h" + + +class PVSServiceDiscovery; +class PVSDiscoveredServer; + +/** + * PVSClient + * base class for the pool video switch client + */ +class PVS: public QObject +{ + Q_OBJECT + Q_CLASSINFO("D-Bus Interface", "org.openslx.pvs") + +public: + PVS(); + ~PVS(); + + void loadCommands(); ///< not inherited, just named like the virtual methods of other net objects + void onCommand(PVSMsg cmdMessage); ///< not inherited, just named like the virtual methods of other net objects + void onLogin(PVSMsg cmdMessage); ///< not inherited, just named like the virtual methods of other net objects + void onDaemonCommand(PVSMsg cmdMessage); ///< not inherited, just named like the virtual methods of other net objects + void onMessage(PVSMsg cmdMessage); + + void securityUnlock() + { + unlock(); + } + ; ///< public forward to the unlock method + void stop(); ///< stop the client + + void setScriptPath(QString path); ///< vnc-start related + + void onConnected(QString name); + void onDisconnected(); + + void connectToHost(PVSDiscoveredServer* server, QString passwd); + void UpdateChatClients(PVSChatMsg chatCommand); + void chat_receive(PVSChatMsg msg); + + void guiAddHost(QString host); + void guiDelHost(QString host); + +public Q_SLOTS: + void start(); + void quit(); + void chat_send(QString nick_to, QString nick_from, QString msg); + QString chat_getNickname(); + QStringList chat_getNicknames(); + void fileChanged(const QString& path); + void pvsConnect(QString host, QString passwd); + void pvsDisconnect(); + QString isConnected(); + QStringList getAvailableHosts(); + QString getIpByNick(QString nick); + +Q_SIGNALS: + void project(QString host, int port, QString passwd, bool fullscreen, + bool smoothTransformation, int quality); + void unproject(); + void chat_receive(QString nick_from, QString nick_to, QString msg); + void chat_client_add(QString nick); + void chat_client_remove(QString nick); + void showMessage(QString title, QString msg, bool useDialog = false); + void connected(QString host); + void disconnected(); + void addHost(QString host); + void delHost(QString host); + +protected: + + void timerEvent(QTimerEvent *event); + +private: + + // own + bool allowExists(); ///< whether the .allow file exists + bool getVNCAllow(); ///< whether vnc-connections to this client are allowed + void readPolicyFiles(); ///< pars the policy files + + + // pvs features and related + bool lock(); ///< lock this client (blankscreen etc) + bool lock_inputs(); ///< lock this client mouse&keyboard only + bool unlock(); ///< remove the lock on this client + + bool _locked; ///< are we locked? + QString _lockMsg; ///< message to display while we're locked + bool _vncAllowed; ///< whether vncConnections to this client are allowed (dup?) + BlankScreen *_blankScreen;///< obhject to blank the screen + + QFileSystemWatcher* _notify; ///< used to get notifies about file changes + //vnc-server + QString _vncScriptPath; ///< path to the vnc script file + QString _vncScriptName; ///< name of the vnc script file + int _vncPort; ///< port to use for the vnc-server (also gets send to the pvsServer) + QString _vncPassword; ///< password to use for the vnc-server (also gets send to the pvsServer) - viewonly password + QString _vncRwPassword; ///< password to use for the vnc-server (also gets send to the pvsServer) - read-write password + + bool gotVNCScript(); ///< whether we got a vnc script + int bootVNC(); ///< init the password and port, then call the startVNCScript() method + int startVNCScript(int port, QString pass, QString rwpass); ///< start the vnc server (via script) + int stopVNCScript(); ///< stop the vnc server (via script) + static void signalHandler(int signal); //handles posix signals + + PVSServerConnection* _pvsServerConnection; ///< our tcp connection object to the pvsserver + + QSettings _settings; + + PVSServiceDiscovery *_sdClient; + + PVSChatClient *_chat; + + bool _vncRequested; ///< did pvsmgr request our screen? + + int _timerLockTest; + int _timerLockDelay; + +}; +#endif /* PVSCLIENT_H_ */ diff --git a/src/pvsDaemon.cpp b/src/pvsDaemon.cpp new file mode 100644 index 0000000..961e0f3 --- /dev/null +++ b/src/pvsDaemon.cpp @@ -0,0 +1,362 @@ +#include <QCoreApplication> +#include <getopt.h> +#include <stdlib.h> +#include "pvs.h" +#include "src/net/pvsLocalhostCommunicator.h" +#include "src/util/pvsSettingsManager.h" +#include "setup.h" +#include "src/net/pvsMsg.h" +#include "src/core/pvsChatClient.h" + +PVS *mainClient = NULL; + +// This define works as a switch whether to run as deamon or regular app +#define as_daemon + +/// VERSION_STRING is defined in src/version.h +void printVersion(bool doExit) +{ + + printf("Version:\t"VERSION_STRING"\n"); + if (doExit) + exit(0); +} + +/// outputs the full help text +void printHelp() +{ + printf("**************************************************************\n"); + printf("\nPool Video Switch Client\n"); + printf("**************************************************************\n"); + printVersion(false); + printf("**************************************************************\n"); + printf("Usage:\tpoolVSClient <<option> <value>, ... >\n\n"); + printf("Options:\n\n"); + printf("-vncScriptFile <fullpath\\filename>\n\tSpecifies a custom location for the vnc-start/stop-script.\n\tIf not specified, ~/.pvs/pvs-vncsrv is expected.\n\n"); + printf("-freq <seconds>\n\tSpecifies how long to wait until a reconnection attempt is made.\n\tDefault is 5.\n\n"); + printf("-port <port>\n\tSpecifies on which port to run.\n\tDefault is %d.\n\n", SERVER_PORT_INT); + printf("-h or --help\n\t Shows this help text and exits.\n\n"); + printf("-v or --version\n\t Shows the current version and exits.\n"); + printf( + "-c <string command>:<string value> \n\t Sends the command and the optional value to a running PVS-Client.\n\t Command and value may not contain spaces or colons.\n\t The dividing colon is mandatory.\n"); + printf("-commands: \n\tPrints out available commands to use with -c . \n "); + printf("**************************************************************\n"); + exit(0); +} + +/// outputs a brief help text +void printNotice() +{ + printf( + "Use -h or --help to get a listing of all options.\n-v or --version gives you the current version.\n\n"); +} + +void printCommands() +{ + printf("**************************************************************\n"); + printf("chat:<on/ off/ 1/ 2/ 3>\n "); + printf("on = turns that chat option on\n off = turns the chat option off\n 1 = bossmode\n 2 = community\n 3 = private\n"); + printf("stop \n\t Stops the running PVS-Client.\n"); + printf("**************************************************************\n"); + exit(0); +} + +/// +int main(int argc, char** argv) +{ + int frequency = 5; + int port = -1; + QString homeDir("/home/"); + QString scriptPath = homeDir; + scriptPath.append(getUserName().append(QString("/.pvs/pvs-vncsrv"))); + QString scriptName; + scriptName = getFilenameFromPath(scriptPath); + + QCoreApplication app(argc, argv); + app.setOrganizationName("openslx"); + app.setOrganizationDomain("openslx.org"); + app.setApplicationName("pvs"); + // use system locale as language to translate gui + QTranslator translator; + translator.load(":pvs"); + app.installTranslator(&translator); + + + PVSLocalhostCommunicator com(getPolicyFilePath(QString( + ".comfile"))); + com.run(); + if (!(com.running())) + { + printf("Error. UDS Communicator is not running. Exiting.\n"); + exit(0); + } + + printf("UDS Communicator is running.\n"); + int option_index = 0; + + while (1) + { + static struct option long_options[] = + { + { "help", no_argument, 0, 'h' }, + { "commands", no_argument, 0, 'o' }, + { "version", no_argument, 0, 'v' }, + { "port", required_argument, 0, 'p' }, + { "freq", required_argument, 0, 'f' }, + { "client", required_argument, 0, 'e' }, + { "script", required_argument, 0, 's' }, + { 0, 0, 0, 0 }, + }; + /* getopt_long stores the option index here. */ + + int c = getopt_long(argc, argv, "hvoc:f:e:s:p:", long_options, + &option_index); + option_index++; + if (c == -1) + break; + + switch (c) + { + case 'h': + printHelp(); + break; + case 'o': + printCommands(); + break; + case 'v': + printVersion(true); + break; + case 'c': + { + if (option_index + 1 < argc) + { + if (com.server()) + { + // wont work, no daemon running + printf("Error. No running PVS-Client found. Exiting.\n"); + com.stop(); + } + else + { + QStringList line = QString::fromLocal8Bit(argv[option_index + + 1]).split(":"); + QString &ident = line[0]; + QString message; + if (line.size() > 1) + message = line[1]; + if (ident.size() > 0) // no use sending empty idents... not even sure if this COULD happen + { + bool flag = false; + if (ident == "make") + PVSSettingsManager::getManager()->setConfigs(); + else if (ident == "chat" && message == "boss") + { + PVSSettingsManager::getManager()->reWriteConfigs("chatmode", "bossmode"); + flag = true; + + } + else if (ident == "chat" && message == "all") + { + PVSSettingsManager::getManager()->reWriteConfigs("chatmode", "community"); + flag = true; + } + else if (ident == "chat" && message == "private") + { + PVSSettingsManager::getManager()->reWriteConfigs("chatmode", "private"); + flag = true; + } + else if (ident == "chat" && message == "on") + { + PVSSettingsManager::getManager()->reWriteConfigs("chatstate", "on"); + flag = true; + } + else if (ident == "chat" && message == "off") + { + PVSSettingsManager::getManager()->reWriteConfigs("chatstate", "off"); + flag = true; + } + else if (ident == "room") + { + //PVSSettingsManager::getManager()->reWriteConfigs(ident, message); + flag = true; + } + else if (ident == "stop" && message == NULL) + flag = true; + else + printf("option %s doesn't exist\n", ident.toUtf8().data()); + + if (flag) + { + qDebug("Will send i: %s, m: %s\n", ident.toUtf8().data(), message.toUtf8().data()); + com.sendCommand(ident, message); + QCoreApplication::processEvents(QEventLoop::AllEvents); + printf("Sent command. Exiting.\n"); + } + } + + else + printf("Something went horribly wrong, since the ident is empty.\n"); + + } + } + else + { + printf("Error. No command issued. Exiting.\n"); + } + exit(0); // and gone + break; + } + case 'f': + { + if (option_index + 1 < argc) + { + frequency = atoi(argv[option_index + 1]); + if (frequency <= 0) + { + frequency = 5; // return to standard + ConsoleLog writeError(QString( + "malformed frequency, setting standard = 5")); + printNotice(); + } + else + ConsoleLog writeLine(QString("Using frequency ").append( + int2String(frequency))); + option_index++; + continue; + } + break; + } + case 'p': + { + if (option_index + 1 < argc) + { + port = atoi(argv[option_index + 1]); + if (port <= 0) + { + ConsoleLog writeTerminal(QString("port maybe malformed")); + printNotice(); + port = -1; // return to standard + } + else + ConsoleLog writeTerminal(QString("Using port ").append( + int2String(port))); + option_index++; + continue; + } + break; + } + case 'e': + { + if (option_index + 1 < argc) + { + printf("WARNING: -e is deprecated\n"); + option_index++; + continue; + } + break; + } + case 's': + { + if (option_index + 1 < argc) + { + scriptPath = QString(argv[option_index + 1]); + scriptName = getFilenameFromPath(scriptPath); + option_index++; + continue; + } + break; + } + case '?': + { + ConsoleLog writeError( + QString("Unrecognized option/paramter: ").append( + argv[option_index])); + printNotice(); + } + default: + abort(); + } + //else + // printNotice(); + } + + if (!com.server()) + { + printf("Error. PoolVSClient already running. Exiting\n"); + com.stop(); + exit(0); + } + + ConsoleLog setLogName(QString("log.client")); + ConsoleLog writeLine(QString("PVS-Client started.")); + +#ifdef as_daemon + + /* Our process ID and Session ID */ + pid_t pid, sid; + + /* Fork off the parent process */ + pid = fork(); + if (pid < 0) + { + exit(-1); + } + /* If we got a good PID, then + we can exit the parent process. */ + if (pid > 0) + { + exit(0); + } + + /* Change the file mode mask */ + umask(0); + + /* Open any logs here */ + + /* Create a new SID for the child process */ + sid = setsid(); + if (sid < 0) + { + /* Log the failure */ + exit(-1); + } + + /* Change the current working directory */ + if ((chdir("/")) < 0) + { + /* Log the failure */ + exit(-1); + } + + /* Close out the standard file descriptors */ + close(STDIN_FILENO); + freopen ((QString("/home/").append(getUserName().append(QString("/.pvs/dump")))).toUtf8().data(),"w",stdout); + //close(STDOUT_FILENO); + close(STDERR_FILENO); + + /* Daemon-specific initialization goes here */ + + /* The Big Loop */ + +#endif + + mainClient = new PVS(); + PVSSettingsManager::getManager()->setConfigFile(getPolicyFilePath("clientconf")); + com.getDispatcher()->addListener("*", mainClient, &PVS::onDaemonCommand); + + if (port <= 0) + port = SERVER_PORT_INT; + ConsoleLog writeLine(QString("TCP-Port: ").append(int2String(port))); + mainClient->setScriptPath(scriptPath); + ConsoleLog writeLine(QString("VNCScriptPath: ").append(scriptPath)); + createPolicyDir(); + createPolicyFiles(); + + // long int gr = 0; + mainClient->setScriptPath(scriptPath); + app.exec(); + delete mainClient; + + return 0; +} + diff --git a/src/pvsgui.cpp b/src/pvsgui.cpp new file mode 100644 index 0000000..25f1cd6 --- /dev/null +++ b/src/pvsgui.cpp @@ -0,0 +1,444 @@ +/* + # Copyright (c) 2009, 2010 - OpenSLX Project, Computer Center University of + # Freiburg + # + # This program is free software distributed under the GPL version 2. + # See http://openslx.org/COPYING + # + # If you have any feedback please consult http://openslx.org/feedback and + # send your suggestions, praise, or complaints to feedback@openslx.org + # + # General information about OpenSLX can be found at http://openslx.org/ + # ----------------------------------------------------------------------------- + # pvsClientGUI.cpp + # - main loop for pvs client GUI. + # - draws toolbar and system tray icon. + # - uses DBUS to communicate with pvs client. + # ----------------------------------------------------------------------------- + */ + +#include "pvsgui.h" + +PVSGUI::PVSGUI(QWidget *parent) : + QWidget(parent) +{ + setupUi(this); + + _menu = new QMenu(this); + _hostMenu = new QMenu(tr("Connect"), this); + _hosts = new QHash<QString, QAction*> (); + _vncViewer = new ClientVNCViewer(); + _chatDialog = new ClientChatDialog(); + _configDialog = new ClientConfigDialog(); + _infoDialog = new ClientInfoDialog(); + _aboutDialog = new AboutDialog(); + + _hostMenu->setEnabled(false); + hostButton->setEnabled(false); + + setupMenu(); + + if (QSystemTrayIcon::isSystemTrayAvailable()) + { + qDebug("[%s] System tray available.", metaObject()->className()); + _trayIcon = new QSystemTrayIcon(QIcon(":cam_off32.svg"), this); + _trayIcon->setContextMenu(_menu); + _trayIcon->setVisible(true); + _chatDialog->setTrayIcon(_trayIcon); + } + else + _trayIcon = NULL; + + // connect to D-Bus and get interface + QDBusConnection dbus = QDBusConnection::sessionBus(); + dbus.registerObject("/", this); + dbus.registerService("org.openslx.pvsgui"); + _ifaceDBus = new OrgOpenslxPvsInterface("org.openslx.pvs", "/", dbus, this); + _ifaceDBus->start(); // start pvs if not running + + // get available hosts + QDBusPendingReply<QStringList> reply0 = _ifaceDBus->getAvailableHosts(); + reply0.waitForFinished(); + QStringList hosts = reply0.value(); + if (reply0.isValid() && !hosts.isEmpty()) + foreach (QString host, hosts) + addHost(host); + + // already connected? + QDBusPendingReply<QString> reply1 = _ifaceDBus->isConnected(); + reply1.waitForFinished(); + QString host = reply1.value(); + if (reply1.isValid() && host != "") + connected(host); + else + disconnected(); + + if (dbus.isConnected()) + qDebug("[%s] Connection to DBus successful!", metaObject()->className()); + + // TODO: perhaps this can go if fadi does his work + // check if vnc is allowed and setup checkbox + QFile file(QDir::toNativeSeparators(QDir::homePath() + "/.pvs/.allow")); + if (file.open(QIODevice::ReadOnly | QIODevice::Text)) + { + QTextStream in(&file); + QString line = in.readLine(); + if (line == "1") + vncCheckBox->setChecked(true); + file.close(); + } + + // listen on port 29481 for incoming file transfers + _serverSocket = new QTcpServer(); + _serverSocket->listen(QHostAddress::Any, 29481); + connect(_serverSocket, SIGNAL(newConnection()), this, SLOT(receiveFile())); + + // signals & slots - menu + connect(_disconnectAction, SIGNAL(triggered()), this, SLOT(pvsDisconnect())); + connect(_startChatAction, SIGNAL(triggered()), _chatDialog, SLOT(open())); + connect(_sendFileAction, SIGNAL(triggered()), this, SLOT(sendFile())); + connect(_configAction, SIGNAL(triggered()), _configDialog, SLOT(open())); + connect(_showInfoAction, SIGNAL(triggered()), _infoDialog, SLOT(open())); + connect(_aboutAction, SIGNAL(triggered()), _aboutDialog, SLOT(open())); + connect(_quitAction, SIGNAL(triggered()), qApp, SLOT(quit())); + connect(_configDialog, SIGNAL(configChanged()), this, SLOT(updateConfig())); + + // signals & slots - toolbar + connect(_menu, SIGNAL(aboutToHide()), this, SLOT(hide())); + connect(_hostMenu, SIGNAL(aboutToHide()), this, SLOT(hide())); + connect(_hostMenu, SIGNAL(triggered(QAction*)), this, + SLOT(pvsConnect(QAction*))); + connect(vncCheckBox, SIGNAL(stateChanged(int)), this, + SLOT(setVncAllow(int))); + + // signals & slots - dbus + connect(_ifaceDBus, SIGNAL(showMessage(QString, QString, bool)), this, + SLOT(showMessage(QString, QString, bool))); + connect(_ifaceDBus, SIGNAL(connected(QString)), this, + SLOT(connected(QString))); + connect(_ifaceDBus, SIGNAL(disconnected()), this, SLOT(disconnected())); + connect(_ifaceDBus, SIGNAL(addHost(QString)), this, SLOT(addHost(QString))); + connect(_ifaceDBus, SIGNAL(delHost(QString)), this, SLOT(delHost(QString))); + + // show toolbar + setWindowFlags(Qt::WindowStaysOnTopHint | Qt::X11BypassWindowManagerHint); + setAttribute(Qt::WA_AlwaysShowToolTips); + updateConfig(); + setVisible(true); + hide(); +} + +PVSGUI::~PVSGUI() +{ + _ifaceDBus->quit(); +} + +//////////////////////////////////////////////////////////////////////////////// +// Public + +void PVSGUI::updateConfig() +{ + if (_settings.value("Display/location").isNull()) + setLocation(POSITION_TOP_CENTER); + else + setLocation(_settings.value("Display/location").toInt()); +} + +//////////////////////////////////////////////////////////////////////////////// +// Protected + +void PVSGUI::leaveEvent(QEvent * e) +{ + if (!_menu->isVisible() && !_hostMenu->isVisible()) + hide(true); + QWidget::leaveEvent(e); +} + +void PVSGUI::enterEvent(QEvent * e) +{ + hide(false); + QWidget::enterEvent(e); +} + +void PVSGUI::mousePressEvent(QMouseEvent *event) +{ + QApplication::setOverrideCursor(QCursor(Qt::ClosedHandCursor)); + _clickPoint = event->pos(); +} + +void PVSGUI::mouseReleaseEvent(QMouseEvent *event) +{ + QApplication::setOverrideCursor(QCursor(Qt::ArrowCursor)); +} + +void PVSGUI::mouseMoveEvent(QMouseEvent *event) +{ + if (event->globalX() - _clickPoint.x() >= 0 && event->globalX() + - _clickPoint.x() + width() <= QApplication::desktop()->width()) + { + move(event->globalX() - _clickPoint.x(), y()); + } +} + +//////////////////////////////////////////////////////////////////////////////// +// Private + +void PVSGUI::setupMenu() +{ + // setup actions + _disconnectAction = new QAction(tr("&Disconnect"), this); + _startChatAction = new QAction(tr("C&hat"), this); + _sendFileAction = new QAction(tr("&Send File"), this); + _configAction = new QAction(tr("&Config"), this); + _showInfoAction = new QAction(tr("&Information"), this); + _aboutAction = new QAction(tr("&About"), this); + _quitAction = new QAction(tr("&Quit"), this); + + // setup menu + _menu->addMenu(_hostMenu); + _menu->addAction(_disconnectAction); + _menu->addAction(_showInfoAction); + _menu->addSeparator(); + _menu->addAction(_startChatAction); + _menu->addAction(_sendFileAction); + _menu->addSeparator(); + _menu->addAction(_configAction); + _menu->addAction(_aboutAction); + _menu->addSeparator(); + _menu->addAction(_quitAction); + + pvsButton->setMenu(_menu); + hostButton->setMenu(_hostMenu); +} + +void PVSGUI::setLocation(int location) +{ + _location = location; + switch (_location) + { + case POSITION_TOP_LEFT: + move(0, 0); + break; + case POSITION_TOP_CENTER: + move((QApplication::desktop()->width() - width()) / 2, 0); + break; + case POSITION_TOP_RIGHT: + move(QApplication::desktop()->width() - width(), 0); + break; + case POSITION_BOTTOM_LEFT: + move(0, QApplication::desktop()->height() - height()); + break; + case POSITION_BOTTOM_CENTER: + move((QApplication::desktop()->width() - width()) / 2, + QApplication::desktop()->height() - height()); + break; + case POSITION_BOTTOM_RIGHT: + move(QApplication::desktop()->width() - width(), + QApplication::desktop()->height() - height()); + break; + default: + break; + } +} + +void PVSGUI::hide(bool b) +{ + if (b) + { + if (_location <= POSITION_TOP_RIGHT) + move(x(), 2 - height()); + else + move(x(), QApplication::desktop()->height() - 2); + } + else + { + if (_location <= POSITION_TOP_RIGHT) + move(x(), 0); + else + move(x(), QApplication::desktop()->height() - height()); + } +} + +void PVSGUI::hide() +{ + if (!_menu->isVisible() && !_hostMenu->isVisible()) + hide(true); +} + +void PVSGUI::pvsConnect(QAction *action) +{ + QString host = action->text(); + action->setChecked(false); // we set it manually + + // already connected? + if (host == hostButton->text()) + { + action->setChecked(true); + return; + } + + // ask user for passwd + bool ok = false; + QString passwd = QInputDialog::getText(0, tr("PVS Connection"), tr( + "Please enter password (If not needed leave blank):"), + QLineEdit::Password, QString(), &ok); + + if (ok) + { + _ifaceDBus->pvsConnect(host, passwd); // send via dbus + _passwd = passwd; // TODO: we have to ask the backend for passwd! + qDebug("[%s] Host '%s' send via DBus.", metaObject()->className(), + qPrintable(host)); + } +} + +void PVSGUI::pvsDisconnect() +{ + QMessageBox::StandardButton result = QMessageBox::question(0, tr( + "PVS Connection"), tr("Are you sure you want to disconnect?"), + QMessageBox::Ok | QMessageBox::Cancel, QMessageBox::Ok); + + if (result == QMessageBox::Ok) + _ifaceDBus->pvsDisconnect(); +} + +void PVSGUI::showMessage(QString title, QString msg, bool useDialog) +{ + if (!isVisible()) + return; + + // show balloon message if supported, otherwise show message dialog + if (!useDialog && _trayIcon && QSystemTrayIcon::supportsMessages()) + _trayIcon->showMessage(title, msg, QSystemTrayIcon::Information, 10000); + else + QMessageBox::about(0, title, msg); +} + +void PVSGUI::connected(QString host) +{ + statusLabel->setText( + "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\"><html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">p, li { white-space: pre-wrap; }</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;\"><p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" color:#00aa00;\">Online</span></p></body></html>"); + showMessage(tr("PVS connection"), tr("Connected to ") + host); + if (_hosts->contains(host)) + _hosts->value(host)->setChecked(true); + hostButton->setText(host); + _disconnectAction->setEnabled(true); + _startChatAction->setEnabled(true); + _sendFileAction->setEnabled(true); + _showInfoAction->setEnabled(true); + _infoDialog->setHost(host); + _infoDialog->setPasswd(_passwd); + + if (_trayIcon) + { + _trayIcon->setIcon(QIcon(":cam_on32.svg")); + _trayIcon->setToolTip(tr("Connected to ") + host); + } +} + +void PVSGUI::disconnected() +{ + statusLabel->setText( + "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\"><html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">p, li { white-space: pre-wrap; }</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;\"><p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" color:#ff0000;\">Offline</span></p></body></html>"); + showMessage(tr("PVS connection"), tr("Disconnected")); + if (_hosts->contains(hostButton->text())) + _hosts->value(hostButton->text())->setChecked(false); + hostButton->setText("-"); + _disconnectAction->setEnabled(false); + _startChatAction->setEnabled(false); + _sendFileAction->setEnabled(false); + _showInfoAction->setEnabled(false); + _passwd = ""; + if (_trayIcon) + { + _trayIcon->setIcon(QIcon(":cam_off32.svg")); + _trayIcon->setToolTip(tr("Disconnected")); + } + _vncViewer->close(); +} + +void PVSGUI::addHost(QString host) +{ + // avoid duplicates + if (_hosts->contains(host)) + return; + + QAction *action = _hostMenu->addAction(host); + action->setCheckable(true); + _hosts->insert(host, action); + + if (!_hosts->isEmpty()) + { + _hostMenu->setEnabled(true); + hostButton->setEnabled(true); + } + + if (hostButton->text() == "-") + showMessage(tr("PVS Connection"), tr("New host available: ") + host); +} + +void PVSGUI::delHost(QString host) +{ + if (_hosts->contains(host)) + { + _hostMenu->removeAction(_hosts->value(host)); + _hosts->remove(host); + } + + if (_hosts->isEmpty()) + { + _hostMenu->setEnabled(false); + hostButton->setEnabled(false); + } +} + +// TODO: perhaps this can go if fadi does his work +void PVSGUI::setVncAllow(int i) +{ + QFile file(QDir::toNativeSeparators(QDir::homePath() + "/.pvs/.allow")); + if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) + return; + + QTextStream out(&file); + if (i == 0) + out << 0; + else + out << 1; + + file.close(); +} + +void PVSGUI::sendFile() +{ + ClientFileSendDialog *d = new ClientFileSendDialog(); + d->open(); +} + +void PVSGUI::receiveFile() +{ + QTcpSocket *socket = _serverSocket->nextPendingConnection(); + ClientFileReceiveDialog *d = new ClientFileReceiveDialog(socket); + d->open(); +} + +//////////////////////////////////////////////////////////////////////////////// +//////////////////////////////////////////////////////////////////////////////// +//////////////////////////////////////////////////////////////////////////////// +// Main + +int main(int argc, char *argv[]) +{ + QApplication app(argc, argv); + app.setOrganizationName("openslx"); + app.setOrganizationDomain("openslx.org"); + app.setApplicationName("pvsgui"); + + // use system locale as language to translate gui + QTranslator translator; + translator.load(":pvsgui"); + app.installTranslator(&translator); + + PVSGUI pvsgui; + + return app.exec(); +} diff --git a/src/pvsgui.h b/src/pvsgui.h new file mode 100644 index 0000000..f9a0ab8 --- /dev/null +++ b/src/pvsgui.h @@ -0,0 +1,103 @@ +/* + # Copyright (c) 2009, 2010 - OpenSLX Project, Computer Center University of + # Freiburg + # + # This program is free software distributed under the GPL version 2. + # See http://openslx.org/COPYING + # + # If you have any feedback please consult http://openslx.org/feedback and + # send your suggestions, praise, or complaints to feedback@openslx.org + # + # General information about OpenSLX can be found at http://openslx.org/ + */ + +#ifndef PVSCLIENTGUI_H_ +#define PVSCLIENTGUI_H_ + +#include <QtGui> +#include <QtNetwork> +#include "ui_clientToolbar.h" +#include "src/gui/clientConfigDialog.h" +#include "src/gui/clientChatDialog.h" +#include "src/gui/clientFileSendDialog.h" +#include "src/gui/clientFileReceiveDialog.h" +#include "src/gui/clientVNCViewer.h" +#include "src/gui/clientInfoDialog.h" +#include "src/gui/aboutDialog.h" + +#include "pvsinterface.h" + +class PVSGUI: public QWidget, private Ui_ClientToolbarClass +{ + Q_OBJECT + Q_CLASSINFO("D-Bus Interface", "org.openslx.pvsgui") + +public: + PVSGUI(QWidget *parent = 0); + ~PVSGUI(); + + int const static POSITION_TOP_LEFT = 0; + int const static POSITION_TOP_CENTER = 1; + int const static POSITION_TOP_RIGHT = 2; + int const static POSITION_BOTTOM_LEFT = 3; + int const static POSITION_BOTTOM_CENTER = 4; + int const static POSITION_BOTTOM_RIGHT = 5; + +public Q_SLOTS: + void updateConfig(); + +protected: + void enterEvent(QEvent *e); + void leaveEvent(QEvent *e); + void mousePressEvent(QMouseEvent *event); + void mouseReleaseEvent(QMouseEvent *event); + void mouseMoveEvent(QMouseEvent *event); + +private Q_SLOTS: + void showMessage(QString title, QString msg, bool useDialog = false); + void hide(); + void connected(QString host); + void disconnected(); + void addHost(QString host); + void delHost(QString host); + void pvsConnect(QAction *action); + void pvsDisconnect(); + void setVncAllow(int i); + void sendFile(); + void receiveFile(); + +private: + void setupMenu(); + void setLocation(int location); + void hide(bool b); + + QMenu *_menu; + QMenu *_hostMenu; + QHash<QString, QAction*> *_hosts; + QSettings _settings; + QSystemTrayIcon *_trayIcon; + ClientChatDialog *_chatDialog; + ClientConfigDialog *_configDialog; + ClientInfoDialog *_infoDialog; + ClientVNCViewer *_vncViewer; + AboutDialog *_aboutDialog; + + QAction *_disconnectAction; + QAction *_startChatAction; + QAction *_sendFileAction; + QAction *_configAction; + QAction *_showInfoAction; + QAction *_aboutAction; + QAction *_quitAction; + + int _location; + QPoint _clickPoint; + QString _passwd; + + QTcpServer *_serverSocket; + + OrgOpenslxPvsInterface *_ifaceDBus; + +}; + +#endif /* PVSCLIENTGUI_H_ */ diff --git a/src/pvsmgr.cpp b/src/pvsmgr.cpp new file mode 100644 index 0000000..83f5fe0 --- /dev/null +++ b/src/pvsmgr.cpp @@ -0,0 +1,55 @@ +/* + # Copyright (c) 2009 - OpenSLX Project, Computer Center University of Freiburg + # + # This program is free software distributed under the GPL version 2. + # See http://openslx.org/COPYING + # + # If you have any feedback please consult http://openslx.org/feedback and + # send your suggestions, praise, or complaints to feedback@openslx.org + # + # General information about OpenSLX can be found at http://openslx.org/ + # ----------------------------------------------------------------------------- + # pvs.cpp + # - main loop for pvsmgr GUI. + # ----------------------------------------------------------------------------- + */ + +#include <QtGui> +#include <QtGui/QDesktopServices> +#include "gui/mainWindow.h" +#include "util/consoleLogger.h" +#include "util/pvsSettingsManager.h" +#include "util/CertManager.h" + +QApplication *qtApp; + +int main(int argc, char** argv) +{ + //system("openssl genrsa 1024 >~/.pvs/"); + qtApp = new QApplication(argc, argv); + qtApp->setOrganizationName("openslx"); + qtApp->setOrganizationDomain("openslx.org"); + qtApp->setApplicationName("pvsmgr"); + + // use system locale as language to translate gui + QTranslator translator; + translator.load(":pvsmgr"); + qtApp->installTranslator(&translator); + + ConsoleLog setLogName(QString("log.server")); + ConsoleLog writeLine(QString("PVS-Server started.")); + + QSslKey k = CertManager::getPrivateKey("manager"); // preload key so the gui won't hang later + /* + if (k.isNull()) + { + printf("FATAL: Private key could not be generated or loaded!\n"); + exit(123); + } + */ + PVSSettingsManager::getManager()->setConfigFile(getPolicyFilePath("serverconf")); + MainWindow w; + w.show(); + return qtApp->exec(); +} + diff --git a/src/pvsmgrtouch.cpp b/src/pvsmgrtouch.cpp new file mode 100644 index 0000000..fa34294 --- /dev/null +++ b/src/pvsmgrtouch.cpp @@ -0,0 +1,55 @@ +/* + # Copyright (c) 2009 - OpenSLX Project, Computer Center University of Freiburg + # + # This program is free software distributed under the GPL version 2. + # See http://openslx.org/COPYING + # + # If you have any feedback please consult http://openslx.org/feedback and + # send your suggestions, praise, or complaints to feedback@openslx.org + # + # General information about OpenSLX can be found at http://openslx.org/ + # ----------------------------------------------------------------------------- + # pvs.cpp + # - main loop for pvs GUI. + # ----------------------------------------------------------------------------- + */ + +#include <QtGui> +#include <QtGui/QDesktopServices> +#include "gui/touchgui.h" +#include "util/consoleLogger.h" +#include "util/pvsSettingsManager.h" +#include "util/CertManager.h" + +QApplication *qtApp; + +int main(int argc, char** argv) +{ + //system("openssl genrsa 1024 >~/.pvs/"); + qtApp = new QApplication(argc, argv); + qtApp->setOrganizationName("openslx"); + qtApp->setOrganizationDomain("openslx.org"); + qtApp->setApplicationName("pvsmgr"); + + // use system locale as language to translate gui + /*QTranslator translator; + translator.load(":pvsmgr"); + qtApp->installTranslator(&translator);*/ + + ConsoleLog setLogName(QString("log.server")); + ConsoleLog writeLine(QString("PVS-Server started.")); + + QSslKey k = CertManager::getPrivateKey("manager"); // preload key so the gui won't hang later + /* + if (k.isNull()) + { + printf("FATAL: Private key could not be generated or loaded!\n"); + exit(123); + } + */ + PVSSettingsManager::getManager()->setConfigFile(getPolicyFilePath("serverconf")); + pvsMainWindow w; + w.show(); + return qtApp->exec(); +} + diff --git a/src/setup.h b/src/setup.h new file mode 100644 index 0000000..4a21754 --- /dev/null +++ b/src/setup.h @@ -0,0 +1,13 @@ +#ifndef _SETUP_H_
+#define _SETUP_H_
+
+#define SERVER_PORT "3490" // the port users will be connecting to
+#define SERVER_PORT_INT 3490 // the port users will be connecting to
+#define VNC_PORT_STRING "59000"
+#define VNC_PORT_INT 59000
+
+#define SB_INTERVAL 7 // Broadcast interval in seconds
+#define SD_PORT_CONSOLE 3491 // Not really used, Qt just wants a bind
+#define SD_PORT_CLIENT 3492 // This is where we expect announcements
+
+#endif
diff --git a/src/util/CertManager.cpp b/src/util/CertManager.cpp new file mode 100644 index 0000000..99d2438 --- /dev/null +++ b/src/util/CertManager.cpp @@ -0,0 +1,87 @@ +/*
+# Copyright (c) 2009 - OpenSLX Project, Computer Center University of Freiburg
+#
+# This program is free software distributed under the GPL version 2.
+# See http://openslx.org/COPYING
+#
+# If you have any feedback please consult http://openslx.org/feedback and
+# send your suggestions, praise, or complaints to feedback@openslx.org
+#
+# General information about OpenSLX can be found at http://openslx.org/
+# -----------------------------------------------------------------------------
+# src/util/CertManager.cpp
+# - Manage SSL certificates
+# - provide access by name
+# -----------------------------------------------------------------------------
+*/
+
+#include "CertManager.h"
+#include "util.h"
+#include <QMap>
+#include <QFileInfo>
+#include <cstdlib>
+
+namespace CertManager
+{
+ static QMap<QString, QSslCertificate> _certs;
+ static QMap<QString, QSslKey> _keys;
+
+ void generateFiles(QString key, QString cert);
+
+ QSslKey getPrivateKey(QString name) {
+ if (_keys.contains(name)) return _keys[name];
+ QString cert = getPolicyFilePath(name);
+ QString key = cert;
+ key.append(".rsa");
+ cert.append(".crt");
+ //
+ QFileInfo keyfile(key);
+ QFileInfo certfile(cert);
+ if (keyfile.exists() && certfile.exists())
+ { // It wouldn't make sense to have one without the other
+ if (getCertificate(name).isNull()) return QSslKey();
+ QFile f(key);
+ f.open(QFile::ReadOnly);
+ QSslKey k = QSslKey(&f, QSsl::Rsa, QSsl::Pem, QSsl::PrivateKey);
+ _keys.insert(name, k);
+ return k;
+ }
+ generateFiles(key, cert);
+ keyfile = QFileInfo(key);
+ if (!keyfile.exists() || getCertificate(name).isNull()) return QSslKey();
+ QFile f(key);
+ f.open(QFile::ReadOnly);
+ QSslKey k = QSslKey(&f, QSsl::Rsa, QSsl::Pem, QSsl::PrivateKey);
+ if (!k.isNull()) _keys.insert(name, k);
+ return k;
+ }
+
+ QSslCertificate getCertificate(QString name) {
+ if (_certs.contains(name)) return _certs[name];
+ QString cert = getPolicyFilePath(name);
+ cert.append(".crt");
+ //
+ QFileInfo certfile(cert);
+ if (certfile.exists())
+ {
+ QList<QSslCertificate> certlist = QSslCertificate::fromPath(cert);
+ if (certlist.empty()) return QSslCertificate();
+ QSslCertificate c = certlist.first();
+ if (!c.isNull()) _certs.insert(name, c);
+ return c;
+ }
+ return QSslCertificate();
+ }
+
+ void generateFiles(QString key, QString cert)
+ {
+ char tmp[1000];
+ unlink(key.toLocal8Bit().data());
+ unlink(cert.toLocal8Bit().data());
+ snprintf(tmp, 1000, "openssl req -x509 -nodes -days 3650 -newkey rsa:1024 -subj '/C=DE/ST=BaWue/L=Freiburg/CN=openslx.org' -keyout \"%s\" -out \"%s\"",
+ key.toLocal8Bit().data(), cert.toLocal8Bit().data());
+ system(tmp);
+ snprintf(tmp, 1000, "chmod 0600 \"%s\" \"%s\"", key.toLocal8Bit().data(), cert.toLocal8Bit().data());
+ system(tmp);
+ }
+}
diff --git a/src/util/CertManager.h b/src/util/CertManager.h new file mode 100644 index 0000000..8caab8b --- /dev/null +++ b/src/util/CertManager.h @@ -0,0 +1,30 @@ +/*
+# Copyright (c) 2009 - OpenSLX Project, Computer Center University of Freiburg
+#
+# This program is free software distributed under the GPL version 2.
+# See http://openslx.org/COPYING
+#
+# If you have any feedback please consult http://openslx.org/feedback and
+# send your suggestions, praise, or complaints to feedback@openslx.org
+#
+# General information about OpenSLX can be found at http://openslx.org/
+# -----------------------------------------------------------------------------
+# src/util/CertManager.cpp
+# - Manage SSL certificates
+# - provide access by name
+# -----------------------------------------------------------------------------
+*/
+
+#ifndef CERTMANAGER_H_
+#define CERTMANAGER_H_
+
+#include <QtNetwork/QSslCertificate>
+#include <QtNetwork/QSslKey>
+
+namespace CertManager
+{
+ QSslKey getPrivateKey(QString name);
+ QSslCertificate getCertificate(QString name);
+}
+
+#endif /* CERTMANAGER_H_ */
diff --git a/src/util/TextFile.cpp b/src/util/TextFile.cpp new file mode 100644 index 0000000..0d04e47 --- /dev/null +++ b/src/util/TextFile.cpp @@ -0,0 +1,39 @@ +/*
+ * TextFile.cpp
+ *
+ * Created on: 13.02.2010
+ * Author: Zahl
+ */
+
+#include "TextFile.h"
+
+TextFile::TextFile(QString filename) : QTextStream()
+{
+ _file = new QFile(filename);
+ if (_file->open(QIODevice::ReadOnly))
+ {
+ this->setDevice(_file);
+ _good = true;
+ }
+ else
+ {
+ _good = false;
+ }
+}
+
+bool TextFile::good()
+{
+ return _good;
+}
+
+bool TextFile::eof()
+{
+ if (!_good || this->atEnd()) return true;
+ return false;
+}
+
+TextFile::~TextFile()
+{
+ _file->close();
+ delete _file;
+}
diff --git a/src/util/TextFile.h b/src/util/TextFile.h new file mode 100644 index 0000000..49932fa --- /dev/null +++ b/src/util/TextFile.h @@ -0,0 +1,26 @@ +/*
+ * TextFile.h
+ *
+ * Created on: 13.02.2010
+ * Author: Zahl
+ */
+
+#ifndef TEXTFILE_H_
+#define TEXTFILE_H_
+
+#include <QtCore/QFile>
+#include <QtCore/QTextStream>
+
+class TextFile : public QTextStream
+{
+public:
+ TextFile(QString filename);
+ virtual ~TextFile();
+ bool good();
+ bool eof();
+protected:
+ QFile *_file;
+ bool _good;
+};
+
+#endif /* TEXTFILE_H_ */
diff --git a/src/util/clientGUIUtils.cpp b/src/util/clientGUIUtils.cpp new file mode 100644 index 0000000..4d4cc0d --- /dev/null +++ b/src/util/clientGUIUtils.cpp @@ -0,0 +1,144 @@ +#include "clientGUIUtils.h" + +BlankScreen::BlankScreen() +{ + dpy = XOpenDisplay(NULL); + scr = DefaultScreen(dpy); + assert(dpy); + blackColor = BlackPixel(dpy, DefaultScreen(dpy)); + whiteColor = WhitePixel(dpy, DefaultScreen(dpy)); +// win = XCreateSimpleWindow(dpy, DefaultRootWindow(dpy), 0, 0, 200, 100, 0, blackColor, whiteColor); + win = XCreateSimpleWindow(dpy, RootWindow(dpy, scr), 10, 10, 200, 200, 1, WhitePixel(dpy, scr), BlackPixel(dpy, scr)); + + XSelectInput(dpy, win, ExposureMask | KeyPressMask); + locked = false; + offX = offY = 0; +} + +void BlankScreen::draw(bool force) +{ + if (locked)// no need to draw if we're not showing the window + { + XWindowAttributes xwa; + XGetWindowAttributes(dpy, DefaultRootWindow(dpy), &xwa); + int hx = (xwa.width)>>2, hy = (xwa.height)>>2; + + if (XCheckTypedEvent(dpy, Expose, &ev) || force ) + { + hx += offX; + hy += offY; + + GC gcc = XCreateGC(dpy, win, 0, NULL); + XSetForeground(dpy, gcc, whiteColor); +// XClearArea(dpy, win, 0, 0, xwa.width, xwa.height, false); + if (lockMsg.size() > 0) + { + char *msg = const_cast<char*>(lockMsg.toUtf8().data()); + XDrawString(dpy, win, gcc/*DefaultGC(dpy, scr)*/, hx, hy, msg, strlen(msg)); + } + else + { + } + } + } +} + +bool BlankScreen::lock() +{ +#define lock_test + + if (locked) + return locked; + + // We want to get MapNotify events + XSelectInput(dpy, win, StructureNotifyMask); + + // "Map" the window (that is, make it appear on the screen) + XMapWindow(dpy, win); + + // Create a "Graphics Context" + //GC gc = XCreateGC(dpy, win, 0, NULL); + + XEvent xev; + Atom wm_state = XInternAtom(dpy, "_NET_WM_STATE", False); + Atom fullscreen = XInternAtom(dpy, "_NET_WM_STATE_FULLSCREEN", False); + memset(&xev, 0, sizeof(xev)); + xev.type = ClientMessage; + xev.xclient.window = win; + xev.xclient.message_type = wm_state; + xev.xclient.format = 32; + xev.xclient.data.l[0] = 1; + xev.xclient.data.l[1] = fullscreen; + xev.xclient.data.l[2] = 0; + + XSendEvent(dpy, DefaultRootWindow(dpy), False, + SubstructureNotifyMask, &xev); + + + + + // Wait for the MapNotify event + for (;;) + { + XEvent e; + XNextEvent(dpy, &e); + if (e.type == MapNotify) + break; + } + //Flush it! + //XFlush(dpy); + +#ifndef lock_test + // load the locked cursor, so people dont think they can click anything + // TODO: Use some kind of invisible cursor instead of the wait-cursor + Cursor locked_cur = XCreateFontCursor(dpy, XC_watch); + XDefineCursor(dpy, DefaultRootWindow(dpy),locked_cur); +#endif + + // grabbing of keyboard and mouse and hide the cursor + XGrabKeyboard(dpy, DefaultRootWindow(dpy), false, GrabModeAsync, GrabModeAsync, CurrentTime); + XGrabPointer(dpy, DefaultRootWindow(dpy), false, 0, GrabModeAsync, GrabModeAsync, None, NULL, CurrentTime); + + if (!locked) + ConsoleLog writeLine(QString("Locked")); + + // see header for more information on this switch + return locked = true; +} + +bool BlankScreen::lock_inputs() +{ + // grabbing of keyboard and mouse and hide the cursor + XGrabKeyboard(dpy, DefaultRootWindow(dpy), false, GrabModeAsync, GrabModeAsync, CurrentTime); + XGrabPointer(dpy, DefaultRootWindow(dpy), false, 0, GrabModeAsync, GrabModeAsync, None, NULL, CurrentTime); + return true; +} + +bool BlankScreen::unlock() +{ + + if (dpy) + { + + int retval = -1; + + //reset cursor to arrow (no *real* default here...) + Cursor normal_cur = XCreateFontCursor(dpy, XC_arrow); + XDefineCursor(dpy, DefaultRootWindow(dpy), normal_cur); + + // ungrabbing of keyboard and mouse + XUngrabPointer(dpy, CurrentTime); + XUngrabKeyboard(dpy, CurrentTime); + + + retval = XUnmapWindow(dpy,win); + if (retval == BadWindow) + ConsoleLog writeError(QString("Bad window while unmapping. Badwindow: ").append(int2String(retval))); + XFlush(dpy); + } + if (locked) + ConsoleLog writeLine(QString("Unlocked")); + + lockMsg.clear(); + return !(locked = false); +} diff --git a/src/util/clientGUIUtils.h b/src/util/clientGUIUtils.h new file mode 100644 index 0000000..28b05cc --- /dev/null +++ b/src/util/clientGUIUtils.h @@ -0,0 +1,39 @@ +#include "src/util/consoleLogger.h" +#include <X11/Xlib.h> // Every Xlib program must include this +#include <X11/cursorfont.h> +#include <assert.h> +#include <unistd.h> +#include <stdio.h> + + + +#define REFRESH_RATE 0.15 + +#ifndef _BLANKSCREEN_H_ +#define _BLANKSCREEN_H_ + +class BlankScreen +{ +public: + BlankScreen(); + void draw(bool force = false); + bool lock(); + bool unlock(); + void setLogMsg(QString msg); + bool lock_inputs(); + +private: + Display *dpy; + Window win; + XEvent ev; + int scr; + + bool locked; + + + QString lockMsg; + int blackColor, whiteColor; + int offX, offY; +}; + +#endif diff --git a/src/util/consoleLogger.cpp b/src/util/consoleLogger.cpp new file mode 100644 index 0000000..b523b40 --- /dev/null +++ b/src/util/consoleLogger.cpp @@ -0,0 +1,355 @@ +/* + # Copyright (c) 2009, 2010 - OpenSLX Project, Computer Center University of + # Freiburg + # + # This program is free software distributed under the GPL version 2. + # See http://openslx.org/COPYING + # + # If you have any feedback please consult http://openslx.org/feedback and + # send your suggestions, praise, or complaints to feedback@openslx.org + # + # General information about OpenSLX can be found at http://openslx.org/ + # ----------------------------------------------------------------------------- + # consoleLogger.cpp + # - ???. + # ----------------------------------------------------------------------------- + */ + +#include "consoleLogger.h" + +#ifdef never +template<class T> +void ConsoleLogger::addListener(T* who, void (T :: *func)(QString)) +{ + LogNotify<T> *test = new LogNotify<T>(who, func); + _CBLog.push_back(dynamic_cast<LogNotifyEntry*>(test)); +} + +template<class T> +void ConsoleLogger::removeListener(T* who, void (T :: *func)(QString)) +{ + if (_CBLog.size()) + { + for (std::list<LogNotifyEntry*>::iterator it = _CBLog.begin(); it != _CBLog.end(); it++) + { + LogNotify<T> *probe = dynamic_cast<LogNotify<T>*>((*it)); + if (probe) + { + if (probe->getCallee() == who && probe->getCB() == func) + { + _CBLog.remove((*it)); + } + } + } + } +// LogNotify<T> *test = new LogNotify<T>(who, func); + // _CBLog.push_back(dynamic_cast<LogNotifyEntry*>(test)); +} + +#endif +int ConsoleLogger::writeLine(QString message, LOG_LEVEL level) +{ + if (message.size() == 0) + return -1; + + ConsoleEntry consoleEntry(_getTimeStamp(), message, level); + _announceWrite(consoleEntry); // tell the listeners! + _writeLine2File(consoleEntry.getLine()); + _log.push_back(consoleEntry); + + return _log.size(); +} + +int ConsoleLogger::writeline(const char* message, LOG_LEVEL level) +{ + if (message) + { + if (strlen(message) > 0) + return writeLine(QString(message), level); + } + return -1; +} + +int ConsoleLogger::writeError(QString error) +{ + return writeLine(error, LOG_ERROR); +} + +int ConsoleLogger::writeError(const char* error) +{ + return writeLine(error, LOG_ERROR); +} + +int ConsoleLogger::writeTerminal(QString terminal) +{ + // printing the line on the console happens further down the line! + return writeLine(terminal, LOG_TERMINAL); +} + +int ConsoleLogger::writeTerminal(const char* terminal) +{ + if (terminal) + if (strlen(terminal) > 0) + return writeTerminal(QString(terminal)); + + terminal = NULL; + return -1; +} + +int ConsoleLogger::writeNetwork(QString network) +{ + // printing the line on the console happens further down the line! + return writeLine(network, LOG_NETWORK); +} + +int ConsoleLogger::writeNetwork(const char* network) +{ + if (network) + if (strlen(network) > 0) + return writeNetwork(QString(network)); + + network = NULL; + return -1; +} + +int ConsoleLogger::writeChat(QString chat) +{ + return writeLine(chat, LOG_CHAT); +} + +int ConsoleLogger::writeChat(const char* chat) +{ + if (chat) + if (strlen(chat) > 0) + return writeChat(QString(chat)); + + chat = NULL; + return -1; +} + +void ConsoleLogger::getLine(int lineNum, char* line) +{ + QString tmp; + getLine(lineNum, &tmp); + if (tmp.size() > 0) + { + line = new char[_log[lineNum].getLine().size()+1]; + if (line) + { + memcpy(line, _log[lineNum].getLine().toUtf8().data(), _log[lineNum].getLine().size()); + if (strlen(line) > 0) + return; + } + } + line = NULL; + +} + +void ConsoleLogger::getLine(int lineNum, QString* line) +{ + if (lineNum <= int(_log.size())) + { + if (lineNum > 0) + lineNum--; + else if (lineNum < 0) + { + line = NULL; + return; + } + } + else + { + line->clear(); + line = NULL; + } +} + +void ConsoleLogger::setLogPath(QString logPath) +{ + getLogger()->_logPath = logPath; + getLogger()->_prepareLog(); +} + +void ConsoleLogger::setLogName(QString logName) +{ + getLogger()->_logName = logName; + getLogger()->_prepareLog(); +} + +void ConsoleLogger::dumpLog(DUMP_MODE mode) +{ + if (mode == DUMP_FILE || (DUMP_FILE_CONCAT && !_fileRead)) + getLogger()->_writeLog(); + if (mode == DUMP_FILE_CONCAT && _fileRead) + getLogger()->_writeLog(true); + if (mode == DUMP_ALL_LISTENERS) + { + for (int i = 0; i <int(_log.size()); i++) + { + _announceWrite(_log[i]); + } + } +} + +int ConsoleLogger::count = 0; + +ConsoleLogger* ConsoleLogger::_logger; + +ConsoleLogger* ConsoleLogger::getLogger() +{ + if (!_logger) + { + return ConsoleLogger::_logger = new ConsoleLogger(); + } + else + return ConsoleLogger::_logger; +} + +ConsoleLogger::ConsoleLogger() + : _logName(""), + _logPath(getPolicyFilePath(QString(""))), + _fileRead(false), + entryDispatcher() +{ +// _prepareLog(); +} + +ConsoleLogger::~ConsoleLogger() +{ + // doesnt work!? + _writeLog(); +} + +void ConsoleLogger::_prepareLog() +{ + _logFile.close(); + _logFileGood = false; + _readLog(); + + mkdir(getPolicyFilePath(QString()).toUtf8().data(), 0777); + QString fullpath; + fullpath.append(_logPath); + //TODO: handle wether path/ or path were entered? + fullpath.append(_logName); + _logFile.open(fullpath.toUtf8().data(), std::ofstream::out | std::ofstream::app); + if (_logFile.good()) + { + _logFileGood = true; + writeTerminal(QString("LogPath/Name changed to: ").append(fullpath)); + } + else + { + printf("ERROR: Logfile ( %s ) not accessible/found. Logs will not be available.\n", _logPath.toUtf8().data()); + } + _logFile.close(); +} + +void ConsoleLogger::_writeLine2File(QString line) +{ + if (_logFileGood) + { + QString fullpath; + fullpath.append(_logPath); + //TODO: handle wether path/ or path were entered? + fullpath.append(_logName); + _logFile.open(fullpath.toUtf8().data(), std::ofstream::out | std::ofstream::app); + + if (_logFile.good()) // one can never be too sure + { + _logFile.write(line.toUtf8().data(), line.size()); + } + + _logFile.close(); + } + +} + +// overwrites the file and dumps the complete log archive of this session +void ConsoleLogger::_writeLog(bool concat) +{ + if (_logFileGood) + { + QString fullpath; + fullpath.append(_logPath); + //TODO: handle wether path/ or path were entered? + fullpath.append(_logName); + + std::vector<ConsoleEntry> *tmpLog = NULL; + + if (concat) + { + std::vector<ConsoleEntry> newLog = _prev_log; + newLog.insert(newLog.end(), _log.begin(), _log.end()); + tmpLog = &newLog; + } + else + { + tmpLog = &_log; + } + _logFile.open(fullpath.toUtf8().data(), std::ofstream::out | std::ofstream::trunc); + + if (_logFile.good()) // one can never be too sure + { + for (int i = 0; i < int(tmpLog->size()); i++) + { + _logFile.write(tmpLog->at(i).getLine().toUtf8().data(), tmpLog->at(i).getLine().size()); + } + } + + _logFile.close(); + } +} + +void ConsoleLogger::_announceWrite(ConsoleEntry consoleEntry) +{ + + entryDispatcher.fire(consoleEntry); +} + +void ConsoleLogger::_readLog(QString path) +{ + // todo, read the file, filter the entries and recombine them if possible etc.. + // then save it all to _log_prev. + // then set _readFile to true, so the dump will concat our current log to the old and THEN overwrite the whole file + _prev_log.clear(); + _fileRead = false; +} + +QString ConsoleLogger::_getTimeStamp() +{ + time_t rawtime; + tm * ptm; + time ( &rawtime ); + + //ptm = gmtime ( &rawtime ); + ptm = localtime ( &rawtime ); + + QString tmpStr; + if (ptm->tm_mday < 10) + tmpStr.append(QString("0")); + tmpStr.append(int2String(ptm->tm_mday)); + tmpStr.push_back('.'); + if (ptm->tm_mon < 10) + tmpStr.append(QString("0")); + tmpStr.append(int2String(int(ptm->tm_mon) +1)); + tmpStr.push_back('.'); + int year = (ptm->tm_year % 100); + if (year < 10) + tmpStr.append(QString("0")); + tmpStr.append(int2String(year)); + tmpStr.push_back(' '); + if (ptm->tm_hour < 10) + tmpStr.append(QString("0")); + tmpStr.append(int2String(ptm->tm_hour)); + tmpStr.push_back(':'); + if (ptm->tm_min < 10) + tmpStr.append(QString("0")); + tmpStr.append(int2String(ptm->tm_min)); + tmpStr.push_back(':'); + if (ptm->tm_sec < 10) + tmpStr.append(QString("0")); + tmpStr.append(int2String(ptm->tm_sec)); + + return tmpStr; +} + diff --git a/src/util/consoleLogger.h b/src/util/consoleLogger.h new file mode 100644 index 0000000..3a0950d --- /dev/null +++ b/src/util/consoleLogger.h @@ -0,0 +1,273 @@ + +#include "util.h" +#include "dispatcher.h" +#include <vector> +#include <time.h> +#include <stdio.h> +#include <stdlib.h> +#include <list> + + +//#define as_daemon +#ifndef _CONSOLELOGGER_H_ +#define _CONSOLELOGGER_H_ + +/**********************************************************************************************************************/ +// Console-, and Message Dispatching / Logging (With timestamping!) +/**********************************************************************************************************************/ +// +// :: Usage :: +// +#define ConsoleLog ConsoleLogger::getLogger()-> //ease of acces! +// +// +// *Logging: +// +// ConsoleLog writeLine(<string/char*>); // sends out a message with "normal" loglevel +// ConsoleLog writeLine(<string/char*>, <loglevel>); // sends out a message with the chosen loglevel --> enum LOG_LEVEL +// ConsoleLog writeError(<string/char*>); // sends out a message with "Error" loglevel +// ConsoleLog writeTerminal(<string/char*>); // sends out a message with "Terminal" loglevel, which means it is +// // also printed on stdout +// ConsoleLog writeNetwork(<string/char*>); // sends out a message with "network" loglevel +// ConsoleLog writeChat(<string/char*>); // sends out a message with "Chat" loglevel +// +// *un/subscribing to the LogDispatcher +// +// ConsoleLog addListener(<pointer-to-object-of-Type-myClass>, &myClass::myMethod); +// callback signature --> typedef void (T::*callback)(ConsoleEntry); // with <U, T> as template // for more on ConsoleEntry, see later +// ConsoleLog removeListener(<pointer-to-object-of-Type-myClass>, &myClass::myMethod); +// +// *Misc +// +// ConsoleLog setLogPath(<string-path-to-log-directory>); // set the log directory (with a final /, the logfilename is appended.) +// ConsoleLog setLogName(<string-name>); // like the above, but for the filename. +// ConsoleLog dumpLog(DUMP_MODE); +// +// DUMP_FILE ::>> Dumps the whole log since the logger was started into the specified logfile. the file content gets overwritten +// DUMP_FILE_CONCAT ::>> The Same as above, but it will just append itself to the previously (if implemented) log which got \** +// ***\ read from the logfile which was present at logger start. if no log is found or logfile was not read, behaves as DUMP_FILE +// DUMP_TERMINAL ::>> Dumps the whole log into the terminal +// DUMP_ALL_LISTENERS ::>> Dumps the whole log to all listeners +// +// Alternatively, you can request a dump to a certain listener: +// ConsoleLog dump2Listener(<pointer-to-object-of-Type-myClass>, &myClass::myMethod); // it expects the same information as when subscribing +// // the PVS-Server console makes heavy use of this feature to implement its filters +// +// +// :: using the ConsoleEntry class :: +// +// *methods and members +// +// +// LOG_LEVEL getLevel() // returns the loglevel as LOG_LEVEL Enum-type +// QString getLine() // returns the complete line as shown in the logfile, with timestamp, loglevel prefix etc +// QString getMessage() // returns the message body, no gimmicks attached +// QString getPrefix() // returns the loglevel as string-represenation +// QString getTimeStamp() // returns the timestamp which was set at the creation of the object +// +// +// +// +// +// +/**********************************************************************************************************************/ + + + + + + +// Typdef at bottom of file : +// typedef ConsoleLogger::ConsoleEntry LogEntry; + + +class ConsoleLogger +{ +public: + + enum LOG_LEVEL { LOG_NORMAL, + LOG_ERROR, + LOG_CHAT, + LOG_TERMINAL, + LOG_NETWORK + }; + enum DUMP_MODE { DUMP_FILE, + DUMP_FILE_CONCAT, + DUMP_TERMINAL, + DUMP_ALL_LISTENERS, + }; + class ConsoleEntry + { + public: + ConsoleEntry(QString timeStamp, QString message, LOG_LEVEL level) + { + setLine(timeStamp, message, level); + }; + void setLine(QString timeStamp, QString message, LOG_LEVEL level) + { + _message = message; + _prefix = _prefixLine(level); + _timeStamp = timeStamp; + _line.append(QString("[ ").append(timeStamp)); + _line.append(QString(" ] ").append(_prefix)); + _line.append(QString(": ").append(message)); + _level = level; + if ('\n' != _line[_line.size()-1] && '\n' != _line[_line.size()]) + _line.push_back('\n'); // add an explicit newline char, so it looks better in the logfile + //#ifndef as_daemon + if (_level == LOG_TERMINAL) // may look strange here, but its quite central :-) + printf("%s\n", _line.toUtf8().data()); + //#endif + }; + LOG_LEVEL getLevel() + { + return _level; + }; + QString getLine() + { + return _line; + }; + QString getMessage() + { + return _message; + }; + QString getPrefix() + { + return _prefix; + }; + QString getTimeStamp() + { + return _timeStamp; + }; + + private: + QString _prefixLine(LOG_LEVEL level) + { + // switch anyone? + if (level == LOG_NORMAL) + return QString("PVS"); + if (level == LOG_ERROR) + return QString("PVS ERROR"); + if (level == LOG_TERMINAL) + return QString("PVS Terminal"); + if (level == LOG_CHAT) + return QString("PVS Chat"); + if (level == LOG_NETWORK) + return QString("PVS Network"); + return QString("UNDEFINED"); + }; + QString _line; // the complete line with timestamp and everything + QString _message; // the message itself + QString _prefix; // just the prefix + QString _timeStamp; // just the timestamp + LOG_LEVEL _level; + }; + + class LogNotifyEntry + { + public: + virtual void fire(ConsoleEntry consoleEntry) {}; + LogNotifyEntry() {}; + }; + +#ifdef never +private: + template<class T> + class LogNotify : public LogNotifyEntry + { + public: + typedef void (T::*callback)(ConsoleEntry); + LogNotify(T* who, callback func )//void (T :: *func)(QString)) + { + callee = who; + //callback = func; + myCB = func; + }; + virtual void fire(ConsoleEntry consoleEntry) + { + if (callee) + (callee->*myCB)(consoleEntry); + }; + T* getCallee() + { + return callee; + }; + callback getCB() + { + return myCB; + }; + + private: + T *callee; + callback myCB; + }; + +public: +#endif + // interfaces for the dispatcher for easy of access ( --> ConsoleLog Makro) + template<class T> void addListener(T* who, void (T :: *func)(ConsoleEntry)) + { + entryDispatcher.addListener(who, func); + }; + template<class T> void removeListener(T* who, void (T :: *func)(ConsoleEntry)) + { + entryDispatcher.removeListener(who, func); + }; + template<class T> void dump2Listener(T* who, void (T :: *func)(ConsoleEntry)) + { + for (int i = 0; i < int(_log.size()) ; i++) + (who->*func)(_log[i]); + }; + + int writeLine(QString message, LOG_LEVEL = LOG_NORMAL); + int writeline(const char* message, LOG_LEVEL = LOG_NORMAL); + int writeError(QString error); + int writeError(const char* error); + int writeTerminal(QString terminal); + int writeTerminal(const char* terminal); + int writeNetwork(QString network); + int writeNetwork(const char* network); + int writeChat(QString chat); + int writeChat(const char* chat); + void getLine(int lineNum, char* line); + void getLine(int lineNum, QString* line); + void setLogPath(QString logPath); + void setLogName(QString logName); + void dumpLog(DUMP_MODE mode = DUMP_FILE); + static ConsoleLogger* getLogger(); + static int count; +private: + + + std::vector<ConsoleEntry>* _getLog() + { + return &_log; + }; + static ConsoleLogger* _logger; + void _prepareLog(); + void _writeLine2File(QString line); + void _writeLog(bool concat = false); + void _announceWrite(ConsoleEntry consoleEntry); + void _readLog(QString path = QString("")); + QString _getTimeStamp(); + void _prefixLine(QString* line, LOG_LEVEL level = LOG_NORMAL); + + + + ConsoleLogger(); + ~ConsoleLogger(); + + QString _logName; + QString _logPath; + + bool _logFileGood, _fileRead; +// std::list<LogNotifyEntry*> _CBLog; + EventDispatcher<ConsoleEntry> entryDispatcher; + std::vector<ConsoleEntry> _log; + std::vector<ConsoleEntry> _prev_log; + std::ofstream _logFile; +}; + +typedef ConsoleLogger::ConsoleEntry LogEntry; + +#endif diff --git a/src/util/dispatcher.h b/src/util/dispatcher.h new file mode 100644 index 0000000..490a3be --- /dev/null +++ b/src/util/dispatcher.h @@ -0,0 +1,210 @@ +#ifndef _DISPATCHER_H_ +#define _DISPATCHER_H_ +#include <list> +#include <QString> +#include <iostream> +#include <map> + + +//****************************************************************************************************/ +// EventDispatcher && EventIdentDispatcher // +/***************************************************************************************************/ +// This handy class(es) act as very simple signals/events. +// Its OOP-only, so dont even try to add static functions +// or C-like methods! +// +// :: Return Types :: +// +// at the moment only callbacks for void methods with a parameter +// count of one ( whos type is the primary template parameter) +// +// :: callback signature :: +// +// typedef void (T::*callback)(U); // with <U, T> as template +// +// :: Usage Example :: +// +// *creating a Dispatcher +// +// -- EventDispatcher<Type A>* nameYourDispatcher = new EventDispatcher<Type A>; // simple Dispatcher +// -- EventIdentDispatcher<Type A>* nameYourIdentDispatcher = new EventIdentDispatcher<Type A>; // ident dispatcher +// +// *difference between simple and ident +// +// a simple dispatcher features only one type of signal, so you can only call all +// attached listeners at once or none at all +// +// an ident dispatcher uses an ident string to hold and fire more than one event type at once +// but is limited to the one defined parameter type for its methods +// +// *subscribung to a dispatcher +// +// -- nameYourDispatcher->addListener(<pointer-to-object-of-Type-myClass>, &myClass::myMethod); // simple Dispatcher +// -- nameYourIdentDispatcher->addListener(<string-as-ident>, <pointer-to-object-of-Type-myClass>, &myClass::myMethod); // ident dispatcher// +// +// you can add the same method/instance to different dispatchers oder differnt ident-distinguished dispatchers in a identdispatcher. +// you can also add the same method/instance to the same dispatchers all over again, which is not recommended +// +// +// *firing a dispatcher +// +// -- nameYourDispatcher->fire(Type_A Object); // simple Dispatcher +// -- nameYourIdentDispatcher->fire(<string-as-ident>, Type_A Object); // ident dispatcher// +// +// All respective attached callbacks are called in the order they were added +// +// +// *unsubscribing +// +// -- nameYourDispatcher->removeListener(<pointer-to-object-of-Type-myClass>, &myClass::myMethod); // simple Dispatcher +// -- nameYourIdentDispatcher->removeListener(<string-as-ident>, <pointer-to-object-of-Type-myClass>, &myClass::myMethod); // ident dispatcher// +// +// just the reverse of addListener. currently no removeAll() available +// +// +// +/***************************************************************************************************/ +class CallbackHandle +{ +}; + +template<class U> +class CallbackBase : public CallbackHandle +{ +public: + virtual void fire(U u) {}; + +private: +}; + +template<class T, class U> +class Callback : public CallbackBase<U> +{ +public: + + virtual void fire(U u) + { + if (cbVU) + (callee->*cbVU)(u); + }; + + typedef void (T::*callbackVU)(U); + + Callback(T* who, callbackVU cb) + { + cbVU = cb; + callee = who; + }; + + T* getCallee() + { + return callee; + }; + callbackVU getCBVU() + { + return cbVU; + }; + +private: + callbackVU cbVU; + T* callee; + +}; + +template<class U> +class EventDispatcher +{ +public: + template<class T> void addListener(T *who, void (T :: *func)(U)) + { + Callback<T, U> *tmp = new Callback<T, U>(who, func); + _listener.push_back(dynamic_cast<CallbackBase<U>*>(tmp)); + }; + void fire(U u) + { + for (typename std::list<CallbackBase<U>*>::iterator it = _listener.begin(); it != _listener.end(); it++) + { + if (*it) + { + (*it)->fire(u); + } + } + }; + + template<class T> void removeListener(T* who, void (T :: *func)(U)) + { + if (_listener.size()) + { + for (typename std::list<CallbackBase<U>*>::iterator it = _listener.begin(); it != _listener.end(); it++) + { + CallbackBase<U>* pro = (*it); + Callback<T, U> *probe = dynamic_cast<Callback<T,U>*>(pro); + if (probe) + { + if (probe->getCallee() == who && probe->getCBVU() == func ) + { + delete (probe); + _listener.remove((*it)); + return; + } + } + } + } + }; + +private: + + std::list<CallbackBase<U>*> _listener; +}; + +template<class U> +class EventIdentDispatcher +{ +public: + template<class T> void addListener(QString ident, T* who, void (T :: *func)(U)) + { + Callback<T, U>* tmp = new Callback<T, U>(who, func); + _listener.push_back(std::pair<QString, CallbackBase<U>*>(ident, dynamic_cast<CallbackBase<U>*>(tmp))); + }; + + void fire(QString ident, U u) + { + for ( typename std::list<std::pair<QString, CallbackBase<U>* > >::iterator it = _listener.begin(); it != _listener.end(); it++) + { + if ((*it).first.compare(ident) == 0 || QString("*").compare((*it).first) == 0) + { + if ((*it).second) + { + (*it).second->fire(u); + } + } + } + }; + template<class T> void removeListener(QString ident, T* who, void (T :: *func)(U)) + { + if (_listener.size()) + { + for (std::list<std::pair <QString, CallbackHandle*> >::iterator it = _listener.begin(); it != _listener.end(); it++) + { + if ((*it).first.compare(ident) == 0) + { + CallbackBase<U>* pro = (*it).second; + Callback<T, U> *probe = dynamic_cast<Callback<T,U>*>(pro); + if (probe) + { + if (probe->getCallee() == who && probe->getVoidCB == func) + { + delete (*it).second; + _listener.remove((*it)); + return; + } + } + } + } + } + }; +private: + std::list<std::pair<QString, CallbackBase<U>* > > _listener; +}; + +#endif diff --git a/src/util/pvsSettingsManager.cpp b/src/util/pvsSettingsManager.cpp new file mode 100644 index 0000000..a6a742b --- /dev/null +++ b/src/util/pvsSettingsManager.cpp @@ -0,0 +1,185 @@ +#include "pvsSettingsManager.h" +#include "TextFile.h" + +PVSSettingsManager* PVSSettingsManager::getManager() +{ + if (myself) + return myself; + else + return myself = new PVSSettingsManager; +} + +void PVSSettingsManager::setConfigFile(QString path) +{ + if (path.size() && fileExists(path)) + { + _path = path; + _parseFile(_path); + + } + else + ConsoleLog writeError(QString("Can't open config file \"").append(QString(path).append("\""))); +} + +bool PVSSettingsManager::hasEntry(QString name) +{ + for (SettingsIter it = settingsList.begin(); it != settingsList.end(); it++) + { + if ((*it).first.compare(name) == 0) + { + return true; + } + } + return false; +} + +QString PVSSettingsManager::getEntryString(QString name) +{ + for (SettingsIter it = settingsList.begin(); it != settingsList.end(); it++) + { + if ((*it).first.compare(name) == 0) + { + return (*it).second; + } + } + return QString(); +} + +void PVSSettingsManager::writeEntry(QString name, QString value) +{ + if (name.size() && value.size()) + return; + bool unique = true; + for (SettingsIter it = settingsList.begin(); it != settingsList.end(); it++) + { + if ((*it).first.compare(name) == 0) + { + unique = false; + (*it).second = value; + break; + } + } + if (unique) + { + SettingsEntry tmp(name, value); + settingsList.push_back(tmp); + } +} + + +PVSSettingsManager* PVSSettingsManager::myself = NULL; + +PVSSettingsManager::PVSSettingsManager() +{ + +} + +void PVSSettingsManager::setConfigs() +{ + //default settings + _configs.setValue("Chat/chatstate", "on"); + _configs.setValue("Chat/chatmode", "bossmode"); + _configs.setValue("Room/roomId", "0"); + _configs.setValue("VNC/permit", "off"); + _configs.setValue("VNC/quality", "high"); + _configs.sync(); +} +void PVSSettingsManager::reWriteConfigs(QString set, QString val) +{ + _configs.setValue(set, val); + _configs.sync(); +} + +void PVSSettingsManager::readConfigs(QString sett, QString vall) +{ + //TODO: read the config file.. + _configs.value("Chat/chatstate").toBool(); + _configs.value("Chat/chatmode").toString(); + _configs.value("Room/room").toInt(); + _configs.value("VNC/permit").toBool(); + _configs.value("VNC/quality").toString(); +} + +void PVSSettingsManager::_parseFile(QString path) +{ + QString line; + TextFile file(path); + + SettingsList tmpList; + + if (file.good()) + { + while (!file.eof()) + { + line = file.readLine(); + if (!(line.length() <=1)) // ignore blank + { + if (!(line[0] == '#' || line[0] == '/' || line[0] == '[')) // ignore comments and section headers + { + SettingsEntry tmp = _parseLine(line); + if (tmp.first.size() && tmp.second.size()) + { + bool unique = true; + for (SettingsIter it = tmpList.begin(); it != tmpList.end(); it++) + { + if ((*it).first.compare(tmp.first) == 0) + { + unique = false; + break; + } + } + if (unique) + tmpList.push_back(tmp); + } + } + } + } + } + else + { + ConsoleLog writeError(QString("No configfile \"").append(QString(path).append("\" found or file corrupt."))); + } + + if (tmpList.size()) + settingsList = tmpList; +} +#ifdef verbose +ConsoleLog writeLine(QString("Dumping Config Content of ").append(QString(path).append(" : "))); +for (SettingsIter it = settingsList.begin(); it != settingsList.end(); it++) +{ + ConsoleLog writeLine(QString("Option: ").append(QString((*it).first).append(QString(" | Value: ").append((*it).second)))); +} +ConsoleLog writeLine(QString("End of ").append(QString(path).append("."))); +#endif + +SettingsEntry PVSSettingsManager::_parseLine(QString line) +{ + QString name; + QString value; + + name = lineSplitter(line, "=\n\t", true); + value = lineSplitter(line, "=\n\t", false); + + if (!(name.size() && value.size())) + return SettingsEntry("",""); + + + // remove whitespaces in front of option name + for (int i = 0; i < name.size(); i++) + { + if (name[i] == '\t' || name[i] == ' ') + { + name.remove(i, 1); + i--; + } + else + break; + } + // whitespaces after the value are trimmed by the lineSplitter + + SettingsEntry tmp(name, value); + return tmp; +} + + + diff --git a/src/util/pvsSettingsManager.h b/src/util/pvsSettingsManager.h new file mode 100644 index 0000000..78607eb --- /dev/null +++ b/src/util/pvsSettingsManager.h @@ -0,0 +1,50 @@ +/// documentation test 1 +/// line 2 +/// line 3 +#ifndef _PVSSETTINGSMANGER_H_ +#define _PVSSETTINGSMANGER_H_ + +#include <list> +#include <map> +#include <src/util/util.h> +#include <src/util/consoleLogger.h> +#include <QSettings> + + +/// documentation test 1.1 +/// line 2.1 +/// line 3.1 + +typedef std::pair<QString, QString> SettingsEntry; ///< first = option name, second = option value +typedef std::list<SettingsEntry> SettingsList; ///< obvious +typedef std::list<SettingsEntry>::iterator SettingsIter; + + +class PVSSettingsManager; +/// documentation test 1.2 +/// line 2.2 +/// line 3.2 +class PVSSettingsManager +{ +public: + static PVSSettingsManager* getManager(); + void setConfigFile(QString path); + bool hasEntry(QString name); + QString getEntryString(QString name); + void writeEntry(QString name, QString value); + void setConfigs(); + void reWriteConfigs(QString set, QString val); + void readConfigs(QString sett, QString vall); +private: + static PVSSettingsManager* myself; + PVSSettingsManager(); + void _parseFile(QString path); + SettingsEntry _parseLine(QString line); + QString _path; + SettingsList settingsList; + QSettings _configs; + +}; + + +#endif diff --git a/src/util/serviceDiscoveryUtil.cpp b/src/util/serviceDiscoveryUtil.cpp new file mode 100644 index 0000000..32aa0fc --- /dev/null +++ b/src/util/serviceDiscoveryUtil.cpp @@ -0,0 +1,65 @@ +#include "serviceDiscoveryUtil.h"
+#include <cassert>
+
+void appendSdField(QByteArray* target, const char* id, QString data)
+{
+ assert(strlen(id) == 3);
+ target->append(id);
+ QByteArray tmp = data.toUtf8();
+ if (tmp.size() > 100) tmp.truncate(100);
+ target->append((char)tmp.size());
+ target->append(tmp);
+}
+
+SdFields parseSdFields(unsigned char* data, int len)
+{
+ SdFields fields;
+ for (;;)
+ {
+ //printf("%d bytes left: %s\n", len, (char*)data);
+ if (len < 4 || len < 4 + data[3]) break; // end of data
+ QString key = QString::fromUtf8((char*)data, 3);
+ QString val = QString::fromUtf8((char*)data+4, data[3]);
+ //printf("Key: %s, Val: %s\n", key.toUtf8().data(), val.toUtf8().data());
+ fields.insert(key, val);
+ len -= (4 + data[3]);
+ data += (4 + data[3]);
+ }
+ return fields;
+}
+
+QString sha1ToReadable(QByteArray input)
+{
+ unsigned char *ptr = (unsigned char *)input.data();
+ QString retval;
+ for (int i = (input.length() < 10 ? input.length() : 10); i; --i)
+ {
+ switch(*ptr++ % 0xD)
+ {
+ case 0x0: retval.append('S'); break;
+ case 0x1: retval.append('F'); break;
+ case 0x2: retval.append('M'); break;
+ case 0x3: retval.append('K'); break;
+ case 0x4: retval.append('H'); break;
+ case 0x5: retval.append('T'); break;
+ case 0x6: retval.append('P'); break;
+ case 0x7: retval.append('D'); break;
+ case 0x8: retval.append('Y'); break;
+ case 0x9: retval.append('W'); break;
+ case 0xA: retval.append('G'); break;
+ case 0xB: retval.append('L'); break;
+ case 0xC: retval.append('B'); break;
+ }
+ if (--i == 0) break;
+ switch((*ptr >> 2) % 5)
+ {
+ case 0: retval.append('a'); break;
+ case 1: retval.append('i'); break;
+ case 2: retval.append('u'); break;
+ case 3: retval.append('e'); break;
+ case 4: retval.append('o'); break;
+ }
+ if ((*ptr++ & 3) == 0) retval.append('n');
+ }
+ return retval;
+}
diff --git a/src/util/serviceDiscoveryUtil.h b/src/util/serviceDiscoveryUtil.h new file mode 100644 index 0000000..537daeb --- /dev/null +++ b/src/util/serviceDiscoveryUtil.h @@ -0,0 +1,19 @@ +#ifndef SERVICEDISCOVERYUTIL_H_
+#define SERVICEDISCOVERYUTIL_H_
+
+#include <QtCore/QString>
+#include <QtCore/QHash>
+
+typedef QHash<QString, QString> SdFields;
+
+// These two functions build/parse the message format used in SD broadcasts
+// It is some kind of key-value pairs, encoded as follows:
+// <3 chars/bytes, key><1 byte, value length in bytes><up to 100 chars/bytes, value>
+void appendSdField(QByteArray* target, const char* id, QString data);
+SdFields parseSdFields(unsigned char* data, int len);
+
+// This algorithm is supposed to generate a readable and maybe pronouncable
+// string from the fingerprint of the servers certificate
+QString sha1ToReadable(QByteArray input);
+
+#endif /* SERVICEDISCOVERYUTIL_H_ */
diff --git a/src/util/timeUtil.cpp b/src/util/timeUtil.cpp new file mode 100644 index 0000000..6f8e93d --- /dev/null +++ b/src/util/timeUtil.cpp @@ -0,0 +1,42 @@ +/* + # Copyright (c) 2009, 2010 - OpenSLX Project, Computer Center University of + # Freiburg + # + # This program is free software distributed under the GPL version 2. + # See http://openslx.org/COPYING + # + # If you have any feedback please consult http://openslx.org/feedback and + # send your suggestions, praise, or complaints to feedback@openslx.org + # + # General information about OpenSLX can be found at http://openslx.org/ + # ----------------------------------------------------------------------------- + # timeUtil.cpp + # - ???. + # ----------------------------------------------------------------------------- + */ + +#include "timeUtil.h" + +TimeUtil::TimeUtil() +{ + seconds = useconds = mtime = 0; +} + +void TimeUtil::start() +{ + gettimeofday(&Begin, NULL); +} + +void TimeUtil::stop() +{ + gettimeofday(&End, NULL); + seconds = End.tv_sec - Begin.tv_sec; + useconds = End.tv_usec - Begin.tv_usec; + mtime = ((seconds) * 1000 + useconds/1000.0) + 0.5; +} + +long TimeUtil::getMS() +{ + return mtime; +} + diff --git a/src/util/timeUtil.h b/src/util/timeUtil.h new file mode 100644 index 0000000..90d647d --- /dev/null +++ b/src/util/timeUtil.h @@ -0,0 +1,34 @@ +#ifndef TIME_UTIL +#define TIME_UTIL + +#include <sys/time.h> +#include <stdio.h> +#include <unistd.h> + + +#ifdef PROFILE +#define startTime(aaa) TimeUtil aaa ## Time = TimeUtil(); aaa ## Time.start(); +#define endTime(aaa) aaa ## Time.stop(); printf("Time to execute " #aaa " : %ld\n", aaa ## Time.getMS()); +#endif + +#ifndef PROFILE +#define startTime(aaa) +#define endTime(aaa) +#endif + + + +class TimeUtil +{ + +public: + TimeUtil(); + void start(); + void stop(); + long getMS(); +private: + long mtime, seconds, useconds; + struct timeval Begin, End; //initialize Begin and End for the timer +}; + +#endif diff --git a/src/util/util.cpp b/src/util/util.cpp new file mode 100644 index 0000000..c2d06a0 --- /dev/null +++ b/src/util/util.cpp @@ -0,0 +1,416 @@ +#include "util.h" +#include <QtGui/QDesktopServices> +#include "consoleLogger.h" +#include "TextFile.h" +#include <ctime> +#include <cstdlib> +#include <QStringList> +#include <iostream> + + +PVSServerEntry::PVSServerEntry(QString name) +{ + name_ = name; +} +void PVSServerEntry::addClient(QString client) +{ + clientList_.push_back(client); +} +bool PVSServerEntry::hasClient(QString client) +{ + for (std::list<QString>::iterator it = clientList_.begin(); it != clientList_.end(); it++) + { + if ((*it).compare(client) == 0) + return true; + } + return false; +} +QString PVSServerEntry::getName() +{ + return name_; +} + +int PVSServerEntry::getSize() +{ + return clientList_.size(); +} + + +//namespace util +//{ + +int getRandom(int min, int max) +{ + static bool init = true; + if (init) + { + init = false; + srand ( time(NULL) + getpid() ); + } + if (min >= max) return rand(); + return rand() % (max-min+1) + min; +} + +std::list<PVSServerEntry> getPVSServerEntryList(QString fileName) +{ + QString line; + TextFile file(fileName); + std::list<PVSServerEntry> entryList; + + if (file.good()) + { +// std::cout << "reading table file \"" << fileName <<"\"" << std::endl; + PVSServerEntry* tmpEntry = NULL; + while (!file.eof()) + { + line = file.readLine(); + + if (!(line.length() <=1)) // ignore blank + if (!(line[0] == '#' || line[0] == '/')) // ignore comments + { + if (line.mid(0, 5).compare(QString("start")) == 0) + { + if (tmpEntry != NULL) + { + // unclean file... but no reason to break down + //PVSServerEntry tmpEntry2 = *tmpEntry; + entryList.push_back(*tmpEntry); + delete tmpEntry; + tmpEntry = NULL; + } + QString tmpName(colonSplitter(line, false)); + if (tmpName.size()<1) + tmpName = QString("localhost"); + + tmpEntry = new PVSServerEntry(tmpName); + continue; + } + if (line.mid(0, 3).compare(QString("end")) == 0) + { + if (tmpEntry!=NULL) + { + entryList.push_back(*tmpEntry); + delete tmpEntry; + tmpEntry = NULL; + } + else + ;// ignore + + continue; + } + if (tmpEntry != NULL) + { + tmpEntry->addClient(line); + } + } + } + if (tmpEntry != NULL) + { + delete tmpEntry; + tmpEntry = NULL; + } + + return entryList; + } + else + { + std::cout << "ERROR: no file \"" << fileName.toStdString() <<"\" found or file corrupt" << std::endl; + } + return std::list<PVSServerEntry>(); +} +QString getFilenameFromPath(QString line) +{ + int lastSlash = 0; + for (int i = 0; i < line.length(); i++) + { + if (line.at(i) == '/') + { + lastSlash = i; + } + } + QString result; + if (lastSlash != 0 && lastSlash != line.length() -1) + { + result = line.mid(lastSlash+1, line.length()-(lastSlash+1)); + } + return result; +} + +QString lineSplitter(QString line, const char* signs, bool first) +{ + char *pch; + char* cLine = new char[line.length()+1]; + strcpy(cLine, line.toUtf8().data()); + pch = strtok (cLine,signs); + if (first) + { + QString tmp(pch); + delete cLine; + return tmp; + } + else + { + QString tmp; + char* tmpp = strtok(NULL, ";,\t\n"); + if (tmpp) + tmp = QString(tmpp); + delete cLine; + return tmp; + } +} + +QString colonSplitter(QString line, bool first) +{ + char *pch; + char* cLine = new char[line.length()+1]; + strcpy(cLine, line.toUtf8().data()); + pch = strtok (cLine," :\t\n"); + if (first) + { + QString tmp(pch); + delete[] cLine; + return tmp; + } + else + { + QString tmp; + char* tmpp = strtok(NULL, " ;,\t\n"); + if (tmpp) + tmp = QString(tmpp); + delete[] cLine; + return tmp; + } +} + +QString getUserName() +{ + struct passwd* passUser = getpwuid(getuid()); + QString username; + if (passUser) + { + username = QString(passUser->pw_name); + } + if (username.isEmpty()) + { + printf("USERNAME COULDNT BE RETRIEVED!\n"); + username = QString("USERNAMEERROR"); + } + return username; +} + +// Get full username. +QString getFullUsername() +{ + QString fullname = getUserName(); + struct passwd *pd; + + if (NULL == (pd = getpwuid(getuid()))) + {ConsoleLog writeError("getpwuid() error.");} + else + { + QString tmp = pd->pw_gecos; + QStringList userData = tmp.split(","); + if(userData[0].length() > 0 ) + { + fullname = userData[0]; + } + } + return fullname; +} + +bool fileExists(QString fileName) +{ + std::ifstream file(fileName.toLocal8Bit().data()); + if (file.good()) + { +#ifdef verbose + printf("fileExists(): file good.\n"); +#endif + file.close(); + return true; + } + return false; + +} + +QString getHomeDir() +{ + return QDesktopServices::storageLocation(QDesktopServices::HomeLocation); +} + +QString getPolicyDir() +{ + QString policyDir = getHomeDir(); + QString subPath("/.pvs/"); + policyDir.append(subPath); + return policyDir; +} + +QString getPolicyFilePath(QString fileName) +{ + + QString fullPath = getPolicyDir(); + fullPath.append(fileName); + return fullPath; +} +bool policyFileExists(QString fileName) +{ + std::ifstream file(getPolicyFilePath(fileName).toUtf8().data()); + if (file.good()) + { + file.close(); + return true; + } + return false; +} + +void createPolicyDir() +{ + mkdir(getPolicyDir().toUtf8().data(), 0777); +} + +void createPolicyFiles() +{ + if (!policyFileExists(QString(".allow"))) + { + std::ofstream file(getPolicyFilePath(QString(".allow")).toUtf8().data()); + file.close(); + } +#ifdef old_method + if (!policyFileExists(QString(".pass"))) + { + std::ofstream file(getPolicyFilePath(QString(".pass")).toUtf8().data()); + file.close(); + } +#endif +} + +QString readPassFromPassFile() +{ + TextFile file(getPolicyFilePath(".pass")); + if (file.good()) // should have been checked via exists before, but better be safe + { + QString pass; + pass = file.readLine(); // we expect a password in correct format. otherwise their fault + return pass; + } + else + return QString(); +} +bool getAllowed() +{ + printf("Checking %s\n", getPolicyFilePath(QString(".allow")).toUtf8().data()); + TextFile file(getPolicyFilePath(".allow")); + if (file.good()) // should have been checked via exists before, but better be safe + { + QString allowed; + allowed = file.readLine(); + if ( (allowed.compare(QString("1")) == 0) || + (allowed.compare(QString("true")) == 0) || + (allowed.compare(QString("t")) == 0) || + (allowed.compare(QString("T")) == 0) || + (allowed.compare(QString("true")) == 0) || + (allowed.compare(QString("allow")) == 0) || + (allowed.compare(QString("TRUE")) == 0) ) + return true; + } + printf("...negative\n"); + return false; +} + +QString int2String(int intInt) +{ + char tmp[50]; + snprintf(tmp, 49, "%d", intInt); + return QString(tmp); +} + +int string2Int(QString string) +{ + return atoi(string.toUtf8().data()); +} + +//}//end namespace util + + +#ifdef neverever +std::list<VNCConnectInfo*> readFile(char* fileName) +{ + QString line; + std::ifstream file(fileName); + std::list<VNCConnectInfo*> infoList; + + if (file.good()) + { +// std::cout << "reading clients file \"" << fileName <<"\"" << std::endl; + while (!file.eof()) + { + getline(file, line); + + if (!(line.length() <=1)) // ignore blank + if (!(line[0] == '#' || line[0] == '/')) // ignore comments + infoList.push_back(getConInfo(line)); + } + } + else + { + std::cout << "ERROR: no file \"" << fileName <<"\" found or file corrupt" << std::endl; + } + return infoList; +} + +VNCConnectInfo* getConInfo(QString line) +{ + char** arguments = new char*[100]; + char* cLine = new char[line.length()+1]; + strcpy(cLine, line.toUtf8().data()); + int count; + makeArgs(cLine , &count , arguments); + std::cout << "found " << count << " arguments" << std::endl; + if (count > 2) // assume that a password would be the second argument in the line, therefore the third argument in the argv + { + QString pass = QString(arguments[2]); + std::cout << "think i found a password" << std::endl; + count--; + delete arguments[2]; + // no changes to the arguments though, since the vnc-lib will ignore most of it anyway + return new VNCConnectInfo(count, arguments, pass); + } + + return new VNCConnectInfo(count, arguments); +} + +void makeArgs(char* line, int* count, char** arguments) +{ + (*count) = 1; + + arguments[(*count)-1] = new char[strlen("dummy")+1]; // get program name from somewhere + strcpy(arguments[(*count)-1], "dummy"); + + /*// include encodings + arguments[(*count)++] = new char[strlen("-encodings")+1]; + strcpy(arguments[(*count)], "-encodings"); + (*count)++; + arguments[(*count)++] = new char[strlen("tight")+1]; + strcpy(arguments[(*count)], "tight"); + (*count)++; + */ + + + if (line[strlen(line)-1] == '\n' || line[strlen(line)-1] == '\r') + line[strlen(line)-1] = '\0'; // remove newline + + char *pch; + pch = strtok (line," ,\t"); + while (pch != NULL && (*count) <= 3) + { + (*count)++; // count args + arguments[(*count)-1] = new char[strlen(pch)+1]; + strcpy(arguments[(*count)-1], pch); + pch = strtok (NULL, " ,\t"); + } +} + + +#endif + diff --git a/src/util/util.h b/src/util/util.h new file mode 100644 index 0000000..37565cb --- /dev/null +++ b/src/util/util.h @@ -0,0 +1,59 @@ +#include <QString> +#include <cstdio> +//#include <cstring> +#include <list> +#include <fstream> +#include <iostream> +#include <pwd.h> +#include <sys/types.h> +#include <sys/stat.h> + + + +#ifndef _PVSSERVERENTRY_H_ +#define _PVSSERVERENTRY_H_ +class PVSServerEntry +{ +public: + PVSServerEntry(QString name); + void addClient(QString client); + bool hasClient(QString client); + QString getName(); + int getSize(); +private: + QString name_; + std::list<QString> clientList_; +}; +#endif + +//namespace util +//{ +int getRandom(int min, int max); +std::list<PVSServerEntry> getPVSServerEntryList(QString fileName); +QString getFilenameFromPath(QString line); +QString lineSplitter(QString line, const char* signs, bool first); +QString colonSplitter(QString line, bool first); +QString getUserName(); +QString getFullUsername(); +bool fileExists(QString fileName); +QString getHomeDir(); +QString getPolicyDir(); +QString getPolicyFilePath(QString fileName); +bool policyFileExists(QString fileName); +void createPolicyFiles(); +void createPolicyDir(); +QString readPassFromPassFile(); +bool getAllowed(); + +QString int2String(int intInt); +int string2Int(QString string); +int string2Int(QString string); +//} // end namespace util + +//std::list<VNCConnectInfo*> readFile(char* fileName); +//void makeArgs(char* line, int* count, char** arguments); +//VNCConnectInfo* getConInfo(QString line); + + + + diff --git a/src/util/vncClientThread.cpp b/src/util/vncClientThread.cpp new file mode 100644 index 0000000..bb1d457 --- /dev/null +++ b/src/util/vncClientThread.cpp @@ -0,0 +1,249 @@ +/* + # Copyright (c) 2009, 2010 - OpenSLX Project, Computer Center University of + # Freiburg + # + # This program is free software distributed under the GPL version 2. + # See http://openslx.org/COPYING + # + # If you have any feedback please consult http://openslx.org/feedback and + # send your suggestions, praise, or complaints to feedback@openslx.org + # + # General information about OpenSLX can be found at http://openslx.org/ + # ----------------------------------------------------------------------------- + # vncClientThread.cpp + # - Connection to remove vnc server + # - Emits Qt signal on framebuffer updates + # ----------------------------------------------------------------------------- + */ + +#include "vncClientThread.h" + +VNCClientThread::VNCClientThread(QString host, int port, QString passwd, + int quality, int updatefreq) : + QThread(), _frameBuffer(0) +{ + _host = host; + _port = port; + _passwd = passwd; + _quality = quality; + _updatefreq = updatefreq; + terminate = false; + _client = NULL; + _connected = false; +} + +VNCClientThread::~VNCClientThread() +{ + if (this->isRunning()) this->wait(2000); + if (_frameBuffer) delete[] _frameBuffer; + _frameBuffer = NULL; + if (_client != NULL) + { + ::close(_client->sock); + _client->frameBuffer = NULL; + rfbClientCleanup(_client); + _client = NULL; + } +} + +//////////////////////////////////////////////////////////////////////////////// +// Public + +void VNCClientThread::run() +{ + qDebug("[%s] VNC client started.", metaObject()->className()); + qDebug("[%s] Host: '%s' Port: %i Passwd: '%s' Quality: %i", + metaObject()->className(), qPrintable(_host), _port, + qPrintable(_passwd), _quality); + + // setup network + _client = rfbGetClient(8, 3, 4); + _client->MallocFrameBuffer = frameBufferHandler; + _client->canHandleNewFBSize = true; + _client->serverHost = strdup(_host.toUtf8().constData()); + _client->desktopName = NULL; + _client->serverPort = _port; + _client->GetPassword = passwdHandler; + _client->GotFrameBufferUpdate = updateImage; + _client->frameBuffer = NULL; + + // save this instance in vnc-struct for callbacks + rfbClientSetClientData(_client, 0, this); + + // start client + if (!rfbInitClient(_client, NULL, NULL)) + { + _client = NULL; // !!! <- if you don't do this you will get a segfault + return; // later when you try to clean up _client, as rfbInitClient already did so + } + + qDebug("[%s] Connection successful!", metaObject()->className()); + + // Main VNC event loop + while (!terminate) + { + _connected = true; + const int i = WaitForMessage(_client, 500); // its usec, not msec + if (i < 0) + break; + if (i) if (!HandleRFBServerMessage(_client)) + break; + + /* + //work yourself through event queue and fire every event... + while (!_eventQueue.isEmpty()) { + SomeEvent* event = _eventQueue.dequeue(); + event->fire(_client); + delete event; + }*/ + + this->msleep(_updatefreq); + } + + // cleanup + ::close(_client->sock); + + qDebug("[%s] VNC client stopped.", metaObject()->className()); + _connected = false; +} + +QImage VNCClientThread::getImage() +{ + return _img; +} + +QSize VNCClientThread::getSize() +{ + return _clientSize; +} + +int VNCClientThread::getUpdatefreq() +{ + if (_updatefreq > 0) + return _updatefreq; + return 500; +} + +void VNCClientThread::setUpdatefreq(int updatefreq) +{ + _updatefreq = updatefreq; +} + +QString VNCClientThread::getDesktopName() +{ + if (_client == NULL || _client->desktopName == NULL) return QString(); + return QString(_client->desktopName); +} + +char* VNCClientThread::passwdHandler(rfbClient *client) +{ + VNCClientThread* t = (VNCClientThread*) rfbClientGetClientData(client, 0); + return strdup(t->_passwd.toLocal8Bit()); +} + +rfbBool VNCClientThread::frameBufferHandler(rfbClient *client) +{ + VNCClientThread *t = (VNCClientThread*) rfbClientGetClientData(client, 0); + const int width = client->width, height = client->height, depth = + client->format.bitsPerPixel; + const int size = width * height * (depth / 8); + qDebug("[%s] Remote desktop: %ix%ix%i", t->metaObject()->className(), + width, height, depth); + + if (t->_frameBuffer) + delete[] t->_frameBuffer; + + t->_frameBuffer = new uint8_t[size]; + client->frameBuffer = t->_frameBuffer; + memset(client->frameBuffer, '\0', size); + client->format.bitsPerPixel = 32; + client->format.redShift = 16; + client->format.greenShift = 8; + client->format.blueShift = 0; + client->format.redMax = 0xff; + client->format.greenMax = 0xff; + client->format.blueMax = 0xff; + + const int quality = t->_quality; + switch (quality) + { + case VNCClientThread::HIGH: + client->appData.useBGR233 = 0; + client->appData.encodingsString = "copyrect hextile raw"; + client->appData.compressLevel = 0; + client->appData.qualityLevel = 9; + client->appData.scaleSetting = 10; // FIXME: Doesn't work + break; + case VNCClientThread::MEDIUM: + client->appData.useBGR233 = 0; + client->appData.encodingsString + = "tight zrle ultra copyrect hextile zlib corre rre raw"; + client->appData.compressLevel = 5; + client->appData.qualityLevel = 7; + client->appData.scaleSetting = 10; + break; + case VNCClientThread::LOW: + default: + client->appData.useBGR233 = 1; + client->appData.encodingsString + = "tight zrle ultra copyrect hextile zlib corre rre raw"; + client->appData.compressLevel = 9; + client->appData.qualityLevel = 1; + client->appData.scaleSetting = 10; + break; + } + SetFormatAndEncodings(client); + + t->_clientSize = QSize(width, height); + + // If something stops working with VNC images/updates, move these two + // commands back tp updateImage + const QImage img = QImage(client->frameBuffer, client->width, + client->height, QImage::Format_RGB32); + t->_img = img; + // <> + + return true; +} + +void VNCClientThread::updateImage(rfbClient* client, int x, int y, int w, int h) +{ + VNCClientThread* t = (VNCClientThread*) rfbClientGetClientData(client, 0); + emit t->imageUpdated(x, y, w, h); +} + +/* rfbClient* VNCClientThread::getRfbClient(){ + return _client; +}*/ + +SomeEvent::~SomeEvent() +{ +} + +void PointerEvent::fire(rfbClient* cl) +{ + SendPointerEvent(cl, _x, _y, _buttonMask); +} + +void KeyEvent::fire(rfbClient* cl) +{ + SendKeyEvent(cl, _key, _pressed); +} + +void VNCClientThread::mouseEvent(int x, int y, int buttonMask) +{ + //QMutexLocker lock(&mutex); + if (terminate) + return; + + _eventQueue.enqueue(new PointerEvent(x, y, buttonMask)); +} + +void VNCClientThread::keyEvent(int key, bool pressed) +{ + //QMutexLocker lock(&mutex); + if (terminate) + return; + + _eventQueue.enqueue(new KeyEvent(key, pressed)); +} diff --git a/src/util/vncClientThread.h b/src/util/vncClientThread.h new file mode 100644 index 0000000..10980b8 --- /dev/null +++ b/src/util/vncClientThread.h @@ -0,0 +1,114 @@ +/* + # Copyright (c) 2009, 2010 - OpenSLX Project, Computer Center University of + # Freiburg + # + # This program is free software distributed under the GPL version 2. + # See http://openslx.org/COPYING + # + # If you have any feedback please consult http://openslx.org/feedback and + # send your suggestions, praise, or complaints to feedback@openslx.org + # + # General information about OpenSLX can be found at http://openslx.org/ + */ + +#ifndef VNCCLIENTTHREAD_H_ +#define VNCCLIENTTHREAD_H_ + +#include <QtCore> +#include <QtGui/QImage> + +extern "C" +{ +#include <rfb/rfbclient.h> +} + +class SomeEvent +{ +public: + virtual ~SomeEvent(); + + virtual void fire(rfbClient*) = 0; +}; + +class KeyEvent : public SomeEvent +{ +public: + KeyEvent(int key, int pressed) + : _key(key), _pressed(pressed) {} + + void fire(rfbClient*); + +private: + int _key; + int _pressed; +}; + +class PointerEvent : public SomeEvent +{ +public: + PointerEvent(int x, int y, int buttonMask) + : _x(x), _y(y), _buttonMask(buttonMask) {} + + void fire(rfbClient*); + +private: + int _x; + int _y; + int _buttonMask; +}; + +class VNCClientThread: public QThread +{ + Q_OBJECT + +public: + VNCClientThread(QString host, int port, QString passwd, int quality, int updatefreq = 0); + ~VNCClientThread(); + + void run(); + QImage getImage(); + QSize getSize(); + int getUpdatefreq(); + void setUpdatefreq(int updatefreq); + QString getDesktopName(); + void mouseEvent(int x, int y, int buttonMask); + void keyEvent(int key, bool pressed); + bool isConnected() + { + return _connected; + } + + + static void updateImage(rfbClient *client, int x, int y, int w, int h); + static char* passwdHandler(rfbClient *client); + static rfbBool frameBufferHandler(rfbClient *client); + //rfbClient* getRfbClient(); + + bool terminate; + + int const static HIGH = 0; + int const static MEDIUM = 1; + int const static LOW = 2; + +Q_SIGNALS: + void imageUpdated(int x, int y, int w, int h); + +private: + rfbClient *_client; + uint8_t *_frameBuffer; + + QString _host; + int _port; + QString _passwd; + int _quality; + int _updatefreq; + QQueue<SomeEvent* > _eventQueue; + + QImage _img; + QSize _clientSize; + + bool _connected; + +}; + +#endif /* VNCCLIENTTHREAD_H_ */ diff --git a/src/version.h b/src/version.h new file mode 100644 index 0000000..c217c07 --- /dev/null +++ b/src/version.h @@ -0,0 +1,2 @@ +#define VERSION_STRING "1.9.8.0" +#define VERSION_NUMBER 1980 diff --git a/startdialog.qrc b/startdialog.qrc new file mode 100644 index 0000000..cf5a6ec --- /dev/null +++ b/startdialog.qrc @@ -0,0 +1,6 @@ +<RCC> + <qresource> + <file>icons/touch.jpg</file> + <file>icons/keyboard.jpg</file> + </qresource> +</RCC> |
