Merge pull request #215 from skcin/votingdialog

Qt Votingdialog
gridcoin-community · Mar 26, 2017 · dd8e47f · dd8e47f
2 parents ab7194c + 3bc1038
commit dd8e47f
Show file tree

Hide file tree

Showing 4 changed files with 585 additions and 167 deletions.
diff --git a/gridcoinresearch.pro b/gridcoinresearch.pro
@@ -18,6 +18,13 @@ greaterThan(QT_MAJOR_VERSION, 4) {
 win32:CONFIG += qaxcontainer
 CONFIG += exceptions
 
+lessThan(QT_VERSION, 5.7.0) {
+    # Qt charts not available
+}else{
+    QT += charts
+}
+
+QT += concurrent
 
 # for boost 1.37, add -mt to the boost libraries
 # use: qmake BOOST_LIB_SUFFIX=-mt
@@ -163,7 +170,6 @@ 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 \
@@ -179,6 +185,7 @@ HEADERS += src/qt/bitcoingui.h \
     src/qt/upgradedialog.h \
     src/qt/editaddressdialog.h \
     src/qt/bitcoinaddressvalidator.h \
+    src/qt/votingdialog.h \
     src/alert.h \
     src/addrman.h \
     src/base58.h \
@@ -252,7 +259,6 @@ HEADERS += src/qt/bitcoingui.h \
     src/sql.h \
     src/upgrader.h
 
-    #missing:    src/qt/votingdialog.cpp \
 
 
 SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \
@@ -268,6 +274,7 @@ SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \
     src/qt/upgradedialog.cpp \
     src/qt/editaddressdialog.cpp \
     src/qt/bitcoinaddressvalidator.cpp \
+    src/qt/votingdialog.cpp \
     src/alert.cpp \
     src/version.cpp \
     src/sync.cpp \

diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
@@ -29,7 +29,7 @@
 #include "signverifymessagedialog.h"
 #include "optionsdialog.h"
 #include "aboutdialog.h"
-//#include "votingdialog.h"
+#include "votingdialog.h"
 
 #include "clientmodel.h"
 #include "walletmodel.h"
@@ -967,7 +967,7 @@ void BitcoinGUI::createActions()
 	votingAction->setMenuRole(QAction::TextHeuristicRole);
 
 
-	votingReservedAction = new QAction(QIcon(":/icons/bitcoin"), tr("&Reserved - Voting Linux"), this);
+    votingReservedAction = new QAction(QIcon(":/icons/bitcoin"), tr("&Voting Linux"), this);
 	votingReservedAction->setStatusTip(tr("Voting - Linux"));
 	votingReservedAction->setMenuRole(QAction::TextHeuristicRole);
 
@@ -1096,13 +1096,17 @@ void BitcoinGUI::createMenuBar()
 	rebuild->addAction(rebootAction);
 	rebuild->addSeparator();
 
-#ifdef WIN32  // The actions in this menu are implemented in Visual Basic and thus only work on Windows
 	QMenu *qmAdvanced = appMenuBar->addMenu(tr("&Advanced"));
 	qmAdvanced->addSeparator();
+#ifdef WIN32  // Some actions in this menu are implemented in Visual Basic and thus only work on Windows    
 	qmAdvanced->addAction(configAction);
 	qmAdvanced->addAction(miningAction);
 	qmAdvanced->addAction(votingAction);
+#endif /* defined(WIN32) */
+
 	qmAdvanced->addAction(votingReservedAction);
+
+#ifdef WIN32  // Some actions in this menu are implemented in Visual Basic and thus only work on Windows 
 	qmAdvanced->addAction(tickerAction);
 	qmAdvanced->addAction(ticketListAction);
 	qmAdvanced->addAction(newUserWizardAction);
@@ -1301,9 +1305,10 @@ void BitcoinGUI::aboutClicked()
 
 void BitcoinGUI::votingReservedClicked()
 {
-    //VotingDialog dlg;
-    //dlg.setModel(clientModel);
-    //dlg.exec();
+    VotingDialog *dlg = new VotingDialog(this);
+    dlg->setStyleSheet("QDialog { background-image:url(:images/bkg);} QTabWidget{ background-color: transparent; color: black;} QTabWidget::pane { border: 1px solid rgb(100,100,100); } QTabBar::tab { background: rgb(150,150,150); color: black; border: 1px solid rgb(100,100,100); border-top-left-radius: 4px; border-top-right-radius: 4px; min-width: 8ex; padding: 2px; } QTabBar::tab:selected { background: rgb(200,200,200); border: 1px solid rgb(100,100,100); border-bottom-color: rgb(200,200,200); } QTabBar::tab:hover { background: rgb(76,155,195); } QTabBar::tab:!selected { margin-top: 2px; } QTableView { alternate-background-color:rgb(255,255,255); background-color:transparent; color:black;} QListWidget {color:black; background-color:transparent;} QLabel {color:black;} QGroupBox {background-color:transparent;} QLineEdit {background-color:lightgray; color:black} QHeaderView::section { background-color:lightgray; color:black; } QPushButton { background-color:lightgray; color:black; } QComboBox { background-color:lightgray; color:black; }");
+    dlg->resetData();
+    dlg->show();
 }