diff --git a/app/scanner/Scanner_zh_CN.qm b/app/scanner/Scanner_zh_CN.qm index b8af3195..49d5ba3e 100644 Binary files a/app/scanner/Scanner_zh_CN.qm and b/app/scanner/Scanner_zh_CN.qm differ diff --git a/app/scanner/Scanner_zh_CN.ts b/app/scanner/Scanner_zh_CN.ts index 81d88145..f6a3ee9a 100644 --- a/app/scanner/Scanner_zh_CN.ts +++ b/app/scanner/Scanner_zh_CN.ts @@ -365,43 +365,43 @@ 默认配置 - - + + default scheme 默认配置方案 - - - - + + + + e.g. '%1%2' 例如.“%1%2” - + ok 确定 - + cancel 取消 - + Browse directory 文件夹路径 - - + + tips 提示 - - + + The configuration scheme already exists 配置方案已存在 @@ -612,36 +612,36 @@ Page range will be "Chosen Pages". 多页保存(TIFF/PDF/OFD/GIF) - - - + + + Input is not valid. Page range will be 'Chosen Pages'. 输入无效。 页码范围将是“被选页码” - + English 英语 - + Simplified Chinese 中文(简体) - + Traditional Chinese 中文(繁体) - + Japanese 日文 - + Korean 韩文 @@ -729,34 +729,34 @@ Page range will be 'Chosen Pages'. 请留下您的电话、QQ或者邮箱等联系方式（必填）。 - - - + + + error 错误 - + Comments and suggestions cannot be empty. 意见与建议不能为空哦 - + The contact information column cannot be empty. 联系方式一栏不能为空哦 - + tip 提示 - + submit succeed. 提交成功 - + submit failed. 提交失败 @@ -1876,7 +1876,7 @@ Please make sure the two passwords are the same. - + upgrade contents: 更新内容： @@ -1891,19 +1891,19 @@ bug description: - + The current version is the latest! The current version number is : 当前为最新版本！版本号为： - - + + Discover the new version : 发现新版本： - - + + ,the current version is : ，当前版本为： @@ -2077,355 +2077,355 @@ bug description: 旋转 - + menu_user 用户 - + menu_info 信息 - + menu_device 设备 - + toolBar 工具栏 - + act_open 打开... - + act_insert 插入本地文件... - + act_save 保存 - + act_saveAs 另存为... - + act_Export 导出... - + act_closeFile 关闭选中项 - + act_closeAll 关闭所有项 - + act_imageInfo 图像信息 - + act_exit 退出 - + act_scannerSettings 扫描设置... - + act_acquire 扫描 - + act_acquireSingle 扫描单张 - - + + act_acquireInto 扫描至... - + act_fullscreen 全屏显示 - + act_fitWindowSize 适应视图框尺寸 - + act_fitWindowWidth 适应视图框宽度 - + act_realSize 真实大小 - + act_zoomIn 放大 - + act_zoomOut 缩小 - + act_toolBar 工具栏 - + act_statusBar 状态栏 - + act_thumbnailBar 缩略图栏 - + act_colorInfo 色彩信息 - + act_previous 上一张 - + act_next 下一张 - + act_first 第一张 - + act_last 最后一张 - + act_openPageNum 跳转至... - + act_previousPage 上一页 - + act_nextPage 下一页 - + act_firstPage 第一页 - + act_lastPage 最后一页 - + act_adjust 亮度/对比度/伽马... - + act_90Left 左旋转90度 - + act_90Right 右旋转90度 - + act_180 旋转180度 - + act_multiRotate 多页旋转... - + act_autoCrop 裁剪/纠偏/消除黑框... - + act_signIn 登录... - + act_passwordChange 密码修改... - + act_signOut 登出 - + act_log 日志管理... - + act_clrCache 缓存设置... - + act_consume 耗材状态... - + act_help 帮助 - + act_about 关于... - + act_insertFromScanner 从扫描插入... - + act_clearRoller 清除滚轴计数 - + act_imageEdit 图像编辑... - + act_sortPages 书籍排序 - + act_autoSave 自动保存 - + act_update 检查更新... - + act_feedback 意见反馈... - + act_device_log 导出设备日志 - + act_driver_log 导出驱动日志 - + act_deleteFile 删除选中项 - + act_enhanceText 文本增强 - + HuaGoScan 华高扫描软件 - + Grid 多列显示 - + Move To... 移动到... - + Insert files 插入文件 - - - + + + nodevice 没有发现扫描仪 - - - - - + + + + + Question 询问 - + modified, save it? 图像已被修改。 是否保存修改？ - + file lost, remove it? 文件已丢失，是否删除？ @@ -2451,17 +2451,17 @@ bug description: 扫描完成 - + Clear, then start scan 清空并启动扫描 - + Do NOT clear, then start scan 不清空并启动扫描 - + Already exist images in image list. Do you want to clear? 图像列表中已存在图像。 @@ -2476,12 +2476,12 @@ Do you want to clear? 磁盘空间不足，请删除不需要的文件，以保证有足够的空间 - + Open images 打开图片 - + Insert images 插入图片 @@ -2494,275 +2494,285 @@ Do you want to clear? 保存失败 - + binary 黑白 - + gray 256级灰度 - + rgb 24位彩色 - - - - - - - - - - - - + + + + + + + + + + + + Please wake up the device manually 请手动唤醒设备 - + UniScan 紫光扫描软件 - - + + Scan + 扫描软件 + + + + default scheme 默认配置方案 - + thumbnailBar enabled 显示缩略图栏 - + thumbnailBar hidden 隐藏缩略图栏 - + cancel 取消 - - - + + + save succeed 保存成功 - - + + find savePath in thumbnail 图片名在列表中已存在 - + Please select at least one picture before export 请至少选中一张图片再进行导出 - + File name 文件名 - + File path 文件路径 - + File size 文件大小 - + Creation date/time 创建时间 - + Modified date/time 修改时间 - + Accessed date/time 访问时间 - + Format 格式 - + Width 宽度 - + Height 高度 - + depth 深度 - + Color model 色彩模式 - + DPI 每英寸像素点 - + Print size 打印尺寸 - + Frame 帧 - + None 无 - + Mono 黑白 - + Gray 灰度 - + Color 彩色 - + Not supported 不支持 - + Warning 警告 - + Device is Running! Please finish scanning first. 设备正在运行！ 请先结束扫描。 - + + about + 关于 + + + cache path folder limit:%1 无法访问当前缓存路径：%1 请尝试在【用户】菜单登录管理员账户，前往【缓存设置】更改缓存路径。 - + aquireinto folder limit:%1 无法访问当前缓存路径：%1 请尝试在【扫描到】更改缓存路径。 - + Image processing failed 图像处理失败 - + Ocr init failed OCR初始化错误 - + Ocr failed OCR错误 - + File does not exist 文件不存在 - + Failed to load dynamic library 加载动态库失败 - + File data error 文件数据错误 - + Image format processing error 图像格式处理错误 - + Out of memory 内存不足 - + Failed 错误 - - + + The language switch is successful and takes effect the next time the software is started! 语言切换成功，下次启动软件时生效! - + Are you sure to delete selected file? 您确定彻底删除选中项文件？ - - - - - - - - - - - - + + + + + + + + + + + + already waked up device 已唤醒设备 - + be ready 就绪 @@ -2772,7 +2782,7 @@ Please finish scanning first. 请尝试在【用户】菜单登录管理员账户，前往【缓存设置】更改缓存路径 - + Insufficient access rights 文件访问权限不足 @@ -2785,46 +2795,46 @@ Please finish scanning first. 图像处理失败 - + Are you sure to close 您确定要断开设备： - + ? 吗? - - + + close 关闭 - + tip 提示 - + Other versions not available 未获取到其他版本 - - + + The device does not support this operation 设备不支持该操作 - - + + IO error IO错误 - - + + error 错误 @@ -2839,17 +2849,17 @@ Continue to close? 是否继续关闭？ - + Sure to sign out administrator account? 是否确定登出管理员账户？ - + confirm the operation 确认操作 - + Are you sure to clear the rollor acount? 你确定要清除滚轴计数吗 @@ -2858,36 +2868,35 @@ Continue to close? 请重新进入关于界面以获取最新值 - - + + <p>%1: <a href='%2'>%3</a> - - + + <p>%1: %2 - + roller number 滚轴张数 - + open scanner 打开扫描仪 - - + app name 华高扫描软件 - - + + success 成功 @@ -2904,22 +2913,22 @@ Continue to close? 失败 - - + + failed 失败 - - - + + + warning 警告 - - - + + + the disk space in the current path is unsufficient, please select a new path or clear the disk space in time. 当前路径磁盘空间不足, 请重新选择路径或及时清理磁盘空间。 @@ -2929,119 +2938,119 @@ Continue to close? 配置丢失 - + apply setting 应用配置 - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + start failed 启动失败 - + HanvonScan 汉王扫描软件 - + LanxumScan 立思辰扫描软件 - + CumtennScan 沧田扫描软件 - + MicrotekScan Microtek DocWizard EX 扫描软件 - + menu_language 语言 - + act_simpCN 简体中文 - + act_English English - + auto save 自动保存 - + when switching pictures, save the edited pictures directly without reminding 切换图片时，不提醒，直接保存编辑过的图片 - + statusBar displayed 显示状态栏 - + statusBar hidden 隐藏状态栏 - + toolBar displayed 显示工具栏 - + toolBar hidden 隐藏工具栏 - + colorInfo enabled 启用图像信息 - + colorInfo disenabled 关闭图像信息 - + enabling automatic saving 启用自动保存 - + cancel auto save 取消自动保存 - + Automatically save the edited the edited iamge when switching pictures. To cancel, uncheck the menu item: image-> automatically save 切换图片时，自动保存编辑过的图像。若想取消，请取消勾选菜单项：图像->自动保存 @@ -3062,26 +3071,26 @@ Continue to close? 发现设备 - + reconnected 重新连接 - + already connected, but open faild 已经连接，但打开失败 - - + + save image failed: 存图失败： - - - - + + + + create savepath failed: 创建文件夹失败： @@ -3090,102 +3099,102 @@ Continue to close? %1%2%3.%4 - - + + create image doc failed: 创建图片文件失败： - - - - - - - - - - - - - + + + + + + + + + + + + + save image doc failed: 保存图片文件失败： - + start failed! 启动安装程序失败！ - + There are pictures that have not been saved. Are you sure to close? 有图像未保存，确定关闭？ - + found device : %1 发现设备 : %1 - - - - - - - - - - - - - + + + + + + + + + + + + + tips 提示 - + Are you sure to close? 确定关闭应用软件？ - + confirm operation 确认操作 - + are you sure to clear the roller count? 您确定要清除滚轴计数吗 - - - + + + hint 提示 - - + + Roller scanned count has been set to 0. 辊轴计数已置零 - - + + Roller scanned count reset failed. 重置滚轴计数失败 - + Error 错误 - + Document missing! It would be deleted or renamed. 文档丢失！文档可能已被删除或被重命名。 @@ -3226,21 +3235,22 @@ Are you sure to close? <p>%1</p><p>版本: %2<br>版权: &#169; %3</p><p>%4%5%6%7%8%9</p> - - + + about %1 关于 %1 - - + + + <p>Version: %1</p> <p>版本: %1</p> <p>版本： %1</p> - - + + <p>CopyRight: &#169; %1</p> <p>版权: &#169; %1</p> <p>版权： &#169; %1</p> @@ -3325,32 +3335,31 @@ Are you sure to close? 取消 - + Restore defaults 恢复默认值 - + Enhance Text 文本增强 - Apply to image - 应用到图像 + 应用到图像 - + Brightness 亮度 - + Gamma correction Gamma校正 - + Contrast 对比度 diff --git a/app/scanner/Scanner_zh_EN.qm b/app/scanner/Scanner_zh_EN.qm index 7a8106c4..558dcdf8 100644 Binary files a/app/scanner/Scanner_zh_EN.qm and b/app/scanner/Scanner_zh_EN.qm differ diff --git a/app/scanner/Scanner_zh_EN.ts b/app/scanner/Scanner_zh_EN.ts index 4d8b482a..05c05336 100644 --- a/app/scanner/Scanner_zh_EN.ts +++ b/app/scanner/Scanner_zh_EN.ts @@ -357,43 +357,43 @@ User custom pages - - + + default scheme Default scheme - - - - + + + + e.g. '%1%2' For example"%1%2" - + ok OK - + cancel Cancel - + Browse directory Folder path - - + + tips Prompt - - + + The configuration scheme already exists The configuration scheme already exists @@ -589,36 +589,36 @@ The page range will be “selected pages” Cancel - - - + + + Input is not valid. Page range will be 'Chosen Pages'. Input invalid. The page range will be “selected pages” - + English English - + Simplified Chinese Simplified Chinese - + Traditional Chinese Traditional Chinese - + Japanese Japanese - + Korean Korean @@ -698,34 +698,34 @@ The page range will be “selected pages” Please leave a contact method, such as a phone number or E-mail address (required). - - - + + + error Error - + Comments and suggestions cannot be empty. Opinions and suggestions cannot be blank - + The contact information column cannot be empty. The contact method field cannot be blank - + tip Prompt - + submit succeed. Submitted successfully. - + submit failed. Submission failed. @@ -1743,24 +1743,24 @@ Please make sure the two passwords are the same. Check for updates - + The current version is the latest! The current version number is : Currently the latest version! The version number is: - - + + Discover the new version : New version discovered: - - + + ,the current version is : , the current version is: - + upgrade contents: Update content: @@ -1912,439 +1912,439 @@ Please make sure the two passwords are the same. Rotate - + menu_user User - + menu_info Information - + menu_device Device - + toolBar Toolbar - + act_open Open... - + act_insert Insert local file... - + act_save Save - + act_saveAs Save as... - + act_Export Export... - + act_closeFile Close selected item - + act_closeAll Close all items - + act_imageInfo Image information... - + act_exit Exit - + act_scannerSettings Scan settings - + act_acquire Scan - + act_acquireSingle Scan single page - - + + act_acquireInto Scan to... - + act_fullscreen Fullscreen display - + act_fitWindowSize Fit view box size - + act_fitWindowWidth Fit view box width - + act_realSize Real size - + act_zoomIn Zoom in - + act_zoomOut Zoom out - + act_toolBar ToolBar - + act_statusBar Status bar - + act_thumbnailBar Thumbnail bar - + act_colorInfo Color information - + act_previous Previous - + act_next Next - + act_first First - + act_last Last - + act_openPageNum Jump to... - + act_previousPage Previous page - + act_nextPage Next page - + act_firstPage First page - + act_lastPage Last page - + act_adjust Brightness/ contrast/ gamma... - + act_90Left Rotate 90 degrees left - + act_90Right Rotate 90 degrees right - + act_180 Rotate 180 degrees - + act_multiRotate Rotate multiple pages... - + act_autoCrop Crop/ Deskew/ Remove black box... - + act_signIn Login... - + act_passwordChange Change password... - + act_signOut Logout - + act_log Log management... - + act_clrCache Cache settings... - + act_consume Consumable status... - + act_help Help - + act_about About... - + act_insertFromScanner Insert from scan... - + act_clearRoller Clear roller count - + act_imageEdit Image edit... - + act_sortPages Book sorting - + act_autoSave Auto save - + act_update Check for updates... - + act_feedback Opinions and feedback... - + act_device_log Export device log... - + act_driver_log Export drive log... - + act_deleteFile Delete selected item - + act_enhanceText Enhance text - + HanvonScan Hanvon scanning software - + LanxumScan LANXUM scanning software - + CumtennScan CUMTENN scanning software - + MicrotekScan Microtek DocWizard EX V1.0 - + HuaGoScan HUAGOSCAN scanning software - + menu_language Language - + act_simpCN 简体中文 - + act_English English - + Grid Multi-column display - + Move To... Move to... - + Insert files Insert file - - - + + + nodevice No scanner detected - + auto save Auto save - + when switching pictures, save the edited pictures directly without reminding Do not show prompt and save the edited images directly when switching images. - + statusBar displayed Show status bar - + statusBar hidden Hide status bar - + toolBar displayed Show toolbar - + toolBar hidden Hide toolbar - + colorInfo enabled Enable image information - + colorInfo disenabled Disable image information - + enabling automatic saving Enable auto save - + cancel auto save Cancel auto save - + Automatically save the edited the edited iamge when switching pictures. To cancel, uncheck the menu item: image-> automatically save Save edited images automatically when switching images. If you want to cancel, please deselect the menu item: Auto save images. - - - - - + + + + + Question Ask - + modified, save it? Image modified, save changes? @@ -2361,7 +2361,7 @@ Please make sure the two passwords are the same. No - + file lost, remove it? File lost; delete? @@ -2370,17 +2370,17 @@ Please make sure the two passwords are the same. Device discovered - + found device : %1 Device discovered: %1 - + reconnected reconnect - + already connected, but open faild connected, but failed to open @@ -2390,394 +2390,404 @@ Please make sure the two passwords are the same. disconnected - - - + + + the disk space in the current path is unsufficient, please select a new path or clear the disk space in time. Insufficient disk space for the current path. Please reselect a path or clear disk space immediately. - - - + + + warning Warning - - + + save image failed: Failed to save image: - - - - + + + + create savepath failed: Failed to create folder: - - + + create image doc failed: Failed to create image file: - - - - - - - - - - - - - + + + + + + + + + + + + + save image doc failed: Failed to save image: - + binary Black and white - + gray Grayscale - + rgb Color - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + start failed Failed to start - + UniScan UNI scanning software - - + + default scheme Default scheme - - - - - - - - - - - - + + + + + + + + + + + + Please wake up the device manually Please wake up the device manually - - - - - - - - - - - - + + Scan + Scanning software + + + + + + + + + + + + + + already waked up device Device is awake - + thumbnailBar enabled Show thumbnail bar - + thumbnailBar hidden Hide thumbnail bar - + Clear, then start scan Clear and start scan - + Do NOT clear, then start scan Do not clear and start scan - + cancel Cancel - + Already exist images in image list. Do you want to clear? Image already exists in the list of images. Clear? - + Open images Open image - + Insert images Insert image - - - - - - - - - - - - - + + + + + + + + + + + + + tips prompt - - - + + + save succeed Saved successfully - - + + find savePath in thumbnail Image name already exists in the list - + Please select at least one picture before export Please select at least one image and then export - + File name File name - + File path File path - + File size File size - + Creation date/time Creation time - + Modified date/time Modification time - + Accessed date/time Access time - + Format Format - + Width Width - + Height Height - + depth Depth - + Color model Color mode - + DPI Pixels per inch - + Print size Print size - + Frame Frame - + None None - + Mono Black and white - + Gray Gray scale - + Color Color - + Not supported Not supported - + Warning Warning - + Device is Running! Please finish scanning first. Device is currently running! Please stop scanning first. - + There are pictures that have not been saved. Are you sure to close? There are unsaved images; are you sure you want to close? - + Are you sure to close? Are you sure you want to close? - + Sure to sign out administrator account? Are you sure you want to log out of the administrator account? - + confirm operation Confirm operation - + are you sure to clear the roller count? Are you sure you want to clear the roller count? - - - + + + hint Prompt - - + + Roller scanned count has been set to 0. Roller count reset to zero. - - + + Roller scanned count reset failed. Failed to reset roller count. - + Error Error - + Document missing! It would be deleted or renamed. File lost! File may be deleted or renamed. - + confirm the operation Confirm operation - + Are you sure to clear the rollor acount? Are you sure you want to clear the roller count? - + + about + About + + + cache path folder limit:%1 Unable to access the current path:%1 Please try to log in to the administrator account in the [User] menu and go to the [Cache settings] to change the cache path. - + aquireinto folder limit:%1 Unable to access the current path:%1 Please try to change the cache path in [Scan to]. @@ -2791,76 +2801,76 @@ Please try to change the cache path in [Scan to]. <p>%1</p><p>Version: %2<br>Copyright: &#169; %3</p><p>%4%5%6%7%8%9</p> - - + + about %1 About %1 - - + + + <p>Version: %1</p> <p>Version: %1</p> - - + + <p>CopyRight: &#169; %1</p> <p>Copyright: &#169; %1</p> - - + + <p>%1: <a href='%2'>%3</a> <p>%1: <a href='%2'>%3</a> - - + + <p>%1: %2 <p>%1: %2 - + roller number Number of rollers - + open scanner Open scanner - - + app name HUAGOSCAN scanning software - - + + success successfully - + be ready Ready - - + + failed failed - - + + error Error - + start failed! Failed to start! @@ -2870,106 +2880,106 @@ Please try to change the cache path in [Scan to]. Please go to “Scan to” and change the accessible scan folder and then perform the scan. - + Insufficient access rights Insufficient file access permissions - + Image processing failed Image processing failed - + Ocr init failed OCR initialization error - + Ocr failed OCR failed - + File does not exist File does not exist - + Failed to load dynamic library Failed to load dynamic library - + File data error File data error - + Image format processing error Image format processing error - + Out of memory Insufficient memory - + Failed Failed - + apply setting Apply configuration - + Are you sure to close Are you sure you want to disconnect device: - + ? ? - - + + close Close - + tip Prompt - + Other versions not available No other versions obtained - - + + The device does not support this operation Device does not support this operation - - + + IO error IO error - - + + The language switch is successful and takes effect the next time the software is started! The language switch is successful and takes effect the next time the software is started! - + Are you sure to delete selected file? Are you sure to delete the selected file completely? @@ -3041,32 +3051,31 @@ Please go to “Scan to” and change the accessible scan folder and then perfor Cancel - + Restore defaults Restore defaults - + Enhance Text Enhance text - Apply to image - Apply to image + Apply to image - + Brightness Brightness - + Gamma correction Gamma correction - + Contrast Contrast diff --git a/app/scanner/VersionDll.cpp b/app/scanner/VersionDll.cpp index 13490694..d5e84de6 100644 --- a/app/scanner/VersionDll.cpp +++ b/app/scanner/VersionDll.cpp @@ -63,8 +63,8 @@ HGResult VersionDll::Load() strcat(dllPath, "ZJVersion.dll"); #elif defined(OEM_ZIGUANG) strcat(dllPath, "ZGVersion.dll"); - #elif defined(OEM_HUAGAO_NEU) - strcat(dllPath, "HGNeuVersion.dll"); + #elif defined(OEM_NEUTRAL) + strcat(dllPath, "NEUVersion.dll"); #else strcat(dllPath, "HGVersion.dll"); #endif @@ -79,8 +79,8 @@ HGResult VersionDll::Load() strcpy(dllPath, "libZjVersion.so"); #elif defined(OEM_ZIGUANG) strcpy(dllPath, "libZgVersion.so"); - #elif defined(OEM_HUAGAO_NEU) - strcat(dllPath, "libHGNeuVersion.so"); + #elif defined(OEM_NEUTRAL) + strcat(dllPath, "libNeuVersion.so"); #else strcpy(dllPath, "libHGVersion.so"); #endif diff --git a/app/scanner/dialog_aquireinto.cpp b/app/scanner/dialog_aquireinto.cpp index 31a72230..1f7ce89b 100644 --- a/app/scanner/dialog_aquireinto.cpp +++ b/app/scanner/dialog_aquireinto.cpp @@ -239,7 +239,7 @@ void Dialog_AquireInto::setCfgBaseOnSection(QString section) ui->lineEdit_fileName->setText(getCfgValue(section2.c_str(), "namePrefix", QString("ZJScan"))); #elif defined(OEM_ZIGUANG) ui->lineEdit_fileName->setText(getCfgValue(section2.c_str(), "namePrefix", QString("ZGScan"))); -#elif defined(OEM_HUAGAO_NEU) +#elif defined(OEM_NEUTRAL) ui->lineEdit_fileName->setText(getCfgValue(section2.c_str(), "namePrefix", QString("Scan"))); #else ui->lineEdit_fileName->setText(getCfgValue(section2.c_str(), "namePrefix", QString("HGScan"))); diff --git a/app/scanner/dialog_feedback.cpp b/app/scanner/dialog_feedback.cpp index 1eb642b4..0cce5094 100644 --- a/app/scanner/dialog_feedback.cpp +++ b/app/scanner/dialog_feedback.cpp @@ -35,8 +35,8 @@ void Dialog_Feedback::on_pbtn_submit_clicked() oemName = HGVERSION_OEMNAME_MICROTEK; #elif defined(OEM_ZIGUANG) oemName = HGVERSION_OEMNAME_UNIS; -#elif defined(OEM_HUAGAO_NEU) - oemName = HGVERSION_OEMNAME_HUAGAO_NEU; +#elif defined(OEM_NEUTRAL) + oemName = HGVERSION_OEMNAME_NEUTRAL; #else oemName = HGVERSION_OEMNAME_HUAGO; #endif diff --git a/app/scanner/dialog_upgrade.cpp b/app/scanner/dialog_upgrade.cpp index c6df5804..715d5ae5 100644 --- a/app/scanner/dialog_upgrade.cpp +++ b/app/scanner/dialog_upgrade.cpp @@ -29,8 +29,8 @@ Dialog_upgrade::Dialog_upgrade(class VersionDll *versionDll, HGVersionInfo *vers oemName = HGVERSION_OEMNAME_MICROTEK; #elif defined(OEM_ZIGUANG) oemName = HGVERSION_OEMNAME_UNIS; -#elif defined(OEM_HUAGAO_NEU) - oemName = HGVERSION_OEMNAME_HUAGAO_NEU; +#elif defined(OEM_NEUTRAL) + oemName = HGVERSION_OEMNAME_NEUTRAL; #else oemName = HGVERSION_OEMNAME_HUAGO; #endif diff --git a/app/scanner/mainwindow.cpp b/app/scanner/mainwindow.cpp index 0e4c2e6c..b5c6d4b8 100644 --- a/app/scanner/mainwindow.cpp +++ b/app/scanner/mainwindow.cpp @@ -120,10 +120,10 @@ MainWindow::MainWindow(const QString& appLang, QWidget *parent) this->setWindowIcon(QIcon(":images/image_rsc/logo/uniscan.ico")); this->setWindowTitle(tr("UniScan")); m_oemName = HGVERSION_OEMNAME_UNIS; -#elif defined(OEM_HUAGO_NEU) +#elif defined(OEM_NEUTRAL) this->setWindowIcon(QIcon(":images/image_rsc/logo/RightWay_logo.ico")); this->setWindowTitle(tr("Scan")); - m_oemName = HGVERSION_OEMNAME_HUAGO_NEU; + m_oemName = HGVERSION_OEMNAME_NEUTRAL; #else this->setWindowIcon(QIcon(":images/image_rsc/logo/logo.ico")); this->setWindowTitle(tr("HuaGoScan")); @@ -143,7 +143,7 @@ MainWindow::MainWindow(const QString& appLang, QWidget *parent) ui->actionact_update->setVisible(false); ui->act_feedback->setVisible(false); -#if !defined(OEM_HANWANG) && !defined(OEM_LISICHENG) && !defined(OEM_CANGTIAN) && !defined(OEM_ZHONGJING) && !defined(OEM_ZIGUANG) && !defined(OEM_HUAGAO_NEU) +#if !defined(OEM_HANWANG) && !defined(OEM_LISICHENG) && !defined(OEM_CANGTIAN) && !defined(OEM_ZHONGJING) && !defined(OEM_ZIGUANG) && !defined(OEM_NEUTRAL) if (m_versionDll->IsValid()) { ui->actionact_update->setVisible(true); @@ -372,7 +372,7 @@ MainWindow::MainWindow(const QString& appLang, QWidget *parent) m_password = "microtek"; #elif defined(OEM_ZIGUANG) m_password = "uniscan"; - #elif defined(OEM_HUAGAO_NEU) + #elif defined(OEM_NEUTRAL) m_password = "scan"; #else m_password = "huagoscan"; @@ -3264,8 +3264,8 @@ void MainWindow::on_act_help_triggered() QString filename = QApplication::applicationDirPath() + "/MicrotekScan_App_Help_manual.pdf"; #elif defined(OEM_ZIGUANG) QString filename = QApplication::applicationDirPath() + "/UniScan_App_Help_manual.pdf"; - #elif defined(OEM_HUAGAO_NEU) - QString filename = QApplication::applicationDirPath() + "/HGScan_App_Help_manual.pdf"; + #elif defined(OEM_NEUTRAL) + QString filename = QApplication::applicationDirPath() + "/NeuScan_App_Help_manual.pdf"; #else QString filename = QApplication::applicationDirPath() + "/HuaGoScan_App_Help_manual.pdf"; #endif @@ -3295,8 +3295,8 @@ void MainWindow::on_act_help_triggered() filename = QApplication::applicationDirPath() + "/../../entries/help/MicrotekScan_App_Help_manual.pdf"; #elif defined(OEM_ZIGUANG) filename = QApplication::applicationDirPath() + "/../../entries/help/UniScan_App_Help_manual.pdf"; -#elif defined(OEM_HUAGAO_NEU) - filename = QApplication::applicationDirPath() + "/../../entries/help/HGScan_App_Help_manual.pdf"; +#elif defined(OEM_NEUTRAL) + filename = QApplication::applicationDirPath() + "/../../entries/help/NeuScan_App_Help_manual.pdf"; #else filename = QApplication::applicationDirPath() + "/../../entries/help/HuaGoScan_App_Help_manual.pdf"; #endif @@ -3313,8 +3313,8 @@ void MainWindow::on_act_help_triggered() filename = QApplication::applicationDirPath() + "/../doc/MicrotekScan_App_Help_manual.pdf"; #elif defined(OEM_ZIGUANG) filename = QApplication::applicationDirPath() + "/../doc/UniScan_App_Help_manual.pdf"; -#elif defined(OEM_HUAGAO_NEU) - filename = QApplication::applicationDirPath() + "/../doc/HGScan_App_Help_manual.pdf"; +#elif defined(OEM_NEUTRAL) + filename = QApplication::applicationDirPath() + "/../doc/NeuScan_App_Help_manual.pdf"; #else filename = QApplication::applicationDirPath() + "/../doc/HuaGoScan_App_Help_manual.pdf"; #endif @@ -3424,6 +3424,10 @@ void MainWindow::on_act_about_triggered() content += *iter; ++iter; } +#else +#ifdef OEM_NEUTRAL + title = tr("about"); + content = tr("

