Commit Graph
100 Commits
Author SHA1 Message Date
Philip Kaufmann ada2a39691 change Q_WS_MAC -> Q_OS_MAC (Qt5 compatibility)
- I missed that one in my former pull
2012-10-07 18:50:03 +02:00
Philip Kaufmann 81bbef2609 add LOCK() for proxy related data-structures
- fix #1560 by properly locking proxy related data-structures
- update GetProxy() and introduce GetNameProxy() to be able to use a
  thread-safe local copy from proxyInfo and nameproxyInfo
- update usage of GetProxy() all over the source to match the new
  behaviour, as it now fills a full proxyType object
- rename GetNameProxy() into HaveNameProxy() to be more clear
2012-10-04 09:35:24 +02:00
Philip Kaufmann d210f4f5b8 fix -Wformat warnings all over the source 2012-10-01 19:45:42 +02:00
Philip Kaufmann 9c8dc7caf1 harmonize printf format characters
- remove the "%" character from format characters for (s)size_t and
  ptrdiff_t and harmonize them with the ones for int64 and uint64
2012-09-30 11:57:25 +02:00
Philip Kaufmann c8bf315188 Windows: fix URI association setting in registry
- fix for #1877
- fix was reported to work via
  https://bitcointalk.org/index.php?topic=110243.msg1230418#msg1230418
2012-09-29 12:25:22 +02:00
Philip Kaufmann 26809acbf9 switch to Qt 4.8.2 for Windows builds 2012-09-25 19:37:22 +02:00
Philip Kaufmann 6ca5ee6211 change last occurance of mac to macx in Qt project-file 2012-09-24 22:59:31 +02:00
Philip Kaufmann 807f3e83ba Bitcoin-Qt: expand GCC Stack-Smashing Protector usage (non Windows)
This patch currently excludes our Windows executable!

- change to use -fstack-protector-all
- the minimum size of buffers (i.e. arrays) that will receive stack
  smashing protection was changed to 1 byte (GCC default: 8)
- warn about functions that will not be protected against stack
  smashing by adding -Wstack-protector
2012-09-22 12:28:39 +02:00
Philip Kaufmann bb86cffa56 additional fix for #1843
- a shortcut on "receive coins" was used twice
2012-09-22 12:15:41 +02:00
Philip Kaufmann da9413d913 fix #1843 by changing 2 GUI shortcuts 2012-09-21 19:31:53 +02:00
Philip Kaufmann 81605d90f5 enhance Qt5 compatibility
- replace Q_WS_MAC (not supported anymore in Qt5) with Q_OS_MAC (supported
  in Qt4/5)
2012-09-21 19:06:53 +02:00
Philip Kaufmann 463a1cab43 fix signed/unsigned in strprintf and CNetAddr::GetByte()
- I checked every occurance of strprintf() in the code and used %u, where
  unsigned vars are used
- the change to GetByte() was made, as ip is an unsigned char
2012-09-12 21:30:47 +02:00
Philip Kaufmann 2dc953274d small update to release-notes.txt 2012-09-07 16:33:50 +02:00
Philip Kaufmann f875921176 Bitcoin-Qt (Windows only): add version info to Resource File
- add version information to bitcoin-qt.rc, which is displayed on Windows, when looking in the executable properties and selecting "Details"
- introduce a new clientversion.h (used in bitcoin-qt.rc to generate
  version information), which takes only the version defines from
  version.h and is included in it (to allow usage with the windres rc-file
  compiler)
- move #define STRINGIFY(s) #s into clientversion.h as that is used in
  bitcoin-qt.rc and rename to DO_STRINGIZE(X)
- add #define STRINGIZE(X) DO_STRINGIZE(X), which is needed to convert the
  version defines into a version string in the rc-file
- this ensures we only need to update 1 file and have bitcoin-qt.exe
  version information

- for RC-file documentation see:
  http://msdn.microsoft.com/en-us/library/windows/desktop/aa381058%28v=vs.85%29.aspx
