Commit Graph

1907 Commits

Author SHA1 Message Date
Friedemann Kleint
622cac50f4 Move QtConcurrent library into Utils.
It causes a conflict with the new QtConcurrent library
of Qt 5 and is quite small.

Change-Id: Ib97ab6daf8f67a88300cf03f044ba3593a4cd270
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-02-09 12:33:10 +01:00
Thomas Hartmann
95a028e835 Wizards: changes the structure of Wizards
This patch introduces platforms as a top level topic when choosing
a wizard. Also I changed the categories and priorities.

Details:

1. I did change the way the dialog/view is structured in newdialog.cpp

2. I added platformName() and supportsPlatform() to BaseQtVersion.
   I needed two functions because the Simulator does not provide a platform
   and therefore has no platformName but supports two platforms.
   I still have to turn the platform names into proper constants.

3. I changed the categories and priorities to get the layout that was
   discussed. (I had to touch quite alot of files but this is mostly trivial)

4. I added a combobox that allows filtering for platforms.

5. I added flags() to IWizard to indicate that a wizard is platform independent.

Change-Id: I86c7ad628a431ad06505c76580885c6e6c3ddc23
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-02-08 17:42:27 +01:00
Friedemann Kleint
1d1d2f0b74 Compile with Qt 5.
- QtQuick1 renaming.
- Start on qtconcurrent split (pending renaming of Qt Creator's
  qtconcurrent library).
- QWinEventNotifier is a public class in Qt 5.
- Metatype system: Classes need to be known.

Change-Id: I5582e7cc2777bf791a08b049262217055769c80f
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-02-08 15:47:00 +01:00
Thomas Hartmann
821eab6c52 Wizards: refactoring - adding WizardDialogParameters
The Wizards itself (derived from IWizard) and the dialogs
implementing the wizards were quite discoupled.
Since I want to add parameters that are delivered from
IWizard::run to the dialog a I added WizardDialogParameters.

Examples of paramters I want to add are the choosen platform
and the choosen subOption/template for this wizard.

Change-Id: I9c0ae2901e3d46d3c36a3f433f4d7d508a6ba74e
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-02-07 16:26:10 +01:00
Adam Treat
3542db8ed2 Send the outputpane the visibilityChanged(true) state when icon is toggled.
When an outputpane is toggled visible/invisible/visible by clicking on the icon
itself the plugin is not made aware of the visiblityChanged(true) state since
changePage does not detect that the index has changed because indeed it has not.

This change just explicitly adds the visibilityChanged call after the toggle so
that the plugin is made aware.

Change-Id: I6e782f52c9ac926c39acd91b5533009899a4ec2a
Reviewed-by: hjk <qthjk@ovi.com>
2012-02-06 22:38:26 +01:00
Eike Ziller
de290e0341 Add "delayedInitialize" feature to plugin manager.
And use it for some of the plugins. It avoids the plugins to
do the timing on their own, and actually adds guarantees about
the order the delayed initialization is done.

Change-Id: I88ad9b46b24b82c91509774170fe0e7e99e88e4b
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-02-03 09:48:39 +01:00
hjk
658a608083 core: prevent allocations when looking up an existing Core::Id
Change-Id: I7bd2f83ffc6a57135aab9f76ff929eca48d16885
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-02-01 14:08:10 +01:00
Daniel Teske
8591b89807 Ensure consistent size of facnyactionbar button
Otherwise the button can jump on switching projects.

Change-Id: I2b6d0a5afe5fc54933fe31d381a312cce896361e
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-01-31 11:59:28 +01:00
Eike Ziller
0651e28d04 Delay setting up the help manager.
Change-Id: I86ba3734bd9a64b7d13ce7b7171a65eeb82dfa3d
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
2012-01-30 18:18:16 +01:00
Denis Mingulov
a36d587ccf Fix non-needed usage of QString's fromLocal8Bit() and fromUtf8()
QString::fromLocal8Bit() and QString::fromUtf8() are much more slower
than an obvious QString::fromLatin1() and QLatin1String(), so this
commit changes some places where these functions are really not
needed.

