improved the presentation of the decoded information

git-svn-id: http://zxing.googlecode.com/svn/trunk@1378 59b500cc-1b3d-0410-9834-0bbf25fbcc57

diff --git a/symbian/ZXingBarcodeReader/.cproject b/symbian/ZXingBarcodeReader/.cproject
index d580a2c..26abcfb 100644 (file)
--- a/symbian/ZXingBarcodeReader/.cproject
+++ b/symbian/ZXingBarcodeReader/.cproject
@@ -4,8 +4,8 @@
 <cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">\r
 <storageModule buildFromInf="true" buildingTestComps="true" cleanLevel="0" concurrentBuildJobs="4" defaultMMPChangedAction="2" extraSBSv2Args="" infBuildComponents="" infFileLocation="group\bld.inf" macrosFile="" makeEngineToUse="make" manageDependencies="true" moduleId="com.nokia.carbide.cdt.builder.carbideCPPBuilder" overrideMakeEngine="false" overrideWorkspaceSettings="false" promptForMMPChangedAction="false" useConcurrentBuilding="true" useDebugMode="false" useIncrementalBuilder="false" useKeepGoing="false" useMMPMacros="true"/>\r
 <storageModule moduleId="org.eclipse.cdt.core.settings">\r
-<cconfiguration id="Emulator Debug (WINSCW) [S60_5th_Edition_SDK_v1.0]">\r
-<storageModule buildSystemId="com.nokia.carbide.cdt.builder.CarbideConfigurationDataProvider" id="Emulator Debug (WINSCW) [S60_5th_Edition_SDK_v1.0]" moduleId="org.eclipse.cdt.core.settings" name="Emulator Debug (WINSCW) [S60_5th_Edition_SDK_v1.0]">\r
+<cconfiguration id="Emulator Debug (WINSCW) [S60_3rd_FP2_SDK_v1.1]">\r
+<storageModule buildSystemId="com.nokia.carbide.cdt.builder.CarbideConfigurationDataProvider" id="Emulator Debug (WINSCW) [S60_3rd_FP2_SDK_v1.1]" moduleId="org.eclipse.cdt.core.settings" name="Emulator Debug (WINSCW) [S60_3rd_FP2_SDK_v1.1]">\r
 <externalSettings/>\r
 <extensions>\r
 <extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>\r
@@ -24,15 +24,15 @@
 <storageModule moduleId="CarbideConfigurationDataProvider">\r
 <ENV_VAR_DATA_ID/>\r
 <ARGUMENTS_DATA_ID ABLDFREEZEARGSSTORAGE="-r"/>\r
-<ROM_BUILDER_DATA_ID ROMBUILDWORKINGDIRECTORYSTORAGE="C:\"/>\r
+<ROM_BUILDER_DATA_ID ROMBUILDWORKINGDIRECTORYSTORAGE="C:\Symbian\9.2\S60_3rd_FP2_SDK_v1.1\epoc32\rom\"/>\r
 </storageModule>\r
