Commit Graph

55 Commits

Author SHA1 Message Date
mgr
a90d1b24d3 Special copy for the binary editor including addresses, hex and ASCII #1485
Added a new copy action to the binary editor context menu for copying the
selected text as seen by the user, instead of the stream of hexadecimal
digits copied by default by qhexedit.

In order to support copying from the context menu, qhexedit has been
modified for not resetting the selection when the left mouse button is
pressed. This will be converted to a pull request to qhexedit afterwards.

See related issue #1485
2018-09-30 23:51:49 +02:00
Justin Clift
a1c982c158 CentOS 7 provides CMake 2.8.12.2, so this commit moves the min version to that
For #1488.
2018-08-10 15:01:06 +01:00
Iulian Onofrei
961141ec36 Replace deprecated qt5_use_modules function (#1419)
* Replace deprecated qt5_use_modules function

* Fix includes that fall under a larger module

* Bump minimum Cmake version to use newer features and properly use libs

* Replace deprecated qt5_use_modules function and bump minimum CMake version to 3.1.0 for 3rd party libraries
2018-07-10 20:57:55 +02:00
Martin Kleusberg
a117c11064 Simplify qmake files 2018-05-20 15:58:24 +02:00
GortiZ
e7752d7398 KUbuntu 14.04 support restored (#1298)
* - [NEW] Add new interface and functionality to manage database file extension. (Implements feature request #659)

* - [FIX] Fixed CMake file to src.pro

* - Applied changes requested by mgrojo to uniform code with sqlitebrowser standards
- Add "history" when closing editor window, but reopen before closing preferences
- Revert some changes done by QtCreator

* Refuse from previous commit

* Additional changes requested by MKleusberg:
- [CHG] Always add "All files (*)" to filters
- [FIX] Removed unused include

* merged from master

* Merge sqlitebrowser master

* [FIX] Fixed compatibility to compile on KUbuntu 14.04 with Qt 5.2.1

* [FIX] Fix Qt version for QOpenGLWidget support on previous commit

* [CHG] Uniformed QT_VERSION_CHECK style
[CHG] Reverted macOS check on Mainwindow for OpenGL context creation
2018-05-20 15:56:01 +02:00
mgrojo
290461778d Fix qmake compilation for XML mode PR #1275
Also, some spaces have been replaced by tabs for uniformity.

See issue #1309
2018-01-30 21:01:44 +01:00
mgrojo
a0e0fc98ae XML mode for the cell editor
The new editor mode shares the same Scintilla widget as the JSON mode.
The JsonTextEdit class has been generalised. Future modes supported by
Scintilla could be added with the current pattern. As a consequence, the
EditMode is not always equal to the current stacked widget.

Some code in EditDialog has been refactored, so it is easier to understand
and modified with so many modes. textNullSet has been replaced by the use
of dataType as Null.

SVG is promoted to a new recognised data type, so it can be edited in the
XML mode.

The XML data is formatted and validated following the pattern established
by the JSON mode.

New modules are needed by the XML mode: the Qt XML module and some new
Scintilla files required by the HTML/XML lexer.

The indent_compact was incorrectly named in Setting::getDefaultValue.

See issue #1253.
2017-12-23 22:19:17 +01:00
mgrojo
cb9712769e libs: Update qcustomplot to version 2.0.0 released on 04.09.17
Let's see if this fixes the problem about disappearing points while
zooming reported at issue #838.
2017-12-15 18:39:08 +01:00
mgrojo
ce06845b36 Folding issues related to the Scintilla JSON lexer
Applied patch from:
https://sourceforge.net/p/scintilla/code/merge-requests/19/

See this thread for info:
https://groups.google.com/forum/#!topic/scintilla-interest/w4sW3sM6Cek

This is merged into Scintilla, so it might come fixed in a future
release.

This should solve the folding issue reported in #1173
2017-11-24 19:31:47 +01:00
mgrojo
934ee7808a Added files to fix the build for JSON editor mode 2017-11-18 16:47:31 +01:00
mgrojo
3c910a9e59 JSON mode for cell editor
Support for JSON in the Database Cell editor using the QScintilla library.

The lexJSON lexer has been added to the compilation, including the
necessary files from the QScintilla source package.

See issue #1173
2017-11-18 16:28:38 +01:00
mgrojo
279c419df9 JSON mode for cell editor
Support for JSON in the Database Cell editor using the QScintilla library.

The lexJSON lexer has been added to the compilation, including the
necessary files from the QScintilla source package.

See issue #1173
2017-11-18 16:10:07 +01:00
mgr
d8aeae1a6f Avoid displaying an unnecessary horizontal scrollbar in SQL editor widgets
The following scroll width functionalities are added to QScintilla:
setScrollWidth, getScrollWidth, setScrollWidthTracking and
getScrollWidthTracking.

This allows setting a lower value for the initial scroll width (default is
2000 pixels).  Consequently, the horizontal scroll is only visible if the
SQL lines become bigger than window width.

The scroll width, though, is never reduced by Scintilla for performance
reasons.

See this for explanation:
https://github.com/jacobslusser/ScintillaNET/issues/216

And see this for a possible implementation of a fully adjusted scroll
width with fixed-width fonts:
https://groups.google.com/forum/#!topic/scintilla-interest/ly8u7mVDgyQ
2017-11-12 14:32:14 +01:00
Martin Kleusberg
4d2845c028 Add separate patch file for commit 3a0e29cf28
This way we can keep track of the changed we did to the included third
party libraries.
2017-11-02 23:10:02 +01:00
mgr
3a0e29cf28 Fixed incorrect display of SQL calltips containing non-US-ASCII characters.
QScintilla was incorrectly converting the text of the calltips to Latin1
although the encoding was set to UTF-8.

This fixes #1107 (Russian) and  #1206 (Korean).
2017-11-01 20:19:00 +01:00
Peter Hyatt
c5c3d2366e Added hide selected columns and show all columns to tableview context menu.
Added a fix for building with MingW on Windows.
2017-09-18 19:47:27 +02:00
Martin Kleusberg
f7f60365eb libs: Fix wrong syntax highlighting in Scintilla lexer code
See issue #1080.
2017-08-11 17:58:51 +02:00
Martin Kleusberg
8c5650a63f libs: Update qcustomplot to version 2.0-beta 2017-05-04 21:51:43 +02:00
Martin Kleusberg
bddae31bf1 libs: Update qscintilla2 to version 2.10 2017-05-04 21:22:56 +02:00
Martin Kleusberg
b5345fe676 Update QHexEdit library to 0.8.3
This adds support for editing the ASCII data on the right side of the
hex editor widget.
2017-02-14 18:00:52 +01:00
Martin Kleusberg
aa965ff725 Fix last commit
Also drop more Qt4 code in order to achieve this.
2016-10-18 18:33:59 +02:00
Martin Kleusberg
b9e4433318 Drop Qt4 support
This commit removes all code and configuration that was required for
building with Qt4. Hopefully noone really needs it anymore.

See issue #603.
2016-10-18 18:07:38 +02:00
ilovezfs
969e263e5b Xcode 8 fix for QScintilla2 2016-10-07 12:10:55 +01:00
Iulian Onofrei
54e56c5304 Update QHexEdit library to version 0.7.8
- closes #692
2016-08-02 22:17:27 +03:00
Iulian Onofrei
ff302c4b6b Update QHexEdit library to version 0.7.7 (#692) 2016-08-01 18:02:55 +01:00
Vladislav Tronko
8f057d720c Fix indentation after if clause 2016-07-02 08:11:49 +03:00
Justin Clift
c6a39d3441 Adding some useful comments to the qscintilla project file 2016-05-02 14:09:42 +01:00
Justin Clift
11963f4f95 Stop forcing release mode config for qscintilla 2016-05-01 17:14:42 +01:00
nickberry17
f0d6925470 Disabled bufferedDraw for smooth fonts on Retina and high DPI displays (#575) 2016-04-26 14:48:50 +01:00
Jens Hoffmann
3f4ba5982f Fix sqlcipher and OSX 10.10 build.
Building under Mac OS X 10.10 was broken using latest QT SDK. Add
missing macextras and fix INCLUDEPATH for mac.
2015-07-15 00:57:59 +02:00
schdub
3137f21972 QCustomPlot: version 1.3.1 2015-05-22 04:13:00 +03:00
schdub
7070aa4866 qscintilla: rid 'not relevant classes found' in build log 2015-05-20 23:56:12 +03:00
Martin Kleusberg
cde2393539 Use QScintilla instead of own implementation of a code editor
This is a first rough implementation of QScintilla support as SQL text
editor.

It should work mostly and build fine with qmake as well as cmake. The
new code supports all the features of the old one plus adding a few
subtle improvements. The main point of this, however, is reducing the
code we have to maintain and making it easier to add new features to the
editor.
2015-04-23 19:51:54 +02:00
Samir Aguiar
c8ea53bf4f qhexedit: Fix initialization order in QHexEditPrivate
This prevents use of uninitialized values in conditional jumps
as reported by Valgrind. It's already fixed in QHexEdit repository.
2015-03-20 23:31:45 +01:00
Peinthor Rene
a2e704cd01 cmake: lower minimal required version a bit 2014-09-17 22:21:07 +02:00
Markus Elfring
d3ccdc2cdd Bug #58: Completed quoting for parameters of some CMake commands
A wiki article pointed out that whitespace will only be preserved for parameters
in CMake commands if passed strings will be appropriately quoted or escaped.
http://cmake.org/Wiki/CMake/Language_Syntax#CMake_splits_arguments_unless_you_use_quotation_marks_or_escapes.

Quoting was added so that more places should also handle file names correctly
which contain space characters or semicolons eventually.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
2014-08-01 15:49:11 +02:00
Martin Kleusberg
e43f43a3f8 Silence some warnings in the antlr code 2014-07-27 13:39:36 +02:00
Fedosov Alexander
a17fd095d1 '%u' causes warning messages on 64bit systems. 2014-07-26 18:46:40 +04:00
Martin Kleusberg
be401ad477 Fix project files of libraries to compile with Qt5
This should fix issue #11.
2014-05-22 20:19:10 +02:00
Rene Peinthor
0ecff2caa2 cmake: build qcustomplot as static lib and fix windows build 2014-04-23 08:31:53 +02:00
Martin Kleusberg
f451beef0d Update qmake files
As promised, here is me updating the qmake project files in order to
allow building the new version with qmake instead of cmake.
2014-04-20 12:36:21 +02:00
Peinthor Rene
abeafa2786 add qcustomplot qt plotting widget 1.2.1 2014-04-19 22:00:02 +02:00
Sean T. Hayes
5647fa86e0 Minor changes to support building with Visual Studio. 2014-02-14 00:47:18 +01:00
Peinthor Rene
de1fb9ff2f qt5: full qt5 compability
ifdef rest of the code which can't be ported 100%
add CMake option USE_QT5 to use qt5 ;)
Thanks to stretchtiberius for initial patch
2014-02-14 00:28:42 +01:00
Peinthor Rene
202b6c915e qt5: toAscii() -> toLatin1() 2014-02-13 23:52:03 +01:00
Peinthor Rene
33b19895d6 fix windows antlr runtime build 2013-09-08 09:45:05 +02:00
Peinthor Rene
11c4cf423a cmake: fix a few warnings and add an option to build unittests 2013-07-11 16:15:51 +02:00
Peinthor Rene
7c411904b9 cmake: initial version of cmake build system files 2013-07-09 23:36:43 +02:00
Peinthor Rene
e3d20ee434 cleanup and improve qmake build files 2013-04-19 06:30:06 +02:00
Peinthor Rene
267d450805 don't force release target on antlr, it is release by default anyway 2013-04-18 19:01:08 +02:00