feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
62,714 Commits 108 Branches 368 Tags
d0a11322f4499e57dc1a6b2ec15755d3b48c0622
Commit Graph

39 Commits

Author SHA1 Message Date
Miklos Marton
8f88b89d81 Make http(s) urls clickable in the VCS output pane 
Fixes: QTCREATORBUG-23536
Fixes: QTCREATORBUG-19171
Change-Id: Ibf6d632031068c7f52cb15f534960e8238bdb21d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2020-02-05 22:02:39 +00:00
Eike Ziller
10098b2508 Merge remote-tracking branch 'origin/4.10' 
Conflicts:
	CMakeLists.txt
	tests/unit/unittest/unittest.pro

Change-Id: I64296ad31502d9b35012da129a28e9277e9fcf8e
 2019-06-28 12:50:03 +02:00
Orgad Shaneh
81ee28fc98 VCS: Add seconds to timestamp in output window 
Useful when there are multiple commands at the same minute.

Change-Id: Ie5c344fe3d19e54e5b2fce1a5b3dc0cfdeb267e2
Reviewed-by: André Hartmann <aha_1980@gmx.de>
 2019-06-26 14:25:19 +00:00
Orgad Shaneh
d97e677be4 VCS: Do not use monospace font in output window 
Change-Id: Id022a55152880a999c6c6c81ca88f70abfa88b8b
Reviewed-by: André Hartmann <aha_1980@gmx.de>
 2019-06-25 13:24:04 +00:00
Christian Kandeler
41ade463da Output panes: Support keyboard shortcuts for zooming 
Fixes: QTCREATORBUG-22567
Change-Id: I3c7419c7b464c329d8f8dae11db9a0b01e51f32c
Reviewed-by: André Hartmann <aha_1980@gmx.de>
 2019-06-24 14:14:07 +00:00
hjk
00b692e67e Utils: Use CommandLine in ShellCommand 
... and adapt users.

Change-Id: I218523ffe34720d5fe199aa0ca6892a8dc2985fc
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2019-06-11 11:01:16 +00:00
hjk
473a741c9f Utils: Rename FileName to FilePath 
More in line with QFileInfo terminonlogy which appears to be
best-of-breed within Qt.

Change-Id: I1d051ff1c8363ebd4ee56376451df45216c4c9ab
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
 2019-05-28 12:23:26 +00:00
Alessandro Portale
c453e896a0 Core: Fix enabling/disabling of zoomIn/Out buttons in output panes 
Amends 48073b2990 to avoid the creation of extra toplevel windows (and
warnings on MS Windows on startup).

Also, ensure that that the initial tab-less application output pane
shows the buttons, albeit in disabled state. All other output panes do
not have to explicitly enable them.

Change-Id: I6c6ef374c09c77e2eb953743071917d9346ca85d
Reviewed-by: hjk <hjk@qt.io>
 2019-04-23 16:39:24 +00:00
Andre Hartmann
b2700d2da4 VCS: Add font settings and zoom to output pane 
Change-Id: I2848bce2a851d9db953d1c218f1694877874e7df
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2019-04-16 14:20:41 +00:00
Andre Hartmann
48073b2990 IOutputPane: Refactor zoom function into base class 
Try to make zoom and font handling in the panes more
similar and put common stuff into IOutputPane.

Change-Id: I59c38c5eecbf67b7ca6c9d84a6f61b1292a787df
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2019-04-16 14:20:22 +00:00
Eike Ziller
b5e7522237 Merge remote-tracking branch 'origin/4.9' 
Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri
	src/plugins/pythoneditor/pythoneditorplugin.cpp

Change-Id: I9a95df5e16b34538539ced7dfc5d326b700794e6
 2019-04-02 12:22:48 +02:00
Andre Hartmann
335d277731 VCS: Make commands in output window bold again 
Most likely broken by 639017783a

While at it, also fix the comment that exactly
states this format.

Change-Id: I8f1ad5a4009ca0cb0d9828bca63e8edf8b6cd5a8
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2019-03-30 17:40:40 +00:00
Andre Hartmann
ea8a1c85c1 VcsOutputWindow: Cleanup and modernize 
Change-Id: I3239fb232207fb661bbcdf460ee01fb297720353
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2019-03-10 18:52:25 +00:00
Alessandro Portale
710e57a628 Fix warning: "Use midRef() instead of mid()" 
[-Wclazy-qstring-ref]

