harmattan/cameraplus
6 years agoresetCamera() will set needed resolution after resetting camera.
Mohammed Sameer [Sat, 17 Aug 2013 21:09:24 +0000 (00:09 +0300)]
resetCamera() will set needed resolution after resetting camera.

No need to do that when either ImageSettings or VideoSettings become ready

6 years agoKill redundant Connecation element for resolution settings
Mohammed Sameer [Sat, 17 Aug 2013 19:31:47 +0000 (22:31 +0300)]
Kill redundant Connecation element for resolution settings

We can do that inside Settings element itself

6 years agoemit deviceChanged() after we are done recreating DeviceSettings
Mohammed Sameer [Sat, 17 Aug 2013 16:00:15 +0000 (19:00 +0300)]
emit deviceChanged() after we are done recreating DeviceSettings

6 years agoPrevent changing any camera properties while device change is in progress
Mohammed Sameer [Sat, 17 Aug 2013 15:59:22 +0000 (18:59 +0300)]
Prevent changing any camera properties while device change is in progress

6 years agoFirst attempt at making Settings class device aware
Mohammed Sameer [Sat, 17 Aug 2013 01:26:33 +0000 (04:26 +0300)]
First attempt at making Settings class device aware

6 years agoRevert "Implemented per device resolution setting and selection"
Mohammed Sameer [Fri, 16 Aug 2013 18:22:26 +0000 (21:22 +0300)]
Revert "Implemented per device resolution setting and selection"

This reverts commit 04e7179e1a1fe4957dd38ccf9b9555f02e9b4b83.

Conflicts:
qml/CameraSettings.qml
qml/ImageOverlay.qml
qml/VideoOverlay.qml

6 years agoReset toolbar when device gets changed
Mohammed Sameer [Thu, 15 Aug 2013 23:36:48 +0000 (02:36 +0300)]
Reset toolbar when device gets changed

6 years agoHide unusable ui parts depending on device quirks
Mohammed Sameer [Thu, 15 Aug 2013 23:26:17 +0000 (02:26 +0300)]
Hide unusable ui parts depending on device quirks

6 years agoAdded QtCamQuirks to libQtCamera and Quirks to libdeclarativeQtCamera
Mohammed Sameer [Tue, 13 Aug 2013 21:42:49 +0000 (00:42 +0300)]
Added QtCamQuirks to libQtCamera and Quirks to libdeclarativeQtCamera

This allows us to specify any device specific quirks to workaround from the UI side.
Also added N9 quirks

6 years agoAdded methods to find VideoResolution and set it
Mohammed Sameer [Tue, 13 Aug 2013 18:19:47 +0000 (21:19 +0300)]
Added methods to find VideoResolution and set it

6 years agoAdded ImageSettings::currentResolution and methods to find ImageResolution and set it
Mohammed Sameer [Tue, 13 Aug 2013 18:19:06 +0000 (21:19 +0300)]
Added ImageSettings::currentResolution and methods to find ImageResolution and set it

6 years agoAdded new QML types to create VideoResolution and ImageResolution from QML
Mohammed Sameer [Tue, 13 Aug 2013 16:04:01 +0000 (19:04 +0300)]
Added new QML types to create VideoResolution and ImageResolution from QML

6 years agoHide video torch setting when front camera is active
Mohammed Sameer [Mon, 12 Aug 2013 18:56:24 +0000 (21:56 +0300)]
Hide video torch setting when front camera is active

6 years agoHide flash settings and indicator when front camera is active
Mohammed Sameer [Mon, 12 Aug 2013 18:55:57 +0000 (21:55 +0300)]
Hide flash settings and indicator when front camera is active

6 years agoDisable auto focus when front camera is active
Mohammed Sameer [Mon, 12 Aug 2013 18:55:33 +0000 (21:55 +0300)]
Disable auto focus when front camera is active

6 years agoWe already reset focus reticle when we move between cameras or change modes
Mohammed Sameer [Mon, 12 Aug 2013 17:14:26 +0000 (20:14 +0300)]
We already reset focus reticle when we move between cameras or change modes

