From a8bd4fee99360571e6771402ce4610dee4e43010 Mon Sep 17 00:00:00 2001
From: yangjiaxuan <171295266@qq.com>
Date: Fri, 2 Sep 2022 13:08:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=85=A5ocr-rtf=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/scanner/Scanner_zh_CN.qm  | Bin 35278 -> 35286 bytes
 app/scanner/Scanner_zh_CN.ts  |   2 +-
 app/scanner/cutpapertool.cpp  |   1 +
 app/scanner/dialog_export.cpp |   1 +
 app/scanner/dialog_saveas.cpp |   6 +++++-
 5 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/scanner/Scanner_zh_CN.qm b/app/scanner/Scanner_zh_CN.qm
index 084f75ca17d57b373a81ce1c2dbef0bb89cc7526..161de402a20f258d8ed90fcdc09cd5fa27109e0e 100644
GIT binary patch
delta 2342
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

delta 2338
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

diff --git a/app/scanner/Scanner_zh_CN.ts b/app/scanner/Scanner_zh_CN.ts
index 9c997f2b..76edf0af 100644
--- a/app/scanner/Scanner_zh_CN.ts
+++ b/app/scanner/Scanner_zh_CN.ts
@@ -1681,7 +1681,7 @@ bug description:
     <message>
         <location filename="HGImgThumb.cpp" line="1214"/>
         <source>unsupported file format</source>
-        <translation>拖拽仅支持jpg、bmp、png、tif/tiff、pdf和ofd格式</translation>
+        <translation type="unfinished">拖拽仅支持jpg、bmp、png、tif/tiff、gif、pdf和ofd格式</translation>
     </message>
     <message>
         <location filename="HGImgThumb.cpp" line="1230"/>
diff --git a/app/scanner/cutpapertool.cpp b/app/scanner/cutpapertool.cpp
index d415deaa..ab2f84e0 100644
--- a/app/scanner/cutpapertool.cpp
+++ b/app/scanner/cutpapertool.cpp
@@ -8,6 +8,7 @@ CutPaperTool::CutPaperTool(QWidget *parent) :
     ui(new Ui::CutPaperTool)
 {
     ui->setupUi(this);
+    setWindowFlags(Qt::Dialog | Qt::WindowCloseButtonHint);
     connect(ui->widget,SIGNAL(cutRectX(double)),this,SLOT(cutRectXSlot(double)));
     connect(ui->widget,SIGNAL(cutRectY(double)),this,SLOT(cutRectYSlot(double)));
     connect(ui->widget,SIGNAL(cutRectWidth(double)),this,SLOT(cutRectWidthSlot(double)));
diff --git a/app/scanner/dialog_export.cpp b/app/scanner/dialog_export.cpp
index dc01611a..7ff9a3c3 100644
--- a/app/scanner/dialog_export.cpp
+++ b/app/scanner/dialog_export.cpp
@@ -43,6 +43,7 @@ static struct
     , {".gif", "GIF - Graphics Interchange Format", FILE_TYPE_ATTR_CONTAIN_MULTI_PAGES}
     , {".pdf", "OCR->PDF - Portable Document Format", FILE_TYPE_ATTR_THIRD_HANDLER | FILE_TYPE_ATTR_CONTAIN_MULTI_PAGES}
     , {".ofd", "OCR->OFD - Open Fixed-layout Document", FILE_TYPE_ATTR_THIRD_HANDLER | FILE_TYPE_ATTR_CONTAIN_MULTI_PAGES}
+    , {".rtf", "OCR->RTF - Rich Text Format", FILE_TYPE_ATTR_THIRD_HANDLER | FILE_TYPE_ATTR_CONTAIN_MULTI_PAGES}
 #endif
 };
 
diff --git a/app/scanner/dialog_saveas.cpp b/app/scanner/dialog_saveas.cpp
index a08c1ac3..9ab9ead4 100644
--- a/app/scanner/dialog_saveas.cpp
+++ b/app/scanner/dialog_saveas.cpp
@@ -86,7 +86,8 @@ Dialog_SaveAs::Dialog_SaveAs(QWidget *parent) :
                 "OFD - Open Fixed-layout Document(*.ofd);;"
                 "GIF - Graphics Interchange Format(*.gif);;"
                 "OCR->PDF - Portable Document Format(*.pdf);;"
-                "OCR->OFD - Open Fixed-layout Document(*.ofd)");
+                "OCR->OFD - Open Fixed-layout Document(*.ofd);;"
+                "OCR->RTF - Rich Text Format(*.rtf)");
 #endif
 
     connect(ui->fileDialog, SIGNAL(accepted()), this, SLOT(on_dialog_accepted()));
@@ -177,6 +178,9 @@ void Dialog_SaveAs::on_dialog_accepted()
     case 8:
         extName = ".ofd";
         break;
+    case 9:
+        extName = ".rtf";
+        break;
     }
 
     assert(!extName.isEmpty());