Skip to content

F
fmtakeout
Commit 71ab590e by 李定达
Options

1.补充提交

parent 548e866a
Showing with 329 additions and 92 deletions
takeout/control/ordergetwork.cpp
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
#include <QTimer> #include <QTimer>
#include <QEventLoop> #include <QEventLoop>
#include <QVariantMap> #include <QVariantMap>
#include <QSettings>
#include "QsLog.h" #include "QsLog.h"
...@@ -365,6 +366,16 @@ bool OrderGetWork::bingToServer(QString &error) ...@@ -365,6 +366,16 @@ bool OrderGetWork::bingToServer(QString &error)
} }
#else #else
void OrderGetWork::SetStoreInfoToConfig()
{
QString configfile = qApp->applicationDirPath() + "/" + CONFIG_NAME;
QSettings(configfile, QSettings::IniFormat).setValue(INI_BASE_PARNETID, _storeinfo[JSON_KEY_PARTNERID]);
QSettings(configfile, QSettings::IniFormat).setValue(INI_BASE_STOREID, _storeinfo[JSON_STOREID]);
QSettings(configfile, QSettings::IniFormat).setValue(INI_BASE_STATIONIID, _storeinfo[JSON_STATIONID]);
QSettings(configfile, QSettings::IniFormat).setValue(INI_BASE_USERID, _storeinfo[JSON_KEY_USERID]);
QSettings(configfile, QSettings::IniFormat).setValue(INI_BASE_PWD, _storeinfo[JSON_KEY_PWD]);
}
bool OrderGetWork::loginToServer(QString &error) bool OrderGetWork::loginToServer(QString &error)
{ {
......
takeout/control/ordergetwork.h
...@@ -77,7 +77,8 @@ private: ...@@ -77,7 +77,8 @@ private:
bool PullOrder(unsigned int timeout, QString &error); bool PullOrder(unsigned int timeout, QString &error);
//订单操作 //订单操作
void optOrderWithType(const QVariantMap &map); void optOrderWithType(const QVariantMap &map);
//登录成功回写数据
void SetStoreInfoToConfig();
private: private:
//门店信息 门店编号 pos编号 用户名 密码 //门店信息 门店编号 pos编号 用户名 密码
QVariantMap _storeinfo; QVariantMap _storeinfo;
......
takeout/control/workcontrol.h
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#define WORKCONTROL_H #define WORKCONTROL_H
#include <QObject> #include <QObject>
//根据配置实例化工作流为实现;
class WorkControl : public QObject class WorkControl : public QObject
{ {
Q_OBJECT Q_OBJECT
......
takeout/takeout.pro
...@@ -56,7 +56,8 @@ SOURCES += main.cpp \ ...@@ -56,7 +56,8 @@ SOURCES += main.cpp \
control/orderlocalizework.cpp \ control/orderlocalizework.cpp \
control/orderprintwork.cpp \ control/orderprintwork.cpp \
view/loginform.cpp \ view/loginform.cpp \
model/discountObject.cpp model/discountObject.cpp \
control/workcontrol.cpp
HEADERS += \ HEADERS += \
event/fmapplication.h \ event/fmapplication.h \
...@@ -91,7 +92,8 @@ HEADERS += \ ...@@ -91,7 +92,8 @@ HEADERS += \
control/orderlocalizework.h \ control/orderlocalizework.h \
control/orderprintwork.h \ control/orderprintwork.h \
view/loginform.h \ view/loginform.h \
model/discountObject.h model/discountObject.h \
control/workcontrol.h
DISTFILES += takeout.rc DISTFILES += takeout.rc
......
takeout/takeout.rc
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
#include <winver.h> #include <winver.h>
#endif #endif
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,0,0,7 FILEVERSION 1,0,0,8
PRODUCTVERSION 1,0,0,7 PRODUCTVERSION 1,0,0,8
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG FILEFLAGS VS_FF_DEBUG
...@@ -22,12 +22,12 @@ VS_VERSION_INFO VERSIONINFO ...@@ -22,12 +22,12 @@ VS_VERSION_INFO VERSIONINFO
BEGIN BEGIN
VALUE "CompanyName", "ShangHai Freemud Co., Ltd." VALUE "CompanyName", "ShangHai Freemud Co., Ltd."
VALUE "FileDescription", "FREEMUD Manager System" VALUE "FileDescription", "FREEMUD Manager System"
VALUE "FileVersion", "1.0.0.7" VALUE "FileVersion", "1.0.0.8"
VALUE "InternalName", "FREEMUD" VALUE "InternalName", "FREEMUD"
VALUE "LegalCopyright", "Copyright (C)2017-2020" VALUE "LegalCopyright", "Copyright (C)2017-2020"
VALUE "OriginalFilename", "fmTakeout.exe" VALUE "OriginalFilename", "fmTakeout.exe"
VALUE "ProductName", "fmTakeout" VALUE "ProductName", "fmTakeout"
VALUE "ProductVersion", "1.0.0.7" VALUE "ProductVersion", "1.0.0.8"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"
......
takeout/view/loginform.cpp
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
#include <QDebug> #include <QDebug>
#include <QVariantMap> #include <QVariantMap>
#include <QSettings>
#include <QsLog.h> #include <QsLog.h>
...@@ -25,6 +26,8 @@ LoginForm::LoginForm(QWidget *parent) : ...@@ -25,6 +26,8 @@ LoginForm::LoginForm(QWidget *parent) :
connect(ui->lineEdit_account, &ClickedLineEdit::clicked, this, &LoginForm::GetCurrLineEdit); connect(ui->lineEdit_account, &ClickedLineEdit::clicked, this, &LoginForm::GetCurrLineEdit);
connect(ui->lineEdit_partnerid, &ClickedLineEdit::clicked, this, &LoginForm::GetCurrLineEdit); connect(ui->lineEdit_partnerid, &ClickedLineEdit::clicked, this, &LoginForm::GetCurrLineEdit);
connect(ui->lineEdit_pwd, &ClickedLineEdit::clicked, this, &LoginForm::GetCurrLineEdit); connect(ui->lineEdit_pwd, &ClickedLineEdit::clicked, this, &LoginForm::GetCurrLineEdit);
connect(ui->lineEdit_posno, &ClickedLineEdit::clicked, this, &LoginForm::GetCurrLineEdit);
connect(ui->lineEdit_storeid, &ClickedLineEdit::clicked, this, &LoginForm::GetCurrLineEdit);
connect(ui->pushButton_0, &QPushButton::clicked, this, &LoginForm::number_btn_click); connect(ui->pushButton_0, &QPushButton::clicked, this, &LoginForm::number_btn_click);
connect(ui->pushButton_1, &QPushButton::clicked, this, &LoginForm::number_btn_click); connect(ui->pushButton_1, &QPushButton::clicked, this, &LoginForm::number_btn_click);
...@@ -74,15 +77,32 @@ LoginForm::~LoginForm() ...@@ -74,15 +77,32 @@ LoginForm::~LoginForm()
delete ui; delete ui;
} }
void LoginForm::SetStoreInfo()
{
QString configfile = qApp->applicationDirPath() + "/" + CONFIG_NAME;
QString storeid = QSettings(configfile, QSettings::IniFormat).value(INI_BASE_STOREID).toString();
QString partnerid = QSettings(configfile, QSettings::IniFormat).value(INI_BASE_PARNETID).toString();
QString userid = QSettings(configfile, QSettings::IniFormat).value(INI_BASE_USERID).toString();
QString pwd = QSettings(configfile, QSettings::IniFormat).value(INI_BASE_PWD).toString();
QString stationid = QSettings(configfile, QSettings::IniFormat).value(INI_BASE_STATIONIID).toString();
if(storeid.isEmpty() || partnerid.isEmpty() || userid.isEmpty() || pwd.isEmpty() || stationid.isEmpty())
return ;
ui->lineEdit_partnerid->setText(partnerid);
ui->lineEdit_storeid->setText(storeid);
ui->lineEdit_posno->setText(stationid);
ui->lineEdit_account->setText(userid);
ui->lineEdit_pwd->setText(pwd);
}
void LoginForm::showfull() void LoginForm::showfull()
{ {
if(!is_login) if(!is_login)
{ {
// ui->lineEdit_account->clear(); SetStoreInfo();
// ui->lineEdit_partnerid->clear();
// ui->lineEdit_pwd->clear();
this->showFullScreen(); this->showFullScreen();
//this->show();
return ; return ;
} }
...@@ -156,9 +176,11 @@ void LoginForm::on_pushButton_login_clicked() ...@@ -156,9 +176,11 @@ void LoginForm::on_pushButton_login_clicked()
if(ui->lineEdit_account->text().isEmpty() || if(ui->lineEdit_account->text().isEmpty() ||
ui->lineEdit_pwd->text().isEmpty() || ui->lineEdit_pwd->text().isEmpty() ||
ui->lineEdit_partnerid->text().isEmpty()) ui->lineEdit_partnerid->text().isEmpty() ||
ui->lineEdit_posno->text().isEmpty() ||
ui->lineEdit_storeid->text().isEmpty() )
{ {
onShowAlert(AlertForm::ERROR, QString::fromLocal8Bit("门店号/账号/密码均不能为空")); onShowAlert(AlertForm::ERROR, QString::fromLocal8Bit("商户号/门店号/POS编号/账号/密码均不能为空"));
return ; return ;
} }
...@@ -166,13 +188,15 @@ void LoginForm::on_pushButton_login_clicked() ...@@ -166,13 +188,15 @@ void LoginForm::on_pushButton_login_clicked()
// map.insert(JSON_STOREID, "1036"); // map.insert(JSON_STOREID, "1036");
// map.insert(JSON_STATIONID, "saas_bf_pos"); // map.insert(JSON_STATIONID, "saas_bf_pos");
map.insert(JSON_STOREID, "fm10001"); //map.insert(JSON_STOREID, "fm10001");
map.insert(JSON_STATIONID, "1001"); //map.insert(JSON_STATIONID, "1001");
//map.insert(JSON_STOREID, "FM00001"); //map.insert(JSON_STOREID, "FM00001");
//map.insert(JSON_STATIONID, "saas_pos"); //map.insert(JSON_STATIONID, "saas_pos");
//map.insert(JSON_STATIONID, "FM00001"); //map.insert(JSON_STATIONID, "FM00001");
map.insert(JSON_STOREID, ui->lineEdit_storeid->text());
map.insert(JSON_STATIONID, ui->lineEdit_posno->text());
map.insert(JSON_KEY_USERID, ui->lineEdit_account->text()); map.insert(JSON_KEY_USERID, ui->lineEdit_account->text());
map.insert(JSON_KEY_PWD, ui->lineEdit_pwd->text()); map.insert(JSON_KEY_PWD, ui->lineEdit_pwd->text());
map.insert(JSON_KEY_PARTNERID, ui->lineEdit_partnerid->text()); map.insert(JSON_KEY_PARTNERID, ui->lineEdit_partnerid->text());
......
takeout/view/loginform.h
...@@ -39,6 +39,7 @@ private slots: ...@@ -39,6 +39,7 @@ private slots:
void on_pushButton_close_clicked(); void on_pushButton_close_clicked();
void SetStoreInfo();
private: private:
Ui::LoginForm *ui; Ui::LoginForm *ui;
...@@ -48,7 +49,6 @@ private: ...@@ -48,7 +49,6 @@ private:
// 通知窗口 // 通知窗口
AlertForm *m_alertForm; AlertForm *m_alertForm;
}; };
#endif // LOGINFORM_H #endif // LOGINFORM_H
takeout/view/loginform.ui
...@@ -6,14 +6,14 @@ ...@@ -6,14 +6,14 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>800</width> <width>1090</width>
<height>726</height> <height>780</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Dialog</string> <string>Dialog</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_4"> <layout class="QVBoxLayout" name="verticalLayout_2">
<property name="spacing"> <property name="spacing">
<number>0</number> <number>0</number>
</property> </property>
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
<spacer name="verticalSpacer_6"> <spacer name="verticalSpacer_8">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
...@@ -115,58 +115,40 @@ ...@@ -115,58 +115,40 @@
</widget> </widget>
</item> </item>
<item> <item>
<spacer name="verticalSpacer_9"> <spacer name="verticalSpacer_6">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
<property name="sizeType">
<enum>QSizePolicy::Maximum</enum>
</property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>20</width> <width>20</width>
<height>70</height> <height>40</height>
</size> </size>
</property> </property>
</spacer> </spacer>
</item> </item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_5"> <layout class="QHBoxLayout" name="horizontalLayout_11">
<property name="spacing">
<number>0</number>
</property>
<item> <item>
<spacer name="horizontalSpacer_2"> <spacer name="horizontalSpacer_12">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>13</width> <width>40</width>
<height>20</height> <height>20</height>
</size> </size>
</property> </property>
</spacer> </spacer>
</item> </item>
<item> <item>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QFrame" name="frame">
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QLabel" name="label_logo"> <widget class="QLabel" name="label_logo">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
...@@ -201,52 +183,70 @@ ...@@ -201,52 +183,70 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<spacer name="horizontalSpacer_13">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</widget>
</item> </item>
<item> <item>
<spacer name="verticalSpacer_2"> <spacer name="verticalSpacer_5">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
<property name="sizeType">
<enum>QSizePolicy::Maximum</enum>
</property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>20</width> <width>20</width>
<height>40</height> <height>100</height>
</size> </size>
</property> </property>
</spacer> </spacer>
</item> </item>
</layout>
</item>
<item> <item>
<spacer name="horizontalSpacer"> <layout class="QHBoxLayout" name="horizontalLayout_12">
<property name="spacing">
<number>0</number>
</property>
<item>
<spacer name="horizontalSpacer_14">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>13</width> <width>40</width>
<height>20</height> <height>20</height>
</size> </size>
</property> </property>
</spacer> </spacer>
</item> </item>
<item> <item>
<widget class="QWidget" name="widget" native="true"> <widget class="QWidget" name="widget_left" native="true">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>300</width> <width>350</width>
<height>540</height> <height>350</height>
</size> </size>
</property> </property>
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>300</width> <width>350</width>
<height>540</height> <height>350</height>
</size> </size>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_6"> <layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing"> <property name="spacing">
<number>0</number> <number>0</number>
</property> </property>
...@@ -263,7 +263,7 @@ ...@@ -263,7 +263,7 @@
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
<spacer name="verticalSpacer_8"> <spacer name="verticalSpacer_9">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
...@@ -272,49 +272,57 @@ ...@@ -272,49 +272,57 @@
</property> </property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>11</width> <width>20</width>
<height>12</height> <height>10</height>
</size> </size>
</property> </property>
</spacer> </spacer>
</item> </item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_9">
<property name="spacing">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="label_title"> <widget class="QLabel" name="label_title">
<property name="text"> <property name="text">
<string>门店登录</string> <string> 门店登录</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property> </property>
</widget> </widget>
</item> </item>
</layout>
</item>
<item> <item>
<spacer name="verticalSpacer_3"> <spacer name="verticalSpacer">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>20</width> <width>20</width>
<height>29</height> <height>40</height>
</size> </size>
</property> </property>
</spacer> </spacer>
</item> </item>
<item> <item>
<layout class="QVBoxLayout" name="verticalLayout_5"> <layout class="QHBoxLayout" name="horizontalLayout_8">
<property name="spacing"> <property name="spacing">
<number>0</number> <number>0</number>
</property> </property>
<property name="leftMargin"> <item>
<number>39</number> <spacer name="horizontalSpacer_3">
</property> <property name="orientation">
<property name="rightMargin"> <enum>Qt::Horizontal</enum>
<number>39</number>
</property> </property>
<property name="bottomMargin"> <property name="sizeHint" stdset="0">
<number>0</number> <size>
<width>40</width>
<height>20</height>
</size>
</property> </property>
</spacer>
</item>
<item> <item>
<layout class="QVBoxLayout" name="verticalLayout_3"> <layout class="QVBoxLayout" name="verticalLayout_3">
<property name="spacing"> <property name="spacing">
...@@ -363,7 +371,7 @@ ...@@ -363,7 +371,7 @@
</size> </size>
</property> </property>
<property name="text"> <property name="text">
<string>1794</string> <string/>
</property> </property>
<property name="echoMode"> <property name="echoMode">
<enum>QLineEdit::Normal</enum> <enum>QLineEdit::Normal</enum>
...@@ -373,6 +381,86 @@ ...@@ -373,6 +381,86 @@
</layout> </layout>
</item> </item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_5">
<item>
<widget class="QLabel" name="label_storeid">
<property name="text">
<string>门店号:</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="ClickedLineEdit" name="lineEdit_storeid">
<property name="minimumSize">
<size>
<width>150</width>
<height>32</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>150</width>
<height>32</height>
</size>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_7">
<item>
<widget class="QLabel" name="label_posno">
<property name="text">
<string>POS编号:</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="ClickedLineEdit" name="lineEdit_posno">
<property name="minimumSize">
<size>
<width>150</width>
<height>32</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>150</width>
<height>32</height>
</size>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2"> <layout class="QHBoxLayout" name="horizontalLayout_2">
<property name="spacing"> <property name="spacing">
<number>0</number> <number>0</number>
...@@ -411,11 +499,11 @@ ...@@ -411,11 +499,11 @@
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>150</width> <width>150</width>
<height>30</height> <height>32</height>
</size> </size>
</property> </property>
<property name="text"> <property name="text">
<string>1001</string> <string/>
</property> </property>
</widget> </widget>
</item> </item>
...@@ -464,7 +552,7 @@ ...@@ -464,7 +552,7 @@
</size> </size>
</property> </property>
<property name="text"> <property name="text">
<string>1001</string> <string/>
</property> </property>
<property name="echoMode"> <property name="echoMode">
<enum>QLineEdit::Password</enum> <enum>QLineEdit::Password</enum>
...@@ -505,14 +593,112 @@ ...@@ -505,14 +593,112 @@
</layout> </layout>
</item> </item>
<item> <item>
<spacer name="verticalSpacer_4"> <spacer name="horizontalSpacer_17">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>28</height>
</size>
</property>
</spacer>
</item>
</layout>
<zorder>verticalSpacer_2</zorder>
<zorder>verticalSpacer</zorder>
<zorder>verticalSpacer_9</zorder>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_15">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Maximum</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QWidget" name="widget_right" native="true">
<property name="minimumSize">
<size>
<width>350</width>
<height>350</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>350</width>
<height>350</height>
</size>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_10">
<property name="spacing">
<number>0</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<spacer name="horizontalSpacer_10">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>59</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout_4">
<property name="spacing">
<number>0</number>
</property>
<item>
<spacer name="verticalSpacer_3">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>20</width> <width>20</width>
<height>18</height> <height>40</height>
</size> </size>
</property> </property>
</spacer> </spacer>
...@@ -785,17 +971,30 @@ ...@@ -785,17 +971,30 @@
</item> </item>
</layout> </layout>
</item> </item>
</layout>
</item>
<item> <item>
<spacer name="verticalSpacer_5"> <spacer name="verticalSpacer_4">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>20</width> <width>20</width>
<height>29</height> <height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item>
<spacer name="horizontalSpacer_11">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>58</width>
<height>20</height>
</size> </size>
</property> </property>
</spacer> </spacer>
...@@ -804,7 +1003,7 @@ ...@@ -804,7 +1003,7 @@
</widget> </widget>
</item> </item>
<item> <item>
<spacer name="horizontalSpacer_3"> <spacer name="horizontalSpacer_16">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
...@@ -826,7 +1025,7 @@ ...@@ -826,7 +1025,7 @@
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>20</width> <width>20</width>
<height>26</height> <height>165</height>
</size> </size>
</property> </property>
</spacer> </spacer>
......
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