6 years agoSet focus to ContinuousNormal always
Mohammed Sameer [Mon, 12 Aug 2013 16:04:29 +0000 (19:04 +0300)]
Set focus to ContinuousNormal always

6 years agoReworked to allow separate paths for saving images and videos
Mohammed Sameer [Sat, 10 Aug 2013 22:14:58 +0000 (01:14 +0300)]
Reworked to allow separate paths for saving images and videos

6 years agoAdd missing sailfish/sailfish.qrc
Mohammed Sameer [Sat, 10 Aug 2013 13:08:35 +0000 (16:08 +0300)]
Add missing sailfish/sailfish.qrc

6 years agoAdd missing capability.cpp
Mohammed Sameer [Sat, 10 Aug 2013 12:14:59 +0000 (15:14 +0300)]
Add missing capability.cpp

6 years agoInitial sailfish port
Mohammed Sameer [Fri, 9 Aug 2013 19:49:40 +0000 (22:49 +0300)]
Initial sailfish port

6 years agoUse 2.0 instead of 1.1 for QtQuick version
Mohammed Sameer [Fri, 9 Aug 2013 18:47:01 +0000 (21:47 +0300)]
Use 2.0 instead of 1.1 for QtQuick version

6 years agoPrevent flicking from viewfinder to post capture or settings while preview animation...
Mohammed Sameer [Fri, 9 Aug 2013 03:30:38 +0000 (06:30 +0300)]
Prevent flicking from viewfinder to post capture or settings while preview animation is running

6 years agoAdded opacity "animation" when we show/hide toolbar tools
Mohammed Sameer [Fri, 9 Aug 2013 03:25:24 +0000 (06:25 +0300)]
Added opacity "animation" when we show/hide toolbar tools

6 years agoAdded reset button to exposure settings
Mohammed Sameer [Fri, 9 Aug 2013 03:12:09 +0000 (06:12 +0300)]
Added reset button to exposure settings

6 years agoAdded own camera icons instead of relying on the system icons
Mohammed Sameer [Fri, 9 Aug 2013 03:11:28 +0000 (06:11 +0300)]
Added own camera icons instead of relying on the system icons

6 years agoReplace icons with text for image resolution indicator
Mohammed Sameer [Thu, 8 Aug 2013 21:33:58 +0000 (00:33 +0300)]
Replace icons with text for image resolution indicator

6 years agoAdded currentResolutionMegapixel property to ImageSettings
Mohammed Sameer [Thu, 8 Aug 2013 21:33:32 +0000 (00:33 +0300)]
Added currentResolutionMegapixel property to ImageSettings

6 years agoKill post capture menu
Mohammed Sameer [Wed, 7 Aug 2013 20:29:09 +0000 (23:29 +0300)]
Kill post capture menu

- show current image in gallery was not working so removed.
- move launch gallery from menu to the toolbar.

Also cleaned up the C++ code.

6 years agoModify icon opacity instead of using different icons for enabled/disabled states
Mohammed Sameer [Wed, 7 Aug 2013 20:11:39 +0000 (23:11 +0300)]
Modify icon opacity instead of using different icons for enabled/disabled states

6 years agopop toolbar if we start recording and its depth is greater than 1
Mohammed Sameer [Wed, 7 Aug 2013 00:35:16 +0000 (03:35 +0300)]
pop toolbar if we start recording and its depth is greater than 1

This prevents scene mode being visible in recording mode

6 years agoHide indicators corresponding to toolbar-accessible settings if toolbar is expanded
Mohammed Sameer [Wed, 7 Aug 2013 00:26:50 +0000 (03:26 +0300)]
Hide indicators corresponding to toolbar-accessible settings if toolbar is expanded

6 years agounset source for iso indicator if it's not visible
Mohammed Sameer [Wed, 7 Aug 2013 00:19:36 +0000 (03:19 +0300)]
unset source for iso indicator if it's not visible

6 years agoAdd back scene mode indicators
Mohammed Sameer [Tue, 6 Aug 2013 23:03:59 +0000 (02:03 +0300)]
Add back scene mode indicators

