--- a/camerauis/cameraxui/cxui/inc/cxuiviewmanager.h Fri Jun 11 13:26:48 2010 +0300
+++ b/camerauis/cameraxui/cxui/inc/cxuiviewmanager.h Wed Jun 23 17:59:54 2010 +0300
@@ -56,6 +56,9 @@
*/
CxuiDocumentLoader* documentLoader();
+ //@todo: Temporarily needed in main().
+ bool proceedStartup();
+
public slots:
void changeToPostcaptureView();
void changeToPrecaptureView();
@@ -64,8 +67,10 @@
void showScenesView();
private slots:
+ void startupCheck();
void toForeground();
void handleForegroundStateChanged(CxuiApplicationFrameworkMonitor::ForegroundState state);
+ void showUsbErrorPopup(bool show);
void handleBatteryEmpty();
void aboutToLooseFocus();
void aboutToGainFocus();
@@ -81,6 +86,7 @@
bool eventFilter(QObject *object, QEvent *event);
private:
+ void initStartupView();
void createStillPrecaptureView();
void createVideoPrecaptureView();
CxuiPrecaptureView* getPrecaptureView(Cxe::CameraMode mode, Cxe::CameraIndex camera);