At least for the Side-By-Side Diff for now.
Task-number: QTCREATORBUG-11115
Change-Id: Ic7cb91f48ca810a99c39b2d00acc0cf227d051be
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
... if there are other splits that is.
Task-number: QTCREATORBUG-11623
Change-Id: Icb3b1c86c39d88e90916079e8ab347574ae9a361
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This requires moving the activateEditor call into openEditorWithContents.
Remove that line elsewhere when editors are constructed. Keep it when
reusing an existing editor though.
Change-Id: I872f03e16fde42f3b8adec2cf2344b7cc495cd08
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This does not work, it needs to be either:
("%1").arg(n) or ("%n, 0, n)
The %n syntax is preferred here since although there probably
are always > 1 elements, some languages use different grammatical
cases for various numerical ranges (Russian, Polish).
This reverts commit c09e80b853.
Change-Id: Id3f480f0ec0de2dd8893b8de256c5e6c9628a6f9
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reset works on current branch by the contents of another, like Merge and
Rebase.
Change-Id: I904823c177dd3c79ff8e1f49fe32d82be9bb8797
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Conditions:
* There is an active local branch
* The selected node is a leaf
* The selected node is not the active branch
Change-Id: I539dd13750737934378e503484646634e50a1aa7
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
... When a single local branch is being removed
Change-Id: I4321d045ebb6faaf5f864ff33cb4f34c15d2264b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
setPalette() does not replace the old one but rather adds the
difference. Thus a previous copy of the palette is unnecessary.
Change-Id: I5c06da456b76144efc4a984ccda13c7d2243a7bc
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Derivatives need to derive TopicCache, implement its pure virtual
functions and pass it in IVersionControl's constructor.
Change-Id: I3a904c84541fda95eee75296f86441c4bae55d79
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This is used to get a platform-agnostic handle on "command line
arguments". It essentially wraps a single QString on Windows,
and a QStringList everywhere else.
As a consequence, several occurrences of #ifdef Q_OS_*
can be removed from the codebase.
Change-Id: Ic93118c1bd0bce0ebb58f416d395dbaebb861772
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
GitDiffSwitcher operates now on IDocument.
GitDiffHandler operates now on DiffEditorController.
"source" property now attached to editor's document (VcsBasePlugin).
Change-Id: Ie2570a597b8b992ac1dc33b9179eca459c8a751a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Initialization order is important.
* updateCommits populates the LogChangeWidget.
* determineRemoteBranch looks up by earliest commit (for which the
LogChangeWidget must already by populated)
* Assignment to m_suggestedRemoteBranch must come before calling
setRemoteBranches
* remoteComboBox was wrongfully used instead of targetBranchComboBox
Change-Id: Ib0db057313c8fd65910b0ec7394b6b8c7d997dab
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Done using the following ruby script:
Dir.glob('**/*.h').each { |file|
if File.file?(file)
s = File.read(file)
t = s.gsub(/^namespace .+ \{\n\s*class .*;\n\s*\}.*$/) { |m| m.gsub(/\n\s*/, ' ').gsub(/\s*\/\/.*$/, '') }
if t != s
puts file
File.open(file, 'w').write(t)
end
end
}
Change-Id: Iffcb966e90eb8e1a625eccd5dd0b94f000ae368e
Reviewed-by: hjk <hjk121@nokiamail.com>
Show dialog even if there are no local commits in current branch
Change-Id: I11e0c6505981712df51bb33694a6cba9704d7324
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Rename local vars to avoid collision with macros defined in
<sys/sysmacros.h>
Change-Id: I6da7354102cca898d2600296242131e4c343c019
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
It's the preparation for the new UnifiedDiffEditorWidget
Change-Id: I018899017c7e711ea8b04d85f8298b0d73f1cbab
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
For a start, it's a single flag. Will be extended.
Also change the default for includeRemotes to false (most callers pass false)
Change-Id: I969f89a06b85a42c134c0232d2947d58fe19ea0d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Resets the revisions when setting the contents of text editor documents
in general.
Task-number: QTCREATORBUG-11356
Change-Id: I4069d629d8a612d42c7deae707300d50690e2db7
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
