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

Refactor css, clear path in code.

Browse Source
This commit is contained in:
Krad
2022-07-14 16:59:30 +08:00
parent 87880f1ca0
commit 6594e84807
6 changed files with 126 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/forms/scan/ScanFormWidget.cpp
View File

@@ -12,7 +12,6 @@
#include <QLabel>
#include <qdebug.h>
#include "guimacros.h"
#include "forms/scan/PatientInformationForm.h"
#include "event/EventCenter.h"
#include "log/UserOperationLog.h"
@@ -47,8 +46,7 @@ ScanFormWidget::ScanFormWidget(QWidget* parent)
, mLblE2(new QLabel(this))
{
auto layout = new QHBoxLayout();
ui->commandWidget->setLayout(layout);
auto layout = new QHBoxLayout(ui->commandWidget);
initProtocolUI(layout);
layout->addSpacerItem(new QSpacerItem(20, 20, QSizePolicy::Expanding));
addVerticalLine(layout);
@@ -64,12 +62,14 @@ void ScanFormWidget::initProtocolUI(QHBoxLayout *layout) {
mLblProtocol->setObjectName("protocolPanelTitle");
layout->addWidget(mLblProtocol);
addVerticalLine(layout);
INIT_TOOL_BTN(Left, ":/icons/left.png")
INIT_TOOL_BTN(Right, ":/icons/right.png")
mBtnLeft->setObjectName("btnLeft");
mBtnRight->setObjectName("btnRight");
mBtnLeft->setText(tr("LEFT"));
mBtnRight->setText(tr("RIGHT"));
layout->addWidget(mBtnLeft);
layout->addWidget(mBtnRight);
auto group = new QButtonGroup(this);
auto group = new QButtonGroup(ui->commandWidget);
mBtnLeft->setCheckable(true);
mBtnLeft->setChecked(true);
mBtnRight->setCheckable(true);
@@ -120,11 +120,10 @@ void ScanFormWidget::initScanContent() {
}
void ScanFormWidget::initScanControlBar(QHBoxLayout *layout){
INIT_TOOL_BTN(Refresh, ":/icons/scan_e.png")
INIT_TOOL_BTN(Preview, ":/icons/rec.png")
INIT_TOOL_BTN(Stop, ":/icons/stop.png")
INIT_TOOL_BTN(Scan, ":/icons/scan.png")
mBtnRefresh->setObjectName("btnRefresh");
mBtnPreview->setObjectName("btnPreview");
mBtnStop->setObjectName("btnStop");
mBtnScan->setObjectName("btnScan");
mBtnRefresh->setText(tr("Refresh"));
mBtnPreview->setText(tr("Preview"));
@@ -135,6 +134,11 @@ void ScanFormWidget::initScanControlBar(QHBoxLayout *layout){
mBtnRefresh->setEnabled(false);
mBtnPreview->setEnabled(false);
mBtnStop->setEnabled(false);
layout->addWidget(mBtnScan);
layout->addWidget(mBtnRefresh);
layout->addWidget(mBtnPreview);
layout->addWidget(mBtnStop);
connect(mBtnRefresh, &QToolButton::clicked, [=]() {
QString patientInf(mPatInf->getCurrentPatientJsonString(true));
LOG_USER_OPERATION(StartRefresh)

19
src/forms/select/SelectFormWidget.cpp
View File

@@ -14,7 +14,6 @@
#include "components/SlideTableView.h"
#include "db/SQLHelper.h"
#include "guimacros.h"
#include "event/EventCenter.h"
#include "dialogs/AccountFormDialog.h"
#include "dialogs/AlertDialog.h"
@@ -77,10 +76,12 @@ void SelectFormWidget::prepareButtons(bool disableALL) {
}
void SelectFormWidget::initGeneralButtons(QHBoxLayout *layout) {
INIT_TOOL_BTN(Account, ":/icons/account.png")
INIT_TOOL_BTN(Worklist, ":/icons/setting.png")
mBtnAccount->setObjectName("btnAccount");
mBtnWorklist->setObjectName("btnWorklist");
mBtnAccount->setText(tr("Account"));
mBtnWorklist->setText(tr("Worklist"));
layout->addWidget(mBtnAccount);
layout->addWidget(mBtnWorklist);
// mBtn account slot
connect(mBtnAccount, &QToolButton::clicked, [=]() {
AccountFormDialog dialog(this);
@@ -90,14 +91,18 @@ void SelectFormWidget::initGeneralButtons(QHBoxLayout *layout) {
}
void SelectFormWidget::initPatEditButtons(QHBoxLayout *layout) {
INIT_TOOL_BTN(Add, ":/icons/add.png")
INIT_TOOL_BTN(Edit, ":/icons/details.png")
INIT_TOOL_BTN(Delete, ":/icons/close_circle.png")
INIT_TOOL_BTN(Select, ":/icons/selected.png")
mBtnAdd->setObjectName("btnAdd");
mBtnEdit->setObjectName("btnEdit");
mBtnDelete->setObjectName("btnDelete");
mBtnSelect->setObjectName("btnSelect");
mBtnAdd->setText(tr("Add"));
mBtnEdit->setText(tr("Edit"));
mBtnDelete->setText(tr("Delete"));
mBtnSelect->setText(tr("Select"));
layout->addWidget(mBtnAdd);
layout->addWidget(mBtnEdit);
layout->addWidget(mBtnDelete);
layout->addWidget(mBtnSelect);
// btn add & edit slot
connect(mBtnAdd, &QToolButton::clicked, this, &SelectFormWidget::editPatient);

15
src/forms/settings/AccountTableForm.cpp
View File

@@ -16,7 +16,6 @@
#include "components/SlideTableView.h"
#include "dialogs/AccountFormDialog.h"
#include "event/EventCenter.h"
#include "guimacros.h"
AccountTableForm::AccountTableForm(QWidget* aParent)
: QWidget(aParent)
@@ -56,7 +55,7 @@ AccountTableForm::AccountTableForm(QWidget* aParent)
table->setColumnWidth(4, 150);
QWidget* cmdPanel = new QWidget(this);
cmdPanel->setObjectName("commandWidgetnoBBorder");
cmdPanel->setObjectName("commandWidget");
QHBoxLayout* cmdLayout = new QHBoxLayout(cmdPanel);
cmdLayout->addSpacerItem(new QSpacerItem(20, 20, QSizePolicy::Expanding));
@@ -64,9 +63,15 @@ AccountTableForm::AccountTableForm(QWidget* aParent)
spacerLine->setFixedWidth(2);
spacerLine->setObjectName("verSpaceLine");
cmdLayout->addWidget(spacerLine);
ADD_TOOL_BTN_TO_LAYOUT(Add, ":/icons/add.png", cmdLayout);
ADD_TOOL_BTN_TO_LAYOUT(Edit, ":/icons/details.png", cmdLayout);
ADD_TOOL_BTN_TO_LAYOUT(Delete, ":/icons/close_circle.png", cmdLayout);
auto btnAdd = new QToolButton(this);
btnAdd->setObjectName("btnAdd");
cmdLayout->addWidget(btnAdd);
auto btnEdit = new QToolButton(this);
btnEdit->setObjectName("btnEdit");
cmdLayout->addWidget(btnEdit);
auto btnDelete = new QToolButton(this);
btnDelete->setObjectName("btnDelete");
cmdLayout->addWidget(btnDelete);
btnAdd->setText(tr("Add"));
btnEdit->setText(tr("Edit"));
btnDelete->setText(tr("Delete"));