feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
21,084 Commits 108 Branches 368 Tags
7fa56b08cf4b4a251c90cfb3437ef692a1fc5c39
Commit Graph

49 Commits

Author SHA1 Message Date
dt_
c960be456d Make SettingsDialog robust against multiple accept()/rejects() 
That can happen if the user clicks very fast due to the multiple
levels of event loops.

Task-Nr: QTCREATORBUG-4818

Change-Id: I9c00dbf957a587c6e5839afebdd71e84b8c4a3c8
Reviewed-on: http://codereview.qt.nokia.com/16
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2011-05-19 14:43:51 +02:00
Tobias Hunger
aa2acec14c Fix/add copyright headers 
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
 2011-05-06 15:17:05 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
con
ebed1ef306 Fix crash when filtering in the preferences. 
Need to ensure creation of all tabs before even the proxy model is
informed.

Task-number: QTCREATORBUG-4272
Reviewed-by: Robert Loehning
 2011-03-29 17:55:05 +02:00
con
d768008d60 Add a tools settings page and show the tools there. 
No editing possible yet.
 2011-02-18 17:15:38 +01:00
con
d1023c7614 It's 2011 now. 
Reviewed-by: hjk
 2011-01-12 09:46:24 +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
bada915c35 Fix crash when using settings dialog filter. 
Introduced by 773343f396
Need to ensure widget creation when filtering, because the translated
strings from the widgets are used for key words.
 2010-12-06 18:24:15 +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
0765a9819d Fix potential crash when closing settings dialog. 
We accessed the m_applied member after the dialog already was deleted.

Task-number: QTCREATORBUG-2844
Reviewed-by: Friedemann Kleint
 2010-10-21 14:11:57 +02:00
con
44bf80a6db Avoid opening settings dialog multiple times and don't crash. 
Task-number: QTCREATORBUG-1522
 2010-07-02 12:10:58 +02:00
Jens Bache-Wiig
bdd62b8925 Increase category item spacing in settings dialog 
This should give things a cleaner look.
 2010-05-18 17:09:19 +02:00
Thorbjørn Lindeijer
b295e82924 Fixed disabling tabs in options dialog when category matches search 
When the category title matches with the search keyword, we shouldn't
disable any of the tabs in this category. For example the only page in
the Locator category was disabled, because the page itself did not have
'Locator' as keyword.

Reviewed-by: con
 2010-05-12 17:13:23 +02:00
Thorbjørn Lindeijer
98cf814911 Reduce icon size in settings dialog 
The current icons don't look so nice at this size, but new ones should
be on their way.
 2010-04-21 14:39:05 +02:00
Thorbjørn Lindeijer
ddf63d3337 Don't stretch the categories column in the settings dialog 
Requested by Alessandro Portale.
 2010-04-14 12:29:12 +02:00
Thorbjørn Lindeijer
2ad17b32a4 Don't force flat group boxes on options dialog pages 
Reviewed-by: Jens Bache-Wiig
 2010-04-13 17:33:37 +02:00
Tobias Hunger
ce8b7f976a Fix warning on windows 2010-03-30 13:49:08 +02:00
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
Thorbjørn Lindeijer
d6b67fb290 Reorganized Options dialog into categories and tabs 
Instead of using a tree based options hierarchy.

Task-number: QTCREATORBUG-954
Reviewed-by: Friedemann Kleint
 2010-03-26 17:47:31 +01:00
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +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
96707f0b92 Make the Options dialog smaller 
Also removed no longer used .ui file.

Reviewed-by: Friedemann Kleint
 2009-12-11 14:29:35 +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
bf73896928 SettingsDialog: Polish 
Use QGridLayout to align header label and QStackedLayout for the pages
(in code, as it is not available in Designer).
Derive new class FilterLineEdit for filter widgets based on a modified
version of FancyLineEdit and use that in settings.
Rubber-stamped-by: con <qtc-committer@nokia.com>
 2009-11-27 13:54:27 +01:00
ck
d790712bdc Settings dialog: Polish "reset filter" button. 
Add a tool tip to the button and give it our standard icon.

Reviewed-by: Friedemann Kleint
 2009-11-26 15:40:06 +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
Friedemann Kleint
03d0b577fd First polish of options dialog find: Set item flags, match on category. 
Strip buddy markers.
 2009-11-20 12:56:49 +01:00
Friedemann Kleint
9a7729ebdc Preferences: Set up infrastructure for a filter widget. 
Add filter widget, use a special QSortFilterProxyModel +
StandardItemModel, add a slot selecting the page.
Add matches() to IOptionsPage.
 2009-11-19 17:47:13 +01:00
Daniel Molkentin
29c073b2a3 The title of SettingsDialog should be "Preferences", not "Options" on OS X. 
This conforms to the entry in the menu entry, wich already changes its
name accordingly to comply with the Apple HIG.

Also, adjusted the docs that were missing the change of location in the menu.
 2009-09-17 11:45:56 +02:00
hjk
93cbef8724 long live the king 2009-08-14 09:30:56 +02:00
Jason McDonald
884b7af769 Update license headers and sales contact details. 
Reviewed-by: Trust Me
 2009-06-17 00:01:27 +10:00
con
6c0c75eb02 Make "preferences" dialog remember last position. 
Task:     234832
 2009-03-19 18:15:54 +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
hjk
8ca887aae2 Fixes: change file license headers to include LGPL 2009-02-25 09:15:00 +01:00
Thorbjørn Lindeijer
5b50ffc20d Cleaned up usages of CoreImpl::instance 
The instance method has been moved to ICore, so there is generally no
need to include coreimpl.h anymore. Many objects accessed through this
core instance also had their own static instance methods.
 2009-01-21 13:37:58 +01:00
hjk
897c05f57c replace Core::ICore::instance()->pluginManager() by ExtensionSystem::PluginManager::instance() 2009-01-20 15:31:33 +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
Thorbjørn Lindeijer
59c8b93309 Modified IOptionsPage interface for Apply button 
The previous interface wasn't sufficient to properly support the Apply
button, since it didn't separate applying the changes from the cleanup
phase.

Designer settings pages still need some fixing.

Fixes Apply button causing problems for certain plugins, for example the
QuickOpen.
 2009-01-13 16:03:55 +01:00
hjk
6848155c7d Fixes: Add "Apply" button to Preferences dialog 
RevBy:   con
 2009-01-05 13:45:30 +01:00
hjk
da3cb14483 chancge Nokia GPL exception version from 1.2 to 1.3 2008-12-16 17:20:00 +01:00
Thorbjørn Lindeijer
824db4c6e7 Don't allow collapsing the settings pages 
It makes no sense.
 2008-12-10 13:21:10 +01:00
hjk
342caa2141 some more whitespace changes 2008-12-09 11:07:24 +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