Commit Graph

27 Commits

Author SHA1 Message Date
Friedemann Kleint
bcd020f382 VCS[git]: Introduce optional pull --rebase.
Do 'git rebase --abort' if something fails.
2010-03-19 16:07:34 +01:00
Friedemann Kleint
edf3437644 VCS/git: Add setting for diff --patience and make it default. 2010-03-10 11:19:59 +01:00
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +01:00
Friedemann Kleint
214679d65b Git: Improve Timeouts.
- Observe timeout setting when running synchronous commands.
- Increase Default on Windows
- Stop process with terminate first (signal).
Task-number: QTCREATORBUG-777
2010-02-26 17:43:37 +01:00
Tobias Hunger
a6ad773722 Make method naming more consistent.
* Use id() for methods returning a string used to represent
    some type of object.
  * Use displayName() for strings that are meant to be user
    visible.
  * Quieten some warnings while touching the files anyway.
  * Move Factories to their products in the plugins where that
    was not done before.

Reviewed-by: dt
2010-01-07 18:17:24 +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
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
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
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
hjk
93cbef8724 long live the king 2009-08-14 09:30:56 +02:00
Friedemann Kleint
41a9395d21 Optionally shorten git blame output by removing date+line number. 2009-07-15 15:18:03 +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
Jason McDonald
884b7af769 Update license headers and sales contact details.
Reviewed-by: Trust Me
2009-06-17 00:01:27 +10:00
dt
46e71d0fe0 This code can be simplified. 2009-05-05 15:42:52 +02:00
Friedemann Kleint
bccf4a1fc3 Fixes: Introduce a cpp settingspage containing file naming conventions (lower case and suffixes). Reorder VCS settings pages.
Task: 241959, 248085

RevBy: Optics/Naming checked by con
Details: Give IOptionPage an id() to differentiate from trName(). Make showOptionsDialog return a bool (applied) and give it an optional parent. Change Cpp and form class wizards, give them a Configure... button to change those settings.
2009-03-18 16:43:01 +01:00
hjk
8ca887aae2 Fixes: change file license headers to include LGPL 2009-02-25 09:15:00 +01:00
Friedemann Kleint
90b094e832 Make the git plugin look for the binary in the path specified in the settings. Previously, the environment was passed to the process, but that did not affect the location of the binary. 2009-02-19 17:47:44 +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
Daniel Molkentin
59affcfffc Bump year in licence header. 2009-01-13 19:22:14 +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
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
Friedemann Kleint
d63c68f39a Fixes: Refactor git settings code, add some more menu options 2008-12-04 11:23:03 +01:00
hjk
df7aacd637 more file cosmetics 2008-12-02 15:08:31 +01:00
hjk
ab83dcd87c off-by-one in headers 2008-12-02 14:20:25 +01:00
hjk
8a43d9b9f3 end-of-line whitespace correction of the new headers 2008-12-02 14:17:16 +01:00
con
05c35356ab Initial import 2008-12-02 12:01:29 +01:00