lp:~jonas-drange/ubuntu-settings-components/filepicker

Branch merges

Approved for merging into lp:ubuntu-settings-components

Ken VanDine: Approve on 2017-01-31

Lukáš Tinkl (community): Needs Information on 2016-07-18

PS Jenkins bot: Pending (continuous-integration) requested 2016-07-15

Diff: 1665 lines (+1174/-226)

27 files modified

debian/changelog (+6/-0)
debian/control (+1/-0)
examples/FilePickerComponent.qml (+91/-0)
plugins/Ubuntu/Settings/Components/CMakeLists.txt (+7/-0)
plugins/Ubuntu/Settings/Components/FilePicker.qml (+197/-0)
plugins/Ubuntu/Settings/Components/FilePickerProperties.qml (+22/-0)
plugins/Ubuntu/Settings/Components/filepickerhelper.cpp (+59/-0)
plugins/Ubuntu/Settings/Components/filepickerhelper.h (+36/-0)
plugins/Ubuntu/Settings/Components/plugin.cpp (+7/-0)
plugins/Ubuntu/Settings/Components/qmldir (+3/-0)
plugins/Ubuntu/Settings/Vpn/DialogFile.qml (+0/-176)
plugins/Ubuntu/Settings/Vpn/DialogFileProperties.qml (+0/-22)
plugins/Ubuntu/Settings/Vpn/FileSelector.qml (+7/-1)
plugins/Ubuntu/Settings/Vpn/VpnEditor.qml (+0/-7)
plugins/Ubuntu/Settings/Vpn/qmldir (+0/-4)
po/ubuntu-settings-components.pot (+28/-16)
tests/qmltests/CMakeLists.txt (+1/-0)
tests/qmltests/Components/tst_FilePicker.qml (+215/-0)
tests/qmltests/mocks/CMakeLists.txt (+1/-0)
tests/qmltests/mocks/Qt/CMakeLists.txt (+1/-0)
tests/qmltests/mocks/Qt/labs/CMakeLists.txt (+1/-0)
tests/qmltests/mocks/Qt/labs/folderlistmodel/CMakeLists.txt (+20/-0)
tests/qmltests/mocks/Qt/labs/folderlistmodel/MockFolderListModel.cpp (+241/-0)
tests/qmltests/mocks/Qt/labs/folderlistmodel/MockFolderListModel.h (+171/-0)
tests/qmltests/mocks/Qt/labs/folderlistmodel/plugin.cpp (+26/-0)
tests/qmltests/mocks/Qt/labs/folderlistmodel/plugin.h (+31/-0)
tests/qmltests/mocks/Qt/labs/folderlistmodel/qmldir (+2/-0)

api

Propose for merging

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

167. By Jonas G. Drange on 2017-01-25

syncs with trunk

166. By Jonas G. Drange on 2017-01-24

bumps filepicker change

165. By Jonas G. Drange on 2017-01-24

sync with trunk

164. By Jonas G. Drange on 2016-10-19

bump version

163. By Jonas G. Drange on 2016-10-19

drop bump

162. By Jonas G. Drange on 2016-10-19

merge trunk

161. By Jonas G. Drange on 2016-07-18

update pot

160. By Jonas G. Drange on 2016-07-18

address comments, use glib to format size

159. By Jonas G. Drange on 2016-07-18

update pot

158. By Jonas G. Drange on 2016-07-15

make file name elide in the middle