diff --git a/graphics/VP1/VP1Gui/CMakeLists.txt b/graphics/VP1/VP1Gui/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..c2b5f7ffa4783fbe14d5da5286b14d521e5da28b
--- /dev/null
+++ b/graphics/VP1/VP1Gui/CMakeLists.txt
@@ -0,0 +1,41 @@
+################################################################################
+# Package: VP1Gui
+################################################################################
+# Author: Thomas Kittelmann <Thomas.Kittelmann@cern.ch>
+# Author: Riccardo Maria BIANCHI <rbianchi@cern.ch>
+################################################################################
+
+# Declare the package name:
+atlas_subdir( VP1Gui )
+
+# Declare the package's dependencies:
+atlas_depends_on_subdirs(
+ PUBLIC graphics/VP1/VP1Base
+ PRIVATE graphics/VP1/VP1UtilsBase )
+
+# External dependencies:
+find_package( Coin3D )
+find_package( Qt4 COMPONENTS QtCore QtOpenGL QtGui QtWebKit QtNetwork )
+find_package( SoQt )
+
+# Generate UI files automatically:
+set( CMAKE_AUTOUIC TRUE )
+# Generate MOC files automatically:
+set( CMAKE_AUTOMOC TRUE )
+# Generate resource files automatically:
+set( CMAKE_AUTORCC TRUE )
+
+# Component(s) in the package:
+atlas_add_library( VP1Gui VP1Gui/*.h src/*.h src/*.cxx src/*.qrc
+ PUBLIC_HEADERS VP1Gui
+ PRIVATE_INCLUDE_DIRS ${COIN3D_INCLUDE_DIRS} ${SOQT_INCLUDE_DIRS}
+ ${CMAKE_CURRENT_BINARY_DIR}
+ LINK_LIBRARIES VP1Base Qt4::QtCore Qt4::QtOpenGL Qt4::QtGui Qt4::QtWebKit
+ Qt4::QtNetwork
+ PRIVATE_LINK_LIBRARIES ${COIN3D_LIBRARIES} ${SOQT_LIBRARIES} VP1UtilsBase )
+
+
+# Install files from the package:
+##atlas_install_scripts( share/* ) # installs into bin/
+atlas_install_runtime( share/* ) # install into share/
+
\ No newline at end of file
diff --git a/graphics/VP1/VP1Gui/VP1Gui/VP1Authenticator.h b/graphics/VP1/VP1Gui/VP1Gui/VP1Authenticator.h
index 95a69baa94d263b51f8240111061f13213fb1390..13d7241d5d9e0f56cad33d7471ebf0b451073545 100644
--- a/graphics/VP1/VP1Gui/VP1Gui/VP1Authenticator.h
+++ b/graphics/VP1/VP1Gui/VP1Gui/VP1Authenticator.h
@@ -16,7 +16,7 @@
#include <QtCore/QObject>
#include <QtGui/QDialog>
-#include "ui_vp1authentication.h"
+#include "ui_vp1authenticator.h"
#include <QtNetwork/QNetworkReply>
class QNetworkAccessManager;
diff --git a/graphics/VP1/VP1Gui/VP1Gui/VP1ChannelManager.h b/graphics/VP1/VP1Gui/VP1Gui/VP1ChannelManager.h
old mode 100755
new mode 100644
diff --git a/graphics/VP1/VP1Gui/VP1Gui/VP1DockWidget.h b/graphics/VP1/VP1Gui/VP1Gui/VP1DockWidget.h
old mode 100755
new mode 100644
diff --git a/graphics/VP1/VP1Gui/VP1Gui/VP1ExecutionScheduler.h b/graphics/VP1/VP1Gui/VP1Gui/VP1ExecutionScheduler.h
old mode 100755
new mode 100644
diff --git a/graphics/VP1/VP1Gui/VP1Gui/VP1Gui.h b/graphics/VP1/VP1Gui/VP1Gui/VP1Gui.h
old mode 100755
new mode 100644
diff --git a/graphics/VP1/VP1Gui/VP1Gui/VP1IncomingMessageDialog.h b/graphics/VP1/VP1Gui/VP1Gui/VP1IncomingMessageDialog.h
old mode 100755
new mode 100644
diff --git a/graphics/VP1/VP1Gui/VP1Gui/VP1MainWindow.h b/graphics/VP1/VP1Gui/VP1Gui/VP1MainWindow.h
old mode 100755
new mode 100644
diff --git a/graphics/VP1/VP1Gui/VP1Gui/VP1PluginDialog.h b/graphics/VP1/VP1Gui/VP1Gui/VP1PluginDialog.h
old mode 100755
new mode 100644
diff --git a/graphics/VP1/VP1Gui/VP1Gui/VP1Prioritiser.h b/graphics/VP1/VP1Gui/VP1Gui/VP1Prioritiser.h
old mode 100755
new mode 100644
diff --git a/graphics/VP1/VP1Gui/VP1Gui/VP1TabManager.h b/graphics/VP1/VP1Gui/VP1Gui/VP1TabManager.h
old mode 100755
new mode 100644
diff --git a/graphics/VP1/VP1Gui/VP1Gui/VP1TcpServer.h b/graphics/VP1/VP1Gui/VP1Gui/VP1TcpServer.h
old mode 100755
new mode 100644
diff --git a/graphics/VP1/VP1Gui/VP1Gui/VP1TextBrowser.h b/graphics/VP1/VP1Gui/VP1Gui/VP1TextBrowser.h
old mode 100755
new mode 100644
diff --git a/graphics/VP1/VP1Gui/src/vp1authentication.ui b/graphics/VP1/VP1Gui/VP1Gui/vp1authenticator.ui
similarity index 100%
rename from graphics/VP1/VP1Gui/src/vp1authentication.ui
rename to graphics/VP1/VP1Gui/VP1Gui/vp1authenticator.ui
diff --git a/graphics/VP1/VP1Gui/VP1Gui/vp1mainwindow.ui b/graphics/VP1/VP1Gui/VP1Gui/vp1mainwindow.ui
new file mode 100644
index 0000000000000000000000000000000000000000..16e2408a78516bc715e3f500c5f5ed8b5dd49ddd
--- /dev/null
+++ b/graphics/VP1/VP1Gui/VP1Gui/vp1mainwindow.ui
@@ -0,0 +1,853 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>VP1MainWindow</class>
+ <widget class="QMainWindow" name="VP1MainWindow">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>1002</width>
+ <height>650</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>Virtual Point 1</string>
+ </property>
+ <property name="windowIcon">
+ <iconset resource="vp1.qrc">
+ <normaloff>:/vp1/icons/icons/3d_32x32.png</normaloff>:/vp1/icons/icons/3d_32x32.png</iconset>
+ </property>
+ <widget class="QWidget" name="centralwidget">
+ <layout class="QVBoxLayout">
+ <property name="leftMargin">
+ <number>6</number>
+ </property>
+ <property name="topMargin">
+ <number>5</number>
+ </property>
+ <property name="rightMargin">
+ <number>7</number>
+ </property>
+ <property name="bottomMargin">
+ <number>0</number>
+ </property>
+ <item>
+ <widget class="QSplitter" name="splitter_leftright">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <widget class="QWidget" name="widget_controlsContainer" native="true">
+ <layout class="QVBoxLayout">
+ <property name="spacing">
+ <number>4</number>
+ </property>
+ <property name="leftMargin">
+ <number>0</number>
+ </property>
+ <property name="topMargin">
+ <number>3</number>
+ </property>
+ <property name="rightMargin">
+ <number>0</number>
+ </property>
+ <property name="bottomMargin">
+ <number>0</number>
+ </property>
+ <item>
+ <widget class="QGroupBox" name="groupBox_channelcontrols">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="title">
+ <string>Controls - No channel selected</string>
+ </property>
+ <layout class="QVBoxLayout">
+ <property name="spacing">
+ <number>6</number>
+ </property>
+ <property name="margin">
+ <number>4</number>
+ </property>
+ <item>
+ <layout class="QHBoxLayout">
+ <property name="spacing">
+ <number>6</number>
+ </property>
+ <property name="margin">
+ <number>0</number>
+ </property>
+ <item>
+ <widget class="QPushButton" name="pushButton_channelfullscreen">
+ <property name="toolTip">
+ <string>Show current channel fullscreen</string>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ <property name="icon">
+ <iconset resource="vp1.qrc">
+ <normaloff>:/vp1/icons/icons/window_fullscreen_32x32.png</normaloff>:/vp1/icons/icons/window_fullscreen_32x32.png</iconset>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="pushButton_channelinformation">
+ <property name="text">
+ <string/>
+ </property>
+ <property name="icon">
+ <iconset resource="vp1.qrc">
+ <normaloff>:/vp1/icons/icons/info_32x32.png</normaloff>:/vp1/icons/icons/info_32x32.png</iconset>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>1</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QPushButton" name="pushButton_printchannel">
+ <property name="toolTip">
+ <string>Print channel snapshot</string>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ <property name="icon">
+ <iconset resource="vp1.qrc">
+ <normaloff>:/vp1/icons/icons/fileprint_32x32.png</normaloff>:/vp1/icons/icons/fileprint_32x32.png</iconset>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="pushButton_savesnapshotchannel">
+ <property name="toolTip">
+ <string>Save channel snapshot to image file</string>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ <property name="icon">
+ <iconset resource="vp1.qrc">
+ <normaloff>:/vp1/icons/icons/camera.png</normaloff>:/vp1/icons/icons/camera.png</iconset>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="pushButton_saveAllChannels">
+ <property name="toolTip">
+ <string>Save all tabs/channels as images in different files</string>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ <property name="icon">
+ <iconset resource="vp1.qrc">
+ <normaloff>:/vp1/icons/icons/window_list_32x32.png</normaloff>:/vp1/icons/icons/window_list_32x32.png</iconset>
+ </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>
+ <item>
+ <widget class="QPushButton" name="pushButton_makeEventDisplay">
+ <property name="toolTip">
+ <string>Combine current tabs/channels into a single event display</string>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ <property name="icon">
+ <iconset resource="vp1.qrc">
+ <normaloff>:/vp1/icons/icons/event_display_32x32.png</normaloff>:/vp1/icons/icons/event_display_32x32.png</iconset>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="pushButton_3D">
+ <property name="toolTip">
+ <string>Open the 3D Stereo tools</string>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ <property name="icon">
+ <iconset resource="vp1.qrc">
+ <normaloff>:/vp1/icons/icons/3D_mode_24x24.png</normaloff>:/vp1/icons/icons/3D_mode_24x24.png</iconset>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="Line" name="line">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QStackedWidget" name="stackedWidget_customcontrols">
+ <widget class="QWidget" name="page"/>
+ <widget class="QWidget" name="page_2"/>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <widget class="QGroupBox" name="groupBox_cruise">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="title">
+ <string>Cruise Mode [off]</string>
+ </property>
+ <layout class="QHBoxLayout">
+ <item>
+ <layout class="QHBoxLayout">
+ <property name="spacing">
+ <number>0</number>
+ </property>
+ <item>
+ <widget class="QRadioButton" name="radioButton_cruise_event">
+ <property name="text">
+ <string>Evt</string>
+ </property>
+ <property name="checked">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QRadioButton" name="radioButton_cruise_tab">
+ <property name="text">
+ <string>Tab</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QRadioButton" name="radioButton_cruise_both">
+ <property name="text">
+ <string>Both</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <spacer>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>1</width>
+ <height>10</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <widget class="QGroupBox" name="groupBox_event">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="title">
+ <string>Event [No event loaded]</string>
+ </property>
+ <layout class="QHBoxLayout">
+ <property name="spacing">
+ <number>6</number>
+ </property>
+ <property name="margin">
+ <number>4</number>
+ </property>
+ <item>
+ <widget class="QPushButton" name="pushButton_eventseek">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="text">
+ <string>Seek</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QSpinBox" name="spinBox_cruise">
+ <property name="alignment">
+ <set>Qt::AlignRight</set>
+ </property>
+ <property name="suffix">
+ <string> s</string>
+ </property>
+ <property name="minimum">
+ <number>1</number>
+ </property>
+ <property name="maximum">
+ <number>999</number>
+ </property>
+ <property name="value">
+ <number>10</number>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="pushButton_cruise">
+ <property name="focusPolicy">
+ <enum>Qt::NoFocus</enum>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ <property name="icon">
+ <iconset resource="vp1.qrc">
+ <normaloff>:/vp1/icons/icons/redo_32x32.png</normaloff>:/vp1/icons/icons/redo_32x32.png</iconset>
+ </property>
+ <property name="checkable">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="pushButton_nextevent">
+ <property name="toolTip">
+ <string>Proceed to next event [Ctrl-N]</string>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ <property name="icon">
+ <iconset resource="vp1.qrc">
+ <normaloff>:/vp1/icons/icons/forward_32x32.png</normaloff>:/vp1/icons/icons/forward_32x32.png</iconset>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer>
+ <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>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <widget class="QSplitter" name="splitter_tabwidget_messagebox">
+ <property name="frameShape">
+ <enum>QFrame::NoFrame</enum>
+ </property>
+ <property name="lineWidth">
+ <number>0</number>
+ </property>
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <widget class="QStackedWidget" name="stackedWidget_central">
+ <property name="frameShape">
+ <enum>QFrame::NoFrame</enum>
+ </property>
+ <property name="lineWidth">
+ <number>0</number>
+ </property>
+ <property name="currentIndex">
+ <number>1</number>
+ </property>
+ <widget class="QWidget" name="page_tabwidget">
+ <layout class="QVBoxLayout">
+ <item>
+ <widget class="VP1TabWidget" name="tabWidget_central">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Ignored" vsizetype="Ignored">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>200</width>
+ <height>200</height>
+ </size>
+ </property>
+ <property name="currentIndex">
+ <number>-1</number>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <widget class="QWidget" name="page_instructions">
+ <layout class="QVBoxLayout">
+ <item>
+ <widget class="QFrame" name="frame_instructions">
+ <property name="frameShape">
+ <enum>QFrame::StyledPanel</enum>
+ </property>
+ <property name="frameShadow">
+ <enum>QFrame::Raised</enum>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout_2">
+ <property name="spacing">
+ <number>0</number>
+ </property>
+ <item>
+ <spacer name="verticalSpacer_2">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>1</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <property name="spacing">
+ <number>0</number>
+ </property>
+ <item>
+ <spacer name="horizontalSpacer">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Expanding</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>1</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <property name="spacing">
+ <number>13</number>
+ </property>
+ <item>
+ <widget class="QLabel" name="label">
+ <property name="maximumSize">
+ <size>
+ <width>500</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <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:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;">
+<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:14pt; font-weight:600; font-style:italic;">Welcome to Virtual Point 1</span></p>
+<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:11pt; font-weight:600; font-style:italic;"> </span><a href="[http://cern.ch/atlas-vp1]"><span style=" text-decoration: underline; color:#0000ff;">[http://cern.ch/atlas-vp1]</span></a></p>
+<p align="center" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p>
+<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">VP1 is now uses plugins to process and present the data and</p>
+<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">detector information which is available in the ATHENA process it runs on top of.</p>
+<p align="center" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p>
+<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Most users should proceed by selecting one of these modes:</p></body></html></string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <property name="spacing">
+ <number>0</number>
+ </property>
+ <item>
+ <spacer>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Expanding</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>1</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <layout class="QGridLayout" name="gridLayout">
+ <property name="spacing">
+ <number>2</number>
+ </property>
+ <item row="0" column="0" colspan="3">
+ <widget class="QPushButton" name="pushButton_quicksetup_3dcocktail">
+ <property name="toolTip">
+ <string>Launch the VP13DCocktailPlugin within a new tab</string>
+ </property>
+ <property name="text">
+ <string>All studies</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QPushButton" name="pushButton_quicksetup_trackingstudies">
+ <property name="toolTip">
+ <string>Launch the VP1TrackPlugin within a new tab</string>
+ </property>
+ <property name="text">
+ <string>Tracking only studies</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QPushButton" name="pushButton_quicksetup_calostudies">
+ <property name="toolTip">
+ <string>Launch the VP1CaloPlugin within a new tab</string>
+ </property>
+ <property name="text">
+ <string>Calo only studies</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="2">
+ <widget class="QPushButton" name="pushButton_quicksetup_geometrystudies">
+ <property name="toolTip">
+ <string>Launch the VP1GeometryPlugin within a new tab</string>
+ </property>
+ <property name="text">
+ <string>Geometry studies</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0" colspan="3">
+ <widget class="QPushButton" name="pushButton_quicksetup_analysisstudies">
+ <property name="toolTip">
+ <string><html><head/><body><p>Launch the Analysis Object (AOD) plugin within a new tab.</p></body></html></string>
+ </property>
+ <property name="text">
+ <string>Analysis Object (AOD) only studies</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <spacer>
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Expanding</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>1</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="QLabel" name="label_2">
+ <property name="maximumSize">
+ <size>
+ <width>500</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <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:'Sans'; font-size:10pt; font-weight:400; font-style:normal;">
+<table border="0" style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;">
+<tr>
+<td style="border: none;">
+<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans Serif'; font-size:9pt;">Advanced users might wish to take full advantage of the flexible configuration</span></p>
+<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans Serif'; font-size:9pt;">capabilities of VP1 by loading and configuring plugins via the &quot;Quick Launch&quot;</span></p>
+<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans Serif'; font-size:9pt;">and &quot;Configuration&quot; menus, and by right-clicking tabs.</span></p>
+<p align="center" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;"></p>
+<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans Serif'; font-size:9pt;">Note that it is possible </span></p>
+<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans Serif'; font-size:9pt;">to save and load configurations </span></p>
+<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans Serif'; font-size:9pt;">from the &quot;Configuration&quot; menu.</span></p></td></tr></table></body></html></string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_2">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Expanding</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>1</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <spacer name="verticalSpacer">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>1</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </widget>
+ <widget class="VP1TextBrowser" name="textBrowser_channelmessages">
+ <property name="toolTip">
+ <string>Message box. Displays messages from channels and systems.</string>
+ </property>
+ <property name="html">
+ <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:'Sans'; font-size:10pt; font-weight:400; font-style:normal;">
+<table border="0" style="-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;">
+<tr>
+<td style="border: none;">
+<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;"><br /></p>
+<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;"><br /></p>
+<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p>
+<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p>
+<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p>
+<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p>
+<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p>
+<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p>
+<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;"><br /></p></td></tr></table></body></html></string>
+ </property>
+ <property name="textInteractionFlags">
+ <set>Qt::TextSelectableByMouse</set>
+ </property>
+ </widget>
+ </widget>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <widget class="QMenuBar" name="menubar">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>1002</width>
+ <height>25</height>
+ </rect>
+ </property>
+ <widget class="QMenu" name="menuConfiguration">
+ <property name="title">
+ <string>&Configuration</string>
+ </property>
+ <addaction name="separator"/>
+ </widget>
+ <widget class="QMenu" name="menu_Style">
+ <property name="title">
+ <string>&Style</string>
+ </property>
+ </widget>
+ <widget class="QMenu" name="menuQuick_Launch">
+ <property name="title">
+ <string>&Quick Launch</string>
+ </property>
+ <addaction name="action_quicklaunch_3dcocktail"/>
+ <addaction name="action_quicklaunch_Tracking_studies"/>
+ <addaction name="action_quicklaunch_Calo_studies"/>
+ <addaction name="action_quicklaunch_Geometry_studies"/>
+ <addaction name="action_quicklaunch_trackcalo_commis"/>
+ <addaction name="action_quicklaunch_Storegate_browser"/>
+ <addaction name="separator"/>
+ <addaction name="action_exit_VP1"/>
+ </widget>
+ <addaction name="menuQuick_Launch"/>
+ <addaction name="menuConfiguration"/>
+ <addaction name="menu_Style"/>
+ </widget>
+ <widget class="QStatusBar" name="statusbar"/>
+ <action name="actionLoad_plugin">
+ <property name="text">
+ <string>Load plugin</string>
+ </property>
+ </action>
+ <action name="actionAdd_empty_tab2">
+ <property name="text">
+ <string>&Add empty tab</string>
+ </property>
+ </action>
+ <action name="actionInfo_about_loaded_plugins">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="text">
+ <string>&Info about loaded plugins</string>
+ </property>
+ </action>
+ <action name="actionLaunch_config_dialog">
+ <property name="text">
+ <string>Launch &config dialog</string>
+ </property>
+ </action>
+ <action name="actionLoad_tab_configuration_from_file">
+ <property name="text">
+ <string>&Load tab configuration from file</string>
+ </property>
+ </action>
+ <action name="actionSave_current_tabs2">
+ <property name="text">
+ <string>&Save current tab configuration to file</string>
+ </property>
+ </action>
+ <action name="actionDummyLoadPlugSubMenu">
+ <property name="text">
+ <string>DummyLoadPlugSubMenu</string>
+ </property>
+ </action>
+ <action name="actionLoad_Plugin">
+ <property name="text">
+ <string>Load Plugin</string>
+ </property>
+ </action>
+ <action name="action_quicklaunch_Tracking_studies">
+ <property name="text">
+ <string>&Tracking only studies</string>
+ </property>
+ <property name="statusTip">
+ <string>Launch a tab with a track channel</string>
+ </property>
+ </action>
+ <action name="action_quicklaunch_Calo_studies">
+ <property name="text">
+ <string>&Calo only studies</string>
+ </property>
+ <property name="statusTip">
+ <string>Launch a tab with a calo cells channel</string>
+ </property>
+ </action>
+ <action name="action_quicklaunch_Geometry_studies">
+ <property name="text">
+ <string>&Geometry studies</string>
+ </property>
+ <property name="statusTip">
+ <string>Launch a tab with a geometry channel</string>
+ </property>
+ </action>
+ <action name="action_exit_VP1">
+ <property name="text">
+ <string>E&xit VP1</string>
+ </property>
+ <property name="statusTip">
+ <string>Close down VP1</string>
+ </property>
+ </action>
+ <action name="action_quicklaunch_Storegate_browser">
+ <property name="text">
+ <string>&Storegate browser</string>
+ </property>
+ <property name="statusTip">
+ <string>Launch a tab with a banks channel</string>
+ </property>
+ </action>
+ <action name="action_quicklaunch_3dcocktail">
+ <property name="text">
+ <string>&All studies (3D cocktail)</string>
+ </property>
+ </action>
+ <action name="action_quicklaunch_trackcalo_commis">
+ <property name="text">
+ <string>T&rack/Calo commis. studies</string>
+ </property>
+ </action>
+ <action name="action_file_Add_event_file">
+ <property name="text">
+ <string>&Add event file ...</string>
+ </property>
+ </action>
+ </widget>
+ <customwidgets>
+ <customwidget>
+ <class>VP1TabWidget</class>
+ <extends>QTabWidget</extends>
+ <header>VP1Base/VP1TabWidget.h</header>
+ <container>1</container>
+ </customwidget>
+ <customwidget>
+ <class>VP1TextBrowser</class>
+ <extends>QTextBrowser</extends>
+ <header>VP1Gui/VP1TextBrowser.h</header>
+ </customwidget>
+ </customwidgets>
+ <tabstops>
+ <tabstop>pushButton_channelfullscreen</tabstop>
+ <tabstop>pushButton_channelinformation</tabstop>
+ <tabstop>radioButton_cruise_event</tabstop>
+ <tabstop>radioButton_cruise_tab</tabstop>
+ <tabstop>radioButton_cruise_both</tabstop>
+ <tabstop>spinBox_cruise</tabstop>
+ <tabstop>pushButton_nextevent</tabstop>
+ <tabstop>pushButton_eventseek</tabstop>
+ <tabstop>tabWidget_central</tabstop>
+ <tabstop>textBrowser_channelmessages</tabstop>
+ </tabstops>
+ <resources>
+ <include location="vp1.qrc"/>
+ </resources>
+ <connections/>
+</ui>
diff --git a/graphics/VP1/VP1Gui/cmt/requirements b/graphics/VP1/VP1Gui/cmt/requirements
old mode 100755
new mode 100644
index a713da1afa6e65b59e6ab60ddf15b64f7913ed3e..891025ff05b68e10f66a1fa27f93cd86bfa50198
--- a/graphics/VP1/VP1Gui/cmt/requirements
+++ b/graphics/VP1/VP1Gui/cmt/requirements
@@ -1,8 +1,10 @@
package VP1Gui
author Thomas Kittelmann <Thomas.Kittelmann@cern.ch>
+author Riccardo Maria BIANCHI <rbianchi@cern.ch>
manager Riccardo Maria BIANCHI <rbianchi@cern.ch>
+
public
use AtlasPolicy AtlasPolicy-*
use VP1Base VP1Base-* graphics/VP1
@@ -24,6 +26,7 @@ macro_remove cppflags "-pedantic" # pedantic makes GCC complain about a non C89
public
apply_pattern qt4based_library
-
+# install to InstallArea the ATLAS logo image stored in share/
+apply_pattern declare_runtime_extras extras="ATLAS-Logo-New_300pixels.png" ;
diff --git a/graphics/VP1/VP1Gui/share/ATLAS-Logo-New_300pixels.png b/graphics/VP1/VP1Gui/share/ATLAS-Logo-New_300pixels.png
new file mode 100644
index 0000000000000000000000000000000000000000..04f5d2fe22cd907316457b671645c22a133f1537
Binary files /dev/null and b/graphics/VP1/VP1Gui/share/ATLAS-Logo-New_300pixels.png differ
diff --git a/graphics/VP1/VP1Gui/src/VP1ChannelManager.cxx b/graphics/VP1/VP1Gui/src/VP1ChannelManager.cxx
old mode 100755
new mode 100644
diff --git a/graphics/VP1/VP1Gui/src/VP1DockWidget.cxx b/graphics/VP1/VP1Gui/src/VP1DockWidget.cxx
old mode 100755
new mode 100644
diff --git a/graphics/VP1/VP1Gui/src/VP1EventDisplayEditor.cxx b/graphics/VP1/VP1Gui/src/VP1EventDisplayEditor.cxx
index 9013acf3ffe28f5322d0208bf443c9b7e0007a7c..e2d4176a16a8ed987f0c0df04ea75646f891b1f7 100644
--- a/graphics/VP1/VP1Gui/src/VP1EventDisplayEditor.cxx
+++ b/graphics/VP1/VP1Gui/src/VP1EventDisplayEditor.cxx
@@ -15,7 +15,7 @@
////////////////////////////////////////////////////////////////
#include "VP1Gui/VP1EventDisplayEditor.h"
-#include "ui_vp1eventdisplaywidget.h"
+#include "ui_vp1eventdisplayeditor.h"
#include "VP1Base/VP1ExaminerViewer.h"
#include "VP1Base/VP1QtInventorUtils.h"
diff --git a/graphics/VP1/VP1Gui/src/VP1ExecutionScheduler.cxx b/graphics/VP1/VP1Gui/src/VP1ExecutionScheduler.cxx
old mode 100755
new mode 100644
index 1ab4a1680f33fb9f781825638dc15bd04d1989e4..477b7cfe8dd7636e9cd37f4eea4fd4ba0c7ad0d0
--- a/graphics/VP1/VP1Gui/src/VP1ExecutionScheduler.cxx
+++ b/graphics/VP1/VP1Gui/src/VP1ExecutionScheduler.cxx
@@ -66,6 +66,7 @@
#include <QtCore/QSet>
#include <QtGui/QMessageBox>
+#include <Inventor/C/errors/debugerror.h>
#include <Inventor/Qt/SoQt.h>
#include <set>
@@ -73,6 +74,8 @@
#include <iostream> //For "widgetcount" output
#include <sstream> // std::ostringstream
#include <ctime>
+#include <stdexcept>
+
//___________________________________________________________________
class VP1ExecutionScheduler::Imp {
@@ -772,8 +775,16 @@ QString VP1ExecutionScheduler::saveSnaphsotToFile(IVP1System* s, bool batch)
// A FOLDER CONTAINER
+ QString folderName = "";
- QString folderName = "vp1_batch_images";
+ // check if use specified an output folder for the batch job
+ QString batchOutFolder = VP1QtUtils::environmentVariableValue("VP1_BATCHMODE_OUT_FOLDER"); // ::getenv("VP1_BATCHMODE");
+ if ( ! (batchOutFolder == "") ) {
+ VP1Msg::messageDebug("Setting 'batch' output folder from user's settings");
+ folderName = batchOutFolder;
+ }
+ else
+ folderName = "atlas_vp1_batch_images";
// check if the folder already exists, if not make a new folder
QDir dir(folderName);
@@ -781,8 +792,9 @@ QString VP1ExecutionScheduler::saveSnaphsotToFile(IVP1System* s, bool batch)
dir.mkpath(".");
}
- QString folder = currentsaveimagepath + QDir::separator() + folderName + QDir::separator();
+ QString folder = currentsaveimagepath + folderName + QDir::separator();
+ VP1Msg::messageDebug("folder set.");
// EVENT INFO AND TIMESTAMP
@@ -848,6 +860,17 @@ QString VP1ExecutionScheduler::saveSnaphsotToFile(IVP1System* s, bool batch)
// saving to file
pm.save(filename);
+ // save last-saved image filename to working dir
+ QString latestImageFileName = currentsaveimagepath + QString("latest_vp1image");
+ QFile latestImage(latestImageFileName);
+ if(latestImage.exists() && !latestImage.remove())
+ throw std::runtime_error("Unable to overwrite the existing latest image file");
+ if(!latestImage.open(QIODevice::WriteOnly | QIODevice::Text))
+ throw std::runtime_error("Unable to create new latest image file");
+ latestImage.write(filename.toStdString().c_str());
+ latestImage.close();
+
+
return filename;
}
diff --git a/graphics/VP1/VP1Gui/src/VP1Gui.cxx b/graphics/VP1/VP1Gui/src/VP1Gui.cxx
old mode 100755
new mode 100644
diff --git a/graphics/VP1/VP1Gui/src/VP1IncomingMessageDialog.cxx b/graphics/VP1/VP1Gui/src/VP1IncomingMessageDialog.cxx
old mode 100755
new mode 100644
index 16b4429a9820cacae79fe63ddf478ce0fbd69ef6..3b0b2eec8ac7c7fd7bf77fd68a76b6e1de61f1f9
--- a/graphics/VP1/VP1Gui/src/VP1IncomingMessageDialog.cxx
+++ b/graphics/VP1/VP1Gui/src/VP1IncomingMessageDialog.cxx
@@ -13,7 +13,7 @@
/////////////////////////////////////////////////////////////
#include "VP1Gui/VP1IncomingMessageDialog.h"
-#include "ui_vp1incomingmessageform.h"
+#include "ui_vp1incomingmessagedialog.h"
#include "VP1Gui/VP1TabManager.h"
#include "VP1Gui/VP1ChannelManager.h"
#include <QtCore/QList>
diff --git a/graphics/VP1/VP1Gui/src/VP1MainWindow.cxx b/graphics/VP1/VP1Gui/src/VP1MainWindow.cxx
old mode 100755
new mode 100644
diff --git a/graphics/VP1/VP1Gui/src/VP1PluginDialog.cxx b/graphics/VP1/VP1Gui/src/VP1PluginDialog.cxx
old mode 100755
new mode 100644
diff --git a/graphics/VP1/VP1Gui/src/VP1Prioritiser.cxx b/graphics/VP1/VP1Gui/src/VP1Prioritiser.cxx
old mode 100755
new mode 100644
diff --git a/graphics/VP1/VP1Gui/src/VP1TabManager.cxx b/graphics/VP1/VP1Gui/src/VP1TabManager.cxx
old mode 100755
new mode 100644
diff --git a/graphics/VP1/VP1Gui/src/VP1TcpServer.cxx b/graphics/VP1/VP1Gui/src/VP1TcpServer.cxx
old mode 100755
new mode 100644
diff --git a/graphics/VP1/VP1Gui/src/VP1TextBrowser.cxx b/graphics/VP1/VP1Gui/src/VP1TextBrowser.cxx
old mode 100755
new mode 100644
diff --git a/graphics/VP1/VP1Gui/src/icons/3d_32x32.png b/graphics/VP1/VP1Gui/src/icons/3d_32x32.png
old mode 100755
new mode 100644
diff --git a/graphics/VP1/VP1Gui/src/icons/back_32x32.png b/graphics/VP1/VP1Gui/src/icons/back_32x32.png
old mode 100755
new mode 100644
diff --git a/graphics/VP1/VP1Gui/src/icons/button_cancel_32x32.png b/graphics/VP1/VP1Gui/src/icons/button_cancel_32x32.png
old mode 100755
new mode 100644
diff --git a/graphics/VP1/VP1Gui/src/icons/button_ok_32x32.png b/graphics/VP1/VP1Gui/src/icons/button_ok_32x32.png
old mode 100755
new mode 100644
diff --git a/graphics/VP1/VP1Gui/src/icons/camera.png b/graphics/VP1/VP1Gui/src/icons/camera.png
old mode 100755
new mode 100644
diff --git a/graphics/VP1/VP1Gui/src/icons/down_32x32.png b/graphics/VP1/VP1Gui/src/icons/down_32x32.png
old mode 100755
new mode 100644
diff --git a/graphics/VP1/VP1Gui/src/icons/edit_32x32.png b/graphics/VP1/VP1Gui/src/icons/edit_32x32.png
old mode 100755
new mode 100644
diff --git a/graphics/VP1/VP1Gui/src/icons/editcopy_32x32.png b/graphics/VP1/VP1Gui/src/icons/editcopy_32x32.png
old mode 100755
new mode 100644
diff --git a/graphics/VP1/VP1Gui/src/icons/fileclose_32x32.png b/graphics/VP1/VP1Gui/src/icons/fileclose_32x32.png
old mode 100755
new mode 100644
diff --git a/graphics/VP1/VP1Gui/src/icons/filefind_32x32.png b/graphics/VP1/VP1Gui/src/icons/filefind_32x32.png
old mode 100755
new mode 100644
diff --git a/graphics/VP1/VP1Gui/src/icons/filenew_32x32.png b/graphics/VP1/VP1Gui/src/icons/filenew_32x32.png
old mode 100755
new mode 100644
diff --git a/graphics/VP1/VP1Gui/src/icons/fileopen_32x32.png b/graphics/VP1/VP1Gui/src/icons/fileopen_32x32.png
old mode 100755
new mode 100644
diff --git a/graphics/VP1/VP1Gui/src/icons/fileprint_32x32.png b/graphics/VP1/VP1Gui/src/icons/fileprint_32x32.png
old mode 100755
new mode 100644
diff --git a/graphics/VP1/VP1Gui/src/icons/filequickprint_32x32.png b/graphics/VP1/VP1Gui/src/icons/filequickprint_32x32.png
old mode 100755
new mode 100644
diff --git a/graphics/VP1/VP1Gui/src/icons/filesave_32x32.png b/graphics/VP1/VP1Gui/src/icons/filesave_32x32.png
old mode 100755
new mode 100644
diff --git a/graphics/VP1/VP1Gui/src/icons/filesaveas_32x32.png b/graphics/VP1/VP1Gui/src/icons/filesaveas_32x32.png
old mode 100755
new mode 100644
diff --git a/graphics/VP1/VP1Gui/src/icons/forward_32x32.png b/graphics/VP1/VP1Gui/src/icons/forward_32x32.png
old mode 100755
new mode 100644
diff --git a/graphics/VP1/VP1Gui/src/icons/help_32x32.png b/graphics/VP1/VP1Gui/src/icons/help_32x32.png
old mode 100755
new mode 100644
diff --git a/graphics/VP1/VP1Gui/src/icons/info_32x32.png b/graphics/VP1/VP1Gui/src/icons/info_32x32.png
old mode 100755
new mode 100644
diff --git a/graphics/VP1/VP1Gui/src/icons/kcalc_32x32.png b/graphics/VP1/VP1Gui/src/icons/kcalc_32x32.png
old mode 100755
new mode 100644
diff --git a/graphics/VP1/VP1Gui/src/icons/kchart_32x32.png b/graphics/VP1/VP1Gui/src/icons/kchart_32x32.png
old mode 100755
new mode 100644
diff --git a/graphics/VP1/VP1Gui/src/icons/kivio_32x32.png b/graphics/VP1/VP1Gui/src/icons/kivio_32x32.png
old mode 100755
new mode 100644
diff --git a/graphics/VP1/VP1Gui/src/icons/launch_32x32.png b/graphics/VP1/VP1Gui/src/icons/launch_32x32.png
old mode 100755
new mode 100644
diff --git a/graphics/VP1/VP1Gui/src/icons/log_32x32.png b/graphics/VP1/VP1Gui/src/icons/log_32x32.png
old mode 100755
new mode 100644
diff --git a/graphics/VP1/VP1Gui/src/icons/network_64x64.png b/graphics/VP1/VP1Gui/src/icons/network_64x64.png
old mode 100755
new mode 100644
diff --git a/graphics/VP1/VP1Gui/src/icons/network_disconnect_64x64.png b/graphics/VP1/VP1Gui/src/icons/network_disconnect_64x64.png
old mode 100755
new mode 100644
diff --git a/graphics/VP1/VP1Gui/src/icons/no3D_32x32.png b/graphics/VP1/VP1Gui/src/icons/no3D_32x32.png
old mode 100755
new mode 100644
diff --git a/graphics/VP1/VP1Gui/src/icons/package_settings_32x32.png b/graphics/VP1/VP1Gui/src/icons/package_settings_32x32.png
old mode 100755
new mode 100644
diff --git a/graphics/VP1/VP1Gui/src/icons/redo_32x32.png b/graphics/VP1/VP1Gui/src/icons/redo_32x32.png
old mode 100755
new mode 100644
diff --git a/graphics/VP1/VP1Gui/src/icons/undo_32x32.png b/graphics/VP1/VP1Gui/src/icons/undo_32x32.png
old mode 100755
new mode 100644
diff --git a/graphics/VP1/VP1Gui/src/icons/window_fullscreen_32x32.png b/graphics/VP1/VP1Gui/src/icons/window_fullscreen_32x32.png
old mode 100755
new mode 100644
diff --git a/graphics/VP1/VP1Gui/src/icons/window_list_32x32.png b/graphics/VP1/VP1Gui/src/icons/window_list_32x32.png
old mode 100755
new mode 100644
diff --git a/graphics/VP1/VP1Gui/src/icons/window_nofullscreen_32x32.png b/graphics/VP1/VP1Gui/src/icons/window_nofullscreen_32x32.png
old mode 100755
new mode 100644
diff --git a/graphics/VP1/VP1Gui/src/icons/yast_route_32x32.png b/graphics/VP1/VP1Gui/src/icons/yast_route_32x32.png
old mode 100755
new mode 100644
diff --git a/graphics/VP1/VP1Gui/src/vp1.qrc b/graphics/VP1/VP1Gui/src/vp1.qrc
old mode 100755
new mode 100644
diff --git a/graphics/VP1/VP1Gui/src/vp1authenticator.ui b/graphics/VP1/VP1Gui/src/vp1authenticator.ui
new file mode 100644
index 0000000000000000000000000000000000000000..21c8e392025e3b85de2e9aa4568ab6b7a34d8cf3
--- /dev/null
+++ b/graphics/VP1/VP1Gui/src/vp1authenticator.ui
@@ -0,0 +1,209 @@
+<ui version="4.0" >
+ <class>dlgAuthentication</class>
+ <widget class="QDialog" name="dlgAuthentication" >
+ <property name="windowModality" >
+ <enum>Qt::ApplicationModal</enum>
+ </property>
+ <property name="geometry" >
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>380</width>
+ <height>447</height>
+ </rect>
+ </property>
+ <property name="windowTitle" >
+ <string>Login</string>
+ </property>
+ <property name="sizeGripEnabled" >
+ <bool>false</bool>
+ </property>
+ <property name="modal" >
+ <bool>false</bool>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_3" >
+ <item row="0" column="0" colspan="3" >
+ <widget class="QLabel" name="lblTitle" >
+ <property name="font" >
+ <font>
+ <pointsize>12</pointsize>
+ </font>
+ </property>
+ <property name="text" >
+ <string>Please enter your NICE login and password</string>
+ </property>
+ <property name="alignment" >
+ <set>Qt::AlignCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0" >
+ <spacer name="horizontalSpacer_5" >
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0" >
+ <size>
+ <width>32</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="1" column="1" >
+ <widget class="QWidget" native="1" name="wdgBackground" >
+ <layout class="QGridLayout" name="gridLayout_2" >
+ <item row="0" column="0" >
+ <spacer name="horizontalSpacer" >
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0" >
+ <size>
+ <width>18</width>
+ <height>52</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="0" column="1" colspan="2" >
+ <layout class="QGridLayout" name="gridLayout" >
+ <item row="0" column="0" >
+ <widget class="QLabel" name="lblPers" >
+ <property name="text" >
+ <string>Login</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1" >
+ <widget class="QLineEdit" name="inpPers" />
+ </item>
+ <item row="1" column="0" >
+ <widget class="QLabel" name="lblPhr" >
+ <property name="text" >
+ <string>Password</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1" >
+ <widget class="QLineEdit" name="inpPhr" >
+ <property name="echoMode" >
+ <enum>QLineEdit::Password</enum>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item row="0" column="3" >
+ <spacer name="horizontalSpacer_2" >
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0" >
+ <size>
+ <width>28</width>
+ <height>52</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="1" column="0" >
+ <spacer name="horizontalSpacer_3" >
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0" >
+ <size>
+ <width>18</width>
+ <height>24</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="1" column="1" >
+ <widget class="QPushButton" name="pbtnLogin" >
+ <property name="text" >
+ <string>Login</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="2" >
+ <widget class="QPushButton" name="pbtnCancel" >
+ <property name="text" >
+ <string>Cancel</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="3" >
+ <spacer name="horizontalSpacer_4" >
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0" >
+ <size>
+ <width>28</width>
+ <height>24</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="2" column="0" colspan="4" >
+ <widget class="QTextEdit" name="teditError" >
+ <property name="enabled" >
+ <bool>true</bool>
+ </property>
+ <property name="autoFillBackground" >
+ <bool>false</bool>
+ </property>
+ <property name="readOnly" >
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="2" >
+ <spacer name="verticalSpacer_2" >
+ <property name="orientation" >
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0" >
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item row="1" column="2" >
+ <spacer name="horizontalSpacer_6" >
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0" >
+ <size>
+ <width>31</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="2" column="1" >
+ <spacer name="verticalSpacer" >
+ <property name="orientation" >
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0" >
+ <size>
+ <width>20</width>
+ <height>35</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/graphics/VP1/VP1Gui/src/vp1eventdisplaywidget.ui b/graphics/VP1/VP1Gui/src/vp1eventdisplayeditor.ui
similarity index 100%
rename from graphics/VP1/VP1Gui/src/vp1eventdisplaywidget.ui
rename to graphics/VP1/VP1Gui/src/vp1eventdisplayeditor.ui
diff --git a/graphics/VP1/VP1Gui/src/vp1incomingmessageform.ui b/graphics/VP1/VP1Gui/src/vp1incomingmessagedialog.ui
old mode 100755
new mode 100644
similarity index 100%
rename from graphics/VP1/VP1Gui/src/vp1incomingmessageform.ui
rename to graphics/VP1/VP1Gui/src/vp1incomingmessagedialog.ui
diff --git a/graphics/VP1/VP1Gui/src/vp1mainwindow.ui b/graphics/VP1/VP1Gui/src/vp1mainwindow.ui
old mode 100755
new mode 100644
diff --git a/graphics/VP1/VP1Gui/src/vp1plugindialog.ui b/graphics/VP1/VP1Gui/src/vp1plugindialog.ui
old mode 100755
new mode 100644