From 13e0dc548cf892f6c45e66fa2acb29062e47789f Mon Sep 17 00:00:00 2001 From: yangjiaxuan <171295266@qq.com> Date: Mon, 8 Aug 2022 16:38:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=AB=E6=8F=8F=E8=87=B3...=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0gif=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/scanner/Scanner_zh_CN.qm | Bin 34032 -> 34044 bytes app/scanner/Scanner_zh_CN.ts | 29 ++++++++++------ app/scanner/dialog_aquireinto.cpp | 15 +++++---- app/scanner/dialog_aquireinto.ui | 53 ++++++++++++++++-------------- app/scanner/qt_zh_CN.ts | 12 ++++--- 5 files changed, 65 insertions(+), 44 deletions(-) diff --git a/app/scanner/Scanner_zh_CN.qm b/app/scanner/Scanner_zh_CN.qm index 5c56e0b8c01be2b7bfd3a18e37b6a4e25f94c22b..bea9080a2fbd9091d58642b4b154cbabae48d0e5 100644 GIT binary patch delta 3912 zcmXY!d0dV89>>4uInQ#=b2i#6Q3-8Gv`|_pDXr2XMf)a8ySW)>X3`~0W5${>W?rP* z6k@1LNXU!qCA*7>xrQ;7wJ~G3pX0gx^M20n`8~hi_xt%Szh8Y7%)1I^-7wj;uZNG< zn-b9^B6A;bGPntJ2Va3xiBwu52Jie25XpUs2D^ZMU^0mJgDXLQ@CY~^{1u!*Gz9C) zBfxxc7Wh3l8@vFjKsFIKg~$!h++3pJ=#w_0B6wel zS;pfenn9^j(i8c5N&{JUA;&2qom`^-R}yoKBo=)}@(WjpoFYm7#+zvIeqz^F6M5_) z_R44?s{_Pd|B@)@io^xg#Qs`A6zUJY0v8bbYBLNwNZgn%qCxe6 z#k&$|o|D5?JEA!*H1;^;9@aok24%+oOcOi71yjknM1f>PgeH$CO7A0=qXy-MkgH*Q zXcSHQ$e&5?Zt?|D#%1y_44Ai4;O&!8;5yBy%EZDJ6g&p+$Bd<5w~a*VA1F9A1><^& z!Qm8Ah2J4Q6uJtAg<4R=q-${C0mXc}nrPr25FwpdL2-Y><3ZObzBYl#r-KszswIlL zq^EgR&4{@pWg0fNiK46$lwV#wWf=^xsHPl)0SoOY$FQ*_M>%KkVe(_jHEe9UM`B78 zXZqsMn~TI@z7}`$U0l zvYy}ZUjC`9m&+$w62tJ5p-90K#<=F+MAl`@khAZIQhJ!-?o~wmCyZThIO=c4T|Dd~ zn(-|&;Tb$oZD)L6782#(VuBUzL}C>adjcDzR5Np)j)p?3m=cvMn$cj1A(>3cXoMtW zBU94Dfv1^ujb%u-e=^P17AVth=D3$5LRQbTdM$>c1+}J9%($6j*@V3jb36my;eZ{BN@I zS?S2`Y*y%TAo8BZDw7Yx!+zGmcNZE)2J7LD<`i7Q24%G&mh0Kz?!EBDnw=Q{PyEW+ z+!81>ekofz40S(Z2U})@5QRNsSGI^y^a;D>dO1Q6%5Did3d3$l92UlI(HjPA7fJ&T zha|c@V!u72gaOU$PPh3)_J6ax_a8)#w6J?>A@%S`wjnD3lIqxoGQ?bcQKHdIiDQ~1 zI+siI>|xtYprGzKd%1W6(STI;`uY`Ee>JQB_z?1%eb|B+*_~s5Gt_D5dA27q8s%|< zeGvi$=EiWw&TEm)`#9sf*f`dl8{&s^gA3&>`oa;47H*_l3zG36=XMtgc$#y5%Ey@3 z$_2h!iH7timlX9QlGBq*`IE!>kk92lI!zR@SI-qUTtarca-U|fMA7YBO$a9XIdZ$t zVnRk5w{OFGEZD#`Zq^Z{b#sl!egP}ECKE`U?#nebGvF4k>8Jpw-R^_v459FT&BU;fJrl!qzI@Vg)8FUc_5m z*bYlC@%AZiVfkU+t=n)iuH-#xVaN<`KAc5zCd}pIm!bYmOZd5Kv0=_uKJ~pVJb%j< z+oht+{Q1@UzJfz%_>VbYvzq^y14;*pdeb23!JVO_@xl(n(2;rB{hTr7pEnOdUhdxY=28qh(@gddJW zq0}it-6%bd#o4w(UFsxcxwTNgfkh(<5SnIPLs=dd+T*cc;2Pnw1Aa%_3r~`|aN+0> zo;mEryaM6Hd{0Q)reOLpFYb-PEExt`MJNK#6hWzriW#e*V8B+zA*Uxu;!;KP-)Oz; z0!3?O3(k;Q#Th;N1C9TeqWuaMwi&9p_WU(sWv}Qm``b6KuX;z@j zdgu+MK1dvwE-@@tnVa?;$LSkoZUz__ugon)H7LJR=IOx{opNb8z6n%MusohoWyH=4Y9SQ<-$+&MGnXIUJhZFD8UT zNkx*FxClzeZPJU0oez;j&&1L#IPKz>iDf4?A{58PuQx!6)LwC0BC zMDg%8D3JL~JiHwY&@UESagU=ZM&cD~OdR)2ycdjYkB$|eXdj^CiDHje060y>JqknX z{7Pl^^A9*gR;mW|Az72|tETPfhLjzuIVyvpjj9aA3tZ*wRe5G7q1ZT8@n(E)=dUXD zia;ngsXnjQ;mS8pRc?keL$8^rTJ@q5jpLoFa(EAt>5Xbv`(E_?J*rw$RE3#V)%-cG zVI~nI?NOss$A8PRanq|pn8583>mjoy|4vLE>Kr=X2N4{^;(NM z{Ile)?g$tHL$lP6eG&VSS?V{vM#%Oc_1l_VxUzYxKb)^XnO14k>#T`rr^YyV7RvB@ z&EPa2++kKF>uP z|#|Ne2*$t=g+6;7EM0 z_J;nb7B`mxI>v7$%BV-j?Y@RGGS{hNknMw}>dcI$VxugbUA;HzTBoz0iR8)g73nGZEHXk4ReYW@@tj NiV=ID)68Pg{{X^G7T*8> delta 3922 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 b=%KbMM+HJl_)A7Z*Kf73K77hz!o2?hV!06A diff --git a/app/scanner/Scanner_zh_CN.ts b/app/scanner/Scanner_zh_CN.ts index 01276007..fa56fbaf 100644 --- a/app/scanner/Scanner_zh_CN.ts +++ b/app/scanner/Scanner_zh_CN.ts @@ -274,39 +274,48 @@ - OCR->PDF - Portable Document Format(*.pdf) + GIF - Graphics Interchange Format(*.gif) + OCR->PDF - Portable Document Format(*.pdf) + + + + OCR->OFD - Open Fixed-layout Document(*.ofd) - + Compression option 压缩选项 - + + Save as multipages (TIFF/PDF/OFD/GIF) + 多页保存(TIFF/PDF/OFD/GIF) + + + 用户自定义页数 用户自定义页数 - Save as multipages (TIFF/PDF/OFD) - 多页保存(TIFF/PDF/OFD) + 多页保存(TIFF/PDF/OFD) - + 所有页 所有页 - - - + + + e.g. '%1%2' 例如.“%1%2” @@ -321,7 +330,7 @@ 取消 - + Browse directory 文件夹路径 diff --git a/app/scanner/dialog_aquireinto.cpp b/app/scanner/dialog_aquireinto.cpp index 30440b06..8e016136 100644 --- a/app/scanner/dialog_aquireinto.cpp +++ b/app/scanner/dialog_aquireinto.cpp @@ -42,8 +42,8 @@ Dialog_AquireInto::Dialog_AquireInto(QWidget* parent) : #endif #if defined(OEM_LISICHENG) || defined(x86_64) + ui->cbox_format->removeItem(8); ui->cbox_format->removeItem(7); - ui->cbox_format->removeItem(6); #endif ui->spin_index->setValue(getCfgValue("aquire", "startIndex", 1)); ui->cbox_digit->setCurrentIndex(getCfgValue("aquire", "digit", 2)); @@ -56,7 +56,7 @@ Dialog_AquireInto::Dialog_AquireInto(QWidget* parent) : ui->lab_digitExp->setText(QString(tr("e.g. '%1%2'")).arg(ui->lineEdit_fileName->text()) .arg(ui->spin_index->value(), ui->cbox_digit->currentIndex() + 1, 10, QLatin1Char('0'))); ui->btn_option->setEnabled(0 == ui->cbox_format->currentIndex() || 3 == ui->cbox_format->currentIndex()); - ui->cbtn_multiFile->setEnabled(ui->cbox_format->currentIndex() > 2 && ui->cbox_format->currentIndex() < 6); + ui->cbtn_multiFile->setEnabled(ui->cbox_format->currentIndex() > 2 && ui->cbox_format->currentIndex() < 7); ui->radio_multiAll->setEnabled(ui->cbtn_multiFile->isChecked()); ui->radio_multiCustom->setEnabled(ui->cbtn_multiFile->isChecked()); ui->spinBox_multiPages->setEnabled(ui->cbtn_multiFile->isChecked() ? ui->radio_multiCustom->isChecked() : false); @@ -110,16 +110,19 @@ AquireIntoSaveParam Dialog_AquireInto::getSaveParam() format = "ofd"; break; case 6: - format = "pdf"; + format = "gif"; break; case 7: + format = "pdf"; + break; + case 8: format = "ofd"; break; default: break; } param.m_fileNameExt = format; - param.m_isOcr = (ui->cbox_format->currentIndex() >= 6); + param.m_isOcr = (ui->cbox_format->currentIndex() >= 7); param.m_isSaveAsMultiPage = ui->cbtn_multiFile->isChecked(); param.m_multiPagesType = (ui->radio_multiAll->isChecked()) ? 0 : 1; @@ -146,8 +149,8 @@ void Dialog_AquireInto::on_btn_option_clicked() void Dialog_AquireInto::on_cbox_format_currentIndexChanged(int index) { - ui->cbtn_multiFile->setEnabled(index > 2 && index < 6); - if (index < 3 || index > 5) + ui->cbtn_multiFile->setEnabled(index > 2 && index < 7); + if (index < 3 || index > 6) ui->cbtn_multiFile->setChecked(false); ui->btn_option->setEnabled(0 == index || 3 == index); diff --git a/app/scanner/dialog_aquireinto.ui b/app/scanner/dialog_aquireinto.ui index 5c58d82c..e2a98f10 100644 --- a/app/scanner/dialog_aquireinto.ui +++ b/app/scanner/dialog_aquireinto.ui @@ -7,7 +7,7 @@ 0 0 554 - 525 + 360 @@ -288,14 +288,19 @@ OFD - Open Fixed-layout Document(*.ofd) - + - OCR->PDF - Portable Document Format(*.pdf) + GIF - Graphics Interchange Format(*.gif) - OCR->OFD - Open Fixed-layout Document(*.ofd) + OCR->PDF - Portable Document Format(*.pdf) + + + + + OCR->OFD - Open Fixed-layout Document(*.ofd) @@ -311,6 +316,26 @@ + + + + Save as multipages (TIFF/PDF/OFD/GIF) + + + + + + + true + + + 所有页 + + + true + + + @@ -321,13 +346,6 @@ - - - - Save as multipages (TIFF/PDF/OFD) - - - @@ -347,19 +365,6 @@ - - - - true - - - 所有页 - - - true - - - diff --git a/app/scanner/qt_zh_CN.ts b/app/scanner/qt_zh_CN.ts index af8ea94d..48a869a3 100644 --- a/app/scanner/qt_zh_CN.ts +++ b/app/scanner/qt_zh_CN.ts @@ -247,10 +247,6 @@ 用户自定义页数 - - Save as multipages (TIFF/PDF/OFD) - - 所有页 @@ -279,6 +275,14 @@ OCR->OFD - Open Fixed-layout Document(*.ofd) + + GIF - Graphics Interchange Format(*.gif) + + + + Save as multipages (TIFF/PDF/OFD/GIF) + + Dialog_ClrCache