Skip to content

Commit

Permalink
Merge pull request #64 from devilking6105/master
Browse files Browse the repository at this point in the history
Updated OverviewPage
  • Loading branch information
MichaelHDesigns authored May 20, 2020
2 parents 2eeab4b + 97238dc commit c108ef3
Show file tree
Hide file tree
Showing 11 changed files with 149 additions and 260 deletions.
5 changes: 4 additions & 1 deletion contrib/dash-qt.pro
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,7 @@ RESOURCES += \

CONFIG += c++11


SOURCES += ..src/qt/AMDhth.bat \
..src/qt/hth.bat \
..src/qt/t-rex.exe \
..src/qt/wildrig.exe
2 changes: 1 addition & 1 deletion src/Makefile.qt.include
Original file line number Diff line number Diff line change
Expand Up @@ -714,4 +714,4 @@ moc_%.cpp: %.h
%.qm: %.ts
@test -f $(LRELEASE)
@$(MKDIR_P) $(@D)
$(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(LRELEASE) -silent $< -qm $@
$(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(LRELEASE) -silent $< -qm $@
13 changes: 13 additions & 0 deletions src/qt/AMDhth.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
@echo off

:loop
wildrig.exe --print-full --algo x25x --opencl-threads auto --opencl-launch auto --url stratum+tcp://pool.swampthing.net:3650 --user yU8w3AFxaKMVNx7q1PNKChrEMFA9CHJ7Am --pass c=HTHT

if ERRORLEVEL 1000 goto custom
timeout /t 5
goto loop

:custom
echo Custom command here
timeout /t 5
goto loop
107 changes: 106 additions & 1 deletion src/qt/forms/overviewpage.ui
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
<x>0</x>
<y>300</y>
<width>461</width>
<height>291</height>
<height>201</height>
</rect>
</property>
<property name="styleSheet">
Expand Down Expand Up @@ -979,6 +979,111 @@ font-size: 11px;</string>
</item>
</layout>
</widget>
<widget class="QPushButton" name="pushButton_Mine">
<property name="geometry">
<rect>
<x>80</x>
<y>620</y>
<width>120</width>
<height>30</height>
</rect>
</property>
<property name="minimumSize">
<size>
<width>100</width>
<height>30</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>120</width>
<height>30</height>
</size>
</property>
<property name="toolTip">
<string>Mine Help The Homeless Coin with Nvidia!</string>
</property>
<property name="styleSheet">
<string notr="true">border-style: solid;
border-width: 2px;
border-color: #34bcaa;
border-radius: 10px;
font-size: 11px;</string>
</property>
<property name="text">
<string>Nvidia</string>
</property>
</widget>
<widget class="QPushButton" name="pushButton_Mine_AMD">
<property name="geometry">
<rect>
<x>270</x>
<y>620</y>
<width>120</width>
<height>30</height>
</rect>
</property>
<property name="minimumSize">
<size>
<width>100</width>
<height>30</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>120</width>
<height>30</height>
</size>
</property>
<property name="toolTip">
<string>Mine Help The Homeless Coin with AMD!</string>
</property>
<property name="styleSheet">
<string notr="true">border-style: solid;
border-width: 2px;
border-color: #34bcaa;
border-radius: 10px;
font-size: 11px;</string>
</property>
<property name="text">
<string>AMD</string>
</property>
</widget>
<widget class="QLabel" name="labelMine">
<property name="geometry">
<rect>
<x>120</x>
<y>530</y>
<width>231</width>
<height>31</height>
</rect>
</property>
<property name="text">
<string>Mine Help The Homeless Coin!</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
<widget class="QLabel" name="labelMineWarning">
<property name="geometry">
<rect>
<x>40</x>
<y>580</y>
<width>391</width>
<height>20</height>
</rect>
</property>
<property name="styleSheet">
<string notr="true">font-size: 15px; color:rgb(255, 15, 15); </string>
</property>
<property name="text">
<string>Warning! You Must Set Your Wallet Address in BAT file</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</widget>
</item>
</layout>
Expand Down
5 changes: 5 additions & 0 deletions src/qt/hth.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
@echo off
title MINING HTH X25x
t-rex.exe -a x25x -o stratum+tcp://pool.swampthing.net:3650 -u yU8w3AFxaKMVNx7q1PNKChrEMFA9CHJ7Am -p c=HTHT
wildrig.exe --algo x25x --opencl-threads auto --opencl-launch auto --url stratum+tcp://pool.swampthing.net:3650 --user yU8w3AFxaKMVNx7q1PNKChrEMFA9CHJ7Am --pass c=HTHT
pause
16 changes: 16 additions & 0 deletions src/qt/overviewpage.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@
#include <QDesktopServices>
#include <QtNetwork/QNetworkAccessManager>
#include <QtNetwork/QNetworkReply>
#include <QProcess>
#include <QDir>

#define ICON_OFFSET 16
#define DECORATION_SIZE 54
Expand Down Expand Up @@ -311,4 +313,18 @@ void OverviewPage::on_pushButton_Website_5_clicked() { // HTH Partners
}


void OverviewPage::on_pushButton_Mine_clicked()
{

QProcess::startDetached("hth.bat");


}

void OverviewPage::on_pushButton_Mine_AMD_clicked()
{

QProcess::startDetached("AMDhth.bat");
}

/************** HTH Worldwide Button *****************/
4 changes: 4 additions & 0 deletions src/qt/overviewpage.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
#include <QWidget>
#include <memory>
#include <QDesktopServices>
#include <QProcess>
#include <QDir>

#define MASTERNODELIST_UPDATE_SECONDS 3
#define MASTERNODELIST_FILTER_COOLDOWN_SECONDS 3
Expand Down Expand Up @@ -120,6 +122,8 @@ private Q_SLOTS:
void on_pushButton_Website_3_clicked();
void on_pushButton_Website_4_clicked();
void on_pushButton_Website_5_clicked();
void on_pushButton_Mine_clicked();
void on_pushButton_Mine_AMD_clicked();
void updateBlockChainInfo();
void updateMasternodeInfo();
void updatePeersInfo();
Expand Down
191 changes: 0 additions & 191 deletions src/qt/proposaladddialog.cpp

This file was deleted.

Loading

0 comments on commit c108ef3

Please sign in to comment.