Skip to content

F
fmtakeout
Commit f565ca3c by 李定达
Options

Merge branch 'hotfix/logochange'

parents c7e5b13b bdefee2c
Showing with 41 additions and 41 deletions
Resources/skin/base_logo.png
Resources/skin/base_logo.png

9.02 KB | W: | H:

Resources/skin/base_logo.png

2.45 KB | W: | H:

Resources/skin/base_logo.png
Resources/skin/base_logo.png
Resources/skin/base_logo.png
Resources/skin/base_logo.png
  • 2-up
  • Swipe
  • Onion skin
Resources/skin/deaufult.qss
......@@ -597,25 +597,25 @@ QWidget
/*---------------------------------floatForm[start]-------------------------------------*/
#label_new
{
font: 75 13pt "黑体";
font: 75 10px "黑体";
color: #0073FF;
}
#label_refund
{
font: 75 13pt "黑体";
font: 75 10px "黑体";
color: #FF000A;
}
#label_newnum
{
font: 75 17pt "微软雅黑";
font: 75 10px "微软雅黑";
color: #0073FF;
}
#label_refundnum
{
font: 75 17pt "微软雅黑";
font: 75 10px "微软雅黑";
color: #FF000A;
}
......@@ -636,7 +636,7 @@ QWidget
#label_newmsg
{
font: 12pt "微软雅黑";
font: 10px "微软雅黑";
color: #FF000A;
}
......
Resources/skin/loginlogin.png
Resources/skin/loginlogin.png

10.2 KB | W: | H:

Resources/skin/loginlogin.png

2.78 KB | W: | H:

Resources/skin/loginlogin.png
Resources/skin/loginlogin.png
Resources/skin/loginlogin.png
Resources/skin/loginlogin.png
  • 2-up
  • Swipe
  • Onion skin
takeout/takeout.rc
......@@ -4,8 +4,8 @@
#include <winver.h>
#endif
VS_VERSION_INFO VERSIONINFO
FILEVERSION 3,0,0,14
PRODUCTVERSION 3,0,0,14
FILEVERSION 3,0,0,15
PRODUCTVERSION 3,0,0,15
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG
......@@ -22,12 +22,12 @@ VS_VERSION_INFO VERSIONINFO
BEGIN
VALUE "CompanyName", "ShangHai Freemud Co., Ltd."
VALUE "FileDescription", "FREEMUD Manager System"
VALUE "FileVersion", "3.0.0.14"
VALUE "FileVersion", "3.0.0.15"
VALUE "InternalName", "FREEMUD"
VALUE "LegalCopyright", "Copyright (C)2017-2020"
VALUE "OriginalFilename", "fmTakeout.exe"
VALUE "ProductName", "fmTakeout"
VALUE "ProductVersion", "3.0.0.14"
VALUE "ProductVersion", "3.0.0.15"
END
END
BLOCK "VarFileInfo"
......
takeout/view/floatForm.cpp
......@@ -33,7 +33,7 @@ FloatForm::FloatForm(QWidget *parent) :
FMApplication::subscibeEvent(this, PosEvent::s_show_float);
FMApplication::subscibeEvent(this, PosEvent::s_delete_order);
FMApplication::subscibeEvent(this, PosEvent::s_login_status);
FMApplication::subscibeEvent(this, PosEvent::s_network_outtime);
//FMApplication::subscibeEvent(this, PosEvent::s_network_outtime);
FMApplication::subscibeEvent(this, PosEvent::s_pickuporder_remind);
m_bReminding = false;
......@@ -50,7 +50,7 @@ FloatForm::FloatForm(QWidget *parent) :
m_raiseTimer.setInterval(2000);
connect(&m_raiseTimer, &QTimer::timeout, this, &FloatForm::raise);
desktopSize= QApplication::desktop()->screenGeometry().size();
desktopSize-= QSize(242, 100);
desktopSize-= QSize(94, 48);
//界面数据初始化
ui->label_newnum->setText("0");
......@@ -268,7 +268,7 @@ void FloatForm::mouseReleaseEvent(QMouseEvent *event)
{
//qDebug() << "x:" << event->x() << "y:" << event->y();
if(event->x() > 100 || !m_is_login)
if(event->x() > 48 || !m_is_login)
{
hide();
m_raiseTimer.stop();
......@@ -424,15 +424,15 @@ void FloatForm::onStartRemind(int type)
m_remindWav = QString("%1/wav/msg.wav").arg(QApplication::applicationDirPath());
// 加上音频的时长
m_wavPlayInterval = ConfigManger::GetInstance().GetSoundInterval() + VALUE_NEWORDERTIME;
ui->label_newmsg->setText(QString::fromLocal8Bit("您有新的订单了!\r\n点击打开查看订单!"));
ui->label_newmsg->setText(QString::fromLocal8Bit("新订单"));
break;
case 1:
m_remindWav = QString("%1/wav/msg1.wav").arg(QApplication::applicationDirPath());
m_wavPlayInterval = ConfigManger::GetInstance().GetSoundInterval() + VALUE_REFUNDORDERTIME;
ui->label_newmsg->setText(QString::fromLocal8Bit("您有新的退单了!\r\n点击打开查看订单!"));
ui->label_newmsg->setText(QString::fromLocal8Bit("新退单"));
break;
case 2:
ui->label_newmsg->setText(QString::fromLocal8Bit("网络异常!"));
ui->label_newmsg->setText(QString::fromLocal8Bit("网络异常"));
}
if(m_bReminding)
......
takeout/view/floatForm.ui
......@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>242</width>
<height>100</height>
<width>94</width>
<height>48</height>
</rect>
</property>
<property name="windowTitle">
......@@ -18,15 +18,15 @@
<rect>
<x>0</x>
<y>0</y>
<width>242</width>
<height>100</height>
<width>94</width>
<height>48</height>
</rect>
</property>
<widget class="QLabel" name="label_new">
<property name="geometry">
<rect>
<x>127</x>
<y>20</y>
<x>48</x>
<y>6</y>
<width>20</width>
<height>20</height>
</rect>
......@@ -41,8 +41,8 @@
<widget class="QLabel" name="label_refund">
<property name="geometry">
<rect>
<x>177</x>
<y>20</y>
<x>48</x>
<y>22</y>
<width>20</width>
<height>20</height>
</rect>
......@@ -57,14 +57,14 @@
<widget class="QLabel" name="label_newnum">
<property name="geometry">
<rect>
<x>118</x>
<y>54</y>
<width>36</width>
<height>24</height>
<x>63</x>
<y>6</y>
<width>26</width>
<height>20</height>
</rect>
</property>
<property name="text">
<string>9999</string>
<string/>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
......@@ -73,14 +73,14 @@
<widget class="QLabel" name="label_refundnum">
<property name="geometry">
<rect>
<x>170</x>
<y>54</y>
<width>36</width>
<height>24</height>
<x>63</x>
<y>22</y>
<width>26</width>
<height>20</height>
</rect>
</property>
<property name="text">
<string>9999</string>
<string/>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
......@@ -92,8 +92,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>242</width>
<height>100</height>
<width>94</width>
<height>48</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
......@@ -122,7 +122,7 @@
</property>
<property name="sizeHint" stdset="0">
<size>
<width>101</width>
<width>46</width>
<height>20</height>
</size>
</property>
......@@ -145,8 +145,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>100</width>
<height>100</height>
<width>48</width>
<height>48</height>
</rect>
</property>
</widget>
......@@ -155,8 +155,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>242</width>
<height>100</height>
<width>94</width>
<height>48</height>
</rect>
</property>
</widget>
......
takeout/view/mainForm.cpp
......@@ -46,7 +46,7 @@ MainForm::MainForm(QWidget *parent) :
FMApplication::subscibeEvent(this, PosEvent::s_delete_order);
FMApplication::subscibeEvent(this, PosEvent::s_login_storeinfo);
FMApplication::subscibeEvent(this, PosEvent::s_show_mainform);
FMApplication::subscibeEvent(this, PosEvent::s_network_outtime);
//FMApplication::subscibeEvent(this, PosEvent::s_network_outtime);
// 初始化界面
......
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