--- a/iaupdate/IAD/ui/inc/iaupdatemainview.h	Tue Jun 15 13:36:10 2010 +0100
+++ b/iaupdate/IAD/ui/inc/iaupdatemainview.h	Thu Jul 22 16:35:01 2010 +0100
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2009-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"
@@ -19,7 +19,7 @@
 #ifndef IAUPDATEMAINVIEW_H_
 #define IAUPDATEMAINVIEW_H_
 
-#include <HbView.h>
+#include <hbview.h>
 #include <QItemSelection> 
 
 #include "iaupdatenode.h"
@@ -28,7 +28,13 @@
 
 
 class HbListWidget;
+class HbAction;
+class HbAbstractViewItem;
+class HbGroupBox;
+class HbDataForm;
 class IAUpdateEngine;
+class IAUpdateDialogUtil;
+class TIAUpdateVersion;
 
 
 class IAUpdateMainView : public HbView
@@ -42,6 +48,9 @@
     void refresh(const RPointerArray<MIAUpdateNode> &nodes,
                  const RPointerArray<MIAUpdateFwNode> &fwNodes,
                  int error);
+signals:
+    void toSettingView();
+    
 public slots:
     void handleStartUpdate();
  
@@ -49,21 +58,65 @@
  
     void handleDisclaimer();
     
-    void handleSelectionChanged(QItemSelection);
+    void handleDetails(HbAbstractViewItem *, const QPointF &);
+    
+    void handleFotaDetails(HbAbstractViewItem *, const QPointF &); 
+    
+    void handleSelectionChanged(const QItemSelection &selected, const QItemSelection &deselected);
+    
+    void handleFwSelectionChanged(const QItemSelection &selected, const QItemSelection &deselected);
+    
+    void dialogFinished(HbAction* action);
     
 private:
     
-    void getSelectedNodes(RPointerArray<MIAUpdateAnyNode> &selectedNodes) const;
+    bool fotaSelected() const;
     void markListItem(bool mark, int index);
-    bool getMandatoryNodes(RPointerArray<MIAUpdateAnyNode> &mandNodes) const;
-    void showUpdateCannotOmitDialog() const; 
-    bool showDependenciesFoundDialog(QString &text) const;
+    void markFotaItem(bool mark);
+    bool getMandatoryNodes(RPointerArray<MIAUpdateNode> &mandNodes) const;
+    void showUpdateCannotOmitDialog(); 
+    void showDependenciesFoundDialog(QString &text);
+    void updateSelectionsToNodeArray(MIAUpdateNode &node, bool mark);
     void updateSelectionsToList();
+    MIAUpdateNode* getApplicationNode(int index) const;
+    void showDetails(MIAUpdateAnyNode& node);
+    void constructDetailsText(MIAUpdateAnyNode &node, QString &text);
+    void versionText(const TIAUpdateVersion &version, QString &versionText);
+    void fileSizeText(int fileSize, QString &text);
+    void setImportance(MIAUpdateAnyNode *node, QString &importanceDescription);
+    void removeCurrentContentLayout();
+    void refreshFirmwareUpdates(const RPointerArray<MIAUpdateFwNode> &fwNodes);
+    void refreshFotaUpdate(MIAUpdateFwNode& fwNode);
+    void refreshNsuUpdate();
+    void refreshApplicationUpdates(const RPointerArray<MIAUpdateNode> &nodes);
+    void updateSelectionInfoInDock();
     
 private:
+    enum DialogState
+        {
+        NoDialog,
+        Dependencies,
+        CannotOmit,
+        Details
+        };
+     
     IAUpdateEngine *mEngine;
+    IAUpdateDialogUtil *mDialogUtil;
+    HbWidget *mContent;
     HbListWidget *mListView;
-    RPointerArray<MIAUpdateAnyNode> mAllNodes;
+    HbListWidget *mFwListView;
+    HbGroupBox *mApplicationUpdatesGroupBox;
+    HbGroupBox *mFwNSUGroupBox;
+    HbDataForm *mContentDataForm;
+    HbGroupBox *mSelections;
+    RPointerArray<MIAUpdateNode> mNodes;
+    RPointerArray<MIAUpdateFwNode> mFwNodes;
+    DialogState mDialogState; 
+    HbAction *mPrimaryAction;
+    MIAUpdateNode *mNode; 
+    bool mMark;
+    bool mSelectionUpdate;
+    bool mSelectionConnect;
 
 };