Commit Graph

37022 Commits

Author SHA1 Message Date
Eike Ziller
fe5b3a39e8 Core: Refactor handling of "window state" actions out of MainWindow
Currently the actions for fullscreen, minimize and zoom only apply to
the main window, even if a different window is active.
Refactor the handling of these actions into a WindowSupport class, and
use that instead for the main window. In a second step, this will be
used to add the functionality to the corresponding external windows
(e.g. help and editor windows)

Change-Id: Ief2c880f40948c3bb724196d6e0cfe888b8ece89
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-07-18 08:55:45 +02:00
Kai Koehne
60d7b23d88 QmlInspector: Use categorized debugging
Change-Id: I551d2b65bbd1734847b7e995e0f95e906d116497
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-07-18 08:48:19 +02:00
hjk
aef20d43e1 Debugger: More robust approach for DebuggerToolTipTreeView::computeSize
model() == 0 should not happen, but the bugreport indicates there
was something wrong at a time.

Task-number: QTCREATORBUG-12692
Change-Id: Ie850dfc1177d968c39ffae74af89ae1bab44703c
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-07-18 08:31:39 +02:00
hjk
3ed30f09cf {Fancy,Debugger}MainWindow: Consolidate dock actions menu population
There are several places where the list of dock actions are shown,
and at least two where it was created.

Change-Id: Ib2c18e602b5d6f57c1b7471bd75f3b989d536600
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-07-18 08:14:56 +02:00
Leena Miettinen
7eeaa6851f Git: replace "Url" with "URL" in UI text
Change-Id: I6cf721e84b33183c97c9db8f98842a461af2f0d1
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-07-17 18:00:38 +02:00
Kai Koehne
ac771eb552 Hide broken "Apply on Save" feature
The feature has always been somewhat experimental, but got even more
broken over time. Let's hide it for the time being.

Change-Id: If46861831d7fb7ed8e9b77b79d1ebe583243ab48
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-07-17 17:52:33 +02:00
Leena Miettinen
a1b5a61b6e Find: remove unused text "Go to Current Document Find"
Because it would have needed changing.

Change-Id: I58ff194a296cce1fd6096f3cc2ea39854435e7c1
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-07-17 17:28:20 +02:00
hjk
0fbbcfa870 FancyMainWindow: Polish dockwidget titlebar display
Pop up after 500 ms hovering over an active area of the
(approximate) size of the titlebar. Hide the titlebase
if the mouse leaves it. Completely hide it (as opposed
to the initial 3 px) if it's "inactive".

Change-Id: I9e43c7f501d2265466a7575da4e661e25aa6ccf5
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-07-17 17:15:54 +02:00
Robert Loehning
4f5747e348 Compile fix for Qt 4.8.6
Task-number: QTCREATORBUG-12695
Done-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
Change-Id: Id184bb051c08ee954474cca89308712e14710f23
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-07-17 17:02:33 +02:00
Daniel Teske
b0af82ebc9 CMakeProject: Make CMakeLists.txt and *.cmake use different mime types
Since we want to treat them differently.

Task-number: QTCREATORBUG-12461
Change-Id: Ia72b8045390ceec693fa416f65010a4c4dbecce1
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-07-17 16:38:30 +02:00
Leena Miettinen
2de73ceb65 Qt support: fix capitalization of "Clean Up" button
Change-Id: Ifdfe2755295b86d7118d105fb478e803764cd429
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-07-17 16:32:52 +02:00
Leena Miettinen
7203eb46e5 CMake: fix capitalization of the "Run CMake..." button
Change-Id: I5402d29e6916110934411848542b1776178615e1
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-07-17 15:40:17 +02:00
Tim Jenssen
76f57922ea QmlDesigner: add puppet mode and process id information
Change-Id: I8e3bf68c5e4ae3bcc7eb446c9321667afc2428ac
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-07-17 14:18:59 +02:00
Eike Ziller
b9063569db Fix vanished fullscreen menu item text on non-OSX
Broke when removing old OS X 10.6 code paths.

Task-number: QTCREATORBUG-12684
Change-Id: I95dea42d40d2f343476cea0eba44bc2a293a422d
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2014-07-17 13:27:05 +02:00
Fawzi Mohamed
883545a03d qmljs: avoid shortened names
libPath -> libraryQualifiedPath
vContext -> viewerContext

Change-Id: I085f5f3304a6becaa00f715cb3395c8cee5227c6
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-07-17 13:21:22 +02:00
Christian Kandeler
e82a47e5af QbsProjectManager: No more "forced" vs "non-forced" parsing.
This differentiation complicates the code and duplicates checks
already done in qbs.
Just let the library reparse the project; if it turns out that nothing
has to be done, then the operation will be fast.

