1
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-21 03:06:34 +01:00
Commit Graph

2588 Commits

Author SHA1 Message Date
nowrep
aa248893c1 [TabWidget] Renamed getTabBar() to just tabBar() 2014-04-04 17:14:31 +02:00
nowrep
b7016a70ee [PopupWindow] Fixed edit actions in menu
WebView now has all edit-functions as public signals, so we can
connect it directly (instead of triggering page action in separate
slot in PopupWindow)
2014-04-04 17:09:04 +02:00
nowrep
5c2c90ae6d [WebTab] More cleanup in detach/attach code.
TabbedWebView can now be used with null BrowserWindow pointer.
2014-04-04 17:07:31 +02:00
nowrep
61c1b8d8a1 [Cookies] Renamed Match Domain exactly to Filter 3rd party cookies
Closes #1277

[ci skip]
2014-04-03 10:19:11 +02:00
nowrep
7469aced65 [Cleanup] Deleted unused ActionCopy class
Also added myself to ComboTabBar copyright
2014-04-02 20:42:29 +02:00
nowrep
98907c2055 [WebTab] Reworked tab attaching/detaching.
This also fixes crash on detach
2014-04-01 18:47:19 +02:00
nowrep
34eeea4d58 [WebInspector] Propagate hideEvent only when closing inspector 2014-04-01 16:34:47 +02:00
nowrep
551ccd6e3c [BrowserWindow] Make sure window is created with at least one tab 2014-04-01 16:34:08 +02:00
nowrep
84f117e68e [AutoScroll] Fixed AutoScroll plugin after recent commits
Use WebView::overlayWidget for showing widgets over WebView
2014-04-01 16:32:55 +02:00
nowrep
7369e86a0a [SearchAction] Don't block Ctrl+F shortcut from pages
It is now possible to search in WebInspector with Ctrl+F

[ci skip]
2014-03-31 18:03:35 +02:00
nowrep
2d9dfa9db7 [WebInspector] WebInspector is now displayed inside WebTab
It no longer uses QDockWidget. Instead, it is plain QWidget with
close button in top right corner.
2014-03-31 17:57:35 +02:00
nowrep
7f3d8ee786 [Cleanup] Split src/lib/webview into tabwidget, webkit and webtab folders 2014-03-31 14:54:08 +02:00
nowrep
b73751f497 [GreaseMonkey] Cleanup of GM_Downloader code 2014-03-31 12:37:24 +02:00
nowrep
ed823d4d50 [ClosedTabsButton] No longer needed to have two copies of button
ClosedTabsButton is now permanent right corner widget
2014-03-31 11:50:07 +02:00
nowrep
5c8afde4d9 [Crash] Fixed crash in BrowserWindow::event
Closes #1273
2014-03-31 10:01:04 +02:00
nowrep
bfe08409b4 [PrivateBrowsing] Show PrivateBrowsing indicator as left corner widget in tabbar
Removed PrivateBrowsing icon in Status Bar
2014-03-31 09:50:54 +02:00
nowrep
da6ccdcee5 [ComboTabBar] Draw TabBarBase also on parts that are not QTabBar
Draw TabBarBase on left/right corner widgets and left/right scroll
buttons.
2014-03-31 09:47:47 +02:00
S. Razi Alavizadeh
b26d9b06ab [ComboTabBar] Fixed right scroll button being hidden on resize
When resizing window and triggering overflow, right scroll button
was hidden until the next resize event.
2014-03-30 16:42:13 +02:00
nowrep
b95da97904 [BrowserWindow] Move TabBar into NavigationContainer
Simplifies entering/leaving fullscreen, as it is only needed to
update visibility of the whole container.
2014-03-30 16:38:34 +02:00
nowrep
6e71ae3c54 [ClosedTabsManager] Save icon of closed tab
Instead of searching icon from database, save the icon of tab.
It will now correctly shows icon of not-yet loaded closed tab if
the url was not in database.
2014-03-30 12:47:13 +02:00
nowrep
a059c005ff [SBI_Icons] Added Zoom Widget to StatusBarIcons plugin
Closes #1197
2014-03-29 15:49:49 +01:00
nowrep
d6625c60fb [SBI_Icons] Update JavaScript icon state on startup 2014-03-29 15:48:50 +01:00
nowrep
9c67d874e7 [Translations] Updated plugins translations 2014-03-29 15:47:38 +01:00
nowrep
6812e020d6 [Qt5] Fixed hiding close button on current tab when dragging it
[ci skip]
2014-03-29 13:02:39 +01:00
nowrep
e598ee1230 [CaBundle] Updated ca-bundle.crt
[ci skip]
2014-03-27 22:32:41 +01:00
nowrep
543c3b8732 [Translations] Try to load Qt (qt_*.qm) translations from Qt path
Also removed all qt_*.qm translations that are part of official Qt
distribution.
2014-03-27 11:53:09 +01:00
Javier Llorente
458f6fecf0 [DownloadItem] Add date of completed download
[ci skip]
2014-03-26 16:20:43 +01:00
nowrep
9c7d6e9795 [BookmarksToolbarButton] Final fix for rendering issues with various styles
It now works correctly with Windows, Gtk+, Oxygen and Fusion theme with
both Qt4 and Qt5.
The only theme that doesn't work correctly is Bespin, because it draws
icon size animation upon hover, but we are drawing the icon and text
manually. I think there is not much to do with it actually...
2014-03-26 10:11:30 +01:00
nowrep
525c4ff5cf [MainMenu] Create toolbars and sidebars menu to fix shortcuts
Shortcuts for sidebars are now available even before first showing
sidebars menu
2014-03-26 10:10:33 +01:00
nowrep
586a9d2242 [OxygenFallback] Correctly initialize fallback icon theme
For some reason, QIcon::hasThemeIcon does not work correctly.
2014-03-26 10:05:27 +01:00
nowrep
4305b59028 [ProgressBar] Use update() instead of repaint()
update() does not trigger repaint immediately. It helps with
speed of restoring crashed session (progressbar does not need to be
refreshed for every restored tab immediately).

The same change was made for SiteIcon in PopupLocationBar
2014-03-25 17:06:50 +01:00
nowrep
545b3f9c54 [SessionRestore] Set override busy cursor when restoring session
TabWidget: Delete WebTab in closeTab() with deleteLater

[ci skip]
2014-03-25 16:55:33 +01:00
nowrep
a284a7c864 [SiteIcon] Don't set :pressed state when popup is not shown
Popup will not be shown eg. on qupzilla: sites
2014-03-25 16:53:41 +01:00
nowrep
fcfe2999f7 [WebView] Delete m_page in destructor
This should fix rare crash when closing tab.

[ci skip]
2014-03-24 21:21:07 +01:00
nowrep
e1661a88b5 [ClosedTabsButton] Hide by default
[ci skip]
2014-03-24 18:13:37 +01:00
nowrep
b9891a815b [LinuxTheme] Deleted now unused icons
Also added "edit-find" icon to oxygen-fallback
2014-03-24 18:07:56 +01:00
nowrep
d4e9682db1 [SiteIcon] Don't flicker when opening site info popup
Make sure the Down state doesn't change between clicking on icon
and opening popup.

