Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-14 19:12:11 +01:00
Code Releases Activity
4,905 Commits 24 Branches 54 Tags 53 MiB
dbd4e75941
Commit Graph

2711 Commits

Author SHA1 Message Date
David Rosca
4e0e4b0d35 ClosedWindowsManager: Fix crash when saving window without any tabs 2018-01-02 22:57:34 +01:00
David Rosca
5013053811 TabBar: Reject drags from other app instances 2018-01-02 22:57:26 +01:00
David Rosca
a8763bee06 SessionManager: Use relative paths for session files in settings 
See #2331
 2018-01-02 22:57:19 +01:00
David Rosca
da3e16d7c4 Preferences: Enable "Don't load tabs until selected" also for Select session 2018-01-02 22:57:11 +01:00
David Rosca
72c6a73e29 MainApplication: Fix opening session with SelectSession after launch action 2018-01-02 22:56:49 +01:00
David Rosca
1aa4b41151 BrowserWindow: Save sidebar for each window 
Allows to have different sidebar on each window.
 2018-01-02 22:56:41 +01:00
David Rosca
1de32182c1 BrowserWindow: Don't restore first app window from postLaunch slot 
Instead restore it immediately after creation from MainApplication
as all other window types.
 2018-01-02 22:55:58 +01:00
David Rosca
6b08e17dcd BrowserWindow: Save ui state separately for each window 2018-01-02 22:55:50 +01:00
David Rosca
423e06c7d6 BrowserWindow: Always save/restore window geometry 2018-01-02 22:55:19 +01:00
David Rosca
ed39aefdad Change structure of session file + also save window geometry 
Bump session file version to 4.

Added support for old version to RestoreManager to prevent losing
old saved sessions.
 2018-01-02 22:55:09 +01:00
David Rosca
25b1583770 Fix merge issues 2018-01-02 15:22:35 +01:00
David Rosca
a578314e8e MainMenu: Remove all aboutToHide menu handling 
Instead create conflicting shortcuts with Qt::WidgetShortcut context.
 2018-01-02 15:15:20 +01:00
David Rosca
f80d827e59 QzTools: Use correct screen for widget in centerWidgetOnScreen 
BUG: 384543
 2018-01-02 15:03:50 +01:00
David Rosca
7b6b69c35f TabBar: Fix dropping text/url to tabs 2018-01-02 15:03:27 +01:00
David Rosca
ef06ed567a Add ClosedWindowsManager allowing to restore closed windows 
Closes #2306
 2018-01-02 15:03:11 +01:00
David Rosca
b3bd08c5e4 BrowserWindow: Add SavedWindow struct and use it for saving/restoring 2018-01-02 15:01:16 +01:00
David Rosca
16fcae4202 ClosedTabsManager: Rewrite to use WebTab::SavedTab 2018-01-02 14:59:06 +01:00
David Rosca
200e602d01 DownloadManager: Add app name to download finished notification 
BUG: 386376
 2018-01-01 18:11:01 +01:00
David Rosca
8749c05854 WebView: Search using default engine instead of active in actions 
BUG: 386377
 2018-01-01 18:09:39 +01:00
David Rosca
90153e280e Fix build 2018-01-01 17:10:44 +01:00
David Rosca
f3b7be2b5e LocationBar: Fix correctly loading "localhost" instead of launching search 
Closes #2028
 2018-01-01 17:02:12 +01:00
David Rosca
f0488c33c3 WebTab: Correctly remove itself from TabWidget 2018-01-01 17:01:48 +01:00
David Rosca
8817493c68 Tabs: Allow to detach tab from window with only one tab 
Window will be closed after detaching this tab.
 2018-01-01 17:01:41 +01:00
David Rosca
3eac8bd161 TabContextMenu: Remove detach tab action 
Tabs can now be detached with drag&drop
 2018-01-01 17:01:19 +01:00
David Rosca
38bfd49d4f TabBar: Change mimetype to falkon 2018-01-01 17:00:42 +01:00
David Rosca
fb652ff6cd Tabs: Make the code work better with zero tabs 2018-01-01 16:59:52 +01:00
David Rosca
4b33364516 Update copyright year to 2018 2018-01-01 16:59:46 +01:00
David Rosca
21ca9adf6b TabBar: Add support for drag&drop tabs to other windows 
Also it is possible to detach tab by dragging it outside of tabbar.

BUG: 386672
 2018-01-01 16:58:47 +01:00
David Rosca
fe396e64ff ComboTabBar: Add tabPixmap method to render single tab 2018-01-01 16:58:16 +01:00
David Rosca
08c0b480c1 ComboTabBar: Fix clearing drop marker when moving from main to pinned tabbar 2018-01-01 16:58:09 +01:00
David Rosca
f5ad4424aa TabWidget: Add insertView method for WebTab 2018-01-01 16:58:02 +01:00
David Rosca
0e25eb2e92 SuperMenu: Remove session manager actions in private mode 2018-01-01 16:57:09 +01:00
David Rosca
c679fdf397 TabBar: Add support for droping text/url inside tabbar to insert new tab 2018-01-01 16:57:03 +01:00
David Rosca
246adbfb0b ComboTabBar: Add support for drawing drop indicator 
It's just a solid line now, should be improved later.
 2018-01-01 16:56:58 +01:00
David Rosca
4fb73f3840 ComboTabBar: Fix edge case in tabAt 
Right corner of pinned tabbar would incorrectly return tabs from main tabbar.
Also make it work on close button.
 2018-01-01 16:56:52 +01:00
David Rosca
8100020b41 TabBar: Support dropping text on tabs 
It will be searched for using default search engine
 2018-01-01 16:56:47 +01:00
David Rosca
c7d58017d2 AddTabButton: Remove handling of drop events 
It is handeld by the TabBar itself.
 2018-01-01 16:56:39 +01:00
David Rosca
ca04e9d967 TabBar: Support adding new tabs with text drop data 
Urls are loaded directly and text is searched for using default search
engine.
 2018-01-01 16:56:32 +01:00