Change-Id: Ib6406f254e51541c69c948f275fff7877b65b4bd
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-07-17 13:11:02 +02:00
Christian Kandeler
35940f16e4 QbsProjectManager: Only update project nodes etc if necessary.
That is, if qbs::Project::projectData() has changed. There are still
some false positives left (e.g. the project nodes will also update if
only the file paths of executables have changed), but we can deal with
those later.

Change-Id: Ifa18903aba41c21769bfe4cd0e4f6004f1a94f11
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-07-17 13:10:45 +02:00
Christian Kandeler
01addecb8d qbs build: Get rid of CopyTransformer.
That item was using a directory as an output artifact, which was only
working by accident and often caused warning messages about failure to
remove files.
Use a proper module instead, which is the nicer solution anyway.

Change-Id: Ib75a0ce26a24c78eb5421367995a8fc72f6a3c2a
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-07-17 13:08:30 +02:00
Eike Ziller
0c00f44a2d Todo: Better naming of enum value.
It's not the last, it's the count.

Change-Id: Ib739c34b952af022f83fa0c2d547154d70641456
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-07-17 12:23:59 +02:00
Fawzi Mohamed
d901572093 qmldesigner: avoid variable shadowing in nodemetainfo
Change-Id: Ie61915613417dbeb792e6911527eb486d5120a99
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
2014-07-17 12:16:04 +02:00
Fawzi Mohamed
f9d9dedab5 qmldesigner: fix reparenting to Layout
Using strings for everything creates issues, the whole thing should
be cleaned up in master.
cleverCompare is asymmetric, one side has the code model, but the other
is a string.
To keep it like that wherever we detect that the string is becoming
too strange (normally for copied prototypes) we fall back to the
cpp name if available whenever the import does not match the origin.
Then cleverCompare can successfully compare the strings.

Task-number:QTCREATORBUG-11905

Change-Id: I857f81b57d8ddd43263ce0e3bb085600ff6e8a43
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-07-17 12:14:54 +02:00
Fawzi Mohamed
176096d112 qmljs: track origin of ObjectValues
allows unique identification of types

Change-Id: Id4e6a9c1fa23409b1e2d5eb32708a0bacd04a5da
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-07-17 12:14:33 +02:00
Fawzi Mohamed
dae0d5afcd qmljs: add libPath utility method
Change-Id: Ie99d3cbff602e38418faeda565526793089a543c
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-07-17 12:14:08 +02:00
Fawzi Mohamed
5e68b6b1be qmljs: make Context::vContext publicly accessible
Change-Id: I3307bd37f55de9d769e1fa9ecaf253fa5887ca64
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-07-17 12:12:49 +02:00
Nikolai Kosjar
dc59d28736 C++: Check for Function::name() before using it
Lambdas do not have a name.

Change-Id: Ifda4816c62dcfe19bdbb1649dc1caf408e056b37
Task-number: QTCREATORBUG-12686
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-07-17 12:09:36 +02:00
Daniel Teske
67a7696e60 androidNameForApiLevel: Api-Level 20 is Android L
That's unlikely to be the final name, but introduce it for now.

Change-Id: Iaf1fd65e797a2354433b9bb5af6a6d76ecb8409c
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2014-07-17 11:29:21 +02:00
Daniel Teske
a3454cadb6 Android: Support Android-L with a hack
android list avd outputs "Target: Android L (Preview) (API level L)",
which we treat as API Level 20 now.

Change-Id: Idc74fc833ffd69959af9d25cdaaa115f35c06831
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2014-07-17 11:29:17 +02:00
Daniel Teske
41ba6f38e4 Android: Report api level of unknown android versions
Change-Id: I5893b5e9ec57da68dc09d0c10a8a43dc074cdd73
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2014-07-17 11:29:11 +02:00
Daniel Teske
1b0279955f AndroidManifestEditor: Fix versionCode being limited
The android documentation does not require a minimum value of 1,
but suggest that "Typically, you would release the first version
of your application with versionCode set to 1". Thus keep the
minimum of 1. A maximum value is not specified.

Task-number: QTCREATORBUG-12668
Change-Id: I6bfb0a534661af82b6fcfe5667d9224893707e41
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2014-07-17 11:21:55 +02:00
Christian Kandeler
a4e55cbeda Update qbs submodule.
And adapt the QbsProjectManager to an API change.

