lp:~artmello/content-hub/content-hub-clipboard

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:content-hub at revision 322

Ken VanDine: Approve on 2017-02-17

system-apps-ci-bot: Pending (continuous-integration) requested 2017-02-16

Diff: 2488 lines (+2130/-2)

31 files modified

debian/apparmor/content-hub-clipboard (+15/-0)
debian/content-hub.install (+3/-0)
debian/control (+1/-0)
debian/rules (+1/-0)
import/Ubuntu/Content/contenthub.cpp (+46/-0)
import/Ubuntu/Content/contenthub.h (+8/-0)
include/com/ubuntu/content/hub.h (+8/-1)
src/com/ubuntu/content/common.h (+1/-0)
src/com/ubuntu/content/detail/com.ubuntu.content.Service.xml (+34/-0)
src/com/ubuntu/content/detail/service.cpp (+164/-0)
src/com/ubuntu/content/detail/service.h (+11/-1)
src/com/ubuntu/content/hub.cpp (+38/-0)
tools/CMakeLists.txt (+1/-0)
tools/clipboard/CMakeLists.txt (+72/-0)
tools/clipboard/ClipboardItemDelegate.qml (+82/-0)
tools/clipboard/PreviewImagePage.qml (+54/-0)
tools/clipboard/PreviewTextPage.qml (+182/-0)
tools/clipboard/clipboardapplication.cpp (+121/-0)
tools/clipboard/clipboardapplication.h (+54/-0)
tools/clipboard/content-hub-clipboard.desktop (+9/-0)
tools/clipboard/main.cpp (+45/-0)
tools/clipboard/main.qml (+308/-0)
tools/clipboard/paste-data-filter-model.cpp (+60/-0)
tools/clipboard/paste-data-filter-model.h (+54/-0)
tools/clipboard/paste-data-model.cpp (+350/-0)
tools/clipboard/paste-data-model.h (+128/-0)
tools/clipboard/paste-data-provider.cpp (+105/-0)
tools/clipboard/paste-data-provider.h (+75/-0)
tools/clipboard/paste-image-provider.cpp (+53/-0)
tools/clipboard/paste-image-provider.h (+39/-0)
tools/clipboard/qml.qrc (+8/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

406. By Arthur Mello on 2017-03-06

Undo Mir string change

405. By Arthur Mello on 2017-03-06

Set the correct Mir property string

404. By Arthur Mello on 2017-03-06

Merged with trunk

403. By Arthur Mello on 2017-02-17

Remove QDbusConnection baseService check since it is failing on some tests
Change sequence for emitting PasteSelected signal to make sure trust session still have focus

402. By Arthur Mello on 2017-02-16

Update Clipboard service calls to work with new trust session methods

401. By Arthur Mello on 2017-02-16

Merge with lp:~ken-vandine/content-hub/ual_cpp_multi_instance

400. By Arthur Mello on 2017-02-07

Update Mir APIs

399. By Arthur Mello on 2017-01-23

Remove changes to store Output Options inside ContentHub's model
Current implementation is triggering an Unity8 crash and will be implemented/followed on another branch

398. By Arthur Mello on 2017-01-23

Store if paste should be outputed as HTML on Paste object

397. By Arthur Mello on 2017-01-22

Undo saving output type data to contenthub model due to crash