David Rosca
373df431a7 TabWidget: Switch to newly created tab when duplicating tab 2018-01-01 16:56:26 +01:00
David Rosca
b6dd2a829d LocationCompleter: Fix showing old suggestions for one char search string 
When typing a search string and then deleting it up to last character,
old suggestions for 2-character search string would be displayed.
 2018-01-01 16:56:03 +01:00
David Rosca
eb92250003 LocationCompleter: Enable suggestions from 2 and more characters 2018-01-01 16:55:57 +01:00
Laurent Cimon
635cb1085c Add an option to disable search suggestions from the address bar. 
Differential Revision: https://phabricator.kde.org/D9539
 2017-12-31 16:44:02 +01:00
David Rosca
925e3496d9 LocationCompleterModel: Don't set tab position to view/search item 2017-12-30 18:06:26 +01:00
David Rosca
56b28bfa1f WebTab: Make sure to not call slotRestore multiple times 
It can happen when switching sessions and results in current tab
being empty tab.
 2017-12-30 18:06:19 +01:00
David Rosca
3aa629ceac BrowserWindow: Make sure window is shown before restoring session 
Same reasoning as 639ecf3626dc5fa667acb17fa35bc398bdaf4712
 2017-12-30 18:06:14 +01:00
David Rosca
5ecf3d8b98 Remove leftover references to no longer used pinnedtabs.dat file 2017-12-30 18:06:06 +01:00
David Rosca
397e2f714e Set default button for all CheckBoxDialogs 
Default button is now focused instead of checkbox.
 2017-12-30 18:05:47 +01:00
David Rosca
01b66a0f48 WebInspector: Set focus back to webview when inspector closes 2017-12-30 18:04:59 +01:00
David Rosca
a5e35bac75 WebInspector: Fix showing close button with Qt 5.10 
It's not tested with Qt 5.9 but it should work there too.
 2017-12-30 18:04:51 +01:00
David Rosca
53f6ef91ac Temporarily enable JavaScript when loading qupzilla:restore page 2017-12-30 18:04:43 +01:00
David Rosca
736e3121bc BrowserWindow: Show window before creating web views 
Otherwise QWebEngineView first creates its underlying view with very
small size which then gets resized to correct size on first show event.

Also remove all calls to setUpdatesEnabled on window during session restore,
it doesn't seem to have any effect anymore.
 2017-12-30 18:04:11 +01:00
David Rosca
c906e0d168 SpeedDial: Show warning message when JavaScript is disabled 2017-12-30 18:04:05 +01:00
David Rosca
7cd86e144b WebInspector: Don't show inspector actions when JavaScript is disabled 
WebInspector doesn't work without JavaScript.
 2017-12-30 18:03:58 +01:00
David Rosca
1ea0c570c4 SqlDatabase: Remove exec and execAsync methods 2017-12-23 18:34:46 +01:00
l10n daemon script
7faf9e2e8d SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2017-12-21 04:50:47 +01:00
David Rosca
edce3dd0d0 Preferences: Show dots instead of chars in proxy password input 
Closes #2526
 2017-12-19 15:15:19 +01:00
David Rosca
82fe9d33c9 Preferences: Fix default proxy type 
Closes #2527
 2017-12-19 15:09:24 +01:00
David Rosca
c1c168aae9 Create every QSqlQuery with correct database for current thread 
Queries are now always executed on correct database instance.
Databases are also stored in thread local storage instead of in hash
table with mutex.

Closes #2498
 2017-12-18 13:06:42 +01:00
David Rosca
fba7b3d9fc Fix saving window state when closing app with Ctrl+Q shortcut 
Closes #2444
 2017-12-05 13:51:29 +01:00
David Rosca
8c99f22240 AdBlockTreeWidget: Fix restoring item font and color for normal rules 2017-12-03 19:10:56 +01:00
David Rosca
7463c692f7 AdBlockRule: Add support for "font" option 
Closes #2445
 2017-12-03 19:10:50 +01:00
David Rosca
d8b3a071bc UserAgentDialog: Update available user agent strings 
Also match Chrome version in Chrome user agent with QtWebEngine version.

Closes #2475
 2017-12-03 19:10:43 +01:00
David Rosca
ee5a11ae72 Fix initial focus when opening new browser window 
Web page is now correctly focused when opening browser window
or opening/restoring sessions.

This is still not absolutely reliable solution as it uses delay
to change focus to webview, because QWebEngineView doesn't accept
focus until after it is initialized.
 2017-12-03 19:10:34 +01:00
David Rosca
b03c5f3cb0 MainApplication: Don't call processEvents when restoring session 
It seems to help with QtWebEngine crashes during session restore
 2017-12-03 19:10:18 +01:00
David Rosca
687f797f27 Fix switching focus when loading url with BrowserWindow::loadAddress 
Also accept key events when handled

Closes #2504
 2017-12-03 19:10:10 +01:00
David Rosca
ca2b5f22be SearchToolbar: Don't set shortcuts from UI file 
Fixes build with Qt 5.10

Closes #2515
 2017-12-03 19:10:01 +01:00
David Rosca
52918db06a Fix using system proxy configuration 
See #2404
 2017-12-03 19:08:17 +01:00
David Rosca
44999080eb History: Also clear QtWebEngine Visited Links in clearHistory 2017-12-03 19:08:07 +01:00
l10n daemon script
4f8b1f57e7 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2017-11-27 05:03:51 +01:00
David Rosca
fd1b8ca16f IconProvider: Save icon urls as QString instead of QByteArray 
Saving it as QByteArray results in sqlite treating it as binary data
and breaks the index search.

Closes #1474
 2017-11-13 13:28:28 +01:00
David Rosca
0049c2b7ac ProfileManager: Create database structure from SQL 
Instead of copying pre-made binary database, create tables from SQL.
 2017-11-13 13:25:30 +01:00
David Rosca
ff6de32d3d LocationCompleterModel: Order domain completion result by date 
Fixes showing irrelevant (first match) domain completions

Closes #2471
 2017-11-08 15:59:24 +01:00
David Rosca
e8807fd901 Fix build on macOS < 10.12 
Closes #2473
 2017-11-08 15:59:17 +01:00
David Rosca
033f701784 LocationCompleter: Fix possibility to be opened at wrong position/time 2017-11-01 17:38:24 +01:00
David Rosca
dcf1cfd96e LineEdit: Don't query clipboard when its contents changes 
Apparently it can hang in QXcbClipboard

Closes #1945
 2017-11-01 17:38:18 +01:00
David Rosca
845d59e5d7 LocationCompleter: Ignore canceled refresh jobs 
Skip updating completion model with invalid data from canceled jobs,
which could result in attempt to resize the completer popup to invalid
size (0 height) and when the popup is resized again to valid size kwin
may actually fail to show it with compositing enabled.

Should help with #2480
 2017-11-01 17:38:11 +01:00
David Rosca
cca6b0189f Don't use QPrinter when printing to PDF 
QWebEnginePage::printToPdf produces scalable PDF with clickable
links while QWebEnginePage::print will create PDF containing low quality
image of page.

Closes #2477
 2017-11-01 17:37:45 +01:00
David Rosca
fe82dde871 IconProvider: Use SqlDatabase to exec query on correct database in imageForDomain 
Fixes crash when being called from multiple threads with Qt 5.10

Closes #2491
 2017-11-01 17:36:51 +01:00
Jose Rios
f011761a50 Clearing correct local storage directory 
Qt uses a 'Local Storage' directory to store web contents
whereas QupZilla tries to delete 'LocalStorage' directory
when the 'Delete locally stored content' option is set.

Closes #2472
 2017-11-01 17:36:13 +01:00
David Rosca
b6288358ef Don't create temporary dir in $HOME 
BUG: 386235
 2017-10-27 14:22:39 +02:00
David Rosca
9c3f38fa11 Fix installing and loading plugins 2017-10-27 14:14:40 +02:00
David Rosca
d3f4b59d66 Remove no longer working USE_LIBPATH build option 2017-10-27 13:33:45 +02:00
l10n daemon script
86ebe85aa7 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2017-10-25 08:45:55 +02:00
Razi Alavizadeh
8086e46ca4 ComboTabBar: Fix duplicate call to slotCurrentChanged() when closing tab. 
- The issue occurred after 04b288b395
- See https://github.com/QupZilla/qupzilla/issues/2489
 2017-10-22 20:00:06 +03:30
David Rosca
40d42f1230 LoadRequest: Replace isEmpty with isValid 
Also test for QUrl being valid, not just not empty
 2017-10-09 12:06:25 +02:00
David Rosca
71ef1cefd0 FirefoxImporter: Allow to import bookmarks with empty name 
Url will be used as title in this case.

Closes #2431
 2017-10-09 11:58:13 +02:00
David Rosca
48d18a3b35 HtmlImporter: Allow to import bookmarks with empty name 
Url will be used as title in this case.

See #2431
 2017-10-09 11:57:44 +02:00
David Rosca
e267b47fb1 LocationCompleter: Fix searching for text that is not valid QUrl 
Closes #2457
 2017-10-09 11:57:17 +02:00
David Rosca
657ed290e2 SearchEnginesManager: Change back DuckDuckGo search url 2017-10-09 11:56:47 +02:00
Razi Alavizadeh
991fb32cc3 Fix restoring state of current tab after restoring last session. 
- After 04b288b3 WebTab does not restore its state on showEvent
- QupZilla issue: https://github.com/QupZilla/qupzilla/issues/2467
 2017-10-06 19:35:54 +03:30
Razi Alavizadeh
bad3a76a2e TabManager: Don't repeat detaching tab code. 2017-10-03 17:02:30 +03:30
Razi Alavizadeh
f17eb82cf9 TabManager: Add tab context-menu to treewidget context-menu. 2017-10-03 17:02:26 +03:30
Razi Alavizadeh
04b288b395 Fix restoring non-loaded tabs when moving them. 2017-10-03 17:02:25 +03:30
Razi Alavizadeh
f041d87534 Move tab context-menu methods to TabContextMenu. 2017-10-03 17:02:24 +03:30
Razi Alavizadeh
ebd8dd051e Windows: Fix compile issues after build system changed to cmake. 
Differential Revision: https://phabricator.kde.org/D8079
 2017-10-03 11:03:35 +03:30
Luigi Toscano
3c67be06b9 Fix UI strings with plural forms 
Otherwise those strings can not be extracted.
 2017-09-26 01:37:46 +02:00
Jacob Tey
11d73bd26a Fix icon name in SBI images icon + add object name to AdBlockIcon 2017-09-25 19:35:44 +02:00
Ken Moore
c75324f379 Update processinfo.h 
Cleanup the includes:
QtGlobal is not needed - already pulled in by qzcommon.h
QString not needed, already pulled in by qzcommon.h
Move the qzcommon include before the ifdefs

This is a change that has been getting used when building QupZilla on FreeBSD for several years now and works fine.
 2017-09-25 19:27:16 +02:00
David Rosca
626e8c5f8a Change library SOVERSION to 2 2017-09-25 18:37:47 +02:00
David Rosca
df25f49cfb Remove more unused files 2017-09-25 14:18:33 +02:00
David Rosca
3b09f115e7 Remove QMake build files 2017-09-25 13:08:06 +02:00
l10n daemon script
524237b202 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2017-09-19 05:03:47 +02:00
Harald Sitter
b60b2e36e9 port DataPaths to QStandardPaths backing 
Summary:
This streamlines the code across all platforms and outsources the path
building to QSP which implements the multi-platform logic.

This keeps AppData lookup paths where they were (with additional lookup
paths from QSP).
Config location changes on Windows (from local to roaming) and OS X
(from `Application Support` to `Preferences`).
Cache also changes location on Windows and OS X.

Temporary directory management is entirely outsourced to QTemporaryDir
which is kept in a scoped pointer so it gets cleaned up on exit.

Reviewers: drosca

Reviewed By: drosca

Differential Revision: https://phabricator.kde.org/D7767
 2017-09-18 12:57:23 +02:00
