feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
27,676 Commits 108 Branches 368 Tags
45b021331ed6c35ece4e3c28f53a12bc90cddcd9
Commit Graph

514 Commits

Author SHA1 Message Date
mae
d4797bd98d show the visual column in the line-column-label (makes a difference 
when using tabs).

Column counting still starts with 1.
 2009-06-09 19:45:53 +02:00
Roberto Raggi
8c41eddaf4 Merge branch '1.2' of git@scm.dev.nokia.troll.no:creator/mainline 2009-06-09 18:38:52 +02:00
Jens Bache-Wiig
c85435d9ab Fixes: Fix a painting glitch when not using code folding 2009-06-09 18:17:54 +02:00
con
f3875c7e8e Merge commit 'origin/1.2' 2009-06-08 15:50:43 +02:00
Roberto Raggi
df99d5447f Initial work on "Quick Fix". 2009-06-08 14:32:42 +02:00
Jens Bache-Wiig
1ada16cd10 Fixes: Limit new folding indicators to Oxygen 
Details:
It seems mac and windows people disagree with forcing
the new indicators on everyone so I will limit it to
Oxygen for now as it was the style in most need of
a fix.
 2009-06-08 12:09:19 +02:00
Jens Bache-Wiig
b25edbe2ab Fixes: Draw arrow branch collapse arrows on all styles 
Details:
We now draw mac/vista-like expand indicators in all styles
as suggested by danimo.
 2009-06-05 16:17:15 +02:00
Jens Bache-Wiig
ab487246e9 Fixes: Make selection rect a little darker 
Details:
Looked a bit too light in certain themes including mac.
 2009-06-05 13:59:53 +02:00
Jens Bache-Wiig
d10389b9c5 Increase the delay for folding blocks 
Details:
40 ms seems a bit too short. We should at least allow the mouse
cursor to pass undetected. The 10 ms delay seems a bit redundant.
 2009-06-04 16:42:09 +02:00
Oswald Buddenhagen
d2a8449bea ifdef Q_?S_* cleanup 
- clear up some Q_OS_LINUX vs. Q_OS_UNIX
- clear up Q_WS_* vs. Q_OS_* (relatively theoretical exercise)
- use proper #if-#else cascades instead of free-standing #ifs
 2009-06-03 20:54:59 +02:00
Jens Bache-Wiig
3df7a2c301 Fixes: Fix overlapping alpha values in expander area 
Details:
There are platform differences when drawing overlapping alpha
rects here. The workaround was to simply avoid using alpha
values for now.
 2009-06-03 20:22:10 +02:00
mae
82153bf5fd fixed deletion of vertical block selection with Backspace key 2009-05-29 18:48:42 +02:00
Jens Bache-Wiig
3cc335618e Fixes: Centered arrow offset on mac 2009-05-29 17:44:32 +02:00
con
67466d0fb8 Support regular expressions in basic text editors. 2009-05-29 17:03:11 +02:00
con
c49412ac3a Prepare for being able to add find flags that are not in QTextDocument 2009-05-29 17:03:10 +02:00
Jens Bache-Wiig
4db79f2cbe Fixes: Fix mac problems in collapse highlight 2009-05-29 16:51:04 +02:00
Jens Bache-Wiig
33b68e1420 Fixes: Prettify the block highlighting 
Details:
I softened it ut to make it significantly less
distracting.
 2009-05-29 15:31:27 +02:00
Lorn Potter
55e7f65533 Fixes: make method combo take up more space on the toolbar, so long 
class and method names can be seen.

Task:     <task number>
Details:  <additional information>
 2009-05-29 04:49:31 +10:00
Roberto Raggi
6ec0b2591e Removed debug output. 2009-05-28 11:12:16 +02:00
mae
4bdc0664eb Small fix for parentheses matching: give the syntaxhighlighter a chance 
to update the parentheses information.
 2009-05-27 20:50:07 +02:00
Thorbjørn Lindeijer
2a1bfc6059 Integrate merge-request #542 into branch 'master' 
Joel Nordell (1):
      XCode-style tab behavior

Request-url: http://gitorious.org/qt-creator/qt-creator/merge_requests/542
Reviewed-by: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>
 2009-05-27 09:47:50 +02:00
Thorbjørn Lindeijer
c358a68557 Do still pass the typed character to the indenter 
Some indenters need this information. If the C++ indenter misbehaves
based on the typed character, then that should be fixed there.

This reverts part of commit 4c07de50b2.

Reviewed-by: Roberto Raggi
 2009-05-26 12:05:05 +02:00
