lp:~michael-sheldon/content-hub/peer_picker_ui
Created by
Michael Sheldon
and last modified
- Get this branch:
- bzr branch lp:~michael-sheldon/content-hub/peer_picker_ui
Only
Michael Sheldon
can upload to this branch. If you are
Michael Sheldon
please log in for upload directions.
Branch merges
Propose for merging
No branches
dependent on this one.
- Ken VanDine: Approve
- PS Jenkins bot: Approve (continuous-integration)
-
Diff: 5637 lines (+3115/-715)82 files modifiedCMakeLists.txt (+3/-0)
doc/qml/pages/mainpage.qdoc (+41/-20)
examples/export-qml/app-exporter.qml (+216/-0)
examples/export-qml/export.qml (+10/-27)
examples/exporter/CMakeLists.txt (+1/-1)
examples/exporter/exampleexporter.cpp (+7/-1)
examples/exporter/exampleexporter.h (+1/-1)
examples/exporter/exporter.cpp (+18/-0)
examples/import-qml/import.qml (+36/-28)
examples/importer/CMakeLists.txt (+1/-1)
examples/importer/example.cpp (+3/-4)
examples/importer/exampleimporter.cpp (+12/-5)
examples/importer/exampleimporter.h (+1/-0)
examples/importer/importer.cpp (+18/-1)
examples/picker-qml/picker.qml (+127/-0)
import/Ubuntu/Content/CMakeLists.txt (+23/-3)
import/Ubuntu/Content/ContentPeerPicker.qml (+260/-0)
import/Ubuntu/Content/ContentTransferHint.qml (+11/-4)
import/Ubuntu/Content/ResponsiveGridView.qml (+94/-0)
import/Ubuntu/Content/contenthandler.cpp (+45/-0)
import/Ubuntu/Content/contenthandler.h (+37/-0)
import/Ubuntu/Content/contenthub.cpp (+155/-157)
import/Ubuntu/Content/contenthub.h (+20/-17)
import/Ubuntu/Content/contenthubplugin.cpp (+23/-2)
import/Ubuntu/Content/contenthubplugin.h (+2/-0)
import/Ubuntu/Content/contenticonprovider.cpp (+63/-0)
import/Ubuntu/Content/contenticonprovider.h (+40/-0)
import/Ubuntu/Content/contentpeer.cpp (+168/-6)
import/Ubuntu/Content/contentpeer.h (+40/-2)
import/Ubuntu/Content/contentpeermodel.cpp (+182/-0)
import/Ubuntu/Content/contentpeermodel.h (+67/-0)
import/Ubuntu/Content/contentscope.cpp (+68/-0)
import/Ubuntu/Content/contentscope.h (+43/-0)
import/Ubuntu/Content/contentstore.cpp (+52/-5)
import/Ubuntu/Content/contentstore.h (+12/-0)
import/Ubuntu/Content/contenttransfer.cpp (+39/-21)
import/Ubuntu/Content/contenttransfer.h (+4/-3)
import/Ubuntu/Content/contenttype.cpp (+4/-1)
import/Ubuntu/Content/contenttype.h (+1/-0)
import/Ubuntu/Content/qmldir (+2/-1)
import/Ubuntu/Content/qmlimportexporthandler.cpp (+8/-0)
import/Ubuntu/Content/qmlimportexporthandler.h (+2/-0)
include/com/ubuntu/content/hub.h (+8/-3)
include/com/ubuntu/content/import_export_handler.h (+1/-0)
include/com/ubuntu/content/peer.h (+24/-5)
include/com/ubuntu/content/transfer.h (+10/-0)
include/com/ubuntu/content/type.h (+2/-0)
libcontent-hub.pc.in (+3/-0)
src/com/ubuntu/content/CMakeLists.txt (+2/-1)
src/com/ubuntu/content/detail/app_manager.cpp (+5/-0)
src/com/ubuntu/content/detail/com.ubuntu.content.Handler.xml (+3/-0)
src/com/ubuntu/content/detail/com.ubuntu.content.Service.xml (+27/-12)
src/com/ubuntu/content/detail/com.ubuntu.content.Transfer.xml (+3/-0)
src/com/ubuntu/content/detail/handler.cpp (+18/-3)
src/com/ubuntu/content/detail/handler.h (+1/-0)
src/com/ubuntu/content/detail/peer_registry.h (+8/-5)
src/com/ubuntu/content/detail/service.cpp (+356/-138)
src/com/ubuntu/content/detail/service.h (+15/-8)
src/com/ubuntu/content/detail/transfer.cpp (+12/-2)
src/com/ubuntu/content/detail/transfer.h (+3/-1)
src/com/ubuntu/content/hub.cpp (+101/-27)
src/com/ubuntu/content/peer.cpp (+101/-8)
src/com/ubuntu/content/service/CMakeLists.txt (+2/-3)
src/com/ubuntu/content/service/com.ubuntu.content.hub.gschema.xml (+32/-4)
src/com/ubuntu/content/service/helper.cpp (+1/-1)
src/com/ubuntu/content/service/hook.cpp (+42/-30)
src/com/ubuntu/content/service/hook.h (+12/-0)
src/com/ubuntu/content/service/main.cpp (+1/-1)
src/com/ubuntu/content/service/registry.cpp (+178/-59)
src/com/ubuntu/content/service/registry.h (+12/-6)
src/com/ubuntu/content/transfer.cpp (+5/-0)
src/com/ubuntu/content/transfer_p.h (+12/-0)
src/com/ubuntu/content/utils.cpp (+13/-0)
tests/acceptance-tests/CMakeLists.txt (+14/-14)
tests/acceptance-tests/app_hub_communication_default_source.cpp (+13/-9)
tests/acceptance-tests/app_hub_communication_handler.cpp (+13/-10)
tests/acceptance-tests/app_hub_communication_known_sources.cpp (+15/-11)
tests/acceptance-tests/app_hub_communication_stores.cpp (+11/-7)
tests/acceptance-tests/app_hub_communication_transfer.cpp (+34/-12)
tests/acceptance-tests/app_manager_mock.h (+1/-1)
tests/acceptance-tests/test_hook.cpp (+13/-10)
tests/qml-tests/tst_ContentHub.qml (+28/-13)
Branch information
Recent revisions
- 151. By Michael Sheldon
-
Make it possible to use an external ContentPeerModel in the ContentPeerPicker via a Loader
- 147. By Michael Sheldon
-
Make ContentPeer's setContentType method behave in a more expected way when not being used declaratively
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:content-hub