Commit Graph

206 Commits

Author SHA1 Message Date
con
af99e09b05 Window title didn't show nice name for e.g. diff views.
Use the editor's displayName for the window title.
Also there were missing change signal emissions in setDisplayName
implementations.
Moves the actual handling of the window title from Session to
EditorManager (so it now is also done for the hypothetical case of no
project explorer plugin).

Task-number: QTCREATORBUG-3207
2010-11-30 13:18:34 +01:00
Tobias Hunger
2f07660e5b Git: Do not accept invalid commits
Do not offer to commit in the dialog opened when closing the
commit editor when the commit is not containing all the required
information.
2010-11-23 16:01:47 +01:00
Tobias Hunger
c8065c2370 VCS: raise submit editor to the front when prompting
Bring the submit to the front when asking whether the change should
get committed or not. This is useful when e.g. closing creator
while a submiteditor is open somewhere (but not visible).
2010-10-08 14:30:29 +02:00
Tobias Hunger
80f91c99d2 VCS: Abort commit on ESC
Abort a commit when pressing ESC in the "Do you want to commit?" dialog.

Task-number: QTCREATORBUG-2616
2010-10-05 18:01:02 +02:00
Leena Miettinen
e779886ab0 UI text - fix capitalization 2010-09-21 17:19:50 +02:00
dt
08ccda5862 EditorManager: Change openEditor/activateEditor to not do mode switching
Also introduce a indirection, modes have now types, edit and debug have
the same type, and editors do have a prefered type of modes instead of a
prefered mode.

That fixes the bug that if the prefered qml editing mode was set to
design, then in switching between qml editors would
- in Edit Mode: stay in edit mode
- in Debug Mode: switch to debug mode
2010-09-14 15:23:11 +02:00
Friedemann Kleint
0f0c17111d VCS[git]: Add menu option for git amend.
Task-number: QTCREATORBUG-1642
2010-08-23 12:18:01 +02:00
Friedemann Kleint
c3eb4b6611 VCS: Windows slash display fixing spree.
Task-number: QTCREATORBUG-1795
2010-07-05 09:52:32 +02:00
hjk
6e4160f45b vcsbase: slightly robuster initialization 2010-06-28 10:30:18 +02:00
hjk
2f5f358ff4 Core::Context: compile hot fix for Windows. 2010-06-25 17:38:25 +02:00
hjk
c7e8b51d37 core: use a class derived from QList<int> instead of a QList<int> for Core::Context
A mostly mechanical change.

Reviewed-By: con
2010-06-25 12:58:07 +02:00
Friedemann Kleint
5364f5c152 VCS: Show message box on timeouts/Add SSH prompt.
- Use message boxes on timeouts.
- Add a configuration for a graphical SSH password prompt binary with
defaults
- Launch commands that require authentification with no terminal on UNIX
and environment variable SSH_ASKPASS set accordingly.
- First attempt at introduce a common function to synchronously run VCS
commands in base plugin with flags.
- Use standard execution log entries in all VCS plugins (outputwindow).
2010-05-21 17:46:00 +02:00
Thorbjørn Lindeijer
f9051e6f87 Renamed VCSBaseSettingsPage to CommonSettingsPage
To free up the name for an upcoming VCSBaseOptionsPage class that forms
the base for all version control option pages.

Reviewed-by: Friedemann Kleint
2010-04-12 18:54:05 +02:00
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +01:00
Friedemann Kleint
a1fed931c4 VCS: Fix time-out handling for synchronous processes.
Introduce static utilities to Utils::SynchronousProcess
for synchronous processes that mimicks the handling
of Utils::SynchronousProcess (apply timeout after no
more data are available on stdout/stderr as opposed
to waitForFinished()).

