chronojump r394 - in trunk: . build/data build/data/locale/ca/LC_MESSAGES glade installer/Chronojump po sqlite_diagrams src src/gui src/sqlite

From: xaviblas svn gnome org
To: svn-commits-list gnome org
Subject: chronojump r394 - in trunk: . build/data build/data/locale/ca/LC_MESSAGES glade installer/Chronojump po sqlite_diagrams src src/gui src/sqlite
Date: Sun, 8 Jun 2008 17:59:17 +0000 (UTC)
Author: xaviblas
Date: Sun Jun  8 17:59:17 2008
New Revision: 394
URL: http://svn.gnome.org/viewvc/chronojump?rev=394&view=rev

Log:
0.7.3.1
splashWin with progressBars
Added chronojump_mini to start menu o install (untested)
install chronojump shortcurts point to mono and the prg (deleted chronojump.bat) (untested)
Adding country to DB
fixed: 537246 better check db on start (now tell user that maybe delete db is the best)


Added:
   trunk/src/sqlite/country.cs
Modified:
   trunk/Makefile
   trunk/build/data/chronojump.prg
   trunk/build/data/chronojump_mini.prg
   trunk/build/data/locale/ca/LC_MESSAGES/chronojump.mo
   trunk/build/data/version.txt
   trunk/changelog.txt
   trunk/glade/chronojump.glade
   trunk/installer/Chronojump/Chronojump.mpi
   trunk/po/POTFILES.in
   trunk/po/ca.po
   trunk/sqlite_diagrams/chronojump_sqlite.dia
   trunk/src/chronojump.cs
   trunk/src/constants.cs
   trunk/src/gui/splash.cs
   trunk/src/sqlite/jumpRj.cs
   trunk/src/sqlite/main.cs
   trunk/src/sqlite/person.cs
   trunk/src/sqlite/runInterval.cs
   trunk/src/sqlite/session.cs
   trunk/src/util.cs
   trunk/version.txt

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	(original)
+++ trunk/Makefile	Sun Jun  8 17:59:17 2008
@@ -39,7 +39,7 @@
 
 CHRONOJUMP_DEP_GRAPHS = src/stats/graphs/graphData.cs src/stats/graphs/graphSerie.cs src/stats/graphs/global.cs src/stats/graphs/sjCmjAbk.cs src/stats/graphs/sjCmjAbkPlus.cs src/stats/graphs/djIndex.cs src/stats/graphs/djQ.cs src/stats/graphs/rjIndex.cs src/stats/graphs/rjPotencyBosco.cs src/stats/graphs/rjEvolution.cs src/stats/graphs/ieIub.cs src/stats/graphs/fv.cs src/stats/graphs/potency.cs src/stats/graphs/rjAVGSD.cs
 
-CHRONOJUMP_DEP_SQLITE = src/sqlite/main.cs src/sqlite/preferences.cs src/sqlite/person.cs src/sqlite/session.cs src/sqlite/jump.cs src/sqlite/jumpRj.cs src/sqlite/jumpType.cs src/sqlite/run.cs src/sqlite/runInterval.cs src/sqlite/runType.cs src/sqlite/personSession.cs src/sqlite/stat.cs src/sqlite/pulse.cs src/sqlite/pulseType.cs src/sqlite/reactionTime.cs src/sqlite/event.cs src/sqlite/sport.cs src/sqlite/speciallity.cs
+CHRONOJUMP_DEP_SQLITE = src/sqlite/main.cs src/sqlite/preferences.cs src/sqlite/person.cs src/sqlite/session.cs src/sqlite/jump.cs src/sqlite/jumpRj.cs src/sqlite/jumpType.cs src/sqlite/run.cs src/sqlite/runInterval.cs src/sqlite/runType.cs src/sqlite/personSession.cs src/sqlite/stat.cs src/sqlite/pulse.cs src/sqlite/pulseType.cs src/sqlite/reactionTime.cs src/sqlite/event.cs src/sqlite/sport.cs src/sqlite/speciallity.cs src/sqlite/country.cs
 
 CHRONOJUMP_DEP_EXECUTE = src/execute/event.cs src/execute/jump.cs src/execute/run.cs src/execute/pulse.cs src/execute/reactionTime.cs
 

Modified: trunk/build/data/chronojump.prg
==============================================================================
Binary files. No diff available.

Modified: trunk/build/data/chronojump_mini.prg
==============================================================================
Binary files. No diff available.

Modified: trunk/build/data/locale/ca/LC_MESSAGES/chronojump.mo
==============================================================================
Binary files. No diff available.

Modified: trunk/build/data/version.txt
==============================================================================
--- trunk/build/data/version.txt	(original)
+++ trunk/build/data/version.txt	Sun Jun  8 17:59:17 2008
@@ -1 +1 @@
-0.7.3
+0.7.3.1

Modified: trunk/changelog.txt
==============================================================================
--- trunk/changelog.txt	(original)
+++ trunk/changelog.txt	Sun Jun  8 17:59:17 2008
@@ -1,5 +1,15 @@
 CHRONOJUMP DETAILED CHANGELOG:
 
+8 jun 2008
+	0.7.3.1
+	splashWin with progressBars
+	Added chronojump_mini to start menu o install (untested)
+	install chronojump shortcurts point to mono and the prg (deleted
+	chronojump.bat) (untested)
+	Adding country to DB
+	fixed: 537246 better check db on start (now tell user that maybe
+	delete db is the best)
+
 5 Jun 2008
 	0.7.3
 	at splash screen it's shown conversion rate on update DB

Modified: trunk/glade/chronojump.glade
==============================================================================
--- trunk/glade/chronojump.glade	(original)
+++ trunk/glade/chronojump.glade	Sun Jun  8 17:59:17 2008
@@ -22409,7 +22409,37 @@
       </child>
 
       <child>
-	<widget class="GtkProgressBar" id="progressbar1">
+	<widget class="GtkProgressBar" id="progressbarVersion">
+	  <property name="visible">True</property>
+	  <property name="orientation">GTK_PROGRESS_LEFT_TO_RIGHT</property>
+	  <property name="fraction">0</property>
+	  <property name="pulse_step">0.10000000149</property>
+	  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	</widget>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">False</property>
+	  <property name="fill">False</property>
+	</packing>
+      </child>
+
+      <child>
+	<widget class="GtkProgressBar" id="progressbarRate">
+	  <property name="visible">True</property>
+	  <property name="orientation">GTK_PROGRESS_LEFT_TO_RIGHT</property>
+	  <property name="fraction">0</property>
+	  <property name="pulse_step">0.10000000149</property>
+	  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	</widget>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">False</property>
+	  <property name="fill">False</property>
+	</packing>
+      </child>
+
+      <child>
+	<widget class="GtkProgressBar" id="progressbarSubRate">
 	  <property name="visible">True</property>
 	  <property name="orientation">GTK_PROGRESS_LEFT_TO_RIGHT</property>
 	  <property name="fraction">0</property>

Modified: trunk/installer/Chronojump/Chronojump.mpi
==============================================================================
--- trunk/installer/Chronojump/Chronojump.mpi	(original)
+++ trunk/installer/Chronojump/Chronojump.mpi	Sun Jun  8 17:59:17 2008
@@ -820,7 +820,7 @@
 InstallComponent 58560ED4-175E-55FA-E8BD-438ABE6EFEA0 -setup Install -type pane -conditions {5A102ED2-6522-7E2D-6206-6241C1C5B4D4 F3ADE40C-1315-8E0A-906B-103FAE94CF0E} -title {Mono Windows install} -component CustomBlankPane1 -command insert -alias {Mono Windows install} -active Yes -parent StandardInstall
 Condition 5A102ED2-6522-7E2D-6206-6241C1C5B4D4 -active Yes -parent 58560ED4-175E-55FA-E8BD-438ABE6EFEA0 -title {Platform Condition} -component PlatformCondition
 Condition F3ADE40C-1315-8E0A-906B-103FAE94CF0E -active Yes -parent 58560ED4-175E-55FA-E8BD-438ABE6EFEA0 -title {Registry Test Condition} -component RegistryTestCondition
-InstallComponent 6B7975BC-0F80-AACD-DE3D-C40A372B33B4 -setup Install -type action -conditions FFAF0F01-244A-26B7-A100-C1713A1CFE2F -title InstallMonoWindowsActions -component ExecuteAction -operator OR -command insert -alias InstallMonoWindowsActions -active Yes -parent 58560ED4-175E-55FA-E8BD-438ABE6EFEA0
+InstallComponent 6B7975BC-0F80-AACD-DE3D-C40A372B33B4 -setup Install -type action -conditions FFAF0F01-244A-26B7-A100-C1713A1CFE2F -title InstallMonoWindowsActions -component ExecuteAction -operator OR -command reorder -alias InstallMonoWindowsActions -active Yes -parent 58560ED4-175E-55FA-E8BD-438ABE6EFEA0
 Condition FFAF0F01-244A-26B7-A100-C1713A1CFE2F -active Yes -parent 6B7975BC-0F80-AACD-DE3D-C40A372B33B4 -title {Platform Condition} -component PlatformCondition
 InstallComponent C1D1F678-E415-9B9E-1A79-05D862F4EB8A -setup Install -type action -conditions {142351D4-8889-E7D6-F79B-B4B940887D02 54A56E5F-C3C7-087A-F024-C7BC97283251} -title {Move to Pane} -component MoveToPane -command insert -active Yes -parent 58560ED4-175E-55FA-E8BD-438ABE6EFEA0
 Condition 142351D4-8889-E7D6-F79B-B4B940887D02 -active Yes -parent C1D1F678-E415-9B9E-1A79-05D862F4EB8A -title {Platform Condition} -component PlatformCondition
@@ -835,7 +835,7 @@
 InstallComponent 49F37AD8-E86B-78D7-2DC9-05FFCF1BEDC3 -setup Install -type action -conditions {B50D3D19-418C-BD12-9A5C-119A7B072695 624512F3-C4CF-D0E7-C864-B587C21B9742} -title {Move to Pane} -component MoveToPane -command insert -active Yes -parent 3FC5BC33-DA5B-9E6B-B025-AA62B582BFEC
 Condition B50D3D19-418C-BD12-9A5C-119A7B072695 -active Yes -parent 49F37AD8-E86B-78D7-2DC9-05FFCF1BEDC3 -title {Platform Condition} -component PlatformCondition
 Condition 624512F3-C4CF-D0E7-C864-B587C21B9742 -active Yes -parent 49F37AD8-E86B-78D7-2DC9-05FFCF1BEDC3 -title {Execute Script Condition} -component ExecuteScriptCondition
-InstallComponent 10254803-9C89-39D8-7879-B04E8250B6B5 -setup Install -type pane -conditions {C298C2E9-3B69-82BE-556E-671E30277A8A 39F46615-DB3E-E7E8-463A-531CB0B37B46 AE8E9951-5FA8-E483-6D2C-E5E48F75D332} -title {Mono windows updated} -component CustomBlankPane1 -command insert -alias {Mono windows updated} -active Yes -parent StandardInstall
+InstallComponent 10254803-9C89-39D8-7879-B04E8250B6B5 -setup Install -type pane -conditions {C298C2E9-3B69-82BE-556E-671E30277A8A 39F46615-DB3E-E7E8-463A-531CB0B37B46 AE8E9951-5FA8-E483-6D2C-E5E48F75D332} -title {Mono windows updated} -component CustomBlankPane1 -command reorder -alias {Mono windows updated} -active Yes -parent StandardInstall
 Condition C298C2E9-3B69-82BE-556E-671E30277A8A -active Yes -parent 10254803-9C89-39D8-7879-B04E8250B6B5 -title {Platform Condition} -component PlatformCondition
 Condition 39F46615-DB3E-E7E8-463A-531CB0B37B46 -active Yes -parent 10254803-9C89-39D8-7879-B04E8250B6B5 -title {Registry Test Condition} -component RegistryTestCondition
 Condition AE8E9951-5FA8-E483-6D2C-E5E48F75D332 -active Yes -parent 10254803-9C89-39D8-7879-B04E8250B6B5 -title {Execute Script Condition} -component ExecuteScriptCondition
@@ -861,7 +861,7 @@
 Condition 96F98447-4F33-D8FD-4DB7-197ED90FBC77 -active Yes -parent 7EB41496-B2E3-30E1-7867-DBFEC151EB2B -title {Platform Condition} -component PlatformCondition
 InstallComponent 53A63017-8385-B8EE-142A-65136147FA12 -setup Install -type action -title {Move Forward} -component MoveForward -active Yes -parent 073E3F8C-ADC8-8230-15C8-2F8108592782
 InstallComponent EF2847CB-E3D7-A3D0-70D3-3E87EA61D5CF -setup Install -type pane -title {Setup Complete} -component SetupComplete -active Yes -parent StandardInstall
-InstallComponent 4C465E6F-9D44-F4D7-8064-5ECE64239B91 -setup Install -type action -conditions {4C240F7C-5F6E-02EC-206D-F0D9BA5BEA68 9A10D654-6137-2828-5047-AFF307DE53B8} -title {Launch Application Checkbutton} -component AddWidget -command insert -active Yes -parent EF2847CB-E3D7-A3D0-70D3-3E87EA61D5CF
+InstallComponent 4C465E6F-9D44-F4D7-8064-5ECE64239B91 -setup Install -type action -conditions {4C240F7C-5F6E-02EC-206D-F0D9BA5BEA68 9A10D654-6137-2828-5047-AFF307DE53B8} -title {Launch Application Checkbutton} -component AddWidget -command reorder -active Yes -parent EF2847CB-E3D7-A3D0-70D3-3E87EA61D5CF
 Condition 4C240F7C-5F6E-02EC-206D-F0D9BA5BEA68 -active Yes -parent 4C465E6F-9D44-F4D7-8064-5ECE64239B91 -title {File Exists Condition} -component FileExistsCondition
 Condition 9A10D654-6137-2828-5047-AFF307DE53B8 -active Yes -parent 4C465E6F-9D44-F4D7-8064-5ECE64239B91 -title {String Is Condition} -component StringIsCondition
 InstallComponent 48B4932D-8D72-1214-5078-F33A9BD89960 -setup Install -type action -conditions {E791CEF9-CCAA-8936-1114-79C5BF368152 5D86A438-171D-8286-765B-F1A104123527} -title {Desktop Shortcut Checkbutton} -component AddWidget -command insert -active Yes -parent EF2847CB-E3D7-A3D0-70D3-3E87EA61D5CF
@@ -879,15 +879,17 @@
 Condition 3ED374ED-8769-C2E1-A5B4-2611FF0E8792 -active Yes -parent ACE850F7-7260-0918-ED4D-A043B59676BD -title {String Is Condition} -component StringIsCondition
 InstallComponent F68AA157-4B17-FABA-4523-B0D105E7260F -setup Install -type action -conditions E082CAC8-715F-5B82-42E3-7B2FD48577E9 -title {Windows Uninstall Registry} -component AddWindowsUninstallEntry -command insert -active Yes -parent DF44E112-7C44-054E-DDC6-7B8E119C230E
 Condition E082CAC8-715F-5B82-42E3-7B2FD48577E9 -active Yes -parent F68AA157-4B17-FABA-4523-B0D105E7260F -title {String Is Condition} -component StringIsCondition
-InstallComponent BBFC8BB2-978A-6A82-64A5-956543B03628 -setup Install -type action -conditions B68C718A-7D67-2AE8-FDD8-525A5B934E19 -title {Program Shortcut} -component InstallProgramFolderShortcut -command insert -active Yes -parent DF44E112-7C44-054E-DDC6-7B8E119C230E
+InstallComponent BBFC8BB2-978A-6A82-64A5-956543B03628 -setup Install -type action -conditions B68C718A-7D67-2AE8-FDD8-525A5B934E19 -title chronojump_shortcut -component InstallProgramFolderShortcut -command reorder -alias chronojump_shortcut -active Yes -parent DF44E112-7C44-054E-DDC6-7B8E119C230E
 Condition B68C718A-7D67-2AE8-FDD8-525A5B934E19 -active Yes -parent BBFC8BB2-978A-6A82-64A5-956543B03628 -title {String Is Condition} -component StringIsCondition
+InstallComponent 0772E47E-FC55-13C6-57FA-B9E06677B816 -setup Install -type action -conditions E4939328-D7E4-1EC3-CCCD-4EEA083B5BBD -title {chronojump_mini shortcut} -component InstallProgramFolderShortcut -command reorder -alias {chronojump_mini shortcut} -active Yes -parent DF44E112-7C44-054E-DDC6-7B8E119C230E
+Condition E4939328-D7E4-1EC3-CCCD-4EEA083B5BBD -active Yes -parent 0772E47E-FC55-13C6-57FA-B9E06677B816 -title {String Is Condition} -component StringIsCondition
 InstallComponent 446BFF70-66AA-8729-5EB1-E5DFB83FCCA9 -setup Install -type action -conditions D8492003-5C19-FCC6-D2C2-BC6E7D29FD09 -title {Uninstall Shortcut} -component InstallProgramFolderShortcut -command insert -active Yes -parent DF44E112-7C44-054E-DDC6-7B8E119C230E
 Condition D8492003-5C19-FCC6-D2C2-BC6E7D29FD09 -active Yes -parent 446BFF70-66AA-8729-5EB1-E5DFB83FCCA9 -title {String Is Condition} -component StringIsCondition
 InstallComponent FC32BEF7-192F-A3D5-C190-6F5BDF2B783E -setup Install -type actiongroup -title {Finish Actions} -alias {Finish Actions} -active Yes -parent ActionGroupsInstall
-InstallComponent 97C38F94-90CA-6717-CC51-78D0D43EE48A -setup Install -type action -conditions {B9C43883-A007-209B-5187-6894BC5C7C65 12BBAD85-A1BB-2F0E-874F-2638E1CE6B6F} -title {Install Desktop Shortcut} -component InstallDesktopShortcut -command insert -active Yes -parent FC32BEF7-192F-A3D5-C190-6F5BDF2B783E
+InstallComponent 97C38F94-90CA-6717-CC51-78D0D43EE48A -setup Install -type action -conditions {B9C43883-A007-209B-5187-6894BC5C7C65 12BBAD85-A1BB-2F0E-874F-2638E1CE6B6F} -title {Install Desktop Shortcut} -component InstallDesktopShortcut -command reorder -active Yes -parent FC32BEF7-192F-A3D5-C190-6F5BDF2B783E
 Condition B9C43883-A007-209B-5187-6894BC5C7C65 -active Yes -parent 97C38F94-90CA-6717-CC51-78D0D43EE48A -title {String Is Condition} -component StringIsCondition
 Condition 12BBAD85-A1BB-2F0E-874F-2638E1CE6B6F -active Yes -parent 97C38F94-90CA-6717-CC51-78D0D43EE48A -title {File Exists Condition} -component FileExistsCondition
-InstallComponent F8EBB3C0-597D-D1C6-82CC-1C9B04F06C23 -setup Install -type action -conditions {43A515B8-D335-D77D-4CF0-025B35D62CFD 19F2DF18-82AF-7F49-64C2-061CFB249FD3 2204086F-F5B9-392D-E5E1-8C0EDFB4D38B} -title {Launch Application} -component ExecuteExternalProgram -command insert -active Yes -parent FC32BEF7-192F-A3D5-C190-6F5BDF2B783E
+InstallComponent F8EBB3C0-597D-D1C6-82CC-1C9B04F06C23 -setup Install -type action -conditions {43A515B8-D335-D77D-4CF0-025B35D62CFD 19F2DF18-82AF-7F49-64C2-061CFB249FD3 2204086F-F5B9-392D-E5E1-8C0EDFB4D38B} -title {Launch Application} -component ExecuteExternalProgram -command reorder -active Yes -parent FC32BEF7-192F-A3D5-C190-6F5BDF2B783E
 Condition 43A515B8-D335-D77D-4CF0-025B35D62CFD -active Yes -parent F8EBB3C0-597D-D1C6-82CC-1C9B04F06C23 -title {String Is Condition} -component StringIsCondition
 Condition 19F2DF18-82AF-7F49-64C2-061CFB249FD3 -active Yes -parent F8EBB3C0-597D-D1C6-82CC-1C9B04F06C23 -title {String Is Condition} -component StringIsCondition
 Condition 2204086F-F5B9-392D-E5E1-8C0EDFB4D38B -active Yes -parent F8EBB3C0-597D-D1C6-82CC-1C9B04F06C23 -title {File Exists Condition} -component FileExistsCondition
@@ -895,13 +897,13 @@
 InstallComponent 385B710C-AC92-98CC-0B32-9E9DBAF28646 -setup Install -type actiongroup -title installMonoWindowsActions -alias installMonoWindowsActions -active Yes -parent ActionGroupsInstall
 InstallComponent C01D7E5D-42C8-06E3-AA57-861C46733A59 -setup Install -type action -title uncompressMonoWindows -component UnpackStoredFile -command reorder -alias uncompressMonoWindows -active Yes -parent 385B710C-AC92-98CC-0B32-9E9DBAF28646
 InstallComponent 96C99CFD-D1AB-A304-994B-F325CB5126D2 -setup Install -type action -title {install mono from windows executable} -component ExecuteExternalProgram -alias {install mono from windows executable} -active Yes -parent 385B710C-AC92-98CC-0B32-9E9DBAF28646
-InstallComponent D6173D47-F333-4546-80F7-E35B4EA32469 -setup Install -type actiongroup -conditions 38F4EEB1-DC2B-CCF8-60DB-D9FA88F13EF6 -title putMonoPathAndCopyNplot -command insert -alias putMonoPathAndCopyNplot -active Yes -parent ActionGroupsInstall
+InstallComponent D6173D47-F333-4546-80F7-E35B4EA32469 -setup Install -type actiongroup -conditions 38F4EEB1-DC2B-CCF8-60DB-D9FA88F13EF6 -title putMonoPathAndCopyNplot -command reorder -alias putMonoPathAndCopyNplot -active Yes -parent ActionGroupsInstall
 Condition 38F4EEB1-DC2B-CCF8-60DB-D9FA88F13EF6 -active Yes -parent D6173D47-F333-4546-80F7-E35B4EA32469 -title {Platform Condition} -component PlatformCondition
-InstallComponent 7950D6BF-C085-89EC-C719-C22E8445FDDE -setup Install -type action -conditions BD034D0C-F1CD-7C43-5CB2-CF52B553BF71 -title getMonoVersion2 -component SetVirtualText -command reorder -alias getMonoVersion2 -active Yes -parent D6173D47-F333-4546-80F7-E35B4EA32469
+InstallComponent 7950D6BF-C085-89EC-C719-C22E8445FDDE -setup Install -type action -conditions BD034D0C-F1CD-7C43-5CB2-CF52B553BF71 -title getMonoVersion2 -component SetVirtualText -command insert -alias getMonoVersion2 -active Yes -parent D6173D47-F333-4546-80F7-E35B4EA32469
 Condition BD034D0C-F1CD-7C43-5CB2-CF52B553BF71 -active Yes -parent 7950D6BF-C085-89EC-C719-C22E8445FDDE -title {Platform Condition} -component PlatformCondition
-InstallComponent CB749156-87EF-BA07-7E39-CB2F781C564B -setup Install -type action -conditions 52AAFFD2-F636-A589-4B1C-A2E5215DD479 -title getMonoPath -component SetVirtualText -command reorder -alias getMonoPath -active Yes -parent D6173D47-F333-4546-80F7-E35B4EA32469
+InstallComponent CB749156-87EF-BA07-7E39-CB2F781C564B -setup Install -type action -conditions 52AAFFD2-F636-A589-4B1C-A2E5215DD479 -title getMonoPath -component SetVirtualText -command insert -alias getMonoPath -active Yes -parent D6173D47-F333-4546-80F7-E35B4EA32469
 Condition 52AAFFD2-F636-A589-4B1C-A2E5215DD479 -active Yes -parent CB749156-87EF-BA07-7E39-CB2F781C564B -title {Platform Condition} -component PlatformCondition
-InstallComponent 66EDCFB0-45FF-6224-A486-A5660D7BFDC1 -setup Install -type action -conditions 4D38DA3A-6B5C-D5C3-9B45-EBE35888DA7B -title writeMonoPath -component WriteTextToFile -command reorder -alias writeMonoPath -active Yes -parent D6173D47-F333-4546-80F7-E35B4EA32469
+InstallComponent 66EDCFB0-45FF-6224-A486-A5660D7BFDC1 -setup Install -type action -conditions 4D38DA3A-6B5C-D5C3-9B45-EBE35888DA7B -title writeMonoPath -component WriteTextToFile -command insert -alias writeMonoPath -active No -parent D6173D47-F333-4546-80F7-E35B4EA32469
 Condition 4D38DA3A-6B5C-D5C3-9B45-EBE35888DA7B -active Yes -parent 66EDCFB0-45FF-6224-A486-A5660D7BFDC1 -title {Platform Condition} -component PlatformCondition
 InstallComponent 4426C95F-7D9C-F29A-FBAE-0C23ACF6D42A -setup Install -type action -title {copy Nplot1} -component CopyFile -alias {copy Nplot1} -active Yes -parent D6173D47-F333-4546-80F7-E35B4EA32469
 InstallComponent 68BF38BB-BFD1-CE11-36C1-706981646027 -setup Install -type action -title {copy Nplot2} -component CopyFile -alias {copy Nplot2} -active Yes -parent D6173D47-F333-4546-80F7-E35B4EA32469
@@ -967,6 +969,24 @@
 073E3F8C-ADC8-8230-15C8-2F8108592782,Title,subst
 1
 
+0772E47E-FC55-13C6-57FA-B9E06677B816,Alias
+{chronojump_mini shortcut}
+
+0772E47E-FC55-13C6-57FA-B9E06677B816,Conditions
+{1 condition}
+
+0772E47E-FC55-13C6-57FA-B9E06677B816,IconPath
+<%InstallDir%>/chronojump-<%Version%>/data/chronojump_icon.ico
+
+0772E47E-FC55-13C6-57FA-B9E06677B816,ShortcutName
+chronojump_mini
+
+0772E47E-FC55-13C6-57FA-B9E06677B816,TargetFileName
+chronojump_mini.bat
+
+0772E47E-FC55-13C6-57FA-B9E06677B816,WorkingDirectory
+<%InstallDir%>/chronojump-<%Version%>/windows
+
 0974AC80-C9EA-B238-282F-80C50AF1981F,Alias
 {is mono installed?}
 
@@ -1561,6 +1581,9 @@
 658A10BC-6046-11E0-60F1-BFCFE5B3989D,Platform
 Linux-x86
 
+66EDCFB0-45FF-6224-A486-A5660D7BFDC1,Active
+No
+
 66EDCFB0-45FF-6224-A486-A5660D7BFDC1,AddToUninstall
 Yes
 
@@ -1862,10 +1885,10 @@
 <%AppName%>
 
 97C38F94-90CA-6717-CC51-78D0D43EE48A,TargetFileName
-<%ProgramExecutable%>
+{<%MonoPathRegValue%>/bin/monow.exe <%ProgramExecutable%>}
 
 97C38F94-90CA-6717-CC51-78D0D43EE48A,WorkingDirectory
-<%InstallDir%>/chronojump-<%Version%>/windows/
+<%InstallDir%>/chronojump-<%Version%>/data
 
 9A10D654-6137-2828-5047-AFF307DE53B8,CheckCondition
 {Before Action is Executed}
@@ -2057,6 +2080,9 @@
 B9C43883-A007-209B-5187-6894BC5C7C65,String
 <%CreateDesktopShortcut%>
 
+BBFC8BB2-978A-6A82-64A5-956543B03628,Alias
+chronojump_shortcut
+
 BBFC8BB2-978A-6A82-64A5-956543B03628,Conditions
 {1 condition}
 
@@ -2067,10 +2093,10 @@
 <%AppName%>
 
 BBFC8BB2-978A-6A82-64A5-956543B03628,TargetFileName
-<%ProgramExecutable%>
+{<%MonoPathRegValue%>/bin/monow.exe <%ProgramExecutable%>}
 
 BBFC8BB2-978A-6A82-64A5-956543B03628,WorkingDirectory
-<%InstallDir%>/chronojump-<%Version%>/windows/
+<%InstallDir%>/chronojump-<%Version%>/data/
 
 BD034D0C-F1CD-7C43-5CB2-CF52B553BF71,CheckCondition
 {Before Action is Executed}
@@ -2249,6 +2275,15 @@
 E3A9B2B7-66C3-77C4-5DB2-F25E797E1697,Title,subst
 1
 
+E4939328-D7E4-1EC3-CCCD-4EEA083B5BBD,CheckCondition
+{Before Action is Executed}
+
+E4939328-D7E4-1EC3-CCCD-4EEA083B5BBD,Operator
+false
+
+E4939328-D7E4-1EC3-CCCD-4EEA083B5BBD,String
+<%UpgradeInstall%>
+
 E51C1501-7EA8-0F27-F3BE-C7B1954C361F,ExitType
 Finish
 
@@ -2778,7 +2813,7 @@
 Typical
 
 Windows,ProgramExecutable
-<%InstallDir%>/chronojump-<%Version%>/windows/chronojump.bat
+chronojump.prg
 
 Windows,ProgramFolderAllUsers
 No

Modified: trunk/po/POTFILES.in
==============================================================================
--- trunk/po/POTFILES.in	(original)
+++ trunk/po/POTFILES.in	Sun Jun  8 17:59:17 2008
@@ -28,6 +28,7 @@
 src/platform.cs
 src/report.cs
 src/runType.cs
+src/sqlite/country.cs
 src/sqlite/personSession.cs
 src/sqlite/speciallity.cs
 src/sqlite/sport.cs

Modified: trunk/sqlite_diagrams/chronojump_sqlite.dia
==============================================================================
Binary files. No diff available.

Modified: trunk/src/chronojump.cs
==============================================================================
--- trunk/src/chronojump.cs	(original)
+++ trunk/src/chronojump.cs	Sun Jun  8 17:59:17 2008
@@ -46,6 +46,7 @@
 	bool needEndSplashWin = false;
 	bool needUpdateSplashMessage = false;
 	string splashMessage = "";
+	bool creatingDB = false; //on creation and on update always refresh labels
 	bool updatingDB = false;
 
 
@@ -113,11 +114,13 @@
 		if (!Sqlite.CheckTables()) {
 			Log.WriteLine ( Catalog.GetString ("no tables, creating ...") );
 
+			creatingDB = true;
 			splashMessageChange(2);  //creating database
 
 			Sqlite.CreateFile();
 			File.Create(runningFileName);
 			Sqlite.CreateTables();
+			creatingDB = false;
 		} else {
 			//backup the database
 			Util.BackupDirCreateIfNeeded();
@@ -136,6 +139,9 @@
 					//check (spanish)
 					//http://mail.gnome.org/archives/chronojump-devel-list/2008-March/msg00011.html
 					string errorMessage = Catalog.GetString("Failed database conversion, ensure you have libsqlite3-0 installed. \nIf problems persist ask in chronojump-list");
+					errorMessage += "\n\n" + string.Format(Catalog.GetString("If you have no data on your database (you just installed Chronojump), you can fix this problem deleting this file: {0}"), 
+							Util.GetDatabaseDir() + Path.DirectorySeparatorChar + "chronojump.db") + 
+						"\n" + Catalog.GetString("And starting Chronojump again.");
 					Log.WriteLine(errorMessage);
 					messageToShowOnBoot += errorMessage;
 					chronojumpHasToExit = true;
@@ -237,15 +243,25 @@
 		}
 		//need to do this, if not it crashes because chronopicWin gets died by thread ending
 		splashWin = SplashWindow.Show();
-		splashWin.Pulse();
 		//Log.WriteLine("splash");
 