[ci skip]
2014-03-24 17:07:25 +01:00
nowrep
174b4e8218 [Unix] Don't register SIGPIPE handler
[ci skip]
2014-03-24 16:28:28 +01:00
nowrep
f7a88a82f7 [Oxygen-fallback] Added bookmark-new-list icon 2014-03-24 16:23:21 +01:00
nowrep
c182dd6f34 [Icons] Removed unused icons 2014-03-24 16:16:35 +01:00
nowrep
ab638a5525 [IconProvider] Use fallback oxygen icon theme (in oxygen-fallback.qrc)
Instead of manually setting fallback icons, use globally fallback theme.
2014-03-24 16:09:30 +01:00
nowrep
3c0576fcfa [BookmarksToolbarButton] Improved rendering of bookmark button
It now correctly draws hover state. It now also supports shifting
contents for Down state
2014-03-24 12:51:42 +01:00
nowrep
a0dba6bd32 [BookmarksToolbarButton] Only fix down state rendering when button is folder
Eg. when the button has menu
2014-03-23 23:54:09 +01:00
nowrep
2e8c9f690e [SiteIcon] Support :pressed state for style sheets 2014-03-23 23:53:51 +01:00
Javier Llorente
539ade15b8 add es_ES language translated 2014-03-23 13:50:15 +01:00
nowrep
e10126d2a9 [TabWidget] Fix showing empty tab title when adding new tab
Regression from recent commits
2014-03-22 23:59:38 +01:00
nowrep
64b53baee3 [TabbedWebView] No need to override stop() method 2014-03-22 22:18:28 +01:00
nowrep
db2d879717 [WebHistoryWrapper] Removed unused WebHistoryWrapper class 2014-03-20 09:11:19 +01:00
S. Razi Alavizadeh
0b4be9055e [Windows] Fixed inserting QUnicodeControlCharacterMenu to contextmenu. 2014-03-20 01:14:36 +03:30
nowrep
e36697eedf [SearchEngines] Support for loading POST engines from LocationBar
Added new class LoadRequest, that holds network request with its
operation type and POST data.
2014-03-19 21:27:43 +01:00
korwru
d247fd9f74 Fix msvc compile issue m_navigationBar undeclared identifier 2014-03-19 15:38:14 +04:00
korwru
a1e849fd9a Fix msvc compile error m_usingTransparentBackground undeclared
identifier
2014-03-19 15:32:30 +04:00
korwru
2097ce08d3 Fix msvc compile issue with datapaths 2014-03-19 15:22:16 +04:00
korwru
75040eace2 Fix msvc compile issue in mainapplication use of undefined type
RegisterQAppAssociation
2014-03-19 15:14:01 +04:00
korwru
a4588a0c28 Fix msvc compile issue in tabwidget. 2014-03-19 15:01:53 +04:00
K0r5hun
8e0d849e01 Fix compile issue with plugins on msvc. 2014-03-19 14:38:16 +04:00
nowrep
f042ba9b88 [TabBar] Fixed showing 2 AddTab buttons when tabs overflows 2014-03-18 20:38:30 +01:00
nowrep
cbc3f4f875 [DuckDuckGo] Use new icon for DuckDuckGo search engine 2014-03-18 20:10:19 +01:00
nowrep
3d23f3eb02 [WebTab] Move more code into WebTab, instead of handling in TabWidget/TabBar
This also fixes showing tab icon after detaching tab
2014-03-18 20:00:34 +01:00
nowrep
27a3781ed0 [ComboTabBar] Move right/left containers to ComboTabBar class
It is now possible to set corner widgets of all tabbar, not only
main tabbar.
2014-03-18 17:35:44 +01:00
nowrep
96b6743ac6 [ClosedTabsButton] New button in the right corner of tabbar
Added icon for Linux theme.
But it needs a new icon for other themes...
2014-03-17 15:04:58 +01:00
nowrep
b3c40e6281 [SiteIcon] Correctly show first site icon 2014-03-17 11:04:26 +01:00
nowrep
5b6b6c6eaf [LoadingAnimation] New loading animation
Instead of using QMovie with GIF, one PNG file with all
frames is now animated.
Fixes issue with bad transparent background of previous GIF
animation.
2014-03-17 10:43:18 +01:00
nowrep
ebd501c9cd [SiteIcon] Show icon with small delay (100ms) 2014-03-17 09:08:36 +01:00
nowrep
a9eba60da2 [LocationCompleter] Pause updates when removing items from completer
Also adjust the size of popup after removing items + close it after
removing last item.
2014-03-16 17:24:10 +01:00
nowrep
20cd658274 [ProfileManager] Fix currentProfile() cutting last char of profile name 2014-03-16 15:31:19 +01:00
nowrep
b9c58b14b3 [AutoScroll] Force ArrowCursor when scrolling 2014-03-16 14:56:09 +01:00
nowrep
f9f74f3642 [LocationBar] Always show site icon in 16x16px 2014-03-16 14:33:56 +01:00
nowrep
e6baa54179 [Qt5] Fixed QIODevice::not open warning message 2014-03-16 14:30:59 +01:00
nowrep
43cb2d6b27 [LocationBar] Fixed crash in setGoIconVisible. Always check for m_webView 2014-03-16 13:56:27 +01:00
nowrep
dbec199ea8 Fixed building with Qt5 2014-03-16 13:55:37 +01:00
nowrep
fe0b03fdb7 Include QDebug in qzcommon.h
It's annoying to always include it just to remove a moment after...
2014-03-16 13:22:41 +01:00
nowrep
d464d9bdef [LineEdit] Create context menu in LineEdit
Instead of code duplication in LocationBar and WebSearchBar, create
the context menu from LineEdit.
Also actually create the menu, not just re-use the standardContextMenu.
2014-03-16 13:06:38 +01:00
nowrep
a701079d27 [LocationBar] Cleanup code + fixed showing rss icon 2014-03-16 12:12:49 +01:00
nowrep
6e53add7d7 [LocationBar] Set cursor position at start when showing long url
Also disable animations for Oxygen style, it breaks when changing
text to completely different one (eg. loading foo.com and then bar.com)
and the url is too long to fit in line
2014-03-16 11:21:24 +01:00
nowrep
caabbc237f [LocationBar] Tweaked Linux theme. No longer hardcode height
It is now specified only minimum height.
Fixes issue with locationbar being too small with bigger fonts.
2014-03-16 09:38:28 +01:00
nowrep
23a599ed75 [ComboTabBar] Fixed double clicking on scroll buttons with Qt5 2014-03-15 23:46:10 +01:00
nowrep
72904a80c3 [LocationBar] Major cleanup. New code to change color of text parts
The code to change color of host of url is completely new.
It doesn't use any paint hacks anymore. That means text in
locationbar will now be always rendered pixel perfect, as it would
with normal QLineEdit.

Cleanup in LocationCompleter. It is now using QCompleter in inline
mode to complete domain. It is still not ideal, eg. it refreshes
and show the domain completion with delay (job run in separate thread),
and sometimes it misses it completely.

WebSearchBar: Always complete when receiving suggestions. Fix issue
when suggestions were only showed after typing at least 2 characters.
2014-03-15 23:22:35 +01:00
nowrep
9c7e9a1396 Fixed building with Qt 4 2014-03-15 20:20:39 +01:00
nowrep
c395f19524 [BrowserWindow] Create shortcuts with QShortcut instead manually in keypress
This fixes eg. Ctrl+W writing W in locationbar
2014-03-15 19:58:19 +01:00
nowrep
7e57cb63f5 [LocationCompleter] Run completions search in separate thread
Currently, there is one issue with inline domain completion. It is
also searched from the separate thread, and thus it gets displayed
after a small delay.

Closes #1135
2014-03-15 19:36:03 +01:00
nowrep
8069573f08 [Crashlogs] Fix showing bad path when saving crashlogs
Regression from recent DataPaths commits
2014-03-15 19:16:58 +01:00
nowrep
0a622e325c [SqlDatabase] New implementation, hold connections for threads
Instead of using worker thread, use multiple threads with QtConcurrent,
and hold database connections for each thread.
2014-03-15 19:16:50 +01:00
nowrep
688e021fff [DatabaseWriter] Replace with new SqlDatabase class 2014-03-15 01:14:06 +01:00
nowrep
167ae2af50 [SqlDatabase] New class allowing to exec Sql queries in separate thread
It uses its own QSqlDatabase connection, which is supported according to
docs.
2014-03-15 01:03:06 +01:00
nowrep
16ff847a8b [Session] Use the same session with both Qt4 & Qt5
The issue with incompatible session were only with first alpha
releases of QtWebKit 2.3
2014-03-14 14:08:38 +01:00
nowrep
a2de6e1627 [ShowStatusBar] Fixed settings to show/hide Status Bar
Closes #1259
2014-03-14 13:33:33 +01:00
nowrep
fbafd56e90 [CaBundle] Update bundle + fix make_ca_bundle.sh script
make_ca_bundle.sh was actually appending all certs to the file.
As a result, there were duplicated certificates after multiple runs
of the script.
2014-03-14 12:27:10 +01:00
nowrep
83bb7c757c [CodeCleanup] Don't use m_isStarting and m_isClosing in BrowserWindow 2014-03-13 17:06:08 +01:00
nowrep
bd0cc0e121 [Crash] Fixed crash after closing some tabs (eg. GMail)
QWebPage::networkAccessManager should be cleared in destructor, to avoid
using it after it was already deleted

This is regression from recent commits
2014-03-13 16:15:23 +01:00
nowrep
b4d2ced60f [CodeCleanup] Cleanup Mac #ifdefs 2014-03-13 15:58:39 +01:00
nowrep
b52a84da3c [CreatingWindow] Don't disable updates when creating browser windows 2014-03-13 13:38:14 +01:00
nowrep
ae511eaa6c [Toolbars] Fixed toggle show Status Bar action
Closes #1259
2014-03-13 13:36:57 +01:00
nowrep
50e8bb071f [NetworkCache] Fix path for network cache 2014-03-13 12:53:19 +01:00
nowrep
34bb2a2097 [WebInspector] Use TabWidget::currentChanged(int) signal and check for invalid tab
TabWidget::currentChanged(int index) can be emited with  index == -1,
which means there are no tabs in tabbar. This may lead to crash after
accessing current webview (null)
2014-03-13 12:52:55 +01:00
nowrep
ea60478160 [Toolbars] Fixed possibility to hide both Navigation Toolbar and Menu Bar
If both Navigation Toolbar and Menu Bar are hidden, there is no way
to access Preferences and other actions from menu.
2014-03-13 12:31:08 +01:00
nowrep
9a6bb0444d [TabBar] Make sure adding new background tab make it visible in tabbar 2014-03-13 12:10:58 +01:00
nowrep
9fda55d86d [StatusBarIcons] Fixed crash when restoring session
All icons have now same parent SBI_Icon
2014-03-13 12:06:28 +01:00
nowrep
d2528417d1 [CodeCleanup] Removed all disconnectObjects() methods
I don't think we need this hack anymore.
2014-03-13 11:24:19 +01:00
nowrep
07cf7036df [ComboTabBar] When removing tabs, don't use timer for enabling updates
Also fixed Show Site Info action in SiteInfoWidget
2014-03-13 11:11:52 +01:00
nowrep
d109159408 [CloseOnLastTab] Instead of blocking closing tab, load new-tab-url 2014-03-13 11:11:15 +01:00
nowrep
22452aa825 [CloseOnLastTab] Changed behavior of "Don't quit upon closing last tab" option
It is now "Don't close window upon closing last tab", as it is more
reasonable to bind it to window, not the whole app.