6 years agoMove logo away
Mohammed Sameer [Tue, 6 Aug 2013 19:38:13 +0000 (22:38 +0300)]
Move logo away

6 years agoSet applicationName to cameraplus.
Mohammed Sameer [Tue, 6 Aug 2013 18:59:27 +0000 (21:59 +0300)]
Set applicationName to cameraplus.

Not sure it's used anywhere but it doesn't hurt.

6 years agoStop autofocus if we fail to capture the image
Mohammed Sameer [Mon, 5 Aug 2013 00:44:11 +0000 (03:44 +0300)]
Stop autofocus if we fail to capture the image

6 years agoFixed BatteryInfo for Sailfish
Mohammed Sameer [Sun, 4 Aug 2013 20:49:10 +0000 (23:49 +0300)]
Fixed BatteryInfo for Sailfish

6 years agoCopied needed bits blindly from harmattan
Mohammed Sameer [Sun, 4 Aug 2013 16:36:29 +0000 (19:36 +0300)]
Copied needed bits blindly from harmattan

6 years agoRenamed src/nemo to src/sailfish
Mohammed Sameer [Sun, 4 Aug 2013 16:10:33 +0000 (19:10 +0300)]
Renamed src/nemo to src/sailfish

6 years agoAssume sailfish for now if we cannot detect harmattan
Mohammed Sameer [Sun, 4 Aug 2013 15:51:52 +0000 (18:51 +0300)]
Assume sailfish for now if we cannot detect harmattan

6 years agoAdded getter for current resolution
Mohammed Sameer [Sun, 4 Aug 2013 04:29:31 +0000 (07:29 +0300)]
Added getter for current resolution

6 years agoSet night mode frame rate for front camera to -1 (-1 is invalid)
Mohammed Sameer [Sun, 4 Aug 2013 04:28:42 +0000 (07:28 +0300)]
Set night mode frame rate for front camera to -1 (-1 is invalid)

6 years agoStop autofocus when image capture has ended.
Mohammed Sameer [Sun, 4 Aug 2013 00:38:44 +0000 (03:38 +0300)]
Stop autofocus when image capture has ended.

Some pipelines might not support preview generation. If we have such a pipeline
then we will never stop auto focus since we do that when we get the preview.

6 years agoAdded QtCamImageMode captureStarted() and captureEnded() signals. Expose them to...
Mohammed Sameer [Sun, 4 Aug 2013 00:37:00 +0000 (03:37 +0300)]
Added QtCamImageMode captureStarted() and captureEnded() signals. Expose them to QML too.

6 years agoCleanup current mode when Camera emits prepareForDeviceChange()
Mohammed Sameer [Sun, 4 Aug 2013 00:36:18 +0000 (03:36 +0300)]
Cleanup current mode when Camera emits prepareForDeviceChange()

6 years agoQSettings doesn't like a section named "general". It has to be called "%General"
Mohammed Sameer [Sun, 4 Aug 2013 00:34:36 +0000 (03:34 +0300)]
QSettings doesn't like a section named "general". It has to be called "%General"

6 years agoMade sure we pass the property correctly
Mohammed Sameer [Sat, 3 Aug 2013 22:26:16 +0000 (01:26 +0300)]
Made sure we pass the property correctly

6 years agoAdded preview-supported property to qtcamera.ini
Mohammed Sameer [Sat, 3 Aug 2013 22:17:06 +0000 (01:17 +0300)]
Added preview-supported property to qtcamera.ini

If the camera source does not support preview then camerabin2 will
misbehave if we enable preview

6 years agoDon't try to get an icon if we are not visible
Mohammed Sameer [Sat, 3 Aug 2013 22:16:08 +0000 (01:16 +0300)]
Don't try to get an icon if we are not visible

6 years agoNo more construction of icon ids by anything outside CameraTheme
Mohammed Sameer [Sat, 3 Aug 2013 21:53:34 +0000 (00:53 +0300)]
No more construction of icon ids by anything outside CameraTheme

6 years agoKill data.js and move all icons and functions to CameraTheme
Mohammed Sameer [Sat, 3 Aug 2013 21:29:17 +0000 (00:29 +0300)]
Kill data.js and move all icons and functions to CameraTheme

6 years agoReworked how we create items for toolbar.
Mohammed Sameer [Sat, 3 Aug 2013 20:39:45 +0000 (23:39 +0300)]
Reworked how we create items for toolbar.

We use a Repeater to construct the items needed on demand.

6 years agoAdded more icon IDs
Mohammed Sameer [Sat, 3 Aug 2013 20:38:49 +0000 (23:38 +0300)]
Added more icon IDs

6 years agoMove imageIcon and videoIcon to CameraTheme
Mohammed Sameer [Sat, 3 Aug 2013 19:12:33 +0000 (22:12 +0300)]
Move imageIcon and videoIcon to CameraTheme

6 years agoCleaned up unused functions
Mohammed Sameer [Sat, 3 Aug 2013 17:15:37 +0000 (20:15 +0300)]
Cleaned up unused functions

6 years agoAdded a flash indicator
Mohammed Sameer [Sat, 3 Aug 2013 17:04:22 +0000 (20:04 +0300)]
Added a flash indicator

6 years agoCleaned up unused icon ids
Mohammed Sameer [Sat, 3 Aug 2013 16:52:09 +0000 (19:52 +0300)]
Cleaned up unused icon ids

6 years agoCorrected video recording resolution for front camera
Mohammed Sameer [Sat, 3 Aug 2013 05:11:30 +0000 (08:11 +0300)]
Corrected video recording resolution for front camera

Stolen from Aura ;-)

6 years agoImplemented per device resolution setting and selection
Mohammed Sameer [Sat, 3 Aug 2013 05:04:39 +0000 (08:04 +0300)]
Implemented per device resolution setting and selection

6 years agoRenamed ImageSettings.qml and VideoSettings.qml to ImageModeSettings.qml and VideoMod...
Mohammed Sameer [Fri, 2 Aug 2013 23:11:11 +0000 (02:11 +0300)]
Renamed ImageSettings.qml and VideoSettings.qml to ImageModeSettings.qml and VideoModeSettings.qml

Prevent clashing with stuff from declarative QtCamera

6 years agoSome coding style fixes
Mohammed Sameer [Fri, 2 Aug 2013 23:08:46 +0000 (02:08 +0300)]
Some coding style fixes

6 years agoMultiple fixes:
Mohammed Sameer [Fri, 2 Aug 2013 22:09:27 +0000 (01:09 +0300)]
Multiple fixes:

- Drop QtCamViewfinder::setDevice() as it's not really needed
- Added Camera::prepareForDeviceChange() signal to notify about the destruction of device.

Viewfinder will reset QtCamDevice viewfinder when Camera emits prepareForDeviceChange().
This allows us to properly restart the pipeline for the secondary camera.

6 years agoUnset camerabin viewfinder-sink property when we unset viewfinder
Mohammed Sameer [Sun, 14 Apr 2013 01:04:22 +0000 (04:04 +0300)]
Unset camerabin viewfinder-sink property when we unset viewfinder

6 years agoCleaned up irrelevant comment
Mohammed Sameer [Sun, 14 Apr 2013 01:03:23 +0000 (04:03 +0300)]
Cleaned up irrelevant comment

6 years agoFree the iterator after iterating on bin elements.
Mohammed Sameer [Sun, 14 Apr 2013 00:56:37 +0000 (03:56 +0300)]
Free the iterator after iterating on bin elements.

We were practically leaking the memory and also holding
a reference to camerabin which prevents deleting it because
reference count will never reach 0

6 years agoDon't hold a reference to camerabin
Mohammed Sameer [Sun, 14 Apr 2013 00:54:56 +0000 (03:54 +0300)]
Don't hold a reference to camerabin

If we keep the reference to camerabin then it will never be freed
when QtCamDevice gets destroyed without special code for handling
device deletion.

What we do instead is to acquire a reference when needed and then
release it immediately.