Version: %1

").arg(QString::fromStdString(about->version)); #else title = tr("about %1").arg(QString::fromStdString(about->title)); content = tr("

Version: %1

").arg(QString::fromStdString(about->version)); @@ -3444,6 +3448,7 @@ void MainWindow::on_act_about_triggered() } content += "

"; } +#endif #endif } free(about); diff --git a/build.bat b/build.bat index 34fc3199..88f77494 100644 --- a/build.bat +++ b/build.bat @@ -32,10 +32,17 @@ if "%OEM%" == "hw" ( %QT_PATH%/msvc2017/bin/qmake "DEFINES += OEM_ZIGUANG" -r -tp vc HGSolution.pro MSBuild.exe HGSolution.sln /m:8 /p:Configuration=Release ) else ( - %QT_PATH%/msvc2017_64/bin/qmake -r -tp vc HGSolution.pro - MSBuild.exe HGSolution.sln /m:8 /p:Configuration=Release - %QT_PATH%/msvc2017/bin/qmake -r -tp vc HGSolution.pro - MSBuild.exe HGSolution.sln /m:8 /p:Configuration=Release + if "%OEM%" == "neu" ( + %QT_PATH%/msvc2017_64/bin/qmake "DEFINES += OEM_NEUTRAL" -r -tp vc HGSolution.pro + MSBuild.exe HGSolution.sln /m:8 /p:Configuration=Release + %QT_PATH%/msvc2017/bin/qmake "DEFINES += OEM_NEUTRAL" -r -tp vc HGSolution.pro + MSBuild.exe HGSolution.sln /m:8 /p:Configuration=Release + ) else ( + %QT_PATH%/msvc2017_64/bin/qmake -r -tp vc HGSolution.pro + MSBuild.exe HGSolution.sln /m:8 /p:Configuration=Release + %QT_PATH%/msvc2017/bin/qmake -r -tp vc HGSolution.pro + MSBuild.exe HGSolution.sln /m:8 /p:Configuration=Release + ) ) ) ) diff --git a/build2/qt/HGDemo/HGDemo.pro b/build2/qt/HGDemo/HGDemo.pro index 7fc2d230..5ce5ec1d 100644 --- a/build2/qt/HGDemo/HGDemo.pro +++ b/build2/qt/HGDemo/HGDemo.pro @@ -36,7 +36,7 @@ if (contains(DEFINES, OEM_HANWANG)) { if (contains(DEFINES, OEM_ZIGUANG)) { RC_ICONS = ../../../app/demo/image_rsc/logo/uniscan.ico } else { - if (contains(DEFINES, OEM_HUAGAO_NEU)) { + if (contains(DEFINES, OEM_NEUTRAL)) { RC_ICONS = ../../../app/demo/image_rsc/logo/RightWay_logo.ico } else { RC_ICONS = ../../../app/demo/image_rsc/logo/logo.ico diff --git a/build2/qt/HGFWUpgrade/HGFWUpgrade.pro b/build2/qt/HGFWUpgrade/HGFWUpgrade.pro index c97c6485..ebb55864 100644 --- a/build2/qt/HGFWUpgrade/HGFWUpgrade.pro +++ b/build2/qt/HGFWUpgrade/HGFWUpgrade.pro @@ -36,7 +36,7 @@ if (contains(DEFINES, OEM_HANWANG)) { if (contains(DEFINES, OEM_ZIGUANG)) { RC_ICONS = ../../../app/fwupgrade/image_rsc/logo/uniscan.ico } else { - if (contains(DEFINES, OEM_HUAGAO_NEU)) { + if (contains(DEFINES, OEM_NEUTRAL)) { RC_ICONS = ../../../app/fwupgrade/image_rsc/logo/RightWay_logo.ico } else { RC_ICONS = ../../../app/fwupgrade/image_rsc/logo/logo.ico diff --git a/build2/qt/HGOEM.pri b/build2/qt/HGOEM.pri index d7221f2e..9fdfd25c 100644 --- a/build2/qt/HGOEM.pri +++ b/build2/qt/HGOEM.pri @@ -31,11 +31,11 @@ if (contains(DEFINES, OEM_HANWANG)) { OEM_PREFIX3 = zg OEM_NAME = unis } else { - if (contains(DEFINES, OEM_HUAGAO_NEU)) { - OEM_PREFIX = HGNeu - OEM_PREFIX2 = HGNeu - OEM_PREFIX3 = hgneu - OEM_NAME = huagaoneu + if (contains(DEFINES, OEM_NEUTRAL)) { + OEM_PREFIX = NEU + OEM_PREFIX2 = Neu + OEM_PREFIX3 = neu + OEM_NAME = neutral } else { OEM_PREFIX = HG OEM_PREFIX2 = HG diff --git a/build2/qt/HGScanner/HGScanner.pro b/build2/qt/HGScanner/HGScanner.pro index 13eb1779..db6b1a2f 100644 --- a/build2/qt/HGScanner/HGScanner.pro +++ b/build2/qt/HGScanner/HGScanner.pro @@ -41,9 +41,9 @@ if (contains(DEFINES, OEM_HANWANG)) { RC_ICONS = ../../../app/scanner/image_rsc/logo/uniscan.ico TARGET = UniScan } else { - if (contains(DEFINES, OEM_HUAGAO_NEU)) { + if (contains(DEFINES, OEM_NEUTRAL)) { RC_ICONS = ../../../app/scanner/image_rsc/logo/RightWay_logo.ico - TARGET = HGScan + TARGET = NeuScan } else { RC_ICONS = ../../../app/scanner/image_rsc/logo/logo.ico TARGET = HuaGoScan diff --git a/build2/qt/HGUpgrade/HGUpgrade.pro b/build2/qt/HGUpgrade/HGUpgrade.pro index 7fcdde89..a02cd090 100644 --- a/build2/qt/HGUpgrade/HGUpgrade.pro +++ b/build2/qt/HGUpgrade/HGUpgrade.pro @@ -36,7 +36,7 @@ if (contains(DEFINES, OEM_HANWANG)) { if (contains(DEFINES, OEM_ZIGUANG)) { RC_ICONS = ../../../app/upgrade/image_rsc/logo/uniscan.ico } else { - if (contains(DEFINES, OEM_HUAGAO_NEU)) { + if (contains(DEFINES, OEM_NEUTRAL)) { RC_ICONS = ../../../app/upgrade/image_rsc/logo/RightWay_logo.ico } else { RC_ICONS = ../../../app/upgrade/image_rsc/logo/logo.ico diff --git a/doc/scanner/HGScan_App_Help_manual.pdf b/doc/scanner/NeuScan_App_Help_manual.pdf similarity index 100% rename from doc/scanner/HGScan_App_Help_manual.pdf rename to doc/scanner/NeuScan_App_Help_manual.pdf diff --git a/doc/scanner/HGScan_scanSettings_Help_manual.pdf b/doc/scanner/NeuScan_scanSettings_Help_manual.pdf similarity index 100% rename from doc/scanner/HGScan_scanSettings_Help_manual.pdf rename to doc/scanner/NeuScan_scanSettings_Help_manual.pdf diff --git a/modules/version/HGVersion.h b/modules/version/HGVersion.h index 01246196..85929276 100644 --- a/modules/version/HGVersion.h +++ b/modules/version/HGVersion.h @@ -9,7 +9,7 @@ HG_DECLARE_HANDLE(HGVersionMgr); #define HGVERSION_APPNAME_SCANNER "Scanner" #define HGVERSION_OEMNAME_HUAGO "Huago" -#define HGVERSION_OEMNAME_HUAGAO_NEU "HuagoNeu" +#define HGVERSION_OEMNAME_NEUTRAL "Neutral" #define HGVERSION_OEMNAME_HANVON "Hanvon" #define HGVERSION_OEMNAME_LANXUM "Lanxum" #define HGVERSION_OEMNAME_CUMTENN "Cumtenn"