Skip to content

Commit

Permalink
Merge pull request #589 from proletesseract/521-osx-png-bug
Browse files Browse the repository at this point in the history
OSX pink menu bug
  • Loading branch information
proletesseract authored Aug 21, 2019
2 parents f449aec + cc41912 commit e087919
Show file tree
Hide file tree
Showing 18 changed files with 21 additions and 11 deletions.
10 changes: 10 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -139,3 +139,13 @@ ui_*.h
*.cflags
*.cxxflags
*.creator.*

craig-core.files

craig-core.includes

navcoin-core.code-workspace

craig-core.config

craig-core.creator
22 changes: 11 additions & 11 deletions src/qt/navcoingui.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -606,25 +606,25 @@ void NavCoinGUI::createToolBars()
topMenuLogo->setFixedSize(187,94);
topMenuLogo->setObjectName("navLogo");
topMenuLogo->setStyleSheet(
"#navLogo { border-image: url(:/icons/menu_logo) 0 0 0 0 stretch stretch; border: 0px; }");
"#navLogo { background: url(:/icons/menu_logo) bottom center #eee; border: 0; }");

topMenu1 = new QPushButton();
walletFrame->menuLayout->addWidget(topMenu1);
topMenu1->setFixedSize(139,94);
topMenu1->setObjectName("topMenu1");
connect(topMenu1, SIGNAL(clicked()), this, SLOT(gotoOverviewPage()));
topMenu1->setStyleSheet(
"#topMenu1 { border-image: url(:/icons/menu_home_ns) 0 0 0 0 stretch stretch; border: 0px; }"
"#topMenu1:hover { border-image: url(:/icons/menu_home_hover) 0 0 0 0 stretch stretch; border: 0px; }");
"#topMenu1 { background: url(:/icons/menu_home_ns) bottom center #eee; border: 0; }"
"#topMenu1:hover { background: url(:/icons/menu_home_hover) bottom center #ddd; border: 0; }");

topMenu2 = new QPushButton();
walletFrame->menuLayout->addWidget(topMenu2);
topMenu2->setFixedSize(144,94);
topMenu2->setObjectName("topMenu2");
connect(topMenu2, SIGNAL(clicked()), this, SLOT(gotoSendCoinsPage()));
topMenu2->setStyleSheet(
"#topMenu2 { border-image: url(:/icons/menu_send_ns) 0 0 0 0 stretch stretch; border: 0px; }"
"#topMenu2:hover { border-image: url(:/icons/menu_send_hover) 0 0 0 0 stretch stretch; border: 0px; }");
"#topMenu2 { background: url(:/icons/menu_send_ns) bottom center #eee; border: 0; }"
"#topMenu2:hover { background: url(:/icons/menu_send_hover) bottom center #ddd; border: 0; }");

topMenu3 = new QPushButton();
walletFrame->menuLayout->addWidget(topMenu3);
Expand All @@ -633,25 +633,25 @@ void NavCoinGUI::createToolBars()
connect(topMenu3, SIGNAL(clicked()), this, SLOT(gotoRequestPaymentPage()));
topMenu3->move(469,0);
topMenu3->setStyleSheet(
"#topMenu3 { border-image: url(:/icons/menu_receive_ns) 0 0 0 0 stretch stretch; border: 0px; }"
"#topMenu3:hover { border-image: url(:/icons/menu_receive_hover) 0 0 0 0 stretch stretch; border: 0px; }");
"#topMenu3 { background: url(:/icons/menu_receive_ns) bottom center #eee; border: 0; }"
"#topMenu3:hover { background: url(:/icons/menu_receive_hover) bottom center #ddd; border: 0; }");

topMenu4 = new QPushButton();
walletFrame->menuLayout->addWidget(topMenu4);
topMenu4->setFixedSize(215,94);
topMenu4->setObjectName("topMenu4");
connect(topMenu4, SIGNAL(clicked()), this, SLOT(gotoHistoryPage()));
topMenu4->setStyleSheet(
"#topMenu4 { border-image: url(:/icons/menu_transaction_ns) 0 0 0 0 stretch stretch; border: 0px; }"
"#topMenu4:hover { border-image: url(:/icons/menu_transaction_hover) 0 0 0 0 stretch stretch; border: 0px; }");
"#topMenu4 { background: url(:/icons/menu_transaction_ns) bottom center #eee; border: 0; }"
"#topMenu4:hover { background: url(:/icons/menu_transaction_hover) bottom center #ddd; border: 0; }");
topMenu5 = new QPushButton();
walletFrame->menuLayout->addWidget(topMenu5);
topMenu5->setFixedSize(215,94);
topMenu5->setObjectName("topMenu5");
connect(topMenu5, SIGNAL(clicked()), this, SLOT(gotoCommunityFundPage()));
topMenu5->setStyleSheet(
"#topMenu5 { border-image: url(:/icons/menu_community_fund_ns) 0 0 0 0 stretch stretch; border: 0px; }"
"#topMenu5:hover { border-image: url(:/icons/menu_community_fund_hover) 0 0 0 0 stretch stretch; border: 0px; }");
"#topMenu5 { background: url(:/icons/menu_community_fund_ns) bottom center #eee; border: 0; }"
"#topMenu5:hover { background: url(:/icons/menu_community_fund_hover) bottom center #ddd; border: 0; }");
QWidget *topMenu = new QWidget();
topMenu->setObjectName("topMenu");
topMenu->setStyleSheet(
Expand Down
Binary file modified src/qt/res/icons/community_fund_hover.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/community_fund_ns.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/community_fund_s.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/home_hover.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/home_ns.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/home_s.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/logo_ns.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/receive_hover.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/receive_ns.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/receive_s.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/send_hover.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/send_ns.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/send_s.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/transaction_hover.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/transaction_ns.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/qt/res/icons/transaction_s.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit e087919

Please sign in to comment.