Commit Graph

65 Commits

Author SHA1 Message Date
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
bad8a15f3b Introduce long timeout. 2009-12-14 09:41:38 +01:00
Friedemann Kleint
79191a76f3 Perforce: Silence the startup 2009-12-14 09:26:29 +01:00
Friedemann Kleint
1982ab61a5 Perforce: Test on Windows. 2009-12-11 17:04:13 +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
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
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
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
01877b2c86 VCS: perforce, cvs, subversion: Goto current line in blame. 2009-10-01 17:32:26 +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
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
dt
9f91842813 Compile without rtti support
Since we can easily do that, just do it. No gurantee that we aren't
going to use rtti in the future.
2009-08-27 12:12:35 +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
e89a3b00d4 Perforce/Subversion: Display diff/annotation with correct encoding. 2009-08-11 11:22:30 +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
Alessandro Portale
d3f9757916 Removing some unused semicolons after Q_UNUSED
There were both variants, with and without extra semicolon.
2009-07-13 17:35:17 +02:00
Friedemann Kleint
bd176fb53e Add update (sync) options to the Perforce plugin.
Add update for projects/all. Remove shortcuts for Mac.
Task-number: 257848
2009-07-13 14:48:44 +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
dt
4637d56284 Don't ask to reload the file, if the user uses git/undo or git/revert.
Simply do it.

Task-Nr: 254558
2009-06-18 14:30:04 +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
8c45eb57fb Fixed p4 plugin.
Introduce settings struct again. Add an errorString() to
the settings class. Change checkP4Command to checkP4Configuration
and make it report errors when appropriate. Make errorString show
up in settings page and add "Test" button.
Build options correctly (omit empty settings) and use basic
options for the test (which was the bug causing p4 to be
disabled if options were actually specified).
2009-05-28 10:30:10 +02: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
Friedemann Kleint
81d69641ab Added ParameterAction class for QActions acting on files.
Reduce inconsistencies in tr()-Strings provided for
QActions that act on a current <something> (mostly files) by
introducing a ParameterAction class that takes the tr()-Strings
at construction time and provides a setParameter(QString) slot,
allows for setting that parameter or an empty string, which
will cause the displayed text to be updated.
2009-05-15 15:41:00 +02:00
Oswald Buddenhagen
3270c4828f typo & language fixes 2009-05-11 14:10:22 +02:00
Alessandro Portale
0ffc9ab76a Removed unused source files that mentioned "Workbench". While at it,
also removed all code inside USE_P4_API. Gits history be our backup,
if we ever want to use the P4 Api directly in the future.
2009-05-08 16:43:18 +02:00
Friedemann Kleint
2dfd7349a3 Make VCS plugins keep the submit editor open if the submit fails. 2009-03-20 16:52:22 +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
Friedemann Kleint
6ffdf7cf40 Fixes: Add a combo for diff file browsing, bring diff editors to front, exclude qconfig.pri from files examined by p4.
Task: 234842
2009-03-10 11:02:12 +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
Oswald Buddenhagen
3fca94780a Merge branch '1.0.0' into master
Conflicts:
	src/plugins/debugger/gdbengine.cpp
2009-02-23 17:03:25 +01:00
dt
469639fb3c Fixes: Make QtCreator fly even in face of perforce misconfiguration.
Details:  If p4 is in path, but the server isn't configured correctly we
were pretty slow, this fixes that by running p4 client -o after the
settings have changed, if that doesn't return after 2 seconds, then we
cache that as a invalid configuration.
2009-02-19 16:29:52 +01:00
mae
ebcb9dce5a separate EM::setCurrentEditor and EM::activateEditor 2009-01-26 16:36:02 +01:00
mae
1b345cfa0f Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
Conflicts:
	src/plugins/perforce/perforceplugin.cpp
2009-01-23 14:41:33 +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
mae
7cfa4dbe5b Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
Conflicts:
	src/plugins/coreplugin/editormanager/editormanager.cpp
	src/plugins/coreplugin/editormanager/openeditorsview.cpp
	src/plugins/coreplugin/editormanager/stackededitorgroup.cpp
2009-01-21 15:24:20 +01:00
hjk
667255c4d1 some more ICore related cleanup 2009-01-20 17:14:00 +01:00
mae
145f9c24ba Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
Conflicts:
	src/plugins/perforce/perforceplugin.cpp
2009-01-20 17:10:34 +01:00
hjk
897c05f57c replace Core::ICore::instance()->pluginManager() by ExtensionSystem::PluginManager::instance() 2009-01-20 15:31: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
mae
c0c5342386 first edition of the new editor view, splitting still missing 2009-01-16 17:34:34 +01:00
con
fbfcc9a484 Fixes: - ICommand --> Command
Details:  - Naming convention
2009-01-14 13:18:25 +01:00
con
1e4c48a173 Fixes: - IActionContainer --> ActionContainer
Details:  - Conform to naming convention
2009-01-14 13:18:24 +01:00