Commit Graph

38410 Commits

Author SHA1 Message Date
Tobias Hunger
89602419c4 JsonWizard: Make sure to open files as the last thing
Make sure to open files only after last touches were applied by
the wizard.

Change-Id: I0da8b49ebe58b0516fa44ef7b0472cce20a5936f
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-10-16 16:23:01 +02:00
Leena Miettinen
c2fb25fd8d Doc: update screenshot of Variable Chooser
Change-Id: Iea74503197295eaceb96e4a351fed9abcc65a5e8
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-10-16 16:18:19 +02:00
Thomas Hartmann
3c88d65a21 Fix warning
Unused variable

Change-Id: Ic7baf8b17cb0b6a5091efe3bfe262ed42b1e9bda
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-10-16 16:06:04 +02:00
Eike Ziller
80390a679d Cpp include hierarchy: Add drag & drop onto editor splits
Change-Id: If6d7acb362433814dd73819ec224249f05ab9dcd
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-10-16 16:05:34 +02:00
Eike Ziller
4bcf60dc64 Type hierarchy: Add drag & drop into editor splits
Change-Id: I8fec78779d4241988bd4987a5d86020cea83d077
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-10-16 16:05:21 +02:00
Eike Ziller
4f6ab1a7bd New branch for binary artifacts
Change-Id: I77f0a248c934e19f89c590577269d2fea537ae00
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-10-16 16:05:09 +02:00
Thomas Hartmann
b5140d760e Update manual tests for ui split
Changing some files to .ui.qml and extracting call to Qt.fontFamilies()

Change-Id: I6151fd088ba4ff8c2cbd9299bacb534639b0b18c
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-10-16 15:07:51 +02:00
Alessandro Portale
a18b067326 Cleanup of Theming
A theme is supposed to provide colors, flags and images. This change
removes functions from Theme which do not just return simple data.
Also ManhattanStyle and Theme get separated a bit.

Change-Id: I2fab26ee38b858fefb55920eb219f84abcfaac18
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-10-16 12:35:29 +02:00
Tobias Hunger
4612cccb08 JsonWizard: Replace FormWizard with JsonWizard
Change-Id: Id469ee792e148d83b33002ee8295d15b5175ebbd
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-10-16 12:06:26 +02:00
Tobias Hunger
7e31b68596 JsonFilePage: Take InitialPath and InitialFileName for initialization
... during initializePage. This allows the JsonWizard to change the default
file name based on secetions on earlier pages.

Change-Id: I8569c23958339782ea21d56b54208812f6fa608e
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-10-16 12:06:21 +02:00
Tobias Hunger
37f9cabf2d JsonWizard: Make the form page available to the JsonWizard
Change-Id: I86d8a199b1c3ed973b32335d14a9cd7e0d23fdbf
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-10-16 12:06:14 +02:00
Tobias Hunger
869c7770d5 JsonWizard: Allow for more control of line layout in templates
Expand "\n", "\\" and "\t" in the templates to a linebreak/single '\'
character/tab respectively. Also enable line continuation with a '\'
character followed by a line break.

This allows for nicer output from the templates, avoiding spurious
blank lines in places.

Change-Id: I224b49e799f306dcb8fb8aa8ab2ea52733aecfa4
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-10-16 12:06:07 +02:00
Tobias Hunger
6568d9fbc0 Fix some copyright headers
Change-Id: I5a6bba98684208cf7ca5fb30b4bd29635c4c0f21
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-10-16 12:02:57 +02:00
Alessandro Portale
91c011d795 WelcomeScreen: Fix hover effect for default.creatortheme
Change-Id: I8a1761ae0dde2a05b81dcbaacdf0b6844277f762
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-10-16 11:33:01 +02:00
Nikolai Kosjar
1754dbf6ff Clang: Make some functions available
Change-Id: I1d2d898e5ab197eb3e5c95e82b6668a00affce7d
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-10-16 11:10:16 +02:00
Fawzi Mohamed
96af4e3c8e support xcode6.1
correctly redirect output, and cleanup pipes
This diverges a bit from upstream, but unfortunately upstream was
not robust.

