1、添加查询订单详情功能 2、添加退积分功能

fmvip/fmp_vip_settings.cpp

@@ -37,6 +37,31 @@ QString FMPVipSettings::getPageSize()
     return _GetValue("List/PageSize").toString();
 }
 
+QString FMPVipSettings::getStoreName()
+{
+    return _GetValue("Home/StoreName").toString();
+}
+
+QString FMPVipSettings::getStoreId()
+{
+    return _GetValue("Home/StoreId").toString();
+}
+
+QString FMPVipSettings::getPartnerId()
+{
+    return _GetValue("Home/PartnerId").toString();
+}
+
+QString FMPVipSettings::getStationId()
+{
+    return _GetValue("Home/PosId").toString();
+}
+
+QString FMPVipSettings::getOperatorId()
+{
+    return _GetValue("Home/CashierId").toString();
+}
+
 QVariant FMPVipSettings::_GetValue(const QString &key, QVariant defaultValue)
 {
     if (_settings) {

fmvip/fmp_vip_settings.h

@@ -20,6 +20,12 @@ public:
     int GetPayPartnerId();
     QString getPageSize();
 
+    QString getStoreName();
+    QString getStoreId();
+    QString getPartnerId();
+    QString getStationId();
+    QString getOperatorId();
+
 private:
     explicit FMPVipSettings(QObject *parent = 0);
 

fmvip/fmvip.pri

@@ -56,7 +56,9 @@ SOURCES += \
     $$PWD/task/taskqrrefund.cpp \
     $$PWD/task/tasklist.cpp \
     $$PWD/windows/fmviplist.cpp \
-    $$PWD/items/scorelist.cpp
+    $$PWD/items/scorelist.cpp \
+    $$PWD/task/taskdouble.cpp \
+    $$PWD/windows/fmlistdetail.cpp
 
 HEADERS +=\
     $$PWD/backup/fmbackup.h \
@@ -103,7 +105,9 @@ HEADERS +=\
     $$PWD/task/taskqrrefund.h \
     $$PWD/task/tasklist.h \
     $$PWD/windows/fmviplist.h \
-    $$PWD/items/scorelist.h
+    $$PWD/items/scorelist.h \
+    $$PWD/task/taskdouble.h \
+    $$PWD/windows/fmlistdetail.h
 
 unix {
     target.path = /usr/lib
@@ -139,4 +143,5 @@ FORMS += \
     $$PWD/windows/forms/fmvippanel.ui \
     $$PWD/windows/forms/fmviprefund.ui \
     $$PWD/windows/forms/fmnumpad.ui \
-    $$PWD/windows/forms/fmviplist.ui
+    $$PWD/windows/forms/fmviplist.ui \
+    $$PWD/windows/forms/fmlistdetail.ui

fmvip/global.h

@@ -56,6 +56,7 @@ enum FM_TYPE {
     FM_Point,
     FM_List,
     FM_Double,
+    FM_Revoke,
     FM_QR_Refund = 10041,
     FM_Refund_Pay,
     FM_Refund_Order
@@ -90,6 +91,7 @@ const FMReqUrlMap::value_type FMReqUrlMapPairs[] =
     FMReqUrlMap::value_type(FM_Point,"member/recharge/points"),
     FMReqUrlMap::value_type(FM_List,"order/List?partner=sgdx"),
     FMReqUrlMap::value_type(FM_Double,"order/Detail?partner=sgdx"),
+    FMReqUrlMap::value_type(FM_Revoke,"member/revoke/points"),
     #else
     FMReqUrlMap::value_type(FM_Coupon, "ordercoupon"),
     #endif

fmvip/res/img.qrc

@@ -16,5 +16,6 @@
         <file>img/tip_warning.png</file>
         <file>img/num_del.png</file>
         <file>img/tip_question.png</file>
+        <file alias="logo">img/logo.png</file>
     </qresource>
 </RCC>

fmvip/task/taskdouble.cpp

+#include "taskdouble.h"
+#include "fmviplist.h"
+#include "fmp_settings_i.h"
+#include "fmlistdetail.h"
+
+TaskDouble::TaskDouble(QJsonObject &jsonObj, Session *session, QObject *parent)
+    : FMTask(jsonObj, FM_Double, session, parent)
+{
+
+}
+
+TaskDouble::~TaskDouble()
+{
+
+}
+
+void TaskDouble::packagePOSReq()
+{
+    bool isOk = sendToServer();
+}
+
+void TaskDouble::setWindow()
+{
+//    _window = new FMListDetail;
+//    connect(qobject_cast<FMListDetail*>(_window), SIGNAL(windowShow()), this, SLOT(onSetUp()));
+}
+
+void TaskDouble::packageServerReq()
+{
+    qDebug() << "____________________________14_________";
+    QString time = QDateTime::currentDateTime().toString("yyyyMMddhhmmsszzz");
+    QString stationId = session()->data("STATIONID").toString();
+    QString storeId = session()->data("SI").toString();
+    QString transId = stationId + storeId + time;
+    serverReqJsonObj[PosProps.OrderNo] = session()->data(PosProps.OrderNo).toString();
+    serverReqJsonObj["PageCount"] = "0";
+    serverReqJsonObj["PageSize"] = "0";
+    serverReqJsonObj[PosProps.TransId] = transId;
+    serverReqJsonObj[PosProps.StationId] = session()->data("STATIONID").toString();
+    serverReqJsonObj[PosProps.PartnerId] = session()->data("PI").toString();
+    serverReqJsonObj[PosProps.Reqtype] = "0";
+    serverReqJsonObj[PosProps.StoreId] = session()->data("SI").toString();
+    serverReqJsonObj[PosProps.OperatorId] = session()->data("OPERATORID").toString();
+    serverReqJsonObj[PosProps.Ver] = "2";
+}
+
+void TaskDouble::packagePOSRsp()
+{
+//    posRspJsonObj = serverRspJsonObj;
+//    if(getServerJsonValue("statusCode").toInt() == 100)
+//    {
+//        qDebug() <<"__________________100";
+//        QJsonArray coupons = getServerJsonValue("coupon_list").toArray();
+//        qobject_cast<FMListDetail*>(_window)->getJsonArray(coupons);
+//    }
+//    else
+//    {
+//        qDebug() << "____________________________15_________" << getServerJsonValue("statusCode").toInt();
+//        QString info = getServerJsonValue("msg").toString();
+//        FMMsgWnd::FailureWnd(info,_window);
+//        return;
+//    }
+}
+
+void TaskDouble::onSetUp()
+{
+//    if(getServerJsonValue("statusCode").toInt() == 100)
+//    {
+//        qDebug() <<"__________________100";
+//        QJsonArray coupons = getServerJsonValue("coupon_list").toArray();
+////        qobject_cast<FMListDetail*>(_window)->getJsonArray(coupons);
+//    }
+//    else
+//    {
+//        qDebug() << "____________________________15_________" << getServerJsonValue("statusCode").toInt();
+//        QString info = getServerJsonValue("msg").toString();
+//        FMMsgWnd::FailureWnd(info,_window);
+//        return;
+//    }
+}
+
+

fmvip/task/taskdouble.h

+#ifndef TASKDOUBLE_H
+#define TASKDOUBLE_H
+#include "fmtask.h"
+
+class TaskDouble : public FMTask
+{
+    Q_OBJECT
+public:
+    explicit TaskDouble(QJsonObject &jsonObj, Session *session = 0, QObject *parent = 0);
+    ~TaskDouble();
+
+    void packagePOSReq() override;
+    void setWindow() override;
+    void packageServerReq() override;
+    void packagePOSRsp() override;
+
+private slots:
+    void onSetUp();
+
+};
+
+#endif // TASKDOUBLE_H

fmvip/task/tasklist.cpp

@@ -25,7 +25,6 @@ void TaskList::setWindow()
 
     connect(qobject_cast<FMVipList*>(_window), SIGNAL(getList()), this, SLOT(onGetList()));
     connect(qobject_cast<FMVipList*>(_window), SIGNAL(buttonClick()), this, SLOT(onButtonClick()));
-//    connect(qobject_cast<FMVipList*>(_window), SIGNAL(doubleClick(QString)), this, SLOT(onDoubleClick(QString)));
 }
 
 void TaskList::packageServerReq()
@@ -61,7 +60,4 @@ void TaskList::onButtonClick()
     qobject_cast<FMVipList*>(_window)->clickListArray(orders);
 }
 
-//void TaskList::onDoubleClick(const QString &id)
-//{
 
-//}

fmvip/task/tasklist.h

@@ -17,7 +17,6 @@ public:
 private slots:
     void onGetList();
     void onButtonClick();
-//    void onDoubleClick(const QString &id);
 };
 
 #endif // TASKLIST_H

fmvip/task/taskothers.cpp

@@ -139,7 +139,14 @@ void TaskCoupon::packagePOSRsp()
     }
     else
     {
-        QString info = QString::fromLocal8Bit("查询失败，请继续输入");
+        if(type == 2)
+        {
+            QString info = QString::fromLocal8Bit("会员信息查询失败，请重新输入");
+            FMP_WARN() << "coupon failed: " << couponState;
+            FMMsgWnd::FailureWnd(info, _window);
+            return;
+        }
+        QString info = QString::fromLocal8Bit("优惠券信息查询失败，请重新输入");
         FMP_WARN() << "coupon failed: " << couponState;
         FMMsgWnd::FailureWnd(info, _window);
         return;
@@ -314,7 +321,7 @@ void TaskPoint::packagePOSRsp()
         FMMsgWnd::FailureWnd(info,_window);
         return;
     }