Thorbjørn Lindeijer
7534732d3b Integrate merge-request #444 into branch 'master' 
Joel Nordell (1):
      add ':' to electric keys for C++ indenting, and check for electric
         keys anywhere on line, not just at beginning

Request-url: http://gitorious.org/qt-creator/qt-creator/merge_requests/444
Reviewed-by: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>
 2009-05-25 16:31:56 +02:00
Joel Nordell
ffd19fe8a0 XCode-style tab behavior 2009-05-20 11:10:06 -05:00
Joel Nordell
4c07de50b2 add ':' to electric keys for C++ indenting, and check for electric keys anywhere on line, not just at beginning 2009-05-18 14:38:22 -05:00
Thorbjørn Lindeijer
5208444d7a Merge branch 'copylines' 
Conflicts:
	src/plugins/texteditor/texteditorconstants.h
 2009-05-18 12:34:12 +02:00
Serge Ratke
2dd046640d implementation of copy lines up/down functionality 2009-05-15 23:17:11 +02:00
Thorbjørn Lindeijer
9a79a06930 Introduce a Delete Line action that doesn't copy to clipboard 
The version that does copy to clipboard is now called Cut Line, and is
still mapped to Shift+Delete by default.
 2009-05-14 17:55:17 +02:00
dt
64e6b49bef Fixes: toggling Whitespace visualization while using block highlight 
Correctly draw the block highlighting after toggling.
 2009-05-12 14:43:35 +02:00
Thorbjørn Lindeijer
3b1e1231f1 Fixed position of folding markers with QGtkStyle 
Not a brilliant solution, but it works. Changing the style itself would
cause problems in other places where the PE_IndicatorBranch is drawn.

Reviewed-by: Jens Bache-Wiig
 2009-05-12 13:01:34 +02:00
Roberto Raggi
12e27549b0 Introduced IFile::checkPermission() and use it to reduce the number of calls to isWritable(). 
Done with: mae
 2009-05-08 15:50:15 +02:00
mae
68d85acaa5 supress parentheses animation if the position was part of the previous 
parentheses highlighting. This makes the Delete key work smoother when
the cursor is positioned behind a closing parenthesis.
 2009-05-06 11:18:56 +02:00
Thorbjørn Lindeijer
358a355315 Fixed faked transparency of folding makers with Plastique style 
Plastique is manually blending with the background color, so make sure
we set the background to the highlight color when the folding marker is
hovered.
 2009-05-05 10:25:18 +02:00
mae
78e4822390 Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline 2009-05-04 14:47:36 +02:00
mae
a1d7db7e15 Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline 2009-05-04 13:47:39 +02:00
Thorbjørn Lindeijer
9cd7d3ac10 Fixed folding markers not showing up with the Mac style 2009-05-04 13:46:55 +02:00
mae
7a1fe81426 give the wave underline more priority, so it will be above search results 
and find scopes (but below the main selection)
 2009-05-04 13:46:50 +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
Thorbjørn Lindeijer
3236678c7b Fixed resetting of block highlighting when leaving the extra area 
When the block highlighting was enabled, it would still get removed when
the mouse left the extra area. Now it changes back to the text cursor
position.

Done with mae.
 2009-05-04 11:47:28 +02:00
Thorbjørn Lindeijer
0c0cacb71e Fixed the block highlighting in combination with right margin 
The highlights would extend on top of the right column margin. It looks
better when they don't.

Done with mae.
 2009-05-04 11:33:59 +02:00
Thorbjørn Lindeijer
b7e12e23f4 Changed classic folding markers 
This new look fits better with the new behaviour. Also, the
collapse/expand markers are now drawn by the style.
 2009-05-04 11:13:31 +02:00
mae
b4f78421ad fancy folding bar: shift the active folding bar area for the function body case 
one up.
 2009-04-29 17:11:37 +02:00
mae
b1a024e55b some corner cases fixing 2009-04-29 16:46:54 +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
3b917fde19 mac fix for parenthesis matching 2009-04-28 19:02:58 +02:00
mae
5df82ab502 experiment with a different way of doing parenthesis matching. This is not finished and 
work in progress.
 2009-04-28 18:34:58 +02:00
mae
606ce15431 more tweaking 2009-04-28 12:55:31 +02:00
mae
a8be2532d1 tune block highlighting 
done with Thorbjorn
 2009-04-28 11:43:13 +02:00
Thorbjørn Lindeijer
968a3c0f9f Added 'current line number' to color theme settings 
Recently it was made to highlight black or write, which isn't nice for
everybody. Now it is dark gray by default, and can be customized. Bold
and italic are also supported.
 2009-04-27 14:10:54 +02:00