Change-Id: Icf161e928033299f6078eee0859ac50835b9ffff
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-10-16 10:38:23 +02:00
Thomas Hartmann
4073016aba Theming: Do not set the global palette
Setting the global palette is not a very good idea, because
it interferes with native styling.

On Windows 7 the dark theme was unuasable, because the text on
all natives controls was to bright.

All native controls and the global palette should be left alone.
Wherever we want styling/theming we have to use Manhatten style.

Change-Id: Ia1d0bfb190e4bde7be72f751afc0846570c1189d
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-10-16 10:35:20 +02:00
Nikolai Kosjar
fdc903b332 ProjectExplorer: Add ClangStaticAnalyzerMode RunMode
Change-Id: I08bc8d11d4085861a56fd52da344785120a78712
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-10-16 10:21:15 +02:00
Christian Kandeler
25be45a5aa QmlProfiler: Fix qbs build.
Change-Id: Id9c3659242841b29a328639a9073860af2b400b4
Reviewed-by: Ulf Hermann <ulf.hermann@digia.com>
2014-10-16 10:00:48 +02:00
hjk
6c34058a5e ExternalTool: Namespace cosmetics
Change-Id: I90b6508608ccca6d938f3d99bd2cac0b94c96616
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-10-16 09:45:22 +02:00
Robert Loehning
0a933a5da5 Squish: Add now stable lines back in
This reverts commit 9af13b1f87
This reverts commit a66acf3d64

Change-Id: Ieeb222742f74482215fb089e9db6ab23b0229282
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-10-16 09:40:47 +02:00
hjk
33e8c02aef Debugger: Display parsed gdb version in build&run debugger list
Change-Id: Ie7ec35f2f282f7f5ed527253c64c19e2b9347b18
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-10-16 08:55:42 +02:00
Alessandro Portale
fa19530c57 Fix build
Change-Id: I7d0b2a827b76a0715c8e257dd6b45e7e8b11e064
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-10-16 00:09:53 +02:00
hjk
c81f31c72f ModeManager: Make instance return a ModeManager * again
Better for Qt5-style connects.

Change-Id: I37353c4b7697c8bb32f0cf13e2721ba78da904cd
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-10-15 22:42:56 +02:00
Christian Stenger
bf848c498e Squish: Fix tst_rename_file
Change-Id: Ic5aab61b2bc73f4de737b81d59fea0189893adfd
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2014-10-15 20:47:51 +02:00
David Schulz
4d207124b8 CDB: Fix assigning a Qt5 QString.
Task-number: QTCREATORBUG-13173
Change-Id: I8d60a3e2bcc6e6b67cde7238cad356a43bd8aa92
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-10-15 20:47:43 +02:00
Tobias Hunger
10016fd656 JsonWizard: Fix a error message
Change-Id: I3d5f31a30cbe3b5b16e0c589575b539403fd9864
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-10-15 18:36:33 +02:00
Tobias Hunger
52e31f80ad JsonWizard: Enable validators for lineedits on Fields pages
Make use of a validator when entering C++ class names.

Change-Id: Id7f9c8c2e1fe036397a337595cbe7aa7fd9589d5
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2014-10-15 18:21:55 +02:00
Tobias Hunger
50df8aa984 JsonWizard: Replace CppClassWizard with a JsonWizard
Change-Id: I4e1aeea4ccd1087b5e804e9ba4c2aa8fde4f4fcb
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2014-10-15 18:21:49 +02:00
Alessandro Portale
f429d3a08b QmakeProject: Add a checkbox for use of the Qt Quick Compiler
Change-Id: Ibeb9fbf21e72d977b37616337595666aa9b59ccc
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-10-15 17:51:12 +02:00
Thorben Kroeger
84f5585b5d Implement theming for QtCreator
Adds a 'Theme' tab to the environment settings and a '-theme' command
line option.
A theme is a combination of colors, gradients, flags and style
information.

