Commit graph

3973 commits

Author SHA1 Message Date
xiaoyifang e38532bb60 [github] windows xapian workflow 2022-11-23 10:58:26 +08:00
xiaoyifang 89c84421c4 Merge branch 'staged' 2022-11-23 09:16:54 +08:00
xiaoyifang aa9ed9bc38 fix:zim regression
image can not displayed
2022-11-22 22:12:55 +08:00
Xiao YiFang a2e258b367 bump release version to 22.11.22 LightSnow 2022-11-21 20:26:01 +08:00
Xiao YiFang c1964fc61a fix conflict 2022-11-21 20:24:10 +08:00
Xiao YiFang b2c534eef5 Merge branch 'staged' into dev 2022-11-21 20:15:34 +08:00
Xiao YiFang 4a129005df [github] add both qt6.3.2&qt6.4.1 2022-11-21 20:14:02 +08:00
Xiao YiFang 520345dadc fix a regression caused by commit f730a4aabc
fixed: #210
2022-11-21 20:03:04 +08:00
xiaoyifang 9f7f6169cf
Merge pull request #215 from shenlebantongying/fix-popup
Marketing Overhaul README.md
2022-11-21 17:14:34 +08:00
shenleban tongying 4b4175574b Overhaul README.md 2022-11-21 02:51:39 -05:00
xiaoyifang 9f65f3c1f8
Merge pull request #214 from shenlebantongying/fix-popup
Fix translations accidentally installed at /local
2022-11-21 14:17:31 +08:00
shenlebantongying f5e1ae54c8 Add translations /local/ to mac build 2022-11-21 00:50:15 -05:00
shenleban tongying f22769c73b Fix translations accidentally install at /local 2022-11-21 00:14:53 -05:00
Xiao YiFang 6b8300c01f Merge branch 'staged' into dev 2022-11-20 20:00:46 +08:00
xiaoyifang 75a83b0f81
Merge pull request #207 from shenlebantongying/fix-popup
Overhaul ScanPopup
2022-11-20 19:42:23 +08:00
shenleban tongying 664a1e87e4 Remove ScanPopup Alt mode ("Keys may also be pressed afterwards").
The functionality of "select then press a key to get popup " has equivalent of using Ctrl+C+C on Hotkeys.
2022-11-20 04:12:58 -05:00
shenlebantongying 451fdb5c21 Fix win build with HAVE_X11 2022-11-20 01:51:23 -05:00
shenleban tongying 6e0a6cfa42 refactor & simplify ScanFlag:
All slots of ScanFlag are used just as functions calls.
2022-11-20 01:19:27 -05:00
shenleban tongying 79f8b05d40 Add showScanFlag condition to mainWindow's clipboardChange 2022-11-20 00:39:41 -05:00
shenleban tongying c2cc848cc7 remove forcePopup from showScanFlag signal
That flag isn't use in any of the slots
2022-11-20 00:14:36 -05:00
shenleban tongying 4dc040f11c Remove clipboardChanged connect in scanpopup.cc blindly 2022-11-20 00:02:12 -05:00
shenlebantongying e0c193bcb6 Let scanPopup always constructed
Before: Construst Scanpopup only when both enableClipboardHotkey and enableScanPopup are true

Now: Always construct ScanPopup so that users can freely enable Copy->ScanPopup through navbar or tray
2022-11-19 22:35:06 -05:00
shenlebantongying 8232bc208d scan popup: Fix windows build 2022-11-19 21:54:22 -05:00
shenleban tongying 0d186dc33d fix: modifier keys should only affect Selection 2022-11-19 21:15:23 -05:00
shenleban tongying 06a296c99f Put conditions on the ClipboardChange for X11 2022-11-19 13:48:26 -05:00
shenleban tongying e6b9810cc7 Group Selection related Settings together 2022-11-19 12:28:11 -05:00
shenleban tongying a4359bef3c Only process clipboard change when scanning enabled 2022-11-19 12:08:57 -05:00
shenleban tongying 20b435053f X11: Add two Preferences to optional tracking clipboard or selection tracking 2022-11-19 11:35:25 -05:00
shenleban tongying 9d9ad3ecc9 rename enableScanPopupAction to enableScanningAction which now governs both popup and sendToMainWindow kinds of scanning 2022-11-19 10:40:57 -05:00
shenleban tongying b3b740854a Unify trackClipboardChanges and enableScanPopupAction
* There is no difference between those two on Windows and MacOS which only support clipboard (Ctrl+C) scanning

