Commit Graph

1907 Commits

Author SHA1 Message Date
Eike Ziller
9e714006ee Move all progress indicator handling to progress manager.
Part of it was managed in ProgressView, which only complicates things.

Change-Id: Ia9ca03e3228f3662864749da751f7ec4bdf23297
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-04-10 14:21:07 +02:00
Friedemann Kleint
0a5eeb542b Fix widgets flashing before start.
Pass parent to status bar widgets.

Change-Id: I5834ce5feececc33e850dafd55f3b29bd0df38c8
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-10 11:01:11 +02:00
Eike Ziller
5a3dfb767f Move progress indicators out of mode bar.
This both allows the mode bar to be hidden optionally, and can give the
progress information a bit more room (e.g. for titles).

Progress information can either be shown in "pop up" windows in the
lower left corner of the main window (hiding window contents below),
or in a summary progress bar in the bottom right corner of the status bar.
Hovering the summary progress bar temporarily pops up the detailed
progress information. Keyboard can be used to switch between the two
views.

Change-Id: Ic6d6ab4fd43906e84b480c8ddf8eae5f5852e1f3
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-04-09 15:50:25 +02:00
Eike Ziller
dd731a8998 Add right aligned location for widget in status bar.
Change-Id: I7ff41fc891836d15b2b9b6bf090feaf2e4feb968
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-04-09 13:05:48 +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
David Schulz
6c12a06029 Editor: Added Dialog for read only files.
Task-number: QTCREATORBUG-2851
Change-Id: Ic47a5a1833650e31b4e27d0a01259d6b398a6415
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-08 10:16:11 +02:00
hjk
fe29d6a8a3 Core: Remove Core::Id(QByteArray) constructor
This was mostly used to disambiguate the char * and the QString
constructors.

Change-Id: Ib6923ef8e8c0e5d514a883e73aa001a1cd9fb534
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-04 16:47:59 +02:00
Eike Ziller
46dcfc30a4 Activate window of editor when setting focus on it.
Both fixes a bug with Qt4 and is needed when having multiple toplevel
editor windows.

Task-number: QTCREATORBUG-8735
Change-Id: I151164a6ad00beb92cb241e581d381a9534733f8
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-04-04 11:42:57 +02:00
Oswald Buddenhagen
06acd82ada derive TARGET from QTC_{LIB,PLUGIN}_NAME
the information is redundant now

Change-Id: Icc8c8b4ace11538d45c6c9e1dbe5a7976f4743e1
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-03 14:37:56 +02:00
Oswald Buddenhagen
66a3553107 make library and plugin dependencies declarative
instead of directly including the respective pri files in
*_dependencies.pri, set variables and let qtcreator.pri resolve
them to includes.
this will allow us to re-use the dependency info elsewhere.

Change-Id: Iaa33924e428ac0409660f42df2f98a7978452d3e
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-04-03 14:37:45 +02:00
Eike Ziller
36a421e778 ProgressManager: Use QGraphicsOpacityEffect instead of hack
Change-Id: Ic3bd8e7d8d33a14be0e49e2d4a22ea30384aebc5
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-03 09:19:45 +02:00
Eike Ziller
54b6607b09 Add documentation for variable chooser.
Change-Id: I26da0ec0d092ba83a30a4db156d8e5237ab8f001
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-04-02 17:34:48 +02:00
Oswald Buddenhagen
9631fb88cf centralize assignment of TEMPLATE = lib
Change-Id: I4025539f3875e79f03743ba9ed3fd09cd31b998d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-02 17:13:17 +02:00
hjk
dcfc617cc8 Core: Add streaming operators for Core::Id
Only used once so far, but makes intended usage clear.

Change-Id: Ia628f5356dd02282e233846268d6c0629e93e3fe
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-02 14:56:28 +02:00
Oswald Buddenhagen
7ce3362288 automatically include libs' and plugins' _dependencies.pri files
Change-Id: I25645bb625b467c6f9d895ff89a70acd6a25683e
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-02 12:19:31 +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
Petar Perisin
b0226e6e96 Open project if it was not added to VC system.
Currently project will be created, but if it fails to add it to VC
system, it asks user to open project anyway.

Task-number: QTCREATORBUG-8892
Change-Id: I8d6cfad4a5d6b4810491d355f916dfe031e82a52
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-02 09:21:02 +02:00
Eike Ziller
a2df8cb0b7 Make adding variable support to textcontrol easier.
Add convenience method in variable chooser and move magic constant to
the place where it's used.

Change-Id: Ie93acb98e13efcacb77d1a478df927a11b16926b
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-03-28 17:00:34 +01:00
Oswald Buddenhagen
70efd3906d remove redundant library dependencies
the respective _dependencies.pri files already list them.

