Commit Graph

245 Commits

Author SHA1 Message Date
hjk
f0b2d6535e Debugger: Rework editor tooltips handling
Fix expansion and updating.

Persistence and non-locals are still lacking.

Change-Id: I74e25199d50350516afc686a05836e239bfc8acb
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-07-11 12:19:01 +02:00
hjk
dbae15684f Debugger: Simplify tooltip interface
Change-Id: I7ce688e56fb516ef6e77ee2e4f56d9b56379918b
Reviewed-by: David Schulz <david.schulz@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-07-09 13:37:45 +02:00
hjk
eba095d22a Debugger: Fix tooltip expansion behavior
Task-number: QTCREATORBUG-11404
Change-Id: I7e08cd6b8216ff7dd0069c2a8718f6bb619ede07
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-07-09 10:39:23 +02:00
hjk
5fa89bcd54 Debugger: Use a history completer for watched expressions
Some of them can be laborous to retype, so keep some history.

Change-Id: Ibc12077f77fc5acc901c95001fb95bfb89763758
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-07-08 13:50:52 +02:00
hjk
5dd261662b Debugger: Remove direct entering new watchers in the treeview
Instead pop up the "Add new expression dialog". Same amount of activity
needed, but more uniform in UI and code and hopefully less confusion
about the now-gone <Edit> marker.

Change-Id: I228801dc51f6d09ea9991b98399dc9ef04aa96c8
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-07-08 10:49:01 +02:00
hjk
1fd24aa8b7 Debugger: Maintain slider position in watch view
Setting column width seems to reset slider positions, needlessly.
Work around.

Change-Id: Ifa6c6a204dd2fbd7ad3dada0c386b697ae7a4100
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-07-03 11:13:44 +02:00
hjk
90b15b0245 Debugger: Show some text even for disabled context menu action
Task-number: QTCREATORBUG-12527
Change-Id: I293481f7e54a94de375e2cfc50a32ccaeb28231b
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-06-27 18:26:45 +02:00
hjk
11a2d3dc46 Debugger: Consolidate Debugger view creation
Change-Id: I43353911c7c0c8250ee2bccddcf5fdccf04d457c
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-06-04 17:17:49 +02:00
hjk
8d04a3aa80 Debugger/Utils: Merge Debugger::TreeView into layer above and below
Change-Id: Ibb186cabba8fecedfdbd04da000459cf358e56e4
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-06-04 17:17:37 +02:00
hjk
8694ad982d Debugger: More column resizing
Turns out setting the column resize mode on the view itself
is counter-productive as it takes away the ability to
manually re-adjust.

So set the mode only temporarily to get the preferred width
than switch back to manually resize mode and use the hint
to set some initial size. Also use the length of the header
label as absolute minimum.

Change-Id: Ic17e31334b23ce6d541f9459cd22be65145046d3
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-06-04 17:16:41 +02:00
hjk
99271c2343 Debugger: Some infrastructure for stricter watch model testing
Targeting re-use for tooltips, and potentially sorting.

Change-Id: I1ce8f4da73ab5ca13cd70d7c651bc76c67f91a39
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-06-03 16:50:14 +02:00
hjk
d2f64b2892 Debugger: Re-group L&E context menu items
Hopefully more logical now and not too confusing for old-timers.

Change-Id: Iee2124d365bf9a05462b7027792e1efc4c273a3f
Reviewed-by: David Schulz <david.schulz@digia.com>
2014-05-28 11:26:39 +02:00
hjk
d9ba7998c5 Debugger: Fix/simplify selection of Widget to watch with newer GDBs
GDB does return dynamic types nowadays, and some widgets are
not plain QWidgets but subclasses...

Change-Id: If3b7b0f7d639858eeb1e42659a649db22822c20f
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-05-27 15:44:21 +02:00
hjk
f7a4e44764 Debugger: Merge Locals and Expressions context menus
Task-number: QTCREATORBUG-12310
Change-Id: Id5566021038ef03998103684e41df334baae2d94
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-05-27 14:34:10 +02:00
hjk
ed01c9a92a Debugger: Fix title of local formats menu when disabled
Change-Id: I066c680a4bb4814977ad8facc12f338b717ede34
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-05-16 11:13:48 +02:00
Friedemann Kleint
607b7fd8e7 Remove unused variables in the debugger watch window code.
Change-Id: Id70e972c4a768d9d544e062dfc29e9b43d88c56e
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-05-06 09:13:23 +02:00
Orgad Shaneh
c1c8cfad42 Debugger: Remove unused local variables
Change-Id: I1580888f4955b4dc489ce91e705fc9de9f8b75db
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-05-05 16:56:12 +02:00
hjk
3f0d02ad7f Debugger: Rework display type selection
The previous index based way was getting too brittle, use enums instead.
Also add a switch between exponential and flat display for floating
point types.

