fix scroll bar in zoom; show version in title

xinntao · Jul 27, 2022 · a1d0361 · a1d0361
1 parent db25a60
commit a1d0361
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -4,6 +4,8 @@
 
 ## <div align="center"><b><a href="README.md">English</a> | <a href="README_CN.md">简体中文</a></b></div>
 
+<div align="center">
+
 [![download](https://img.shields.io/github/downloads/xinntao/HandyView/total)](https://github.com/xinntao/HandyView/releases)
 ![visitors](https://visitor-badge.glitch.me/badge?page_id=xinntao/HandyView)
 [![PyPI](https://img.shields.io/pypi/v/handyview)](https://pypi.org/project/handyview/)
@@ -12,9 +14,11 @@
 [![Publish-pip](https://github.com/xinntao/HandyView/actions/workflows/publish-pip.yml/badge.svg)](https://github.com/xinntao/HandyView/blob/master/.github/workflows/publish-pip.yml)
 [![Release](https://github.com/xinntao/HandyView/actions/workflows/release.yml/badge.svg)](https://github.com/xinntao/HandyView/blob/master/.github/workflows/release.yml)
 
+ </div>
+
 <div align="center">
 
-  ⏬[**Executable files**](https://github.com/xinntao/HandyView/releases) **|** 🔧[**Usage**](#-Usage)
+  🔻[**Executable files**](https://github.com/xinntao/HandyView/releases) **|** 🔧[**Usage**](#-Usage)
  </div>
 
 HandyView is a **handy image viewer** for convenient viewing and comparing. It is developed with PyQt5.

diff --git a/README_CN.md b/README_CN.md
@@ -4,6 +4,8 @@
 
 ## <div align="center"><b><a href="README.md">English</a> | <a href="README_CN.md">简体中文</a></b></div>
 
+<div align="center">
+
 [![download](https://img.shields.io/github/downloads/xinntao/HandyView/total)](https://github.com/xinntao/HandyView/releases)
 ![visitors](https://visitor-badge.glitch.me/badge?page_id=xinntao/HandyView)
 [![PyPI](https://img.shields.io/pypi/v/handyview)](https://pypi.org/project/handyview/)
@@ -12,10 +14,12 @@
 [![Publish-pip](https://github.com/xinntao/HandyView/actions/workflows/publish-pip.yml/badge.svg)](https://github.com/xinntao/HandyView/blob/master/.github/workflows/publish-pip.yml)
 [![Release](https://github.com/xinntao/HandyView/actions/workflows/release.yml/badge.svg)](https://github.com/xinntao/HandyView/blob/master/.github/workflows/release.yml)
 
+</div>
+
 <div align="center">
 
-  ⏬[**下载安装文件**](https://github.com/xinntao/HandyView/releases) **|** 🔧[**用法**](#-使用)
- </div>
+  🔻[**下载安装文件**](https://github.com/xinntao/HandyView/releases) **|** 🔧[**用法**](#-使用)
+
 
 HandyView 是一款基于 PyQt5 开发的方便的图像查看和比对工具
 

diff --git a/handyview/handyviewer.py b/handyview/handyviewer.py
@@ -88,7 +88,10 @@ def __init__(self, init_path=None):
         self.center_canvas = CenterWidget(self, self.hvdb)
 
         # initialize UI
-        self.setWindowTitle('HandyView')
+        # read version from file
+        with open(os.path.join(ROOT_DIR, 'VERSION')) as f:
+            title = 'HandyView @ V' + f.readline().strip()
+        self.setWindowTitle(title)
         self.init_menubar()
         self.init_toolbar()
         # self.init_statusbar()

diff --git a/handyview/view_scene.py b/handyview/view_scene.py
@@ -191,6 +191,10 @@ def zoom_in(self, scale=1.05, emit_signal=False):
             self.parent.zoom_label.setText(f'Zoom: {self.zoom:.2f}')
         self.set_transform()
 
+        # update the scroller bar values when zoom in/out
+        self.vertical_scroll_value = self.verticalScrollBar().value()
+        self.horizontal_scroll_value = self.horizontalScrollBar().value()
+
     def zoom_out(self, scale=1.05, emit_signal=False):
         self.zoom /= scale
         if emit_signal:
@@ -199,6 +203,10 @@ def zoom_out(self, scale=1.05, emit_signal=False):
             self.parent.zoom_label.setText(f'Zoom: {self.zoom:.2f}')
         self.set_transform()
 
+        # update the scroller bar values when zoom in/out
+        self.vertical_scroll_value = self.verticalScrollBar().value()
+        self.horizontal_scroll_value = self.horizontalScrollBar().value()
+
     def set_zoom(self, ratio):
         self.zoom = ratio
         if self.show_info:

diff --git a/pyinstaller_install_mac.sh b/pyinstaller_install_mac.sh
@@ -3,6 +3,7 @@ pyinstaller -D handyview/handyviewer.py \
   --add-data="handyview:handyview" \
   --add-data="icons:icons" \
   --add-data="icon.png:." \
+  --add-data="VERSION:." \
   --windowed \
   --noconfirm \
   --hidden-import="PIL.Image" \

diff --git a/pyinstaller_install_win.sh b/pyinstaller_install_win.sh
@@ -4,6 +4,7 @@ pyinstaller -D handyview/handyviewer.py \
   --add-data="icons;icons" \
   --add-data="icon.png;." \
   --add-data="icon.ico;." \
+  --add-data="VERSION;." \
   --windowed \
   --noconfirm \
   --hidden-import="PIL.Image" \