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

197 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
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
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
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
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
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
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
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
Friedemann Kleint
68d4d35cae Coreplugin: Header cleanup. 
Clean icore.h.
 2010-11-02 16:53:56 +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
kh1
f707cfd834 Fix potential crash and extra open page on initial help start. 
Reviewed-by: ck
 2010-10-12 17:47:11 +02:00
kh1
699e3657a9 Replace QToolBars with StyledBar. Remove minimum size constraints. 
Reviewed-by: con
 2010-10-05 14:53:29 +02:00
kh1
997e2e5348 Some properties are not being highlighted in context sensitive help. 
This happens because the may have a different name (like it's frament)
which we now look for while parsing the html for the function name.

Task-number: QTCREATORBUG-2217
Reviewed-by: ck
 2010-09-30 14:42:22 +02:00
kh1
2e6217b756 Prefer never documentation over old ones. 
Task-number: QTCREATORBUG-2080
Reviewed-by: ck
 2010-09-29 14:09:49 +02:00
kh1
2c4eb25168 Don't put focus on the viewer if we couldn't find any documentation. 
Task-number: QTCREATORBUG-2326
 2010-09-24 09:43:03 +02:00
kh1
b4dd2080be Implement opening find toolbar after '/' as requested by hjk. 2010-09-22 15:33:50 +02:00
kh1
55fe83c291 Make it possible to return editor mode if the last help page was closed. 2010-09-21 17:01:36 +02:00
Leena Miettinen
224b43034c UI text - fix capitalization 2010-09-17 11:14:38 +02:00
hjk
ff0ac20a42 coreplugin: use Core::Id is some places 2010-09-10 17:22:28 +02:00
kh1
6ce18c8dcb The sidebar viewer should not be allowed to open a new page. 2010-09-09 15:54:37 +02:00
Victor Ostashevsky
ea354f258c Wrong messages/contexts in help plugin 
Merge-request: 172
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2010-09-01 10:32:46 +02:00
kh1
8c070031df Fix build without webkit. 2010-08-26 11:58:39 +02:00
kh1
053721ea22 Should have been part of fc6c2aa998 . 2010-08-25 17:35:42 +02:00
kh1
fc6c2aa998 Small refactoring. 2010-08-25 17:34:36 +02:00
kh1
0cf36e2dc0 The backward menu logic was still broken. 2010-08-25 17:15:58 +02:00
kh1
ffdd1765ca Better naming. 2010-08-25 16:18:52 +02:00
kh1
1b7a92925d Make next/ previous button work for external help. 
Task-number: QTCREATORBUG-2074
 2010-08-25 15:51:56 +02:00
kh1
e9305eef3f Better naming. 2010-08-25 15:51:55 +02:00
kh1
44f4db7a39 Add navigation menus to the back and forth history buttons. 
Task-number: QTCREATORBUG-347
Reviewed-by: ck
 2010-08-25 11:46:04 +02:00
kh1
9e352be3b1 Fix jumping to an anchor once the page has been scrolled. 
Task-number: QTCREATORBUG-2130
 2010-08-23 14:32:09 +02:00
kh1
3170380074 Make sure we set the saved size for the side bar. 2010-08-17 14:48:07 +02:00
kh1
7b3208ce0f Add some more missing shortcuts. 2010-08-06 14:45:53 +02:00
Friedemann Kleint
7e739985b2 Merge remote branch 'origin/2.0' 
Conflicts:
	src/plugins/debugger/debuggeruiswitcher.cpp
	src/plugins/git/gitclient.cpp
	src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
 2010-08-06 10:46:50 +02:00
kh1
eec3542433 Missing connects when changed from the options dialog. 2010-08-05 16:17:47 +02:00
kh1
597ceed2c4 Make the side bar able to hide, implement missing shortcuts. 
Reviewed-by: ck
 2010-08-04 15:35:29 +02:00
kh1
c094e8f353 Make use of the user defined filter settings. 2010-08-02 16:33:19 +02:00
kh1
dc3f33890c Make use of the custom value settings functionality. 2010-08-02 16:32:18 +02:00
kh1
00783d2fbd Make sure on first start the IDE becomes the active window. 2010-08-02 16:18:34 +02:00
Alessandro Portale
3aa3c5688f Pedantic cleanup of filename parameters for QIcon constructor 
Using more *::Constants::ICON_* where it makes sense and
wrapping the file names into QLatin1String where they were
missing.

The increased usage of the ICON constants needed a few more
cross plugin includes of *constants.h, here and there.
I think that it is OK, since the dependencies were alredy there
icon resource wise.
 2010-07-30 22:17:14 +02:00