--- a/helps_info/helps_metadata/helps_metadata.mrp Tue Jun 08 18:34:07 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-#
-# Copyright (c) 2009 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"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description:
-#
-
-component helps_metadata
-source \sf\app\helps\helps_info\helps_metadata
-source \sf\app\helps\package_definition.xml
-source \sf\app\helps\distribution.policy.s60
-notes_source \component_defs\release.src
-ipr T
--- a/package_definition.xml Tue Jun 08 18:34:07 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SystemDefinition schema="3.0.0">
- <package id="helps" name="Help Apps" levels="eng tools if ui">
- <collection id="csxhelp" name="Context Sensitive Extended Help" level="if">
- <component id="aiwhelpprovider" filter="s60" name="AIW Help Provider" class="plugin">
- <!-- <unit bldFile="csxhelp/aiwhelpprovider/group"/> -->
- </component>
- <component id="csxhelp_build" filter="s60" name="Context Sensitive Extended Help Build">
- <unit bldFile="csxhelp/group"/>
- </component>
- </collection>
- <collection id="symhelp" name="Symbian Help" level="eng">
- <component id="helpmodel" name="Help" introduced="6.0" purpose="optional">
- <unit bldFile="symhelp/helpmodel/group" mrp="symhelp/helpmodel/group/app-services_hlpmodel.mrp"/>
- </component>
- </collection>
- <collection id="helps_info" name="Help Apps Info" level="ui">
- <component id="helps_metadata" name="Help Apps Metadata" class="config" introduced="^2" purpose="development" target="desktop">
- <unit mrp="helps_info/helps_metadata/helps_metadata.mrp"/>
- </component>
- </collection>
- </package>
-</SystemDefinition>
--- a/symhelp/helpmodel/TestData/Source/ER5Help/epochlp.alp.tmp Tue Jun 08 18:34:07 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE cshproj PUBLIC "/EPOC32/tools/cshlpcmp/dtd/CSHproj.dtd" "SYSTEM">
-<?xml:stylesheet href="/EPOC32/tools/cshlpcmp/xsl/CSHproj.xsl" title="CS-Help project" type="text/xsl"?>
-<cshproj>
- <helpfileUID>0x10006000</helpfileUID>
- <directories>
- <input>\work\help\</input>
- <output>\epoc32\wins\c\system\help\</output>
- <graphics>\work\help\</graphics>
- <working>\work\help\temp\</working>
- </directories>
- <files>
- <source>
- <file>agen-hlp.rtf</file>
- <file>bomb-hlp.rtf</file>
- <file>calc-hlp.rtf</file>
- <file>comm-hlp.rtf</file>
- <file>cont-hlp.rtf</file>
- <file>data-hlp.rtf</file>
- <file>dial-hlp.rtf</file>
- <file>dict-hlp.rtf</file>
- <file>gen--hlp.rtf</file>
- <file>hard-hlp.rtf</file>
- <file>jott-hlp.rtf</file>
- <file>prog-hlp.rtf</file>
- <file>rec--hlp.rtf</file>
- <file>shet-hlp.rtf</file>
- <file>sket-hlp.rtf</file>
- <file>spel-hlp.rtf</file>
- <file>syst-hlp.rtf</file>
- <file>time-hlp.rtf</file>
- <file>word-hlp.rtf</file>
- <file>xtra-hlp.rtf</file>
- </source>
- <destination>EPOCHlp</destination>
- <customization>\work\help\uk.alc.xml</customization>
- </files>
-</cshproj>
--- a/symhelp/helpmodel/TestData/Source/ER5Help/epochlp.alp.xml.bak Tue Jun 08 18:34:07 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE cshproj PUBLIC "/EPOC32/tools/cshlpcmp/dtd/CSHproj.dtd" "SYSTEM">
-<?xml:stylesheet href="/EPOC32/tools/cshlpcmp/xsl/CSHproj.xsl" title="CS-Help project" type="text/xsl"?>
-<cshproj>
- <helpfileUID>0x10006000</helpfileUID>
- <directories>
- <input>H:\aleppo\work\help\</input>
- <output>H:\epoc32\wins\c\system\help\</output>
- <graphics>H:\aleppo\work\help\</graphics>
- <working>H:\aleppo\work\help\temp\</working>
- </directories>
- <files>
- <source>
- <file>sket-hlp.rtf</file>
- </source>
- <destination>EPOCHlp</destination>
- <customization>H:\aleppo\work\help\uk.alc.xml</customization>
- </files>
-</cshproj>
--- a/symhelp/helpmodel/TestData/Source/ER5Help/epochlp.tmp Tue Jun 08 18:34:07 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-inputdirectory c:\aleppo\work\help\
-outputdirectory c:\epoc32\wins\c\documents\
-outputfile EPOCHlp
-sourcefile agen-hlp bomb-hlp calc-hlp comm-hlp cont-hlp data-hlp dial-hlp dict-hlp gen--hlp hard-hlp jott-hlp prog-hlp rec--hlp shet-hlp sket-hlp spel-hlp syst-hlp time-hlp word-hlp xtra-hlp
-orderfile EPOCHlp.order
-graphicsdirectory c:\aleppo\work\help\
-workingdirectory c:\aleppo\work\help\temp\
-customizationfile c:\aleppo\work\help\uk.alc
--- a/symhelp/helpmodel/TestData/Source/ER5Help/uk.alc.tmp Tue Jun 08 18:34:07 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE cshcust PUBLIC "/EPOC32/tools/cshlpcmp/dtd/CSHcush.dtd" "SYSTEM">
-<?xml:stylesheet href="/EPOC32/tools/cshlpcmp/xsl/CSHcust.xsl" title="CS-Help customisation" type="text/xsl"?>
-<cshcust>
-<bodystyle fontstyle="sansserif" size="10"/>
-<titlestyle fontstyle="sansserif" size="14"/>
-<listbullet1style bulletchar="149"></listbullet1style>
-<listbullet2style bulletchar="45"></listbullet2style>
-<tipeffects leftindent="36"><b>Tip:</b></tipeffects>
-<noteeffects leftindent="36"><b>Note:</b></noteeffects>
-<importanteffects leftindent="60"><b>Important:</b></importanteffects>
-</cshcust>
--- a/symhelp/helpmodel/group/BLD.INF Tue Jun 08 18:34:07 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
-// Copyright (c) 1999-2009 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"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// Help application engine
-//
-//
-
-PRJ_PLATFORMS
-DEFAULT WINC
-
-
-PRJ_EXPORTS
-// specify the source file followed by its destination here
-// copy will be used to copy the source file to its destination
-// If there's no destination then the source file will be copied
-// to the same name in \epoc32\include
-../dbwriter/DBWRITER.H SYMBIAN_APP_LAYER_PUBLIC_EXPORT_PATH(dbwriter.h)
-//
-../inc/HLPMODEL.H SYMBIAN_APP_LAYER_PUBLIC_EXPORT_PATH(hlpmodel.h)
-../inc/HLPLCH.H SYMBIAN_APP_LAYER_PUBLIC_EXPORT_PATH(hlplch.h)
-../inc/hlpconstants.h SYMBIAN_APP_LAYER_PLATFORM_EXPORT_PATH(hlpconstants.h)
-../inc/HlpZoom.h SYMBIAN_APP_LAYER_PUBLIC_EXPORT_PATH(hlpzoom.h)
-
-../group/hlpmodel.iby /epoc32/rom/include/hlpmodel.iby
-
-
-PRJ_MMPFILES
-../dbwriter/DBWRITER.MMP
-#ifndef WINC
-../group/HLPMODEL.MMP
-../lch/HLPLCH.MMP
-#endif
-
-PRJ_TESTMMPFILES
-../tsrc/tlch.mmp manual
-../tsrc/TSearch.mmp
-../tsrc/tstore.mmp
-../tsrc/THelpView.mmp manual
-../tsrc/tdumper.mmp manual
-../tsrc/TLoader.mmp
-
-PRJ_TESTEXPORTS
-../group/hlpmodelTest.iby /epoc32/rom/include/hlpmodeltest.iby
-
-../TestData/Boss-1.hlp /epoc32/winscw/c/resource/help/boss-1.hlp
-../TestData/Boss-2.hlp /epoc32/winscw/c/resource/help/boss-2.hlp
-../TestData/ER5Help_Part1.hlp /epoc32/winscw/c/resource/help/er5help_part1.hlp
-../TestData/newfile.hlp /epoc32/winscw/c/resource/help/newfile.hlp
-../TestData/french.hlp /epoc32/winscw/c/resource/help/french.hlp
-../TestData/PlatSecSearchTestZ.hlp z:/resource/help/platsecsearchtest.hlp
-../TestData/PlatSecSearchTestC.hlp z:/system/data/thlpmodel/platsecsearchtestc.hlp
-../TestData/PlatSecSearchTestF.hlp z:/system/data/thlpmodel/platsecsearchtestf.hlp
-
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/symhelp/helpmodel/group/bld.inf Tue Jun 22 18:36:24 2010 +0800
@@ -0,0 +1,63 @@
+// Copyright (c) 1999-2009 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"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// Help application engine
+//
+//
+
+PRJ_PLATFORMS
+DEFAULT WINC
+
+
+PRJ_EXPORTS
+// specify the source file followed by its destination here
+// copy will be used to copy the source file to its destination
+// If there's no destination then the source file will be copied
+// to the same name in \epoc32\include
+../dbwriter/DBWRITER.H SYMBIAN_APP_LAYER_PUBLIC_EXPORT_PATH(dbwriter.h)
+//
+../inc/HLPMODEL.H SYMBIAN_APP_LAYER_PUBLIC_EXPORT_PATH(hlpmodel.h)
+../inc/HLPLCH.H SYMBIAN_APP_LAYER_PUBLIC_EXPORT_PATH(hlplch.h)
+../inc/hlpconstants.h SYMBIAN_APP_LAYER_PLATFORM_EXPORT_PATH(hlpconstants.h)
+../inc/HlpZoom.h SYMBIAN_APP_LAYER_PUBLIC_EXPORT_PATH(hlpzoom.h)
+
+../group/hlpmodel.iby /epoc32/rom/include/hlpmodel.iby
+
+
+PRJ_MMPFILES
+../dbwriter/DBWRITER.MMP
+#ifndef WINC
+../group/HLPMODEL.MMP
+../lch/HLPLCH.MMP
+#endif
+
+PRJ_TESTMMPFILES
+../tsrc/tlch.mmp manual
+../tsrc/TSearch.mmp
+../tsrc/tstore.mmp
+../tsrc/THelpView.mmp manual
+../tsrc/tdumper.mmp manual
+../tsrc/TLoader.mmp
+
+PRJ_TESTEXPORTS
+../group/hlpmodelTest.iby /epoc32/rom/include/hlpmodeltest.iby
+
+../TestData/Boss-1.hlp /epoc32/winscw/c/resource/help/boss-1.hlp
+../TestData/Boss-2.hlp /epoc32/winscw/c/resource/help/boss-2.hlp
+../TestData/ER5Help_Part1.hlp /epoc32/winscw/c/resource/help/er5help_part1.hlp
+../TestData/newfile.hlp /epoc32/winscw/c/resource/help/newfile.hlp
+../TestData/french.hlp /epoc32/winscw/c/resource/help/french.hlp
+../TestData/PlatSecSearchTestZ.hlp z:/resource/help/platsecsearchtest.hlp
+../TestData/PlatSecSearchTestC.hlp z:/system/data/thlpmodel/platsecsearchtestc.hlp
+../TestData/PlatSecSearchTestF.hlp z:/system/data/thlpmodel/platsecsearchtestf.hlp
+
--- a/userguide/Userguide.pro Tue Jun 08 18:34:07 2010 +0800
+++ b/userguide/Userguide.pro Tue Jun 22 18:36:24 2010 +0800
@@ -62,9 +62,9 @@
MOBILITY = systeminfo
LIBS += -lezip -lxqservice -lxqserviceutil
include(rom/userguide.pri)
+ SKINICON = qtg_large_help
}
-
-ICON = resources/qtg_large_help.svg
+
RESOURCES += resources/Userguide.qrc
debug: DESTDIR = ./debug
--- a/userguide/inc/HelpBaseView.h Tue Jun 08 18:34:07 2010 +0800
+++ b/userguide/inc/HelpBaseView.h Tue Jun 22 18:36:24 2010 +0800
@@ -45,18 +45,12 @@
void onToolbarFind() { emit showFindList(); };
void onToolbarOnlineSupport();
-protected slots:
- virtual void onOrientationChanged(Qt::Orientation orientation);
-
protected:
void initBaseDocMl();
protected:
HelpUIBuilder mBuilder;
HbToolBar* mToolBar;
-
-private:
- void RefreshToolbarText(Qt::Orientation orientation);
};
#endif //HELPBATHVIEW_H
--- a/userguide/inc/HelpCategoryView.h Tue Jun 08 18:34:07 2010 +0800
+++ b/userguide/inc/HelpCategoryView.h Tue Jun 22 18:36:24 2010 +0800
@@ -18,19 +18,14 @@
#ifndef HELPCATEGORYVIEW_H
#define HELPCATEGORYVIEW_H
-#include <hbview.h>
+#include <HelpBaseView.h>
-#include "HelpCommon.h"
#include "HelpDocumentLoader.h"
class HbTreeView;
-class HbListView;
-class HbSearchPanel;
class QStandardItem;
-class HbStaticVkbHost;
-class HbGroupBox;
-class HelpCategoryView : public HbView
+class HelpCategoryView : public HelpBaseView
{
Q_OBJECT
@@ -42,64 +37,20 @@
private:
void initDocMl();
void initAllList();
- void initSearchList();
- void initSearchPanel();
- void initBackAction();
- void initEmptyLabel();
- void initVirtualKeyboard();
-
-private:
- HbGroupBox* groupBox();
-
-public:
- enum ViewMode
- {
- ViewModeNull = 0,
- ViewModeAll,
- ViewModeSearch
- };
- void switchViewMode(ViewMode viewMode);
-
-signals:
- void activateView(HelpViewName viewName);
-
-private:
- void updateVisibleItems(bool visible);
- void ResetSearchPanel();
private:
void expandCollapseAllList(QStandardItem* item, bool expand);
-
-private slots: // handle system event
- void onCurrentViewChanged(HbView *view);
-
-private slots: // handle button action
- void onBackAction();
+ void updateExpandCollapseAction(bool expand);
private slots: // handle list event
void onAllListActivated(const QModelIndex& index);
- void onSearchListActivated(const QModelIndex& index);
-private slots: // handle search panel event
- void onSearchPanelExitClicked();
- void onSearchPanelCriteriaChanged(const QString &criteria);
-
-private slots:
- void onExpandAll();
- void onCollapseAll();
-
-private slots: // handle virtual keyboard event
- void onHandleKeypadOpen();
- void onHandleKeypadClose();
+private slots: // handle menu event
+ void onExpandOrCollapseAll();
private:
- ViewMode mViewMode;
- HbTreeView* mListAll;
- HbListView* mListSearch;
- HbSearchPanel* mSearchPanel;
- HbAction* mSoftKeyAction;
- HbStaticVkbHost* mVirtualKeyboard;
- HelpUIBuilder mBuilder;
+ HbTreeView* mListAll;
+ int mExpandCount;
};
#endif //HELPCATEGORYVIEW_H
--- a/userguide/inc/HelpDataProvider.h Tue Jun 08 18:34:07 2010 +0800
+++ b/userguide/inc/HelpDataProvider.h Tue Jun 22 18:36:24 2010 +0800
@@ -35,14 +35,13 @@
static void destroyInstance();
public:
+ void createHelpCategory();
QAbstractItemModel* getCategoryData();
QAbstractItemModel* getSearchData(const QString& key=QString());
void setHelpContentUrl(const QString& uid, const QString& href);
void getHelpContentData(QString& content, QString& url);
private:
- void createHelpCategory();
-
//construct 1st category
void constructCategory();
//construct help category in rom
--- a/userguide/inc/HelpKeywordView.h Tue Jun 08 18:34:07 2010 +0800
+++ b/userguide/inc/HelpKeywordView.h Tue Jun 22 18:36:24 2010 +0800
@@ -45,15 +45,16 @@
void initVirtualKeyboard();
private:
- void onOrientationChanged(Qt::Orientation orientation);
-
-private:
HbLabel* label();
private:
void updateVisibleItems(bool visible);
void ResetSearchPanel();
void updateLabelPos();
+ void showToolBar(bool visible);
+
+private slots:
+ void onOrientationChanged(Qt::Orientation orientation);
private slots: // handle system event
void onViewReady();
--- a/userguide/resources/Userguide.qrc Tue Jun 08 18:34:07 2010 +0800
+++ b/userguide/resources/Userguide.qrc Tue Jun 22 18:36:24 2010 +0800
@@ -2,13 +2,8 @@
<qresource prefix="/xml">
<file alias="categoryView.docml">xml/categoryView.docml</file>
+ <file alias="keywordView.docml">xml/keywordView.docml</file>
<file alias="contentsView.docml">xml/contentsView.docml</file>
- <file alias="toolbar.docml">xml/toolbar.docml</file>
+ <file alias="baseView.docml">xml/baseView.docml</file>
</qresource>
-
- <qresource prefix= "/images">
- <file alias="show_all.svg">images/qtg_mono_show_all.svg</file>
- <file alias="link_nokia.svg">images/qtg_mono_link_nokia.svg</file>
- </qresource>
-
</RCC>
\ No newline at end of file
--- a/userguide/resources/qtg_large_help.svg Tue Jun 08 18:34:07 2010 +0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
-<svg baseProfile="tiny" height="60" viewBox="0 0 60 60" width="60" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<rect fill="none" height="60" width="60"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="30" x2="30" y1="8.16" y2="51.02">
-<stop offset="0" stop-color="#E5FFB2"/>
-<stop offset="0.39" stop-color="#6AAB18"/>
-<stop offset="0.68" stop-color="#247307"/>
-<stop offset="1" stop-color="#C2FF4A"/>
-</linearGradient>
-<circle cx="29.998" cy="29.385" fill="url(#SVGID_1)" r="21.427"/>
-<radialGradient cx="30.2" cy="10.41" gradientUnits="userSpaceOnUse" id="SVGID_2" r="39.38">
-<stop offset="0" stop-color="#AFED23"/>
-<stop offset="0.81" stop-color="#358C0C"/>
-<stop offset="1" stop-color="#67AD1A"/>
-</radialGradient>
-<path d="M29.998,50.2c-11.478,0-20.815-9.337-20.815-20.814S18.521,8.571,29.998,8.571 c11.477,0,20.814,9.337,20.814,20.815S41.475,50.2,29.998,50.2L29.998,50.2z" fill="url(#SVGID_2)"/>
-<path d="M23.264,21.626v-3.515c2.128-0.49,4.146-0.735,6.06-0.735 c2.821,0,4.986,0.547,6.492,1.642c1.507,1.093,2.26,2.697,2.26,4.815c0,1.231-0.291,2.274-0.869,3.129 c-0.581,0.854-4.583,4.875-4.978,5.425c-0.396,0.55-0.592,1.201-0.592,1.955v0.752h-5.615V34.09c0-1.22,0.267-2.25,0.799-3.094 c0.532-0.843,1.461-1.887,2.789-3.13c1.041-0.969,2.332-3.217,2.332-3.695c0-2.163-1.303-3.245-3.91-3.245 C26.562,20.927,24.974,21.16,23.264,21.626z M28.803,44.69c-0.944,0-1.757-0.335-2.439-1.005c-0.68-0.67-1.021-1.488-1.021-2.457 c0-0.957,0.338-1.775,1.013-2.457c0.676-0.682,1.491-1.022,2.447-1.022c0.957,0,1.775,0.341,2.458,1.022s1.022,1.5,1.022,2.457 c0,0.969-0.341,1.787-1.022,2.457C30.58,44.355,29.76,44.69,28.803,44.69z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M23.264,20.78v-3.515c2.128-0.49,4.146-0.735,6.06-0.735 c2.821,0,4.986,0.547,6.492,1.642c1.507,1.093,2.26,2.697,2.26,4.815c0,1.231-0.291,2.274-0.869,3.129 c-0.581,0.854-4.583,4.875-4.978,5.425c-0.396,0.55-0.592,1.202-0.592,1.954v0.754h-5.615v-1.005c0-1.22,0.267-2.251,0.799-3.094 c0.532-0.843,1.461-1.887,2.789-3.13c1.041-0.969,2.332-3.217,2.332-3.695c0-2.163-1.303-3.245-3.91-3.245 C26.562,20.081,24.974,20.314,23.264,20.78z M28.803,43.844c-0.944,0-1.757-0.334-2.439-1.004c-0.68-0.67-1.021-1.489-1.021-2.458 c0-0.956,0.338-1.775,1.013-2.457c0.676-0.682,1.491-1.022,2.447-1.022c0.957,0,1.775,0.341,2.458,1.022 c0.683,0.681,1.022,1.501,1.022,2.457c0,0.969-0.341,1.788-1.022,2.458C30.58,43.51,29.76,43.844,28.803,43.844z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="30.67" x2="30.67" y1="15.45" y2="42.99">
-<stop offset="0" stop-color="#F6FDFF"/>
-<stop offset="1" stop-color="#ADB3B5"/>
-</linearGradient>
-<path d="M23.264,19.79v-3.515c2.128-0.491,4.146-0.735,6.06-0.735c2.821,0,4.986,0.546,6.492,1.642 c1.507,1.093,2.26,2.697,2.26,4.814c0,1.232-0.291,2.274-0.869,3.129C36.625,25.98,32.623,30,32.229,30.55 c-0.396,0.55-0.592,1.202-0.592,1.955v0.753h-5.615v-1.005c0-1.22,0.267-2.25,0.799-3.093c0.532-0.843,1.461-1.887,2.789-3.13 c1.041-0.968,2.332-3.216,2.332-3.694c0-2.163-1.303-3.245-3.91-3.245C26.562,19.091,24.974,19.323,23.264,19.79z M28.803,42.854 c-0.944,0-1.757-0.334-2.439-1.004c-0.68-0.67-1.021-1.489-1.021-2.457c0-0.957,0.338-1.775,1.013-2.458 c0.676-0.681,1.491-1.022,2.447-1.022c0.957,0,1.775,0.342,2.458,1.022c0.683,0.682,1.022,1.501,1.022,2.458 c0,0.968-0.341,1.787-1.022,2.457C30.58,42.52,29.76,42.854,28.803,42.854z" fill="url(#SVGID_3)"/>
-<rect fill="none" height="59.996" width="59.996"/>
-</svg>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/userguide/resources/xml/categoryView.docml Tue Jun 22 18:36:24 2010 +0800
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<hbdocument version="1.0">
+ <object name="action_expand_collapse_all" type="HbAction">
+ <string locid="txt_user_guide_opt_expand_all" name="text" value="Action01"/>
+ </object>
+
+ <widget name="view_help" type="HbView">
+ <widget name="content" role="HbView:widget" type="HbWidget">
+ <widget name="list_category_all" type="HbTreeView">
+ <widget name="treeItemPrototype" role="HbAbstractView:prototype" type="HbTreeViewItem"/>
+ <sizehint height="47.7612un" type="PREFERRED" width="35.8209un"/>
+ </widget>
+ <real name="z" value="0"/>
+ <layout orientation="Vertical" type="linear">
+ <contentsmargins bottom="0px" left="0px" right="0px" top="0px"/>
+ <linearitem itemname="list_category_all"/>
+ </layout>
+ </widget>
+ <widget name="menu" type="HbMenu" role="HbView:menu">
+ <ref object="action_expand_collapse_all" role="HbMenu:addAction" />
+ </widget>
+ <string locid="txt_user_guide_title_user_guide" name="title" value="View"/>
+ </widget>
+
+ <connect sender="action_expand_collapse_all" signal="triggered(bool)" receiver="view_help" slot="onExpandOrCollapseAll()" />
+
+</hbdocument>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/userguide/resources/xml/contentsView.docml Tue Jun 22 18:36:24 2010 +0800
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<hbdocument version="1.0">
+
+ <widget name="view_help" type="HbView">
+ <widget name="content" role="HbView:widget" type="HbWidget">
+ <widget name="browser_contents" type="BrowserWrapper">
+ <sizehint height="47.7612un" type="PREFERRED" width="35.8209un"/>
+ <sizepolicy horizontalPolicy="Preferred" horizontalStretch="0" verticalPolicy="Expanding" verticalStretch="0"/>
+ </widget>
+ <real name="z" value="0"/>
+ <layout orientation="Vertical" type="linear">
+ <contentsmargins bottom="0px" left="0px" right="0px" top="0px"/>
+ <linearitem itemname="browser_contents"/>
+ </layout>
+ </widget>
+ <string locid="txt_user_guide_title_user_guide" name="title" value="View"/>
+ </widget>
+
+</hbdocument>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/userguide/src/HelpBaseView.cpp Tue Jun 22 18:36:24 2010 +0800
@@ -0,0 +1,61 @@
+/*
+* Copyright (c) 2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+#include <hbtoolbar.h>
+#include <hbnotificationdialog.h>
+#include <hbaction.h>
+
+#include "HelpBaseView.h"
+
+//////////////////////////////////////////////////////////////////////////////////////////////
+
+HelpBaseView::HelpBaseView()
+{
+}
+
+HelpBaseView::~HelpBaseView()
+{
+}
+
+
+////////////////////////////////////////////////////////////////////////////////////////////
+
+void HelpBaseView::initBaseDocMl()
+{
+ // Create widget hierarchy
+ setObjectName( DOCML_VIEW_NAME );
+
+ // List existing root elements - this allows us to refer to objects in the XML
+ // which are created outside the document.
+ QObjectList roots;
+ roots.append( this );
+
+ mBuilder.setObjectTree(roots);
+
+ mBuilder.load(QRC_DOCML_BASE);
+}
+
+void HelpBaseView::onToolbarOnlineSupport()
+{
+ HbNotificationDialog *notificationDialog = new HbNotificationDialog();
+ notificationDialog->setParent(this);
+ notificationDialog->setTitle(URL_LINK_SUPPORT);
+ notificationDialog->show();
+}
+
+
+// end of file
--- a/userguide/src/HelpCategoryView.cpp Tue Jun 08 18:34:07 2010 +0800
+++ b/userguide/src/HelpCategoryView.cpp Tue Jun 22 18:36:24 2010 +0800
@@ -21,20 +21,13 @@
#include <hbmainwindow.h>
#include <hbapplication.h>
#include <hbaction.h>
-#include <hbtoolbar.h>
-#include <hblabel.h>
#include <hbtreeview.h>
-#include <hblistview.h>
-#include <hbsearchpanel.h>
#include <hbscrollbar.h>
-#include <hblineedit.h>
#include <hbmenu.h>
-#include <hbstaticvkbhost.h>
-#include <hbgroupbox.h>
+#include <hbtoolbar.h>
#include "HelpDataProvider.h"
-#include "HelpProxyModel.h"
#include "HelpCategoryView.h"
@@ -42,10 +35,8 @@
//////////////////////////////////////////////////////////////////////////////////////////////
HelpCategoryView::HelpCategoryView() :
-mViewMode(ViewModeNull),
-mListAll(NULL),
-mListSearch(NULL),
-mSearchPanel(NULL)
+mListAll(NULL),
+mExpandCount(0)
{
}
@@ -59,39 +50,15 @@
void HelpCategoryView::init()
{
initDocMl();
- initBackAction();
initAllList();
- initSearchList();
- initSearchPanel();
- initVirtualKeyboard();
- initEmptyLabel();
-
- switchViewMode(ViewModeAll);
-
- connect(mainWindow(), SIGNAL(currentViewChanged(HbView*)), this, SLOT(onCurrentViewChanged(HbView*)));
}
void HelpCategoryView::initDocMl()
{
- // Create widget hierarchy
- setObjectName( DOCML_VIEW_CATEGORY );
-
- // List existing root elements - this allows us to refer to objects in the XML
- // which are created outside the document.
- QObjectList roots;
- roots.append( this );
-
- mBuilder.setObjectTree(roots);
-
+ initBaseDocMl();
mBuilder.load(QRC_DOCML_CATEGORY);
}
-void HelpCategoryView::initBackAction()
-{
- mSoftKeyAction = new HbAction(Hb::BackAction);
- connect(mSoftKeyAction, SIGNAL(triggered()), this, SLOT(onBackAction()));
-}
-
void HelpCategoryView::initAllList()
{
mListAll = mBuilder.findWidget<HbTreeView*>(DOCML_LIST_CATEGORY_ALL);
@@ -100,57 +67,6 @@
connect(mListAll, SIGNAL(activated(const QModelIndex&)), this, SLOT(onAllListActivated(const QModelIndex&)));
}
-void HelpCategoryView::initSearchList()
-{
- mListSearch = mBuilder.findWidget<HbListView*>(DOCML_LIST_CATEGORY_SEARCH);
- mListSearch->setHorizontalScrollBarPolicy(HbScrollArea::ScrollBarAlwaysOff);
- mListSearch->setModel(HelpDataProvider::instance()->getSearchData());
- connect(mListSearch, SIGNAL(activated(const QModelIndex&)), this, SLOT(onSearchListActivated(const QModelIndex&)));
-}
-void HelpCategoryView::initSearchPanel()
-{
- mSearchPanel = mBuilder.findWidget<HbSearchPanel*>(DOCML_SEARCH_PANEL_CATEGORY);
- connect(mSearchPanel, SIGNAL(exitClicked()), this, SLOT(onSearchPanelExitClicked()));
- connect(mSearchPanel, SIGNAL(criteriaChanged(const QString&)), this, SLOT(onSearchPanelCriteriaChanged(const QString&)));
-}
-
-void HelpCategoryView::initVirtualKeyboard()
-{
- mVirtualKeyboard = new HbStaticVkbHost(this);
- connect(mVirtualKeyboard, SIGNAL(keypadOpened()), this, SLOT(onHandleKeypadOpen()));
- connect(mVirtualKeyboard, SIGNAL(keypadClosed()), this, SLOT(onHandleKeypadClose()));
-}
-
-void HelpCategoryView::initEmptyLabel()
-{
- HbLabel* label = mBuilder.findWidget<HbLabel*>(DOCML_NO_MATCH_LABEL);
- label->setFontSpec(HbFontSpec(HbFontSpec::Primary));
-}
-
-HbGroupBox* HelpCategoryView::groupBox()
-{
- return mBuilder.findWidget<HbGroupBox*>(DOCML_GROUPBOX);
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////
-
-void HelpCategoryView::switchViewMode(ViewMode viewMode)
-{
- if(ViewModeNull == viewMode) return;
-
- mViewMode = viewMode;
- if(ViewModeAll == viewMode)
- {
- mBuilder.load(QRC_DOCML_CATEGORY, DOCML_LAYOUT_CATEGORY_ALL);
- toolBar()->show();
- }
- else if(ViewModeSearch == viewMode)
- {
-// mBuilder.load(QRC_DOCML_CATEGORY, DOCML_LAYOUT_CATEGORY_SEARCH);
- ResetSearchPanel();
- }
-}
-
////////////////////////////////////////////////////////////////////////////////////////////
void HelpCategoryView::expandCollapseAllList(QStandardItem* item, bool expand)
@@ -166,66 +82,13 @@
}
}
-////////////////////////////////////////////////////////////////////////////////////////////
-
-void HelpCategoryView::updateVisibleItems(bool visible)
-{
- static Hb::SceneItems items = Hb::TitleBarItem | Hb::StatusBarItem;
- if(visible)
- {
- showItems(items);
- }
- else
- {
- hideItems(items);
- }
-}
-
-void HelpCategoryView::ResetSearchPanel()
+void HelpCategoryView::updateExpandCollapseAction(bool expand)
{
- foreach(QGraphicsItem *obj, mSearchPanel->childItems())
- {
- QGraphicsWidget *const widget = static_cast<QGraphicsWidget*>(obj);
- if(widget != NULL)
- {
- HbLineEdit *const lineEdit = qobject_cast<HbLineEdit*>(widget);
- if(lineEdit != NULL)
- {
- lineEdit->setText("");
- break;
- }
- }
- }
+ HbAction* allAction = mBuilder.findObject<HbAction*>(DOCML_ACTION_EXPAND_COLLAPSE_ALL);
+ allAction->setText(expand ? hbTrId(TXT_EXPAND_ALL) : hbTrId(TXT_COLLAPSE_ALL));
}
////////////////////////////////////////////////////////////////////////////////////////////
-// handle system event
-
-void HelpCategoryView::onCurrentViewChanged(HbView *view)
-{
- if(this == view)
- {
- setNavigationAction(mSoftKeyAction);
- }
-}
-
-///////////////////////////////////////////////////////////////////////////////////////
-// handle button back action
-
-void HelpCategoryView::onBackAction()
-{
- if(ViewModeSearch == mViewMode)
- {
- switchViewMode(ViewModeAll);
- }
- else
- {
- HbApplication::exit();
- }
-}
-
-
-////////////////////////////////////////////////////////////////////////////////////////////
// handle list event
void HelpCategoryView::onAllListActivated(const QModelIndex& index)
@@ -233,6 +96,20 @@
if(!index.isValid() || // invalid
index.child(0,0).isValid()) // this is a node
{
+ if(index.parent().isValid())
+ {
+ return;
+ }
+
+ if(mListAll->isExpanded(index))
+ {
+ mExpandCount++;
+ }
+ else
+ {
+ mExpandCount--;
+ }
+ updateExpandCollapseAction(mExpandCount == 0);
return;
}
@@ -242,96 +119,15 @@
emit activateView(HelpViewContents);
}
-void HelpCategoryView::onSearchListActivated(const QModelIndex& index)
+////////////////////////////////////////////////////////////////////////////////////////////
+// handle menu event
+void HelpCategoryView::onExpandOrCollapseAll()
{
- if(!index.isValid() || // invalid
- index.child(0,0).isValid()) // this is a node
- {
- return;
- }
-
- QString uid = mListSearch->model()->data(index, UidRole).toString();
- QString href = mListSearch->model()->data(index, HrefRole).toString();
- HelpDataProvider::instance()->setHelpContentUrl(uid, href);
- emit activateView(HelpViewContents);
-}
-
-
-////////////////////////////////////////////////////////////////////////////////////////////
-// handle search panel event
-
-void HelpCategoryView::onSearchPanelExitClicked()
-{
- if(mListSearch->model()->rowCount() == 0)
- {
- mBuilder.load(QRC_DOCML_CATEGORY, DOCML_LAYOUT_CATEGORY_SEARCH_NO_SRHPAL_NO_MATCH);
- }
- else
- {
- mBuilder.load(QRC_DOCML_CATEGORY, DOCML_LAYOUT_CATEGORY_SEARCH_NO_SRHPAL);
- }
- toolBar()->show();
+ bool needExpand = (mExpandCount == 0);
+ QStandardItemModel* model = (QStandardItemModel*)(mListAll->model());
+ expandCollapseAllList(model->invisibleRootItem(),needExpand);
+ mExpandCount = needExpand ? model->invisibleRootItem()->rowCount() : 0;
+ updateExpandCollapseAction(mExpandCount == 0);
}
-void HelpCategoryView::onSearchPanelCriteriaChanged(const QString &criteria)
-{
- HelpDataProvider::instance()->getSearchData(criteria);
- if(mListSearch->model()->rowCount() == 0)
- {
- mBuilder.load(QRC_DOCML_CATEGORY, DOCML_LAYOUT_CATEGORY_SEARCH_NO_MATCH);
- }
- else
- {
- mBuilder.load(QRC_DOCML_CATEGORY, DOCML_LAYOUT_CATEGORY_SEARCH);
- }
-
- toolBar()->hide();
-
- if(criteria.isEmpty())
- {
- groupBox()->setHeading(hbTrId(TXT_SETLABEL_SEARCH));
- }
- else
- {
- QString heading = qtTrId(TXT_SETLABEL_SEARCH_RESULTS);
- heading.append(COLON);
- heading.append(criteria);
- groupBox()->setHeading(heading);
- }
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////
-// handle virtual keyboard event
-
-void HelpCategoryView::onHandleKeypadOpen()
-{
- updateVisibleItems(false);
- qreal heightToSet = mainWindow()->layoutRect().height() - mVirtualKeyboard->keyboardArea().height();
- this->setMaximumHeight(heightToSet);
-}
-
-void HelpCategoryView::onHandleKeypadClose()
-{
- updateVisibleItems(true);
- qreal mainHeight = mainWindow()->layoutRect().height();
- qreal toolbarHeight = toolBar()->size().height();
- qreal height = mainHeight - (toolBar()->isVisible() ? toolbarHeight : 0);
- this->setMaximumHeight(height);
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////
-// handle menu event
-void HelpCategoryView::onExpandAll()
-{
- QStandardItemModel* model = (QStandardItemModel*)(mListAll->model());
- expandCollapseAllList(model->invisibleRootItem(),true);
-}
-
-void HelpCategoryView::onCollapseAll()
-{
- QStandardItemModel* model = (QStandardItemModel*)(mListAll->model());
- expandCollapseAllList(model->invisibleRootItem(),false);
-}
-
-
// end of file
--- a/userguide/src/HelpDataProvider.cpp Tue Jun 08 18:34:07 2010 +0800
+++ b/userguide/src/HelpDataProvider.cpp Tue Jun 22 18:36:24 2010 +0800
@@ -72,11 +72,6 @@
QAbstractItemModel* HelpDataProvider::getCategoryData()
{
- if(!mHelpModel->rowCount())
- {
- createHelpCategory();
- }
-
return mHelpModel;
}
@@ -89,6 +84,7 @@
mLastSrhKey = key;
mSearhResultModel->setFilterRegExp(key);
+
return mSearhResultModel;
}
@@ -187,7 +183,6 @@
void HelpDataProvider::constructBuiltInCategory(const QString& path, const QStringList& uidList, const QStringList& titleList)
{
-// constructCategory2(title, uid);
if(uidList.count() != titleList.count())
{
//ToDo
@@ -363,7 +358,7 @@
return;
}
- for(int i = featureIdLst.count() - 1; i <= 0; i--)
+ for(int i = featureIdLst.count() - 1; i >= 0; i--)
{
int featureID = featureIdLst.at(i).toInt();
if(!HelpUtils::suppportFeatureID(featureID))
@@ -426,7 +421,7 @@
return;
}
- for(int i = featureIdLst.count() - 1; i <= 0; i--)
+ for(int i = featureIdLst.count() - 1; i >= 0; i--)
{
int featureID = featureIdLst.at(i).toInt();
if(!HelpUtils::suppportFeatureID(featureID))
--- a/userguide/src/HelpDocumentLoader.cpp Tue Jun 08 18:34:07 2010 +0800
+++ b/userguide/src/HelpDocumentLoader.cpp Tue Jun 22 18:36:24 2010 +0800
@@ -32,7 +32,7 @@
object->setObjectName(name);
return object;
}
-
+
return HbDocumentLoader::createObject(type, name);
}
--- a/userguide/src/HelpKeywordView.cpp Tue Jun 08 18:34:07 2010 +0800
+++ b/userguide/src/HelpKeywordView.cpp Tue Jun 22 18:36:24 2010 +0800
@@ -104,7 +104,7 @@
void HelpKeywordView::loadAllContent()
{
- toolBar()->hide();
+ showToolBar(false);
mBuilder.load(QRC_DOCML_KEYWORD, DOCML_LAYOUT_SEARCH);
ResetSearchPanel();
@@ -172,6 +172,19 @@
}
}
+void HelpKeywordView::showToolBar(bool visible)
+{
+ Hb::SceneItems items = Hb::ToolBarItem;
+ if(visible)
+ {
+ showItems(items);
+ }
+ else
+ {
+ hideItems(items);
+ }
+}
+
////////////////////////////////////////////////////////////////////////////////////////////
// handle system event
@@ -223,7 +236,7 @@
{
mBuilder.load(QRC_DOCML_KEYWORD, DOCML_LAYOUT_SEARCH_NO_SRHPAL);
}
- toolBar()->show();
+ showToolBar(true);
}
void HelpKeywordView::onSearchPanelCriteriaChanged(const QString &criteria)
@@ -237,8 +250,7 @@
{
mBuilder.load(QRC_DOCML_KEYWORD, DOCML_LAYOUT_SEARCH);
}
-
- toolBar()->hide();
+ showToolBar(false);
}
////////////////////////////////////////////////////////////////////////////////////////////
@@ -257,14 +269,14 @@
updateVisibleItems(true);
qreal mainHeight = mainWindow()->layoutRect().height();
qreal toolbarHeight = toolBar()->size().height();
- qreal height = mainHeight - (toolBar()->isVisible() ? toolbarHeight : 0);
+ qreal height = mainHeight - ( toolBar()->isVisible() ? toolbarHeight : 0);
this->setMaximumHeight(height);
updateLabelPos();
}
void HelpKeywordView::onOrientationChanged(Qt::Orientation orientation)
{
- HelpBaseView::onOrientationChanged(orientation);
+ Q_UNUSED(orientation);
updateLabelPos();
}
--- a/userguide/src/HelpMainWindow.cpp Tue Jun 08 18:34:07 2010 +0800
+++ b/userguide/src/HelpMainWindow.cpp Tue Jun 22 18:36:24 2010 +0800
@@ -35,6 +35,7 @@
mContentsView(NULL)
{
QObject::connect(qApp, SIGNAL(aboutToQuit()), this, SLOT(saveActivity()));
+ HelpDataProvider::instance()->createHelpCategory();
activateCategoryView();
}
@@ -62,6 +63,7 @@
}
break;
default:
+ HbApplication::exit();
break;
}
}
@@ -134,30 +136,29 @@
void HelpMainWindow::saveActivity()
{
- HbActivityManager* activityManager = qobject_cast<HbApplication*>(qApp)->activityManager();
+ HbActivityManager* activityManager = qobject_cast<HbApplication*>(qApp)->activityManager();
- // clean up any previous versions of this activity from the activity manager.
- bool ok = activityManager->removeActivity("UserGuideMainView");
- if ( !ok )
- {
- //qFatal("Remove failed" );
- }
+ // clean up any previous versions of this activity from the activity manager.
+ bool ok = activityManager->removeActivity("UserGuideMainView");
+ if ( !ok )
+ {
+ //qFatal("Remove failed" );
+ }
- // get a screenshot for saving to the activity manager
- QVariantHash metadata;
- metadata.insert("screenshot", QPixmap::grabWidget(this, rect()));
+ // get a screenshot for saving to the activity manager
+ QVariantHash metadata;
+ metadata.insert("screenshot", QPixmap::grabWidget(this, rect()));
- // save any data necessary to save the state
- QByteArray serializedActivity;
- QDataStream stream(&serializedActivity, QIODevice::WriteOnly | QIODevice::Append);
- stream << "whatever data you need to save the state adequately";
+ // save any data necessary to save the state
+ QByteArray serializedActivity;
+ QDataStream stream(&serializedActivity, QIODevice::WriteOnly | QIODevice::Append);
- // add the activity to the activity manager
- ok = activityManager->addActivity("UserGuideMainView", serializedActivity, metadata);
- if ( !ok )
- {
- qFatal("Add failed" );
- }
+ // add the activity to the activity manager
+ ok = activityManager->addActivity("UserGuideMainView", serializedActivity, metadata);
+ if ( !ok )
+ {
+ qFatal("Add failed" );
+ }
}
// end of file
--- a/userguide/src/HelpUtils.cpp Tue Jun 08 18:34:07 2010 +0800
+++ b/userguide/src/HelpUtils.cpp Tue Jun 22 18:36:24 2010 +0800
@@ -232,9 +232,6 @@
QString uriStr("appto://");
uriStr.append(appUid);
- /* uriStr.append("?");
- uriStr.append("activityname");
- uriStr.append("=MainView&key1=data1&key2=data2");*/
QUrl uri(uriStr);
XQApplicationManager appmgr;
