feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
31,419 Commits 108 Branches 368 Tags
d0633f0ac9ddcc8a9e8c806677972f019f0d320c
Commit Graph

44 Commits

Author SHA1 Message Date
Lorenz Haas
7d2a7685aa Editor: Show file encoding in editor toolbar 
The file encoding is shown next to the current line in the toolbar. If
the label is clicked a dialog for encoding selection is shown.

Task-number: QTCREATORBUG-8376
Change-Id: I9adee76a31929de5f698d14fe5ca5abce3cc4633
Reviewed-by: David Schulz <david.schulz@digia.com>
 2013-04-18 15:53:53 +02:00
David Schulz
6ef0cf1a30 Editor: Refactor Open Link in Next Split. 
Cleanup code and added shortcuts and menu entries for
- open header/source in next split
- follow symbol under cursor in next split
- open declaration/definition in next split

Change-Id: I2c4347749d26669d88b7c2968f30f60710f442b1
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
 2013-02-14 09:46:16 +01:00
David Schulz
78076ed8f2 Editor: Remove default for "Open Links In Another Split". 
The functionality in generall is ok, but current default
behavior is not expectet, so turning it off.

Change-Id: Ibfff28e02d49269981314c9924b36f9f2d4d7740
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-02-04 15:04:05 +01:00
Oswald Buddenhagen
1fda2111d4 Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in
	src/plugins/debugger/qtmessageloghandler.cpp
	src/plugins/debugger/qtmessagelogwindow.cpp
	src/plugins/madde/maemodeployconfigurationwidget.cpp
	src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
	src/plugins/qmldesigner/designercore/include/widgetqueryview.h
	src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.h
	src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
	src/plugins/qnx/bardescriptormagicmatcher.h
	src/plugins/qt4projectmanager/profilekeywords.cpp
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/deployablefilesperprofile.h
	src/plugins/remotelinux/deploymentinfo.cpp
	src/plugins/remotelinux/deploymentsettingsassistant.cpp
	src/plugins/remotelinux/profilesupdatedialog.cpp
	tests/auto/icheckbuild/ichecklib.cpp
	tests/auto/icheckbuild/parsemanager.cpp
	tests/auto/icheckbuild/parsemanager.h

Change-Id: Ie465a578446a089e1c502d1cb1096e84ca058104
 2013-01-31 16:25:33 +01:00
Robert Loehning
298531e370 Incremented year in copyright info 
Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2013-01-29 16:27:03 +01:00
Petar Perisin
39e9c5ef20 Editor: Allow to open links in a new split. 
This changes current behavior while opening links. Link is now opened in
next split by default. If you use CTRL+Click to open links, it will also
open in next split. However, by using CTRL+ALT+click it will open in
current split.

There are two new checkboxes in Tools/Options/Text Editor/Display:
- "Open Links in New Split" - if it is checked, links will not be opened
in current split. However, if document with link is already opened, it
will be used to open the split
- "Force open links in next split" - Links will always open in next
split, even if their document is already opened somewhere else.

Task-number: QTCREATORBUG-8117
Change-Id: Ib99075b55d9e9683ed2c2386767227457de0a3fc
Reviewed-by: David Schulz <david.schulz@digia.com>
 2013-01-11 12:48:44 +01:00
Vasiliy Sorokin
6a90a1a740 Add Highlight Matching Parentheses setting 
Task-number: QTCREATORBUG-8008

Change-Id: If1989eb850e82636c735a319bc7c4950a01dd33c
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: David Schulz <david.schulz@digia.com>
 2012-10-18 11:05:05 +02:00
hjk
386ca7c8dd Adjust license headers 
Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2012-10-05 17:12:56 +02:00
Eike Ziller
e0e8cf3ada Contact -> qt-project.org 
Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2012-07-19 13:23:21 +02:00
Erik Verbruggen
3fa55b7ab9 Removed module names from #include directives. 
Getting the #include directives ready for Qt5. This includes the
new-project wizards.

Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-02-15 16:24:46 +01:00
hjk
2931a499e6 Long live the king! 
Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-01-26 19:55:36 +01:00
hjk
31600758de all: s/info@qt.nokia.com/qt-info@nokia.com/ 
Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-11-03 10:33:19 +01:00
Friedemann Kleint
ddf4b613f3 Krazy fixes (spelling, single char strings, char constants). 2011-05-10 15:21:41 +02:00
Tobias Hunger
aa2acec14c Fix/add copyright headers 
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
 2011-05-06 15:17:05 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
