Merge lp://staging/~fabiozaramella/foto/lots-of-improvements into lp://staging/foto
Proposed by
Fabio Zaramella
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://staging/~fabiozaramella/foto/lots-of-improvements |
| Merge into: | lp://staging/foto |
| Diff against target: |
22619 lines (+21893/-0) (has conflicts) 115 files modified
AUTHORS (+10/-0) CMakeLists.txt (+227/-0) COPYING (+674/-0) HACKING (+85/-0) INSTALL (+27/-0) README (+1/-0) cmake/GSettings.cmake (+42/-0) cmake/Makefile (+286/-0) cmake/README (+10/-0) cmake/README.Vala.rst (+173/-0) cmake/Translations.cmake (+41/-0) cmake/uninstall.cmake (+21/-0) cmake/vala/FindVala.cmake (+65/-0) cmake/vala/ParseArguments.cmake (+36/-0) cmake/vala/ValaPrecompile.cmake (+175/-0) cmake/vala/ValaVersion.cmake (+96/-0) config.h.cmake (+11/-0) data/foto.desktop (+24/-0) data/icons/foto-view-edit-symbolic.svg (+49/-0) data/icons/foto.svg (+1714/-0) data/icons/view-presentation-symbolic.svg (+163/-0) doc/CMakeLists.txt (+44/-0) org.pantheon.Foto.gschema.xml (+31/-0) po/CMakeLists.txt (+10/-0) po/ar.po (+294/-0) po/bg.po (+294/-0) po/ca.po (+296/-0) po/de.po (+295/-0) po/en_GB.po (+295/-0) po/es.po (+295/-0) po/et.po (+296/-0) po/eu.po (+294/-0) po/fi.po (+296/-0) po/foto.pot (+322/-0) po/fr.po (+296/-0) po/gl.po (+295/-0) po/hu.po (+294/-0) po/id.po (+295/-0) po/it.po (+295/-0) po/ms.po (+296/-0) po/nl.po (+295/-0) po/pl.po (+296/-0) po/pt.po (+294/-0) po/pt_BR.po (+294/-0) po/ru.po (+294/-0) po/ta.po (+296/-0) po/tr.po (+295/-0) po/zh_CN.po (+294/-0) po/zh_TW.po (+294/-0) src/AppWindow.vala (+162/-0) src/FotoApp.vala (+204/-0) src/MainMenu.vala (+65/-0) src/PageContainer.vala (+60/-0) src/ViewManager.vala (+139/-0) src/ViewerWindow.vala (+124/-0) src/core/DAO/AlbumDAO.vala (+199/-0) src/core/DAO/Db.vala (+258/-0) src/core/DAO/FolderDAO.vala (+115/-0) src/core/DAO/PictureDAO.vala (+216/-0) src/core/DAO/TagDAO.vala (+116/-0) src/core/ImportJob.vala (+99/-0) src/core/PhotoDocument.vala (+57/-0) src/core/PhotoFormat/BmpDriver.vala (+25/-0) src/core/PhotoFormat/GdkDriver.vala (+48/-0) src/core/PhotoFormat/JfifDriver.vala (+25/-0) src/core/PhotoFormat/Photo.vala (+112/-0) src/core/PhotoFormat/PhotoDriver.vala (+35/-0) src/core/PhotoFormat/PhotoFormat.vala (+141/-0) src/core/PhotoFormat/PhotoMetadata.vala (+508/-0) src/core/PhotoFormat/PngDriver.vala (+25/-0) src/core/PictureFilter.vala (+46/-0) src/core/PictureSorter.vala (+110/-0) src/core/VO/Album.vala (+42/-0) src/core/VO/AlbumCollection.vala (+34/-0) src/core/VO/Folder.vala (+30/-0) src/core/VO/Picture.vala (+48/-0) src/core/VO/PictureCollection.vala (+34/-0) src/core/VO/Tag.vala (+32/-0) src/core/VO/TagCollection.vala (+35/-0) src/dialogs/AddToAlbumDialog.vala (+102/-0) src/dialogs/AlbumDialog.vala (+185/-0) src/dialogs/PropertiesDialog.vala (+177/-0) src/dialogs/SettingsDialog.vala (+161/-0) src/pages/AlbumPage.vala (+142/-0) src/pages/CollectionPage.vala (+291/-0) src/pages/LastImportedPage.vala (+127/-0) src/pages/LibraryPage.vala (+167/-0) src/pages/MapPage.vala (+222/-0) src/pages/Page.vala (+147/-0) src/pages/TagPage.vala (+125/-0) src/pages/ViewerPage.vala (+293/-0) src/pages/WelcomePage.vala (+52/-0) src/settings/Settings.vala (+31/-0) src/sidebar/Sidebar.vala (+169/-0) src/slideshow/SlideshowWindow.vala (+247/-0) src/util/CacheUtils.vala (+178/-0) src/util/ColorTransformation.vala (+1519/-0) src/util/FileHandler.vala (+313/-0) src/util/IconFactory.vala (+146/-0) src/util/KeyValueMap.vala (+118/-0) src/util/PixbufUtils.vala (+118/-0) src/util/string.vala (+11/-0) src/widgets/AlbumThumb.vala (+324/-0) src/widgets/ButtonGroup.vala (+233/-0) src/widgets/CairoPictureWidget.vala (+392/-0) src/widgets/ColorRow.vala (+141/-0) src/widgets/DropArea.vala (+193/-0) src/widgets/ItemSearchBar.vala (+49/-0) src/widgets/ItemSortBar.vala (+54/-0) src/widgets/LLabel.vala (+48/-0) src/widgets/PicThumb.vala (+287/-0) src/widgets/Rating.vala (+126/-0) src/widgets/ZoomSlider.vala (+97/-0) vapi/config.vapi (+9/-0) vapi/libexif.vapi (+340/-0) Conflict adding file AUTHORS. Moved existing file to AUTHORS.moved. Conflict adding file CMakeLists.txt. Moved existing file to CMakeLists.txt.moved. Conflict adding file COPYING. Moved existing file to COPYING.moved. Conflict adding file INSTALL. Moved existing file to INSTALL.moved. Conflict adding file README. Moved existing file to README.moved. Conflict adding file cmake. Moved existing file to cmake.moved. Conflict adding file config.h.cmake. Moved existing file to config.h.cmake.moved. Conflict adding file data. Moved existing file to data.moved. Conflict adding file org.pantheon.Foto.gschema.xml. Moved existing file to org.pantheon.Foto.gschema.xml.moved. Conflict adding file po. Moved existing file to po.moved. Conflict adding file src. Moved existing file to src.moved. Conflict adding file vapi. Moved existing file to vapi.moved. |
| To merge this branch: | bzr merge lp://staging/~fabiozaramella/foto/lots-of-improvements |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Erasmo Marín | Pending | ||
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2014-09-06.
To post a comment you must log in.
Revision history for this message
| Fabio Zaramella (fabiozaramella) wrote | # |
Revision history for this message
| Fabio Zaramella (fabiozaramella) wrote | # |
Revision history for this message
| Erasmo Marín (erasmo-marin) wrote | # |
Unmerged revisions
- 77. By Fabio Zaramella
-
better looking drop area
- 76. By Fabio Zaramella
-
deprecated code changed
- 75. By Fabio Zaramella
-
AddAlbum dialog now transient for main window and is modal
- 74. By Fabio Zaramella
-
changed from text button to icon button with tooltip texts
- 73. By Fabio Zaramella
-
somme tooltip_texts added with relative translateable strings
- 72. By Fabio Zaramella
-
add import on toolbar and other ui fixes
- 71. By Fabio Zaramella
-
import removed from sidebar and again ui improvemenets
- 70. By Fabio Zaramella
-
PropertiesDialog ported to Gtk.Dialog and some ui fixes
- 69. By Fabio Zaramella
-
AddAlbum ported to Gtk.Dialog and some other fixes
- 68. By Erasmo Marín
-
better slideshow icons and behavior
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Nothing to do, again, Erasmo can you help me? :p I don't understand why launchpad says there are so many conflicts in files that i haven't even touched?