Commit Graph

111 Commits

Author SHA1 Message Date
hjk
70d392d235 core: make context and widget IContext data members 2011-04-14 11:15:07 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
con
1c2da511b9 Merge remote branch 'origin/2.2'
Conflicts:
	src/plugins/debugger/gdb/gdbengine.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemoglobal.h
	src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp
	src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.h
2011-04-01 09:53:09 +02:00
dt
306a945b86 Navigation Tree View: Fix width of column
We want to have the width both to be at least the contents size
but also stretch to width of the viewport.

Reviewed-By: con
2011-03-28 14:34:15 +02:00
dt
c6e0499026 Sessions: Store expand/collapsed state of project tree
Task-Nr: QTCREATORBUG-3161
And related to
Task-Nr: QTCREATORBUG-1796
2011-03-25 16:50:21 +01:00
con
d1023c7614 It's 2011 now.
Reviewed-by: hjk
2011-01-12 09:46:24 +01:00
Paul Kolomiets
fd9e25d698 set stretch last section for class view and project view trees
Merge-request: 225
Reviewed-by: dt <qtc-committer@nokia.com>
2011-01-10 16:35:40 +01:00
con
b1bcf081d8 Merge branch '2.1'
Conflicts:
	src/plugins/coreplugin/basemode.cpp
	src/plugins/coreplugin/basemode.h
	src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp
	src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.h
	src/plugins/debugger/cdb/cdbsymbolpathlisteditor.cpp
	src/plugins/debugger/debuggeragents.cpp
	src/plugins/debugger/debuggeruiswitcher.cpp
	src/plugins/debugger/debuggeruiswitcher.h
	src/plugins/projectexplorer/buildconfigdialog.cpp
	src/plugins/qmldesigner/components/propertyeditor/colorwidget.cpp
	src/plugins/qmldesigner/components/propertyeditor/colorwidget.h
	src/plugins/qmldesigner/designercore/include/enumeratormetainfo.h
	src/plugins/qmldesigner/designercore/include/modelutilities.h
	src/plugins/qmldesigner/designercore/include/nodeinstance.h
	src/plugins/qmldesigner/designercore/include/propertymetainfo.h
	src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.h
	src/plugins/qmldesigner/designercore/instances/graphicsviewnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.h
	src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/qmlviewnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.h
	src/plugins/qmldesigner/designercore/metainfo/enumeratormetainfo.cpp
	src/plugins/qmldesigner/designercore/metainfo/propertymetainfo.cpp
	src/plugins/qmldesigner/designercore/model/modelutilities.cpp
	src/plugins/snippets/inputwidget.cpp
	src/plugins/snippets/snippetscompletion.cpp
	src/plugins/snippets/snippetscompletion.h
	src/plugins/snippets/snippetspec.cpp
	src/plugins/snippets/snippetsplugin.cpp
	src/plugins/snippets/snippetswindow.cpp
	src/plugins/snippets/snippetswindow.h
	src/plugins/texteditor/snippetsparser.cpp
	src/tools/qml/qmldom/main.cpp
	tests/manual/trk/runner.cpp
	tests/manual/trk/trkolddevice.cpp
	tests/manual/trk/trkolddevice.h
	tests/manual/trk/trkserver.cpp
2010-12-17 17:00:53 +01:00
con
04e32b0049 License headers. 2010-12-17 16:03:42 +01:00
dt
74d641a8d1 ProjectExplorer: Fix context menu actions
Disable/Enable them correctly and give them the correct context.

Task-Nr: QTCREATORBUG-3078
2010-11-12 17:54:07 +01:00
Friedemann Kleint
22f03cbde6 ProjectExplor/Debugger: Header cleanup 2010-11-02 16:14:00 +01:00
Friedemann Kleint
4293ee40ec ProjectExplorer: Remove internal classes from exported headers. 2010-11-01 11:18:27 +01:00
Leena Miettinen
86dc1fb6e8 UI text - fix capitalization 2010-09-28 17:29:05 +02:00
dt
08ccda5862 EditorManager: Change openEditor/activateEditor to not do mode switching
Also introduce a indirection, modes have now types, edit and debug have
the same type, and editors do have a prefered type of modes instead of a
prefered mode.

That fixes the bug that if the prefered qml editing mode was set to
design, then in switching between qml editors would
- in Edit Mode: stay in edit mode
- in Debug Mode: switch to debug mode
2010-09-14 15:23:11 +02:00
Denis Mingulov
b23b4588bf Navigation Widget: add 'Priority' support
Merge-request: 176
Reviewed-by: hjk <qtc-committer@nokia.com>
2010-09-09 14:39:59 +02:00
Alessandro Portale
3aa3c5688f Pedantic cleanup of filename parameters for QIcon constructor
Using more *::Constants::ICON_* where it makes sense and
wrapping the file names into QLatin1String where they were
missing.

The increased usage of the ICON constants needed a few more
cross plugin includes of *constants.h, here and there.
I think that it is OK, since the dependencies were alredy there
icon resource wise.
2010-07-30 22:17:14 +02:00
Kai Koehne
4b504323ec Show horizontal scrollbar in navigator views (if needed)
Requested by con.
2010-07-16 16:27:14 +02:00
Denis Mingulov
5af6f15f7c Utils::NavigationTreeView is created - as a base class for any Navigation Widget (Side Bar) tree view
Merge-request: 2167
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2010-07-16 11:24:02 +02:00
Kai Koehne
679ccc3b74 QmlOutline: Add filter for hiding bindings (properties) 2010-07-14 16:56:14 +02:00
dt
d5932f0cc7 Active project not beeing bold after switching navigation views
Task-Nr: QTCREATORBUG-1741
2010-07-08 15:37:56 +02:00
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +01:00
Lasse Holmstedt
df7a19de9e Design mode integration
Moved Qt Designer to open from Design Mode. Also, Design mode is now global,
and created in coreplugin. Other plugins can register themselves to it.
2010-02-26 11:17:02 +01:00
Kai Koehne
30dfae9007 Fix Project pane synchronization in case one opens first file via
Locator

Commit 38924e386 makes sure that the Project node is selected after
loading a new project, even when there is a current editor opened.

Make sure that we actually only block the sync if no new file is opened.

Done with mae.

Reviewed-by: mae
2010-02-25 15:18:30 +01:00
con
58a248cb9d Navigation widgets need separate id and display name.
Such that the layout of the left hand sidebar can be restored
even if the display language is changed.
2010-01-27 19:05:19 +01:00
dt
38924e3863 On loading a project, select it in the project tree view
This fixes the issue that when loading a project in a big session the
newly loaded project is hard to find. The solution is a bit of a hack.
Reviewed-by: mae <qt-info@nokia.com>
2010-01-08 13:47:52 +01:00
Tobias Hunger
a6ad773722 Make method naming more consistent.
* Use id() for methods returning a string used to represent
    some type of object.
  * Use displayName() for strings that are meant to be user
    visible.
  * Quieten some warnings while touching the files anyway.
  * Move Factories to their products in the plugins where that
    was not done before.

Reviewed-by: dt
2010-01-07 18:17:24 +01:00
Roberto Raggi
c17fcb8ac6 Fixed a typo.
Renamed doockToolBarWidgets
2009-10-09 17:41:09 +02:00
Friedemann Kleint
ad294f8467 Project explorer: Make public headers compile with NO_CAST_FROM_ASCII
.. and purge unneeded includes.
2009-09-29 11:39:55 +02:00
Friedemann Kleint
978cf4bda8 Rename IRunConfigurationRunner -> IRunControlFactory...
and ApplicationRunConfiguration to LocalApplicationRunConfiguration,
preparing remote debugging. Change the interface canRun() to be const,
run() to create() (since it does not run anything), use references
to the QSharedPointer<Foo>. Introduce d-Pointer and remove
unneeded headers from ProjectExplorerPlugin and add missing includes
everywhere.
2009-09-25 11:35:44 +02:00
hjk
93cbef8724 long live the king 2009-08-14 09:30:56 +02:00
con
8ed85f1eb6 Unify tool button appearance in "panelWidgets".
Reviewed-by: Jens Bache-Wiig
2009-07-17 13:13:32 +02:00
dt
ed9f834714 Fix crash on removing a .pro file from the project with creator open 2009-06-26 16:52:09 +02:00
Jason McDonald
884b7af769 Update license headers and sales contact details.
Reviewed-by: Trust Me
2009-06-17 00:01:27 +10: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
dt
27a241749a Fix currentNode beeing invalid. The ProjecTreeWidget takes care of that. 2009-03-31 15:05:52 +02:00
hjk
8ca887aae2 Fixes: change file license headers to include LGPL 2009-02-25 09:15:00 +01:00
mae
14e36bcd5a Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline 2009-02-02 21:58:54 +01:00
con
66e9410f3d Fixes: - Unwanted focus halos 2009-01-30 17:09:33 +01:00
mae
fb01db4490 Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
Conflicts:
	src/plugins/coreplugin/editormanager/editormanager.cpp
2009-01-28 17:03:52 +01:00
Jens Bache-Wiig
e33c21934a Fixes: Kill alternate row colors
Details:
It was worth a try but it seems redundant, so
we might as well kill it.
2009-01-27 15:01:54 +01:00
mae
1cd553e6b8 Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline 2009-01-27 12:51:44 +01:00
Jens Bache-Wiig
bd15f2b308 Fixes: Set alternate base on light themes
Details:
Not all themes have ok contrast for alternate base and
we want to keep it light, so I'm enforcing it for
themes with white background.
2009-01-27 12:51:14 +01:00
Jens Bache-Wiig
e4876723a4 Fixes: Use alternate row colors for sidebar
Task:     As discussed with b_lindeijer
Details:
This enables alternate row colors, with filled empty
area on the side bar for improved usability.
2009-01-27 10:10:24 +01:00
mae
1b345cfa0f Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
Conflicts:
	src/plugins/perforce/perforceplugin.cpp
2009-01-23 14:41:33 +01:00
Thorbjørn Lindeijer
6adecf3767 Avoid going through ICore when it's not necessary
Many singletons have their own instance() method, in which case there is
no need to use ICore::instance() to get access to them.
2009-01-21 15:55:33 +01:00
mae
7cfa4dbe5b Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
Conflicts:
	src/plugins/coreplugin/editormanager/editormanager.cpp
	src/plugins/coreplugin/editormanager/openeditorsview.cpp
	src/plugins/coreplugin/editormanager/stackededitorgroup.cpp
2009-01-21 15:24:20 +01:00
hjk
667255c4d1 some more ICore related cleanup 2009-01-20 17:14:00 +01:00
mae
ed5afa14dd added new empty split actions and fixed a few loopy bugs with double select files. 2009-01-20 17:06:46 +01:00
Daniel Molkentin
59affcfffc Bump year in licence header. 2009-01-13 19:22:14 +01:00
Thorbjørn Lindeijer
6c1e557d70 Changed coreplugin resource prefix to "/core"
It still read "/qworkbench", the research project name for Qt Creator.

Reviewed-by: con
2009-01-12 15:23:22 +01:00