Commit Graph

510 Commits

Author SHA1 Message Date
con
04e32b0049 License headers. 2010-12-17 16:03:42 +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
f84c228568 Git: Add options to diff editor 2010-11-22 12:03:07 +01:00
Friedemann Kleint
68d4d35cae Coreplugin: Header cleanup.
Clean icore.h.
2010-11-02 16:53:56 +01:00
Tobias Hunger
11fb6d1c52 Git: Rename "reset" back to "undo uncomitted changes"
Rename "Reset..." back to "Undo Uncommitted Changes..." to be more
in line with git gui as well as the file-based operations.

Reviewed-by: Leena Miettinen
2010-10-15 18:02:47 +02:00
Tobias Hunger
e78b8cf4cc VCS: String update
String update as suggested by Leena.
2010-10-08 14:30:33 +02:00
Tobias Hunger
eb9b15be8c Git: Clean up the menu of the git plugin 2010-10-08 14:30:32 +02:00
Tobias Hunger
9293ecabc3 Git: Show native pathes to repositories 2010-10-08 14:30:31 +02:00
Leena Miettinen
224b43034c UI text - fix capitalization 2010-09-17 11:14:38 +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
hjk
ff0ac20a42 coreplugin: use Core::Id is some places 2010-09-10 17:22:28 +02:00
dt
bde1ebaaea Remove EditorManager::ensureEditorManagerVisible()
The function always switched to Edit Mode, which was the cause for
several bugs. Since openEditor() already does switch to the right mode,
the function is not really needed.

The following actions now respect the prefered mode of the editor:
"f file"-locator
The Open Documents list
Editor history navigation
2010-09-06 13:56:53 +02:00
Robert Loehning
b719bbda42 VCS[git]: Added git fetch 2010-09-01 13:09:20 +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
817d4370d5 VCS: Add 'Check/Uncheck' all context menu to submit file list.
Update 'Commit' button to show number of files to be committed.
Task-number: QTCREATORBUG-2090
2010-08-19 10:04:21 +02:00
Friedemann Kleint
7e739985b2 Merge remote branch 'origin/2.0'
Conflicts:
	src/plugins/debugger/debuggeruiswitcher.cpp
	src/plugins/git/gitclient.cpp
	src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
2010-08-06 10:46:50 +02:00
Robert Loehning
e2347b3d92 git: Added an option to undo unstaged changes only 2010-07-30 19:39:55 +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
6793f1f962 VCS[git]: Add arguments setting for gitk, add to locator.
Task-number: QTCREATORBUG-1577
2010-06-16 09:05:50 +02:00
Friedemann Kleint
7dc2760f0e VCS[git]: Add menu option to launch gitk.
Task-number: QTCREATORBUG-1577
2010-06-08 15:55:12 +02:00
Friedemann Kleint
1c69b97ca6 VCS[git]: Make push/pull synchronous commands.
..for timeout handling to take effect. Also,
log window will update continuously.

Task-number: QTCREATORBUG-777
2010-05-25 11:48:53 +02:00
Leena Miettinen
cf233161fa Doc - UI - Fix UI text capitalization to follow the KDE Style Guide rules.
Reviewed-by: ossi
2010-05-14 15:53:56 +02:00
Friedemann Kleint
aa0926901b VCS: Initially enable menus.
Fix breakage introduced by:
5923733889
2010-04-26 09:12:58 +02:00
Friedemann Kleint
de28b61cca VCS[git], CodePaster: Add support for applying patches.
Modify CodePaster::fetch to do a mimetype detection on the
content, create a filename with the matching extension and
open that file.
This gives correct syntax highlighting  and makes "Save as"
more convenient. Keep the file around and delete on exit.

Modify patch mimetype with some content detection (higher priority
than C++).

Add a "current patch file" to the VCSBasePlugin::State. Add "Apply
patch" to git with whitespace fix.
2010-03-25 16:23:37 +01:00
Thorbjørn Lindeijer
66543381b0 Set a parent on git actions to make sure they're not leaked
Static leaks, but causes noise in valgrind output. :)

Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2010-03-22 15:03:30 +01:00
Friedemann Kleint
75e7d30de3 VCS[git]: Reorganize menu action creation/Start SVN submenu.
Create actions with convenient factory functions, do enabling per
file/project/repository centrally.
2010-03-19 14:48:21 +01:00
Friedemann Kleint
bbcacaf59f Header cleaning spree in Core/Debugger and Symbian/Maemo-code of Qt4. 2010-03-18 10:59:06 +01:00
Friedemann Kleint
288ece116a VCS[git]: Add "Clean project"
in the same fashion as "Clean repository".
2010-03-15 09:18:24 +01:00
Friedemann Kleint
93b156e585 VCS[git]: Add support for cleaning a repository.
Present user with a checkable list of files to be cleaned (add reusable
dialog to VCSBase module).
2010-03-12 15:54:09 +01:00
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +01:00
dt
75545a2bf0 Fix FileManager to correctly handle multiple IFile's for the same file
And port the Qt4ProjectManager to use that API for synchronization
between editors and the .pro file tree.

