Commit Graph

94 Commits

Author SHA1 Message Date
Thorbjørn Lindeijer
2d21060bc9 Added icons to options dialog categories
Some categories do not have icons yet, unfortunately.
2010-03-26 17:47:31 +01:00
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +01:00
Friedemann Kleint
81f14bb270 Fix some code scanning issues.
QString: Use QChar/char where appropriate, do not use QString::null
2010-02-02 17:09:41 +01:00
Oswald Buddenhagen
75b42f18d8 Merge remote branch 'origin/1.3'
Trailing whitespace removal re-applied manually.
2010-01-29 22:50:23 +01:00
Oswald Buddenhagen
a6ca348636 remove trailing whitespace
doing it in 1.3 as well to avoid possible later conflicts
2010-01-29 21:33:57 +01:00
Tobias Hunger
592e494d1a Fix typos
Reviewed-by: thorbjorn
2010-01-11 10:26:13 +01:00
Tobias Hunger
b95c86db23 Remove duplicate inclusions of headers
Reviewed-by: thorbjorn
2010-01-11 10:26:12 +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
Friedemann Kleint
a8ac34c347 Options: Sort by category, id.
Separate category and trCategory and introduce sorting characters
to the categories. Same for id/name.
2009-11-27 16:12:12 +01:00
Friedemann Kleint
65e11062bb Polish the settings dialog.
Add a title label to the pages. Use QGroupBoxes throughout.
Extend SavedAction to work with checkable QGroupBoxes. Polish UI files,
use common layout for VCS plugins. Performance: Apply only visited
settings pages. Add search keywords.

Task-number: QTCREATOR-26
2009-11-24 15:05:02 +01:00
Friedemann Kleint
e4a7792d6e Options dialog: Further polishing.
Task-number: QTCREATOR-26
2009-11-20 16:55:23 +01:00
dt
1253c55d56 Fix a race in CMakeProjectManager::createXml 2009-10-21 13:45:49 +02:00
Friedemann Kleint
5948e284bb Rename namespace Core::Utils into Utils
Also move Designer::Internal::FormWindowEditor ->
Designer::FormWindowEditor.
2009-10-05 11:06:05 +02:00
Friedemann Kleint
978cf4bda8 Rename IRunConfigurationRunner -> IRunControlFactory...
and ApplicationRunConfiguration to LocalApplicationRunConfiguration,
preparing remote debugging. Change the interface canRun() to be const,
run() to create() (since it does not run anything), use references
to the QSharedPointer<Foo>. Introduce d-Pointer and remove
unneeded headers from ProjectExplorerPlugin and add missing includes
everywhere.
2009-09-25 11:35:44 +02:00
dt
261796c3c6 If no cmake executable is specified or a invalid path, ask the user.
Directly in the wizard and save that to the settings. Also give feedback
if a wrong path was entered.
2009-09-23 14:33:05 +02:00
hjk
93cbef8724 long live the king 2009-08-14 09:30:56 +02:00
dt
560b06391d Add msvc support to cmake plugin. Depends on a cvs version of cmake.
The CodeBlocks - NMake Makefiles generator combination is only available
in the cvs version of cmake.
This has not been extensively tested at all.
2009-07-02 11:30:29 +02:00
Jason McDonald
884b7af769 Update license headers and sales contact details.
Reviewed-by: Trust Me
2009-06-17 00:01:27 +10:00
dt
adc7a7204b Use the environment specified for the current build configuration to
rebuild the cbp file

I think that makes sense, we'll see.
2009-05-27 14:58:11 +02:00
dt
dc3641b9e1 Fix warning. 2009-05-25 13:42:03 +02:00
Friedemann Kleint
4e7f2f8d7f Fixed translation glitches. 2009-05-14 17:02:30 +02:00
dt
b419403b0f Refactoring: Use one common code to find the debugging helper library
Remove duplicated code from cmakeprojectmanager.
2009-04-24 14:59:47 +02:00
dt
48dd25866e Show also error output in the cmake run log. 2009-04-20 12:18:32 +02:00
dt
ad1047925b Fix the directories the cmakelugin checks for the debugger plugin
I need to refactor that code for 1.2.
2009-04-17 12:27:04 +02:00
dt
e6779aaeb2 Use QT_INSTALL_DATA instead of path() for searching the debugger helper 2009-04-08 15:16:02 +02:00
Oswald Buddenhagen
deff5ac20f re-use pre-existing builds
run "cmake . [...]" if a build already exists in the build dir. this
saves the user from reproducing all the arguments he may need.