Change-Id: If8a0844b39377feb3772542559655854a92b93cd
Reviewed-by: hjk <hjk@qt.io>
 2019-01-17 13:00:37 +00:00
Orgad Shaneh
5873612767 VCS: Unbold messages and errors in output pane 
Change-Id: Id154d75c07cf95b9ceaad3ee26fcac08e66b3200
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
 2018-11-24 16:01:55 +00:00
Orgad Shaneh
5170dd0858 Merge remote-tracking branch 'origin/4.8' 
Change-Id: Ia8bf92c8effdee0e1085730cb975ff88c8ad85fc
 2018-11-20 19:13:13 +02:00
Orgad Shaneh
639017783a VCS: Use OutputFormat in output window 
Change-Id: I232880ed713dd32674ac326d15f935392fe2f06d
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
 2018-11-19 13:14:02 +00:00
Orgad Shaneh
bd539f7f77 VCS: Avoid setting other panes as active when has focus 
Fixes: QTCREATORBUG-19972
Change-Id: I21dd33a5ba89ba6befe14aa80f28c2806915441a
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
 2018-11-19 09:56:48 +00:00
Orgad Shaneh
8f65486dfc VCSBase: Modernize 
override, auto, nullptr, member initializers.

Change-Id: Ie21b8f4a4d6673947d82619bc3de677fcea63d7f
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
 2018-09-20 07:02:17 +00:00
Orgad Shaneh
afb60d0434 VCS: Use namespace Utils 
Change-Id: I41c818362398fd194995baf5b1adb16899e83217
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
 2018-07-18 08:44:45 +00:00
Alessandro Portale
3d3f14e3fe Prefer using 'override' instead of 'virtual' 
warning: prefer using 'override' or (rarely) 'final' instead of
'virtual' [modernize-use-override]

Change-Id: I6dac7a62b627fa1353b4455e1af92f869c2571cc
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
 2018-07-11 16:31:35 +00:00
hjk
492a17b65b VcsBasePlugin: Remove last instance of addAutoReleasedObject 
Change-Id: I6a622faed0bce39f21c5489afc0df623cb32f801
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2018-02-20 15:03:37 +00:00
Orgad Shaneh
f19de84e57 VCS: Quote command-line arguments 
Change-Id: I49e776abe769b70d8003483215a4dbe31f60377b
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
 2017-05-15 14:06:03 +00:00
Orgad Shaneh
da7cb91446 Merge remote-tracking branch 'origin/4.2' into 4.3 
Change-Id: I4931dcc81be872d7712e67123e94d15ee696459f
 2017-03-14 16:20:14 +02:00
Samuel Gaist
4033471aa9 QRegExp include cleanup 
This patch adds the missing include statements for QRegExp.

Change-Id: Ibb03b929940adb84ae190b5090cb6b88653cc14c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2017-03-13 22:05:30 +00:00
Kavindra Palaraja
ca507f2fe3 Change "Executing in" to "Running in" 
While I understand that the term "execute" is techically accurate, to
execute has many meanings, not all of them are positive. Execute can
also mean to kill someone. We should try to have more geopolitically
neutral terms in an IDE like QtCreator since it is used all over the world.

Change-Id: Icd6742865afa7a4469764e38eee961d7a96c7d5f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
 2017-01-09 13:48:45 +00:00
Nikita Baryshnikov
395d0045bd OutputPanes code style fixes 
Change-Id: I58c4fd1369dc2d6400416b0366b1d357a3308523
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2016-08-02 12:39:26 +00:00
Orgad Shaneh
9117b28eb1 VCS: Fix find in output pane 
It is instantiated in several locations. Move the find support to its ctor.

Change-Id: I77b05eff2889d0b8b801eef38d701ca4af3eefda
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
 2016-02-08 08:03:30 +00:00
Tobias Hunger
397e7f4843 Update License according to agreement with Free Qt Foundation 
* Update files in src/plugins

