From 05b592610193492f35b5b7feee4864b6ebd106c8 Mon Sep 17 00:00:00 2001 From: thelastWallE <12502210+thelastWallE@users.noreply.github.com> Date: Fri, 9 Apr 2021 21:47:48 +0200 Subject: [PATCH 1/3] Merge branch 'rc' --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index bfd3bed..51536a7 100644 --- a/setup.py +++ b/setup.py @@ -19,7 +19,7 @@ plugin_package = "octoprint_klipper" plugin_name = "OctoKlipper" -plugin_version = "0.3.7.2" +plugin_version = "0.3.8rc1" plugin_description = """A plugin for OctoPrint to configure,control and monitor the Klipper 3D printer software.""" From 58c26ca9aea7f7cc853ec0eba2b8c643fb4b1a15 Mon Sep 17 00:00:00 2001 From: thelastWallE <12502210+thelastWallE@users.noreply.github.com> Date: Sun, 11 Apr 2021 00:17:19 +0200 Subject: [PATCH 2/3] -zooming on editor todo: editor is taking whole dialog --- octoprint_klipper/__init__.py | 11 ++++--- octoprint_klipper/static/css/klipper.css | 10 +++++- .../static/js/klipper_settings.js | 31 +++++++++++++++++-- .../templates/klipper_settings.jinja2 | 9 ++++-- 4 files changed, 50 insertions(+), 11 deletions(-) diff --git a/octoprint_klipper/__init__.py b/octoprint_klipper/__init__.py index 2d544b4..2cf6e42 100644 --- a/octoprint_klipper/__init__.py +++ b/octoprint_klipper/__init__.py @@ -129,7 +129,8 @@ class KlipperPlugin( logpath="/tmp/klippy.log", reload_command="RESTART", navbar=True, - parse_check=False + parse_check=False, + fontsize=9 ) ) @@ -374,7 +375,7 @@ class KlipperPlugin( if "FIRMWARE_VERSION" in printerInfo: self.log_info("Firmware version: {}".format( printerInfo["FIRMWARE_VERSION"])) - elif "// probe" in line: + elif "// probe" in line or "// Failed to verify BLTouch" in line: msg = line.strip('/') self.log_info(msg) write_parsing_response_buffer() @@ -452,9 +453,9 @@ class KlipperPlugin( self._settings.set(["config"], data["config"]) # self.send_message("reload", "config", "", data["config"]) # send the configdata to frontend to update ace editor - if sys.version_info[0] < 3: - data["config"] = data["config"].decode('utf-8') - return flask.jsonify(data=data["config"]) + if sys.version_info[0] < 3: + data["config"] = data["config"].decode('utf-8') + return flask.jsonify(data=data["config"]) elif command == "checkConfig": if "config" in data: if not self.validate_configfile(data["config"]): diff --git a/octoprint_klipper/static/css/klipper.css b/octoprint_klipper/static/css/klipper.css index 75dcb26..ba55bb5 100644 --- a/octoprint_klipper/static/css/klipper.css +++ b/octoprint_klipper/static/css/klipper.css @@ -104,7 +104,15 @@ div#settings_plugin_klipper.tab-pane.active form.form-horizontal div.tab-content div#settings_plugin_klipper.tab-pane.active form.form-horizontal div.tab-content div#conf.tab-pane.active div.control-group div.conf-editor { height: 100%; - overflow: auto; + width: 100%; +} + +div#settings_plugin_klipper.tab-pane.active form.form-horizontal div.tab-content div#conf.tab-pane.active div.control-group div.conf-editor div#plugin-klipper-config { + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; } div#settings_plugin_klipper.tab-pane.active form.form-horizontal div.tab-content div#conf.tab-pane.active div.control-group button.btn.btn-small { diff --git a/octoprint_klipper/static/js/klipper_settings.js b/octoprint_klipper/static/js/klipper_settings.js index 732560c..a4ac6fa 100644 --- a/octoprint_klipper/static/js/klipper_settings.js +++ b/octoprint_klipper/static/js/klipper_settings.js @@ -107,6 +107,28 @@ $(function() { } } + self.minusFontsize = function () { + self.settings.settings.plugins.klipper.configuration.fontsize(self.settings.settings.plugins.klipper.configuration.fontsize() - 1); + if (self.settings.settings.plugins.klipper.configuration.fontsize() < 9) { + self.settings.settings.plugins.klipper.configuration.fontsize(9); + } + if (editor) { + editor.setFontSize(self.settings.settings.plugins.klipper.configuration.fontsize()); + editor.resize(); + } + } + + self.plusFontsize = function () { + self.settings.settings.plugins.klipper.configuration.fontsize(self.settings.settings.plugins.klipper.configuration.fontsize() + 1); + if (self.settings.settings.plugins.klipper.configuration.fontsize() > 20) { + self.settings.settings.plugins.klipper.configuration.fontsize(20); + } + if (editor) { + editor.setFontSize(self.settings.settings.plugins.klipper.configuration.fontsize()); + editor.resize(); + } + } + self.loadLastSession = function () { if (self.settings.settings.plugins.klipper.configuration.old_config() != "") { self.klipperViewModel.consoleMessage("info","lastSession:" + self.settings.settings.plugins.klipper.configuration.old_config()) @@ -156,6 +178,8 @@ $(function() { obKlipperConfig = config.withSilence(); if (editor) { editor.setValue(obKlipperConfig()); + editor.setFontSize(self.settings.settings.plugins.klipper.configuration.fontsize()); + editor.resize(); editor.clearSelection(); } return obKlipperConfig; @@ -166,13 +190,16 @@ $(function() { editor.setTheme("ace/theme/monokai"); editor.session.setMode("ace/mode/klipper_config"); editor.setOptions({ - autoScrollEditorIntoView: true, - maxLines: "Infinity" + hScrollBarAlwaysVisible: true, + vScrollBarAlwaysVisible: true, + autoScrollEditorIntoView: true, + //maxLines: "Infinity" }) editor.session.on('change', function(delta) { if (obKlipperConfig) { obKlipperConfig.silentUpdate(editor.getValue()); + editor.resize(); } }); diff --git a/octoprint_klipper/templates/klipper_settings.jinja2 b/octoprint_klipper/templates/klipper_settings.jinja2 index 8b5f127..a05bea6 100644 --- a/octoprint_klipper/templates/klipper_settings.jinja2 +++ b/octoprint_klipper/templates/klipper_settings.jinja2 @@ -196,7 +196,7 @@
- {{ _('Add Point') }} + {{ _('Add Point') }}
@@ -206,14 +206,17 @@ - +    + +
From db68bee4973952cb304b4704e38f9fde41adcafe Mon Sep 17 00:00:00 2001 From: thelastWallE <12502210+thelastWallE@users.noreply.github.com> Date: Sun, 11 Apr 2021 22:27:04 +0200 Subject: [PATCH 3/3] css --- octoprint_klipper/static/css/klipper.css | 44 ++++++++++++------- .../templates/klipper_settings.jinja2 | 24 +++++----- .../templates/klipper_tab_main.jinja2 | 4 +- 3 files changed, 42 insertions(+), 30 deletions(-) diff --git a/octoprint_klipper/static/css/klipper.css b/octoprint_klipper/static/css/klipper.css index ba55bb5..25d4afb 100644 --- a/octoprint_klipper/static/css/klipper.css +++ b/octoprint_klipper/static/css/klipper.css @@ -1,5 +1,5 @@ .plugin-klipper-log { - padding: 3px; + padding: 0px; overflow-y: scroll; height: 400px; border: 1px solid #eee; @@ -10,7 +10,7 @@ margin: 3px auto 0 auto; border: 1px solid #ddd; border-radius: 3px; - background-color: #eeeeef; + background-color: #efefef; color: #333; } @@ -57,26 +57,30 @@ ul#klipper-settings { #tab_plugin_klipper_main .row-fluid { display: flex; - flex-direction: row; - flex-wrap: wrap; + flex: row wrap; + align-items: stretch; } -#tab_plugin_klipper_main .span8 { - flex-grow: 8; - float: left; - box-sizing: border-box; +@media all and (max-width: 940px) { + #tab_plugin_klipper_main .row-fluid { + /* On small screens, we are no longer using row direction but column */ + flex-direction: column; + } + } + +#tab_plugin_klipper_main #left-side { + flex: 3 1; + padding-right: 10px; } #tab_plugin_klipper_main .span8 label { float: left; } -#tab_plugin_klipper_main .span4 { - flex-grow: 0; - flex-shrink: 1; - /* max-width: 13%; */ - float: left; - box-sizing: border-box; +#tab_plugin_klipper_main #right-side { + flex: 1 1; + max-width: 200px; + min-width: 100px; } #settings_plugin_klipper { @@ -94,7 +98,7 @@ ul#klipper-settings { } #settings_plugin_klipper form .tab-content .tab-pane { - height: calc(100% - 35px); + height: 100%; } div#settings_plugin_klipper.tab-pane.active form.form-horizontal div.tab-content div#conf.tab-pane.active div.control-group { @@ -102,13 +106,19 @@ div#settings_plugin_klipper.tab-pane.active form.form-horizontal div.tab-content height: 100%; } +div#settings_plugin_klipper.tab-pane.active form.form-horizontal div.tab-content div#conf.tab-pane.active div.control-group .editor-controls{ + margin-bottom: 0px; + height: 26px; +} + div#settings_plugin_klipper.tab-pane.active form.form-horizontal div.tab-content div#conf.tab-pane.active div.control-group div.conf-editor { - height: 100%; + height: calc(100% - 28px); width: 100%; + padding-top: 2px; } div#settings_plugin_klipper.tab-pane.active form.form-horizontal div.tab-content div#conf.tab-pane.active div.control-group div.conf-editor div#plugin-klipper-config { - position: absolute; + position: relative; top: 0; right: 0; bottom: 0; diff --git a/octoprint_klipper/templates/klipper_settings.jinja2 b/octoprint_klipper/templates/klipper_settings.jinja2 index a05bea6..51e358a 100644 --- a/octoprint_klipper/templates/klipper_settings.jinja2 +++ b/octoprint_klipper/templates/klipper_settings.jinja2 @@ -206,17 +206,19 @@ - - - -    - - +
+ + + +    + + +
diff --git a/octoprint_klipper/templates/klipper_tab_main.jinja2 b/octoprint_klipper/templates/klipper_tab_main.jinja2 index e9875f6..b7a8840 100644 --- a/octoprint_klipper/templates/klipper_tab_main.jinja2 +++ b/octoprint_klipper/templates/klipper_tab_main.jinja2 @@ -1,5 +1,5 @@
-
+
@@ -16,7 +16,7 @@ {{ _("Clear") }}
-
+