QString::fromLatin1() is used in case if QString object is used
immediately (something like QString::fromLatin1().arg()),
QLatin1String is used otherwise like in other places (for example,
QPixmap(QLatin1String("..."))) - to allow to use default QString
constructor and work with QT_NO_CAST_FROM_ASCII.

Change-Id: Ib6eb1c61e9cb35c7c5b7569fea77c5e41d32621a
Reviewed-by: hjk <qthjk@ovi.com>
2012-01-30 17:50:45 +01:00
Tobias Hunger
97496df1bf Task: Update Task to use Utils::FileName and Core::Id
Use Utils::FileName and Core::Id in Task structure.

Change-Id: Ia0ed459f86df36ffe547abde7c240b0ac409bcf5
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-01-30 11:34:43 +01:00
Adam Treat
01d8907ea9 Fix a crash when loading the qt4projectmangerplugin.
This crash can happen when enabling/disabling a certain combination
of plugins and restarting.

There was a null pointer de-reference that was occurring because the
qt4projectmanagerplugin was referencing an action that it believed
to have been registered by the texteditorplugin when it was initialized.

However, apparently the texteditorplugin was not initializing its actions
at plugin initialization, but rather when 'extensionsInitialized' was called.
I do not know the call graph for when this is to be called, but I encountered
at least one situation where the qt4projectmanagerplugin was being initialized
before this.

Change-Id: Iede1831e0ac9c92b80a079157e1bdc8c66473470
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-01-27 15:49:22 +01:00
hjk
2df4cb21fe Core::ModeManager: make some functions static
Change-Id: I5c1275ba3f596d8911fd2e4404181bf57b58f494
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-01-27 14:52:24 +01:00
hjk
2931a499e6 Long live the king!
Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-01-26 19:55:36 +01:00
Morten Johan Sorvig
b0cd54c1ec Replace Q_WS_MAC with Q_OS_MAC.
We want to carry over all mac-specific code paths
to Qt 5. WS_MAC is no longer set; OS_MAC is.

This change is compatible with Qt 4 builds since
OS_MAC is set whenever WS_MAC is. (OS_MAC would
also be set for the theoretical X11/Mac platform,
but that's anyway not a supported configuration
for Creator)

Change-Id: Ib25d8c4e83e7e27d911124cd48aa17fdb875923f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-01-26 11:06:12 +01:00
hjk
21c0cdee40 Core::Filemanager: make some methods static
This follows suit to the ICore changes.

Change-Id: Iba2de1b1e3f2574fd1459892eae702e6af1cc7dc
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-01-25 19:23:11 +01:00
hjk
4a21f0c3c8 Use new static ICore interface.
Change-Id: I9b690d9b150c8d162b15370f9f8986267c9128f1
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-01-24 18:48:47 +01:00
hjk
0fbd7f320f Core: make ICore interface static
This mainly serves two purposes:
(a) it saves a function call in ICore::instance()->foo() vs ICore::foo() at runtime
(b) it saves typing and reduces line noise when reading

It's also (mostly) source compatible, as ICore::instance()->foo() remains compilable.

Change-Id: Icf7be0bce17fefe3560473534a8991ff79cbecc3
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-01-24 15:20:11 +01:00
Thomas Hartmann
17a7bd17d0 Wizards: allows filtering of wizards based on Qt version
Every wizard now implements requiredFeatures() to define a feature set.
If the feature set is not satisfied by the available Qt Versions,
the wizard is not shown in the create file/project dialog.

Every Qt version can define the provided feature set in availableFeatures()
defined in BaseQtVersion.

Change-Id: Ie9e2c210d19187b2296451948c36d274f2096623
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-01-18 15:13:52 +01:00
Eike Ziller
4219e41a70 Fix showing the default shortcuts in keyboard preferences
Change-Id: I49df1f586ac7ed67c61f6bdf646e45bd1e7dbb4a
Reviewed-by: hjk <qthjk@ovi.com>
2012-01-13 14:47:18 +01:00
Tobias Hunger
fab53ac364 Replace Q_ASSERTs with QTC_ASSERTs
or even with QTC_CHECKs.

