界面微调

app/scanner/dialog_aquireinto.cpp

@@ -61,6 +61,7 @@ Dialog_AquireInto::Dialog_AquireInto(QWidget* parent) :
     ui->cbtn_multiFile->setEnabled(ui->cbox_format->currentIndex() > 5 && ui->cbox_format->currentIndex() <= 11);
     ui->radio_multiAll->setEnabled(ui->cbtn_multiFile->isChecked());
     ui->radio_multiCustom->setEnabled(ui->cbtn_multiFile->isChecked());
+    ui->radio_multiCustom->setChecked(getCfgValue("aquire", "multiCustom", false));
     ui->spinBox_multiPages->setEnabled(ui->cbtn_multiFile->isChecked() ? ui->radio_multiCustom->isChecked() : false);
     ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(!ui->lineEdit_directory->text().isEmpty());
 
@@ -186,6 +187,7 @@ void Dialog_AquireInto::on_buttonBox_accepted()
     saveCfgValue("aquire", "multiFile", ui->cbtn_multiFile->isChecked());
     saveCfgValue("aquire", "multiAll", ui->radio_multiAll->isChecked());
     saveCfgValue("aquire", "multiPages", ui->spinBox_multiPages->value());
+    saveCfgValue("aquire", "multiCustom", ui->radio_multiCustom->isChecked());
 }
 
 void Dialog_AquireInto::on_cbox_digit_currentIndexChanged(int index)

app/scanner/dialog_imageeditor.cpp

@@ -20,6 +20,8 @@ Dialog_ImageEditor::Dialog_ImageEditor(QWidget *parent)
         ui->comboBox_textSize->setItemData(i, m_textSize[i]);
     for (int i = 0; i < ui->comboBox_lineWidth->count(); i++)
         ui->comboBox_lineWidth->setItemData(i, m_lineWidth[i]);
+
+    ui->comboBox_textSize->setCurrentIndex(2);
     ui->graphicsView->setScene(m_scene);
     ui->graphicsView->setParent(this);
     ui->btn_color->setStyleSheet("QPushButton{background-color:red;border:1px solid red;}");

app/scanner/mainwindow.cpp

@@ -316,14 +316,9 @@ MainWindow::MainWindow(QWidget *parent)
     m_dlgFullScreen = nullptr;
     m_dialogLog->updateStatus(!dev_que_.opened_scanner_name().empty() && 0 != m_scanType, m_isScanning);
     updateActionStatus();
-    ui->act_autoSave->setChecked(auto_save_changes_);
+    ui->act_autoSave->setChecked(getCfgValue("save", "autoSave", false));
     ui->act_autoSave->setText(tr("auto save"));
-
-    #if defined(OEM_LISICHENG)
     ui->act_autoSave->setToolTip(tr("when switching pictures, save the edited pictures directly without reminding"));
-    #else
-        ui->act_autoSave->setToolTip(tr("when switching pictures, save the edited pictures directly without reminding"));
-    #endif
 
     auto_save_info_.index = 0;
     ui->act_device_log->setEnabled(false);
@@ -540,6 +535,7 @@ void MainWindow::on_act_autoSave_triggered()
     {
         m_wndStatusBar->setDeviceStatusInfo(tr("cancel auto save"), false);
     }
+    saveCfgValue("save", "autoSave", auto_save_changes_);
 }
 
 void MainWindow::on_itemCountChanged(int count)

app/scanner/mainwindow.ui

@@ -35,7 +35,7 @@
      <x>0</x>
      <y>0</y>
      <width>800</width>
-     <height>36</height>
+     <height>22</height>
     </rect>
    </property>
    <widget class="QMenu" name="menu_file">
@@ -49,6 +49,8 @@
     <addaction name="act_saveAs"/>
     <addaction name="act_Export"/>
     <addaction name="separator"/>
+    <addaction name="act_autoSave"/>
+    <addaction name="separator"/>
     <addaction name="act_closeFile"/>
     <addaction name="act_closeAll"/>
     <addaction name="separator"/>
@@ -131,7 +133,6 @@
     <addaction name="menu_Rotate"/>
     <addaction name="act_autoCrop"/>
     <addaction name="act_imageEdit"/>
-    <addaction name="act_autoSave"/>
    </widget>
    <widget class="QMenu" name="menu_user">
     <property name="title">

app/scanner/setpicclrtool.ui

@@ -20,7 +20,7 @@
       <widget class="QComboBox" name="comboBox">
        <item>
         <property name="text">
-         <string>自定</string>
+         <string>自定义</string>
         </property>
        </item>
        <item>