Commit Graph

5173 Commits

Author SHA1 Message Date
Sergey Belyashov
f1cef5aa3a Update Russian translation
Change-Id: I68cecfabe8dcfebb7733030a404f75603464d157
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2014-11-17 12:28:07 +01:00
Thomas Hartmann
44e0f91f73 Wizards: Fix form ui wizard
Fix the description and labels.

Task-number: QTCREATORBUG-13227
Change-Id: I81a017ced91198bdc4e822cfcc1c45580945a773
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-11-17 12:19:48 +01:00
hjk
e6020b7067 Debugger: Report stack after frame switching with LLDB
Change-Id: Ibbaa52dc8c0703f3245cac2ca15b942e3006993a
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2014-11-17 09:45:50 +01:00
Alessandro Portale
c95839df23 Qt Quick App wizards: Use Label instead of Text
Label respects the system palette, while Text does not.

Task-number: QTCREATORBUG-13189
Change-Id: Ife1796cd04216eef909820f85dfdfd9c403ae80f
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com>
2014-11-17 09:21:18 +01:00
hjk
195400b42e Debugger: Explicitly convert division result to int in dumper
This can cause "TypeError: 'float' object cannot be interpreted as
an integer" otherwise.

Change-Id: Icae026f8f47edb686e22ce417f3bbdf41bbf0bc1
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-11-15 13:29:51 +01:00
hjk
7066e3348d Debugger: Improve tooltip for out-of-scope items with gdb
Previously, hovering over 'i' when stopped in main()

   int foo() { int i; }
   int main() {}

produced a tooltip without contents, now there is an
item saying "<not accessible>"

Change-Id: Id4de72541f74af93ba65c2a9508cf21e1dcd6569
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2014-11-14 13:38:07 +01:00
Mitch Curtis
1635e53ea2 Place each statement of default snippets on their own line.
Change-Id: Ia10d41887e6adbb0603a18fbf69bb1ce67eeac73
Task-number: QTCREATORBUG-12253
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-11-14 11:35:33 +01:00
Eike Ziller
2d03b59f53 Merge remote-tracking branch 'origin/3.3'
Change-Id: I0ab4982e229d475b8e3575414b4bebbfea07498d
2014-11-12 12:55:10 +01:00
Daniel Teske
684a037a8e Welcome Screen: Fix scrollbar
The size of the project list should only depend on the size of the items,
not on the size of the parent.

Task-number: QTCREATORBUG-13387
Change-Id: Iad8a32999a277532c2b64a7a889ddaafa40f693b
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-11-12 12:07:33 +01:00
Alessandro Portale
6f91d7772a WelcomeScreen theming: Fix button border color
This change adds an additional color role for the border color of a
pressed button.

Task-number: QTCREATORBUG-13356
Change-Id: Ibdbd330f60063961dbf27dbe2fb90f32089d7b34
Reviewed-by: Thorben Kroeger <thorbenkroeger@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-11-12 09:23:18 +01:00
Tobias Hunger
6a338d73ba JsonWizard: Add .gitignore file to empty qmake projects
Task-number: QTCREATORBUG-3125
Change-Id: I8c6777734224d4f7fff27ce441f75f380460723a
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2014-11-10 16:29:10 +01:00
Orgad Shaneh
685ea30204 Theming: Enable theming info bar
Use same role for info bar and search result widget

Change-Id: Ibe1f226d4ea8edaafb3daa1cc629e23a48322cf2
Reviewed-by: Thorben Kroeger <thorbenkroeger@gmail.com>
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-11-10 09:03:37 +01:00
Thorben Kroeger
c725271970 Theming: fix regression in search result bg color
Task-number: QTCREATORBUG-13309
Change-Id: I320f031a49f8ad2ef4eabd80597d8183f172aa78
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-11-09 14:40:51 +01:00
hjk
1fef3c41b9 Debugger: Fix QRegion dumper for Qt 5.4
The layout has changed in ee324e4ed527.

Change-Id: I4b5f47f6526bf1218fdb79dc625f7482af21012b
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-11-07 13:57:10 +01:00
Thomas Hartmann
0cc3180978 QmlDesigner.PropertyEditor: Use correct scope for enums
Change-Id: I07b1d83071407c19874af936617a395a37a79dd5
Task-number: QTCREATORBUG-13080
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2014-11-07 12:17:54 +01:00
Thomas Hartmann
8a8e21e1bc QmlDesigner.PropertyEditor: Fixing templates
toolTip was renamed to tooltip.