-    FMMsgWnd::SuccessWnd(QString::fromLocal8Bit("     提交成功！"),_window);
+    FMMsgWnd::SuccessWnd(QString::fromLocal8Bit("     积分成功！"),_window);
 
 }
 
@@ -362,3 +369,41 @@ void TaskReverse::packagePOSRsp()
 //    }
 }
 #endif
+
+TaskRevoke::TaskRevoke(QJsonObject &jsonObj, Session *session, QObject *parent)
+    :FMTaskNoWnd(jsonObj, FM_Revoke, session, parent)
+{
+
+}
+
+void TaskRevoke::packageServerReq()
+{
+    QString time = QDateTime::currentDateTime().toString("yyyyMMddhhmmsszzz");
+    QString stationId = FMPVipSettings::instance()->getStationId();
+    QString storeId = FMPVipSettings::instance()->getStoreId();
+    QString transId = stationId + storeId + time;
+    QString partnerId = FMPVipSettings::instance()->getPartnerId();
+    QString orderNo = partnerId + stationId  + time;
+
+    serverReqJsonObj[PosProps.StoreId] = storeId;
+    serverReqJsonObj[PosProps.StationId] = stationId;
+    serverReqJsonObj[PosProps.OperatorId] = FMPVipSettings::instance()->getOperatorId();
+    serverReqJsonObj[PosProps.PartnerId] = partnerId;
+    serverReqJsonObj[PosProps.TransId] = transId;
+    serverReqJsonObj[PosProps.OpenId] = session()->data(PosProps.OpenId).toString();
+    serverReqJsonObj["orgiOutReferNo"] = session()->data(PosProps.OrderId).toString();
+    serverReqJsonObj["orgiOrderNo"] = session()->data(PosProps.OrderId).toString();
+    serverReqJsonObj["outReferNo"] = orderNo;
+}
+
+void TaskRevoke::packagePOSRsp()
+{
+    qDebug() << getServerJsonValue("statusCode").toInt() << "|||||||||||||||||||";
+    if(getServerJsonValue("statusCode").toInt() != 100)
+    {
+        QString info = getServerJsonValue("msg").toString();
+        FMMsgWnd::FailureWnd(info,_window);
+        return;
+    }
+    FMMsgWnd::SuccessWnd(QString::fromLocal8Bit("     退分成功！"),_window);
+}

