Commit Graph

135 Commits

Author SHA1 Message Date
Alessandro Portale
2bc8bcd363 Build fix for Windows
Change-Id: I81abfab977d2ea9fd36dcf5e48346744742208cf
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-07-24 23:44:00 +02:00
Alessandro Portale
966cdd69de progressmanager_win: Load the error icon via dpiSpecificPixmap()
The @2x variant looks better on HighDpi screens

Change-Id: I2fe1e9973b479dc35889cf40f1091b423b512997
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-07-10 14:22:00 +02:00
Alessandro Portale
4ee38b2925 Core: Fix "compile error" overlay in progressmanager_win
In order to fit a text into a fixed-sized image, we have to use
pixel sizes for fonts. The default point size can be anything
and the dpi can be anything.

Also, decomplicate the drawText call.

Change-Id: I20da8177a8a261c6ffbaef27060d804d924e1259
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-07-08 10:04:41 +02:00
Christian Kandeler
93304df038 Always pass Core::Id by value.
Currently we pass in some places by value, elsewhere by const ref and
for some weird reason also by const value in a lot of places. The latter
is particularly annoying, as it is also used in interfaces and therefore
forces all implementors to do the same, since leaving the "const" off is
causing compiler warnings with MSVC.

Change-Id: I65b87dc3cce0986b8a55ff6119cb752361027803
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-07-01 11:52:08 +02:00
hjk
54cac66c72 ProgressManager: Handle QFutureInterface by value in addTimedTask
QFutureInterface acts by a shared pointer itself, so use that to
guards against the QFutureInterface object being destroyed while
the timer is running.

This feels awkward as QFutureInterfaceBase::future() is non-const
for unknown reason.

Change-Id: I1d43abe0c27183af2f01cf269e2a94d2fcaba46e
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-05-30 15:46:53 +02:00
hjk
eefaf0c4d0 ProgressManager: Hide some internally used function from .h interface.
The indirection of the "virtual + implementation inheritance" pattern is
kind of subset of the "static" pattern, no need to have both.

Change-Id: I4e2c2742dae94819ee05c7925c02b954a8c6294b
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-05-30 13:36:02 +02:00
hjk
811f74ce63 Windows compile fix
Change-Id: I2321ae9310476f36a1b1fa36509ec92f639ee8a7
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-05-13 14:57:22 +02:00
hjk
5ac261bff2 Valgrind: Use generic timed future for uncertain progress
Change-Id: Idb7f1b1e5a0fcd0351d6c30f5a6dadcbec191898
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-05-13 14:05:58 +02:00
Eike Ziller
0f8506e2f3 Make progress views adapt to title length.
Change-Id: Idd8cdd01215d648cdb36609f16ca704b08363699
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-04-28 14:18:19 +02:00
hjk
4d96fa7aba Core: Merge Find and Locator into Core plugin
Change-Id: I7053310272235d854c9f409670ff52a10a7add8b
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-01-14 07:43:00 +01:00
Robert Loehning
746c5d8863 Incremented year in copyright info
Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-01-08 08:29:47 +01:00
Robert Loehning
11807f0db2 Polish taskbar-icon for build issues
Change-Id: I5998bdabc80e59972446b1f8806ac8703ed5a729
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-11-20 17:02:32 +01:00
Kai Koehne
5c3a507668 Fix doc about ProgressManager
Change-Id: I49b0a7d83d0be4586c5e11a482b109461f1a05d6
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-11-18 08:39:53 +01:00
Christian Kandeler
6448d26ad7 Core: Adapt documentation to recent refactoring.
ProgressManager and ActionManager are no longer retrieved via ICore,
and most accesses do not go via the instance anymore.

Change-Id: Ib0c3033270051aaadfb25e0b2b0eaf7bdec63a1d
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-10-23 15:10:14 +02:00
Nikolai Kosjar
b8dbac0b9c Rename "[Mm]ethod(s)" to "[Ff]unction(s)"
Only methods as programming functions are affected. Besides renaming
some actions like "Switch Between Function Declaration/Definition" this
mostly touches (api) code comments.

This is a follow-up patch to commit 872bfb7.

