--- a/camerauis/cameraxui/cxengine/conf/camerax.confml Fri Sep 24 11:12:50 2010 +0300
+++ b/camerauis/cameraxui/cxengine/conf/camerax.confml Wed Oct 06 15:52:13 2010 +0300
@@ -74,8 +74,8 @@
<FolderNameCr>200904</FolderNameCr>
<FileNameImageCounterCr>1</FileNameImageCounterCr>
<FileNameVideoCounterCr>1</FileNameVideoCounterCr>
- <StillShowCapturedCr>4000</StillShowCapturedCr>
- <VideoShowCapturedCr>4000</VideoShowCapturedCr>
+ <StillShowCapturedCr>-1</StillShowCapturedCr>
+ <VideoShowCapturedCr>-1</VideoShowCapturedCr>
<ImageQualityCr>1</ImageQualityCr>
<VideoQualityCr>0</VideoQualityCr>
<AudioMuteCr>0</AudioMuteCr>
--- a/camerauis/cameraxui/cxengine/cxengine.pro Fri Sep 24 11:12:50 2010 +0300
+++ b/camerauis/cameraxui/cxengine/cxengine.pro Wed Oct 06 15:52:13 2010 +0300
@@ -22,7 +22,7 @@
} else {
CONFIG += dll
DEFINES += CAMERAX_ENGINE_LIBRARY
- VERSION = 10.0.1
+ VERSION = 10.0.2
}
TEMPLATE = lib
--- a/camerauis/cameraxui/cxengine/src/cxecameradevice.cpp Fri Sep 24 11:12:50 2010 +0300
+++ b/camerauis/cameraxui/cxengine/src/cxecameradevice.cpp Wed Oct 06 15:52:13 2010 +0300
@@ -28,6 +28,7 @@
#include "cxecameradeviceTraces.h"
#endif
+const int KCameraPriority = -1;
CxeCameraDevice::CxeCameraDevice() :
@@ -227,10 +228,12 @@
CCamera* camera = NULL;
#if defined(CXE_USE_DUMMY_CAMERA) || defined(__WINSCW__)
- TRAPD(err, camera = CxeDummyCamera::NewL(*observer, cameraIndex, 100, 2));
+ TRAPD(err, camera = CxeDummyCamera::NewL(*observer, cameraIndex,
+ KCameraPriority, 2));
CX_DEBUG(("CxeCameraDevice::newCamera <> new CxeDummyCamera"));
#else
- TRAPD(err, camera = CCamera::New2L(*observer, cameraIndex, 100 /*KCameraClientPriority*/));
+ TRAPD(err, camera = CCamera::New2L(*observer,
+ cameraIndex, KCameraPriority));
CX_DEBUG(("CxeCameraDevice::newCamera <> new CCamera"));
#endif
--- a/camerauis/cameraxui/cxengine/src/dummyengine/cxedummycamera.cpp Fri Sep 24 11:12:50 2010 +0300
+++ b/camerauis/cameraxui/cxengine/src/dummyengine/cxedummycamera.cpp Wed Oct 06 15:52:13 2010 +0300
@@ -47,6 +47,35 @@
_LIT( PANICDUMMYCAMERA, "DummyCamera" );
}
+CxeDummyBuffer::CxeDummyBuffer() : iData(_L8("ABC"))
+ {
+ CX_DEBUG_IN_FUNCTION();
+ }
+
+CxeDummyBuffer::~CxeDummyBuffer()
+ {
+ CX_DEBUG_ENTER_FUNCTION();
+ delete iBitmap;
+ CX_DEBUG_EXIT_FUNCTION();
+ }
+
+
+
+CxeDummySnapshot::CxeDummySnapshot()
+ {
+ CX_DEBUG(("snap this = 0x%08x", this));
+ CX_DEBUG_IN_FUNCTION();
+ }
+
+CxeDummySnapshot::~CxeDummySnapshot()
+ {
+ CX_DEBUG_ENTER_FUNCTION();
+ delete iBuffer;
+ CX_DEBUG_EXIT_FUNCTION();
+ }
+
+
+
CxeDummyCamera* CxeDummyCamera::NewL(MCameraObserver2& aObserver,TInt aCameraIndex,TInt aPriority, TInt aCameraVersion)
{
--- a/camerauis/cameraxui/cxengine/src/dummyengine/cxedummycamera.h Fri Sep 24 11:12:50 2010 +0300
+++ b/camerauis/cameraxui/cxengine/src/dummyengine/cxedummycamera.h Wed Oct 06 15:52:13 2010 +0300
@@ -39,18 +39,8 @@
public MCameraBuffer
{
public:
- CxeDummyBuffer() : iData(_L8("ABC"))
- {
- CX_DEBUG_IN_FUNCTION();
- }
-
- ~CxeDummyBuffer()
- {
- CX_DEBUG_ENTER_FUNCTION();
- delete iBitmap;
- CX_DEBUG_EXIT_FUNCTION();
- }
-
+ CxeDummyBuffer();
+ ~CxeDummyBuffer();
void CreateBitmapL( const TSize& aSize );
public:
@@ -73,17 +63,8 @@
public MCameraSnapshot
{
public:
- CxeDummySnapshot()
- {
- CX_DEBUG(("snap this = 0x%08x", this));
- CX_DEBUG_IN_FUNCTION();
- }
- ~CxeDummySnapshot()
- {
- CX_DEBUG_ENTER_FUNCTION();
- delete iBuffer;
- CX_DEBUG_EXIT_FUNCTION();
- }
+ CxeDummySnapshot();
+ ~CxeDummySnapshot();
TUint32 SupportedFormats() { return 0; }
void PrepareSnapshotL(CCamera::TFormat aFormat, const TPoint& aPosition, const TSize& aSize, const TRgb& aBgColor, TBool aMaintainAspectRatio);
--- a/camerauis/cameraxui/cxengine/tsrc/unit/system_include/imagingconfigmanager.cpp Fri Sep 24 11:12:50 2010 +0300
+++ b/camerauis/cameraxui/cxengine/tsrc/unit/system_include/imagingconfigmanager.cpp Wed Oct 06 15:52:13 2010 +0300
@@ -50,6 +50,8 @@
//
CImagingConfigManager::~CImagingConfigManager()
{
+ delete iVideoQualitySets;
+ delete iImageQualitySets;
}
--- a/camerauis/cameraxui/cxui/cxui.pro Fri Sep 24 11:12:50 2010 +0300
+++ b/camerauis/cameraxui/cxui/cxui.pro Wed Oct 06 15:52:13 2010 +0300
@@ -29,7 +29,7 @@
# and TraceCompiler needing USERINCLUDE.
MMP_RULES += "USERINCLUDE traces"
MMP_RULES += SMPSAFE
- VERSION = 10.0.1
+ VERSION = 10.0.2
}
# export sound file
@@ -144,7 +144,11 @@
thumbnailmanager_qt.h \
xqappmgr.h \
xqserviceprovider.h \
- XQUtils
+ XQUtils \
+ afactivation.h \
+ afactivities_global.h \
+ afactivitystorage.h \
+ xqrequestinfo.h
}
SOURCES += main.cpp \
--- a/camerauis/cameraxui/cxui/layouts/setting.docml Fri Sep 24 11:12:50 2010 +0300
+++ b/camerauis/cameraxui/cxui/layouts/setting.docml Wed Oct 06 15:52:13 2010 +0300
@@ -1,16 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
-<hbdocument version="1.0">
+<hbdocument version="1.2">
<object name="action_ok" type="HbAction">
- <string name="role" value="HbDialog:primaryAction"/>
<string locid="txt_common_button_ok" name="text" value="Ok"/>
</object>
<object name="action_cancel" type="HbAction">
- <string name="role" value="HbDialog:secondaryAction"/>
<string locid="txt_common_button_cancel" name="text" value="Cancel"/>
</object>
<widget name="settings_dialog" type="HbDialog">
+ <sizehint type="MINIMUM" width="var(hb-param-widget-dialog-width)"/>
+ <ref object="action_ok" role="HbWidget:addAction"/>
+ <ref object="action_cancel" role="HbWidget:addAction"/>
<widget name="settings_dialog_heading" role="HbDialog:headingWidget" type="HbLabel">
- <enums name="alignment" value="AlignVCenter|AlignLeft"/>
+ <enums name="alignment" value="AlignLeft|AlignVCenter|AlignLeading"/>
<string name="plainText" value="Dummy settings dialog"/>
<fontspec name="fontSpec" role="Primary" textheight="var(hb-param-text-height-primary)"/>
</widget>
@@ -19,18 +20,17 @@
<container name="items" type="stringlist">
<string value="Dummy item 1"/>
<string value="Dummy item 2"/>
+ <string value="Dummy item 3"/>
+ <string value="Dummy item 4"/>
</container>
- <sizehint type="MINIMUM" height="30un"/>
</widget>
- <layout orientation="Vertical" type="linear">
+ <layout orientation="Vertical" spacing="0un" type="linear">
+ <contentsmargins bottom="0un" left="0un" right="0un" top="0un"/>
<linearitem itemname="settings_dialog_list"/>
</layout>
</widget>
- <sizehint type="MINIMUM" width="var(hb-param-widget-dialog-width)"/>
- <ref object="action_ok" role="HbDialog:primaryAction"/>
- <ref object="action_cancel" role="HbDialog:secondaryAction"/>
</widget>
- <metadata activeUIState="Common ui state" display="NHD landscape" unit="un">
+ <metadata activeUIState="Common ui state" display="NHD-3.2-inch_landscape" unit="un">
<uistate name="Common ui state" sections="#common"/>
</metadata>
</hbdocument>
--- a/camerauis/cameraxui/cxui/layouts/setting_slider.docml Fri Sep 24 11:12:50 2010 +0300
+++ b/camerauis/cameraxui/cxui/layouts/setting_slider.docml Wed Oct 06 15:52:13 2010 +0300
@@ -18,6 +18,7 @@
<enums name="orientation" value="Horizontal"/>
<bool name="visible" value="TRUE"/>
<bool name="trackFilled" value="FALSE"/>
+ <bool name="toolTipVisible" value="FALSE"/>
</widget>
<layout orientation="Horizontal" type="linear">
<linearitem itemname="settings_dialog_slider"/>
--- a/camerauis/cameraxui/cxui/layouts/view_still_precapture.docml Fri Sep 24 11:12:50 2010 +0300
+++ b/camerauis/cameraxui/cxui/layouts/view_still_precapture.docml Wed Oct 06 15:52:13 2010 +0300
@@ -128,6 +128,7 @@
<sizehint height="40un" type="PREFERRED" width="9un"/>
<enums name="orientation" value="Vertical"/>
<bool name="visible" value="FALSE"/>
+ <bool name="toolTipVisible" value="FALSE"/>
</widget>
<widget name="images_left_container" type="HbWidget">
<widget name="images_remaining" type="HbLabel">
--- a/camerauis/cameraxui/cxui/layouts/view_video_precapture.docml Fri Sep 24 11:12:50 2010 +0300
+++ b/camerauis/cameraxui/cxui/layouts/view_video_precapture.docml Wed Oct 06 15:52:13 2010 +0300
@@ -131,6 +131,7 @@
<real name="z" value="8"/>
<sizehint height="40un" type="PREFERRED" width="9un"/>
<enums name="orientation" value="Vertical"/>
+ <bool name="toolTipVisible" value="FALSE"/>
</widget>
<widget name="video_toolbar_paused" type="HbToolBar">
<enums name="layoutDirection" value="RightToLeft"/>
--- a/camerauis/cameraxui/cxui/src/cxuisettingradiobuttonlist.cpp Fri Sep 24 11:12:50 2010 +0300
+++ b/camerauis/cameraxui/cxui/src/cxuisettingradiobuttonlist.cpp Wed Oct 06 15:52:13 2010 +0300
@@ -60,6 +60,7 @@
mSettingValues.append(setting.mValue); // engine value for setting
}
+ setListBoxType(data->mListboxType);
// Set the setting strings to the model.
setItems(settingStrings);
// Set the preview mode.
@@ -68,7 +69,6 @@
mPreview = data->mPreview;
setSettingId(data->mSettingId);
- setListBoxType(data->mListboxType);
// Store the original setting value and focus matching item.
QString value = mEngine->settings().get<QString>(mSettingId, "");
--- a/camerauis/cameraxui/cxui/src/cxuivideoprecaptureview.cpp Fri Sep 24 11:12:50 2010 +0300
+++ b/camerauis/cameraxui/cxui/src/cxuivideoprecaptureview.cpp Wed Oct 06 15:52:13 2010 +0300
@@ -68,7 +68,7 @@
{
static const int CXUI_ELAPSED_TIME_TIMEOUT = 1000; // 1 second
static const int CXUI_RECORD_ANIMATION_DURATION = 3000; // milliseconds
- static const int CXUI_PAUSE_TIMEOUT = 60*1000; // 60 seconds
+ static const int CXUI_PAUSE_TIMEOUT = 5*60*1000; // 5 minutes
const int POSTCAPTURE_ON = -1;
}
--- a/camerauis/cameraxui/cxui/src/cxuiviewmanager.cpp Fri Sep 24 11:12:50 2010 +0300
+++ b/camerauis/cameraxui/cxui/src/cxuiviewmanager.cpp Wed Oct 06 15:52:13 2010 +0300
@@ -22,7 +22,6 @@
#include <afactivitystorage.h>
#include <afactivation.h>
#include <hbaction.h>
-#include <xqserviceutil.h>
#include "cxuiapplication.h"
#include "cxuiapplicationstate.h"
@@ -279,12 +278,7 @@
AfActivation activation;
AfActivityStorage activityStorage;
- if (activation.reason() == Hb::ActivationReasonService ||
- // @todo: There's a bug in orbit and we never get Hb::ActivationReasonService as
- // activation reason. Use XQServiceUtil to determine if starting service as
- // a workaround for now
- XQServiceUtil::isService()) {
-
+ if (activation.reason() == Af::ActivationReasonService) {
// For embedded mode: don't create view yet, create when engine inits to correct mode.
// Connect signals to set up the view after image/video prepare
connect(&mEngine.stillCaptureControl(), SIGNAL(imagePrepareComplete(CxeError::Id)),
@@ -292,7 +286,7 @@
connect(&mEngine.videoCaptureControl(), SIGNAL(videoPrepareComplete(CxeError::Id)),
this, SLOT(changeToPrecaptureView()));
- } else if (activation.reason() == Hb::ActivationReasonActivity) {
+ } else if (activation.reason() == Af::ActivationReasonActivity) {
// restoring activity, read startup view from stored activity
// view to start in
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/camerauis/cameraxui/cxui/stubs_desktop/inc/afactivation.h Wed Oct 06 15:52:13 2010 +0300
@@ -0,0 +1,46 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+* Stub version of epoc32\include\platform\mw\afactivation.h to be used in desktop build.
+*
+*/
+#ifndef AFACTIVATION_H
+#define AFACTIVATION_H
+
+
+#include <QObject>
+#include <QString>
+#include <QStringList>
+#include <QVariant>
+
+#include "afactivities_global.h"
+
+class AfActivation : public QObject
+{
+ Q_OBJECT
+
+public:
+ AfActivation(QObject *parent = 0) {}
+
+signals:
+ void activated(Af::ActivationReason reason, QString name, QVariantHash parameters);
+
+public slots:
+ QVariantHash parameters() const {return QVariantHash();}
+ Af::ActivationReason reason() const {return Af::ActivationReasonNormal;}
+ QString name() const {return "";}
+};
+
+#endif // AFACTIVATION_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/camerauis/cameraxui/cxui/stubs_desktop/inc/afactivities_global.h Wed Oct 06 15:52:13 2010 +0300
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description:
+ *
+ * Stub version of epoc32\include\platform\mw\afactivities_global.h to be used in desktop build.
+ *
+ */
+
+#ifndef AFACTIVITIES_GLOBAL_H
+#define AFACTIVITIES_GLOBAL_H
+
+#include <qglobal.h>
+
+namespace Af {
+ enum ActivationReason {
+ ActivationReasonActivity = 0,
+ ActivationReasonService,
+ ActivationReasonNormal
+ };
+
+ const char KActivityScheme[] = "appto";
+
+ const char KActivityUriNameKey[] = "activityname";
+ const char KActivityUriBackgroundKey[] = "activityinbackground";
+}
+
+#endif // AFACTIVITIES_GLOBAL_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/camerauis/cameraxui/cxui/stubs_desktop/inc/afactivitystorage.h Wed Oct 06 15:52:13 2010 +0300
@@ -0,0 +1,52 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+* Stub version of epoc32\include\platform\mw\afactivitystorage.h to be used in desktop build.
+*
+*/
+#ifndef AFACTIVITYSTORAGE_H
+#define AFACTIVITYSTORAGE_H
+
+
+#include <QString>
+#include <QStringList>
+#include <QVariant>
+#include <QScopedPointer>
+
+#include "afactivities_global.h"
+
+class AfActivityStorage : public QObject
+{
+ Q_OBJECT
+
+public:
+ AfActivityStorage(QObject *parent = 0) {}
+ virtual ~AfActivityStorage() {}
+
+public slots:
+ bool saveActivity(const QString &activityId, const QVariant &activityData, const QVariantHash &metadata) {return true;}
+ bool removeActivity(const QString &activityId) {return true;}
+
+ QStringList allActivities() const {return QStringList();}
+
+ QVariant activityData(const QString &activityId) const {return QVariant();}
+ QVariantHash activityMetaData(const QString &activityId) const {return QVariantHash();}
+
+private:
+ Q_DISABLE_COPY(AfActivityStorage)
+
+};
+
+#endif // AFACTIVITYSTORAGE_H
--- a/camerauis/cameraxui/cxui/stubs_desktop/inc/xqaiwdecl.h Fri Sep 24 11:12:50 2010 +0300
+++ b/camerauis/cameraxui/cxui/stubs_desktop/inc/xqaiwdecl.h Wed Oct 06 15:52:13 2010 +0300
@@ -48,5 +48,13 @@
#define XQCAMERA_INDEX_SWITCH QLatin1String("AllowCameraSwitch")
#define XQCAMERA_QUALITY_CHANGE QLatin1String("AllowQualityChange")
+/*!
+ A key name for XQRequestInfo object to pass a window title
+ to be shown in service application instead of the default title.
+ Service application is responsible to handle the key value.
+ \see XQApplicationMgr::XQRequestInfo::setInfo()
+*/
+#define XQINFO_KEY_WINDOW_TITLE QLatin1String("WindowTitle")
+
#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/camerauis/cameraxui/cxui/stubs_desktop/inc/xqrequestinfo.h Wed Oct 06 15:52:13 2010 +0300
@@ -0,0 +1,57 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+* Stub version of epoc32\include\mw\xqrequestinfo.h to be used in desktop build.
+*
+*/
+
+#ifndef XQREQUESTINFO_H
+#define XQREQUESTINFO_H
+
+#include <QVariant>
+#include <QStringList>
+#include <QSet>
+
+
+class XQRequestInfo
+{
+ public:
+ XQRequestInfo() {}
+ virtual ~XQRequestInfo() {}
+
+ public:
+
+ bool isValid() const {return true;}
+
+ void setEmbedded(bool on) {}
+ bool isEmbedded() const {return false;}
+ void setBackground(bool on) {}
+ bool isBackground() const {return false;}
+ bool isSynchronous() const {return false;}
+ void setForeground(bool on) {}
+ bool isForeground() const {return false;}
+
+ quint32 clientSecureId() const {return 0;}
+ quint32 clientVendorId() const {return 0;}
+ QSet<int> clientCapabilities() const {return QSet<int>();}
+ int id() const {return 0;}
+
+ void setInfo(const QString &key, const QVariant &value) {}
+ QVariant info(const QString &key) const {return QVariant();}
+ QStringList infoKeys() const {return QStringList();}
+
+};
+
+#endif
--- a/camerauis/cameraxui/cxui/stubs_desktop/inc/xqserviceprovider.h Fri Sep 24 11:12:50 2010 +0300
+++ b/camerauis/cameraxui/cxui/stubs_desktop/inc/xqserviceprovider.h Wed Oct 06 15:52:13 2010 +0300
@@ -20,6 +20,7 @@
#include <QObject>
#include <QString>
+#include "xqrequestinfo.h"
class XQServiceProvider : public QObject
{
@@ -31,7 +32,7 @@
virtual void publishAll(){}
bool completeRequest(int index, const QVariant &retValue) {return true;}
int setCurrentRequestAsync() {return 0;}
-
+ XQRequestInfo requestInfo() const {return XQRequestInfo();}
};
#endif // XQSERVICEPROVIDER_H
--- a/inc/CamcorderInternalPSKeys.h Fri Sep 24 11:12:50 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-/*
-* Copyright (c) 2004 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Camcorder internal Publish & Subscribe keys.
-*
-*/
-
-
-
-#ifndef CAMCORDERINTERNALPSKEYS_H
-#define CAMCORDERINTERNALPSKEYS_H
-
-const TUid KPSUidCamcorderNotifier = {0x101F882E};
-
-// Camcorder Notification API
-
-const TUint32 KCCorLatestFilePath = 0x00000001;
-
-#endif // CAMCORDERINTERNALPSKEYS_H
-
-
-// End of File
--- a/package_definition.xml Fri Sep 24 11:12:50 2010 +0300
+++ b/package_definition.xml Wed Oct 06 15:52:13 2010 +0300
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
- <package id="camera" name="Camera Apps">
+ <package id="camera" name="Camera Apps" version="1.0.0">
<collection id="camerauis" name="Camera UIs">
<component id="cameraxui" filter="s60" name="CameraX UIs">
<meta rel="testbuild">
@@ -10,5 +10,11 @@
<unit bldFile="camerauis/cameraxui/cxengine/tsrc/unit" qt:proFile="unit.pro" filter="test,unit_test"/>
</component>
</collection>
+ <collection id="camera_info" name="Camera Application Info" level="int">
+ <component id="camera_sis" filter="s60" name="Camera Application SIS installation files" class="config">
+ <!-- consider moving these exports into the other collections -->
+ <unit bldFile="sis"/>
+ </component>
+ </collection>
</package>
</SystemDefinition>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sis/bld.inf Wed Oct 06 15:52:13 2010 +0300
@@ -0,0 +1,24 @@
+/*
+* ============================================================================
+* Name : bld.inf
+* Part of : camerax
+* Description : Build file for exporting camerax stub sis file to the ROM
+* Version : %version: 1 % << Don't touch! Updated by Synergy at check-out.
+*
+* Copyright © 2010 Nokia and/or its subsidiary(-ies). All rights reserved.
+* This material, including documentation and any related computer
+* programs, is protected by copyright controlled by Nokia. All
+* rights are reserved. Copying, including reproducing, storing,
+* adapting or translating, any or all of this material requires the
+* prior written consent of Nokia. This material also contains
+* confidential information which may not be disclosed to others
+* without the prior written consent of Nokia.
+* ============================================================================
+* Template version: 4.2
+*/
+
+PRJ_PLATFORMS
+DEFAULT
+
+PRJ_EXPORTS
+camerax_stub.sis \epoc32\data\z\system\install\camerax_stub.sis
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sis/camerax_depends.xml Wed Oct 06 15:52:13 2010 +0300
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ad:metadata xmlns="http://nokia.com/arrow/repository/ia_component"
+ xmlns:ad="http://nokia.com/arrow/application_metadata">
+ <!--
+ The appResources element contains all the language metadata of one IAC.
+ IAC may have one or more language-specific component names
+ and descriptions inside appResource element.
+
+ Language ID 1 should be always defined as this is the default language
+ in case other languages supported by the client cannot be found.
+ -->
+ <appResources>
+ <appResource>
+ <!-- Language ID -->
+ <language>1</language>
+ <!-- Name in given language -->
+ <iacName>Camera application</iacName>
+ <!-- Description in given language -->
+ <iacDescription>Camera application update</iacDescription>
+ </appResource>
+ </appResources>
+ <!-- Specifies for what versions of what platform this component is for. -->
+ <swPlatformDep>
+ <!-- platform code -->
+ <platform>S60</platform>
+ <versionFrom>
+ <!--
+ platform version number separated in major and minor number (i.e.
+ 3.0 has 3 as major and 0 as minor)
+ -->
+ <major>6</major>
+ <minor>1</minor>
+ <!--
+ date-element can be used to pinpoint platform version number to even
+ more specific one. It is not currently used in the system.
+ -->
+ <date>
+ <year>2010</year>
+ <week>34</week>
+ </date>
+ </versionFrom>
+ </swPlatformDep>
+ <!-- specifies dependencies to other IACs -->
+ <interDeps>
+ </interDeps>
+ <firmwareDependencies>
+ </firmwareDependencies>
+ <rebootAfterInstall>false</rebootAfterInstall>
+</ad:metadata>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sis/camerax_package.pkg Wed Oct 06 15:52:13 2010 +0300
@@ -0,0 +1,38 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Symbian Foundation License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description:
+;
+
+; Language
+&EN
+
+; SIS header: name, uid, version
+#{"cxui"},(0x20031EC3),1,0,0, TYPE=SA,RU
+
+; Localised Vendor name
+%{"Nokia"}
+
+; Unique Vendor name
+:"Nokia"
+
+; Dependencies
+[0x20032DE7],0,0,0,{"S60ProductID"}
+
+; CameraX UI
+"\epoc32\release\armv5\urel\cxui.exe" - "!:\sys\bin\cxui.exe"
+"\epoc32\data\z\resource\apps\cxui.rsc" - "!:\resource\apps\cxui.rsc"
+"\epoc32\data\z\private\10003a3f\import\apps\cxui_reg.rsc" - "!:\private\10003a3f\import\apps\cxui_reg.rsc"
+
+; CameraX Engine
+"\epoc32\release\armv5\urel\cxengine.dll" - "!:\sys\bin\cxengine.dll"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sis/camerax_stub.pkg Wed Oct 06 15:52:13 2010 +0300
@@ -0,0 +1,30 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of the License "Symbian Foundation License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description: This is a PKG file for creating stub sis package of camerax
+; application. This sis is exported to the ROM image and used by IAD service
+; to determine the initial version of the application.
+;
+
+; Language
+&EN
+
+; SIS header: name, uid, version
+#{"cxui"},(0x20031EC3),1,0,0, TYPE=SA
+
+; Localised Vendor name
+%{"Nokia"}
+
+; Unique Vendor name
+:"Nokia"
+
Binary file sis/camerax_stub.sis has changed