Commit Graph

2048 Commits

Author SHA1 Message Date
Tobias Hunger
3d360653cf Clean headers of the DiffEditor plugin.
Change-Id: I1c49527f010acbece31849127fc4d182678b6f37
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
2015-03-10 14:28:13 +00:00
Orgad Shaneh
478a2e86f9 Git: Support Log for selected commit in git editors
Change-Id: I5081471b3be65de1948d9bfdd52fd812df5e6a7a
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-03-10 13:53:16 +00:00
Orgad Shaneh
690a545f8e Git: Enable different reset types for commits in git editors
Change-Id: I0eafbd3db04a7da4ea85457ae67a940c71b49e9b
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-03-10 13:53:14 +00:00
Orgad Shaneh
94cf79f895 VCS: Add accelerators to context menu entry in editors
Change-Id: I57b89670999d1f4857dcbdf94d8dc1f480e337c1
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-03-10 12:55:29 +00:00
Tobias Hunger
b2b8b867d6 DiffEditor: Refactor the user-facing parts
* Move all data handling into DiffEditorDocument
* Move much of the logic of how to update views into the
  DiffEditor.
* Introduce a base class for the different views on the diff
  to implement.
* Remove DiffEditorGuiController
* Make DiffEditorController smaller and merge the DiffEditorReloader
  into the class
* Simplify communication between the classes involved
* Make much of the implementation private to the plugin

Change-Id: I7ccb9df6061923bcb34cf3090d6d8331895e83c7
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
2015-03-10 10:25:52 +00:00
Orgad Shaneh
9a1c382273 VCS: Remove dead stores
Change-Id: I998e523c76bdc0b76cbc6089092a0dda4812ca16
Reviewed-by: Nikita Baryshnikov <nib952051@gmail.com>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2015-03-08 08:20:28 +00:00
Hugues Delorme
f7bdbc66e0 Vcs: rename overload SubmitEditor::diffSelectedFiles() for rows
-> Renamed to diffSelectedRows()

This allows to use easily Qt5 connects, without ugly casting to
pick the right overload

Change-Id: Ifaa0242febccb4e1aadd53470cc4b3be79b07c18
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
(cherry picked from commit 12fac12e8f)
2015-03-06 08:02:35 +00:00
Friedemann Kleint
54da18eaaa Clean exported headers of the Core plugin.
Change-Id: I26472d568844d5fee62323e01f5c5c12082d5450
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-03-05 07:18:14 +00:00
hjk
7f20035881 Git: Replace two uses of QAction::setData
Change-Id: I540d1fd221cc331c230950cb97848e39780b650c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-03-04 08:23:49 +00:00
Tobias Hunger
bdbe119dbe Git: Remove unnecessary destructor
Change-Id: Ib4041924e1544d1ec2c5837c62c23554c6be0e91
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-03-03 10:20:32 +00:00
Orgad Shaneh
ebfc0c2823 Git: Fix tab order in PushToGerrit
Change-Id: I739c79f5c6d35deb45aea9d4b22c148d5293d163
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-03-02 08:45:29 +00:00
Orgad Shaneh
aee35662a2 Prefix duplicate names in Open Documents to make them unique
If a document has a file name associated with it then the prefix is
composed from path components (subdirectories), starting from the one
where the file is located and going up the parents until the resulting
name becomes unique among other open documents.

If a document doesn't have an associated file name, then a sequential
number (starting from 1) is appended to the display name of the
document.

This feature is useful when working with big projects that have lots
of idendical file names across different subdirectories (e.g.
Makefile.in, main.cpp, etc.) that need to be edited at the same
time. It allows to easily recognize such a file when switching
between documents in the editor, w/o the need to place the
mouse pointer over the name entry to get its full path.

Started-by: Dmitriy Kuminov <coding@dmik.org>
Task-number: QTCREATORBUG-10185
Change-Id: I633ea6d9b9b4fce8b67335dbcce1bda29254efde
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-02-26 14:56:25 +00:00
Friedemann Kleint
fe2addf515 Clean exported headers of the TextEditor plugin.
Change-Id: I1e7dd34ba5a51fb0b34d137dc03add4457b32ed1
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-02-26 13:15:29 +00:00
Friedemann Kleint
d33af01d09 Clean exported headers of the VcsBase plugin.
Change-Id: Ibfe20bc7156e14e33fd0448586f5cc625494e008
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-02-26 10:57:52 +00:00
hjk
7f001dab1b Core: Make Context parameter to registerAction optional
... and default to C_GLOBAL. A rather common case.
Similar for ActionContainer::addSeparator().

Change-Id: I7f9ba573af201c0a472132d5a494ad17cc4175b7
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-02-26 10:09:03 +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
Alessandro Portale
fb567a224d Fix layouts for OSX: Set the obligatory ExpandingFieldsGrow
In Qt Creator, we want line edits to take up the free horizontal
space.

Change-Id: I4ff78035ab2481cc2f944fc02569638f06f0b090
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-02-24 11:45:53 +00:00
Alessandro Portale
cf82da2b91 Gerrit Push Dialog: Let Commits list take the free space
When resizing the dialog, the Commits list should take the free
space.

Change-Id: I6586f43f8f43a4563327867e29630626f4a6e00a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-02-24 10:32:35 +00:00
Tobias Hunger
16f9e10e72 VcsBase: Make the description directly available in Submit Editor
Make the description directly available to subclasses of the submit
editor.

Change-Id: Ieb6f99091fdcb6f794491169e637bec53a04dacb
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-02-20 08:59:27 +00:00
Tobias Hunger
6546a292c2 Gerrit: Properly sort timestamps in Gerrit dialog
Task-number: QTCREATORBUG-13602
Change-Id: Iba4b2d85d6b75752214b4f53684b9e90df9b1b69
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-02-17 13:46:02 +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
Tobias Hunger
956abd2803 DiffEditor: Make DiffEditorDocument internal
Only expose Core::IDocument and keep DiffEditorDocument internal
to the DiffEditor plugin.

Change-Id: If39b82e2f20d40a65284503b4d4fd8dad919ad3a
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-02-16 15:50:16 +00:00
Orgad Shaneh
a260afe004 Gerrit: Place gerrit and origin remotes first
Change-Id: Icf74210934b92c3f794ccc764b8e526d51eafc2b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-02-16 15:29:39 +00:00
Orgad Shaneh
7471187404 Gerrit: List remote branches also for non-fetched remotes
Task-number: QTCREATORBUG-13718
Change-Id: I0259d06f4f06b68af459d747176dc46b14a55008
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-02-16 15:29:25 +00:00
Orgad Shaneh
bd5afaf4c6 Gerrit: Gracefully handle error retrieving branch distance
Change-Id: If4f6babe654a6f667c36ac3afb851b078439d3b6
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-02-16 15:29:21 +00:00
Orgad Shaneh
9fd5c44f4b Gerrit: Simplify loop in setRemoteBranches
Change-Id: I9f32080c15ca48a2eb9feb1693eabcc1d8f20dd5
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-02-16 15:23:24 +00:00
Tobias Hunger
4caee9fcbf Gerrit: Polish push to gerrit dialog
Make the UI a bit nicer and simplify the code to find remotes.

Task-number: QTCREATORBUG-13718
Change-Id: I3b973fee30061232188c9aed3ad95abc8f8f095d
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-02-16 13:31:05 +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
42e0ea62f6 Git: Support stash --keep-index
Task-number: QTCREATORBUG-13587
Change-Id: I23f62b961df73872ae980d95b91a3285c0e367c1
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-02-09 20:59:40 +00:00
Orgad Shaneh
c9df079885 Git: Improve stash
* Use explicit "save" sub-command
* Show output in log window

Change-Id: Icd4a47de2e4548322d1ea06f126d0bd6023e67ee
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-02-09 20:59:35 +00:00
Orgad Shaneh
2a677ce8b3 Git: Save all documents before stash pop
... and refresh the stash dialog