Change-Id: Icb65e8d73b59a022f8885b14df497169543a3b92
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-10 15:56:12 +02:00
Tobias Hunger
e7c5f22fb8 Core: Remove dead code
Change-Id: Ia8d85cb54c96fbca09331df6f5ac360100011dab
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-09-12 13:54:37 +02:00
hjk
98917598d3 ProjectManager: Use Core::Id for progress types
Change-Id: I72993fda50ad70ad2d7c2f449923ac6e34b9e737
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-09-04 14:59:06 +02:00
Tobias Hunger
d18b61b85d Core::Id: Remove some explicit casts to Core::Id
Change-Id: Ibe505c8331f7d1280fdb8784a00321742f5d94cb
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-09-03 11:57:23 +02:00
Orgad Shaneh
54785e5353 Fix Windows compilation
Change-Id: Iebb52b369ddd1e36283835909b769621deba5c3a
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-09-02 14:24:50 +02:00
hjk
e3ffb95b90 ProgressManager: Remove unused constructor parameter
Change-Id: I0c27f54c813cfba1c9e940b2431a0950fd1e4b8d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-09-02 12:42:05 +02:00
hjk
df36184371 Core: Static pattern for ProgressManager, clean up all users
Change-Id: I4af8793ca69a3af9e99baeb7c31dad3864266f91
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-09-02 12:41:47 +02:00
Eike Ziller
a98fe15fe5 Merge remote-tracking branch 'origin/2.8' into HEAD
Conflicts:
	qbs/pluginspec/pluginspec.qbs

Change-Id: Ic8e992623b9eda8913ee473c779a8df27643ccc9
2013-07-08 15:01:17 +02:00
Eike Ziller
07c0a8348c Progress summary: Forward click to "current" progress details.
It was annoying that it wasn't possible to click on the summary progress
bar to e.g. open the compile output or issues pane, even when you had
only a build running.

This change forwards the click to either the progress that currently
shows a details widget in the status bar (like the build errors/warnings
from the build progress), or to the last progress that was started.

Change-Id: I4b50dd4b43bdc12fac329d33e158fa759bee4d28
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-08 14:32:55 +02:00
Eike Ziller
7017e95531 Progressbar: Fix uninitialized variable
Which lead to progress indicators sometimes not having a cancel button.

Change-Id: Idd470411c02686b6975c1e7efd79ac802eb37037
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-08 12:47:33 +02:00
Eike Ziller
2f8f083b40 Unify pattern used for privates and constructors
In the 'managers' from ICore

Change-Id: Iab98c9e0947b759843a62e3777ba46be3b304b06
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-07-01 11:52:35 +02:00
Orgad Shaneh
81fc8ff210 Doc: Remove \fn lines adjacent to functions
They are unneeded, some of them are unmaintained

Change-Id: I0ad87e152d8e2328b486b2f904f7cf9613004afe
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-06-05 10:07:14 +02:00
Eike Ziller
aee00cfad7 ProgressManager: Give individual tasks same range in summary bar
The total range was sum of individual ranges so far, so e.g. parsing/
2).

Change-Id: Ia9133376be3219c12101435ba2e2ae27c32df6f8
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-05-28 17:02:43 +02:00
Eike Ziller
8e50dc182c Remember progress details pinned state and default to "pinned".
Making the default "pinned" will hopefully make people realize earlier
that the progress information has moved to the new location.

Change-Id: I5dbb3cae3680f724369b1a025cf38c5317a29fd0
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-27 14:23:43 +02:00
Joerg Bornemann
f5ab5f3a46 fix build for namespaced Qt
Change-Id: Idd25bbea2c5adafbf893a10e107d4a8bfc2d221f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-05-21 14:26:00 +02:00
Leena Miettinen
bc9bb4b93c UI text: fix VCS related strings
Fix capitalization and punctuation and a typo.

Change-Id: Ie974594878aad6dec558516b2d31b202e8c732d4
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-05-16 14:33:32 +02:00
Eike Ziller
920e7ca1f1 Show build and search progress detail also in status bar.
A widget specifically layouted for the status bar can now be registered
with the progress information. The newest one is made visible next to
the summary progress bar. If a newer one vanishes, the older becomes
visible again.

Change-Id: Iedf0e88a542ea442ae86fa51c792c68fbc6eef3c
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-10 14:21:25 +02:00
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
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
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
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
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
Tobias Hunger
3ae8323d54 Fix warnings introduced by reordering member variables
Change-Id: I37bc8f9bc874de52281b8597838ef8addae1a1a3
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-02-22 11:08:20 +01:00
Tobias Hunger
1951c86395 Reduce padding in often-used structs
Reduce the padding in some often-used structs for 64bit machines.
32bit machines should also profit from most changes, but to a
lesser degree.

Change-Id: Ic4c67b94e962731de4f31164c52a372d78944ccc
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-02-21 13:22:21 +01:00
Leena Miettinen
419c6de735 Doc: replace deprecated QDoc commands
The \i and \o commands were replaced with \li and
\bold was replaced with \b in QDoc for Qt 5.

The \input command was replaced with \include in the docs.

