feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
30,482 Commits 108 Branches 368 Tags
77ddc869e02e77631264e69cb67b51ced7500d15
Commit Graph

523 Commits

Author SHA1 Message Date
Oswald Buddenhagen
dc3c156cac Merge branch '2.2' 
Conflicts:
	src/plugins/debugger/gdb/pythongdbengine.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.h
	src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.h
	src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp
	src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp
	src/plugins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp
	src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp
	src/plugins/qt4projectmanager/qt4target.cpp
	src/plugins/qt4projectmanager/qt4target.h
	src/plugins/qt4projectmanager/qtoptionspage.h
	src/plugins/qt4projectmanager/qtversionmanager.cpp
	src/plugins/welcome/welcomemode.cpp
 2011-04-14 12:39:31 +02:00
hjk
ba52d6725b welcomemode: simplify WelcomeMode 2011-04-14 11:15:08 +02:00
hjk
be9455bc50 mode: make displayname, icon, priority, id, type data members 2011-04-14 11:15:08 +02:00
hjk
5b7b39cbda icontext: remove BaseContext class 2011-04-14 11:15:08 +02:00
hjk
70d392d235 core: make context and widget IContext data members 2011-04-14 11:15:07 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
hjk
5c056505f1 Revert "help: add menu keyboard accellerators" 
This reverts commit ce80090d19.

The string shows up in other places, too.
 2011-03-22 17:07:19 +01:00
hjk
ce80090d19 help: add menu keyboard accellerators 2011-03-22 12:32:46 +01:00
con
4ed1895c68 Revert "F1+F1 behavior was broken if there was no context help found." 
This reverts commit 9eccbbee5c.

After a bit more discussion and considering
2c4eb25168 this wasn't a good idea after
all.
 2011-03-09 11:37:59 +01:00
con
9eccbbee5c F1+F1 behavior was broken if there was no context help found. 
If on F1 no documentation was found, the focus was not set to the side
bar, making it impossible to press F1 again to get into help mode.
The fix also makes sure that the "blank" page is not set to the help
mode in this case, to avoid a big white empty area.
 2011-03-09 11:16:55 +01:00
Friedemann Kleint
aa5b5e237c Help: Fix leaking side bar widget and find placeholder. 
Breakage introduced by d28dc2d989.

Reviewed-by: con
 2011-03-03 16:48:16 +01:00
Leena Miettinen
f20591e727 UI text: rename locator filter 
Reviewed-by: con
 2011-03-03 16:23:50 +01:00
Leandro Melo
ae3b2ab013 Still changes to our options dialog 
We decided to have text-based buttons by default.
 2011-02-28 14:42:32 +01:00
Leandro Melo
a5977bc822 Revert "Make our options dialog a bit more uniform" 
This reverts commit 561f87fcb9.
 2011-02-28 14:37:27 +01:00
Leandro Melo
f4c25ad537 Revert "More options dialog UI changes" 
This reverts commit c5b57ea5f9.
 2011-02-28 14:37:26 +01:00
Leandro Melo
c5b57ea5f9 More options dialog UI changes 
Continuing 561f87fcb9
 2011-02-25 17:00:06 +01:00
Leandro Melo
561f87fcb9 Make our options dialog a bit more uniform 
In terms of buttons, layouts, aesthetics in general.
 2011-02-25 16:29:35 +01:00
Pasi Hirvonen
d28dc2d989 coreplugin: Make RightPaneWidget more widely usable. 
RightPaneWidget now has setWidget() and is no longer intimately tied
to the help plugin. Help plugin now uses setWidget().

Reviewed-By: dt
 2011-02-24 19:10:58 +01:00
Friedemann Kleint
808408eeea 10n: Fix tr() issues. 2011-01-19 16:50:03 +01:00
con
7915ce6bd3 Show wrap indicator also for searches in help views. 
Task-number: QTCREATORBUG-2753
 2011-01-14 11:19:57 +01:00
con
d1023c7614 It's 2011 now. 
Reviewed-by: hjk
 2011-01-12 09:46:24 +01:00
kh1
d8035bcaca In case of network error print the error string. 
Task-number: QTCREATORBUG-3378
 2011-01-11 16:12:06 +01:00
kh1
80cd57a9b1 Small cleanup. 2011-01-11 16:12:06 +01:00
dt
1c1acd0c4c Compile: include QApplication instead of QCoreApplication 
Reviewed-By: kh
 2011-01-11 15:00:23 +01:00
kh1
fd89e85850 Fix missing progress indicator during load. 
Task-number: QTCREATORBUG-3380
 2011-01-11 13:16:12 +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
Roberto Raggi
8df7fbc67a Compile fix for pedantic C++ compilers. 
Get rid of all those ugly stray semicolons. They are not valid C++.
 2010-12-16 11:29:24 +01:00
hjk
5bce99b9e5 Replace BaseMode convenience class by individual implementation. 
Using the convienience class does not really save code and adds another
needless level in the hierarchy. This affects the three remaining BaseMode
users: Help, ProjectExplorer and HelloWorld.
 2010-12-07 16:45:58 +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
Friedemann Kleint
d2e8819f9a Set some object names for easier debugging. 2010-12-03 17:31:01 +01:00
con
a9c803d310 Version bump. 2010-12-02 10:38:04 +01:00
kh1
71033d5d9a Specify the used charset, fixes e.g. polish translation. 2010-11-18 16:04:27 +01:00
kh1
da84000313 Cannot reset font size for help when shown in side pane. 
Task-number: QTCREATORBUG-2924
Reviewed-by: ck
 2010-11-16 16:25:56 +01:00
