diff --git a/CounterRealTime/ChannelChartForm.cpp b/CounterRealTime/ChannelChartForm.cpp index 06d7df7..8f6284d 100644 --- a/CounterRealTime/ChannelChartForm.cpp +++ b/CounterRealTime/ChannelChartForm.cpp @@ -10,6 +10,16 @@ this->setWindowFlags(Qt::FramelessWindowHint); resize(SettingConfig::getInstance().WINDOW_WIDTH, SettingConfig::getInstance().WINDOW_HEIGHT); + + QFile file(":/qss/chartForm.css"); + if (file.open(QFile::ReadOnly)) { + QString qss = QLatin1String(file.readAll()); + QString paletteColor = qss.mid(20, 7); + this->setPalette(QPalette(QColor(paletteColor))); + this->setStyleSheet(qss); + + file.close(); + } } ChannelChartForm::~ChannelChartForm() diff --git a/CounterRealTime/ChannelChartForm.cpp b/CounterRealTime/ChannelChartForm.cpp index 06d7df7..8f6284d 100644 --- a/CounterRealTime/ChannelChartForm.cpp +++ b/CounterRealTime/ChannelChartForm.cpp @@ -10,6 +10,16 @@ this->setWindowFlags(Qt::FramelessWindowHint); resize(SettingConfig::getInstance().WINDOW_WIDTH, SettingConfig::getInstance().WINDOW_HEIGHT); + + QFile file(":/qss/chartForm.css"); + if (file.open(QFile::ReadOnly)) { + QString qss = QLatin1String(file.readAll()); + QString paletteColor = qss.mid(20, 7); + this->setPalette(QPalette(QColor(paletteColor))); + this->setStyleSheet(qss); + + file.close(); + } } ChannelChartForm::~ChannelChartForm() diff --git a/CounterRealTime/CounterWindowRT.cpp b/CounterRealTime/CounterWindowRT.cpp index 47f7c2d..8ce6761 100644 --- a/CounterRealTime/CounterWindowRT.cpp +++ b/CounterRealTime/CounterWindowRT.cpp @@ -7,9 +7,17 @@ { ui->setupUi(this); - this->setWindowFlags(Qt::FramelessWindowHint); + setWindowFlags(Qt::FramelessWindowHint); move(0, 0); resize(SettingConfig::getInstance().WINDOW_WIDTH, SettingConfig::getInstance().WINDOW_HEIGHT); + setWindowIcon(QIcon(":/images/CounterRealTime.png")); + + trayIcon = new QSystemTrayIcon(this); + trayIcon->setIcon(QIcon(":/images/CounterRealTime.png")); + trayIcon->setToolTip(QString("钟差测量数据采集软件(%1)").arg(SettingConfig::getInstance().MASTER == 1 ? "主" : "备")); + trayIcon->show(); + + connect(trayIcon, &QSystemTrayIcon::activated, this, &CounterWindowRT::onTrayIconActived); settingForm = new CounterSettingForm(); connect(settingForm, &CounterSettingForm::channelSettingSubmit, this, &CounterWindowRT::onChannelSettingSubmit); @@ -526,8 +534,20 @@ } void CounterWindowRT::on_btnMenuMin_clicked() { - setWindowState(Qt::WindowMinimized | windowState()); + this->hide(); } +void CounterWindowRT::onTrayIconActived(QSystemTrayIcon::ActivationReason reason) +{ + switch (reason) { + case QSystemTrayIcon::Trigger: // left click + case QSystemTrayIcon::Context: // right click + this->show(); + break; + default: + break; + } +} + void CounterWindowRT::initChannelForm() { diff --git a/CounterRealTime/ChannelChartForm.cpp b/CounterRealTime/ChannelChartForm.cpp index 06d7df7..8f6284d 100644 --- a/CounterRealTime/ChannelChartForm.cpp +++ b/CounterRealTime/ChannelChartForm.cpp @@ -10,6 +10,16 @@ this->setWindowFlags(Qt::FramelessWindowHint); resize(SettingConfig::getInstance().WINDOW_WIDTH, SettingConfig::getInstance().WINDOW_HEIGHT); + + QFile file(":/qss/chartForm.css"); + if (file.open(QFile::ReadOnly)) { + QString qss = QLatin1String(file.readAll()); + QString paletteColor = qss.mid(20, 7); + this->setPalette(QPalette(QColor(paletteColor))); + this->setStyleSheet(qss); + + file.close(); + } } ChannelChartForm::~ChannelChartForm() diff --git a/CounterRealTime/CounterWindowRT.cpp b/CounterRealTime/CounterWindowRT.cpp index 47f7c2d..8ce6761 100644 --- a/CounterRealTime/CounterWindowRT.cpp +++ b/CounterRealTime/CounterWindowRT.cpp @@ -7,9 +7,17 @@ { ui->setupUi(this); - this->setWindowFlags(Qt::FramelessWindowHint); + setWindowFlags(Qt::FramelessWindowHint); move(0, 0); resize(SettingConfig::getInstance().WINDOW_WIDTH, SettingConfig::getInstance().WINDOW_HEIGHT); + setWindowIcon(QIcon(":/images/CounterRealTime.png")); + + trayIcon = new QSystemTrayIcon(this); + trayIcon->setIcon(QIcon(":/images/CounterRealTime.png")); + trayIcon->setToolTip(QString("钟差测量数据采集软件(%1)").arg(SettingConfig::getInstance().MASTER == 1 ? "主" : "备")); + trayIcon->show(); + + connect(trayIcon, &QSystemTrayIcon::activated, this, &CounterWindowRT::onTrayIconActived); settingForm = new CounterSettingForm(); connect(settingForm, &CounterSettingForm::channelSettingSubmit, this, &CounterWindowRT::onChannelSettingSubmit); @@ -526,8 +534,20 @@ } void CounterWindowRT::on_btnMenuMin_clicked() { - setWindowState(Qt::WindowMinimized | windowState()); + this->hide(); } +void CounterWindowRT::onTrayIconActived(QSystemTrayIcon::ActivationReason reason) +{ + switch (reason) { + case QSystemTrayIcon::Trigger: // left click + case QSystemTrayIcon::Context: // right click + this->show(); + break; + default: + break; + } +} + void CounterWindowRT::initChannelForm() { diff --git a/CounterRealTime/CounterWindowRT.h b/CounterRealTime/CounterWindowRT.h index 12cc365..256b7ac 100644 --- a/CounterRealTime/CounterWindowRT.h +++ b/CounterRealTime/CounterWindowRT.h @@ -43,6 +43,8 @@ CounterSettingForm * settingForm; + QSystemTrayIcon * trayIcon; + QVector devTitleList; // 计数器设备标题的QLabel集合 QVector devRefList; // Ref通道 QVector channelNameList; // 通道名的QLabel集合 @@ -70,6 +72,7 @@ void on_btnMenuMin_clicked(); void on_btnMenuSetting_clicked(); + void onTrayIconActived(QSystemTrayIcon::ActivationReason reason); void initChannelForm(); void updateDeviceWidget(); diff --git a/CounterRealTime/ChannelChartForm.cpp b/CounterRealTime/ChannelChartForm.cpp index 06d7df7..8f6284d 100644 --- a/CounterRealTime/ChannelChartForm.cpp +++ b/CounterRealTime/ChannelChartForm.cpp @@ -10,6 +10,16 @@ this->setWindowFlags(Qt::FramelessWindowHint); resize(SettingConfig::getInstance().WINDOW_WIDTH, SettingConfig::getInstance().WINDOW_HEIGHT); + + QFile file(":/qss/chartForm.css"); + if (file.open(QFile::ReadOnly)) { + QString qss = QLatin1String(file.readAll()); + QString paletteColor = qss.mid(20, 7); + this->setPalette(QPalette(QColor(paletteColor))); + this->setStyleSheet(qss); + + file.close(); + } } ChannelChartForm::~ChannelChartForm() diff --git a/CounterRealTime/CounterWindowRT.cpp b/CounterRealTime/CounterWindowRT.cpp index 47f7c2d..8ce6761 100644 --- a/CounterRealTime/CounterWindowRT.cpp +++ b/CounterRealTime/CounterWindowRT.cpp @@ -7,9 +7,17 @@ { ui->setupUi(this); - this->setWindowFlags(Qt::FramelessWindowHint); + setWindowFlags(Qt::FramelessWindowHint); move(0, 0); resize(SettingConfig::getInstance().WINDOW_WIDTH, SettingConfig::getInstance().WINDOW_HEIGHT); + setWindowIcon(QIcon(":/images/CounterRealTime.png")); + + trayIcon = new QSystemTrayIcon(this); + trayIcon->setIcon(QIcon(":/images/CounterRealTime.png")); + trayIcon->setToolTip(QString("钟差测量数据采集软件(%1)").arg(SettingConfig::getInstance().MASTER == 1 ? "主" : "备")); + trayIcon->show(); + + connect(trayIcon, &QSystemTrayIcon::activated, this, &CounterWindowRT::onTrayIconActived); settingForm = new CounterSettingForm(); connect(settingForm, &CounterSettingForm::channelSettingSubmit, this, &CounterWindowRT::onChannelSettingSubmit); @@ -526,8 +534,20 @@ } void CounterWindowRT::on_btnMenuMin_clicked() { - setWindowState(Qt::WindowMinimized | windowState()); + this->hide(); } +void CounterWindowRT::onTrayIconActived(QSystemTrayIcon::ActivationReason reason) +{ + switch (reason) { + case QSystemTrayIcon::Trigger: // left click + case QSystemTrayIcon::Context: // right click + this->show(); + break; + default: + break; + } +} + void CounterWindowRT::initChannelForm() { diff --git a/CounterRealTime/CounterWindowRT.h b/CounterRealTime/CounterWindowRT.h index 12cc365..256b7ac 100644 --- a/CounterRealTime/CounterWindowRT.h +++ b/CounterRealTime/CounterWindowRT.h @@ -43,6 +43,8 @@ CounterSettingForm * settingForm; + QSystemTrayIcon * trayIcon; + QVector devTitleList; // 计数器设备标题的QLabel集合 QVector devRefList; // Ref通道 QVector channelNameList; // 通道名的QLabel集合 @@ -70,6 +72,7 @@ void on_btnMenuMin_clicked(); void on_btnMenuSetting_clicked(); + void onTrayIconActived(QSystemTrayIcon::ActivationReason reason); void initChannelForm(); void updateDeviceWidget(); diff --git a/CounterRealTime/images/CounterRealTime.png b/CounterRealTime/images/CounterRealTime.png new file mode 100644 index 0000000..cf82600 --- /dev/null +++ b/CounterRealTime/images/CounterRealTime.png Binary files differ diff --git a/CounterRealTime/ChannelChartForm.cpp b/CounterRealTime/ChannelChartForm.cpp index 06d7df7..8f6284d 100644 --- a/CounterRealTime/ChannelChartForm.cpp +++ b/CounterRealTime/ChannelChartForm.cpp @@ -10,6 +10,16 @@ this->setWindowFlags(Qt::FramelessWindowHint); resize(SettingConfig::getInstance().WINDOW_WIDTH, SettingConfig::getInstance().WINDOW_HEIGHT); + + QFile file(":/qss/chartForm.css"); + if (file.open(QFile::ReadOnly)) { + QString qss = QLatin1String(file.readAll()); + QString paletteColor = qss.mid(20, 7); + this->setPalette(QPalette(QColor(paletteColor))); + this->setStyleSheet(qss); + + file.close(); + } } ChannelChartForm::~ChannelChartForm() diff --git a/CounterRealTime/CounterWindowRT.cpp b/CounterRealTime/CounterWindowRT.cpp index 47f7c2d..8ce6761 100644 --- a/CounterRealTime/CounterWindowRT.cpp +++ b/CounterRealTime/CounterWindowRT.cpp @@ -7,9 +7,17 @@ { ui->setupUi(this); - this->setWindowFlags(Qt::FramelessWindowHint); + setWindowFlags(Qt::FramelessWindowHint); move(0, 0); resize(SettingConfig::getInstance().WINDOW_WIDTH, SettingConfig::getInstance().WINDOW_HEIGHT); + setWindowIcon(QIcon(":/images/CounterRealTime.png")); + + trayIcon = new QSystemTrayIcon(this); + trayIcon->setIcon(QIcon(":/images/CounterRealTime.png")); + trayIcon->setToolTip(QString("钟差测量数据采集软件(%1)").arg(SettingConfig::getInstance().MASTER == 1 ? "主" : "备")); + trayIcon->show(); + + connect(trayIcon, &QSystemTrayIcon::activated, this, &CounterWindowRT::onTrayIconActived); settingForm = new CounterSettingForm(); connect(settingForm, &CounterSettingForm::channelSettingSubmit, this, &CounterWindowRT::onChannelSettingSubmit); @@ -526,8 +534,20 @@ } void CounterWindowRT::on_btnMenuMin_clicked() { - setWindowState(Qt::WindowMinimized | windowState()); + this->hide(); } +void CounterWindowRT::onTrayIconActived(QSystemTrayIcon::ActivationReason reason) +{ + switch (reason) { + case QSystemTrayIcon::Trigger: // left click + case QSystemTrayIcon::Context: // right click + this->show(); + break; + default: + break; + } +} + void CounterWindowRT::initChannelForm() { diff --git a/CounterRealTime/CounterWindowRT.h b/CounterRealTime/CounterWindowRT.h index 12cc365..256b7ac 100644 --- a/CounterRealTime/CounterWindowRT.h +++ b/CounterRealTime/CounterWindowRT.h @@ -43,6 +43,8 @@ CounterSettingForm * settingForm; + QSystemTrayIcon * trayIcon; + QVector devTitleList; // 计数器设备标题的QLabel集合 QVector devRefList; // Ref通道 QVector channelNameList; // 通道名的QLabel集合 @@ -70,6 +72,7 @@ void on_btnMenuMin_clicked(); void on_btnMenuSetting_clicked(); + void onTrayIconActived(QSystemTrayIcon::ActivationReason reason); void initChannelForm(); void updateDeviceWidget(); diff --git a/CounterRealTime/images/CounterRealTime.png b/CounterRealTime/images/CounterRealTime.png new file mode 100644 index 0000000..cf82600 --- /dev/null +++ b/CounterRealTime/images/CounterRealTime.png Binary files differ diff --git a/CounterRealTime/qss/chartForm.css b/CounterRealTime/qss/chartForm.css new file mode 100644 index 0000000..ab0b02a --- /dev/null +++ b/CounterRealTime/qss/chartForm.css @@ -0,0 +1,33 @@ +QPalette{background:#0B1425;} + +/* ChannelChartForm */ +QPushButton#btnChartClose { + border-radius: 5px; + color: #DCDCDC; + margin: 15px; + background: none; + border-style: none; +} +QPushButton#btnChartClose:hover{ + color: #FFFFFF; + margin: 1px 1px 2px 1px; + background-color: rgba(238, 0, 0, 1.0); +} +QLabel#labChartTitle { + font-family: "Microsoft Yahei"; + color: #FFFFFF; + margin-left: 30px; + font-size: 20px; +} + +QToolTip { + font-family: "Microsoft Yahei"; + font-size: 16px; + color: #FFFFFF; + background-color: #0B1425; + min-width: 500px; + padding: 0px 5px; + border: 2px solid #0BB2E9; + border-radius: 12px; +} +/* ChannelChartForm */ diff --git a/CounterRealTime/ChannelChartForm.cpp b/CounterRealTime/ChannelChartForm.cpp index 06d7df7..8f6284d 100644 --- a/CounterRealTime/ChannelChartForm.cpp +++ b/CounterRealTime/ChannelChartForm.cpp @@ -10,6 +10,16 @@ this->setWindowFlags(Qt::FramelessWindowHint); resize(SettingConfig::getInstance().WINDOW_WIDTH, SettingConfig::getInstance().WINDOW_HEIGHT); + + QFile file(":/qss/chartForm.css"); + if (file.open(QFile::ReadOnly)) { + QString qss = QLatin1String(file.readAll()); + QString paletteColor = qss.mid(20, 7); + this->setPalette(QPalette(QColor(paletteColor))); + this->setStyleSheet(qss); + + file.close(); + } } ChannelChartForm::~ChannelChartForm() diff --git a/CounterRealTime/CounterWindowRT.cpp b/CounterRealTime/CounterWindowRT.cpp index 47f7c2d..8ce6761 100644 --- a/CounterRealTime/CounterWindowRT.cpp +++ b/CounterRealTime/CounterWindowRT.cpp @@ -7,9 +7,17 @@ { ui->setupUi(this); - this->setWindowFlags(Qt::FramelessWindowHint); + setWindowFlags(Qt::FramelessWindowHint); move(0, 0); resize(SettingConfig::getInstance().WINDOW_WIDTH, SettingConfig::getInstance().WINDOW_HEIGHT); + setWindowIcon(QIcon(":/images/CounterRealTime.png")); + + trayIcon = new QSystemTrayIcon(this); + trayIcon->setIcon(QIcon(":/images/CounterRealTime.png")); + trayIcon->setToolTip(QString("钟差测量数据采集软件(%1)").arg(SettingConfig::getInstance().MASTER == 1 ? "主" : "备")); + trayIcon->show(); + + connect(trayIcon, &QSystemTrayIcon::activated, this, &CounterWindowRT::onTrayIconActived); settingForm = new CounterSettingForm(); connect(settingForm, &CounterSettingForm::channelSettingSubmit, this, &CounterWindowRT::onChannelSettingSubmit); @@ -526,8 +534,20 @@ } void CounterWindowRT::on_btnMenuMin_clicked() { - setWindowState(Qt::WindowMinimized | windowState()); + this->hide(); } +void CounterWindowRT::onTrayIconActived(QSystemTrayIcon::ActivationReason reason) +{ + switch (reason) { + case QSystemTrayIcon::Trigger: // left click + case QSystemTrayIcon::Context: // right click + this->show(); + break; + default: + break; + } +} + void CounterWindowRT::initChannelForm() { diff --git a/CounterRealTime/CounterWindowRT.h b/CounterRealTime/CounterWindowRT.h index 12cc365..256b7ac 100644 --- a/CounterRealTime/CounterWindowRT.h +++ b/CounterRealTime/CounterWindowRT.h @@ -43,6 +43,8 @@ CounterSettingForm * settingForm; + QSystemTrayIcon * trayIcon; + QVector devTitleList; // 计数器设备标题的QLabel集合 QVector devRefList; // Ref通道 QVector channelNameList; // 通道名的QLabel集合 @@ -70,6 +72,7 @@ void on_btnMenuMin_clicked(); void on_btnMenuSetting_clicked(); + void onTrayIconActived(QSystemTrayIcon::ActivationReason reason); void initChannelForm(); void updateDeviceWidget(); diff --git a/CounterRealTime/images/CounterRealTime.png b/CounterRealTime/images/CounterRealTime.png new file mode 100644 index 0000000..cf82600 --- /dev/null +++ b/CounterRealTime/images/CounterRealTime.png Binary files differ diff --git a/CounterRealTime/qss/chartForm.css b/CounterRealTime/qss/chartForm.css new file mode 100644 index 0000000..ab0b02a --- /dev/null +++ b/CounterRealTime/qss/chartForm.css @@ -0,0 +1,33 @@ +QPalette{background:#0B1425;} + +/* ChannelChartForm */ +QPushButton#btnChartClose { + border-radius: 5px; + color: #DCDCDC; + margin: 15px; + background: none; + border-style: none; +} +QPushButton#btnChartClose:hover{ + color: #FFFFFF; + margin: 1px 1px 2px 1px; + background-color: rgba(238, 0, 0, 1.0); +} +QLabel#labChartTitle { + font-family: "Microsoft Yahei"; + color: #FFFFFF; + margin-left: 30px; + font-size: 20px; +} + +QToolTip { + font-family: "Microsoft Yahei"; + font-size: 16px; + color: #FFFFFF; + background-color: #0B1425; + min-width: 500px; + padding: 0px 5px; + border: 2px solid #0BB2E9; + border-radius: 12px; +} +/* ChannelChartForm */ diff --git a/CounterRealTime/qss/mainClock.css b/CounterRealTime/qss/mainClock.css index 146c5a0..2a191ba 100644 --- a/CounterRealTime/qss/mainClock.css +++ b/CounterRealTime/qss/mainClock.css @@ -169,40 +169,22 @@ background-color: #BDC3C7; border-top-right-radius: 10px; } + +QMenu{ + background:white; + color: #000000; + border:1px solid lightgray; +} +QMenu::item{ + padding:0px 20px 0px 20px; + height:25px; +} +QMenu::item:selected:enabled{ + background: lightgray; + color: white; +} /* widgetContent */ -/* ChannelChartForm */ -QPushButton#btnChartClose { - border-radius: 5px; - color: #DCDCDC; - margin: 15px; - background: none; - border-style: none; -} -QPushButton#btnChartClose:hover{ - color: #FFFFFF; - margin: 1px 1px 2px 1px; - background-color: rgba(238, 0, 0, 1.0); -} -QLabel#labChartTitle { - font-family: "Microsoft Yahei"; - color: #FFFFFF; - margin-left: 30px; - font-size: 20px; -} - -QToolTip { - font-family: "Microsoft Yahei"; - font-size: 16px; - color: #FFFFFF; - background-color: #0B1425; - min-width: 500px; - padding: 0px 5px; - border: 2px solid #0BB2E9; - border-radius: 12px; -} -/* ChannelChartForm */ - /* CounterSettingForm */ QPushButton#btnSettingClose { border-radius: 5px; diff --git a/CounterRealTime/ChannelChartForm.cpp b/CounterRealTime/ChannelChartForm.cpp index 06d7df7..8f6284d 100644 --- a/CounterRealTime/ChannelChartForm.cpp +++ b/CounterRealTime/ChannelChartForm.cpp @@ -10,6 +10,16 @@ this->setWindowFlags(Qt::FramelessWindowHint); resize(SettingConfig::getInstance().WINDOW_WIDTH, SettingConfig::getInstance().WINDOW_HEIGHT); + + QFile file(":/qss/chartForm.css"); + if (file.open(QFile::ReadOnly)) { + QString qss = QLatin1String(file.readAll()); + QString paletteColor = qss.mid(20, 7); + this->setPalette(QPalette(QColor(paletteColor))); + this->setStyleSheet(qss); + + file.close(); + } } ChannelChartForm::~ChannelChartForm() diff --git a/CounterRealTime/CounterWindowRT.cpp b/CounterRealTime/CounterWindowRT.cpp index 47f7c2d..8ce6761 100644 --- a/CounterRealTime/CounterWindowRT.cpp +++ b/CounterRealTime/CounterWindowRT.cpp @@ -7,9 +7,17 @@ { ui->setupUi(this); - this->setWindowFlags(Qt::FramelessWindowHint); + setWindowFlags(Qt::FramelessWindowHint); move(0, 0); resize(SettingConfig::getInstance().WINDOW_WIDTH, SettingConfig::getInstance().WINDOW_HEIGHT); + setWindowIcon(QIcon(":/images/CounterRealTime.png")); + + trayIcon = new QSystemTrayIcon(this); + trayIcon->setIcon(QIcon(":/images/CounterRealTime.png")); + trayIcon->setToolTip(QString("钟差测量数据采集软件(%1)").arg(SettingConfig::getInstance().MASTER == 1 ? "主" : "备")); + trayIcon->show(); + + connect(trayIcon, &QSystemTrayIcon::activated, this, &CounterWindowRT::onTrayIconActived); settingForm = new CounterSettingForm(); connect(settingForm, &CounterSettingForm::channelSettingSubmit, this, &CounterWindowRT::onChannelSettingSubmit); @@ -526,8 +534,20 @@ } void CounterWindowRT::on_btnMenuMin_clicked() { - setWindowState(Qt::WindowMinimized | windowState()); + this->hide(); } +void CounterWindowRT::onTrayIconActived(QSystemTrayIcon::ActivationReason reason) +{ + switch (reason) { + case QSystemTrayIcon::Trigger: // left click + case QSystemTrayIcon::Context: // right click + this->show(); + break; + default: + break; + } +} + void CounterWindowRT::initChannelForm() { diff --git a/CounterRealTime/CounterWindowRT.h b/CounterRealTime/CounterWindowRT.h index 12cc365..256b7ac 100644 --- a/CounterRealTime/CounterWindowRT.h +++ b/CounterRealTime/CounterWindowRT.h @@ -43,6 +43,8 @@ CounterSettingForm * settingForm; + QSystemTrayIcon * trayIcon; + QVector devTitleList; // 计数器设备标题的QLabel集合 QVector devRefList; // Ref通道 QVector channelNameList; // 通道名的QLabel集合 @@ -70,6 +72,7 @@ void on_btnMenuMin_clicked(); void on_btnMenuSetting_clicked(); + void onTrayIconActived(QSystemTrayIcon::ActivationReason reason); void initChannelForm(); void updateDeviceWidget(); diff --git a/CounterRealTime/images/CounterRealTime.png b/CounterRealTime/images/CounterRealTime.png new file mode 100644 index 0000000..cf82600 --- /dev/null +++ b/CounterRealTime/images/CounterRealTime.png Binary files differ diff --git a/CounterRealTime/qss/chartForm.css b/CounterRealTime/qss/chartForm.css new file mode 100644 index 0000000..ab0b02a --- /dev/null +++ b/CounterRealTime/qss/chartForm.css @@ -0,0 +1,33 @@ +QPalette{background:#0B1425;} + +/* ChannelChartForm */ +QPushButton#btnChartClose { + border-radius: 5px; + color: #DCDCDC; + margin: 15px; + background: none; + border-style: none; +} +QPushButton#btnChartClose:hover{ + color: #FFFFFF; + margin: 1px 1px 2px 1px; + background-color: rgba(238, 0, 0, 1.0); +} +QLabel#labChartTitle { + font-family: "Microsoft Yahei"; + color: #FFFFFF; + margin-left: 30px; + font-size: 20px; +} + +QToolTip { + font-family: "Microsoft Yahei"; + font-size: 16px; + color: #FFFFFF; + background-color: #0B1425; + min-width: 500px; + padding: 0px 5px; + border: 2px solid #0BB2E9; + border-radius: 12px; +} +/* ChannelChartForm */ diff --git a/CounterRealTime/qss/mainClock.css b/CounterRealTime/qss/mainClock.css index 146c5a0..2a191ba 100644 --- a/CounterRealTime/qss/mainClock.css +++ b/CounterRealTime/qss/mainClock.css @@ -169,40 +169,22 @@ background-color: #BDC3C7; border-top-right-radius: 10px; } + +QMenu{ + background:white; + color: #000000; + border:1px solid lightgray; +} +QMenu::item{ + padding:0px 20px 0px 20px; + height:25px; +} +QMenu::item:selected:enabled{ + background: lightgray; + color: white; +} /* widgetContent */ -/* ChannelChartForm */ -QPushButton#btnChartClose { - border-radius: 5px; - color: #DCDCDC; - margin: 15px; - background: none; - border-style: none; -} -QPushButton#btnChartClose:hover{ - color: #FFFFFF; - margin: 1px 1px 2px 1px; - background-color: rgba(238, 0, 0, 1.0); -} -QLabel#labChartTitle { - font-family: "Microsoft Yahei"; - color: #FFFFFF; - margin-left: 30px; - font-size: 20px; -} - -QToolTip { - font-family: "Microsoft Yahei"; - font-size: 16px; - color: #FFFFFF; - background-color: #0B1425; - min-width: 500px; - padding: 0px 5px; - border: 2px solid #0BB2E9; - border-radius: 12px; -} -/* ChannelChartForm */ - /* CounterSettingForm */ QPushButton#btnSettingClose { border-radius: 5px; diff --git a/CounterRealTime/res.qrc b/CounterRealTime/res.qrc index a6b3ada..453a473 100644 --- a/CounterRealTime/res.qrc +++ b/CounterRealTime/res.qrc @@ -7,5 +7,7 @@ images/menuSetting.png images/arrowDown2.png images/arrowUp2.png + qss/chartForm.css + images/CounterRealTime.png