6 years agoReset pipeline manager error and try to start camera device when device gets changed
Mohammed Sameer [Fri, 2 Aug 2013 21:38:51 +0000 (00:38 +0300)]
Reset pipeline manager error and try to start camera device when device gets changed

6 years agoEnable camera device switcher when camera is idle.
Mohammed Sameer [Fri, 2 Aug 2013 21:33:35 +0000 (00:33 +0300)]
Enable camera device switcher when camera is idle.

6 years agoAdded presets for secondary camera.
Mohammed Sameer [Wed, 10 Apr 2013 22:07:40 +0000 (01:07 +0300)]
Added presets for secondary camera.

Night mode resolution is still not working unfortunately.

Conflicts:
data/n9/qtcamera.ini

6 years agoIntroduce a base class for capabilities.
Mohammed Sameer [Sun, 7 Apr 2013 22:10:40 +0000 (01:10 +0300)]
Introduce a base class for capabilities.

Introduce the Capability base class for all capabilities.
It has only one property for now (isSupported).

Conflicts:
declarative/declarative.pro
declarative/plugin.cpp

6 years agoCorrect the class name in the message for Aperture
Mohammed Sameer [Sun, 7 Apr 2013 22:09:45 +0000 (01:09 +0300)]
Correct the class name in the message for Aperture

6 years agoShow/hide UI elements for setting resolution and aspect ratio
Mohammed Sameer [Fri, 2 Aug 2013 21:26:06 +0000 (00:26 +0300)]
Show/hide UI elements for setting resolution and aspect ratio
depending on the availability of resolutions and/or aspect ratios
for a selected device.

6 years agoAdded aspectRatioCount to ImageSettings and VideoSettings
Mohammed Sameer [Sun, 7 Apr 2013 17:35:46 +0000 (20:35 +0300)]
Added aspectRatioCount to ImageSettings and VideoSettings

6 years agoAdd count property to ImageResolutionModel and VideoResolutionModel
Mohammed Sameer [Sun, 7 Apr 2013 17:35:08 +0000 (20:35 +0300)]
Add count property to ImageResolutionModel and VideoResolutionModel

Conflicts:
declarative/imageresolutionmodel.cpp
declarative/videoresolutionmodel.cpp

6 years agoIf we don't have resolutions then return an invalid one.
Mohammed Sameer [Sat, 6 Apr 2013 19:15:47 +0000 (22:15 +0300)]
If we don't have resolutions then return an invalid one.

This should allow camerabin2 to start assuming it can negotiate
some sane defaults instead of crashing.

6 years agoUse a QPointer for the m_mode member.
Mohammed Sameer [Sat, 6 Apr 2013 18:02:26 +0000 (21:02 +0300)]
Use a QPointer for the m_mode member.

m_mode is owned by the device and it will be destroyed if device
gets destroyed.

6 years agoAdded settings to change camera device.
Mohammed Sameer [Fri, 2 Aug 2013 21:05:00 +0000 (00:05 +0300)]
Added settings to change camera device.

This is just the UI. Changing the device leads to a crash.

6 years agopost capture image now follows device orientation
Mohammed Sameer [Fri, 2 Aug 2013 20:04:26 +0000 (23:04 +0300)]
post capture image now follows device orientation

6 years agoRename orientationChanged to onOrientationChanged
Mohammed Sameer [Fri, 2 Aug 2013 19:25:28 +0000 (22:25 +0300)]
Rename orientationChanged to onOrientationChanged
seems it was confusing QML runtime. Signal was not being catched in QML

6 years agoHide post capture toolbar immediately when we start video playback
Mohammed Sameer [Fri, 2 Aug 2013 14:33:53 +0000 (17:33 +0300)]
Hide post capture toolbar immediately when we start video playback

6 years agoReworked CameraToolBar
Mohammed Sameer [Fri, 2 Aug 2013 04:55:05 +0000 (07:55 +0300)]
Reworked CameraToolBar

6 years agoAdded TODO items to be resolved before a release
Mohammed Sameer [Thu, 1 Aug 2013 15:29:09 +0000 (18:29 +0300)]
Added TODO items to be resolved before a release

