sunwen/GUI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

translation improvement 5

Browse Source
This commit is contained in:
xueyan hu
2021-12-29 14:56:48 +08:00
parent 912558507f
commit 4b5a596010
10 changed files with 300 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/SelectFormWidget.cpp
View File

@@ -17,6 +17,7 @@
#include "AccountFormDialog.h"
#include <QDebug>
#include "log/UserOperationLog.h"
#include <QSortFilterProxyModel>
#define ADD_CENTER_ITEM(row,col,text)\
item = new QTableWidgetItem(text);\
@@ -86,6 +87,7 @@ SelectFormWidget::SelectFormWidget(QWidget* parent) :
table->horizontalHeader()->setStretchLastSection(true);
//data from SQLITE
auto model = SQLHelper::getTable("Patient");
model->setFilter("Flag=0");
model->sort(5, Qt::DescendingOrder);
@@ -96,10 +98,15 @@ SelectFormWidget::SelectFormWidget(QWidget* parent) :
model->setHeaderData(4, Qt::Horizontal, tr("Gender"));
model->setHeaderData(5, Qt::Horizontal, tr("Add Date"));
model->setHeaderData(6, Qt::Horizontal, tr("Comment"));
QSortFilterProxyModel* proxyModel = new QSortFilterProxyModel(model); // create proxy
proxyModel->setSourceModel(model);
table->setSortingEnabled(true); // enable sortingEnabled
table->setModel((QAbstractItemModel*)model);
table->hideColumn(0);
table->hideColumn(7);
table->show();
// table->setSortingEnabled(true);

3
src/components/imageswitch.cpp
View File

@@ -8,6 +8,7 @@ ImageSwitch::ImageSwitch(QWidget* parent) : QWidget(parent)
{
isChecked = false;
setButtonStyle(ButtonStyle_1);
this->setFixedSize(sizeHint());
}
void ImageSwitch::mousePressEvent(QMouseEvent*)
@@ -44,7 +45,7 @@ ImageSwitch::ButtonStyle ImageSwitch::getButtonStyle() const
QSize ImageSwitch::sizeHint() const
{
return QSize(220, 64);
return QSize(100, 50);
}
QSize ImageSwitch::minimumSizeHint() const

BIN
src/icons/imageswitch/btncheckoff1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.8 KiB

After

Width:  |  Height:  |  Size: 10 KiB

BIN
src/icons/imageswitch/btncheckon1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.4 KiB

After

Width:  |  Height:  |  Size: 8.5 KiB

2
src/stylesheet/Dark2.qss
View File

File diff suppressed because one or more lines are too long

3
src/systemsettingform.cpp
View File

