# HG changeset patch # User jake # Date 1288096454 -10800 # Node ID ac3b45850c50c36b03255d5dc462ed66b29457e7 # Parent 480fe05ec121ea6d2d55e6424c14635ab0d930e1 New release 0.1.c diff -r 480fe05ec121 -r ac3b45850c50 WidgetGen.pro.user --- a/WidgetGen.pro.user Mon Oct 11 08:55:38 2010 +0300 +++ b/WidgetGen.pro.user Tue Oct 26 15:34:14 2010 +0300 @@ -13,8 +13,8 @@ ProjectExplorer.Project.Target.0 - Qt Simulator - Qt4ProjectManager.Target.QtSimulatorTarget + Desktop + Qt4ProjectManager.Target.DesktopTarget 1 0 @@ -46,8 +46,8 @@ Debug Qt4ProjectManager.Qt4BuildConfiguration 2 - F:/QT/tryouts/widgetbuilder - 3 + C:/WidgetGen-build-desktop + 11 2 true @@ -80,8 +80,8 @@ Release Qt4ProjectManager.Qt4BuildConfiguration 0 - F:/QT/tryouts/widgetbuilder - 3 + C:/WidgetGen-build-desktop + 11 2 true diff -r 480fe05ec121 -r ac3b45850c50 data/commonwidgetdata/group/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/data/commonwidgetdata/group/bld.inf Tue Oct 26 15:34:14 2010 +0300 @@ -0,0 +1,40 @@ +/* +* Copyright (c) {Year(s)} {Copyright owner}. +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of the "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html". +* +* Initial Contributors: +* {Name} {Company} ? Initial contribution +* +* Contributors: +* {Name} {Company} ? {{Description of contribution}} +* +* Description: +* {{Description of the file}} +* +*/ + +#include + +PRJ_PLATFORMS +DEFAULT + +PRJ_EXPORTS +// Support for productization and Carbide.Ui customization +../hsps/00/manifest.dat /epoc32/data/Z/resource/homescreen/#replace#_#replaceuid#/hsps/manifest.dat +../hsps/00/widgetconfiguration.xml /epoc32/data/Z/resource/homescreen/#replace#_#replaceuid#/hsps/widgetconfiguration.xml +../xuikon/00/#replace#_#replaceuid#.dat /epoc32/data/Z/resource/homescreen/#replace#_#replaceuid#/xuikon/#replace#_#replaceuid#.dat +../xuikon/00/#replace#.css /epoc32/data/Z/resource/homescreen/#replace#_#replaceuid#/xuikon/#replace#.css +../xuikon/00/#replace#.xml /epoc32/data/Z/resource/homescreen/#replace#_#replaceuid#/xuikon/#replace#.xml +//../xuikon/00/#replace#.dtd /epoc32/data/Z/resource/homescreen/#replace#_#replaceuid#/xuikon/#replace#.dtd + + +PRJ_EXTENSIONS +START EXTENSION tools/dtd +OPTION SWITCH_LOC_FILE_NAME #replace#_#replaceuid# +OPTION DTD_TYPE widget +END +// End of File diff -r 480fe05ec121 -r ac3b45850c50 data/commonwidgetdata/hsps/00/empty.dat diff -r 480fe05ec121 -r ac3b45850c50 data/commonwidgetdata/hsps/00/manifest.dat --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/data/commonwidgetdata/hsps/00/manifest.dat Tue Oct 26 15:34:14 2010 +0300 @@ -0,0 +1,21 @@ + + + qhd_tch + widget + + 0x2001f48a + 0x101fb657 + #replaceuid# + + #replace# + #replace# + 1.0 + + unlimited + + widgetconfiguration.xml + + + #replace#.o0000 + + diff -r 480fe05ec121 -r ac3b45850c50 data/commonwidgetdata/hsps/00/widgetconfiguration.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/data/commonwidgetdata/hsps/00/widgetconfiguration.xml Tue Oct 26 15:34:14 2010 +0300 @@ -0,0 +1,6 @@ + + + + + + diff -r 480fe05ec121 -r ac3b45850c50 data/commonwidgetdata/sis/backup_registration.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/data/commonwidgetdata/sis/backup_registration.xml Tue Oct 26 15:34:14 2010 +0300 @@ -0,0 +1,5 @@ + + + + + diff -r 480fe05ec121 -r ac3b45850c50 data/commonwidgetdata/sis/replace.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/data/commonwidgetdata/sis/replace.pkg Tue Oct 26 15:34:14 2010 +0300 @@ -0,0 +1,19 @@ +;Language +&EN +; Header +#{"#replace#"}, (0x#replaceuid#), 1,0,0 +;Localized Vendor Name +%{"Company"} +;Unique Vendor name +:"Vendor" +;Files to install +; HSPS - general (extracting files to C drive, other drives are not searched) +"..\hsps\00\widgetconfiguration.xml" - "c:\private\200159c0\import\2001f48a\101fb657\#replaceuid#\1.0\widgetconfiguration.xml" +"..\hsps\00\manifest.dat" - "c:\private\200159c0\import\2001f48a\101fb657\#replaceuid#\1.0\manifest.dat" +; HSPS - Resources for locale 0 +; "..\xuikon\00\locale.dtd" - "c:\private\200159c0\import\2001f48a\101fb657\#replaceuid#\1.0\0\locale.dtd" +"\epoc32\data\z\private\200159c0\install\#replace#_#replaceuid#\xuikon\00\#replace#.o0000" - "c:\private\200159c0\import\2001f48a\101fb657\#replaceuid#\1.0\0\#replace#.o0000" +; HSPS - Backup +"backup_registration.xml" - "c:\private\10202D56\import\packages\#replaceuid#\backup_registration.xml" +; HSPS - trigger for post installations by the HSPS server +"..\hsps\00\empty.dat" - "c:\private\200159c0\import\plugin_2001f48a_101fb657_#replaceuid#_1.0.dat" diff -r 480fe05ec121 -r ac3b45850c50 data/commonwidgetdata/xuikon/00/replace.dat --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/data/commonwidgetdata/xuikon/00/replace.dat Tue Oct 26 15:34:14 2010 +0300 @@ -0,0 +1,12 @@ + + + + 2001CB4F + 101FB657 + 11001241 + Anything + #replace# + 1.0 + #replace#.xml + #replace#.css + diff -r 480fe05ec121 -r ac3b45850c50 data/commonwidgetdata/xuikon/00/replace.dtd diff -r 480fe05ec121 -r ac3b45850c50 data/commonwidgetdata/xuikon/00/replacerenderer.css --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/data/commonwidgetdata/xuikon/00/replacerenderer.css Tue Oct 26 15:34:14 2010 +0300 @@ -0,0 +1,11 @@ +widget +{ +} + +image +{ +} + +text +{ +} diff -r 480fe05ec121 -r ac3b45850c50 data/commonwidgetdata/xuikon/00/replacerenderer.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/data/commonwidgetdata/xuikon/00/replacerenderer.xml Tue Oct 26 15:34:14 2010 +0300 @@ -0,0 +1,17 @@ + + + + + + + + + + + <#replace#renderer> + + + + + + diff -r 480fe05ec121 -r ac3b45850c50 data/feed/group/bld.inf --- a/data/feed/group/bld.inf Mon Oct 11 08:55:38 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,40 +0,0 @@ -/* -* Copyright (c) {Year(s)} {Copyright owner}. -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html". -* -* Initial Contributors: -* {Name} {Company} ? Initial contribution -* -* Contributors: -* {Name} {Company} ? {{Description of contribution}} -* -* Description: -* {{Description of the file}} -* -*/ - -#include - -PRJ_PLATFORMS -DEFAULT - -PRJ_EXPORTS -// Support for productization and Carbide.Ui customization -../hsps/00/manifest.dat /epoc32/data/Z/resource/homescreen/#replace#_#replaceuid#/hsps/manifest.dat -../hsps/00/widgetconfiguration.xml /epoc32/data/Z/resource/homescreen/#replace#_#replaceuid#/hsps/widgetconfiguration.xml -../xuikon/00/#replace#_#replaceuid#.dat /epoc32/data/Z/resource/homescreen/#replace#_#replaceuid#/xuikon/#replace#_#replaceuid#.dat -../xuikon/00/#replace#.css /epoc32/data/Z/resource/homescreen/#replace#_#replaceuid#/xuikon/#replace#.css -../xuikon/00/#replace#.xml /epoc32/data/Z/resource/homescreen/#replace#_#replaceuid#/xuikon/#replace#.xml -//../xuikon/00/#replace#.dtd /epoc32/data/Z/resource/homescreen/#replace#_#replaceuid#/xuikon/#replace#.dtd - - -PRJ_EXTENSIONS -START EXTENSION tools/dtd -OPTION SWITCH_LOC_FILE_NAME #replace#_#replaceuid# -OPTION DTD_TYPE widget -END -// End of File diff -r 480fe05ec121 -r ac3b45850c50 data/feed/hsps/00/empty.dat diff -r 480fe05ec121 -r ac3b45850c50 data/feed/hsps/00/manifest.dat --- a/data/feed/hsps/00/manifest.dat Mon Oct 11 08:55:38 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,21 +0,0 @@ - - - qhd_tch - widget - - 0x2001f48a - 0x101fb657 - #replaceuid# - - #replace# - #replace# - 1.0 - - unlimited - - widgetconfiguration.xml - - - #replace#.o0000 - - diff -r 480fe05ec121 -r ac3b45850c50 data/feed/hsps/00/widgetconfiguration.xml --- a/data/feed/hsps/00/widgetconfiguration.xml Mon Oct 11 08:55:38 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ - - - - - - diff -r 480fe05ec121 -r ac3b45850c50 data/feed/sis/backup_registration.xml --- a/data/feed/sis/backup_registration.xml Mon Oct 11 08:55:38 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ - - - - - diff -r 480fe05ec121 -r ac3b45850c50 data/feed/sis/replace.pkg --- a/data/feed/sis/replace.pkg Mon Oct 11 08:55:38 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,19 +0,0 @@ -;Language -&EN -; Header -#{"#replace#"}, (0x#replaceuid#), 1,0,0 -;Localized Vendor Name -%{"Company"} -;Unique Vendor name -:"Vendor" -;Files to install -; HSPS - general (extracting files to C drive, other drives are not searched) -"..\hsps\00\widgetconfiguration.xml" - "c:\private\200159c0\import\2001f48a\101fb657\#replaceuid#\1.0\widgetconfiguration.xml" -"..\hsps\00\manifest.dat" - "c:\private\200159c0\import\2001f48a\101fb657\#replaceuid#\1.0\manifest.dat" -; HSPS - Resources for locale 0 -; "..\xuikon\00\locale.dtd" - "c:\private\200159c0\import\2001f48a\101fb657\#replaceuid#\1.0\0\locale.dtd" -"\epoc32\data\z\private\200159c0\install\#replace#_#replaceuid#\xuikon\00\#replace#.o0000" - "c:\private\200159c0\import\2001f48a\101fb657\#replaceuid#\1.0\0\#replace#.o0000" -; HSPS - Backup -"backup_registration.xml" - "c:\private\10202D56\import\packages\#replaceuid#\backup_registration.xml" -; HSPS - trigger for post installations by the HSPS server -"..\hsps\00\empty.dat" - "c:\private\200159c0\import\plugin_2001f48a_101fb657_#replaceuid#_1.0.dat" diff -r 480fe05ec121 -r ac3b45850c50 data/feed/xuikon/00/replace.dat --- a/data/feed/xuikon/00/replace.dat Mon Oct 11 08:55:38 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ - - - - 2001CB4F - 101FB657 - 11001241 - Anything - #replace# - 1.0 - #replace#.xml - #replace#.css - diff -r 480fe05ec121 -r ac3b45850c50 data/feed/xuikon/00/replace.dtd diff -r 480fe05ec121 -r ac3b45850c50 data/graphiciconstext/group/bld.inf --- a/data/graphiciconstext/group/bld.inf Mon Oct 11 08:55:38 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,40 +0,0 @@ -/* -* Copyright (c) {Year(s)} {Copyright owner}. -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html". -* -* Initial Contributors: -* {Name} {Company} ? Initial contribution -* -* Contributors: -* {Name} {Company} ? {{Description of contribution}} -* -* Description: -* {{Description of the file}} -* -*/ - -#include - -PRJ_PLATFORMS -DEFAULT - -PRJ_EXPORTS -// Support for productization and Carbide.Ui customization -../hsps/00/manifest.dat /epoc32/data/Z/resource/homescreen/#replace#_#replaceuid#/hsps/manifest.dat -../hsps/00/widgetconfiguration.xml /epoc32/data/Z/resource/homescreen/#replace#_#replaceuid#/hsps/widgetconfiguration.xml -../xuikon/00/#replace#_#replaceuid#.dat /epoc32/data/Z/resource/homescreen/#replace#_#replaceuid#/xuikon/#replace#_#replaceuid#.dat -../xuikon/00/#replace#.css /epoc32/data/Z/resource/homescreen/#replace#_#replaceuid#/xuikon/#replace#.css -../xuikon/00/#replace#.xml /epoc32/data/Z/resource/homescreen/#replace#_#replaceuid#/xuikon/#replace#.xml -//../xuikon/00/#replace#.dtd /epoc32/data/Z/resource/homescreen/#replace#_#replaceuid#/xuikon/#replace#.dtd - - -PRJ_EXTENSIONS -START EXTENSION tools/dtd -OPTION SWITCH_LOC_FILE_NAME #replace#_#replaceuid# -OPTION DTD_TYPE widget -END -// End of File diff -r 480fe05ec121 -r ac3b45850c50 data/graphiciconstext/hsps/00/empty.dat diff -r 480fe05ec121 -r ac3b45850c50 data/graphiciconstext/hsps/00/manifest.dat --- a/data/graphiciconstext/hsps/00/manifest.dat Mon Oct 11 08:55:38 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,21 +0,0 @@ - - - qhd_tch - widget - - 0x2001f48a - 0x101fb657 - #replaceuid# - - #replace# - #replace# - 1.0 - - unlimited - - widgetconfiguration.xml - - - #replace#.o0000 - - diff -r 480fe05ec121 -r ac3b45850c50 data/graphiciconstext/hsps/00/widgetconfiguration.xml --- a/data/graphiciconstext/hsps/00/widgetconfiguration.xml Mon Oct 11 08:55:38 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ - - - - - - diff -r 480fe05ec121 -r ac3b45850c50 data/graphiciconstext/sis/backup_registration.xml --- a/data/graphiciconstext/sis/backup_registration.xml Mon Oct 11 08:55:38 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ - - - - - diff -r 480fe05ec121 -r ac3b45850c50 data/graphiciconstext/sis/replace.pkg --- a/data/graphiciconstext/sis/replace.pkg Mon Oct 11 08:55:38 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,19 +0,0 @@ -;Language -&EN -; Header -#{"#replace#"}, (0x#replaceuid#), 1,0,0 -;Localized Vendor Name -%{"Company"} -;Unique Vendor name -:"Vendor" -;Files to install -; HSPS - general (extracting files to C drive, other drives are not searched) -"..\hsps\00\widgetconfiguration.xml" - "c:\private\200159c0\import\2001f48a\101fb657\#replaceuid#\1.0\widgetconfiguration.xml" -"..\hsps\00\manifest.dat" - "c:\private\200159c0\import\2001f48a\101fb657\#replaceuid#\1.0\manifest.dat" -; HSPS - Resources for locale 0 -; "..\xuikon\00\locale.dtd" - "c:\private\200159c0\import\2001f48a\101fb657\#replaceuid#\1.0\0\locale.dtd" -"\epoc32\data\z\private\200159c0\install\#replace#_#replaceuid#\xuikon\00\#replace#.o0000" - "c:\private\200159c0\import\2001f48a\101fb657\#replaceuid#\1.0\0\#replace#.o0000" -; HSPS - Backup -"backup_registration.xml" - "c:\private\10202D56\import\packages\#replaceuid#\backup_registration.xml" -; HSPS - trigger for post installations by the HSPS server -"..\hsps\00\empty.dat" - "c:\private\200159c0\import\plugin_2001f48a_101fb657_#replaceuid#_1.0.dat" diff -r 480fe05ec121 -r ac3b45850c50 data/graphiciconstext/xuikon/00/replace.dat --- a/data/graphiciconstext/xuikon/00/replace.dat Mon Oct 11 08:55:38 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ - - - - 2001CB4F - 101FB657 - 11001241 - Anything - #replace# - 1.0 - #replace#.xml - #replace#.css - diff -r 480fe05ec121 -r ac3b45850c50 data/graphiciconstext/xuikon/00/replace.dtd diff -r 480fe05ec121 -r ac3b45850c50 data/graphictext/group/bld.inf --- a/data/graphictext/group/bld.inf Mon Oct 11 08:55:38 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,40 +0,0 @@ -/* -* Copyright (c) {Year(s)} {Copyright owner}. -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html". -* -* Initial Contributors: -* {Name} {Company} ? Initial contribution -* -* Contributors: -* {Name} {Company} ? {{Description of contribution}} -* -* Description: -* {{Description of the file}} -* -*/ - -#include - -PRJ_PLATFORMS -DEFAULT - -PRJ_EXPORTS -// Support for productization and Carbide.Ui customization -../hsps/00/manifest.dat /epoc32/data/Z/resource/homescreen/#replace#_#replaceuid#/hsps/manifest.dat -../hsps/00/widgetconfiguration.xml /epoc32/data/Z/resource/homescreen/#replace#_#replaceuid#/hsps/widgetconfiguration.xml -../xuikon/00/#replace#_#replaceuid#.dat /epoc32/data/Z/resource/homescreen/#replace#_#replaceuid#/xuikon/#replace#_#replaceuid#.dat -../xuikon/00/#replace#.css /epoc32/data/Z/resource/homescreen/#replace#_#replaceuid#/xuikon/#replace#.css -../xuikon/00/#replace#.xml /epoc32/data/Z/resource/homescreen/#replace#_#replaceuid#/xuikon/#replace#.xml -//../xuikon/00/#replace#.dtd /epoc32/data/Z/resource/homescreen/#replace#_#replaceuid#/xuikon/#replace#.dtd - - -PRJ_EXTENSIONS -START EXTENSION tools/dtd -OPTION SWITCH_LOC_FILE_NAME #replace#_#replaceuid# -OPTION DTD_TYPE widget -END -// End of File diff -r 480fe05ec121 -r ac3b45850c50 data/graphictext/hsps/00/empty.dat diff -r 480fe05ec121 -r ac3b45850c50 data/graphictext/hsps/00/manifest.dat --- a/data/graphictext/hsps/00/manifest.dat Mon Oct 11 08:55:38 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,21 +0,0 @@ - - - qhd_tch - widget - - 0x2001f48a - 0x101fb657 - #replaceuid# - - #replace# - #replace# - 1.0 - - unlimited - - widgetconfiguration.xml - - - #replace#.o0000 - - diff -r 480fe05ec121 -r ac3b45850c50 data/graphictext/hsps/00/widgetconfiguration.xml --- a/data/graphictext/hsps/00/widgetconfiguration.xml Mon Oct 11 08:55:38 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ - - - - - - diff -r 480fe05ec121 -r ac3b45850c50 data/graphictext/sis/backup_registration.xml --- a/data/graphictext/sis/backup_registration.xml Mon Oct 11 08:55:38 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ - - - - - diff -r 480fe05ec121 -r ac3b45850c50 data/graphictext/sis/replace.pkg --- a/data/graphictext/sis/replace.pkg Mon Oct 11 08:55:38 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,19 +0,0 @@ -;Language -&EN -; Header -#{"#replace#"}, (0x#replaceuid#), 1,0,0 -;Localized Vendor Name -%{"Company"} -;Unique Vendor name -:"Vendor" -;Files to install -; HSPS - general (extracting files to C drive, other drives are not searched) -"..\hsps\00\widgetconfiguration.xml" - "c:\private\200159c0\import\2001f48a\101fb657\#replaceuid#\1.0\widgetconfiguration.xml" -"..\hsps\00\manifest.dat" - "c:\private\200159c0\import\2001f48a\101fb657\#replaceuid#\1.0\manifest.dat" -; HSPS - Resources for locale 0 -; "..\xuikon\00\locale.dtd" - "c:\private\200159c0\import\2001f48a\101fb657\#replaceuid#\1.0\0\locale.dtd" -"\epoc32\data\z\private\200159c0\install\#replace#_#replaceuid#\xuikon\00\#replace#.o0000" - "c:\private\200159c0\import\2001f48a\101fb657\#replaceuid#\1.0\0\#replace#.o0000" -; HSPS - Backup -"backup_registration.xml" - "c:\private\10202D56\import\packages\#replaceuid#\backup_registration.xml" -; HSPS - trigger for post installations by the HSPS server -"..\hsps\00\empty.dat" - "c:\private\200159c0\import\plugin_2001f48a_101fb657_#replaceuid#_1.0.dat" diff -r 480fe05ec121 -r ac3b45850c50 data/graphictext/xuikon/00/replace.dat --- a/data/graphictext/xuikon/00/replace.dat Mon Oct 11 08:55:38 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ - - - - 2001CB4F - 101FB657 - 11001241 - Anything - #replace# - 1.0 - #replace#.xml - #replace#.css - diff -r 480fe05ec121 -r ac3b45850c50 data/graphictext/xuikon/00/replace.dtd diff -r 480fe05ec121 -r ac3b45850c50 data/iconstext/group/bld.inf --- a/data/iconstext/group/bld.inf Mon Oct 11 08:55:38 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,40 +0,0 @@ -/* -* Copyright (c) {Year(s)} {Copyright owner}. -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html". -* -* Initial Contributors: -* {Name} {Company} ? Initial contribution -* -* Contributors: -* {Name} {Company} ? {{Description of contribution}} -* -* Description: -* {{Description of the file}} -* -*/ - -#include - -PRJ_PLATFORMS -DEFAULT - -PRJ_EXPORTS -// Support for productization and Carbide.Ui customization -../hsps/00/manifest.dat /epoc32/data/Z/resource/homescreen/#replace#_#replaceuid#/hsps/manifest.dat -../hsps/00/widgetconfiguration.xml /epoc32/data/Z/resource/homescreen/#replace#_#replaceuid#/hsps/widgetconfiguration.xml -../xuikon/00/#replace#_#replaceuid#.dat /epoc32/data/Z/resource/homescreen/#replace#_#replaceuid#/xuikon/#replace#_#replaceuid#.dat -../xuikon/00/#replace#.css /epoc32/data/Z/resource/homescreen/#replace#_#replaceuid#/xuikon/#replace#.css -../xuikon/00/#replace#.xml /epoc32/data/Z/resource/homescreen/#replace#_#replaceuid#/xuikon/#replace#.xml -//../xuikon/00/#replace#.dtd /epoc32/data/Z/resource/homescreen/#replace#_#replaceuid#/xuikon/#replace#.dtd - - -PRJ_EXTENSIONS -START EXTENSION tools/dtd -OPTION SWITCH_LOC_FILE_NAME #replace#_#replaceuid# -OPTION DTD_TYPE widget -END -// End of File diff -r 480fe05ec121 -r ac3b45850c50 data/iconstext/hsps/00/empty.dat diff -r 480fe05ec121 -r ac3b45850c50 data/iconstext/hsps/00/manifest.dat --- a/data/iconstext/hsps/00/manifest.dat Mon Oct 11 08:55:38 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,21 +0,0 @@ - - - qhd_tch - widget - - 0x2001f48a - 0x101fb657 - #replaceuid# - - #replace# - #replace# - 1.0 - - unlimited - - widgetconfiguration.xml - - - #replace#.o0000 - - diff -r 480fe05ec121 -r ac3b45850c50 data/iconstext/hsps/00/widgetconfiguration.xml --- a/data/iconstext/hsps/00/widgetconfiguration.xml Mon Oct 11 08:55:38 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ - - - - - - diff -r 480fe05ec121 -r ac3b45850c50 data/iconstext/sis/backup_registration.xml --- a/data/iconstext/sis/backup_registration.xml Mon Oct 11 08:55:38 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ - - - - - diff -r 480fe05ec121 -r ac3b45850c50 data/iconstext/sis/replace.pkg --- a/data/iconstext/sis/replace.pkg Mon Oct 11 08:55:38 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,19 +0,0 @@ -;Language -&EN -; Header -#{"#replace#"}, (0x#replaceuid#), 1,0,0 -;Localized Vendor Name -%{"Company"} -;Unique Vendor name -:"Vendor" -;Files to install -; HSPS - general (extracting files to C drive, other drives are not searched) -"..\hsps\00\widgetconfiguration.xml" - "c:\private\200159c0\import\2001f48a\101fb657\#replaceuid#\1.0\widgetconfiguration.xml" -"..\hsps\00\manifest.dat" - "c:\private\200159c0\import\2001f48a\101fb657\#replaceuid#\1.0\manifest.dat" -; HSPS - Resources for locale 0 -; "..\xuikon\00\locale.dtd" - "c:\private\200159c0\import\2001f48a\101fb657\#replaceuid#\1.0\0\locale.dtd" -"\epoc32\data\z\private\200159c0\install\#replace#_#replaceuid#\xuikon\00\#replace#.o0000" - "c:\private\200159c0\import\2001f48a\101fb657\#replaceuid#\1.0\0\#replace#.o0000" -; HSPS - Backup -"backup_registration.xml" - "c:\private\10202D56\import\packages\#replaceuid#\backup_registration.xml" -; HSPS - trigger for post installations by the HSPS server -"..\hsps\00\empty.dat" - "c:\private\200159c0\import\plugin_2001f48a_101fb657_#replaceuid#_1.0.dat" diff -r 480fe05ec121 -r ac3b45850c50 data/iconstext/xuikon/00/replace.dat --- a/data/iconstext/xuikon/00/replace.dat Mon Oct 11 08:55:38 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ - - - - 2001CB4F - 101FB657 - 11001241 - Anything - #replace# - 1.0 - #replace#.xml - #replace#.css - diff -r 480fe05ec121 -r ac3b45850c50 data/iconstext/xuikon/00/replace.dtd diff -r 480fe05ec121 -r ac3b45850c50 data/text/group/bld.inf --- a/data/text/group/bld.inf Mon Oct 11 08:55:38 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,40 +0,0 @@ -/* -* Copyright (c) {Year(s)} {Copyright owner}. -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html". -* -* Initial Contributors: -* {Name} {Company} ? Initial contribution -* -* Contributors: -* {Name} {Company} ? {{Description of contribution}} -* -* Description: -* {{Description of the file}} -* -*/ - -#include - -PRJ_PLATFORMS -DEFAULT - -PRJ_EXPORTS -// Support for productization and Carbide.Ui customization -../hsps/00/manifest.dat /epoc32/data/Z/resource/homescreen/#replace#_#replaceuid#/hsps/manifest.dat -../hsps/00/widgetconfiguration.xml /epoc32/data/Z/resource/homescreen/#replace#_#replaceuid#/hsps/widgetconfiguration.xml -../xuikon/00/#replace#_#replaceuid#.dat /epoc32/data/Z/resource/homescreen/#replace#_#replaceuid#/xuikon/#replace#_#replaceuid#.dat -../xuikon/00/#replace#.css /epoc32/data/Z/resource/homescreen/#replace#_#replaceuid#/xuikon/#replace#.css -../xuikon/00/#replace#.xml /epoc32/data/Z/resource/homescreen/#replace#_#replaceuid#/xuikon/#replace#.xml -//../xuikon/00/#replace#.dtd /epoc32/data/Z/resource/homescreen/#replace#_#replaceuid#/xuikon/#replace#.dtd - - -PRJ_EXTENSIONS -START EXTENSION tools/dtd -OPTION SWITCH_LOC_FILE_NAME #replace#_#replaceuid# -OPTION DTD_TYPE widget -END -// End of File diff -r 480fe05ec121 -r ac3b45850c50 data/text/hsps/00/empty.dat diff -r 480fe05ec121 -r ac3b45850c50 data/text/hsps/00/manifest.dat --- a/data/text/hsps/00/manifest.dat Mon Oct 11 08:55:38 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,21 +0,0 @@ - - - qhd_tch - widget - - 0x2001f48a - 0x101fb657 - #replaceuid# - - #replace# - #replace# - 1.0 - - unlimited - - widgetconfiguration.xml - - - #replace#.o0000 - - diff -r 480fe05ec121 -r ac3b45850c50 data/text/hsps/00/widgetconfiguration.xml --- a/data/text/hsps/00/widgetconfiguration.xml Mon Oct 11 08:55:38 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ - - - - - - diff -r 480fe05ec121 -r ac3b45850c50 data/text/sis/backup_registration.xml --- a/data/text/sis/backup_registration.xml Mon Oct 11 08:55:38 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ - - - - - diff -r 480fe05ec121 -r ac3b45850c50 data/text/sis/replace.pkg --- a/data/text/sis/replace.pkg Mon Oct 11 08:55:38 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,19 +0,0 @@ -;Language -&EN -; Header -#{"#replace#"}, (0x#replaceuid#), 1,0,0 -;Localized Vendor Name -%{"Company"} -;Unique Vendor name -:"Vendor" -;Files to install -; HSPS - general (extracting files to C drive, other drives are not searched) -"..\hsps\00\widgetconfiguration.xml" - "c:\private\200159c0\import\2001f48a\101fb657\#replaceuid#\1.0\widgetconfiguration.xml" -"..\hsps\00\manifest.dat" - "c:\private\200159c0\import\2001f48a\101fb657\#replaceuid#\1.0\manifest.dat" -; HSPS - Resources for locale 0 -; "..\xuikon\00\locale.dtd" - "c:\private\200159c0\import\2001f48a\101fb657\#replaceuid#\1.0\0\locale.dtd" -"\epoc32\data\z\private\200159c0\install\#replace#_#replaceuid#\xuikon\00\#replace#.o0000" - "c:\private\200159c0\import\2001f48a\101fb657\#replaceuid#\1.0\0\#replace#.o0000" -; HSPS - Backup -"backup_registration.xml" - "c:\private\10202D56\import\packages\#replaceuid#\backup_registration.xml" -; HSPS - trigger for post installations by the HSPS server -"..\hsps\00\empty.dat" - "c:\private\200159c0\import\plugin_2001f48a_101fb657_#replaceuid#_1.0.dat" diff -r 480fe05ec121 -r ac3b45850c50 data/text/xuikon/00/replace.css --- a/data/text/xuikon/00/replace.css Mon Oct 11 08:55:38 2010 +0300 +++ b/data/text/xuikon/00/replace.css Tue Oct 26 15:34:14 2010 +0300 @@ -24,4 +24,5 @@ text.hidden { - display:none; \ No newline at end of file + display:none; +} \ No newline at end of file diff -r 480fe05ec121 -r ac3b45850c50 data/text/xuikon/00/replace.dat --- a/data/text/xuikon/00/replace.dat Mon Oct 11 08:55:38 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ - - - - 2001CB4F - 101FB657 - 11001241 - Anything - #replace# - 1.0 - #replace#.xml - #replace#.css - diff -r 480fe05ec121 -r ac3b45850c50 data/text/xuikon/00/replace.dtd diff -r 480fe05ec121 -r ac3b45850c50 data/widget/group/bld.inf --- a/data/widget/group/bld.inf Mon Oct 11 08:55:38 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,40 +0,0 @@ -/* -* Copyright (c) {Year(s)} {Copyright owner}. -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of the "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html". -* -* Initial Contributors: -* {Name} {Company} ? Initial contribution -* -* Contributors: -* {Name} {Company} ? {{Description of contribution}} -* -* Description: -* {{Description of the file}} -* -*/ - -#include - -PRJ_PLATFORMS -DEFAULT - -PRJ_EXPORTS -// Support for productization and Carbide.Ui customization -../hsps/00/manifest.dat /epoc32/data/Z/resource/homescreen/#replace#_#replaceuid#/hsps/manifest.dat -../hsps/00/widgetconfiguration.xml /epoc32/data/Z/resource/homescreen/#replace#_#replaceuid#/hsps/widgetconfiguration.xml -../xuikon/00/#replace#_#replaceuid#.dat /epoc32/data/Z/resource/homescreen/#replace#_#replaceuid#/xuikon/#replace#_#replaceuid#.dat -../xuikon/00/#replace#.css /epoc32/data/Z/resource/homescreen/#replace#_#replaceuid#/xuikon/#replace#.css -../xuikon/00/#replace#.xml /epoc32/data/Z/resource/homescreen/#replace#_#replaceuid#/xuikon/#replace#.xml -//../xuikon/00/#replace#.dtd /epoc32/data/Z/resource/homescreen/#replace#_#replaceuid#/xuikon/#replace#.dtd - - -PRJ_EXTENSIONS -START EXTENSION tools/dtd -OPTION SWITCH_LOC_FILE_NAME #replace#_#replaceuid# -OPTION DTD_TYPE widget -END -// End of File diff -r 480fe05ec121 -r ac3b45850c50 data/widget/hsps/00/empty.dat diff -r 480fe05ec121 -r ac3b45850c50 data/widget/hsps/00/manifest.dat --- a/data/widget/hsps/00/manifest.dat Mon Oct 11 08:55:38 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,21 +0,0 @@ - - - qhd_tch - widget - - 0x2001f48a - 0x101fb657 - #replaceuid# - - #replace# - #replace# - 1.0 - - unlimited - - widgetconfiguration.xml - - - #replace#.o0000 - - diff -r 480fe05ec121 -r ac3b45850c50 data/widget/hsps/00/widgetconfiguration.xml --- a/data/widget/hsps/00/widgetconfiguration.xml Mon Oct 11 08:55:38 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ - - - - - - diff -r 480fe05ec121 -r ac3b45850c50 data/widget/sis/backup_registration.xml --- a/data/widget/sis/backup_registration.xml Mon Oct 11 08:55:38 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ - - - - - diff -r 480fe05ec121 -r ac3b45850c50 data/widget/sis/replace.pkg --- a/data/widget/sis/replace.pkg Mon Oct 11 08:55:38 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,19 +0,0 @@ -;Language -&EN -; Header -#{"#replace#"}, (0x#replaceuid#), 1,0,0 -;Localized Vendor Name -%{"Company"} -;Unique Vendor name -:"Vendor" -;Files to install -; HSPS - general (extracting files to C drive, other drives are not searched) -"..\hsps\00\widgetconfiguration.xml" - "c:\private\200159c0\import\2001f48a\101fb657\#replaceuid#\1.0\widgetconfiguration.xml" -"..\hsps\00\manifest.dat" - "c:\private\200159c0\import\2001f48a\101fb657\#replaceuid#\1.0\manifest.dat" -; HSPS - Resources for locale 0 -; "..\xuikon\00\locale.dtd" - "c:\private\200159c0\import\2001f48a\101fb657\#replaceuid#\1.0\0\locale.dtd" -"\epoc32\data\z\private\200159c0\install\#replace#_#replaceuid#\xuikon\00\#replace#.o0000" - "c:\private\200159c0\import\2001f48a\101fb657\#replaceuid#\1.0\0\#replace#.o0000" -; HSPS - Backup -"backup_registration.xml" - "c:\private\10202D56\import\packages\#replaceuid#\backup_registration.xml" -; HSPS - trigger for post installations by the HSPS server -"..\hsps\00\empty.dat" - "c:\private\200159c0\import\plugin_2001f48a_101fb657_#replaceuid#_1.0.dat" diff -r 480fe05ec121 -r ac3b45850c50 data/widget/xuikon/00/replace.dat --- a/data/widget/xuikon/00/replace.dat Mon Oct 11 08:55:38 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ - - - - 2001CB4F - 101FB657 - 11001241 - Anything - #replace# - 1.0 - #replace#.xml - #replace#.css - diff -r 480fe05ec121 -r ac3b45850c50 data/widget/xuikon/00/replace.dtd diff -r 480fe05ec121 -r ac3b45850c50 data/widget/xuikon/00/replacerenderer.css --- a/data/widget/xuikon/00/replacerenderer.css Mon Oct 11 08:55:38 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,7 +0,0 @@ -widget -{ -} - -text -{ -} diff -r 480fe05ec121 -r ac3b45850c50 data/widget/xuikon/00/replacerenderer.xml --- a/data/widget/xuikon/00/replacerenderer.xml Mon Oct 11 08:55:38 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,17 +0,0 @@ - - - - - - - - - - - <#replace#renderer> - - - - - - diff -r 480fe05ec121 -r ac3b45850c50 images/feeds_layout.jpg Binary file images/feeds_layout.jpg has changed diff -r 480fe05ec121 -r ac3b45850c50 images/graphicscarousel_layout.jpg Binary file images/graphicscarousel_layout.jpg has changed diff -r 480fe05ec121 -r ac3b45850c50 images/graphicsgrid_layout.jpg Binary file images/graphicsgrid_layout.jpg has changed diff -r 480fe05ec121 -r ac3b45850c50 images/graphicsgridtext_layout.jpg Binary file images/graphicsgridtext_layout.jpg has changed diff -r 480fe05ec121 -r ac3b45850c50 images/graphicsiconstext_layout_1.jpg Binary file images/graphicsiconstext_layout_1.jpg has changed diff -r 480fe05ec121 -r ac3b45850c50 images/graphicsiconstext_layout_2.jpg Binary file images/graphicsiconstext_layout_2.jpg has changed diff -r 480fe05ec121 -r ac3b45850c50 images/graphicsiconstext_layout_3.jpg Binary file images/graphicsiconstext_layout_3.jpg has changed diff -r 480fe05ec121 -r ac3b45850c50 images/graphicstext_layout_1.jpg Binary file images/graphicstext_layout_1.jpg has changed diff -r 480fe05ec121 -r ac3b45850c50 images/graphicstext_layout_2.jpg Binary file images/graphicstext_layout_2.jpg has changed diff -r 480fe05ec121 -r ac3b45850c50 images/graphicstext_layout_3.jpg Binary file images/graphicstext_layout_3.jpg has changed diff -r 480fe05ec121 -r ac3b45850c50 images/graphictext_layout_1.jpg Binary file images/graphictext_layout_1.jpg has changed diff -r 480fe05ec121 -r ac3b45850c50 images/graphictext_layout_2.jpg Binary file images/graphictext_layout_2.jpg has changed diff -r 480fe05ec121 -r ac3b45850c50 images/graphictext_layout_3.jpg Binary file images/graphictext_layout_3.jpg has changed diff -r 480fe05ec121 -r ac3b45850c50 images/iconstext_layout_1.jpg Binary file images/iconstext_layout_1.jpg has changed diff -r 480fe05ec121 -r ac3b45850c50 images/iconstext_layout_2.jpg Binary file images/iconstext_layout_2.jpg has changed diff -r 480fe05ec121 -r ac3b45850c50 images/iconstext_layout_3.jpg Binary file images/iconstext_layout_3.jpg has changed diff -r 480fe05ec121 -r ac3b45850c50 images/text_layout_1.jpg Binary file images/text_layout_1.jpg has changed diff -r 480fe05ec121 -r ac3b45850c50 images/text_layout_2.jpg Binary file images/text_layout_2.jpg has changed diff -r 480fe05ec121 -r ac3b45850c50 images/text_layout_3.jpg Binary file images/text_layout_3.jpg has changed diff -r 480fe05ec121 -r ac3b45850c50 images/wideimage_layout.1jpg Binary file images/wideimage_layout.1jpg has changed diff -r 480fe05ec121 -r ac3b45850c50 images/wideimage_layout.jpg Binary file images/wideimage_layout.jpg has changed diff -r 480fe05ec121 -r ac3b45850c50 mainwindow.cpp --- a/mainwindow.cpp Mon Oct 11 08:55:38 2010 +0300 +++ b/mainwindow.cpp Tue Oct 26 15:34:14 2010 +0300 @@ -38,7 +38,7 @@ QString MainWindow::widgetName() { - return ui->widgetName->text().toLower(); + return ui->widgetName->text(); } QString MainWindow::widgetUid() @@ -58,7 +58,7 @@ QString MainWindow::rendererUid() { - return ui->rendererUid->text(); + return ui->rendererUid->text().toLower(); } void MainWindow::on_pushButton_clicked() @@ -89,6 +89,14 @@ return; } + if (widgetLayout().length() == 0 && !rendererCheckBox().isChecked()) + { + QMessageBox msgBox; + msgBox.setText("Layout data not available yet."); + msgBox.exec(); + return; + } + generateMainBuildFile(); PublisherCreator* publisherCreator = new PublisherCreator(*this); @@ -126,8 +134,8 @@ void MainWindow::generateMainBuildFile() { QDir dir; - dir.mkpath( widgetName() + "/group"); - dir.setPath( widgetName() + "/group"); + dir.mkpath( widgetName().toLower() + "/group"); + dir.setPath( widgetName().toLower() + "/group"); QFile file( dir.filePath("bld.inf")); if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) return; @@ -200,6 +208,7 @@ { QString line = in.readLine(); line.replace(QString("#replace#"), widgetName()); + if( noHexUid ) { line.replace(QString("#replaceuid#"), widgetUidNoHex()); @@ -214,15 +223,19 @@ void MainWindow::on_renderingCheckBox_stateChanged(int state ) { + iTimer->stop(); if( state == Qt::Unchecked ) { ui->rendererName->setEnabled( false ); ui->rendererUid->setEnabled( false ); + ui->comboBox->setEnabled( true ); + updateLayout(); } else if ( state == Qt::Checked) { ui->rendererName->setEnabled( true ); ui->rendererUid->setEnabled( true); + ui->comboBox->setEnabled( false ); } } @@ -251,7 +264,15 @@ return QString( "graphictext" ); } break; + case 4: + { + return QString( "graphiciconstext" ); + } + break; + }; + + return QString( "" ); } void MainWindow::on_comboBox_currentIndexChanged(int index) @@ -259,8 +280,6 @@ iLayoutIndex = index; iLayoutCount = 3; updateLayout(); - - } void MainWindow::updateLayout() @@ -287,10 +306,40 @@ break; case 3: { - showGraphicTextLayout(); + showGraphicsTextLayout(); + iTimer->start(2000); + } + break; + case 4: + { + showGraphicsIconTextLayout(); iTimer->start(2000); } break; + case 5: + { + iTimer->stop(); + showGraphicsGridLayout(); + } + break; + case 6: + { + iTimer->stop(); + showGraphicsGridTextLayout(); + } + break; + case 7: + { + iTimer->stop(); + showWidgeImageLayout(); + } + break; + case 8: + { + iTimer->stop(); + showGraphicsCarouselLayout(); + } + break; }; if( iLayoutCount > 1) @@ -308,6 +357,26 @@ ui->layoutGraphics->setPixmap(QPixmap(QString::fromUtf8(":/widgets/images/feeds_layout.jpg"))); } +void MainWindow::showGraphicsGridLayout() +{ + ui->layoutGraphics->setPixmap(QPixmap(QString::fromUtf8(":/widgets/images/graphicsgrid_layout.jpg"))); +} + +void MainWindow::showGraphicsGridTextLayout() +{ + ui->layoutGraphics->setPixmap(QPixmap(QString::fromUtf8(":/widgets/images/graphicsgridtext_layout.jpg"))); +} + +void MainWindow::showWidgeImageLayout() +{ + ui->layoutGraphics->setPixmap(QPixmap(QString::fromUtf8(":/widgets/images/wideimage_layout.jpg"))); +} + +void MainWindow::showGraphicsCarouselLayout() +{ + ui->layoutGraphics->setPixmap(QPixmap(QString::fromUtf8(":/widgets/images/graphicscarousel_layout.jpg"))); +} + void MainWindow::showTextLayout() { QString imagePath(":/widgets/images/text_layout_"); @@ -328,12 +397,23 @@ ui->layoutGraphics->setPixmap(QPixmap(imagePath)); } -void MainWindow::showGraphicTextLayout() +void MainWindow::showGraphicsTextLayout() { - QString imagePath(":/widgets/images/graphictext_layout_"); + QString imagePath(":/widgets/images/graphicstext_layout_"); QString cnt; cnt.setNum( iLayoutCount ); imagePath.append( cnt ); imagePath.append( ".jpg" ); ui->layoutGraphics->setPixmap(QPixmap(imagePath)); } + +void MainWindow::showGraphicsIconTextLayout() +{ + QString imagePath(":/widgets/images/graphicsiconstext_layout_"); + QString cnt; + cnt.setNum( iLayoutCount ); + imagePath.append( cnt ); + imagePath.append( ".jpg" ); + ui->layoutGraphics->setPixmap(QPixmap(imagePath)); +} + diff -r 480fe05ec121 -r ac3b45850c50 mainwindow.h --- a/mainwindow.h Mon Oct 11 08:55:38 2010 +0300 +++ b/mainwindow.h Tue Oct 26 15:34:14 2010 +0300 @@ -36,9 +36,14 @@ private: void generateMainBuildFile(); void showFeedsLayout(); + void showGraphicsGridLayout(); + void showGraphicsGridTextLayout(); + void showWidgeImageLayout(); + void showGraphicsCarouselLayout(); void showTextLayout(); void showIconsTextLayout(); - void showGraphicTextLayout(); + void showGraphicsTextLayout(); + void showGraphicsIconTextLayout(); private: Ui::MainWindow *ui; diff -r 480fe05ec121 -r ac3b45850c50 mainwindow.ui --- a/mainwindow.ui Mon Oct 11 08:55:38 2010 +0300 +++ b/mainwindow.ui Tue Oct 26 15:34:14 2010 +0300 @@ -6,7 +6,7 @@ 0 0 - 332 + 356 324 @@ -115,6 +115,31 @@ Graphic&Text layout + + + Graphics&Icon&Text layout + + + + + Graphics grid layout + + + + + Graphics grid&Text layout + + + + + Widge image layout + + + + + Carousel graphics layout + + @@ -125,16 +150,22 @@ - 312 + 334 82 + + true + :/widgets/images/feeds_layout.jpg + + Qt::AlignCenter + @@ -201,6 +232,11 @@ false + + + 12 + + @@ -227,6 +263,11 @@ false + + + 12 + + diff -r 480fe05ec121 -r ac3b45850c50 releases/WidgetBuilder_0_1_c.zip Binary file releases/WidgetBuilder_0_1_c.zip has changed diff -r 480fe05ec121 -r ac3b45850c50 renderercreator.cpp --- a/renderercreator.cpp Mon Oct 11 08:55:38 2010 +0300 +++ b/renderercreator.cpp Tue Oct 26 15:34:14 2010 +0300 @@ -16,8 +16,8 @@ void RendererCreator::generateFolders() { QDir dir; - dir.mkpath( iUi.widgetName() + "/renderingplugin"); - dir.setPath( iUi.widgetName() + "/renderingplugin"); + dir.mkpath( iUi.widgetName().toLower() + "/renderingplugin"); + dir.setPath( iUi.widgetName().toLower() + "/renderingplugin"); dir.mkpath( "data" ); dir.mkpath( "group" ); dir.mkpath( "inc" ); @@ -26,32 +26,46 @@ void RendererCreator::generateResource() { + QString widgetName( iUi.widgetName().toLower() ); + QString rendererName( iUi.rendererName().toLower() ); + iUi.replaceData("data/renderingplugin/data/renderer.rss", - iUi.widgetName() + "/renderingplugin/data/" + iUi.rendererName() + "renderer.rss"); + widgetName + "/renderingplugin/data/" + rendererName + "renderer.rss"); } void RendererCreator::generateBuildFile() { + QString widgetName( iUi.widgetName().toLower() ); + iUi.replaceData("data/renderingplugin/group/bld.inf", - iUi.widgetName() + "/renderingplugin/group/bld.inf"); + widgetName + "/renderingplugin/group/bld.inf"); } void RendererCreator::generateMMP() { + QString widgetName( iUi.widgetName().toLower() ); + QString rendererName( iUi.rendererName().toLower() ); + iUi.replaceData("data/renderingplugin/group/renderer.mmp", - iUi.widgetName() + "/renderingplugin/group/" + iUi.rendererName() + "renderer.mmp"); + widgetName + "/renderingplugin/group/" + rendererName + "renderer.mmp"); } void RendererCreator::generateHeader() { + QString widgetName( iUi.widgetName().toLower() ); + QString rendererName( iUi.rendererName().toLower() ); + iUi.replaceData("data/renderingplugin/inc/renderer.h", - iUi.widgetName() + "/renderingplugin/inc/" + iUi.rendererName() + "renderer.h"); + widgetName + "/renderingplugin/inc/" + rendererName + "renderer.h"); } void RendererCreator::generateSource() { + QString widgetName( iUi.widgetName().toLower() ); + QString rendererName( iUi.rendererName().toLower() ); + iUi.replaceData("data/renderingplugin/src/renderer.cpp", - iUi.widgetName() + "/renderingplugin/src/" + iUi.rendererName() + "renderer.cpp"); + widgetName + "/renderingplugin/src/" + rendererName + "renderer.cpp"); } void RendererCreator::replaceData( QString sourceFile, QString destFile ) @@ -71,8 +85,15 @@ while (!in.atEnd()) { QString line = in.readLine(); - line.replace(QString("#replace#"), iUi.rendererName()); - line.replace(QString("#replaceuid#"), iUi.rendererUid()); + if( line.contains("#replace#Renderer.h", Qt::CaseInsensitive )) + { + line.replace(QString("#replace#"), iUi.rendererName().toLower()); + } + else + { + line.replace(QString("#replace#"), iUi.rendererName()); + line.replace(QString("#replaceuid#"), iUi.rendererUid()); + } out << line << "\n"; } } diff -r 480fe05ec121 -r ac3b45850c50 widgetcreator.cpp --- a/widgetcreator.cpp Mon Oct 11 08:55:38 2010 +0300 +++ b/widgetcreator.cpp Tue Oct 26 15:34:14 2010 +0300 @@ -19,16 +19,14 @@ generateBur(); } - - QString WidgetCreator::widgetName() { - return iUi.widgetName(); + return iUi.widgetName().toLower(); } QString WidgetCreator::widgetUid() { - return iUi.widgetUid(); + return iUi.widgetUid().toLower(); } QString WidgetCreator::widgetLayout() @@ -49,18 +47,18 @@ void WidgetCreator::generateBuildFile() { - iUi.replaceData("data/" + widgetLayout() +"/group/bld.inf", widgetName() + "/widget/group/bld.inf", 1); + iUi.replaceData("data/commonwidgetdata/group/bld.inf", widgetName() + "/widget/group/bld.inf", 1); } void WidgetCreator::generateHSPSManifest() { - iUi.replaceData("data/" + widgetLayout() +"/hsps/00/manifest.dat", + iUi.replaceData("data/commonwidgetdata/hsps/00/manifest.dat", widgetName() + "/widget/hsps/00/manifest.dat"); } void WidgetCreator::generateHSPSConf() { - iUi.replaceData( "data/" + widgetLayout() +"/hsps/00/widgetconfiguration.xml", + iUi.replaceData( "data/commonwidgetdata/hsps/00/widgetconfiguration.xml", widgetName() + "/widget/hsps/00/widgetconfiguration.xml" ); } @@ -77,13 +75,13 @@ { if( iUi.rendererCheckBox().isChecked()) { - iUi.replaceData( "data/" + widgetLayout() +"/xuikon/00/replacerenderer.xml", - widgetName() + "/widget/xuikon/00/" + iUi.widgetName() + ".xml"); + iUi.replaceData( "data/commonwidgetdata/xuikon/00/replacerenderer.xml", + widgetName() + "/widget/xuikon/00/" + widgetName() + ".xml"); } else { iUi.replaceData( "data/" + widgetLayout() +"/xuikon/00/replace.xml", - widgetName() + "/widget/xuikon/00/" + iUi.widgetName() + ".xml"); + widgetName() + "/widget/xuikon/00/" + widgetName() + ".xml"); } } @@ -92,19 +90,19 @@ { if( iUi.rendererCheckBox().isChecked()) { - iUi.replaceData( "data/" + widgetLayout() +"/xuikon/00/replacerenderer.css", - widgetName() + "/widget/xuikon/00/" + iUi.widgetName() + ".css"); + iUi.replaceData( "data/commonwidgetdata/xuikon/00/replacerenderer.css", + widgetName() + "/widget/xuikon/00/" + widgetName() + ".css"); } else { iUi.replaceData( "data/" + widgetLayout() +"/xuikon/00/replace.css", - widgetName() + "/widget/xuikon/00/" + iUi.widgetName() + ".css"); + widgetName() + "/widget/xuikon/00/" + widgetName() + ".css"); } } void WidgetCreator::generateDat() { - iUi.replaceData("data/" + widgetLayout() +"/xuikon/00/replace.dat", + iUi.replaceData("data/commonwidgetdata/xuikon/00/replace.dat", widgetName() + "/widget/xuikon/00/" + widgetName() + "_" + iUi.widgetUidNoHex() + ".dat"); } @@ -120,7 +118,7 @@ void WidgetCreator::generatePkg() { - iUi.replaceData("data/" + widgetLayout() +"/sis/replace.pkg", + iUi.replaceData("data/commonwidgetdata/sis/replace.pkg", widgetName() + "/widget/sis/"+ widgetName() + ".pkg", 1); // 1 =no hex uid used } diff -r 480fe05ec121 -r ac3b45850c50 widgetgen.qrc --- a/widgetgen.qrc Mon Oct 11 08:55:38 2010 +0300 +++ b/widgetgen.qrc Tue Oct 26 15:34:14 2010 +0300 @@ -1,14 +1,21 @@ images/feeds_layout.jpg - images/text_layout_3.jpg + images/graphicscarousel_layout.jpg + images/graphicsgrid_layout.jpg + images/graphicsgridtext_layout.jpg + images/graphicsiconstext_layout_1.jpg + images/graphicsiconstext_layout_2.jpg + images/graphicsiconstext_layout_3.jpg + images/graphicstext_layout_1.jpg + images/graphicstext_layout_2.jpg + images/graphicstext_layout_3.jpg images/iconstext_layout_1.jpg images/iconstext_layout_2.jpg images/iconstext_layout_3.jpg images/text_layout_1.jpg images/text_layout_2.jpg - images/graphictext_layout_1.jpg - images/graphictext_layout_2.jpg - images/graphictext_layout_3.jpg + images/text_layout_3.jpg + images/wideimage_layout.jpg