I have made the following changes intended for : CE:Apps / meego-handset-camera
Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below. https://build.pub.meego.com//request/show/5376 Thank You, fralik [This message was auto-generated] --- Request # 5376: Messages from BOSS: State: review at 2012-08-01T23:23:26 by bossbot Reviews: accepted by bossbot : Prechecks succeeded. new for CE-maintainers : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: home:fralik:branches:CE:Apps / meego-handset-camera -> CE:Apps / meego-handset-camera changes files: -------------- --- meego-handset-camera.changes +++ meego-handset-camera.changes @@ -0,0 +1,3 @@ +* Thu Aug 02 2012 Vadim Frolov <[email protected]> - 1.0.7 +- Remove Home and Quit buttons (fixes NEMO#111). + new: ---- 0001-Removed-Home-and-Quit-buttons-fixes-NEMO-111.patch spec files: ----------- --- meego-handset-camera.spec +++ meego-handset-camera.spec @@ -1,11 +1,13 @@ # # Do NOT Edit the Auto-generated Part! -# Generated by: spectacle version 0.22 +# Generated by: spectacle version 0.24 # + +Name: meego-handset-camera + # >> macros # << macros -Name: meego-handset-camera Summary: MeeGo Handset camera application Version: 1.0.7 Release: 1 @@ -15,6 +17,7 @@ Source0: meego-handset-camera-%{version}.tar.bz2 Source1: camera-screenshot.png Source100: meego-handset-camera.yaml +Patch0: 0001-Removed-Home-and-Quit-buttons-fixes-NEMO-111.patch Requires: gst-plugins-camera Requires: gstreamer >= 0.10.32 Requires: libdeclarative-multimedia @@ -28,17 +31,17 @@ BuildRequires: qt-devel-tools BuildRequires: desktop-file-utils - %description meego-handset-camera provides very basic camera features such as still capture, zooming, adjusting white balance, EV componesation and flash settings. - %prep %setup -q -n %{name}-%{version} +# 0001-Removed-Home-and-Quit-buttons-fixes-NEMO-111.patch +%patch0 -p1 # >> setup # << setup @@ -52,6 +55,7 @@ # >> build post # << build post + %install rm -rf %{buildroot} # >> install pre @@ -60,15 +64,11 @@ # >> install post # << install post + desktop-file-install --delete-original \ --dir %{buildroot}%{_datadir}/applications \ %{buildroot}%{_datadir}/applications/*.desktop - - - - - %files %defattr(-,root,root,-) %{_bindir}/meego-handset-camera @@ -76,5 +76,3 @@ %config %{_sysconfdir}/xdg/Nokia/%{name}.conf # >> files # << files - - other changes: -------------- ++++++ 0001-Removed-Home-and-Quit-buttons-fixes-NEMO-111.patch (new) --- 0001-Removed-Home-and-Quit-buttons-fixes-NEMO-111.patch +++ 0001-Removed-Home-and-Quit-buttons-fixes-NEMO-111.patch @@ -0,0 +1,124 @@ +From 122d2b67f6c4102a75f054ef914a272849379913 Mon Sep 17 00:00:00 2001 +From: Vadim Frolov <[email protected]> +Date: Thu, 2 Aug 2012 01:40:49 +0400 +Subject: [PATCH] Removed Home and Quit buttons (fixes NEMO#111) + +--- + TopPane.qml | 37 ++----------------------------------- + declarative-camera.qml | 3 --- + declarative-camera.qrc | 9 +++------ + 3 files changed, 5 insertions(+), 44 deletions(-) + +diff --git a/TopPane.qml b/TopPane.qml +index 5fbd331..e218f0e 100644 +--- a/TopPane.qml ++++ b/TopPane.qml +@@ -8,51 +8,18 @@ Item { + + property alias quickSettingsVisible : quickSettings.visible + +- signal homePressed +- signal quitPressed +- +- ImageButton { +- id: homeButton +- +- width: homeButton.height +- +- anchors.top: parent.top +- anchors.bottom: parent.bottom +- anchors.left: parent.left +- +- source: "images/icon-m-framework-home.svg" +- +- onClicked: homePressed() +- } +- + QuickSettingsPane { + id: quickSettings + + anchors.top: parent.top + anchors.bottom: parent.bottom +- anchors.left: homeButton.right +- anchors.right: quitButton.left ++ anchors.left: parent.left ++ anchors.right: parent.right + +- anchors.leftMargin: 64 + anchors.rightMargin: 6 + + camera: parent.camera + settings: parent.settings + propertyPopup: parent.propertyPopup + } +- +- ImageButton { +- id: quitButton +- +- width: height +- +- anchors.top : parent.top +- anchors.bottom: parent.bottom +- anchors.right : parent.right +- +- +- source: "images/icon-m-framework-close.svg" +- +- onClicked: quitPressed() +- } + } +diff --git a/declarative-camera.qml b/declarative-camera.qml +index 498c3d4..622d250 100644 +--- a/declarative-camera.qml ++++ b/declarative-camera.qml +@@ -381,9 +381,6 @@ Rectangle { + propertyPopup: cameraPropertyPopup + + quickSettingsVisible : cameraUI.state == "Capture" +- +- onHomePressed: mainWindow.showMinimized() +- onQuitPressed: Qt.quit() + } + + BottomPane { +diff --git a/declarative-camera.qrc b/declarative-camera.qrc +index f27e145..a509f5b 100644 +--- a/declarative-camera.qrc ++++ b/declarative-camera.qrc +@@ -1,7 +1,7 @@ + <RCC> + <qresource prefix="/"> + <file>declarative-camera.qml</file> +- <file>CameraPropertyPopup.qml</file>> ++ <file>CameraPropertyPopup.qml</file> + <file>CaptureControls.qml</file> + <file>PhotoPreview.qml</file> + <file>ZoomControl.qml</file> +@@ -12,7 +12,7 @@ + <file>CameraPropertyButton.qml</file> + <file>CameraPropertyModel.qml</file> + <file>images/camera_camera_setting.png</file> +- <file>images/icon-m-camera-flash-auto-screen.svg</file> ++ <file>images/icon-m-camera-flash-auto-screen.svg</file> + <file>images/icon-m-camera-flash-off-screen.svg</file> + <file>images/icon-m-camera-flash-always-screen.svg</file> + <file>images/icon-m-camera-flash-red-eye-screen.svg</file> +@@ -21,14 +21,11 @@ + <file>images/icon-m-camera-whitebalance-cloudy-screen.svg</file> + <file>images/icon-m-camera-whitebalance-sunny-screen.svg</file> + <file>images/icon-m-camera-whitebalance-tungsten-screen.svg</file> +- <file>images/icon-m-framework-home.svg</file> +- <file>images/icon-m-toolbar-delete.svg</file> ++ <file>images/icon-m-toolbar-delete.svg</file> + <file>images/icon-m-toolbar-camera.svg</file> +- <file>images/icon-m-framework-close.svg</file> + <file>images/icon-m-camera-ongoing-recording.svg</file> + <file>images/icon-m-camera-pause.svg</file> + <file>images/icon-m-camera-pause-indication.svg</file> +- <file>images/icon-m-camera-video.svg</file> + <file>images/icon-m-camera-video-record.svg</file> + <file>images/icon-m-camera-video.svg</file> + <file>images/icon-m-toolbar-gallery.svg</file> +-- +1.7.9.5 + ++++++ meego-handset-camera.yaml --- meego-handset-camera.yaml +++ meego-handset-camera.yaml @@ -8,6 +8,8 @@ Sources: - meego-handset-camera-%{version}.tar.bz2 - camera-screenshot.png +Patches: + - 0001-Removed-Home-and-Quit-buttons-fixes-NEMO-111.patch SourcePrefix: "%{name}-%{version}" Description: | meego-handset-camera provides very basic camera features such as still capture,
