From 4b5a596010d4b4ebc92708389c5a169dfb2f75f1 Mon Sep 17 00:00:00 2001 From: xueyan hu <576627988@qq.com> Date: Wed, 29 Dec 2021 14:56:48 +0800 Subject: [PATCH] translation improvement 5 --- src/SelectFormWidget.cpp | 9 +- src/components/imageswitch.cpp | 3 +- src/icons/imageswitch/btncheckoff1.png | Bin 6916 -> 10341 bytes src/icons/imageswitch/btncheckon1.png | Bin 9598 -> 8738 bytes src/stylesheet/Dark2.qss | 2 +- src/systemsettingform.cpp | 3 +- src/systemsettingform.ui | 359 ++++++++++++++++--------- src/translations/zh_CN.qm | Bin 10018 -> 10018 bytes src/translations/zh_CN.ts | 54 ++-- src/translations/zh_CN.ts.bak | 54 ++-- 10 files changed, 300 insertions(+), 184 deletions(-) diff --git a/src/SelectFormWidget.cpp b/src/SelectFormWidget.cpp index 07b6a45..99a73e3 100644 --- a/src/SelectFormWidget.cpp +++ b/src/SelectFormWidget.cpp @@ -17,6 +17,7 @@ #include "AccountFormDialog.h" #include #include "log/UserOperationLog.h" +#include #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); diff --git a/src/components/imageswitch.cpp b/src/components/imageswitch.cpp index 2b341ca..9a5829d 100644 --- a/src/components/imageswitch.cpp +++ b/src/components/imageswitch.cpp @@ -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 diff --git a/src/icons/imageswitch/btncheckoff1.png b/src/icons/imageswitch/btncheckoff1.png index 7c4b9cc8ce82fd7b887ca3b5108bf440d0b5238a..154e8c06e4f3b3a196626d1dae6025c5adfc5d29 100644 GIT binary patch literal 10341 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 rb}1JS>cgPOIsSP7-N%%Zj!RW)iW8iFdVA|9)@ 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 ZN24~A?Vrpa6hIX~|GJ4zwH7Mo{{b>J)PDc~ diff --git a/src/stylesheet/Dark2.qss b/src/stylesheet/Dark2.qss index 44565a3..9a29092 100644 --- a/src/stylesheet/Dark2.qss +++ b/src/stylesheet/Dark2.qss @@ -1 +1 @@ - /*------1.silver-->grey--------------------------*/ *{background-color:#3c3c3c; color:#fcfcfc;margin:0;font-size:16px;} QTabBar::tab { height:60px; width:300px; font-size: 25px; background:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,stop: 0 #505050, stop: 1.0 #333333); border: 2px solid #505050; border-bottom-left-radius: 50%; border-bottom-right-radius: 50%; min-width: 8ex; padding: 2px; } QTabBar::tab:selected, QTabBar::tab:hover { border-top:5px solid #4a88c7; background: #505050;} QTabWidget::pane{margin:0} QPlainTextEdit{border:0px} QGroupBox{border:0px} QLabel{color:#fcfcfc; font-weight:bold; font-size:16px;} QLineEdit{min-height:36px;max-height:36px; border:1px solid #505050;color:grey;border-radius:3px;} QLineEdit:enabled{background-color: #505050;color:#fcfcfc;} QDateEdit{min-height:36px;max-height:36px; border:1px solid #505050;color:grey;border-radius:3px;} QDateEdit:enabled{background-color: #505050;color:#fcfcfc;} QTextEdit{ border:1px solid #505050;color:grey;border-radius:3px;} QTextEdit:enabled{background-color: #505050;color:#fcfcfc;} QComboBox{text-align:center;min-height:36px;max-height:36px; border:1px solid #505050} QComboBox:enabled{background-color: #505050} QComboBox::drop-down{width:20px} QComboBox QAbstractItemView{min-width:120px;} QComboBox QAbstractItemView::item {min-height:60px;max-height:60px; border:1px solid white;} QWidget QToolButton{border:none;border-radius:10%;font-size:26px; font-weight:Bold;padding:5px;} QWidget QToolButton:disabled{color:#606060 } QWidget QToolButton:hover{background:#505050;} QWidget QToolButton:checked{border:5px solid darkorange;padding:0px;} QPushButton{border:1px solid #505050 ;padding-left:50px;padding-right:50px; border-radius:5px; min-height:28px; max-height:28px; background:qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 #505050, stop:1 #606060);} QListView{border:none;margin:5px; font-weight:bold} QListView::item{background:#4d4d4d;min-height:30px; border:1px solid #505050; border-radius:5px} QListView::item:selected{background:#365880;font-weight:bold;color:#fcfcfc;} /*QListView::item:selected{ background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #ABAFE5, stop: 1 #8588B2); border:1px solid #505050; }*/ QHeaderView::section{background-color:#595959;min-height:50px;max-height:50px;font-weight:Bold; font-size:16px; border:1px solid #323232;} QHeaderView::section:horizontal{border-bottom: 1px solid rgb(0,170,255);} QHeaderView::section:vertical{min-height:36px;max-height:36px;} QTableView{border:none;alternate-background-color: #595959;selection-color:#fcfcfc;selection-background-color:#0078d8} /*-----------Specific---------------*/ QLabel#sliderPickerLabel{color:grey;padding:0;background:#505050;font-weight:normal;font-size:50px;} QWidget#topbarWidget{min-height:36px;max-height:36px;} QWidget#contentWidget{border-top:1px solid #505050;} QWidget#commandWidget{min-height:123px;max-height:123px;border-top:1px solid #505050; border-bottom:1px solid #323232;} QLabel#logo{min-width:30px;max-width:30px} QLabel#company{min-width:150px;max-width:150px; } QLabel#systemMsgBar{min-width:500px;} QLabel#warn{color:#CCCC00;background:transparent;font-size:20px;} QWidget QWidget#statusBarWidget{min-width:300px;} QToolButton#btn_main{border:2px solid #0078d8;border-radius:10%;font-size:26px; font-weight:Bold;padding:5px;} QWidget#editcmdWidget{min-height:83px;max-height:83px;} QWidget#verSpaceLine{ border-right:1px solid #0078d8;} QWidget#topBottomLine{ border-top:2px solid #0078d8;border-bottom:2px solid #0078d8;background:transparent} /*-----蒙版Dialog-----*/ QDialog QWidget#innerWidget{ background:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,stop: 0.0 darkgray, stop: 0.5 lightgray, stop: 1.0 darkgray); border-radius:20px;border:5px solid #0078d8; } QDialog#MessageDialog QWidget QWidget{ background:transparent;color:#3078d8} QDialog#MessageDialog QWidget QWidget QLabel{ font-size:30px} #spacer_1, #spacer_2{min-width:2px;max-width:2px;margin-top:6px;margin-bottom:6px;border-right:1px solid #0078d8;} /*-----FormDialog-----*/ QPushButton#btnOK{background:#365880; font-weight:bold} QDialog#formDialog{border:3px solid grey; border-radius:8px} QWidget#slider_one{border:1px solid #505050; border-radius:8px} QWidget#formWidget QLabel#endline{border-bottom:1px solid grey} QWidget#formWidget{font-size:30px;} QLabel#title{font-size:30px; border-bottom:1px solid #3078d8 } QWidget#edit_patient{min-width:300px;max-width:300px;} QToolButton#sexBtn{min-width:120px;max-width:120px;font-size:20px;padding:2px;} QToolButton#sexBtn:disabled{color:grey} QWidget#sexpanelwidget{border:1px solid #505050;} QWidget#sexpanelwidget:enabled{background-color: #505050;} QToolButton#sexBtn:checked{border:2px solid darkorange;padding:0px;} \ No newline at end of file + /*------1.silver-->grey--------------------------*/ *{background-color:#3c3c3c; color:#fcfcfc;margin:0;font-size:16px;} QTabBar::tab { height:60px; width:300px; font-size: 25px; background:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,stop: 0 #505050, stop: 1.0 #333333); border: 2px solid #505050; border-bottom-left-radius: 50%; border-bottom-right-radius: 50%; min-width: 8ex; padding: 2px; } QTabBar::tab:selected, QTabBar::tab:hover { border-top:5px solid #4a88c7; background: #505050;} QTabWidget::pane{margin:0} QPlainTextEdit{border:0px} QGroupBox{border:0px} QLabel{color:#fcfcfc; font-weight:bold; font-size:16px;} QLineEdit{min-height:36px;max-height:36px; border:1px solid #505050;color:grey;border-radius:3px;} QLineEdit:enabled{background-color: #505050;color:#fcfcfc;} QDateEdit{min-height:36px;max-height:36px; border:1px solid #505050;color:grey;border-radius:3px;} QDateEdit:enabled{background-color: #505050;color:#fcfcfc;} QTextEdit{ border:1px solid #505050;color:grey;border-radius:3px;} QTextEdit:enabled{background-color: #505050;color:#fcfcfc;} QComboBox{text-align:center;min-height:36px;max-height:36px; border:1px solid #505050} QComboBox:enabled{background-color: #505050} QComboBox::drop-down{width:20px} QComboBox QAbstractItemView{min-width:120px;} QComboBox QAbstractItemView::item {min-height:60px;max-height:60px; border:1px solid white;} QWidget QToolButton{border:none;border-radius:10%;font-size:26px; font-weight:Bold;padding:5px;} QWidget QToolButton:disabled{color:#606060 } QWidget QToolButton:hover{background:#505050;} QWidget QToolButton:checked{border:5px solid darkorange;padding:0px;} QPushButton{border:1px solid #505050 ;padding-left:50px;padding-right:50px; border-radius:5px; min-height:28px; max-height:28px; background:qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 #505050, stop:1 #606060);} QListView{border:none;margin:5px; font-weight:bold} QListView::item{background:#4d4d4d;min-height:30px; border:1px solid #505050; border-radius:5px} QListView::item:selected{background:#365880;font-weight:bold;color:#fcfcfc;} /*QListView::item:selected{ background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #ABAFE5, stop: 1 #8588B2); border:1px solid #505050; }*/ QHeaderView::section{background-color:#595959;min-height:50px;max-height:50px;font-weight:Bold; font-size:16px; border:1px solid #323232;} QHeaderView::section:horizontal{border-bottom: 1px solid rgb(0,170,255);} QHeaderView::section:vertical{min-height:36px;max-height:36px;} QTableView{border:none;alternate-background-color: #595959;selection-color:#fcfcfc;selection-background-color:#0078d8} /*-----------Specific---------------*/ QLabel#sliderPickerLabel{color:grey;padding:0;background:#505050;font-weight:normal;font-size:50px;} QWidget#topbarWidget{min-height:36px;max-height:36px;} QWidget#contentWidget{border-top:1px solid #505050;} QWidget#commandWidget{min-height:123px;max-height:123px;border-top:1px solid #505050; border-bottom:1px solid #323232;} QLabel#logo{min-width:30px;max-width:30px} QLabel#company{min-width:150px;max-width:150px; } QLabel#systemMsgBar{min-width:500px;} QLabel#warn{color:#CCCC00;background:transparent;font-size:20px;} QWidget QWidget#statusBarWidget{min-width:300px;} QToolButton#btn_main{border:2px solid #0078d8;border-radius:10%;font-size:26px; font-weight:Bold;padding:5px;} QWidget#editcmdWidget{min-height:83px;max-height:83px;} QWidget#verSpaceLine{ border-right:1px solid #0078d8;} QWidget#topBottomLine{ border-top:2px solid #0078d8;border-bottom:2px solid #0078d8;background:transparent} /*-----Settings*/ QPushButton#BigBtn{ padding-left:0px; padding-right:0px; min-height:60px; max-height:60px; min-width:140px; max-width:140px; font-size: 20px; font-weight:bold } /*-----蒙版Dialog-----*/ QDialog QWidget#innerWidget{ background:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,stop: 0.0 darkgray, stop: 0.5 lightgray, stop: 1.0 darkgray); border-radius:20px;border:5px solid #0078d8; } QDialog#MessageDialog QWidget QWidget{ background:transparent;color:#3078d8} QDialog#MessageDialog QWidget QWidget QLabel{ font-size:30px} #spacer_1, #spacer_2{min-width:2px;max-width:2px;margin-top:6px;margin-bottom:6px;border-right:1px solid #0078d8;} /*-----FormDialog-----*/ QPushButton#btnOK{background:#365880; font-weight:bold} QDialog#formDialog{border:3px solid grey; border-radius:8px} QWidget#slider_one{border:1px solid #505050; border-radius:8px} QWidget#formWidget QLabel#endline{border-bottom:1px solid grey} QWidget#formWidget{font-size:30px;} QLabel#title{font-size:30px; border-bottom:1px solid #3078d8 } QWidget#edit_patient{min-width:300px;max-width:300px;} QToolButton#sexBtn{min-width:120px;max-width:120px;font-size:20px;padding:2px;} QToolButton#sexBtn:disabled{color:grey} QWidget#sexpanelwidget{border:1px solid #505050;} QWidget#sexpanelwidget:enabled{background-color: #505050;} QToolButton#sexBtn:checked{border:2px solid darkorange;padding:0px;} \ No newline at end of file diff --git a/src/systemsettingform.cpp b/src/systemsettingform.cpp index ebb8825..eef9871 100644 --- a/src/systemsettingform.cpp +++ b/src/systemsettingform.cpp @@ -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, [=]() { diff --git a/src/systemsettingform.ui b/src/systemsettingform.ui index 2b3f205..d54d40b 100644 --- a/src/systemsettingform.ui +++ b/src/systemsettingform.ui @@ -6,91 +6,146 @@ 0 0 - 572 - 612 + 681 + 678 Form - + + + + - + - - - - - - - 25 - 25 - - + + + + + + + + + Protocal + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 40 + 20 + + + + + + + + Qt::Horizontal + + + + + + + + 100 + 0 + + + + Auto Verify + + + + + + + + 25 + 25 + + + + + + + + Qt::Horizontal + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 40 + 20 + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + - - + + - Qt::Horizontal - - - QSizePolicy::Fixed + Qt::Vertical - 40 - 20 - - - - - - - - - 100 - 0 - - - - Auto Verify - - - - - - - Protocal - - - - - - - - 100 - 50 - - - - - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 40 - 20 + 20 + 40 @@ -99,42 +154,16 @@ - + - Qt::Horizontal + Qt::Vertical - - QSizePolicy::Fixed - - - - 40 - 20 - - - + - - - - - - DICOM - - - Qt::ToolButtonTextBesideIcon - - - - - - - Worklist Filter - - - - + + + IP @@ -144,38 +173,116 @@ - - - - - 100 - 50 - - - - + + + + Qt::Horizontal + + + + + + + Worklist Filter + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 40 + 20 + + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + DICOM + + + Qt::ToolButtonTextBesideIcon + + + + + + + Qt::Horizontal + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + - - - - Qt::Vertical - - - - 20 - 224 - - - - diff --git a/src/translations/zh_CN.qm b/src/translations/zh_CN.qm index f569de61c8feae72283a104a5c330d5581be9e45..e35ce1460bf4b3f64c94373ad911c8e7bde35218 100644 GIT binary patch delta 15 WcmZ4Fx5#gUkpk01-_0fp@7Mq^y#>Ai delta 15 WcmZ4Fx5#gUkpffqzRe~I@7Mq{IR+^J diff --git a/src/translations/zh_CN.ts b/src/translations/zh_CN.ts index 43df1f9..1fcb34f 100644 --- a/src/translations/zh_CN.ts +++ b/src/translations/zh_CN.ts @@ -678,67 +678,67 @@ parameters SelectFormWidget - - + + Account 账户 - + Worklist - - + + Add 新增 - - + + Edit 编辑 - - + + Delete 删除 - - + + Select 选择 - - + + Name 姓名 - - + + Birth Date 出生日期 - - + + Gender 性别 - - + + Add Date 添加日期 - - + + Comment 备注 @@ -983,7 +983,7 @@ parameters systemSettingForm - + Form @@ -992,12 +992,12 @@ parameters 网络配置 - + Protocal 扫描协议 - + Worklist Filter Worklist过滤器 @@ -1006,7 +1006,7 @@ parameters DICOM - + Auto Verify 自动验证 @@ -1015,7 +1015,7 @@ parameters 配置 - + IP @@ -1032,7 +1032,7 @@ parameters 接受 - + DICOM diff --git a/src/translations/zh_CN.ts.bak b/src/translations/zh_CN.ts.bak index 43df1f9..1fcb34f 100644 --- a/src/translations/zh_CN.ts.bak +++ b/src/translations/zh_CN.ts.bak @@ -678,67 +678,67 @@ parameters SelectFormWidget - - + + Account 账户 - + Worklist - - + + Add 新增 - - + + Edit 编辑 - - + + Delete 删除 - - + + Select 选择 - - + + Name 姓名 - - + + Birth Date 出生日期 - - + + Gender 性别 - - + + Add Date 添加日期 - - + + Comment 备注 @@ -983,7 +983,7 @@ parameters systemSettingForm - + Form @@ -992,12 +992,12 @@ parameters 网络配置 - + Protocal 扫描协议 - + Worklist Filter Worklist过滤器 @@ -1006,7 +1006,7 @@ parameters DICOM - + Auto Verify 自动验证 @@ -1015,7 +1015,7 @@ parameters 配置 - + IP @@ -1032,7 +1032,7 @@ parameters 接受 - + DICOM