Change-Id: I2008abdd043bf3c8738035971b0cbbfe57b02ba2
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-03-27 16:20:35 +01:00
Friedemann Kleint
cf5e615f6d Clean headers in Core-plugin.
Change-Id: Ie79d334765ca5c6a034fa2f5eccff5d45b481975
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-03-27 09:31:54 +01:00
Eike Ziller
7cff3f952c Fix progress bar rendering
Fixes the border image drawing, which probably is only visible when
making the progress bars longer.

Change-Id: Ia4692bcb4a4b86b7ca610c039046367cc5d2bdfe
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-03-26 17:43:33 +01:00
Daniel Teske
c0cc6ce5af HeaderViewStretcher: Fix bug in resize code
Change-Id: Ia62d4c64418e7d616b5dd90d0eda2a2ee985c2d8
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-03-26 16:19:40 +01:00
Daniel Teske
a183bb8ea1 Utils::TreeWidgetColumStretcher: Generalize to support all QHeaderViews
I need this for a QTableView.

Change-Id: I07f4c6561abc2c62ce19a21a2233c65210329ef6
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-03-26 16:19:26 +01:00
Eike Ziller
599be01a67 Merge remote-tracking branch 'origin/2.7'
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	share/qtcreator/qml/qmlpuppet/interfaces/interfaces.pri
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstancesignalspy.cpp
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h
	share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/objectnodeinstance.h
	src/plugins/debugger/debuggerplugin.cpp
	src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu_helper.cpp
	src/plugins/qmldesigner/components/debugview/debugview.cpp
	src/plugins/qmldesigner/components/formeditor/abstractcustomtool.cpp
	src/plugins/qmldesigner/components/formeditor/abstractcustomtool.h
	src/plugins/qmldesigner/components/formeditor/formeditorview.cpp
	src/plugins/qmldesigner/components/integration/stackedutilitypanelcontroller.h
	src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.cpp
	src/plugins/qmldesigner/components/navigator/navigatorview.cpp
	src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp
	src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp
	src/plugins/qmldesigner/designercore/include/abstractview.h
	src/plugins/qmldesigner/designercore/include/qmldesignercorelib_global.h
	src/plugins/qmldesigner/designercore/include/rewriterview.h
	src/plugins/qmldesigner/designercore/metainfo/metainforeader.cpp
	src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp
	src/plugins/qmldesigner/designercore/model/abstractview.cpp
	src/plugins/qmldesigner/designmodewidget.cpp

Change-Id: I9d8126e88397c02a87b5e4ab4da44e2bc7089134
2013-03-26 13:09:43 +01:00
Christian Kandeler
f4a0cbf6c0 Fix gcc warnings about unused variables.
These appear when compiling in release mode.

Change-Id: I76ee3b1b8d728fd839d713ee4f914b6965851b99
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-03-25 13:52:45 +01:00
Daniel Teske
a5942cf1d1 MessageManager: Remove no longer used printToOutputPane functions
Change-Id: Ifd8f251a556e8102ed15a503ee5b67b36f894273
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-03-25 11:09:21 +01:00
Eike Ziller
92f65afeb8 Move status bar gradient to helper function.
Change-Id: I803f354f1efb0f3c79e7e9ee61fb50d3d5f71363
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
2013-03-22 15:44:44 +01:00
Daniel Teske
05d90a6243 ExternalToolRunner: Adjust to MessageManager api change
Note: The popup now no longer switches modes.

Change-Id: I855f393a8e97bddaff1471d3672a092c38c992f9
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-03-22 15:04:37 +01:00
Daniel Teske
f4b19e0e8f MessageManger::printToOutputPane: Add more control over the popup
Change-Id: I40254c0d152bf1d94c74e2602e5bfb642fe933e1
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-03-22 13:48:23 +01:00
hjk
2d7e49c794 Core: Remove deprecated and now unused Core::Id(QString) constructor
Change-Id: I0eff48af98b3fd3ff244386a4424aa9dd0648919
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-03-22 11:10:36 +01:00
hjk
090638c241 Core: add a 'suffixAfter' function
Pure convenience for the decomposition of ids constructed wit suffix().
This will help centralizing repeated code in the qnx, blackberry, android
and cmake plugins.

Change-Id: Ibc9ca21f8da1d15578f4553da97212cc99a5c5b9
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-03-22 08:33:47 +01:00
hjk
c722efb074 Use Core::Id::withSuffix when appropriate
Change-Id: I919b9b5d8c3e2554cea6d0f5c1db85ed305a8015
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-03-19 18:29:34 +01:00
Friedemann Kleint
aebf19eabd Clean headers in Utils.
Forward-declare QGraphicsOpacityEffect in DetailsButton,
QProcessEnvironment in Environment, QFileInfo in fileutils,
QUrl in IWelcomePage, FancyLineEdit in PathChooser and
remove unneeded headers.