l10n daemon script
395cb5d2f5 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2017-09-18 05:00:58 +02:00
Harald Sitter
2b3b95ae36 change qapp applicationName to lower case 
Summary:
NB: this changes the standard config name of default constructed QSettings
  (a quick grep seems to suggest there is no default constructed QSettings
   though, so this should be fine).

Aligning the applicationName with the spelling in the installation paths
on case sensitive systems allows us to use QStandardPaths' built-in
handling for application-specific paths instead of having to manually
append /falkon to various paths.

Test Plan: still seems to be working on linux

Reviewers: drosca

Reviewed By: drosca

Differential Revision: https://phabricator.kde.org/D7721
 2017-09-11 14:13:47 +02:00
David Faure
eecaf2e9d6 Fix compilation with -DQT_NO_CAST_TO_ASCII 2017-09-11 10:05:28 +02:00
David Faure
d69e5458f9 First steps towards a cmake buildsystem, currently only builds src/lib. 
USE_DATADIR no longer exists, QStandardPaths::standardLocations is used
unless NO_SYSTEM_DATAPATH is set.
 2017-09-09 20:27:44 +02:00
l10n daemon script
ca377a0d65 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2017-09-06 08:25:21 +02:00
l10n daemon script
d42b1ecf52 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2017-09-05 04:29:09 +02:00
l10n daemon script
691723e4f6 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2017-09-03 04:44:27 +02:00
l10n daemon script
3dc4685561 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2017-09-01 04:37:46 +02:00
l10n daemon script
765d27cde5 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2017-08-30 08:02:14 +02:00
Harald Sitter
58e4b9a3a7 extend data paths with standard paths from QStandardPaths 
Summary:
this is, for now, backwards compatible. in the long run a full move
to QSP instead of manually doing path lookup would be good though.
as that ideally means aligning capitalization between appname and on-disk
paths we'll avoid that for now.

fixes data lookup from XDG paths making the binary partially relocatable
and properly configurable via XDG paths (e.g. corporate branding or what
have you)

Test Plan: - theme path resolution now walks all XDG paths

Reviewers: drosca

Reviewed By: drosca

Differential Revision: https://phabricator.kde.org/D7600
 2017-08-29 14:38:46 +02:00
Razi Alavizadeh
e5b89fd5f5 LocationCompleterDelegate: Don't align RTL titles to right after new delegate. 
- The old delegate was using separate lines for title and link
  after 5f9fe54086 it uses just one line.
 2017-08-29 12:26:31 +04:30
l10n daemon script
b6dabb55aa SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2017-08-27 04:43:13 +02:00
l10n daemon script
d718a61042 SVN_SILENT made messages (.desktop file) - always resolve ours 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
 2017-08-26 04:46:29 +02:00
David Rosca
efff69b7b2 Continue with Falkon renaming 2017-08-25 17:55:52 +02:00
David Rosca
d00e769749 Initial rename to Falkon 2017-08-25 17:32:32 +02:00
David Rosca
04df4cbdf8 LocationCompleter: Fix search engine shortcuts 2017-08-25 16:11:58 +02:00
David Rosca
1387baade0 SearchToolBar: Guard against running search callback after toolbar was deleted 2017-08-25 16:11:40 +02:00
srazi
a78b595569 Hide sidebar when a web element goes to full screen. 
- Closes #2423
 2017-08-23 14:02:26 +04:30
srazi
e0e21362cc Remove MPL notice in last commit. 2017-08-22 17:14:45 +04:30
srazi
2aa25fe0b1 Windows: At first try to show native default app settings UI (>=Vista). 2017-08-22 14:19:22 +02:00
srazi
21b2685375 Windows: Remove support to set QupZilla as default FTP handler. 
- Closes #2417
 2017-08-21 21:45:32 +04:30
David Rosca
d3153355d7 LocationCompleterView: Make sure focusProxy() is not null 
See #2421
 2017-08-21 11:16:10 +02:00
David Rosca
08274f5bbe Fix build warning 2017-08-19 19:11:45 +02:00
David Rosca
5812721e48 BrowserWindow: Fix failing to enter fullscreen sometimes 2017-08-19 18:52:26 +02:00
David Rosca
f3367e7611 AdBlockRule: Add support for ping, media and other options 
Also fix object-subrequest matching, it should block requests
from plugins despite its name.
 2017-08-12 17:31:11 +02:00
David Rosca
c2c49c6b13 AdBlock: Add support for rules with empty filter (match all) 2017-08-12 16:27:02 +02:00
David Rosca
67c6834a5f ComboTabBar: Disable focusing scroll buttons 2017-08-12 15:56:26 +02:00
David Rosca
0203cab204 LocationCompleterDelegate: Only draw "search with" on selected/hovered items 2017-08-12 15:46:54 +02:00
David Rosca
82700cae38 LocationCompleterDelegate: Draw icons with correct mode 2017-08-12 15:25:36 +02:00
David Rosca
0524bbc1a6 LocationCompleter: Don't allow to delete search/visit completion item 2017-08-12 15:10:39 +02:00
David Rosca
20010eb3c4 LocationCompleter: Fix incorrectly showing search action after domain completion 2017-08-12 15:09:29 +02:00
David Rosca
5f9fe54086 LocationCompleterDelegate: Draw title and address in one line 
Also show twice as much available completions.
 2017-08-12 15:02:00 +02:00
David Rosca
d7ff9546d6 Fix build 2017-08-11 15:46:19 +02:00
David Rosca
7e6600bb48 Change wording "Search on" -> "Search with" 
Also don't show "URL" in interface, "address" is enough.
 2017-08-11 15:29:15 +02:00
David Rosca
2867f9fed5 LocationCompleter: Show search suggestions 2017-08-11 15:29:09 +02:00
David Rosca
c3bead5ed7 LocationCompleterView: Completely remove the hovered index tracking logic 2017-08-11 13:01:41 +02:00
David Rosca
6bceef43e2 LocationCompleter: Don't change selected index with mouseover 
Also render proper item state (selected / under mouse) in delegate.
 2017-08-11 12:56:55 +02:00
