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

minor ui fixes

Browse source
This commit is contained in:
Teja 2015-08-12 11:42:19 +02:00
parent 4ac1707052
commit 233f426dff
4 changed files with 24 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/octoprint/plugins/svgtogcode/static/css/svgtogcode.css
View file

@ -28,7 +28,7 @@ table th.settings_plugin_svgtogcode_profiles_key,table td.settings_plugin_svgtog
}
.img_intensity_input {
width: 3em;
width: 3.5em;
}
svg text {
@ -73,7 +73,3 @@ svg text {
color: #999;
font-size: smaller;
}
.autoModal.modal .modal-body{
max-height: 100%;
}

24
src/octoprint/plugins/svgtogcode/static/js/convert.js
View file

@ -63,14 +63,14 @@ $(function(){
});
// TODO check if still in use
self.show = function(target, file) {
alert('still in use (line52, convert.js)');
self.target = target;
self.file = file;
self.title(_.sprintf(gettext("Converting %(filename)s"), {filename: self.file}));
self.gcodeFilename(self.file.substr(0, self.file.lastIndexOf(".")));
$("#dialog_vector_graphics_conversion").modal("show");
};
// self.show = function(target, file) {
// alert('still in use (line52, convert.js)');
// self.target = target;
// self.file = file;
// self.title(_.sprintf(gettext("Converting %(filename)s"), {filename: self.file}));
// self.gcodeFilename(self.file.substr(0, self.file.lastIndexOf(".")));
// $("#dialog_vector_graphics_conversion").modal("show");
// };
// shows conversion dialog and extracts svg first
self.show_conversion_dialog = function() {
@ -369,6 +369,14 @@ $(function(){
};
// TODO debug this.
self.showExpertSettings.subscribe(function(){
// var wh = $(window).height();
// var h = $('#dialog_vector_graphics_conversion').outerHeight();
// var d = Math.max((wh - h) / 2, 10);
// $('#dialog_vector_graphics_conversion').css('top', d + 'px');
//$("#dialog_vector_graphics_conversion").modal("show");
});
}

10
src/octoprint/plugins/svgtogcode/templates/svgtogcode.jinja2
View file

@ -1,4 +1,4 @@
<div id="dialog_vector_graphics_conversion" class="modal hide fade autoModal">
<div id="dialog_vector_graphics_conversion" class="modal hide fade">
<div class="modal-header">
<a href="#" class="close" data-dismiss="modal" aria-hidden="true">&times;</a>
<h3 data-bind="text: title"></h3>
@ -42,18 +42,18 @@
<label class="control-label">{{ _('Laser intensity') }}</label>
<div class="controls">
<div class="input-append">
<input id="svgtogcode_img_intensity_white" class="img_intensity_input" type="number" min="0" max="1000" data-bind="value: imgIntensityWhite, valueUpdate: 'keyup'">
<input id="svgtogcode_img_intensity_white" class="img_intensity_input" type="number" min="0" max="1000" data-bind="value: imgIntensityWhite">
<div class="svgtogcode_grayscale">&nbsp;</div>
<input id="svgtogcode_img_intensity_black" class="img_intensity_input" type="number" min="0" max="1000" data-bind="value: imgIntensityBlack, valueUpdate: 'keyup'">
<input id="svgtogcode_img_intensity_black" class="img_intensity_input" type="number" min="0" max="1000" data-bind="value: imgIntensityBlack">
</div>
</div>
<label class="control-label">{{ _('Engraving speed') }}</label>
<div class="controls">
<div class="input-append">
<input id="svgtogcode_img_feedrate_white" class="img_intensity_input" type="number" data-bind="value: imgFeedrateWhite, valueUpdate: 'keyup'">
<input id="svgtogcode_img_feedrate_white" class="img_intensity_input" type="number" min="30" data-bind="value: imgFeedrateWhite">
<div class="svgtogcode_grayscale">&nbsp;</div>
<input id="svgtogcode_img_feedrate_black" class="img_intensity_input" type="number" data-bind="value: imgFeedrateBlack, valueUpdate: 'keyup'">
<input id="svgtogcode_img_feedrate_black" class="img_intensity_input" type="number" min="30" data-bind="value: imgFeedrateBlack">
</div>
</div>
</div>

3
src/octoprint/static/js/app/main.js
View file

@ -110,8 +110,9 @@ $(function() {
//~~ File list
var h = $('#wa_filelist').innerHeight()
$(".gcode_files").slimScroll({
height: "80vh",
'height': h+"px",
size: "5px",
distance: "0",
railVisible: true,