From ebbc3e7cd2086a9f62a857dffe9ab0bd1f5da768 Mon Sep 17 00:00:00 2001
From: Benjamin Dobell <benjamin.dobell+git@glassechidna.com.au>
Date: Fri, 8 Mar 2013 00:00:52 +1100
Subject: - Removed legacy command line hard-coded partition name parameters. -
 As a result of the above two points, there are no "known boot   partitions",
 and hence boot partitions are not automatically flashed   last. - Made
 partitions flash in the order in order in which partition arguments   are
 specified. Hence, it's recommended that you specify boot partitions   last. -
 Added --usb-level argument that can be used for debugging libusbx, or  
 flashing issues in general. - Removed generally non-functional firmware
 dumping behaviour. - Removed auto-resume functionality - Although this
 feature was definitely   nice to have; I believe it may be responsible for
 flashing compatibility   issues for a variety of devices. - As a result of
 the above. In order perform another action after a   --no-reboot action, you
 must provide the --resume flag. - Heimdall Frontend also has support for
 specifying the --resume flag   via a GUI. Heimdall Frontend also tries to
 keep track of your actions   and enable "Resume" automatically after a "No
 Reboot" action. - Refactored quite a few of the actions, and code responsible
 for flashing   (particularly PIT file flashing). - Bumped version to 1.4RC3
 *however* this commit is not yet an official   release candidate. It's still
 a WIP. In particular build files still   have not been updated for Linux and
 OS X.

---
 heimdall-frontend/mainwindow.ui | 239 +++++++++++++++++++++++-----------------
 1 file changed, 140 insertions(+), 99 deletions(-)

(limited to 'heimdall-frontend/mainwindow.ui')

diff --git a/heimdall-frontend/mainwindow.ui b/heimdall-frontend/mainwindow.ui
index 6a165fb..ce42a89 100644
--- a/heimdall-frontend/mainwindow.ui
+++ b/heimdall-frontend/mainwindow.ui
@@ -401,7 +401,7 @@
        <rect>
         <x>10</x>
         <y>300</y>
-        <width>751</width>
+        <width>511</width>
         <height>171</height>
        </rect>
       </property>
@@ -414,9 +414,9 @@
        </property>
        <property name="geometry">
         <rect>
-         <x>350</x>
+         <x>280</x>
          <y>130</y>
-         <width>271</width>
+         <width>221</width>
          <height>31</height>
         </rect>
        </property>
@@ -432,8 +432,8 @@
         <rect>
          <x>10</x>
          <y>30</y>
-         <width>731</width>
-         <height>91</height>
+         <width>491</width>
+         <height>81</height>
         </rect>
        </property>
        <property name="undoRedoEnabled">
@@ -451,7 +451,7 @@
         <rect>
          <x>10</x>
          <y>130</y>
-         <width>331</width>
+         <width>261</width>
          <height>21</height>
         </rect>
        </property>
@@ -468,59 +468,6 @@
         <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
        </property>
       </widget>
-      <widget class="QPushButton" name="startFlashButton">
-       <property name="enabled">
-        <bool>false</bool>
-       </property>
-       <property name="geometry">
-        <rect>
-         <x>620</x>
-         <y>130</y>
-         <width>91</width>
-         <height>31</height>
-        </rect>
-       </property>
-       <property name="text">
-        <string>Start</string>
-       </property>
-      </widget>
-      <widget class="QLabel" name="startFlashTipLabel">
-       <property name="geometry">
-        <rect>
-         <x>720</x>
-         <y>130</y>
-         <width>21</width>
-         <height>23</height>
-        </rect>
-       </property>
-       <property name="font">
-        <font>
-         <weight>75</weight>
-         <bold>true</bold>
-        </font>
-       </property>
-       <property name="toolTip">
-        <string notr="true">The &quot;Start&quot; button will remain inactive until at least one partition/file is added.</string>
-       </property>
-       <property name="frameShape">
-        <enum>QFrame::Panel</enum>
-       </property>
-       <property name="frameShadow">
-        <enum>QFrame::Raised</enum>
-       </property>
-       <property name="lineWidth">
-        <number>2</number>
-       </property>
-       <property name="midLineWidth">
-        <number>0</number>
-       </property>
-       <property name="text">
-        <string>?</string>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignCenter</set>
-       </property>
-      </widget>
      </widget>
      <widget class="QGroupBox" name="optionsGroup">
       <property name="geometry">
@@ -540,7 +487,7 @@
          <x>10</x>
          <y>20</y>
          <width>391</width>
-         <height>61</height>
+         <height>91</height>
         </rect>
        </property>
        <property name="title">
@@ -624,6 +571,25 @@
          <set>Qt::AlignCenter</set>
         </property>
        </widget>
+       <widget class="QCheckBox" name="repartitionCheckBox">
+        <property name="enabled">
+         <bool>false</bool>
+        </property>
+        <property name="geometry">
+         <rect>
+          <x>10</x>
+          <y>60</y>
+          <width>131</width>
+          <height>21</height>
+         </rect>
+        </property>
+        <property name="toolTip">
+         <string notr="true">Repartitioning will wipe all data for your phone and install the selected PIT file.</string>
+        </property>
+        <property name="text">
+         <string>Repartition</string>
+        </property>
+       </widget>
       </widget>
       <widget class="QGroupBox" name="partitionGroup">
        <property name="geometry">