Task-number: QTCREATORBUG-12050
Change-Id: I86addbac5a80e8b79b176c6107b251b466503fe7
Reviewed-by: David Schulz <david.schulz@digia.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-04-29 09:18:00 +02:00
Daniel Teske
406ccbdef5 DebuggerViews: Fix keyboard navigation on OS X
Also fix WatchTreeView to use double click activation like every other
debugger view.

Change-Id: Idabe21e12d38d59bef66b7d9855a7fe97089dd8f
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-04-16 12:29:20 +02:00
Robert Loehning
746c5d8863 Incremented year in copyright info
Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-01-08 08:29:47 +01:00
Friedemann Kleint
119548a0ff Remove most leading/trailing blanks from translated messages.
They are a hassle for translators and reviewers alike.

Change-Id: I363138212b692cf75fe1605df8af3721315d37e1
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-24 10:50:56 +02:00
hjk
976c044696 Debugger: Apply static pattern to DebuggerToolTipManager
Change-Id: I49869c393b922da75572959973b917894f93f4ec
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-10-14 09:19:02 +02:00
Leena Miettinen
2b573a6d82 Doc: edit debugger API docs
Remove \brief commands from function descriptions.
Use QDoc commands for notes and lists.
Write GDB in all caps.
Fix punctuation and style and grammar issues.

Change-Id: I7f5bf0f53ad643eb4e2981c0d4e39c453dff5558
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-09-09 12:55:15 +02:00
Orgad Shaneh
0bf0cc41ad Debugger: Update scrollbar when navigating with the keyboard
Change-Id: I3b715f763cab15e4d6cf37140040e1bdf5d1eba2
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-08-16 08:24:13 +02:00
hjk
5e005443eb Debugger: Save watcher history
Change-Id: I2cb838bf78a095b822540f4dd98b9b4170079f93
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-06-11 12:04:13 +02:00
Orgad Shaneh
81fc8ff210 Doc: Remove \fn lines adjacent to functions
They are unneeded, some of them are unmaintained

Change-Id: I0ad87e152d8e2328b486b2f904f7cf9613004afe
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-06-05 10:07:14 +02:00
Eike Ziller
65654e4a50 Merge remote-tracking branch 'origin/2.7'
Conflicts:
	src/plugins/android/androidrunner.cpp
	src/plugins/clearcase/clearcasesync.cpp
	src/plugins/fakevim/fakevimhandler.cpp
	tests/auto/ioutils/ioutils.pro

Change-Id: I31587b8a4dd6aacc1e76803159da51a972878370
2013-04-08 13:26:37 +02:00
Kai Koehne
7e1a94e59a Remove unneeded typedefs
Fix gcc 4.8.0 warnings like

warning: typedef 'AvahiSimplePollSetFuncPtr' locally defined but not
used [-Wunused-local-typedefs]

Change-Id: I5cc2917958dc8e6a4c31031577ecc66575b8d328
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-02 11:54:32 +02:00
Friedemann Kleint
85d12bb409 Clean headers in debugger plugin.
Change-Id: Ia50e61a82101b699390b23b4f1ea9509619314bb
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-03-22 10:00:00 +01:00
hjk
e1f8ed7384 Debugger: Sort out the 'address' vs 'origaddr' fields
Now 'address' always refers to the address of the object or
field mentioned in a WatchItem whereas 'origaddr' is
optionally used for the address of the pointer (not its
value) pointing to the object/field in case of "autoderef"
pointers.

Change-Id: I718eb13e6147dafca016c85db6c8b31c631cc764
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-03-08 17:29:06 +01:00
Thiago Macieira
58cc66b638 Escape & in evaluation expressions
If somone watches "&foo", let's display the &, instead of making f an
accelerator.

Change-Id: I633801b2ca1a3f982ad159d62e7189503ce5f72b
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-03-08 10:23:20 +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
hjk
b36afdac3e Debugger: make variable format changes work with multi-selection
Task-number: QTCREATORBUG-7577
Change-Id: I9c9a5b40bfe88970d99ed855e4c912fc98f1fa11
Reviewed-by: hjk <qthjk@ovi.com>
2013-01-10 16:01:36 +01:00
Orgad Shaneh
29a93998df Remove braces for single lines of conditions
#!/usr/bin/env ruby

Dir.glob('**/*.cpp') { |file|
  # skip ast (excluding paste, astpath, and canv'ast'imer)
  next if file =~ /ast[^eip]|keywords\.|qualifiers|preprocessor|names.cpp/i
  s = File.read(file)
  next if s.include?('qlalr')
  orig = s.dup
  s.gsub!(/\n *if [^\n]*{\n[^\n]*\n\s+}(\s+else if [^\n]* {\n[^\n]*\n\s+})*(\s+else {\n[^\n]*\n\s+})?\n/m) { |m|
    res = $&
    if res =~ /^\s*(\/\/|[A-Z_]{3,})/ # C++ comment or macro (Q_UNUSED, SDEBUG), do not touch braces
      res
    else
      res.gsub!('} else', 'else')
      res.gsub!(/\n +} *\n/m, "\n")
      res.gsub(/ *{$/, '')
    end
  }
  s.gsub!(/ *$/, '')
  File.open(file, 'wb').write(s) if s != orig
}

Change-Id: I3b30ee60df0986f66c02132c65fc38a3fbb6bbdc
Reviewed-by: hjk <qthjk@ovi.com>
2013-01-08 10:48:18 +01:00
Friedemann Kleint
9043898f6f Fix crash in context menu for edit formats.
Ensure type is in range.

Change-Id: I850eab05d365fca4fbf86ca3e7753e117d3f2f2a
Reviewed-by: hjk <qthjk@ovi.com>
2012-12-28 19:26:14 +01:00
Eike Ziller
ba1d5f2cdf Merge remote-tracking branch 'origin/2.6'
Conflicts:
	share/share.qbs
	src/plugins/cpptools/cppchecksymbols.cpp
	src/plugins/texteditor/behaviorsettingswidget.cpp

Change-Id: Ia34060984f9c036b2f28a6411d796d41f55a3e37
2012-11-27 11:50:56 +01:00
Aurindam Jana
46101b0bb2 Inspector: Update Editor on object selection
When an object is selected in the Inspector, the
Editor is updated to show the relevant code.

Task-number: QTCREATORBUG-8246

Change-Id: I4f7fbcccdeb22849682fa72c63e87a78f48d185b
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
2012-11-26 15:04:56 +01:00
Friedemann Kleint
9deb806b42 Fix memory highlighting of first variable/member.
Give it a color number != 0 and replace the first generated color
(usually very bright) by base color.

Change-Id: I736fa24215974b810f050d8a407ddf4a2432d711
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2012-11-15 17:26:39 +01:00
Friedemann Kleint
0767aab4b9 Improve color highlighting of memory view.
Factor out and streamline code from the annotation highlighter
to create a list of colors suitable for highlighting and use that
in memory view.

Task-number: QTCREATORBUG-8250
Change-Id: Iefd408847897ddc98e3aecd6e4f084d1415b80c0
Reviewed-by: hjk <qthjk@ovi.com>
2012-11-15 17:06:22 +01:00
Eike Ziller
67b0637934 Merge remote-tracking branch 'origin/2.6' 2012-10-29 15:13:06 +01:00
Friedemann Kleint
0ae5695649 Try to watch local variable in watchwindow-DND, too.
Fix codepath overlooked in
6886e485de by introducing
a WatchHandler::watchVariable().

Task-number: QTCREATORBUG-8120
Change-Id: Ibab2619754e0006f3c81810a6bfdf758261c169e
Reviewed-by: hjk <qthjk@ovi.com>
2012-10-29 13:29:56 +01:00
Aurindam Jana
c2c58fecd7 Inspector: Set the context of console
The current selected item in the inspector view
is set as the context of the console.

Task-number: QTCREATORBUG-7439

Change-Id: Ibc980218751ce4afacf714cf1ab34f0a36550b2c
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2012-10-25 14:11:47 +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
Nikolai Kosjar
ed86a7ca58 Get rid of some Q_WS_X11.
This macro isn't defined in Qt5 anymore, so use Q_OS_* where
appropriate.

Regarding bug QTCREATORBUG-7936:
Now the fonts look normal again on GNU/Linux, e.g. in the text editor
and the application/compile output pane.

Task-number: QTCREATORBUG-7936
Change-Id: I501cca608f273789d095e1138b32c2c8c38b0059
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-10-04 08:00:26 +02:00
hjk
422eee2938 debugger: handle "bad" characters when d&d'ing new watchers
Change-Id: I9847a1e22d9dc384658972c1462c4f6d42654daa
Reviewed-by: hjk <qthjk@ovi.com>
2012-09-21 23:25:50 +02:00
Friedemann Kleint
6886e485de Handle watching/tooltips of C++ editor tokens consistently.
For editor tooltips and the editor context menu
'Watch expression', always try to find a local variable first
and use its expression.

Change the tooltip manager/widgets not to rely on the debugger
model enum and obscure expression, filter by complete iname
instead. Remove obsolete enumeration.

Change gdb's handling of tooltips such that local variables
are displayed immediately without creating additional tooltip
items.

Change-Id: I9b55823428029ba50d84d3a8cab55eb58942e72b
Reviewed-by: hjk <qthjk@ovi.com>
2012-09-03 09:02:56 +02:00
Friedemann Kleint
5bbaef6b10 Debugger: Fix stack layout display.
Do not start at model root, since an additional layer
has been introduced. The check for root level in the recursion
is then no longer required.

Change-Id: I22c83b3eb4c07dacc3b5af45edeb340a02c01e3e
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-21 16:27:59 +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
hjk
48fcfe0b8d debugger: move watchpoint convenience functions to breakhandler
Change-Id: I7f214ff5fe6d996c4dd14c6ac181a482ad00c94e
Reviewed-by: hjk <qthjk@ovi.com>
2012-06-04 00:14:41 +02:00