Commit Graph

78 Commits

Author SHA1 Message Date
hjk
d1a8347e65 Vcs: Denoise *plugin.cpp and reduces scope of constants
Change-Id: If2eb34e8975cca46a52c61d902b89a5f99c757a5
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-07-28 18:33:15 +02:00
hjk
2bf4d7c3da Bazaar: Code style
Change-Id: I0c2281703d4708bf07702d9d2fc148842489bb04
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-07-22 13:57:27 +02:00
Robert Loehning
3c7f5c08bd Bazaar: Assign parent to dialogs
Change-Id: I3bbcd289c06932b2031d08e13e5378010acd58a9
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Hugues Delorme <delorme.hugues@fougsys.fr>
2014-06-18 15:40:46 +02:00
Tobias Hunger
67c2c77a99 Vcs: Append "Factory" to the variaus checkout wizards
Change-Id: I571717a389c63f4f0371570e22d3f2a834e8b900
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-05-26 11:43:48 +02:00
hjk
4d96fa7aba Core: Merge Find and Locator into Core plugin
Change-Id: I7053310272235d854c9f409670ff52a10a7add8b
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-01-14 07:43:00 +01:00
Eike Ziller
236ea9efb9 Merge remote-tracking branch 'origin/3.0'
Conflicts:
	share/qtcreator/debugger/dumper.cpp
	share/qtcreator/debugger/dumper_p.h
	share/qtcreator/debugger/test/main.cpp
	src/plugins/debugger/gdb/classicgdbengine.cpp
	src/plugins/debugger/gdb/pythongdbengine.cpp
	src/plugins/debugger/lldblib/guest/lldbengineguest.cpp
	src/plugins/debugger/lldblib/guest/lldbengineguest.h
	src/plugins/debugger/lldblib/guest/main.cpp
	src/plugins/debugger/lldblib/ipcengineguest.cpp
	src/plugins/debugger/lldblib/ipcengineguest.h
	src/plugins/debugger/lldblib/ipcenginehost.cpp
	src/plugins/debugger/lldblib/ipcenginehost.h
	src/plugins/debugger/lldblib/lldbenginehost.cpp
	src/plugins/debugger/lldblib/lldboptionspage.cpp
	src/plugins/qbsprojectmanager/qbsstep.cpp
	src/plugins/qbsprojectmanager/qbsstep.h
	src/plugins/qmlprofiler/canvas/qdeclarativecanvas.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativecanvas_p.h
	src/plugins/qmlprofiler/canvas/qdeclarativecontext2d.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativecontext2d_p.h
	src/plugins/qmlprofiler/canvas/qmlprofilercanvas.cpp
	src/plugins/qnx/blackberrycheckdevmodestep.cpp
	src/plugins/qtsupport/debugginghelper.cpp

Change-Id: Ie9fd0a885fb6264a6a8a72daee071b75bcbd2e9d
2014-01-08 11:01:06 +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
Hugues Delorme
e922cd234b Bzr: add support for "uncommit" command
All "bzr uncommit" options are supported, even --dry-run (allowing
user to check the green light)

Change-Id: Ib97ef1333709ad18be53c658c23c97356e4e4ce0
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-12-11 15:35:06 +01:00
Orgad Shaneh
b034b0b955 DVCS: Never prompt before committing
Commit is local. There's no reason to prompt.

Change-Id: I3aed5ad4931bc49c62d52f906100273739f4af89
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-10-11 16:40:56 +02:00
hjk
eb724f3772 EditorManager: Use interface directly instead of going through ICore
In the majority of cases we were doing that anyways, having two
ways is just needlessly confusing.

Change-Id: Ied362a702c23beee528368d74df1f2aabe5807f8
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-30 11:25:51 +02:00
Orgad Shaneh
b0d14c79fe VCS: Use correct output style
Change-Id: I95ea8078ae53e7339213765fbb8a79bff33f899c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-12 12:42:11 +02:00
Eike Ziller
113c5600c9 Move displayName from IEditor to IDocument
The display name is not editor instance specific, but belongs to the
document.

Change-Id: I3c936f04a86e10e6ca30063d85036d85b4b5880e
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-07-10 17:26:15 +02:00
Eike Ziller
dd43d9908f Rename IDocument::fileName --> filePath
That is what it actually is, wrt how Qt API calls it.

Change-Id: Ied02055debf6aad75556b0d9d22e8ba2f72be555
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-09 13:51:42 +02:00
Eike Ziller
7c8db79817 Switch less often to edit mode
This change
* Removes IMode::type, ModeManager::activateModeType, and
  IEditor::preferredModeType, and adds IEditor::isDesignModePreferred
  instead
* Adapts the mode switching code in EditorManager to handle multiple
  windows, for example switching to edit mode should only happen if
  the editor/view is in the main window. Otherwise the editor window
  should be raised and focused
* Renames EditorManager::NoActivate --> DoNotChangeCurrentEditor
* Reverts the EditorManager::ModeSwitch logic to switch mode or
  make the current editor visible by default, introducing
  DoNotMakeVisible flag instead