Change-Id: I2530c57c720a7f5e009df23d62945f7bafb9168c
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-07-17 11:04:57 +02:00
Marco Bubke
026a50648b QmlDesigner: Fix spelling in PuppetCreator
Change-Id: I0acca5762d8263292ad0bd9fdac41fc268049e35
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-07-17 10:53:41 +02:00
Marco Bubke
35ee31a062 QmlDesigner: Remove qDebug
Change-Id: Iddce028fde17754ea3de57eb9163c3a91e30cc4b
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-07-17 10:53:19 +02:00
Lorenz Haas
70b40d501e Changelog: Added entries for Beautifier
Change-Id: Ie3f177847223a8edd744753f7b349fa7ba31d57d
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-07-16 20:31:16 +02:00
hjk
7347ecc54b Debugger: Hide some dock widget access
Change-Id: I6cd12a0a7a04f4d37165828552c08263537cfdbb
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-07-16 16:42:21 +02:00
hjk
3a9e0d82bf Debugger: Remove special column resizing in the break view
Is handled by the general case now.

Change-Id: I3668693cc17bd5db6bb45756d38627c4bb6859e0
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-07-16 16:34:53 +02:00
Erik Verbruggen
0bcb6d090e C++: initialize class field.
Change-Id: I3bcc08356951518d9c7c3ae7974b475370112dfe
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-07-16 15:06:00 +02:00
Orgad Shaneh
62d98daa58 Utils: Remove unneeded namespace qualifications
Change-Id: Iacab8410ab4d3b63f96e7541b450e3cc729ab662
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-07-16 14:15:09 +02:00
Christian Kandeler
e639455936 QbsProjectManager: Reparse project before building.
Otherwise, if "save before build" is enabled and the user presses Ctrl+B
with unsaved changes to a project file, these would get ignored due to
the delay (and also if the delay were not there, because the file system
watchers trigger later than the "Build" action).
If there are no actual changes to any build file, the overhead caused by
this operation consists of loading (and possibly storing) the build
graph file.

Task-number: QBS-596
Change-Id: I1f837cc0fcdc77a249b423834f4b6711f5c0bc87
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-07-16 14:05:38 +02:00
Christian Kandeler
cbeb77030f Autotests: Fix qbs build.
The semantic change in product.buildDirectory broke some autotests.

Change-Id: Ic9336f1e9341adacd1daa763b7ba729d7973fe58
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-07-16 14:02:19 +02:00
Orgad Shaneh
c5d34eb6b3 Git: Use Git bin directory as an additional path
Change-Id: I4738a4aec3b1b83b6d596497842086aeb1278f27
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-07-16 12:43:36 +02:00
Orgad Shaneh
54db877297 Git: Factor out resolving of bin directory on Windows
Change-Id: Ifbafa0f5cb8329faedfd1da3674b87e46001acc3
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-07-16 12:43:32 +02:00
Robert Loehning
36d2f47dcc QmlDesigner: Language
Change-Id: I566d43144ce8ace585099041f63f3a2c9e1009d7
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-07-16 12:34:59 +02:00
Eike Ziller
e470038c59 New Dialog: Do not show wizards on top of everything else
Just live with the fact that there is not even a way to keep it on top
of the main window or something like that (without also making it a tool
window).
Also, even though it would be nice to have the "New" menu item bring the
current wizard to the top, if any, that requires heavy refactoring in
the wizard side.

Change-Id: I93d345964b085adeaa314d93acc612f8fb2e7e68
Task-number: QTCREATORBUG-12675
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-07-16 12:23:53 +02:00
Andre Hartmann
f6bfd75320 Git: Fix suggested directory for clone
For:
* remote paths with port number
* local repositories

Task-number: QTCREATORBUG-12651
Change-Id: I7fef5c78499291047781ab48a7fef31d52613198
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-07-16 12:00:15 +02:00
Leena Miettinen
79704ebb8a UI text: replace "e-mail" with "email"
For consistency.

Change-Id: I0b8244a7d6b86c3fc0cccf24b220e3264f0ee116
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-07-16 11:44:36 +02:00
Leena Miettinen
142bc18881 TextEditor: edit MIME type description for primitive types
To make it more consistent with the other descriptions.

Change-Id: Ia7b5f046976e5ae18f68e1afba7b971b89898e39
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-07-16 11:38:45 +02:00
Leena Miettinen
a394158858 Session Manager: fix capitalization of UI text
Change-Id: Ic9b73f694ceeff7dbefc02126551124818e7a358
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-07-16 11:29:41 +02:00
Leena Miettinen
38961dbff3 TextEditorPlugin: replace "quick fix" with "refactoring action"
"Refactoring action" is the term used in Qt Creator Manual.

Change-Id: I10dd3ecb615f24a9b5fa5d9ae8aa160969146e72
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-07-16 11:24:08 +02:00
Marco Bubke
1a35a71648 QmlDesigner: Support Qt4 again
Task-number: QTCREATORBUG-12567
Change-Id: I5a6b7c4ca31f20d25301cc6fc19a549ce895c0b4
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-07-15 18:45:22 +02:00
Lorenz Haas
9b2557de7d Beautifier: Add @2x icon variant
Change-Id: I839bdd215a9f70d2641a159166bda9f90db555e0
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-07-15 17:54:05 +02:00