kh1
0985f9c1c4 Fix ambiguity with help manager by renaming the file to match class. 
Task-number: QTCREATORBUG-3090
Reviewed-by: ck
 2010-11-16 16:25:55 +01:00
Oswald Buddenhagen
04d4d309f7 Merge remote branch 'origin/2.1' 
Conflicts:
    share/qtcreator/static.pro
    src/plugins/qmljseditor/qmljsoutlinetreeview.cpp
    src/plugins/projectexplorer/outputwindow.cpp
 2010-11-15 19:03:18 +01:00
Christian Kandeler
5aedcb78a8 Help plugin: Fix possible crash on documentation update. 
We must not call updateFilterPage() when the "Options" dialog
is not currently open.
Without this patch, Creator will crash on a documentation update
if that dialog has been opened at least once and is currently closed.

Reviewed-by: kh1
Reviewed-by: con
 2010-11-15 12:12:09 +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
Kai Koehne
796cb76044 HelpPlugin: Compile fix for msvc2010 
Make sure that help/helpmanager.h is before coreplugin/helpmanager.h
in the INCLUDEPATH.
 2010-11-11 13:08:47 +01:00
Bill King
5361313118 help plugin: Make compile on windows/under pulse 2010-11-08 15:08:41 +10:00
Oswald Buddenhagen
9532d4a345 dynamically replace creator version during build 
... instead of running a sed script over a lot of files on each
version increment.
 2010-11-03 17:47:41 +01:00
Oswald Buddenhagen
e160f071ce centralize addition of pluginspecs to OTHER_FILES 2010-11-03 17:47:41 +01:00
Friedemann Kleint
68d4d35cae Coreplugin: Header cleanup. 
Clean icore.h.
 2010-11-02 16:53:56 +01:00
con
d7216e84cc Version bump. 2010-11-02 11:15:12 +01:00
Oswald Buddenhagen
a9ff4d3749 Merge remote branch 'origin/2.1' 
Conflicts:
	doc/qtcreator.qdoc
 2010-11-01 12:11:03 +01:00
Daniel Molkentin
c4a8e6da3b Fix regression: WelcomeMode has no RightPanePlaceHolder, switch to Edit 
Reviewed-by: con
 2010-10-27 18:54:06 +02:00
dt
552a2d0226 Merge remote branch 'origin/2.1' 2010-10-12 18:09:25 +02:00
kh1
f707cfd834 Fix potential crash and extra open page on initial help start. 
Reviewed-by: ck
 2010-10-12 17:47:11 +02:00
Christian Kamm
b78c1ef6da Merge remote branch 'origin/2.1' 
Conflicts:
	README
	doc/qt-html-templates.qdocconf
	doc/qtcreator.qdoc
	doc/qtcreator.qdocconf
	share/qtcreator/templates/wizards/qtcreatorplugin/MyPlugin.pluginspec
	src/app/Info.plist
	src/plugins/bineditor/BinEditor.pluginspec
	src/plugins/bookmarks/Bookmarks.pluginspec
	src/plugins/classview/ClassView.pluginspec
	src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec
	src/plugins/coreplugin/Core.pluginspec
	src/plugins/coreplugin/coreconstants.h
	src/plugins/cpaster/CodePaster.pluginspec
	src/plugins/cppeditor/CppEditor.pluginspec
	src/plugins/cpptools/CppTools.pluginspec
	src/plugins/cvs/CVS.pluginspec
	src/plugins/debugger/Debugger.pluginspec
	src/plugins/debugger/breakhandler.cpp
	src/plugins/designer/Designer.pluginspec
	src/plugins/fakevim/FakeVim.pluginspec
	src/plugins/find/Find.pluginspec
	src/plugins/genericprojectmanager/GenericProjectManager.pluginspec
	src/plugins/git/ScmGit.pluginspec
	src/plugins/helloworld/HelloWorld.pluginspec
	src/plugins/help/Help.pluginspec
	src/plugins/imageviewer/ImageViewer.pluginspec
	src/plugins/locator/Locator.pluginspec
	src/plugins/mercurial/Mercurial.pluginspec
	src/plugins/perforce/Perforce.pluginspec
	src/plugins/projectexplorer/ProjectExplorer.pluginspec
	src/plugins/qmldesigner/QmlDesigner.pluginspec
	src/plugins/qmljseditor/QmlJSEditor.pluginspec
	src/plugins/qmljsinspector/QmlJSInspector.pluginspec
	src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec
	src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec
	src/plugins/regexp/RegExp.pluginspec
	src/plugins/resourceeditor/ResourceEditor.pluginspec
	src/plugins/snippets/Snippets.pluginspec
	src/plugins/subversion/Subversion.pluginspec
	src/plugins/tasklist/TaskList.pluginspec
	src/plugins/texteditor/TextEditor.pluginspec
	src/plugins/vcsbase/VCSBase.pluginspec
	src/plugins/welcome/Welcome.pluginspec
	tests/auto/cplusplus/codeformatter/tst_codeformatter.cpp
	tests/manual/fakevim/fakevim.pro
	tests/manual/ssh/errorhandling/main.cpp
 2010-10-11 14:16:33 +02:00
hjk
880312c549 version bump: 2.0.92 -> 2.0.93 2010-10-08 13:50:04 +02:00