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

Merge branch 'master' of http://192.168.1.9:3000/Bug/GUI

Browse Source
This commit is contained in:
sunwen
2023-09-11 16:01:56 +08:00
parent aed3ed80c7 99b862735b
commit ae1b063b72
4 changed files with 32 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/forms/recon/ScanSearchCriteriaForm.cpp
View File

@@ -18,8 +18,7 @@ ScanSearchCriteriaForm::ScanSearchCriteriaForm(QWidget *parent)
ui->mLBBeginDate->setVisible(false); ui->mLBBeginDate->setVisible(false);
ui->mLBBeginDate->deleteLater(); ui->mLBBeginDate->deleteLater();
ui->mLBBeginDate=beginBox; ui->mLBBeginDate=beginBox;
ui->mLBBeginDate->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); ui->mLBBeginDate->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
ui->mLBBeginDate->setFixedWidth(200);
ui->mLBBeginDate->setUpdatesEnabled(true); ui->mLBBeginDate->setUpdatesEnabled(true);
ui->mLBBeginDate->setText(QDate::currentDate().toString("yyyy-MM-dd")); ui->mLBBeginDate->setText(QDate::currentDate().toString("yyyy-MM-dd"));
@@ -29,8 +28,7 @@ ScanSearchCriteriaForm::ScanSearchCriteriaForm(QWidget *parent)
ui->mLBEndDate->setVisible(false); ui->mLBEndDate->setVisible(false);
ui->mLBEndDate->deleteLater(); ui->mLBEndDate->deleteLater();
ui->mLBEndDate=endBox; ui->mLBEndDate=endBox;
ui->mLBEndDate->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); ui->mLBEndDate->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
ui->mLBEndDate->setFixedWidth(200);
ui->mLBEndDate->setUpdatesEnabled(true); ui->mLBEndDate->setUpdatesEnabled(true);
ui->mLBEndDate->setText(QDate::currentDate().toString("yyyy-MM-dd")); ui->mLBEndDate->setText(QDate::currentDate().toString("yyyy-MM-dd"));
ui->CriteriaTitle->setObjectName("parameterTitle"); ui->CriteriaTitle->setObjectName("parameterTitle");

2
src/forms/recon/ScanSearchCriteriaForm.ui
View File

@@ -152,7 +152,7 @@
<item> <item>
<widget class="QToolButton" name="mLBBeginDate"> <widget class="QToolButton" name="mLBBeginDate">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed"> <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>

1
src/forms/settings/SettingFormWidget.cpp
View File

@@ -26,6 +26,7 @@ SettingFormWidget::SettingFormWidget(QWidget* aParent, Qt::WindowFlags f)
layout->setContentsMargins(0, 0, 0, 0); layout->setContentsMargins(0, 0, 0, 0);
ui->contentWidget->setObjectName("settingContentWidget"); ui->contentWidget->setObjectName("settingContentWidget");
QListWidget* widget = new QListWidget(ui->contentWidget); QListWidget* widget = new QListWidget(ui->contentWidget);
widget->setObjectName("LeftBtnBar");
widget->setFixedWidth(250); widget->setFixedWidth(250);
QStringList menus; QStringList menus;
menus << tr("General") << tr("Account") << tr("System") << tr("About") << tr("Operation Log"); menus << tr("General") << tr("Account") << tr("System") << tr("About") << tr("Operation Log");

36
src/stylesheet/Dark2.css
View File

@@ -3,7 +3,7 @@
background-color: #3c3c3c; background-color: #3c3c3c;
color: #fcfcfc; color: #fcfcfc;
margin: 0; margin: 0;
font-size: 16px; font-size: 20px;
} }
/* Global buttons */ /* Global buttons */
@@ -169,7 +169,8 @@ QTableView {
QListView { QListView {
border: none; border: none;
margin: 5px; margin: 5px;
font-weight: bold font-weight: bold;
} }
QListView::item { QListView::item {
@@ -183,7 +184,7 @@ QListView::item {
stop: 1.0 #404040); stop: 1.0 #404040);
min-height: 30px; min-height: 30px;
border: 1px solid #505050; border: 1px solid #505050;
border-radius: 5px border-radius: 5px;
} }
QListView::item:selected { QListView::item:selected {
@@ -209,7 +210,7 @@ QHeaderView::section {
min-height: 50px; min-height: 50px;
max-height: 50px; max-height: 50px;
font-weight: Bold; font-weight: Bold;
font-size: 16px; font-size: 22px;
border: 1px solid #323232; border: 1px solid #323232;
} }
@@ -571,7 +572,7 @@ QLabel#protocolPanelTitle {
} }
QLabel#parameterTitle,#protocolTitle,#patientTitle{ QLabel#parameterTitle,#protocolTitle,#patientTitle{
font-size: 20px; font-size: 26px;
margin: 0; margin: 0;
border-bottom: 1px solid silver border-bottom: 1px solid silver
} }
@@ -675,10 +676,16 @@ QWidget#commandWidgetnoBBorder {
border-top: 1px solid #505050; border-top: 1px solid #505050;
} }
/*-------SearchCriteriaForm--------------------------------------------------*/ /*-------SearchCriteriaForm--------------------------------------------------*/
QWidget#SearchCriteriaForm QPushButton { QWidget#SearchCriteriaForm QWidget{
min-height: 38px; font-size: 26px;
max-height: 38px;
} }
QWidget#SearchCriteriaForm QPushButton {
min-height: 56px;
max-height: 56px;
}
/*------Dialogs--------------------------------------------------------------*/ /*------Dialogs--------------------------------------------------------------*/
@@ -826,6 +833,7 @@ ListBox {
qproperty-icon:url(":/icons/arrow-down.png"); qproperty-icon:url(":/icons/arrow-down.png");
} }
/*--------keyvboard------------------------------------------------------------*/
QWidget#KeyBoard QWidget { QWidget#KeyBoard QWidget {
background: #eff0f1; background: #eff0f1;
} }
@@ -980,3 +988,15 @@ QWidget#RadioButtonArea
{ {
border-bottom: 1px solid grey; border-bottom: 1px solid grey;
} }
/*-------LeftBtnBar-------------------------------------------------------------*/
QListView#LeftBtnBar::item
{
border:2px solid grey;
min-height: 50px;
max-height: 50px;
}
QWidget#settingContentWidget QWidget{
font-size:26px;
}