diff --git a/README.md b/README.md index 1755780..1dc98a6 100644 --- a/README.md +++ b/README.md @@ -35,4 +35,70 @@ new PNotify({ command: _.escape(commandSpec.name) }), type: "success" -}); \ No newline at end of file +}); + +## Notification JS with buttons +new PNotify({ + title: "tit", + text: "sime", + hide: false, + confirm: { + confirm: true, + buttons: [ + { + text: "btnText", + click: function(notice) {console.log("btnPress") + } + } + ]}, + buttons: { + sticker: false, + closer: false + } +}) + + +## confirmation modal +showConfirmationDialog({ + title: gettext("Are you sure you want to update now?"), + html: "ss", + proceed: gettext("Proceed"), + onproceed: function() { + console.log("proc"); + }, + onclose: function() { + console.log("close"); + } +}); + + +## dialog with showing progress +showProgressModal(options, promise) + +## dialog with multi buttons +showSelectionDialog({"title": "tt", "message": "text", "selections":["ss","fdgd","asdas","asda"]}) + +## Message dialog +showMessageDialog("sss", {options}) + +## modal dialog with buttons +showConfirmationDialog({ +"message": "something", +"question": "que?", +"cancel" : "somaCancel", +"proceed" : "someProceed", +}) + var title = options.title || gettext("Are you sure?"); + var message = options.message || ""; + var question = options.question || gettext("Are you sure you want to proceed?"); + var html = options.html; + var checkboxes = options.checkboxes; + var cancel = options.cancel || gettext("Cancel"); + var proceed = options.proceed || gettext("Proceed"); + var proceedClass = options.proceedClass || "danger"; + var onproceed = options.onproceed || undefined; + var oncancel = options.oncancel || undefined; + var onclose = options.onclose || undefined; + var dialogClass = options.dialogClass || ""; + var nofade = options.nofade || false; + var noclose = options.noclose || false; \ No newline at end of file diff --git a/octoprint_CalibrationTools/__init__.py b/octoprint_CalibrationTools/__init__.py index ec98fc9..6b00246 100644 --- a/octoprint_CalibrationTools/__init__.py +++ b/octoprint_CalibrationTools/__init__.py @@ -7,13 +7,13 @@ from octoprint_CalibrationTools import (api, hooks, models) defaultSettings = { "eSteps": { - "userControlsTemp": True, - "turnOffHeater": True, - "extrudeTemp": 210, - "extrudeLength": 100, - "extrudeSpeed": 50, - "markLength": 120 - } + "userControlsTemp": True, + "turnOffHeater": True, + "extrudeTemp": 210, + "extrudeLength": 100, + "extrudeSpeed": 50, + "markLength": 120 + } } class CalibrationtoolsPlugin( diff --git a/octoprint_CalibrationTools/static/js/CalibrationTools.js b/octoprint_CalibrationTools/static/js/CalibrationTools.js index 8eea900..207ecaa 100644 --- a/octoprint_CalibrationTools/static/js/CalibrationTools.js +++ b/octoprint_CalibrationTools/static/js/CalibrationTools.js @@ -30,7 +30,7 @@ $(function () { return (self.steps.E() / self.results.actualExtrusion() * 100).toFixed(3); }); self.results["newStepsDisplay"] = ko.computed(function () { - return "M92 E" + self.results.newSteps() ; + return "M92 E" + self.results.newSteps(); }); self.onBeforeBinding = self.onUserLoggedIn = self.onUserLoggedOut = function () { @@ -64,9 +64,10 @@ $(function () { self.startExtrusion = function () { OctoPrint.simpleApiCommand("CalibrationTools", "startExtrusion").done(function (response) { new PNotify({ - title: "Test request", + title: "E axe calibration started", text: "Heating nuzzle has started!!!
When extrusion stops you have to fulfil Length after extrusion and save the new value ", - type: "info" + type: "warning", + hide: false }); console.log(response); })