* Q_WS_X11 was defined on Qt4, and it causes the super weird trackClipboardChanges to occur on Windows
2022-11-19 10:30:31 -05:00
shenleban tongying aa3778bb64 Remove enableScanPopup: Complete. Remove from config file and ui file
At here, all code working exactly same as before
The only change is that ScanPopup always enabled for all users
2022-11-19 09:50:20 -05:00
shenleban tongying eb5806503a Remove enableScanPopup: Respect navBar toggling more
* Always construct Scan Popup object regardless of the setting
2022-11-19 09:30:58 -05:00
shenleban tongying edbc4d32cd Remove enableScanPopup: Let Scan popup's 💡 on navBar always visible 2022-11-19 09:25:53 -05:00
shenleban tongying 92bdec7119 Rename QAction * enableScanPopup
There is a var named exactly the same used in the same file!
2022-11-19 09:04:04 -05:00
Xiao YiFang dc29111e88 [win] remove multimedia plugin manual copy. qt6.4.1 has fixed this qt6.4.0 bug 2022-11-19 20:19:47 +08:00
Xiao YiFang 2b614d53ee [mac] add ffmpeg build script 2022-11-19 20:14:45 +08:00
Xiao YiFang aec6cf7c5a add zh_CN translation of About dialog 2022-11-19 19:31:10 +08:00
Xiao YiFang 1f390b8754 Merge branch 'staged' into dev 2022-11-19 19:16:08 +08:00
xiaoyifang 892dab0410
Merge pull request #205 from shenlebantongying/staged
Add two basic "copy info" buttons to about dialog for easier bug reporting
2022-11-19 18:53:37 +08:00
shenleban tongying c08d584233 About copy version info: fix styles 2022-11-19 05:17:34 -05:00
xiaoyifang 276056c9e1
Merge pull request #206 from xiaoyifang/fix/zim
fix: zim dictionary auto refresh logic
2022-11-19 17:46:46 +08:00
Xiao YiFang c75c9cc74b zim: move regex to globalregex 2022-11-19 16:39:41 +08:00
Xiao YiFang 9f6ed1eec2 zim img src link replace regex changes 2022-11-19 16:23:43 +08:00
shenlebantongying b7e1648356
Merge branch 'xiaoyifang:staged' into staged 2022-11-19 03:20:16 -05:00
Xiao YiFang f730a4aabc fix: zim dictionary auto refresh logic
fix <meta http-equiv="Refresh"
2022-11-19 15:23:22 +08:00
Xiao YiFang 3b05f3b4e9 fix scanpopup dialog popup condition check 2022-11-19 14:52:20 +08:00
Xiao YiFang b02b6f9bcb [action] bump qt version from 6.3.2 to 6.4.1 2022-11-18 20:28:26 +08:00
Xiao YiFang 0d2e2bb6a3 Merge remote-tracking branch 'gd/master' into staged 2022-11-18 20:23:43 +08:00
Xiao YiFang 3653b616cf Merge commit '83d71daf03e468f784e41e834dc32c67fe2a5870' into staged 2022-11-18 20:23:32 +08:00
Xiao YiFang cdc0fe07e0 fix: forvo has no free plan now fix the apikey tooltip
in order to use forvo pronounciation ,an api key has to be aquired.
2022-11-18 20:13:24 +08:00