Commit graph

5286 commits

Author SHA1 Message Date
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
Xiao YiFang 3b96b468a9 add zh_CN translation 2022-11-18 19:57:20 +08:00
Igor Kushnir 3aaaf15e0a Save&restore the geometry of Print Preview dialog
Calling dialog.showMaximized() before dialog.exec() doesn't work as
intended under KDE Plasma and Xfce. In both desktop environments the
Print Preview dialog ends up modeless - the user can interact with the
main window while the dialog is visible. Such a behavior is surprising
to developers, because QDialog::exec() should show the dialog as modal.
In addition, under Xfce the dialog is not maximized, but very small and
also frameless => neither movable nor resizable.

b13b808edf inserted the line
`dialog.showMaximized();` to work around tiny print preview window,
which confirms that the side effects described above are unintentional.

These maximizing issues could be fixed by passing
Qt::CustomizeWindowHint | Qt::WindowMaximizeButtonHint | Qt::WindowCloseButtonHint
as window flags to QPrintPreviewDialog's constructor and replacing the
line `dialog.showMaximized();` with
`dialog.setWindowState( dialog.windowState() | Qt::WindowMaximized );`.
However, saving and restoring the dialog's geometry allows customization
and thus improves usability. This is how more frequently used dialogs
behave in GoldenDict.

Customize the dialog's window flags to show a maximize button.
Maximizing could be useful on a small screen. This also makes restoring
the old appearance on systems, where it worked correctly, easy to the
user: maximize the dialog once and it appears maximized henceforth
(until the user unmaximizes it back). Use the same window flags as in
EditDictionaries dialog - I haven't noticed any complaints since they
were introduced more than a year ago.
2022-11-17 18:36:58 +03:00
shenleban tongying 8d3b4165da Add "copy info" buttons to about dialog 2022-11-17 05:14:18 -05:00
xiaoyifang 4f10a55f95
Merge pull request #204 from xiaoyifang/fix/issue203
fix revert c5035d87fc  conflict
2022-11-17 17:22:58 +08:00
xiaoyifang ea21eba386 fix revert c5035d87fc conflict
related to the issue #203
2022-11-17 16:43:42 +08:00
xiaoyifang df91a5b7bd add spx extenstion to the QFileDialog save path 2022-11-17 14:09:11 +08:00
Igor Kushnir 83d71daf03 Don't reset FTS Ignore* options on Preferences change
Accepting changes in Preferences dialog no longer disables two options
"Ignore words order" and "Ignore diacritics", which are configurable in
Full-text search dialog.
2022-11-16 18:51:26 +03:00
Igor Kushnir c087d60165 Set article background to white while printing
cb6b00d85e set .gdarticle background to
`#fefdeb` in article-style.css, but failed to override it in
article-style-print.css.

Set html background to white as well in order to prevent a thin border
around articles' contents if non-printing article styles set html
background to a color other than white.

Printing color background makes little sense and is wasteful. Users who
prefer the old behavior can override the background color in
<Configuration Folder>/article-style-print.css.

Use `background` rather than `background-color` CSS property in order to
overwrite any background image set by non-printing article styles.
2022-11-16 18:51:01 +03:00
Xiao YiFang 67485fd875 [action] enable macos homebrew action 2022-11-16 21:10:45 +08:00
Xiao YiFang 13b7e7cba9 Merge branch 'staged' into dev 2022-11-16 21:09:44 +08:00
Xiao YiFang 66ec6b6d63 fix: mdx headword total count is incorrect 2022-11-16 21:09:30 +08:00
xiaoyifang 7215a34dd9
Merge pull request #192 from xiaoyifang/feature/homebrew-ffmpeg
github action: homebrew ffmpeg
2022-11-15 21:15:00 +08:00
Xiao YiFang 12acff095c ffmpeg convert the the audio to raw format 2022-11-15 21:14:34 +08:00
Xiao YiFang edea394892 [macos] add speex support 2022-11-15 21:14:34 +08:00
Xiao YiFang 6c72f650fe Merge remote-tracking branch 'gd/master' into staged 2022-11-15 20:02:24 +08:00
Xiao YiFang 4927f9a56e Merge commit 'f708c50' into staged 2022-11-15 20:02:20 +08:00
Igor Kushnir 5e8cab6d54 Show translateBoxWidget automatically when Words Zoom level decreases
When Search Pane is hidden, Words Zoom level is large and GoldenDict
main window's width is small, translateBoxWidget does not fit into the
toolbar and is hidden behind the toolbar extension button » on the right
side. Reducing Words Zoom level does not automatically make
translateBoxWidget visible until the user presses the toolbar extension
button or types text to be translated.