-<storageModule filesCache="C:\Carbide\ZXingWorkspace\ZXingBarcodeReader\group\ZXingBarcodeReader.mmp;C:\Carbide\ZXingWorkspace\ZXingBarcodeReader\group\bld.inf;" includesCache="C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/stdapis;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/stdapis/sys;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/stdapis/stlport;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/variant;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/ecom;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/stdapis/stlport/stl;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/inc;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group/zxing/common/reedsolomon;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group/zxing/oned;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group/zxing/qrcode;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group/zxing/qrcode/decoder;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group/zxing/qrcode/detector;" macrosCache="_UNICODE;__SYMBIAN32__;__SUPPORT_CPP_EXCEPTIONS__;__EXE__;__S60_3X__;__SERIES60_3X__;__S60_5X__;__CW32__;__WINS__;__WINSCW__;__S60_50__;_DEBUG;" moduleId="configDataCache" sourcesCache="/ZXingBarcodeReader/data;/ZXingBarcodeReader/group;/ZXingBarcodeReader/group/zxing;/ZXingBarcodeReader/group/zxing/common;/ZXingBarcodeReader/group/zxing/common/reedsolomon;/ZXingBarcodeReader/group/zxing/oned;/ZXingBarcodeReader/group/zxing/qrcode;/ZXingBarcodeReader/group/zxing/qrcode/decoder;/ZXingBarcodeReader/group/zxing/qrcode/detector;/ZXingBarcodeReader/inc;/ZXingBarcodeReader/src;" timestampCache="1272964065464" useMmpMacrosCache="true"/>\r
+<storageModule filesCache="C:\Carbide\Testworkspace\ZXingBarcodeReader\group\bld.inf;C:\Carbide\Testworkspace\ZXingBarcodeReader\group\ZXingBarcodeReader.mmp;" includesCache="C:/Symbian/9.2/S60_3rd_FP2_SDK_v1.1/epoc32/include;C:/Symbian/9.2/S60_3rd_FP2_SDK_v1.1/epoc32/include/stdapis;C:/Symbian/9.2/S60_3rd_FP2_SDK_v1.1/epoc32/include/stdapis/sys;C:/Symbian/9.2/S60_3rd_FP2_SDK_v1.1/epoc32/include/stdapis/stlport;C:/Symbian/9.2/S60_3rd_FP2_SDK_v1.1/epoc32/include/variant;C:/Symbian/9.2/S60_3rd_FP2_SDK_v1.1/epoc32/include/ecom;C:/Symbian/9.2/S60_3rd_FP2_SDK_v1.1/epoc32/include/stdapis/stlport/stl;C:/Carbide/Testworkspace/ZXingBarcodeReader/group;C:/Carbide/Testworkspace/ZXingBarcodeReader/inc;C:/Carbide/Testworkspace/ZXingBarcodeReader/group/zxing/common/reedsolomon;C:/Carbide/Testworkspace/ZXingBarcodeReader/group/zxing/oned;C:/Carbide/Testworkspace/ZXingBarcodeReader/group/zxing/qrcode;C:/Carbide/Testworkspace/ZXingBarcodeReader/group/zxing/qrcode/decoder;C:/Carbide/Testworkspace/ZXingBarcodeReader/group/zxing/qrcode/detector;" macrosCache="_UNICODE;__SYMBIAN32__;__SUPPORT_CPP_EXCEPTIONS__;__EXE__;__S60_3X__;__SERIES60_3X__;__S60_32__;__CW32__;__WINS__;__WINSCW__;_DEBUG;" moduleId="configDataCache" sourcesCache="/ZXingBarcodeReader/data;/ZXingBarcodeReader/group;/ZXingBarcodeReader/group/zxing;/ZXingBarcodeReader/group/zxing/common;/ZXingBarcodeReader/group/zxing/common/reedsolomon;/ZXingBarcodeReader/group/zxing/oned;/ZXingBarcodeReader/group/zxing/qrcode;/ZXingBarcodeReader/group/zxing/qrcode/decoder;/ZXingBarcodeReader/group/zxing/qrcode/detector;/ZXingBarcodeReader/inc;/ZXingBarcodeReader/src;" timestampCache="1274434344850" useMmpMacrosCache="true"/>\r
 <storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>\r
 <storageModule moduleId="org.eclipse.cdt.core.language.mapping"/>\r
 <storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>\r
 </cconfiguration>\r
-<cconfiguration id="Phone Debug (ARMV5) [S60_5th_Edition_SDK_v1.0]">\r
-<storageModule buildSystemId="com.nokia.carbide.cdt.builder.CarbideConfigurationDataProvider" id="Phone Debug (ARMV5) [S60_5th_Edition_SDK_v1.0]" moduleId="org.eclipse.cdt.core.settings" name="Phone Debug (ARMV5) [S60_5th_Edition_SDK_v1.0]">\r
+<cconfiguration id="Phone Debug (ARMV5) [S60_3rd_FP2_SDK_v1.1]">\r
+<storageModule buildSystemId="com.nokia.carbide.cdt.builder.CarbideConfigurationDataProvider" id="Phone Debug (ARMV5) [S60_3rd_FP2_SDK_v1.1]" moduleId="org.eclipse.cdt.core.settings" name="Phone Debug (ARMV5) [S60_3rd_FP2_SDK_v1.1]">\r
 <externalSettings/>\r
 <extensions>\r
 <extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>\r
@@ -52,15 +52,15 @@
 <storageModule moduleId="CarbideConfigurationDataProvider">\r
 <ENV_VAR_DATA_ID/>\r
 <ARGUMENTS_DATA_ID ABLDFREEZEARGSSTORAGE="-r"/>\r
-<ROM_BUILDER_DATA_ID ROMBUILDWORKINGDIRECTORYSTORAGE="C:\"/>\r
+<ROM_BUILDER_DATA_ID ROMBUILDWORKINGDIRECTORYSTORAGE="C:\Symbian\9.2\S60_3rd_FP2_SDK_v1.1\epoc32\rom\"/>\r
 </storageModule>\r
-<storageModule filesCache="C:\Carbide\ZXingWorkspace\ZXingBarcodeReader\group\ZXingBarcodeReader.mmp;C:\Carbide\ZXingWorkspace\ZXingBarcodeReader\group\bld.inf;" includesCache="C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/stdapis;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/stdapis/sys;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/stdapis/stlport;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/variant;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/ecom;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/stdapis/stlport/stl;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/inc;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group/zxing/common/reedsolomon;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group/zxing/oned;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group/zxing/qrcode;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group/zxing/qrcode/decoder;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group/zxing/qrcode/detector;" macrosCache="_UNICODE;__SUPPORT_CPP_EXCEPTIONS__;__MARM_ARMV5__;__ARMCC__;__ARMCC_2_2__;__SYMBIAN32__;__MARM__;__EXE__;__S60_3X__;__SERIES60_3X__;__ARMCC_2__;__S60_5X__;__EPOC32__;__GENERIC_MARM__;__EABI__;__S60_50__;_DEBUG;" moduleId="configDataCache" sourcesCache="/ZXingBarcodeReader/data;/ZXingBarcodeReader/group;/ZXingBarcodeReader/group/zxing;/ZXingBarcodeReader/group/zxing/common;/ZXingBarcodeReader/group/zxing/common/reedsolomon;/ZXingBarcodeReader/group/zxing/oned;/ZXingBarcodeReader/group/zxing/qrcode;/ZXingBarcodeReader/group/zxing/qrcode/decoder;/ZXingBarcodeReader/group/zxing/qrcode/detector;/ZXingBarcodeReader/inc;/ZXingBarcodeReader/src;" timestampCache="1272964065481" useMmpMacrosCache="true"/>\r
+<storageModule filesCache="C:\Carbide\Testworkspace\ZXingBarcodeReader\group\bld.inf;C:\Carbide\Testworkspace\ZXingBarcodeReader\group\ZXingBarcodeReader.mmp;" includesCache="C:/Symbian/9.2/S60_3rd_FP2_SDK_v1.1/epoc32/include;C:/Symbian/9.2/S60_3rd_FP2_SDK_v1.1/epoc32/include/stdapis;C:/Symbian/9.2/S60_3rd_FP2_SDK_v1.1/epoc32/include/stdapis/sys;C:/Symbian/9.2/S60_3rd_FP2_SDK_v1.1/epoc32/include/stdapis/stlport;C:/Symbian/9.2/S60_3rd_FP2_SDK_v1.1/epoc32/include/variant;C:/Symbian/9.2/S60_3rd_FP2_SDK_v1.1/epoc32/include/ecom;C:/Symbian/9.2/S60_3rd_FP2_SDK_v1.1/epoc32/include/stdapis/stlport/stl;C:/Carbide/Testworkspace/ZXingBarcodeReader/group;C:/Carbide/Testworkspace/ZXingBarcodeReader/inc;C:/Carbide/Testworkspace/ZXingBarcodeReader/group/zxing/common/reedsolomon;C:/Carbide/Testworkspace/ZXingBarcodeReader/group/zxing/oned;C:/Carbide/Testworkspace/ZXingBarcodeReader/group/zxing/qrcode;C:/Carbide/Testworkspace/ZXingBarcodeReader/group/zxing/qrcode/decoder;C:/Carbide/Testworkspace/ZXingBarcodeReader/group/zxing/qrcode/detector;" macrosCache="_UNICODE;__SUPPORT_CPP_EXCEPTIONS__;__S60_32__;__MARM_ARMV5__;__ARMCC__;__ARMCC_2_2__;__SYMBIAN32__;__MARM__;__EXE__;__S60_3X__;__SERIES60_3X__;__EPOC32__;__GENERIC_MARM__;__EABI__;_DEBUG;" moduleId="configDataCache" sourcesCache="/ZXingBarcodeReader/data;/ZXingBarcodeReader/group;/ZXingBarcodeReader/group/zxing;/ZXingBarcodeReader/group/zxing/common;/ZXingBarcodeReader/group/zxing/common/reedsolomon;/ZXingBarcodeReader/group/zxing/oned;/ZXingBarcodeReader/group/zxing/qrcode;/ZXingBarcodeReader/group/zxing/qrcode/decoder;/ZXingBarcodeReader/group/zxing/qrcode/detector;/ZXingBarcodeReader/inc;/ZXingBarcodeReader/src;" timestampCache="1274434344850" useMmpMacrosCache="true"/>\r
 <storageModule moduleId="org.eclipse.cdt.core.language.mapping"/>\r
-<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>\r
 <storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>\r
+<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>\r
 </cconfiguration>\r
-<cconfiguration id="Phone Release (ARMV5) [S60_5th_Edition_SDK_v1.0]">\r
-<storageModule buildSystemId="com.nokia.carbide.cdt.builder.CarbideConfigurationDataProvider" id="Phone Release (ARMV5) [S60_5th_Edition_SDK_v1.0]" moduleId="org.eclipse.cdt.core.settings" name="Phone Release (ARMV5) [S60_5th_Edition_SDK_v1.0]">\r
+<cconfiguration id="Phone Release (ARMV5) [S60_3rd_FP2_SDK_v1.1]">\r
+<storageModule buildSystemId="com.nokia.carbide.cdt.builder.CarbideConfigurationDataProvider" id="Phone Release (ARMV5) [S60_3rd_FP2_SDK_v1.1]" moduleId="org.eclipse.cdt.core.settings" name="Phone Release (ARMV5) [S60_3rd_FP2_SDK_v1.1]">\r
 <externalSettings/>\r
 <extensions>\r
 <extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>\r
@@ -80,15 +80,15 @@
 <storageModule moduleId="CarbideConfigurationDataProvider">\r
 <ENV_VAR_DATA_ID/>\r
 <ARGUMENTS_DATA_ID ABLDFREEZEARGSSTORAGE="-r"/>\r
-<ROM_BUILDER_DATA_ID ROMBUILDWORKINGDIRECTORYSTORAGE="C:\"/>\r
+<ROM_BUILDER_DATA_ID ROMBUILDWORKINGDIRECTORYSTORAGE="C:\Symbian\9.2\S60_3rd_FP2_SDK_v1.1\epoc32\rom\"/>\r
 </storageModule>\r
-<storageModule filesCache="C:\Carbide\ZXingWorkspace\ZXingBarcodeReader\group\ZXingBarcodeReader.mmp;C:\Carbide\ZXingWorkspace\ZXingBarcodeReader\group\bld.inf;" includesCache="C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/stdapis;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/stdapis/sys;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/stdapis/stlport;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/variant;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/ecom;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/stdapis/stlport/stl;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/inc;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group/zxing/common/reedsolomon;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group/zxing/oned;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group/zxing/qrcode;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group/zxing/qrcode/decoder;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group/zxing/qrcode/detector;" macrosCache="_UNICODE;__SUPPORT_CPP_EXCEPTIONS__;__MARM_ARMV5__;NDEBUG;__ARMCC__;__ARMCC_2_2__;__SYMBIAN32__;__MARM__;__EXE__;__S60_3X__;__SERIES60_3X__;__ARMCC_2__;__S60_5X__;__EPOC32__;__GENERIC_MARM__;__EABI__;__S60_50__;" moduleId="configDataCache" sourcesCache="/ZXingBarcodeReader/data;/ZXingBarcodeReader/group;/ZXingBarcodeReader/group/zxing;/ZXingBarcodeReader/group/zxing/common;/ZXingBarcodeReader/group/zxing/common/reedsolomon;/ZXingBarcodeReader/group/zxing/oned;/ZXingBarcodeReader/group/zxing/qrcode;/ZXingBarcodeReader/group/zxing/qrcode/decoder;/ZXingBarcodeReader/group/zxing/qrcode/detector;/ZXingBarcodeReader/inc;/ZXingBarcodeReader/src;" timestampCache="1272964065495" useMmpMacrosCache="true"/>\r
+<storageModule filesCache="C:\Carbide\Testworkspace\ZXingBarcodeReader\group\bld.inf;C:\Carbide\Testworkspace\ZXingBarcodeReader\group\ZXingBarcodeReader.mmp;" includesCache="C:/Symbian/9.2/S60_3rd_FP2_SDK_v1.1/epoc32/include;C:/Symbian/9.2/S60_3rd_FP2_SDK_v1.1/epoc32/include/stdapis;C:/Symbian/9.2/S60_3rd_FP2_SDK_v1.1/epoc32/include/stdapis/sys;C:/Symbian/9.2/S60_3rd_FP2_SDK_v1.1/epoc32/include/stdapis/stlport;C:/Symbian/9.2/S60_3rd_FP2_SDK_v1.1/epoc32/include/variant;C:/Symbian/9.2/S60_3rd_FP2_SDK_v1.1/epoc32/include/ecom;C:/Symbian/9.2/S60_3rd_FP2_SDK_v1.1/epoc32/include/stdapis/stlport/stl;C:/Carbide/Testworkspace/ZXingBarcodeReader/group;C:/Carbide/Testworkspace/ZXingBarcodeReader/inc;C:/Carbide/Testworkspace/ZXingBarcodeReader/group/zxing/common/reedsolomon;C:/Carbide/Testworkspace/ZXingBarcodeReader/group/zxing/oned;C:/Carbide/Testworkspace/ZXingBarcodeReader/group/zxing/qrcode;C:/Carbide/Testworkspace/ZXingBarcodeReader/group/zxing/qrcode/decoder;C:/Carbide/Testworkspace/ZXingBarcodeReader/group/zxing/qrcode/detector;" macrosCache="_UNICODE;__SUPPORT_CPP_EXCEPTIONS__;__S60_32__;__MARM_ARMV5__;NDEBUG;__ARMCC__;__ARMCC_2_2__;__SYMBIAN32__;__MARM__;__EXE__;__S60_3X__;__SERIES60_3X__;__EPOC32__;__GENERIC_MARM__;__EABI__;" moduleId="configDataCache" sourcesCache="/ZXingBarcodeReader/data;/ZXingBarcodeReader/group;/ZXingBarcodeReader/group/zxing;/ZXingBarcodeReader/group/zxing/common;/ZXingBarcodeReader/group/zxing/common/reedsolomon;/ZXingBarcodeReader/group/zxing/oned;/ZXingBarcodeReader/group/zxing/qrcode;/ZXingBarcodeReader/group/zxing/qrcode/decoder;/ZXingBarcodeReader/group/zxing/qrcode/detector;/ZXingBarcodeReader/inc;/ZXingBarcodeReader/src;" timestampCache="1274434344865" useMmpMacrosCache="true"/>\r
 <storageModule moduleId="org.eclipse.cdt.core.language.mapping"/>\r
-<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>\r
 <storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>\r
+<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>\r
 </cconfiguration>\r
-<cconfiguration id="Phone Debug (GCCE) [S60_5th_Edition_SDK_v1.0]">\r
-<storageModule buildSystemId="com.nokia.carbide.cdt.builder.CarbideConfigurationDataProvider" id="Phone Debug (GCCE) [S60_5th_Edition_SDK_v1.0]" moduleId="org.eclipse.cdt.core.settings" name="Phone Debug (GCCE) [S60_5th_Edition_SDK_v1.0]">\r
+<cconfiguration id="Phone Debug (GCCE) [S60_3rd_FP2_SDK_v1.1]">\r
+<storageModule buildSystemId="com.nokia.carbide.cdt.builder.CarbideConfigurationDataProvider" id="Phone Debug (GCCE) [S60_3rd_FP2_SDK_v1.1]" moduleId="org.eclipse.cdt.core.settings" name="Phone Debug (GCCE) [S60_3rd_FP2_SDK_v1.1]">\r
 <externalSettings/>\r
 <extensions>\r
 <extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>\r
@@ -106,18 +106,18 @@
 </extensions>\r
 </storageModule>\r
 <storageModule moduleId="CarbideConfigurationDataProvider">\r
-<SIS_BUILDER_DATA_ID CREATESTUBSTORAGE="false" ENABLEDSTORAGE="true" PARTIALUPGRADESTORAGE="false" PKGFILESTORAGE="C:\Carbide\ZXingWorkspace\ZXingBarcodeReader\sis\ZXingBarcodeReader_S60.pkg" SIGNINGTYPESTORAGE="1"/>\r
+<SIS_BUILDER_DATA_ID CREATESTUBSTORAGE="false" ENABLEDSTORAGE="true" PARTIALUPGRADESTORAGE="false" PKGFILESTORAGE="C:\Carbide\Testworkspace\ZXingBarcodeReader\sis\ZXingBarcodeReader_S60.pkg" SIGNINGTYPESTORAGE="1"/>\r
 <ENV_VAR_DATA_ID/>\r
 <ARGUMENTS_DATA_ID ABLDFREEZEARGSSTORAGE="-r"/>\r
-<ROM_BUILDER_DATA_ID ROMBUILDWORKINGDIRECTORYSTORAGE="C:\"/>\r
+<ROM_BUILDER_DATA_ID ROMBUILDWORKINGDIRECTORYSTORAGE="C:\Symbian\9.2\S60_3rd_FP2_SDK_v1.1\epoc32\rom\"/>\r
 </storageModule>\r
-<storageModule filesCache="C:\Carbide\ZXingWorkspace\ZXingBarcodeReader\group\ZXingBarcodeReader.mmp;C:\Carbide\ZXingWorkspace\ZXingBarcodeReader\group\bld.inf;" includesCache="C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/stdapis;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/stdapis/sys;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/stdapis/stlport;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/variant;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/ecom;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/stdapis/stlport/stl;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/inc;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group/zxing/common/reedsolomon;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group/zxing/oned;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group/zxing/qrcode;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group/zxing/qrcode/decoder;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group/zxing/qrcode/detector;" macrosCache="_UNICODE;__SUPPORT_CPP_EXCEPTIONS__;__MARM_ARMV5__;__SYMBIAN32__;__GCCE__;__MARM__;__EXE__;__SERIES60_3X__;__S60_3X__;__S60_5X__;__EPOC32__;__GENERIC_MARM__;__EABI__;_DEBUG;__S60_50__;" moduleId="configDataCache" sourcesCache="/ZXingBarcodeReader/data;/ZXingBarcodeReader/group;/ZXingBarcodeReader/group/zxing;/ZXingBarcodeReader/group/zxing/common;/ZXingBarcodeReader/group/zxing/common/reedsolomon;/ZXingBarcodeReader/group/zxing/oned;/ZXingBarcodeReader/group/zxing/qrcode;/ZXingBarcodeReader/group/zxing/qrcode/decoder;/ZXingBarcodeReader/group/zxing/qrcode/detector;/ZXingBarcodeReader/inc;/ZXingBarcodeReader/src;" timestampCache="1272964065514" useMmpMacrosCache="true"/>\r
+<storageModule filesCache="C:\Carbide\Testworkspace\ZXingBarcodeReader\group\bld.inf;C:\Carbide\Testworkspace\ZXingBarcodeReader\group\ZXingBarcodeReader.mmp;" includesCache="C:/Symbian/9.2/S60_3rd_FP2_SDK_v1.1/epoc32/include;C:/Symbian/9.2/S60_3rd_FP2_SDK_v1.1/epoc32/include/stdapis;C:/Symbian/9.2/S60_3rd_FP2_SDK_v1.1/epoc32/include/stdapis/sys;C:/Symbian/9.2/S60_3rd_FP2_SDK_v1.1/epoc32/include/stdapis/stlport;C:/Symbian/9.2/S60_3rd_FP2_SDK_v1.1/epoc32/include/variant;C:/Symbian/9.2/S60_3rd_FP2_SDK_v1.1/epoc32/include/ecom;C:/Symbian/9.2/S60_3rd_FP2_SDK_v1.1/epoc32/include/stdapis/stlport/stl;C:/Carbide/Testworkspace/ZXingBarcodeReader/group;C:/Carbide/Testworkspace/ZXingBarcodeReader/inc;C:/Carbide/Testworkspace/ZXingBarcodeReader/group/zxing/common/reedsolomon;C:/Carbide/Testworkspace/ZXingBarcodeReader/group/zxing/oned;C:/Carbide/Testworkspace/ZXingBarcodeReader/group/zxing/qrcode;C:/Carbide/Testworkspace/ZXingBarcodeReader/group/zxing/qrcode/decoder;C:/Carbide/Testworkspace/ZXingBarcodeReader/group/zxing/qrcode/detector;" macrosCache="_UNICODE;__SUPPORT_CPP_EXCEPTIONS__;__S60_32__;__MARM_ARMV5__;__SYMBIAN32__;__GCCE__;__MARM__;__EXE__;__SERIES60_3X__;__S60_3X__;__GENERIC_MARM__;__EPOC32__;__EABI__;_DEBUG;" moduleId="configDataCache" sourcesCache="/ZXingBarcodeReader/data;/ZXingBarcodeReader/group;/ZXingBarcodeReader/group/zxing;/ZXingBarcodeReader/group/zxing/common;/ZXingBarcodeReader/group/zxing/common/reedsolomon;/ZXingBarcodeReader/group/zxing/oned;/ZXingBarcodeReader/group/zxing/qrcode;/ZXingBarcodeReader/group/zxing/qrcode/decoder;/ZXingBarcodeReader/group/zxing/qrcode/detector;/ZXingBarcodeReader/inc;/ZXingBarcodeReader/src;" timestampCache="1274434344881" useMmpMacrosCache="true"/>\r
 <storageModule moduleId="org.eclipse.cdt.core.language.mapping"/>\r
-<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>\r
 <storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>\r
+<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>\r
 </cconfiguration>\r
-<cconfiguration id="Phone Release (GCCE) [S60_5th_Edition_SDK_v1.0]">\r
-<storageModule buildSystemId="com.nokia.carbide.cdt.builder.CarbideConfigurationDataProvider" id="Phone Release (GCCE) [S60_5th_Edition_SDK_v1.0]" moduleId="org.eclipse.cdt.core.settings" name="Phone Release (GCCE) [S60_5th_Edition_SDK_v1.0]">\r
+<cconfiguration id="Phone Release (GCCE) [S60_3rd_FP2_SDK_v1.1]">\r
+<storageModule buildSystemId="com.nokia.carbide.cdt.builder.CarbideConfigurationDataProvider" id="Phone Release (GCCE) [S60_3rd_FP2_SDK_v1.1]" moduleId="org.eclipse.cdt.core.settings" name="Phone Release (GCCE) [S60_3rd_FP2_SDK_v1.1]">\r
 <externalSettings/>\r
 <extensions>\r
 <extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>\r
@@ -137,12 +137,12 @@
 <storageModule moduleId="CarbideConfigurationDataProvider">\r
 <ENV_VAR_DATA_ID/>\r
 <ARGUMENTS_DATA_ID ABLDFREEZEARGSSTORAGE="-r"/>\r
-<ROM_BUILDER_DATA_ID ROMBUILDWORKINGDIRECTORYSTORAGE="C:\"/>\r
+<ROM_BUILDER_DATA_ID ROMBUILDWORKINGDIRECTORYSTORAGE="C:\Symbian\9.2\S60_3rd_FP2_SDK_v1.1\epoc32\rom\"/>\r
 </storageModule>\r
-<storageModule filesCache="C:\Carbide\ZXingWorkspace\ZXingBarcodeReader\group\ZXingBarcodeReader.mmp;C:\Carbide\ZXingWorkspace\ZXingBarcodeReader\group\bld.inf;" includesCache="C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/stdapis;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/stdapis/sys;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/stdapis/stlport;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/variant;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/ecom;C:/S60/devices/S60_5th_Edition_SDK_v1.0/epoc32/include/stdapis/stlport/stl;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/inc;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group/zxing/common/reedsolomon;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group/zxing/oned;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group/zxing/qrcode;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group/zxing/qrcode/decoder;C:/Carbide/ZXingWorkspace/ZXingBarcodeReader/group/zxing/qrcode/detector;" macrosCache="_UNICODE;__SUPPORT_CPP_EXCEPTIONS__;__MARM_ARMV5__;NDEBUG;__SYMBIAN32__;__GCCE__;__MARM__;__EXE__;__SERIES60_3X__;__S60_3X__;__S60_5X__;__EPOC32__;__GENERIC_MARM__;__EABI__;__S60_50__;" moduleId="configDataCache" sourcesCache="/ZXingBarcodeReader/data;/ZXingBarcodeReader/group;/ZXingBarcodeReader/group/zxing;/ZXingBarcodeReader/group/zxing/common;/ZXingBarcodeReader/group/zxing/common/reedsolomon;/ZXingBarcodeReader/group/zxing/oned;/ZXingBarcodeReader/group/zxing/qrcode;/ZXingBarcodeReader/group/zxing/qrcode/decoder;/ZXingBarcodeReader/group/zxing/qrcode/detector;/ZXingBarcodeReader/inc;/ZXingBarcodeReader/src;" timestampCache="1272964065527" useMmpMacrosCache="true"/>\r
+<storageModule filesCache="C:\Carbide\Testworkspace\ZXingBarcodeReader\group\bld.inf;C:\Carbide\Testworkspace\ZXingBarcodeReader\group\ZXingBarcodeReader.mmp;" includesCache="C:/Symbian/9.2/S60_3rd_FP2_SDK_v1.1/epoc32/include;C:/Symbian/9.2/S60_3rd_FP2_SDK_v1.1/epoc32/include/stdapis;C:/Symbian/9.2/S60_3rd_FP2_SDK_v1.1/epoc32/include/stdapis/sys;C:/Symbian/9.2/S60_3rd_FP2_SDK_v1.1/epoc32/include/stdapis/stlport;C:/Symbian/9.2/S60_3rd_FP2_SDK_v1.1/epoc32/include/variant;C:/Symbian/9.2/S60_3rd_FP2_SDK_v1.1/epoc32/include/ecom;C:/Symbian/9.2/S60_3rd_FP2_SDK_v1.1/epoc32/include/stdapis/stlport/stl;C:/Carbide/Testworkspace/ZXingBarcodeReader/group;C:/Carbide/Testworkspace/ZXingBarcodeReader/inc;C:/Carbide/Testworkspace/ZXingBarcodeReader/group/zxing/common/reedsolomon;C:/Carbide/Testworkspace/ZXingBarcodeReader/group/zxing/oned;C:/Carbide/Testworkspace/ZXingBarcodeReader/group/zxing/qrcode;C:/Carbide/Testworkspace/ZXingBarcodeReader/group/zxing/qrcode/decoder;C:/Carbide/Testworkspace/ZXingBarcodeReader/group/zxing/qrcode/detector;" macrosCache="_UNICODE;__SUPPORT_CPP_EXCEPTIONS__;__S60_32__;__MARM_ARMV5__;NDEBUG;__SYMBIAN32__;__GCCE__;__MARM__;__EXE__;__SERIES60_3X__;__S60_3X__;__GENERIC_MARM__;__EPOC32__;__EABI__;" moduleId="configDataCache" sourcesCache="/ZXingBarcodeReader/data;/ZXingBarcodeReader/group;/ZXingBarcodeReader/group/zxing;/ZXingBarcodeReader/group/zxing/common;/ZXingBarcodeReader/group/zxing/common/reedsolomon;/ZXingBarcodeReader/group/zxing/oned;/ZXingBarcodeReader/group/zxing/qrcode;/ZXingBarcodeReader/group/zxing/qrcode/decoder;/ZXingBarcodeReader/group/zxing/qrcode/detector;/ZXingBarcodeReader/inc;/ZXingBarcodeReader/src;" timestampCache="1274434344912" useMmpMacrosCache="true"/>\r
 <storageModule moduleId="org.eclipse.cdt.core.language.mapping"/>\r
-<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>\r
 <storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>\r
+<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>\r
 </cconfiguration>\r
 </storageModule>\r
 </cproject>\r

diff --git a/symbian/ZXingBarcodeReader/data/ZXingBarcodeReader.rss b/symbian/ZXingBarcodeReader/data/ZXingBarcodeReader.rss
index 3e5d83f..991417c 100644 (file)
--- a/symbian/ZXingBarcodeReader/data/ZXingBarcodeReader.rss
+++ b/symbian/ZXingBarcodeReader/data/ZXingBarcodeReader.rss
@@ -155,4 +155,31 @@ RESOURCE LOCALISABLE_APP_INFO r_localisable_app_info
                };\r
        }\r
 \r
+\r
+RESOURCE DIALOG r_text_query_dialog\r
+    {\r
+    flags = EGeneralQueryFlags | EEikDialogFlagNoBorder | EEikDialogFlagNoShadow;\r
+    buttons = R_AVKON_SOFTKEYS_OK_EMPTY;\r
+    items=\r
+        {\r
+        DLG_LINE \r
+            {\r
+            type = EAknCtPopupHeadingPane;\r
+            id = EAknMessageQueryHeaderId;\r
+            itemflags = EEikDlgItemNonFocusing;\r
+            control = AVKON_HEADING\r
+                {\r
+                };\r
+            },\r
+        DLG_LINE\r
+            {\r
+            type = EAknCtMessageQuery;\r
+            id = EAknMessageQueryContentId;\r
+            control = AVKON_MESSAGE_QUERY\r
+                {\r
+                };\r
+            }\r
+        };\r
+    }\r
+\r
 // End of File\r

