Commit Graph

125 Commits

Author SHA1 Message Date
Eike Ziller
0be914853b Use IDE_ID for user resource path
We should not share these settings with a different IDE_ID

Change-Id: If50102606722f40ab64c9c7fe01c74a9f0dda06e
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-01-10 15:36:36 +00:00
Eike Ziller
7b6943e578 Add "Remove File" to file system view
Task-number: QTCREATORBUG-19208
Change-Id: Iacf1e1468018fa8dd3426bc1325f36bb39a4b4e2
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-12-12 10:50:29 +00:00
hjk
cdaa4aee1a Add some mechanism to help screenshot creation
If QTC_SCREENSHOTS_PATH points to a writable directory, each widget that
has been registered with ICore's setupScreenShooter(const QString &name,
QWidget *w) will dump a screen shot to this directory as soon as the
widget is shown.

Change-Id: I2dec12064f1bb3c510d2fd9d27c1b79f7b7d5f30
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2017-11-16 10:28:49 +00:00
Tobias Hunger
4ef01c961e app_version.h: Make IDE name configurable
Change-Id: I993f452c8d09cf89e9a2958fc8e36b7d2c17ee6f
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-09-05 10:19:48 +00:00
Eike Ziller
1891af4b07 Specify Qt Creator's "display version" in qtcreator.pri/qtc.qbs
Currently it is set by passing defines to qmake, which complicates
package build setups.
Set the display version where the numerical version is defined. This
also makes it available to developer builds. Also switch around the
display version and numerical version in the about dialog, since e.g.
"4.3.0-rc1" is more descriptive than "4.2.83".

Change-Id: I26dda427975acdc6cc169f8d625f57918167cf19
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-04-21 13:28:54 +00:00
Orgad Shaneh
530c248051 Core: Fix compiler display name for MSVC2017
Change-Id: I0a0a6e2899373241dac0cdec5154ea7f22efd0c2
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-04-18 08:43:13 +00:00
Eike Ziller
36b443dfba Add defines for relative data paths
Derive the relative paths used in code from the paths used by the build
system.

Change-Id: I208ee55d3c1ee76921734f5c1c6c40d3fcb9724c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-12-01 14:24:53 +00:00
Eike Ziller
94a58b4653 File > New: Bring existing dialog to foreground
Task-number: QTCREATORBUG-16932
Change-Id: I1a90ab01825b5cd2f439395cbdf4400075943dc4
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-09-30 08:16:55 +00:00
Eike Ziller
79be19a8a0 ICore: Make sure main window is initialized
Initialize main window even if no ICore instance is created, so in that
case methods like raiseWindow and dialogParent will still work.

Change-Id: I7b435dedac574bcc120e996c198c413fd5ccfe6f
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-09-30 08:16:47 +00:00
Eike Ziller
9c9485e15b ICore: Remove unused methods
Some didn't even have implementations anymore

Change-Id: I376cb12006c9b3ec8f6b2a75c38275cd92d2bbf6
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-09-30 08:16:41 +00:00
Eike Ziller
b554829fd8 Core: Fix that core settings like shortcuts were only saved at shutdown
Save them also whenever a settings save is requested, which e.g. also
happens when closing the options dialog.

Change-Id: Ic20f1007381a4d0a8157f17fd24c0d8ea24907ee
Task-number: QTCREATORBUG-16576
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-09-12 07:10:12 +00:00
Eike Ziller
0e542a6a29 Fix build
Change-Id: Ie23ae9e462dff66206759bacda13876dce8264a0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-09-06 08:18:11 +00:00
Eike Ziller
f38531effb Add a menu entry for copying system information
Which outputs the information from qtdiag, installed plugins,
and general Qt Creator build information.

Task-number: QTCREATORBUG-16135
Change-Id: I618b9883369bae45006bb109f8757e89b091b882
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-09-05 13:00:54 +00:00
Orgad Shaneh
5646480f27 Core: Use Qt5-style connects
The heavy lifting was done by clazy.

Change-Id: I2dde14919d917816d02117338205f8f861d8af0a
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-02-03 07:54:02 +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
Eike Ziller
98257617e9 Merge remote-tracking branch 'origin/3.6'
Conflicts:
	src/plugins/clangcodemodel/clangassistproposalmodel.cpp
	src/plugins/clangcodemodel/clangassistproposalmodel.h

Change-Id: Iba30d2f4d95fa0f551afe58890d15f5835dfb715
2016-01-19 16:41:17 +01:00
Friedemann Kleint
01f144d514 Fix display of MSVC2015 in compilerString().
Display values of _MSC_VER >= 1900 (currently displayed as MSVC 2014)
as MSVC2015 and larger values as unknown.

