summaryrefslogtreecommitdiff
path: root/src/plugins/vcsbase/vcsbaseeditorparameterwidget.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Rename VcsBaseEditorParameterWidget -> VcsBaseEditorConfigOrgad Shaneh2016-10-241-300/+0
| | | | | | Change-Id: I5626e66ba2b7a760ce55263edce9e716067ea6a4 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io> Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* VCS: Replace QToolButtons in VCS toolbar with QActionsJarek Kobus2016-10-241-43/+45
| | | | | | | | | | | | Change VcsBaseEditorParameterWidget to add actions/widgets to an existing toolbar, instead of being a widget itself. The class is renamed in a follow-up commit. Task-number: QTCREATORBUG-14934 Change-Id: I473a439d12a096f4cbb64f06faa0598ee72000de Reviewed-by: Tobias Hunger <tobias.hunger@qt.io> Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* VcsBase: Modernize headersTobias Hunger2016-02-031-5/+0
| | | | | | | | | * Use pragma once * Use override * Remove Q_DECLARE_PRIVATE as that makes no sense for QtCreator Change-Id: Ic31d4868c172a0b8fcb50cc9a71a6e95639cf84c Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Update License according to agreement with Free Qt FoundationTobias Hunger2016-01-191-17/+12
| | | | | | | * Update files in src/plugins Change-Id: Ia5d77fad7d19d4bb3498e78661982f68729adb22 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'Eike Ziller2015-02-121-6/+6
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Update LicenseEike Ziller2015-01-161-6/+6
| | | | | | | | | | Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* | VcsBase: use Qt5 new connect syntaxHugues Delorme2015-01-221-3/+5
| | | | | | | | | | | | | | For VcsBaseClient and VcsBaseEditorParameterWidget Change-Id: Ib80110c904ee0d1153bc1c602c385f9cb8b0be50 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* | Vcs: in VcsBaseClient use functors to create log/diff parameter widgetsHugues Delorme2015-01-221-4/+5
| | | | | | | | | | | | | | | | | | | | Also API of VcsBaseEditorParameterWidget was changed to take benefit of C++11 lambdas. Slot executeCommand() is no longer virtual and only fires signal commandExecutionRequested(). The Vcs client just has to bind a lambda to this signal instead of some boiler-plate code like keeping track of the arguments of diff/log with "struct XxxDiffParameters", etc. Change-Id: I347c97d84a8324e9c661df4e6d9a6075980b020f Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* | VcsBase: Sprinkle with autoTobias Hunger2015-01-221-2/+2
|/ | | | | Change-Id: Icd1e1ec16b1ff918162d3c6f564348d47177ffc7 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* License updateEike Ziller2014-10-091-7/+8
| | | | | Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* Incremented year in copyright infoRobert Loehning2014-01-081-1/+1
| | | | | | Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Doc: use standard wording in \brief commandsLeena Miettinen2013-06-201-1/+2
| | | | | | | | | QDoc does some magic with the \class and \namespaces and \brief commands, so the following wording must be used: "The xxx class yyy ..." Change-Id: Id231f30e8464898b776888d5423523de404aae34 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Fix broken "git blame" on Windows.Friedemann Kleint2013-04-301-1/+1
| | | | | | | | | Change 48b9747550d555e5cde18146c55ed499a6744e36 caused an empty string to be passed as argument, resulting in "invalid revision ''". Change-Id: I0bcfad3f64298f0d14b00347bc12f42c3c00270e Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Vcs: Allow multiple flags in parameter widgetsOrgad Shaneh2013-04-291-45/+25
| | | | | | | Refactor combobox values to use %1 as a placeholder for values Change-Id: I9a9bb6b9ba5c21bcaad4a3047d322856225892bc Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Clean headers in vcsbase-plugin.Friedemann Kleint2013-03-261-0/+1
| | | | | Change-Id: Ibbfd5e0b07b2a06d17f4e3360511d7ad13b49f55 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Incremented year in copyright infov2.6.2Robert Loehning2013-01-291-1/+1
| | | | | Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Adjust license headershjk2012-10-051-21/+20
| | | | | Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Contact -> qt-project.orgEike Ziller2012-07-191-3/+1
| | | | | Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Removed module names from #include directives.Erik Verbruggen2012-02-151-4/+4
| | | | | | | | Getting the #include directives ready for Qt5. This includes the new-project wizards. Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Long live the king!hjk2012-01-261-1/+1
| | | | | Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* vcs: s/VCS/Vcs/hjk2012-01-091-28/+28
| | | | | | | | According to style guide. Change-Id: I05c1d4f50ddbf2876ab7e0835f4abec95fd573b2 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
* vcsbase: stylehjk2012-01-091-4/+0
| | | | | Change-Id: I139d9d46605383f03215c80bd9e9fd965021b435 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Use internal namespace in VCSBase more consistentlyTobias Hunger2011-12-081-15/+15
| | | | | Change-Id: I61de9796aaeb9484b44029c5f1d46e69834a04c3 Reviewed-by: Hugues Delorme <delorme.hugues@fougsys.fr>
* all: s/info@qt.nokia.com/qt-info@nokia.com/hjk2011-11-031-2/+2
| | | | | Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* VCSBaseEditorParameterWidget::mapSetting cope with 0 pointerDaniel Teske2011-10-071-1/+1
| | | | | | | Change-Id: I797488c6ace58a6f927fe3d528131682f1832de1 Reviewed-on: http://codereview.qt-project.org/6235 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* VCS: Handle empty arguments in EditorParameterWidgetsTobias Hunger2011-10-061-2/+6
| | | | | | | Task-number: QTCREATORBUG-6251 Change-Id: I833bcecf295b7191df1916a658b16f008f69f902 Reviewed-on: http://codereview.qt-project.org/6164 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* VCS: Make editorparameterwidget comboboxes work with indexesTobias Hunger2011-10-061-12/+41
| | | | | | | Change-Id: Id3d81e59f85d9b7d2dbadef337b97be13a37a598 Reviewed-on: http://codereview.qt-project.org/6160 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* all: less QScopedPointerhjk2011-09-191-0/+1
| | | | | | Change-Id: I536bdb4d4f0c10fa858560f3c160fc0fff8da9b2 Reviewed-on: http://codereview.qt-project.org/5116 Reviewed-by: hjk <qthjk@ovi.com>
* vcsbase: auto load/save settings in EditorParameterWidgetcerf2011-06-101-2/+91
| | | | | | | | Change-Id: If99006d418d8e3878677518a1bc0997bdfef38c6 Merge-request: 341 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com> Reviewed-on: http://codereview.qt.nokia.com/444 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* vcsbase: remove facility tool buttons in EditorParameterWidgetcerf2011-06-031-30/+0
| | | | | | | | | | | | | | Because diff options are VCS-specific, these methods were removed : VCSBaseEditorParameterWidget::addIgnoreWhiteSpaceButton() VCSBaseEditorParameterWidget::addIgnoreBlankLinesButton() Associated msg*Label() and msg*ToolTip() This impacts cvs, hg, perforce, svn and bzr plugins Change-Id: I8d213ed3915653b78bae9ba8b6cbbd65fa269ce2 Merge-request: 340 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com> Reviewed-on: http://codereview.qt.nokia.com/323 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* VCS: Update default value to current syntaxTobias Hunger2011-05-311-1/+2
| | | | | | | Change-Id: If640bacd36ad1d6bbffc91bc17a4320e1db34c6a Reviewed-on: http://codereview.qt.nokia.com/264 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* vcsbase: support of combo boxes in EditorParameterWidgetcerf2011-05-311-4/+67
| | | | | | | | | | | VCSBaseEditorParameterWidget supports "choice-based" options through mapping of QComboBox. Change-Id: I46e1205e1b6f56b16782d9f0d81ec6f1d4961f1a Merge-request: 331 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com> Reviewed-on: http://codereview.qt.nokia.com/255 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* vcsbase: simplify mapping of toggle buttons in EditorParameterWidgetcerf2011-05-311-69/+40
| | | | | | | | Change-Id: I9fee337731999f9ed4820cd2b449e1d3db661f65 Merge-request: 331 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com> Reviewed-on: http://codereview.qt.nokia.com/254 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* vcsbase: add "exec command" mechanism to EditorParameterWidgetcerf2011-05-311-0/+10
| | | | | | | | | | | | Based on BaseGitArgumentsWidget, it provides an "arguments changed" handler that calls executeCommand() by default. This handler can also further load/save settings Change-Id: I7182ddfa6323205f2ee57a7ce67122be5b89102e Merge-request: 331 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com> Reviewed-on: http://codereview.qt.nokia.com/253 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* Fix/add copyright headersTobias Hunger2011-05-061-15/+14
| | | | Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
* VCS[cvs,subversion]: Add diff options and enable reverting chunks.Friedemann Kleint2011-03-251-0/+192
Create VCSBaseEditorParameterWidget as a base class for setting the diff arguments lists and wire it up to trigger a re-run of diff on reverting. Enable reverting of chunks for cvs, subversion.
View Lorry Controller Status