David Rosca
9e8614447e LocationCompleterDelegate: Better logic for limiting URL length 2017-08-11 12:42:07 +02:00
David Rosca
029aa6823b LocationCompleterView: Don't propagate Esc key press 2017-08-11 12:32:23 +02:00
David Rosca
16b3a74aa1 LocationCompleter: Add persistent first item that shows used search engine 
Or in case searching from location bar is disabled or entered text
is valid URL, it indicates that this URL will be loaded.
 2017-08-11 12:32:18 +02:00
David Rosca
b05986bac3 Bookmarks: Warn when trying to open multiple bookmarks in tabs 
Closes #2340
 2017-07-19 14:09:49 +02:00
David Rosca
6f08f94e0f Workaround wrong focus when opening new tab from createWindow() 2017-07-19 13:57:37 +02:00
David Rosca
cbba636f61 Require C++14 2017-07-19 13:27:46 +02:00
David Rosca
d0f6a3f909 WebSearchBar: Search when clicking on search suggestion 
Closes #2281
 2017-07-19 13:27:30 +02:00
David Rosca
aefc3eba38 Disable QWebEngineSettings::FocusOnNavigationEnabled 
Keeping this enabled will focus views loaded in background tabs.

Closes #2352
 2017-07-19 13:06:25 +02:00
David Rosca
05492a89e6 LocationCompleterView: Fix selecting items with mouse 
See #2365
 2017-07-19 12:39:36 +02:00
David Rosca
9f266ac1e0 LocationCompleterView: Only use special window flags on xcb platform 2017-07-19 12:26:26 +02:00
David Rosca
54a6f65bee AdBlock: Fix saving subscriptions 
QSaveFile doesn't support QFile::Truncate mode
 2017-07-01 18:50:25 +02:00
David Rosca
9b933c1fb7 SessionManager: Show only session name in message box when deleting session 2017-06-08 15:00:03 +02:00
David Rosca
26eb3753c0 SessionManager: Make it possible to restore backups again 2017-06-08 14:56:52 +02:00
David Rosca
93d4d66054 SessionManager: Add Session Manager dialog instead of menu structure 
See #2331
 2017-06-08 14:13:15 +02:00
David Rosca
bc65a0a038 Add RemoveItemFocusDelegate and use it in SearchEnginesDialog 2017-06-08 13:08:38 +02:00
David Rosca
ea966925dc SearchEnginesDialog: Remove left padding for items in QTreeView 2017-06-08 13:00:13 +02:00
David Rosca
f62665b9d9 SuperMenu: Move help actions to Help submenu 
Also move Preferences action above About action
 2017-06-08 11:13:22 +02:00
David Rosca
c9a52e59c3 Use QSaveFile also in other places 2017-06-08 10:14:19 +02:00
David Rosca
1a818e5b6c SessionManager: Use QSaveFile for writing session to file 
See #2331
 2017-06-08 10:04:45 +02:00
Elvis Angelaccio
2a2c49ca47 Ensure transient parent window for LocationCompleterView 
This makes sure that the completer listview is properly positioned on
wayland. Tested with Qt 5.9 RC.

Closes #2344.
 2017-06-08 09:47:39 +02:00
ravas
8dd870bc53 corrected BREW_OPENSSL path #1850 2017-06-07 10:43:11 +02:00
David Rosca
0d2b8b6b81 Change linux desktop file name to org.qupzilla.QupZilla 
Closes #2308
 2017-06-06 17:56:49 +02:00
David Rosca
567881f130 Fix warnings when building with GCC 7 2017-06-06 17:51:06 +02:00
David Rosca
f0b8ac2daa Use QWebEngineHttpRequest with Qt 5.9 2017-06-06 17:40:47 +02:00
David Rosca
fcc3cf1809 Don't show multiple autofill notifications to save/update password 
Close the old autofill notification before adding new one.
 2017-05-29 19:28:31 +02:00
David Rosca
49eb9a862e Workaround Ctrl+F keypress being eaten by QtWebEngine 5.9 2017-05-29 17:21:56 +02:00
David Rosca
16f9b2fde9 Rework the zoom bug workaround 
Qt 5.9 is affected too

Closes #2289
 2017-05-29 17:11:48 +02:00
David Rosca
3ec6ffa5c9 WebPage: Remove no longer used m_adjustingScheduled 2017-05-29 17:05:28 +02:00
David Rosca
f9778eeaad Make sure the QWebChannel object is initiated in SpeedDial/Restore pages 
Make it more robust, this also fixes issue with Qt 5.9

Closes #2329
 2017-05-29 16:46:25 +02:00
David Rosca
74c65c2272 Password observer: Also use 'login' input name as username 2017-05-29 16:15:09 +02:00
David Rosca
57172459d8 Fix comparing tagName in form observer 
Listen also to subtree mutations

Closes #2321
 2017-05-29 16:08:41 +02:00
David Rosca
bd9a33d6f9 Fix crash when opening target __blank links 
Regression from 92b49be0c2

Closes #2335
 2017-05-19 09:02:38 +02:00
Anthony Fieroni
92b49be0c2 Don't leak web page 
Signed-off-by: Anthony Fieroni <bvbfan@abv.bg>
 2017-05-12 20:50:24 +02:00
Anthony Fieroni
db33b8d860 Workaround Qt5.8 zoom factor bug 
Signed-off-by: Anthony Fieroni <bvbfan@abv.bg>
 2017-05-12 20:50:24 +02:00
David Rosca
54949f94f3 AesInterface: Don't use deprecated RAND_pseudo_bytes 2017-05-03 21:17:09 +02:00
Jose Rios
efc4725e91 Fixed compilation for Openssl 1.1.0 
Most of libcrypto and libssl internal structures were made
opaque in this version not allowing to instatiate them in
the stack.

More info:
    * https://www.openssl.org/news/openssl-1.1.0-notes.html
    * https://github.com/openssl/openssl/issues/962#issuecomment-208792020
 2017-05-01 11:03:40 +02:00
David Rosca
eb0cf5065d WebView: Exit fullscreen on hide 
Closes #2294
 2017-04-09 10:33:57 +02:00
David Rosca
8e16efc1bf Fix crash when restoring history of internal pages with QtWebEngine 5.8 
Closes #2302
 2017-04-08 16:44:41 +02:00
