@@ -453,12 +453,12 @@ void BitcoinGUI::createToolBars()
453453 // "Tabs" toolbar (vertical, aligned on left side of overview screen).
454454 QToolBar *toolbar = addToolBar (" Tabs toolbar"
455455 toolbar->setObjectName (" toolbar"
456- addToolBar (Qt::LeftToolBarArea,toolbar);
456+ addToolBar (Qt::LeftToolBarArea, toolbar);
457457 toolbar->setOrientation (Qt::Vertical);
458- toolbar->setMovable ( false );
458+ toolbar->setMovable (false );
459459 toolbar->setToolButtonStyle (Qt::ToolButtonTextUnderIcon);
460460 toolbar->setContextMenuPolicy (Qt::PreventContextMenu);
461- toolbar->setIconSize (QSize (50 ,25 ));
461+ toolbar->setIconSize (QSize (50 , 25 ));
462462 toolbar->addAction (overviewAction);
463463 toolbar->addAction (sendCoinsAction);
464464 toolbar->addAction (receiveCoinsAction);
@@ -474,10 +474,23 @@ void BitcoinGUI::createToolBars()
474474 toolbar->addAction (unlockWalletAction);
475475 toolbar->addAction (lockWalletAction);
476476
477- // Status bar notification icons
477+ addToolBarBreak (Qt::LeftToolBarArea);
478+
479+
480+ // Status bar notification icons (Status toolbar)
481+ QToolBar *toolbar2 = addToolBar (" Status toolbar"
482+ addToolBar (Qt::LeftToolBarArea, toolbar2);
483+ toolbar2->setOrientation (Qt::Vertical);
484+ // toolbar2->setGeometry(0, 0, STATUSBAR_ICONSIZE, 0);
485+ toolbar2->setMinimumWidth (STATUSBAR_ICONSIZE);
486+ toolbar2->setContentsMargins (0 , 0 , 0 , 0 );
487+ toolbar2->setMovable (false );
488+ toolbar2->setObjectName (" toolbar2"
489+
478490 QFrame *frameBlocks = new QFrame ();
479491
480492 frameBlocks->setContentsMargins (0 ,0 ,0 ,0 );
493+ frameBlocks->setMinimumWidth (STATUSBAR_ICONSIZE);
481494
482495 QVBoxLayout *frameBlocksLayout = new QVBoxLayout (frameBlocks);
483496 frameBlocksLayout->setContentsMargins (1 ,0 ,1 ,0 );
@@ -487,14 +500,16 @@ void BitcoinGUI::createToolBars()
487500 labelConnectionsIcon = new QLabel ();
488501 labelBlocksIcon = new QLabel ();
489502 labelScraperIcon = new QLabel ();
503+ labelBeaconIcon = new QLabel ();
490504
491505 frameBlocksLayout->addWidget (labelEncryptionIcon);
492506 frameBlocksLayout->addWidget (labelStakingIcon);
493507 frameBlocksLayout->addWidget (labelConnectionsIcon);
494508 frameBlocksLayout->addWidget (labelBlocksIcon);
495509 frameBlocksLayout->addWidget (labelScraperIcon);
496- // 12-21-2015 Prevent Lock from falling off the page
510+ frameBlocksLayout-> addWidget (labelBeaconIcon);
497511
512+ // 12-21-2015 Prevent Lock from falling off the page
498513 frameBlocksLayout->addStretch ();
499514
500515 if (GetBoolArg (" -staking" true ))
@@ -505,22 +520,21 @@ void BitcoinGUI::createToolBars()
505520 updateStakingIcon ();
506521 }
507522
508- frameBlocks->setObjectName (" frame"
509- addToolBarBreak (Qt::LeftToolBarArea);
510- QToolBar *toolbar2 = addToolBar (" Tabs toolbar"
511- addToolBar (Qt::LeftToolBarArea,toolbar2);
512- toolbar2->setOrientation (Qt::Vertical);
513- toolbar2->setMovable ( false );
514- toolbar2->setObjectName (" toolbar2"
523+ QTimer *timerBeaconIcon = new QTimer (labelBeaconIcon);
524+ connect (timerBeaconIcon, SIGNAL (timeout ()), this , SLOT (updateBeaconIcon ()));
525+ timerBeaconIcon->start (30 * 1000 );
526+ updateBeaconIcon ();
527+
515528 toolbar2->addWidget (frameBlocks);
516529
517530 addToolBarBreak (Qt::TopToolBarArea);
518531
532+
519533 // Top tool bar (clickable Gridcoin and BOINC logos)
520534 QToolBar *toolbar3 = addToolBar (" Logo bar"
521- addToolBar (Qt::TopToolBarArea,toolbar3);
535+ addToolBar (Qt::TopToolBarArea, toolbar3);
522536 toolbar3->setOrientation (Qt::Horizontal);
523- toolbar3->setMovable ( false );
537+ toolbar3->setMovable (false );
524538 toolbar3->setObjectName (" toolbar3"
525539 ClickLabel *grcLogoLabel = new ClickLabel ();
526540 grcLogoLabel->setObjectName (" gridcoinLogoHorizontal"
@@ -1498,13 +1512,13 @@ void BitcoinGUI::updateStakingIcon()
14981512 if (staking)
14991513 {
15001514 QString text = GetEstimatedStakingFrequency (GetEstimatedTimetoStake ());
1501- labelStakingIcon->setPixmap (QIcon (" :/icons/staking_on" pixmap (STATUSBAR_ICONSIZE,STATUSBAR_ICONSIZE));
1515+ labelStakingIcon->setPixmap (QIcon (" :/icons/staking_on" pixmap (STATUSBAR_ICONSIZE, STATUSBAR_ICONSIZE));
15021516 labelStakingIcon->setToolTip (tr (" Staking.<br>Your weight is %1<br>Network weight is %2<br><b>Estimated</b> staking frequency is %3."
15031517 .arg (nWeight).arg (nNetworkWeight).arg (text));
15041518 }
15051519 else
15061520 {
1507- labelStakingIcon->setPixmap (QIcon (" :/icons/staking_off" pixmap (STATUSBAR_ICONSIZE,STATUSBAR_ICONSIZE));
1521+ labelStakingIcon->setPixmap (QIcon (" :/icons/staking_off" pixmap (STATUSBAR_ICONSIZE, STATUSBAR_ICONSIZE));
15081522 // Part of this string wont be translated :(
15091523 labelStakingIcon->setToolTip (tr (" Not staking; %1" arg (QString (ReasonNotStaking.c_str ())));
15101524 }
@@ -1569,7 +1583,7 @@ void BitcoinGUI::updateScraperIcon(int scraperEventtype, int status)
15691583 }
15701584 else if (scraperEventtype == (int )scrapereventtypes::Sleep && status == CT_NEW)
15711585 {
1572- labelScraperIcon->setPixmap (QIcon (" :/icons/staking_off " pixmap (STATUSBAR_ICONSIZE, STATUSBAR_ICONSIZE));
1586+ labelScraperIcon->setPixmap (QIcon (" :/icons/grey_scraper " pixmap (STATUSBAR_ICONSIZE, STATUSBAR_ICONSIZE));
15731587 labelScraperIcon->setToolTip (tr (" Scraper: superblock not needed - inactive."
15741588 }
15751589 else if (scraperEventtype == (int )scrapereventtypes::Stats && (status == CT_NEW || status == CT_UPDATED || status == CT_UPDATING))
@@ -1580,7 +1594,7 @@ void BitcoinGUI::updateScraperIcon(int scraperEventtype, int status)
15801594 else if ((scraperEventtype == (int )scrapereventtypes::Convergence || scraperEventtype == (int )scrapereventtypes::SBContract)
15811595 && (status == CT_NEW || status == CT_UPDATED) && nConvergenceTime)
15821596 {
1583- labelScraperIcon->setPixmap (QIcon (" :/icons/staking_on " pixmap (STATUSBAR_ICONSIZE, STATUSBAR_ICONSIZE));
1597+ labelScraperIcon->setPixmap (QIcon (" :/icons/green_scraper " pixmap (STATUSBAR_ICONSIZE, STATUSBAR_ICONSIZE));
15841598
15851599 if (bDisplayScrapers)
15861600 {
@@ -1606,8 +1620,14 @@ void BitcoinGUI::updateScraperIcon(int scraperEventtype, int status)
16061620 else if ((scraperEventtype == (int )scrapereventtypes::Convergence || scraperEventtype == (int )scrapereventtypes::SBContract)
16071621 && status == CT_DELETED)
16081622 {
1609- labelScraperIcon->setPixmap (QIcon (" :/icons/quit " pixmap (STATUSBAR_ICONSIZE, STATUSBAR_ICONSIZE));
1623+ labelScraperIcon->setPixmap (QIcon (" :/icons/red_and_white_x " pixmap (STATUSBAR_ICONSIZE, STATUSBAR_ICONSIZE));
16101624 labelScraperIcon->setToolTip (tr (" Scraper: No convergence able to be achieved. Will retry in a few minutes."
16111625 }
16121626
16131627}
1628+
1629+ void BitcoinGUI::updateBeaconIcon ()
1630+ {
1631+ labelBeaconIcon->setPixmap (QIcon (" :/icons/beacon_green" pixmap (STATUSBAR_ICONSIZE, STATUSBAR_ICONSIZE));
1632+ labelBeaconIcon->setToolTip (tr (" Iconsize = %1." arg (QString (std::to_string (STATUSBAR_ICONSIZE).c_str ())));
1633+ }
0 commit comments