diff --git a/CMakeLists.txt b/CMakeLists.txt index 5ce6017..288b02e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,34 +12,34 @@ set (QT_MINIMUM_VERSION "5.10") find_package(Qt5 ${QT_MINIMUM_VERSION} CONFIG REQUIRED Widgets Svg LinguistTools) set (PPIC_CPP_FILES - main.cpp - mainwindow.cpp - graphicsview.cpp - graphicsscene.cpp - bottombuttongroup.cpp - navigatorview.cpp - opacityhelper.cpp - toolbutton.cpp - settings.cpp - settingsdialog.cpp - aboutdialog.cpp - metadatamodel.cpp - metadatadialog.cpp + app/main.cpp + app/mainwindow.cpp + app/graphicsview.cpp + app/graphicsscene.cpp + app/bottombuttongroup.cpp + app/navigatorview.cpp + app/opacityhelper.cpp + app/toolbutton.cpp + app/settings.cpp + app/settingsdialog.cpp + app/aboutdialog.cpp + app/metadatamodel.cpp + app/metadatadialog.cpp ) set (PPIC_HEADER_FILES - mainwindow.h - graphicsview.h - graphicsscene.h - bottombuttongroup.h - navigatorview.h - opacityhelper.h - toolbutton.h - settings.h - settingsdialog.h - aboutdialog.h - metadatamodel.h - metadatadialog.h + app/mainwindow.h + app/graphicsview.h + app/graphicsscene.h + app/bottombuttongroup.h + app/navigatorview.h + app/opacityhelper.h + app/toolbutton.h + app/settings.h + app/settingsdialog.h + app/aboutdialog.h + app/metadatamodel.h + app/metadatadialog.h ) set (PPIC_QRC_FILES @@ -53,7 +53,7 @@ set (PPIC_RC_FILES set (EXE_NAME ppic) # Translation -file (GLOB PPIC_TS_FILES languages/*.ts) +file (GLOB PPIC_TS_FILES translations/*.ts) set (PPIC_CPP_FILES_FOR_I18N ${PPIC_CPP_FILES}) qt5_create_translation(PPIC_QM_FILES ${PPIC_CPP_FILES_FOR_I18N} ${PPIC_TS_FILES}) diff --git a/aboutdialog.cpp b/app/aboutdialog.cpp similarity index 100% rename from aboutdialog.cpp rename to app/aboutdialog.cpp diff --git a/aboutdialog.h b/app/aboutdialog.h similarity index 100% rename from aboutdialog.h rename to app/aboutdialog.h diff --git a/bottombuttongroup.cpp b/app/bottombuttongroup.cpp similarity index 100% rename from bottombuttongroup.cpp rename to app/bottombuttongroup.cpp diff --git a/bottombuttongroup.h b/app/bottombuttongroup.h similarity index 100% rename from bottombuttongroup.h rename to app/bottombuttongroup.h diff --git a/graphicsscene.cpp b/app/graphicsscene.cpp similarity index 100% rename from graphicsscene.cpp rename to app/graphicsscene.cpp diff --git a/graphicsscene.h b/app/graphicsscene.h similarity index 100% rename from graphicsscene.h rename to app/graphicsscene.h diff --git a/graphicsview.cpp b/app/graphicsview.cpp similarity index 100% rename from graphicsview.cpp rename to app/graphicsview.cpp diff --git a/graphicsview.h b/app/graphicsview.h similarity index 100% rename from graphicsview.h rename to app/graphicsview.h diff --git a/main.cpp b/app/main.cpp similarity index 100% rename from main.cpp rename to app/main.cpp diff --git a/mainwindow.cpp b/app/mainwindow.cpp similarity index 100% rename from mainwindow.cpp rename to app/mainwindow.cpp diff --git a/mainwindow.h b/app/mainwindow.h similarity index 100% rename from mainwindow.h rename to app/mainwindow.h diff --git a/metadatadialog.cpp b/app/metadatadialog.cpp similarity index 100% rename from metadatadialog.cpp rename to app/metadatadialog.cpp diff --git a/metadatadialog.h b/app/metadatadialog.h similarity index 100% rename from metadatadialog.h rename to app/metadatadialog.h diff --git a/metadatamodel.cpp b/app/metadatamodel.cpp similarity index 100% rename from metadatamodel.cpp rename to app/metadatamodel.cpp diff --git a/metadatamodel.h b/app/metadatamodel.h similarity index 100% rename from metadatamodel.h rename to app/metadatamodel.h diff --git a/navigatorview.cpp b/app/navigatorview.cpp similarity index 100% rename from navigatorview.cpp rename to app/navigatorview.cpp diff --git a/navigatorview.h b/app/navigatorview.h similarity index 100% rename from navigatorview.h rename to app/navigatorview.h diff --git a/opacityhelper.cpp b/app/opacityhelper.cpp similarity index 100% rename from opacityhelper.cpp rename to app/opacityhelper.cpp diff --git a/opacityhelper.h b/app/opacityhelper.h similarity index 100% rename from opacityhelper.h rename to app/opacityhelper.h diff --git a/settings.cpp b/app/settings.cpp similarity index 100% rename from settings.cpp rename to app/settings.cpp diff --git a/settings.h b/app/settings.h similarity index 100% rename from settings.h rename to app/settings.h diff --git a/settingsdialog.cpp b/app/settingsdialog.cpp similarity index 100% rename from settingsdialog.cpp rename to app/settingsdialog.cpp diff --git a/settingsdialog.h b/app/settingsdialog.h similarity index 100% rename from settingsdialog.h rename to app/settingsdialog.h diff --git a/toolbutton.cpp b/app/toolbutton.cpp similarity index 100% rename from toolbutton.cpp rename to app/toolbutton.cpp diff --git a/toolbutton.h b/app/toolbutton.h similarity index 100% rename from toolbutton.h rename to app/toolbutton.h diff --git a/pineapple-pictures.pro b/pineapple-pictures.pro index 07656f7..35e9f21 100644 --- a/pineapple-pictures.pro +++ b/pineapple-pictures.pro @@ -17,37 +17,37 @@ DEFINES += QT_DEPRECATED_WARNINGS CONFIG += c++11 lrelease embed_translations SOURCES += \ - aboutdialog.cpp \ - main.cpp \ - mainwindow.cpp \ - graphicsview.cpp \ - bottombuttongroup.cpp \ - graphicsscene.cpp \ - navigatorview.cpp \ - opacityhelper.cpp \ - toolbutton.cpp \ - settings.cpp \ - settingsdialog.cpp \ - metadatamodel.cpp \ - metadatadialog.cpp + app/aboutdialog.cpp \ + app/main.cpp \ + app/mainwindow.cpp \ + app/graphicsview.cpp \ + app/bottombuttongroup.cpp \ + app/graphicsscene.cpp \ + app/navigatorview.cpp \ + app/opacityhelper.cpp \ + app/toolbutton.cpp \ + app/settings.cpp \ + app/settingsdialog.cpp \ + app/metadatamodel.cpp \ + app/metadatadialog.cpp HEADERS += \ - aboutdialog.h \ - mainwindow.h \ - graphicsview.h \ - bottombuttongroup.h \ - graphicsscene.h \ - navigatorview.h \ - opacityhelper.h \ - toolbutton.h \ - settings.h \ - settingsdialog.h \ - metadatamodel.h \ - metadatadialog.h + app/aboutdialog.h \ + app/mainwindow.h \ + app/graphicsview.h \ + app/bottombuttongroup.h \ + app/graphicsscene.h \ + app/navigatorview.h \ + app/opacityhelper.h \ + app/toolbutton.h \ + app/settings.h \ + app/settingsdialog.h \ + app/metadatamodel.h \ + app/metadatadialog.h TRANSLATIONS = \ - languages/PineapplePictures.ts \ - languages/PineapplePictures_zh_CN.ts + translations/PineapplePictures.ts \ + translations/PineapplePictures_zh_CN.ts # Default rules for deployment. qnx: target.path = /tmp/$${TARGET}/bin diff --git a/languages/PineapplePictures.ts b/translations/PineapplePictures.ts similarity index 67% rename from languages/PineapplePictures.ts rename to translations/PineapplePictures.ts index ccbb938..405a76e 100644 --- a/languages/PineapplePictures.ts +++ b/translations/PineapplePictures.ts @@ -4,157 +4,157 @@ AboutDialog - + About - + Launch application with image file path as argument to load the file. - + Drag and drop image file onto the window is also supported. - + Context menu option explanation: - + Make window stay on top of all other windows. - + Avoid close window accidentally. (eg. by double clicking the window) - + Version: %1 - + Copyright (c) 2020 %1 - + Logo designed by %1 - + Built with Qt %1 (%2) - + Source code - + Contributors - + List of contributors on GitHub - + Thanks to all people who contributed to this project. - + Translators - + I would like to thank the following people who volunteered to translate this application. - + &Special Thanks - + &Third-party Libraries - + Your Rights - + %1 is released under the MIT License. - + This license grants people a number of freedoms: - + You are free to use %1, for any purpose - + You are free to distribute %1 - + You can study how %1 works and change it - + You can distribute changed versions of %1 - + The MIT license guarantees you this freedom. Nobody is ever permitted to take it away. - + Third-party Libraries used by %1 - + %1 is built on the following free software libraries: - + &Help - + &About - + &License @@ -162,7 +162,7 @@ GraphicsScene - + Drag image here @@ -170,28 +170,28 @@ GraphicsView - + File url list is empty - + File is not a valid image - - + + Image data is invalid or currently unsupported - + Image data is invalid - + Not supported mimedata: %1 @@ -199,59 +199,59 @@ MainWindow - + File url list is empty - + &Copy - + Copy P&ixmap - + Copy &File Path - + &Paste Image - + &Paste Image File - + Properties - - + + Stay on top - - + + Protected mode - + Configure... - + Help @@ -259,7 +259,7 @@ MetadataDialog - + Image Metadata @@ -267,109 +267,109 @@ MetadataModel - + Origin Section name. - + Image Section name. - + File Section name. - + Camera Section name. - + %1 File - + Description Section name. - + Advanced photo Section name. - + GPS Section name. - + Dimensions - + Aspect Ratio - + Name - + Item type - + Folder path - + Size - + Date Created - + Date Modified - + %1 x %2 - + %1 : %2 - + Property - + Value @@ -377,32 +377,32 @@ SettingsDialog - + Settings - + Do nothing - + Close the window - + Toggle maximize - + Stay on top when start-up - + Double-click behavior @@ -410,12 +410,12 @@ main - + Pineapple Pictures - + File list. diff --git a/languages/PineapplePictures_zh_CN.ts b/translations/PineapplePictures_zh_CN.ts similarity index 68% rename from languages/PineapplePictures_zh_CN.ts rename to translations/PineapplePictures_zh_CN.ts index 067bee7..951def9 100644 --- a/languages/PineapplePictures_zh_CN.ts +++ b/translations/PineapplePictures_zh_CN.ts @@ -4,157 +4,157 @@ AboutDialog - + About 关于 - + Launch application with image file path as argument to load the file. 以图片文件的路径作为参数运行程序即可直接打开图片文件。 - + Drag and drop image file onto the window is also supported. 也支持拖放图片文件到窗口内来加载图片。 - + Context menu option explanation: 菜单项说明： - + Make window stay on top of all other windows. 使窗口始终至于其它非置顶窗口上方。 - + Avoid close window accidentally. (eg. by double clicking the window) 避免窗口意外关闭。（如：不小心双击了窗口触发了关闭窗口行为） - + Version: %1 版本: %1 - + Copyright (c) 2020 %1 版权所有 (c) 2020 %1 - + Logo designed by %1 Logo 由 %1 设计 - + Built with Qt %1 (%2) 使用 Qt %1 (%2) 进行构建 - + Source code 源代码 - + Contributors 贡献者 - + List of contributors on GitHub GitHub 上的贡献者列表 - + Thanks to all people who contributed to this project. 感谢所有参与此项目的朋友。 - + Translators 翻译者 - + I would like to thank the following people who volunteered to translate this application. 我想要感谢下列自愿参与翻译此应用程序的朋友。 - + &Special Thanks 致谢(&S) - + &Third-party Libraries 第三方程序库(&T) - + Your Rights 用户的权利 - + %1 is released under the MIT License. %1 是在 MIT 许可协议下发布的。 - + This license grants people a number of freedoms: 此许可证赋予人们以下自由的权利： - + You are free to use %1, for any purpose 任何人都可以为了任何目的自由地使用 %1 - + You are free to distribute %1 任何人都可以自由地分发 %1 - + You can study how %1 works and change it 任何人都可以自由地研究 %1 的工作原理并对其进行修改 - + You can distribute changed versions of %1 任何人都可以自由地分发修改过的 %1 版本 - + The MIT license guarantees you this freedom. Nobody is ever permitted to take it away. 此软件通过 MIT 许可证赋予用户上述自由，任何人无权剥夺。 - + Third-party Libraries used by %1 %1 使用的第三方程序库 - + %1 is built on the following free software libraries: %1 采用了下列自由软件程序库进行构建： - + &Help 帮助(&H) - + &About 关于(&A) - + &License 软件许可证(&L) @@ -162,7 +162,7 @@ GraphicsScene - + Drag image here 拖放图片至此 @@ -170,28 +170,28 @@ GraphicsView - + File url list is empty 文件 URL 列表为空 - + File is not a valid image 文件不是有效的图片文件 - - + + Image data is invalid or currently unsupported 图像数据无效或暂未支持 - + Image data is invalid 图片数据无效 - + Not supported mimedata: %1 不受支持的 MimeData 格式：%1 @@ -199,59 +199,59 @@ MainWindow - + File url list is empty 文件 URL 列表为空 - + &Copy 复制(&C) - + Copy P&ixmap 复制位图(&I) - + Copy &File Path 复制文件路径(&F) - + &Paste Image 粘贴图像(&P) - + &Paste Image File 粘贴图像文件(&P) - + Properties 属性 - - + + Stay on top 总在最前 - - + + Protected mode 保护模式 - + Configure... 设置... - + Help 帮助 @@ -259,7 +259,7 @@ MetadataDialog - + Image Metadata 图像元信息 @@ -267,109 +267,109 @@ MetadataModel - + Origin Section name. 来源 - + Image Section name. 图像 - + File Section name. 文件 - + Camera Section name. 照相机 - + %1 File %1 文件 - + Description Section name. 说明 - + Advanced photo Section name. 高级照片 - + GPS Section name. GPS - + Dimensions 分辨率 - + Aspect Ratio 纵横比 - + Name 名称 - + Item type 项目类型 - + Folder path 文件夹路径 - + Size 大小 - + Date Created 创建日期 - + Date Modified 修改日期 - + %1 x %2 %1 x %2 - + %1 : %2 %1 : %2 - + Property 属性 - + Value 值 @@ -377,32 +377,32 @@ SettingsDialog - + Settings 设定 - + Do nothing 什么也不做 - + Close the window 关闭窗口 - + Toggle maximize 最大化窗口 - + Stay on top when start-up 启动时保持窗口总在最前 - + Double-click behavior 双击时的行为 @@ -410,12 +410,12 @@ main - + Pineapple Pictures 菠萝看图 - + File list. 文件列表。