feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
18,741 Commits 108 Branches 368 Tags
f8ef0fac136d48e4ddc1df260bab4344ca812bc8
Commit Graph

44 Commits

Author SHA1 Message Date
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
Leena Miettinen
d5a33d2860 Wizards: change terminology 
Reviewed-by: dt
 2011-02-03 15:54:19 +01:00
con
d1023c7614 It's 2011 now. 
Reviewed-by: hjk
 2011-01-12 09:46:24 +01:00
Friedemann Kleint
b606469ae7 Project managers: Remove dependency to Qt Designer. 
(Cmake/Qt4). Use PluginManager invocation facility
for the form class code generation. Do the rest
(testing for form editor, retrieving the editor
contents).

Acked-By: hjk
 2011-01-10 16:33:31 +01:00
con
b1bcf081d8 Merge branch '2.1' 
Conflicts:
	src/plugins/coreplugin/basemode.cpp
	src/plugins/coreplugin/basemode.h
	src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp
	src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.h
	src/plugins/debugger/cdb/cdbsymbolpathlisteditor.cpp
	src/plugins/debugger/debuggeragents.cpp
	src/plugins/debugger/debuggeruiswitcher.cpp
	src/plugins/debugger/debuggeruiswitcher.h
	src/plugins/projectexplorer/buildconfigdialog.cpp
	src/plugins/qmldesigner/components/propertyeditor/colorwidget.cpp
	src/plugins/qmldesigner/components/propertyeditor/colorwidget.h
	src/plugins/qmldesigner/designercore/include/enumeratormetainfo.h
	src/plugins/qmldesigner/designercore/include/modelutilities.h
	src/plugins/qmldesigner/designercore/include/nodeinstance.h
	src/plugins/qmldesigner/designercore/include/propertymetainfo.h
	src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.h
	src/plugins/qmldesigner/designercore/instances/graphicsviewnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.h
	src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/qmlviewnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.h
	src/plugins/qmldesigner/designercore/metainfo/enumeratormetainfo.cpp
	src/plugins/qmldesigner/designercore/metainfo/propertymetainfo.cpp
	src/plugins/qmldesigner/designercore/model/modelutilities.cpp
	src/plugins/snippets/inputwidget.cpp
	src/plugins/snippets/snippetscompletion.cpp
	src/plugins/snippets/snippetscompletion.h
	src/plugins/snippets/snippetspec.cpp
	src/plugins/snippets/snippetsplugin.cpp
	src/plugins/snippets/snippetswindow.cpp
	src/plugins/snippets/snippetswindow.h
	src/plugins/texteditor/snippetsparser.cpp
	src/tools/qml/qmldom/main.cpp
	tests/manual/trk/runner.cpp
	tests/manual/trk/trkolddevice.cpp
	tests/manual/trk/trkolddevice.h
	tests/manual/trk/trkserver.cpp
 2010-12-17 17:00:53 +01:00
con
04e32b0049 License headers. 2010-12-17 16:03:42 +01:00
con
773343f396 Delay widget creation of options pages till their category is shown 
Also add the alternative way: IOptionsPageProvider, which states
a category, and is asked for a list of options pages for that
category when it is shown.

Task-number: QTCREATORBUG-3131
 2010-12-06 11:18:58 +01:00
con
17fb150f10 Fix ui language for custom wizards. 
Introduces a ICore::userInterfaceLanguage method, which centralizes the
previous qApp property hack for help and designer integration.

Reviewed-by: Friedemann Kleint
 2010-11-11 13:30:38 +01:00
dt
a84ad42741 Designer: Move dependency from CppEditor to CppTools 
That makes CppEditor almost a leaf node in the project dependencies.
 2010-10-04 15:10:01 +02:00
Daniel Molkentin
465675d332 Two descriptions in the file new dialog were swapped 
No strings translations were harmed in this commit. No kittens either.

Reviewed-by: Alessandro Portale
 2010-06-04 12:57:32 +02:00
Daniel Molkentin
bf95a99c51 New texts for the wizard types in the new dialog 
Reviewed-by: Leena Miettinen
 2010-05-12 14:16:49 +02:00
Friedemann Kleint
f65092bd56 Profiling: Re-introduce delayed loading of Designer 
from options dialog and editor factory.
 2010-03-10 12:51:04 +01:00
dt
2dedde25fe Remove work around again 4.2.0 
Reviewed-by: Friedemann Kleint <qtc-committer@nokia.com>
 2010-03-05 15:51:30 +01:00
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +01:00
Lasse Holmstedt
df7a19de9e Design mode integration 
Moved Qt Designer to open from Design Mode. Also, Design mode is now global,
and created in coreplugin. Other plugins can register themselves to it.
 2010-02-26 11:17:02 +01:00
con
a24738ffab Fixes: Diff editors don't get correct name. 
They were no longer showing e.g. the file name of the diffed file.
Also separate editor id and editor context a bit.
 2010-01-11 16:54:30 +01:00
Tobias Hunger
a6ad773722 Make method naming more consistent. 
* Use id() for methods returning a string used to represent
    some type of object.
  * Use displayName() for strings that are meant to be user
    visible.
  * Quieten some warnings while touching the files anyway.
  * Move Factories to their products in the plugins where that
    was not done before.

