Commit Graph

31 Commits

Author SHA1 Message Date
Friedemann Kleint
3c13f9484f Gerrit: Display dependent changes as tree.
Add a depth member to GerritChange indicating the tree depth
and populate it by searches over the dependent changes.
Display the root changes sorted by date and add dependent changes
to their deph=1 parent, avoiding deeply nested items.

Change-Id: I66ccf392ce47514841c661820797e81996e9e5cc
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-06-23 13:58:14 +02:00
Friedemann Kleint
bb4031dccf Gerrit: Refactor preparing the introduction of a hierarchical model.
Change model and dialog methods to use QModelIndex and remove
obsolete methods. Split out method to populate a list of standard items
from a change. Change GerritModel::itemForId() to recurse
over the tree.

Change-Id: I9393f498ffbdf63ba3ad78146d041bcda3835527
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-06-20 15:24:53 +02:00
Friedemann Kleint
ded93b43d2 Gerrit: Read out dependency information.
Pass on the command line argument --dependencies to the client,
read out dependent/needed by changes and display them in the
detailed text view. Move the toHtml() method from GerritChange to
GerritModel to be able to display titles of dependent changes.

Change-Id: I1d0b67a995d45a9fe5b7bdb3ff51cc905d58478f
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2014-06-19 15:11:24 +02:00
Daniel Teske
094a309a10 GerritDialog: Fix keyboard activation
Open the change in a browser on Return/Enter

Change-Id: I6ed6d832e3bebf625adb3765415929cc0670d4e4
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-04-14 12:08:29 +02:00
Orgad Shaneh
d24e509662 Gerrit: Some more cleanup
* Remove qualification for types in Gerrit::Internal
* Remove action/command pair. Action is stored in Command.

Change-Id: I946bedd3909e217279e9d7a538e8460e0a61de0f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-04-07 10:14:32 +02:00
Orgad Shaneh
0eb363f959 Gerrit: Use current top level as default repository
* Remove repository setting
* Disable Gerrit menu entry if there is no top level

Change-Id: Ie3f4ca36ae4e7b350034dea7a0de52382da94e90
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-04-04 12:06:50 +02:00
Orgad Shaneh
f7db3258b4 Gerrit: Remove the "Always prompt" setting
It's confusing. The user can just choose the path in the dialog rather
than in a popup

Change-Id: I91422ec9baf5508d3e3d2e552afc6b955fd84748
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-04-04 12:06:35 +02:00
Lorenz Haas
ac70c168da Optimize usage of QPalette
setPalette() does not replace the old one but rather adds the
difference. Thus a previous copy of the palette is unnecessary.

Change-Id: I5c06da456b76144efc4a984ccda13c7d2243a7bc
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-02-21 08:53:28 +01:00
hjk
a74de6af81 Utils: Merge FilterLineEdit into FancyLineEdit
Change-Id: Ic53836dade3985c36b0f6767e43b5af0ddb80d72
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-02-14 16:58:43 +01:00
Eike Ziller
236ea9efb9 Merge remote-tracking branch 'origin/3.0'
Conflicts:
	share/qtcreator/debugger/dumper.cpp
	share/qtcreator/debugger/dumper_p.h
	share/qtcreator/debugger/test/main.cpp
	src/plugins/debugger/gdb/classicgdbengine.cpp
	src/plugins/debugger/gdb/pythongdbengine.cpp
	src/plugins/debugger/lldblib/guest/lldbengineguest.cpp
	src/plugins/debugger/lldblib/guest/lldbengineguest.h
	src/plugins/debugger/lldblib/guest/main.cpp
	src/plugins/debugger/lldblib/ipcengineguest.cpp
	src/plugins/debugger/lldblib/ipcengineguest.h
	src/plugins/debugger/lldblib/ipcenginehost.cpp
	src/plugins/debugger/lldblib/ipcenginehost.h
	src/plugins/debugger/lldblib/lldbenginehost.cpp
	src/plugins/debugger/lldblib/lldboptionspage.cpp
	src/plugins/qbsprojectmanager/qbsstep.cpp
	src/plugins/qbsprojectmanager/qbsstep.h
	src/plugins/qmlprofiler/canvas/qdeclarativecanvas.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativecanvas_p.h
	src/plugins/qmlprofiler/canvas/qdeclarativecontext2d.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativecontext2d_p.h
	src/plugins/qmlprofiler/canvas/qmlprofilercanvas.cpp
	src/plugins/qnx/blackberrycheckdevmodestep.cpp
	src/plugins/qtsupport/debugginghelper.cpp

Change-Id: Ie9fd0a885fb6264a6a8a72daee071b75bcbd2e9d
2014-01-08 11:01:06 +01:00
Robert Loehning
746c5d8863 Incremented year in copyright info
Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-01-08 08:29:47 +01:00
Tobias Hunger
37ae76ac18 Git: Add history completer to path choosers
Change-Id: I90a45dccb21963a24e338880a0b3677bb5dbf8e5
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-11-26 11:28:53 +01:00
Friedemann Kleint
119548a0ff Remove most leading/trailing blanks from translated messages.
They are a hassle for translators and reviewers alike.

Change-Id: I363138212b692cf75fe1605df8af3721315d37e1
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-24 10:50:56 +02:00
hjk
c4d1d7f278 Core: Clean up some ICore::instance() uses
Change-Id: I888b30094ed75818ee3af58c94ebf8468afa5eb9
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-09-24 09:57:55 +02:00
Petar Perisin
beac53ad8d Gerrit - use new diff editor for diff
Change-Id: I7ba84491a5f6796ff446c2e21487ed4c04441b82
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-28 10:25:26 +02:00
Petar Perisin
e835b57fc2 Gerrit - Added Shortcuts to Gerrit Dialog
Change-Id: I048ea80b48d693b7d44769e1f538d0c0050dbe2d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-05-26 15:08:45 +02:00
Petar Perisin
b28ae07274 Gerrit Dialog - renamed "Apply" to "Cherry Pick"
Cherry pick is git command that everyone who works with git knows. First
time I saw "Apply" I thought it was some git or gerrit command unknown
to me. Renaming it to "Cherry Pick" makes dialog more clear, since user
knows what command will execute when button is pressed.

Change-Id: Ifbcad697ef5f5909a36dc008f716025d48a26ad0
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-05-26 15:08:36 +02:00
Friedemann Kleint
9393335c1d Clean headers in Git.
Ran script to remove inludes on a trial-and-error basis and
manually corrected it.

Change-Id: Ib2afbc530760684db96888b927c5153b29fe24aa
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-05 15:10:02 +02:00
Petar Perisin
83d51b2691 Gerrit: added ability to save path for applying patches
Change-Id: I3cc8f1d19784145a7fbf19c321ccbc079847fbc2
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-05 11:27:57 +02:00
Oswald Buddenhagen
1fda2111d4 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in
	src/plugins/debugger/qtmessageloghandler.cpp
	src/plugins/debugger/qtmessagelogwindow.cpp
	src/plugins/madde/maemodeployconfigurationwidget.cpp
	src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
	src/plugins/qmldesigner/designercore/include/widgetqueryview.h
	src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.h
	src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
	src/plugins/qnx/bardescriptormagicmatcher.h
	src/plugins/qt4projectmanager/profilekeywords.cpp
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/deployablefilesperprofile.h
	src/plugins/remotelinux/deploymentinfo.cpp
	src/plugins/remotelinux/deploymentsettingsassistant.cpp
	src/plugins/remotelinux/profilesupdatedialog.cpp
	tests/auto/icheckbuild/ichecklib.cpp
	tests/auto/icheckbuild/parsemanager.cpp
	tests/auto/icheckbuild/parsemanager.h

Change-Id: Ie465a578446a089e1c502d1cb1096e84ca058104
2013-01-31 16:25:33 +01:00
Robert Loehning
298531e370 Incremented year in copyright info
Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-01-29 16:27:03 +01:00
Friedemann Kleint
45b4ff4e74 Gerrit: Disable buttons while fetch operation is in progress.
Gerrit operations should not be started in parallel since
they use FETCH_HEAD, which can cause mix-ups.

Change-Id: Icb421c8065f680a4bb93acd63e1ffe6309ce774a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-12-11 15:19:35 +01:00
hjk
386ca7c8dd Adjust license headers
Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-10-05 17:12:56 +02:00
hjk
903eeaf42f fancylineedit: enforce conscious choice between history or special completer
Change-Id: Ia667895b619d0bb37561dce348adb7269df2fb9c
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-08-24 13:37:59 +02:00
Orgad Shaneh
c1abef38a4 Gerrit: Allow sorting
Change-Id: I3e84a62b486ea4bde586467fa3e00a453364ae2c
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-08-07 14:56:15 +02:00
Eike Ziller
e0e8cf3ada Contact -> qt-project.org
Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-07-19 13:23:21 +02:00
Orgad Shaneh
7c77331ea4 Gerrit: Replace 'additional queries' with a query completer
Change-Id: Idbc3f0a0dc47c63eb02ee105965ec52fda712f84
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-07-04 09:20:39 +02:00
Orgad Shaneh
cb8c8ca19e Gerrit: Allow custom query
Change-Id: I8ee0967a8f0013c785bc4d6e98ff7b634f488e97
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-07-04 09:20:27 +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
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