pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

little ui fixes. restart button removed as it was not working.

Browse source
This commit is contained in:
Teja 2015-07-09 18:05:01 +02:00
parent f842809db8
commit dffb123d0e
3 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/octoprint/plugins/svgtogcode/static/css/mrbeam.css
View file

@ -1837,3 +1837,13 @@ input.search-query,
-webkit-animation-iteration-count:infinite;
display: inline-block;
}
.progress .bar {
color: #999;
text-align: left;
text-shadow: none;
padding-left: 0.5em;
background-color: #DD0000;
background-image: none;
white-space: nowrap;
}

6
src/octoprint/static/js/app/viewmodels/terminal.js
View file

@ -69,8 +69,10 @@ $(function() {
}
});
// self.activeFilters = ko.observableArray([]);
self.activeFilters = ko.observableArray(self.filters); // all enabled by default
self.activeFilters = ko.observableArray([]);
// all enabled by default TODO!!!
//self.filters();
self.activeFilters = ko.observableArray();
self.activeFilters.subscribe(function(e) {
self.updateFilterRegex();
});

11
src/octoprint/templates/mrbeam_index.jinja2
View file

@ -56,7 +56,7 @@
</div>
<div id="statusbox">
<div id="control" class="accordion-inner" data-bind="visible: (isReady() || isLocked()) && !isPrinting() ">
<div id="control" class="accordion-inner" data-bind="visible: isReady() || isLocked() ">
<div data-bind="visible: isLocked ">
Mr Beam is in a locked state as it does not know its position.
First remove any objects blocking the gantry's travel range.
@ -105,7 +105,7 @@
</div>
</div>
<div>
<button id="set_coordinate_origin_btn" class="btn" data-bind="click: setCoordinateOrigin" title="set coordinate origin"><i class="icon-screenshot"></i></button>
<button id="set_coordinate_origin_btn" class="btn" data-bind="enable: isOperational() && !isPrinting() && loginState.isUser(), click: setCoordinateOrigin" title="set coordinate origin"><i class="icon-screenshot"></i></button>
</div>
</div>
@ -146,7 +146,7 @@
{{ _('Timelapse') }}: <strong data-bind="text: timelapseString"></strong><br>
-->
{{ _('Approx. Total Job Time') }}: <strong data-bind="text: estimatedPrintTimeString"></strong><br>
<div class="progress" data-bind="visible: isPrinting()">
<div class="progress" data-bind="visible: isPrinting() || isPaused()">
<div class="bar" id="job_progressBar" data-bind="style: { width: progressString() + '%' }">{{ _('Processed') }} : <strong data-bind="text: byteString"></strong></div>
</div>
<!-- {{ _('Print Time') }}: <strong data-bind="text: printTimeString"></strong><br>
@ -154,8 +154,9 @@
<div class="row-fluid print-control" style="display: none;" data-bind="visible: loginState.isUser">
<button class="btn btn-danger span4" data-bind="click: conversion.show_conversion_dialog, enable: isOperational() && isReady() && !isPrinting() && loginState.isUser() && !workingArea.working_area_empty(), attr: {title: titlePrintButton}" id="job_print">
<i class="icon-white" data-bind="css: {'icon-fire': !isPaused(), 'icon-undo': isPaused(), 'wobble': isPrinting()}"></i> <span data-bind="text: (isPaused() ? '{{ _('Restart') }}' : '{{ _('Laser') }}')">{{ _('Laser') }}</span>
<button class="btn btn-danger span4" data-bind="click: conversion.show_conversion_dialog, enable: isOperational() && isReady() && !isPrinting() && !isPaused() && loginState.isUser() && !workingArea.working_area_empty(), attr: {title: titlePrintButton}" id="job_print">
<i class="icon-white icon-fire" data-bind="css: { 'wobble': isPrinting()}"></i> <span>{{ _('Laser') }}</span>
<!--<i class="icon-white" data-bind="css: {'icon-fire': !isPaused(), 'icon-undo': isPaused(), 'wobble': isPrinting()}"></i> <span data-bind="text: (isPaused() ? '{{ _('Restart') }}' : '{{ _('Laser') }}')">{{ _('Laser') }}</span>-->
</button>
<button class="btn span4" id="job_pause" data-bind="click: pause, enable: isOperational() && (isPrinting() || isPaused()) && loginState.isUser(), css: {active: isPaused()}, attr: {title: titlePauseButton}"><i data-bind="css: {'icon-pause': !isPaused(), 'icon-play': isPaused()}"></i> <span data-bind="visible: !isPaused()">{{ _('Pause') }}</span><span data-bind="visible: isPaused()">{{ _('Resume') }}</span></button>
<button class="btn span4" id="job_cancel" data-bind="click: cancel, enable: isOperational() && (isPrinting() || isPaused()) && loginState.isUser()" title="{{ _('Cancels the job') }}"><i class="icon-stop"></i> {{ _('Cancel') }}</button>