Change-Id: Ia5d77fad7d19d4bb3498e78661982f68729adb22
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2016-01-19 15:57:01 +00:00
Orgad Shaneh
a1f2b8c76e VCS: Streamline output window 
Use Core::OutputWindow instead of QPlainTextEdit

Change-Id: Ibad25b9ab1240d92977a0d789b440eaf3bc3e2a6
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2015-10-31 16:46:14 +00:00
Orgad Shaneh
15a9ad92ec VCS: Support searching in VCS output pane 
Change-Id: I88312b2585636aa89b2657800fc2254e83dc9c00
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
 2015-10-30 08:43:00 +00:00
Orgad Shaneh
cf0fbfef47 VCS: Theme output pane 
Change-Id: I256377d87a91fa101fd53fd65b966d629deb1179
Reviewed-by: Thorben Kroeger <thorbenkroeger@gmail.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2015-03-30 09:26:13 +00:00
Eike Ziller
9926fc2ab1 Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe' 
Conflicts:
	src/libs/utils/tooltip/tipcontents.cpp
	src/libs/utils/tooltip/tipcontents.h
	src/plugins/android/androiddeployqtstep.cpp
	src/plugins/baremetal/baremetalconstants.h
	src/plugins/baremetal/baremetaldevice.cpp
	src/plugins/baremetal/baremetaldevice.h
	src/plugins/baremetal/baremetaldeviceconfigurationwidget.cpp
	src/plugins/baremetal/baremetaldeviceconfigurationwidget.h
	src/plugins/baremetal/baremetaldeviceconfigurationwizard.cpp
	src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.cpp
	src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.h
	src/plugins/baremetal/baremetalplugin.cpp
	src/plugins/baremetal/baremetalplugin.h
	src/plugins/baremetal/baremetalruncontrolfactory.cpp
	src/plugins/baremetal/baremetalruncontrolfactory.h
	src/plugins/cppeditor/cppcodemodelinspectordialog.cpp
	src/plugins/cppeditor/cppdoxygen_test.cpp
	src/plugins/cppeditor/cppdoxygen_test.h
	src/plugins/debugger/breakpointmarker.cpp
	src/plugins/debugger/debuggeritemmodel.cpp
	src/plugins/debugger/debuggeritemmodel.h
	src/plugins/debugger/loadcoredialog.cpp
	src/plugins/genericprojectmanager/cppmodelmanagerhelper.cpp
	src/plugins/projectexplorer/addnewmodel.cpp
	src/plugins/projectexplorer/addnewmodel.h
	src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp
	src/plugins/qmlprofiler/abstracttimelinemodel.cpp
	src/plugins/qmlprofiler/abstracttimelinemodel.h
	src/plugins/qmlprofiler/notesmodel.cpp
	src/plugins/qmlprofiler/qml/CategoryLabel.qml
	src/plugins/qmlprofiler/qml/MainView.qml
	src/plugins/qmlprofiler/qml/Overview.js
	src/plugins/qmlprofiler/qml/Overview.qml
	src/plugins/qmlprofiler/qml/TimeDisplay.qml
	src/plugins/qmlprofiler/qml/TimeMarks.qml
	src/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.cpp
	src/plugins/qmlprofiler/sortedtimelinemodel.cpp
	src/plugins/qmlprofiler/sortedtimelinemodel.h
	src/plugins/qmlprofiler/timelinemodelaggregator.cpp
	src/plugins/qmlprofiler/timelinemodelaggregator.h
	src/plugins/qmlprofiler/timelinerenderer.cpp
	src/plugins/qmlprofiler/timelinerenderer.h
	src/plugins/qmlprojectmanager/QmlProjectManager.json.in
	src/plugins/texteditor/findinfiles.cpp
	src/plugins/vcsbase/vcsconfigurationpage.cpp
	src/shared/qbs
	src/shared/scriptwrapper/interface_wrap_helpers.h
	src/shared/scriptwrapper/wrap_helpers.h
	tests/auto/qmlprofiler/abstracttimelinemodel/tst_abstracttimelinemodel.cpp
	tests/system/suite_debugger/tst_debug_empty_main/test.py
	tests/system/suite_debugger/tst_qml_js_console/test.py
	tests/system/suite_debugger/tst_qml_locals/test.py

