Commit graph

113 commits

Author SHA1 Message Date
xiaoyifang d2257ce061 Merge remote-tracking branch 'remotes/origin/master' into branch-qt-5.15
# Conflicts:
#	articleview.cc
2021-09-24 14:08:26 +08:00
yifang e5c72f8ecc change to setcontent 2021-08-21 09:41:40 +08:00
yifang b1c4159a3d change function declarition 2021-08-15 11:05:38 +08:00
xiaoyifang eddfa075bd connect reply content to article view 2021-08-14 15:25:10 +08:00
xiaoyifang 3aadf52344 webkit to webengine 2021-07-15 22:58:32 +08:00
Igor Kushnir f919685797 Extract duplicated "gdfrom-" string manipulation into functions
Such helper functions facilitate understanding of the code and simplify
implementing new features.
2021-06-29 13:31:09 +03:00
Igor Kushnir 60bc05218f Add input phrase's punctuation suffix to alts
Preferences::sanitizeInputPhrase() transforms an input phrase by
removing its whitespace/punctuation prefix and suffix. Translating a
phrase from X11 primary selection or from clipboard, via mouse-over or
from the command line results in such sanitization. This is useful when
a punctuation mark or a space is selected accidentally alongside a word.
This sanitization can be undesirable, however, when an abbreviated word
is selected. For example: "etc.", "e.g.", "i.e.".

This commit implements searching for the input word with the punctuation
suffix preserved as an alternative form of the sanitized word to show
articles for both. For example, when the word "etc." is translated from
the clipboard, both "ETC" and "etc." articles are displayed.

The punctuation suffix is preserved when the word is passed from the
scan popup to the main window and when the translate line text is
refreshed (e.g. when the current group is changed). The suffix is not
stored in history and favorites (doing so would require file format
changes and possibly substantial code changes, this can be implemented
later if need be).

Trim the input phrase once in ArticleNetworkAccessManager::getResource()
instead of verbose trimming in multiple places in
ArticleMaker::makeDefinitionFor().

Closes #1350.
2021-06-17 12:06:36 +03:00
Igor Kushnir 3bf7aad1f7 Add a shortcut to focus scan popup's article view
The article view focus is necessary to navigate a word definition via
keyboard rather than mouse. The shortcut - Ctrl+N - is the same as
the one in the main window for the corresponding action.
2018-05-16 14:54:20 +03:00
Abs62 5fa5cc123f Full-text search: Allow ignore diacritics while search 2018-04-10 17:49:52 +03:00
Igor Kushnir e5045860ef Make adding new audio player implementations easy
* add a new interface class AudioPlayerInterface;
* inherit a new proxy class Ffmpeg::AudioPlayer from it;
* partially switch ArlticleView to using the interface;
* expose MainWindow's AudioPlayerInterface instance to all ArticleView
  instances;
* add a new AudioPlayerFactory class responsible for creating instances
  of concrete classes derived from AudioPlayerInterface depending on
  relevant Config::Preferences values;
* increase minimum supported Qt version from 4.5 to 4.6 in README
  in order to use QScopedPointer introduced in Qt 4.6.
2018-03-24 21:31:48 +02:00
Abs62 747dc0aaaf Refactor resource downloading 2017-04-28 00:13:25 +03:00
Abs62 2085314eb9 1. Don't show "failed to download" error message while saving resources like "gdau://search/..."
2. Stop search if resource is found
2017-04-27 18:04:26 +03:00
Abs62 9511494c2b Send image to external viewer by double click 2017-03-13 17:38:27 +03:00
Abs62 10532279b1 Merge branch 'Original' into Qt4x5
Conflicts:
	article_netmgr.cc
	mainwindow.cc
2014-04-23 18:16:06 +04:00
Abs62 503650d617 Full-text search: Set group for ArticleView::showDefinition() when view article 2014-04-23 00:08:21 +04:00
Abs62 c2cdf9b177 Full-text search: Highlight of the search results 2014-04-22 22:29:58 +04:00
Abs62 9ad0d5f985 Implement full-text search 2014-04-16 20:18:28 +04:00
Abs62 0fa4087b38 Merge branch 'Original' into Qt4x5
Conflicts:
	goldendict.pro
	mainwindow.cc
	zim.cc
	zipsounds.cc