Reviewed-by: dt
 2010-01-07 18:17:24 +01:00
Thorbjørn Lindeijer
97eabc2916 Merge branch '1.3' 2010-01-06 14:46:22 +01:00
Jarek Kobus
738a950b75 Load designer translations before instantiating any designer object 
In this way all tr calls are done after translations are loaded.

Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@trolltech.com>
Task-number: QTCREATORBUG-470
 2010-01-06 11:33:45 +01:00
Friedemann Kleint
0e554fac91 Wizards: Sort 
Introduce new QString id() const-API and sort wizards by
[untranslated] category and id. Introduce respective constants.
Rubber-stamped-by: con <qtc-committer@nokia.com>
 2009-11-27 10:33:24 +01:00
hjk
93cbef8724 long live the king 2009-08-14 09:30:56 +02:00
Alessandro Portale
d3f9757916 Removing some unused semicolons after Q_UNUSED 
There were both variants, with and without extra semicolon.
 2009-07-13 17:35:17 +02:00
Friedemann Kleint
f7da76ab27 Fix Gui app wizard to write form classes consistent with Designer. 
Make Gui app wizard use Qt Designer wizard code to write the classes.
Remove the settings from the form class wizard page extension area and
add a settings page instead. Polish the designer plugin's structs to
parametrize class generation with QSharedData and settings code.
Export them and use them in the Gui app wizard.

Task-number: 256927
 2009-07-01 16:27:40 +02:00
Jason McDonald
884b7af769 Update license headers and sales contact details. 
Reviewed-by: Trust Me
 2009-06-17 00:01:27 +10:00
Daniel Molkentin
bebb155925 Also search for Qt tr cataloges in the Creator tr dir. Add qt_help cataloge. 
The qt_help cataloge is required to fully translate the help plugin. The
additional lookup is mandated by the binary packages, where the translations
are simply put in Creatrors translation directories and the Qt translation
path is invalid.

Reviewed-by: con <qtc-committer@nokia.com>
 2009-06-10 13:30:41 +02:00
Daniel Molkentin
83d451be32 Make strings consistant, part. descriptions in the 'New' wizard. 2009-05-25 13:45:12 +02:00
Oswald Buddenhagen
40546f9a93 load translations 2009-04-20 16:51:10 +02:00
dt
1492cd0eec Work around problems with kde 4.2.0 by checking for that exact version. 
Need to remove that at one point, but having someone report it one day
after we tried to remove this, means not now.
 2009-03-25 17:49:54 +01:00
con
0729ae0191 Lazily initialize designer again. 
People with KDE 4.2.0 please update to 4.2.1 ...

Reviewed-by: dt
 2009-03-24 16:50:59 +01:00
Oswald Buddenhagen
3670b1a42f remove qt < 4.5 #ifdefs 2009-03-11 18:40:27 +01:00
hjk
8ca887aae2 Fixes: change file license headers to include LGPL 2009-02-25 09:15:00 +01:00
hjk
099146a8f9 Revert "Revert "Fixes: Workaround a bug in kde 4.2.0."" 
This reverts commit 81a4518127.
 2009-02-18 11:56:55 +01:00
Martin Aumueller
81a4518127 Revert "Fixes: Workaround a bug in kde 4.2.0." 
This reverts commit e08f1763b7.
 2009-02-17 09:13:33 +01:00
dt
e08f1763b7 Fixes: Workaround a bug in kde 4.2.0. 
Task:     Reported on irc.
Details:  We did regiser all plugins but didn't initialize them. Leading
to the kde plugins installing a kde file dialog, but not initializing a
KComponentData, which leads to a crash when trying to open a file
dialog. So we aren't lazy anymore with the designer plugins.
And initialize them right away. We should reenable lazy initializing
once kde 4.2.1 has been released. (And probably has replaced kde 4.2.0
on most systems.)
 2009-02-02 18:06:26 +01:00
hjk
667255c4d1 some more ICore related cleanup 2009-01-20 17:14:00 +01:00
hjk
897c05f57c replace Core::ICore::instance()->pluginManager() by ExtensionSystem::PluginManager::instance() 2009-01-20 15:31:33 +01:00
hjk
113b81e9db replace ExtensionSystem::PluginManager::instance()->getObject<Core::ICore>() by Core::ICore::instance() 2009-01-20 11:52:04 +01:00
hjk
cc5ff1ec74 Remove #include <extensionsystem/pluginmanager.h> from icore.h, a 
forward declaration is sufficient.
 2009-01-19 12:39:20 +01:00
Daniel Molkentin
59affcfffc Bump year in licence header. 2009-01-13 19:22:14 +01:00
hjk
da3cb14483 chancge Nokia GPL exception version from 1.2 to 1.3 2008-12-16 17:20:00 +01:00
hjk
df7aacd637 more file cosmetics 2008-12-02 15:08:31 +01:00
hjk
ab83dcd87c off-by-one in headers 2008-12-02 14:20:25 +01:00
hjk
8a43d9b9f3 end-of-line whitespace correction of the new headers 2008-12-02 14:17:16 +01:00
con
05c35356ab Initial import 2008-12-02 12:01:29 +01:00