Change-Id: I7d5f273530dd2059bbdaf0899f0a3bc7e49e8482
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-03-19 17:19:26 +01:00
hjk
2330fb4850 Core: Add a convenience .withSuffix(QString) method
Change-Id: Ia6a1802376442d3e3ccdce2b0a061c71edafa8c9
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-03-19 15:22:37 +01:00
Eike Ziller
c85c3d15c6 Add variable manager API documentation
Change-Id: Ia4cb33802bda2b51afc2f194136cd4d74d8bd854
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-03-18 14:20:56 +01:00
Joerg Bornemann
c02395cc63 fix qbs files for MacOS
Change-Id: I73dc7f853eb250ae155386674d8cb9aa1d3c1678
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-03-18 11:40:07 +01:00
Eike Ziller
99b2eb1ca9 Merge remote-tracking branch 'origin/2.7'
Conflicts:
	doc/src/debugger/qtquick-debugger-example.qdoc

Change-Id: If9a6ac2db76773c50aae26c5156e6aa2603329b3
2013-03-18 10:19:14 +01:00
Orgad Shaneh
14e35b5dc4 Client: Block until editor is closed
Change-Id: I06bd4425008103be3a4c8f64b6dff8f7df30c552
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-03-15 12:24:52 +01:00
Friedemann Kleint
efe98de840 Fix Krazy warnings about values or keys iteration in various places.
Change-Id: Iced108cc7fc74f6ce5501c59db7090fea21cb87a
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-03-15 11:14:15 +01:00
Christian Kandeler
17765de169 Core: Remove unneeded ifdefs.
Replace compile-time checks for host OS by run-time checks.

Change-Id: I9f237389171586786c2609f81314bcb1bc17b01e
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-03-15 10:00:08 +01:00
Eike Ziller
3a042b87a2 Variable manager: Add convenience method for expanding string.
Change-Id: I0e2cf4a9d39142ab3ae4c6cedb2d917822d1c1f5
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-03-14 10:57:06 +01:00
Eike Ziller
e7cb32d621 Make variable manager static.
This makes it follow our preferred singleton pattern.

Change-Id: I230e5ac5ef7f156da7123f7efe3a49bcb6a20669
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-03-13 17:28:46 +01:00
Friedemann Kleint
b488562d57 Fix Krazy warnings about includes/header guards in Core plugin.
Change-Id: I24b4486bf749d8a649f213482fb8d075a24fc30b
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-03-13 14:05:40 +01:00
Orgad Shaneh
29f8d15332 VcsManager: Prevent parents caching when VCS not found
Editing a file inside .git directory is intentionally not detected as
managed by Git. This causes cache override for the real toplevel with
a null version control

Change-Id: I8a333c38fb160e3dba4f0ee4677b68c4c619ac6d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-03-12 13:55:06 +01:00
Eike Ziller
3bc622400d Merge remote-tracking branch 'origin/2.7'
Conflicts:
	src/plugins/debugger/gdb/gdbengine.cpp

Change-Id: Ic8590ad97d7349ed7601a49c4fd873ffc9a5f9b5
2013-03-12 10:56:52 +01:00
Eike Ziller
c190b5dad9 Fix opening of xml files.
They were either opened as text/plain, or, if they were empty, as
application/vnd.rim.qnx.bar_descriptor types.
This hotfix makes the mime database consider lower levels for matching
by extension, if no match with maxweight was found, and reduces the
weight of the application/xml type's ".xml" extension, so the
bar_descriptor type can override this based on its content matcher.

We should do a real fix in post-2.7.

Task-number: QTCREATORBUG-8920
Change-Id: I3d6f4455ba23485d0229967eaa3eea6abe19746f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Nätterlund <tobias.naetterlund@kdab.com>
2013-03-12 09:05:57 +01:00
Knut Petter Svendsen
0d3b54f410 ClearCase: Don't show Hijack button for dynamic view
The Hijack button (makeWriteableButton) should only
be shown for snapshot views.

Change-Id: I809981885d18b6057d82f73b5104b0f1041cd255
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-03-11 14:18:51 +01:00
Eike Ziller
1eac160eb2 Set sensible placeholder text in shortcut edit.
The "Key sequence" edit showed a wrong placeholder text for actions
without a shortcut.

Task-number: QTCREATORBUG-8109
Change-Id: I3764275e0c99cb53964b16ff4b06602c48661cf1
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-03-11 13:33:40 +01:00
Eike Ziller
c37423b612 Add file name and base name variants to file-kind variables.
Change-Id: I46b91fba5cf78a3e540c3a07baee3354265c977a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-03-11 12:43:45 +01:00
Eike Ziller
d3341b996c Centralize handling of file-kind variables.
Change-Id: I400e28ae7d1d4f0250519dcd3c85746da1ea1e93
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-03-11 12:43:33 +01:00