- Jun 17, 2013
-
-
Orgad Shaneh authored
Rebase --continue might request an editor, which hangs if run synchronously Change-Id: I28127884408f6f8fbd351bb1024dc8d3c2b339b8 Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
- Jun 11, 2013
-
-
Orgad Shaneh authored
Change-Id: I9ec0ae0ff6a1b70e5d4c322dbf2e53be57e3009f Reviewed-by:
Petar Perisin <petar.perisin@gmail.com> Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
Orgad Shaneh authored
Change-Id: I9d2e9f76a165a57588c29bc1db1a087fc7cb441b Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
Orgad Shaneh authored
Change-Id: I600e939e99de77e92de1ff068a5ebad98eb736ca Reviewed-by:
Petar Perisin <petar.perisin@gmail.com> Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
- Jun 10, 2013
-
-
Petar Perisin authored
This dialog was before, in QtCreator 2.7, used only for show. It was in main git menu, and available always. Although a lot of new options were added to the dialog, I think it is good to get it back to where it was before, so that 2.7 users can find it easier. Also, I prefer this location for it, since it is easier to access here. Change-Id: I510ab0efb081194e70f6297125012034103e13e1 Reviewed-by:
Orgad Shaneh <orgads@gmail.com> Reviewed-by:
Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
- Jun 05, 2013
-
-
Orgad Shaneh authored
Change-Id: I81b52b8f349cfd5e9d67bd48b0be32c48e5b2f8e Reviewed-by:
Petar Perisin <petar.perisin@gmail.com> Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
Orgad Shaneh authored
Change-Id: I99edfed36b12942e64ee1947a46eddd1ca08b9ba Reviewed-by:
Petar Perisin <petar.perisin@gmail.com> Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
Eike Ziller authored
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>
-
jkobus authored
Change-Id: Icc4bb2648fc4e18e95216012ce08365940a80937 Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
- Jun 04, 2013
-
-
Petar Perisin authored
Change-Id: I3b3f72c5699e63f3f273b1564ea0a093b6c9725b Reviewed-by:
Orgad Shaneh <orgads@gmail.com>
-
Petar Perisin authored
Change-Id: I0d5b0eaf562d30f34f01bcf344791a4ce766bdab Reviewed-by:
Orgad Shaneh <orgads@gmail.com> Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
Petar Perisin authored
Change-Id: Ic2243adaa36444099f834676186331927f3f4588 Reviewed-by:
Orgad Shaneh <orgads@gmail.com> Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
- Jun 03, 2013
-
-
Orgad Shaneh authored
* Kate highlighter doesn't have enough colors * It works out of the box only on Windows * New editor support links Change-Id: I09bbaef08574660e535ccb86c2c460d5976fc2e3 Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
- May 31, 2013
-
-
Orgad Shaneh authored
Task-number: QTCREATORBUG-9411 Change-Id: I0bb90e508b78d0e7c7ff86fda72399036ad665ae Reviewed-by:
Christian Stenger <christian.stenger@digia.com>
-
- May 30, 2013
-
-
Petar Perisin authored
for Merge, Rebase, Show, Cherry Pick, Revert and Checkout. Task-number: QTCREATORBUG-9405 Change-Id: I9a10d93382248ca86fe566bf1dccf4d390601aaf Reviewed-by:
Orgad Shaneh <orgads@gmail.com> Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
- May 28, 2013
-
-
Petar Perisin authored
Change-Id: I8462ed07f3d1edce5c7f5ab8c166ce8c68b6d4b3 Reviewed-by:
Orgad Shaneh <orgads@gmail.com>
-
- May 27, 2013
-
-
Orgad Shaneh authored
Change-Id: Ic0d31a1131f559d1dfa2c880d72c68720d378d1f Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
Orgad Shaneh authored
* Replace RebaseManager with ConflictHandler * Store StashGuard in GitClient, allow popping after a whole process is done (e.g. pull with resolved conflicts) Change-Id: I85784f32f515ff896c73f35303c7de26f8006f59 Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
- May 24, 2013
-
-
Orgad Shaneh authored
Change-Id: I52fccf36cca032dda36102d4be2654eb7461de64 Reviewed-by:
Eike Ziller <eike.ziller@digia.com> Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
Orgad Shaneh authored
Change-Id: I37d47c79f0efaf51eb5afd1fe529aacfadff8ee1 Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
Orgad Shaneh authored
Mostly internal mimetypes Change-Id: Ia84206f1334c1f83474cbc307e848719bb98adbc Reviewed-by:
Fawzi Mohamed <fawzi.mohamed@digia.com> Reviewed-by:
Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
Orgad Shaneh authored
Change-Id: I17e73e269698af0d515f668d3c272a748cdca3bb Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
- May 17, 2013
-
-
Orgad Shaneh authored
Change-Id: I0efb368782ffb66cf6b8d39650fe7840c5ef2501 Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
- May 07, 2013
-
-
Petar Perisin authored
In case Working Directory is changed in dialog, use new one for command. Change-Id: Iea2e71d3695fff49a6375d19d723f4d62a092c2f Reviewed-by:
Orgad Shaneh <orgads@gmail.com>
-
- May 06, 2013
-
-
Orgad Shaneh authored
Change-Id: I26cff005974102c037bbbff04b7606e7f8a07b84 Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
Orgad Shaneh authored
Change-Id: I8cb08b0fcba3ddac7223b39b3762ff71e8d61f8c Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
Orgad Shaneh authored
Mostly 3 leading spaces converted to 4 A few other indentation issues Change-Id: Ib0db5925cac4d2999faf5699cd570884cbcd4863 Reviewed-by:
hjk <hjk121@nokiamail.com>
-
- May 04, 2013
-
-
Orgad Shaneh authored
* Enable display of local-only commits * Enable specifying a top commit Change-Id: I0688ba9ac670f709d2044ae2b7bff081fd86c860 Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
Orgad Shaneh authored
Change-Id: Ia2584ff975ed0db614dc878a70ce4adbd5c3ba67 Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
Orgad Shaneh authored
If the rebase succeeds without conflicts, pop Change-Id: I4f0c6ad3061f4f69f7e5c9450f972cce5c15227d Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
- May 02, 2013
-
-
Orgad Shaneh authored
It is used for both input and output, the pointer is assumed to be valid Change-Id: Iad9a82dfb5ea4850584d4da848076699cddd23c2 Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
Orgad Shaneh authored
Change-Id: I900f3dd89eeeac61e29604ac459d36ecc6c0aa8f Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
- Apr 30, 2013
-
-
Orgad Shaneh authored
Change-Id: Ibea0a1f2826c67796a56414326fe6afdee654576 Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
- Apr 29, 2013
-
-
Orgad Shaneh authored
* Added a Graph toggle button for log editor * Hide diff parameters when Diff is off * Remove GitClient::graphLog Change-Id: Ib87560bc4d6d7dbe866f0e58db8743a95df0622b Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
- Apr 28, 2013
-
-
Petar Perisin authored
If the LogChangeDialog is closed without selecting any commit, interactive rebase started with '^' as the commit. Change-Id: I6292c700f61e5d075953ecc371d0916342096801 Reviewed-by:
Orgad Shaneh <orgads@gmail.com>
-
- Apr 26, 2013
-
-
Petar Perisin authored
this is where stash popup question belongs Change-Id: Ib3435f12eacd0b932ba2a67ecd728e5a41c0c64a Reviewed-by:
Orgad Shaneh <orgads@gmail.com>
-
Petar Perisin authored
So ChangeSelectionDialog does not show full path of current file, but just path to top level dir Change-Id: I4960009216afc0564b009bbf4f89b676cb92c4df Reviewed-by:
Orgad Shaneh <orgads@gmail.com>
-
- Apr 22, 2013
-
-
Orgad Shaneh authored
Change-Id: I4521e26e72c85e896e58e4d9d129f92b2d80f869 Reviewed-by:
Eike Ziller <eike.ziller@digia.com>
-
- Apr 21, 2013
-
-
Petar Perisin authored
Change-Id: I3dd274ad827c7cbd94d849b991cc518eff7f18ae Reviewed-by:
Orgad Shaneh <orgads@gmail.com>
-
- Apr 19, 2013
-
-
Eike Ziller authored
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>
-