Commit Graph

24073 Commits (67ab1c39f3b0f7dcf009a079bc57122e4b05c882)

Author SHA1 Message Date
IgorA100 67ab1c39f3
Preset Layouts should be first in the Layots list (montage.php)
Moved preset Layouts from montage.js
Changed the definition of the default Layout
2024-05-19 00:21:12 +03:00
IgorA100 7840050999
Moved list of preset Layouts to montage.php (montage.js) 2024-05-19 00:09:46 +03:00
Isaac Connor 593c4f47ce
Merge pull request #4010 from IgorA100/patch-96
Fix: Changed color of "background" and "text" in base theme for Frames table
2024-05-18 15:07:38 -04:00
IgorA100 d257447fdd
Set color "background" and "text" for "tr.alarm" from variables (frames.css) 2024-05-18 15:22:39 +03:00
IgorA100 10cef857af
Added vars color for "background" & "text" in base theme (skin.css) 2024-05-18 15:17:13 +03:00
Isaac Connor 83ac51479c
Merge pull request #4009 from IgorA100/patch-95
Fix: remove "preventDefault" in handleClick & add "pdateScale=true in panZoomAction (watch.js)
2024-05-17 19:14:55 -04:00
Isaac Connor 8968138ec7
Merge pull request #4008 from IgorA100/patch-94
Feat: Added support for PanZoom on Event page
2024-05-17 19:11:13 -04:00
IgorA100 e2d27c0bfe
Fix: Zoom In on mouse click when using player.js & added option (event.js)
Added option:
Ctrl + mouse click = zoom out
Ctrl + Shift + mouse click = reset scale to "1"
2024-05-17 22:45:07 +03:00
IgorA100 5e76dfe273
Added support PanZoom (event.php) 2024-05-17 20:23:10 +03:00
IgorA100 fa9bc056a0
Chore: eslint (event.js) 2024-05-17 19:08:08 +03:00
IgorA100 135493de06
Added styles for support PanZoom (event.css) 2024-05-17 19:02:41 +03:00
IgorA100 95c00a053d
Fix: remove "preventDefault" in handleClick & add "pdateScale=true in panZoomAction (watch.js) 2024-05-17 18:59:27 +03:00
IgorA100 0d7ea72c7d
Added support PanZoom & fix Scale (event.js) 2024-05-17 18:52:31 +03:00
IgorA100 126ac1e57b
Added support "panZoomScale" in "function scaleToFit" (skin.js)
Added the ability to calculate Scale without taking into account "bottomEl".
To do this, you need to pass "bottomEl=false" to the scaleToFit function.
2024-05-17 15:36:37 +03:00
IgorA100 2b6e4e2cbc
Feat: Added support for PanZoom on Event page (functions.php) 2024-05-17 15:16:43 +03:00
Isaac Connor 9f730bc0d7 Immediately do a status command when the image loads instead of waiting statusInterval for it. 2024-05-16 15:57:50 -04:00
Isaac Connor 41d766c930 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-05-16 10:20:00 -04:00
Isaac Connor 5085943c01 Allow empty MaxImageBufferCount 2024-05-16 10:19:51 -04:00
Isaac Connor 52fc01f1d9
Merge pull request #4002 from IgorA100/patch-91
Feat: Added mouse wheel control for Zoom & others (montage.js)
2024-05-16 10:17:36 -04:00
Isaac Connor fa82acb1fe
Merge pull request #4004 from IgorA100/patch-92
Chore: code optimization (watch.js)
2024-05-16 10:16:40 -04:00
Isaac Connor af233ef93e Restart stream when playClicked and zmsBroke. Fixes #4005 2024-05-16 10:14:55 -04:00
IgorA100 2d21527558
Chore: code optimization (watch.js)
Moved "$j(document).on('keyup keydown', function(e) {"
From "$j('.zoompan').each( function() {"
2024-05-16 12:50:15 +03:00
IgorA100 b737cddc4e
Fix: Add missing "||" (montage.js) 2024-05-15 22:35:43 +03:00
IgorA100 4226993846
Feat: Added mouse wheel control for Zoom & others (montage.js)
"Shift" button + mouse wheel - Zoom In / Zoom Out
"Shift" button + mouse click anywhere in the image = applies Zoom Out to the clicked location.
"Ctrl" button + mouse click anywhere in the image = reset Zoom to 1.
Depending on the available actions, the appearance of the mouse cursor changes.

Removed unused Layout names '5 Wide', '7 Wide', '9 Wide', '10 Wide'