I haven't noticed any effect of the existing line of code that activates
groupList parent widget's layout whether Search Pane is visible or
hidden. This line was introduced in the commit that implemented
TranslateBox - da13998518. In this initial
implementation navToolbar was the parent of groupList, and
translateBoxWidget did not yet exist. I think that the introduction of
translateBoxWidget in 404a16442b obsoleted
this line of code, and so remove it here.

I have verified that this fix works as intended in the Qt 4 and the Qt 5
version both under KDE Plasma and Xfce.
2022-11-14 19:56:29 +02:00
Igor Kushnir f708c5068c Qt5: give focus to article view after last tab is closed
When the last tab is closed while the article view in it has focus,
Results Navigation Pane acquires focus in the Qt 4 version. This is OK,
because typed text is sent to the translate line and all shortcuts work.
In the Qt 5 version, depending on the value of the "Hide single tab"
option, either no widget has focus or the tab bar acquires focus in this
situation. This leads to issues described in the added comment.
2022-11-12 14:10:06 +03:00
xiaoyifang bf22c9c77c
Merge pull request #191 from xiaoyifang/feature/remove-libao
feature: remove libao dependency and use QAudioSink(QAudioOutput) to …
2022-11-12 17:27:44 +08:00
Xiao YiFang f37e2862ce remove commented line 2022-11-12 17:27:16 +08:00
Xiao YiFang 42fd3a749d add file reference link 2022-11-12 17:26:10 +08:00
Xiao YiFang c4c6ff8376 ffmpeg depends on multimedia 2022-11-12 17:03:20 +08:00
xiaoyifang 589e664fc2
Merge pull request #199 from xiaoyifang/feature/custome-macos
add script to build ffmpeg
2022-11-12 14:11:29 +08:00
Xiao YiFang 1b9faf70f5 add ffmpeg build 2022-11-12 13:57:23 +08:00
Xiao YiFang f1468a5af4 feature: add support to import txt format file to favorite pannel
fix #198
2022-11-12 12:31:03 +08:00
Xiao YiFang 1bfc5abf6c github: remove libao and install ffmpeg with speex 2022-11-12 09:34:09 +08:00
Xiao YiFang 16bc832a20 remove mac and windows dependency of libao 2022-11-12 09:34:09 +08:00
Xiao YiFang 85aad0f80c feature: remove libao dependency and use QAudioSink(QAudioOutput) to play the pcm audio format 2022-11-12 09:34:09 +08:00
Xiao YiFang bba4b8ef23 Merge branch 'staged' into dev 2022-11-12 09:32:19 +08:00
Xiao YiFang e3d904f8b8 Merge branch 'staged' of github.com:xiaoyifang/goldendict into staged 2022-11-12 09:22:06 +08:00
Xiao YiFang 1554d026c5 fix: crash on headword dialog lookup
when the headword count is too small ,the application will crash .
2022-11-12 09:16:10 +08:00
xiaoyifang 5230d254a8
Merge pull request #196 from xiaoyifang/gd-master
sync upstream
2022-11-06 12:03:19 +08:00
Xiao YiFang 570949b9f9 fix conflict with upstream as codebase has changed a lot 2022-11-06 10:09:09 +08:00
Xiao YiFang f6ae13cd87 Merge remote-tracking branch 'gd/master' into gd-master 2022-11-06 10:06:05 +08:00
Xiao YiFang f33743b448 Merge commit 'fdcd6a37' into gd-master 2022-11-06 10:05:49 +08:00
Igor Kushnir 5f96f1f26e Linux-specific: don't force X11 focus unnecessarily
Focus is already transferred to GoldenDict in toggleMainWindow() only
the first time the main window is shown. At all subsequent requests to
show the main window, focus has to be forced with the workaround.
Checking focus asynchronously allows to resort to the workaround less
often.

Under Xfce: the timeout of 0 ms is almost always sufficient in the Qt 5
version, but is never enough in the Qt 4 version. The timeout of 4 ms is
always sufficient in both versions.

Under KDE Plasma: the timeout of 0 ms is rarely sufficient in the Qt 5
version. Unfortunately, with any timeout other than 0 ms, the Qt 5
version does not always get focus, which would be a serious regression,
so no other timeout can be used. The Qt 4 version does not always get
focus both with and without the timeout.
2022-11-05 22:03:51 +03:00
Igor Kushnir a321593ed1 Linux-specific: check correct X11 window ID
translateLine->internalWinId() always equals 0. When the show/hide main
window hotkey is triggered right after GoldenDict starts to system tray,
`wh` equals MainWindow::internalWinId(). A few more experiments confirm
that XGetInputFocus()'s output parameter `focus_return` is an ID of a
top-level window, not of an embedded widget child.
2022-11-05 22:03:51 +03:00