Instead of loading the url-on-new-tab, it now simply blocks closing last
tab
2014-03-12 22:31:33 +01:00
nowrep
853e3905ee [Crash] Fixed crash after closing first app window
Always create BrowserWindow with MainApp::createWindow (even in MainApp
constructor).
Regression from recent commits.
2014-03-12 21:36:34 +01:00
nowrep
493edfc655 [AdBlockRule] Save some memory with dynamic allocation and removing member variables
m_regExpStrings are now also dynamically allocated only for RegExp rules
m_cssSelector is now merged with m_matchString (m_matchString was empty
for Css Rules)
2014-03-12 13:25:12 +01:00
nowrep
d3e8cbac97 Fixed building after recent commits
Closes #1257
2014-03-11 09:12:37 +01:00
nowrep
4fb58a6202 [Strings] Small changes in translation strings
Always use HTML in caps + don't translate file filters (.html here)
Use "Import and Export" everywhere
2014-03-10 21:37:20 +01:00
nowrep
34cb20e82a Updated translations 2014-03-10 20:55:31 +01:00
David Rosca
c580d4167b Merge pull request #1256 from pejakm/srtrans
[Translations] Update Serbian language
2014-03-10 20:43:37 +01:00
Mladen Pejaković
ecfc987b4f [Translations] Update Serbian language 2014-03-10 19:47:27 +01:00
nowrep
5ca0073410 [Translations] Fixed loading translations
Regression from recent commits
+ more cleanup
2014-03-10 19:41:44 +01:00
nowrep
e827249f50 [MainMenu] Added MainMenu class that holds all menu actions of window
All actions are now saved in QHash with name, this will make possible
to implement own keyboard shortcuts for actions.
+ WIP cleanup of BrowserWindow class
2014-03-10 16:55:11 +01:00
nowrep
fb2629898b [TabBar] Don't draw base. Should help with Qt5 Fusion style
Also small changes in MainApplication
2014-03-10 09:38:16 +01:00
S. Razi Alavizadeh
d14655a3ab [ComboTabBar] Don't emit overflowChanged when not necessary 2014-03-10 09:36:37 +01:00
nowrep
2e9ce1ba90 [CodeCleanup] Major cleanup in MainApplication class 2014-03-10 00:47:07 +01:00
nowrep
969f262cf8 [DataPaths] Don't add trailing slash to paths
Qt API is not adding trailing slashes to dir paths either.
2014-03-09 22:17:13 +01:00
nowrep
214279e3bb [DataPaths] Added new class DataPaths
This class holds all paths now (instead of MainApplication)
Renamed ProfileUpdater -> ProfileManager
ProfileManager is now responsible for all operations with profiles
2014-03-09 21:51:42 +01:00
nowrep
985db8a35d [AdBlockManager] Use Q_GLOBAL_STATIC for AdBlockManager 2014-03-09 12:54:23 +01:00
nowrep
a3c3dead87 [CodeCleanup] Get rid of Qz::AppMessage enum 2014-03-09 12:54:07 +01:00
nowrep
a61ce67d7c [SpellCheck] Cleanup: Speller class is now singleton
All spellcheck is now where it belongs, under spellcheck directory
2014-03-08 14:21:08 +01:00
nowrep
0e9fcc2113 [Building] Fixed building on Qt 5 & without Hunspell
BookmarksExportDialog: Align "Format" label to the right
2014-03-07 23:59:12 +01:00
nowrep
875d48b580 [Bookmarks] Save bookmarks after restoring defaults 2014-03-07 23:21:06 +01:00
nowrep
9764cea3a3 [ToolButton] ShowMenuInside option needs own aboutToShowMenu signal 2014-03-07 23:20:31 +01:00
nowrep
417da146e5 [QzTools] Make QzTools class and export only the class
Also fixed building on Windows
2014-03-07 22:54:50 +01:00
nowrep
fdf4fcc54e [main.cpp] SIGPIPE is not needed to be handled in signal_handler 2014-03-07 18:57:42 +01:00
nowrep
f558a836b0 [Code] Create singletons with Q_GLOBAL_STATIC macro 2014-03-07 18:24:13 +01:00
nowrep
edbb87bd1f [CodeCleanup] IconProvider now have static methods for getting icons 2014-03-07 18:03:42 +01:00
nowrep
e0780b7779 [CookiesTest] Make the test pass after last commit 2014-03-06 17:07:58 +01:00
nowrep
d0d1fa1844 [Session] Save session to QByteArray and then write it to file
Instead of appending data to file, write all session data at once.
This should help preventing corrupting session.dat file.

Closes #1247
2014-03-06 16:18:58 +01:00
nowrep
f33552320f [AutoSaver] Rework AutoSaver so each object can use own instance
Instead of saving everything in MainApp::saveStateSlot, save each object
separately. As a result, this will save a lot of writes to disk.

Other changes includes:
Saving bookmarks also in private mode. Closes #1208
Cleanup of code
2014-03-06 16:12:36 +01:00
nowrep
c0311d7ee8 [Building] Include defines.pri after Qt modules are added
Fixes regression from 74883f8af4
Closes #1253
2014-03-05 19:00:53 +01:00
nowrep
74883f8af4 [Building] Use QZ_DESTDIR variable for $SRC/bin directory
Should fix problems with shadow builds.
Closes #1252
2014-03-04 15:14:19 +01:00
nowrep
688455158c [Bookmarks] HtmlImporter: Fixed filter for html files
See #1228
2014-03-04 14:16:58 +01:00
nowrep
29f20ae520 [Building] Don't require ending slash in USE_LIBPATH and QUPZILLA_PREFIX options 2014-03-03 15:08:52 +01:00
nowrep
a7d382ee42 [Cleanup] Use QZ_WS_X11 only for X11 specific code
In other cases, use Q_OS_UNIX for determining UNIX platform.
UNIX platfroms without X11 should benefit from this commit, including
MAC and UNIXes on Wayland.
2014-03-03 14:47:47 +01:00
nowrep
82ca226127 [Code] Use QTime::elapsed() for timing 2014-03-03 12:55:35 +01:00
nowrep
12948cd0a4 [DNT] Enable sending DoNotTrack header by default 2014-03-02 22:42:10 +01:00
nowrep
c7a31c57e0 [CodeCleanup] Use QMouseEvent::button() in mouse release events
In press/move events, use QMouseEvent::buttons() instead
2014-03-01 14:12:50 +01:00
nowrep
5ad76995a2 [BookmarksSidebar] Enable only SingleSelection in sidebar 2014-03-01 14:06:44 +01:00
nowrep
b826ebc52a [LocationCompleter] Support Ctrl / Shift activation of items
Ctrl activation: Opens url in new tab
Shift activation: Opens url in new window
Closes #1245

Bookmarks: Update visit count also from location completer
BookmarkItem: Added new method updateVisitCount
2014-03-01 14:05:44 +01:00
Mladen Pejaković
8f9f187b80 Fix regression after 2a6896e57f 2014-03-01 00:22:55 +01:00
Mladen Pejaković
b18ac632df [HistoryMenu] Improvements 2014-02-28 21:12:25 +01:00
nowrep
a9bce8c775 [Code] Moved history menu into separate HistoryMenu class 2014-02-27 22:53:56 +01:00
nowrep
5e4f703ef2 [Code] Renamed qz_namespace.h to qzcommon.h 2014-02-26 20:03:20 +01:00
nowrep
3650aac9ff [Code] Little cleanups after rename QupZilla -> BrowserWindow 2014-02-26 19:55:49 +01:00
S. Razi Alavizadeh
84ef3e9fda Fixed, renamed QupZilla class to BrowserWindow everywhere 2014-02-25 22:06:13 +03:30
nowrep
b6181315f7 [AdBlock] Don't add domain css rules to sites whitelisted with $document option
Closes #1246
2014-02-25 12:12:27 +01:00
nowrep
4133106988 [PinnedTabs] Restore pinned tabs also when not restoring session
Closes #1239
2014-02-24 11:38:18 +01:00
Mladen Pejaković
9b7ecf1d12 [TabBar] Comment fix 2014-02-23 14:54:22 +01:00
Mladen Pejaković
5d23a21f37 [TabBar] Option to show/hide close button on inactive tabs. Closes #1220 2014-02-23 14:49:32 +01:00
nowrep
7d98a162d6 [Code] Fixed cppcheck issues 2014-02-22 15:23:46 +01:00
nowrep
5cf7d0b9a9 [Bookmarks] Add new action to open bookmarks in private window
Closes #995
2014-02-22 15:20:54 +01:00
Mladen Pejaković
131eef5c9d Open links in private window. 2014-02-22 14:57:22 +01:00
nowrep
eb9b2635d5 [ButtonWithMenu] Fixed selectPreviousItem not selecting first item 2014-02-20 17:06:21 +01:00
nowrep
77e8afb5ec [Bookmarks] Force icons visible in bookmarks menu
For example, Gnome3 has icons hidden in menu by default

