← Back to branch summary

~bfiller/gallery-app/remove-texture

~bfiller/gallery-app/remove-texture

« back to all changes in this revision

Viewing changes to rc/qml/Widgets/GalleryOverviewNavigationBar.qml

Committer: Omer Akram
Date: 2012-12-04 11:20:20 UTC
mfrom: (398.3.18 goodhope.ap)
mto: (428.6.2 gallgood)
mto: This revision was merged to the branch mainline in revision 447.
Revision ID: om26er@ubuntu.com-20121204112020-l2jnrb7j5o2izomd

merge autopilot tests.

files added:
debian/goodhope-autopilot.install

tests

tests/autopilot

tests/autopilot/goodhope

tests/autopilot/goodhope/__init__.py

tests/autopilot/goodhope/data

tests/autopilot/goodhope/data/sample.jpg

tests/autopilot/goodhope/emulators

tests/autopilot/goodhope/emulators/__init__.py

tests/autopilot/goodhope/emulators/album_editor.py

tests/autopilot/goodhope/emulators/main_window.py

tests/autopilot/goodhope/emulators/photo_viewer.py

tests/autopilot/goodhope/tests

tests/autopilot/goodhope/tests/__init__.py

tests/autopilot/goodhope/tests/test_album_editor.py

tests/autopilot/goodhope/tests/test_mainwindow.py

tests/autopilot/goodhope/tests/test_photo_viewer.py

files modified:
debian/control

gallery.pro

rc/Capetown/Widgets/BinaryTabGroup.qml

rc/qml/AlbumEditor.qml

rc/qml/AlbumViewer.qml

rc/qml/Components/AlbumCover.qml

rc/qml/Widgets/AddCreateOperationNavbarButton.qml

rc/qml/Widgets/GalleryOverviewNavigationBar.qml

rc/qml/Widgets/TrashOperationToolbarButton.qml

Show diffs side-by-side

added added

removed removed

rc/qml/Widgets/GalleryOverviewNavigationBar.qml

36

36

}

37

37

38

38

ToolbarIconButton {

39

objectName: "toolbarCameraIcon"

39

40

anchors.verticalCenter: parent.verticalCenter

40

41

anchors.right: parent.right

41

42

anchors.rightMargin: units.gu(2)

Older »