con
d1023c7614 It's 2011 now. 
Reviewed-by: hjk
 2011-01-12 09:46:24 +01:00
con
04e32b0049 License headers. 2010-12-17 16:03:42 +01:00
Leandro Melo
67d0ab3fac Remove option to extend tooltips. 2010-08-31 19:04:52 +02:00
Leandro Melo
0ccdbbc91d C++ tooltip: Integration with Qt docs always on (for showing brief descriptions). 
The old integration option is now used to switch to extended descriptions.
 2010-07-22 12:03:51 +02:00
Leandro Melo
3ed60eaa6c C++ tooltip: Option to integrate Qt docs into tooltips. 2010-07-13 14:46:06 +02:00
mae
be92567948 Add "center cursor on scroll" option for the base text editor 2010-04-14 13:40:36 +02:00
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +01:00
Thorbjørn Lindeijer
3d2d122472 Moved the mouse navigation option to the Behaviour settings page 
It used to be hidden on the Display settings page.

Task-number: QTCREATORBUG-135
 2009-12-08 18:22:52 +01:00
mae
dc713d0684 added "auto-fold first comment"-option to the editor 
Convenient when you don't want to see all the big license headers.
 2009-12-01 18:08:47 +01:00
mae
e2a899e354 improved search result selection with over and underlay 
done with thorbjorn
 2009-12-01 14:47:40 +01:00
mae
45933a35ef Reset default for "highlight current line" 
By accident the default was changed to false, but we want true.
 2009-10-07 11:13:06 +02:00
hjk
93cbef8724 long live the king 2009-08-14 09:30:56 +02:00
Thorbjørn Lindeijer
d34bf41a37 Added the option to turn off marking of text changes 2009-07-16 11:30:11 +02:00
Jason McDonald
884b7af769 Update license headers and sales contact details. 
Reviewed-by: Trust Me
 2009-06-17 00:01:27 +10:00
Thorbjørn Lindeijer
cf44cbf58e Added an option to disable the mouse navigation 
It's conflicting too much with pasting for some, so better have the
option to just turn it off.
 2009-05-13 16:07:43 +02:00
Thorbjørn Lindeijer
baeb67133b Removed the fancy folding bar 
The improved traditional bar will hopefully keep everybody happy.
 2009-05-04 12:04:40 +02:00
mae
ffe9fe58f7 support old-fashioned +/- folding bar, but improved 2009-04-29 15:37:38 +02:00
mae
94a713c38e parentheses matching and block highlighting polishing 2009-04-29 12:17:42 +02:00
mae
0b81651839 more traditional defaults, this is stuff in progress. 2009-04-28 12:03:06 +02:00
mae
5f89921179 polishing of block highlighting, and a new folder bar. 2009-04-24 16:44:48 +02:00
mae
a71436649c removed the folding ribbon from the default configuration, instead 
turned a new block highlighting mechanism on.
 2009-04-23 17:28:53 +02:00
mae
4d708fa408 new text editor option "Highlight blocks" 2009-04-22 20:04:38 +02:00
hjk
8ca887aae2 Fixes: change file license headers to include LGPL 2009-02-25 09:15:00 +01:00
Daniel Molkentin
59affcfffc Bump year in licence header. 2009-01-13 19:22:14 +01:00
hjk
da3cb14483 chancge Nokia GPL exception version from 1.2 to 1.3 2008-12-16 17:20:00 +01:00
hjk
cf11b69643 more code cosmetics 2008-12-02 16:19:05 +01:00
hjk
ab83dcd87c off-by-one in headers 2008-12-02 14:20:25 +01:00
hjk
8a43d9b9f3 end-of-line whitespace correction of the new headers 2008-12-02 14:17:16 +01:00
con
05c35356ab Initial import 2008-12-02 12:01:29 +01:00