Commit Graph

35 Commits

Author SHA1 Message Date
hjk
58cb19e55e all: less QScopedPointer
Change-Id: I536bdb4d4f0c10fa858560f3c160fc0fff8da9b2
Reviewed-on: http://codereview.qt-project.org/5116
Reviewed-by: hjk <qthjk@ovi.com>
2011-09-19 08:56:44 +02:00
cerf
10b667ad58 vcsbase: add mechanism to ease management of VCS settings
Management of VCS settings was rather laborious (see BazaarSettings,
GitSettings, ...).
To overcome this, the base class VCSBaseClientSettings is now
equipped with a mechanism factorizing redundant code for VCS settings,
like operator=(), operator==(), writeSettings(), ...
Heir classes of VCSBaseClientSettings only need to declare the
settings (key + default value).

Bazaar and Mercurial plugins are impacted.

Change-Id: I7e4093a6d9476f3c8954f4d104f1b26ac185beb9
Merge-request: 2204
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-on: http://codereview.qt-project.org/4889
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
2011-09-14 13:22:30 +02:00
Tobias Hunger
c5c94206ba VCS: Make initialization of a repo trigger updateActions
Make initialization/cloning of a repo trigger an updateActions.

This is needed to e.g. enable git actions after a git repo is created.

Reviewed-by: Hugues Delorme
Change-Id: Ia8513a216e584fe8e512fdd5d6215aa96c075f3f
Reviewed-on: http://codereview.qt-project.org/4878
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2011-09-14 10:53:20 +02:00
cerf
eebe6681bc vcsbase: overhaul *Arguments() methods in VCSBaseClient
Refactor how sub VCS clients redefine commands like diff, log, ...
This allows sensible code shrinks in Bazaar and Mercurial plugins

Change-Id: Ifeaf366c5c1c2eee776ce5d6bc748c3872e53f5a
Merge-request: 2201
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/3403
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
2011-08-23 15:13:11 +02:00
cerf
a8fc5e2134 vcsbase: refactor status output signal in VCSBaseClient
There is now a clear distinction between the basic status command
and the status command used to emit parsed output

Change-Id: Ie398a866ffcd8f4cc33b864ddbe23ce9d2e97437
Merge-request: 358
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/3337
2011-08-22 17:51:37 +02:00
cerf
0dcd66ef46 vcsbase: rename slot VCSBaseClient::settingsChanged()
Rename VCSBaseClient::settingsChanged() to handleSettingsChanged().
This avoids confusion with a signal (note : Bazaar and Mercurial
plugins are impacted)

Change-Id: I8afd8d60be300088081338a4ed682c2760ba42eb
Merge-request: 358
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/3336
2011-08-22 17:51:29 +02:00
cerf
3907824b4d vcsbase: refactor status parsing in VCSBaseClient
This impacts Bazaar and Mercurial plugins

Change-Id: Ife1e83083b268e597928fbae30378e488e31ee96
Merge-request: 358
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/3335
2011-08-22 17:51:19 +02:00
cerf
96819ddb7a vcsbase: move VCSBaseClient's private slots in its pimpl
Change-Id: Ic9bd8d75d3985538c686fdd632a6ce5993997fc6
Merge-request: 358
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/3334
2011-08-22 17:51:00 +02:00
cerf
c8178a5f5d vcsbase: allow custom init of client log editors
VCSBaseClient provides similar initialization of log editors
as for diff editors

Change-Id: Ic4cae50de70ebf7235e216a6f86b9bbc507483b8
Merge-request: 351
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/2331
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
2011-07-28 12:23:47 +02:00
cerf
b46072c724 vcsbase: auto save settings when requested by Core::ICore
Bazaar and Mercurial plugins are impacted

Change-Id: Ia781dae79983350d773f454de32f812e876bfbfb
Merge-request: 350
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/645
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
2011-06-23 10:59:38 +02:00
cerf
83566c3c3a vcsbase: simplify init of the diff editor in VCSBaseClient
Bazaar and Mercurial plugins are impacted, they benefit auto load/save
of the diff settings

Change-Id: I67327b231fd80eeb61bb859879f9eabdc56739e8
Merge-request: 345
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/463
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
2011-06-10 17:47:20 +02:00
cerf
eed4d1e149 vcsbase: make settings mutable inside VCSBaseClient
VCSBaseClient takes now a pointer to VCSBaseClientSettings, so settings
can be changed within the VCS client. For example diff settings can now
be loaded and saved from within the VCS client.
This impacts the Bazaar and Mercurial plugins

Change-Id: I84882b1f3355e0ca2597704f48f589dca42fd661
Merge-request: 344
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/452
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
2011-06-10 16:03:51 +02:00
Fawzi Mohamed
e54a959ef1 Editor: fix to always call forceReadOnly before activation
Move the call to force readOnly to before the activation for the editors
that had it after their activation call.
Not having signals, currently dynamic changes of the editor read only
state are not really supported, and on windows some actions remained
activated.