@@ -45,8 +45,9 @@ systemSettingForm::systemSettingForm(QWidget* parent) :
//data init
ui->btnPro->setText(JsonObject::Instance()->defaultProtocal());
ui->btnPro->setObjectName("BigBtn");
ui->btnFlt->setText(JsonObject::Instance()->defaultFilter());
ui->btnFlt->setObjectName("BigBtn");
//connection
connect(ui->swt_verify, &ImageSwitch::clicked, [=]() {

359
src/systemsettingform.ui
View File

@@ -6,91 +6,146 @@
<rect>
<x>0</x>
<y>0</y>
<width>572</width>
<height>612</height>
<width>681</width>
<height>678</height>
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="styleSheet">
<string notr="true"/>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QWidget" name="block1" native="true">
<widget class="QWidget" name="widget" native="true">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QWidget" name="block10" native="true">
<layout class="QGridLayout" name="gridLayout_2">
<item row="1" column="2">
<widget class="ImageSwitch" name="swt_verify" native="true">
<property name="minimumSize">
<size>
<width>25</width>
<height>25</height>
</size>
</property>
<widget class="QWidget" name="widget_2" native="true">
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<widget class="QWidget" name="block10" native="true">
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
<widget class="QLabel" name="lbl_protocal">
<property name="text">
<string>Protocal</string>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QPushButton" name="btnPro">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="2" column="1">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="0">
<widget class="Line" name="line_3">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="lbl_verify">
<property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>Auto Verify</string>
</property>
</widget>
</item>
<item row="2" column="2">
<widget class="ImageSwitch" name="swt_verify" native="true">
<property name="minimumSize">
<size>
<width>25</width>
<height>25</height>
</size>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="Line" name="line">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="0" column="1">
<spacer name="horizontalSpacer_7">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="3">
<spacer name="horizontalSpacer_4">
<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>
</widget>
</item>
<item row="1" column="1">
<spacer name="horizontalSpacer">
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="0">
<widget class="QLabel" name="lbl_verify">
<property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>Auto Verify</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="lbl_protocal">
<property name="text">
<string>Protocal</string>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QPushButton" name="btnPro">
<property name="minimumSize">
<size>
<width>100</width>
<height>50</height>
</size>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="0" column="1">
<spacer name="horizontalSpacer_7">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
@@ -99,42 +154,16 @@
</widget>
</item>
<item>
<spacer name="horizontalSpacer_3">
<widget class="Line" name="line_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</widget>
</item>
<item>
<widget class="QWidget" name="widget_2" native="true">
<layout class="QGridLayout" name="gridLayout_3">
<item row="3" column="0">
<widget class="QToolButton" name="btn_dicom">
<property name="text">
<string>DICOM</string>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextBesideIcon</enum>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="lbl_filter">
<property name="text">
<string>Worklist Filter</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QWidget" name="widget_4" native="true">
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QToolButton" name="btn_network">
<property name="text">
<string>IP</string>
@@ -144,38 +173,116 @@
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QPushButton" name="btnFlt">
<property name="minimumSize">
<size>
<width>100</width>
<height>50</height>
</size>
</property>
<property name="text">
<string/>
<item>
<widget class="Line" name="line_4">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item>
<widget class="QWidget" name="widget_3" native="true">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QLabel" name="lbl_filter">
<property name="text">
<string>Worklist Filter</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_3">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="btnFlt">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<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>
</layout>
</widget>
</item>
<item>
<widget class="QToolButton" name="btn_dicom">
<property name="text">
<string>DICOM</string>
</property>
<property name="toolButtonStyle">
<enum>Qt::ToolButtonTextBesideIcon</enum>
</property>
</widget>
</item>
<item>
<widget class="Line" name="line_5">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>224</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
<customwidgets>

BIN
src/translations/zh_CN.qm
View File

Binary file not shown.

54
src/translations/zh_CN.ts
View File

@@ -678,67 +678,67 @@ parameters
<context>
<name>SelectFormWidget</name>
<message>
<location filename="../SelectFormWidget.cpp" line="59"/>
<location filename="../SelectFormWidget.cpp" line="268"/>
<location filename="../SelectFormWidget.cpp" line="60"/>
<location filename="../SelectFormWidget.cpp" line="275"/>
<source>Account</source>
<translation>账户</translation>
</message>
<message>
<location filename="../SelectFormWidget.cpp" line="60"/>
<location filename="../SelectFormWidget.cpp" line="61"/>
<source>Worklist</source>
<translation></translation>
</message>
<message>
<location filename="../SelectFormWidget.cpp" line="71"/>
<location filename="../SelectFormWidget.cpp" line="270"/>
<location filename="../SelectFormWidget.cpp" line="72"/>
<location filename="../SelectFormWidget.cpp" line="277"/>
<source>Add</source>
<translation>新增</translation>
</message>
<message>
<location filename="../SelectFormWidget.cpp" line="72"/>
<location filename="../SelectFormWidget.cpp" line="271"/>
<location filename="../SelectFormWidget.cpp" line="73"/>
<location filename="../SelectFormWidget.cpp" line="278"/>
<source>Edit</source>
<translation>编辑</translation>
</message>
<message>
<location filename="../SelectFormWidget.cpp" line="73"/>
<location filename="../SelectFormWidget.cpp" line="272"/>
<location filename="../SelectFormWidget.cpp" line="74"/>
<location filename="../SelectFormWidget.cpp" line="279"/>
<source>Delete</source>
<translation>删除</translation>
</message>
<message>
<location filename="../SelectFormWidget.cpp" line="74"/>
<location filename="../SelectFormWidget.cpp" line="273"/>
<location filename="../SelectFormWidget.cpp" line="75"/>
<location filename="../SelectFormWidget.cpp" line="280"/>
<source>Select</source>
<translation>选择</translation>
</message>
<message>
<location filename="../SelectFormWidget.cpp" line="94"/>
<location filename="../SelectFormWidget.cpp" line="262"/>
<location filename="../SelectFormWidget.cpp" line="96"/>
<location filename="../SelectFormWidget.cpp" line="269"/>
<source>Name</source>
<translation>姓名</translation>
</message>
<message>
<location filename="../SelectFormWidget.cpp" line="95"/>
<location filename="../SelectFormWidget.cpp" line="263"/>
<location filename="../SelectFormWidget.cpp" line="97"/>
<location filename="../SelectFormWidget.cpp" line="270"/>
<source>Birth Date</source>
<translation>出生日期</translation>
</message>
<message>
<location filename="../SelectFormWidget.cpp" line="96"/>
<location filename="../SelectFormWidget.cpp" line="264"/>
<location filename="../SelectFormWidget.cpp" line="98"/>
<location filename="../SelectFormWidget.cpp" line="271"/>
<source>Gender</source>
<translation>性别</translation>
</message>
<message>
<location filename="../SelectFormWidget.cpp" line="97"/>
<location filename="../SelectFormWidget.cpp" line="265"/>
<location filename="../SelectFormWidget.cpp" line="99"/>
<location filename="../SelectFormWidget.cpp" line="272"/>
<source>Add Date</source>
<translation>添加日期</translation>
</message>
<message>
<location filename="../SelectFormWidget.cpp" line="98"/>
<location filename="../SelectFormWidget.cpp" line="266"/>
<location filename="../SelectFormWidget.cpp" line="100"/>
<location filename="../SelectFormWidget.cpp" line="273"/>
<source>Comment</source>
<translation>备注</translation>
</message>
@@ -983,7 +983,7 @@ parameters
<context>
<name>systemSettingForm</name>
<message>
<location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="147"/>
<location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="230"/>
<source>Form</source>
<translation></translation>
</message>
@@ -992,12 +992,12 @@ parameters
<translation type="vanished">网络配置</translation>
</message>
<message>
<location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="149"/>
<location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="231"/>
<source>Protocal</source>
<translation>扫描协议</translation>
</message>
<message>
<location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="152"/>
<location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="235"/>
<source>Worklist Filter</source>
<translation>Worklist过滤器</translation>
</message>
@@ -1006,7 +1006,7 @@ parameters
<translation type="vanished">DICOM</translation>
</message>
<message>
<location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="148"/>
<location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="233"/>
<source>Auto Verify</source>
<translation>自动验证</translation>
</message>
@@ -1015,7 +1015,7 @@ parameters
<translation type="vanished">配置</translation>
</message>
<message>
<location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="153"/>
<location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="234"/>
<source>IP</source>
<translation></translation>
</message>
@@ -1032,7 +1032,7 @@ parameters
<translation type="vanished">接受</translation>
</message>
<message>
<location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="151"/>
<location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="237"/>
<source>DICOM</source>
<translation></translation>
</message>

54
src/translations/zh_CN.ts.bak
View File

@@ -678,67 +678,67 @@ parameters
<context>
<name>SelectFormWidget</name>
<message>
<location filename="../SelectFormWidget.cpp" line="59"/>
<location filename="../SelectFormWidget.cpp" line="268"/>
<location filename="../SelectFormWidget.cpp" line="60"/>
<location filename="../SelectFormWidget.cpp" line="275"/>
<source>Account</source>
<translation>账户</translation>
</message>
<message>
<location filename="../SelectFormWidget.cpp" line="60"/>
<location filename="../SelectFormWidget.cpp" line="61"/>
<source>Worklist</source>
<translation></translation>
</message>
<message>
<location filename="../SelectFormWidget.cpp" line="71"/>
<location filename="../SelectFormWidget.cpp" line="270"/>
<location filename="../SelectFormWidget.cpp" line="72"/>
<location filename="../SelectFormWidget.cpp" line="277"/>
<source>Add</source>
<translation>新增</translation>
</message>
<message>
<location filename="../SelectFormWidget.cpp" line="72"/>
<location filename="../SelectFormWidget.cpp" line="271"/>
<location filename="../SelectFormWidget.cpp" line="73"/>
<location filename="../SelectFormWidget.cpp" line="278"/>
<source>Edit</source>
<translation>编辑</translation>
</message>
<message>
<location filename="../SelectFormWidget.cpp" line="73"/>
<location filename="../SelectFormWidget.cpp" line="272"/>
<location filename="../SelectFormWidget.cpp" line="74"/>
<location filename="../SelectFormWidget.cpp" line="279"/>
<source>Delete</source>
<translation>删除</translation>
</message>
<message>
<location filename="../SelectFormWidget.cpp" line="74"/>
<location filename="../SelectFormWidget.cpp" line="273"/>
<location filename="../SelectFormWidget.cpp" line="75"/>
<location filename="../SelectFormWidget.cpp" line="280"/>
<source>Select</source>
<translation>选择</translation>
</message>
<message>
<location filename="../SelectFormWidget.cpp" line="94"/>
<location filename="../SelectFormWidget.cpp" line="262"/>
<location filename="../SelectFormWidget.cpp" line="96"/>
<location filename="../SelectFormWidget.cpp" line="269"/>
<source>Name</source>
<translation>姓名</translation>
</message>
<message>
<location filename="../SelectFormWidget.cpp" line="95"/>
<location filename="../SelectFormWidget.cpp" line="263"/>
<location filename="../SelectFormWidget.cpp" line="97"/>
<location filename="../SelectFormWidget.cpp" line="270"/>
<source>Birth Date</source>
<translation>出生日期</translation>
</message>
<message>
<location filename="../SelectFormWidget.cpp" line="96"/>
<location filename="../SelectFormWidget.cpp" line="264"/>
<location filename="../SelectFormWidget.cpp" line="98"/>
<location filename="../SelectFormWidget.cpp" line="271"/>
<source>Gender</source>
<translation>性别</translation>
</message>
<message>
<location filename="../SelectFormWidget.cpp" line="97"/>
<location filename="../SelectFormWidget.cpp" line="265"/>
<location filename="../SelectFormWidget.cpp" line="99"/>
<location filename="../SelectFormWidget.cpp" line="272"/>
<source>Add Date</source>
<translation>添加日期</translation>
</message>
<message>
<location filename="../SelectFormWidget.cpp" line="98"/>
<location filename="../SelectFormWidget.cpp" line="266"/>
<location filename="../SelectFormWidget.cpp" line="100"/>
<location filename="../SelectFormWidget.cpp" line="273"/>
<source>Comment</source>
<translation>备注</translation>
</message>
@@ -983,7 +983,7 @@ parameters
<context>
<name>systemSettingForm</name>
<message>
<location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="147"/>
<location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="230"/>
<source>Form</source>
<translation></translation>
</message>
@@ -992,12 +992,12 @@ parameters
<translation type="vanished">网络配置</translation>
</message>
<message>
<location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="149"/>
<location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="231"/>
<source>Protocal</source>
<translation>扫描协议</translation>
</message>
<message>
<location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="152"/>
<location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="235"/>
<source>Worklist Filter</source>
<translation>Worklist过滤器</translation>
</message>
@@ -1006,7 +1006,7 @@ parameters
<translation type="vanished">DICOM</translation>
</message>
<message>
<location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="148"/>
<location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="233"/>
<source>Auto Verify</source>
<translation>自动验证</translation>
</message>
@@ -1015,7 +1015,7 @@ parameters
<translation type="vanished">配置</translation>
</message>
<message>
<location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="153"/>
<location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="234"/>
<source>IP</source>
<translation></translation>
</message>
@@ -1032,7 +1032,7 @@ parameters
<translation type="vanished">接受</translation>
</message>
<message>
<location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="151"/>
<location filename="../../out/build/x64-Debug/ui_systemsettingform.h" line="237"/>
<source>DICOM</source>
<translation></translation>
</message>