diff -r 3075d9b614e6 -r 0e652f8f1fbd camerauis/cameraxui/cxui/cxui.pro
--- a/camerauis/cameraxui/cxui/cxui.pro	Thu May 13 21:30:19 2010 +0300
+++ b/camerauis/cameraxui/cxui/cxui.pro	Thu Jul 15 01:55:05 2010 +0300
@@ -24,13 +24,19 @@
     TARGET.UID3         = 0x101f857a
     TARGET.VID          = VID_DEFAULT
     TARGET.EPOCHEAPSIZE = 0x020000 0x1000000
-    ICON                = ./icons/cxui.svg
+    SKINICON            = qtg_large_camera
     RSS_RULES           = "group_name=\"Qt Camera\";"
     # Fix for QMake translating INCLUDEPATH to SYSTEMINCLUDE
     # and TraceCompiler needing USERINCLUDE.
     MMP_RULES           += "USERINCLUDE traces"
 }
 
+# export sound file
+symbian {
+    CXUI_DIR = $$section(PWD,":",1)
+    BLD_INF_RULES.prj_exports += "$$CXUI_DIR/data/selftimer.wav    /epoc32/data/z/system/sounds/digital/selftimer.wav"
+}
+
 DEPENDPATH += ../cxengine/inc/api
 VPATH += src \
     inc
@@ -45,7 +51,6 @@
     -lcxengine \
     -lapmime \
     -lcommonui \
-    -lxqsettingsmanager \
     -lxqutils \
     -lxqservice \
     -lxqserviceutil \
@@ -54,7 +59,9 @@
     -lefsrv \
     -lws32 \
     -lgdi \
-    -lapgrfx
+    -lapgrfx \
+    -lusbman \
+    -lthumbnailmanagerqt
 
 CONFIG += hb
 CONFIG += service
@@ -68,6 +75,8 @@
 HEADERS += cxuiapplication.h \
     cxuiapplicationframeworkmonitor.h \
     cxuiapplicationframeworkmonitorprivate.h \
+    cxuiapplicationstate.h \
+    cxuiview.h \
     cxuiprecaptureview.h \
     cxuistillprecaptureview.h \
     cxuivideoprecaptureview.h \
@@ -83,19 +92,22 @@
     cxuisettingradiobuttonlist.h \
     cxuiscenelabel.h \
     cxuierrormanager.h \
-    cxuistandby.h \
     cxuisettingradiobuttonlistmodel.h \
     cxuisettingsinfo.h \
     cxuisettingxmlreader.h \
     cxuiserviceprovider.h \
     cxuiscenemodeview.h \
     cxuizoomslider.h \
+    cxuifullscreenpopup.h \
+    cxuieventlog.h \
     traces/OstTraceDefinitions.h
 
 SOURCES += main.cpp \
     cxuiapplication.cpp \
     cxuiapplicationframeworkmonitor.cpp \
     cxuiapplicationframeworkmonitorprivate.cpp \
+    cxuiapplicationstate.cpp \
+    cxuiview.cpp \
     cxuiprecaptureview.cpp \
     cxuivideoprecaptureview.cpp \
     cxuistillprecaptureview.cpp \
@@ -110,13 +122,14 @@
     cxuisettingradiobuttonlist.cpp \
     cxuiscenelabel.cpp \
     cxuierrormanager.cpp \
-    cxuistandby.cpp \
     cxuisettingradiobuttonlistmodel.cpp \
     cxuisettingsinfo.cpp \
     cxuisettingxmlreader.cpp \
     cxuiserviceprovider.cpp \
     cxuiscenemodeview.cpp \
-    cxuizoomslider.cpp
+    cxuizoomslider.cpp \
+    cxuifullscreenpopup.cpp \
+    cxuieventlog.cpp
 
 RESOURCES += cxui.qrc