Closes #1215
2014-02-20 16:56:08 +01:00
nowrep
afae00e4a2 [Cleanup] Rename export macro to just QUPZILLA_EXPORT 2014-02-19 22:12:32 +01:00
nowrep
404fa68a1b [Cleanup] Renamed QupZilla class to BrowserWindow 2014-02-19 22:07:21 +01:00
nowrep
118478351f [AutoScroll] Set window title of settings dialog 2014-02-19 21:39:34 +01:00
nowrep
c7cf42f0a4 [AutoScroll] Set minimum value of divider to 1.0 2014-02-18 17:52:20 +01:00
nowrep
47fe951001 [Translators] Added Juan Carlos Sánchez into translators 2014-02-18 17:50:55 +01:00
nowrep
a4541da935 [Plugins] Updated translations 2014-02-18 17:23:14 +01:00
nowrep
1f7628ff05 [AutoScroll] Added settings - option to change scroll divider value 2014-02-18 17:21:31 +01:00
nowrep
65a47fd450 [LocationCompleter] Speedup searching in Bookmarks & History
See #1135
2014-02-18 16:17:22 +01:00
nowrep
7323fb1cad [AutoScroll] Add scrolling icons (from Oxygen cursor theme)
Also scroll timer interval is now 10 msecs, so scrolling will be a
little faster.
2014-02-18 15:16:03 +01:00
nowrep
e5240bcc8e [AutoScroll] Added AutoScroll plugin
I'm still looking for some icon. For now, only red square is shown.
2014-02-17 20:00:40 +01:00
David Rosca
22e195b621 Merge pull request #1218 from pejakm/sdfix
[SpeedDial] Fix overlay text input visibility with dark themes
2014-02-17 12:15:55 +01:00
nowrep
b8f8e3753f [Bookmarks] Added Export dialog + HTML Bookmarks Exporter 2014-02-17 12:13:26 +01:00
nowrep
daa3f07426 [FirefoxImporter] Support importing full bookmarks structure 2014-02-16 15:39:59 +01:00
Mladen Pejaković
091f4ab6a6 [SpeedDial] Fix overlay text input visibility with dark themes 2014-02-15 23:50:54 +01:00
nowrep
680ed27c22 [BookmarksImportDialog] Draw separators in imported bookmarks treeview 2014-02-15 22:18:11 +01:00
nowrep
763183be88 [OperaImporter] Support importing full bookmarks structure 2014-02-15 22:07:52 +01:00
nowrep
650558dea6 [ChromeImporter] Support importing full bookmarks structure 2014-02-15 20:53:03 +01:00
Mladen Pejaković
3eede1d8a2 Rework list of closed tabs 2014-02-15 18:49:48 +01:00
nowrep
5301495966 [BookmarksImport] Added back button to import dialog + other small changes
Also moved all bookmarks import classes to bookmarks/bookmarksimport
2014-02-15 01:49:12 +01:00
nowrep
09893f20b4 [BookmarksImport] Create new base BookmarksImporter class
Also moved all importers into bookmarks/import folder
2014-02-15 00:17:31 +01:00
nowrep
23b55d9158 [BookmarksImport] Show full structure of imported bookmarks
BookmarksModel can now be used with arbitrary root item independently
of main bookmarks root item.
2014-02-14 21:13:08 +01:00
nowrep
167e80f59a [SaveSettings] Don't save settings twice on app close 2014-02-14 20:29:41 +01:00
nowrep
d422ce3767 [Models] Decrease the delay for filtering to 300ms 2014-02-14 20:28:25 +01:00
nowrep
f9d3c102ec [Cleanup] QTimer::start() restarts timer if it is already running 2014-02-14 19:31:35 +01:00
nowrep
a99f954930 [ReloadStopButton] Instead of pausing updates, only update the button after delay 2014-02-14 19:28:41 +01:00
S. Razi Alavizadeh
35f1799e59 [ComboTabBar] Fix tabAt function for RTL languages 2014-02-14 18:48:16 +01:00
nowrep
907386b921 [Sslv3Sites] easylist-downloads.adblockplus.org shouldn't be there 2014-02-14 10:53:19 +01:00
nowrep
94c32ae235 [FreeBSD] Link to execinfo 2014-02-14 10:51:27 +01:00
nowrep
363cd01016 [AdBlockDialog] Show error if subscription can't be loaded 2014-02-14 10:38:43 +01:00
nowrep
4aa4864c06 [OS/2] Fixed build of StatusBarIcons 2014-02-13 22:16:32 +01:00
nowrep
9ae0352548 [SslV3Sites] Added possibility to change list of sites in settings.ini
In settings.ini: Web-Browser-Settings/SSLv3Sites

Also added sermapa.es to default list
2014-02-13 20:46:15 +01:00
nowrep
d005505dba FreeBSD build patches
Imported from http://svnweb.freebsd.org/ports/head/www/qupzilla/files/
See #1206
2014-02-13 20:17:57 +01:00
nowrep
156a14dfb6 [Windows] Use %LOCALAPPDATA% only if user doesn't have config in older paths 2014-02-13 20:17:57 +01:00
nowrep
84eea976c2 [Building] Fixed building on OS/2 2014-02-13 20:17:56 +01:00
nowrep
a22b40db9d Updated translations from Transifex 2014-02-13 17:06:15 +01:00
nowrep
5e131033e6 [Flicker] Another set of flicker patches
Old approach caused navigationbar to be empty for a moment while
opening a lot of tabs at once
2014-02-13 17:06:09 +01:00
nowrep
6a4a41a5d9 [TabBar] Don't show tab previews while dragging tabs 2014-02-13 17:06:09 +01:00
nowrep
3ec9e0b893 [TabListButton] Show popup menu inside window for tab-list button in tabbar 2014-02-13 17:05:50 +01:00
nowrep
851e19ce01 [Bookmarks] Fixed assert when migrating bookmarks
Assert when user had bookmark with folder that doesn't exists
Also save bookmarks as soon as they are migrated

Closes #1213
2014-02-13 16:35:52 +01:00
S. Razi Alavizadeh
b880a920ff [Windows] Fixed PROFILEDIR when using Qt4. 2014-02-13 17:23:20 +03:30
nowrep
fa091d77f2 [ComboTabBar] Fixed drawing tabbar with only pinned tabs
Regression from e2dcf4d525affddf280ff1dfd36468a782fa3332
2014-02-13 14:48:02 +01:00
David Rosca
14923a728e Merge pull request #1210 from javierllorente/recoverywidget
make 'Windows and Tabs' a translatable string
2014-02-13 03:13:10 +01:00
nowrep
884cde6abf [LocationBar] Don't ever set cursor location to start
Probably fixes #1212
2014-02-13 02:41:13 +01:00
Javier Llorente
49d9889fcd make 'Windows and Tabs' a translatable string 2014-02-12 17:46:11 +01:00
S. Razi Alavizadeh
f52d5fa234 [Themes][RTL] Use correct icons for tabbar scroll buttons.
- also fixed compile issue on Windows.
2014-02-12 19:41:05 +03:30
nowrep
d17584d944 [ComboTabBar] Rework tab scrolling animation
Using OutQuad easing curve and restarting animation on new wheel events
make the scrolling feel a lot better.

Wheel scrolling behavior:
horizontal wheel event: slower scrolling
vertical wheel event with control modifier: faster scrolling
vertical wheel event with other(+no) modifiers: fast scrolling
2014-02-12 16:28:12 +01:00
nowrep
f5955c7b92 [Window] Disable updates when showing/hiding toolbars 2014-02-12 14:23:23 +01:00
nowrep
7cefc22c0a [Flicker] Fixed flicker when opening new tabs with sites that loads instantly
Eg. this happens for internal qupzilla: pages
Also early set locationbar's url to newly opened tab's url.
2014-02-12 13:50:06 +01:00
nowrep
96b5ec1c50 [NewTabFlags] Fixed incorrect usage of Qz::NewTabPositionFlags 2014-02-12 13:49:48 +01:00
nowrep
79cd4e381d [TabTooltips] Fixed tooltips disappearing on (un)pinning tabs 2014-02-12 12:11:09 +01:00
nowrep
801284eda0 [BookmarksToolbar] Don't hardcode height of buttons
Also don't "hide" (=resize only to layout spacing * 2) toolbar
when there is no bookmark in it.
2014-02-12 11:42:01 +01:00
nowrep
9eb36830b2 [TabPreview] Disable tab previews by default
They are too intrusive, so don't force them by default
2014-02-12 11:28:18 +01:00
nowrep
9b6db07b9c [BookmarksToolbar] Fixed window flicker when showing toolbar 2014-02-12 11:26:02 +01:00
nowrep
896ab6bac9 [Shortcuts] Ctrl+W shortcut no longer closes a pinned tab
Pinned tab can now only be closed from tab context menu
2014-02-12 11:16:57 +01:00
nowrep
4d211e0098 [ComboTabBar] Hopefully fixed all issues with wrong mouseover state for tabs
Repaint the whole tabbar on enter and leave events, so all tabs are
rendered with correct mouseover state.
2014-02-12 11:16:06 +01:00
nowrep
0da5bf7994 [ListItems] Apply workaround only for Fusion style
It actually breaks other styles ...
Fixes 2105b48ca4
2014-02-11 22:53:06 +01:00
nowrep
dab7c82ae8 [WebView] Another approach to window.onbeforeunload handling
Don't try to load empty url just to check for beforeunload event.
Explicitly evaluate the window.onbeforeunload function instead.
2014-02-11 22:25:32 +01:00
nowrep
dc6f71a1b8 [Preferences] Update default settings on some options
TabsOnTop: Enabled by default
DontLoadTabsUntilSelected: Enabled by default
AfterLaunch: Restore session is now default
2014-02-11 15:44:47 +01:00
nowrep
653db8f4bf [Json] Implement bool values
This fixes expanded state with QScriptEngine Json parsing
2014-02-11 15:34:51 +01:00
nowrep
d4d31d2daa [Bookmarks] Improved drawing of separator
Instead of QFrame::Line, use actual ToolbarSeparator.
Also add separator into toolbar for default bookmarks.json
2014-02-11 15:33:02 +01:00
nowrep
2105b48ca4 [ListItems] Fixed drawing of ListItems with Qt5 Fusion style 2014-02-11 14:54:18 +01:00
nowrep
6d7761ebe9 [BookmarksTreeView] Show focus on whole row, not each column separately 2014-02-11 14:34:02 +01:00
nowrep
22f523da4a [SearchEngines] Correctly set DuckDuckGo as default engine 2014-02-11 14:17:21 +01:00
nowrep
47496501eb [ComboTabBar] Correctly set height of pinned tabbar
Both tabbars will now have the same height.
This commit fixes incorrect drawing of line under pinned tabs when
moving tabs with Oxygen theme.

