feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
18,788 Commits 108 Branches 368 Tags
ddf4b613f3ebf3799f23f51a68c00649bfb84e95
Commit Graph

362 Commits

Author SHA1 Message Date
mae
0c09777ab4 Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline 2009-02-16 12:51:11 +01:00
mae
8598a59b9f fix context definitions of the vcs editors (this makes shortcuts work again) 2009-02-16 12:50:15 +01:00
con
b8726d503f Merge commit 'origin/1.0.0' 2009-02-13 15:56:18 +01:00
lowinu
b6c15d1ba9 Fixes: add timeout value to git plugin 
RevBy:    tba
Details:  - as on windows some git commands take much longer it happens fairly often, that git timeouts.
          - added a timeout value to the option to let the user choose maximum timeout value (minimum is 10 seconds, maximum 5 minutes)
 2009-02-13 14:09:48 +01:00
con
10a083c12b Merge branch '0.9.2-rc1' 
Conflicts:
	src/plugins/coreplugin/editormanager/editormanager.cpp
 2009-02-04 21:34:12 +01:00
mae
522cf96b0e activate diff editor after creating it 2009-02-04 19:10:36 +01:00
con
bbca68fbb9 Fixes: - Copyright date 2009-02-04 11:15:28 +01:00
mae
14e36bcd5a Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline 2009-02-02 21:58:54 +01:00
con
276abf077d Fixes: - Layout of git settings. 
Details:  - No need for form layout anyhow (which looks broken atm).
 2009-01-29 13:47:07 +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
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
f6b0820315 forgot this 2009-01-20 11:54:18 +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
hjk
266ee2a468 remove ProjectExplorerInterface and ExtensionSystemInterfaces files 2009-01-14 15:08:46 +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
Daniel Molkentin
59affcfffc Bump year in licence header. 2009-01-13 19:22:14 +01:00
Friedemann Kleint
e2ef36a65d Fixes: Enable multiselection in file list of git submit editor 
Details: Refactor the git command to be able to run a batch. Run diff and diff --cached in a batch
 2009-01-13 17:25:09 +01:00
Thorbjørn Lindeijer
59c8b93309 Modified IOptionsPage interface for Apply button 
The previous interface wasn't sufficient to properly support the Apply
button, since it didn't separate applying the changes from the cleanup
phase.

Designer settings pages still need some fixing.

Fixes Apply button causing problems for certain plugins, for example the
QuickOpen.
 2009-01-13 16:03:55 +01:00
con
281c462d24 Fixes: - ProgressManagerInterface --> ProgressManager 
Details:  - Conform to conventions.
 2009-01-13 15:44:26 +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
Friedemann Kleint
94d646a206 Fixes: Added dbl-click handling for remote branches 
Task:
RevBy:
AutoTest:
Details: Moved code to create a local branch from model to dialog which is slightly better since all the modifying app code is there.
 2009-01-09 16:27:42 +01:00
Friedemann Kleint
352cf14353 Fixes: Add way to create a new local branch in the git plugin 
Task: 205821
Details: Split up the branch model into remote branch base class and extended local branch class with <New Branch> row.
 2009-01-07 12:58:31 +01:00
Friedemann Kleint
b8f013ce4a Fixes: Remove whatsthis 2008-12-19 17:49:14 +01:00
Friedemann Kleint
5b8008609c Compile Windows 2008-12-19 17:44:11 +01:00
Friedemann Kleint
defc270896 Fixes: Start a git branch dialog. 2008-12-19 17:42:08 +01:00
Friedemann Kleint
4db2f99836 Fixes: Add ensureStashed() method asking user to stash before a change such as pull 2008-12-19 11:45:30 +01:00
Friedemann Kleint
d6fbb1b573 Fixes: gcc 4.3.2 compile warnings 2008-12-19 10:49:29 +01:00
goro
a51b70b51c Bump version from 0.9.1 to 0.9.2 2008-12-18 12:51:08 +01:00
dt
791217bad4 Merge branch '0.9.1-beta' of git@scm.dev.nokia.troll.no:creator/mainline into 0.9.1-beta 2008-12-16 17:25:17 +01:00
dt
29dfc72f1a Fixes: Nokia Technology Preview License -> Nokia Beta Version License 
Details:  in all pluginspecs.
 2008-12-16 17:24:14 +01:00
hjk
da3cb14483 chancge Nokia GPL exception version from 1.2 to 1.3 2008-12-16 17:20:00 +01:00
hjk
a556ddada8 start sanitizing gdb options dialog 2008-12-11 14:01:53 +01:00
Thorbjørn Lindeijer
09da60f050 Fix git configuration page resize behaviour 
Now it uses all the available space.
 2008-12-10 16:42:31 +01:00
con
0722e95682 Fixes: - Don't popup the git output window at all operations 2008-12-10 15:22:45 +01:00
con
766ca41cec Fixes: - Give show commit dialog a window title 2008-12-10 12:36:02 +01:00
con
7a4ef123ef Fixes: - tools->git->show commit dialog broken 
Task:     - 237689
Details:  - .git is a hidden file, so we need the QDir::Hidden flag as well
 2008-12-10 12:27:42 +01:00
hjk
4a552ead9f use QTC_ASSERT instead of Q_ASSERT 2008-12-09 15:25:01 +01:00
hjk
342caa2141 some more whitespace changes 2008-12-09 11:07:24 +01:00
goro
38b04c737b Bump two plugins from version 0.1 to 0.9.1 2008-12-05 17:55:09 +01:00
Friedemann Kleint
c149046b15 Fixes: Add revert to git, name stage options according to git gui 2008-12-04 15:35:16 +01:00