Task-number: QTCREATORBUG-777
2010-03-01 10:06:32 +01:00
Oswald Buddenhagen
75b42f18d8 Merge remote branch 'origin/1.3'
Trailing whitespace removal re-applied manually.
2010-01-29 22:50:23 +01:00
Oswald Buddenhagen
a6ca348636 remove trailing whitespace
doing it in 1.3 as well to avoid possible later conflicts
2010-01-29 21:33:57 +01:00
Tobias Hunger
cacdc6c736 Add display name to VCS plugin structs
Reviewed-by: Friedemann Kleint
2010-01-08 11:51:53 +01:00
Tobias Hunger
a6ad773722 Make method naming more consistent.
* Use id() for methods returning a string used to represent
    some type of object.
  * Use displayName() for strings that are meant to be user
    visible.
  * Quieten some warnings while touching the files anyway.
  * Move Factories to their products in the plugins where that
    was not done before.

Reviewed-by: dt
2010-01-07 18:17:24 +01:00
Friedemann Kleint
0af3c1f13a VCS Submit: Run check script in repository, do not front-trim message.
Make checkscript a bit more verbose.

Task-number: QTCREATORBUG-451
Task-number: QTCREATORBUG-422
2009-12-14 10:56:50 +01:00
Friedemann Kleint
f7cc04e25e Perforce: Use new VCSBasePlugin class.
Use relative paths with -d-option, check for symlinked depots.
Add revert-actions.
Use different context/kinds for editors, suppressing warnings.
Introduce common run-function.
2009-12-11 16:43:39 +01:00
Friedemann Kleint
8097879d6d VCS: Introduce Base class for VCS plugins, use in git.
Fixes:
- Cannot diff a file that does not belong to a project
- Cannot commit when a temporary diff/log view is open
  due to the current file pointing to a temporary directory
- git's project-related actions not passing the correct
  relative path.

Implementation:
- Centralize code to listen for Qt Creator's relevant state changes
  in VCSBasePlugin, dispatching the changes to the instances affected.
  (avoiding multiple invocations of searches/QFileInfo on current).
- Do the same for the corelistener catching closing SubmitEditors.
- Introduce VCSBasePluginState representing the relevant state
  (current file/project).
