Skip to content

Commit

Permalink
Merge pull request #267 from GongHeng2017/20240729-master-fix
Browse files Browse the repository at this point in the history 
fix: The Restore button has no icon
  • Loading branch information
@mhogomchungu
mhogomchungu authored Jul 31, 2024
2 parents ef38da3 + 7c3598d commit e71e619
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 27 deletions.
16 changes: 11 additions & 5 deletions src/configoptions.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,16 +43,22 @@ configOptions::configOptions( QWidget * parent,
m_ui->tabWidget->setCurrentIndex( 0 ) ;

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

m_ui->pbPostMountCommand->setIcon( QIcon( ":/executable.png" ) ) ;
m_ui->pbPostMountCommand->setIcon( QIcon( ":/folder.png" ) ) ;
m_ui->pbRunPostMountCommandDefault->setIcon( QIcon( ":/icons/setting_reset.png" ) );

m_ui->pbPreUnMountCommand->setIcon( QIcon( ":/executable.png" ) ) ;
m_ui->pbPreUnMountCommand->setIcon( QIcon( ":/folder.png" ) ) ;
m_ui->pbRunPreUnMountCommandDefault->setIcon( QIcon( ":/icons/setting_reset.png" ) );

m_ui->pbSetExternalCommand->setIcon( QIcon( ":/executable.png" ) ) ;
m_ui->pbSetExternalCommand->setIcon( QIcon( ":/folder.png" ) ) ;
m_ui->pbExternalExecutableDefault->setIcon( QIcon( ":/icons/setting_reset.png" ) );

m_ui->pbSetFileManager->setIcon( QIcon( ":/executable.png" ) ) ;
m_ui->pbSetFileManager->setIcon( QIcon( ":/folder.png" ) ) ;
m_ui->pbSetFileManagerToDefault->setIcon( QIcon( ":/icons/setting_reset.png" ) );

m_ui->pbRunPeriodicallyCommand->setIcon( QIcon( ":/executable.png" ) ) ;
m_ui->pbRunPeriodicallyCommand->setIcon( QIcon( ":/folder.png" ) ) ;
m_ui->pbRunCommandPeriodicallyDefault->setIcon( QIcon( ":/icons/setting_reset.png" ) );

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

Expand Down
44 changes: 22 additions & 22 deletions src/configoptions.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>621</width>
<height>475</height>
<height>498</height>
</rect>
</property>
<property name="windowTitle">
Expand All @@ -19,11 +19,11 @@
<x>20</x>
<y>10</y>
<width>581</width>
<height>431</height>
<height>451</height>
</rect>
</property>
<property name="currentIndex">
<number>0</number>
<number>1</number>
</property>
<widget class="QWidget" name="widget">
<attribute name="title">
Expand All @@ -33,7 +33,7 @@
<property name="geometry">
<rect>
<x>120</x>
<y>360</y>
<y>370</y>
<width>331</width>
<height>33</height>
</rect>
Expand Down Expand Up @@ -123,7 +123,7 @@
<x>120</x>
<y>0</y>
<width>191</width>
<height>26</height>
<height>28</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
Expand All @@ -142,7 +142,7 @@
<x>120</x>
<y>30</y>
<width>166</width>
<height>26</height>
<height>28</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_2">
Expand All @@ -161,7 +161,7 @@
<x>120</x>
<y>60</y>
<width>195</width>
<height>26</height>
<height>28</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_3">
Expand All @@ -180,7 +180,7 @@
<x>120</x>
<y>90</y>
<width>141</width>
<height>26</height>
<height>28</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_4">
Expand All @@ -199,7 +199,7 @@
<x>120</x>
<y>120</y>
<width>288</width>
<height>26</height>
<height>28</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_5">
Expand All @@ -218,7 +218,7 @@
<x>120</x>
<y>150</y>
<width>252</width>
<height>26</height>
<height>28</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_6">
Expand Down Expand Up @@ -307,7 +307,7 @@
<widget class="QPushButton" name="pbMountPointPrefix">
<property name="geometry">
<rect>
<x>470</x>
<x>465</x>
<y>30</y>
<width>31</width>
<height>33</height>
Expand Down Expand Up @@ -397,7 +397,7 @@
<widget class="QPushButton" name="pbPostMountCommand">
<property name="geometry">
<rect>
<x>470</x>
<x>465</x>
<y>210</y>
<width>31</width>
<height>33</height>
Expand All @@ -410,7 +410,7 @@
<widget class="QPushButton" name="pbPreUnMountCommand">
<property name="geometry">
<rect>
<x>470</x>
<x>465</x>
<y>270</y>
<width>31</width>
<height>33</height>
Expand Down Expand Up @@ -452,7 +452,7 @@
<widget class="QPushButton" name="pbRunPeriodicallyCommand">
<property name="geometry">
<rect>
<x>470</x>
<x>465</x>
<y>330</y>
<width>31</width>
<height>33</height>
Expand All @@ -465,9 +465,9 @@
<widget class="QLineEdit" name="lineEditRunPeriodicallyInterval">
<property name="geometry">
<rect>
<x>330</x>
<y>360</y>
<width>131</width>
<x>400</x>
<y>370</y>
<width>61</width>
<height>31</height>
</rect>
</property>
Expand All @@ -476,8 +476,8 @@
<property name="geometry">
<rect>
<x>70</x>
<y>360</y>
<width>251</width>
<y>370</y>
<width>311</width>
<height>31</height>
</rect>
</property>
Expand All @@ -494,7 +494,7 @@
<widget class="QPushButton" name="pbSetFileManager">
<property name="geometry">
<rect>
<x>470</x>
<x>465</x>
<y>90</y>
<width>31</width>
<height>33</height>
Expand All @@ -507,7 +507,7 @@
<widget class="QPushButton" name="pbSetExternalCommand">
<property name="geometry">
<rect>
<x>470</x>
<x>465</x>
<y>150</y>
<width>31</width>
<height>33</height>
Expand Down Expand Up @@ -619,7 +619,7 @@
<property name="geometry">
<rect>
<x>220</x>
<y>440</y>
<y>460</y>
<width>131</width>
<height>33</height>
</rect>
Expand Down
1 change: 1 addition & 0 deletions src/icon.qrc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,6 @@
<file>lock.png</file>
<file>icons/password_show.png</file>
<file>icons/password_hide.png</file>
<file>icons/setting_reset.png</file>
</qresource>
</RCC>
Binary file added src/icons/setting_reset.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit e71e619

Please sign in to comment.