* Fixes a few instances where EditorManager::ModeSwitch should have been
  used

One non-trivial problem left: If you open a .ui file and switch to an
external editor window, edit mode is activated, because the current
editor no longer is a .ui file, which means that the design mode gets
deactivated.

Change-Id: I76c5c2391eb4090143b778fb103acff3a5a1ff41
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-06-05 09:43:14 +02:00
Orgad Shaneh
64fe884bbc VCS: Fix tests
Some editors were removed, adapt indices

Change-Id: I87ab8c3aa8c6e9ccad494527ec93a171f90ecf83
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-27 17:45:32 +02:00
Orgad Shaneh
94148f22e9 VCS: Remove unused editors
Change-Id: Ia931fdd07d7cf1984f34b10c9b4c20a414c93d9e
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-24 12:29:11 +02:00
Orgad Shaneh
fd48f081c6 VCS: Remove unused extension parameter from editors
Change-Id: I17e73e269698af0d515f668d3c272a748cdca3bb
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-24 12:21:26 +02:00
Orgad Shaneh
83b57eda89 VCS: Remove redundant calls to default constructor
Change-Id: I4521e26e72c85e896e58e4d9d129f92b2d80f869
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-22 09:29:12 +02:00
Eike Ziller
e31575a493 VCS: Clean up submit editor handling
It was not possible to simultaneously open two commit editors for
different version control systems, also there was no reason to scan all
open editors for the submit editor, since the plugins can just remember
the editor that they opened.

Change-Id: I1bea6ece3cd6faa1ecc0566bdd6f5fb10c816963
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-04-19 16:21:06 +02:00
Friedemann Kleint
9528671f42 Clean headers in Bazaar.
Ran script to remove inludes on a trial-and-error basis and
manually corrected it.

Change-Id: I004d756b351c3fdd9d13367627b1345f3efa7f2a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-05 11:19:36 +02:00
hjk
2cea4c6f80 Vcs: Construct Core::Id directly for submit editor
Change-Id: I21ca57fa6b73887dfc88b31240096b0851d53cae
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-03-21 13:13:35 +01:00
Oswald Buddenhagen
1fda2111d4 Merge remote-tracking branch 'origin/2.6'
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
2013-01-31 16:25:33 +01:00
Orgad Shaneh
7cb80f0e16 VCS: Use entries combobox for log
Tests included

Change-Id: Ibe2f6ece207128f8467b0cbca9dc38f2bcd5ced6
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-01-30 10:26:31 +01:00
Orgad Shaneh
ea33bed564 VCS: Un-static testDiffFileResolving
Change-Id: I43c40585e5ac50369422d78f74240d7249be95ae
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-01-30 10:26:07 +01:00
Robert Loehning
298531e370 Incremented year in copyright info
Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-01-29 16:27:03 +01:00
Orgad Shaneh
7b39f41c05 VCS: Refactor fileNameFromDiffSpecification
Use diff file pattern to match file name. Avoid duplication.

Include unit tests for Git

Change-Id: Ib68a08368270a27976a3e16bdd1cb219a52b8889
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-01-21 12:19:55 +01:00
hjk
7fafeaa513 CommandLocator: use Id instead of QString.
There seems to be still disagreement in the code what the
individual parameters are meant for.

Change-Id: I9c51e6ee9cc8fd1a55d202b8131027de1ef812a0
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-01-18 15:56:23 +01:00
Orgad Shaneh
76f6729892 Git: Pass rows instead of files for diffSelectedFiles
Useful when the same file can appear more than once
(e.g. staged + modified)

Task-number: QTCREATORBUG-5347
Change-Id: I3ce716c22840c149490e00e6948612607ae57159
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-01-11 13:13:39 +01:00
hjk
386ca7c8dd Adjust license headers
Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-10-05 17:12:56 +02:00
Tobias Hunger
917517cd37 Mercurial/Bazaar: Make commit work on windows
Do not keep an open file around when passing the file name to the
editor. The editor won't be able to save on windows since the file
is locked.

Task-number: QTCREATORBUG-5972
Change-Id: Ib424c76d2e3e57d43fdc1e1c222dbeb148669038
Reviewed-by: Hugues Delorme <delorme.hugues@fougsys.fr>
2012-09-27 11:49:54 +02:00
hjk
6a7cf405bd rename QtDebug to QDebug
More uniform.

Change-Id: I1c6057981f4c2b3170a4e69f0674fe4caf1143a2
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
2012-08-06 14:55:08 +02:00
Eike Ziller
e0e8cf3ada Contact -> qt-project.org
Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-07-19 13:23:21 +02:00
Eike Ziller
cdd44befff Add ActionContainer::addSeparator(...)
Gets rid of a lot of code duplication.

Change-Id: I2ce38fb38a0b61cb821e0bdc7bcc9a7ccdf9da72
Reviewed-by: hjk <qthjk@ovi.com>
2012-06-05 15:19:30 +02:00
Eike Ziller
3934347fe9 ActionManager API cleanup.
d-pointer instead of inheritance
static methods