Also removed unused maxVisiblePinnedTabs property
2014-02-11 10:55:05 +01:00
nowrep
3d2f2ff8fb [BookmarksToolbar] Clear button's mouseouver state after closing menu 2014-02-11 10:24:44 +01:00
nowrep
ed13086e1d [ComboTabBar] Fixed draw issues with Oxygen theme
Always draw a selected tab in paint event. If the tab is not active,
let's just move the selected tab outside the tabbar's rect
2014-02-11 10:24:00 +01:00
nowrep
c1293fca3f [Windows] Use %APPDATA% for PROFILEDIR
Also show warning message when using deprecated config path ~/.qupzilla
2014-02-11 09:40:47 +01:00
nowrep
35fb5cecad [Json] Removed dependency on QJson
QtScript is now used instead of QJson. QtScript is available on both
Qt 4 & Qt 5 and also as side benefit, is TWICE as fast as QJson!
2014-02-10 23:33:12 +01:00
nowrep
4e8c0adbad [LocationBar] Don't incorrectly show about to be loaded url when it was not accepted
It can happen for example when trying to change address on a page that
handles window.onbeforeunload event
2014-02-10 21:58:25 +01:00
nowrep
28091f4957 [Menus] Menus are not closed when opening links with middle mouse button
It is the same behaviour as in Konqueror
Closes #1165
2014-02-10 21:36:24 +01:00
nowrep
0b8b969535 [Bookmarks] Fixed migrating bookmarks
Folders in unsorted bookmarks were lost during migration
2014-02-10 21:12:08 +01:00
nowrep
018d7ec098 [MinGW] Some fixes for MinGW building 2014-02-10 20:49:54 +01:00
nowrep
d91e6ef5a7 [ComboTabBar] Fix flickering when (un)pinning tabs 2014-02-10 20:06:09 +01:00
nowrep
ea7237b90e [Downloads] Make sure to always add slash '/' between path and filename 2014-02-10 19:57:02 +01:00
nowrep
f7806bed7d [ComboTabBar] Fixed incorrectly changing current index when closing tabs in inactive tabbar. 2014-02-10 19:49:09 +01:00
nowrep
818afc1398 [ClosedTabs] Fixed saving closed tabs after 1fd1691ee2 2014-02-10 19:27:58 +01:00
nowrep
51498fdb6e [ClosedTabsManager] Use QLinkedList for storing closed tabs
The operations prepend() and takeFirst() are O(1) in linked list
2014-02-10 19:26:38 +01:00
nowrep
b88bbe4fc8 [WebView] Better window.onbeforeunload handling
Let's first quickly check whether window.onbeforeunload is not null,
and then try to load empty page.
Always loading empty page was quite heavy, because it needed to clear
all web contents, it also fired loading signals, ...
2014-02-10 18:38:47 +01:00
nowrep
d328ad2023 [Bookmarks] New JSON backend supports multi-level folders and more...
Merge branch 'bookmarks'

Closes #458
2014-02-10 18:13:38 +01:00
nowrep
a19164c1f9 [Bookmarks] Final cleanup 2014-02-10 17:55:05 +01:00
nowrep
283960f33e [Bookmarks] Added default bookmarks.json file
Default browsedata.db now also contains icons for default bookmarks.
2014-02-10 17:51:52 +01:00
nowrep
c39c8d66fb [BookmarksToolbar] Dropping url on folder adds bookmark to this folder
Also allow to drop only url (when text in MimeData is missing)
2014-02-10 17:13:19 +01:00
nowrep
75f3460a27 [Bookmarks] Automatically migrate bookmarks from SQLite to JSON 2014-02-10 16:58:43 +01:00
nowrep
ad615316c8 [Bookmarks] Cache bookmark's icon for 20 seconds
BookmarksToolbarButton: Draw button according to BookmarkItem, not
text and icon properties
2014-02-10 16:03:29 +01:00
nowrep
338a6f991e [BookmarksSidebar] Activate bookmarks on mouseRelease
So it doesn't interfere with bookmarks reordering
2014-02-10 15:09:51 +01:00
nowrep
1d822d3a03 [Bookmarks] Importing bookmarks now works
It will however need a complete rewrite, the code is really bad.
HtmlImport: Supports importing bookmarks with full structure
2014-02-10 14:57:48 +01:00
nowrep
284e58ebca [Bookmarks] Cleanup in Bookmarks class 2014-02-10 12:58:34 +01:00
nowrep
6ab92b39bc [Bookmarks] Bookmarks Toolbar is now working 2014-02-10 11:54:58 +01:00
S. Razi Alavizadeh
1c8b25fbb7 [Mac] Fixed toggleFullScreen 2014-02-10 04:31:42 +03:30
nowrep
946354a15d [Bookmarks] Load default bookmarks on error 2014-02-09 18:55:11 +01:00
nowrep
b915439ba6 [Bookmarks] Activate bookmarks with single click in Sidebar 2014-02-09 18:53:21 +01:00
nowrep
9a5a795449 [LocationCompleterModel] Simplify createQuery function
It is no longer needed to search for bookmarks in database
2014-02-09 17:35:43 +01:00
nowrep
b3c4d5d8da [Bookmarks] Draw separators in BookmarksTreeView 2014-02-09 17:27:55 +01:00
nowrep
549e20a31d [Bookmarks] Implement searching in BookmarksTreeView 2014-02-09 15:44:38 +01:00
nowrep
395b865d55 [Bookmarks] Various smaller changes
BookmarksTreeView: Select & ensure visibility of newly added bookmark
BookmarksTools: Added function to open folder in tabs
LocationCompleterModel: Removed bookmarks bits in createQuery
QupZilla: loadAddress now opens new tab if current tab is pinned
2014-02-09 15:09:04 +01:00
nowrep
d21d6c43a0 [ComboTabBar] Fixed flickering when removing tabs from tabbar 2014-02-09 14:26:03 +01:00
nowrep
83b8b0b666 [Bookmarks] LocationCompleter now works
BookmarkItem: Added counting of bookmark's visits
2014-02-09 13:34:52 +01:00
nowrep
877eefec22 [Bookmarks] Clean dead code in Bookmarks & TreeWidget 2014-02-09 12:43:06 +01:00
nowrep
2ea155560a [Bookmarks] Removed BookmarksTree and renamed BookmarkIcon -> BookmarksIcon 2014-02-09 12:22:49 +01:00
nowrep
1f4272e45e [Bookmarks] BookmarksIcon & PopupWidget are now working 2014-02-09 12:18:52 +01:00
nowrep
511a6e1cd7 [Bookmarks] BookmarksSidebar is now working 2014-02-09 11:02:51 +01:00
nowrep
973014ae89 [EnhancedMenu] Rename signals to ctrlTriggerd and shiftTriggered 2014-02-09 01:14:00 +01:00
nowrep
bb6ead3ad4 [Bookmarks] Bookmarks menu is now working 2014-02-09 01:09:08 +01:00
nowrep
a805f19f13 [Bookmarks] Add bookmarks dialogs are now working 2014-02-08 23:01:01 +01:00
nowrep
1536cd0c46 [Bookmarks] Save bookmarks with AutoSaver
Also implement loading & saving expanded property of top-level
internal folders (toolbar, menu, unsorted).
2014-02-08 21:11:13 +01:00
Javier Llorente
d00fdd007b Use up/down arrows instead of back/forward on search toolbar 2014-02-08 20:33:15 +01:00
nowrep
9348f1d4fc [Bookmarks] BookmarksManager now supports adding & removing bookmarks 2014-02-08 20:01:07 +01:00
nowrep
92aedc3e0f [Bookmarks] BookmarkItem: Added convenience functions isType 2014-02-08 18:28:01 +01:00
nowrep
8c3623e633 [Bookmarks] BookmarksManager now uses new BookmarksTreeView 2014-02-08 18:14:38 +01:00
nowrep
181de48f68 [Bookmarks] Added BookmarksTreeView class 2014-02-08 18:14:20 +01:00
nowrep
da970b274d [QJson] Check for QJson headers in /usr/include/qjson
Also hopefully fix the QJSON_HAVE_INDENT check
2014-02-08 00:47:03 +01:00
nowrep
eef8741b4b [QJson] Hack to check for Indent support
There is no library version available in header files, so this is
the only solution to fix building on Debian stable
2014-02-08 00:19:22 +01:00
Javier Llorente
c84f3d2366 [Theme] Use theme icon for Exit Fullscreen button in toolbar 2014-02-07 23:14:32 +01:00
nowrep
9271b70802 [Bookmarks] Added BookmarksModel 2014-02-07 22:48:30 +01:00
nowrep
c9a556658a [Json] Use built-in QJSonDocument class in Qt 5 2014-02-06 22:24:10 +01:00
nowrep
03186060aa [Bookmarks] New bookmarks backend using JSON format
New format is compatible with Chromium's Bookmarks file.
It will support everything as the current backend +
 * multi-level bookmarks
 * bookmark description
 * bookmark keyword
 * remember expanded state (for folders)

