Commit Graph

174 Commits

Author SHA1 Message Date
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
c55b5b7b31 Git/SVN: Ignore whitespace in annotation/blame (introduce setting).
Defaulting to true.

Task-number: QTCREATORBUG-502
2010-01-05 15:45:41 +01:00
Friedemann Kleint
718f8fa898 Replace handcrafted filter widgets by Utils::FilterLineEdit 2009-12-16 15:58:10 +01:00
Friedemann Kleint
730fd82ac8 VCS: Add "Open file" context menu action to VCS log pane
to be used for status/opened output. enabling convenient opening.
Append repository as block data to log text to be able to resolve
relative paths.
2009-12-15 14:20:06 +01:00
Friedemann Kleint
304d398357 Git: Expand commit template relative to repository directory
if it is a relative file specification.
Task-number: QTCREATORBUG-451
2009-12-14 15:16:40 +01:00
Friedemann Kleint
dde46ec1eb VCS: Introduce configureable timeout to vcs,svn, p4.
as already present for git, mercurial.

Task-number: QTCREATORBUG-475
2009-12-14 12:45:45 +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
dt
839bc1e941 Fixes commiting with empty author/email information
Also only filling in the author field works, git does magic then.
Also fix quoting
2009-12-11 14:08:27 +01:00
Friedemann Kleint
7ce3683143 CVS: Use new VCSBasePlugin-class.
Make the diff-base directory a property of VCSBaseEditor and use
everywhere.
2009-12-09 12:41:10 +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
con
90c03d3209 Add functionality to show progress for the application in task bar/dock.
Move the API to the progress manager.
Added a first Mac implementation, other
platforms are pending.
2009-11-27 17:08:21 +01:00
Friedemann Kleint
a8ac34c347 Options: Sort by category, id.
Separate category and trCategory and introduce sorting characters
to the categories. Same for id/name.
2009-11-27 16:12:12 +01:00
Friedemann Kleint
0e554fac91 Wizards: Sort
Introduce new QString id() const-API and sort wizards by
[untranslated] category and id. Introduce respective constants.
Rubber-stamped-by: con <qtc-committer@nokia.com>
2009-11-27 10:33:24 +01:00
Friedemann Kleint
65e11062bb Polish the settings dialog.
Add a title label to the pages. Use QGroupBoxes throughout.
Extend SavedAction to work with checkable QGroupBoxes. Polish UI files,
use common layout for VCS plugins. Performance: Apply only visited
settings pages. Add search keywords.

Task-number: QTCREATOR-26
2009-11-24 15:05:02 +01:00
Alessandro Portale
20b209858b Improved line wrapping of plugin license texts.
The paragraphs are now long lines that get wrapped by the text browser.

Reviewed-by: TrustMe

	modified:   src/plugins/bineditor/BinEditor.pluginspec
	modified:   src/plugins/bookmarks/Bookmarks.pluginspec
	modified:   src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec
	modified:   src/plugins/coreplugin/Core.pluginspec
	modified:   src/plugins/cpaster/CodePaster.pluginspec
	modified:   src/plugins/cppeditor/CppEditor.pluginspec
	modified:   src/plugins/cpptools/CppTools.pluginspec
	modified:   src/plugins/cvs/CVS.pluginspec
	modified:   src/plugins/debugger/Debugger.pluginspec
	modified:   src/plugins/designer/Designer.pluginspec
	modified:   src/plugins/fakevim/FakeVim.pluginspec
	modified:   src/plugins/find/Find.pluginspec
	modified:   src/plugins/genericprojectmanager/GenericProjectManager.pluginspec
	modified:   src/plugins/git/ScmGit.pluginspec
	modified:   src/plugins/helloworld/HelloWorld.pluginspec
	modified:   src/plugins/help/Help.pluginspec
	modified:   src/plugins/locator/Locator.pluginspec
	modified:   src/plugins/mercurial/Mercurial.pluginspec
	modified:   src/plugins/perforce/Perforce.pluginspec
	modified:   src/plugins/projectexplorer/ProjectExplorer.pluginspec
	modified:   src/plugins/qmleditor/QmlEditor.pluginspec
	modified:   src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec
	modified:   src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec
	modified:   src/plugins/qtscripteditor/QtScriptEditor.pluginspec
	modified:   src/plugins/regexp/RegExp.pluginspec
	modified:   src/plugins/resourceeditor/ResourceEditor.pluginspec
	modified:   src/plugins/snippets/Snippets.pluginspec
	modified:   src/plugins/subversion/Subversion.pluginspec
	modified:   src/plugins/texteditor/TextEditor.pluginspec
	modified:   src/plugins/vcsbase/VCSBase.pluginspec
	modified:   src/plugins/welcome/Welcome.pluginspec
2009-11-20 14:32:42 +01:00
Alessandro Portale
ee30a1fbf4 Indentation: Tabs -> whitespaces
modified:   src/plugins/cvs/CVS.pluginspec
	modified:   src/plugins/git/ScmGit.pluginspec
	modified:   src/plugins/perforce/Perforce.pluginspec
2009-11-20 14:32:41 +01:00
con
43bccb41ed Merge commit 'origin/1.3'
Conflicts:
	src/plugins/debugger/debuggermanager.h
	src/plugins/qmleditor/qmleditorplugin.cpp
	src/plugins/qt4projectmanager/qt4runconfiguration.cpp
2009-11-11 16:14:29 +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
162b0dae81 Version bump. 2009-10-29 17:17:49 +01:00
con
008168838f Version bump. 2009-10-29 17:15:55 +01:00
Rohan McGovern
eacb27f1fb Fixed transient compile failure with highly parallel jom.
These .pri files which add to INCLUDEPATH and have FORMS should also add
to DEPENDPATH.

Adding to INCLUDEPATH does not add to DEPENDPATH by default with qmake.
That means qmake may not find headers in those paths and won't
consider them dependencies when compiling the source files which include
them.

This doesn't matter when all the headers in the new INCLUDEPATH are
always present, but when some of them are generated (e.g. from FORMS),
the dependencies are important and omitting them means a race condition
in parallel builds.

Fixes errors of the form:
  ..\..\shared\help\topicchooser.h(33) : fatal error C1083: Cannot open
    include file: 'ui_topicchooser.h': No such file or directory
(cherry picked from commit 9a7e02946a)
2009-10-12 11:11:01 +02:00
con
7ecbfbe6d2 Merge commit 'origin/1.3' 2009-10-09 20:15:17 +02:00
con
fe9d0bf3c5 Enable multi key shortcuts on the Mac.
Since that was fixed in Qt.
2009-10-09 13:33:56 +02:00
Rohan McGovern
9a7e02946a Fixed transient compile failure with highly parallel jom.
These .pri files which add to INCLUDEPATH and have FORMS should also add
to DEPENDPATH.

Adding to INCLUDEPATH does not add to DEPENDPATH by default with qmake.
That means qmake may not find headers in those paths and won't
consider them dependencies when compiling the source files which include
them.

This doesn't matter when all the headers in the new INCLUDEPATH are
always present, but when some of them are generated (e.g. from FORMS),
the dependencies are important and omitting them means a race condition
in parallel builds.

Fixes errors of the form:
  ..\..\shared\help\topicchooser.h(33) : fatal error C1083: Cannot open
    include file: 'ui_topicchooser.h': No such file or directory
2009-10-08 12:26:47 +02:00
Erik Verbruggen
49f6b740cd Merge remote branch 'origin/1.3'
Conflicts:
	src/libs/cplusplus/CheckUndefinedSymbols.cpp
	src/plugins/qmleditor/qmlcodecompletion.cpp
2009-10-06 11:41:00 +02: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
con
b19d76d903 Version bump. 2009-10-02 16:27:03 +02:00
con
1de6a6e716 Version bump. 2009-10-02 16:21:39 +02:00
Friedemann Kleint
9d4aafebac VCS/git: Make blame go to current editor line
using queued slot/variant cookie magic in command
2009-10-01 17:50:24 +02:00
Friedemann Kleint
01877b2c86 VCS: perforce, cvs, subversion: Goto current line in blame. 2009-10-01 17:32:26 +02:00
Friedemann Kleint
ad294f8467 Project explorer: Make public headers compile with NO_CAST_FROM_ASCII
.. and purge unneeded includes.
2009-09-29 11:39:55 +02:00
Friedemann Kleint
e653b7054a git: Remove duplicate action. 2009-09-25 13:46:49 +02:00
Friedemann Kleint
77fc7441af Git: Remove dpulicate slot revert(), move to UndoFileChanges. 2009-09-25 12:41:13 +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
Friedemann Kleint
25a546e3ea Git:: Prompt before doing hard reset. 2009-09-24 13:58:08 +02:00
Friedemann Kleint
5aa65b12f3 Version control: Do not keep lock on message file while committing.
Store the file name and do not keep the QTemporaryFile around,
which still seems to maintain some kind of lock on Windows although
it is closed.
2009-09-22 12:23:44 +02:00
con
32e0340eab Version bump. 2009-09-10 17:02:57 +02:00
Friedemann Kleint
40f6f72a5d Git: Make commit work on Windows 2009-08-25 09:57:58 +02:00
Friedemann Kleint
d7c5e2ed24 Version Control: Release the commit message temporary file.
... and add some logging to p4.
2009-08-17 09:49:56 +02:00
hjk
93cbef8724 long live the king 2009-08-14 09:30:56 +02:00
con
188dbc3a43 API naming.
Reviewed-by: hjk
2009-08-12 10:41:30 +02:00
Friedemann Kleint
8dfa8af69b Gitorious Wizard: Add a repository filter field.
... to accommodate for the setup at Nokia.
2009-08-11 14:09:32 +02:00
Friedemann Kleint
1e64d9f9b2 Version control: Replace per-VCS output panes with a single one.
...and give it some color and formatting.
2009-08-10 15:46:45 +02:00
Friedemann Kleint
61123092ab Fixed compiler/lupdate/uic warnings.
Add missing Q_OBJECTS where tr() was used.
2009-07-29 09:11:37 +02:00