summaryrefslogtreecommitdiff
path: root/src/leap/gui/ui
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-03-08 11:09:23 -0300
committerTomás Touceda <chiiph@leap.se>2013-03-08 11:09:23 -0300
commit01a7faa2033ef3ce85bc5a346eca3601f0f4f7c5 (patch)
treefd3da99f8d1bec4c4d086583a461e77477dfd8b9 /src/leap/gui/ui
parentcaba70c5cee5e772761f9bbb2e4a9c5beab0be1e (diff)
Migrate VPN process to QProcess
Also: - Add a new tray icon for the whole app and a VPN specific one - Add a way to start/stop EIP independently - Improve reaction to the process dying
Diffstat (limited to 'src/leap/gui/ui')
-rw-r--r--src/leap/gui/ui/mainwindow.ui63
1 files changed, 35 insertions, 28 deletions
diff --git a/src/leap/gui/ui/mainwindow.ui b/src/leap/gui/ui/mainwindow.ui
index a527eaf6..d8a6d37d 100644
--- a/src/leap/gui/ui/mainwindow.ui
+++ b/src/leap/gui/ui/mainwindow.ui
@@ -171,16 +171,6 @@
</widget>
<widget class="QWidget" name="page_2">
<layout class="QGridLayout" name="gridLayout_3">
- <item row="1" column="0" colspan="6">
- <widget class="QLabel" name="lblEIPStatus">
- <property name="text">
- <string>Disconnected</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignCenter</set>
- </property>
- </widget>
- </item>
<item row="0" column="0" colspan="6">
<widget class="QLabel" name="lblVPNStatusIcon">
<property name="text">
@@ -194,20 +184,7 @@
</property>
</widget>
</item>
- <item row="2" column="0">
- <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>
- <item row="2" column="2">
+ <item row="3" column="2">
<widget class="QLabel" name="lblUpload">
<property name="minimumSize">
<size>
@@ -220,7 +197,7 @@
</property>
</widget>
</item>
- <item row="2" column="4">
+ <item row="3" column="4">
<widget class="QLabel" name="lblDownload">
<property name="minimumSize">
<size>
@@ -233,7 +210,7 @@
</property>
</widget>
</item>
- <item row="2" column="5">
+ <item row="3" column="5">
<spacer name="horizontalSpacer_6">
<property name="orientation">
<enum>Qt::Horizontal</enum>
@@ -246,7 +223,7 @@
</property>
</spacer>
</item>
- <item row="2" column="3">
+ <item row="3" column="3">
<widget class="QLabel" name="label_7">
<property name="text">
<string/>
@@ -256,7 +233,7 @@
</property>
</widget>
</item>
- <item row="2" column="1">
+ <item row="3" column="1">
<widget class="QLabel" name="label_5">
<property name="text">
<string/>
@@ -266,6 +243,36 @@
</property>
</widget>
</item>
+ <item row="3" column="0">
+ <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>
+ <item row="1" column="0" colspan="6">
+ <widget class="QLabel" name="lblEIPStatus">
+ <property name="text">
+ <string>Disconnected</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1" colspan="4">
+ <widget class="QPushButton" name="btnEipStartStop">
+ <property name="text">
+ <string>Start EIP</string>
+ </property>
+ </widget>
+ </item>
</layout>
</widget>
</widget>