Skip to content

Commit

Permalink
Updated layout of fixed transaction tab, shiftdialog.ui, returned tab…
Browse files Browse the repository at this point in the history 
…s to main tab after corrections
  • Loading branch information
@wrapperband
wrapperband committed Jun 22, 2016
1 parent d38d7f9 commit 78055c7
Showing 1 changed file with 43 additions and 31 deletions.
74 changes: 43 additions & 31 deletions src/qt/forms/shiftdialog.ui
View file
Expand Up @@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>560</width>
<height>428</height>
<height>470</height>
</rect>
</property>
<property name="windowTitle">
Expand Down Expand Up @@ -966,7 +966,7 @@
<property name="geometry">
<rect>
<x>10</x>
<y>10</y>
<y>20</y>
<width>121</width>
<height>16</height>
</rect>
Expand All @@ -978,8 +978,8 @@
<widget class="QLineEdit" name="fixAmountEdit">
<property name="geometry">
<rect>
<x>122</x>
<y>10</y>
<x>160</x>
<y>20</y>
<width>151</width>
<height>20</height>
</rect>
Expand All @@ -988,8 +988,8 @@
<widget class="QComboBox" name="fixComboBox">
<property name="geometry">
<rect>
<x>290</x>
<y>10</y>
<x>350</x>
<y>20</y>
<width>91</width>
<height>22</height>
</rect>
Expand All @@ -999,7 +999,7 @@
<property name="geometry">
<rect>
<x>10</x>
<y>40</y>
<y>60</y>
<width>121</width>
<height>16</height>
</rect>
Expand All @@ -1011,18 +1011,18 @@
<widget class="QLineEdit" name="fixWithdrawalAddrEdit">
<property name="geometry">
<rect>
<x>120</x>
<y>40</y>
<width>261</width>
<x>150</x>
<y>60</y>
<width>291</width>
<height>20</height>
</rect>
</property>
</widget>
<widget class="QLabel" name="label_26">
<property name="geometry">
<rect>
<x>10</x>
<y>70</y>
<x>30</x>
<y>100</y>
<width>111</width>
<height>16</height>
</rect>
Expand All @@ -1034,8 +1034,8 @@
<widget class="QLineEdit" name="returnAddr">
<property name="geometry">
<rect>
<x>120</x>
<y>70</y>
<x>150</x>
<y>100</y>
<width>261</width>
<height>20</height>
</rect>
Expand All @@ -1044,8 +1044,8 @@
<widget class="QPushButton" name="postFixButton">
<property name="geometry">
<rect>
<x>410</x>
<y>70</y>
<x>440</x>
<y>100</y>
<width>75</width>
<height>23</height>
</rect>
Expand Down Expand Up @@ -1131,8 +1131,8 @@
<widget class="QLabel" name="label_31">
<property name="geometry">
<rect>
<x>323</x>
<y>38</y>
<x>330</x>
<y>40</y>
<width>101</width>
<height>16</height>
</rect>
Expand Down Expand Up @@ -1202,8 +1202,8 @@
<widget class="QLineEdit" name="lineEdit">
<property name="geometry">
<rect>
<x>106</x>
<y>36</y>
<x>120</x>
<y>40</y>
<width>211</width>
<height>20</height>
</rect>
Expand All @@ -1224,13 +1224,25 @@
<widget class="QLineEdit" name="lineEdit_2">
<property name="geometry">
<rect>
<x>416</x>
<y>36</y>
<x>440</x>
<y>40</y>
<width>81</width>
<height>20</height>
</rect>
</property>
</widget>
<zorder>label_27</zorder>
<zorder>label_28</zorder>
<zorder>label_29</zorder>
<zorder>label_30</zorder>
<zorder>label_31</zorder>
<zorder>label_32</zorder>
<zorder>label_33</zorder>
<zorder>label_34</zorder>
<zorder>label_35</zorder>
<zorder>lineEdit</zorder>
<zorder>lineEdit_2</zorder>
<zorder>groupBox_3</zorder>
</widget>
</item>
</layout>
Expand Down Expand Up @@ -1258,15 +1270,15 @@
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'SimSun'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Step1:&lt;/span&gt; Select Feathercoin as the input and Bitcoin as the output.&lt;/p&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Step2:&lt;/span&gt; Provide your Bitcoin address in the box, then click the POST button.&lt;/p&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Step3&lt;/span&gt;: ShapeShift will generate a FTC deposit address for you. Please send your FTCs to this generated address. (Don't send more than the Deposit Limit).&lt;/p&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Helvetica Neue,Helvetica,Arial,sans-serif'; font-size:14px; color:#31708f; background-color:#d9edf7;&quot;&gt;FTC Miner Fee: 0.1 FTC&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Noto Sans'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'SimSun'; font-size:9pt; font-weight:600;&quot;&gt;Step1:&lt;/span&gt;&lt;span style=&quot; font-family:'SimSun'; font-size:9pt;&quot;&gt; Select Feathercoin as the input and Bitcoin as the output.&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot;-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:'SimSun'; font-size:9pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'SimSun'; font-size:9pt; font-weight:600;&quot;&gt;Step2:&lt;/span&gt;&lt;span style=&quot; font-family:'SimSun'; font-size:9pt;&quot;&gt; Provide your Bitcoin address in the box, then click the POST button.&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot;-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:'SimSun'; font-size:9pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'SimSun'; font-size:9pt; font-weight:600;&quot;&gt;Step3&lt;/span&gt;&lt;span style=&quot; font-family:'SimSun'; font-size:9pt;&quot;&gt;: ShapeShift will generate a FTC deposit address for you. Please send your FTCs to this generated address. (Don't send more than the Deposit Limit).&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot;-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:'SimSun'; font-size:9pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
&lt;p style=&quot;-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:'SimSun'; font-size:9pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Helvetica Neue,Helvetica,Arial,sans-serif'; font-size:9pt; color:#31708f; background-color:#d9edf7;&quot;&gt;FTC Miner Fee: 0.1 FTC&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
Expand Down

0 comments on commit 78055c7

Please sign in to comment.