Catchup to latest Symbian^4 GCC_SURGE
authorWilliam Roberts <williamr@symbian.org>
Thu, 22 Jul 2010 16:33:45 +0100
branchGCC_SURGE
changeset 37 451b2e1545b2
parent 26 6bcf277166c1 (diff)
parent 33 11b6825f0862 (current diff)
Catchup to latest Symbian^4
hswidgetplugin/buildflags.pri
hswidgetplugin/fmradiohswidgetplugin/fmradiohswidgetplugin.pro
hswidgetplugin/fmradiohswidgetplugin/fmradiohswidgetplugin.xml
hswidgetplugin/fmradiohswidgetplugin/inc/fmradiohswidget.h
hswidgetplugin/fmradiohswidgetplugin/inc/fmradiohswidgetplugin.h
hswidgetplugin/fmradiohswidgetplugin/inc/fmradiohswidgetprocesshandler.h
hswidgetplugin/fmradiohswidgetplugin/inc/fmradiohswidgetprofilereader.h
hswidgetplugin/fmradiohswidgetplugin/inc/fmradiohswidgetradioserviceclient.h
hswidgetplugin/fmradiohswidgetplugin/qmakepluginstubs/fmradiohswidgetplugin.qtplugin
hswidgetplugin/fmradiohswidgetplugin/resource/fmradiohswidget.docml
hswidgetplugin/fmradiohswidgetplugin/resource/fmradiohswidgetplugin.css
hswidgetplugin/fmradiohswidgetplugin/resource/fmradiohswidgetplugin.manifest
hswidgetplugin/fmradiohswidgetplugin/resource/fmradiohswidgetplugin.s60xml
hswidgetplugin/fmradiohswidgetplugin/resource/fmradiohswidgetplugin.xml
hswidgetplugin/fmradiohswidgetplugin/resource/fmradiohswidgetplugin_icon.png
hswidgetplugin/fmradiohswidgetplugin/resources.qrc
hswidgetplugin/fmradiohswidgetplugin/src/fmradiohswidget.cpp
hswidgetplugin/fmradiohswidgetplugin/src/fmradiohswidgetplugin.cpp
hswidgetplugin/fmradiohswidgetplugin/src/fmradiohswidgetprocesshandler.cpp
hswidgetplugin/fmradiohswidgetplugin/src/fmradiohswidgetprofilereader.cpp
hswidgetplugin/fmradiohswidgetplugin/src/fmradiohswidgetradioserviceclient.cpp
hswidgetplugin/fmradiohswidgetplugin_exports_to_rom.pri
hswidgetplugin/fmradiohswidgetplugininstaller/fmradiohswidgetplugininstaller.cpp
hswidgetplugin/fmradiohswidgetplugininstaller/fmradiohswidgetplugininstaller.pro
hswidgetplugin/hswidgetplugin.pro
hswidgetplugin/rom/fmradiohswidgetplugin.iby
hswidgetplugin/rom/fmradiohswidgetplugin_stub.pkg
hswidgetplugin/rom/fmradiohswidgetplugininstaller.iby
hswidgetplugin/sis/fmradiohswidgetplugin.pkg
layers.sysdef.xml
radio.pro
radioapp/bin/fmradio_en_US.qm
radioapp/buildflags.pri
radioapp/bwins/radioenginewrapperu.def
radioapp/bwins/radiopresetstorageu.def
radioapp/bwins/radiouiengineu.def
radioapp/bwins/radiowidgetsu.def
radioapp/commoninc/radio_global.h
radioapp/commoninc/radiologger.h
radioapp/commoninc/radionotificationdata.h
radioapp/commoninc/radioservicedef.h
radioapp/eabi/radioenginewrapperu.def
radioapp/eabi/radiopresetstorageu.def
radioapp/eabi/radiouiengineu.def
radioapp/eabi/radiowidgetsu.def
radioapp/radioapp.pro
radioapp/radioapplication/inc/radioapplication.h
radioapp/radioapplication/inc/testwindow_win32.h
radioapp/radioapplication/radioapplication.pro
radioapp/radioapplication/resources/fmradio.ts
radioapp/radioapplication/src/main.cpp
radioapp/radioapplication/src/radioapplication.cpp
radioapp/radioapplication/src/testwindow_win32.cpp
radioapp/radioenginewrapper/inc/cradioenginehandler.h
radioapp/radioenginewrapper/inc/radiocontroleventlistener.h
radioapp/radioenginewrapper/inc/radioenginewrapper.h
radioapp/radioenginewrapper/inc/radioenginewrapper_p.h
radioapp/radioenginewrapper/inc/radioenginewrapper_win32_p.h
radioapp/radioenginewrapper/inc/radioenginewrapperobserver.h
radioapp/radioenginewrapper/inc/radiosettings.h
radioapp/radioenginewrapper/inc/radiostationhandlerif.h
radioapp/radioenginewrapper/inc/t_radiodataparser.h
radioapp/radioenginewrapper/radioenginewrapper.pro
radioapp/radioenginewrapper/src/cradioenginehandler.cpp
radioapp/radioenginewrapper/src/radiocontroleventlistener.cpp
radioapp/radioenginewrapper/src/radioenginewrapper.cpp
radioapp/radioenginewrapper/src/radioenginewrapper_p.cpp
radioapp/radioenginewrapper/src/radioenginewrapper_win32.cpp
radioapp/radioenginewrapper/src/radioenginewrapper_win32_p.cpp
radioapp/radioenginewrapper/src/radiologger.cpp
radioapp/radioenginewrapper/src/radiordslistener.cpp
radioapp/radioenginewrapper/src/radiosettings.cpp
radioapp/radiopresetstorage/inc/radiopresetstorage.h
radioapp/radiopresetstorage/inc/radiopresetstorage_p.h
radioapp/radiopresetstorage/inc/radiopresetstorage_win32_p.h
radioapp/radiopresetstorage/inc/radiopresetstorageexport.h
radioapp/radiopresetstorage/inc/radiostationif.h
radioapp/radiopresetstorage/radiopresetstorage.pro
radioapp/radiopresetstorage/src/radiopresetstorage.cpp
radioapp/radiopresetstorage/src/radiopresetstorage_win32.cpp
radioapp/radiopresetstorage/tsrc/t_radiopresetstorage.pro
radioapp/radiouiengine/inc/radiocarouselmodel.h
radioapp/radiouiengine/inc/radiocarouselmodel_p.h
radioapp/radiouiengine/inc/radiocontrolservice.h
radioapp/radiouiengine/inc/radiohistoryitem.h
radioapp/radiouiengine/inc/radiohistoryitem_p.h
radioapp/radiouiengine/inc/radiohistorymodel.h
radioapp/radiouiengine/inc/radiohistorymodel_p.h
radioapp/radiouiengine/inc/radiomonitorservice.h
radioapp/radiouiengine/inc/radiomonitorservice_win32.h
radioapp/radiouiengine/inc/radioscannerengine.h
radioapp/radiouiengine/inc/radioscannerengine_p.h
radioapp/radiouiengine/inc/radiostation.h
radioapp/radiouiengine/inc/radiostation_p.h
radioapp/radiouiengine/inc/radiostationfiltermodel.h
radioapp/radiouiengine/inc/radiostationmodel.h
radioapp/radiouiengine/inc/radiostationmodel_p.h
radioapp/radiouiengine/inc/radiouiengine.h
radioapp/radiouiengine/inc/radiouiengine_p.h
radioapp/radiouiengine/inc/radiouiengineexport.h
radioapp/radiouiengine/radiouiengine.pro
radioapp/radiouiengine/src/radiocarouselmodel.cpp
radioapp/radiouiengine/src/radiocarouselmodel_p.cpp
radioapp/radiouiengine/src/radiocontrolservice.cpp
radioapp/radiouiengine/src/radiohistoryitem.cpp
radioapp/radiouiengine/src/radiohistoryitem_p.cpp
radioapp/radiouiengine/src/radiohistorymodel.cpp
radioapp/radiouiengine/src/radiohistorymodel_p.cpp
radioapp/radiouiengine/src/radiomonitorservice.cpp
radioapp/radiouiengine/src/radiomonitorservice_win32.cpp
radioapp/radiouiengine/src/radioscannerengine.cpp
radioapp/radiouiengine/src/radioscannerengine_p.cpp
radioapp/radiouiengine/src/radiostation.cpp
radioapp/radiouiengine/src/radiostationfiltermodel.cpp
radioapp/radiouiengine/src/radiostationmodel.cpp
radioapp/radiouiengine/src/radiostationmodel_p.cpp
radioapp/radiouiengine/src/radiouiengine.cpp
radioapp/radiouiengine/src/radiouiengine_p.cpp
radioapp/radiouiengine/tsrc/inc/t_radiostation.h
radioapp/radiouiengine/tsrc/src/t_radiostation.cpp
radioapp/radiouiengine/tsrc/t_radiouiengine.pro
radioapp/radiowidgets/inc/radiobannerlabel.h
radioapp/radiowidgets/inc/radiofadinglabel.h
radioapp/radiowidgets/inc/radiofrequencyitem.h
radioapp/radiowidgets/inc/radiofrequencyscanner.h
radioapp/radiowidgets/inc/radiofrequencystrip.h
radioapp/radiowidgets/inc/radiohistoryview.h
radioapp/radiowidgets/inc/radiostationcarousel.h
radioapp/radiowidgets/inc/radiostationitem.h
radioapp/radiowidgets/inc/radiostationsview.h
radioapp/radiowidgets/inc/radiostripbase.h
radioapp/radiowidgets/inc/radiouiutilities.h
radioapp/radiowidgets/inc/radioviewbase.h
radioapp/radiowidgets/inc/radiowidgetsexport.h
radioapp/radiowidgets/radiowidgets.pro
radioapp/radiowidgets/res/effects/blink_in_out_in.fxml
radioapp/radiowidgets/res/fmradioui.qrc
radioapp/radiowidgets/res/images/nowplayingicon.png
radioapp/radiowidgets/res/images/pri_small_shazam.svg
radioapp/radiowidgets/res/images/pri_small_star_inactive.svg
radioapp/radiowidgets/res/images/pri_small_tag.svg
radioapp/radiowidgets/res/images/qtg_fr_lcd.svg
radioapp/radiowidgets/res/images/qtg_fr_lcd_overlay.svg
radioapp/radiowidgets/res/images/qtg_fr_tuner.svg
radioapp/radiowidgets/res/images/qtg_mono_next.svg
radioapp/radiowidgets/res/images/qtg_mono_play_history.svg
radioapp/radiowidgets/res/images/qtg_mono_previous.svg
radioapp/radiowidgets/res/images/qtg_mono_radio_stations.svg
radioapp/radiowidgets/res/images/qtg_mono_speaker.svg
radioapp/radiowidgets/res/images/qtg_mono_speaker_off.svg
radioapp/radiowidgets/res/images/qtg_mono_station_scan.svg
radioapp/radiowidgets/res/images/qtg_mono_tag.svg
radioapp/radiowidgets/res/images/setfavoriteicon.png
radioapp/radiowidgets/res/images/stripbackground.png
radioapp/radiowidgets/res/layout/historyview.docml
radioapp/radiowidgets/res/layout/radiostationitem.css
radioapp/radiowidgets/res/layout/radiostationitem.widgetml
radioapp/radiowidgets/res/layout/stationsview.docml
radioapp/radiowidgets/src/radiobannerlabel.cpp
radioapp/radiowidgets/src/radiofrequencyitem.cpp
radioapp/radiowidgets/src/radiofrequencyscanner.cpp
radioapp/radiowidgets/src/radiofrequencystrip.cpp
radioapp/radiowidgets/src/radiohistoryview.cpp
radioapp/radiowidgets/src/radiostationcarousel.cpp
radioapp/radiowidgets/src/radiostationitem.cpp
radioapp/radiowidgets/src/radiostationsview.cpp
radioapp/radiowidgets/src/radiostripbase.cpp
radioapp/radiowidgets/src/radiouiutilities.cpp
radioapp/radiowidgets/src/radioviewbase.cpp
radioapp/radiowidgetsplugin/main.cpp
radioengine/engine/api/mradioengineinitializer.h
radioengine/engine/api/mradioengineobserver.h
radioengine/engine/api/mradiordsdataobserver.h
radioengine/engine/api/mradiordsreceiver.h
radioengine/engine/api/mradioscanobserver.h
radioengine/engine/bwins/radioengineu.def
radioengine/engine/eabi/radioengineu.def
radioengine/engine/group/bld.inf
radioengine/engine/group/radioengine.mmp
radioengine/engine/inc/cradioengineimp.h
radioengine/engine/inc/cradiordsreceiver.h
radioengine/engine/inc/cradiordsreceiverbase.h
radioengine/engine/inc/t_cradiordsreceiversimulator.h
radioengine/engine/src/cradioengineimp.cpp
radioengine/engine/src/cradionetworkinfolistener.cpp
radioengine/engine/src/cradiordsreceiver.cpp
radioengine/engine/src/cradiordsreceiverbase.cpp
radioengine/engine/src/t_cradiordsreceiversimulator.cpp
radioengine/group/buildflags.hrh
radioengine/settings/api/cradioregion.h
radioengine/settings/api/mradioenginesettings.h
radioengine/settings/api/mradiosettingssetter.h
radioengine/settings/bwins/radioenginesettingsu.def
radioengine/settings/cenrep/101FF976.txt
radioengine/settings/data/radioenginesettings.rss
radioengine/settings/eabi/radioenginesettingsu.def
radioengine/settings/group/bld.inf
radioengine/settings/group/radioenginesettings.mmp
radioengine/settings/inc/cradioapplicationsettings.h
radioengine/settings/inc/cradioenginesettings.h
radioengine/settings/inc/cradiosettingsbase.h
radioengine/settings/inc/radiopreset.hrh
radioengine/settings/inc/radiosettings.rh
radioengine/settings/src/cradioapplicationsettings.cpp
radioengine/settings/src/cradioenginesettings.cpp
radioengine/settings/src/cradiosettingsbase.cpp
radioengine/settings/src/cradiosettingsimp.cpp
radioengine/utils/api/cradiopubsub.h
radioengine/utils/api/radioenginedef.h
radioengine/utils/api/radiointernalpskeys.h
radioengine/utils/bwins/radioengineutilsu.def
radioengine/utils/eabi/radioengineutilsu.def
radioengine/utils/group/bld.inf
radioengine/utils/group/radioengineutils.mmp
radioengine/utils/inc/cradioaccessoryobserver.h
radioengine/utils/inc/cradiopubsubimp.h
radioengine/utils/inc/cradioremcontargetimp.h
radioengine/utils/inc/cradiorepositoryentity.h
radioengine/utils/inc/cradiorepositoryentity.inl
radioengine/utils/inc/cradiorepositoryentitybase.h
radioengine/utils/inc/cradiorepositorymanagerimp.h
radioengine/utils/src/cradioaccessoryobserver.cpp
radioengine/utils/src/cradioaudiorouter.cpp
radioengine/utils/src/cradioenginelogger.cpp
radioengine/utils/src/cradioenginetls.cpp
radioengine/utils/src/cradiopubsub.cpp
radioengine/utils/src/cradiopubsubimp.cpp
radioengine/utils/src/cradioremcontargetimp.cpp
radioengine/utils/src/cradiorepositorymanager.cpp
radioengine/utils/src/cradiorepositorymanagerimp.cpp
radioengine/utils/src/cradioroutableaudio.cpp
radioengine/utils/src/cradiosystemeventcollector.cpp
radioengine/utils/src/cradiosystemeventcollectorimp.cpp
radioengine/utils/src/cradiosystemeventdetector.cpp
radioengine/utils/src/radioengineutils.cpp
rom/fmradio.iby
rom/fmradio_resources.iby
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/radioapp/radiowidgets/res/layout/tuningview.docml	Thu Jul 22 16:33:45 2010 +0100
@@ -0,0 +1,191 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<hbdocument context="RadioTuningView" version="0.9">
+    <object name="tv:historyview_action" type="HbAction">
+        <string name="text" locid="txt_rad_opt_play_history" />
+    </object>
+    <object name="exit_action" type="HbAction">
+        <string name="text" locid="txt_common_opt_exit" />
+    </object>
+    <widget name="view" plugin="radiowidgetsplugin" type="RadioTuningView">
+        <widget name="menu" role="HbView:menu" type="HbMenu">
+            <ref object="tv:historyview_action" role="HbMenu:addAction"/>
+            <ref object="exit_action" role="HbMenu:addAction"/>
+        </widget>
+        <widget name="tv:container" role="HbView:widget" type="HbWidget">
+            <widget name="tv:info_area" type="HbWidget">
+                <widget name="tv:carousel_background" type="HbLabel">
+                    <icon name="icon" iconName=":/images/qtg_fr_lcd.svg" />
+                    <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
+                </widget>
+                <widget name="tv:carousel_overlay" type="HbLabel">
+                    <icon name="icon" iconName=":/images/qtg_fr_lcd_overlay.svg" />
+                    <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
+                </widget>
+                <widget name="tv:station_carousel" plugin="radiowidgetsplugin" type="RadioStationCarousel">
+                    <icon name="favoriteIcon" iconName=":/images/pri_small_star.svg" />
+                    <icon name="nonFavoriteIcon" iconName=":/images/pri_small_star_inactive.svg" />
+                    <widget name="tv:info_text" type="HbLabel" >
+                        <bool name="visible" value="FALSE"/>
+                        <sizehint height="200" width="300" type="PREFERRED"/>
+                    </widget>
+                </widget>
+                <layout type="stacked">
+                    <stackitem itemname="tv:carousel_background"/>
+                    <stackitem itemname="tv:carousel_overlay"/>
+                    <stackitem itemname="tv:station_carousel"/>
+                </layout>
+            </widget>
+            <widget name="tv:control_widget" type="HbWidget" >
+                <widget name="tv:stations_button" type="HbPushButton">
+                    <bool name="stretched" value="TRUE" />
+                    <string name="text" locid="txt_rad_button_stations" />
+                    <icon name="icon" iconName="qtg_mono_radio_stations.svg" />
+                </widget>
+                <widget name="tv:scan_button" type="HbPushButton">
+                    <bool name="stretched" value="TRUE" />
+                    <string name="text" locid="txt_rad_button_search_all_stations" />
+                    <icon name="icon" iconName="qtg_mono_station_scan.svg" />
+                </widget>
+                <widget name="tv:loudspeaker_button" type="HbPushButton">
+                    <bool name="stretched" value="TRUE" />
+                    <string name="text" locid="txt_rad_button_activate_loudspeaker" />
+                    <icon name="icon" iconName="qtg_mono_speaker.svg.svg" />
+                </widget>
+                <layout orientation="Vertical" spacing="var(hb-param-margin-gene-middle-vertical)" type="linear">
+                    <contentsmargins bottom="var(hb-param-margin-gene-bottom)" left="var(hb-param-margin-gene-left)" right="var(hb-param-margin-gene-right)" top="var(hb-param-margin-gene-top)"/>
+                    <linearitem itemname="tv:stations_button"/>
+                    <stretchitem stretchfactor="1"/>
+                    <linearitem itemname="tv:scan_button"/>
+                    <stretchitem stretchfactor="1"/>
+                    <linearitem itemname="tv:loudspeaker_button"/>
+                </layout>
+            </widget>
+            <widget name="tv:frequency_area" type="HbWidget">
+                 <widget name="tv:frequency_background" type="HbLabel">
+                    <icon name="icon" iconName=":/images/stripbackground.png" />
+                    <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
+                </widget>
+               <widget name="tv:frequency_strip" plugin="radiowidgetsplugin" type="RadioFrequencyStrip">
+                    <icon name="leftButtonIcon" iconName=":/images/qtg_mono_previous.svg" />
+                    <icon name="rightButtonIcon" iconName=":/images/qtg_mono_next.svg" />
+                    <integer name="autoScrollTime" value="1000"/>
+                </widget>
+                <layout type="stacked">
+                    <stackitem itemname="tv:frequency_background"/>
+                    <stackitem itemname="tv:frequency_strip"/>
+                </layout>
+            </widget>
+        </widget>
+        <string name="title" locid="txt_rad_title_fm_radio"/>
+    </widget>
+    <connect receiver="view" sender="exit_action" signal="triggered()" slot="quit()"/>
+    <section name="portrait">
+        <widget name="tv:frequency_area">
+            <sizehint height="70" width="360" type="PREFERRED"/>
+        </widget>
+        <widget name="tv:info_area">
+            <sizehint height="280" type="PREFERRED" width="360"/>
+        </widget>
+        <widget name="tv:control_widget">
+            <sizehint height="280" type="PREFERRED" width="300"/>
+        </widget>
+        <widget name="tv:container">
+            <layout orientation="Vertical" spacing="0un" type="linear">
+                <linearitem itemname="tv:info_area"/>
+                <linearitem itemname="tv:frequency_area"/>
+                <linearitem itemname="tv:control_widget"/>
+            </layout>
+        </widget>
+    </section>
+    <section name="landscape">
+        <widget name="tv:frequency_area">
+            <sizehint height="50" width="640" type="PREFERRED"/>
+        </widget>
+        <widget name="tv:info_area">
+            <sizehint height="300" type="PREFERRED" width="230"/>
+        </widget>
+        <widget name="tv:control_widget">
+            <sizehint height="230" type="PREFERRED" width="230"/>
+        </widget>
+        <widget name="tv:container">
+            <layout spacing="0un" type="grid">
+                <griditem column="0" itemname="tv:info_area" row="0"/>
+                <griditem column="1" itemname="tv:control_widget" row="0"/>
+                <griditem column="0" itemname="tv:frequency_area" row="1" column_span="2" />
+            </layout>
+        </widget>
+    </section>
+    <!-- Scanning layout -->
+    <section name="tv:scanning">
+        <object name="tv:historyview_action">
+            <bool name="visible" value="FALSE"/>
+        </object>
+        <widget name="tv:info_text">
+            <string name="plainText" locid="txt_rad_list_searching_all_available_stations_ple" />
+            <bool name="visible" value="TRUE"/>
+        </widget>
+        <widget name="tv:stations_button">
+            <bool name="visible" value="FALSE"/>
+        </widget>
+        <widget name="tv:scan_button">
+            <string name="text" locid="txt_rad_button_cancel" />
+            <icon name="icon" iconName=" " />
+        </widget>
+        <widget name="tv:loudspeaker_button">
+            <bool name="visible" value="FALSE"/>
+        </widget>
+    </section>
+
+<!-- Seeking layout -->
+    <section name="tv:seeking">
+        <object name="tv:historyview_action">
+            <bool name="visible" value="FALSE"/>
+        </object>
+        <widget name="tv:info_text">
+            <string name="plainText" locid="txt_rad_list_seeking" />
+            <bool name="visible" value="TRUE"/>
+        </widget>
+    </section>
+
+<!-- No antenna layout -->
+    <section name="tv:no_antenna">
+        <widget name="tv:info_text">
+            <string name="plainText" locid="txt_rad_info_connect_wired_headset1" />
+            <bool name="visible" value="TRUE"/>
+        </widget>
+    </section>
+
+<!-- No favorites layout -->
+    <section name="tv:no_favorites">
+        <widget name="tv:info_text">
+            <string name="plainText" locid="txt_rad_dialog_long_press_arrow_keys_to_search_str" />
+            <bool name="visible" value="TRUE"/>
+        </widget>
+    </section>
+
+    <!-- Normal layout (not scanning) -->
+    <section name="tv:normal">
+        <object name="tv:historyview_action">
+            <bool name="visible" value="TRUE"/>
+        </object>
+        <widget name="tv:info_text">
+            <bool name="visible" value="FALSE"/>
+        </widget>
+        <widget name="tv:stations_button">
+            <bool name="visible" value="TRUE"/>
+        </widget>
+        <widget name="tv:scan_button">
+            <string name="text" locid="txt_rad_button_search_all_stations" />
+            <icon name="icon" iconName="qtg_mono_station_scan.svg" />
+        </widget>
+        <widget name="tv:loudspeaker_button">
+            <bool name="visible" value="TRUE"/>
+        </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>