Commit ae117074 by gujin.wang

隐藏悬浮窗上的设置按钮

parent c160abc6
...@@ -179,6 +179,12 @@ void NavWindow::createMenuBtn(const QString &btnName, const QString &showName) ...@@ -179,6 +179,12 @@ void NavWindow::createMenuBtn(const QString &btnName, const QString &showName)
emit menuBtnClicked(btnName); emit menuBtnClicked(btnName);
}); });
//设置按钮不显示在悬浮窗上
if(btnName == "tool")
{
return;
}
auto btn = new QPushButton(this); auto btn = new QPushButton(this);
btn->setCursor(QCursor(Qt::PointingHandCursor)); btn->setCursor(QCursor(Qt::PointingHandCursor));
btn->addAction(action); btn->addAction(action);
...@@ -360,7 +366,8 @@ void NavWindow::timerEvent(QTimerEvent *) ...@@ -360,7 +366,8 @@ void NavWindow::timerEvent(QTimerEvent *)
FMPRedeemInterface* svcRedeem = FMP::GetService<FMPRedeemInterface>(); FMPRedeemInterface* svcRedeem = FMP::GetService<FMPRedeemInterface>();
if(svcRedeem) if(svcRedeem)
{ {
svcRedeem->StartService(); if(svcRedeem->GetPluginState() != ctkPlugin::ACTIVE)
svcRedeem->StartService();
if(svcRedeem->IsRedeeming() == false) if(svcRedeem->IsRedeeming() == false)
{ {
show(); show();
......
...@@ -50,7 +50,7 @@ int FMPHomePrivate::Init() ...@@ -50,7 +50,7 @@ int FMPHomePrivate::Init()
// _navWindow->createMenuBtn("takeout", QString::fromLocal8Bit("非码外卖")); // _navWindow->createMenuBtn("takeout", QString::fromLocal8Bit("非码外卖"));
_navWindow->createMenuBtn("coupons", QString::fromLocal8Bit("码多多")); _navWindow->createMenuBtn("coupons", QString::fromLocal8Bit("码多多"));
_navWindow->createMenuBtn("check", QString::fromLocal8Bit("核销详情")); _navWindow->createMenuBtn("check", QString::fromLocal8Bit("核销详情"));
// _navWindow->createMenuBtn("tool", QString::fromLocal8Bit("设置")); _navWindow->createMenuBtn("tool", QString::fromLocal8Bit("设置"));
_navWindow->show(); _navWindow->show();
connect(_navWindow, SIGNAL(menuBtnClicked(QString)), this, SLOT(onMenuBtnClicked(QString))); connect(_navWindow, SIGNAL(menuBtnClicked(QString)), this, SLOT(onMenuBtnClicked(QString)));
......
Plugin-SymbolicName: fmp.home Plugin-SymbolicName: fmp.home
Plugin-Version: 0.1.0 Plugin-Version: 0.1.0
Plugin-Name: fmp.home Plugin-Name: fmp.home
Plugin-Copyright: Freemud Ltd. Copyright (C) 2014-2017 Plugin-Copyright: Freemud Ltd. Copyright (C) 2014-2018
Plugin-Vendor: Freemud Plugin-Vendor: Freemud
...@@ -24,7 +24,7 @@ QLabel{ ...@@ -24,7 +24,7 @@ QLabel{
QLineEdit{ QLineEdit{
font-size:20px; font-size:20px;
} }
#softLabel, #companyLabel{ #softLabel{
font-size:15px; font-size:15px;
} }
#titleLabel{ #titleLabel{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment