From 4ac1707052999675b4a92d0500d721da3b986b73 Mon Sep 17 00:00:00 2001
From: Teja <mail@tejaphilipp.de>
Date: Wed, 12 Aug 2015 09:31:50 +0200
Subject: [PATCH] minor us fixes, photo attribution

---
 run                                            |  5 +++++
 .../svgtogcode/static/css/svgtogcode.css       | 18 +++++++++++++++---
 .../plugins/svgtogcode/static/js/convert.js    |  2 +-
 .../svgtogcode/templates/svgtogcode.jinja2     | 13 +++++++------
 4 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/run b/run
index 0c51da39..86f1fdf8 100755
--- a/run
+++ b/run
@@ -18,5 +18,10 @@ I don't know anything about).
 
 sys.path.insert(0, os.path.join(basedir, "src"))
 
+#import sys
+#sys.path.append('/home/teja/Downloads/pyvmmonitor/public_api')
+#import pyvmmonitor
+#pyvmmonitor.connect()
+
 import octoprint
 octoprint.main()
diff --git a/src/octoprint/plugins/svgtogcode/static/css/svgtogcode.css b/src/octoprint/plugins/svgtogcode/static/css/svgtogcode.css
index c4627248..fd08a9e5 100644
--- a/src/octoprint/plugins/svgtogcode/static/css/svgtogcode.css
+++ b/src/octoprint/plugins/svgtogcode/static/css/svgtogcode.css
@@ -23,12 +23,12 @@ table th.settings_plugin_svgtogcode_profiles_key,table td.settings_plugin_svgtog
 
 .svgtogcode_grayscale {
 	background-image: linear-gradient(90deg, #FFFFFF, #000000); 
-	width:130px;
+	width:220px;
 	display: inline-block;
 }
 
-.slider_manual_input.noleftspace{
-	margin-left: 0; 
+.img_intensity_input {
+	width: 3em;
 }
 
 svg text {
@@ -65,3 +65,15 @@ svg text {
 .img_preprocessing_preview.after .sharpened_contrast {
 	opacity: 0;
 }
+
+.photo_attribution {
+	margin-bottom: 1em;
+}
+.photo_attribution a {
+    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 9e62eb75..66e5bb36 100644
--- a/src/octoprint/plugins/svgtogcode/static/js/convert.js
+++ b/src/octoprint/plugins/svgtogcode/static/js/convert.js
@@ -36,7 +36,7 @@ $(function(){
 		// image engraving stuff
 		self.show_image_parameters = ko.observable(false);
 		self.imgIntensityWhite = ko.observable(0);
-		self.imgIntensityBlack = ko.observable(1000);
+		self.imgIntensityBlack = ko.observable(500);
 		self.imgFeedrateWhite = ko.observable(3000); // TODO use machineprofile maximum
 		self.imgFeedrateBlack = ko.observable(500);
 		self.imgDithering = ko.observable(false);
diff --git a/src/octoprint/plugins/svgtogcode/templates/svgtogcode.jinja2 b/src/octoprint/plugins/svgtogcode/templates/svgtogcode.jinja2
index f62f8975..5129508f 100644
--- a/src/octoprint/plugins/svgtogcode/templates/svgtogcode.jinja2
+++ b/src/octoprint/plugins/svgtogcode/templates/svgtogcode.jinja2
@@ -1,4 +1,4 @@
-<div id="dialog_vector_graphics_conversion" class="modal hide fade">
+<div id="dialog_vector_graphics_conversion" class="modal hide fade autoModal">
     <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="slider_manual_input" type="text" 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, valueUpdate: 'keyup'">
 							<div class="svgtogcode_grayscale">&nbsp;</div>
-							<input id="svgtogcode_img_intensity_black" class="slider_manual_input noleftspace" type="text" 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, valueUpdate: 'keyup'">
 						</div>
 					</div>
 
 					<label class="control-label">{{ _('Engraving speed') }}</label>
 					<div class="controls">
 						<div class="input-append">
-							<input id="svgtogcode_img_feedrate_white" class="slider_manual_input" type="text" data-bind="value: imgFeedrateWhite, valueUpdate: 'keyup'">
+							<input id="svgtogcode_img_feedrate_white" class="img_intensity_input" type="number" data-bind="value: imgFeedrateWhite, valueUpdate: 'keyup'">
 							<div class="svgtogcode_grayscale">&nbsp;</div>
-							<input id="svgtogcode_img_feedrate_black" class="slider_manual_input noleftspace" type="text" data-bind="value: imgFeedrateBlack, valueUpdate: 'keyup'">
+							<input id="svgtogcode_img_feedrate_black" class="img_intensity_input" type="number" data-bind="value: imgFeedrateBlack, valueUpdate: 'keyup'">
 						</div>
 					</div>
 				</div>
@@ -67,6 +67,7 @@
 							<div class="img_preprocessing_preview dithered" style="background-image:url(/plugin/svgtogcode/static/img/kitty_dithered_150.png);" data-bind="visible: imgDithering"></div>
 						
 						</div>
+						<div class="photo_attribution"><a href="http://www.christianholmer.com" target="_blank">Photo: Christian Holmér</a></div>
 					</div>
 					
 					<div data-bind="disable:imgDithering ">
@@ -92,8 +93,8 @@
 				</div>
 			</div>
 
-			<p>{{ _('Store GCode after conversion:') }}</p>
             <div class="control-group" data-bind="visible: showExpertSettings ">
+				<p>{{ _('Store GCode after conversion:') }}</p>
                 <label class="control-label">{{ _('GCode Filename') }}</label>
                 <div class="controls">
                     <div class="input-append">