There are two themes:
- 'default': preserves the current default look
- 'dark': uses a more flat for many widgets, dark color theme
  for everything

This does not use a stylesheet (too limited), but rather sets
the palette via C++ and modifies drawing behavior.
Overall, the look is more flat (removed some gradients and bevels).

Tested on Ubuntu 14.04 using Qt 5.4 and running on a KDE
Desktop (Oxygen base style).

For a screenshot, see
https://gist.github.com/thorbenk/5ab06bea726de0aa7473

Changes:
- Introduce class Theme, defining the interface how to access theme
  specific settings. The class reads a .creatortheme file (INI file, via
  QSettings)

  - Define named colors in the [Palette] section
    (see dark.creatortheme for example usage)

  - Use either named colors of AARRGGBB (hex) in the [Colors]
    section

  - A file ending with .creatortheme may be supplied
    to the '-theme' command line option

- A global Theme instance can be accessed via creatorTheme()

- Query colors, gradients, icons and flags from the theme
  were possible (TODO: use this in more places...)

- There are very many color roles. It seems better to me
  to describe the role clearly, and then to consolidate later
  in the actual theme by assigning the same color.
  For example, one can set the text color of the output pane button
  individualy.

- Many elements are also drawn differently.
  For the dark theme, I wanted to have a flatter look.
  - Introduce Theme::WidgetStyle enum, for now {Original, Flat}.
  - The theme specifies which kind of widget style it wants.
  - The drawing code queries the theme's style flag and
    switches between the original, gradient based look and
    the new, flat look.

- Create some custom icons which look better on dark background
  (wip, currently folder/file icons)

- Let ManhattanStyle draw some elements for non-panelwidgets, too
  (open/close arrows in QTreeView, custom folder/file icons)

- For the welcomescreen, pass the WelcomeTheme class.
  WelcomeTheme exposes theme colors as Q_PROPERTY accessible from
  .qml

- Themes can be modified via the 'Themes' tab in the environment
  settings.

TODO:
* Unify image handling
* Avoid style name references
* Fix gradients

Change-Id: I92c2050ab0fb327649ea1eff4adec973d2073944
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-10-15 17:21:10 +02:00
hjk
fd8fcd29a1 Lay down current namespace practices
Change-Id: I16e6e292097f3f7289bda8d9c6c23b6827ee54b9
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-10-15 16:34:25 +02:00
Nikita Baryshnikov
8bbce4608f Remove probably outdated QShortcut include
Also take care about sibling include statements

Change-Id: I513893ef710107310b63187cd5fa82c5e52fae0a
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-10-15 16:34:14 +02:00
Nikolai Kosjar
ae087f0557 AnalyzerBase: Accept links with column number in DetailedErrorView
Change-Id: I61ff15877523325a80cdfa089bd28e4e89a45bd5
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-10-15 16:13:51 +02:00
Nikolai Kosjar
24bde997ca AnalyzerBase: Extract some base classes from Valgrind
This makes the view of the valgrind tools avilable for other analyzers.

Change-Id: Icb28a3a6d6dbd7d437de803d50e30fada7dca0da
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-10-15 16:13:47 +02:00
Alessandro Portale
bde3629b29 WelcomeScreen: Session layout improvements
No gaps. Smoother hovering. Some cleanup.

Change-Id: Id4110ab10973a7df8b5c39a90d60878145ad389b
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-10-15 16:11:49 +02:00
Tim Jenssen
6a74c9d4a7 QmlDesigner: fix Section Collapsed size bug
Change-Id: Iff7016b35aeb763569366400460c12b99689e14f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-10-15 16:11:06 +02:00
Francois Ferrand
32b960db47 C++: support smart splitting of strings.
If 'enter' is pressed while the cursor is in the middle of a string,
the string is ended at the current cursor position, and a new string
is started on the next line.  This makes it very easy to split a long
string onto multiple lines.