Scale recalculation no more than once every 0.2 sec.
2024-05-15 20:17:49 +03:00
Isaac Connor fc46991eea Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-05-15 11:46:36 -04:00
Isaac Connor 582f594b0f Merge branch 'IgorA100-patch-6' 2024-05-15 11:46:26 -04:00
Isaac Connor 7bfd94b9d2 Merge branch 'patch-6' of github.com:IgorA100/zoneminder into IgorA100-patch-6 2024-05-15 11:45:49 -04:00
Isaac Connor ad18cef36c
Merge pull request #4001 from IgorA100/patch-90
Fix: Change Scale when scrolling mouse wheel (watch.js)
2024-05-15 11:36:21 -04:00
IgorA100 7ee7829725
Fix: Change Scale when scrolling mouse wheel (watch.js)
And set the Scale update period to no more than 1 time every 0.5 seconds. Otherwise, scrolling the mouse wheel quickly or pressing Zoom In/Out quickly will cause the browser to do unnecessary work.
2024-05-15 18:25:18 +03:00
Isaac Connor f85639c2f3
Merge pull request #3992 from IgorA100/patch-84
Feat: Managing Ratio on Montage page
2024-05-15 09:21:56 -04:00
Isaac Connor 87e618fd0a
Merge pull request #3996 from IgorA100/patch-87
Moved the "Fullscreen" button to another block (watch.php)
2024-05-15 09:21:39 -04:00
Isaac Connor e39c222309 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-05-15 09:05:22 -04:00
Isaac Connor a9b6215a50 Fix eslint 2024-05-15 09:05:18 -04:00
Isaac Connor e0814a3c14
Merge pull request #3995 from IgorA100/patch-86
Added "Scale" setting (watch.js)
2024-05-15 09:04:20 -04:00
Isaac Connor 8c7997eacd
Merge pull request #3998 from IgorA100/patch-88
Fix: "Scale" calculation algorithm (skin.js)
2024-05-15 08:59:16 -04:00
IgorA100 7a130033e6
Fix: Change "Scale" on page load (montage.js) 2024-05-15 15:31:54 +03:00
Isaac Connor ee2908078c Use parseInt to ensure an integer comparison on preventframes and maximagebuffercount 2024-05-15 08:22:33 -04:00
IgorA100 3270c7dbd9
Fix: "Scale" calculation algorithm (skin.js) 2024-05-15 15:05:43 +03:00
IgorA100 22df605a72
Moved the "Fullscreen" button to another block (watch.php)
Moved from block `id="dvrControls"` to block `id="extButton"`
Now the button does not disappear if there is no block `dvrControls`
2024-05-15 00:39:35 +03:00
IgorA100 589efd0a2a
Chore: eslint (watch.js) 2024-05-14 23:46:07 +03:00
IgorA100 d923057dfe
Added option Scale=Actual (config.php) 2024-05-14 23:39:33 +03:00
IgorA100 4fdbc28ba3
Added option Scale=Actual (watch.js)
Actual = 100% of original size
2024-05-14 23:37:29 +03:00
IgorA100 ebe84d4520
Changed the values in $scales (config.php) 2024-05-14 21:02:33 +03:00
IgorA100 3285419942
Added "Scale" setting (watch.php) 2024-05-14 21:00:17 +03:00
IgorA100 8b235fc4e5
Added "Scale" setting (watch.js)
Two settings options:
- Auto
- Fit to width
2024-05-14 20:54:21 +03:00
Isaac Connor 0ca70a32bd
Merge pull request #3994 from IgorA100/patch-85
Added translation for "BadPreEventCountMaxImageBufferCount" (ru_ru.php)
2024-05-14 12:28:49 -04:00
Isaac Connor 9b65204e75
Merge pull request #3991 from IgorA100/patch-83
Enabled support for old ZoomPan algorithm, Added ZoomPan (In & Out) options  & other (watch.js)
2024-05-14 12:28:36 -04:00
IgorA100 af0aa91774
Added translation for "BadPreEventCountMaxImageBufferCount" (ru_ru.php) 2024-05-14 17:31:28 +03:00
IgorA100 a34a89cabe
Fix: Controlling the presence of a button with ID="zoomOutBtn" (watch.js) 2024-05-14 17:11:30 +03:00
Isaac Connor 007f0e29b4 When editing buffer settings, ensure that MaxImageBuffers > PreEventCount. 2024-05-14 10:03:20 -04:00