Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
F
fmp_home
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
zhenfei.zhang
fmp_home
Commits
d855757b
Commit
d855757b
authored
Jan 19, 2018
by
xiaoqing.gu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化登录界面
parent
ad717311
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
103 additions
and
9 deletions
+103
-9
fmp_login.cpp
+14
-1
fmp_login.ui
+84
-5
res/MANIFEST.MF
+1
-1
res/img.qrc
+2
-0
res/img/password.png
+0
-0
res/img/user.png
+0
-0
version.h
+2
-2
No files found.
fmp_login.cpp
View file @
d855757b
...
@@ -11,6 +11,7 @@
...
@@ -11,6 +11,7 @@
#include <QFile>
#include <QFile>
#include "fmnetwork.h"
#include "fmnetwork.h"
#include <QDebug>
#include <QDebug>
#include <QPixmap>
FMPLogin
::
FMPLogin
(
QDialog
*
parent
)
:
FMPLogin
::
FMPLogin
(
QDialog
*
parent
)
:
FMPWnd
(
parent
),
FMPWnd
(
parent
),
...
@@ -20,7 +21,7 @@ FMPLogin::FMPLogin(QDialog *parent) :
...
@@ -20,7 +21,7 @@ FMPLogin::FMPLogin(QDialog *parent) :
{
{
ui
->
setupUi
(
this
);
ui
->
setupUi
(
this
);
// connect(ui->numpad, SIGNAL(digit_confirm()), this, SLOT(on_login_btn_clicked()));
// connect(ui->numpad, SIGNAL(digit_confirm()), this, SLOT(on_login_btn_clicked()));
//
connect(qApp, &QApplication::focusChanged, this, &FMPLogin::onFocusChanged);
connect
(
qApp
,
&
QApplication
::
focusChanged
,
this
,
&
FMPLogin
::
onFocusChanged
);
setAttribute
(
Qt
::
WA_QuitOnClose
,
false
);
setAttribute
(
Qt
::
WA_QuitOnClose
,
false
);
setWindowIcon
(
QIcon
(
":fm-icon_tray"
));
setWindowIcon
(
QIcon
(
":fm-icon_tray"
));
...
@@ -28,6 +29,17 @@ FMPLogin::FMPLogin(QDialog *parent) :
...
@@ -28,6 +29,17 @@ FMPLogin::FMPLogin(QDialog *parent) :
ui
->
logo_label
->
setText
(
QString
::
fromLocal8Bit
(
FMP_APPNAME
));
ui
->
logo_label
->
setText
(
QString
::
fromLocal8Bit
(
FMP_APPNAME
));
ui
->
user_edit
->
setFocus
();
ui
->
user_edit
->
setFocus
();
/*标题栏添加非码图标*/
ui
->
icon_label
->
setPixmap
(
QPixmap
(
":fm-icon_02"
));
ui
->
icon_label
->
setScaledContents
(
true
);
/*为账号和密码行添加图标*/
ui
->
user_label
->
setAlignment
(
Qt
::
AlignCenter
);
ui
->
user_label
->
setPixmap
(
QPixmap
(
":user"
));
ui
->
pwd_label
->
setAlignment
(
Qt
::
AlignCenter
);
ui
->
pwd_label
->
setPixmap
(
QPixmap
(
":pwd"
));
_url
=
FMPHomeSettings
::
instance
()
->
getServer
();
_url
=
FMPHomeSettings
::
instance
()
->
getServer
();
_storeId
=
FMPHomeSettings
::
instance
()
->
getStroeId
();
_storeId
=
FMPHomeSettings
::
instance
()
->
getStroeId
();
_partnerId
=
FMPHomeSettings
::
instance
()
->
getPartnerId
();
_partnerId
=
FMPHomeSettings
::
instance
()
->
getPartnerId
();
...
@@ -113,6 +125,7 @@ void FMPLogin::onFocusChanged(QWidget *, QWidget *now)
...
@@ -113,6 +125,7 @@ void FMPLogin::onFocusChanged(QWidget *, QWidget *now)
{
{
if
(
ui
->
user_edit
==
now
||
ui
->
pwd_edit
==
now
)
{
if
(
ui
->
user_edit
==
now
||
ui
->
pwd_edit
==
now
)
{
// ui->numpad->setLineEdit(qobject_cast<QLineEdit*>(now));
// ui->numpad->setLineEdit(qobject_cast<QLineEdit*>(now));
qDebug
()
<<
"changed"
;
}
}
}
}
...
...
fmp_login.ui
View file @
d855757b
...
@@ -47,6 +47,7 @@
...
@@ -47,6 +47,7 @@
min-height: 54px; max-height: 54px;
min-height: 54px; max-height: 54px;
border: 1 solid silver;
border: 1 solid silver;
}
}
#logo_label {
#logo_label {
font: 75 22px
"
微软雅黑
"
;;
font: 75 22px
"
微软雅黑
"
;;
color: rgb(220, 220, 220);
color: rgb(220, 220, 220);
...
@@ -64,8 +65,16 @@
...
@@ -64,8 +65,16 @@
/*
/*
*
*
*/
*/
#user_label{
color: rgb(169,169,169);
/* image: url(
"
:/account.png
"
);*/
background: white;
border: 1 solid silver;
border-right: 0;
min-width: 49; max-width: 49;
}
#
user_label,#
pwd_label {
#pwd_label {
color: rgb(169,169,169);
color: rgb(169,169,169);
image: url(
"
:/account.png
"
);
image: url(
"
:/account.png
"
);
background: white;
background: white;
...
@@ -151,16 +160,38 @@
...
@@ -151,16 +160,38 @@
<number>
0
</number>
<number>
0
</number>
</property>
</property>
<item>
<item>
<widget
class=
"QLabel"
name=
"logo_label"
>
<widget
class=
"QLabel"
name=
"icon_label"
>
<property
name=
"minimumSize"
>
<size>
<width>
54
</width>
<height>
54
</height>
</size>
</property>
<property
name=
"maximumSize"
>
<property
name=
"maximumSize"
>
<size>
<size>
<width>
16777215
</width>
<width>
54
</width>
<height>
16777215
</height>
<height>
54
</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>
</size>
</property>
</property>
<property
name=
"text"
>
<property
name=
"text"
>
<string/>
<string/>
</property>
</property>
<property
name=
"alignment"
>
<set>
Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter
</set>
</property>
</widget>
</widget>
</item>
</item>
<item>
<item>
...
@@ -230,6 +261,18 @@
...
@@ -230,6 +261,18 @@
</property>
</property>
<item>
<item>
<widget
class=
"QLabel"
name=
"user_label"
>
<widget
class=
"QLabel"
name=
"user_label"
>
<property
name=
"minimumSize"
>
<size>
<width>
50
</width>
<height>
51
</height>
</size>
</property>
<property
name=
"maximumSize"
>
<size>
<width>
50
</width>
<height>
51
</height>
</size>
</property>
<property
name=
"margin"
>
<property
name=
"margin"
>
<number>
0
</number>
<number>
0
</number>
</property>
</property>
...
@@ -237,6 +280,18 @@
...
@@ -237,6 +280,18 @@
</item>
</item>
<item>
<item>
<widget
class=
"QLineEdit"
name=
"user_edit"
>
<widget
class=
"QLineEdit"
name=
"user_edit"
>
<property
name=
"minimumSize"
>
<size>
<width>
340
</width>
<height>
51
</height>
</size>
</property>
<property
name=
"maximumSize"
>
<size>
<width>
16777215
</width>
<height>
50
</height>
</size>
</property>
<property
name=
"inputMask"
>
<property
name=
"inputMask"
>
<string/>
<string/>
</property>
</property>
...
@@ -263,6 +318,18 @@
...
@@ -263,6 +318,18 @@
</property>
</property>
<item>
<item>
<widget
class=
"QLabel"
name=
"pwd_label"
>
<widget
class=
"QLabel"
name=
"pwd_label"
>
<property
name=
"minimumSize"
>
<size>
<width>
50
</width>
<height>
51
</height>
</size>
</property>
<property
name=
"maximumSize"
>
<size>
<width>
50
</width>
<height>
51
</height>
</size>
</property>
<property
name=
"margin"
>
<property
name=
"margin"
>
<number>
0
</number>
<number>
0
</number>
</property>
</property>
...
@@ -270,6 +337,18 @@
...
@@ -270,6 +337,18 @@
</item>
</item>
<item>
<item>
<widget
class=
"QLineEdit"
name=
"pwd_edit"
>
<widget
class=
"QLineEdit"
name=
"pwd_edit"
>
<property
name=
"minimumSize"
>
<size>
<width>
0
</width>
<height>
51
</height>
</size>
</property>
<property
name=
"maximumSize"
>
<size>
<width>
16777215
</width>
<height>
50
</height>
</size>
</property>
<property
name=
"inputMask"
>
<property
name=
"inputMask"
>
<string/>
<string/>
</property>
</property>
...
@@ -314,7 +393,7 @@
...
@@ -314,7 +393,7 @@
<cursorShape>
PointingHandCursor
</cursorShape>
<cursorShape>
PointingHandCursor
</cursorShape>
</property>
</property>
<property
name=
"text"
>
<property
name=
"text"
>
<string>
会员认证
</string>
<string>
登录
</string>
</property>
</property>
</widget>
</widget>
</item>
</item>
...
...
res/MANIFEST.MF
View file @
d855757b
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-201
7
Plugin-Copyright: Freemud Ltd. Copyright (C) 2014-201
8
Plugin-Vendor: Freemud
Plugin-Vendor: Freemud
res/img.qrc
View file @
d855757b
...
@@ -15,5 +15,7 @@
...
@@ -15,5 +15,7 @@
<file alias="coupons">img/fm-icon_coupons.png</file>
<file alias="coupons">img/fm-icon_coupons.png</file>
<file alias="coupons_onclick">img/fm-icon_coupons_02.png</file>
<file alias="coupons_onclick">img/fm-icon_coupons_02.png</file>
<file>img/fm-icon_close_02.png</file>
<file>img/fm-icon_close_02.png</file>
<file alias="pwd">img/password.png</file>
<file alias="user">img/user.png</file>
</qresource>
</qresource>
</RCC>
</RCC>
res/img/password.png
0 → 100644
View file @
d855757b
576 Bytes
res/img/user.png
0 → 100644
View file @
d855757b
781 Bytes
version.h
View file @
d855757b
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
#define VER_MINOR 1
#define VER_MINOR 1
#define VER_REVISION 0
#define VER_REVISION 0
#define VER_BUILD 1
7
#define VER_BUILD 1
9
//! Convert version numbers to string
//! Convert version numbers to string
#define _STR(S) #S
#define _STR(S) #S
...
@@ -20,7 +20,7 @@
...
@@ -20,7 +20,7 @@
#define RES_STR_FILE_VER MAK_VER(VER_MAJOR, VER_MINOR, VER_REVISION, VER_BUILD)
#define RES_STR_FILE_VER MAK_VER(VER_MAJOR, VER_MINOR, VER_REVISION, VER_BUILD)
#define RES_STR_PRODUCT_VER MAK_VER(VER_MAJOR, VER_MINOR, VER_REVISION, VER_BUILD)
#define RES_STR_PRODUCT_VER MAK_VER(VER_MAJOR, VER_MINOR, VER_REVISION, VER_BUILD)
#define RES_COMPANY_NAME "上海非码网络科技有限公司\0"
#define RES_COMPANY_NAME "上海非码网络科技有限公司\0"
#define RES_COPYRIGHT "Freemud Ltd. Copyright (C) 2014-201
7
\0"
#define RES_COPYRIGHT "Freemud Ltd. Copyright (C) 2014-201
8
\0"
#define RES_FILE_DESC "fmp.home\0"
#define RES_FILE_DESC "fmp.home\0"
#define RES_INTER_NAME "fmp.home\0"
#define RES_INTER_NAME "fmp.home\0"
#define RES_FILE_NAME "fmp.home\0"
#define RES_FILE_NAME "fmp.home\0"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment