Commit Graph

214 Commits

Author SHA1 Message Date
Daniel Molkentin
552db99357 Revert "Enable Lion-style fullscreen mode for Creator."
Breaks with Qt 4.7.

This reverts commit f27a916024.

Change-Id: I52e64dbd0e1602d400c83e32f4c8e2cf81d88d3f
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
2011-12-20 19:08:37 +01:00
Eike Ziller
8cc3844038 Allow build to specify different settings path.
Task-number: QTCREATORBUG-5509
Change-Id: I4541049a1861e83f55106effc536fd50eb233d97
Reviewed-by: Alexander Lenhardt <alexander.lenhardt@nokia.com>
Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
2011-12-16 08:48:31 +01:00
Morten Johan Sorvig
f27a916024 Enable Lion-style fullscreen mode for Creator.
Change-Id: Ib44cdd432da7b4609026e211d8c43088d883621a
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-12-06 11:05:32 +01:00
Eike Ziller
5f44d8f535 More Esc fixes.
Move focus back to editor's focus widget if there's one.
(E.g. pressing escape in an output pane while the
commit editor is open.)

Change-Id: I4211a84cfa3d7ee9b61f39ae054fc4bd32e214c1
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2011-12-02 12:34:39 +01:00
Yuchen Deng
7140642d0e Fix central Esc handling again
We should to determine the focus widget whether the same,
Sometimes, the widget's sub-window has the real focus.

Change-Id: I0e9128e7d6008e2cb6de681bb0a1a337ad69a230
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-12-01 12:13:03 +01:00
Eike Ziller
85cf2b661e Merge remote-tracking branch 'origin/2.4'
Conflicts:
	src/libs/qmljs/qmljsinterpreter.cpp
	src/libs/qmljs/qmljsinterpreter.h
	src/plugins/debugger/qml/scriptconsole.cpp
	src/plugins/git/gitplugin.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas_p.h

Change-Id: Iad59c8d87c72a21c79c047e374c0ab689998af39
2011-11-11 09:46:25 +01:00
hjk
82f5573626 more Id type fixes
Change-Id: I3720946ba5485696822976567d83b4d6cb1fb283

x

Change-Id: Iab58bc34bc56371405d132315573b484a533b77c
Reviewed-by: hjk <qthjk@ovi.com>
2011-11-10 15:57:09 +01:00
Harald Fernengel
f9623b5ad6 Small include header fixes
QtXmlStream classes live in QtCore, not QtXml. Also add a few headers
that are not implicitly included in Qt 5 any more. This greatly eases
transition to Qt 5 which not having any side effects on the Qt 4 build.

Change-Id: I1293ef4360015b885dcea8c4099e8e5b9e254c91
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2011-11-09 14:02:40 +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
Tobias Hunger
58a6a7e485 Add "presentation mode"
Presentation mode can be entered by passing -presentationMode when
starting Qt Creator.

It displays a popup with the keyboard shortcut of the commands
that are triggered. Great for the DevDays;-)

Change-Id: I897966aab491f98e2a5abc4433c40b04e2a8db57
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: Liang Qi <liang.qi@nokia.com>
2011-10-31 15:10:27 +01:00
Eike Ziller
2ee0b36342 Make it possible for installers to disable plugins by default.
Plugin manager reads Plugins/Ignored in installation global settings
now, and handles these plugins similar to as if they were experimental.

Change-Id: I56a0c5fe143e3fbd9261244bafece26d7b99c154
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@nokia.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
2011-10-27 18:20:40 +02:00
Eike Ziller
16c6c27901 Adapt default window size to larger window borders.
Also remove old compat settings reading code.

Change-Id: I460322e4ee5167f98ee2c2f258cee956c70e1612
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
2011-10-13 13:57:01 +02:00
hjk
66ab323eb3 use Core::Id for IEditorFactory::id
Change-Id: Iefd67a0461d9016b8ba0f3371df7ec6d42e188c5
Reviewed-on: http://codereview.qt-project.org/4321
Reviewed-by: hjk <qthjk@ovi.com>
2011-09-08 17:40:53 +02:00
hjk
488330255d core: rename uniqueidmanager.{cpp,h} as the class UniqueIdManager is gone
Change-Id: Iffe04bc3bb0103cbac605f0734bbfd66eb7fd854
Reviewed-on: http://codereview.qt.nokia.com/4215
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
2011-09-05 18:04:55 +02:00
hjk
df2858bb6c core: progress on the QString->QByteArray for Core::Id, remove UniqueIDManager
Change-Id: I94bec127866822b790a6e45a4201a7a5fe71d6ce
Reviewed-on: http://codereview.qt.nokia.com/4208
Reviewed-by: hjk <qthjk@ovi.com>
2011-09-05 15:28:46 +02:00
Eike Ziller
bbfa7e0020 Merge app_version.h and ide_version.h
Change-Id: I703d4704a3bdf88bd567c92512ee27db6aea043c
Reviewed-on: http://codereview.qt.nokia.com/3918
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
2011-08-31 13:48:00 +02:00
Friedemann Kleint
2f92eae7bc Utils/Coreplugin: Clean headers.
Change-Id: I1e0d432127651622d40ff990e1866eac9fac46a0
Reviewed-on: http://codereview.qt.nokia.com/3091
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2011-08-17 12:58:38 +02:00
Eike Ziller
dd91cbcf80 Work around wrong click area of output buttons on Mac.
For some reason using push buttons in the status bar will make
the clickable area of the buttons too small (half of the button isn't
clickable). Using QToolButtons instead.

Task-number: QTCREATORBUG-4513
Change-Id: I8b0f97552ec9b2471d570d577522b7ce5f382fb9
Reviewed-on: http://codereview.qt.nokia.com/2193
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
2011-07-26 16:07:04 +02:00
Leena Miettinen
8aea021dc3 UI text: fix capitalization and terminology
Change-Id: Ieb52b4e2e6e8b5835219ecc4f6fe7907539e5bdb
Reviewed-on: http://codereview.qt.nokia.com/1827
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2011-07-19 15:54:50 +02:00
con
974d825bba Move translation noop to constants.
Change-Id: I8b084374f67d2419abbc1a43b377321fd3041cf5
Reviewed-on: http://codereview.qt.nokia.com/538
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2011-06-21 16:34:44 +02:00
con
49ea170692 Add menu item to clear the recent projects/files menus.
Task-number: QTCREATORBUG-5136

Change-Id: I27d5c86832277be9525d95fd1e38a3b86f620974
Reviewed-on: http://codereview.qt.nokia.com/496
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2011-06-20 12:41:10 +02: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
90f7ab49a6 Adapt accelerators of edit menu items.
Acked-by: hjk
2011-03-22 15:06:55 +01:00
Leandro Melo
3db53206c2 MIME types: Introduce user extensions feature
Creates a new page in the options dialog which allows
the user to modify MIME type's globl patterns and rule-based
magic matchers.

As a side-effect of this feature our MIME database (and related
components) got some improvements.

Reviewed-by: Friedemann Kleint
2011-03-02 10:13:40 +01:00
Friedemann Kleint
047ee5522c Debugger: Improve configuration error reporting.
- Make showWarningWithOptions actually show the details.
- Show errors from multiple engines as separate messages.
- Remove 'enabled' option from CDB (handled by toolchain config now).
- Show ABI as tooltip in debbugger toolchain chooser.
2011-02-25 09:34:31 +01:00
con
b40500a7bf Add a generic variable chooser widget.
The chooser allows choosing variables from a list, and inserting them
into previously focused line edit, text edit, or plain text edit.
Variables are now registered with a description in the variable manager.
Also make the QT_INSTALL_BINS --> CurrentProject:QT_INSTALL_BINS for
consistency.
2011-02-18 17:15:41 +01:00
con
eaea867e53 Implement renaming of tools and categories.
Not possible to reset them yet.
Saves the change in the settings instead of writing new tools xml files.
This probably needs to be adapted for tools that are "local" from the
beginning.
2011-02-18 17:15:39 +01:00
con
d768008d60 Add a tools settings page and show the tools there.
No editing possible yet.
2011-02-18 17:15:38 +01:00
con
4429a8de86 Make tools menu look better on Linux/Win 2011-02-18 17:15:37 +01:00
con
371478ffb9 Read external tools from resources and show them in menu. 2011-02-18 17:15:35 +01:00
con
388521605c Send contextAboutToChange before current context object is updated.
Task-number: QTCREATORBUG-3597
2011-02-04 14:59:41 +01:00
con
301f15ee6b Fix some more actions that were enabled at startup without a reason. 2011-01-31 15:18:35 +01:00
Leandro Melo
9e3b5bd0a0 Temporary "feature" to allow user specific MIME types
We need a feature which allows a more flexible binding
of MIME types and editors. This is definetely not the
way to handle it, but a temporary workaround.

Reviewed-by: con
2011-01-20 10:47:42 +01:00
con
d1023c7614 It's 2011 now.
Reviewed-by: hjk
2011-01-12 09:46:24 +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
4321e01efb Some API beautification in action container.
Done-with: Daniel Molkentin
2010-12-17 16:05:47 +01:00
con
04e32b0049 License headers. 2010-12-17 16:03:42 +01:00
con
506fb9e166 Dropping project blocks other programs (like file explorer).
We have to delay or drop event handling, so the Qt code that delivers
the event can return control. The commit also prevents dropping another
file while we are currently already handling a drop.

Task-number: QTCREATORBUG-3344
2010-12-10 14:49:34 +01:00
con
abd4a7b931 Recent files should remember the editor type as well.
Task-number: QTCREATORBUG-1785
2010-12-09 11:38:12 +01:00
hjk
b9f92c29a0 vcsmanager: coding convention 2010-12-08 07:58:23 +01:00
con
3b177facce Some menus where missing a setEmptyAction(EA_None) call.
Was exposed by fixing the empty action mechanism in
d7e7c3427d.
2010-11-15 12:03:45 +01:00
con
a757c55870 Fixes restoration of main window geometry.
We were handling it ourselves, now we let saveGeometry and saveState do
its job. This also takes care of making the geometry valid for offscreen
saved states.

Task-number: QTCREATORBUG-1689
2010-11-02 13:41:25 +01:00
con
99a93dc2e3 Get rid of hardcoded settingspaths that need to be synced.
Share the (user)settings object between plugin manager and Qt Creator
core.
2010-10-25 17:21:28 +02:00
con
3a82e22982 Opening recent files wasn't opening with right encoding (Windows)
Confusion between native and internal path representation (i.e.
backslashes). File names should always be "portable" internally.

Reviewed-by: Robert Loehning
2010-10-20 12:10:02 +02:00
Tobias Hunger
0a5094097d Welcome: Do not open main.cpp when project loading was canceled
When choosing an example from the welcome screen and the user
cancels loading the project:
 * Do not switch to edit mode
 * Do not load main.cpp
 * Do not pop up help

Task-number: QTCREATORBUG-2774
Reviewed-by: Daniel Molkentin
2010-10-19 16:16:04 +02:00
con
2ee57b31d2 Don't override user's shortcut settings for navigation panes at startup.
The action manager was reading the settings before the navigation panels
had their commands registered.

Task-number: QTCREATORBUG-2005
Reviewed-by: hjk
2010-10-08 13:48:26 +02:00
dt
d81d90a67a EditorManager: add a flag for embedded linenumbers
And make use of it to accept on the command line the patterns:
"filename" "+45", "filename" ":23", "filename:12" and "filename+42"

Task-Nr: QTCREATORBUG-2428
2010-09-23 12:36:16 +02:00
dt
00caec3e73 Mode switching: On drag & drop, on remote opening, on Open Files
Readd a few mode switchings that I accidentally removed.

Task-Nr: QTCREATORBUG-2405
2010-09-22 11:56:24 +02:00