2014-02-11 23:39:31 +04:00
Abs62 dabceff223 Don't jump to dictionary when new page opens in background 2014-02-09 19:15:41 +04:00
Abs62 97c4697a80 Handle some touch screen gestures in article view window 2014-02-04 22:38:50 +04:00
Timon Wong 01ef08a709 Merge branch 'master' into qt4x5 2013-07-05 17:03:57 +08:00
Tvangeste 23f94c584f Jump to article when double-clicking on dictinary in "Found in Dictionaries"
This forces the jump even when the dictionary is already a current/active dictionary.
This is convenient for the following use-cases:

1. User manually scrolls far away from the current dictionary and would like to return.
2. User jumps far away from the current dictionary when doing search (Ctrl+F).
3. User scrolls a huge article and would like to get back to the beginning of it.
2013-06-28 18:00:13 +02:00
Timon Wong 4b412f360c Merge branch 'master' into qt4x5 2013-05-31 12:20:33 +08:00
Timon Wong f30c41dbf6 Remove Url::Class, add Qt4x5::Url::ensureLeadingSlash() and fix all related 2013-05-31 12:20:25 +08:00
Timon Wong d5c236f183 Fix pronunciation for active article (if not avaialbe, fallback to the first one) 2013-05-31 11:29:04 +08:00
Timon Wong ad4394d02b #212: Workaround for Qt5 changed behavior in QUrl::setPath() 2013-05-30 23:05:41 +08:00
Timon Wong 329aa02f93 Add "Inspect" action to context menu
* The "Inspect" action will bring up web inspector from WebKit.
* Restorable inspector window geometry.
2013-05-30 10:18:28 +08:00
Timon Wong 1ba03a326d Add an option to enable saving resource files with articles (#321) 2013-05-27 19:18:13 +08:00
Abs62 1f5270c619 Add "Copy as text" feature (issue #311) 2013-05-15 17:52:47 +04:00
Timon Wong c4752eb14c Add internal audio player(ffmpeg/libav + libao).
* phonon, bass, playsound are removed.
2013-05-05 18:22:12 +08:00
Abs62 0ac060576d Save images and sounds via context menu (issue #223) 2013-02-22 16:44:23 +04:00
Tvangeste 48801fc7a8 Fixed #186: F3 and Shift+F3 shortcuts are no longer global in the main window. 2013-01-23 19:36:45 +01:00
Tvangeste bb3a35e7ff Fixed Issue #184: F3 and Shift-F3 shortcuts don't work in a scan popup window when Search is activated
Also fixed  #185: Dictionaries menu uses hardcoded shortcut value in its text.
2013-01-22 22:16:54 +01:00
Tvangeste 0ee62530c2 Select an enire text of the current article (Ctrl+Shift+A).
Plus a context menu for that as well.
2013-01-18 15:37:24 +01:00
Tvangeste 8b61a8f995 Fixed a bug with incorrect restored sizes of sidebars. 2012-12-27 21:32:16 +01:00
Abs62 0dcbfd849f Send word to input line via context menu 2012-11-26 17:13:13 +04:00
Abs62 259efae81c Update history when clicking links on page (issue #120) 2012-11-12 17:52:54 +04:00
Abs62 8cc13b98b9 "Sound" button on toolbar always play first obtained sound 2012-09-29 14:11:06 +04:00
Abs62 ad8ddc8daf Add option for word selection by single mouse click 2012-09-26 17:59:48 +04:00
Abs62 3c2990bf23 Own muted dictionaries list for each group 2012-09-26 17:13:47 +04:00
Abs62 4c5e79c2b2 Add "Dictionary info" item to dictionary bar context menu 2012-09-25 17:13:35 +04:00
Abs62 3de1e09663 Win-specific: Scan popup now work in GoldenDict article tabs 2012-09-19 03:01:31 +04:00
Abs62 305c9ed1b8 Show/hide optional parts of articles (DSL dictionaries only) 2012-09-16 14:19:47 +04:00
Abs62 e00415e4d2 Close popup menus when ScanPopup window closes 2012-09-12 18:18:16 +04:00
Abs62 ea442909ae Add word to history through context menu 2012-09-12 18:11:30 +04:00
Abs62 535fe0d3e0 Update year in copyright notices. 2012-02-21 01:47:14 +04:00
Julian Depetris Chauvin a7cb431c72 Clicking on "...." in the article view's context menu opens the Results Navigation Pane (if closed and is not popup window), focuses on the next dictionary entry on it and scrolls to the next dictionary in the article view. If user is using the popup window it just scrolls to the next dictionary. 2011-07-30 21:11:07 -03:00
Julian Depetris Chauvin 778a288297 Fix sync between currently active article and the "found in dictionaries" pane for web dictionaries. 2011-07-30 17:28:24 -03:00
Tvangeste 4163bce8a2 Various status bar related fixes:
* Status Bar now available for Scan Popup window as well.
* Fixed #13: Eliminated modal box when sound is not available:
  Instead of modal dialog box we now show the status bar message,
  with error icon, thus making it visible but not disruptive.
* Proper handling of status bar images.
* Styling of the status bar in both modes
  (in Mani Window and in Popup Window).
2011-07-14 22:11:57 +02:00
Tvangeste 79dbce2bb3 Sync between the currently active article and the "found in dictionaries" pane.
Now when a user activates an article (by clicking on it, or by using Alt-Up/Down shortcuts),
corresponding dictionary in the "found in dictionaries" pane is selected.

See Issue #22.

P.S. Lingvo behaves in the same way too.
2011-07-03 19:59:17 +02:00
Tvangeste ad75c8992c Hovered link notifications in the status bar, just like in browsers.
Move the mouse pointer over the link and see the status bar updated.
2011-07-02 15:04:49 +02:00
Konstantin Isakov ace090d434 Merge pull request #10 from chulai/highlight-all-search
Add "Highlight all" to Article search (Ctrl + F)
2011-07-01 20:57:05 -07:00
Julian Depetris Chauvin 5f97db0449 Add shortcuts for Previous/Next actions on Article search (Ctrl + F) 2011-06-30 09:45:05 -03:00
Julian Depetris Chauvin c55061c302 Add "Highlight all" to Article search (Ctrl + F) 2011-06-29 14:42:16 -03:00
Tvangeste 6f192dca6e Enable/disable Back and Forward buttons depending on the history.
This is a standard behavior for any history-enabled app
(like web browser). When there is no previous or next item
in the history, the appropriate button on the toolbar
is disabled.
2011-06-07 18:52:51 +02:00
Konstantin Isakov 0712d8fd96 Don't allow navigating back to the empty initial pages. 2011-06-07 00:57:25 -07:00
Tvangeste 4e6e0a5e05 Fixes after code review:
* Replaced the search via dictionary name by search via dictionary id, cleanup
* Renamed "Dictionaries Pane" --> "Results Navigation Pane"
* Added to CREDITS
* TODO note about code duplication
2011-06-06 11:54:23 +02:00
Tvangeste 3762f22e76 Implemented Dictionaries Pane, to show dicts in which results were found.
It is a separate detacheable pane, which could also be enabled/disabled,
it tracks the current tab's contains, and lists those dictionaries that
contributed their content to the current translation.

Clicking on dictionary name jumps to the appropriate article from
this dictionary, which improves the navigation flow.

The Dictionaries Pane:
  * Shows both dictionaries' names and icons.
  * Does not consume resources when hidden.
  * Properly styled.
  * Properly handles app-wide shortcuts
    (Esc, Ctrl-L, Alt-D, Enter, Alt-Up/Down).
2011-06-05 13:49:50 +02:00
Konstantin Isakov 92eceb8cad Change email from @users.berlios.de to @goldendict.org. 2010-12-09 15:31:50 +03:00
Konstantin Isakov 1dafa5cb16 Allow styling of translate line and word list dependent on the current group by introducing a currentGroup Qt property.
To use, create ~/.goldendict/qt-style.css like this:

MainWindow #searchPane #translateLine[currentGroup="En"], MainWindow #searchPane #wordList[currentGroup="En"]
{
  background: white;
  color: black;
  font-size: 20px;
}
2010-11-15 18:22:35 +03:00
Konstantin Isakov 953d9237a3 Update copyright to span to 2011.
Better early than late, this year is ending anyway.
2010-11-14 18:47:03 +03:00
Konstantin Isakov eea1e3a2df Re-introduce native Windows audio playback.
This one can only play .wav files, but is far more stable than Phonon.
Any existing installations would auto-switch from Phonon to this one.
Any attempt to play a non-wav file would suggest switching to Phonon.
2010-11-14 18:38:41 +03:00
Konstantin Isakov ab88fa4867 Drop the src/ directory. It's superfluous. 2010-05-15 16:42:18 +04:00
Renamed from src/articleview.hh (Browse further)