diff options
| -rw-r--r-- | AUTHORS | 11 | ||||
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | TRANSLATION | 4 | ||||
| -rw-r--r-- | src/pvsgui.cpp | 37 | ||||
| -rw-r--r-- | src/version.h | 4 |
5 files changed, 30 insertions, 30 deletions
@@ -2,19 +2,20 @@ Initial design and first versions: Simon Wittenberg <wittenb@informatik.uni-freiburg.de> Involved team members at the moment: +Fabian Schillinger <schillif@informatik.uni-freiburg.de> +Johann Latocha <johann@latocha.de> +Sébastien Braun <sebb@yellowhippy.org> + +Credits of left team members: 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 +Johann Latocha <johann@latocha.de>
\ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index cc695ce..a78e1ab 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -445,8 +445,8 @@ SET( CPACK_GENERATOR "DEB;RPM" ) SET( CPACK_SET_DESTDIR "ON" ) SET( CPACK_PACKAGE_NAME "pvs" ) SET( CPACK_PACKAGE_VERSION_MAJOR "2" ) -SET( CPACK_PACKAGE_VERSION_MINOR "0" ) -SET( CPACK_PACKAGE_VERSION_PATCH "3" ) +SET( CPACK_PACKAGE_VERSION_MINOR "8" ) +SET( CPACK_PACKAGE_VERSION_PATCH "0" ) SET( CPACK_PACKAGE_DESCRIPTION_SUMMARY "Pool Video Switch" ) SET( CPACK_PACKAGE_DESCRIPTION "") SET( CPACK_PACKAGE_CONTACT "Simon Wittenberg <wittenb@informatik.uni-freiburg.de>" ) diff --git a/TRANSLATION b/TRANSLATION index 74a10cb..1d04f06 100644 --- a/TRANSLATION +++ b/TRANSLATION @@ -1,4 +1,2 @@ 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 +Johann Latocha <johann@latocha.de>
\ No newline at end of file diff --git a/src/pvsgui.cpp b/src/pvsgui.cpp index eb1383b..1520c81 100644 --- a/src/pvsgui.cpp +++ b/src/pvsgui.cpp @@ -450,24 +450,6 @@ void printVersion() int main(int argc, char *argv[]) { - QtSingleApplication app(argc, argv); - app.setQuitOnLastWindowClosed(false); - app.setOrganizationName("openslx"); - app.setOrganizationDomain("openslx.org"); - app.setApplicationName("pvsgui"); - - // only one instance should be allowed - if (app.sendMessage("")) - { - qDebug("[PVSGUI] ERROR: Already running. Exiting"); - return 0; - } - - // use system locale as language to translate gui - QTranslator translator; - translator.load(":pvsgui"); - app.installTranslator(&translator); - bool visible = false; int position = -1; @@ -506,6 +488,25 @@ int main(int argc, char *argv[]) opt = getopt_long( argc, argv, optString, longOpts, &longIndex ); } + + QtSingleApplication app(argc, argv); + app.setQuitOnLastWindowClosed(false); + app.setOrganizationName("openslx"); + app.setOrganizationDomain("openslx.org"); + app.setApplicationName("pvsgui"); + + // only one instance should be allowed + if (app.sendMessage("")) + { + qDebug("[PVSGUI] ERROR: Already running. Exiting"); + return 0; + } + + // use system locale as language to translate gui + QTranslator translator; + translator.load(":pvsgui"); + app.installTranslator(&translator); + PVSGUI pvsgui; pvsgui.setPosition(position); pvsgui.setVisible(visible); diff --git a/src/version.h b/src/version.h index de5c6aa..a08c819 100644 --- a/src/version.h +++ b/src/version.h @@ -1,2 +1,2 @@ -#define VERSION_STRING "2.0.5" -#define VERSION_NUMBER 205 +#define VERSION_STRING "2.8.0" +#define VERSION_NUMBER 280 |