Skip to content

Commit e665883

Browse files
committed
small ui fixes
1 parent 895b52f commit e665883

File tree

2 files changed

+89
-16
lines changed

2 files changed

+89
-16
lines changed

mainwindow.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ void MainWindow::loadConfig(){
7171
esp.erase_flash = setup.value ("esp/erase_flash",false).toBool ();
7272
ui->cbEraseFlash->setChecked (esp.erase_flash);
7373

74+
ui->twTabs->setCurrentIndex (0);
7475
}
7576

7677
void MainWindow::saveConfig(){

mainwindow.ui

Lines changed: 88 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,18 @@
3737
<string>Upload</string>
3838
</attribute>
3939
<layout class="QVBoxLayout" name="verticalLayout_5">
40+
<property name="leftMargin">
41+
<number>5</number>
42+
</property>
43+
<property name="topMargin">
44+
<number>5</number>
45+
</property>
46+
<property name="rightMargin">
47+
<number>5</number>
48+
</property>
49+
<property name="bottomMargin">
50+
<number>5</number>
51+
</property>
4052
<item>
4153
<layout class="QVBoxLayout" name="verticalLayout_3">
4254
<item>
@@ -136,6 +148,18 @@
136148
<string>Serial</string>
137149
</attribute>
138150
<layout class="QHBoxLayout" name="horizontalLayout_6" stretch="1,1,1">
151+
<property name="leftMargin">
152+
<number>5</number>
153+
</property>
154+
<property name="topMargin">
155+
<number>5</number>
156+
</property>
157+
<property name="rightMargin">
158+
<number>5</number>
159+
</property>
160+
<property name="bottomMargin">
161+
<number>5</number>
162+
</property>
139163
<item>
140164
<widget class="QWidget" name="widget_2" native="true">
141165
<property name="minimumSize">
@@ -276,6 +300,18 @@
276300
<string>IP</string>
277301
</attribute>
278302
<layout class="QHBoxLayout" name="horizontalLayout_5" stretch="1,1,1,1">
303+
<property name="leftMargin">
304+
<number>5</number>
305+
</property>
306+
<property name="topMargin">
307+
<number>5</number>
308+
</property>
309+
<property name="rightMargin">
310+
<number>5</number>
311+
</property>
312+
<property name="bottomMargin">
313+
<number>5</number>
314+
</property>
279315
<item>
280316
<widget class="QWidget" name="widget_3" native="true">
281317
<property name="minimumSize">
@@ -520,6 +556,18 @@
520556
<string>Devices</string>
521557
</attribute>
522558
<layout class="QVBoxLayout" name="verticalLayout_2">
559+
<property name="leftMargin">
560+
<number>5</number>
561+
</property>
562+
<property name="topMargin">
563+
<number>5</number>
564+
</property>
565+
<property name="rightMargin">
566+
<number>5</number>
567+
</property>
568+
<property name="bottomMargin">
569+
<number>5</number>
570+
</property>
523571
<item>
524572
<widget class="QTableWidget" name="twDevices">
525573
<property name="minimumSize">
@@ -567,6 +615,18 @@
567615
<string>New Device</string>
568616
</property>
569617
<layout class="QGridLayout" name="gridLayout">
618+
<property name="leftMargin">
619+
<number>5</number>
620+
</property>
621+
<property name="topMargin">
622+
<number>11</number>
623+
</property>
624+
<property name="rightMargin">
625+
<number>5</number>
626+
</property>
627+
<property name="bottomMargin">
628+
<number>5</number>
629+
</property>
570630
<item row="0" column="0">
571631
<layout class="QVBoxLayout" name="verticalLayout_13">
572632
<item>
@@ -601,15 +661,15 @@
601661
<widget class="QWidget" name="widget_6" native="true">
602662
<property name="minimumSize">
603663
<size>
604-
<width>210</width>
605-
<height>45</height>
664+
<width>191</width>
665+
<height>30</height>
606666
</size>
607667
</property>
608668
<widget class="QSpinBox" name="sbNewDeviceIP0">
609669
<property name="geometry">
610670
<rect>
611-
<x>10</x>
612-
<y>10</y>
671+
<x>0</x>
672+
<y>0</y>
613673
<width>41</width>
614674
<height>30</height>
615675
</rect>
@@ -633,8 +693,8 @@
633693
<widget class="QLabel" name="label_3">
634694
<property name="geometry">
635695
<rect>
636-
<x>103</x>
637-
<y>20</y>
696+
<x>93</x>
697+
<y>15</y>
638698
<width>16</width>
639699
<height>16</height>
640700
</rect>
@@ -646,8 +706,8 @@
646706
<widget class="QSpinBox" name="sbNewDeviceIP3">
647707
<property name="geometry">
648708
<rect>
649-
<x>160</x>
650-
<y>10</y>
709+
<x>150</x>
710+
<y>0</y>
651711
<width>41</width>
652712
<height>30</height>
653713
</rect>
@@ -674,8 +734,8 @@
674734
<widget class="QSpinBox" name="sbNewDeviceIP2">
675735
<property name="geometry">
676736
<rect>
677-
<x>110</x>
678-
<y>10</y>
737+
<x>100</x>
738+
<y>0</y>
679739
<width>41</width>
680740
<height>30</height>
681741
</rect>
@@ -702,8 +762,8 @@
702762
<widget class="QLabel" name="label_2">
703763
<property name="geometry">
704764
<rect>
705-
<x>53</x>
706-
<y>20</y>
765+
<x>43</x>
766+
<y>13</y>
707767
<width>16</width>
708768
<height>16</height>
709769
</rect>
@@ -715,8 +775,8 @@
715775
<widget class="QLabel" name="label_4">
716776
<property name="geometry">
717777
<rect>
718-
<x>153</x>
719-
<y>20</y>
778+
<x>144</x>
779+
<y>15</y>
720780
<width>16</width>
721781
<height>16</height>
722782
</rect>
@@ -728,8 +788,8 @@
728788
<widget class="QSpinBox" name="sbNewDeviceIP1">
729789
<property name="geometry">
730790
<rect>
731-
<x>60</x>
732-
<y>10</y>
791+
<x>50</x>
792+
<y>0</y>
733793
<width>41</width>
734794
<height>30</height>
735795
</rect>
@@ -794,6 +854,18 @@
794854
<string>Console</string>
795855
</attribute>
796856
<layout class="QHBoxLayout" name="horizontalLayout_2">
857+
<property name="leftMargin">
858+
<number>5</number>
859+
</property>
860+
<property name="topMargin">
861+
<number>5</number>
862+
</property>
863+
<property name="rightMargin">
864+
<number>5</number>
865+
</property>
866+
<property name="bottomMargin">
867+
<number>5</number>
868+
</property>
797869
<item>
798870
<widget class="QPlainTextEdit" name="teConsoleOutput">
799871
<property name="acceptDrops">

0 commit comments

Comments
 (0)