aboutsummaryrefslogtreecommitdiffstats
path: root/src/libs/utils/reloadpromptutils.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Utils: Make OsType addition less visiblehjk2022-09-021-0/+1
| | | | | | Change-Id: I092930ef6b0ed6876e32ed6b0c78d6bd58becddc Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
* macOS: Fix description where to change reload settingsEike Ziller2022-08-311-6/+14
| | | | | | | | | | in the dialog that asks you what to do when a file changed on disk. Fixes: QTCREATORBUG-27809 Change-Id: I47b3a7287c725c8f4d37564c1b6a9788665e345e Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Use SPDX license identifiersLucie Gérard2022-08-261-24/+2
| | | | | | | | | Replace the current license disclaimer in files by a SPDX-License-Identifier. Task-number: QTBUG-67283 Change-Id: I708fd1f9f2b73d60f57cc3568646929117825813 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Adapt to move of options to Edit > PreferencesEike Ziller2022-06-281-4/+5
| | | | | Change-Id: I6881f658db9eec5059b434bce12093667535d5ac Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Utils: Drop unused headers [I-Z]Jarek Kobus2022-05-251-1/+2
| | | | | | | | | Round 2 - focus on sources. For classes with initial in range [I-Z]. Try to keep the same separators between different kind of headers. Change-Id: I8a7ab99bab8120ee72cda6433ee3dc6f260a4d76 Reviewed-by: hjk <hjk@qt.io>
* Utils: SimplifyNikolai Kosjar2019-11-011-13/+5
| | | | | | | | | bugprone-branch-clone readability-simplify-boolean-expr Change-Id: I75ad6118275ad9231f21b578567c3c042414263b Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Utils: Rename FileName to FilePathhjk2019-05-281-1/+1
| | | | | | | | 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>
* Utils: Add hint for default configuration to file reload promptAndre Hartmann2019-04-291-1/+4
| | | | | | Change-Id: I6fe8174498bd6ec929b5de50c91cb63b600eee50 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* app_version.h: Make IDE name configurableTobias Hunger2017-09-051-4/+4
| | | | | | Change-Id: I993f452c8d09cf89e9a2958fc8e36b7d2c17ee6f Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Utils: Use title case in title barRobert Loehning2017-08-101-1/+1
| | | | | Change-Id: If84c417c66ea98b9a75605fe594179b9b93b4715 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Implement diff on close, on revert and on external modificationJarek Kobus2016-10-211-2/+16
| | | | | | Task-number: QTCREATORBUG-1531 Change-Id: I8c9a740d66eb7836b3df6850ac243260fd282b32 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Changed Close button to text to &CloseJesus Fernandez2016-02-251-0/+3
| | | | | | | | | | The close button in reload prompt message box had no keyboard shortcut. The text was changed to &Close to add the shortcut. This behavior is useful after a long QtCreator session and several Qt intermediate files open. When those files are regenerated it's useful to close them. Change-Id: I25a9134eeed3ce6f10a5b698c7eda9f714f3bae5 Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
* Update License according to agreement with Free Qt FoundationTobias Hunger2016-01-191-17/+12
| | | | | | | * Update remaining files in src Change-Id: I1896f17fcf34f71c3310c87899fb5171b8e4afb1 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>
* | Utils: Use FileName in reloadPromptOrgad Shaneh2015-02-021-3/+3
| | | | | | | | | | Change-Id: I170208e1c49bcab9c78b1651669252ed0d162bb3 Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
* | Replace QFileInfo::fileName() with FileName::fileName()Orgad Shaneh2015-01-291-1/+2
|/ | | | | Change-Id: I4852ff215abf25649fc5eac1e922ae901839ca3d Reviewed-by: hjk <hjk@theqtcompany.com>
* License updateEike Ziller2014-10-091-7/+8
| | | | | Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* Utils: Remove unneeded namespace qualificationsOrgad Shaneh2014-07-161-10/+12
| | | | | | Change-Id: Iacab8410ab4d3b63f96e7541b450e3cc729ab662 Reviewed-by: Daniel Teske <daniel.teske@digia.com> Reviewed-by: hjk <hjk121@nokiamail.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>
* Utils: Fixing codestyle issues in reloadpromptutils.David Schulz2013-09-111-18/+38
| | | | | Change-Id: I225de3015425297aeaa26e349da61ccac44272cf Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
* Editor: Added a close all option to the deleted file dialog.David Schulz2013-09-091-0/+3
| | | | | | Change-Id: Ibacfc31c4cd6193e85c84f8553bae7495aea08c7 Reviewed-by: Simon Schäfer <simon.schaefer@koeln.de> Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Clean headers in Utils.Friedemann Kleint2013-03-191-1/+0
| | | | | | | | | | Forward-declare QGraphicsOpacityEffect in DetailsButton, QProcessEnvironment in Environment, QFileInfo in fileutils, QUrl in IWelcomePage, FancyLineEdit in PathChooser and remove unneeded headers. Change-Id: I7d5f273530dd2059bbdaf0899f0a3bc7e49e8482 Reviewed-by: hjk <hjk121@nokiamail.com>
* Merge remote-tracking branch 'origin/2.6'Oswald Buddenhagen2013-01-311-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in src/plugins/debugger/qtmessageloghandler.cpp src/plugins/debugger/qtmessagelogwindow.cpp src/plugins/madde/maemodeployconfigurationwidget.cpp src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp src/plugins/qmldesigner/designercore/include/widgetqueryview.h src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.h src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp src/plugins/qnx/bardescriptormagicmatcher.h src/plugins/qt4projectmanager/profilekeywords.cpp src/plugins/remotelinux/deployablefilesperprofile.cpp src/plugins/remotelinux/deployablefilesperprofile.h src/plugins/remotelinux/deploymentinfo.cpp src/plugins/remotelinux/deploymentsettingsassistant.cpp src/plugins/remotelinux/profilesupdatedialog.cpp tests/auto/icheckbuild/ichecklib.cpp tests/auto/icheckbuild/parsemanager.cpp tests/auto/icheckbuild/parsemanager.h Change-Id: Ie465a578446a089e1c502d1cb1096e84ca058104
| * Incremented year in copyright infov2.6.2Robert Loehning2013-01-291-1/+1
| | | | | | | | | | Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Remove braces for single lines of conditionsOrgad Shaneh2013-01-081-4/+3
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | #!/usr/bin/env ruby Dir.glob('**/*.cpp') { |file| # skip ast (excluding paste, astpath, and canv'ast'imer) next if file =~ /ast[^eip]|keywords\.|qualifiers|preprocessor|names.cpp/i s = File.read(file) next if s.include?('qlalr') orig = s.dup s.gsub!(/\n *if [^\n]*{\n[^\n]*\n\s+}(\s+else if [^\n]* {\n[^\n]*\n\s+})*(\s+else {\n[^\n]*\n\s+})?\n/m) { |m| res = $& if res =~ /^\s*(\/\/|[A-Z_]{3,})/ # C++ comment or macro (Q_UNUSED, SDEBUG), do not touch braces res else res.gsub!('} else', 'else') res.gsub!(/\n +} *\n/m, "\n") res.gsub(/ *{$/, '') end } s.gsub!(/ *$/, '') File.open(file, 'wb').write(s) if s != orig } Change-Id: I3b30ee60df0986f66c02132c65fc38a3fbb6bbdc Reviewed-by: hjk <qthjk@ovi.com>
* Adjust license headershjk2012-10-051-21/+20
| | | | | Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Add Close button to window asking what to do with changed documentsTobias Hunger2012-10-041-1/+3
| | | | | | | | | | | Add a close button to window asking what to do with documents that were changed outside Creator. Finally a simple way to get rid of open moc-files that trigger this window over and over again:-) Task-number: QTCREATORBUG-7360 Change-Id: I7a373ed60d85d810caf6604bc7dae7bb7fa186a9 Reviewed-by: Daniel Teske <daniel.teske@digia.com> 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-5/+5
| | | | | | | | 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>
* Merge remote-tracking branch 'origin/2.4'Eike Ziller2011-11-111-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/libs/qmljs/qmljsinterpreter.cpp src/libs/qmljs/qmljsinterpreter.h src/plugins/debugger/qml/scriptconsole.cpp src/plugins/git/gitplugin.cpp src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas.cpp src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas_p.h Change-Id: Iad59c8d87c72a21c79c047e374c0ab689998af39
| * 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>
* | add keyboard accelerators to the "file deleted" prompt message boxJoerg Bornemann2011-11-101-3/+3
|/ | | | | Change-Id: Ifaa790abd795ab3922ad354cd676770ab18c2805 Reviewed-by: hjk <qthjk@ovi.com>
* Fix/add copyright headersTobias Hunger2011-05-061-1/+1
| | | | Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
* Handle internally triggered deletes more gracefulldt_2011-04-271-3/+7
| | | | | | | If the user has enabled "Reload unmodified" then on remove the unmodified editors are closed. Otherwise the user is asked as before. Also modify the message to indicate if the change was triggred externally.
* Update license.hjk2011-04-131-14/+13
|
* It's 2011 now.con2011-01-121-1/+1
| | | | Reviewed-by: hjk
* License headers.con2010-12-171-7/+11
|
* Don't show the full file name in the reload prompt by default.con2010-06-301-7/+13
| | | | | | | Because paths can get long, and text wrapping in QMessageBox will do the wrong thing. Put the full file name into the details of the message box. Task-number: QTCREATORBUG-1708
* Refactor the externally modified file handlingcon2010-03-221-1/+27
| | | | Reviewed-by: dt
* Long live the king!hjk2010-03-051-1/+1
|
* Rename namespace Core::Utils into UtilsFriedemann Kleint2009-10-051-9/+8
| | | | | Also move Designer::Internal::FormWindowEditor -> Designer::FormWindowEditor.
* AlienDirSeparatorsOnWindows--Alessandro Portale2009-09-011-2/+3
| | | | Reviewed-by: Trustme
* long live the kinghjk2009-08-141-1/+1
|
* Add option to select behavior on externally changed files.Henrik Abelsson2009-07-131-3/+10
| | | | | Merge-request: 840 Reviewed-by: Thorbjørn Lindeijer <thorbjorn.lindeijer@nokia.com>
* Update license headers and sales contact details.Jason McDonald2009-06-171-2/+2
| | | | Reviewed-by: Trust Me
* Fixed translation glitches.Friedemann Kleint2009-05-131-3/+5
|
* Rename QWORKBENCH_UTILS_EXPORT to QTCREATOR_UTILS_EXPORTAlessandro Portale2009-05-081-2/+2
| | | | Rename QWORKBENCH_UTILS_LIBRARY to QTCREATOR_UTILS_LIBRARY
* Fixes: change file license headers to include LGPLhjk2009-02-251-21/+17
|
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-22 05:51:45 +0000