Skip to content

Commit e71e619

Browse files
authored
Merge pull request mhogomchungu#267 from GongHeng2017/20240729-master-fix
fix: The Restore button has no icon
2 parents ef38da3 + 7c3598d commit e71e619

File tree

4 files changed

+34
-27
lines changed

4 files changed

+34
-27
lines changed

src/configoptions.cpp

+11-5
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,22 @@ configOptions::configOptions( QWidget * parent,
4343
m_ui->tabWidget->setCurrentIndex( 0 ) ;
4444

4545
m_ui->pbMountPointPrefix->setIcon( QIcon( ":/folder.png" ) ) ;
46+
m_ui->pbMountPointPrefixDefault->setIcon( QIcon( ":/icons/setting_reset.png" ) );
4647

47-
m_ui->pbPostMountCommand->setIcon( QIcon( ":/executable.png" ) ) ;
48+
m_ui->pbPostMountCommand->setIcon( QIcon( ":/folder.png" ) ) ;
49+
m_ui->pbRunPostMountCommandDefault->setIcon( QIcon( ":/icons/setting_reset.png" ) );
4850

49-
m_ui->pbPreUnMountCommand->setIcon( QIcon( ":/executable.png" ) ) ;
51+
m_ui->pbPreUnMountCommand->setIcon( QIcon( ":/folder.png" ) ) ;
52+
m_ui->pbRunPreUnMountCommandDefault->setIcon( QIcon( ":/icons/setting_reset.png" ) );
5053

51-
m_ui->pbSetExternalCommand->setIcon( QIcon( ":/executable.png" ) ) ;
54+
m_ui->pbSetExternalCommand->setIcon( QIcon( ":/folder.png" ) ) ;
55+
m_ui->pbExternalExecutableDefault->setIcon( QIcon( ":/icons/setting_reset.png" ) );
5256

53-
m_ui->pbSetFileManager->setIcon( QIcon( ":/executable.png" ) ) ;
57+
m_ui->pbSetFileManager->setIcon( QIcon( ":/folder.png" ) ) ;
58+
m_ui->pbSetFileManagerToDefault->setIcon( QIcon( ":/icons/setting_reset.png" ) );
5459

55-
m_ui->pbRunPeriodicallyCommand->setIcon( QIcon( ":/executable.png" ) ) ;
60+
m_ui->pbRunPeriodicallyCommand->setIcon( QIcon( ":/folder.png" ) ) ;
61+
m_ui->pbRunCommandPeriodicallyDefault->setIcon( QIcon( ":/icons/setting_reset.png" ) );
5662

5763
connect( m_ui->pushButton,&QPushButton::clicked,[ this ](){ this->HideUI() ; } ) ;
5864

src/configoptions.ui

+22-22
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<x>0</x>
88
<y>0</y>
99
<width>621</width>
10-
<height>475</height>
10+
<height>498</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
@@ -19,11 +19,11 @@
1919
<x>20</x>
2020
<y>10</y>
2121
<width>581</width>
22-
<height>431</height>
22+
<height>451</height>
2323
</rect>
2424
</property>
2525
<property name="currentIndex">
26-
<number>0</number>
26+
<number>1</number>
2727
</property>
2828
<widget class="QWidget" name="widget">
2929
<attribute name="title">
@@ -33,7 +33,7 @@
3333
<property name="geometry">
3434
<rect>
3535
<x>120</x>
36-
<y>360</y>
36+
<y>370</y>
3737
<width>331</width>
3838
<height>33</height>
3939
</rect>
@@ -123,7 +123,7 @@
123123
<x>120</x>
124124
<y>0</y>
125125
<width>191</width>
126-
<height>26</height>
126+
<height>28</height>
127127
</rect>
128128
</property>
129129
<layout class="QHBoxLayout" name="horizontalLayout">
@@ -142,7 +142,7 @@
142142
<x>120</x>
143143
<y>30</y>
144144
<width>166</width>
145-
<height>26</height>
145+
<height>28</height>
146146
</rect>
147147
</property>
148148
<layout class="QHBoxLayout" name="horizontalLayout_2">
@@ -161,7 +161,7 @@
161161
<x>120</x>
162162
<y>60</y>
163163
<width>195</width>
164-
<height>26</height>
164+
<height>28</height>
165165
</rect>
166166
</property>
167167
<layout class="QHBoxLayout" name="horizontalLayout_3">
@@ -180,7 +180,7 @@
180180
<x>120</x>
181181
<y>90</y>
182182
<width>141</width>
183-
<height>26</height>
183+
<height>28</height>
184184
</rect>
185185
</property>
186186
<layout class="QHBoxLayout" name="horizontalLayout_4">
@@ -199,7 +199,7 @@
199199
<x>120</x>
200200
<y>120</y>
201201
<width>288</width>
202-
<height>26</height>
202+
<height>28</height>
203203
</rect>
204204
</property>
205205
<layout class="QHBoxLayout" name="horizontalLayout_5">
@@ -218,7 +218,7 @@
218218
<x>120</x>
219219
<y>150</y>
220220
<width>252</width>
221-
<height>26</height>
221+
<height>28</height>
222222
</rect>
223223
</property>
224224
<layout class="QHBoxLayout" name="horizontalLayout_6">
@@ -307,7 +307,7 @@
307307
<widget class="QPushButton" name="pbMountPointPrefix">
308308
<property name="geometry">
309309
<rect>
310-
<x>470</x>
310+
<x>465</x>
311311
<y>30</y>
312312
<width>31</width>
313313
<height>33</height>
@@ -397,7 +397,7 @@
397397
<widget class="QPushButton" name="pbPostMountCommand">
398398
<property name="geometry">
399399
<rect>
400-
<x>470</x>
400+
<x>465</x>
401401
<y>210</y>
402402
<width>31</width>
403403
<height>33</height>
@@ -410,7 +410,7 @@
410410
<widget class="QPushButton" name="pbPreUnMountCommand">
411411
<property name="geometry">
412412
<rect>
413-
<x>470</x>
413+
<x>465</x>
414414
<y>270</y>
415415
<width>31</width>
416416
<height>33</height>
@@ -452,7 +452,7 @@
452452
<widget class="QPushButton" name="pbRunPeriodicallyCommand">
453453
<property name="geometry">
454454
<rect>
455-
<x>470</x>
455+
<x>465</x>
456456
<y>330</y>
457457
<width>31</width>
458458
<height>33</height>
@@ -465,9 +465,9 @@
465465
<widget class="QLineEdit" name="lineEditRunPeriodicallyInterval">
466466
<property name="geometry">
467467
<rect>
468-
<x>330</x>
469-
<y>360</y>
470-
<width>131</width>
468+
<x>400</x>
469+
<y>370</y>
470+
<width>61</width>
471471
<height>31</height>
472472
</rect>
473473
</property>
@@ -476,8 +476,8 @@
476476
<property name="geometry">
477477
<rect>
478478
<x>70</x>
479-
<y>360</y>
480-
<width>251</width>
479+
<y>370</y>
480+
<width>311</width>
481481
<height>31</height>
482482
</rect>
483483
</property>
@@ -494,7 +494,7 @@
494494
<widget class="QPushButton" name="pbSetFileManager">
495495
<property name="geometry">
496496
<rect>
497-
<x>470</x>
497+
<x>465</x>
498498
<y>90</y>
499499
<width>31</width>
500500
<height>33</height>
@@ -507,7 +507,7 @@
507507
<widget class="QPushButton" name="pbSetExternalCommand">
508508
<property name="geometry">
509509
<rect>
510-
<x>470</x>
510+
<x>465</x>
511511
<y>150</y>
512512
<width>31</width>
513513
<height>33</height>
@@ -619,7 +619,7 @@
619619
<property name="geometry">
620620
<rect>
621621
<x>220</x>
622-
<y>440</y>
622+
<y>460</y>
623623
<width>131</width>
624624
<height>33</height>
625625
</rect>

src/icon.qrc

+1
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,6 @@
1010
<file>lock.png</file>
1111
<file>icons/password_show.png</file>
1212
<file>icons/password_hide.png</file>
13+
<file>icons/setting_reset.png</file>
1314
</qresource>
1415
</RCC>

src/icons/setting_reset.png

2.03 KB
Loading

0 commit comments

Comments
 (0)