6 years agoRemoved unused functions after cleaning up CheckButton
Mohammed Sameer [Thu, 1 Aug 2013 00:27:03 +0000 (03:27 +0300)]
Removed unused functions after cleaning up CheckButton

6 years agoReworked CheckButton API
Mohammed Sameer [Thu, 1 Aug 2013 00:23:50 +0000 (03:23 +0300)]
Reworked CheckButton API

CheckButton has one roperty "checked".
It will also highlight the background of the checked button

6 years agoVideoPlayer::paused property does not exist. Use VideoPlayer::state instead
Mohammed Sameer [Wed, 31 Jul 2013 20:21:57 +0000 (23:21 +0300)]
VideoPlayer::paused property does not exist. Use VideoPlayer::state instead

6 years agoMove all icon ids used in .qml files into CameraTheme and create a harmattan theme
Mohammed Sameer [Wed, 31 Jul 2013 20:16:19 +0000 (23:16 +0300)]
Move all icon ids used in .qml files into CameraTheme and create a harmattan theme

6 years agoindented
Mohammed Sameer [Wed, 31 Jul 2013 18:57:40 +0000 (21:57 +0300)]
indented

6 years agoCheckButton and all components using it converted to iconId usage
Mohammed Sameer [Wed, 31 Jul 2013 18:44:15 +0000 (21:44 +0300)]
CheckButton and all components using it converted to iconId usage

6 years agoDisable postcapture ListView flicking when we are playing a video
Mohammed Sameer [Wed, 31 Jul 2013 18:34:50 +0000 (21:34 +0300)]
Disable postcapture ListView flicking when we are playing a video

6 years agoConvert most iconSource usage to iconId
Mohammed Sameer [Wed, 31 Jul 2013 18:32:54 +0000 (21:32 +0300)]
Convert most iconSource usage to iconId

6 years agoview->showFullScreen moved by mistake to QT5 specific block
Mohammed Sameer [Wed, 31 Jul 2013 18:15:05 +0000 (21:15 +0300)]
view->showFullScreen moved by mistake to QT5 specific block

6 years agoQt5: If QQuickView cannot load QML then print them and quit.
Mohammed Sameer [Wed, 31 Jul 2013 18:02:56 +0000 (21:02 +0300)]
Qt5: If QQuickView cannot load QML then print them and quit.

6 years agoRename Campass and Orientation to CameraCompass and CameraOrientation
Mohammed Sameer [Wed, 31 Jul 2013 17:47:56 +0000 (20:47 +0300)]
Rename Campass and Orientation to CameraCompass and CameraOrientation

6 years agoMake more components harmattan specific
Mohammed Sameer [Wed, 31 Jul 2013 17:45:01 +0000 (20:45 +0300)]
Make more components harmattan specific

6 years agoRefactor and rename isWrapperReady to isReadyForCapture()
Mohammed Sameer [Mon, 29 Jul 2013 02:07:29 +0000 (05:07 +0300)]
Refactor and rename isWrapperReady to isReadyForCapture()

This better describes what the function should do.
We will check the "ready-for-capture" property on video source
if we don't have a wrapper instead of returning false.

6 years agoAdd missing include
Mohammed Sameer [Mon, 29 Jul 2013 01:47:17 +0000 (04:47 +0300)]
Add missing include

6 years agoCall parent class componentComplete()
Mohammed Sameer [Mon, 29 Jul 2013 01:44:25 +0000 (04:44 +0300)]
Call parent class componentComplete()

6 years agoReworked main.qml so we have a page
Mohammed Sameer [Sun, 28 Jul 2013 22:12:56 +0000 (01:12 +0300)]
Reworked main.qml so we have a page

6 years agoReworking QtCamViewfinderRenderer to avoid having to pass QPainter to the renderer
Mohammed Sameer [Sun, 28 Jul 2013 18:56:59 +0000 (21:56 +0300)]
Reworking QtCamViewfinderRenderer to avoid having to pass QPainter to the renderer