diff --git a/symbian/ZXingBarcodeReader/inc/ZXingBarcodeReaderAppView.h b/symbian/ZXingBarcodeReader/inc/ZXingBarcodeReaderAppView.h
index a36191d..d267bd6 100644 (file)
--- a/symbian/ZXingBarcodeReader/inc/ZXingBarcodeReaderAppView.h
+++ b/symbian/ZXingBarcodeReader/inc/ZXingBarcodeReaderAppView.h
@@ -69,6 +69,7 @@ public CCoeControl, public MCameraEngineObserver
         \r
         //timer\r
         void StartTimer();\r
+        void StopTimer();\r
         static TInt Tick(TAny* aObject);\r
     \r
     private: \r

diff --git a/symbian/ZXingBarcodeReader/sis/ZXingBarcodeReader_S60.sisx b/symbian/ZXingBarcodeReader/sis/ZXingBarcodeReader_S60.sisx
index 7c089af..abdf27b 100644 (file)
Binary files a/symbian/ZXingBarcodeReader/sis/ZXingBarcodeReader_S60.sisx and b/symbian/ZXingBarcodeReader/sis/ZXingBarcodeReader_S60.sisx differ

diff --git a/symbian/ZXingBarcodeReader/src/DecodingOperations.cpp b/symbian/ZXingBarcodeReader/src/DecodingOperations.cpp
index 5ea8016..47b8743 100644 (file)
--- a/symbian/ZXingBarcodeReader/src/DecodingOperations.cpp
+++ b/symbian/ZXingBarcodeReader/src/DecodingOperations.cpp
@@ -8,6 +8,8 @@
 #include <zxing/BinaryBitmap.h>\r
 #include <CameraImage.h>\r
 #include <string>\r
+#include <aknmessagequerydialog.h>\r
+#include "ZXingBarcodeReader_0xEF24C10A.rsg"\r
 \r
 using namespace zxing;\r
 using namespace zxing::qrcode;\r
@@ -64,41 +66,34 @@ void CZXingBarcodeReaderAppView::decodeBackbufferImage()
                }\r
        catch(zxing::Exception& e)\r
                {\r
-                       string string = "Error...retrying...";\r
+                       /*string string = "Error...retrying...";\r
                        HBufC8 *pHeap8 = HBufC8::NewMaxLC(string.size());\r
                        pHeap8->Des().Copy((const TUint8 *)string.c_str());\r
                        \r
                        HBufC *pHeap16 = HBufC::NewMaxLC(pHeap8->Length());\r
                        pHeap16->Des().Copy(*pHeap8);\r
                        \r
-                       ShowResultL(*pHeap16);\r
+                       ShowResultL(*pHeap16);*/\r
                }\r
        }\r
 \r
 void CZXingBarcodeReaderAppView::ShowResultL(TDesC16& message)\r
        {\r
-       if (!iNote)\r
-               {\r
-       // Create the note once\r
-       iNote = CAknInfoPopupNoteController::NewL();\r
-               }\r
-       // Hide the note. The last note may be visible when creating the second\r
-       iNote->HideInfoPopupNote();\r
-\r
-       // Set the time delay period before the popup is shown (in milliseconds)\r
-       iNote->SetTimeDelayBeforeShow(100);\r
-\r
-       // Set the time period of how long the popup is in the view (in milliseconds)\r
-       iNote->SetTimePopupInView(2*1000);\r
-\r
-       // Note text\r
-       iNote->SetTextL(message);\r
+        StopTimer();\r
+           \r
+       CAknMessageQueryDialog* dlg = new (ELeave) CAknMessageQueryDialog ();\r
        \r
-       TRect rect(Rect());\r
+       dlg->PrepareLC(R_TEXT_QUERY_DIALOG );\r
+          \r
+       //HBufC* title = NULL;  \r
+       //title = iEikonEnv->AllocReadResourceLC ( TEXT_DIALOG_TITLE );\r
+       dlg->QueryHeading ()->SetTextL (_L("Information") );\r
+               \r
+       dlg->SetMessageTextL ( message );\r
        \r
-       // Note position\r
-       iNote->SetPositionAndAlignment(TPoint(rect.Width()/5,rect.Height()/7),EHLeftVTop);\r
-\r
-       // Show note\r
-       iNote->ShowInfoPopupNote();\r
+       dlg->RunLD();\r
+       \r
+       CleanupStack::PopAndDestroy();\r
+       \r
+       StartTimer();\r
        }\r

diff --git a/symbian/ZXingBarcodeReader/src/ZXingBarcodeReaderAppView.cpp b/symbian/ZXingBarcodeReader/src/ZXingBarcodeReaderAppView.cpp
index 77dcec8..030ebcb 100644 (file)
--- a/symbian/ZXingBarcodeReader/src/ZXingBarcodeReaderAppView.cpp
+++ b/symbian/ZXingBarcodeReader/src/ZXingBarcodeReaderAppView.cpp
@@ -570,6 +570,13 @@ void CZXingBarcodeReaderAppView::MceoHandleOtherEvent( const TECAMEvent& /*aEven
        }\r
 \r
 \r
+void CZXingBarcodeReaderAppView::StopTimer()\r
+{\r
+    if(iPeriodic)\r
+        iPeriodic->Cancel();\r
+}\r
+\r
+\r
 \r
 \r
 // End of File\r