summaryrefslogtreecommitdiff
path: root/src/plugins/bazaar/bazaarplugin.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Bzr: add support for "uncommit" commandHugues Delorme2013-12-111-0/+18
| | | | | | | | | 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>
* DVCS: Never prompt before committingOrgad Shaneh2013-10-111-1/+1
| | | | | | | Commit is local. There's no reason to prompt. Change-Id: I3aed5ad4931bc49c62d52f906100273739f4af89 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* EditorManager: Use interface directly instead of going through ICorehjk2013-08-301-1/+1
| | | | | | | | 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>
* VCS: Use correct output styleOrgad Shaneh2013-08-121-1/+1
| | | | | Change-Id: I95ea8078ae53e7339213765fbb8a79bff33f899c Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Move displayName from IEditor to IDocumentEike Ziller2013-07-101-1/+1
| | | | | | | | The display name is not editor instance specific, but belongs to the document. Change-Id: I3c936f04a86e10e6ca30063d85036d85b4b5880e Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Rename IDocument::fileName --> filePathEike Ziller2013-07-091-1/+1
| | | | | | | That is what it actually is, wrt how Qt API calls it. Change-Id: Ied02055debf6aad75556b0d9d22e8ba2f72be555 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Switch less often to edit modeEike Ziller2013-06-051-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | 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>
* VCS: Fix testsOrgad Shaneh2013-05-271-2/+2
| | | | | | | Some editors were removed, adapt indices Change-Id: I87ab8c3aa8c6e9ccad494527ec93a171f90ecf83 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* VCS: Remove unused editorsOrgad Shaneh2013-05-241-12/+5
| | | | | Change-Id: Ia931fdd07d7cf1984f34b10c9b4c20a414c93d9e Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* VCS: Remove unused extension parameter from editorsOrgad Shaneh2013-05-241-8/+4
| | | | | Change-Id: I17e73e269698af0d515f668d3c272a748cdca3bb Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* VCS: Remove redundant calls to default constructorOrgad Shaneh2013-04-221-2/+1
| | | | | Change-Id: I4521e26e72c85e896e58e4d9d129f92b2d80f869 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* VCS: Clean up submit editor handlingEike Ziller2013-04-191-8/+9
| | | | | | | | | | | 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>
* Clean headers in Bazaar.Friedemann Kleint2013-04-051-4/+0
| | | | | | | | 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>
* Vcs: Construct Core::Id directly for submit editorhjk2013-03-211-1/+1
| | | | | Change-Id: I21ca57fa6b73887dfc88b31240096b0851d53cae Reviewed-by: Tobias Hunger <tobias.hunger@digia.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>
* | VCS: Use entries combobox for logOrgad Shaneh2013-01-301-0/+24
| | | | | | | | | | | | | | Tests included Change-Id: Ibe2f6ece207128f8467b0cbca9dc38f2bcd5ced6 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | VCS: Un-static testDiffFileResolvingOrgad Shaneh2013-01-301-1/+1
| | | | | | | | | | Change-Id: I43c40585e5ac50369422d78f74240d7249be95ae Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | VCS: Refactor fileNameFromDiffSpecificationOrgad Shaneh2013-01-211-0/+35
| | | | | | | | | | | | | | | | | | 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>
* | CommandLocator: use Id instead of QString.hjk2013-01-181-1/+1
| | | | | | | | | | | | | | | | 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>
* | Git: Pass rows instead of files for diffSelectedFilesOrgad Shaneh2013-01-111-1/+2
|/ | | | | | | | | | 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>
* Adjust license headershjk2012-10-051-21/+19
| | | | | Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Mercurial/Bazaar: Make commit work on windowsTobias Hunger2012-09-271-34/+14
| | | | | | | | | | 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>
* rename QtDebug to QDebughjk2012-08-061-1/+1
| | | | | | | More uniform. Change-Id: I1c6057981f4c2b3170a4e69f0674fe4caf1143a2 Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
* Contact -> qt-project.orgEike Ziller2012-07-191-3/+1
| | | | | Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Add ActionContainer::addSeparator(...)Eike Ziller2012-06-051-11/+4
| | | | | | | Gets rid of a lot of code duplication. Change-Id: I2ce38fb38a0b61cb821e0bdc7bcc9a7ccdf9da72 Reviewed-by: hjk <qthjk@ovi.com>
* ActionManager API cleanup.Eike Ziller2012-05-251-25/+23
| | | | | | | | d-pointer instead of inheritance static methods Change-Id: I7b2f0c8b05ad3951e1ff26a7d4e08e195d2dd258 Reviewed-by: hjk <qthjk@ovi.com>
* Get rid of lots of ifdef Q_OS_MAC for shortcuts.Eike Ziller2012-05-231-20/+4
| | | | | | | Using a central enum now. Change-Id: I20d88c9a3f8c62cf33e4b89a3442269f71918b06 Reviewed-by: hjk <qthjk@ovi.com>
* Mac: Avoid Alt+<character> shortcutsEike Ziller2012-05-221-0/+16
| | | | | | | | 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>
* editormanager: simplify use of interfacehjk2012-05-111-3/+3
| | | | | | | Less code on the user side, same meaning. Change-Id: I14e54a5d2ed8e024a51cce74eaf7c8419ad544be Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Rename IFile->IDocument and FileManager->DocumentManagerEike Ziller2012-02-201-5/+5
| | | | | | | | 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>
* Removed module names from #include directives.Erik Verbruggen2012-02-151-10/+10
| | | | | | | | Getting the #include directives ready for Qt5. This includes the new-project wizards. Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Version control: Compile with QT_NO_CAST_FROM_ASCII.Friedemann Kleint2012-01-311-2/+2
| | | | | Change-Id: I85c007045efdb207f397b42fbce7a554ac9c9819 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* Core::Filemanager: make some methods statichjk2012-01-251-1/+1
| | | | | | | This follows suit to the ICore changes. Change-Id: Iba2de1b1e3f2574fd1459892eae702e6af1cc7dc Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* Use new static ICore interface.hjk2012-01-241-7/+5
| | | | | Change-Id: I9b690d9b150c8d162b15370f9f8986267c9128f1 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* vcs: s/VCS/Vcs/hjk2012-01-091-38/+38
| | | | | | | | According to style guide. Change-Id: I05c1d4f50ddbf2876ab7e0835f4abec95fd573b2 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
* VCS: auto-completion in the description text editHugues Delorme2011-12-081-1/+2
| | | | | | | | | | 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>
* Bazaar,Mercurial: fix update of the commit buttonHugues Delorme2011-11-231-5/+5
| | | | | | | | | | | | | | | 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>
* Bazaar: whitespace and indentation fixesHugues Delorme2011-11-141-10/+10
| | | | | Change-Id: I31258a10bd79a047f25787d38c070b0c95ed9f78 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* Bazaar: rename mistyped local variableHugues Delorme2011-11-141-5/+5
| | | | | | | | 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>
* 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>
* vcsbase: throw away VCSJobRunner, replaced by GitCommandcerf2011-10-051-1/+0
| | | | | | | | | | | | 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
* Bazaar: fix whitespacescerf2011-09-211-2/+2
| | | | | | | | | 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>
* vcsbase: add mechanism to ease management of VCS settingscerf2011-09-141-5/+5
| | | | | | | | | | | | | | | | | | Management of VCS settings was rather laborious (see BazaarSettings, GitSettings, ...). To overcome this, the base class VCSBaseClientSettings is now equipped with a mechanism factorizing redundant code for VCS settings, like operator=(), operator==(), writeSettings(), ... Heir classes of VCSBaseClientSettings only need to declare the settings (key + default value). Bazaar and Mercurial plugins are impacted. Change-Id: I7e4093a6d9476f3c8954f4d104f1b26ac185beb9 Merge-request: 2204 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com> Reviewed-on: http://codereview.qt-project.org/4889 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* use Core::Id for IEditorFactory::idhjk2011-09-081-1/+1
| | | | | | Change-Id: Iefd67a0461d9016b8ba0f3371df7ec6d42e188c5 Reviewed-on: http://codereview.qt-project.org/4321 Reviewed-by: hjk <qthjk@ovi.com>
* core: rename uniqueidmanager.{cpp,h} as the class UniqueIdManager is gonehjk2011-09-051-1/+1
| | | | | | | Change-Id: Iffe04bc3bb0103cbac605f0734bbfd66eb7fd854 Reviewed-on: http://codereview.qt.nokia.com/4215 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: hjk <qthjk@ovi.com>
* vcsbase: refactor status output signal in VCSBaseClientcerf2011-08-221-1/+2
| | | | | | | | | | There is now a clear distinction between the basic status command and the status command used to emit parsed output Change-Id: Ie398a866ffcd8f4cc33b864ddbe23ce9d2e97437 Merge-request: 358 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com> Reviewed-on: http://codereview.qt.nokia.com/3337
* vcsbase: rename slot VCSBaseClient::settingsChanged()cerf2011-08-221-1/+1
| | | | | | | | | | | Rename VCSBaseClient::settingsChanged() to handleSettingsChanged(). This avoids confusion with a signal (note : Bazaar and Mercurial plugins are impacted) Change-Id: I8afd8d60be300088081338a4ed682c2760ba42eb Merge-request: 358 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com> Reviewed-on: http://codereview.qt.nokia.com/3336
* vcsbase: refactor status parsing in VCSBaseClientcerf2011-08-221-5/+5
| | | | | | | | | This impacts Bazaar and Mercurial plugins Change-Id: Ife1e83083b268e597928fbae30378e488e31ee96 Merge-request: 358 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com> Reviewed-on: http://codereview.qt.nokia.com/3335
* vcsbase: auto save settings when requested by Core::ICorecerf2011-06-231-2/+1
| | | | | | | | | | Bazaar and Mercurial plugins are impacted Change-Id: Ia781dae79983350d773f454de32f812e876bfbfb Merge-request: 350 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com> Reviewed-on: http://codereview.qt.nokia.com/645 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
View Lorry Controller Status