--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/devicemanagementnotifiersplugin/dialog.docml Fri May 14 15:42:35 2010 +0300
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<hbdocument version="0.9">
+ <object name="qtl_dialog_softkey_2_left" type="HbAction">
+ <string name="role" value="HbDialog:primaryAction"/>
+ <string name="role" value="HbDialog:primaryAction"/>
+ <string name="text" value="OK"/>
+ </object>
+ <object name="qtl_dialog_softkey_2_right" type="HbAction">
+ <string name="role" value="HbDialog:secondaryAction"/>
+ <string name="role" value="HbDialog:secondaryAction"/>
+ <string name="text" value="Cancel"/>
+ </object>
+ <widget name="dialog" type="HbDialog">
+ <widget name="qtl_dialog_pri_heading" role="HbDialog:headingWidget" type="HbLabel">
+ <contentsmargins bottom="var(hb-param-margin-gene-popup)" left="var(hb-param-margin-gene-popup)" right="var(hb-param-margin-gene-popup)" top="var(hb-param-margin-gene-popup)"/>
+ <string name="plainText" value="Update available"/>
+ <fontspec name="fontSpec" role="Primary" textheight="var(hb-param-text-height-primary)"/>
+ </widget>
+ <widget name="qtl_dialog_pri5_large_graphic" role="HbDialog:contentWidget" type="HbWidget">
+ <widget name="icon" type="HbLabel">
+ <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
+ <icon iconName="note_warning" name="icon"/>
+ <sizepolicy horizontalPolicy="Fixed" horizontalStretch="0" verticalPolicy="Fixed" verticalStretch="0"/>
+ <sizehint height="var(hb-param-graphic-size-primary-large)" type="FIXED" width="var(hb-param-graphic-size-primary-large)"/>
+ <bool name="visible" value="TRUE"/>
+ </widget>
+ <widget name="qtl_dialog_pri5" type="HbLabel">
+ <enums name="textWrapping" value="TextWordWrap"/>
+ <bool name="visible" value="TRUE"/>
+ <string name="plainText" value="Recommended update is available from TarmBlr. Downloading requires connection to the internet"/>
+ <fontspec name="fontSpec" role="Primary" textheight="var(hb-param-text-height-primary)"/>
+ </widget>
+ <real name="z" value="0"/>
+ <contentsmargins bottom="0un" left="0un" right="0un" top="0un"/>
+ <layout orientation="Horizontal" spacing="var(hb-param-margin-gene-popup)" type="linear">
+ <contentsmargins bottom="var(hb-param-margin-gene-popup)" left="var(hb-param-margin-gene-popup)" right="var(hb-param-margin-gene-popup)" top="var(hb-param-margin-gene-popup)"/>
+ <linearitem itemname="icon"/>
+ <linearitem itemname="qtl_dialog_pri5"/>
+ </layout>
+ </widget>
+ <sizehint height="42.08955un" type="PREFERRED" width="50.5un"/>
+ <ref object="qtl_dialog_softkey_2_left" role="HbDialog:primaryAction"/>
+ <ref object="qtl_dialog_softkey_2_right" role="HbDialog:secondaryAction"/>
+ </widget>
+ <metadata activeUIState="Common ui state" display="NHD portrait" unit="un">
+ <resource location="TemplateIcons.qrc"/>
+ <uistate name="Common ui state" sections="#common"/>
+ </metadata>
+</hbdocument>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/devicemanagementnotifiersplugin/dialoginformative.docml Fri May 14 15:42:35 2010 +0300
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<hbdocument version="0.9">
+ <object name="qtl_dialog_softkey_2_left" type="HbAction">
+ <string name="role" value="HbDialog:primaryAction"/>
+ <string name="role" value="HbDialog:primaryAction"/>
+ <string name="text" value="OK"/>
+ </object>
+ <object name="qtl_dialog_softkey_2_right" type="HbAction">
+ <string name="role" value="HbDialog:secondaryAction"/>
+ <string name="role" value="HbDialog:secondaryAction"/>
+ <string name="text" value="Cancel"/>
+ </object>
+ <widget name="dialog" type="HbDialog">
+ <widget name="qtl_dialog_pri5_large_graphic" role="HbDialog:contentWidget" type="HbWidget">
+ <widget name="icon" type="HbLabel">
+ <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
+ <icon iconName="note_warning" name="icon"/>
+ <sizepolicy horizontalPolicy="Fixed" horizontalStretch="0" verticalPolicy="Fixed" verticalStretch="0"/>
+ <sizehint height="var(hb-param-graphic-size-primary-large)" type="FIXED" width="var(hb-param-graphic-size-primary-large)"/>
+ <bool name="visible" value="TRUE"/>
+ </widget>
+ <widget name="qtl_dialog_pri5" type="HbLabel">
+ <enums name="textWrapping" value="TextWordWrap"/>
+ <bool name="visible" value="TRUE"/>
+ <string name="plainText" value=""/>
+ <fontspec name="fontSpec" role="Primary" textheight="var(hb-param-text-height-primary)"/>
+ </widget>
+ <real name="z" value="0"/>
+ <contentsmargins bottom="0un" left="0un" right="0un" top="0un"/>
+ <layout orientation="Horizontal" spacing="var(hb-param-margin-gene-popup)" type="linear">
+ <contentsmargins bottom="var(hb-param-margin-gene-popup)" left="var(hb-param-margin-gene-popup)" right="var(hb-param-margin-gene-popup)" top="var(hb-param-margin-gene-popup)"/>
+ <linearitem itemname="icon"/>
+ <linearitem itemname="qtl_dialog_pri5"/>
+ </layout>
+ </widget>
+ <sizehint height="23.28358un" type="PREFERRED" width="50.5un"/>
+ </widget>
+ <metadata activeUIState="Common ui state" display="NHD portrait" unit="un">
+ <resource location="TemplateIcons.qrc"/>
+ <uistate name="Common ui state" sections="#common"/>
+ </metadata>
+</hbdocument>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/devicemanagementnotifiersplugin/dialogserverpushconfirm.docml Fri May 14 15:42:35 2010 +0300
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<hbdocument version="0.9">
+ <object name="qtl_dialog_softkey_2_left" type="HbAction">
+ <string name="role" value="HbDialog:primaryAction"/>
+ <string name="role" value="HbDialog:primaryAction"/>
+ <string name="text" value="Yes"/>
+ </object>
+ <object name="qtl_dialog_softkey_2_right" type="HbAction">
+ <string name="role" value="HbDialog:secondaryAction"/>
+ <string name="role" value="HbDialog:secondaryAction"/>
+ <string name="text" value="No"/>
+ </object>
+ <widget name="dialog" type="HbDialog">
+ <widget name="container" role="HbDialog:contentWidget" type="HbWidget">
+ <widget name="qtl_dialog_pri5" type="HbLabel">
+ <enums name="textWrapping" value="TextWordWrap"/>
+ <real name="z" value="2"/>
+ <contentsmargins bottom="var(hb-param-margin-gene-popup)" left="var(hb-param-margin-gene-popup)" right="var(hb-param-margin-gene-popup)" top="var(hb-param-margin-gene-popup)"/>
+ <bool name="visible" value="TRUE"/>
+ <string name="plainText" value=""/>
+ <fontspec name="fontSpec" role="Primary" textheight="var(hb-param-text-height-primary)"/>
+ </widget>
+ <real name="z" value="0"/>
+ <layout spacing="0un" type="grid">
+ <contentsmargins bottom="var(hb-param-margin-view-bottom)" left="var(hb-param-margin-view-left)" right="var(hb-param-margin-view-right)" top="var(hb-param-margin-view-top)"/>
+ <griditem column="0" itemname="qtl_dialog_pri5" row="0"/>
+ </layout>
+ </widget>
+ <widget name="qtl_dialog_pri_heading" role="HbDialog:headingWidget" type="HbLabel">
+ <enums name="alignment" value="AlignLeft|AlignLeading"/>
+ <contentsmargins bottom="var(hb-param-margin-gene-popup)" left="var(hb-param-margin-gene-popup)" right="var(hb-param-margin-gene-popup)" top="var(hb-param-margin-gene-popup)"/>
+ <string name="plainText" value="Server Message"/>
+ <fontspec name="fontSpec" role="Primary" textheight="var(hb-param-text-height-primary)"/>
+ </widget>
+ <sizehint height="42.38806un" type="PREFERRED" width="50.5un"/>
+ <ref object="qtl_dialog_softkey_2_left" role="HbDialog:primaryAction"/>
+ <ref object="qtl_dialog_softkey_2_right" role="HbDialog:secondaryAction"/>
+ </widget>
+ <metadata activeUIState="Common ui state" display="NHD portrait" unit="un">
+ <uistate name="Common ui state" sections="#common"/>
+ </metadata>
+</hbdocument>
--- a/deviceupdatesui/deviceupdates/deviceupdates.pro Mon May 03 12:24:32 2010 +0300
+++ b/deviceupdatesui/deviceupdates/deviceupdates.pro Fri May 14 15:42:35 2010 +0300
@@ -21,6 +21,7 @@
:BLD_INF_RULES.prj_exports += "./rom/deviceupdates.iby CORE_APP_LAYER_IBY_EXPORT_PATH(deviceupdates.iby)"
:BLD_INF_RULES.prj_exports += "./rom/deviceupdates_resources.iby LANGUAGE_APP_LAYER_IBY_EXPORT_PATH(deviceupdates_resources.iby)"
:BLD_INF_RULES.prj_exports += "./conf/101F6DE5.txt /epoc32/data/z/private/10202be9/101F6DE5.txt"
+ :BLD_INF_RULES.prj_exports += "./conf/101F6DE5.txt /epoc32/winscw/c/private/10202be9/101F6DE5.txt"
TARGET.UID2 = 0x100039CE
TARGET.UID3 = 0x101F6DE5
TARGET.CAPABILITY = CAP_APPLICATION
@@ -38,7 +39,8 @@
-lsysversioninfo\
-letel3rdparty\
-letelpckt\
- -lcmmanager
+ -lcmmanager\
+ -lsisregistryclient
}
TEMPLATE = app
TARGET = deviceupdates
--- a/deviceupdatesui/deviceupdates/inc/dmadvancedview.h Mon May 03 12:24:32 2010 +0300
+++ b/deviceupdatesui/deviceupdates/inc/dmadvancedview.h Fri May 14 15:42:35 2010 +0300
@@ -91,6 +91,9 @@
void serversListGroupClicked(bool state);
void reLayout(Qt::Orientation layoutType);
void backButtonClicked();
+ void defaultMenuItemSelected();
+ void deleteMenuItemSelected();
+ void connectMenuItemSelected();
private:
HbGroupBox *serversListGroup;
@@ -98,7 +101,6 @@
HbListView* list;
HbListView* otherdetailslist;
HbLabel *label;
- HbMenu* csmenu;
HbMenu* viewspecificmenu;
HbAction* help;
HbAction* exit;
@@ -126,6 +128,10 @@
RTelServer iServer;
RTelServer::TPhoneInfo info;
RMobilePhone::TMobilePhoneNetworkSecurity idispSecurity;
+ int currentselecteditem;
+ //This item should not be deleted,it just refer an item and deletion
+ //will be taken care by List view
+ QStandardItem *modelItem;
};
#endif // DMADVANCEDVIEW_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/deviceupdates/resources/UpdateDialog.docml Fri May 14 15:42:35 2010 +0300
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<hbdocument version="0.9">
+ <object name="qtl_dialog_softkey_2_left" type="HbAction">
+ <string name="role" value="HbDialog:primaryAction"/>
+ <string name="role" value="HbDialog:primaryAction"/>
+ <string name="text" value="OK"/>
+ </object>
+ <object name="qtl_dialog_softkey_2_right" type="HbAction">
+ <string name="role" value="HbDialog:secondaryAction"/>
+ <string name="role" value="HbDialog:secondaryAction"/>
+ <string name="text" value="Cancel"/>
+ </object>
+ <widget name="UpdateDialog" type="HbDialog">
+ <widget name="qtl_dialog_pri5_large_graphic" role="HbDialog:contentWidget" type="HbWidget">
+ <widget name="icon" type="HbLabel">
+ <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
+ <icon iconName="note_warning" name="icon"/>
+ <sizepolicy horizontalPolicy="Fixed" horizontalStretch="0" verticalPolicy="Fixed" verticalStretch="0"/>
+ <sizehint height="var(hb-param-graphic-size-primary-large)" type="FIXED" width="var(hb-param-graphic-size-primary-large)"/>
+ <bool name="visible" value="TRUE"/>
+ </widget>
+ <widget name="DialogText" type="HbLabel">
+ <enums name="textWrapping" value="TextWordWrap"/>
+ <bool name="visible" value="TRUE"/>
+ <string name="plainText" value="No server configured to get the updates. Please call customer care."/>
+ <fontspec name="fontSpec" role="Primary" textheight="var(hb-param-text-height-primary)"/>
+ </widget>
+ <real name="z" value="0"/>
+ <contentsmargins bottom="0un" left="0un" right="0un" top="0un"/>
+ <layout orientation="Horizontal" spacing="var(hb-param-margin-gene-popup)" type="linear">
+ <contentsmargins bottom="var(hb-param-margin-gene-popup)" left="var(hb-param-margin-gene-popup)" right="var(hb-param-margin-gene-popup)" top="var(hb-param-margin-gene-popup)"/>
+ <linearitem itemname="icon"/>
+ <linearitem itemname="DialogText"/>
+ </layout>
+ </widget>
+ <sizehint height="17.46269un" type="PREFERRED" width="50.5un"/>
+ <sizehint height="15un" type="MINIMUM"/>
+ <sizehint height="25un" type="MAXIMUM"/>
+ </widget>
+ <metadata activeUIState="Common ui state" display="NHD portrait" unit="un">
+ <uistate name="Common ui state" sections="#common"/>
+ </metadata>
+</hbdocument>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/deviceupdates/resources/devman.docml Fri May 14 15:42:35 2010 +0300
@@ -0,0 +1,357 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<hbdocument version="0.9">
+ <object name="help" type="HbAction">
+ <string name="text" value="Help"/>
+ </object>
+ <object name="exit" type="HbAction">
+ <string name="text" value="Exit"/>
+ </object>
+ <section name="Portrait">
+ <widget name="p:view" type="HbView">
+ <widget name="content" role="HbView:widget" type="HbWidget">
+ <widget name="scrollArea" type="HbScrollArea">
+ <widget name="scrollAreaContents" role="HbScrollArea:contents" type="HbWidget">
+ <widget name="p:updatelabel" type="HbLabel">
+ <enums name="textWrapping" value="TextWordWrap"/>
+ <real name="z" value="1"/>
+ <sizehint height="10.14925un" type="PREFERRED" width="48.80597un"/>
+ <string name="plainText" value="To update your device software to latest available device software"/>
+ </widget>
+ <widget name="p:update" type="HbPushButton">
+ <real name="z" value="2"/>
+ <sizepolicy horizontalPolicy="Minimum" horizontalStretch="0" verticalPolicy="Preferred" verticalStretch="0"/>
+ <sizehint height="5.97015un" type="PREFERRED" width="32.08955un"/>
+ <string name="text" value="Update"/>
+ <string name="state" value="normal"/>
+ </widget>
+ <widget name="p:advanced" type="HbPushButton">
+ <real name="z" value="4"/>
+ <sizepolicy horizontalPolicy="Minimum" horizontalStretch="0" verticalPolicy="Preferred" verticalStretch="0"/>
+ <sizehint height="5.97015un" type="PREFERRED" width="32.38806un"/>
+ <string name="text" value="Advanced"/>
+ <string name="state" value="normal"/>
+ </widget>
+ <widget name="label" type="HbLabel">
+ <real name="z" value="5"/>
+ <sizehint height="3.8806un" type="PREFERRED" width="44.32836un"/>
+ <bool name="enabled" value="TRUE"/>
+ <bool name="visible" value="FALSE"/>
+ <string name="plainText" value="Product Release"/>
+ <fontspec name="fontSpec" role="Primary" textheight="26.8"/>
+ </widget>
+ <widget name="label_1" type="HbLabel">
+ <real name="z" value="6"/>
+ <sizehint height="3.8806un" type="PREFERRED" width="44.17911un"/>
+ <bool name="enabled" value="FALSE"/>
+ <bool name="visible" value="FALSE"/>
+ <string name="plainText" value="Label"/>
+ </widget>
+ <widget name="label_2" type="HbLabel">
+ <real name="z" value="7"/>
+ <sizehint height="3.8806un" type="PREFERRED" width="44.32836un"/>
+ <bool name="enabled" value="FALSE"/>
+ <bool name="visible" value="FALSE"/>
+ <string name="plainText" value="Software Version"/>
+ <fontspec name="fontSpec" role="Primary" textheight="26.8"/>
+ </widget>
+ <widget name="label_3" type="HbLabel">
+ <real name="z" value="8"/>
+ <sizehint height="3.8806un" type="PREFERRED" width="44.32836un"/>
+ <bool name="enabled" value="FALSE"/>
+ <bool name="visible" value="FALSE"/>
+ <string name="plainText" value="Label"/>
+ <fontspec name="fontSpec" role="Secondary" textheight="23.45"/>
+ </widget>
+ <widget name="label_4" type="HbLabel">
+ <real name="z" value="9"/>
+ <sizehint height="3.8806un" type="PREFERRED" width="44.32836un"/>
+ <bool name="visible" value="FALSE"/>
+ <string name="plainText" value="Model"/>
+ <fontspec name="fontSpec" role="Primary" textheight="26.8"/>
+ </widget>
+ <widget name="label_5" type="HbLabel">
+ <real name="z" value="10"/>
+ <sizehint height="3.8806un" type="PREFERRED" width="44.32836un"/>
+ <bool name="visible" value="FALSE"/>
+ <string name="plainText" value="Label"/>
+ <fontspec name="fontSpec" role="Secondary" textheight="23.45"/>
+ </widget>
+ <widget name="label_6" type="HbLabel">
+ <real name="z" value="11"/>
+ <sizehint height="3.8806un" type="PREFERRED" width="44.32836un"/>
+ <bool name="visible" value="FALSE"/>
+ <string name="plainText" value="Type"/>
+ <fontspec name="fontSpec" role="Primary" textheight="26.8"/>
+ </widget>
+ <widget name="label_7" type="HbLabel">
+ <real name="z" value="12"/>
+ <sizehint height="3.8806un" type="PREFERRED" width="44.32836un"/>
+ <bool name="visible" value="FALSE"/>
+ <string name="plainText" value="Label"/>
+ <fontspec name="fontSpec" role="Secondary" textheight="23.45"/>
+ </widget>
+ <widget name="label_8" type="HbLabel">
+ <real name="z" value="13"/>
+ <sizehint height="3.8806un" type="PREFERRED" width="44.32836un"/>
+ <bool name="visible" value="FALSE"/>
+ <string name="plainText" value="Product Code"/>
+ <fontspec name="fontSpec" role="Primary" textheight="26.8"/>
+ </widget>
+ <widget name="label_9" type="HbLabel">
+ <real name="z" value="14"/>
+ <sizehint height="3.8806un" type="PREFERRED" width="44.32836un"/>
+ <bool name="visible" value="FALSE"/>
+ <string name="plainText" value="Label"/>
+ <fontspec name="fontSpec" role="Secondary" textheight="23.45"/>
+ </widget>
+ <widget name="label_10" type="HbLabel">
+ <real name="z" value="15"/>
+ <sizehint height="3.8806un" type="PREFERRED" width="44.32836un"/>
+ <bool name="visible" value="FALSE"/>
+ <string name="plainText" value="IMEI"/>
+ <fontspec name="fontSpec" role="Primary" textheight="26.8"/>
+ </widget>
+ <widget name="label_11" type="HbLabel">
+ <real name="z" value="16"/>
+ <sizehint height="3.8806un" type="PREFERRED" width="44.32836un"/>
+ <bool name="visible" value="FALSE"/>
+ <string name="plainText" value="Label"/>
+ <fontspec name="fontSpec" role="Secondary" textheight="23.45"/>
+ </widget>
+ <real name="z" value="0"/>
+ <sizehint height="95.37314un" type="PREFERRED" width="53.73134un"/>
+ <layout type="anchor">
+ <anchoritem dst="p:updatelabel" dstEdge="LEFT" spacing="1.79105un" src="" srcEdge="LEFT"/>
+ <anchoritem dst="p:updatelabel" dstEdge="TOP" spacing="1.04477un" src="" srcEdge="TOP"/>
+ <anchoritem dst="p:update" dstEdge="TOP" spacing="11.19403un" src="" srcEdge="TOP"/>
+ <anchoritem dst="p:update" dstEdge="RIGHT" spacing="-11.22387un" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="p:advanced" dstEdge="RIGHT" spacing="-11.07463un" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="p:advanced" dstEdge="BOTTOM" spacing="-1.68655un" src="" srcEdge="BOTTOM"/>
+ <anchoritem dst="label" dstEdge="LEFT" spacing="2.53731un" src="" srcEdge="LEFT"/>
+ <anchoritem dst="label" dstEdge="TOP" spacing="18.20896un" src="" srcEdge="TOP"/>
+ <anchoritem dst="label_1" dstEdge="LEFT" spacing="2.38806un" src="" srcEdge="LEFT"/>
+ <anchoritem dst="label_1" dstEdge="TOP" spacing="22.98508un" src="" srcEdge="TOP"/>
+ <anchoritem dst="label_2" dstEdge="LEFT" spacing="2.38806un" src="" srcEdge="LEFT"/>
+ <anchoritem dst="label_2" dstEdge="TOP" spacing="29.7015un" src="" srcEdge="TOP"/>
+ <anchoritem dst="label_3" dstEdge="TOP" spacing="34.62687un" src="" srcEdge="TOP"/>
+ <anchoritem dst="label_3" dstEdge="RIGHT" spacing="-7.01492un" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="label_4" dstEdge="TOP" spacing="42.2388un" src="" srcEdge="TOP"/>
+ <anchoritem dst="label_4" dstEdge="RIGHT" spacing="-7.01492un" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="label_5" dstEdge="TOP" spacing="46.71642un" src="" srcEdge="TOP"/>
+ <anchoritem dst="label_5" dstEdge="RIGHT" spacing="-7.01492un" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="label_6" dstEdge="TOP" spacing="53.73135un" src="" srcEdge="TOP"/>
+ <anchoritem dst="label_6" dstEdge="RIGHT" spacing="-7.01492un" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="label_7" dstEdge="TOP" spacing="58.65672un" src="" srcEdge="TOP"/>
+ <anchoritem dst="label_7" dstEdge="RIGHT" spacing="-7.01492un" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="label_8" dstEdge="TOP" spacing="66.11941un" src="" srcEdge="TOP"/>
+ <anchoritem dst="label_8" dstEdge="RIGHT" spacing="-7.01492un" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="label_9" dstEdge="TOP" spacing="70.74627un" src="" srcEdge="TOP"/>
+ <anchoritem dst="label_9" dstEdge="RIGHT" spacing="-7.01492un" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="label_10" dstEdge="TOP" spacing="77.46269un" src="" srcEdge="TOP"/>
+ <anchoritem dst="label_10" dstEdge="RIGHT" spacing="-7.01492un" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="label_11" dstEdge="TOP" spacing="82.38806un" src="" srcEdge="TOP"/>
+ <anchoritem dst="label_11" dstEdge="RIGHT" spacing="-7.01492un" src="" srcEdge="RIGHT"/>
+ </layout>
+ </widget>
+ <enums name="verticalScrollBarPolicy" value="ScrollBarAlwaysOn"/>
+ <enums name="horizontalScrollBarPolicy" value="ScrollBarAlwaysOff"/>
+ <sizehint height="81.34329un" type="PREFERRED" width="52.23881un"/>
+ </widget>
+ <widget name="p:title" type="HbLabel">
+ <real name="z" value="1"/>
+ <real name="opacity" value="1"/>
+ <sizehint height="4.62687un" type="PREFERRED" width="50.29851un"/>
+ <enums name="focusPolicy" value="NoFocus"/>
+ <string name="plainText" value="Device Updates"/>
+ <fontspec name="fontSpec" role="Primary" textheight="26.8"/>
+ </widget>
+ <layout type="anchor">
+ <anchoritem dst="scrollArea" dstEdge="LEFT" spacing="0.89552un" src="" srcEdge="LEFT"/>
+ <anchoritem dst="scrollArea" dstEdge="TOP" spacing="3.5821un" src="" srcEdge="TOP"/>
+ <anchoritem dst="p:title" dstEdge="LEFT" spacing="1.34328un" src="" srcEdge="LEFT"/>
+ <anchoritem dst="p:title" dstEdge="TOP" spacing="0.14925un" src="" srcEdge="TOP"/>
+ </layout>
+ </widget>
+ <widget name="viewMenu" role="HbView:menu" type="HbMenu">
+ <ref object="help" role="HbMenu:addAction"/>
+ <ref object="exit" role="HbMenu:addAction"/>
+ </widget>
+ <string name="title" value=""/>
+ </widget>
+ </section>
+ <section name="Landscape">
+ <widget name="l:view" type="HbView">
+ <widget name="content_1" role="HbView:widget" type="HbWidget">
+ <widget name="scrollArea_1" type="HbScrollArea">
+ <widget name="scrollAreaContents_1" role="HbScrollArea:contents" type="HbWidget">
+ <widget name="l:updatelabel" type="HbLabel">
+ <enums name="textWrapping" value="TextWordWrap"/>
+ <real name="z" value="1"/>
+ <sizehint height="9.10448un" type="PREFERRED" width="68.0597un"/>
+ <string name="plainText" value="To update your device software to latest available device software"/>
+ </widget>
+ <widget name="l:update" type="HbPushButton">
+ <real name="z" value="2"/>
+ <sizepolicy horizontalPolicy="Minimum" horizontalStretch="0" verticalPolicy="Preferred" verticalStretch="0"/>
+ <sizehint height="5.97015un" type="PREFERRED" width="18.20896un"/>
+ <string name="text" value="Update"/>
+ <string name="state" value="normal"/>
+ </widget>
+ <widget name="label_13" type="HbLabel">
+ <real name="z" value="3"/>
+ <sizehint height="3.8806un" type="PREFERRED" width="30.74627un"/>
+ <sizehint height="3.8806un" type="MINIMUM" width="1.64179un"/>
+ <bool name="enabled" value="FALSE"/>
+ <bool name="visible" value="FALSE"/>
+ <string name="plainText" value="Product Release"/>
+ <fontspec name="fontSpec" role="Primary" textheight="26.8"/>
+ </widget>
+ <widget name="label_14" type="HbLabel">
+ <real name="z" value="4"/>
+ <sizehint height="3.8806un" type="PREFERRED" width="30.74627un"/>
+ <bool name="enabled" value="FALSE"/>
+ <bool name="visible" value="FALSE"/>
+ <string name="plainText" value="Label"/>
+ <fontspec name="fontSpec" role="Secondary" textheight="23.45"/>
+ </widget>
+ <widget name="label_15" type="HbLabel">
+ <real name="z" value="5"/>
+ <sizehint height="3.8806un" type="PREFERRED" width="30.74627un"/>
+ <bool name="visible" value="FALSE"/>
+ <string name="plainText" value="Software Version"/>
+ <fontspec name="fontSpec" role="Primary" textheight="26.8"/>
+ </widget>
+ <widget name="label_16" type="HbLabel">
+ <real name="z" value="6"/>
+ <sizehint height="3.8806un" type="PREFERRED" width="30.74627un"/>
+ <bool name="visible" value="FALSE"/>
+ <string name="plainText" value="Label"/>
+ <fontspec name="fontSpec" role="Secondary" textheight="23.45"/>
+ </widget>
+ <widget name="label_17" type="HbLabel">
+ <real name="z" value="7"/>
+ <sizehint height="3.8806un" type="PREFERRED" width="30.74627un"/>
+ <bool name="visible" value="FALSE"/>
+ <string name="plainText" value="Model"/>
+ <fontspec name="fontSpec" role="Primary" textheight="26.8"/>
+ </widget>
+ <widget name="label_18" type="HbLabel">
+ <real name="z" value="8"/>
+ <sizehint height="3.8806un" type="PREFERRED" width="30.74627un"/>
+ <bool name="visible" value="FALSE"/>
+ <string name="plainText" value="Label"/>
+ <fontspec name="fontSpec" role="Secondary" textheight="23.45"/>
+ </widget>
+ <widget name="label_19" type="HbLabel">
+ <real name="z" value="9"/>
+ <sizehint height="3.8806un" type="PREFERRED" width="30.74627un"/>
+ <bool name="visible" value="FALSE"/>
+ <string name="plainText" value="Type"/>
+ <fontspec name="fontSpec" role="Primary" textheight="26.8"/>
+ </widget>
+ <widget name="label_20" type="HbLabel">
+ <real name="z" value="10"/>
+ <sizehint height="3.8806un" type="PREFERRED" width="30.74627un"/>
+ <bool name="visible" value="FALSE"/>
+ <string name="plainText" value="Label"/>
+ <fontspec name="fontSpec" role="Secondary" textheight="23.45"/>
+ </widget>
+ <widget name="label_21" type="HbLabel">
+ <real name="z" value="11"/>
+ <sizehint height="3.8806un" type="PREFERRED" width="30.74627un"/>
+ <bool name="visible" value="FALSE"/>
+ <string name="plainText" value="Product Code"/>
+ <fontspec name="fontSpec" role="Primary" textheight="26.8"/>
+ </widget>
+ <widget name="label_22" type="HbLabel">
+ <real name="z" value="12"/>
+ <sizehint height="3.8806un" type="PREFERRED" width="30.74627un"/>
+ <bool name="visible" value="FALSE"/>
+ <string name="plainText" value="Label"/>
+ <fontspec name="fontSpec" role="Secondary" textheight="23.45"/>
+ </widget>
+ <widget name="label_23" type="HbLabel">
+ <real name="z" value="13"/>
+ <sizehint height="3.8806un" type="PREFERRED" width="30.74627un"/>
+ <bool name="visible" value="FALSE"/>
+ <string name="plainText" value="IMEI"/>
+ <fontspec name="fontSpec" role="Primary" textheight="26.8"/>
+ </widget>
+ <widget name="label_24" type="HbLabel">
+ <real name="z" value="14"/>
+ <sizehint height="3.8806un" type="PREFERRED" width="30.74627un"/>
+ <bool name="visible" value="FALSE"/>
+ <string name="plainText" value="Label"/>
+ <fontspec name="fontSpec" role="Secondary" textheight="23.45"/>
+ </widget>
+ <widget name="l:advanced" type="HbPushButton">
+ <real name="z" value="15"/>
+ <sizepolicy horizontalPolicy="Minimum" horizontalStretch="0" verticalPolicy="Preferred" verticalStretch="0"/>
+ <sizehint height="5.97015un" type="PREFERRED" width="37.61194un"/>
+ <string name="text" value="Advanced"/>
+ <string name="state" value="normal"/>
+ </widget>
+ <real name="z" value="0"/>
+ <sizehint height="56.56717un" type="PREFERRED" width="95.37314un"/>
+ <layout type="anchor">
+ <anchoritem dst="l:updatelabel" dstEdge="LEFT" spacing="2.08955un" src="" srcEdge="LEFT"/>
+ <anchoritem dst="l:updatelabel" dstEdge="TOP" spacing="0.14925un" src="" srcEdge="TOP"/>
+ <anchoritem dst="l:update" dstEdge="TOP" spacing="1.79104un" src="" srcEdge="TOP"/>
+ <anchoritem dst="l:update" dstEdge="RIGHT" spacing="-5.85075un" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="label_13" dstEdge="LEFT" spacing="2.83582un" src="" srcEdge="LEFT"/>
+ <anchoritem dst="label_13" dstEdge="TOP" spacing="10.74627un" src="" srcEdge="TOP"/>
+ <anchoritem dst="label_14" dstEdge="TOP" spacing="10.59701un" src="" srcEdge="TOP"/>
+ <anchoritem dst="label_14" dstEdge="RIGHT" spacing="-20.89552un" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="label_15" dstEdge="LEFT" spacing="2.83582un" src="" srcEdge="LEFT"/>
+ <anchoritem dst="label_15" dstEdge="BOTTOM" spacing="-35.67165un" src="" srcEdge="BOTTOM"/>
+ <anchoritem dst="label_16" dstEdge="RIGHT" spacing="-20.74628un" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="label_16" dstEdge="BOTTOM" spacing="-35.67165un" src="" srcEdge="BOTTOM"/>
+ <anchoritem dst="label_17" dstEdge="LEFT" spacing="2.83582un" src="" srcEdge="LEFT"/>
+ <anchoritem dst="label_17" dstEdge="BOTTOM" spacing="-29.55224un" src="" srcEdge="BOTTOM"/>
+ <anchoritem dst="label_18" dstEdge="LEFT" spacing="43.73135un" src="" srcEdge="LEFT"/>
+ <anchoritem dst="label_18" dstEdge="BOTTOM" spacing="-29.55224un" src="" srcEdge="BOTTOM"/>
+ <anchoritem dst="label_19" dstEdge="LEFT" spacing="2.83582un" src="" srcEdge="LEFT"/>
+ <anchoritem dst="label_19" dstEdge="BOTTOM" spacing="-23.28358un" src="" srcEdge="BOTTOM"/>
+ <anchoritem dst="label_20" dstEdge="LEFT" spacing="43.73135un" src="" srcEdge="LEFT"/>
+ <anchoritem dst="label_20" dstEdge="BOTTOM" spacing="-23.28358un" src="" srcEdge="BOTTOM"/>
+ <anchoritem dst="label_21" dstEdge="LEFT" spacing="2.83582un" src="" srcEdge="LEFT"/>
+ <anchoritem dst="label_21" dstEdge="BOTTOM" spacing="-17.01493un" src="" srcEdge="BOTTOM"/>
+ <anchoritem dst="label_22" dstEdge="LEFT" spacing="43.73135un" src="" srcEdge="LEFT"/>
+ <anchoritem dst="label_22" dstEdge="BOTTOM" spacing="-17.16418un" src="" srcEdge="BOTTOM"/>
+ <anchoritem dst="label_23" dstEdge="LEFT" spacing="2.98507un" src="" srcEdge="LEFT"/>
+ <anchoritem dst="label_23" dstEdge="BOTTOM" spacing="-10.74627un" src="" srcEdge="BOTTOM"/>
+ <anchoritem dst="label_24" dstEdge="LEFT" spacing="43.73135un" src="" srcEdge="LEFT"/>
+ <anchoritem dst="label_24" dstEdge="BOTTOM" spacing="-10.89552un" src="" srcEdge="BOTTOM"/>
+ <anchoritem dst="l:advanced" dstEdge="RIGHT" spacing="-28.98508un" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="l:advanced" dstEdge="BOTTOM" spacing="-3.77612un" src="" srcEdge="BOTTOM"/>
+ </layout>
+ </widget>
+ <enums name="verticalScrollBarPolicy" value="ScrollBarAlwaysOn"/>
+ <sizehint height="38.80597un" type="PREFERRED" width="94.17911un"/>
+ </widget>
+ <widget name="l:title" type="HbLabel">
+ <real name="z" value="1"/>
+ <sizehint height="3.8806un" type="PREFERRED" width="94.47761un"/>
+ <string name="plainText" value="Device Updates"/>
+ <fontspec name="fontSpec" role="Primary" textheight="26.8"/>
+ </widget>
+ <layout type="anchor">
+ <anchoritem dst="scrollArea_1" dstEdge="LEFT" spacing="0.74626un" src="" srcEdge="LEFT"/>
+ <anchoritem dst="scrollArea_1" dstEdge="TOP" spacing="4.92538un" src="" srcEdge="TOP"/>
+ <anchoritem dst="l:title" dstEdge="LEFT" spacing="0.74627un" src="" srcEdge="LEFT"/>
+ <anchoritem dst="l:title" dstEdge="TOP" spacing="0.89552un" src="" srcEdge="TOP"/>
+ </layout>
+ </widget>
+ <widget name="viewMenu_1" role="HbView:menu" type="HbMenu">
+ <ref object="help" role="HbMenu:addAction"/>
+ <ref object="exit" role="HbMenu:addAction"/>
+ </widget>
+ <string name="title" value=""/>
+ </widget>
+ </section>
+ <metadata activeUIState="Portrait" display="NHD portrait" unit="un">
+ <uistate name="Common ui state" sections="#common"/>
+ <uistate name="Portrait" sections="#common Portrait"/>
+ <uistate name="Landscape" sections="#common Landscape"/>
+ </metadata>
+</hbdocument>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/deviceupdates/resources/serversview.docml Fri May 14 15:42:35 2010 +0300
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<hbdocument version="0.9">
+ <widget name="view" type="HbView">
+ <widget name="content" role="HbView:widget" type="HbWidget">
+ <widget name="label" type="HbLabel">
+ <real name="z" value="1"/>
+ <sizehint type="PREFERRED" width="52.68657un"/>
+ <string name="plainText" value="Label"/>
+ </widget>
+ <widget name="container" type="HbWidget">
+ <widget name="groupBox" type="HbGroupBox">
+ <widget name="container_1" role="HbGroupBox:contentWidget" type="HbWidget">
+ <widget name="listView" type="HbListView">
+ <widget name="listItemPrototype" role="HbListView:prototype" type="HbListViewItem">
+ <string name="state" value="normal"/>
+ </widget>
+ <real name="z" value="2"/>
+ </widget>
+ <widget name="pushButton" type="HbPushButton">
+ <string name="text" value="Push Button"/>
+ <string name="state" value="normal"/>
+ </widget>
+ <real name="z" value="3"/>
+ <layout orientation="Vertical" type="linear">
+ <linearitem itemname="listView"/>
+ <linearitem itemname="pushButton"/>
+ </layout>
+ </widget>
+ <string name="titleText" value="Group Box"/>
+ <bool name="collapsable" value="FALSE"/>
+ </widget>
+ <widget name="groupBox_1" type="HbGroupBox">
+ <widget name="listView_1" role="HbGroupBox:contentWidget" type="HbListView">
+ <widget name="listItemPrototype_1" role="HbListView:prototype" type="HbListViewItem">
+ <string name="state" value="normal"/>
+ </widget>
+ <real name="z" value="1"/>
+ </widget>
+ <string name="titleText" value="Group Box"/>
+ <real name="z" value="1"/>
+ <bool name="collapsable" value="FALSE"/>
+ </widget>
+ <real name="z" value="2"/>
+ <sizehint height="81.9403un" type="PREFERRED" width="53.28358un"/>
+ <layout orientation="Vertical" type="linear">
+ <linearitem itemname="groupBox"/>
+ <linearitem itemname="groupBox_1"/>
+ </layout>
+ </widget>
+ <layout type="anchor">
+ <anchoritem dst="label" dstEdge="LEFT" spacing="0un" src="" srcEdge="LEFT"/>
+ <anchoritem dst="label" dstEdge="TOP" spacing="0un" src="" srcEdge="TOP"/>
+ <anchoritem dst="container" dstEdge="LEFT" spacing="0un" src="" srcEdge="LEFT"/>
+ <anchoritem dst="container" dstEdge="BOTTOM" spacing="0un" src="" srcEdge="BOTTOM"/>
+ <anchoritem dst="container" dstEdge="TOP" spacing="0un" src="label" srcEdge="BOTTOM"/>
+ </layout>
+ </widget>
+ <string name="title" value="View"/>
+ </widget>
+ <section name="landscape">
+ <widget name="content" role="HbView:widget" type="HbWidget">
+ <layout type="anchor">
+ <anchoritem dst="label" dstEdge="LEFT" spacing="0un" src="" srcEdge="LEFT"/>
+ <anchoritem dst="label" dstEdge="TOP" spacing="0un" src="" srcEdge="TOP"/>
+ <anchoritem dst="container" dstEdge="LEFT" spacing="0un" src="" srcEdge="LEFT"/>
+ <anchoritem dst="container" dstEdge="BOTTOM" spacing="0un" src="" srcEdge="BOTTOM"/>
+ <anchoritem dst="container" dstEdge="TOP" spacing="0un" src="label" srcEdge="BOTTOM"/>
+ <anchoritem dst="container" dstEdge="RIGHT" spacing="0un" src="" srcEdge="RIGHT"/>
+ </layout>
+ </widget>
+ <widget name="container_1" role="HbGroupBox:contentWidget" type="HbWidget">
+ <layout orientation="Vertical" type="linear">
+ <linearitem itemname="listView"/>
+ <linearitem itemname="pushButton"/>
+ </layout>
+ </widget>
+ </section>
+ <section name="portrait"/>
+ <metadata activeUIState="portrait" display="NHD portrait" unit="un">
+ <uistate name="Common ui state" sections="#common"/>
+ <uistate name="landscape" sections="#common landscape"/>
+ <uistate name="portrait" sections="#common portrait"/>
+ <dummydata objectName="listView" section="#common" value="0"/>
+ <dummydata objectName="listView_1" section="#common" value="0"/>
+ </metadata>
+</hbdocument>
--- a/deviceupdatesui/deviceupdates/src/dmadvancedview.cpp Mon May 03 12:24:32 2010 +0300
+++ b/deviceupdatesui/deviceupdates/src/dmadvancedview.cpp Fri May 14 15:42:35 2010 +0300
@@ -15,7 +15,7 @@
* Description: Methods for DmAdvancedView.
*
*/
-
+#include <hbnamespace.h>
#include "dmadvancedview.h"
#include "serversettingsview.h"
@@ -32,6 +32,7 @@
currentview = 0;
connectionRequested = false;
backbehaviorset = false;
+ currentselecteditem = -1;
}
DmAdvancedView::~DmAdvancedView()
@@ -46,61 +47,38 @@
void DmAdvancedView::handleLongPress(HbAbstractViewItem* item , QPointF coOrdinates)
{
- if(connectionRequested)
+ if (connectionRequested)
return;
- int itemnum = 0;
- if (item)
+ if (item)
{
- QStandardItem *modelItem = model->itemFromIndex(item->modelIndex());
- itemnum = modelItem->row();
-
+ modelItem = model->itemFromIndex(item->modelIndex());
+ currentselecteditem = modelItem->row();
- csmenu = new HbMenu();
- HbAction *defaultprofileAction = 0;
- HbAction *deleteaction= 0;
- HbAction *connectaction= 0;
- if(!dminfo->Isdefaultprofile(itemnum))
- {
- defaultprofileAction = csmenu->addAction(hbTrId("txt_device_update_menu_set_as_default"));
- }
- if(!dminfo->Isprofilelocked(itemnum))
- {
- deleteaction = csmenu->addAction(hbTrId("txt_device_update_menu_delete"));
- }
- connectaction = csmenu->addAction(hbTrId("txt_device_update_menu_connect"));
- HbAction *selectedAction = csmenu->exec(coOrdinates);
- if(selectedAction)
- {
- if(selectedAction == defaultprofileAction )
+ HbMenu *csmenu = new HbMenu();
+ csmenu->setAttribute( Qt::WA_DeleteOnClose);
+ HbAction *defaultprofileAction = 0;
+ HbAction *deleteaction = 0;
+ HbAction *connectaction = 0;
+ if (!dminfo->Isdefaultprofile(currentselecteditem))
{
- dminfo->setDefaultProfile(itemnum);
- updateEarlierdefaultProfileIcon();
- modelItem->setIcon(defaultprofileicon);
- currentdefaultprofile = itemnum;
+ defaultprofileAction = csmenu->addAction(hbTrId(
+ "txt_device_update_menu_set_as_default"));
+ connect(defaultprofileAction, SIGNAL(triggered()), this,
+ SLOT(defaultMenuItemSelected()));
}
- else if (selectedAction == deleteaction )
+ if (!dminfo->Isprofilelocked(currentselecteditem))
{
- dminfo->DisableDbNotifications(true);
- //check currentdefaultprofile is current item
- if(itemnum == currentdefaultprofile) // deleting default profile
- currentdefaultprofile = -1;
- if(dminfo->DeleteProfile(itemnum) >=0 )
- {
- //Update the profile list
- model->removeRow(itemnum);
- }
- dminfo->DisableDbNotifications(false);
+ deleteaction = csmenu->addAction(hbTrId(
+ "txt_device_update_menu_delete"));
+ connect(deleteaction, SIGNAL(triggered()), this,
+ SLOT(deleteMenuItemSelected()));
}
- else if( selectedAction == connectaction )
- {
- dminfo->synchronize(itemnum);
- connectionRequested = true;
- }
- else
- {
- }
- }
- delete csmenu;
+ connectaction = csmenu->addAction(hbTrId(
+ "txt_device_update_menu_connect"));
+ connect(connectaction, SIGNAL(triggered()), this,
+ SLOT(connectMenuItemSelected()));
+ csmenu->setPreferredPos(coOrdinates);
+ csmenu->open();
}
}
@@ -113,8 +91,8 @@
dminfo->DisableDbNotifications(true);
//If profile is not locked then take to edit server view
int itemnum = 0;
- QStandardItem *modelItem = model->itemFromIndex(index);
- itemnum = modelItem->row();
+ QStandardItem *selectedItem = model->itemFromIndex(index);
+ itemnum = selectedItem->row();
if(itemnum >= 0 && !dminfo->Isprofilelocked(itemnum))
{
//read profile items
@@ -262,17 +240,17 @@
{
if(currentdefaultprofile >= 0)
{
- QStandardItem *modelItem = model->item(currentdefaultprofile);
+ QStandardItem *earlierDefaultProfile = model->item(currentdefaultprofile);
//Find the transport type & set the icon
int transporttype = 0;
dminfo->profileTransport(currentdefaultprofile,transporttype);
if(transporttype == 0)//Internet
{
- modelItem->setIcon(internet);
+ earlierDefaultProfile->setIcon(internet);
}
else
{
- modelItem->setIcon(bluetooth);
+ earlierDefaultProfile->setIcon(bluetooth);
}
}
}
@@ -668,3 +646,31 @@
updateListview();
}
+void DmAdvancedView::defaultMenuItemSelected()
+ {
+ dminfo->setDefaultProfile(currentselecteditem);
+ updateEarlierdefaultProfileIcon();
+ modelItem->setIcon(defaultprofileicon);
+ currentdefaultprofile = currentselecteditem;
+ }
+
+void DmAdvancedView::deleteMenuItemSelected()
+ {
+ dminfo->DisableDbNotifications(true);
+ //check currentdefaultprofile is current item
+ if(currentselecteditem == currentdefaultprofile) // deleting default profile
+ currentdefaultprofile = -1;
+ if(dminfo->DeleteProfile(currentselecteditem) >=0 )
+ {
+ //Update the profile list
+ model->removeRow(currentselecteditem);
+ }
+ dminfo->DisableDbNotifications(false);
+ }
+
+void DmAdvancedView::connectMenuItemSelected()
+ {
+ dminfo->synchronize(currentselecteditem);
+ connectionRequested = true;
+ }
+
--- a/deviceupdatesui/deviceupdates/src/dmfotaview.cpp Mon May 03 12:24:32 2010 +0300
+++ b/deviceupdatesui/deviceupdates/src/dmfotaview.cpp Fri May 14 15:42:35 2010 +0300
@@ -24,6 +24,7 @@
#include <etel.h>
#include <featmgr.h>
#include <etelmm.h>
+#include <hbnotificationdialog.h>
#include <centralrepository.h>
#include <sysversioninfo.h>
#include "nsmldmsyncprivatecrkeys.h"
@@ -92,7 +93,7 @@
exit->setText(QString("txt_common_menu_exit"));
QObject::connect(exit, SIGNAL(triggered()), this, SLOT(OnExit()));
- mSoftKeyBackAction = new HbAction(Hb::BackAction ,this);
+ mSoftKeyBackAction = new HbAction(Hb::BackNaviAction ,this);
mSoftKeyBackAction->setText("Back");
connect(mSoftKeyBackAction, SIGNAL(triggered()), this, SLOT(backtoMainWindow()));
@@ -122,7 +123,7 @@
//Product Release
- TBuf< 1024 > prodrelease;
+ TBuf< KSysUtilVersionTextLength > prodrelease;
prodrelease.Zero();
if(SysUtil::GetPRInformation(prodrelease)==KErrNone)
{
@@ -280,28 +281,35 @@
//
void DMFotaView::CheckforUpdate()
{
- // if(no default profile defined)
- HbDocumentLoader loader;
- bool ok = false;
- loader.load(":/xml/updatedialog.docml", &ok);
- QString val;
- // Exit if the file format is invalid
- Q_ASSERT_X(ok, "Device Manager", "Invalid docml file");
- HbDialog* dialog = qobject_cast<HbDialog*>(loader.findWidget("UpdateDialog"));
-
- label=qobject_cast<HbLabel*>(loader.findWidget("DialogText"));
- val = hbTrId("txt_device_update_info_no_server_configured_to_get");
- label->setPlainText(val);
- dialog->setDismissPolicy(HbPopup::TapAnywhere);
- dialog->setTimeout(HbPopup::StandardTimeout);
- dialog->setAttribute(Qt::WA_DeleteOnClose, true);
- dialog->exec();
- //Else connect
- /*TInt iProfileId= 1000000;
- iSession.OpenL();
- profile.OpenL(iSession,iProfileId);
- //openconnection
- iSyncJob.CreateL( iSession, iProfileId );*/
+ /*TInt profileId=NULL;
+ if(mainDmInfo==0)
+ {
+ if(!profilesView)
+ {
+ mainDmInfo = new DmInfo();
+ mainDmInfo->refreshProfileList();
+ }
+ else
+ {
+ mainDmInfo = profilesView->dminfo;
+ }
+ }
+ if((profileId = mainDmInfo->DefaultFotaProfileIdL())==KErrNotFound)
+ {*/
+
+ HbNotificationDialog* note = new HbNotificationDialog();
+ QString val = hbTrId("txt_device_update_info_no_server_configured_to_get");
+ note->setTitle(val);
+ note->setTitleTextWrapping(Hb::TextWordWrap);
+ note->setDismissPolicy(HbPopup::TapAnywhere);
+ note->setTimeout(HbPopup::StandardTimeout);
+ note->setAttribute(Qt::WA_DeleteOnClose, true);
+ note->open();
+ /* }
+ else
+ {
+ mainDmInfo->sync(profileId);
+ }*/
}
// -----------------------------------------------------------------------------
@@ -315,22 +323,23 @@
qDebug("omadm DeviceManagerUi::AdvancedDeviceManager");
if(!profilesView)
{
- qDebug("omadm DeviceManagerUi::AdvancedDeviceManager 1");
- profilesView = new DmAdvancedView(mMainWindow,this);
- qDebug("omadm DeviceManagerUi::AdvancedDeviceManager 2");
+ qDebug("omadm DeviceManagerUi::AdvancedDeviceManager 1");
+ profilesView = new DmAdvancedView(mMainWindow,this);
+ qDebug("omadm DeviceManagerUi::AdvancedDeviceManager 2");
bool loadingok = profilesView->displayItems();
if(loadingok)
- {qDebug("omadm DeviceManagerUi::AdvancedDeviceManager 3");
- mMainWindow->addView(profilesView);
- qDebug("omadm DeviceManagerUi::AdvancedDeviceManager 4");
- profilesView->setBackBehavior();
- qDebug("omadm DeviceManagerUi::AdvancedDeviceManager 5");
- mMainWindow->setCurrentView(profilesView);
- qDebug("omadm DeviceManagerUi::AdvancedDeviceManager 6");
+ {
+ qDebug("omadm DeviceManagerUi::AdvancedDeviceManager 3");
+ mMainWindow->addView(profilesView);
+ qDebug("omadm DeviceManagerUi::AdvancedDeviceManager 4");
+ profilesView->setBackBehavior();
+ qDebug("omadm DeviceManagerUi::AdvancedDeviceManager 5");
+ mMainWindow->setCurrentView(profilesView);
+ qDebug("omadm DeviceManagerUi::AdvancedDeviceManager 6");
}
else
{
- qFatal("omadm Unable to read groupbox.docml");
+ qFatal("omadm Unable to read groupbox.docml");
}
}
--- a/deviceupdatesui/deviceupdates/src/serversettingsview.cpp Mon May 03 12:24:32 2010 +0300
+++ b/deviceupdatesui/deviceupdates/src/serversettingsview.cpp Fri May 14 15:42:35 2010 +0300
@@ -17,6 +17,7 @@
#include <hblineedit.h>
#include <hbmessagebox.h>
+#include <hbnamespace.h>
#include "serversettingsview.h"
#include "dmadvancedview.h"
#include "settingsdataformcustomitem.h"
@@ -160,12 +161,12 @@
}
else
{
- HbMessageBox note(HbMessageBox::MessageTypeInformation);
- note.setText(hbTrId(
+ HbMessageBox *note = new HbMessageBox(HbMessageBox::MessageTypeInformation);
+ note->setText(hbTrId(
"txt_device_update_dialog_enter_mandatory_field_values"));
- note.setPrimaryAction(new HbAction("OK"));
- note.setTimeout(HbPopup::NoTimeout);
- note.exec();
+ note->setAttribute( Qt::WA_DeleteOnClose);
+ note->setTimeout(HbPopup::NoTimeout);
+ note->open();
}
}
@@ -175,10 +176,11 @@
if(serversView->checkServerId(srvid))
{
serverid->setContentWidgetData(QString("text"), QString(""));
- HbMessageBox note(HbMessageBox::MessageTypeInformation);
- note.setText(hbTrId("txt_device_update_dialog_invalid_server_id"));
- note.setTimeout(HbPopup::NoTimeout);
- note.exec();
+ HbMessageBox *note= new HbMessageBox(HbMessageBox::MessageTypeInformation);
+ note->setText(hbTrId("txt_device_update_dialog_invalid_server_id"));
+ note->setAttribute( Qt::WA_DeleteOnClose);
+ note->setTimeout(HbPopup::NoTimeout);
+ note->open();
}
}
--- a/deviceupdatesui/deviceupdates/src/settingsdataformcustomitem.cpp Mon May 03 12:24:32 2010 +0300
+++ b/deviceupdatesui/deviceupdates/src/settingsdataformcustomitem.cpp Fri May 14 15:42:35 2010 +0300
@@ -49,8 +49,8 @@
HbLineEdit* mLineEdit = new HbLineEdit();
mLineEdit->setText(QString("8080"));
HbEditorInterface editorInterface(mLineEdit);
- editorInterface.setInputMode(HbInputModeNumeric);
- editorInterface.setConstraints(HbEditorConstraintFixedInputMode);
+ editorInterface.setMode(HbInputModeNumeric);
+ editorInterface.setInputConstraints(HbEditorConstraintFixedInputMode);
return mLineEdit;
}
default: