Commit Graph

514 Commits

Author SHA1 Message Date
Orgad Shaneh
b25dfed9ff Gerrit: Prevent losing portFlag when changing other settings
Change-Id: I2ca531b8d9ea9a01739c2f28b7b36e189b0b9b9f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-06-07 13:54:54 +02:00
Eike Ziller
cdd44befff Add ActionContainer::addSeparator(...)
Gets rid of a lot of code duplication.

Change-Id: I2ce38fb38a0b61cb821e0bdc7bcc9a7ccdf9da72
Reviewed-by: hjk <qthjk@ovi.com>
2012-06-05 15:19:30 +02:00
Orgad Shaneh
a452db5055 VCS: Fallback to raw revision if decorate fails
Change-Id: I64537306723dc1bd3c979f22af2213f0f5cd8f84
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-06-05 10:43:47 +02:00
Orgad Shaneh
671bfb9250 VCS: Always allow "Revert Chunk"
Remove revertDiffChunkEnabled property

Any diff view might relate to previous changes, so it makes sense
to always allow reverting them

Change-Id: I8da0fb2d8625ac98140d1bde0296a4478bc6a0b7
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-06-04 11:35:07 +02:00
Orgad Shaneh
3c342a49dc VCS: Add 'Blame current revision' in blame context menu
Internal change: added decorateVersion() function for decorating
a revision. This is called for both the current version and previous ones

Change-Id: I8b23fd628c9db01b005c19d46580979c5a21c687
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-06-04 11:34:24 +02:00
Orgad Shaneh
6f7ae05d69 Git: Prompt to checkout after adding a branch
Change-Id: Ifc215303f42dcba71298f906fb6d2e576d3033d3
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-06-04 11:29:29 +02:00
Orgad Shaneh
93a4108a0d Git: Emphasize detached HEAD on commit
Change-Id: I91dab02af501527489bf6268fe088bc8095bb321
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-06-04 11:28:50 +02:00
Orgad Shaneh
0ef2f65b0e Git: Do not fail on add branch when no tracking branch selected
Change-Id: Icf278e4969ca98a8081d6a12be08e61670c8dbaa
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-06-04 11:28:17 +02:00
Orgad Shaneh
284ab01d2b Git: Allow Checkout for remote branches
Change-Id: Ic1b402314c29c70a24d314ead674166839a61d42
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-06-04 11:27:43 +02:00
Friedemann Kleint
1267f3fe44 Fix compilation with Qt 5.
No match for operator ==(QStringRef, const char *).

Change-Id: I37e365f08ab990c41ce9431558ad679a63acd952
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-05-30 16:43:18 +02:00
Friedemann Kleint
753acdcf82 tr()-Fixes in master.
- Add missing Q_OBJECTS
- Clean up Android, fix capitalization, remove redundant
  translations.

Change-Id: I24583b7e363ff8f90cad3b8257b676888e8a59db
Reviewed-by: hjk <qthjk@ovi.com>
2012-05-28 00:23:29 +02:00
Orgad Shaneh
f88d995f9e Gerrit: Onlt set port flag if SSH parameter chaned
Change-Id: Ib006e31fdb5d832f67a19fa115a80c871628ccc6
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-05-25 10:51:04 +02:00
Theo J.A. de Vries
1efd121b39 added possibility to enter port specifier to gitorious address
Change-Id: I4558b5151dfe1abde98037173c0a83b6a070c6b5
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-05-25 10:40:56 +02:00
Eike Ziller
3934347fe9 ActionManager API cleanup.
d-pointer instead of inheritance
static methods

Change-Id: I7b2f0c8b05ad3951e1ff26a7d4e08e195d2dd258
Reviewed-by: hjk <qthjk@ovi.com>
2012-05-25 10:08:24 +02:00
Friedemann Kleint
7c7ccdc764 Gerrit: Do not run plink executable in accessor of OptionsWidget.
Do not run the process every time the user presses 'Ok' or 'Apply'
in the settings page, do it only if the gerrit parameters actually
changed. Also check for empty binary.

Change-Id: I934616e5d9b20404278f1fd9fc751ff161030cd8
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-05-25 09:51:29 +02:00
Orgad Shaneh
b7927fe1b0 Gerrit: Support plink
Change-Id: I7fe7c5d47b17b2e5d8179e7deb9cb8e566f15912
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-05-24 16:39:27 +02:00
Eike Ziller
1781617f8e Get rid of lots of ifdef Q_OS_MAC for shortcuts.
Using a central enum now.