NOTE: It is NOT yet complete. There is a LOT of work still needed.
Only bookmarks loading + saving and internal tree representation is
done.
2014-02-06 17:13:05 +01:00
nowrep
371306cd3c [Code] Various cleanups in Bookmarks code 2014-02-05 17:52:14 +01:00
nowrep
fe9ecbbbaa [Code] Renamed BookmarksModel class to Bookmarks
It actually is not model. BookmarksModel name will be needed for future
Bookmarks DataModel class.
2014-02-05 15:26:51 +01:00
nowrep
8f5c422759 [AdBlock] Fixed incorrect handling of non-trivial exception rules
News are loading fine now on http://abcnews.go.com/
2014-02-05 14:28:44 +01:00
nowrep
98307a01dc [Mac] Disable building of QtWebKit-Plugins
It doesn't work as of now and we also don't have linking to hunspell
working either. So let's just disable it for now.
2014-02-04 23:21:19 +01:00
nowrep
f19110c302 [Mac] Disable DBus as it is not available in Qt 5 2014-02-04 23:04:06 +01:00
nowrep
f824a81da3 [ProfileUpdater] Don't overwrite settings.ini on incompatible profile data 2014-02-04 23:03:21 +01:00
nowrep
2261ed4b79 Fixed previous commit
Ooops, it should actually check the return value, not just ignore it...
2014-02-04 14:52:39 +01:00
nowrep
9fd168934e [coverity] Fixed Unchecked return value from library 2014-02-04 14:48:34 +01:00
nowrep
b2b6d198f7 [SearchEngines] Fixed issue with default engine when more engines have same name 2014-02-04 00:43:25 +01:00
nowrep
ffa1e0561f [OpenSearch] Added support for external.AddSearchProvider js function 2014-02-04 00:02:09 +01:00
nowrep
cb99a3154e [SpeedDial] Fix issues with loading a missing preview on load
Missing previews are now loaded after the page has been loaded (from
JavaScript code), instead of loading being started on generating
initial script (from C++ code)
2014-02-03 23:50:53 +01:00
nowrep
1a5fc6a1a1 [ExternalJsObject] Add window.external Js object to all pages
SpeedDial is now available with external.speeddial
2014-02-03 23:50:18 +01:00
nowrep
aa6aea1399 [coverity] Followup fixes
webview.cpp: Fixed pointer to local outside scope
bookmarksmodel.cpp: Unchecked return value
2014-02-03 00:29:51 +01:00
nowrep
5b55d5b483 Add build option to disable new version checking
Closes #1184
2014-02-02 16:21:48 +01:00
nowrep
cfddd6d4e1 [NetworkManager] Also add centrum.cz to SslV3 sites list 2014-02-01 22:45:48 +01:00
nowrep
ad1296e170 [NetworkManager] SSL workaround: use correct domain matching 2014-02-01 21:07:42 +01:00
nowrep
ee91727cb2 [NetworkManager] Use list of old servers that doesn't understand TLSv1 handshake
Force SslV3 for those old servers.

Closes #1176
Closes #1141
Closes #1080
2014-02-01 20:58:20 +01:00
nowrep
260447e414 [coverity] Fixes for issues found by scan.coverity.com 2014-02-01 19:21:49 +01:00
nowrep
08929228bd [CodingStyle] TabStackedWidget::isValid should be private
And also choose better name - validIndex
2014-01-29 21:15:04 +01:00
nowrep
0d2db81ffa OS/2 + Windows: Don't build KDE/Gnome password plugins.
OS/2: Correctly link to libcrypto
BUILDING: Make a note about gdb being requirement for debug build
2014-01-27 22:30:55 +01:00
Mladen Pejaković
77d10dbec7 [Translations] Serbian files update 2014-01-27 15:27:33 +01:00
nowrep
15844ceeab Fixed building 2014-01-27 00:31:48 +01:00
nowrep
a0117e6313 Updated copyright to 2014 2014-01-26 19:13:17 +01:00
nowrep
585da812dd Development version 1.7.0 2014-01-26 19:12:34 +01:00
nowrep
80e4575517 [Translations] Updated translations from Transifex
Also removed incomplete (less than 60%) translations
2014-01-26 18:46:45 +01:00
nowrep
3b097c8da1 [WebView] Bookmark Link action now uses a.title as bookmark title
Closes #1131
2014-01-26 11:21:53 +01:00
nowrep
142407be21 [WindowsJumpList] Add new entry "Open new private window"
Closes #1155
2014-01-25 22:06:19 +01:00
nowrep
b6683ab6b9 [DownloadManager] Change "Remove" -> "Remove From List"
Closes #1162
2014-01-25 21:57:05 +01:00
nowrep
b4377767c0 [AdBlockTreeWidget] Greatly speedup loading rules from subscriptions
Don't use per-pixel scrolling. For some reason, it massively slows
rendering of TreeWidget