fmvip/task/taskothers.h

@@ -59,6 +59,19 @@ public:
     void packagePOSRsp();
 };
 
+
+/*退分接口*/
+class TaskRevoke : public FMTaskNoWnd
+{
+    Q_OBJECT
+public:
+    explicit TaskRevoke(QJsonObject &jsonObj, Session *session = 0, QObject *parent = 0);
+
+    void packageServerReq();
+    void packagePOSRsp();
+};
+
+
 /*冲正接口*/
 class TaskReverse : public FMTaskNoWnd
 {

fmvip/windows/fmlistdetail.cpp

+#include "fmlistdetail.h"
+#include "ui_fmlistdetail.h"
+#include "fmviplist.h"
+#include "taskothers.h"
+#include "fmp_vip_server.h"
+#include <QJsonArray>
+
+FMListDetail::FMListDetail(QDialog *parent) :
+    FMVipWnd(parent),
+    ui(new Ui::FMListDetail),
+    _orderId(""),
+    _transId(""),
+    _openId("")
+{
+    ui->setupUi(this);
+    _session = new Session();
+    ui->tableWidget->horizontalHeader()->setStretchLastSection(true);
+    ui->tableWidget->setSelectionBehavior(QAbstractItemView::SelectRows);  //单击选择一行
+    ui->tableWidget->setSelectionMode(QAbstractItemView::SingleSelection); //设置只能选择一行，不能多行选中
+    ui->tableWidget->setEditTriggers(QAbstractItemView::NoEditTriggers);   //设置每行内容不可更改
+    ui->tableWidget->setAlternatingRowColors(true);
+}
+
+FMListDetail::~FMListDetail()
+{
+    delete ui;
+}
+
+bool FMListDetail::initWnd(Session *session)
+{
+    _session = session;
+
+    ui->tableWidget->horizontalHeader()->setStretchLastSection(true);
+    ui->tableWidget->setSelectionBehavior(QAbstractItemView::SelectRows);  //单击选择一行
+    ui->tableWidget->setSelectionMode(QAbstractItemView::SingleSelection); //设置只能选择一行，不能多行选中
+    ui->tableWidget->setEditTriggers(QAbstractItemView::NoEditTriggers);   //设置每行内容不可更改
+    ui->tableWidget->setAlternatingRowColors(true);
+
+    return true;
+}
+
+void FMListDetail::getJsonArray(QJsonArray &jsonArray)
+{
+    int row = jsonArray.size();
+    ui->tableWidget->clear();
+    ui->tableWidget->setRowCount(row);
+    ui->tableWidget->setColumnCount(2);
+    ui->tableWidget->setColumnWidth(0,300);
+    QStringList header;
+    header << QString::fromLocal8Bit("券号") << QString::fromLocal8Bit("金额");
+    ui->tableWidget->setHorizontalHeaderLabels(header);
+    for(int k =0;k< row;k++)
+    {
+        QJsonObject json = jsonArray[k].toObject();
+        ui->tableWidget->setItem(k, 0, new QTableWidgetItem(QString(json["coupon_code"].toString())));
+        ui->tableWidget->setItem(k, 1, new QTableWidgetItem(QString(json["coupon_amount"].toString())));
+//        QPushButton *ptn = new QPushButton(QString::fromLocal8Bit("退分"));
+//        ptn->setProperty("Row", k);
+//        ui->tableWidget->setCellWidget(k, 2,ptn);
+//        connect(ptn,SIGNAL(clicked(bool)),this,SLOT(tableWidget_button(bool)));
+    }
+
+    for (int i=0;i<row;i++)
+       {
+           for (int j=0;j<2;j++)
+           {
+               // 代码设置居中
+               ui->tableWidget->item(i,j)->setTextAlignment(Qt::AlignHCenter|Qt::AlignVCenter);
+           }
+    }
+}
+
+void FMListDetail::getMsg(QStringList id)
+{
+    _orderId = id.at(0);
+    _transId = id.at(1);
+    _openId = id.at(2);
+    session()->addData(PosProps.OrderId,_orderId);
+    session()->addData(PosProps.TransId,_transId);
+    session()->addData(PosProps.OpenId,_openId);
+}
+
+void FMListDetail::clearWidget()
+{
+    ui->tableWidget->clear();
+}
+
+void FMListDetail::on_pushButton_clicked()
+{
+    this->accept();
+}
+
+//void FMListDetail::tableWidget_button(bool)
+//{
+//    qDebug() << qobject_cast<QPushButton*>(sender())->property("Row").toInt();
+//}
+
+void FMListDetail::on_pushButton_2_clicked()
+{
+    QJsonObject json;
+    TaskRevoke revokeTask(json,_session);
+    revokeTask.doTask();
+    accept();
+    emit listClose();
+    QByteArray rspData;
+    FMPVipServer::instance()->callVipPay("{\"fm_cmd\":10036}",rspData);
+}

fmvip/windows/fmlistdetail.h

+#ifndef FMLISTDETAIL_H
+#define FMLISTDETAIL_H
+
+#include "fmvipwnd.h"
+
+namespace Ui {
+class FMListDetail;
+}
+
+class FMListDetail : public FMVipWnd
+{
+    Q_OBJECT
+
+public:
+    explicit FMListDetail(QDialog *parent = 0);
+    ~FMListDetail();
+
+    bool initWnd(Session *session);
+    void getJsonArray(QJsonArray &jsonArray);
+    void getMsg(QStringList id);
+    void clearWidget();
+
+signals:
+    void listClose();
+
+private slots:
+    void on_pushButton_clicked();
+//    void tableWidget_button(bool);
+    void on_pushButton_2_clicked();
+
+private:
+    Ui::FMListDetail *ui;
+    QString _orderId;
+    QString _transId;
+    QString _openId;
+};
+
+#endif // FMLISTDETAIL_H

fmvip/windows/fmviplist.h

@@ -2,6 +2,7 @@
 #define FMVIPLIST_H
 
 #include "fmvipwnd.h"
+#include "fmlistdetail.h"
 
 namespace Ui {
 class FMVipList;
@@ -24,15 +25,24 @@ public:
 signals:
     void getList();
     void buttonClick();
-//    void doubleClick(const QString &id);
+    void doubleClick(const QString &id);
+
+protected:
+    bool close();
 
 private slots:
     void on_order_pushButton_clicked();
 
-//    void on_tableWidget_doubleClicked(const QModelIndex &index);
+    void onTableWidgetDoubleClicked(const QModelIndex &index);
+
+    void on_close_btn_clicked();
+
+    void tableWidget_button(bool);
 
 private:
     Ui::FMVipList *ui;
+
+    FMListDetail *_listDetailWnd;
 };
 
 #endif // FMVIPLIST_H

fmvip/windows/fmviporder.cpp

@@ -9,6 +9,7 @@
 #include <QItemSelectionModel>
 #include <QLabel>
 #include "fmp_vip_server.h"
+#include "fmp_vip_settings.h"
 
 FMVipOrder::FMVipOrder(QDialog *parent) :
     FMVipWnd(parent),
@@ -69,6 +70,9 @@ FMVipOrder::FMVipOrder(QDialog *parent) :
 
     scanfLe->setFocus();
 
+    ui->first_label->setAlignment(Qt::AlignCenter);
+    ui->first_label->setPixmap(QPixmap(":logo"));
+
     ui->pay_max->setText(QString::fromLocal8Bit("订单金额"));
     ui->pay_max->setAlignment(Qt::AlignLeft | Qt::AlignVCenter);
     ui->pay_max->setStyleSheet("QLabel{color:black;font:normal 18px;}");
@@ -91,7 +95,12 @@ FMVipOrder::FMVipOrder(QDialog *parent) :
     ui->title->setStyleSheet("QWidget{background:rgb(255, 170, 0);color:black}");
     ui->pay_btn->setStyleSheet("QPushButton{background:rgb(255, 170, 0)}");
 
-    ui->coupon_page->setDisabled(true);
+    ui->coupon_page->setDisabled(false);
+
+    ui->pageCtrlLayLayout->removeWidget(ui->coupon);
+    ui->coupon_next_btn->close();
+    ui->coupon_prev_btn->close();
+    ui->position_label->close();
 
     connect(scanfLe,SIGNAL(returnPressed()),this,SLOT(on_scanfLe_returnPressed()));
 
@@ -157,7 +166,9 @@ bool FMVipOrder::initWnd(Session *session)
 //    storeLabel->setText(session->data("PN").toString());
 //    storeLabel->adjustSize();
     QString storeName = session->data("PN").toString();
-    QString logo = QString::fromLocal8Bit("华润通小助手") + "(" +storeName + ")";
+    QString partnerName = FMPVipSettings::instance()->getStoreName();
+    QString logo = QString::fromLocal8Bit("华润通小助手") + "(" + partnerName + " " + storeName +")";
+
     ui->logo_label->setText(logo);
     ui->store_label->setText(session->data("SI").toString());
     ui->pos_label->setText(session->data("STATIONID").toString());
@@ -196,7 +207,7 @@ void FMVipOrder::on_pay_btn_clicked()
     session()->addData(PosProps.Pay_amount, payAmount);
 
 #ifdef FASTPAY
-    if(vipLe->text() == NULL)
+    if(vipLe->text() == NULL && !selectionModel->hasSelection())
     {
         FMMsgWnd::FailureWnd(QString::fromLocal8Bit("会员为空！"),this);
         this->setEnabled(true);
@@ -260,7 +271,10 @@ void FMVipOrder::on_coupon_page_clicked(const QModelIndex &index)
 {
     // 如果选中状态则取消选中
     if(selectionModel->isSelected(index)) {
+#ifdef FASTPAY
+#else
         selectionModel->select(index, QItemSelectionModel::Deselect);
+#endif
     } else {
         // 如果已经有一个选中的，则判断选中的这个是否是不可叠加券
         if(selectionModel->selectedIndexes().length() == 1) {

fmvip/windows/fmviporder.h

@@ -219,6 +219,7 @@ private:
 #ifdef FASTPAY
     QLabel *scanfLabel;
     QLabel *vipLabel_desc;
+    QLabel *logo_label;
     QLineEdit *scanfLe;
     QLineEdit *vipLe;
     QLineEdit *needPayLe;

fmvip/windows/fmvipwnd.cpp

@@ -49,6 +49,7 @@ void FMVipWnd::setIsBusy(const bool isBusy)
 
 int FMVipWnd::exec()
 {
+    emit windowShow();
     showNormal();
     ::SetForegroundWindow((HWND)effectiveWinId());
 

fmvip/windows/fmvipwnd.h

@@ -24,6 +24,9 @@ public:
     virtual bool        initWnd(Session* session) {this->_session = session; return true;}
     Session*    session() const {return _session;}
 
+signals:
+    void    windowShow();
+
 public slots:
     void    on_close_btn_clicked();
 private:

fmvip/windows/forms/fmlistdetail.ui

+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>FMListDetail</class>
+ <widget class="QDialog" name="FMListDetail">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>444</width>
+    <height>298</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Dialog</string>
+  </property>
+  <property name="styleSheet">
+   <string notr="true">
+#label {
+	font:18px;
+	background:rgb(255, 170, 0);
+}
+
+#pushButton {
+	min-height: 56px;
+	background: rgb(255, 170, 0);
+	font: 400 23px &quot;Microsoft YaHei&quot;;
+	color: white;
+	border: 1 solid white;
+	border-right: 0 solid silver;
+}
+#pushButton_2 {
+		min-height: 56px;
+	background: rgb(255, 170, 0);
+	font: 400 23px &quot;Microsoft YaHei&quot;;
+	color: white;
+	border: 1 solid white;
+	border-right: 0 solid silver;
+}</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QLabel" name="label">
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>30</height>
+      </size>
+     </property>
+     <property name="text">
+      <string>已核销优惠券列表</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignCenter</set>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QTableWidget" name="tableWidget"/>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QPushButton" name="pushButton_2">
+       <property name="minimumSize">
+        <size>
+         <width>0</width>
+         <height>58</height>
+        </size>
+       </property>
+       <property name="text">
+        <string>退分</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pushButton">
+       <property name="minimumSize">
+        <size>
+         <width>0</width>
+         <height>58</height>
+        </size>
+       </property>
+       <property name="text">
+        <string>关闭</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

fmvip/windows/forms/fmviplist.ui

@@ -127,6 +127,25 @@
        <number>0</number>
       </property>
       <item>
+       <widget class="QLabel" name="label">
+        <property name="minimumSize">
+         <size>
+          <width>55</width>
+          <height>0</height>
+         </size>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>55</width>
+          <height>16777215</height>
+         </size>
+        </property>
+        <property name="text">
+         <string>TextLabel</string>
+        </property>
+       </widget>
+      </item>
+      <item>
        <widget class="QLabel" name="logo_label">
         <property name="maximumSize">
          <size>

fmvip/windows/forms/fmviporder.ui

@@ -40,7 +40,7 @@
 #title {
   background: rgb(56, 56, 64);
   min-height: 54px; max-height: 54px;
-  border: 1 solid silver;
+  border: 0 solid silver;
   border-bottom: 0 solid silver;
 }
 #logo_label {
@@ -322,7 +322,32 @@
        <number>0</number>
       </property>
       <item>
+       <widget class="QLabel" name="first_label">
+        <property name="minimumSize">
+         <size>
+          <width>55</width>
+          <height>55</height>
+         </size>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>55</width>
+          <height>16777215</height>
+         </size>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item>
        <widget class="QLabel" name="logo_label">
+        <property name="minimumSize">
+         <size>
+          <width>140</width>
+          <height>54</height>
+         </size>
+        </property>
         <property name="maximumSize">
          <size>
           <width>16777215</width>
@@ -580,7 +605,7 @@
            <number>0</number>
           </property>
           <property name="verticalScrollBarPolicy">
-           <enum>Qt::ScrollBarAlwaysOff</enum>
+           <enum>Qt::ScrollBarAlwaysOn</enum>
           </property>
           <property name="horizontalScrollBarPolicy">
            <enum>Qt::ScrollBarAlwaysOff</enum>
@@ -608,7 +633,7 @@
           </property>
           <property name="gridSize">
            <size>
-            <width>230</width>
+            <width>190</width>
             <height>124</height>
            </size>
           </property>
@@ -630,15 +655,21 @@
         <property name="spacing">
          <number>0</number>
         </property>
+        <property name="sizeConstraint">
+         <enum>QLayout::SetMaximumSize</enum>
+        </property>
         <item>
          <spacer name="verticalSpacer">
           <property name="orientation">
            <enum>Qt::Vertical</enum>
           </property>
+          <property name="sizeType">
+           <enum>QSizePolicy::Maximum</enum>
+          </property>
           <property name="sizeHint" stdset="0">
            <size>
-            <width>20</width>
-            <height>40</height>
+            <width>0</width>
+            <height>0</height>
            </size>
           </property>
          </spacer>
@@ -683,10 +714,13 @@
           <property name="orientation">
            <enum>Qt::Vertical</enum>
           </property>
+          <property name="sizeType">
+           <enum>QSizePolicy::Maximum</enum>
+          </property>
           <property name="sizeHint" stdset="0">
            <size>
-            <width>20</width>
-            <height>40</height>
+            <width>0</width>
+            <height>0</height>
            </size>
           </property>
          </spacer>

version.h

@@ -5,7 +5,7 @@
 #define VER_MINOR 1
 #define VER_REVISION 0
 
-#define VER_BUILD 42
+#define VER_BUILD 43
 
 //! Convert version numbers to string
 #define _STR(S)  #S