Ubuntu Settings Components

Merge lp://staging/~jonas-drange/ubuntu-settings-components/filepicker into lp://staging/ubuntu-settings-components

  1. filepicker
  2. Merge into trunk
Proposed by Jonas G. Drange
Status: Approved
Approved by: Ken VanDine
Approved revision: 167
Proposed branch: lp://staging/~jonas-drange/ubuntu-settings-components/filepicker
Merge into: lp://staging/ubuntu-settings-components
Diff against target: 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)
To merge this branch: bzr merge lp://staging/~jonas-drange/ubuntu-settings-components/filepicker
Reviewer Review Type Date Requested Status
Ken VanDine Approve
Lukáš Tinkl (community) Needs Information
PS Jenkins bot continuous-integration Pending
Review via email: mp+300180@code.staging.launchpad.net

Commit message

create file picker component for export

To post a comment you must log in.
Revision history for this message
Ken VanDine (ken-vandine) wrote :

One copyright question inline

review: Needs Information
Reply
Revision history for this message
Lukáš Tinkl (lukas-kde) wrote :

Two other minor points inline

review: Needs Information
Reply
Revision history for this message
Ken VanDine (ken-vandine) wrote :

Looks fine to me

review: Approve
Reply
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

Is this something we still want to land?

Reply
Revision history for this message
Jonas G. Drange (jonas-drange) wrote :

It's scheduled to land after silo 2078.

On 27 October 2016 at 18:16, Marco Trevisan (Treviño) <mail@3v1n0.net>
wrote:

> Is this something we still want to land?
> --
> https://code.launchpad.net/~jonas-drange/ubuntu-settings-
> components/filepicker/+merge/300180
> You are the owner of lp:~jonas-drange/ubuntu-settings-components/
> filepicker.
>

Reply
lp://staging/~jonas-drange/ubuntu-settings-components/filepicker updated
166. By Jonas G. Drange

bumps filepicker change

167. By Jonas G. Drange

syncs with trunk

Revision history for this message
Ken VanDine (ken-vandine) wrote :

I'll reviewed the commits since my last approval, looks fine.

review: Approve
Reply

Unmerged revisions

167. By Jonas G. Drange

syncs with trunk

166. By Jonas G. Drange

bumps filepicker change

165. By Jonas G. Drange

sync with trunk

164. By Jonas G. Drange

bump version

163. By Jonas G. Drange

drop bump

162. By Jonas G. Drange

merge trunk

161. By Jonas G. Drange

update pot

160. By Jonas G. Drange

address comments, use glib to format size

159. By Jonas G. Drange

update pot

158. By Jonas G. Drange

make file name elide in the middle

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: