v1.1-beta.514

BaseFiles/Common/html/locales/sv.json

@@ -682,19 +682,17 @@
     "configure_widgeteditor_savingjavascript":
         "Saving Javascript...",
     "configure_interfaces_importdriver":
-        "Install Add-ons",        
+        "Install Interface",        
     "configure_interfaces_download":
-        "Download & install",        
+        "Download and install",        
     "configure_interfaces_upload":
-        "Upload & install",        
-    "configure_interfaces_addonslist":
-        "Add-ons list",        
-    "configure_interfaces_installaddons":
-        "Install Add-ons",
+        "Upload and install",        
+    "configure_interfaces_install":
+        "Install Interface",
     "configure_interfaces_downloadfromurl":
-        "Download add-on package from URL",
+        "Download package from URL",
     "configure_interfaces_uploadpackage":
-        "Upload add-on package from file",
+        "Upload package from file",
     "cronwizard_title":
         "Cron event Wizard",      
     "cronwizard_tab_minute":

BaseFiles/Common/html/pages/configure/interfaces/_systemsettings.js

@@ -5,7 +5,7 @@ HG.WebApp.SystemSettings.Interfaces = HG.WebApp.SystemSettings.Interfaces || {};
 HG.WebApp.SystemSettings.InitializePage = function () {
     var page = $('#'+HG.WebApp.SystemSettings.PageId);
     var importPopup = page.find('[data-ui-field=import-popup]');
-    var importButton = page.find('[data-ui-field=interface_import]');
+    var importButton = page.find('[data-ui-field=interface_install]');
     var importForm = page.find('[data-ui-field=import-form]');
     var downloadButton = page.find('[data-ui-field=download-btn]');
     var downloadUrl = page.find('[data-ui-field=download-url]');
@@ -24,7 +24,7 @@ HG.WebApp.SystemSettings.InitializePage = function () {
         });
     });
     page.on('pageshow', function (e) {
-        page.find('[data-ui-field=package_install]').qtip({
+        page.find('[data-locale-id=configure_program_bbaractions]').qtip({
             content: {
                 text: HG.WebApp.Locales.GetLocaleString('configure_system_installtip_description', 'Go to the Package Manager to install additional features.'),
             },
@@ -43,7 +43,9 @@ HG.WebApp.SystemSettings.InitializePage = function () {
         importButton.removeClass('ui-btn-active');
     });
     importButton.on('click', function() {
-        importPopup.popup('open');
+        setTimeout(function(){
+            importPopup.popup('open');
+        }, 500);
     });
     downloadButton.on('click', function() {
         if (downloadUrl.val() == '') {

BaseFiles/Common/html/pages/configure/interfaces/main.html

@@ -23,14 +23,31 @@ <h4 data-locale-id="configure_interfaces_downloadfromurl">Download add-on packag
             </fieldset>
             <h4 data-locale-id="configure_interfaces_uploadpackage">Upload add-on package</h4>
             <fieldset data-role="controlgroup" data-type="vertical" style="border:solid 1px gray;padding:5px;padding-top:0">
-                <form data-ui-field="import-form" target="interface_import_uploadframe" enctype="multipart/form-data" method="post" action="../../api/HomeAutomation.HomeGenie/Config/Interface.Import/" data-ajax="false">
+                <form data-ui-field="import-form" target="interface_install_uploadframe" enctype="multipart/form-data" method="post" action="../../api/HomeAutomation.HomeGenie/Config/Interface.Import/" data-ajax="false">
                     <input data-ui-field="upload-file" type="file" title="Add-on driver from file" name="file" />
                 </form>
                 <a data-ui-field="upload-btn" data-locale-id="configure_interfaces_upload" class="ui-btn ui-shadow ui-corner-all">Upload &amp; install</a>
-                <iframe data-ui-field="upload-frame" name="interface_import_uploadframe" src="blank.html" style="display:none;width:0;height:0;border:0"></iframe>
+                <iframe data-ui-field="upload-frame" name="interface_install_uploadframe" src="blank.html" style="display:none;width:0;height:0;border:0"></iframe>
             </fieldset>
         </div>
     </div> 
+
+    <div id="configure_system_actionmenu" data-role="popup" data-overlay-theme="b">
+        <a href="#" data-rel="back" class="ui-btn ui-corner-all ui-shadow ui-icon-delete ui-btn-icon-notext ui-btn-right">Close</a>
+        <h5 data-locale-id="actions_menu" align="center">Actions Menu</h5>
+        <ul data-role="listview" data-inset="false" style="min-width:210px;">
+            <li>
+                <a data-locale-id="configure_system_packagemanager" data-ui-field="package_install" href="#page_configure_maintenance" class="ui-btn ui-btn-a ui-btn-icon-right ui-icon-fa-download">
+                    Package Manager
+                </a>
+            </li>
+            <li>
+                <a data-locale-id="configure_interfaces_install" data-ui-field="interface_install" data-rel="back" class="ui-btn ui-icon-fa-file-zip-o u ui-btn-icon-right">
+                    Install Interface
+                </a>
+            </li>
+        </ul>
+    </div>
 
     <div data-role="footer" data-position="fixed" data-tap-toggle="false">
         <div data-role="navbar">
@@ -46,11 +63,8 @@ <h4 data-locale-id="configure_interfaces_uploadpackage">Upload add-on package</h
                     </a>
                 </li>
                 <li>
-                    <!--a data-locale-id="configure_interfaces_installaddons" data-ui-field="interface_import" class="ui-btn ui-icon-arrow-u ui-btn-icon-right">
-                        Install Add-ons
-                    </a-->
-                    <a data-locale-id="configure_system_installpackage" data-ui-field="package_install" href="#page_configure_maintenance" class="ui-btn ui-btn-a ui-btn-icon-right ui-icon-fa-download">
-                        Install Package
+                    <a class="ui-btn ui-icon-fa-tasks ui-btn-icon-right" href="#configure_system_actionmenu" data-locale-id="configure_program_bbaractions" data-rel="popup" data-transition="slideup">
+                        Actions
                     </a>
                 </li>
             </ul>

BaseFiles/Common/programs.xml

@@ -3568,7 +3568,6 @@ Program.Run();
 //
 // Allows adding conditional IR code for Lights, Switches and Dimmers.
 // Also let you dim last light using Up/Down button which you can define in configuration
-// Skip Command IR code is designed for disabling the next command and it is useful in case you just want to change the dimmer value.
 // 
 
 var dimmerInterval = Program.Option("DimmerInterval");
@@ -3629,8 +3628,7 @@ Program.GoBackground();</ScriptSource>
     <Name>IR Remote Controller</Name>
     <Description>Control module using an IR remote.
 When you press the assigned remote button, it will toggle the module on/off.
-Also it lets you dim last addressed module using Up/Down button which can be defined through program's configuration options.
-"Skip Command IR code" option is designed for disabling the next command and it's useful when you just want to change the dimmer value.</Description>
+Also it lets you dim last addressed module using Up/Down button which can be defined through program's configuration options.</Description>
     <Group>Lights</Group>
     <Features>
       <ProgramFeature>
@@ -3782,4 +3780,4 @@ When changing the number of zone sensors, program restart is required.</Descript
     <Type>CSharp</Type>
     <IsEnabled>true</IsEnabled>
   </ProgramBlock>
-</ArrayOfProgramBlock>
+</ArrayOfProgramBlock>

HISTORY.TXT

@@ -1,6 +1,6 @@
 RELEASE HISTORY
 
-21/01/2016 v1.1-beta.514
+22/01/2016 v1.1-beta.514
     - Moved LIRC, Insteon, W800RF32, V4LCamera interfaces to package repository
     - Fix C# automation program compile error on mono ARM platforms with locale settings using comma separator for decimals
     - Fix package install error on mono ARM < 4.0.4

HomeGenie/Program.cs

@@ -93,21 +93,6 @@ private static void Console_CancelKeyPress(object sender, ConsoleCancelEventArgs
             Quit(false);
         }
 
-        private static void ShellCommand(string command, string args)
-        {
-            try
-            {
-                var processInfo = new ProcessStartInfo(command, args);
-                processInfo.RedirectStandardOutput = false;
-                processInfo.UseShellExecute = false;
-                processInfo.CreateNoWindow = true;
-                var process = new Process();
-                process.StartInfo = processInfo;
-                process.Start();
-            }
-            catch { }
-        }
-
         private static void UnhandledExceptionTrapper(object sender, UnhandledExceptionEventArgs e) 
         {
             var logEntry = new MigEvent(

HomeGenie/Service/BackupManager.cs

@@ -83,7 +83,11 @@ public void BackupConfiguration(string archiveName)
             Utility.AddFileToZip(archiveName, "release_info.xml");
             // Statistics db
             if (File.Exists(StatisticsLogger.STATISTICS_DB_FILE))
+            {
+                homegenie.Statistics.CloseStatisticsDatabase();
                 Utility.AddFileToZip(archiveName, StatisticsLogger.STATISTICS_DB_FILE);
+                homegenie.Statistics.OpenStatisticsDatabase();
+            }
             // Installed packages
             if (File.Exists(PackageManager.PACKAGE_LIST_FILE))
                 Utility.AddFileToZip(archiveName, PackageManager.PACKAGE_LIST_FILE);

HomeGenie/Service/Logging/StatisticsLogger.cs

@@ -543,7 +543,7 @@ string value
         /// Opens the statistics database.
         /// </summary>
         /// <returns><c>true</c>, if statistics database was opened, <c>false</c> otherwise.</returns>
-        private bool OpenStatisticsDatabase()
+        internal bool OpenStatisticsDatabase()
         {
             bool success = false;
             //lock (dbLock)
@@ -633,7 +633,7 @@ private void CleanOldValuesFromStatisticsDatabase(int numberOfDays)
         /// <summary>
         /// Closes the statistics database.
         /// </summary>
-        private void CloseStatisticsDatabase()
+        internal void CloseStatisticsDatabase()
         {
             //lock (dbLock)
             if (dbConnection != null)

HomeGenie/release_info.xml

@@ -13,5 +13,5 @@
   - Fixed occasional "object reference not set" error when compiling/starting a program
   - Added recursion check to scheduler event expressions
   - Fixed bug in evaluating composite scheduler events using names (@)</ReleaseNote>
-  <ReleaseDate>2016-01-21T15:38:02.0000Z</ReleaseDate>
+  <ReleaseDate>2016-01-22T15:38:02.0000Z</ReleaseDate>
 </ReleaseInfo>

HomeGenie_Linux/Packager/DEBIAN/md5sums

@@ -47,7 +47,7 @@ cb83c6c764e4cce219adfae1b177b27a  usr/local/bin/homegenie/lib/mig/XTenLib.dll
 4b2e8cdefcdd848a1e4293864093ff7d  usr/local/bin/homegenie/lib/mig/v4l/debian64_libCameraCaptureV4L.so
 6d8594a2978b5070055a4c1ad0d460f5  usr/local/bin/homegenie/lib/mig/v4l/debian64_libCameraCaptureV4L.so.gd3
 9fa7c1e2979434e4fd3eeb8fa259184c  usr/local/bin/homegenie/lib/mig/v4l/raspbian_libCameraCaptureV4L.so
-bf285e714ab879ba69ab34d7cde834ed  usr/local/bin/homegenie/lib/mig/MIG.HomeAutomation.dll
+03174ecd705a82f84b5d23badb55d8a4  usr/local/bin/homegenie/lib/mig/MIG.HomeAutomation.dll
 ca71de7a3c556db84be080f0275a4e6d  usr/local/bin/homegenie/lib/mig/MIG.Protocols.dll
 e2f6b564cb161a24fbd82e93352d1c9b  usr/local/bin/homegenie/lib/mig/LibUsbDotNet.dll
 cc6e0a426ae50abf5fb805bd77335c9b  usr/local/bin/homegenie/lib/mig/ZWaveLib.dll
@@ -85,7 +85,7 @@ f7311f3ccc47f6a5b886fcae58dcd54c  usr/local/bin/homegenie/programs/36.dll
 2ac6b7a230154313232d1a8be051ce33  usr/local/bin/homegenie/programs/6.dll
 8efb9babdfbfb500e59f0cc1c10d372c  usr/local/bin/homegenie/programs/16.dll
 6e911e0a393f7d7d6f2de035fa4f883b  usr/local/bin/homegenie/Microsoft.Scripting.Metadata.dll
-35998a3befb4aa751d269e2ef7de5795  usr/local/bin/homegenie/HomeGenie.exe.mdb
+6161ae4d580f438bb1e976310e703ca0  usr/local/bin/homegenie/HomeGenie.exe.mdb
 edb4222ca9b4aa24ff7ad7dc5d63ab89  usr/local/bin/homegenie/NetClientLib.dll.mdb
 198a54b1a3bba2d5300270ea6f1b9cb5  usr/local/bin/homegenie/Common.Logging.dll
 037a39c0e60471e2ad6a155519aabaf8  usr/local/bin/homegenie/Common.dll.mdb
@@ -101,9 +101,9 @@ cb2955458b620dbf5ed454b5ad1bba50  usr/local/bin/homegenie/Raspberry.IO.Component
 d127cd699e15cf5feb4df3cdd34b77df  usr/local/bin/homegenie/Raspberry.IO.InterIntegratedCircuit.dll
 2074c256e8b7a372e28490a436a8e04d  usr/local/bin/homegenie/NLog.dll
 1dcf890d5a0ac7fdcd3db320b629a3ca  usr/local/bin/homegenie/Raspberry.IO.Components.dll.config
-e48dbad8fe226e561413ab343744edcd  usr/local/bin/homegenie/HISTORY.TXT
+77046ce868d05ef71f35e1889ba19453  usr/local/bin/homegenie/HISTORY.TXT
 3435a8ca2eb89ec7fc13a463590121c0  usr/local/bin/homegenie/README.TXT
-dbf14700e99f9ad6fa80b8ca4d980714  usr/local/bin/homegenie/programs.xml
+a197878b0b27c672c8e685f61d5992c0  usr/local/bin/homegenie/programs.xml
 5aadf70b56f0c48ffd8779379241ad61  usr/local/bin/homegenie/modules.xml
 a19a8070a77444aafa96d3fbe033c42e  usr/local/bin/homegenie/IronRuby.Libraries.dll
 456c7d0d3afb06de913ee487f333aadc  usr/local/bin/homegenie/Raspberry.IO.Interop.dll
@@ -952,8 +952,8 @@ ebbefa9357c4ca1f6892a6065da24823  usr/local/bin/homegenie/html/pages/events/_eve
 a76e3bca4fbe34d3dbc2a130c5e3f17f  usr/local/bin/homegenie/html/pages/apps/netplay/_slideshow.js
 110a74cdaba4da7a8dbd471e4e90cc8b  usr/local/bin/homegenie/html/pages/apps/netplay/slideshow.html
 59c62b496ded33ba38f2b2354f792ac3  usr/local/bin/homegenie/html/pages/header.html
-9df49645d62268e1a8f2a78ae562455f  usr/local/bin/homegenie/html/pages/configure/interfaces/main.html
-36d724328d3b14666acf5bdd1ef963f4  usr/local/bin/homegenie/html/pages/configure/interfaces/_systemsettings.js
+5a19b256726b4f196f2c48dbc01ef28f  usr/local/bin/homegenie/html/pages/configure/interfaces/main.html
+8f67a92e4d3dfdc0f4c5ce5b4a21e408  usr/local/bin/homegenie/html/pages/configure/interfaces/_systemsettings.js
 f00365e62e72243aaf12a0ad6c0afe60  usr/local/bin/homegenie/html/pages/configure/interfaces/configlet/zwave.html
 a43823f4e8a7626a9d467ee769e8b19a  usr/local/bin/homegenie/html/pages/configure/interfaces/configlet/x10.html
 d2ec0dc9bfb03fb7b9fe74ffa6045474  usr/local/bin/homegenie/html/pages/configure/interfaces/configlet/upnp.html
@@ -982,25 +982,25 @@ a887fa79784e6721029b8158b4a92c4a  usr/local/bin/homegenie/html/pages/configure/w
 50048e2a8f01a633a34ef20f30798326  usr/local/bin/homegenie/html/locales/sv.lingo.json
 f0ab1246c4369e046013d92764a961b1  usr/local/bin/homegenie/html/locales/pl.lingo.json
 eef54d1c7ce38c6812ea95e194e2484a  usr/local/bin/homegenie/html/locales/en.lingo.json
-2b0d9f5033949ac1c7128cd92c196ff3  usr/local/bin/homegenie/html/locales/nl.json
+c1aafb077ef013adace381502f55ad27  usr/local/bin/homegenie/html/locales/nl.json
 7bba696d2a81a0ce1b579271da91fe55  usr/local/bin/homegenie/html/locales/ru.json
 c1e5548823bcce89f98f81b8f5eff7ef  usr/local/bin/homegenie/html/locales/en.programs.json
 c05766eb6d2a9f2f4ad58dd871daf237  usr/local/bin/homegenie/html/locales/nl.lingo.json
 f200b98dbe6ed17b4385010fb0aeebe6  usr/local/bin/homegenie/html/locales/es.lingo.json
 a3661ccef2ce053188574e57816c959f  usr/local/bin/homegenie/html/locales/it.programs.json
-184cce806f50739a3a550d68061165dc  usr/local/bin/homegenie/html/locales/it.json
+273a76640877fd480027d026ff0ece3c  usr/local/bin/homegenie/html/locales/it.json
 39202efeb92f6dac83a6b7a4ec482f7d  usr/local/bin/homegenie/html/locales/ru.programs.json
 42ae657831fc25ad32a3cd1d49084e92  usr/local/bin/homegenie/html/locales/fr.programs.json
-93a5d2cab7b624c677ea5110a3436563  usr/local/bin/homegenie/html/locales/fr.json
+2ab497d0c5558563afcb378f6fa95297  usr/local/bin/homegenie/html/locales/fr.json
 82999c6df0484bdad6c1d58c3ae7dc52  usr/local/bin/homegenie/html/locales/de.lingo.json
 24351c73b38c1df5950b5a75ea8fef46  usr/local/bin/homegenie/html/locales/ru.lingo.json
-19e90e9051721f839ed7a93c74430416  usr/local/bin/homegenie/html/locales/sv.json
+74c6972567867ab8e1f1eb3a27cdf02c  usr/local/bin/homegenie/html/locales/sv.json
 edf7140a95f873d27e69958fb854a750  usr/local/bin/homegenie/html/locales/de.programs.json
 200dc71ceec659b49b5dd8432c398cc1  usr/local/bin/homegenie/html/locales/it.lingo.json
 85cc6dded2ab2be199aa13ad4a05c581  usr/local/bin/homegenie/html/locales/fr.lingo.json
-a8ca8a705ab361d8e0ce6cd73b771863  usr/local/bin/homegenie/html/locales/es.json
-b14c0b859530e506e022d300cb28720c  usr/local/bin/homegenie/html/locales/en.json
-22ab3f1e0c142930ba729cfb86e2c492  usr/local/bin/homegenie/html/locales/de.json
+b93bc988315bb58021bb25a572d0ac8b  usr/local/bin/homegenie/html/locales/es.json
+8349cc203051801683e9c38309c0c7b3  usr/local/bin/homegenie/html/locales/en.json
+a9dc6561a46dda70ac13fb578667afe5  usr/local/bin/homegenie/html/locales/de.json
 aa124fa757aa5d7913cf38b027cc7463  usr/local/bin/homegenie/html/locales/es.programs.json
 a4e8c938edacd5e8c55c5441054dcf9a  usr/local/bin/homegenie/html/icons.html
 b059dd0f6967f4e8ba50c9ca728c91b5  usr/local/bin/homegenie/html/css/jquery-ui.min.css
@@ -1734,14 +1734,14 @@ ce07e14186da81596585fb8970aa7d80  usr/local/bin/homegenie/html/ui/widgets/captur
 b8459e32556b6e692fae8f9ff81817c9  usr/local/bin/homegenie/html/ui/core/popup.cronwizard.html
 40acf64097f759ba725a1afb6f7075b8  usr/local/bin/homegenie/html/ui/core/popup.cronwizard.js
 9e90aad43d8acc5b45729f2296cb5907  usr/local/bin/homegenie/Raspberry.IO.SerialPeripheralInterface.dll
-9230e4a94ad6c01720e8e19af34caf90  usr/local/bin/homegenie/HomeGenie.exe
-273134b93937cf253371509c326b8f4a  usr/local/bin/homegenie/release_info.xml
+f9807798579c62888b9113927f7ad08d  usr/local/bin/homegenie/HomeGenie.exe
+d6c911d70664df72988272068506cdc7  usr/local/bin/homegenie/release_info.xml
 536920e88b28850b8df27484746134f4  usr/local/bin/homegenie/NetClientLib.dll
 5405413fff79b8d9c747aa900f60f082  usr/local/bin/homegenie/sqlite3.dll
 8b44d53cb2d7afc7ff215bd43df7fc40  usr/local/bin/homegenie/scheduler.xml
 ca7296e5c1dc0a5f0c9762733f0fb9b7  usr/local/bin/homegenie/groups.xml
 61b0c6d8eb2c756355d52df2ef6170c6  usr/local/bin/homegenie/Microsoft.Scripting.dll
-a501ce39612cea68cb524b8f0d636698  usr/local/bin/homegenie/homegenie_factory_config.zip
+a852c934335fb901c0a0fec2a57510ac  usr/local/bin/homegenie/homegenie_factory_config.zip
 acbb8de3a6a8f53d69957e2607097992  usr/local/bin/homegenie/DEVELOPERS.TXT
 ae7bbf0f4b96d2a0effd97d69befb47e  usr/local/bin/homegenie/CommonMark.dll
 93675a8ef36065d0c64fe1bf4fb79902  usr/local/bin/homegenie/IronRuby.Libraries.Yaml.dll

HomeGenie_Windows/Packager/setup.iss

@@ -4,10 +4,10 @@
 
 [Setup]
 AppName=HomeGenie
-AppVerName=HomeGenie 1.1 beta (r512)
+AppVerName=HomeGenie 1.1 beta (r514)
 AppPublisher=GenieLabs
 AppPublisherURL=http://www.homegenie.it
-AppVersion=1.1 beta (r512)
+AppVersion=1.1 beta (r514)
 DefaultDirName={pf}\HomeGenie
 DefaultGroupName=HomeGenie
 Compression=lzma
@@ -198,8 +198,8 @@ Type: files; Name: "{app}\SQLite.Interop.dll";
 ;Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}"; 
 
 [Icons]
-Name: "{group}\HomeGenie 1.1 beta (r512)"; Filename: "{app}\HomeGenieManager.exe"
-Name: "{group}\Uninstall HomeGenie 1.1 beta (r512)"; Filename: "{uninstallexe}"
+Name: "{group}\HomeGenie 1.1 beta (r514)"; Filename: "{app}\HomeGenieManager.exe"
+Name: "{group}\Uninstall HomeGenie 1.1 beta (r514)"; Filename: "{uninstallexe}"
 Name: "{commondesktop}\HomeGenie"; Filename: "{app}\HomeGenieManager.exe"
 
 [Run]