See #1169
2014-01-25 21:13:14 +01:00
nowrep
4a7423b02f [AdBlockDialog] Change AdBlockDialog to QWidget
Closes #1169
2014-01-25 20:06:08 +01:00
nowrep
d5ea5342cf [SBI_JsIcon] Fix after 36724df3a6
Closes #1174
2014-01-25 17:48:30 +01:00
nowrep
5230554943 [code] Coding style 2014-01-25 17:47:21 +01:00
nowrep
29b6b93dd4 [Portable] Portable mode can now be enabled with commandline option
It is not needed to rebuild for Portable mode.
However, it is still possible to enforce portable mode with
PORTABLE_BUILD build option.
2014-01-23 13:02:07 +01:00
nowrep
a1f9b784d7 [CommandLineOptions] New option to toggle fullscreen. 2014-01-22 17:34:25 +01:00
nowrep
a1a0764101 [CommandLineOptions] Change Qt url to qt-project.com 2014-01-22 17:11:17 +01:00
nowrep
555453a7e2 [ComboTabBar] Fixed isOverflowed() for empty tabbar.
It returned true for empty tabbar. Switching tabs with
mouse wheel now works correctly in all scenarios.
2014-01-22 16:57:04 +01:00
nowrep
5c235f6775 [Buttons] Use QPushButton for buttons with menu everywhere 2014-01-22 15:39:32 +01:00
nowrep
8eea60fe6a [AdBlockDialog] Options button is now QPushButton
Qt renders better down icon indicating the button has menu
2014-01-22 15:31:42 +01:00
nowrep
31afc8aee6 [KWalletPasswords] Build only with Qt4.
Also show better error message when loading plugin fails
2014-01-21 23:53:45 +01:00
nowrep
b347d00479 [CloseDialog] Fixed string in window close dialog.
Are you sure to quit QupZilla -> Are you sure to close this window
2014-01-21 23:09:53 +01:00
nowrep
ebb81409ff [Preferences] Network cache value can now be 20-200 MB
Increase the maximum cache size. See #1139
2014-01-21 23:06:30 +01:00
nowrep
36724df3a6 [QupZillaPages] Always enable JavaScript for qupzilla: pages
Closes #1150
2014-01-20 12:46:39 +01:00
nowrep
354b9d1695 [Preferences] Lazy reload of MainApp preferences
Re-setting user stylesheet with a lot of AdBlock hiding rules
takes quite some time for QtWebKitSettings.
2014-01-18 11:41:08 +01:00
nowrep
c026594175 [WebView] Enable Undo/Redo actions in context menu by default 2014-01-17 21:45:33 +01:00
David Rosca
b3031671bc Merge pull request #1129 from pejakm/undoredo
[WebView] Option to add Undo/Redo menu actions to forms
2014-01-17 12:43:30 -08:00
nowrep
bcaecbdde1 [Translations] Correctly load translation for non-translated countries
Closes #1152
2014-01-17 21:39:02 +01:00
Mladen Pejaković
a15dc3e3d6 [BookmarksWidget] Fix translation string 2014-01-16 15:39:14 +01:00
Mladen Pejaković
aa83f23848 [RSSWidget] Ability to mark feeds already added 2014-01-12 17:47:59 +01:00
nowrep
7cb39aed0b [TabBar] Added option to always switch tabs using mouse wheel
It will switch tabs even when tabs are overflowing.
2014-01-12 16:39:23 +01:00
nowrep
bfe9331579 Added missing copyright to squeezelabel and sbi_proxywidget 2014-01-11 16:56:33 +01:00
Jonathan Hooverman
d917f43cf0 Updated copyright year to 2014 2014-01-11 16:11:42 +01:00
Mladen Pejaković
47fee7b3b2 [Translations] Plural for number of opened tabs. Closes #1143 2014-01-09 22:53:01 +01:00
nowrep
2d2f198846 [TabBar] Show tooltips on tabs when tab previews are disabled 2014-01-09 10:22:06 +01:00
Mladen Pejaković
1cafad9ed4 [Autofill] Thematic changes 2014-01-08 16:59:21 +01:00
nowrep
d61b72bd87 [SearchShortcuts] Fixed using search shortcuts longer than one character 2014-01-08 10:39:41 +01:00
nowrep
0758ba39ab [LocationCompleter] Add option to enable/disable inline completion 2014-01-08 10:29:01 +01:00
Mladen Pejaković
aa13775cde [RSS] Fix compilation of RSSWidget. Closes 1134 2014-01-06 23:25:46 +01:00
nowrep
ce9316318f Added Kizito Birabwa into translators 2014-01-06 19:46:40 +01:00
Mladen Pejaković
27d4b05c2b [Speed Dial] Theme icons for context menu actions 2014-01-05 11:32:51 +01:00
nowrep
4e8b1839b4 [BookmarkIcon] Don't show popup on qupzilla: internal pages 2014-01-05 11:01:57 +01:00
nowrep
baa0677d3f Updated translations 2014-01-05 10:56:44 +01:00
nowrep
6604e28c36 Added Lasso Kante into translators (N'ko) 2014-01-05 10:42:33 +01:00
nowrep
a1f1d76404 [Copyright] Small string changes + 2014 copyright 2014-01-05 00:57:47 +01:00
Mladen Pejaković
3a3e7341a2 Thematic changes 2014-01-05 00:44:36 +01:00
Mladen Pejaković
6b5f62ecf3 [WebView] Option to add Undo/Redo menu actions to forms 2014-01-04 19:00:01 +01:00
nowrep
b891bf3914 Added Muhammad Fawwaz Orabi into translators 2014-01-04 11:17:47 +01:00
nowrep
d2d7d89893 [Preferences] Correctly shows name for N'ko language 2014-01-04 11:14:48 +01:00
nowrep
4cd8fc4557 [Building] Fixed building StatusBarIcons plugin on Windows 2014-01-03 20:30:39 +01:00
nowrep
daf210aa89 [Plugins] Build Gnome/KDE password plugins only on Unix platforms
Correctly disable building those plugins on Windows, Mac, OS/2, ...
2014-01-02 18:07:20 +01:00
nowrep
4565c63cb7 [defines.pri] Correctly use new GNOME_INTEGRATION build flag 2014-01-02 17:55:21 +01:00
S. Razi Alavizadeh
141f0bf142 Ability to run portable version together with installed version. 2014-01-02 20:01:12 +03:30
nowrep
9343da6ee7 [Plugins] Fixed building Gnome/Kde password integration plugins 2014-01-02 16:30:40 +01:00
nowrep
e6fe3ad917 [OS/2] Another OS/2 build fixes 2014-01-02 15:26:44 +01:00
S. Razi Alavizadeh
68cdba9e3a Fixed some small issues when re-loading settings. 2014-01-02 15:40:23 +03:30
nowrep
1fd1691ee2 Handle window.beforeunload event
Closes #1041
2014-01-02 12:09:04 +01:00
nowrep
93927dfa1e [TabPreviews] Do not show tab previews when they are disabled in prefences 2014-01-02 10:48:59 +01:00
nowrep
58a485fb6d [OS X] Fixed build on OS X
Closes #1122
2014-01-02 10:45:22 +01:00
nowrep
d58ad2e6a1 [OS/2] Build fix 2014-01-01 23:15:50 +01:00
nowrep
4e4e653f9f Version 1.6.0 2014-01-01 20:55:33 +01:00
nowrep
637e2715d3 [SpeedDial] Allow dial's width up to 500px
New page screens will now be generated in 450x253px resolution

Closes #1116
2014-01-01 18:35:54 +01:00
nowrep
4b75a98806 [WindowsTheme] Add extra icon for add-tab button when outside tabbar. 2014-01-01 18:23:56 +01:00
nowrep
36d1bed75a [CodingStyle] Coding style updates in ComboTabBar 2014-01-01 15:57:17 +01:00
nowrep
48079096c2 [ComboTabBar] Middle click on left/right buttons now scrolls to current tab 2014-01-01 15:42:30 +01:00
nowrep
cf5abaddb0 [ToolButton] Emit doubleClicked only on left mouse double click 2014-01-01 15:42:13 +01:00
David Rosca
fecb681d24 Merge pull request #1118 from pejakm/expcoll
[Sidebar] Expand/collapse buttons for bookmarks sidebar
2014-01-01 06:18:11 -08:00
S. Razi Alavizadeh
7bd48d6674 [ComboTabBar] Don't scroll to current tab on window focus change 2014-01-01 15:15:26 +01:00
Mladen Pejaković
22880ade4e [Sidebar] Expand/collapse buttons for bookmarks sidebar 2014-01-01 12:29:19 +01:00
nowrep
252c55dd2b [SpeedDial] Raise maximum width of one dial to 450px.
See #1116
2013-12-31 18:39:02 +01:00
nowrep
da15e5868d [CodingStyle] Don't use references when assigning to local variable
Let the compiler do the optimization
2013-12-30 13:43:48 +01:00
nowrep
d695a8b99a [PageScreen] Remember last saved path 2013-12-30 13:35:02 +01:00
nowrep
eada3365c9 [QzTools] FileDialogs: Fix suggesting default filename 2013-12-30 13:15:20 +01:00
nowrep
d753e21a5c Revert "WebSearchBar: Select alls text + set focus after search engine changed."
This reverts commit 9ec85ad49d.
2013-12-30 12:06:08 +01:00
nowrep
6f4e236e6e [BookmarksImport] Show InternetExplorer only on Windows 2013-12-30 11:31:19 +01:00
nowrep
b1da23ca72 [Bookmarks] Added option to export bookmarks to HTML file. 2013-12-30 00:35:01 +01:00
nowrep
4265b90643 [TabPreviews] Another tab preview behavior tweak 2013-12-29 14:50:12 +01:00
nowrep
99a4559973 [ClearPrivateData] Ask user before actually deleting data. 2013-12-29 11:59:30 +01:00
nowrep
e78e0fe498 [TabPreviews] Only hide preview on LeaveEvent when cursor is outside tabbar.
For some reason, tabbar receives first leave event (after first preview
is shown) even when cursor is inside tabbar rect, which leads to this
first tab preview being shown -> hidden and then again shown.
2013-12-28 17:25:41 +01:00
nowrep
1b3c9e38ea [TabPreviews] Don't show tab preview when moving tab 2013-12-28 17:12:24 +01:00
nowrep
d52b0e2cea [OptimizeDb] Move Optimize Database link to ClearPrivateData dialog. 2013-12-28 16:55:08 +01:00
nowrep
271e78a6c9 [BrowsingLibrary] Fixed loading RSS feeds after first library window close. 2013-12-28 16:35:52 +01:00
nowrep
1808208f66 [WebView] Correctly replace \t in selected text 2013-12-28 15:26:56 +01:00
nowrep
b8cb20ced6 Revert "[Code] Use QDir::separator() instead of hardcoded "/""
This reverts commit 4f059a75ee.

It is really not helpful at all (Qt will automatically use native
separators)
2013-12-27 15:09:42 +01:00
nowrep
a9dc3a929a [Code] Added comment 2013-12-27 15:09:31 +01:00
nowrep
eb1f4f590d [WebView] Fixed GoogleTranslate urls 2013-12-26 21:26:30 +01:00
nowrep
4f059a75ee [Code] Use QDir::separator() instead of hardcoded "/"
QDir::separator() returns native separator (= "\" on Windows)
2013-12-26 20:52:21 +01:00
nowrep
f28eb82fb2 [FileDialogs] All file dialogs now remember last directory. 2013-12-26 20:49:59 +01:00
nowrep
5828d57277 [TabBar] Fixed crash in tabSizeHint (division by zero). 2013-12-26 19:52:07 +01:00
nowrep
e9fccbfb75 [ComboTabBar] Fixed height of tabbar when there are no normal tabs. 2013-12-26 19:46:56 +01:00
nowrep
3d4da9e4ea [FileDialogs] Remember last path in all dialogs
Closes #1075
2013-12-25 19:06:58 +01:00
nowrep
33615d3f32 Fixed compilation with Qt 5 2013-12-24 17:21:10 +01:00
nowrep
5af425aecc [WebView] Added new conetxt menu action for translating page
Also added icon for W3Validator.

Closes #860
2013-12-24 14:56:17 +01:00
nowrep
23d402a12b [ComboTabBar] Setup layout as soon as possible.
Also fixed typo widthes -> widths
2013-12-24 12:28:51 +01:00
nowrep
4ed66114e7 [TabPreviews] Only show previews after a small delay of mouse at tab
Instead of showing previews on ToolTipEvent, which would be fired
immediately if moving from one tooltip to another, it now always show
preview after a set small delay.
This delay have been changed to 300 msecs from original 200 msecs.
2013-12-24 11:58:00 +01:00
nowrep
0038fd6cb6 [ComboTabBar] Double click on scroll buttons will scroll to end/start 2013-12-24 00:57:01 +01:00
nowrep
cf87a9895e [TabPreviews] Immediately hide preview when using mouse wheel in tabbar 2013-12-24 00:18:28 +01:00
nowrep
3bfa8cecaa [TabPreviews] Fix some small tab preview issues with ComboTabBar 2013-12-24 00:01:35 +01:00
nowrep
e8bbe53edb [ComboTabBar] Correctly fix tabAt function 2013-12-24 00:01:18 +01:00
nowrep
b4f3b5962e [ComboTabBar] Fix tabAt when pos is on right/left scroll buttons 2013-12-23 21:24:41 +01:00
nowrep
6c747b3c36 [Coding style] It should be only one if statement... 2013-12-23 20:32:42 +01:00
nowrep
ea8b099688 [ComboTabBar] Tweaked appearance of buttons when tabs overflows.
Also disabled painting shadow gradient indicationg that tabbar is not
scrolled at the end.
2013-12-23 20:31:56 +01:00
nowrep
3e3d823d95 [ComboTabBar] m_heightIsDirty is not really needed 2013-12-23 20:31:51 +01:00
nowrep
852e197334 [ComboTabBar] Workaround for setting tabbbar height with Oxygen 2013-12-23 20:31:44 +01:00
S. Razi Alavizadeh
23876a3765 [ComboTabBar] Fixed weird scrolling on resizing. 2013-12-23 20:31:12 +01:00
nowrep
6fcbefc7b1 TabBar: Edit sizes of tabs. Minimal tab width is now 100 2013-12-23 20:31:05 +01:00
S. Razi Alavizadeh
bff614144b Added TabStackedWidget + ComboTabBar
Set of patches:
Introduce TabStackedWidget+ComboTabbar
[Windows] Fix enabling blur background in fullscreen
[ComboTabBar] Fix some issues with pinned tabs
[ComboTabBar] Don't use pointer to integer,
Implement TabStackedWidget::keyPressEvent() and fix changing tab by wheel event
Fix animation delay of dragged tab's buttons.
[ComboTabBar] Add themable scrollButtons
2013-12-23 20:30:54 +01:00
nowrep
ed8ec5ab4a [LocationBar] Fixed rendering selected text with visible popup completer. 2013-12-23 19:21:47 +01:00
nowrep
7e088d0f1d [Fix] Url with only query is valid too
mailto:?subject=foo should be treated as valid url too

Closes #1112
2013-12-22 00:46:00 +01:00
nowrep
ffd560142b Fixed showing "//" as receiver in Thunderbird form "Send page/link ..." actions
Instead of empty receiver address, just one space %20 is used.
2013-12-22 00:39:23 +01:00
nowrep
3295899230 Files with relative paths can now be opened from command line
Closes #1109
2013-12-18 17:51:38 +01:00
nowrep
af33f79c66 [Translations] Pulled all plugins translations from Transifex
*Passwords and StatusBarIcons were missing
2013-12-06 22:46:28 +01:00
nowrep
efe1d4d125 [Translations] Pulled plugins translations from Transifex 2013-12-06 22:32:58 +01:00
nowrep
d519a1253e [Sessions] Last 2 sessions are now backuped in profile directory.
Closes #1100
2013-12-06 21:26:07 +01:00
nowrep
5a550eb853 [Preferences] Move "Add .co.uk by pressing ALT" option under Keyboard Shortcuts
This option adds local domain (not necessarily .co.uk) by pressing ALT

Closes #1047
2013-12-05 21:22:56 +01:00
nowrep
586982e473 [Bookmarks] Fixed drag&drop moving folders into bookmarks toolbar
Closes #1097
2013-12-05 21:15:20 +01:00
nowrep
b4f0096f96 [Code] Add/Edit some comments 2013-12-05 19:52:13 +01:00
nowrep
0d5c86f8cd [UrlCompleter] Don't show same urls multiple times
Closes #1096
2013-12-05 19:49:32 +01:00
nowrep
5a7789bd17 [WebView] Edit isValidUrl method. All non-empty urls are valid now.
Fixes #1099
2013-12-05 19:18:11 +01:00
nowrep
43ab2e44f0 [StatusBar] Don't decode url of hovered link
Workarounds #1095
2013-12-05 18:45:11 +01:00
nowrep
4f3aba95ff [TabBar] Ask user before closing all other tabs.
Closes #1088
2013-11-21 18:37:59 +01:00
nowrep
a49e574f83 [WebSearchBar] Ctrl+Up/Down for changing search engines.
Closes #1090
2013-11-21 18:23:11 +01:00
nowrep
479df003a0 defines.pri: Set QMAKE_LFLAGS_RPATH when empty
Closes #1089
2013-11-19 20:09:59 +01:00
nowrep
2276a7f274 PageFormCompleter: Coding style
PageFormCompleter::getAllElementsFromPage doesn't need passing
QWebPage *
2013-11-15 19:35:06 +01:00
nowrep
4819e2c65d UserAgentDialog: Update list of known user agents 2013-11-11 22:06:45 +01:00
nowrep
605ce133e1 OpenSearchReader: Fixed parsing files with XML declaration 2013-11-10 12:27:05 +01:00
S. Razi Alavizadeh
d1f0b1776a Fix translation issue and compile issue on Windows. 2013-11-09 22:24:39 +03:30
nowrep
478af279da SearchEngines: Fixed adding GET forms as search engines from pages 2013-11-09 16:14:54 +01:00
nowrep
f48363d484 SearchEngines: YouTube replaced with StartPage
Closes #1079
2013-11-09 15:59:35 +01:00
nowrep
2211fbf2b3 SearchEngines: Added support for POST method.
Closes #715
2013-11-09 15:48:24 +01:00
nowrep
c9ff4f1c94 SearchEngines: Return SearchResult on all searches 2013-11-09 13:32:03 +01:00
nowrep
8a5a4017d6 SearchEngine: Prepare for POST method support 2013-11-08 22:17:27 +01:00
nowrep
f465157897 SpeedDial: Google.com is no longer in default pages
See #1079
2013-11-06 17:17:49 +01:00
nowrep
5fbf11c8f2 AdBlock: Fix issue when enabling rule didn't work until restart.
When attempting to enable rule that was already disabled on startup,
it won't have an effect until completely restarting the browser.
2013-11-04 16:06:07 +01:00
nowrep
2abefeaf79 AdBlock: Added option to use full EasyList subscription
Instead of downloading only the essential half of EasyList,
user can now choose to download and use the full list.
This restriction is still here because the other half of EasyList
is full of domain restricted rules that are using RegExps in our
implementation, and thus being slow.
2013-11-03 16:04:38 +01:00
nowrep
2e9d5a3316 BSD: Make crash handler work on kfreebsd
Original patch by Georges Khaznadar in Debian's package.
http://packages.debian.org/sid/qupzilla
2013-11-03 15:11:26 +01:00
nowrep
d73d4f7ad7 AdBlockSearchTree: Save few string allocations on searching 2013-11-03 14:49:58 +01:00
nowrep
511ef3c346 AdBlockSubscription: Don't allocate search tree on heap. 2013-11-03 14:29:23 +01:00
nowrep
c07e9cff3c Typo s/childs/children 2013-11-03 14:22:27 +01:00
nowrep
3159407c18 AdBlock: Use fast search tree for basic rules
For all rules that can be matched with simple string-contains match,
use fast tree searching.
Only in EasyList, there is 6000 those rules.
It improves overall performance of AdBlock matching by 5 - 10 times,
at the cost of memory.
The tree needs about 1.5MB memory for 1000 rules, which is a great
tradeoff for such big performance improvement.
2013-11-02 17:43:18 +01:00
nowrep
22b8103fb4 AdBlockManager: Match always by lower case strings 2013-11-02 17:42:20 +01:00
nowrep
4a85e59778 AdBlockRule: Add new rule type Invalid for invalid rules 2013-11-02 17:41:51 +01:00
nowrep
6f6bba66f6 X11: Use different WM_CLASS for private browsing window 2013-10-21 15:59:25 +02:00
nowrep
ea7720e64b Added option to copy download link in download options dialog.
Closes #1056
2013-10-17 17:20:50 +02:00
Muhammad Fawwaz Orabi
c2ed0d6482 Enhanced plural forms for languages with complex rules 2013-10-10 10:36:01 +02:00
nowrep
cb0cd31f3b Coding style in downloaditem.cpp 2013-09-29 13:52:45 +02:00
David Rosca
8a3b3bd6a9 Merge pull request #1049 from forabi/master
[translation] Added plural forms for hours/mins/secs in download manager and tr() for data units
2013-09-29 04:46:27 -07:00
Muhammad Fawwaz Orabi
baecfddad1 Added plural forms for hours/mins/secs in download manager and tr() for data units 2013-09-28 23:01:53 +03:00
nowrep
611e8bbfdf [RSSWidget] Fixed displaying a lot of RSS feeds.
Closes #906
2013-09-22 15:48:17 +02:00
Mladen Pejaković
68eff6bc3a Contributor's email address change 2013-09-21 00:02:56 +02:00
Mladen Pejaković
1fcef58e8b Serbian translations update 2013-09-20 23:48:00 +02:00
nowrep
ee8a00ea50 [SslErrorDialog] Add option to accept certificate permanently.
Closes #939
2013-09-19 20:21:46 +02:00
nowrep
f527a837db Added Arabic translation to project files (.pro) 2013-09-19 12:02:53 +02:00
David Rosca
875f46ea54 Merge pull request #1033 from forabi/master
Added complete Arabic translations for the main application and plugins
2013-09-18 00:18:42 -07:00
Muhammad Fawwaz Orabi
a6466bbe15 Updated Arabic translations 2013-09-18 09:20:10 +03:00
Muhammad Fawwaz Orabi
740c8d7f4e Added complete Arabic translations for the main application and plugins, the coordinator on transifex does not seem to be active. 2013-09-18 09:04:36 +03:00
nowrep
55cbdec32c [Unloaded tab color] Make sure it work also for black color
Closes #1013
2013-09-17 17:03:50 +02:00
nowrep
e56a3a69f8 X11: Changed main window WM_CLASS to "QupZilla Browser" 2013-09-14 21:26:40 +02:00
nowrep
5de4075a98 Tabs: Make sure unloaded tabs color is different even for white color.
Closes #1013
2013-09-13 17:29:52 +02:00
Jonathan Hooverman
474cb7baa7 Fixed a small typo in bookmarksimportdialog.ui 2013-09-11 11:47:02 +02:00
nowrep
68172898d0 Merge branch 'master' of github.com:QupZilla/qupzilla 2013-09-10 16:02:28 +02:00
nowrep
48860aa398 Bookmarks Import: Add option not to fetch icons
Closes #1018
2013-09-10 16:01:40 +02:00