fix: cannot load images under WSL2 network location

workaround resolve GH-7
feat(i18n): add zh_CN translation for .desktop file
2020-08-28 15:25:07 +08:00 · 2020-08-26 19:06:41 +08:00 · 2020-08-23 23:46:12 +08:00 · 2020-08-13 19:45:38 +08:00 · 2020-08-11 09:08:31 +08:00 · 2020-08-10 23:41:59 +08:00
17 changed files with 504 additions and 75 deletions
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@ -17,4 +17,8 @@ jobs:
        cd build
        cmake ../
        make
-        sudo cpack
+        cpack -G DEB
+    - uses: actions/upload-artifact@v2
+      with:
+        name: ubuntu-20.04-deb-package
+        path: build/*.deb
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -3,6 +3,7 @@ project (pineapple-pictures)
 cmake_minimum_required (VERSION 3.9.5)

 include (GNUInstallDirs)
+include (FeatureSummary)

 set (CMAKE_AUTOMOC ON)
 set (CMAKE_AUTORCC ON)
@ -19,6 +20,8 @@ set (PPIC_CPP_FILES
    navigatorview.cpp
    opacityhelper.cpp
    toolbutton.cpp
+    settings.cpp
+    settingsdialog.cpp
 )

 set (PPIC_HEADER_FILES
@ -29,6 +32,8 @@ set (PPIC_HEADER_FILES
    navigatorview.h
    opacityhelper.h
    toolbutton.h
+    settings.h
+    settingsdialog.h
 )

 set (PPIC_QRC_FILES
@ -67,6 +72,49 @@ if (WIN32)
        TARGET ${EXE_NAME}
        PROPERTY WIN32_EXECUTABLE true
    )
+
+    target_compile_definitions(${EXE_NAME} PRIVATE
+        FLAG_PORTABLE_MODE_SUPPORT=1
+    )
+endif ()
+
+# Helper macros for parsing and setting project version from `git describe --long` result
+macro (ppic_set_version_via_describe _describe_long)
+    string (
+        REGEX REPLACE
+        "^([0-9a-z.]*)-[0-9]+-g[0-9a-f]*$"
+        "\\1"
+        _tag_parts
+        "${_describe_long}"
+    )
+    list (GET _tag_parts 0 _matched_tag_version)
+    if ("${_matched_tag_version}" MATCHES "^[0-9]+\\.[0-9]+\\.[0-9]+$")
+        string (
+            REGEX REPLACE
+            "^([0-9]+)\\.([0-9]+)\\.([0-9]+).*$"
+            "\\1;\\2;\\3"
+            _ver_parts
+            "${_matched_tag_version}"
+        )
+        list (GET _ver_parts 0 CPACK_PACKAGE_VERSION_MAJOR)
+        list (GET _ver_parts 1 CPACK_PACKAGE_VERSION_MINOR)
+        list (GET _ver_parts 2 CPACK_PACKAGE_VERSION_PATCH)
+    endif ()
+endmacro ()
+
+# Version setup
+if (EXISTS "${CMAKE_SOURCE_DIR}/.git")
+    find_package(Git)
+    set_package_properties(Git PROPERTIES TYPE OPTIONAL PURPOSE "Determine exact build version.")
+    if (GIT_FOUND)
+        execute_process (
+            COMMAND ${GIT_EXECUTABLE} describe --tags --always --long
+            WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+            OUTPUT_VARIABLE _git_describe_long
+        )
+        string (REGEX REPLACE "\n" "" _git_describe_long "${_git_describe_long}")
+        ppic_set_version_via_describe(${_git_describe_long})
+    endif ()
 endif ()

 # Helper macros for install settings
--- a/PineapplePictures.pro
+++ b/PineapplePictures.pro
@ -32,7 +32,9 @@ SOURCES += \
    graphicsscene.cpp \
    navigatorview.cpp \
    opacityhelper.cpp \
-    toolbutton.cpp
+    toolbutton.cpp \
+    settings.cpp \
+    settingsdialog.cpp

 HEADERS += \
        mainwindow.h \
@ -41,7 +43,9 @@ HEADERS += \
    graphicsscene.h \
    navigatorview.h \
    opacityhelper.h \
-    toolbutton.h
+    toolbutton.h \
+    settings.h \
+    settingsdialog.h

 TRANSLATIONS = \
    languages/PineapplePictures.ts \
@ -55,6 +59,6 @@ else: unix:!android: target.path = /opt/$${TARGET}/bin
 RESOURCES += \
    resources.qrc

-# Generate fron svg:
+# Generate from svg:
 # magick convert -background none app-icon.svg -define icon:auto-resize="16,32,48,64,128,256" app-icon.ico
 RC_ICONS = icons/app-icon.ico
--- a/README.md
+++ b/README.md
@ -3,29 +3,64 @@ Yet another image viewer.
 |CI|Build Status|
 |---|---|
 |Windows Build|[![Windows build status](https://ci.appveyor.com/api/projects/status/dbd8clww3cit6oa0/branch/master?svg=true)](https://ci.appveyor.com/project/BLumia/pineapplepictures/branch/master)|
-|macOS Build|![macOS CI](https://github.com/BLumia/PineapplePictures/workflows/macOS%20CI/badge.svg)|
-|Ubuntu 20.04 Build|![Ubuntu 20.04 CI](https://github.com/BLumia/PineapplePictures/workflows/Ubuntu%2020.04%20CI/badge.svg)|
+|macOS Build|![macOS CI](https://github.com/BLumia/pineapple-pictures/workflows/macOS%20CI/badge.svg)|
+|Ubuntu 20.04 Build|![Ubuntu 20.04 CI](https://github.com/BLumia/pineapple-pictures/workflows/Ubuntu%2020.04%20CI/badge.svg)|

 ![Pineapple Pictures - Main Window](https://repository-images.githubusercontent.com/211888654/21fb6300-269f-11ea-8e85-953e5d57da44)

 ## Get it!

- - [GitHub Release Page](https://github.com/BLumia/PineapplePictures/releases)
+ - [GitHub Release Page](https://github.com/BLumia/pineapple-pictures/releases)
 - Archlinux AUR: [pineapple-pictures-git](https://aur.archlinux.org/packages/pineapple-pictures-git/)

+## Build it manually:
+
+Current state, we need:
+
+ - `cmake`: as the build system.
+ - `qt5` with `qt5-svg` and `qt5-tools`: since the app is using Qt.
+
+Then we can build it with any proper c++ compiler like g++ or msvc.
+
+Building it just requires normal cmake building steps:
+
+``` bash
+$ mkdir build && cd build
+$ cmake ..
+$ cmake --build . # or simply using `make` if you are using Makefile as the cmake generator.
+```
+
+After that, a `ppic` executable file will be available to use. You can also optionally install it by using the target `install` (or simply `make install` in case you are using Makefile). After the build process, you can also use `cpack` to make a package.
+
+Image formats supports rely on Qt's imageformats plugins, just get the plugins you need from your distro's package manager will be fine. For Windows user, you may need build and install the imageformats plugin manually, read the content below.
+
+### Linux
+
+Just normal build process as other program will be fine. Nothing special ;)
+
+For Archlinux there are also a [PKGBUILD](https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=pineapple-pictures-git) you can use.
+
+For packaging to debian-based distro, the `CMakeLists.txt` provides some cpack configurations for generating a `.deb` package. After the build process, use `cpack -G DEB` to generate the package. You can also take `.github/workflows/ubuntu.yml` as a reference.
+
+For this project, `DEB` is the only supported cpack generator in current state, feel free to submit a PR if you like improving `cpack` support for this project.
+
+### Windows
+
+The normal build steps for Linux is also applied to Windows, but since Windows doesn't have a decent package manager, so if you need any other image formats support other than the supported formats which Qt provided, you need to get and build these imageformats plugins manually and vendor it. It's optional and can be skipped if you don't need extra image formats support.
+
+For the Windows binary I provided, kimageformats plugin is used (for formats like kra, xcf, psd and etc.). You can take `appveyor.yml` as a reference to learn what I did when building the Windows binary.
+
+[KDE Craft](https://community.kde.org/Craft) environment also can be used to build and package this program. I did also created a blueprint for building this project, but since I don't have a CI to run KDE Craft build, the blueprint repo are not provided here. Maybe sometimes later.
+
+### macOS
+
+I don't have a mac, so no support at all. There is also a GitHub Action (see `.github/workflows/macos.yml`) running macOS build though so at least it can build. Feel free to submit a PR if you would like to give some love to the macOS build ;P
+
 ## Help Translation!

 [Translate this project on Transifex!](https://www.transifex.com/blumia/pineapple-pictures/)

-Feel free to open up an issue to request an new language to translate.
-
-## Uncleaned shits inside(TM):
-
- - Mixed `CR LF` and `LF`.
- - Ugly action icons.
- - Ugly implementations.
- - For windows build, win32 APIs are used.
- - No drag-window-border-to-resize support under non-windows platforms (I use <kbd>Meta+Drag</kbd> to resize window under my x11 desktop).
+Feel free to open up an issue to request a new language to translate.

 ## License

--- a/appveyor.yml
+++ b/appveyor.yml
@ -59,6 +59,7 @@ build_script:
  - mingw32-make install
 # fixme: I don't know how to NOT make the binary installed to the ./bin/ folder...
  - cd bin
+  - copy %APPVEYOR_BUILD_FOLDER%\LICENSE .
  - copy C:\projects\cmake\bin\libKF5Archive.dll .
  - windeployqt --verbose=2 --no-quick-import --no-translations --no-opengl-sw --no-angle --no-system-d3d-compiler --release .\ppic.exe
 # for debug..
--- a/graphicsview.cpp
+++ b/graphicsview.cpp
@ -31,6 +31,17 @@ void GraphicsView::showFileFromUrl(const QUrl &url, bool doRequestGallery)

    QString filePath(url.toLocalFile());

+#ifdef Q_OS_WIN
+    // TODO: remove this workaround when M$ change the "wsl$" hostname.
+    if (Q_UNLIKELY(url.scheme() == QStringLiteral("qtbug-86277"))) {
+        filePath = url.path();
+        // Qt's QUrl won't work with such hostname anyway so the urls will
+        // still be the wrong one when requesting gallery. So we just don't
+        // request gallery here...
+        doRequestGallery = false;
+    }
+#endif // Q_OS_WIN
+
    if (filePath.endsWith(".svg")) {
        showSvg(filePath);
    } else if (filePath.endsWith(".gif")) {
@ -142,12 +153,16 @@ void GraphicsView::fitInView(const QRectF &rect, Qt::AspectRatioMode aspectRadio
    applyTransformationModeByScaleFactor();
 }

-void GraphicsView::checkAndDoFitInView()
+void GraphicsView::checkAndDoFitInView(bool markItOnAnyway)
 {
    if (!isThingSmallerThanWindowWith(transform())) {
        m_enableFitInView = true;
        fitInView(sceneRect(), Qt::KeepAspectRatio);
    }
+
+    if (markItOnAnyway) {
+        m_enableFitInView = true;
+    }
 }

 void GraphicsView::toggleCheckerboard()
--- a/graphicsview.h
+++ b/graphicsview.h
@ -30,7 +30,7 @@ public:
    void rotateView(qreal rotateAngel);
    void fitInView(const QRectF &rect, Qt::AspectRatioMode aspectRadioMode = Qt::IgnoreAspectRatio);

-    void checkAndDoFitInView();
+    void checkAndDoFitInView(bool markItOnAnyway = true);

 signals:
    void navigatorViewRequired(bool required, qreal angle);
--- a/languages/PineapplePictures.ts
+++ b/languages/PineapplePictures.ts
@ -12,7 +12,7 @@
 <context>
    <name>GraphicsView</name>
    <message>
-        <location filename="../graphicsview.cpp" line="243"/>
+        <location filename="../graphicsview.cpp" line="247"/>
        <source>File url list is empty</source>
        <translation type="unfinished"></translation>
    </message>
@ -22,12 +22,12 @@
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../graphicsview.cpp" line="251"/>
+        <location filename="../graphicsview.cpp" line="255"/>
        <source>Image data is invalid</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../graphicsview.cpp" line="258"/>
+        <location filename="../graphicsview.cpp" line="262"/>
        <source>Not supported mimedata: %1</source>
        <translation type="unfinished"></translation>
    </message>
@ -35,78 +35,111 @@
 <context>
    <name>MainWindow</name>
    <message>
-        <location filename="../mainwindow.cpp" line="173"/>
+        <location filename="../mainwindow.cpp" line="174"/>
        <source>File url list is empty</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../mainwindow.cpp" line="382"/>
+        <location filename="../mainwindow.cpp" line="396"/>
        <source>&amp;Copy</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../mainwindow.cpp" line="403"/>
+        <location filename="../mainwindow.cpp" line="417"/>
        <source>Copy P&amp;ixmap</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../mainwindow.cpp" line="408"/>
+        <location filename="../mainwindow.cpp" line="422"/>
        <source>Copy &amp;File Path</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../mainwindow.cpp" line="418"/>
+        <location filename="../mainwindow.cpp" line="432"/>
        <source>&amp;Paste Image</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../mainwindow.cpp" line="424"/>
+        <location filename="../mainwindow.cpp" line="438"/>
        <source>&amp;Paste Image File</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../mainwindow.cpp" line="429"/>
-        <location filename="../mainwindow.cpp" line="448"/>
+        <location filename="../mainwindow.cpp" line="443"/>
+        <location filename="../mainwindow.cpp" line="471"/>
        <source>Stay on top</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../mainwindow.cpp" line="435"/>
-        <location filename="../mainwindow.cpp" line="449"/>
+        <location filename="../mainwindow.cpp" line="450"/>
+        <location filename="../mainwindow.cpp" line="472"/>
        <source>Protected mode</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../mainwindow.cpp" line="441"/>
+        <location filename="../mainwindow.cpp" line="457"/>
+        <source>Configure...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="464"/>
        <source>Help</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../mainwindow.cpp" line="444"/>
+        <location filename="../mainwindow.cpp" line="467"/>
        <source>Launch application with image file path as argument to load the file.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../mainwindow.cpp" line="445"/>
+        <location filename="../mainwindow.cpp" line="468"/>
        <source>Drag and drop image file onto the window is also supported.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../mainwindow.cpp" line="447"/>
+        <location filename="../mainwindow.cpp" line="470"/>
        <source>Context menu option explanation:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../mainwindow.cpp" line="448"/>
+        <location filename="../mainwindow.cpp" line="471"/>
        <source>Make window stay on top of all other windows.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../mainwindow.cpp" line="449"/>
+        <location filename="../mainwindow.cpp" line="472"/>
        <source>Avoid close window accidentally. (eg. by double clicking the window)</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
+<context>
+    <name>SettingsDialog</name>
+    <message>
+        <location filename="../settingsdialog.cpp" line="18"/>
+        <source>Do nothing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.cpp" line="19"/>
+        <source>Close the window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.cpp" line="20"/>
+        <source>Toggle maximize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.cpp" line="28"/>
+        <source>Stay on top when start-up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.cpp" line="29"/>
+        <source>Double-click behavior</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
    <name>main</name>
    <message>
--- a/languages/PineapplePictures_zh_CN.ts
+++ b/languages/PineapplePictures_zh_CN.ts
@ -12,7 +12,7 @@
 <context>
    <name>GraphicsView</name>
    <message>
-        <location filename="../graphicsview.cpp" line="243"/>
+        <location filename="../graphicsview.cpp" line="247"/>
        <source>File url list is empty</source>
        <translation>文件 URL 列表为空</translation>
    </message>
@ -22,12 +22,12 @@
        <translation>文件不是有效的图片文件</translation>
    </message>
    <message>
-        <location filename="../graphicsview.cpp" line="251"/>
+        <location filename="../graphicsview.cpp" line="255"/>
        <source>Image data is invalid</source>
        <translation>图片数据无效</translation>
    </message>
    <message>
-        <location filename="../graphicsview.cpp" line="258"/>
+        <location filename="../graphicsview.cpp" line="262"/>
        <source>Not supported mimedata: %1</source>
        <translation>不受支持的 MimeData 格式：%1</translation>
    </message>
@ -35,12 +35,12 @@
 <context>
    <name>MainWindow</name>
    <message>
-        <location filename="../mainwindow.cpp" line="173"/>
+        <location filename="../mainwindow.cpp" line="174"/>
        <source>File url list is empty</source>
        <translation>文件 URL 列表为空</translation>
    </message>
    <message>
-        <location filename="../mainwindow.cpp" line="382"/>
+        <location filename="../mainwindow.cpp" line="396"/>
        <source>&amp;Copy</source>
        <translation>复制(&amp;C)</translation>
    </message>
@ -49,68 +49,101 @@
        <translation type="vanished">复制位图(&amp;P)</translation>
    </message>
    <message>
-        <location filename="../mainwindow.cpp" line="403"/>
+        <location filename="../mainwindow.cpp" line="417"/>
        <source>Copy P&amp;ixmap</source>
        <translation>复制位图(&amp;I)</translation>
    </message>
    <message>
-        <location filename="../mainwindow.cpp" line="408"/>
+        <location filename="../mainwindow.cpp" line="422"/>
        <source>Copy &amp;File Path</source>
        <translation>复制文件路径(&amp;F)</translation>
    </message>
    <message>
-        <location filename="../mainwindow.cpp" line="418"/>
+        <location filename="../mainwindow.cpp" line="432"/>
        <source>&amp;Paste Image</source>
        <translation>粘贴图像(&amp;P)</translation>
    </message>
    <message>
-        <location filename="../mainwindow.cpp" line="424"/>
+        <location filename="../mainwindow.cpp" line="438"/>
        <source>&amp;Paste Image File</source>
        <translation>粘贴图像文件(&amp;P)</translation>
    </message>
    <message>
-        <location filename="../mainwindow.cpp" line="429"/>
-        <location filename="../mainwindow.cpp" line="448"/>
+        <location filename="../mainwindow.cpp" line="443"/>
+        <location filename="../mainwindow.cpp" line="471"/>
        <source>Stay on top</source>
        <translation>总在最前</translation>
    </message>
    <message>
-        <location filename="../mainwindow.cpp" line="435"/>
-        <location filename="../mainwindow.cpp" line="449"/>
+        <location filename="../mainwindow.cpp" line="450"/>
+        <location filename="../mainwindow.cpp" line="472"/>
        <source>Protected mode</source>
        <translation>保护模式</translation>
    </message>
    <message>
-        <location filename="../mainwindow.cpp" line="441"/>
+        <location filename="../mainwindow.cpp" line="457"/>
+        <source>Configure...</source>
+        <translation>设置...</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="464"/>
        <source>Help</source>
        <translation>帮助</translation>
    </message>
    <message>
-        <location filename="../mainwindow.cpp" line="444"/>
+        <location filename="../mainwindow.cpp" line="467"/>
        <source>Launch application with image file path as argument to load the file.</source>
        <translation>以图片文件的路径作为参数运行程序即可直接打开图片文件。</translation>
    </message>
    <message>
-        <location filename="../mainwindow.cpp" line="445"/>
+        <location filename="../mainwindow.cpp" line="468"/>
        <source>Drag and drop image file onto the window is also supported.</source>
        <translation>也支持拖放图片文件到窗口内来加载图片。</translation>
    </message>
    <message>
-        <location filename="../mainwindow.cpp" line="447"/>
+        <location filename="../mainwindow.cpp" line="470"/>
        <source>Context menu option explanation:</source>
        <translation>菜单项说明：</translation>
    </message>
    <message>
-        <location filename="../mainwindow.cpp" line="448"/>
+        <location filename="../mainwindow.cpp" line="471"/>
        <source>Make window stay on top of all other windows.</source>
        <translation>使窗口始终至于其它非置顶窗口上方。</translation>
    </message>
    <message>
-        <location filename="../mainwindow.cpp" line="449"/>
+        <location filename="../mainwindow.cpp" line="472"/>
        <source>Avoid close window accidentally. (eg. by double clicking the window)</source>
        <translation>避免窗口意外关闭。（如：不小心双击了窗口触发了关闭窗口行为）</translation>
    </message>
 </context>
+<context>
+    <name>SettingsDialog</name>
+    <message>
+        <location filename="../settingsdialog.cpp" line="18"/>
+        <source>Do nothing</source>
+        <translation>什么也不做</translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.cpp" line="19"/>
+        <source>Close the window</source>
+        <translation>关闭窗口</translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.cpp" line="20"/>
+        <source>Toggle maximize</source>
+        <translation>最大化窗口</translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.cpp" line="28"/>
+        <source>Stay on top when start-up</source>
+        <translation>启动时保持窗口总在最前</translation>
+    </message>
+    <message>
+        <location filename="../settingsdialog.cpp" line="29"/>
+        <source>Double-click behavior</source>
+        <translation>双击时的行为</translation>
+    </message>
+</context>
 <context>
    <name>main</name>
    <message>
--- a/main.cpp
+++ b/main.cpp
@ -37,6 +37,14 @@ int main(int argc, char *argv[])
    QList<QUrl> urlList;
    for (const QString & str : urlStrList) {
        QUrl url = QUrl::fromLocalFile(str);
+#ifdef Q_OS_WIN
+        // TODO: remove this workaround when M$ change the "wsl$" hostname.
+        if (Q_UNLIKELY(str.startsWith(R"(\\wsl$\)"))) {
+            url.clear();
+            url.setScheme(QStringLiteral("qtbug-86277"));
+            url.setPath(str);
+        }
+#endif // Q_OS_WIN
        if (url.isValid()) {
            urlList.append(url);
        }
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@ -1,10 +1,12 @@
 #include "mainwindow.h"

+#include "settings.h"
 #include "toolbutton.h"
 #include "bottombuttongroup.h"
 #include "graphicsview.h"
 #include "navigatorview.h"
 #include "graphicsscene.h"
+#include "settingsdialog.h"

 #include <QMouseEvent>
 #include <QMovie>
@ -27,9 +29,14 @@
 MainWindow::MainWindow(QWidget *parent) :
    QMainWindow(parent)
 {
-    this->setWindowFlags(Qt::Window | Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint);
+    if (Settings::instance()->stayOnTop()) {
+        this->setWindowFlags(Qt::Window | Qt::FramelessWindowHint | Qt::WindowMinimizeButtonHint | Qt::WindowStaysOnTopHint);
+    } else {
+        this->setWindowFlags(Qt::Window | Qt::FramelessWindowHint | Qt::WindowMinimizeButtonHint);
+    }
+
    this->setAttribute(Qt::WA_TranslucentBackground, true);
-    this->setMinimumSize(710, 530);
+    this->setMinimumSize(350, 350);
    this->setWindowIcon(QIcon(":/icons/app-icon.svg"));
    this->setMouseTracking(true);

@ -101,13 +108,7 @@ MainWindow::MainWindow(QWidget *parent) :
    connect(m_bottomButtonGroup, &BottomButtonGroup::resetToOriginalBtnClicked,
            this, [ = ](){ m_graphicsView->resetScale(); });
    connect(m_bottomButtonGroup, &BottomButtonGroup::toggleWindowMaximum,
-            this, [ = ](){
-        if (isMaximized()) {
-            showNormal();
-        } else {
-            showMaximized();
-        }
-    });
+            this, &MainWindow::toggleMaximize);
    connect(m_bottomButtonGroup, &BottomButtonGroup::zoomInBtnClicked,
            this, [ = ](){ m_graphicsView->zoomView(1.25); });
    connect(m_bottomButtonGroup, &BottomButtonGroup::zoomOutBtnClicked,
@ -187,11 +188,11 @@ void MainWindow::adjustWindowSizeBySceneRect()
        QSize screenSize = qApp->screenAt(QCursor::pos())->availableSize();
        if (screenSize.expandedTo(sceneSize) == screenSize) {
            // we can show the picture by increase the window size.
-            if (screenSize.expandedTo(sceneSizeWithMargins) == screenSize) {
-                this->resize(sceneSizeWithMargins);
-            } else {
-                this->resize(screenSize);
-            }
+            QSize finalSize = (screenSize.expandedTo(sceneSizeWithMargins) == screenSize) ?
+                              sceneSizeWithMargins : screenSize;
+            // We have a very reasonable sizeHint() value ;P
+            this->resize(finalSize.expandedTo(this->sizeHint()));
+
            // We're sure the window can display the whole thing with 1:1 scale.
            // The old window size may cause fitInView call from resize() and the
            // above resize() call won't reset the scale back to 1:1, so we
@ -325,7 +326,7 @@ void MainWindow::mousePressEvent(QMouseEvent *event)

 void MainWindow::mouseMoveEvent(QMouseEvent *event)
 {
-    if (event->buttons() & Qt::LeftButton && m_clickedOnWindow) {
+    if (event->buttons() & Qt::LeftButton && m_clickedOnWindow && !isMaximized()) {
        move(event->globalPos() - m_oldMousePos);
        event->accept();
    }
@ -342,9 +343,22 @@ void MainWindow::mouseReleaseEvent(QMouseEvent *event)

 void MainWindow::mouseDoubleClickEvent(QMouseEvent *event)
 {
-    quitAppAction();
+    switch (Settings::instance()->doubleClickBehavior()) {
+    case ActionCloseWindow:
+        quitAppAction();
+        event->accept();
+        break;
+    case ActionMaximizeWindow:
+        toggleMaximize();
+        event->accept();
+        break;
+    case ActionDoNothing:
+        break;
+    }

-    return QMainWindow::mouseDoubleClickEvent(event);
+    // blumia: don't call parent constructor here, seems it will cause mouse move
+    //         event get called even if we set event->accept();
+    // return QMainWindow::mouseDoubleClickEvent(event);
 }

 void MainWindow::wheelEvent(QWheelEvent *event)
@ -432,12 +446,21 @@ void MainWindow::contextMenuEvent(QContextMenuEvent *event)
    });
    stayOnTopMode->setCheckable(true);
    stayOnTopMode->setChecked(stayOnTop());
+
    QAction * protectedMode = new QAction(tr("Protected mode"));
    connect(protectedMode, &QAction::triggered, this, [ = ](){
        toggleProtectedMode();
    });
    protectedMode->setCheckable(true);
    protectedMode->setChecked(m_protectedMode);
+
+    QAction * toggleSettings = new QAction(tr("Configure..."));
+    connect(toggleSettings, &QAction::triggered, this, [ = ](){
+        SettingsDialog * sd = new SettingsDialog(this);
+        sd->exec();
+        sd->deleteLater();
+    });
+
    QAction * helpAction = new QAction(tr("Help"));
    connect(helpAction, &QAction::triggered, this, [ = ](){
        QStringList sl {
@ -465,6 +488,7 @@ void MainWindow::contextMenuEvent(QContextMenuEvent *event)
    menu->addAction(stayOnTopMode);
    menu->addAction(protectedMode);
    menu->addSeparator();
+    menu->addAction(toggleSettings);
    menu->addAction(helpAction);
    menu->exec(mapToGlobal(event->pos()));
    menu->deleteLater();
@ -559,6 +583,11 @@ bool MainWindow::nativeEvent(const QByteArray &eventType, void *message, long *r
 #endif // _WIN32
 }

+QSize MainWindow::sizeHint() const
+{
+    return QSize(710, 530);
+}
+
 void MainWindow::centerWindow()
 {
    this->setGeometry(
@ -626,3 +655,12 @@ void MainWindow::toggleFullscreen()
        showFullScreen();
    }
 }
+
+void MainWindow::toggleMaximize()
+{
+    if (isMaximized()) {
+        showNormal();
+    } else {
+        showMaximized();
+    }
+}
--- a/mainwindow.h
+++ b/mainwindow.h
@ -50,6 +50,8 @@ protected slots:

    bool nativeEvent(const QByteArray& eventType, void* message, long* result) override;

+    QSize sizeHint() const override;
+
    void centerWindow();
    void closeWindow();
    void updateWidgetsPosition();
@ -58,6 +60,7 @@ protected slots:
    bool stayOnTop();
    void quitAppAction(bool force = false);
    void toggleFullscreen();
+    void toggleMaximize();

 private:
    QPoint m_oldMousePos;
--- a/pineapple-pictures.desktop
+++ b/pineapple-pictures.desktop
@ -1,12 +1,15 @@
 [Desktop Entry]
 Categories=Graphics;
-Comment=Pineapple Pictures Image Viewer.
+Comment=Pineapple Pictures is a lightweight image viewer
+Comment[zh_CN]=菠萝看图是一个轻量级的图像查看器
 Exec=ppic %F
-GenericName=Pictures
+GenericName=Image Viewer
+GenericName[zh_CN]=图像查看器
 Icon=pineapple-pictures
 Keywords=Picture;Image;Viewer;Jpg;Jpeg;Png;
 MimeType=image/bmp;image/bmp24;image/jpg;image/jpe;image/jpeg;image/jpeg24;image/jng;image/pcd;image/pcx;image/png;image/tif;image/tiff;image/tiff24;image/dds;image/gif;image/sgi;image/j2k;image/jp2;image/pct;image/wdp;image/arw;image/icb;image/dng;image/vda;image/vst;image/svg;image/ptif;image/mef;image/xbm;image/svg+xml;
 Name=Pineapple Pictures
+Name[zh_CN]=菠萝看图
 StartupNotify=false
 Type=Application
 Terminal=false
--- a/settings.cpp
+++ b/settings.cpp
@ -0,0 +1,86 @@
+#include "settings.h"
+
+#include <QApplication>
+#include <QStandardPaths>
+#include <QDebug>
+#include <QDir>
+
+Settings *Settings::m_settings_instance = nullptr;
+
+Settings *Settings::instance()
+{
+    if (!m_settings_instance) {
+        m_settings_instance = new Settings;
+    }
+
+    return m_settings_instance;
+}
+
+bool Settings::stayOnTop()
+{
+    return m_qsettings->value("stay_on_top", true).toBool();
+}
+
+DoubleClickBehavior Settings::doubleClickBehavior()
+{
+    QString result = m_qsettings->value("double_click_behavior", "close").toString().toLower();
+
+    return stringToDoubleClickBehavior(result);
+}
+
+void Settings::setStayOnTop(bool on)
+{
+    m_qsettings->setValue("stay_on_top", on);
+    m_qsettings->sync();
+}
+
+void Settings::setDoubleClickBehavior(DoubleClickBehavior dcb)
+{
+    m_qsettings->setValue("double_click_behavior", doubleClickBehaviorToString(dcb));
+    m_qsettings->sync();
+}
+
+QString Settings::doubleClickBehaviorToString(DoubleClickBehavior dcb)
+{
+    static QMap<DoubleClickBehavior, QString> _map {
+        {ActionCloseWindow, "close"},
+        {ActionMaximizeWindow, "maximize"},
+        {ActionDoNothing, "ignore"}
+    };
+
+    return _map.value(dcb, "close");
+}
+
+DoubleClickBehavior Settings::stringToDoubleClickBehavior(QString str)
+{
+    static QMap<QString, DoubleClickBehavior> _map {
+        {"close", ActionCloseWindow},
+        {"maximize", ActionMaximizeWindow},
+        {"ignore", ActionDoNothing}
+    };
+
+    return _map.value(str, ActionCloseWindow);
+}
+
+Settings::Settings()
+    : QObject(qApp)
+{
+    QString configPath;
+
+#ifdef FLAG_PORTABLE_MODE_SUPPORT
+    QString portableConfigDirPath = QDir(QCoreApplication::applicationDirPath()).absoluteFilePath("data");
+    QFileInfo portableConfigDirInfo(portableConfigDirPath);
+    if (portableConfigDirInfo.exists() && portableConfigDirInfo.isDir() && portableConfigDirInfo.isWritable()) {
+        // we can use it.
+        configPath = portableConfigDirPath;
+    }
+#endif // FLAG_PORTABLE_MODE_SUPPORT
+
+    // %LOCALAPPDATA% under Windows.
+    if (configPath.isEmpty()) {
+        configPath = QStandardPaths::writableLocation(QStandardPaths::ConfigLocation);
+    }
+
+    m_qsettings = new QSettings(QDir(configPath).absoluteFilePath("config.ini"), QSettings::IniFormat, this);
+}
+
--- a/settings.h
+++ b/settings.h
@ -0,0 +1,41 @@
+#pragma once
+
+#include <QObject>
+#include <QSettings>
+
+enum DoubleClickBehavior {
+    ActionDoNothing,
+    ActionCloseWindow,
+    ActionMaximizeWindow,
+
+    ActionStart = ActionDoNothing,
+    ActionEnd = ActionMaximizeWindow
+};
+
+class Settings : public QObject
+{
+    Q_OBJECT
+public:
+    static Settings *instance();
+
+    bool stayOnTop();
+    DoubleClickBehavior doubleClickBehavior();
+
+    void setStayOnTop(bool on);
+    void setDoubleClickBehavior(DoubleClickBehavior dcb);
+
+    static QString doubleClickBehaviorToString(DoubleClickBehavior dcb);
+    static DoubleClickBehavior stringToDoubleClickBehavior(QString str);
+
+private:
+    Settings();
+
+    static Settings *m_settings_instance;
+
+    QSettings *m_qsettings;
+
+signals:
+
+public slots:
+};
+
--- a/settingsdialog.cpp
+++ b/settingsdialog.cpp
@ -0,0 +1,51 @@
+#include "settingsdialog.h"
+
+#include "settings.h"
+
+#include <QCheckBox>
+#include <QComboBox>
+#include <QFormLayout>
+#include <QStringListModel>
+
+SettingsDialog::SettingsDialog(QWidget *parent)
+    : QDialog(parent)
+    , m_stayOnTop(new QCheckBox)
+    , m_doubleClickBehavior(new QComboBox)
+{
+    QFormLayout * settingsForm = new QFormLayout(this);
+
+    static QMap<DoubleClickBehavior, QString> _map {
+        { ActionDoNothing, tr("Do nothing") },
+        { ActionCloseWindow, tr("Close the window") },
+        { ActionMaximizeWindow, tr("Toggle maximize") }
+    };
+
+    QStringList dropDown;
+    for (int dcb = ActionStart; dcb <= ActionEnd; dcb++) {
+        dropDown.append(_map.value(static_cast<DoubleClickBehavior>(dcb)));
+    }
+
+    settingsForm->addRow(tr("Stay on top when start-up"), m_stayOnTop);
+    settingsForm->addRow(tr("Double-click behavior"), m_doubleClickBehavior);
+
+    m_stayOnTop->setChecked(Settings::instance()->stayOnTop());
+    m_doubleClickBehavior->setModel(new QStringListModel(dropDown));
+    DoubleClickBehavior dcb = Settings::instance()->doubleClickBehavior();
+    m_doubleClickBehavior->setCurrentIndex(static_cast<int>(dcb));
+
+    connect(m_stayOnTop, &QCheckBox::stateChanged, this, [ = ](int state){
+        Settings::instance()->setStayOnTop(state == Qt::Checked);
+    });
+
+    connect(m_doubleClickBehavior, QOverload<int>::of(&QComboBox::currentIndexChanged), this, [ = ](int index){
+        Settings::instance()->setDoubleClickBehavior(static_cast<DoubleClickBehavior>(index));
+    });
+
+    this->setMinimumSize(300, 61); // not sure why it complain "Unable to set geometry"
+    setWindowFlag(Qt::WindowContextHelpButtonHint, false);
+}
+
+SettingsDialog::~SettingsDialog()
+{
+
+}
--- a/settingsdialog.h
+++ b/settingsdialog.h
@ -0,0 +1,26 @@
+#ifndef SETTINGSDIALOG_H
+#define SETTINGSDIALOG_H
+
+#include <QObject>
+#include <QWidget>
+#include <QDialog>
+
+class QCheckBox;
+class QComboBox;
+class SettingsDialog : public QDialog
+{
+    Q_OBJECT
+public:
+    explicit SettingsDialog(QWidget *parent = nullptr);
+    ~SettingsDialog();
+
+signals:
+
+public slots:
+
+private:
+    QCheckBox * m_stayOnTop = nullptr;
+    QComboBox * m_doubleClickBehavior = nullptr;
+};
+
+#endif // SETTINGSDIALOG_H
Author	SHA1	Message	Date
Gary Wang	9f67be61fb	fix: cannot load images under WSL2 network location workaround resolve GH-7	2020-08-28 15:25:07 +08:00
Gary Wang	761f5e064c	feat(i18n): add zh_CN translation for .desktop file	2020-08-26 19:06:41 +08:00
Gary Wang	84e100c174	Update README.md	2020-08-23 23:46:12 +08:00
Gary Wang	d64e9cf276	build(ci): deb package for ubuntu 20.04	2020-08-13 19:45:38 +08:00
Gary Wang	dc82115e1f	fix: don't show what's this button from setting dialog.	2020-08-11 09:08:31 +08:00
Gary Wang	3b94eecde2	chore: only enable portable mode support for windows	2020-08-10 23:41:59 +08:00
Felix Yan	f3b3ad7b8a	Correct a typo in PineapplePictures.pro	2020-08-06 19:40:44 +08:00
Gary Wang	1a511ddb02	CI: for windows build, also copy LICENSE file to binary dir	2020-08-04 19:15:10 +08:00
Gary Wang	1cb67b48f4	fix: cannot minimize window by clicking taskbar icon	2020-08-04 19:10:02 +08:00
Gary Wang	90d0869b5e	doc: prepare for repo url change	2020-07-29 13:26:54 +08:00
Gary Wang	7004e74165	i18n: update translations for new strings	2020-07-29 13:23:31 +08:00
Gary Wang	a2adb0e1d4	feat: simple config dialog	2020-07-29 00:57:43 +08:00
Gary Wang	6709c21d70	config file support	2020-07-28 21:29:37 +08:00
Gary Wang	31fae2cc8c	misc: lower minimum window size limit	2020-07-27 20:47:54 +08:00