Skip to content

Commit

Permalink
Merge pull request #69 from devilking6105/master
Browse files Browse the repository at this point in the history 
Added Warning to ModalOverlay
  • Loading branch information
@MichaelHDesigns
MichaelHDesigns authored May 23, 2020
2 parents 7fa0463 + d0ae243 commit 94d10e5
Show file tree
Hide file tree
Showing 16 changed files with 373 additions and 136 deletions.
2 changes: 0 additions & 2 deletions src/Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,6 @@ BITCOIN_CORE_H = \
zmq/zmqnotificationinterface.h \
zmq/zmqpublishnotifier.h


obj/build.h: FORCE
@$(MKDIR_P) $(builddir)/obj
@$(top_srcdir)/share/genbuild.sh $(abs_top_builddir)/src/obj/build.h \
Expand Down Expand Up @@ -436,7 +435,6 @@ crypto_libhelpthehomeless_crypto_a_SOURCES = \
crypto/SWIFFTX/lane.h \
crypto/SWIFFTX/blake2s.h


# consensus: shared between all executables that validate any consensus rules.
libhelpthehomeless_consensus_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
libhelpthehomeless_consensus_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
Expand Down
60 changes: 0 additions & 60 deletions src/annwidget.cpp
View file

This file was deleted.

45 changes: 0 additions & 45 deletions src/annwidget.h
View file

This file was deleted.

3 changes: 2 additions & 1 deletion src/qt/bitcoingui.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -492,6 +492,7 @@ void BitcoinGUI::createActions()
tabGroup->addAction(governanceAction);
connect(governanceAction, SIGNAL(triggered()), this, SLOT(showNormalIfMinimized()));
connect(governanceAction, SIGNAL(triggered()), this, SLOT(gotoGovernancePage()));

}

/* privatesendAction = new QAction(QIcon(":/icons/coinmix"), tr("&Private Send"), this);
Expand Down Expand Up @@ -520,7 +521,7 @@ void BitcoinGUI::createActions()
connect(receiveCoinsMenuAction, SIGNAL(triggered()), this, SLOT(gotoReceiveCoinsPage()));
connect(historyAction, SIGNAL(triggered()), this, SLOT(showNormalIfMinimized()));
connect(historyAction, SIGNAL(triggered()), this, SLOT(gotoHistoryPage()));
/* connect(privatesendAction, SIGNAL(triggered()), this, SLOT(showNormalIfMinimized()));
/* connect(privatesendAction, SIGNAL(triggered()), this, SLOT(showNormalIfMinimized()));
connect(privatesendAction, SIGNAL(triggered()), this, SLOT(gotoPrivateSendPage())); */

#endif // ENABLE_WALLET
Expand Down
2 changes: 1 addition & 1 deletion src/qt/bitcoingui.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ public Q_SLOTS:
private Q_SLOTS:
#ifdef ENABLE_WALLET


/** Switch to masternode page */
void gotoGovernancePage();
/** Switch to private send page */
Expand Down
160 changes: 149 additions & 11 deletions src/qt/forms/modaloverlay.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,16 @@
<rect>
<x>0</x>
<y>0</y>
<width>640</width>
<height>401</height>
<width>797</width>
<height>605</height>
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
<property name="styleSheet">
<string notr="true">font-weight: bold;</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout" stretch="0">
<property name="sizeConstraint">
<enum>QLayout::SetDefaultConstraint</enum>
Expand Down Expand Up @@ -52,7 +55,7 @@
<property name="styleSheet">
<string notr="true"/>
</property>
<layout class="QVBoxLayout" name="verticalLayoutSub" stretch="1,0,0,0,0">
<layout class="QVBoxLayout" name="verticalLayoutSub" stretch="1,0,0,0,0,0">
<property name="spacing">
<number>0</number>
</property>
Expand Down Expand Up @@ -128,8 +131,7 @@
<item>
<widget class="QLabel" name="infoText">
<property name="text">
<string>Recent transactions may not yet be visible, and therefore your wallet's balance might be incorrect. This information will be correct once your wallet has finished synchronizing with the HelpTheHomeless network, as detailed below.</string>

<string>Recent transactions may not yet be visible, and therefore your wallet's balance might be incorrect. This information will be correct once your wallet has finished synchronizing with the HelpTheHomeless network, as detailed below.</string>
</property>
<property name="textFormat">
<enum>Qt::RichText</enum>
Expand All @@ -148,9 +150,7 @@
</font>
</property>
<property name="text">

<string>Attempting to spend HTH that are affected by not-yet-displayed transactions will not be accepted by the network.</string>

<string>Attempting to spend HTH that are affected by not-yet-displayed transactions will not be accepted by the network.</string>
</property>
<property name="textFormat">
<enum>Qt::RichText</enum>
Expand All @@ -165,6 +165,9 @@
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
Expand All @@ -178,14 +181,146 @@
</layout>
</item>
<item>
<spacer name="verticalSpacerAfterText">
<widget class="QFrame" name="frame">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>657</width>
<height>87</height>
</size>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<widget class="QWidget" name="layoutWidget">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>651</width>
<height>81</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayoutIconText_2" stretch="0,0,1">
<property name="topMargin">
<number>20</number>
</property>
<item>
<layout class="QVBoxLayout" name="verticalLayoutIcon_2">
<property name="leftMargin">
<number>0</number>
</property>
<item>
<widget class="QPushButton" name="warningIcon_2">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string/>
</property>
<property name="icon">
<iconset>
<normaloff>:/icons/www</normaloff>
<disabledoff>:/icons/www</disabledoff>:/icons/www</iconset>
</property>
<property name="iconSize">
<size>
<width>48</width>
<height>48</height>
</size>
</property>
<property name="flat">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacerWarningIcon_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>113</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayoutInfoText_2">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="infoText_2">
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="styleSheet">
<string notr="true">color: red;</string>
</property>
<property name="text">
<string>Before starting THE AMD &amp; NVIDIA MINING SOFTWARE, User MUST add their HTH Wallet Address &amp; Pool Info to the BAT Files. Default Pool Settings Apply</string>
</property>
<property name="textFormat">
<enum>Qt::RichText</enum>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</widget>
</item>
<item>
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
<height>75</height>
</size>
</property>
</spacer>
Expand Down Expand Up @@ -363,10 +498,13 @@
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
<height>10</height>
</size>
</property>
</spacer>
Expand Down
2 changes: 1 addition & 1 deletion src/qt/modaloverlay.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ bestHeaderHeight(0),
bestHeaderDate(QDateTime()),
layerIsVisible(false),
userClosed(false),
foreverHidden(true)
foreverHidden(false)
{
ui->setupUi(this);
connect(ui->closeButton, SIGNAL(clicked()), this, SLOT(closeClicked()));
Expand Down
Loading

0 comments on commit 94d10e5

Please sign in to comment.