support for third panel

diff --git a/Readme.txt b/Readme.txt
index 26b94162478e4805c62ae07bc0747023071ca6c0..edf36dae6138c37c4e579e0491840971cdf1bda6 100644 (file)
--- a/Readme.txt
+++ b/Readme.txt
@@ -2,8 +2,8 @@
  ComingNext & Coming Next B for N97\r
 ------------------------------------\r
 This widget was originally created by Dr. Cochambre and was extended by \r
-Michael Prager <X_X_L@gmx.net>. It will display the next 8 upcoming events \r
-on your N97 homescreen. It consists of two seperate widgets, each displaying\r
+Michael Prager <X_X_L@gmx.net>. It will display the next 12 upcoming events \r
+on your N97 homescreen. It consists of tree seperate widgets, each displaying\r
 4 events.\r
 \r
 For more info or to report bugs, please refere to \r
@@ -184,3 +184,4 @@ Changelog:
 1.26 () by Michael Prager\r
   - fixed second panel showing the same events as the first panel\r
   - mark overdue ToDo events (this feature can be disabled in the settings)\r
+  - support for 3 panels\r

diff --git a/build.pl b/build.pl
index 467b71a81ee7009bc43a625994891f81a51e1a6f..162e61915f50f063f0b1d7d25d52cf74ffe4a7b2 100644 (file)
--- a/build.pl
+++ b/build.pl
@@ -13,6 +13,7 @@ use Archive::Zip qw( :ERROR_CODES );
 unlink <*.wgz>;\r
 unlink <*.zip>;\r
 rmtree("ComingNextB");\r
+rmtree("ComingNextC");\r
 \r
 # update version info\r
 sed("comingNext/index.html", 'var version = \"(.*?)\";', 'var version = \"'.$version.'\";');\r
@@ -25,6 +26,12 @@ sed("comingNextB/index.html", 'var panelNum = 0;', 'var panelNum = 1;');
 sed("comingNextB/Info.plist", '<key>DisplayName<\/key>(\s*?)<string>Coming Next (.*?)<\/string>', '<key>DisplayName<\/key>$1<string>Coming Next B $2<\/string>');\r
 sed("comingNextB/Info.plist", '<key>Identifier<\/key>(\s*?)<string>(.*?)<\/string>', '<key>Identifier<\/key>$1<string>$2b<\/string>');\r
 \r
+# add additional widget\r
+copyrecursive("comingNext", "comingNextC");\r
+sed("comingNextC/index.html", 'var panelNum = 0;', 'var panelNum = 2;');\r
+sed("comingNextC/Info.plist", '<key>DisplayName<\/key>(\s*?)<string>Coming Next (.*?)<\/string>', '<key>DisplayName<\/key>$1<string>Coming Next C $2<\/string>');\r
+sed("comingNextC/Info.plist", '<key>Identifier<\/key>(\s*?)<string>(.*?)<\/string>', '<key>Identifier<\/key>$1<string>$2c<\/string>');\r
+\r
 # package release\r
 my $zip = Archive::Zip->new();\r
 $zip->addTree("ComingNext", "ComingNext");\r
@@ -34,9 +41,14 @@ $zip = Archive::Zip->new();
 $zip->addTree("ComingNextB", "ComingNextB");\r
 $zip->writeToFileNamed("comingNextB.wgz");\r
 \r
+$zip = Archive::Zip->new();\r
+$zip->addTree("ComingNextC", "ComingNextC");\r
+$zip->writeToFileNamed("comingNextC.wgz");\r
+\r
 $zip = Archive::Zip->new();\r
 $zip->addFile("comingNext.wgz");\r
 $zip->addFile("comingNextB.wgz");\r
+$zip->addFile("comingNextC.wgz");\r
 $zip->addFile("Readme.txt");\r
 $zip->addFile("License.txt");\r
 $zip->addFile("ComingNext_SkinFetcher_v1.1.sisx");\r

diff --git a/comingNext/index.html b/comingNext/index.html
index ce0d15dbdf65b1fe4ee64e3e481336569de0b66b..ad665667916acdcf621703e0baccaad8dd544c52 100644 (file)
--- a/comingNext/index.html
+++ b/comingNext/index.html
@@ -175,7 +175,7 @@ function isToday(date)
 \r
 function collectLocales()\r
 {\r
-       var tmpyear = ((panelNum == 0) ? 2000 : 2001);\r
+       var tmpyear = 2000 + panelNum;\r
        var month = 0;\r
 \r
        if (months_translated.length > 0)\r
@@ -476,7 +476,7 @@ function updateData()
                var eventIds = [];\r
                var max;\r
                if (mode == 0)\r
-                       max = ((panelNum == 0) ? config['eventsPerWidget'].Value : 2 * config['eventsPerWidget'].Value);\r
+                       max = (panelNum + 1) * config['eventsPerWidget'].Value;\r
                else\r
                        max = 30; // we can display a lot more events in fullscreen mode\r
 \r
@@ -578,7 +578,7 @@ function updateData()
                                }\r
 \r
                                // skip events for the first panel in case this is the second one and we're not in fullscreen mode\r
-                               if (mode == 0 && panelNum == 1 && counter < config['eventsPerWidget'].Value + 1) {\r
+                               if (mode == 0 && panelNum > 0 && counter < panelNum * config['eventsPerWidget'].Value + 1) {\r
                                        console.info('skipping (already in first widget) ' + entry.id);\r
                                        continue;\r
                                }\r