From: Calin Crisan <ccrisan@gmail.com>
Date: Sat, 20 Aug 2016 18:45:31 +0000 (+0300)
Subject: added action buttons for 9 presets
X-Git-Url: http://www.vanbest.org/gitweb/?a=commitdiff_plain;h=d8099b35bb9a03df89dcce92942d2d5ae17be6c5;p=motioneye-debian

added action buttons for 9 presets
---

diff --git a/motioneye/config.py b/motioneye/config.py
index fb8b9e3..21f872f 100644
--- a/motioneye/config.py
+++ b/motioneye/config.py
@@ -41,7 +41,8 @@ import v4l2ctl
 
 _CAMERA_CONFIG_FILE_NAME = 'thread-%(id)s.conf'
 _MAIN_CONFIG_FILE_NAME = 'motion.conf'
-_ACTIONS = ['lock', 'unlock', 'light_on', 'light_off', 'alarm_on', 'alarm_off', 'up', 'right', 'down', 'left', 'zoom_in', 'zoom_out']
+_ACTIONS = ['lock', 'unlock', 'light_on', 'light_off', 'alarm_on', 'alarm_off', 'up', 'right', 'down', 'left', 'zoom_in', 'zoom_out',
+        'preset1', 'preset2', 'preset3', 'preset4', 'preset5', 'preset6', 'preset7', 'preset8', 'preset9']
 
 _main_config_cache = None
 _camera_config_cache = {}
diff --git a/motioneye/static/css/main.css b/motioneye/static/css/main.css
index 356207a..191f167 100644
--- a/motioneye/static/css/main.css
+++ b/motioneye/static/css/main.css
@@ -1104,6 +1104,50 @@ div.camera-action-button.zoom-out {
     background-position: -1400% 0px;
 }
 
+div.camera-action-button.preset {
+    background-position: -1500% 0px;
+    text-align: center;
+    line-height: 2.5em;
+    color: #3498db;
+    font-weight: bold;
+}
+
+div.camera-action-button.preset1:BEFORE {
+    content: '1';
+}
+
+div.camera-action-button.preset2:BEFORE {
+    content: '2';
+}
+
+div.camera-action-button.preset3:BEFORE {
+    content: '3';
+}
+
+div.camera-action-button.preset4:BEFORE {
+    content: '4';
+}
+
+div.camera-action-button.preset5:BEFORE {
+    content: '5';
+}
+
+div.camera-action-button.preset6:BEFORE {
+    content: '6';
+}
+
+div.camera-action-button.preset7:BEFORE {
+    content: '7';
+}
+
+div.camera-action-button.preset8:BEFORE {
+    content: '8';
+}
+
+div.camera-action-button.preset9:BEFORE {
+    content: '9';
+}
+
 div.camera-container {
     position: relative;
     padding: 0px;
diff --git a/motioneye/static/img/camera-action-buttons.svg b/motioneye/static/img/camera-action-buttons.svg
index 5eeeb93..dfa5c83 100644
--- a/motioneye/static/img/camera-action-buttons.svg
+++ b/motioneye/static/img/camera-action-buttons.svg
@@ -27,9 +27,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.74509804"
      inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="562.2256"
-     inkscape:cy="12.256296"
+     inkscape:zoom="8"
+     inkscape:cx="579.29889"
+     inkscape:cy="13.896368"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
@@ -322,5 +322,11 @@
        id="path4192"
        d="m 581,1029.8622 -7,0"
        style="fill:none;fill-rule:evenodd;stroke:#3498db;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <circle
+       r="13"
+       cy="1032.3623"
+       cx="620"
+       id="circle4175"
+       style="fill:none;stroke:#3498db;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
   </g>
 </svg>
diff --git a/motioneye/static/js/main.js b/motioneye/static/js/main.js
index 205019a..47dd60e 100644
--- a/motioneye/static/js/main.js
+++ b/motioneye/static/js/main.js
@@ -3985,6 +3985,15 @@ function addCameraFrameUi(cameraConfig) {
                                 '<div class="button icon camera-action-button mouse-effect right" title="right"></div>' +
                                 '<div class="button icon camera-action-button mouse-effect zoom-in" title="zoom in"></div>' +
                                 '<div class="button icon camera-action-button mouse-effect zoom-out" title="zoom out"></div>' +
+                                '<div class="button icon camera-action-button mouse-effect preset preset1" title="preset 1"></div>' +
+                                '<div class="button icon camera-action-button mouse-effect preset preset2" title="preset 2"></div>' +
+                                '<div class="button icon camera-action-button mouse-effect preset preset3" title="preset 3"></div>' +
+                                '<div class="button icon camera-action-button mouse-effect preset preset4" title="preset 4"></div>' +
+                                '<div class="button icon camera-action-button mouse-effect preset preset5" title="preset 5"></div>' +
+                                '<div class="button icon camera-action-button mouse-effect preset preset6" title="preset 6"></div>' +
+                                '<div class="button icon camera-action-button mouse-effect preset preset7" title="preset 7"></div>' +
+                                '<div class="button icon camera-action-button mouse-effect preset preset8" title="preset 8"></div>' +
+                                '<div class="button icon camera-action-button mouse-effect preset preset9" title="preset 9"></div>' +
                             '</div>' +
                         '</div>' +
                     '</div>' +
@@ -4015,6 +4024,15 @@ function addCameraFrameUi(cameraConfig) {
     var leftButton = cameraFrameDiv.find('div.camera-action-button.left');
     var zoomInButton = cameraFrameDiv.find('div.camera-action-button.zoom-in');
     var zoomOutButton = cameraFrameDiv.find('div.camera-action-button.zoom-out');
+    var preset1Button = cameraFrameDiv.find('div.camera-action-button.preset1');
+    var preset2Button = cameraFrameDiv.find('div.camera-action-button.preset2');
+    var preset3Button = cameraFrameDiv.find('div.camera-action-button.preset3');
+    var preset4Button = cameraFrameDiv.find('div.camera-action-button.preset4');
+    var preset5Button = cameraFrameDiv.find('div.camera-action-button.preset5');
+    var preset6Button = cameraFrameDiv.find('div.camera-action-button.preset6');
+    var preset7Button = cameraFrameDiv.find('div.camera-action-button.preset7');
+    var preset8Button = cameraFrameDiv.find('div.camera-action-button.preset8');
+    var preset9Button = cameraFrameDiv.find('div.camera-action-button.preset9');
     
     var cameraOverlay = cameraFrameDiv.find('div.camera-overlay');
     var cameraPlaceholder = cameraFrameDiv.find('div.camera-placeholder');
@@ -4123,7 +4141,16 @@ function addCameraFrameUi(cameraConfig) {
         'down': downButton,
         'left': leftButton,
         'zoom_in': zoomInButton,
-        'zoom_out': zoomOutButton
+        'zoom_out': zoomOutButton,
+        'preset1': preset1Button,
+        'preset2': preset2Button,
+        'preset3': preset3Button,
+        'preset4': preset4Button,
+        'preset5': preset5Button,
+        'preset6': preset6Button,
+        'preset7': preset7Button,
+        'preset8': preset8Button,
+        'preset9': preset9Button
     };
     
     cameraConfig.actions.forEach(function (action) {