Change-Id: Id23b0f9342e6ad6d776bb44743e5e4ce91462c8f
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-01-19 14:29:53 +00:00
hjk
e6a98f368e Core: Replace ICoreListener by std::functions
ICoreListener::coreAboutToClose() remains in the core,
ICoreListener::editorAboutToClose() is handled by a new
EditorManager::addCloseEditorListener() function.

This removes the need for some boiler plate code resulting
from the need to implement the interface in custom classes
(DesignModeCoreListener, EditorClosingCoreListener,
PojectEplorer::CoreListener and VcsBase::CoreListener).

EditorManager::addCloseEditorListener

Change-Id: Ie554c987b5455b555be6d77b77e4013639201d22
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-11-04 17:52:20 +00:00
Eike Ziller
9a69a05f9b Core: Allow adding additional information to about dialog.
Purpose is to get rid of hard coded license information string in the Qt
Creator binary.

Change-Id: I867e2aed010f8a622adfbb89ac96dccbc8229161
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-10-09 08:35:12 +00:00
Eike Ziller
6ed775f56a Fix wrong context help if tool tip was not shown for focus widget
The tool tip never has focus, so it cannot become the IContext that is
checked for context help. So, integrate the help id into Utils::ToolTip
and check the tool tip first when checking for context help.
As a side effect the [F1] button and help id for the tool tip is now also
available for use outside of the text editors.

Task-number: QTCREATORBUG-5345
Change-Id: Id975703caf161d1183c247e8ad8bb693b90fd306
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-09-30 08:25:18 +00:00
Tobias Hunger
819438a37b ICore: Consistently use NewItemDialog to refer to File>New dialog
Change-Id: I28fba1e7cca3f9885d14c6e58d693046a4c0ea33
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-09-24 10:18:54 +00:00
Eike Ziller
972731d42e ICore: Don't split context in contextChanged signal
This way the order of the context doesn't get lost between context from
the focus widget and additional contexts

Change-Id: I371c411a5d9c9f31ae1f8631a6ede4eda100b0c5
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-09-23 09:29:25 +00:00
Eike Ziller
37f6b4397d Merge remote-tracking branch 'origin/3.5'
Change-Id: I1ce0fa92e5c469d591d3030d1a4f168dcee232ba
2015-08-06 11:38:13 +02:00
Nikolai Kosjar
adefa318ae Tests: Emit coreAboutToClose() before exiting
Now address sanitizer will not show false positives.

Change-Id: Ieeb4dc31697920ed1ca542f5647f4cb0b23a29ab
Task-number: QTCREATORBUG-14713
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-08-05 07:38:16 +00:00
Christian Kandeler
6d5a5aff94 Use a proper libexec path for Unix builds.
Change-Id: I036c806af47f07e60408a90d3a4e181a6773f866
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-07-09 09:08:01 +00:00
Eike Ziller
4890307b0c Wizards: Do not crash when dialogs are still open on quit
Change-Id: I49622484e316b902699e5b63ea3eea827d2f2680
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-06-04 14:40:37 +00:00
Tobias Hunger
e2dab7685c Core: Improve dialogParent() to work better with detached windows
Make new windows center on the window the user is currently looking
at instead of the mainwindow.

Change-Id: Ia6246a4f1935b6d2d66db329c6141f4cb8349916
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-06-03 10:25:08 +00:00
Tobias Hunger
7e41b40c91 Wizards: Treat running wizards in the same way as a running NewDialog
That is block the New file or project action.

Change-Id: Ic7bb6013fce02fdcdd5c86b70ba5428218597a40
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-06-03 08:07:29 +00:00
Tobias Hunger
47660a8f09 NewDialog: Keep information on whether the dialog is open or not
Keep that information in the NewDialog instead of ICore.

Change-Id: I3e351251be6c4927b80a22db175ed79cb1f24621
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-06-01 14:47:30 +00:00
Tobias Hunger
c0952e22f7 ICore: Move handling of New File/Project dialog into ICore
ICore only used to pass this on to MainWindow.

Change-Id: I3c4a214330713928a50a291e3c5c6624310db03a
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-06-01 12:56:32 +00:00
Tobias Hunger
25f2f8e1ee IWizardFactory: Create wizards with factoryCreators
Do not use the object pool to hold potential wizards. Register
FactoryCreator functions with IWizardFactory instead and use
those to create the wizards when necessary.

This saves us a couple of cycles during startup since we can now
delay construction of all wizards and it makes us more flexible
wrt. managing the lifecycle of the wizard factories.

Change-Id: I95d6a6dfcdf0fd995e1934a9fefcd96c6a676753
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-05-26 11:47:53 +00:00
hjk
592ffe7377 SettingsDialog: Remove CategoryId parameter from callers
PageIds are supposed to be unique, so the CategoryId can be determined
from the PageId. Look for PageIds in the already expanded categories
first before searching through expensive categories.

