Ecosystem/feather
Ecosystem/feather
1
0
Fork 0
mirror of https://github.com/feather-wallet/feather.git synced 2025-01-22 10:44:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request 'Rename XMRig tab to Mining' (#205) from tobtoht/feather:xmrig_mining into master

Browse source 
Reviewed-on: https://git.wownero.com/feather/feather/pulls/205
This commit is contained in:
tobtoht 2020-12-12 14:29:30 +00:00
commit 6ef4eaa39f
4 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/assets.qrc
View file

@ -48,6 +48,7 @@
<file>assets/images/lock_icon.png</file> <file>assets/images/lock_icon.png</file>
<file>assets/images/lock.svg</file> <file>assets/images/lock.svg</file>
<file>assets/images/microphone.png</file> <file>assets/images/microphone.png</file>
<file>assets/images/mining.png</file>
<file>assets/images/morphtoken.png</file> <file>assets/images/morphtoken.png</file>
<file>assets/images/network.png</file> <file>assets/images/network.png</file>
<file>assets/images/offline_tx.png</file> <file>assets/images/offline_tx.png</file>

BIN
src/assets/images/mining.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.1 KiB

4
src/mainwindow.cpp
View file

@ -413,8 +413,8 @@ void MainWindow::initMenu() {
#if defined(HAS_XMRIG) #if defined(HAS_XMRIG)
connect(ui->actionShow_XMRig, &QAction::triggered, m_tabShowHideSignalMapper, QOverload<>::of(&QSignalMapper::map)); connect(ui->actionShow_XMRig, &QAction::triggered, m_tabShowHideSignalMapper, QOverload<>::of(&QSignalMapper::map));
m_tabShowHideMapper["XMRig"] = new ToggleTab(ui->tabXmrRig, "XMRig", "XMRig", ui->actionShow_XMRig, Config::showTabXMRig); m_tabShowHideMapper["Mining"] = new ToggleTab(ui->tabXmrRig, "Mining", "Mining", ui->actionShow_XMRig, Config::showTabXMRig);
m_tabShowHideSignalMapper->setMapping(ui->actionShow_XMRig, "XMRig"); m_tabShowHideSignalMapper->setMapping(ui->actionShow_XMRig, "Mining");
#else #else
ui->actionShow_XMRig->setVisible(false); ui->actionShow_XMRig->setVisible(false);
#endif #endif

8
src/mainwindow.ui
View file

@ -43,7 +43,7 @@
<item row="1" column="0"> <item row="1" column="0">
<widget class="QTabWidget" name="tabWidget"> <widget class="QTabWidget" name="tabWidget">
<property name="currentIndex"> <property name="currentIndex">
<number>0</number> <number>7</number>
</property> </property>
<property name="iconSize"> <property name="iconSize">
<size> <size>
@ -357,10 +357,10 @@
<widget class="QWidget" name="tabXmrRig"> <widget class="QWidget" name="tabXmrRig">
<attribute name="icon"> <attribute name="icon">
<iconset resource="assets.qrc"> <iconset resource="assets.qrc">
<normaloff>:/assets/images/xmrig.ico</normaloff>:/assets/images/xmrig.ico</iconset> <normaloff>:/assets/images/mining.png</normaloff>:/assets/images/mining.png</iconset>
</attribute> </attribute>
<attribute name="title"> <attribute name="title">
<string>XMRig</string> <string>Mining</string>
</attribute> </attribute>
<layout class="QGridLayout" name="gridLayout_2"> <layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0"> <item row="0" column="0">
@ -700,7 +700,7 @@
</action> </action>
<action name="actionShow_XMRig"> <action name="actionShow_XMRig">
<property name="text"> <property name="text">
<string>Show XMRig</string> <string>Show Mining</string>
</property> </property>
</action> </action>
<action name="actionImportTransaction"> <action name="actionImportTransaction">