Merge branch 'master' of ssh://git.openslx.org/pvs

5 files changed, 180 insertions, 41 deletions

diff --git a/src/gui/ui/mainwindow.ui b/src/gui/ui/mainwindow.ui
index d444092..a9d5cad 100644
--- a/src/gui/ui/mainwindow.ui
+++ b/src/gui/ui/mainwindow.ui
@@ -557,7 +557,7 @@
     <string>showProcesses</string>
    </property>
    <property name="toolTip">
-    <string>Show Processes of the selected Client</string>
+    <string>Show processes of all clients</string>
    </property>
   </action>
   <action name="actionStartProcess">
@@ -568,6 +568,9 @@
    <property name="text">
     <string>Start Process</string>
    </property>
+   <property name="toolTip">
+    <string>Start process on the selected client(s)</string>
+   </property>
   </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
diff --git a/src/gui/ui/mainwindowtouch.ui b/src/gui/ui/mainwindowtouch.ui
index 3480f09..12a2f2b 100644
--- a/src/gui/ui/mainwindowtouch.ui
+++ b/src/gui/ui/mainwindowtouch.ui
@@ -28,8 +28,8 @@
         <rect>
          <x>0</x>
          <y>0</y>
-         <width>1335</width>
-         <height>673</height>
+         <width>1329</width>
+         <height>660</height>
         </rect>
        </property>
        <layout class="QGridLayout" name="gridLayout_3">
@@ -648,7 +648,7 @@
     <string>showProcesses</string>
    </property>
    <property name="toolTip">
-    <string>Show Processes of the selected Client</string>
+    <string>Show processes of all clients</string>
    </property>
   </action>
   <action name="actionStartProcess">
@@ -659,6 +659,9 @@
    <property name="text">
     <string>Start Process</string>
    </property>
+   <property name="toolTip">
+    <string>Start process on the selected client(s)</string>
+   </property>
   </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
diff --git a/src/gui/ui/processWidget.ui b/src/gui/ui/processWidget.ui
index 3e7f55e..a759dc1 100644
--- a/src/gui/ui/processWidget.ui
+++ b/src/gui/ui/processWidget.ui
@@ -26,7 +26,7 @@
     <item>
      <widget class="QGroupBox" name="groupBox_2">
       <property name="title">
-       <string>Prozessliste</string>
+       <string>List of processes</string>
       </property>
       <widget class="QWidget" name="verticalLayoutWidget">
        <property name="geometry">
@@ -56,7 +56,7 @@
            <bool>true</bool>
           </property>
           <property name="selectionMode">
-           <enum>QAbstractItemView::SingleSelection</enum>
+           <enum>QAbstractItemView::ExtendedSelection</enum>
           </property>
           <property name="selectionBehavior">
            <enum>QAbstractItemView::SelectRows</enum>
@@ -147,14 +147,14 @@
           <item>
            <widget class="QPushButton" name="refreshButton">
             <property name="text">
-             <string>Aktualisieren</string>
+             <string>Refresh</string>
             </property>
            </widget>
           </item>
           <item>
            <widget class="QPushButton" name="stopButton">
             <property name="text">
-             <string>Prozess beenden</string>
+             <string>Stop process</string>
             </property>
            </widget>
           </item>
@@ -180,7 +180,7 @@
        </size>
       </property>
       <property name="title">
-       <string>Prozess starten</string>
+       <string>Start Process</string>
       </property>
       <widget class="QWidget" name="horizontalLayoutWidget">
        <property name="geometry">
@@ -198,7 +198,7 @@
         <item>
          <widget class="QPushButton" name="startButton">
           <property name="text">
-           <string>Prozess starten</string>
+           <string>Start Process</string>
           </property>
          </widget>
         </item>
diff --git a/src/gui/ui/processesDialog.ui b/src/gui/ui/processesDialog.ui
index 4ac4859..14d2403 100644
--- a/src/gui/ui/processesDialog.ui
+++ b/src/gui/ui/processesDialog.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Prozesse</string>
+   <string>Processes</string>
   </property>
   <widget class="QDialogButtonBox" name="buttonBox">
    <property name="geometry">
diff --git a/src/gui/ui/processesStartDialog.ui b/src/gui/ui/processesStartDialog.ui
index 5d8c7ee..2003c57 100644
--- a/src/gui/ui/processesStartDialog.ui
+++ b/src/gui/ui/processesStartDialog.ui
@@ -6,58 +6,191 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>393</width>
-    <height>109</height>
+    <width>524</width>
+    <height>309</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Start Process</string>
   </property>
-  <widget class="QWidget" name="layoutWidget">
+  <widget class="QWidget" name="verticalLayoutWidget_3">
    <property name="geometry">
     <rect>
