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

src/forms/recon/ScanSearchCriteriaForm.cpp

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

src/forms/recon/ScanSearchCriteriaForm.ui

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

src/forms/settings/SettingFormWidget.cpp

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

src/stylesheet/Dark2.css

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