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 7c4b9cc..154e8c0 100644 Binary files a/src/icons/imageswitch/btncheckoff1.png and b/src/icons/imageswitch/btncheckoff1.png differ diff --git a/src/icons/imageswitch/btncheckon1.png b/src/icons/imageswitch/btncheckon1.png index 24835ba..4e9c8c1 100644 Binary files a/src/icons/imageswitch/btncheckon1.png and b/src/icons/imageswitch/btncheckon1.png differ 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 f569de6..e35ce14 100644 Binary files a/src/translations/zh_CN.qm and b/src/translations/zh_CN.qm differ 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