lp:~carlos-mazieri/ubuntu-filemanager-app/app-devel-pre4
- Get this branch:
- bzr branch lp:~carlos-mazieri/ubuntu-filemanager-app/app-devel-pre4
Branch merges
- Arto Jalkanen: Approve
- Ubuntu Phone Apps Jenkins Bot: Approve (continuous-integration)
-
Diff: 1605 lines (+1155/-164)14 files modifiedsrc/plugin/folderlistmodel/CMakeLists.txt (+10/-0)
src/plugin/folderlistmodel/dirmodel.cpp (+106/-139)
src/plugin/folderlistmodel/dirmodel.h (+11/-16)
src/plugin/folderlistmodel/disk/disklocation.cpp (+222/-0)
src/plugin/folderlistmodel/disk/disklocation.h (+81/-0)
src/plugin/folderlistmodel/filecompare.cpp (+2/-3)
src/plugin/folderlistmodel/folderlistmodel.pri (+14/-5)
src/plugin/folderlistmodel/location.cpp (+140/-0)
src/plugin/folderlistmodel/location.h (+132/-0)
src/plugin/folderlistmodel/locationsfactory.cpp (+181/-0)
src/plugin/folderlistmodel/locationsfactory.h (+136/-0)
src/plugin/folderlistmodel/locationurl.cpp (+34/-0)
src/plugin/folderlistmodel/locationurl.h (+40/-0)
src/plugin/test_folderlistmodel/regression/tst_folderlistmodel.cpp (+46/-1)
Branch information
Recent revisions
- 174. By Carlos Jose Mazieri
-
* changed destructor to virtual from classes Location() and DiskLocation
* changed Location::setFromInfoIte m(const DirItemInfo *itemInfo) to:
Location: :setInfoItem( DireItemInfo *itemInfo)
* changed const Location * LocationsFactory::setNewPath( const QString& uPath) to
Location * LocationsFactor y::setNewPath( const QString& uPath)
* changed const Location * LocationsFactory::parse( const QString& urlPath) to
Location * LocationsFactor y::parse( const QString& urlPath)
* changed const Location * LocationsFactory::location( ) const to
Location * LocationsFactor y::location( ) const - 172. By Carlos Jose Mazieri
-
Introduces Location, it basicaly handles Urls and their internal paths.
IORequest/
DirListWorker and ExternalFSWatcher calls/handling were moved from DirModel class to DiskLocation class. Location provides:
current path/url -> Location::urlPath()
its content -> Location::fetchItems( )
navigation -> up=Location::becomeParent( ) into sub-folders= Location: :setFromInfoIte m()
notification about external changes in its current path. Changed navigation in the file manager:
DirModel::setPath( ) now calls LocationsFactor y::setNewPath( ) which can change the location or set a path in the current location.
DirModel::cdUp()
DirModel::cdIntoIndex( )
DirModel::openPath( ) - 171. By Carlos Jose Mazieri
-
Disk loading classes modified to allow reusing code for Trash:
* introduced class IORequestLoader
* add ExternalFileSystemChangesWorke r::compareItems ()
* comparing moved from ExternalFileSystemChangesWorke r::run( ) to ExternalFileSys temChangesWorke r::compareItems () - 170. By Carlos Jose Mazieri
-
class ExternalFSWatcher changed to allow watching more than a path.
reason: It is intended to watch external changes in the Trash and Trash can be compounded for more than one path. - 169. By Carlos Jose Mazieri
-
structure DirItemPrivate moved from diriteminfo.cpp do diriteminfo.h
added DirItemInfo::isContentReada ble() to extend DirItemInfo: :isReadable( ),
DirModel::data() still uses DirItemInfo::isReadable( ), DirModel: :cdIntoIndex( ) uses DirItemInfo: :isContentReada ble()
## test mode only
DirModel::columnCount( ) moved from dirmodel.h to dirmodel.cpp
added DirModel::getExternalFSW atcher( ) - 168. By Arash Badie Modiri
-
Trivial fix to make a string properly translatable.
Approved by Ubuntu Phone Apps Jenkins Bot, Alan Pope ㋛.
- 167. By Victor Thompson
-
Install icons directory. Fixes: https:/
/bugs.launchpad .net/bugs/ 1312879. Approved by David Planella, Ubuntu Phone Apps Jenkins Bot.
- 166. By David Planella
-
Fixed desktop run, renamed installation paths to just filemanager. Fixes: https:/
/bugs.launchpad .net/bugs/ 1312712. Approved by Ubuntu Phone Apps Jenkins Bot, Nicholas Skaggs, Alan Pope ㋛.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:ubuntu-filemanager-app