Change-Id: I20d88c9a3f8c62cf33e4b89a3442269f71918b06
Reviewed-by: hjk <qthjk@ovi.com>
2012-05-23 13:47:13 +02:00
hjk
f77cd29e54 IOptionsPage: replace virtual fuctions by data members
Change-Id: I8297df85109b67b79f90c33263a5dc7b89efbb60
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-05-23 10:48:04 +02:00
Eike Ziller
48a23cc28b Mac: Avoid Alt+<character> shortcuts
Because these tend to add special characters into the editor instead of
triggering the shortcut. Use Ctrl (aka Qt's Meta) instead.

Change-Id: I5866772baf4550e6d048e4d7252b2899a6d28296
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-05-22 16:48:20 +02:00
Christian Kandeler
53a1087d13 Move SSH support into a dedicated library.
It does not belong into libUtils, which is a collection of small
unrelated utility classes.

Task-number: QTCREATORBUG-7218
Change-Id: Id92b9f28678afec93e6f07166adfde6550f38072
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-05-22 10:51:53 +02:00
Friedemann Kleint
3815988c8a Gerrit: Make number a URL.
Change-Id: I15e07746290241ae10f0c9ecaaad1be5d86ed76c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-05-18 12:51:07 +02:00
Friedemann Kleint
615f35f144 Gerrit: Fix compilation with MSVC2010, Qt 5.
Change-Id: I8fe5047d99bcac8e81053f750d5ce038773a0ca2
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-05-18 11:15:57 +02:00
Orgad Shaneh
674fce3aca Gerrit: Make dialog narrower
Change-Id: I2c298cde61b7643578c1c2665f8aee994a7289cd
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-05-18 09:22:27 +02:00
Friedemann Kleint
f1b52256cd Gerrit: Add 'Details' text to dialog.
- Add a splitter and a text browser containing detailed text
  for the change using HTML links for email and URL, allowing
  for removal of 'Open', 'Copy URL' buttons.
- Remove large tooltip from list, rename methods to toHtml()
  and use them for the details text.
- Parse out reviewer email.
- Display approval level with sign.

Change-Id: I2d71a80bbe19643e5bfa9deeaaeb3650976f00b4
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-05-16 17:38:02 +02:00
Friedemann Kleint
37def2aa1c Gerrit: Differentiate by approval type.
- Parse approval type and description.
- Format tooltip as HTML table, listing approvals by type
- Format the approval column similar to the web view by
  type character.
- Fix the special character issue in Qt 4.8 (query tool
  actually outputs UTF8 instead of escapes).

Change-Id: I803f289a03c5a8ede0029d972a19381b5e783d36
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-05-16 14:26:59 +02:00
hjk
21bf0046c3 editormanager: simplify use of interface
Less code on the user side, same meaning.

Change-Id: I14e54a5d2ed8e024a51cce74eaf7c8419ad544be
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-05-11 13:51:14 +02:00
Friedemann Kleint
043c179376 Git: Fix warning about invalid connection.
Change-Id: Iabf33b764dc451d51bfc523d6b3c9b247adab383
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-05-03 20:32:09 +02:00
hjk
d006ca80a6 texteditor: use an enum instead of QString as color ids
Change-Id: I658412c18d5ccfe978ec444451c6417ffb18d71c
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-05-03 13:11:25 +02:00
Orgad Shaneh
e19ad8eab2 Git: Cleanup qbs and add resetdialog files
Change-Id: Ie580a8ca9f5e50ca07cbbaf12f216ce3c1af89b4
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-05-02 15:48:40 +02:00
Joerg Bornemann
40f9c18a3b fix qbs build of git plugin
Change-Id: I0ccda7cf3ada845aa36b2564256c5c67196a68dd
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-05-02 15:39:37 +02:00
Friedemann Kleint
9a5fa0dd48 Git: Offer recent list of changes for reset --hard.
This makes it easier to remove changed applied for review
by Gerrit.

Change-Id: I2e3407ae4e74b650d08d53fed37e9aeb11071a4e
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-05-02 11:12:49 +02:00
Bradley T. Hughes
fb9146a9c3 Compile after qt5/qtbase commit 75a0c7f9
Commit 75a0c7f9b52cde47f20fdc1b89e1264d60350848 in qt5/qtbase changed
some QRegExp methods to be non-const (they were previously const). This
change makes Qt Creator compile again.

Change-Id: Ibc98c678126c3b3189df7fcc043463b940951445
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-04-30 14:32:08 +02:00
Friedemann Kleint
d681bc10c9 Gerrit: Introduce bold marking of changes.
Owned changes: Mark using bold if approval != 0,1.
Changes for review: Mark using bold if review is missing.

Derive verbose user name from first query.

Change-Id: I0ba85c1c7fff088846261b3ba8c5dbaaf259db9a
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-04-30 14:00:41 +02:00
Friedemann Kleint
dc327294d6 Gerrit: Fix tooltip.
Change-Id: I3ba09461226841c25f68c6d1f5bf8c45f4af588b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-04-30 11:29:28 +02:00
Orgad Shaneh
88bc6df12f Gerrit: Make patch display behave like git diff
Change-Id: If6b0b449d29b43a2eb6a135504c12caaf6fcd43b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-04-26 14:35:12 +02:00
Friedemann Kleint
2193915cca Start on a gerrit plugin as a sub-plugin of git.
- Add a gerrit window that shows a list of changes
  and buttons to display, apply or check out
  a change.
- Uses the new Qt 5 Json API or the utils/json
  classes for Qt 4.

Tested-by: Tobias Hunger <tobias.hunger@nokia.com>
Tested-by: Orgad Shaneh <orgads@gmail.com>

Change-Id: I14c6c2c2de8f95fb785752c7319be8638b386a1e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-04-26 14:34:41 +02:00
Eike Ziller
71d9f33bef Merge remote-tracking branch 'origin/2.5' 2012-04-26 07:06:04 +02:00
Orgad Shaneh
75c46a8ded qbs files: Add QT_NO_CAST_FROM_ASCII to git and todo
Change-Id: Ic9f61a8e08e591853b00ef31b418aa59fd771240
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-04-25 10:58:30 +02:00
hjk
5b0bf61640 qtcassert: move actual printing to separate function and enforce style
This also allows simple setting of breakpoints on failed asserts.

Change-Id: I6dd84cbfaf659d57e39f3447386cebc0221b2b84
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-04-17 09:53:44 +02:00
Joerg Bornemann
96a7fbe3ae qbs files: use Qt5 module dependencies
Renamed gui -> widgets.
Renamed declarative -> quick1.

With qbs the usage of qt.widgets and qt.quick1 with Qt4 is supported.

Change-Id: I6cadaf34527f1f880d74ced7d2d18dd9801b7de1
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-04-10 18:02:39 +02:00
Orgad Shaneh
d207165f6a Git: Allow commit (or amend) when not on a branch
Git allows that so why can't we?
Useful when in the middle of merge/rebase.

Change-Id: Id09da3417904ff29e6dd1b4ef383157e9c4920d3
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-03-14 11:18:41 +01:00
Orgad Shaneh
6a3f9460d7 Git: Enable --no-verify for commit
Change-Id: I88cfb7839b41467e3f6b25bea329eb15765e440e
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-03-14 11:18:18 +01:00
Eike Ziller
63f0c0a62f Merge remote-tracking branch 'origin/2.5'
Conflicts:
	qtcreator.pri

Change-Id: Ic24b756b41d2a13f3d696dee69553d2c3241ab95
2012-03-14 09:33:25 +01:00
Tobias Hunger
e4aa2b581e Git: Do not fail to create checkout job
Do not fail to create checkout job when showing the configuration page.

Task-number: QTCREATORBUG-7082
Change-Id: I501cf9421f63b9ca4fa88f0d274624ff48117ced
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2012-03-13 17:02:19 +01:00
Francois Ferrand
4d1bbebf2a Git: Add customizable repository browser command.
Change-Id: Iac297e3665b18d97ca80097c4dd33dd70e64b9a1
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-03-12 15:49:17 +01:00
Eike Ziller
4b8df15f3d Merge remote-tracking branch 'origin/2.5'
Conflicts:
	src/plugins/remotelinux/startgdbserverdialog.cpp

Change-Id: I69597e20d5372e9baf12ac09fc20d39406683f9e
2012-03-08 07:48:55 +01:00
Tobias Hunger
4b366303e6 VCS: Make dark color schemes work with annotation highlighter
Task-number: QTCREATORBUG-6257

Change-Id: Ied01cf6773b5114100afccbac33f359cc72c0889
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-03-06 14:34:01 +01:00
Orgad Shaneh
8b6a2b0a85 Git: Do not fail on amend if no files were modified
Task-number: QTCREATORBUG-6916
Change-Id: I44d69bdd11487388163723dffa56a6690ac14239
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-03-06 11:28:04 +01:00
Tobias Hunger
8973ef31cc Git: Do not pull --rebase when changes are not stashed
Git will not do a pull --rebase when there are changes. So we
now abort if the user did not stash them instead of trying to
pull.

I do not want to revert user changes implicitly.

Task-number: QTCREATORBUG-7031
Change-Id: Ic6041755938be36d8ecdbcbac373b5c38642360d
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-03-05 17:15:26 +01:00
Eike Ziller
9c9316b9e7 Merge remote-tracking branch 'origin/2.5' 2012-03-05 13:48:48 +01:00