Change-Id: I7b2f0c8b05ad3951e1ff26a7d4e08e195d2dd258
Reviewed-by: hjk <qthjk@ovi.com>
2012-05-25 10:08:24 +02:00
Eike Ziller
1781617f8e Get rid of lots of ifdef Q_OS_MAC for shortcuts.
Using a central enum now.

Change-Id: I20d88c9a3f8c62cf33e4b89a3442269f71918b06
Reviewed-by: hjk <qthjk@ovi.com>
2012-05-23 13:47:13 +02:00
Eike Ziller
48a23cc28b Mac: Avoid Alt+<character> shortcuts
Because these tend to add special characters into the editor instead of
triggering the shortcut. Use Ctrl (aka Qt's Meta) instead.

Change-Id: I5866772baf4550e6d048e4d7252b2899a6d28296
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-05-22 16:48:20 +02:00
hjk
21bf0046c3 editormanager: simplify use of interface
Less code on the user side, same meaning.

Change-Id: I14e54a5d2ed8e024a51cce74eaf7c8419ad544be
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-05-11 13:51:14 +02:00
Eike Ziller
d66acb51d0 Rename IFile->IDocument and FileManager->DocumentManager
And adapt the other API respectively.

Change-Id: I1e04e555409be09242db6890f9e013396f83aeed
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-02-20 13:32:49 +01:00
Erik Verbruggen
3fa55b7ab9 Removed module names from #include directives.
Getting the #include directives ready for Qt5. This includes the
new-project wizards.

Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-02-15 16:24:46 +01:00
Friedemann Kleint
e2ace515e2 Version control: Compile with QT_NO_CAST_FROM_ASCII.
Change-Id: I85c007045efdb207f397b42fbce7a554ac9c9819
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-01-31 11:26:52 +01:00
hjk
21c0cdee40 Core::Filemanager: make some methods static
This follows suit to the ICore changes.

Change-Id: Iba2de1b1e3f2574fd1459892eae702e6af1cc7dc
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-01-25 19:23:11 +01:00
hjk
4a21f0c3c8 Use new static ICore interface.
Change-Id: I9b690d9b150c8d162b15370f9f8986267c9128f1
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-01-24 18:48:47 +01:00
hjk
6681d3edee vcs: s/VCS/Vcs/
According to style guide.

Change-Id: I05c1d4f50ddbf2876ab7e0835f4abec95fd573b2
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
2012-01-09 10:55:41 +01:00
Hugues Delorme
676739a87a VCS: auto-completion in the description text edit
In the description field of the commit editor, class
VCSBaseSubmitEditor provides completion of file names and C++
entities (based on QtCreator's internal C++ code model).

Change-Id: Ie5323714dbf6f6e635953dfbb35596201d86fc37
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-by: Hugues Delorme <delorme.hugues@fougsys.fr>
2011-12-08 14:44:48 +01:00
Hugues Delorme
df058c8027 Bazaar,Mercurial: fix update of the commit button
There was a bug with the initial display of the submit editor.
The submit action was not disabled (description field is empty) and
thus the user was allowed to commit changes without entering a
description. Empty commit message causes error for most VCS (if not all).

Technically, Utils::SubmitEditorWidget::registerActions() must be called
before init of the widget (eg call to BazaarPlugin::setFields()), because
SubmitEditorWidget::updateActions() won't have any chance to be called.

Change-Id: I154d6c807e0943b98abcb6222d8f57ec5421181c
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-by: Bill King <bill.king@nokia.com>
2011-11-23 11:22:21 +01:00
Hugues Delorme
d4a4ca5054 Bazaar: whitespace and indentation fixes
Change-Id: I31258a10bd79a047f25787d38c070b0c95ed9f78
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2011-11-14 10:29:35 +01:00
Hugues Delorme
bbfde648d2 Bazaar: rename mistyped local variable
In function BazaarPlugin::showCommitWidget() variable m_changeLogPattern
is now renamed to changeLogPattern (this is not a class attribute !)

Change-Id: I432bcbc34f922460bf30ea5ed5e8802e12b32e8b
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2011-11-14 10:23:07 +01:00
hjk
31600758de all: s/info@qt.nokia.com/qt-info@nokia.com/
Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-11-03 10:33:19 +01:00
cerf
6a72edb28a vcsbase: throw away VCSJobRunner, replaced by GitCommand
VCSBase::Command was created from GitCommand, it replaces VCSJobRunner.
VCSBase::Command is simpler to use (in VCSBaseClient) and commands
can show up in the progress manager.
From now on, the git plugin can easily rely on vcsbase.

Change-Id: I40593f354249cd94a4c79e90f9bf1362ff3bf5ec
Merge-request: 394
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-on: http://codereview.qt-project.org/6078
2011-10-05 17:33:28 +02:00
cerf
425261d69a Bazaar: fix whitespaces
Merge-request: 2208
Reviewed-by: hjk <qtc-committer@nokia.com>

Change-Id: I4f803ebe6bfc4eda5635c1ee60d7c049d8c70250
Reviewed-on: http://codereview.qt-project.org/5302
Reviewed-by: hjk <qthjk@ovi.com>
2011-09-21 11:45:15 +02:00