Change-Id: Iba16efc4f612cd1997493206704100ec57493932
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-02-09 20:59:32 +00:00
Orgad Shaneh
15e7446fda Git: Simplify stash
Change-Id: I2df6687d2bc539aa192dff53b4fb7936f20d299f
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-02-09 20:59:29 +00:00
Orgad Shaneh
4f079fe17e Git: Support reverting unmerged files
Change-Id: I8b974cb6ec620b303f9b1918af43e6672460f030
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-02-09 20:58:16 +00:00
Marco Bubke
cda1b6d246 Git: Use Core::AsynchronousMessageBox
Event loops can lead to crashes so it is better to use a dialog which has
not it's own event loop.

Change-Id: Ib703aad698f270b1fa491731adee131ad8b081e6
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-02-09 20:53:14 +00:00
Montel Laurent
250cc0640b Port to new connect api
Change-Id: Ifa29f380789c28cefda5dfdf497df42163fb2f94
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-02-09 16:15:04 +00:00
Orgad Shaneh
10f36eada5 Gerrit: Support cancel in fetch context
Task-number: QTCREATORBUG-9743
Change-Id: Idf77d1d4efa5accb1aa00f61f495a3813704c934
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-02-07 16:42:24 +00:00
Orgad Shaneh
c6ccb096d6 Gerrit: Support cancel in query context
Task-number: QTCREATORBUG-9743
Change-Id: I106fefaee19e7ce39c1a501342d11fdf8d6b0acd
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-02-07 16:42:00 +00:00
Orgad Shaneh
0da9178c3e Gerrit: Fix sorting by change number
Change-Id: I476bcfb38c6c0d48f6ff8102aa8f2876d89d167a
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-02-05 14:09:10 +00:00
Tobias Hunger
2998d33562 Gerrit: Rename member
This is more in line with what we do elsewhere.

Change-Id: If5fb57a498c021c2c2f830d9aaa375bc13afeb19
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-02-04 15:12:25 +00:00
Orgad Shaneh
620d1c36e5 VCS: 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: I061c7bdcade96961aed226a8348f8ab07ee95f5f
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-02-04 13:22:55 +00:00
Orgad Shaneh
8b5dcc13c5 Replace QFileInfo::fileName() with FileName::fileName()
Change-Id: I4852ff215abf25649fc5eac1e922ae901839ca3d
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-01-29 11:15:43 +00:00
Tobias Hunger
0ed08bdfdf Git: De-noise code
Change-Id: Ibcae2f432b3a9262e9c7c23cf2d8f9ca018cd771
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
2015-01-28 13:35:08 +00:00
Tobias Hunger
bdae49c474 DiffEditor: Use Qt5 style connects
Change-Id: I051b2128620bf0317b359852007463c6601ceaca
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
2015-01-28 13:35:05 +00:00
Tobias Hunger
56637a5d25 GitClient: Use Qt5 style connects
Change-Id: Idc7d5d2a52627d8a328c28863bb99174ad0154e5
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-01-27 14:52:45 +00:00
Tobias Hunger
2477df97fe GitEditor: WS only fix
Change-Id: I7426b8d0c09edaa7e2eb7ce58d0cec58e6e90da7
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-01-27 14:23:22 +00:00
Tobias Hunger
d20833364a VcsBaseClient: Fix build on windows
Windows does pick ::log in favor of this->log in the lambda.

Change-Id: Ib3037606dfe70de955b10e69e2bc513b99b82fca
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-01-22 16:03:22 +01:00
Hugues Delorme
4b5d2ccef7 Vcs: in VcsBaseClient use functors to create log/diff parameter widgets
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>
2015-01-22 14:28:35 +01:00
Tobias Hunger
03c9b935de Git: Sprinkle with auto
Change-Id: I13886e17ee49702a69450e0f0b7d161cdfed1385
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-01-22 14:19:09 +01:00
Tobias Hunger
5460250281 VcsBase: Make VcsConfiguration page more dynamic
... again making it more useful for the JSON wizard

Change-Id: Ic7a454c4efc93eb48a44ab2a37ecd39f8c6f3ba7
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-01-21 12:24:11 +01:00
Tobias Hunger
36ff7e4a6b VcsBase: Move vcsconfigurationpage into wizard subfolder
I will try to move all the wizard code that is still relevant there
and then get rid of the rest.

Change-Id: I3963f53fd39ef0f84c71218eb59b05213121cc90
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-01-21 09:23:14 +01:00