srazi
0148b7aaff RestoreManager: Don't append WindowData with empty tabsState to restore data 2017-04-08 13:36:46 +04:30
David Rosca
3492999abe Don't return empty QByteArray when there are no tabs in session 2017-04-07 12:38:54 +02:00
David Rosca
cb4012c5c9 Don't save qupzilla:restore tabs in sessions 2017-04-07 12:36:42 +02:00
srazi
755ec16598 Session manager (#2293) 2017-04-07 10:02:27 +02:00
srazi
2654081912 Fix 2178 (#2292) 
* CheckBoxDialog: Rewritten to inherit from QMessageBox

-  QMessageBox supports showing checkbox for Qt >= 5.2

* Add option to disable warning message when closing tabs from tabbar context menu.

- Closes #2178
 2017-04-05 10:27:03 +02:00
David Rosca
f961958989 Add another key shortcut for reload action 
Closes #2290
 2017-04-03 15:34:44 +02:00
David Rosca
281919fc4d LocationCompleterView: Use custom window type only on X11 
Closes #2287
 2017-04-02 16:35:38 +02:00
srazi
ade7b9c690 Refactor some codes related to sessions. (#2280) 2017-03-26 11:27:04 +02:00
srazi
345d03105f macOS: Fix global menu with multiple windows. 
- Closes #2261
 2017-03-20 11:37:33 +03:30
srazi
9af542aa03 macOS: Disable auto window tabbing (#2261) 2017-03-20 04:28:55 +03:30
David Rosca
9683f0f295 StatusBarMessage: Don't show for inactive windows 2017-03-18 17:22:21 +01:00
David Rosca
076deb7cdd Set PulseAudio property overrides to QupZilla app name and icon 
Closes #2262
 2017-03-18 17:19:57 +01:00
David Rosca
44cd68e3d9 Merge branch 'v2.1' 2017-03-18 16:11:34 +01:00
David Rosca
b61b4aca67 WebView: Don't change m_progress when loading finished 
QtWebEngine may emit loadProgress signal even after loadFinished
was already emitted.

Closes #2222
 2017-03-18 16:00:57 +01:00
srazi
1d0d555ed1 macOS: Fix paths of qtwebengine_dictionaries (#2261) 2017-03-18 02:39:25 +03:30
David Rosca
f20d421113 Merge branch 'v2.1' 2017-03-15 13:29:24 +01:00
David Rosca
486b8f4c7d Workaround QWebEnginePage not scrolling to anchors when opened in background tab 
Closes #2242
 2017-03-15 13:11:27 +01:00
David Rosca
bfef9e2c03 Merge branch 'v2.1' 2017-03-15 10:53:44 +01:00
David Rosca
9211a8eceb Disable native scrollbars by default 
See #2246
 2017-03-15 10:49:27 +01:00
David Rosca
d18be6f8e4 ProfileManager: Fix warning when creating new profile 2017-03-15 10:48:00 +01:00
David Rosca
a4c3e49e3e AdBlock: Fix warning when creating new profile 2017-03-15 10:35:14 +01:00
José Rios
85832642db Fixed new tab not opening on mouse mid button click (#2244) 
Whenever the user pressed the middle button the mouse press handler
in WebPage issued an 'execJavaScript' which has its own event loop
causing the mouse release handler to be called before the field
'm_clickedUrl' get the url in the first handler. Since this field
is used to guard the logic in the second handler the new tab wasn't
opening.

Closes #2238
 2017-03-13 09:05:36 +01:00
José Rios
e49ea20f33 Fixed new tab not opening on mouse mid button click (#2244) 
Whenever the user pressed the middle button the mouse press handler
in WebPage issued an 'execJavaScript' which has its own event loop
causing the mouse release handler to be called before the field
'm_clickedUrl' get the url in the first handler. Since this field
is used to guard the logic in the second handler the new tab wasn't
opening.

Closes #2238
 2017-03-12 17:57:19 +01:00
David Rosca
b95a8be600 LocationCompleterView: Fix window type on Wayland 
Closes #2236
 2017-02-26 20:27:37 +01:00
David Rosca
8501275ee4 Merge branch 'v2.1' 2017-02-23 20:09:26 +01:00
David Rosca
690eb2c447 AdBlock: Don't remove url interceptor when disabled 
Instead just return early in block() when AdBlock is disabled
 2017-02-23 20:08:59 +01:00
David Rosca
8cbccbf71d AdBlock: Remove option to use limited EasyList subscription 
It is no longer need as AdBlock matching runs in separate thread
 2017-02-23 19:58:38 +01:00
David Rosca
93b1104611 AdBlock: Guard AdBlockMatcher with mutex 
Closes #2231
 2017-02-23 19:55:04 +01:00
David Rosca
e832a3418c Merge branch 'v2.1' 2017-02-21 10:29:15 +01:00
David Rosca
71f0737511 WebScrollBarManager: Use scrollbars as lambda context 
Instead of manually disconnecting the lambdas, use scrollbar
as context.
 2017-02-21 10:28:24 +01:00
David Rosca
3045cf28b2 Merge branch 'v2.1' 2017-02-20 17:20:39 +01:00
David Rosca
e86f96878e Fix clicking on go icon when location completer popup is visible 
Closes #2225
 2017-02-20 17:20:00 +01:00
David Rosca
071c4fbe52 Merge branch 'v2.1' 2017-02-13 21:35:56 +01:00
David Rosca
fe0ae53653 WebScrollBar: Make sure not to accidentally scroll 
Closes #2211
 2017-02-13 21:13:30 +01:00
David Rosca
71b06197ef LocationCompleterView: Use better window type 
It is no longer modal, so it doesn't break shortcuts.

Closes #2213
 2017-02-13 21:01:21 +01:00
David Rosca
e150e44cc6 Replace Q_OS_MAC with Q_OS_MACOS 2017-02-10 19:00:58 +01:00
David Rosca
69193399b4 Merge branch 'v2.1' 2017-02-08 10:51:23 +01:00
David Rosca
bcf824dce2 Preferences: Allow to reorder spellcheck languages 
See #2195
 2017-02-08 10:13:41 +01:00
David Rosca
6e2d8d8fe7 Preferences: Disable spell check language list when disabled 2017-02-08 09:51:39 +01:00
David Rosca
fb38307783 Preferences: Don't list duplicated spellcheck dictionaries 
Closes #2195
 2017-02-08 09:49:45 +01:00
David Rosca
85f8cf881e Fix drawing text with correct color in item delegates on Windows 2017-02-07 15:47:41 +01:00
David Rosca
3dd36b37ef Merge branch 'v2.1' 2017-02-07 15:08:25 +01:00
David Rosca
1c1c35522b SpeedDial: Fix editing url of entries 
Closes #2197
 2017-02-07 15:07:44 +01:00
David Rosca
1710e284c8 SpeedDial: Fix displaying broken page image 2017-02-07 15:07:08 +01:00
David Rosca
335c6b66c5 SpeedDial: Correctly emit load error when trying to load invalid url 2017-02-07 14:52:56 +01:00
David Rosca
1f362c0cb7 Merge branch 'v2.1' 2017-02-07 11:08:41 +01:00
David Rosca
da8e9732f7 Change blank tab url to empty QUrl() 2017-02-07 10:41:58 +01:00
David Rosca
5873ed48fd TabIcon: Hide icon immediately when url is empty or has qupzilla: scheme 2017-02-07 10:41:37 +01:00
David Rosca
8a942e2e73 WebView: Remove QWebChannel resetting workaround 
It was fixed while ago in Qt
 2017-02-06 20:45:28 +01:00
David Rosca
5f0f520a45 WebPage: Remove now unused scheduleAdjustPage 2017-02-06 20:44:27 +01:00
David Rosca
6b39dc9cf0 WebPage: Remove no longer needed copies of runJavaScript functions 2017-02-06 20:43:40 +01:00
David Rosca
8fa9db9f65 Show print preview dialog when printing page 
Print directly to QPrinter instead of using intermediate pdf file.
 2017-02-06 20:40:40 +01:00
David Rosca
1b365f1e86 Bring back Print Element Background option 2017-02-06 19:52:39 +01:00
David Rosca
829e05bdec Merge branch 'v2.1' 2017-02-06 19:31:51 +01:00
David Rosca
118427db86 Update COPYRIGHT 2017-02-06 19:31:35 +01:00
David Rosca
bfa5234ea2 Update AdBlock known subscriptions urls 2017-02-06 18:47:02 +01:00
David Rosca
13cba7a069 Bump minimum Qt to 5.8 2017-02-06 18:39:59 +01:00
David Rosca
4062473e98 Version 2.1.0 2017-02-04 10:47:24 +01:00
David Rosca
670d189765 ClearRecentHistory: Remove icon 2017-02-03 14:20:36 +01:00
David Rosca
f6bd5595b6 Preferences: Fix showing settings icon in Extensions tab 2017-02-03 14:18:51 +01:00
David Rosca
446f02c7ee WebTab: Remove stylesheet changing background color 
It was there from QtWebKit times, it has no effect now.
 2017-01-31 22:11:21 +01:00
David Rosca
534eb14432 WebScrollBar: Add workaround for Breeze style 2017-01-31 22:06:48 +01:00
David Rosca
c6a7935a67 Fix MainApplication::styleName() 2017-01-31 21:37:12 +01:00
David Rosca
a82a1c396b AdBlockDialog: Don't force black color to normal rules 
Makes the dialog more usable with dark color schemes
 2017-01-31 21:18:51 +01:00
David Rosca
288150ccf9 PopupWebView: Fix window.close() handling 2017-01-31 20:56:34 +01:00
David Rosca
9a2bda2063 Fix build with Qt 5.7 2017-01-28 14:58:24 +01:00
David Rosca
ea7f4dd58f HistoryManager: Pressing Del key now removes selected entries 2017-01-28 14:31:47 +01:00
David Rosca
bcb633fcd0 TabBar: Use correct duration for showing add tab button after releasing dragged tab 2017-01-28 10:31:45 +01:00
David Rosca
8e55c3ad3c Fix setting spellcheck languages 2017-01-27 22:46:30 +01:00
David Rosca
e18d2d90bd Register also as url handler for https scheme 2017-01-27 20:59:10 +01:00
David Rosca
e2af1649bc CookieManager: Remove warning about filter 3rd party / tracking cookies 2017-01-27 19:32:48 +01:00
David Rosca
a634a17af0 CookieManager: Hide filter 3rd party cookies option 
It's impossible to implement with current QtWebEngine API.
 2017-01-27 19:28:30 +01:00
David Rosca
43eb307e2d SpeedDial: Fix setting center dials option 2017-01-27 17:40:35 +01:00
David Rosca
33aba0c93f Revert "Change background image instantly and for all speed dials" 
This reverts commit 65667b95db.
 2017-01-27 17:31:46 +01:00
David Rosca
f15ed333b6 SpeedDial: Use oninput instead of onchange for input range 2017-01-27 17:25:47 +01:00
David Rosca
728e58fdf7 Use updated version of jQuery and jQuery UI 
Fixes issue with speed dial settings being impossible to click.

Closes #2175
 2017-01-27 17:20:11 +01:00
David Rosca
8ba412e584 ComboTabBar: Add setFocusPolicy 
TabBar is setting Qt::NoFocus policy which was ignored
 2017-01-27 16:51:45 +01:00
David Rosca
6e15e85919 LineEdit: SideWidget now eats all mouse events 2017-01-27 16:36:11 +01:00
David Rosca
ad024ec739 LineEdit: Clicking on SideWidget will not pass focus to LineEdit 2017-01-27 16:29:26 +01:00
David Rosca
5adcc6b4d9 LineEdit: Block mouse double click when not focused 2017-01-27 16:29:03 +01:00
David Rosca
e134abfda7 Fix build with Qt 5.7 2017-01-27 15:52:39 +01:00
David Rosca
74740ef441 ComboTabBar: Make wheel scrolling faster 2017-01-27 15:43:21 +01:00
David Rosca
2d90afc503 TabBar: Don't return -1 when not visible in pixelMetric 
Fixes tabs sometimes being invisible when leaving fullscreen

Correct fix for #1967
 2017-01-27 15:34:29 +01:00
David Rosca
953c52e73d DownloadManager: Immediately show file dialog when download was user requested 
QWebEngineDownloadItem::UserRequested should be set when initiating
download from web actions - Save image as..., Save link as...
It doesn't seem to work with current QtWebEngine however
 2017-01-27 15:02:25 +01:00
David Rosca
880b0eb5b1 DownloadManager: Always ask where to save with Save Page action 2017-01-27 14:48:40 +01:00
David Rosca
41adc8f9ba Don't block focus for QListWidgets 
Also set per-pixel scrolling in Preferences
 2017-01-27 14:34:56 +01:00
David Rosca
6525410e22 ComboTabBar: Fix drawing with correct selectedPosition 2017-01-27 14:24:39 +01:00
David Rosca
4e1a9079f3 ComboTabBar: Set QStyleOptionTabBarBase::selectedTabRect 
Closes #1389
 2017-01-27 14:06:06 +01:00
David Rosca
6132bf7789 ComboTabBar: Fix using correct value for tab animation duration 2017-01-27 14:00:09 +01:00
David Rosca
f7d4054cb9 Preferences: Don't show version next to ok/cancel/apply buttons 2017-01-27 13:48:47 +01:00
David Rosca
c44b8b9309 LocationBarPopup: Use QFrame::Raised 2017-01-27 13:42:05 +01:00
Voldracarno Draconor
4729b24c64 Added: Remove cache on close (#2185) 2017-01-27 13:37:56 +01:00
David Rosca
c6354259a8 DownloadManager: Improve logic for closeDownloadTab 
It now can handle also new tabs opened in background
 2017-01-27 10:29:12 +01:00
David Rosca
e10294db6d WebScrollBarCornerWidget: Draw using QStyle::PE_PanelScrollAreaCorner 2017-01-26 21:13:57 +01:00
David Rosca
e656e92eaf WebScrollBarManager: Fix height of vertical scrollbar when horizontal is visible 
Also fix warnings in console when trying to access null document.documentElement
 2017-01-26 20:57:12 +01:00
David Rosca
899622e623 DownloadManager: Don't try to close the single tab in tabbar 2017-01-26 20:48:29 +01:00
David Rosca
df2fa561d5 DownloadManager: Close empty tab that was opened only for downloading 2017-01-26 20:45:59 +01:00
David Rosca
f9a0d202de WebScrollBarManager: Guard against ScrollBarData being deleted 2017-01-26 20:45:38 +01:00
David Rosca
fcc356e4df DownloadOptionsDialog: Show download mime type and icon 2017-01-26 19:13:47 +01:00
David Rosca
c785e09bdf WebScrollBarManager: Improve viewportSize() with knowledge from javascript 2017-01-26 17:59:45 +01:00
David Rosca
7096d3eb88 WebScrollBarManager: Correctly update visibility with javascript 
Closes #2182
 2017-01-26 17:27:02 +01:00
David Rosca
f7005f8d95 NetworkManager: Remove NetworkUrlInterceptor in shutdown 
Fixes potential crash on close
 2017-01-26 12:35:21 +01:00
David Rosca
24b6db866a AdBlockSearchTree: Slightly more efficient traversal 
Access hash only once for each char
 2017-01-23 10:55:45 +01:00
David Rosca
7c798585ef Html5PermissionNotification: Close when request is canceled / load started 2017-01-23 09:14:46 +01:00
David Rosca
1ed1059c42 WebHitTestResult: Only update with contextmenu data with same position 2017-01-23 08:21:24 +01:00
David Rosca
e7bd2ed8cd LineEdit: Make the side widgets occupy full height 2017-01-23 08:21:24 +01:00
Voldracarno Draconor
7738deb721 Added option to delete all cookies on exiting (#2173) 2017-01-22 20:43:41 +01:00
David Rosca
abc7a2528b PopupWindow: Use same notifications as WebTab 2017-01-22 14:58:45 +01:00
David Rosca
635cc8e5eb WebInspector: Remember separately docked/undocked sizes 2017-01-22 14:50:15 +01:00
David Rosca
a186e75cb1 PopupWindow: Fix hiding progressbar 
QWebEngineView emits loadProgress(100) after loadFinished() is emitted
 2017-01-22 14:45:55 +01:00
David Rosca
0cc9692f63 PopupWindow: Fix showing custom scrollbars 2017-01-22 14:43:22 +01:00
David Rosca
f6e9cc1c6a WebTab: Make it possible to show more than one notification 2017-01-22 14:26:48 +01:00
David Rosca
ddb60dca53 Bring back mouse grab permission workaround 
It is still needed for QtWebEngine 5.7
 2017-01-22 13:24:01 +01:00
David Rosca
1695c9bd62 Preferences: Fix detecting active profile 
Starting and active profile can be different when passing the profile
as a cli flag.
 2017-01-22 10:34:44 +01:00
David Rosca
4878265ff6 Fix crash when render process crashes 
Tab crash page is now correctly loaded and offers user to reload the
page.
 2017-01-22 10:23:14 +01:00
David Rosca
45f37a3a64 WebView: Fix send text by mail action 2017-01-22 10:05:21 +01:00
David Rosca
e4d7445c77 Remove connection to non-existant slot 2017-01-22 09:28:35 +01:00
David Rosca
8b992364c4 Fix setting cache maximum size 2017-01-22 09:22:22 +01:00
David Rosca
db2eb5bbd7 Rename label_21 from previous commit 2017-01-22 09:22:03 +01:00
Voldracarno Draconor
ae449974a9 Exchanged the cache size slider with a spinbox and enhanced the range (#2170) 2017-01-22 09:18:43 +01:00
David Rosca
b5eda4f803 Preferences: Use new icons 2017-01-21 22:36:51 +01:00
David Rosca
060011e466 Use qMax and qAbs instead of std functions 
Closes #2169
 2017-01-21 21:23:36 +01:00