Change-Id: I67540b648f8b162496f4aa606b04d50c7c9125c6
 2015-02-12 17:29:21 +01:00
Tobias Hunger
6fe3eec590 VcsCommand: Use Qt5-style connects 
Change-Id: I81688ce998bf9f8d47b7d88e639699b626be90dd
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2015-01-20 15:44:30 +01:00
Tobias Hunger
38ef30f4c2 VcsOutputWindow: Try harder to filter out password data 
Not perfect, but might catch some more passwords before they are
echoed in cleartext.

Change-Id: I61e537a4a3cbc69748e1f761a5a08fe03ff2552d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2015-01-20 14:37:10 +01:00
Tobias Hunger
2be422b4e0 VcsCommand: Fix indention 
WS only change

Change-Id: I5a04b51babc91d80aef8c03d356345f1faf95500
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2015-01-19 18:08:01 +01:00
Eike Ziller
3c85058694 Update License 
Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
 2015-01-16 12:37:56 +01:00
Eike Ziller
ea27143239 Merge remote-tracking branch 'origin/3.2' 
Conflicts:
	src/libs/utils/ipaddresslineedit.cpp
	src/libs/utils/logging.h
	src/plugins/analyzerbase/AnalyzerBase.pluginspec.in
	src/plugins/android/Android.pluginspec.in
	src/plugins/android/androiddeploystep.cpp
	src/plugins/android/androiddeploystep.h
	src/plugins/android/androiddeploystepfactory.cpp
	src/plugins/android/androiddeploystepwidget.cpp
	src/plugins/android/androidpackagecreationfactory.cpp
	src/plugins/android/androidpackagecreationstep.cpp
	src/plugins/android/androidpackagecreationstep.h
	src/plugins/android/androidpackagecreationwidget.cpp
	src/plugins/android/androidpackagecreationwidget.h
	src/plugins/android/javafilewizard.cpp
	src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in
	src/plugins/baremetal/BareMetal.pluginspec.in
	src/plugins/bazaar/Bazaar.pluginspec.in
	src/plugins/beautifier/Beautifier.pluginspec.in
	src/plugins/bineditor/BinEditor.pluginspec.in
	src/plugins/bookmarks/Bookmarks.pluginspec.in
	src/plugins/clangcodemodel/ClangCodeModel.pluginspec.in
	src/plugins/clangcodemodel/clanghighlightingsupport.cpp
	src/plugins/clangcodemodel/clangsymbolsearcher.cpp
	src/plugins/classview/ClassView.pluginspec.in
	src/plugins/clearcase/ClearCase.pluginspec.in
	src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec.in
	src/plugins/cmakeprojectmanager/cmakeeditorfactory.cpp
	src/plugins/cmakeprojectmanager/cmakehighlighter.cpp
	src/plugins/coreplugin/Core.pluginspec.in
	src/plugins/cpaster/CodePaster.pluginspec.in
	src/plugins/cppeditor/CppEditor.pluginspec.in
	src/plugins/cppeditor/cppfilewizard.cpp
	src/plugins/cpptools/CppTools.pluginspec.in
	src/plugins/cpptools/cpphighlightingsupportinternal.cpp
	src/plugins/cpptools/cppmodelmanagerinterface.cpp
	src/plugins/cpptools/cppmodelmanagerinterface.h
	src/plugins/cvs/CVS.pluginspec.in
	src/plugins/debugger/Debugger.pluginspec.in
	src/plugins/designer/Designer.pluginspec.in
	src/plugins/diffeditor/DiffEditor.pluginspec.in
	src/plugins/emacskeys/EmacsKeys.pluginspec.in
	src/plugins/fakevim/FakeVim.pluginspec.in
	src/plugins/genericprojectmanager/GenericProjectManager.pluginspec.in
	src/plugins/git/Git.pluginspec.in
	src/plugins/git/gitorious/gitorious.cpp
	src/plugins/git/gitorious/gitorious.h
	src/plugins/git/gitorious/gitoriousclonewizard.cpp
	src/plugins/git/gitorious/gitorioushostwidget.cpp
	src/plugins/git/gitorious/gitorioushostwidget.h
	src/plugins/git/gitorious/gitorioushostwizardpage.cpp
	src/plugins/git/gitorious/gitoriousprojectwidget.cpp
	src/plugins/git/gitorious/gitoriousprojectwidget.h
	src/plugins/git/gitorious/gitoriousprojectwizardpage.cpp
	src/plugins/git/gitorious/gitoriousprojectwizardpage.h
	src/plugins/git/gitorious/gitoriousrepositorywizardpage.cpp
	src/plugins/git/gitorious/gitoriousrepositorywizardpage.h
	src/plugins/glsleditor/GLSLEditor.pluginspec.in
	src/plugins/glsleditor/glsleditorfactory.cpp
	src/plugins/glsleditor/glslfilewizard.cpp
	src/plugins/helloworld/HelloWorld.pluginspec.in
	src/plugins/help/Help.pluginspec.in
	src/plugins/imageviewer/ImageViewer.pluginspec.in
	src/plugins/ios/Ios.pluginspec.in
	src/plugins/macros/Macros.pluginspec.in
	src/plugins/mercurial/Mercurial.pluginspec.in
	src/plugins/perforce/Perforce.pluginspec.in
	src/plugins/projectexplorer/ProjectExplorer.pluginspec.in
	src/plugins/pythoneditor/PythonEditor.pluginspec.in
	src/plugins/pythoneditor/pythoneditorwidget.cpp
	src/plugins/pythoneditor/wizard/pythonfilewizard.cpp
	src/plugins/qbsprojectmanager/QbsProjectManager.pluginspec.in
	src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp
	src/plugins/qmakeprojectmanager/QmakeProjectManager.pluginspec.in
	src/plugins/qmakeprojectmanager/profileeditorfactory.cpp
	src/plugins/qmldesigner/QmlDesigner.pluginspec.in
	src/plugins/qmljseditor/QmlJSEditor.pluginspec.in
	src/plugins/qmljseditor/qmljseditorfactory.cpp
	src/plugins/qmljstools/QmlJSTools.pluginspec.in
	src/plugins/qmlprofiler/QmlProfiler.pluginspec.in
	src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec.in
	src/plugins/qnx/Qnx.pluginspec.in
	src/plugins/qtsupport/QtSupport.pluginspec.in
	src/plugins/remotelinux/RemoteLinux.pluginspec.in
	src/plugins/resourceeditor/ResourceEditor.pluginspec.in
	src/plugins/resourceeditor/resourcewizard.h
	src/plugins/subversion/Subversion.pluginspec.in
	src/plugins/tasklist/TaskList.pluginspec.in
	src/plugins/texteditor/TextEditor.pluginspec.in
	src/plugins/texteditor/basetexteditor_p.h
	src/plugins/texteditor/basetextmark.cpp
	src/plugins/texteditor/codeassist/basicproposalitemlistmodel.h
	src/plugins/texteditor/codeassist/defaultassistinterface.h
	src/plugins/texteditor/codeassist/iassistproposalitem.cpp
	src/plugins/texteditor/itexteditor.cpp
	src/plugins/texteditor/itexteditor.h
	src/plugins/texteditor/itextmark.cpp
	src/plugins/texteditor/plaintexteditor.cpp
	src/plugins/texteditor/plaintexteditor.h
	src/plugins/texteditor/texteditoractionhandler.cpp
	src/plugins/todo/Todo.pluginspec.in
	src/plugins/updateinfo/UpdateInfo.pluginspec.in
	src/plugins/valgrind/Valgrind.pluginspec.in
	src/plugins/vcsbase/VcsBase.pluginspec.in
	src/plugins/welcome/Welcome.pluginspec.in
	src/plugins/winrt/WinRt.pluginspec.in
	tests/auto/debugger/temporarydir.h

Change-Id: I254af8be8119fe9855287909e17d4b8ca9d2fc2f
 2014-10-14 15:36:16 +02:00
hjk
4d082cee74 VcsBase: Use static pattern for VcsBaseOutputWindow 
Also rename to VcsOutputWindow.

Change-Id: I79547b1154603a8c7b3604eadc5b460930c6109c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-08-27 12:12:15 +02:00