-     <x>20</x>
-     <y>20</y>
-     <width>351</width>
-     <height>71</height>
+     <x>10</x>
+     <y>10</y>
+     <width>503</width>
+     <height>291</height>
     </rect>
    </property>
-   <layout class="QVBoxLayout" name="verticalLayout">
+   <layout class="QVBoxLayout" name="outerVerticalLayout">
     <item>
-     <widget class="QLineEdit" name="message"/>
-    </item>
-    <item>
-     <layout class="QHBoxLayout" name="horizontalLayout">
-      <property name="spacing">
-       <number>5</number>
-      </property>
+     <layout class="QVBoxLayout" name="upperVerticalLayout">
       <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>
+       <widget class="QLabel" name="label_2">
+        <property name="text">
+         <string>Either use a command  from this list or type in the process in the lower field.</string>
         </property>
-       </spacer>
+       </widget>
       </item>
       <item>
-       <widget class="QPushButton" name="cancel">
-        <property name="text">
-         <string>Cancel</string>
+       <widget class="QTableWidget" name="processesList">
+        <property name="verticalScrollBarPolicy">
+         <enum>Qt::ScrollBarAsNeeded</enum>
+        </property>
+        <property name="horizontalScrollBarPolicy">
+         <enum>Qt::ScrollBarAlwaysOff</enum>
+        </property>
+        <property name="editTriggers">
+         <set>QAbstractItemView::DoubleClicked|QAbstractItemView::SelectedClicked</set>
+        </property>
+        <property name="alternatingRowColors">
+         <bool>true</bool>
+        </property>
+        <property name="selectionMode">
+         <enum>QAbstractItemView::SingleSelection</enum>
+        </property>
+        <property name="selectionBehavior">
+         <enum>QAbstractItemView::SelectRows</enum>
+        </property>
+        <property name="gridStyle">
+         <enum>Qt::DotLine</enum>
+        </property>
+        <property name="sortingEnabled">
+         <bool>false</bool>
+        </property>
+        <property name="wordWrap">
+         <bool>false</bool>
         </property>
+        <property name="cornerButtonEnabled">
+         <bool>false</bool>
+        </property>
+        <attribute name="horizontalHeaderVisible">
+         <bool>true</bool>
+        </attribute>
+        <attribute name="horizontalHeaderCascadingSectionResizes">
+         <bool>false</bool>
+        </attribute>
+        <attribute name="horizontalHeaderDefaultSectionSize">
+         <number>200</number>
+        </attribute>
+        <attribute name="horizontalHeaderHighlightSections">
+         <bool>false</bool>
+        </attribute>
+        <attribute name="horizontalHeaderStretchLastSection">
+         <bool>true</bool>
+        </attribute>
+        <attribute name="verticalHeaderVisible">
+         <bool>false</bool>
+        </attribute>
+        <attribute name="verticalHeaderVisible">
+         <bool>false</bool>
+        </attribute>
+        <attribute name="horizontalHeaderStretchLastSection">
+         <bool>true</bool>
+        </attribute>
+        <attribute name="horizontalHeaderCascadingSectionResizes">
+         <bool>false</bool>
+        </attribute>
+        <attribute name="horizontalHeaderVisible">
+         <bool>true</bool>
+        </attribute>
+        <attribute name="horizontalHeaderHighlightSections">
+         <bool>false</bool>
+        </attribute>
+        <attribute name="horizontalHeaderDefaultSectionSize">
+         <number>200</number>
+        </attribute>
+        <column>
+         <property name="text">
+          <string>Command</string>
+         </property>
+        </column>
+        <column>
+         <property name="text">
+          <string>Description</string>
+         </property>
+        </column>
        </widget>
       </item>
       <item>
-       <widget class="QPushButton" name="send">
+       <layout class="QHBoxLayout" name="horizontalLayout_3">
+        <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="QPushButton" name="saveButton">
+          <property name="text">
+           <string>Save</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </item>
+    <item>
+     <widget class="Line" name="line">
+      <property name="orientation">
+       <enum>Qt::Horizontal</enum>
+      </property>
+     </widget>
+    </item>
+    <item>
+     <layout class="QVBoxLayout" name="lowerVerticalLayout">
+      <item>
+       <widget class="QLabel" name="label">
         <property name="text">
-         <string>Send</string>
+         <string>Process to start:</string>
         </property>
        </widget>
       </item>
+      <item>
+       <widget class="QLineEdit" name="message"/>
+      </item>
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayout">
+        <property name="spacing">
+         <number>5</number>
+        </property>
+        <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="cancelButton">
+          <property name="text">
+           <string>Cancel</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="sendButton">
+          <property name="text">
+           <string>Start</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
      </layout>
     </item>
    </layout>