on the downside, this will go utterly awry if the source dir of the
existing build is a different one than known to creator. this should be
a rather rare corner case, so ignore it for now. the nice solution would
be a checkbox (on by default) to request this new behavior.
2009-03-27 20:57:12 +01:00
dt
74974a5a58 Also use the dumper library code from the cmake plugin.
Adds a little bit of code duplication, don't currently know how to best
avoid it, so I'll leave that for now as is. To be tested once Andre
pushes his stuff.
2009-03-25 17:30:48 +01:00
Friedemann Kleint
bccf4a1fc3 Fixes: Introduce a cpp settingspage containing file naming conventions (lower case and suffixes). Reorder VCS settings pages.
Task: 241959, 248085

RevBy: Optics/Naming checked by con
Details: Give IOptionPage an id() to differentiate from trName(). Make showOptionsDialog return a bool (applied) and give it an optional parent. Change Cpp and form class wizards, give them a Configure... button to change those settings.
2009-03-18 16:43:01 +01:00
dt
d73ac37b8a Fixes: Use the correct generator/make for MinGW
Details:  Patch by Antoine Requet
2009-03-10 11:48:37 +01:00
dt
ef1693e9a3 Fixes: Add a smarter cmake open project wizard.
Details:  That fixes a few bugs, while still having a few missing
things. Don't allow the user to set a shadow build directory, if there
is already a in source build. Detect if a cbp file is already existing
and recent enough, don't rerun cmake then. Ensure that the user runs
cmake with the cbp generator on opening the project. Show the output of
the cmake generator while running. Remove the unecessary cmake step.
2009-03-09 18:13:19 +01:00
dt
8897284189 Fixes: Show the CMakeLists.txt file in the navigation widget and completion
Task:     CMake support
Details:  No syntax highlighting
2009-03-03 19:03:39 +01:00
hjk
8ca887aae2 Fixes: change file license headers to include LGPL 2009-02-25 09:15:00 +01:00
dt
e8e2e4f45d Fixes: Progress to the cmake plugin
Details:  Add a dialog asking for command line options and build
directory. This dialog pops up if you don't have a .user file. Note,
though that it also pops up if there is already a in source build.
(The build directory lineedit should be read only then.)
The cmake button in that dialog and the output pane need more polish to
make them better. With those changes you can now build and run marble
from Qt Creator. (For marble you need to pass a few options to cmake.)

Also add a configuration page to the Tools/Options dialog, where you can
specify the cmake executable path.

And add a class which runs cmake in the background to find out which
version and wheter that cmake version has Qt Creator generator. (Which I
did begin to write.)
2009-01-23 16:57:38 +01:00
dt
3bcbd0782b Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline 2009-01-22 11:37:43 +01:00
dt
38471eebfe Fixes: Run cmake to get the version and check for the QtCreator generator
Details:  We don't act on that information yet.
2009-01-21 17:21:59 +01:00
dt
db20c44d40 Fixes: Add a settings page to the cmake plugin.
Details:  There's a linedit on there, we restore and save the settings,
only thing missing is actually using it.
2009-01-21 16:25:21 +01:00
Thorbjørn Lindeijer
6adecf3767 Avoid going through ICore when it's not necessary
Many singletons have their own instance() method, in which case there is
no need to use ICore::instance() to get access to them.
2009-01-21 15:55:33 +01:00
hjk
113b81e9db replace ExtensionSystem::PluginManager::instance()->getObject<Core::ICore>() by Core::ICore::instance() 2009-01-20 11:52:04 +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
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
hjk
f61e8672db more cosmetic changes 2008-12-02 14:09:21 +01:00
con
05c35356ab Initial import 2008-12-02 12:01:29 +01:00