Testing option for show_ip_at_startup

tpmullan · Jan 31, 2021 · 467a3a7 · 467a3a7
1 parent 9e371cc
commit 467a3a7
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/octoprint_detailedprogress/__init__.py b/octoprint_detailedprogress/__init__.py
@@ -44,7 +44,7 @@ def on_event(self, event, payload):
 			self._printer.commands("M117 {}".format(message))
 			currentData = {"progress": {"completion": 100, "printTimeLeft": 0}}
 			self._update_progress(currentData)
-		elif event == Events.CONNECTED:
+		elif event == Events.CONNECTED and self._settings.get(["show_ip_at_startup"]):
 			ip = self._get_host_ip()
 			if not ip:
 				return
@@ -198,6 +198,7 @@ def get_settings_defaults(self):
 			etl_format="{hours:02d}h{minutes:02d}m{seconds:02d}s",
 			print_done_message="Print Done",
 			use_M73=True,
+                        show_ip_at_startup=True,
 			M73_PrusaStyle=False,
 			all_messages=[
 				'{filename}',

diff --git a/octoprint_detailedprogress/static/js/DetailedProgress.js b/octoprint_detailedprogress/static/js/DetailedProgress.js
@@ -16,6 +16,7 @@ $(function() {
     self.etl_format = ko.observable();
     self.print_done_message = ko.observable();
     self.use_M73 = ko.observable();
+    self.show_ip_at_startup = ko.observable();
     self.all_messages = ko.observableArray();
     self.messages = ko.observableArray();
 
@@ -24,6 +25,7 @@ $(function() {
       self.eta_strftime(self.settings.settings.plugins.detailedprogress.eta_strftime());
       self.etl_format(self.settings.settings.plugins.detailedprogress.etl_format());
       self.use_M73(self.settings.settings.plugins.detailedprogress.use_M73());
+      self.show_ip_at_startup(self.settings.settings.plugins.detailedprogress.show_ip_at_startup());
       self.print_done_message(self.settings.settings.plugins.detailedprogress.print_done_message());
       self.messages(self.settings.settings.plugins.detailedprogress.messages());
       self.all_messages(self.settings.settings.plugins.detailedprogress.all_messages());
@@ -34,6 +36,7 @@ $(function() {
       self.eta_strftime = self.settings.settings.plugins.detailedprogress.eta_strftime();
       self.etl_format = self.settings.settings.plugins.detailedprogress.etl_format();
       self.use_M73 = self.settings.settings.plugins.detailedprogress.use_M73();
+      self.show_ip_at_startup = self.settings.settings.plugins.detailedprogress.show_ip_at_startup();
       self.print_done_message = self.settings.settings.plugins.detailedprogress.print_done_message();
       self.messages = self.settings.settings.plugins.detailedprogress.messages();
       self.all_messages = self.settings.settings.plugins.detailedprogress.all_messages();

diff --git a/octoprint_detailedprogress/templates/detailedprogress_settings.jinja2 b/octoprint_detailedprogress/templates/detailedprogress_settings.jinja2
@@ -79,4 +79,11 @@
 		</div>
 	</div>
 
+  <div class="control-group">
+		<label class="control-label">{{ _('Show Ip at Startup') }}</label>
+		<div class="controls">
+      <input type="checkbox" class="input-block-level form-check-input" data-bind="checked: settings.plugins.detailedprogress.show_ip_at_startup">
+		</div>
+	</div>
+
 </form>