diff --git a/src/forms/TopBarWidget.cpp b/src/forms/TopBarWidget.cpp index 6bde70d..e260a61 100644 --- a/src/forms/TopBarWidget.cpp +++ b/src/forms/TopBarWidget.cpp @@ -23,7 +23,7 @@ TopBarWidget::TopBarWidget(QWidget *parent, Qt::WindowFlags f) : QWidget(parent, company->setText(tr("浙江衡玖医疗科技")); QWidget* spacerLine0 = new QWidget(this); spacerLine0->setFixedWidth(2); - spacerLine0->setObjectName("smallSpacer"); + spacerLine0->setObjectName("verSpaceLine"); layout->addWidget(spacerLine0); QLabel * lbl_msglogo = new QLabel(this); lbl_msglogo->setObjectName("msglogo"); @@ -53,7 +53,7 @@ TopBarWidget::TopBarWidget(QWidget *parent, Qt::WindowFlags f) : QWidget(parent, status_layout->addWidget(nowDate); QWidget* spacerLine = new QWidget(this); spacerLine->setFixedWidth(2); - spacerLine->setObjectName("smallSpacer"); + spacerLine->setObjectName("verSpaceLine"); layout->addWidget(spacerLine); layout->addWidget(linkIcon); diff --git a/src/forms/select/SelectFormWidget.cpp b/src/forms/select/SelectFormWidget.cpp index 4b9f85b..f63bc94 100644 --- a/src/forms/select/SelectFormWidget.cpp +++ b/src/forms/select/SelectFormWidget.cpp @@ -43,9 +43,8 @@ SelectFormWidget::SelectFormWidget(QWidget* parent) initPatEditButtons(layout); initDataModel(); //Init content widget - auto* contentLayout = new QHBoxLayout(); - contentLayout->setContentsMargins(5, 5, 0, 5); - this->ui->contentWidget->setLayout(contentLayout); + auto* contentLayout = new QHBoxLayout(this->ui->contentWidget); + contentLayout->setContentsMargins(0, 0, 0, 0); initTableView(contentLayout); addVerticalLine(contentLayout); initDetailPanel(contentLayout); diff --git a/src/forms/settings/AboutWidget.cpp b/src/forms/settings/AboutWidget.cpp index 6db7475..b13c93d 100644 --- a/src/forms/settings/AboutWidget.cpp +++ b/src/forms/settings/AboutWidget.cpp @@ -66,30 +66,25 @@ void AboutWidget::initUiWidget() pCompanyCopyRight = new QLabel(this); pCompanyCopyRight->setObjectName("normal"); pCompanyCopyRight->setText(tr("Copyright © 2017-2022 Zhejiang Equilibrium Nine Medical Equipment Co., Ltd. All Rights Reversed")); - pCompanyCopyRight->setContentsMargins(subContentMargin, 0, 0, 0); pMainLayout->addWidget(pCompanyCopyRight); pMainLayout->addSpacing(subContentSpacing); pGuiVer = new QLabel(this); pGuiVer->setText(QString(tr("GUI Software V%1")).arg(getGUIVersion())); - pGuiVer->setContentsMargins(subContentMargin, 0, 0, 0); pMainLayout->addWidget(pGuiVer); pEmbededSoftVer = new QLabel(this); pEmbededSoftVer->setText(tr("Embedded Software %1, Data store Path:%2").arg(getEmbVersion(), getDataStorePath())); - pEmbededSoftVer->setContentsMargins(subContentMargin, 0, 0, 0); pMainLayout->addWidget(pEmbededSoftVer); pReconSotfVer = new QLabel(this); pReconSotfVer->setText(tr("Reconstruction Software V1.2")); - pReconSotfVer->setContentsMargins(subContentMargin, 0, 0, 0); pMainLayout->addWidget(pReconSotfVer); pMainLayout->addSpacing(subContentSpacing); pFEBVer = new QLabel(this); pFEBVer->setText(tr("FEB Information")); - pFEBVer->setContentsMargins(subContentMargin, 0, 0, 0); pMainLayout->addWidget(pFEBVer); pMainLayout->addSpacing(subContentSpacing); @@ -108,7 +103,6 @@ void AboutWidget::initUiWidget() pDcmtkCopyright = new QLabel(this); pDcmtkCopyright->setObjectName("normal"); pDcmtkCopyright->setText(tr("Copyright (c) 1994-2021, OFFIS e.V.")); - pDcmtkCopyright->setContentsMargins(subContentMargin, 0, 0, 0); pMainLayout->addWidget(pDcmtkCopyright); pMainLayout->addSpacing(subContentSpacing); @@ -118,7 +112,6 @@ void AboutWidget::initUiWidget() pJsoncppCopyright = new QLabel(this); pJsoncppCopyright->setObjectName("normal"); pJsoncppCopyright->setText(tr("Copyright (c) 2009-2017 Dave Gamble")); - pJsoncppCopyright->setContentsMargins(subContentMargin, 0, 0, 0); pMainLayout->addWidget(pJsoncppCopyright); pMainLayout->addSpacing(subContentSpacing); pMainLayout->addStretch(); diff --git a/src/forms/settings/AdminSettingForm.cpp b/src/forms/settings/AdminSettingForm.cpp index dbbf841..17758ca 100644 --- a/src/forms/settings/AdminSettingForm.cpp +++ b/src/forms/settings/AdminSettingForm.cpp @@ -21,10 +21,10 @@ AdminSettingForm::AdminSettingForm(QWidget* aParent, Qt::WindowFlags f) : TabFormWidget(aParent) { QHBoxLayout* layout = new QHBoxLayout(ui->contentWidget); - layout->setMargin(0); - layout->setContentsMargins(0, 8, 0, 1); +// layout->setMargin(0); + layout->setContentsMargins(0, 0, 0, 0); ui->contentWidget->setObjectName("settingContentWidget"); - QListWidget* widget = new QListWidget(this); + QListWidget* widget = new QListWidget(ui->contentWidget); widget->setFixedWidth(250); QStringList menus; menus << tr("General") << tr("Account") << tr("System") << tr("About"); @@ -35,26 +35,24 @@ AdminSettingForm::AdminSettingForm(QWidget* aParent, Qt::WindowFlags f) widget->item(i)->setTextAlignment(Qt::AlignCenter); } layout->addWidget(widget); - QStackedWidget* stackedWidget = new QStackedWidget(this); + QStackedWidget* stackedWidget = new QStackedWidget(ui->contentWidget); QWidget* spacerLine = new QWidget(this); - spacerLine->setFixedWidth(2); spacerLine->setObjectName("verSpaceLine"); - spacerLine->setStyleSheet("margin-bottom:8px"); layout->addWidget(spacerLine); layout->addWidget(stackedWidget); ui->commandWidget->hide(); - GeneralForm* generalForm = new GeneralForm(this); + GeneralForm* generalForm = new GeneralForm(ui->commandWidget); stackedWidget->addWidget(generalForm); - AccountTableForm* acc = new AccountTableForm(this); + AccountTableForm* acc = new AccountTableForm(ui->commandWidget); stackedWidget->addWidget(acc); - SystemSettingForm* systemSetting = new SystemSettingForm(this); + SystemSettingForm* systemSetting = new SystemSettingForm(ui->commandWidget); stackedWidget->addWidget(systemSetting); - AboutWidget* about = new AboutWidget(this); + AboutWidget* about = new AboutWidget(ui->commandWidget); stackedWidget->addWidget(about); widget->setCurrentRow(0); diff --git a/src/stylesheet/Dark2.css b/src/stylesheet/Dark2.css index 2a4e059..47bbc21 100644 --- a/src/stylesheet/Dark2.css +++ b/src/stylesheet/Dark2.css @@ -1 +1 @@ - * { background-color: #3c3c3c; color: #fcfcfc; margin: 0; font-size: 16px; } /*------Widget------------------------------------*/ /* Global */ QWidget#verSpaceLine { border-right: 1px solid #0078d8; } QWidget#topBottomLine { border-top: 2px solid #0078d8; border-bottom: 2px solid #0078d8; background: transparent; } QWidget#smallSpacer { min-width: 2px; max-width: 2px; margin-top: 6px; margin-bottom: 6px; border-right: 1px solid #0078d8; } /* use in Topbar */ QWidget#borderWidget { border: 1px solid white } /* use in SlidePickerBox */ QWidget#slidePicker { border: 1px solid #505050; border-radius: 8px } /* use in GUIFormBaseDialog */ QWidget#formWidget { font-size: 30px; } /* use in GUIMessageDialog */ 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; } /* use in MainWindow */ QWidget#topbarWidget { min-height: 36px; max-height: 36px; } /* use in TabFormWidget */ QWidget#contentWidget { border-top: 1px solid #505050; } /* use in SelectformWidget */ QWidget#patientDetailWidget { min-width: 300px; max-width: 300px; } /* use in AdminSetting */ QWidget#settingContentWidget { border-top: 1px solid #505050; border-bottom: 1px solid #323232; } /* use in ScanFormWidget */ QWidget#commandWidget { min-height: 123px; max-height: 123px; border-top: 1px solid #505050; border-bottom: 1px solid #323232; } QWidget#paramWidget { min-width: 300px; max-width: 300px; border-left: 1px solid #0078d8 } QWidget#broadcastWidget { border: 2px solid #515151; border-radius: 20px; background-color: black } QWidget#PatientInformationForm { min-width: 300px; max-width: 300px; margin-right: 10 } /* use in PatientInfomationForm */ QWidget#patientInfoPanel { border-right: 1px solid #0078d8 } /* use in AccountTableForm*/ QWidget#commandWidgetnoBBorder { min-height: 123px; max-height: 123px; border-top: 1px solid #505050; } /* use in TopBarWidget */ QWidget#statusBarWidget { min-width: 300px; } /* use in PatientDetailForm */ QWidget#editcmdWidget { min-height: 83px; max-height: 83px; } /*------Buttons----------------------------------*/ 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.50, y1: 0, x2: 0.5, y2: 1, stop: 0 #505050, stop: 1 #606060); } /* use in SystemSettingForm */ 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; } /* use in GUIFormBaseDialog */ QPushButton#btnOK { background: #365880; font-weight: bold } QToolButton { border: none; border-radius: 10%; font-size: 26px; background: qlineargradient(spread:pad, x1: 0.5, y1: 0, x2: 0.5, y2: 1.0, stop: 0 #404040, stop: 0.5 #505050, stop: 1.0 #404040); font-weight: Bold; padding: 5px; } QToolButton:disabled { border: none; color: #606060; background: #3c3c3c } QToolButton:hover { background: #505050; } QToolButton:checked { border: 5px solid darkorange; padding: 0; } /* GUIFormBaseDialog button */ GUIFormBaseDialog QToolButton{ min-height: 36px; max-height: 36px; border: none; border-bottom: 1px solid #505050; border-radius: 0; color: grey; qproperty-toolButtonStyle:ToolButtonTextBesideIcon; qproperty-iconSize:30px 30px; } GUIFormBaseDialog QToolButton:enabled { background-color: #505050; border-bottom-color: #4a88c7; color: #fcfcfc; } QToolButton#changePwdBtn{ qproperty-icon:url(":/icons/edit.png"); } QToolButton#logoutBtn{ qproperty-icon:url(":/icons/logout.png"); } /* Patient detail panel hide and show button */ QToolButton#showeditBtn { border-top: 1px solid darkgray; border-bottom: 1px solid darkgray; border-left: 1px solid darkgray; border-radius: 0; border-bottom-left-radius: 10px; font-size: 20px; font-weight: normal; background: #505050; qproperty-toolButtonStyle:ToolButtonTextUnderIcon; qproperty-icon:url(":/icons/edit.png"); qproperty-iconSize:30px 30px; } QToolButton#hideeditBtn { border-top: 1px solid darkgray; border-bottom: 1px solid darkgray; border-left: 1px solid darkgray; border-radius: 0; border-top-left-radius: 10px; border-bottom-left-radius: 10px; font-size: 20px; font-weight: normal; background: #505050; qproperty-toolButtonStyle:ToolButtonTextBesideIcon; qproperty-icon:url(":/icons/hidearrow.png"); qproperty-iconSize:30px 30px; } /* AdminSettingForm button*/ QToolButton#btnDICOM{ qproperty-icon:url(":/icons/dicomsettings.png"); qproperty-iconSize:80px 80px; } QToolButton#btnNetwork{ qproperty-icon:url(":/icons/networksettings.png"); qproperty-iconSize:80px 80px; } /* GUIMessageDialog Button */ GUIMessageDialog QToolButton{ border: 2px solid #0078d8; border-radius: 10%; font-size: 26px; font-weight: Bold; padding: 5px; qproperty-toolButtonStyle:ToolButtonTextBesideIcon; qproperty-iconSize:30px 30px; } QToolButton#dialogBtnOK{ qproperty-icon:url(":/icons/selected_d.png"); } QToolButton#dialogBtnStop{ qproperty-icon:url(":/icons/close_circle_d.png"); } /* protocol buttons*/ QToolButton#sexBtn { min-width: 120px; max-width: 120px; font-size: 20px; padding: 2px; } QToolButton#sexBtn:checked { border: 2px solid darkorange; padding: 0px; } QGroupBox { border: 0px } /*------------------Tab----------------*/ 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 } /*-------------------Label------------------*/ QLabel { color: #fcfcfc; font-weight: bold; font-size: 16px; } /* blue line spacer horizon*/ QLabel#endline { border-bottom: 1px solid grey } /* use for side picker */ QLabel#sliderPickerLabel { color: grey; padding: 0; background: #505050; font-weight: normal; font-size: 50px; } QLabel#sliderSpliterLabel { color: white; padding-top: 35px; font-weight: normal; font-size: 50px; } /* use in TopBarWidget */ QLabel#logo { min-width: 30px; max-width: 30px; min-height: 30px; max-height: 30px; qproperty-pixmap:url(":/icons/logo.png"); qproperty-scaledContents:true; } QLabel#msglogo { min-width: 28px; max-width: 28px; min-height: 28px; max-height: 28px; qproperty-pixmap:url(":/icons/msg.png"); qproperty-scaledContents:true; } QLabel#link { min-width: 28px; max-width: 28px; min-height: 28px; max-height: 28px; qproperty-pixmap:url(":/icons/link_g.png"); qproperty-scaledContents:true; } QLabel#ready { min-width: 28px; max-width: 28px; min-height: 28px; max-height: 28px; qproperty-pixmap:url(":/icons/ready.png"); qproperty-scaledContents:true; } QLabel#company { min-width: 150px; max-width: 150px; } QLabel#systemMsgBar { min-width: 500px; } /* warn message label */ QLabel#warn { color: #930000; background: transparent; font-size: 20px; } /* dialog title*/ QLabel#title { font-size: 30px; } /* use in AboutWidget */ QLabel#normal { color: #fcfcfc; font-weight: normal; font-size: 16px; } /* use in ScanFormWidget */ QLabel#protocolPanelTitle { font-size: 32px; margin: 0; color: silver } QLabel#parameterTitle,#protocolTitle,#patientTitle{ font-size: 20px; margin: 0; border-bottom: 1px solid silver } QLabel#endSpaceLine { font-size: 20px; margin: 0; border-top: 1px solid #0078d8 } QLabel#placeholder { font-size: 20px; } QWidget#patientInfoPanel QLabel { font-size: 20px; } QWidget#broadcastWidget QLabel { background-color: black } /*------editors----------------------------------*/ QLineEdit { min-height: 36px; max-height: 36px; border: none; border-bottom: 1px solid #505050; color: grey; } QLineEdit:enabled { background-color: #505050; border-bottom-color: #4a88c7; color: #fcfcfc; } QLineEdit#displayLineEdit:disabled { background-color: #3c3c3c; border-bottom-color: #4a88c7; color: #fcfcfc; } QPlainTextEdit { border: 0px } QDateEdit { min-height: 36px; max-height: 36px; border: none; border-bottom: 1px solid #505050; color: grey; border-radius: 3px; } QDateEdit:disabled { background-color: #3c3c3c; border-bottom-color: #4a88c7; color: #fcfcfc; } QTextEdit { border: 1px solid #505050; color: grey; border-radius: 3px; } QTextEdit:enabled { background-color: #505050; border: 1px solid #4a88c7; color: #fcfcfc; } QComboBox { text-align: center; min-height: 36px; max-height: 36px; border: 1px solid #505050 } QComboBox:enabled { background-color: #505050 } /*----------------Table & List View---------------*/ QTableView { border: none; alternate-background-color: #595959; selection-color: #fcfcfc; selection-background-color: #0078d8 } QListView { border: none; margin: 5px; font-weight: bold } QListView::item { background: qlineargradient(spread:pad, x1: 0.5, y1: 0, x2: 0.5, y2: 1.0, stop: 0 #404040, stop: 0.5 #505050, stop: 1.0 #404040); min-height: 30px; border: 1px solid #505050; border-radius: 5px } QListView::item:selected { background: #365880; font-weight: bold; color: #fcfcfc; } QHeaderView::down-arrow { subcontrol-position: center right; image: url(":/icons/arrow-down.png"); padding-right: 8px; } QHeaderView::up-arrow { subcontrol-position: center right; image: url(":/icons/arrow-up.png"); padding-right: 8px; } 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; } /*------Dialog-------------------------------------*/ QDialog#formDialog { border: 3px solid grey; border-radius: 8px } QDialog#MessageDialog QWidget QWidget { background: transparent; color: #3078d8; } QDialog#MessageDialog QWidget QWidget QLabel { font-size: 30px } /* use in LoginWindow */ QFrame#loginFrame { min-width: 700px; max-width: 700px; max-height: 500px; min-height: 500px; border: 1px solid #0078d8; border-radius: 20px; background: qlineargradient(x1:0, y1: 0, x2: 0, y2: 1, stop: 0.0 darkgray, stop: 0.5 gray, stop: 1.0 darkgray); } QDialog#loginForm { background-color: #3c3c3c; color: white; margin: 0; font-size: 16px; } QDialog#loginForm QLabel#title { font-Size: 98px; color: qlineargradient(x1:0, y1: 0, x2: 0, y2: 1, stop: 0.0 darkgray, stop: 0.5 lightgray, stop: 1.0 darkgray); } QDialog#loginForm QLineEdit { min-height: 100px; max-height: 100px; border: 1px solid silver; border-radius: 10px; font-size: 26px; } QDialog#loginForm QLineEdit:enabled { background-color: #515151 } QDialog#loginForm QToolButton#btnlogin { min-height: 100px; max-height: 100px; min-width: 200px; border: 1px solid #505050; border-radius: 10%; font-size: 26px; font-weight: Bold; padding: 5px; } QDialog#loginForm QToolButton#btnlogin:hover { background: #505050; } \ No newline at end of file +/* Global */ * { background-color: #3c3c3c; color: #fcfcfc; margin: 0; font-size: 16px; } /* Global buttons */ 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.50, y1: 0, x2: 0.5, y2: 1, stop: 0 #505050, stop: 1 #606060); } QToolButton { border: none; border-radius: 10%; font-size: 26px; background: qlineargradient(spread:pad, x1: 0.5, y1: 0, x2: 0.5, y2: 1.0, stop: 0 #404040, stop: 0.5 #505050, stop: 1.0 #404040); font-weight: Bold; padding: 5px; } QToolButton:disabled { border: none; color: #606060; background: #3c3c3c } QToolButton:hover { background: #505050; } QToolButton:checked { border: 5px solid darkorange; padding: 0; } /* Global QGroupBox */ QGroupBox { border: 0px } /* Global Editors */ QLabel { color: #fcfcfc; font-weight: bold; font-size: 16px; } QLineEdit { min-height: 36px; max-height: 36px; border: none; border-bottom: 1px solid #505050; color: grey; } QLineEdit:enabled { background-color: #505050; border-bottom-color: #4a88c7; color: #fcfcfc; } QPlainTextEdit { border: 0px } QDateEdit { min-height: 36px; max-height: 36px; border: none; border-bottom: 1px solid #505050; color: grey; border-radius: 3px; } QDateEdit:disabled { background-color: #3c3c3c; border-bottom-color: #4a88c7; color: #fcfcfc; } QTextEdit { border: 1px solid #505050; color: grey; border-radius: 3px; } QTextEdit:enabled { background-color: #505050; border: 1px solid #4a88c7; color: #fcfcfc; } QComboBox { text-align: center; min-height: 36px; max-height: 36px; border: 1px solid #505050 } QComboBox:enabled { background-color: #505050 } /* Global Tab */ 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 } /* Global TableView & ListView */ QTableView { border: none; alternate-background-color: #595959; selection-color: #fcfcfc; selection-background-color: #0078d8; margin: 5px 0 5 5; } QListView { border: none; margin: 5px; font-weight: bold } QListView::item { background: qlineargradient(spread:pad, x1: 0.5, y1: 0, x2: 0.5, y2: 1.0, stop: 0 #404040, stop: 0.5 #505050, stop: 1.0 #404040); min-height: 30px; border: 1px solid #505050; border-radius: 5px } QListView::item:selected { background: #365880; font-weight: bold; color: #fcfcfc; } QHeaderView::down-arrow { subcontrol-position: center right; image: url(":/icons/arrow-down.png"); padding-right: 8px; } QHeaderView::up-arrow { subcontrol-position: center right; image: url(":/icons/arrow-up.png"); padding-right: 8px; } 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; } QWidget#verSpaceLine { min-width: 2px; max-width: 2px; border-right: 1px solid #0078d8; margin-top: 6px; margin-bottom: 6px; } QLabel#endline { border-bottom: 1px solid grey } QLabel#warn { color: #930000; background: transparent; font-size: 20px; } QLabel#title { font-size: 30px; } /*------LoginWindow----------------------------------------------------------*/ QFrame#loginFrame { min-width: 700px; max-width: 700px; max-height: 500px; min-height: 500px; border: 1px solid #0078d8; border-radius: 20px; background: qlineargradient(x1:0, y1: 0, x2: 0, y2: 1, stop: 0.0 darkgray, stop: 0.5 gray, stop: 1.0 darkgray); } QDialog#loginForm { background-color: #3c3c3c; color: white; margin: 0; font-size: 16px; } QDialog#loginForm QLabel#title { font-Size: 98px; color: qlineargradient(x1:0, y1: 0, x2: 0, y2: 1, stop: 0.0 darkgray, stop: 0.5 lightgray, stop: 1.0 darkgray); } QDialog#loginForm QLineEdit { min-height: 100px; max-height: 100px; border: 1px solid silver; border-radius: 10px; font-size: 26px; } QDialog#loginForm QLineEdit:enabled { background-color: #515151 } QDialog#loginForm QToolButton#btnlogin { min-height: 100px; max-height: 100px; min-width: 200px; border: 1px solid #505050; border-radius: 10%; font-size: 26px; font-weight: Bold; padding: 5px; } QDialog#loginForm QToolButton#btnlogin:hover { background: #505050; } /*------MainWindow------------------------------------------------------------------*/ /*------TopbarWidget--------------------------------------------------------------- */ QWidget#topbarWidget { min-height: 36px; max-height: 36px; } QWidget#borderWidget { border: 1px solid white } QWidget#statusBarWidget { min-width: 300px; } QLabel#logo { min-width: 30px; max-width: 30px; min-height: 30px; max-height: 30px; qproperty-pixmap:url(":/icons/logo.png"); qproperty-scaledContents:true; } QLabel#msglogo { min-width: 28px; max-width: 28px; min-height: 28px; max-height: 28px; qproperty-pixmap:url(":/icons/msg.png"); qproperty-scaledContents:true; } QLabel#link { min-width: 28px; max-width: 28px; min-height: 28px; max-height: 28px; qproperty-pixmap:url(":/icons/link_g.png"); qproperty-scaledContents:true; } QLabel#ready { min-width: 28px; max-width: 28px; min-height: 28px; max-height: 28px; qproperty-pixmap:url(":/icons/ready.png"); qproperty-scaledContents:true; } QLabel#company { min-width: 150px; max-width: 150px; } QLabel#systemMsgBar { min-width: 500px; } /*------TabFormWidget--------------------------------------------------------*/ 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; } /*------SelectformWidget-----------------------------------------------------*/ QWidget#patientDetailWidget { min-width: 300px; max-width: 300px; margin-top: 5; } QToolButton#showeditBtn { margin-top: 5; padding-top: 0; border-top: 1px solid darkgray; border-bottom: 1px solid darkgray; border-left: 1px solid darkgray; border-radius: 0; border-bottom-left-radius: 10px; font-size: 20px; font-weight: normal; background: #505050; qproperty-toolButtonStyle:ToolButtonTextUnderIcon; qproperty-icon:url(":/icons/edit.png"); qproperty-iconSize:30px 30px; } QToolButton#hideeditBtn { border-top: 1px solid darkgray; border-bottom: 1px solid darkgray; border-left: 1px solid darkgray; border-radius: 0; border-top-left-radius: 10px; border-bottom-left-radius: 10px; font-size: 20px; font-weight: normal; background: #505050; qproperty-toolButtonStyle:ToolButtonTextBesideIcon; qproperty-icon:url(":/icons/hidearrow.png"); qproperty-iconSize:30px 30px; } /* PatientDetailForm in SelectformWidget */ QWidget#editcmdWidget { min-height: 83px; max-height: 83px; } QLineEdit#displayLineEdit:disabled { background-color: #3c3c3c; border-bottom-color: #4a88c7; color: #fcfcfc; } /*------ScanFormWidget-------------------------------------------------------*/ QWidget#paramWidget { min-width: 300px; max-width: 300px; border-left: 1px solid #0078d8 } QWidget#broadcastWidget { border: 2px solid #515151; border-radius: 20px; background-color: black } QWidget#PatientInformationForm { min-width: 300px; max-width: 300px; margin-right: 10 } QLabel#protocolPanelTitle { font-size: 32px; margin: 0; color: silver } QLabel#parameterTitle,#protocolTitle,#patientTitle{ font-size: 20px; margin: 0; border-bottom: 1px solid silver } QLabel#endSpaceLine { font-size: 20px; margin: 0; border-top: 1px solid #0078d8 } QLabel#placeholder { font-size: 20px; } QWidget#patientInfoPanel QLabel { font-size: 20px; } QWidget#broadcastWidget QLabel { background-color: black } /* PatientInfomationForm in ScanFormWidget */ QWidget#patientInfoPanel { border-right: 1px solid #0078d8 } /* protocol buttons in ScanFormWidget*/ QToolButton#sexBtn { min-width: 120px; max-width: 120px; font-size: 20px; padding: 2px; } QToolButton#sexBtn:checked { border: 2px solid darkorange; padding: 0px; } /*------AdminSettingForm---------------------------------------------------*/ QWidget#settingContentWidget { border-top: 1px solid #505050; border-bottom: 1px solid #323232; } QWidget#settingContentWidget QStackedWidget{ margin-top: 5; margin-bottom: 5 } /*------AboutWidget----------------------------------------------------------*/ QLabel#normal { color: #fcfcfc; font-weight: normal; font-size: 16px; } /*------SystemSettingForm----------------------------------------------------*/ 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; } QToolButton#btnDICOM{ qproperty-icon:url(":/icons/dicomsettings.png"); qproperty-iconSize:80px 80px; } QToolButton#btnNetwork{ qproperty-icon:url(":/icons/networksettings.png"); qproperty-iconSize:80px 80px; } /*------AccountTableForm-----------------------------------------------------*/ QWidget#commandWidgetnoBBorder { min-height: 123px; max-height: 123px; border-top: 1px solid #505050; } /*------GUIFormBaseDialog----------------------------------------------------*/ QDialog#formDialog { border: 3px solid grey; border-radius: 8px } QWidget#formWidget { font-size: 30px; } GUIFormBaseDialog QToolButton{ min-height: 36px; max-height: 36px; border: none; border-bottom: 1px solid #505050; border-radius: 0; color: grey; qproperty-toolButtonStyle:ToolButtonTextBesideIcon; qproperty-iconSize:30px 30px; } GUIFormBaseDialog QToolButton:enabled { background-color: #505050; border-bottom-color: #4a88c7; color: #fcfcfc; } QPushButton#btnOK { background: #365880; font-weight: bold } /* GUIFormBaseDialog - AccountFormDialog */ QToolButton#changePwdBtn{ qproperty-icon:url(":/icons/edit.png"); } QToolButton#logoutBtn{ qproperty-icon:url(":/icons/logout.png"); } /*------GUIMessageDialog-----------------------------------------------------*/ 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 } GUIMessageDialog QToolButton{ border: 2px solid #0078d8; border-radius: 10%; font-size: 26px; font-weight: Bold; padding: 5px; qproperty-toolButtonStyle:ToolButtonTextBesideIcon; qproperty-iconSize:30px 30px; } QToolButton#dialogBtnOK{ qproperty-icon:url(":/icons/selected_d.png"); } QToolButton#dialogBtnStop{ qproperty-icon:url(":/icons/close_circle_d.png"); } /*------SlidePickerBox--------------------------------------------------------*/ QWidget#slidePicker { border: 1px solid #505050; border-radius: 8px } QWidget#topBottomLine { border-top: 2px solid #0078d8; border-bottom: 2px solid #0078d8; background: transparent; } QLabel#sliderPickerLabel { color: grey; padding: 0; background: #505050; font-weight: normal; font-size: 50px; } QLabel#sliderSpliterLabel { color: white; padding-top: 35px; font-weight: normal; font-size: 50px; } \ No newline at end of file diff --git a/src/windows/MainWindow.cpp b/src/windows/MainWindow.cpp index eaaad44..abacc1b 100644 --- a/src/windows/MainWindow.cpp +++ b/src/windows/MainWindow.cpp @@ -198,7 +198,6 @@ void MainWindow::initializeLayout() layout->setMargin(0); layout->setSpacing(0); QWidget* topBarWidget = new TopBarWidget(this); - topBarWidget->setObjectName("topbarWidget"); layout->addWidget(topBarWidget); layout->addWidget(mTabWidget); }