Reviewed-By: con
2010-02-17 16:51:02 +01:00
Friedemann Kleint
b03ab1d704 Add command locator.
Make it possible to trigger actions from the locator bar by
registering an instance of Locator::CommandLocator by prefix.
Currently used for VCS systems.

Acked-by: con
Initial-patch-by: Roberto Raggi <roberto.raggi@nokia.com>
2010-02-12 16:03:08 +01:00
Friedemann Kleint
18ab532e56 VCS[git]: Make Branchdialog non-modal as is StashDialog.
Give dialogs a consistent look, set
WA_DeleteOnClose on them and improve updating.
Add a Refresh/Diff buttons to branch dialog.
2010-01-27 12:47:23 +01:00
Friedemann Kleint
9ac98a402c VCS[git]: Add support for stashes.
Add non-modal stash management dialog and additional menu option
"Stash snapshot..." to stash away changes prompting for a description,
which will immediately replay the stash (take snapshot and continue
working).
Add interface to IVersionControl for creating/restoring/deleting
snapshots for backup/complex undo operations (currently supported
by git only). Add test options to VCSBasePlugin.
Clean up and extend git client accordingly.
2010-01-15 12:28:22 +01:00
Friedemann Kleint
d5271a086d VCS[hg, git]: Add support for repository creation.
Add repository creation operation to IVersionControl, implement for hg
and git, add convenience slot with prompts to VCSBasePlugin.
Add respective menu options and make menus are visible in case no VCS is
active.
Change project wizards extension page to list VCS that are capable of
repository creation in a QComboBox in case the directory is not managed
by another VCS (in which case it lists that one for operation 'add').
On that occasion, polish the Project selection to use a QComboBox as
well and add some smartness to find the most suitable project to add via
path matching.
2010-01-12 16:45:21 +01:00
Friedemann Kleint
b81c30df2b VCS[git]: Add log repository action. 2010-01-08 16:07:05 +01:00
Tobias Hunger
cacdc6c736 Add display name to VCS plugin structs
Reviewed-by: Friedemann Kleint
2010-01-08 11:51:53 +01:00
Friedemann Kleint
bcba9ea604 VCS [git]: Annotate previous version/single filelog annotation.
Task-number: QTCREATORBUG-503
2010-01-07 17:29:14 +01:00
Thorbjørn Lindeijer
ae535daa20 Merge branch '1.3'
Conflicts:
	src/plugins/git/gitplugin.cpp
2010-01-07 09:09:45 +01:00
Thorbjørn Lindeijer
fdbdf50ce4 Fixed warnings about absolutePath on empty filename in git plugin
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2010-01-07 08:58:01 +01:00
Friedemann Kleint
40f5d38b91 Git: Introduce diff repository and group actions. 2010-01-05 16:36:27 +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
ff1054fc8d Subversion: Adapt to new VCSBasePlugin.
Remove logic handling several repositories.
2009-12-08 16:50:27 +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
8335a06ed4 Code model: Update on changes from the versioning system.
Add changed signals to IVersionControl and
VCSManager and wire them to the update methods. Add a menu action for
manually updating. Improved version of reverted
7aa2411693.

Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
2009-11-11 14:32:54 +01:00
con
e4b1a25dd2 Revert "Code model: Update on changes from the versioning system."
This reverts commit 7aa2411693.
It breaks the code model updates completely. So reverting this change
until we have the right thing.

Reviewed-by: Roberto Raggi
2009-11-10 18:19:37 +01:00
Robert Loehning
8ee769a3bc Disabling "Undo Project Changes" when not working in a Git repository.
Reviewed-by: Friedemann Kleint
2009-11-09 16:49:39 +01:00
Friedemann Kleint
7aa2411693 Code model: Update on changes from the versioning system.
Add state logic to CppCodeModelManagerInterface, making it aware whether
an indexer is running, protect the update methods from another
invocation while running. Add changed signals to IVersionControl and
VCSManager and wire them to the update methods. Add a menu action for
manually updating.

Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: con <qtc-committer@nokia.com>
2009-11-09 15:57:56 +01:00
con
fe9d0bf3c5 Enable multi key shortcuts on the Mac.
Since that was fixed in Qt.
2009-10-09 13:33:56 +02:00