Change-Id: I18fc3cfb3f9ce21a6402ce3adccbb078a297b682
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-11-07 09:39:52 +01:00
Eike Ziller
3f1deee5e1 Merge remote-tracking branch 'origin/3.3' 2014-11-06 12:38:37 +01:00
Thomas Hartmann
ab4edad6ba QmlDesigner.PropertyEditor: Fix ComboBox drop down menu
We need to style the drop down menu.

Change-Id: Ide5845b06336cc6dff08acc7b5814a06ebde6a1b
Task-number: QTCREATORBUG-13336
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2014-11-06 11:37:11 +01:00
Thorben Kroeger
cf45c854e0 Theming: allow to override base style
Change-Id: I48e2d03b83fccf3d6eb4b508bd77912dbdaea1d0
Reviewed-by: Thorben Kroeger <thorbenkroeger@gmail.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-11-06 08:40:57 +01:00
Thorben Kroeger
82bbc6f562 Theming: Allow to apply theme palette globally
Change-Id: I709bd6b6c566e016731af1fb94ddaef6326ef485
Reviewed-by: Thorben Kroeger <thorbenkroeger@gmail.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-11-06 08:40:49 +01:00
Thiago Macieira
c080f68300 Fix linking with the Intel Compiler for OS X
ICC does not understand the -sectcreate option. Since this is really
just a linker option, use -Wl to pass it to the linker. This works with
Clang too.

Change-Id: I3edff1a856ba235a60984c745fc144b4046cad77
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@theqtcompany.com>
2014-11-05 19:48:18 +01:00
Thomas Hartmann
71bf6cf03e QmlDesigner: Remove unused qmldir file
This is a leftover from QtQuick 1.

Change-Id: I1540924f11fd3c316b68b7a04eb1786afc6bfec1
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2014-11-05 13:42:03 +01:00
Tobias Hunger
3cc6ca1286 JsonWizard: Rename Kits page to make it consistent with other wizards
Change-Id: Ie3bcd79cf402c0dbed8a6f616c730a7c59a907d2
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-11-04 11:00:24 +01:00
Tobias Hunger
d2eb042676 JsonWizard: Remove empty lines
Task-number: QTCREATORBUG-13289
Change-Id: I2c8d1fc4e2cfcb940e76a6988d35e80703548668
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-11-03 15:38:47 +01:00
Tobias Hunger
86d7a980ff JsonWizard: Replace EmptyProjectWizard with a JsonWizard
Change-Id: Ia199a04b535535722a3b47a9651b16635b019cbf
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-11-03 09:44:24 +01:00
Tobias Hunger
cda0320f5b JsonWizard: Match up files generated by the Cpp Class wizard
Change-Id: I407958b02446e81a449a34519a9eb592723a08a5
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-11-03 09:44:08 +01:00
Orgad Shaneh
4336f8874e Dumper: Adapt Token dumper 3.2
Change-Id: If7d6ba7265620edb14d258884b26578c36da2651
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2014-10-31 11:13:26 +01:00
Tim Jenssen
67fef99766 QmlDesigner: toolTip -> tooltip and some qsTr fixes
- "tooltip" is how it is in the component so use this everywhere

Change-Id: Ib8caa26365e50e1f68e04768b051941bbebe146e
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-10-30 16:47:05 +01:00
Thomas Hartmann
e8a937d82a Fixing the latest .qrc Qt Quick Application wizards
* The .ui.qml files were not properly generated.
* The .qrc file was wrong
* We have to use Window and set visible to true

Change-Id: I4617aba04048bebf744cf164013bd5af0aaadcd1
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-10-30 16:14:49 +01:00
Thomas Hartmann
d525d28e6f QmlPuppet: Enabling style support
If a style is activated by setting QT_QUICK_CONTROLS_STYLE we have
to use QGuiApplication instead of QApplication.