Task-number: QTCREATORBUG-4774
Change-Id: I09a84c6e558ddf61aeedb928f8688f6ed65e89c0
Reviewed-on: http://codereview.qt.nokia.com/20
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2011-05-19 15:53:16 +02:00
cerf
e6bbf52f29 Get rid of VCSBaseClient::ExtraCommandOptions
It is replaced by QStringList, allowing a simpler approach to add extra
arguments to a command.
The Bazaar and Mercurial VCS plugins are impacted by this change

Merge-request: 325
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2011-05-12 14:48:10 +02:00
Tobias Hunger
aa2acec14c Fix/add copyright headers
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
2011-05-06 15:17:05 +02:00
cerf
326ea080c5 vcsbase: VCSBaseClient::log() now accepts extra options
Merge-request: 323
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2011-05-03 14:44:38 +02:00
Oswald Buddenhagen
dc3c156cac Merge branch '2.2'
Conflicts:
	src/plugins/debugger/gdb/pythongdbengine.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.h
	src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.h
	src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp
	src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp
	src/plugins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp
	src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp
	src/plugins/qt4projectmanager/qt4target.cpp
	src/plugins/qt4projectmanager/qt4target.h
	src/plugins/qt4projectmanager/qtoptionspage.h
	src/plugins/qt4projectmanager/qtversionmanager.cpp
	src/plugins/welcome/welcomemode.cpp
2011-04-14 12:39:31 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
Friedemann Kleint
58111b2df2 API Documentation: Add VCSBase. 2011-03-28 14:19:17 +02:00
Friedemann Kleint
d7cddd4e17 VCS[Bazaar, Mercurial]: Add diff formatting, revert chunk.
Add toolbar controls for ignore-whitespace to editors
and wire 'Revert Chunk' context menus.

Fix Bazaar diff interaction (find the file on doubleclick).

Introduce initializeDiffEditor to BaseClient and wire the editors
there.
2011-03-28 11:59:26 +02:00
cerf
cc35cad557 VCSBase: fix working dir in VCSBaseClient::view()
The working directory for the job was wrong in the case where the
source argument is already a path. The fix tests file/dir nature of the
source and ensures a valid path is given to the job command.

Merge-request: 281
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2011-03-25 10:12:51 +01:00
cerf
f93226fbf3 Bazaar: set global Bazaar user ID when changed
This ID is automatically set when the user settings have been changed
and applied from the "Options" dialog. This calls 'bzr whoami' under
the hood

Merge-request: 275
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2011-03-16 17:29:14 +01:00
cerf
434e32270b vcsbase: concise and readable VCS editor title
The user string returned by VCSBaseClient::vcsEditorTitle() now
begins with the basename of the VCS binary

Merge-request: 270
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2011-03-16 17:29:09 +01:00
cerf
901ea8fa95 vcsbase : fix bug in VCSBaseClient::view()
The VCS command was executed in the wrong working directory

Merge-request: 269
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2011-03-16 17:29:08 +01:00
cerf
86b77ca950 vcsbase : fix bug in VCSBaseClient::log()
The editor returned by createVCSEditor() had always the wrong source

Merge-request: 269
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2011-03-16 17:29:07 +01:00
cerf
c414c1a3f2 vcsbase : corrected ws
Correct Whitespace in header and source files of class VCSBaseClient

Merge-request: 268
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2011-03-16 17:29:05 +01:00
cerf
455a85bd86 Bazaar: set global Bazaar user ID when changed
This ID is automatically set when the user settings have been changed
and applied from the "Options" dialog. This calls 'bzr whoami' under
the hood

Merge-request: 275
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2011-03-15 15:47:45 +01:00
cerf
9ffcff105a vcsbase: concise and readable VCS editor title
The user string returned by VCSBaseClient::vcsEditorTitle() now
begins with the basename of the VCS binary

Merge-request: 270
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2011-03-14 11:18:49 +01:00
cerf
cba7359afa vcsbase : fix bug in VCSBaseClient::view()
The VCS command was executed in the wrong working directory

Merge-request: 269
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2011-03-14 09:41:25 +01:00
cerf
dbbd7244a1 vcsbase : fix bug in VCSBaseClient::log()
The editor returned by createVCSEditor() had always the wrong source

Merge-request: 269
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2011-03-14 09:41:25 +01:00
cerf
878157c66f vcsbase : corrected whitespaces in header and source files of class VCSBaseClient
Merge-request: 268
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2011-03-11 15:32:08 +01:00
Friedemann Kleint
48ca10b090 Header cleanup. 2011-03-02 12:49:55 +01:00
Friedemann Kleint
fcd4c9e194 L10n: tr()-Fixes. 2011-03-02 12:01:34 +01:00
Tobias Hunger
3adb533ad7 Bazaar: Cleanups
Clean up whitespaces and coding style issues.
2011-02-28 16:10:47 +01:00
cerf
6c1dd96f12 Refactored the Mercurial plugin
Refactored the mercurial plugin which led to new vcsbase common
tools (VCSBaseClient, VCSBaseClientSettings and VCSJobRunner)

Merge-request: 229
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2011-02-28 16:08:15 +01:00