2012-09-07 16:08:18 +02:00
Philip Kaufmann 4bd34b4966 replace 2x WSAGetLastError() with 1x WSAGetLastError() call 2012-09-05 22:20:26 +02:00
Philip Kaufmann 274b7ab123 remove double logging of startup time, when !fLogTimestamps 2012-09-05 08:36:50 +02:00
Philip Kaufmann 8d367c7e66 fix signed/unsigned usage in BlockFilePath() 2012-09-05 08:34:41 +02:00
Philip Kaufmann d93e5986d7 add default value in -timeout description 2012-08-30 23:28:19 +02:00
Philip Kaufmann c3856bb011 add missing netbase.h to Qt project-file 2012-08-30 19:11:41 +02:00
Philip Kaufmann a4d4403a75 enable ASLR and DEP for bitcoind.exe via linker flags
- this is already active for bitcoin-qt.exe
2012-08-29 22:22:04 +02:00
Philip Kaufmann 382e9e25ff Qt: re-order GUI code
- re-order Qt Actions and connect() calls to match the real GUI layout,
  which makes things easier to read and understand
- remove signMessageAction and verifyMessageAction from tabGroup as we
  didn't use them anyway (as tooltips are not displayed in the menu remove
  these too)
- update 2 comments
2012-08-29 19:59:22 +02:00
Philip Kaufmann 5fc3a0f707 remove FIRST_CLASS_MESSAGING support from the client
- removes the FIRST_CLASS_MESSAGING support from the client, which was no
  default setting anyway
2012-08-29 19:57:51 +02:00
Philip Kaufmann e273c51287 Update string for Show/Hide in the tray
- be clear we don't "Show/Hide Bitcoins", but just the client window
- remove the tooltip for toggleHideAction as this is not shown anyway
- update a comment to be more general
2012-08-29 07:39:35 +02:00
Philip Kaufmann 4f6a85b3bd add Qt GUI part to release-notes.txt 2012-08-27 23:52:45 +02:00
Philip Kaufmann 9fd537965d Qt: add copyrightLabel to aboutdialog.ui
- add a new label, which can be updated independently from the whole
  license information stuff
- the benefit is, we don't need to re-translate that whole wall of text
  every year the copyright info changes
- update to the same copyright string we use in the source and in the
  bitcoin-qt.exe meta-data information
- removes an obsolete entry from the ui-file
2012-08-24 13:04:10 +02:00
Philip Kaufmann f09e8fcd33 Qt: show mined transactions at depth 1
- before, we used to show them in GUI when depth >= 2, which could lead to
  confusion of users, as the RPC behaviour already showed the Tx
2012-08-24 08:52:12 +02:00
Philip Kaufmann 30c8a40847 fix a comment in addrman.cpp 2012-08-18 16:45:24 +02:00
Philip Kaufmann 8e2ebc0106 Bitcoin-Qt (Windows only): add ASLR and DEP linker flags
- for extra security on Windows: enable ASLR and DEP via GCC linker flags

GCC linker flag description:
--dynamicbase  The image base address may be relocated using address space layout randomization (ASLR). This feature was introduced with MS Windows Vista for i386 PE targets.
--nxcompat The image is compatible with the Data Execution Prevention.
This feature was introduced with MS Windows XP SP2 for i386 PE targets.
2012-08-18 10:52:50 +02:00
Philip Kaufmann 2d914f89fe add splashscreen message when importing blocks via -loadblock 2012-08-17 14:21:17 +02:00
Philip Kaufmann 1e7027b41e fix a compiler sign warning in OpenBlockFile() 2012-08-17 10:35:51 +02:00
Philip Kaufmann 746f502a79 log how long LoadExternalBlockFile() takes in ms (Benchmark) 2012-08-17 00:14:40 +02:00
Philip Kaufmann 4b94f4e0ed Bitcoin-Qt (Windows only): extend Resource File
- extend bitcoin-qt.rc to include meta information, which is displayed on
  Windows, when looking in the executable properties and selecting
  "Details"
- does currently NOT include version information, this is scheduled
  for later releases
- for RC-file documentation see:
  http://msdn.microsoft.com/en-us/library/windows/desktop/aa381058%28v=vs.85%29.aspx
2012-08-14 11:16:46 +02:00
Philip Kaufmann 3d88c9b4d3 Bitcoin-Qt (Windows only): enable DEP for bitcoin-qt.exe
- this enables DEP on all Windows version which support the
  SetProcessDEPPolicy() call in Kernel32.dll
- use a dynamic approach via GetProcAddress() to not rely on headers or
  compiler libs