Change-Id: I138a4fb75508f989f97b207a7024a426fa379f9e
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-10-30 14:39:01 +01:00
Thomas Hartmann
7a470e9730 Updating the .qrc based wizards to use .ui.qml files
Change-Id: I178b9cdbb895ef221d74b9aa282163307550fd13
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-10-30 14:16:17 +01:00
Tobias Hunger
b159d740fa JsonWizard: Replace Python class wizard with a JsonWizard
* Remove Qt4 support.
* Remove some UI options that did not do anything in the original wizard

Change-Id: I9647cbc6cd0958a02df5b2fe480b9c8069249521
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-10-24 13:38:33 +02:00
Orgad Shaneh
6b4c254bf3 Theming: Fix light colored find widgets style
It is used when e.g. searching the environment widget.

Change-Id: I203b9f5e280a8f18f7a38f8e4d7b4540c79f932c
Reviewed-by: Thorben Kroeger <thorbenkroeger@gmail.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-10-23 13:57:37 +02:00
David Schulz
7c795b6667 Fix project file in the script wizard example.
Do not add the header file to the sources group of the project.

Change-Id: I2850854e0ded1fa226c7ef5f4428d0de7ec20c75
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2014-10-23 09:29:39 +02:00
Orgad Shaneh
92a1f66cdf GenericHighlighter: Update from latest KTextEditor source
Change-Id: If31df61e1e4aa7133d6384e91a362405149c2883
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: David Schulz <david.schulz@digia.com>
2014-10-22 14:05:44 +02:00
Tim Jenssen
49c39eb029 QmlDesigner: create DesignerSupport on stack
- it has the same life cycle like the Qt5NodeInstanceServer
 - we don't need to create and delete it (with maybe memory leaks)
 - this fixes a crash while the puppet is closed after an item deletion

Change-Id: Iecd6515eb41324b95e99e151d77ee74895230182
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-10-22 11:29:30 +02:00
hjk
6aa84464f6 Debugger: Be more verbose in dumper debug output
One of the should-not-happen situations seem to happen.
Add extra output to help to track it down.

Change-Id: I40bad85ce2fbaf1f02043b3d97f657461f5a1995
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-10-21 09:38:55 +02:00
Tobias Hunger
9bcecbe8fb Rename qml file templates
... to not trigger warnings about invalid syntax.

Change-Id: I21d94b521650a32e86d1181c412ff1e99a6e24b2
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-10-20 11:11:23 +02:00
Alessandro Portale
ca9ed45016 Theming: Remove IconOverlay section from default.creatortheme
IconOverlays are now defined in the Images section. Also,
default.creatortheme does not need to define these since they are
already defined in the cpp code as fallback.

See a18b067326

Change-Id: Id2cf616068b11c5aa8e43ee695369063e6a4ee0e
Reviewed-by: Thorben Kroeger <thorbenkroeger@gmail.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-10-20 09:09:30 +02:00
Alessandro Portale
5d84104d63 Theming: WelcomeScreen fixes
Restores the separation line in the WelcomeScreen
Some colors were still referenced with the incorrect name.

Change-Id: Ia0de1b4779ecc67030ebb4a5877edd5a6f24085c
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-10-17 18:28:09 +02:00
Alessandro Portale
34ba0c273a Theming: Use QQmlPropertyHash for passing theme to QML
This makes the mapping of theme values to QML automatic.

Change-Id: I4442ef454dc3a7dde1bd6b068b03ff890db3e49f
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-10-17 18:13:28 +02:00
Alessandro Portale
1c451c7a8a Theming: Small font color fix in default theme
Inactive doubleTabWidget tabs had a white color. This patch restores
that.

Change-Id: I775de6b4a647cc9a6f064e8658b7a675d5b605fc
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-10-17 16:31:30 +02:00
Thomas Hartmann
6d660f3051 Make QtQuick QML wizards more consistent
With this patch there is a Qt Quick 2.4 and a Qt Quick Controls 1.3 wizard
that both use .ui.qml files, but only the wizard for controls actually
uses controls. Using .ui.qml files is now the default for the latest versions.

Change-Id: I0d6c4d6878c0052330387339562831af37aa482b
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-10-17 12:49:15 +02:00
Thomas Hartmann
73158461b6 Add file wizard for .ui.qml forms
This wizard creates a .qml file that uses the pure form
.ui.qml file.

Change-Id: I1076ae4876002b2b726404c309d399c5268979ee
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-10-17 09:34:43 +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
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
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
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