Skip to content

Commit

Permalink
Version 10:
Browse files Browse the repository at this point in the history
* Designed for Blue Iris 4.7.3.3+
* Added support for cached clip animation preview frames.
* Added event-triggered icon and sound options (disabled by default, see Main Menu > UI Settings.
* No more developer console spam when changing cameras while streaming H.264.
* UI Settings can now handle "range" (slider bar) inputs similar to how the camera properties panel can.
  • Loading branch information
bp2008 committed May 4, 2018
1 parent 75f873c commit 2ba425a
Show file tree
Hide file tree
Showing 4 changed files with 766 additions and 183 deletions.
3 changes: 2 additions & 1 deletion ui3.htm
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
};
</script>
<script type="text/javascript">
var ui_version = "9";
var ui_version = "10";
var bi_version = "%%VERSION%%";
var combined_version = ui_version + "-" + bi_version;
//if (!!navigator.userAgent.match(/ Android /))
Expand Down Expand Up @@ -296,6 +296,7 @@
<div id="camimg_centerIconBackground"><svg class="icon"><use xlink:href="#svg_x5F_PTZbackground"></use></svg></div>
<div id="camimg_playIcon"><svg class="icon"><use xlink:href="#svg_x5F_Play"></use></svg></div>
<div id="camimg_pauseIcon"><svg class="icon"><use xlink:href="#svg_x5F_Pause"></use></svg></div>
<div id="cornerStatusIcons"></div>
<div id="playbackHeader" style="display: none;">
<div id="closeClipLeft" title="Close clip"><svg class="icon noflip stroke"><use xlink:href="#svg_stroke_closeBtn"></use></svg></div>
<div id="clipNameHeading"></div>
Expand Down
6 changes: 5 additions & 1 deletion ui3/svgtest.htm
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@
<html>
<head>
<title>SVG Icon Test</title>
<script src="libs-src/jquery-1.11.3.min.js" type="text/javascript"></script>
<script src="libs-src/jquery-1.12.4.min.js"></script>
<script>
if (typeof $ === "undefined")
document.write('<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"><\/script>');
</script>
<style type="text/css">
body
{
Expand Down
51 changes: 47 additions & 4 deletions ui3/ui3.css
Original file line number Diff line number Diff line change
Expand Up @@ -3148,6 +3148,35 @@ div.invisibleLabel
cursor: -webkit-grabbing !important;
cursor: grabbing !important;
}
/* Corner Status Icons */
#cornerStatusIcons
{
position: absolute;
top: 0px;
right: 0px;
color: #FFFFFF;
width: 50%;
}

.cornerStatusIconWrapper
{
float: right;
display: inline;
width: 20px;
height: 20px;
padding: 5px 5px;
margin: 5px;
border: 1px solid transparent;
border-radius: 50%;
display: none;
}

.cornerStatusIconWrapper svg
{
pointer-events: none;
filter: drop-shadow( 0px 0px 2px rgba(0,0,0,1) );
}

/* Question Dialog */
/* Simple text buttons */
.simpleTextButton
Expand Down Expand Up @@ -3526,6 +3555,15 @@ div.invisibleLabel
padding: 6px 0px;
}

.dialogOption_item_comment
{
color: #66cd66;
}
.dialogOption_item_comment .settingsCommentError
{
color: #FF6666;
}

.campropcontent .dialogOption_item_info
{
max-width: 320px;
Expand All @@ -3541,20 +3579,20 @@ div.invisibleLabel
max-width: 340px;
}

.dialogOption_item_range
.campropcontent .dialogOption_item_range
{
max-width: 320px;
margin: 0px auto;
padding: 5px 10px;
position: relative;
}

.dialogOption_item_range:hover
.campropcontent .dialogOption_item_range:hover
{
background-color: rgba(255,255,255,0.1);
}

.dialogOption_item_range input
.campropcontent .dialogOption_item_range input
{
width: 315px;
display: block;
Expand Down Expand Up @@ -3584,6 +3622,7 @@ div.invisibleLabel
height: 28px;
margin: 0px 10px;
float: right;
max-width: 35%;
}

#uiSettingsPanel a.input
Expand Down Expand Up @@ -3862,11 +3901,15 @@ div::-webkit-scrollbar-corner
{
width: 80px;
}

#uiSettingsPanel input[type="text"]
{
width: 169px;
}
#uiSettingsPanel input[type="range"]
{
width: 90%;
margin: 0px 5%;
}

.uiSettingsRow
{
Expand Down
Loading

0 comments on commit 2ba425a

Please sign in to comment.