Commit Graph

18 Commits

Author SHA1 Message Date
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
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
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
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
bddae31bf1 libs: Update qscintilla2 to version 2.10 2017-05-04 21:22:56 +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
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
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