Change-Id: I257d1bebb8ebc739ca20e0d29fcf0406ecb14534
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-02-06 09:44:18 +01:00
Oswald Buddenhagen
1fda2111d4 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in
	src/plugins/debugger/qtmessageloghandler.cpp
	src/plugins/debugger/qtmessagelogwindow.cpp
	src/plugins/madde/maemodeployconfigurationwidget.cpp
	src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
	src/plugins/qmldesigner/designercore/include/widgetqueryview.h
	src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.h
	src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
	src/plugins/qnx/bardescriptormagicmatcher.h
	src/plugins/qt4projectmanager/profilekeywords.cpp
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/deployablefilesperprofile.h
	src/plugins/remotelinux/deploymentinfo.cpp
	src/plugins/remotelinux/deploymentsettingsassistant.cpp
	src/plugins/remotelinux/profilesupdatedialog.cpp
	tests/auto/icheckbuild/ichecklib.cpp
	tests/auto/icheckbuild/parsemanager.cpp
	tests/auto/icheckbuild/parsemanager.h

Change-Id: Ie465a578446a089e1c502d1cb1096e84ca058104
2013-01-31 16:25:33 +01:00
Robert Loehning
298531e370 Incremented year in copyright info
Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-01-29 16:27:03 +01:00
Orgad Shaneh
29a93998df Remove braces for single lines of conditions
#!/usr/bin/env ruby

Dir.glob('**/*.cpp') { |file|
  # skip ast (excluding paste, astpath, and canv'ast'imer)
  next if file =~ /ast[^eip]|keywords\.|qualifiers|preprocessor|names.cpp/i
  s = File.read(file)
  next if s.include?('qlalr')
  orig = s.dup
  s.gsub!(/\n *if [^\n]*{\n[^\n]*\n\s+}(\s+else if [^\n]* {\n[^\n]*\n\s+})*(\s+else {\n[^\n]*\n\s+})?\n/m) { |m|
    res = $&
    if res =~ /^\s*(\/\/|[A-Z_]{3,})/ # C++ comment or macro (Q_UNUSED, SDEBUG), do not touch braces
      res
    else
      res.gsub!('} else', 'else')
      res.gsub!(/\n +} *\n/m, "\n")
      res.gsub(/ *{$/, '')
    end
  }
  s.gsub!(/ *$/, '')
  File.open(file, 'wb').write(s) if s != orig
}

Change-Id: I3b30ee60df0986f66c02132c65fc38a3fbb6bbdc
Reviewed-by: hjk <qthjk@ovi.com>
2013-01-08 10:48:18 +01:00
Orgad Shaneh
a44aa55502 Add whitespace after control keywords
find -name \*.cpp -o -name \*.h | \
  xargs sed -Ei 's/ (for|foreach|if|switch|while)\(/ \1 (/g'

Change-Id: I9efdff4bf0c8c01a52baaaeb75198483c77b0390
Reviewed-by: hjk <qthjk@ovi.com>
2012-11-28 20:20:46 +01:00
Orgad Shaneh
3747e941ad Clean up whitespace before EOL
Change-Id: I385544a10b9be66589b0d1a48594128035836c8a
Reviewed-by: hjk <qthjk@ovi.com>
2012-11-28 20:17:51 +01:00
Eike Ziller
6fd252b0a5 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.cpp
	share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.h
	src/plugins/debugger/qtmessageloghandler.cpp
	src/plugins/debugger/qtmessageloghandler.h
	src/plugins/debugger/qtmessagelogwindow.cpp
	src/plugins/madde/maemodeployconfigurationwidget.cpp
	src/plugins/madde/maemodeployconfigurationwidget.h
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/deployablefilesperprofile.h
	src/plugins/remotelinux/deploymentinfo.cpp
	src/plugins/remotelinux/deploymentinfo.h
	src/plugins/remotelinux/deploymentsettingsassistant.cpp
	src/plugins/remotelinux/profilesupdatedialog.cpp
	src/plugins/remotelinux/remotelinuxdeploymentdatamodel.h
	tests/auto/icheckbuild/ichecklib.cpp
	tests/auto/icheckbuild/ichecklib_global.h
	tests/auto/icheckbuild/parsemanager.cpp
	tests/auto/icheckbuild/parsemanager.h
	tests/manual/ssh/tunnel/tunnel.h

Change-Id: I04d7761df6bd936ad00e0547974284c967d39580
2012-10-05 21:20:50 +02:00
hjk
386ca7c8dd Adjust license headers
Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-10-05 17:12:56 +02:00
Orgad Shaneh
614bb33589 qbs files: Consolidate includePaths in QtcLibrary and QtcPlugin
Avoid using "." as includePath when it is unneeded

Change-Id: I9bc6f4ebe50409f49782520033fd5f098aed10d0
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2012-10-05 10:18:56 +02:00
Aleksey Sidorov
457c289100 Fix possibly memory corruption
text.toUtf8() create a temporary QByteArray object, which is then destroyed and
const char *utfString may be corrupted.

Change-Id: Icd6584675c0c6e25423d25129d3b6fc8b055ebf0
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-08-20 08:30:45 +02:00
Eike Ziller
e0f16c3093 Windows: Fix resource leak
Task-number: QTCREATORBUG-7385

Change-Id: I9c6e72a83e8761d32b1f9f94594e4e5d22f48b28
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
2012-07-30 10:10:34 +02:00