Permalink
Browse files

3.5.8.5-leisure

Checking in Joe's code for linux cross compatible voting.  This is
currently disabled in Prod.
Passing development over to Grisou.
  • Loading branch information...
1 parent 41add47 commit 6422a1b74e7c8b254b980737a473fb18173e56dc @gridcoin committed Jan 6, 2017
View
@@ -1,6 +1,6 @@
#############################################################################
# Makefile for building: gridcoinresearch
-# Generated by qmake (2.01a) (Qt 4.8.4) on: Sat Dec 31 17:22:56 2016
+# Generated by qmake (2.01a) (Qt 4.8.4) on: Thu Jan 5 19:45:15 2017
# Project: gridcoinresearch.pro
# Template: app
#############################################################################
View
@@ -1,6 +1,6 @@
#############################################################################
# Makefile for building: gridcoinresearch
-# Generated by qmake (2.01a) (Qt 4.8.4) on: Sat Dec 31 17:22:57 2016
+# Generated by qmake (2.01a) (Qt 4.8.4) on: Thu Jan 5 19:45:15 2017
# Project: gridcoinresearch.pro
# Template: app
#############################################################################
@@ -454,13 +454,15 @@ Module modGRC
Dim RACURL As String = "http://cpid.gridcoin.us:5000/"
Dim sURL As String = RACURL + "get_user.php?cpid=" + sCPID
Dim w As New MyWebClient
- Dim sRAC As String
+ Dim sRAC As String = ""
Try
sRAC = w.DownloadString(sURL)
Catch ex As Exception
End Try
+ If sRAC = "" Then sRAC = "0" : Return 0
+
Dim vRAC() As String
vRAC = Split(sRAC, "<project>")
dProjectByteLength = Len(sRAC)
@@ -166,6 +166,8 @@ contains(USE_O3, 1) {
QMAKE_CXXFLAGS_WARN_ON = -fdiagnostics-show-option -Wall -Wextra -Wno-ignored-qualifiers -Wformat -Wformat-security -Wno-unused-parameter -Wstack-protector
# Input
+# missing: src/qt/votingdialog.h \
+
DEPENDPATH += src src/json src/qt
HEADERS += src/qt/bitcoingui.h \
src/qt/transactiontablemodel.h \
@@ -177,7 +179,7 @@ HEADERS += src/qt/bitcoingui.h \
src/qt/addressbookpage.h \
src/qt/signverifymessagedialog.h \
src/qt/aboutdialog.h \
- src/qt/upgradedialog.h \
+ src/qt/upgradedialog.h \
src/qt/editaddressdialog.h \
src/qt/bitcoinaddressvalidator.h \
src/alert.h \
@@ -251,7 +253,10 @@ HEADERS += src/qt/bitcoingui.h \
src/threadsafety.h \
src/cpid.h \
src/sql.h \
- src/upgrader.h
+ src/upgrader.h
+
+ #missing: src/qt/votingdialog.cpp \
+
SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \
src/qt/transactiontablemodel.cpp \
View
@@ -9,7 +9,7 @@
#define CLIENT_VERSION_MAJOR 3
#define CLIENT_VERSION_MINOR 5
#define CLIENT_VERSION_REVISION 8
-#define CLIENT_VERSION_BUILD 4
+#define CLIENT_VERSION_BUILD 5
// Converts the parameter X to a string after macro replacement on X has been performed.
// Don't merge these into one macro!
View
@@ -30,6 +30,8 @@
#include "signverifymessagedialog.h"
#include "optionsdialog.h"
#include "aboutdialog.h"
+//#include "votingdialog.h"
+
#include "clientmodel.h"
#include "walletmodel.h"
#include "editaddressdialog.h"
@@ -971,6 +973,11 @@ void BitcoinGUI::createActions()
votingAction->setMenuRole(QAction::TextHeuristicRole);
+ votingReservedAction = new QAction(QIcon(":/icons/bitcoin"), tr("&Reserved - Voting Linux"), this);
+ votingReservedAction->setStatusTip(tr("Voting - Linux"));
+ votingReservedAction->setMenuRole(QAction::TextHeuristicRole);
+
+
galazaAction = new QAction(QIcon(":/icons/bitcoin"), tr("&Galaza (Game)"), this);
galazaAction->setStatusTip(tr("Galaza"));
galazaAction->setMenuRole(QAction::TextHeuristicRole);
@@ -1031,6 +1038,7 @@ void BitcoinGUI::createActions()
connect(miningAction, SIGNAL(triggered()), this, SLOT(miningClicked()));
connect(votingAction, SIGNAL(triggered()), this, SLOT(votingClicked()));
+ connect(votingReservedAction, SIGNAL(triggered()), this, SLOT(votingReservedClicked()));
connect(tickerAction, SIGNAL(triggered()), this, SLOT(tickerClicked()));
connect(ticketListAction, SIGNAL(triggered()), this, SLOT(ticketListClicked()));
@@ -1100,6 +1108,7 @@ void BitcoinGUI::createMenuBar()
qmAdvanced->addAction(configAction);
qmAdvanced->addAction(miningAction);
qmAdvanced->addAction(votingAction);
+ qmAdvanced->addAction(votingReservedAction);
qmAdvanced->addAction(tickerAction);
qmAdvanced->addAction(ticketListAction);
qmAdvanced->addAction(newUserWizardAction);
@@ -1294,6 +1303,15 @@ void BitcoinGUI::aboutClicked()
dlg.exec();
}
+
+void BitcoinGUI::votingReservedClicked()
+{
+ //VotingDialog dlg;
+ //dlg.setModel(clientModel);
+ //dlg.exec();
+}
+
+
void BitcoinGUI::setNumConnections(int count)
{
QString icon;
View
@@ -115,6 +115,7 @@ class BitcoinGUI : public QMainWindow
QAction *ticketListAction;
QAction *votingAction;
+ QAction *votingReservedAction;
QAction *galazaAction;
QAction *newUserWizardAction;
@@ -220,6 +221,8 @@ private slots:
void configClicked();
void miningClicked();
void votingClicked();
+ void votingReservedClicked();
+
void faqClicked();
void diagnosticsClicked();
Oops, something went wrong.

0 comments on commit 6422a1b

Please sign in to comment.