In addition, Shift+Enter insert an escape in the string, to continue the
string at the beginning of next line.

A setting can be used to enable or disable this option.

Change-Id: Ia5f3c6989fc00d40d06bc4fe1182fe8b1318f565
Reviewed-by: Francois Ferrand <thetypz@gmail.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-10-15 15:59:18 +02:00
Eike Ziller
82d9cf4146 Cpp type hierarchy: Use single click activation instead of click handling
Change-Id: I968d28a37b16e9966502ee618c00f23fecd0daa6
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-10-15 15:22:54 +02:00
Christian Kandeler
31a20fcafa QbsProjectManager: Remove "experimental" status.
qbs considered harmless.

Change-Id: Iea3e32d1509b1f3fc22c05c86433f73abca7aeab
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-10-15 15:20:15 +02:00
Eike Ziller
9c7019f0b2 License update.
Change-Id: I0acde2c3b995693de682679471f03af85bdd0a61
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-10-15 15:19:55 +02:00
hjk
80323dfb8e BookMarks: Some code modernization
Change-Id: Ifb39d67d69bb97f1516bcdc70da6ca118c797126
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-10-15 13:58:02 +02:00
Thomas Hartmann
7956107187 QmlJS: Distinguish between erros for ui.qml files and designer warnings
We properly distinguish between warnings in the Qt Quick Designer and
error in a .ui.qml file.

The warnings are a subset of the errors anyway.

Change-Id: Ib3b21a845436381df10863b464c975b0b39fc063
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-10-15 12:37:28 +02:00
hjk
eacaf93a59 TextEditor: Factory cosmetics
Pimpl, add some convenience setters.

Change-Id: I525c080179fddab6fe2bd2270505fdbf33e56be2
Reviewed-by: David Schulz <david.schulz@digia.com>
2014-10-15 12:35:41 +02:00
Thomas Hartmann
9ee73a4fac QmlDesigner: Add support for .ui.qml
Change-Id: Iec0663147a9072d8332cf05ad56bcb7db0253eda
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-10-15 12:30:21 +02:00
Tobias Hunger
685bc9f0b5 JsonWizard: Fix spacer item in Fields page
Calculate space to use based on better data:-)

Change-Id: Ia502deb3eb40e5b4a3828e531798971d120e9b0d
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-10-15 12:07:15 +02:00
Takao Fujiwara
2b7dae1b84 Delete QEvent::InputMethod handling in FakeVimHandler::eventFilter()
The head keys handling is not needed because IBusEngineSimple handles
compose keys.
Also the length of QInputMethodEvent.commitString() is not one and
prevent users from auto-complettions.

Change-Id: Ieb0022add243829340797954e7d48ca71af2c249
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-10-15 11:49:47 +02:00
Kai Koehne
1502ea104a Don't activate qml debugging just because of qml file
20 lines above we actually search for qml libraries in the .pro/.pri file.
Do not overwrite this just based on the fact that there are QML files listed
somewhere in the project.

Change-Id: I01ea4304d98e40fca690d5bf3ce3f3de0543c82d
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-10-15 11:40:14 +02:00
Ulf Hermann
24c990475a QmlProfiler: Prefer events with notes when propagating selections
If you click on a row with a note in the timeline you probably want to
see the place with the note, not some other occurrence of the event
type.

Change-Id: Ic94514e460a33dbadca5cfed0b1455a1718b6d03
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2014-10-15 11:23:57 +02:00
Ulf Hermann
9331565e6e QmlProfiler: Show notes in events view
Change-Id: I21542128c4cc9b7a31f7b834defbdf1dd15cd37a
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2014-10-15 11:22:51 +02:00