- Call git with working directory set and relative arguments
- Remove setEnabled/isEnabled() logic of IVersionControl
- Pass toplevel from VCSManager to avoid duplicate searches.
2009-12-08 14:26:41 +01:00
Friedemann Kleint
5948e284bb Rename namespace Core::Utils into Utils
Also move Designer::Internal::FormWindowEditor ->
Designer::FormWindowEditor.
2009-10-05 11:06:05 +02:00
Friedemann Kleint
74a3828f19 Purge out include files in exported headers 2009-10-01 16:38:08 +02:00
Friedemann Kleint
978cf4bda8 Rename IRunConfigurationRunner -> IRunControlFactory...
and ApplicationRunConfiguration to LocalApplicationRunConfiguration,
preparing remote debugging. Change the interface canRun() to be const,
run() to create() (since it does not run anything), use references
to the QSharedPointer<Foo>. Introduce d-Pointer and remove
unneeded headers from ProjectExplorerPlugin and add missing includes
everywhere.
2009-09-25 11:35:44 +02:00
hjk
93cbef8724 long live the king 2009-08-14 09:30:56 +02:00
Friedemann Kleint
9e2f12c737 VCSBase: Add common functionality, make checkout use page lists.
Move GitClient::filterUntrackedFilesOfProject into submit editor.
Make checkout wizards use page lists for greater flexibility.
2009-07-21 11:14:48 +02:00
con
baaf7b1d62 Less QToolBars in editor tool bar. 2009-07-16 18:06:38 +02:00
Friedemann Kleint
2508fa03a0 Make the "prompt to submit" setting a per-plugin one.
Provide a checkable message box to be able to turn
prompting off when asked.
2009-06-19 16:34:38 +02:00
Jason McDonald
884b7af769 Update license headers and sales contact details.
Reviewed-by: Trust Me
2009-06-17 00:01:27 +10:00
Friedemann Kleint
e5c6a29fc4 Raise existing submit window if there is one when Submit is invoked.
Introduce convenience to VCSBaseSubmitEditor.
Task-number: 254644
2009-05-27 16:17:24 +02:00
Thorbjørn Lindeijer
bd87ce9454 Use use-preferred font in submit editor, not slightly smaller
Also enable/disable the column spinbox when checking/unchecking the wrap
submit message option, and force the wrapping to be word-based.
2009-03-25 16:22:35 +01:00
Friedemann Kleint
014efbdab0 Submit editor: Use config font settings, add simple highlighting for git 2009-03-25 08:52:39 +01:00
Friedemann Kleint
81c0bb15b2 Add a submit field widget modeled after mail client address controls 2009-03-23 12:03:20 +01:00
Friedemann Kleint
2fc4e90015 Fix wrapping of commit messages
Remove trimmedDescription(), always trim. Extract trimmed text using the
text cursor
Reviewed-by: Thorbjorn Lindeijer <thorbjorn.lindeijer@nokia.com>
2009-03-20 16:02:14 +01:00
Friedemann Kleint
b28d55f295 Missing files of previous commit 2009-03-20 14:22:20 +01:00
Friedemann Kleint
927578ed55 Fixes: Polish submit message checking.
Details: Use a global model for nicknames that is shared by all dialogs to solve the updating  problems. Make p4 plugin submit work again. Force a submit prompt in case of shutdown or editor close (as opposed to user clickling on "Submit").
2009-03-20 10:16:18 +01:00
Friedemann Kleint
27cb595bbb Fixes: Add common configuration to the VCSA base plugin; submit message check script and user name configuration. Details: Extend submit editor widget by configureable fields. Use them in the VCS base submit editor to specify users, provide completion and selection dialog for them. 2009-03-19 17:44:50 +01:00
hjk
12018c89d6 Fixes: simplify ProjectExplorerPlugin::instance() access 2009-03-04 09:38:01 +01:00
hjk
8ca887aae2 Fixes: change file license headers to include LGPL 2009-02-25 09:15:00 +01:00
Thorbjørn Lindeijer
6adecf3767 Avoid going through ICore when it's not necessary
Many singletons have their own instance() method, in which case there is
no need to use ICore::instance() to get access to them.
2009-01-21 15:55:33 +01:00
hjk
113b81e9db replace ExtensionSystem::PluginManager::instance()->getObject<Core::ICore>() by Core::ICore::instance() 2009-01-20 11:52:04 +01:00
hjk
cc5ff1ec74 Remove #include <extensionsystem/pluginmanager.h> from icore.h, a
forward declaration is sufficient.
2009-01-19 12:39:20 +01:00
Daniel Molkentin
59affcfffc Bump year in licence header. 2009-01-13 19:22:14 +01:00
con
c9889120c3 Fixes: - Rename ActionManagerInterface --> ActionManager
Details:  - To make it conform to naming convention.
2009-01-13 15:44:25 +01:00
Friedemann Kleint
dd235e2b48 Fixes: Random enabling of submit/diff buttons when switching contexts (viewing diffs) from the submit editor
Details: Register actions directly
2009-01-13 14:06:42 +01:00
Friedemann Kleint
4741a7282d Fixes: Make git diff work for staged files, do not launch submit if file list empty, make file model read only, add conveniences
Details: Add a type data field to the git file model
2009-01-13 10:06:06 +01:00
Friedemann Kleint
17daca603a Fixes: Use a model for the submit file list (to resolve the git diff mess) 2009-01-12 17:44:04 +01:00
Friedemann Kleint
05033a9d36 Fixes: Show untracked files in git submit dialog
Details: Move routine to get project file list into VCSBase, use it in p4 and git to filter submit lists.
2009-01-09 17:52:41 +01:00
hjk
da3cb14483 chancge Nokia GPL exception version from 1.2 to 1.3 2008-12-16 17:20:00 +01:00