lp:~carlos-mazieri/ubuntu-filemanager-app/app-devel

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp:ubuntu-filemanager-app

Ubuntu Phone Apps Jenkins Bot: Approve (continuous-integration) on 2014-05-01

David Planella: Needs Fixing on 2014-04-30

Michael Zanetti (community): Needs Fixing on 2014-04-30

Carlos Jose Mazieri: Approve on 2014-04-18

Diff: 3723 lines (+2563/-386)

28 files modified

src/plugin/folderlistmodel/CMakeLists.txt (+17/-1)
src/plugin/folderlistmodel/diriteminfo.cpp (+58/-68)
src/plugin/folderlistmodel/diriteminfo.h (+48/-5)
src/plugin/folderlistmodel/dirmodel.cpp (+151/-158)
src/plugin/folderlistmodel/dirmodel.h (+20/-24)
src/plugin/folderlistmodel/disk/disklocation.cpp (+222/-0)
src/plugin/folderlistmodel/disk/disklocation.h (+81/-0)
src/plugin/folderlistmodel/externalfswatcher.cpp (+35/-18)
src/plugin/folderlistmodel/externalfswatcher.h (+11/-6)
src/plugin/folderlistmodel/filecompare.cpp (+2/-3)
src/plugin/folderlistmodel/folderlistmodel.pri (+19/-5)
src/plugin/folderlistmodel/iorequest.cpp (+139/-36)
src/plugin/folderlistmodel/iorequest.h (+76/-15)
src/plugin/folderlistmodel/location.cpp (+140/-0)
src/plugin/folderlistmodel/location.h (+132/-0)
src/plugin/folderlistmodel/locationsfactory.cpp (+183/-0)
src/plugin/folderlistmodel/locationsfactory.h (+136/-0)
src/plugin/folderlistmodel/locationurl.cpp (+34/-0)
src/plugin/folderlistmodel/locationurl.h (+40/-0)
src/plugin/folderlistmodel/trash/qtrashdir.cpp (+14/-14)
src/plugin/folderlistmodel/trash/qtrashdir.h (+3/-14)
src/plugin/folderlistmodel/trash/qtrashutilinfo.cpp (+153/-0)
src/plugin/folderlistmodel/trash/qtrashutilinfo.h (+82/-0)
src/plugin/folderlistmodel/trash/trashiteminfo.cpp (+141/-0)
src/plugin/folderlistmodel/trash/trashiteminfo.h (+58/-0)
src/plugin/folderlistmodel/trash/trashlocation.cpp (+259/-0)
src/plugin/folderlistmodel/trash/trashlocation.h (+55/-0)
src/plugin/test_folderlistmodel/regression/tst_folderlistmodel.cpp (+254/-19)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

164. By Carlos Jose Mazieri on 2014-05-02

QTrashUtilInfo improved: handing .trasinfo information: createTrashInfoFile() and removeTrashInfoFile()

163. By Carlos Jose Mazieri on 2014-05-01

removed relative path from include directive from test

162. By Carlos Jose Mazieri on 2014-05-01

* added DirItemInfo::isContentReadable() to use as generic DirItemInfo::isReadable() for files and folders
    DirModel::data() still uses DirItemInfo::isReadable() while DirItemInfo::isContentReadable() is prefered in other situations
* added TrashLocation destructor
* removed relative path from include directives

161. By Carlos Jose Mazieri on 2014-04-17

sync with last version of plugin branch
changed CMakeLists.txt to fit new files

160. By David Planella on 2014-04-15

Merge the C++ folderlistmodel plugin into the app's source tree. Fixes: https://bugs.launchpad.net/bugs/1300911.

Approved by Nicholas Skaggs, Ubuntu Phone Apps Jenkins Bot, Carlos Jose Mazieri.

159. By Launchpad Translations on behalf of ubuntu-filemanager-dev on 2014-04-12

Launchpad automatic translations update.

158. By Alan Pope 🍺🐧🐱 🦄 on 2014-04-11

Capitalise title - fix 1306821. Fixes: https://bugs.launchpad.net/bugs/1306821.

Approved by Michael Hall, Ubuntu Phone Apps Jenkins Bot.

157. By Launchpad Translations on behalf of ubuntu-filemanager-dev on 2014-04-09

Launchpad automatic translations update.

156. By Launchpad Translations on behalf of ubuntu-filemanager-dev on 2014-04-06

Launchpad automatic translations update.

155. By Launchpad Translations on behalf of ubuntu-filemanager-dev on 2014-04-05

Launchpad automatic translations update.