diff --git a/src/octoprint/plugins/svgtogcode/static/css/svgtogcode.css b/src/octoprint/plugins/svgtogcode/static/css/svgtogcode.css index fd08a9e5..78b21236 100644 --- a/src/octoprint/plugins/svgtogcode/static/css/svgtogcode.css +++ b/src/octoprint/plugins/svgtogcode/static/css/svgtogcode.css @@ -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%; -} \ No newline at end of file diff --git a/src/octoprint/plugins/svgtogcode/static/js/convert.js b/src/octoprint/plugins/svgtogcode/static/js/convert.js index 66e5bb36..e0bec9b8 100644 --- a/src/octoprint/plugins/svgtogcode/static/js/convert.js +++ b/src/octoprint/plugins/svgtogcode/static/js/convert.js @@ -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"); + }); } diff --git a/src/octoprint/plugins/svgtogcode/templates/svgtogcode.jinja2 b/src/octoprint/plugins/svgtogcode/templates/svgtogcode.jinja2 index 5129508f..40ea0a6f 100644 --- a/src/octoprint/plugins/svgtogcode/templates/svgtogcode.jinja2 +++ b/src/octoprint/plugins/svgtogcode/templates/svgtogcode.jinja2 @@ -1,4 +1,4 @@ -