set version info. updated config file

remotes/origin/HEAD
Tobias Weiss 7 years ago
parent d1cc49b202
commit e54f75f678

@ -624,7 +624,7 @@ void lc::MainWindow::SetupWidgets() {
//DisableDisfunctionalWidgets(); //DisableDisfunctionalWidgets();
// Set the info text in LInfo on the TInfo tab // Set the info text in LInfo on the TInfo tab
ui->LInfo->setText( "This is Labcontrol.\n\nDevelopers\n\n" ui->LInfo->setText( "This is Labcontrol version 2.1.4\n\n\nDevelopers\n\n"
"0day-2016 Henning Prömpers\n" "0day-2016 Henning Prömpers\n"
"2014-2016 Markus Prasser\n" "2014-2016 Markus Prasser\n"
"2016 - now WiwilabHiwiOrgaization\n\n\n" "2016 - now WiwilabHiwiOrgaization\n\n\n"

@ -11,7 +11,7 @@
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -64,7 +64,7 @@
</font> </font>
</property> </property>
<property name="currentIndex"> <property name="currentIndex">
<number>0</number> <number>3</number>
</property> </property>
<property name="usesScrollButtons"> <property name="usesScrollButtons">
<bool>true</bool> <bool>true</bool>
@ -206,6 +206,13 @@
<string>Client actions</string> <string>Client actions</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_5"> <layout class="QVBoxLayout" name="verticalLayout_5">
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>Switch the selected clients on or off</string>
</property>
</widget>
</item>
<item> <item>
<widget class="QPushButton" name="PBBoot"> <widget class="QPushButton" name="PBBoot">
<property name="toolTip"> <property name="toolTip">
@ -240,20 +247,27 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QLabel" name="label_2">
<property name="text">
<string>Remote control the selected clients</string>
</property>
</widget>
</item>
<item> <item>
<widget class="QPushButton" name="PBViewDesktopViewOnly"> <widget class="QPushButton" name="PBViewDesktopViewOnly">
<property name="toolTip"> <property name="toolTip">
<string>Shows the desktop of the selected clients.</string> <string>Shows the desktop of the selected clients.</string>
</property> </property>
<property name="text"> <property name="text">
<string>View desktop of selected clients (view only)</string> <string>View desktop (view only)</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QPushButton" name="PBViewDesktopFullControl"> <widget class="QPushButton" name="PBViewDesktopFullControl">
<property name="text"> <property name="text">
<string>View desktop of selected clients (full control)</string> <string>Control desktop (mouse and keyboard)</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -271,7 +285,7 @@
<item> <item>
<widget class="QLabel" name="LUploadFolder"> <widget class="QLabel" name="LUploadFolder">
<property name="text"> <property name="text">
<string>Upload folder to all selected clients</string> <string>Upload folder to the selected clients</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set> <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
@ -317,7 +331,7 @@
<item> <item>
<widget class="QLabel" name="LBrowserActions"> <widget class="QLabel" name="LBrowserActions">
<property name="text"> <property name="text">
<string>Start browser on all selected clients</string> <string>Start browser on the selected clients</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -923,87 +937,70 @@
<attribute name="title"> <attribute name="title">
<string>Settings</string> <string>Settings</string>
</attribute> </attribute>
<widget class="QWidget" name="formLayoutWidget"> <widget class="QPushButton" name="PBChangeSettingsTemp">
<property name="geometry">
<rect>
<x>240</x>
<y>520</y>
<width>201</width>
<height>23</height>
</rect>
</property>
<property name="text">
<string>Change settings temporarly</string>
</property>
</widget>
<widget class="QScrollArea" name="scrollArea">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>10</x> <x>10</x>
<y>10</y> <y>10</y>
<width>311</width> <width>691</width>
<height>201</height> <height>501</height>
</rect> </rect>
</property> </property>
<layout class="QFormLayout" name="formLayout"> <property name="verticalScrollBarPolicy">
<item row="0" column="0"> <enum>Qt::ScrollBarAlwaysOn</enum>
<widget class="QLabel" name="label_8"> </property>
<property name="text"> <property name="widgetResizable">
<string>TextLabel</string> <bool>true</bool>
</property> </property>
</widget> <widget class="QWidget" name="scrollAreaWidgetContents">
</item> <property name="geometry">
<item row="0" column="1"> <rect>
<widget class="QLineEdit" name="lineEdit"/> <x>0</x>
</item> <y>0</y>
<item row="1" column="0"> <width>675</width>
<widget class="QLabel" name="label_9"> <height>499</height>
<property name="text"> </rect>
<string>TextLabel</string> </property>
</property> <widget class="QWidget" name="formLayoutWidget">
</widget> <property name="geometry">
</item> <rect>
<item row="2" column="0"> <x>0</x>
<widget class="QLabel" name="label_10"> <y>0</y>
<property name="text"> <width>671</width>
<string>TextLabel</string> <height>611</height>
</property> </rect>
</widget> </property>
</item> <layout class="QFormLayout" name="formLayout">
<item row="3" column="0"> <item row="0" column="0">
<widget class="QLabel" name="label_11"> <widget class="QLabel" name="label_3">
<property name="text"> <property name="text">
<string>TextLabel</string> <string>Server settings</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="0"> <item row="1" column="0">
<widget class="QLabel" name="label_12"> <widget class="QLabel" name="label_4">
<property name="text"> <property name="text">
<string>TextLabel</string> <string>Client settings</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="0"> </layout>
<widget class="QLabel" name="label_13"> </widget>
<property name="text"> </widget>
<string>TextLabel</string>
</property>
</widget>
</item>
<item row="6" column="0">
<widget class="QLabel" name="label_14">
<property name="text">
<string>TextLabel</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="lineEdit_2"/>
</item>
<item row="2" column="1">
<widget class="QLineEdit" name="lineEdit_3"/>
</item>
<item row="3" column="1">
<widget class="QLineEdit" name="lineEdit_4"/>
</item>
<item row="4" column="1">
<widget class="QLineEdit" name="lineEdit_5"/>
</item>
<item row="5" column="1">
<widget class="QLineEdit" name="lineEdit_6"/>
</item>
<item row="6" column="1">
<widget class="QLineEdit" name="lineEdit_7"/>
</item>
</layout>
</widget> </widget>
</widget> </widget>
<widget class="QWidget" name="TInfo"> <widget class="QWidget" name="TInfo">
@ -1011,7 +1008,7 @@
<enum>Qt::RightToLeft</enum> <enum>Qt::RightToLeft</enum>
</property> </property>
<attribute name="title"> <attribute name="title">
<string>Credits</string> <string>Info</string>
</attribute> </attribute>
<layout class="QVBoxLayout" name="VLInfo"> <layout class="QVBoxLayout" name="VLInfo">
<item> <item>

Loading…
Cancel
Save