@@ -738,44 +704,6 @@
         </property>
        </widget>
       </widget>
-      <widget class="QCheckBox" name="noRebootCheckBox">
-       <property name="enabled">
-        <bool>false</bool>
-       </property>
-       <property name="geometry">
-        <rect>
-         <x>250</x>
-         <y>90</y>
-         <width>151</width>
-         <height>21</height>
-        </rect>
-       </property>
-       <property name="toolTip">
-        <string notr="true">Can be enabled to prevent your device rebooting after the flash finishes.</string>
-       </property>
-       <property name="text">
-        <string>No Reboot</string>
-       </property>
-      </widget>
-      <widget class="QCheckBox" name="repartitionCheckBox">
-       <property name="enabled">
-        <bool>false</bool>
-       </property>
-       <property name="geometry">
-        <rect>
-         <x>20</x>
-         <y>90</y>
-         <width>151</width>
-         <height>21</height>
-        </rect>
-       </property>
-       <property name="toolTip">
-        <string notr="true">Repartitioning will wipe all data for your phone and install the selected PIT file.</string>
-       </property>
-       <property name="text">
-        <string>Repartition</string>
-       </property>
-      </widget>
       <widget class="QGroupBox" name="partitionsGroup">
        <property name="geometry">
         <rect>
@@ -872,6 +800,110 @@
        </widget>
       </widget>
      </widget>
+     <widget class="QGroupBox" name="sessionGroup">
+      <property name="geometry">
+       <rect>
+        <x>530</x>
+        <y>300</y>
+        <width>231</width>
+        <height>171</height>
+       </rect>
+      </property>
+      <property name="title">
+       <string>Session</string>
+      </property>
+      <widget class="QCheckBox" name="noRebootCheckBox">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="geometry">
+        <rect>
+         <x>10</x>
+         <y>30</y>
+         <width>211</width>
+         <height>21</height>
+        </rect>
+       </property>
+       <property name="toolTip">
+        <string notr="true">Can be enabled to prevent your device rebooting after the flash finishes.</string>
+       </property>
+       <property name="text">
+        <string>No Reboot</string>
+       </property>
+      </widget>
+      <widget class="QCheckBox" name="resumeCheckbox">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="geometry">
+        <rect>
+         <x>10</x>
+         <y>60</y>
+         <width>211</width>
+         <height>21</height>
+        </rect>
+       </property>
+       <property name="toolTip">
+        <string notr="true">Can be enabled to prevent your device rebooting after the flash finishes.</string>
+       </property>
+       <property name="text">
+        <string>Resume (use after &quot;No Reboot&quot;)</string>
+       </property>
+      </widget>
+      <widget class="QPushButton" name="startFlashButton">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="geometry">
+        <rect>
+         <x>50</x>
+         <y>120</y>
+         <width>111</width>
+         <height>31</height>
+        </rect>
+       </property>
+       <property name="text">
+        <string>Start</string>
+       </property>
+      </widget>
+      <widget class="QLabel" name="startFlashTipLabel">
+       <property name="geometry">
+        <rect>
+         <x>170</x>
+         <y>120</y>
+         <width>21</width>
+         <height>23</height>
+        </rect>
+       </property>
+       <property name="font">
+        <font>
+         <weight>75</weight>
+         <bold>true</bold>
+        </font>
+       </property>
+       <property name="toolTip">
+        <string notr="true">The &quot;Start&quot; button will remain inactive until at least one partition/file is added.</string>
+       </property>
+       <property name="frameShape">
+        <enum>QFrame::Panel</enum>
+       </property>
+       <property name="frameShadow">
+        <enum>QFrame::Raised</enum>
+       </property>
+       <property name="lineWidth">
+        <number>2</number>
+       </property>
+       <property name="midLineWidth">
+        <number>0</number>
+       </property>
+       <property name="text">
+        <string>?</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignCenter</set>
+       </property>
+      </widget>
+     </widget>
     </widget>
     <widget class="QWidget" name="createPackageTab">
      <property name="enabled">
@@ -1826,6 +1858,8 @@
     <property name="title">
      <string>Advanced</string>
     </property>
+    <addaction name="actionResumeConnection"/>
+    <addaction name="separator"/>
     <addaction name="actionVerboseOutput"/>
    </widget>
    <addaction name="menuDonate"/>
@@ -1860,6 +1894,14 @@
     <string>Verbose Output</string>
    </property>
   </action>
+  <action name="actionResumeConnection">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Resume Connection</string>
+   </property>
+  </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <tabstops>
@@ -1883,7 +1925,6 @@
   <tabstop>partitionFileLineEdit</tabstop>
   <tabstop>partitionFileBrowseButton</tabstop>
   <tabstop>outputPlainTextEdit</tabstop>
-  <tabstop>startFlashButton</tabstop>
   <tabstop>createFirmwareNameLineEdit</tabstop>
   <tabstop>createFirmwareVersionLineEdit</tabstop>
   <tabstop>createPlatformNameLineEdit</tabstop>
-- 
cgit v1.1