-		if(updatingDB) 
-			splashWin.UpdateLabel(splashMessage + " " + Sqlite.PrintConversionRate());
-		else if(needUpdateSplashMessage) {
+		if(updatingDB) {
+			splashWin.ShowProgressbar("updating");
+			splashWin.UpdateLabel(splashMessage + " " + Sqlite.PrintConversionText());
+		
+			splashWin.UpdateProgressbar("version", Sqlite.PrintConversionVersion());
+			splashWin.UpdateProgressbar("rate", Sqlite.PrintConversionRate());
+			splashWin.UpdateProgressbar("subrate", Sqlite.PrintConversionSubRate());
+		} else if(creatingDB) {
+			splashWin.ShowProgressbar("creating");
+			splashWin.UpdateProgressbar("version", Sqlite.PrintCreation());
+		}
+
+		if(needUpdateSplashMessage) {
 			splashWin.UpdateLabel(splashMessage);
 			needUpdateSplashMessage = false;
 		}
+			
 
 		Thread.Sleep (50);
 		Log.Write(thread.ThreadState.ToString());

Modified: trunk/src/constants.cs
==============================================================================
--- trunk/src/constants.cs	(original)
+++ trunk/src/constants.cs	Sun Jun  8 17:59:17 2008
@@ -43,6 +43,7 @@
 	public const string SportTable = "sport";
 	public const string SpeciallityTable = "speciallity";
 	public const string PreferencesTable = "preferences";
+	public const string CountryTable = "country";
 	public const string ConvertTempTable = "convertTemp"; //for conversions
 	//tests
 	public const string JumpTable = "jump";
@@ -236,6 +237,8 @@
 	public static string SpeciallityUndefined = "Undefined"; 
 	private static string dumbVariableForTranslatingSpeciallityUndefined = Catalog.GetString("Undefined");
 	
+	public static int CountryUndefinedID = 1;
+	public static string CountryUndefined = "Undefined"; 
 	
 	//levels of sport practice
 	//int will go into person database

Modified: trunk/src/gui/splash.cs
==============================================================================
--- trunk/src/gui/splash.cs	(original)
+++ trunk/src/gui/splash.cs	Sun Jun  8 17:59:17 2008
@@ -28,7 +28,9 @@
 {
 	[Widget] Gtk.Window splash_window;
 	[Widget] Gtk.Image image_logo;
-	[Widget] Gtk.ProgressBar progressbar1;
+	[Widget] Gtk.ProgressBar progressbarVersion;
+	[Widget] Gtk.ProgressBar progressbarRate;
+	[Widget] Gtk.ProgressBar progressbarSubRate;
 	[Widget] Gtk.Label myLabel;
 
 	static SplashWindow SplashWindowBox;
@@ -42,6 +44,8 @@
 		//put an icon to window
 		UtilGtk.IconWindow(splash_window);
 
+		hideAllProgressbars();
+
 		//put logo image
 		Pixbuf pixbuf;
 		pixbuf = new Pixbuf (null, Util.GetImagePath(false) + Constants.FileNameLogo320);
@@ -58,14 +62,36 @@
 		return SplashWindowBox;
 	}
 
+	private void hideAllProgressbars() 
+	{
+		progressbarVersion.Hide();
+		progressbarRate.Hide();
+		progressbarSubRate.Hide();
+	}
+
+	public void ShowProgressbar(string option) {
+		if(option == "creating")
+			progressbarVersion.Show();
+		else if (option == "updating") {
+			progressbarVersion.Show();
+			progressbarRate.Show();
+			progressbarSubRate.Show();
+		}
+	}
+
+	public void UpdateProgressbar (string pbString, double fraction) {
+		if(pbString == "version")
+			progressbarVersion.Fraction = fraction;
+		else if(pbString == "rate")
+			progressbarRate.Fraction = fraction;
+		else 
+			progressbarSubRate.Fraction = fraction;
+	}
+		
 			
 	public void UpdateLabel (string text) {
 		myLabel.Text = text;
 	}
-	
-	public void Pulse() {
-		progressbar1.Pulse();
-	}
 
 	public void Destroy () {
 		SplashWindowBox.splash_window.Destroy ();

Added: trunk/src/sqlite/country.cs
==============================================================================
--- (empty file)
+++ trunk/src/sqlite/country.cs	Sun Jun  8 17:59:17 2008
@@ -0,0 +1,479 @@
+/*
+ * This file is part of ChronoJump
+ *
+ * ChronoJump is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or   
+ *    (at your option) any later version.
+ *    
+ * ChronoJump is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ *    GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Xavier de Blas: 
+ * http://www.xdeblas.com, http://www.deporteyciencia.com (parleblas)
+ */
+
+/*
+ * UNUSED BECAUSE USER WILL NOT DEFINE SPORTS BECAUSE THIS WILL MAKE PROBLEMS WITH GLOBAL SPORTS DEFINITION (NOT LOCAL) SPECIALLY IN SPORT TRANSLATIONS
+ *
+ * SPORTS ARE DEFINED IN constants.cs
+ */
+
+
+using System;
+using System.Data;
+using System.IO;
+using System.Collections; //ArrayList
+//using Mono.Data.SqliteClient;
+//using System.Data.SqlClient;
+using Mono.Data.Sqlite;
+//using System.Data.SQLite;
+using Mono.Unix;
+
+
+class SqliteCountry : Sqlite
+{
+	protected internal static void createTable()
+	 {
+		dbcmd.CommandText = 
+			"CREATE TABLE " + Constants.CountryTable + " ( " +
+			"uniqueID INTEGER PRIMARY KEY, " +
+			"name TEXT, " +
+			"code TEXT, " +
+			"continent TEXT )";
+		dbcmd.ExecuteNonQuery();
+	 }
+
+	// intialize table
+	protected internal static void initialize()
+	{
+		foreach(string myString in countries) {
+			//put in db only english name
+			string [] strFull = myString.Split(new char[] {':'});
+			Insert(
+					true,   		//dbconOpened
+					strFull[3], 		//code
+					strFull[1], 		//name (english)
+					strFull[0]		//continent
+			      );
+		}
+	}
+	public static int Insert(bool dbconOpened, string code, string nameEnglish, string continent)
+	{
+		if(! dbconOpened)
+			dbcon.Open();
+
+		string myString = "INSERT INTO " + Constants.CountryTable + 
+			//" (uniqueID, code, name, continent) VALUES (NULL, '" + code + "', '" + 
+			//nameEnglish + "', '" + continent + "')";
+			//fix bad chars (') :
+			" (uniqueID, code, name, continent) VALUES (NULL, \"" + code + "\", \"" + 
+			nameEnglish + "\", \"" + continent + "\")";
+
+		dbcmd.CommandText = myString;
+		dbcmd.ExecuteNonQuery();
+		int myReturn = dbcon.LastInsertRowId;
+		
+		if(! dbconOpened)
+			dbcon.Close();
+
+		return myReturn;
+	}
+
+	/*
+	public static string Select(int uniqueID)
+	{
+		dbcon.Open();
+		
+		dbcmd.CommandText = "SELECT * FROM " + Constants.CountryTable + " WHERE uniqueID == " + uniqueID;
+		
+		Log.WriteLine(dbcmd.CommandText.ToString());
+		dbcmd.ExecuteNonQuery();
+
+		SqliteDataReader reader;
+		reader = dbcmd.ExecuteReader();
+		reader.Read();
+/*
+		Sport mySport = new Sport(
+				uniqueID,
+				reader[1].ToString(), //name
+				Util.IntToBool(Convert.ToInt32(reader[2])), //userDefined
+				Util.IntToBool(Convert.ToInt32(reader[3])), //hasSpeciallities
+				reader[4].ToString() //graphLink
+				);
+*/
+	/*	
+		reader.Close();
+		dbcon.Close();
+		return mySport;
+	}
+	*/
+
+	/*
+	public static int SelectID(string name)
+	{
+		//dbcon.Open();
+		
+		dbcmd.CommandText = "SELECT uniqueID FROM " + Constants.SportTable + " WHERE name == '" + name + "'";
+		
+		Log.WriteLine(dbcmd.CommandText.ToString());
+		dbcmd.ExecuteNonQuery();
+
+		SqliteDataReader reader;
+		reader = dbcmd.ExecuteReader();
+		reader.Read();
+		int myID = Convert.ToInt32(reader[0]);
+		reader.Close();
+		
+		//dbcon.Close();
+		
+		return myID;
+	}
+		
+	public static string [] SelectAll() 
+	{
+		dbcon.Open();
+		SqliteDataReader reader;
+		ArrayList myArray = new ArrayList(2);
+		int count = 0;
+
+		dbcmd.CommandText = "SELECT * " +
+			" FROM " + Constants.SportTable + " " +
+			" ORDER BY name";
+		
+		dbcmd.ExecuteNonQuery();
+		reader = dbcmd.ExecuteReader();
+		while(reader.Read()) {
+			Sport sport = new Sport(
+					Convert.ToInt32(reader[0]), 
+					Catalog.GetString(reader[1].ToString()), 
+					Util.IntToBool(Convert.ToInt32(reader[2])),
+					Util.IntToBool(Convert.ToInt32(reader[3])),
+					reader[4].ToString() //graphLink
+					);
+			myArray.Add(sport.ToString());
+			count ++;
+		}
+		reader.Close();
+		dbcon.Close();
+
+		string [] myReturn = new string[count];
+		count = 0;
+		foreach (string line in myArray) {
+			myReturn [count++] = line;
+		}
+
+		return myReturn;
+	}
+*/
+
+	/*
+	 * the Catalog.GetString is only for having a translation that will be used on display sport name if available
+	 * don't sportuserchecks here, doit in the database because sports will grow
+	 * all this are obviously NOT user defined
+	 * last string is for graphLink
+	 */
+	private static string [] countries = {
+		//true or false means if it has speciallities
+		Constants.CountryUndefined + ":" + Constants.CountryUndefined + ":" + Catalog.GetString(Constants.CountryUndefined) + ":" + Constants.CountryUndefined, //will be 1 (it's also written in Constants.CountryUndefinedID
+		"Africa:" + "Algeria, People's Democratic Republic of:" + Catalog.GetString("Algeria, People's Democratic Republic of") + ":" + "DZA",
+		"Africa:" + "Angola, Republic of:" + Catalog.GetString("Angola, Republic of") + ":" + "AGO",
+		"Africa:" + "Benin, Republic of:" + Catalog.GetString("Benin, Republic of") + ":" + "BEN",
+		"Africa:" + "Botswana, Republic of:" + Catalog.GetString("Botswana, Republic of") + ":" + "BWA",
+		"Africa:" + "Burkina Faso:" + Catalog.GetString("Burkina Faso") + ":" + "BFA",
+		"Africa:" + "Burundi, Republic of:" + Catalog.GetString("Burundi, Republic of") + ":" + "BDI",
+		"Africa:" + "Cameroon, Republic of:" + Catalog.GetString("Cameroon, Republic of") + ":" + "CMR",
+		"Africa:" + "Cape Verde, Republic of:" + Catalog.GetString("Cape Verde, Republic of") + ":" + "CPV",
+		"Africa:" + "Central African Republic:" + Catalog.GetString("Central African Republic") + ":" + "CAF",
+		"Africa:" + "Chad, Republic of:" + Catalog.GetString("Chad, Republic of") + ":" + "TCD",
+		"Africa:" + "Comoros, Union of the:" + Catalog.GetString("Comoros, Union of the") + ":" + "COM",
+		"Africa:" + "Congo, Democratic Republic of the:" + Catalog.GetString("Congo, Democratic Republic of the") + ":" + "COD",
+		"Africa:" + "Congo, Republic of the:" + Catalog.GetString("Congo, Republic of the") + ":" + "COG",
+		"Africa:" + "Cote d\'Ivoire, Republic of:" + Catalog.GetString("Cote d'Ivoire, Republic of") + ":" + "CIV",
+		"Africa:" + "Djibouti, Republic of:" + Catalog.GetString("Djibouti, Republic of") + ":" + "DJI",
+		"Africa:" + "Egypt, Arab Republic of:" + Catalog.GetString("Egypt, Arab Republic of") + ":" + "EGY",
+		"Africa:" + "Equatorial Guinea, Republic of:" + Catalog.GetString("Equatorial Guinea, Republic of") + ":" + "GNQ",
+		"Africa:" + "Eritrea, State of:" + Catalog.GetString("Eritrea, State of") + ":" + "ERI",
+		"Africa:" + "Ethiopia, Federal Democratic Republic of:" + Catalog.GetString("Ethiopia, Federal Democratic Republic of") + ":" + "ETH",
+		"Africa:" + "Gabon, Gabonese Republic:" + Catalog.GetString("Gabon, Gabonese Republic") + ":" + "GAB",
+		"Africa:" + "Gambia, Republic of the:" + Catalog.GetString("Gambia, Republic of the") + ":" + "GMB",
+		"Africa:" + "Ghana, Republic of:" + Catalog.GetString("Ghana, Republic of") + ":" + "GHA",
+		"Africa:" + "Guinea-Bissau, Republic of:" + Catalog.GetString("Guinea-Bissau, Republic of") + ":" + "GNB",
+		"Africa:" + "Guinea, Republic of:" + Catalog.GetString("Guinea, Republic of") + ":" + "GIN",
+		"Africa:" + "Kenya, Republic of:" + Catalog.GetString("Kenya, Republic of") + ":" + "KEN",
+		"Africa:" + "Lesotho, Kingdom of:" + Catalog.GetString("Lesotho, Kingdom of") + ":" + "LSO",
+		"Africa:" + "Liberia, Republic of:" + Catalog.GetString("Liberia, Republic of") + ":" + "LBR",
+		"Africa:" + "Libyan Arab Jamahiriya:" + Catalog.GetString("Libyan Arab Jamahiriya") + ":" + "LBY",
+		"Africa:" + "Madagascar, Republic of:" + Catalog.GetString("Madagascar, Republic of") + ":" + "MDG",
+		"Africa:" + "Malawi, Republic of:" + Catalog.GetString("Malawi, Republic of") + ":" + "MWI",
+		"Africa:" + "Mali, Republic of:" + Catalog.GetString("Mali, Republic of") + ":" + "MLI",
+		"Africa:" + "Mauritania, Islamic Republic of:" + Catalog.GetString("Mauritania, Islamic Republic of") + ":" + "MRT",
+		"Africa:" + "Mauritius, Republic of:" + Catalog.GetString("Mauritius, Republic of") + ":" + "MUS",
+		"Africa:" + "Mayotte:" + Catalog.GetString("Mayotte") + ":" + "MYT",
+		"Africa:" + "Morocco, Kingdom of:" + Catalog.GetString("Morocco, Kingdom of") + ":" + "MAR",
+		"Africa:" + "Mozambique, Republic of:" + Catalog.GetString("Mozambique, Republic of") + ":" + "MOZ",
+		"Africa:" + "Namibia, Republic of:" + Catalog.GetString("Namibia, Republic of") + ":" + "NAM",
+		"Africa:" + "Nigeria, Federal Republic of:" + Catalog.GetString("Nigeria, Federal Republic of") + ":" + "NGA",
+		"Africa:" + "Niger, Republic of:" + Catalog.GetString("Niger, Republic of") + ":" + "NER",
+		"Africa:" + "Reunion:" + Catalog.GetString("Reunion") + ":" + "REU",
+		"Africa:" + "Rwanda, Republic of:" + Catalog.GetString("Rwanda, Republic of") + ":" + "RWA",
+		"Africa:" + "Saint Helena:" + Catalog.GetString("Saint Helena") + ":" + "SHN",
+		"Africa:" + "Sao Tome and Principe, Democratic Republic of:" + Catalog.GetString("Sao Tome and Principe, Democratic Republic of") + ":" + "STP",
+		"Africa:" + "Senegal, Republic of:" + Catalog.GetString("Senegal, Republic of") + ":" + "SEN",
+		"Africa:" + "Seychelles, Republic of:" + Catalog.GetString("Seychelles, Republic of") + ":" + "SYC",
+		"Africa:" + "Sierra Leone, Republic of:" + Catalog.GetString("Sierra Leone, Republic of") + ":" + "SLE",
+		"Africa:" + "Somalia, Somali Republic:" + Catalog.GetString("Somalia, Somali Republic") + ":" + "SOM",
+		"Africa:" + "South Africa, Republic of:" + Catalog.GetString("South Africa, Republic of") + ":" + "ZAF",
+		"Africa:" + "Sudan, Republic of:" + Catalog.GetString("Sudan, Republic of") + ":" + "SDN",
+		"Africa:" + "Suriname, Republic of:" + Catalog.GetString("Suriname, Republic of") + ":" + "SUR",
+		"Africa:" + "Swaziland, Kingdom of:" + Catalog.GetString("Swaziland, Kingdom of") + ":" + "SWZ",
+		"Africa:" + "Tanzania, United Republic of:" + Catalog.GetString("Tanzania, United Republic of") + ":" + "TZA",
+		"Africa:" + "Togo, Togolese Republic:" + Catalog.GetString("Togo, Togolese Republic") + ":" + "TGO",
+		"Africa:" + "Tunisia, Tunisian Republic:" + Catalog.GetString("Tunisia, Tunisian Republic") + ":" + "TUN",
+		"Africa:" + "Uganda, Republic of:" + Catalog.GetString("Uganda, Republic of") + ":" + "UGA",
+		"Africa:" + "Western Sahara:" + Catalog.GetString("Western Sahara") + ":" + "ESH",
+		"Africa:" + "Zambia, Republic of:" + Catalog.GetString("Zambia, Republic of") + ":" + "ZMB",
+		"Africa:" + "Zimbabwe, Republic of:" + Catalog.GetString("Zimbabwe, Republic of") + ":" + "ZWE",
+		"Antarctica:" + "Antarctica (the territory South of 60 deg S):" + Catalog.GetString("Antarctica (the territory South of 60 deg S)") + ":" + "ATA",
+		"Antarctica:" + "Bouvet Island (Bouvetoya):" + Catalog.GetString("Bouvet Island (Bouvetoya)") + ":" + "BVT",
+		"Antarctica:" + "French Southern Territories:" + Catalog.GetString("French Southern Territories") + ":" + "ATF",
+		"Antarctica:" + "Heard Island and McDonald Islands:" + Catalog.GetString("Heard Island and McDonald Islands") + ":" + "HMD",
+		"Antarctica:" + "South Georgia and the South Sandwich Islands:" + Catalog.GetString("South Georgia and the South Sandwich Islands") + ":" + "SGS",
+		"Asia:" + "Afghanistan, Islamic Republic of:" + Catalog.GetString("Afghanistan, Islamic Republic of") + ":" + "AFG",
+		"Asia:" + "Armenia, Republic of:" + Catalog.GetString("Armenia, Republic of") + ":" + "ARM",
+		"Asia:" + "Azerbaijan, Republic of:" + Catalog.GetString("Azerbaijan, Republic of") + ":" + "AZE",
+		"Asia:" + "Bahrain, Kingdom of:" + Catalog.GetString("Bahrain, Kingdom of") + ":" + "BHR",
+		"Asia:" + "Bangladesh, People's Republic of:" + Catalog.GetString("Bangladesh, People's Republic of") + ":" + "BGD",
+		"Asia:" + "Bhutan, Kingdom of:" + Catalog.GetString("Bhutan, Kingdom of") + ":" + "BTN",
+		"Asia:" + "British Indian Ocean Territory (Chagos Archipelago):" + Catalog.GetString("British Indian Ocean Territory (Chagos Archipelago)") + ":" + "IOT",
+		"Asia:" + "Brunei Darussalam:" + Catalog.GetString("Brunei Darussalam") + ":" + "BRN",
+		"Asia:" + "Cambodia, Kingdom of:" + Catalog.GetString("Cambodia, Kingdom of") + ":" + "KHM",
+		"Asia:" + "China, People's Republic of:" + Catalog.GetString("China, People's Republic of") + ":" + "CHN",
+		"Asia:" + "Christmas Island:" + Catalog.GetString("Christmas Island") + ":" + "CXR",
+		"Asia:" + "Cocos (Keeling) Islands:" + Catalog.GetString("Cocos (Keeling) Islands") + ":" + "CCK",
+		"Asia:" + "Cyprus, Republic of:" + Catalog.GetString("Cyprus, Republic of") + ":" + "CYP",
+		"Asia:" + "Georgia:" + Catalog.GetString("Georgia") + ":" + "GEO",
+		"Asia:" + "Hong Kong, Special Administrative Region of China:" + Catalog.GetString("Hong Kong, Special Administrative Region of China") + ":" + "HKG",
+		"Asia:" + "India, Republic of:" + Catalog.GetString("India, Republic of") + ":" + "IND",
+		"Asia:" + "Indonesia, Republic of:" + Catalog.GetString("Indonesia, Republic of") + ":" + "IDN",
+		"Asia:" + "Iran, Islamic Republic of:" + Catalog.GetString("Iran, Islamic Republic of") + ":" + "IRN",
+		"Asia:" + "Iraq, Republic of:" + Catalog.GetString("Iraq, Republic of") + ":" + "IRQ",
+		"Asia:" + "Israel, State of:" + Catalog.GetString("Israel, State of") + ":" + "ISR",
+		"Asia:" + "Japan:" + Catalog.GetString("Japan") + ":" + "JPN",
+		"Asia:" + "Jordan, Hashemite Kingdom of:" + Catalog.GetString("Jordan, Hashemite Kingdom of") + ":" + "JOR",
+		"Asia:" + "Kazakhstan, Republic of:" + Catalog.GetString("Kazakhstan, Republic of") + ":" + "KAZ",
+		"Asia:" + "Korea, Democratic People's Republic of:" + Catalog.GetString("Korea, Democratic People's Republic of") + ":" + "PRK",
+		"Asia:" + "Korea, Republic of:" + Catalog.GetString("Korea, Republic of") + ":" + "KOR",
+		"Asia:" + "Kuwait, State of:" + Catalog.GetString("Kuwait, State of") + ":" + "KWT",
+		"Asia:" + "Kyrgyz Republic:" + Catalog.GetString("Kyrgyz Republic") + ":" + "KGZ",
+		"Asia:" + "Lao People's Democratic Republic:" + Catalog.GetString("Lao People's Democratic Republic") + ":" + "LAO",
+		"Asia:" + "Lebanon, Lebanese Republic:" + Catalog.GetString("Lebanon, Lebanese Republic") + ":" + "LBN",
+		"Asia:" + "Macao, Special Administrative Region of China:" + Catalog.GetString("Macao, Special Administrative Region of China") + ":" + "MAC",
+		"Asia:" + "Malaysia:" + Catalog.GetString("Malaysia") + ":" + "MYS",
+		"Asia:" + "Maldives, Republic of:" + Catalog.GetString("Maldives, Republic of") + ":" + "MDV",
+		"Asia:" + "Mongolia:" + Catalog.GetString("Mongolia") + ":" + "MNG",
+		"Asia:" + "Myanmar, Union of:" + Catalog.GetString("Myanmar, Union of") + ":" + "MMR",
+		"Asia:" + "Nepal, State of:" + Catalog.GetString("Nepal, State of") + ":" + "NPL",
+		"Asia:" + "Oman, Sultanate of:" + Catalog.GetString("Oman, Sultanate of") + ":" + "OMN",
+		"Asia:" + "Pakistan, Islamic Republic of:" + Catalog.GetString("Pakistan, Islamic Republic of") + ":" + "PAK",
+		"Asia:" + "Palestinian Territory, Occupied:" + Catalog.GetString("Palestinian Territory, Occupied") + ":" + "PSE",
+		"Asia:" + "Philippines, Republic of the:" + Catalog.GetString("Philippines, Republic of the") + ":" + "PHL",
+		"Asia:" + "Qatar, State of:" + Catalog.GetString("Qatar, State of") + ":" + "QAT",
+		"Asia:" + "Saudi Arabia, Kingdom of:" + Catalog.GetString("Saudi Arabia, Kingdom of") + ":" + "SAU",
+		"Asia:" + "Singapore, Republic of:" + Catalog.GetString("Singapore, Republic of") + ":" + "SGP",
+		"Asia:" + "Sri Lanka, Democratic Socialist Republic of:" + Catalog.GetString("Sri Lanka, Democratic Socialist Republic of") + ":" + "LKA",
+		"Asia:" + "Syrian Arab Republic:" + Catalog.GetString("Syrian Arab Republic") + ":" + "SYR",
+		"Asia:" + "Taiwan:" + Catalog.GetString("Taiwan") + ":" + "TWN",
+		"Asia:" + "Tajikistan, Republic of:" + Catalog.GetString("Tajikistan, Republic of") + ":" + "TJK",
+		"Asia:" + "Thailand, Kingdom of:" + Catalog.GetString("Thailand, Kingdom of") + ":" + "THA",
+		"Asia:" + "Timor-Leste, Democratic Republic of:" + Catalog.GetString("Timor-Leste, Democratic Republic of") + ":" + "TLS",
+		"Asia:" + "Turkey, Republic of:" + Catalog.GetString("Turkey, Republic of") + ":" + "TUR",
+		"Asia:" + "Turkmenistan:" + Catalog.GetString("Turkmenistan") + ":" + "TKM",
+		"Asia:" + "United Arab Emirates:" + Catalog.GetString("United Arab Emirates") + ":" + "ARE",
+		"Asia:" + "Uzbekistan, Republic of:" + Catalog.GetString("Uzbekistan, Republic of") + ":" + "UZB",
+		"Asia:" + "Vietnam, Socialist Republic of:" + Catalog.GetString("Vietnam, Socialist Republic of") + ":" + "VNM",
+		"Asia:" + "Yemen:" + Catalog.GetString("Yemen") + ":" + "YEM",
+		"Europe:" + "Ãland Islands:" + Catalog.GetString("Ãland Islands") + ":" + "ALA",
+		"Europe:" + "Albania, Republic of:" + Catalog.GetString("Albania, Republic of") + ":" + "ALB",
+		"Europe:" + "Andorra, Principality of:" + Catalog.GetString("Andorra, Principality of") + ":" + "AND",
+		"Europe:" + "Austria, Republic of:" + Catalog.GetString("Austria, Republic of") + ":" + "AUT",
+		"Europe:" + "Belarus, Republic of:" + Catalog.GetString("Belarus, Republic of") + ":" + "BLR",
+		"Europe:" + "Belgium, Kingdom of:" + Catalog.GetString("Belgium, Kingdom of") + ":" + "BEL",
+		"Europe:" + "Bosnia and Herzegovina:" + Catalog.GetString("Bosnia and Herzegovina") + ":" + "BIH",
+		"Europe:" + "Bulgaria, Republic of:" + Catalog.GetString("Bulgaria, Republic of") + ":" + "BGR",
+		"Europe:" + "Croatia, Republic of:" + Catalog.GetString("Croatia, Republic of") + ":" + "HRV",
+		"Europe:" + "Czech Republic:" + Catalog.GetString("Czech Republic") + ":" + "CZE",
+		"Europe:" + "Denmark, Kingdom of:" + Catalog.GetString("Denmark, Kingdom of") + ":" + "DNK",
+		"Europe:" + "Estonia, Republic of:" + Catalog.GetString("Estonia, Republic of") + ":" + "EST",
+		"Europe:" + "Faroe Islands:" + Catalog.GetString("Faroe Islands") + ":" + "FRO",
+		"Europe:" + "Finland, Republic of:" + Catalog.GetString("Finland, Republic of") + ":" + "FIN",
+		"Europe:" + "France, French Republic:" + Catalog.GetString("France, French Republic") + ":" + "FRA",
+		"Europe:" + "Germany, Federal Republic of:" + Catalog.GetString("Germany, Federal Republic of") + ":" + "DEU",
+		"Europe:" + "Gibraltar:" + Catalog.GetString("Gibraltar") + ":" + "GIB",
+		"Europe:" + "Greece, Hellenic Republic:" + Catalog.GetString("Greece, Hellenic Republic") + ":" + "GRC",
+		"Europe:" + "Guernsey, Bailiwick of:" + Catalog.GetString("Guernsey, Bailiwick of") + ":" + "GGY",
+		"Europe:" + "Holy See (Vatican City State):" + Catalog.GetString("Holy See (Vatican City State)") + ":" + "VAT",
+		"Europe:" + "Hungary, Republic of:" + Catalog.GetString("Hungary, Republic of") + ":" + "HUN",
+		"Europe:" + "Iceland, Republic of:" + Catalog.GetString("Iceland, Republic of") + ":" + "ISL",
+		"Europe:" + "Ireland:" + Catalog.GetString("Ireland") + ":" + "IRL",
+		"Europe:" + "Isle of Man:" + Catalog.GetString("Isle of Man") + ":" + "IMN",
+		"Europe:" + "Italy, Italian Republic:" + Catalog.GetString("Italy, Italian Republic") + ":" + "ITA",
+		"Europe:" + "Jersey, Bailiwick of:" + Catalog.GetString("Jersey, Bailiwick of") + ":" + "JEY",
+		"Europe:" + "Latvia, Republic of:" + Catalog.GetString("Latvia, Republic of") + ":" + "LVA",
+		"Europe:" + "Liechtenstein, Principality of:" + Catalog.GetString("Liechtenstein, Principality of") + ":" + "LIE",
+		"Europe:" + "Lithuania, Republic of:" + Catalog.GetString("Lithuania, Republic of") + ":" + "LTU",
+		"Europe:" + "Luxembourg, Grand Duchy of:" + Catalog.GetString("Luxembourg, Grand Duchy of") + ":" + "LUX",
+		"Europe:" + "Macedonia, the former Yugoslav Republic of:" + Catalog.GetString("Macedonia, the former Yugoslav Republic of") + ":" + "MKD",
+		"Europe:" + "Malta, Republic of:" + Catalog.GetString("Malta, Republic of") + ":" + "MLT",
+		"Europe:" + "Moldova, Republic of:" + Catalog.GetString("Moldova, Republic of") + ":" + "MDA",
+		"Europe:" + "Monaco, Principality of:" + Catalog.GetString("Monaco, Principality of") + ":" + "MCO",
+		"Europe:" + "Montenegro, Republic of:" + Catalog.GetString("Montenegro, Republic of") + ":" + "MNE",
+		"Europe:" + "Netherlands, Kingdom of the:" + Catalog.GetString("Netherlands, Kingdom of the") + ":" + "NLD",
+		"Europe:" + "Norway, Kingdom of:" + Catalog.GetString("Norway, Kingdom of") + ":" + "NOR",
+		"Europe:" + "Poland, Republic of:" + Catalog.GetString("Poland, Republic of") + ":" + "POL",
+		"Europe:" + "Portugal, Portuguese Republic:" + Catalog.GetString("Portugal, Portuguese Republic") + ":" + "PRT",
+		"Europe:" + "Romania:" + Catalog.GetString("Romania") + ":" + "ROU",
+		"Europe:" + "Russian Federation:" + Catalog.GetString("Russian Federation") + ":" + "RUS",
+		"Europe:" + "San Marino, Republic of:" + Catalog.GetString("San Marino, Republic of") + ":" + "SMR",
+		"Europe:" + "Serbia, Republic of:" + Catalog.GetString("Serbia, Republic of") + ":" + "SRB",
+		"Europe:" + "Slovakia (Slovak Republic):" + Catalog.GetString("Slovakia (Slovak Republic)") + ":" + "SVK",
+		"Europe:" + "Slovenia, Republic of:" + Catalog.GetString("Slovenia, Republic of") + ":" + "SVN",
+		"Europe:" + "Spain, Kingdom of:" + Catalog.GetString("Spain, Kingdom of") + ":" + "ESP",
+		"Europe:" + "Svalbard & Jan Mayen Islands:" + Catalog.GetString("Svalbard & Jan Mayen Islands") + ":" + "SJM",
+		"Europe:" + "Sweden, Kingdom of:" + Catalog.GetString("Sweden, Kingdom of") + ":" + "SWE",
+		"Europe:" + "Switzerland, Swiss Confederation:" + Catalog.GetString("Switzerland, Swiss Confederation") + ":" + "CHE",
+		"Europe:" + "Ukraine:" + Catalog.GetString("Ukraine") + ":" + "UKR",
+		"Europe:" + "United Kingdom of Great Britain & Northern Ireland:" + Catalog.GetString("United Kingdom of Great Britain & Northern Ireland") + ":" + "GBR",
+		"North America:" + "Anguilla:" + Catalog.GetString("Anguilla") + ":" + "AIA",
+		"North America:" + "Antigua and Barbuda:" + Catalog.GetString("Antigua and Barbuda") + ":" + "ATG",
+		"North America:" + "Aruba:" + Catalog.GetString("Aruba") + ":" + "ABW",
+		"North America:" + "Bahamas, Commonwealth of the:" + Catalog.GetString("Bahamas, Commonwealth of the") + ":" + "BHS",
+		"North America:" + "Barbados:" + Catalog.GetString("Barbados") + ":" + "BRB",
+		"North America:" + "Belize:" + Catalog.GetString("Belize") + ":" + "BLZ",
+		"North America:" + "Bermuda:" + Catalog.GetString("Bermuda") + ":" + "BMU",
+		"North America:" + "British Virgin Islands:" + Catalog.GetString("British Virgin Islands") + ":" + "VGB",
+		"North America:" + "Canada:" + Catalog.GetString("Canada") + ":" + "CAN",
+		"North America:" + "Cayman Islands:" + Catalog.GetString("Cayman Islands") + ":" + "CYM",
+		"North America:" + "Costa Rica, Republic of:" + Catalog.GetString("Costa Rica, Republic of") + ":" + "CRI",
+		"North America:" + "Cuba, Republic of:" + Catalog.GetString("Cuba, Republic of") + ":" + "CUB",
+		"North America:" + "Dominica, Commonwealth of:" + Catalog.GetString("Dominica, Commonwealth of") + ":" + "DMA",
+		"North America:" + "Dominican Republic:" + Catalog.GetString("Dominican Republic") + ":" + "DOM",
+		"North America:" + "El Salvador, Republic of:" + Catalog.GetString("El Salvador, Republic of") + ":" + "SLV",
+		"North America:" + "Greenland:" + Catalog.GetString("Greenland") + ":" + "GRL",
+		"North America:" + "Grenada:" + Catalog.GetString("Grenada") + ":" + "GRD",
+		"North America:" + "Guadeloupe:" + Catalog.GetString("Guadeloupe") + ":" + "GLP",
+		"North America:" + "Guatemala, Republic of:" + Catalog.GetString("Guatemala, Republic of") + ":" + "GTM",
+		"North America:" + "Haiti, Republic of:" + Catalog.GetString("Haiti, Republic of") + ":" + "HTI",
+		"North America:" + "Honduras, Republic of:" + Catalog.GetString("Honduras, Republic of") + ":" + "HND",
+		"North America:" + "Jamaica:" + Catalog.GetString("Jamaica") + ":" + "JAM",
+		"North America:" + "Martinique:" + Catalog.GetString("Martinique") + ":" + "MTQ",
+		"North America:" + "Mexico, United Mexican States:" + Catalog.GetString("Mexico, United Mexican States") + ":" + "MEX",
+		"North America:" + "Montserrat:" + Catalog.GetString("Montserrat") + ":" + "MSR",
+		"North America:" + "Netherlands Antilles:" + Catalog.GetString("Netherlands Antilles") + ":" + "ANT",
+		"North America:" + "Nicaragua, Republic of:" + Catalog.GetString("Nicaragua, Republic of") + ":" + "NIC",
+		"North America:" + "Panama, Republic of:" + Catalog.GetString("Panama, Republic of") + ":" + "PAN",
+		"North America:" + "Puerto Rico, Commonwealth of:" + Catalog.GetString("Puerto Rico, Commonwealth of") + ":" + "PRI",
+		"North America:" + "Saint Barthelemy:" + Catalog.GetString("Saint Barthelemy") + ":" + "BLM",
+		"North America:" + "Saint Kitts and Nevis, Federation of:" + Catalog.GetString("Saint Kitts and Nevis, Federation of") + ":" + "KNA",
+		"North America:" + "Saint Lucia:" + Catalog.GetString("Saint Lucia") + ":" + "LCA",
+		"North America:" + "Saint Martin:" + Catalog.GetString("Saint Martin") + ":" + "MAF",
+		"North America:" + "Saint Pierre and Miquelon:" + Catalog.GetString("Saint Pierre and Miquelon") + ":" + "SPM",
+		"North America:" + "Saint Vincent and the Grenadines:" + Catalog.GetString("Saint Vincent and the Grenadines") + ":" + "VCT",
+		"North America:" + "Trinidad and Tobago, Republic of:" + Catalog.GetString("Trinidad and Tobago, Republic of") + ":" + "TTO",
+		"North America:" + "Turks and Caicos Islands:" + Catalog.GetString("Turks and Caicos Islands") + ":" + "TCA",
+		"North America:" + "United States of America:" + Catalog.GetString("United States of America") + ":" + "USA",
+		"North America:" + "United States Virgin Islands:" + Catalog.GetString("United States Virgin Islands") + ":" + "VIR",
+		"Oceania:" + "American Samoa:" + Catalog.GetString("American Samoa") + ":" + "ASM",
+		"Oceania:" + "Australia, Commonwealth of:" + Catalog.GetString("Australia, Commonwealth of") + ":" + "AUS",
+		"Oceania:" + "Cook Islands:" + Catalog.GetString("Cook Islands") + ":" + "COK",
+		"Oceania:" + "Fiji, Republic of the Fiji Islands:" + Catalog.GetString("Fiji, Republic of the Fiji Islands") + ":" + "FJI",
+		"Oceania:" + "French Polynesia:" + Catalog.GetString("French Polynesia") + ":" + "PYF",
+		"Oceania:" + "Guam:" + Catalog.GetString("Guam") + ":" + "GUM",
+		"Oceania:" + "Kiribati, Republic of:" + Catalog.GetString("Kiribati, Republic of") + ":" + "KIR",
+		"Oceania:" + "Marshall Islands, Republic of the:" + Catalog.GetString("Marshall Islands, Republic of the") + ":" + "MHL",
+		"Oceania:" + "Micronesia, Federated States of:" + Catalog.GetString("Micronesia, Federated States of") + ":" + "FSM",
+		"Oceania:" + "Nauru, Republic of:" + Catalog.GetString("Nauru, Republic of") + ":" + "NRU",
+		"Oceania:" + "New Caledonia:" + Catalog.GetString("New Caledonia") + ":" + "NCL",
+		"Oceania:" + "New Zealand:" + Catalog.GetString("New Zealand") + ":" + "NZL",
+		"Oceania:" + "Niue:" + Catalog.GetString("Niue") + ":" + "NIU",
+		"Oceania:" + "Norfolk Island:" + Catalog.GetString("Norfolk Island") + ":" + "NFK",
+		"Oceania:" + "Northern Mariana Islands, Commonwealth of the:" + Catalog.GetString("Northern Mariana Islands, Commonwealth of the") + ":" + "MNP",
+		"Oceania:" + "Palau, Republic of:" + Catalog.GetString("Palau, Republic of") + ":" + "PLW",
+		"Oceania:" + "Papua New Guinea, Independent State of:" + Catalog.GetString("Papua New Guinea, Independent State of") + ":" + "PNG",
+		"Oceania:" + "Pitcairn Islands:" + Catalog.GetString("Pitcairn Islands") + ":" + "PCN",
+		"Oceania:" + "Samoa, Independent State of:" + Catalog.GetString("Samoa, Independent State of") + ":" + "WSM",
+		"Oceania:" + "Solomon Islands:" + Catalog.GetString("Solomon Islands") + ":" + "SLB",
+		"Oceania:" + "Tokelau:" + Catalog.GetString("Tokelau") + ":" + "TKL",
+		"Oceania:" + "Tonga, Kingdom of:" + Catalog.GetString("Tonga, Kingdom of") + ":" + "TON",
+		"Oceania:" + "Tuvalu:" + Catalog.GetString("Tuvalu") + ":" + "TUV",
+		"Oceania:" + "United States Minor Outlying Islands:" + Catalog.GetString("United States Minor Outlying Islands") + ":" + "UMI",
+		"Oceania:" + "Vanuatu, Republic of:" + Catalog.GetString("Vanuatu, Republic of") + ":" + "VUT",
+		"Oceania:" + "Wallis and Futuna:" + Catalog.GetString("Wallis and Futuna") + ":" + "WLF",
+		"South America:" + "Argentina, Argentine Republic:" + Catalog.GetString("Argentina, Argentine Republic") + ":" + "ARG",
+		"South America:" + "Bolivia, Republic of:" + Catalog.GetString("Bolivia, Republic of") + ":" + "BOL",
+		"South America:" + "Brazil, Federative Republic of:" + Catalog.GetString("Brazil, Federative Republic of") + ":" + "BRA",
+		"South America:" + "Chile, Republic of:" + Catalog.GetString("Chile, Republic of") + ":" + "CHL",
+		"South America:" + "Colombia, Republic of:" + Catalog.GetString("Colombia, Republic of") + ":" + "COL",
+		"South America:" + "Ecuador, Republic of:" + Catalog.GetString("Ecuador, Republic of") + ":" + "ECU",
+		"South America:" + "Falkland Islands (Malvinas):" + Catalog.GetString("Falkland Islands (Malvinas)") + ":" + "FLK",
+		"South America:" + "French Guiana:" + Catalog.GetString("French Guiana") + ":" + "GUF",
+		"South America:" + "Guyana, Co-operative Republic of:" + Catalog.GetString("Guyana, Co-operative Republic of") + ":" + "GUY",
+		"South America:" + "Paraguay, Republic of:" + Catalog.GetString("Paraguay, Republic of") + ":" + "PRY",
+		"South America:" + "Peru, Republic of:" + Catalog.GetString("Peru, Republic of") + ":" + "PER",
+		"South America:" + "Uruguay, Eastern Republic of:" + Catalog.GetString("Uruguay, Eastern Republic of") + ":" + "URY",
+		"South America:" + "Venezuela, Bolivarian Republic of:" + Catalog.GetString("Venezuela, Bolivarian Republic of") + ":" + "VEN",
+		//add ALWAYS below
+	};
+
+	//dumb variables to translate countries
+	private static string ctr1 = Catalog.GetString("Africa");
+	private static string ctr2 = Catalog.GetString("Antarctica");
+	private static string ctr3 = Catalog.GetString("Asia");
+	private static string ctr4 = Catalog.GetString("Europe");
+	private static string ctr5 = Catalog.GetString("North America");
+	private static string ctr6 = Catalog.GetString("Oceania");
+	private static string ctr7 = Catalog.GetString("South America");
+	/* howto countryList 
+
+	   used this list:
+	http://en.wikipedia.org/wiki/List_of_countries_by_continent_(data_file)
+
+	with vim:
+	1 selected all
+	2 substitution
+
+	:'<,'>s/\(..\) \(..\) \(...\) \(...\) \(.*$\)/\1:\5:\3
+	eg.     from:   AF AO AGO 024 Angola, Republic of
+        	to:     AF:Angola, Republic of:AGO
+
+	3 !sort
+
+	4
+	:%s/AF:/Africa:
+	:%s/AN:/Antarctica:
+	:%s/AS:/Asia:
+	:%s/EU:/Europe:
+	:%s/OC:/Oceania:
+	:%s/NA:/North America:
+	:%s/SA:/South America:
+
+	5 convert to usable by chronojump
+	:%s/\([^:]*\):\([^:]*\):\([^:]*\)/"\1:" + "\2:" + Catalog.GetString("\2") + ":" + "\3"
+
+	6 fix bad chars
+	:%s/'/\\'/g (this doesn't work)
+	solved, on insertion instead of doing:
+		'" + code + "'
+	we use:
+		\"" + code + "\" 
+
+	
+	*/
+
+}

Modified: trunk/src/sqlite/jumpRj.cs
==============================================================================
--- trunk/src/sqlite/jumpRj.cs	(original)
+++ trunk/src/sqlite/jumpRj.cs	Sun Jun  8 17:59:17 2008
@@ -87,7 +87,7 @@
 		return myLast;
 	}
 
-	public static string[] SelectJumps(int sessionID, int personID, string filterWeight) 
+	public new static string[] SelectJumps(int sessionID, int personID, string filterWeight) 
 	{
 		string filterPersonString = "";
 		if(personID != -1)

Modified: trunk/src/sqlite/main.cs
==============================================================================
--- trunk/src/sqlite/main.cs	(original)
+++ trunk/src/sqlite/main.cs	Sun Jun  8 17:59:17 2008
@@ -47,8 +47,12 @@
 
 	static string connectionString = "version = 3; Data source = " + sqlFile;
 
-	//for conversion
-	static string currentVersion = "";
+	//for db creation
+	static int creationRate;
+	static int creationTotal;
+
+	//for db conversion
+	static string currentVersion = "0";
 	static int conversionRate;
 	static int conversionRateTotal;
 	static int conversionSubRate;
@@ -225,13 +229,28 @@
 
 	}
 
-	public static string PrintConversionRate() {
+	//for splashWin text
+	public static string PrintConversionText() {
 		double toReach = Convert.ToDouble(lastChronojumpDatabaseVersion);
 		return currentVersion + "/" + toReach.ToString() + " " +
 			conversionRate.ToString() + "/" + conversionRateTotal.ToString() + " " +
 			conversionSubRate.ToString() + "/" + conversionSubRateTotal.ToString() + " ";
 	}
 
+	//for splashWin progressbars
+	public static double PrintCreation() {
+		return Util.DivideSafe(creationRate, creationTotal);
+	}
+	public static double PrintConversionVersion() {
+		return Util.DivideSafe(Convert.ToDouble(currentVersion), Convert.ToDouble(lastChronojumpDatabaseVersion));
+	}
+	public static double PrintConversionRate() {
+		return Util.DivideSafe(conversionRate, conversionRateTotal);
+	}
+	public static double PrintConversionSubRate() {
+		return Util.DivideSafe(conversionSubRate, conversionSubRateTotal);
+	}
+
 	public static bool ConvertToLastChronojumpDBVersion() {
 
 		//if(checkIfIsSqlite2())
@@ -458,7 +477,7 @@
 				arrayAngleAndSimulated.Add("-1"); //angle
 				arrayAngleAndSimulated.Add("-1"); //simulated
 
-				conversionRateTotal = 7;
+				conversionRateTotal = 8;
 				conversionRate = 1;
 				convertTables(new SqliteJump(), Constants.JumpTable, 9, arrayAngleAndSimulated);
 				conversionRate ++;
@@ -481,10 +500,14 @@
 				//SqliteRun.intervalCreateTable(Constants.TempRunIntervalTable);
 				sqliteRunIntervalObject.createTable(Constants.TempRunIntervalTable);
 
+				conversionRate ++;
+				SqliteCountry.createTable();
+				SqliteCountry.initialize();
+
 				SqlitePreferences.Update ("databaseVersion", "0.57", true); 
 				dbcon.Close();
 				
-				Log.WriteLine("Added simulated column to each event table on client");
+				Log.WriteLine("Added simulated column to each event table on client. Added country");
 				currentVersion = "0.57";
 			}
 		}
@@ -514,11 +537,14 @@
 	{
 		dbcon.Open();
 
+		creationTotal = 12;
+		creationRate = 1;
 		SqlitePerson.createTable(Constants.PersonTable);
 
 		//graphLinkTable
 		SqliteEvent.createGraphLinkTable();
-	
+		creationRate ++;
+		
 		//jumps
 		SqliteJump sqliteJumpObject = new SqliteJump();
 		SqliteJumpRj sqliteJumpRjObject = new SqliteJumpRj();
@@ -530,12 +556,14 @@
 		sqliteJumpRjObject.createTable(Constants.TempJumpRjTable);
 
 		//jump Types
+		creationRate ++;
 		SqliteJumpType.createTableJumpType();
 		SqliteJumpType.createTableJumpRjType();
 		SqliteJumpType.initializeTableJumpType();
 		SqliteJumpType.initializeTableJumpRjType();
 		
 		//runs
+		creationRate ++;
 		SqliteRun sqliteRunObject = new SqliteRun();
 		SqliteRunInterval sqliteRunIntervalObject = new SqliteRunInterval();
 		//SqliteRun.createTable(Constants.RunTable);
@@ -546,37 +574,48 @@
 		sqliteRunIntervalObject.createTable(Constants.TempRunIntervalTable);
 		
 		//run Types
+		creationRate ++;
 		SqliteRunType.createTableRunType();
 		SqliteRunType.createTableRunIntervalType();
 		SqliteRunType.initializeTableRunType();
 		SqliteRunType.initializeTableRunIntervalType();
 		
 		//reactionTimes
+		creationRate ++;
 		SqliteReactionTime sqliteReactionTimeObject = new SqliteReactionTime();
 		sqliteReactionTimeObject.createTable(Constants.ReactionTimeTable);
 		
 		//pulses and pulseTypes
+		creationRate ++;
 		SqlitePulse sqlitePulseObject = new SqlitePulse();
 		sqlitePulseObject.createTable(Constants.PulseTable);
 		SqlitePulseType.createTablePulseType();
 		SqlitePulseType.initializeTablePulseType();
 	
 		//sports
+		creationRate ++;
 		SqliteSport.createTable();
 		SqliteSport.initialize();
 		SqliteSpeciallity.createTable();
 		SqliteSpeciallity.initialize();
 		SqliteSpeciallity.InsertUndefined(true);
 
+		creationRate ++;
 		SqliteSession.createTable(Constants.SessionTable);
 		
+		creationRate ++;
 		SqlitePersonSession.createTable();
 		
+		creationRate ++;
 		SqlitePreferences.createTable();
 		SqlitePreferences.initializeTable(lastChronojumpDatabaseVersion);
 		
+		creationRate ++;
+		SqliteCountry.createTable();
+		SqliteCountry.initialize();
+		
 		//changes [from - to - desc]
-		//0.56 - 0.57 Added simulated column to each event table on client
+		//0.56 - 0.57 Added simulated column to each event table on client. Added country
 		//0.55 - 0.56 Added session default sport stuff into session table
 		//0.54 - 0.55 Added undefined to speciallity table
 		//0.53 - 0.54 created sport tables. Added sport data, speciallity and level of practice to person table
@@ -596,6 +635,7 @@
 		
 
 		dbcon.Close();
+		creationRate ++;
 	}
 
 	public static bool Exists(string tableName, string findName)

Modified: trunk/src/sqlite/person.cs
==============================================================================
--- trunk/src/sqlite/person.cs	(original)
+++ trunk/src/sqlite/person.cs	Sun Jun  8 17:59:17 2008
@@ -33,7 +33,8 @@
 {
 	//can be "Constants.PersonTable" or "Constants.ConvertTempTable"
 	//temp is used to modify table between different database versions if needed
-	protected internal static void createTable(string tableName)
+	protected new internal static void createTable(string tableName)
+	//protected override void createTable(string tableName)
 	 {
 		dbcmd.CommandText = 
 			"CREATE TABLE " + tableName + " ( " +

Modified: trunk/src/sqlite/runInterval.cs
==============================================================================
--- trunk/src/sqlite/runInterval.cs	(original)
+++ trunk/src/sqlite/runInterval.cs	Sun Jun  8 17:59:17 2008
@@ -82,7 +82,7 @@
 		return myLast;
 	}
 
-	public static string[] SelectAllRuns(int sessionID) 
+	public new static string[] SelectAllRuns(int sessionID) 
 	{
 		dbcon.Open();
 		dbcmd.CommandText = "SELECT person.name, runInterval.* " +

Modified: trunk/src/sqlite/session.cs
==============================================================================
--- trunk/src/sqlite/session.cs	(original)
+++ trunk/src/sqlite/session.cs	Sun Jun  8 17:59:17 2008
@@ -34,7 +34,8 @@
 {
 	//can be "Constants.SessionTable" or "Constants.ConvertTempTable"
 	//temp is used to modify table between different database versions if needed
-	protected internal static void createTable(string tableName)
+	protected new internal static void createTable(string tableName)
+	//protected override void createTable(string tableName)
 	{
 		dbcmd.CommandText = 
 			"CREATE TABLE " + tableName + " ( " +

Modified: trunk/src/util.cs
==============================================================================
--- trunk/src/util.cs	(original)
+++ trunk/src/util.cs	Sun Jun  8 17:59:17 2008
@@ -834,4 +834,14 @@
 
 		return foundLevelName;
 	}
+
+	//avoids fivide by zero
+	public static double DivideSafe (double val1, double val2) {
+		double result = val1 / val2;
+		if(result > 1)
+			result = 1;
+		else if(result < 0)
+			result = 0;
+		return result;
+	}
 }

Modified: trunk/version.txt
==============================================================================
--- trunk/version.txt	(original)
+++ trunk/version.txt	Sun Jun  8 17:59:17 2008
@@ -1 +1 @@
-0.7.3
+0.7.3.1
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]