- this is the same way the Tor-project does it
2012-08-03 14:51:51 +02:00
Philip Kaufmann efdcf94174 fix further spelling errors / remove a tab in the source 2012-08-02 10:09:29 +02:00
Philip Kaufmann 4aaa4313e7 small UX update for optionsdialog
- add enableApplyButton() and disableApplyButton() to optionsdialog.{h/cpp}
- they are used to ensure the Ok button does not get disabled, when Apply needs to be disabled (standard UX should allow Ok always to dismiss the dialog and only disable it, when we have a faulty proxy IP)
- disable Apply after initially loading the settings, as nothing new needs to be saved
- remove orphan settings from optionsdialog.ui that are default anyway
2012-08-02 09:05:10 +02:00
Philip Kaufmann 75578d60f3 only update cached values in ClientModel::updateTimer() when they are changed 2012-08-01 23:32:32 +02:00
Philip Kaufmann 68acc1b4cb Translations update 2012-08-01 (fetched from Transifex) 2012-08-01 22:22:41 +02:00
Philip Kaufmann e6bc9c35f3 Update Warning-strings to use a standard-format
- ensure warnings always start with "Warning:" and that the first
  character after ":" is written uppercase
- ensure the first sentence in warnings ends with an "!"
- remove unneeded spaces from Warning-strings
- add missing Warning-string translation
- remove a "\n" and replace with untranslatable "<br><br>"
2012-08-01 19:33:32 +02:00
Philip Kaufmann 6986c779f0 update HelpMessage()
- place "-?" option at first
- re-work description and "\n" usage for Gavins new block creation options
  to better match current description syntax
- ensure no "\n" is in translated strings, which is better for Transifex
2012-07-27 14:03:37 +02:00
Philip Kaufmann 64c0020ff8 fix typo "logfile" -> "log file" 2012-07-23 08:22:04 +02:00
Philip Kaufmann 6fe375c3bd set TARGET = bitcoin-qt in project file 2012-07-23 08:08:34 +02:00
Philip Kaufmann 1376a542b4 optionsdialog cleanup
- remove duplicate includes, that are already present in ui_optionsdialog.h
- change QIntValidator to not allow 0 as port-number
- re-order some function calls to match the Ui element order, for better readbility and to prepare for the addition of further IPv6 and Tor proxy options
- restat warning for the language selection is only shown, when the language was changed (not on simply activating the Ui element)
- split check for object == ui->proxyIp into seperate if-clause
- micro-optimize the code in the above mentioned if-clause
- unify used format for comments in the code
- introduce handleProxyIpValid() function, which handles UI elements and the
save button states for valid/invalid proxy IPs
2012-07-22 01:12:11 +02:00
Philip Kaufmann a7f82808c4 fix OpenSSL not written as proper noun in some comments 2012-07-21 12:44:54 +02:00
Philip Kaufmann a76552ce47 do not use external IPv4 discovery, when -onlynet="IPv6" 2012-07-20 13:23:02 +02:00
Philip Kaufmann 1d915d0237 re-size addressbookpage.ui to fix #1062 2012-07-19 07:22:38 +02:00
Philip Kaufmann ce2f66d9bf small update for BitcoinGUI::setNumBlocks() function
- re-work code parts that check if we have a Statusbar warning
- use same variable names in the header
2012-07-17 14:54:01 +02:00
Philip Kaufmann c95d9a9482 fix a comment in net.cpp 2012-07-17 09:53:53 +02:00
Philip Kaufmann 41c938eede IPC-server hardening and update
- add IMPLEMENT_RANDOMIZE_STACK for ipcThread()
- log / print boost interprocess exceptions
- use MAX_URI_LENGTH in guiconstants.h (also used in qrcodedialog.cpp)
- remove unneeded includes and ipcShutdown() from qtipcserver.cpp
- fix a small mem-leak by deleting mq before re-using it
- make ipcThread() and ipcThread2() static functions
- add some more comments
2012-07-17 09:37:12 +02:00
Philip Kaufmann b9a33a61a0 change Window title to "Bitcoin - Wallet" / misc related renames
- this helps user to not think our Client is called "Bitcoin Wallet"
- change "About Bitcoin-Qt" to "About Bitcoin"
- change "Bitcoin debug window" to "Bitcoin - Debug window"
- change "Client" in debug Window to "Bitcoin Core"
2012-07-13 11:06:31 +02:00
Philip Kaufmann 56d673675d when on testnet, set testnet icon for about dialog
- add a comment
2012-07-13 08:48:24 +02:00
Philip Kaufmann 81ccec4042 enhance lang-selection in OptionsDialog, when compiling with Qt >= 4.8 2012-07-13 07:43:41 +02:00
Philip Kaufmann 144bfd9c53 optionsmodel cleanup
- cleanup optionsmodel before adding new proxy options
- place SOCKS version stuff below proxy port (IP, Port, SOCKS version)
- simplyfy some parts of the code (e.g. don't check IP and port, as this
  is done in optionsdialog anyway, remove unneeded {} in switch/case)
- small cosmetic changes in the header for better readability
2012-07-12 15:31:59 +02:00
Philip Kaufmann a04030d30f fix a wrong string in signverifymessagedialog.ui 2012-07-12 13:46:34 +02:00
Philip Kaufmann dae7fff12e translation process file updates
- add part for handling of plurals
- update Transifex links
- small misc changes
2012-07-11 22:34:42 +02:00
Philip Kaufmann fd28283707 fix some recently added translation plurals 2012-07-11 14:08:53 +02:00
Philip Kaufmann 30d509c12e fix for build.h regeneration failure when compiling on Windows
- as the "||" operator is not known to qmake use "|" instead,
  which ensures the code in brackets does never get executed on Windows
2012-07-11 11:18:57 +02:00
Philip Kaufmann ddadf791f1 replace some ugly code in addressbookpage.cpp
- add signals signMessage() and verifyMessage() in addressbookpage.cpp
- connect to them in bitcoingui.cpp to switch to the corresponding tab in the Sign/Verify Message dialog
- make gotoSignMessageTab() and gotoVerifyMessageTab() private slots
2012-07-08 18:49:07 +02:00
Philip Kaufmann c7441658da show used OpenSSL library version in debug window 2012-07-07 16:43:46 +02:00
Philip Kaufmann 0e3947ef32 fix typo in optionsmodel.cpp 2012-07-07 16:35:29 +02:00
Philip Kaufmann 5c83f797c5 update QRCodeDialog
- remove unused #include <QDebug> and lblBTC label
- update Bitcoin input field to a BitcoinAmountField to allow Bitcoin unit selection
- use BitcoinUnits::format for the resulting amount parameter in the generated URI (always use BTC as per BIP21)
- move MAX_URI_LENGTH and EXPORT_IMAGE_SIZE to guiconstants.h
- add OptionsModel in AddressBookPage and use it in on_showQRCode_clicked() to pass it to QRCodeDialog
- add OptionsModel in QRCodeDialog to enable display unit updates
- add updateDisplayUnit() slot to be able to imediately update currently set bitcoin unit
- make all labels in the UI-file plain text
- resize dialog to match for an updated layout (fields are now stacked and new field)
- remove unused parameters from private slots
- only enable save button, when QR Code was generated
- show message when entered amound is invalid
- add read-only QPlainTextEdit field to output generated URI
2012-07-06 18:51:30 +02:00
Philip Kaufmann 47894585ae GUI: merge sign/verify message into a single window with tabbed UI
- add UI-feedback via QValidatedLineEdit
- copy button for generated signature was moved to the signature output field
- add an addressbook button to verify message tab
- input fields are now evenly ordered for sign and verify tabs
- update FIRST_CLASS_MESSAGING support to ensure a good UX
- add a button and context menu entry in addressbook for verify message (to be consistent with sign message)
- focus is now only set/changed, when clearing input fields or adding an address via addressbook
- re-work / update some strings
- ensure model gets initialized in the SignVerifyMessageDialog constructor
- add checks for a valid model to both addressbook buttons
- remove unneeded includes for Qt GUI elements that are listed in ui_signverifymessagedialog.h anyway
2012-07-06 11:31:27 +02:00
Philip Kaufmann a75b45fcd3 update Boost version to 1.49 for Windows in the Qt project file
- add -s flag as we also use a static build in makefile.mingw
2012-07-06 11:26:06 +02:00
Philip Kaufmann 31b581bcac write used OpenSSL library version to debug.log 2012-07-04 08:18:03 +02:00
Philip Kaufmann b7506b302d enhance translation possibilities in TransactionDesc / misc other changes
- remove "#include <QString>" as this is included in the header
- add some missing plural forms that can be translated
- change "yours" into "own address", which is easier to understand and translate in that context
- cleanup translatable strings to not include HTML or unneeded chars (e.g. ":")
- resize TransactionDescDialog a little (remove unwanted line-breaks with non english translations)
2012-07-03 14:38:03 +02:00
Philip Kaufmann 0f5d4c6e88 fix a typo in OptionsDialog 2012-06-30 01:16:22 +02:00
Philip Kaufmann 2943f60811 GUI: change language selection format
- display as "language - country (locale name)", when locale name consists of 2 parts
- display as "language (locale name)", when locale name consists of 1 part
2012-06-26 16:14:25 +02:00
Philip Kaufmann 82ec7d5542 small updates to Bitcoin-Qt project file
- add noui.cpp to SOURCES (to see / edit the file)
- re-word a comment and remove a space
2012-06-25 16:36:25 +02:00
Philip Kaufmann a8c20ea946 fix a comment to correctly use -upgradewallet 2012-06-24 18:08:27 +02:00
Philip Kaufmann a3d12f445a fix a memory leak in key.cpp
- add EC_KEY_free() in CKey::Reset() when pkey != NULL
- init pkey with NULL in CKey constructor
2012-06-21 14:43:13 +02:00
Philip Kaufmann 229c34f818 GUI: ensure a changed bitcoin unit immediately updates the tx list amounts 2012-06-20 06:51:38 +02:00
Philip Kaufmann e0873dafc5 add the slot updateDisplayUnit() to overviewpage, sendcoinsdialog, sendcoinsentry and connect it to displayUnitChanged() - this ensures all fields in the GUI, who use a display unit are imediately updated, when the user changes this setting in the optionsdialog / ensure used fields init with the current set display unit 2012-06-17 15:20:42 +02:00
Philip Kaufmann 93b7af3099 URI-handling code update: added safety checks and tray-notifications 2012-06-14 07:59:27 +02:00
Philip Kaufmann b5782531ad set cursor for balance field to IBeamCursor (to show the user it IS selectable) and set autoDefault to false for the buttons that do not need this 2012-06-13 18:34:29 +02:00
Philip Kaufmann 66654ab02e update translation files (fetched from Transifex) and remove translation for fr_FR, which was removed / renamed on TX 2012-06-13 18:04:27 +02:00
Philip Kaufmann c4443c2be1 re-work optionsdialog to a tabbed UI based on an ui-file
- extend network options with a SOCKS version selection
- changing "Unit to show amounts in:" now also updates the unit used in the transaction fee box
- string updates
- link Apply button and OK button when enabling or disabling them
- use LookupNumeric() from netbase to verify proxy address (via an EventFilter)
- change proxy address field to QValidatedLineEdit and add visual feedback
- add a status label used for displaying a message for invalid proxy addresses
- allow usage of IPv6 address as proxy address
- added warning message when enabling / disabling SOCKS proxy
2012-06-13 16:24:25 +02:00
Philip Kaufmann d2e6dd6c99 merge toggleHidden() code into showNormalIfMinimized() to extend the functionality, but keep a simpler toggleHidden() for use in SLOT() macro 2012-06-12 22:15:35 +02:00
Philip Kaufmann d4b2f3c45b make buttons in debug window non autoDefault 2012-06-12 17:17:51 +02:00
Philip Kaufmann 9247134eab introduce a new StartShutdown() function, which starts a thread with Shutdown() if no GUI is used and calls uiInterface.QueueShutdown() if a GUI is used / all direct uiInterface.QueueShutdown() calls are replaced with Shutdown() - this ensures a clean GUI shutdown, even when catching a SIGTERM and allows the BitcoinGUI destructor to get called (which fixes a tray-icon issue and keeps the tray-icon until Bitcoin-Qt exits) 2012-06-12 07:21:03 +02:00
Philip Kaufmann 59e0f445ce change initial Balance on overviewpage from "123.456 BTC" to "0 BTC" to not confuse users, which could see it before we init with the real wallet balance 2012-06-11 22:40:06 +02:00
Philip Kaufmann 40d23dafb7 update info string in GUI for generated blocks and change "must wait" into "must mature" to take the new immature label into consideration 2012-06-09 00:34:10 +02:00
Philip Kaufmann 618b250e34 add used datadir to debug.log 2012-06-05 07:37:07 +02:00
Philip Kaufmann b69dd08ae7 fix two signed/unsigned comparison warnings in netbase.cpp 2012-06-05 07:32:27 +02:00
Philip Kaufmann 4e16306ae3 fix default Proxy address in Qt options (no hostname allowed currently) 2012-06-04 23:13:01 +02:00
Philip Kaufmann 5d6b30271f move class HelpMessageBox to guiutil.cpp/.h / add button to show Bitcoin command-line options (in RPC Console -> Information) / resize Debug window a little to allow for a non-breaking display of the welcome message with non-english translation 2012-06-01 16:29:54 +02:00
Philip Kaufmann 8103b0bb62 change verifymessagepage behaviour to match RPC-call "verifymessage" (input address, signature and message) / display messages in status label (remove message boxes) / resize window to make signature fully readable / change signature font to BC-address font (like in messagepage) / remove checkAddress() and place code directly in on_verifyMessage_clicked() / add visual feedback to LineEdits / remove AddressTableModel references, as they are now unused / add addr.GetKeyID(keyID) check 2012-06-01 11:13:44 +02:00
Philip Kaufmann 407e20c11a sync english translation master file with current master branch 2012-05-31 11:11:04 +02:00
Philip Kaufmann bd09334d1a remove dead "using namespace boost::asio;" from rpcdump.cpp 2012-05-24 18:13:03 +02:00
Philip Kaufmann 41c6b8abc6 add client startup time as an entry to debug.log (note: logged time in debug.log differs by a few seconds from the one displayed in the Debug window) / make ClientModel::formatClientStartupTime() return a QString 2012-05-23 18:44:28 +02:00
Philip Kaufmann 4dfbc78a88 start rows in askpassphrasedialog.ui at 0 (not 1) 2012-05-20 15:55:39 +02:00
Philip Kaufmann 00fb08158d remove strncasecmp() + strnicmp() calls and replace that code via boost::algorithm::istarts_with() / do not call ipcInit() on Mac and Windows as this is unneeded currently 2012-05-20 00:48:34 +02:00
Philip Kaufmann ff0ee876bb change strings to Bitcoin (uppercase), where it is used as a noun and update strings to use "Qt" (and not qt or QT) / update initialisation of notificator to use qApp->applicationName() instead of a static string 2012-05-18 23:13:58 +02:00
Philip Kaufmann a3b4caac38 add an icon for Debug logfile -> Open in the RPC console / add a missing comment in rpcconsole.h 2012-05-18 14:11:55 +02:00
Philip Kaufmann f4ac41806a use _strnicmp (ISO C++) instead of deprecated strnicmp (POSIX) and add missing "#define strncasecmp _strnicmp" in init.cpp 2012-05-17 23:20:47 +02:00
Philip Kaufmann c26f3a9bd1 add 2 labels to the overviewpage that display Wallet and Transaction status (obsolete or current) / cleanup overviewpage XML ui-file 2012-05-17 21:49:32 +02:00
Philip Kaufmann 5f9861953e fix RenameOver() and FileCommit() functions, to not generate compilation errors 2012-05-17 18:30:09 +02:00
Philip Kaufmann 8b4d653663 allow translation of "options" used in the --help message / split translation of RPC console welcome message and remove the need to take care of "<br>" / remove some spaces in strings and misc other stuff related to translations 2012-05-17 15:49:00 +02:00
Philip Kaufmann cd8c905dfe add 4 new translations bg, el_GR, fr and pt_PT (based on transifex fetch from today) 2012-05-15 23:44:49 +02:00
Philip Kaufmann 34aa3112c8 adapt user-experience from messagepage / move placeholderTexts from XML to source to avoid a problem with Qt < 4.7 / add eventFilter for address field to select text when clicking in / add Clear All button / rework strings 2012-05-15 08:04:51 +02:00
Philip Kaufmann 8892579f8b fix DebugLog file opens twice after clicking "Open" in RPC Console Information tab 2012-05-14 22:26:15 +02:00
Philip Kaufmann 966ae00fe4 make CheckDiskSpace() use a global static const uint64 for checking required disk space and remove 2 ugly spaces from a message string 2012-05-14 14:02:36 +02:00