[UI] Use only one column for Proposal list

lateminer · Dec 26, 2018 · bbf3274 · bbf3274
1 parent d6c68c6
commit bbf3274
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 11 deletions.
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
@@ -369,7 +369,7 @@ void BitcoinGUI::createActions(const NetworkStyle* networkStyle)
         connect(masternodeAction, SIGNAL(triggered()), this, SLOT(gotoMasternodePage()));
     }
 
-    governanceAction = new QAction(QIcon(":/icons/masternodes"), tr("&Governance"), this);
+    governanceAction = new QAction(QIcon(":/icons/governance"), tr("&Governance"), this);
     governanceAction->setStatusTip(tr("Show Proposals"));
     governanceAction->setToolTip(governanceAction->statusTip());
     governanceAction->setCheckable(true);

diff --git a/src/qt/forms/governancepage.ui b/src/qt/forms/governancepage.ui
@@ -195,7 +195,7 @@
                   <verstretch>1</verstretch>
                  </sizepolicy>
                 </property>
-                <layout class="QGridLayout" name="proposalGrid" rowstretch="0" columnstretch="0">
+                <layout class="QVBoxLayout" name="proposalGrid" rowstretch="0" columnstretch="0">
                  <property name="sizeConstraint">
                   <enum>QLayout::SetDefaultConstraint</enum>
                  </property>
@@ -206,7 +206,7 @@
                   <number>0</number>
                  </property>
                  <property name="rightMargin">
-                  <number>50</number>
+                  <number>0</number>
                  </property>
                  <property name="bottomMargin">
                   <number>0</number>

diff --git a/src/qt/governancepage.cpp b/src/qt/governancepage.cpp
@@ -110,7 +110,7 @@ void GovernancePage::updateProposalList(bool fForce)
 {
     int nCountMyMasternodes = masternodeConfig.getCount();
     std::vector<CBudgetProposal*> winningProps = budget.GetAllProposals();
-    int nGridRow = 0, nGridCol = 0;
+    int nRow = 0;
     for (CBudgetProposal* pbudgetProposal : winningProps) {
         if (!pbudgetProposal->fValid) continue;
         if (pbudgetProposal->GetRemainingPaymentCount() < 1) continue;
@@ -185,13 +185,9 @@ void GovernancePage::updateProposalList(bool fForce)
         proposalItem->addLayout(proposalVotes);
 
         proposalFrame->setMaximumHeight(150);
-        ui->proposalGrid->addWidget(proposalFrame, nGridRow, nGridCol);
-
-        if (nGridCol == 1 ) {
-            ++nGridRow;
-            nGridCol = -1;
-        }
-        ++nGridCol;
+        ui->proposalGrid->addWidget(proposalFrame, nRow);
+
+        ++nRow;
     }
 }
 

diff --git a/src/qt/pivx.qrc b/src/qt/pivx.qrc
@@ -33,6 +33,8 @@
         <file alias="history">res/icons/history.png</file>
         <file alias="overview">res/icons/overview.png</file>
         <file alias="masternodes">res/icons/masternodes.png</file>
+        <file alias="governance">res/icons/governance.png</file>
+        <file alias="governance_dark">res/icons/governance_dark.png</file>
         <file alias="export">res/icons/export.png</file>
         <file alias="synced">res/icons/synced.png</file>
         <file alias="remove">res/icons/remove.png</file>

diff --git a/src/qt/res/icons/governance.png b/src/qt/res/icons/governance.png
diff --git a/src/qt/res/icons/governance_dark.png b/src/qt/res/icons/governance_dark.png