Change-Id: I6df67f088bb2f944f0a1abd751fdb192db2be298
Reviewed-by: hjk <qthjk@ovi.com>
2012-01-13 14:34:22 +01:00
Tobias Hunger
e4a0bdd8e2 vcs: better sanity checking
Change-Id: I1d3b347d291e9f5bc6a873e5c99506371749c0ef
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-01-13 14:27:00 +01:00
Tobias Hunger
7d3ba0e9b4 VCSmanager: Fix QTC_ASSERTs
These tests are needed to make sure no broken data ends up in the cache,
causing inconsistencies in the cache. The asserts did a good job there,
catching a couple of issue, so I would like to keep them the way they are.

QDir is not needed at all as the data _should_ be perfectly fine already
anyway and should not be used if the asserts are not evaluated.

Change-Id: Icf113f8b02b6c7c7ba7498386b8465b2644daae8
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-01-13 14:16:45 +01:00
Eike Ziller
edcb065edb Windows build fix.
Change-Id: I4b7223e16eb727e9d98cc973eb64cb4f9feccdcc
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-01-13 10:10:26 +01:00
Eike Ziller
f7ca05e4b9 Let Command construct its description (former defaultText) itself.
Instead of doing it duplicated in the general and the fakevim shortcut
settings.

Change-Id: Id4b0e5b0630f1e94c825528f1c038776dc205aa3
Reviewed-by: hjk <qthjk@ovi.com>
2012-01-12 19:50:58 +01:00
Friedemann Kleint
b82475b0e9 Change asserts() to soft-asserts in Vcs-Cache.
- Prevent crash when creating a project.
- Use QDir to normalize the path (as it is constrcuted in
  the assert anyway).
- Print proper warnings.

Change-Id: Ib6fa3c564aff20b73d6efc08ca3a13688fd97dce
Reviewed-by: hjk <qthjk@ovi.com>
2012-01-12 11:20:57 +01:00
hjk
745c58befa core: use Core::Id for IVersionControl::id()
Change-Id: I54e17c91c3e2a69d598ed485235dbf7ec62b4615
Reviewed-by: hjk <qthjk@ovi.com>
2012-01-11 12:56:02 +01:00
hjk
443e77a47d Use QByteArray for variable names.
Less conversions, tighter code, less to type.

Change-Id: I38eb27ca17e6f1d98cdbc41fa003cbedf0f0bb34
Reviewed-by: hjk <qthjk@ovi.com>
2012-01-10 23:55:48 +01:00
Leena Miettinen
ad12c39206 UI text: fix capitalization
Change-Id: I415abccffdcd1bccfe7270003caa95232706ba16
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
2012-01-02 16:56:32 +01:00
Friedemann Kleint
2892f13b8c CorePlugin: Compile with QT_NO_CAST_FROM_ASCII.
- Wrap literals in QLatin1String()/QLatin1Char().
- Extract some string constants avoiding repeated
  QString construction.
- Fix repeated invocation of Container.end() in loops.

Change-Id: If737735507aaf82e53063adda53f54c46418f42f
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2011-12-22 14:47:29 +01:00
hjk
80d148d351 editormanager: minor style fixes
Change-Id: I863264ce8ee10b7c0a7b140aa8c25301a97e41d9
Reviewed-by: hjk <qthjk@ovi.com>
2011-12-21 11:57:05 +01:00
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
3768dc02fd Use QStringList directly for setting.
For installed documentation. Instead of splitting a string at ';'.

Change-Id: I0e0ad0ece337bc8738501c008ff67412df1f18bb
Reviewed-by: Alexander Lenhardt <alexander.lenhardt@nokia.com>
2011-12-16 16:18:52 +01:00
Eike Ziller
3e6cd71fe2 Don't explicitly look in "install settings" for installed doc.
Not strictly necessary, and being able to specify that in user settings
makes things a bit easier for testing purposes.

Change-Id: Ie54c12cf65682892de09f0d811a8a1571137395c
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2011-12-16 12:41:46 +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
Eike Ziller
1899a3838f Provide "Open with" context menu in qrc editor.
Task-number: QTCREATORBUG-4224

Change-Id: If2b13fa8b58779058d483d532c2c9649f7fa8dfd
Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
2011-12-13 10:09:58 +01:00
Eike Ziller
b9bcb7250e Disable "Error Details" button for disabled plugins.
Task-number: QTCREATORBUG-4191

Change-Id: I88605bc99bc8ca71a2ba4563e88b8ba14e112172
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2011-12-12 13:11:48 +01:00
Eike Ziller
121e12701f Hide the icon in the editor combobox (but not in its popup)
Otherwise we have the lock icon from the tool button and from the combo
box next to each other.

Change-Id: I74d0ba42cd38ea37f2f8aa7e8d08a733174f1dce
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2011-12-12 13:09:48 +01:00
Eike Ziller
7ee895b6dd "Open with" actions can also remember their file name.
Change-Id: Id32e2149c6c5d23722c2c6fd125ad2e56dda0c24
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2011-12-09 13:11:05 +01:00
Eike Ziller
3998a0cbde Move "Open with" menu logic to FileManager.
Better place than ProjectExplorer since it will then be available
elsewhere too.

Change-Id: I0508f121918105a562d2499ac6b31d19d733abad
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2011-12-09 13:10:51 +01:00
Friedemann Kleint
9b7f746fd5 Id: Fix MingW/gcc warning about exported inline function.
Change-Id: Ib80a0cdc1acc3eed893516e370045d4d7fcb3ee2
Reviewed-by: hjk <qthjk@ovi.com>
2011-12-06 13:18:54 +01:00
Eike Ziller
f9cec1f443 Move lock icon to left of editor list.
Is actually more logical and looks better.

Change-Id: Id1c70309a93ffe13050f3403f9f828a7de9b5a95
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
2011-12-06 12:07:38 +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
Jarek Kobus
297b444df2 Add add/remove splitter buttons to the editor view
Task-number: QTCREATORBUG-232

Change-Id: I71b517e09455bfdbe1b835515161e818a4f618f0
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-12-05 14:19:54 +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
Orgad Shaneh
d4a881e6ee Test for read-only when session is loaded
Task-number: QTCREATORBUG-5131
Change-Id: I6642ec2b80ff156b76bba86172e8a2362cb02bc8
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
2011-12-02 10:48:16 +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
e2b0835b58 Merge remote-tracking branch 'origin/2.4'
Conflicts:
	qtcreator.pri
	src/libs/qmljs/qmljstypedescriptionreader.cpp
	src/plugins/analyzerbase/startremotedialog.ui
	src/plugins/qmldesigner/designercore/include/rewriterview.h
	src/plugins/qt4projectmanager/makestep.cpp

Change-Id: If9d15a8c8f73106585fd8ce6ac47c253a40af6b1
2011-11-25 09:48:25 +01:00
Eike Ziller
cc11186bad Avoid setting large minimum size for output panes.
The search result pane set a minimum size for the "New Search"
panel which forced this relative big minimum size on all panels
and made it impossible to make the output pane area small.
Now, the new search is wrapped into a scroll area, doesn't
enforce a minimum size anymore, and, instead, when initiating
a new search (via shortcut or menu action) resizes the pane
so the panel fits nicely.

Change-Id: I9afe67e66f324111a10a97f33c203846231e6a93
Reviewed-by: hjk <qthjk@ovi.com>
2011-11-24 13:32:04 +01:00
hjk
f012bf4494 compile fix with namespaces
Change-Id: I1b888ff8bd5c30a13dc8c00824d4cae6990a4b23
Reviewed-by: hjk <qthjk@ovi.com>
2011-11-24 13:03:56 +01:00