Change-Id: I006beb0df6183453163ac1810fe59a306a0f52b1
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-02-24 13:52:00 +00:00
Eike Ziller
5a3a940ad3 Use new mime database
Change-Id: I4305872b6b11ef3e8a364280ffa5209a5a793600
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-02-17 13:00:07 +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
Orgad Shaneh
428565cb02 Core: Remove unneeded qualifications
Mostly done using the following ruby script:
Dir.glob('**/*.cpp').each { |file|
  next if file =~ %r{src/shared/qbs|/qmljs/}
  s = File.read(file)
  s.scan(/^using namespace (.*);$/) {
    ns = $1
    t = s.gsub(/^(.*)\b#{ns}::((?!Const)[A-Z])/) { |m|
      before = $1
      char = $2
      if before =~ /"|\/\/|\\|using|SIGNAL|SLOT|Q_/
        m
      else
        before + char
      end
    }
    if t != s
      puts file
      File.open(file, 'w').write(t)
    end
  }
}

Change-Id: I5c6690f51488bf8ca3610ba9fb11e6e5fd814aaa
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-02-06 09:06:18 +00: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
d52bb24e39 Revert "Add Qt build date to about dialog"
For whatever reason that only worked for local builds,
but not the packages.
This reverts commit ab83c30f87.

Change-Id: I8225e1bdd22489b619ce546ecccba420424f9880
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
2014-11-20 16:06:52 +01:00
Eike Ziller
ab83c30f87 Add Qt build date to about dialog
Change-Id: I8fd680ba5436c0b854385910b2977db7b5ebc97a
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-11-20 09:58:19 +01:00
Orgad Shaneh
aee3c2f531 Core: Introduce ICore::{add,remove}AdditionalContext
Simplify single operation

Change-Id: I172b9dfe8f97324d931d4f332ac1609d230e3400
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-11-17 10:08:28 +01:00
hjk
a439483d70 Use QFileInfo::exist(f) instead of QFileInfo(f).exists() if possible
Faster.

Change-Id: I91aa67462e11ff3258600d7f158de79942d0dc81
Reviewed-by: Marc Reilly <marc.reilly@gmail.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-11-03 09:31:28 +01:00
Eike Ziller
8295b503be License update
Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-10-09 11:41:44 +02:00
Eike Ziller
fe5b3a39e8 Core: Refactor handling of "window state" actions out of MainWindow
Currently the actions for fullscreen, minimize and zoom only apply to
the main window, even if a different window is active.
Refactor the handling of these actions into a WindowSupport class, and
use that instead for the main window. In a second step, this will be
used to add the functionality to the corresponding external windows
(e.g. help and editor windows)

Change-Id: Ief2c880f40948c3bb724196d6e0cfe888b8ece89
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-07-18 08:55:45 +02:00
Eike Ziller
5b3bb398ba Run "New ..." dialog as non-blocking, stay-on-top.
Task-number: QTCREATORBUG-6102
Change-Id: I384c37e5867ce1cbd6127e96c49cb7790298713c
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-07-02 09:57:11 +02:00
Tobias Hunger
43735f28dd Core: Add method to get the tooltip for the showOptionsDialog
Change-Id: Icf473145f615f8ea80887f9620ca95af812d0c98
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-06-23 14:58:59 +02:00
Tobias Hunger
a8e8910130 IWizard->IWizardFactory
Start at splitting up the wizard functionality a bit. Currently
it is a factory but also contains a lot of logic that is invoked by
the real wizard dialogs.

This change renames/moves a couple of things only.

Change-Id: I1fa114ee3ee262f7c0690841f361bbf09e674725
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-05-26 11:42:03 +02:00
Eike Ziller
d52ee686d1 Save settings less aggressively.
Remove saving settings on auto-save, and only save settings when
switching away from projects mode, instead of any mode switch.

Change-Id: I3369b7f5ee785467d57c47e1a194a8ef989b98fb
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-03-07 15:52:04 +01:00
hjk
7f76ef3b18 Core: Remove settings accessor indirection via MainWindow
Change-Id: I2ece1fb47eb48c4e56561ed2c947dc1c997af344
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-03-05 12:42:56 +01:00
Eike Ziller
4251265a63 Unify text on buttons that open the options dialog
We have many buttons that open the options dialog, and many of these use
different terms.

Change-Id: I073fe2a23569c6f4174a2fb6567359c89cb2427c
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-02-25 16:55:25 +01:00
Robert Loehning
746c5d8863 Incremented year in copyright info
Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-01-08 08:29:47 +01:00
hjk
178bf93d15 Core: Add ICore::dialogParent() specific for use as dialog parent
Change-Id: I72dca0f95b418a32ac3859f086053f91b9e9ec67
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2014-01-06 12:39:21 +01:00