Maintance: remove trailing slashes from url and diable broken yr plugin

dabear · Jan 14, 2019 · 03fdb57 · 03fdb57
1 parent 0df8630
commit 03fdb57
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/FloatingGlucose/Classes/DataSources/Plugins/YrWeatherService/YrWeatherServiceEndpoint.cs b/FloatingGlucose/Classes/DataSources/Plugins/YrWeatherService/YrWeatherServiceEndpoint.cs
@@ -22,7 +22,7 @@ internal class YrWeatherServiceEndpoint : IDataSourcePlugin
         public bool PluginHandlesFormatting => true;
         public bool RequiresUserNameAndPassword => false;
         public bool RequiresDataSource => true;
-        public bool PluginDisabled => false;
+        public bool PluginDisabled => true;
         public bool RequiresBrowseButton => false;
         public string BrowseDialogFileFilter => "";
         public string DataSourceShortName => "Yr.no Weather";

diff --git a/FloatingGlucose/FloatingGlucose.cs b/FloatingGlucose/FloatingGlucose.cs
@@ -33,10 +33,11 @@ private NameValueCollection datasourceLocation
                 // data points to calculate raw glucose diff
                 var count = Default.EnableRawGlucoseDisplay ? 2 : 1;
                 var units = Default.GlucoseUnits;
+                var urlstripped = Default.DataPathLocation.TrimEnd('/');
                 return new NameValueCollection()
                 {
                     { "raw", Default.DataPathLocation },
-                    { "location", $"{Default.DataPathLocation}/pebble?count={count}&units={units}"}
+                    { "location", $"{urlstripped}/pebble?count={count}&units={units}"}
                 };
             }
         }
@@ -57,6 +58,17 @@ private FormGlucoseSettings settingsForm
                 return this._settingsForm;
             }
         }
+        [DllImport("Gdi32.dll", EntryPoint = "CreateRoundRectRgn")]
+        private static extern IntPtr CreateRoundRectRgn
+        (
+            int nLeftRect, // x-coordinate of upper-left corner
+            int nTopRect, // y-coordinate of upper-left corner
+            int nRightRect, // x-coordinate of lower-right corner
+            int nBottomRect, // y-coordinate of lower-right corner
+            int nWidthEllipse, // height of ellipse
+            int nHeightEllipse // width of ellipse
+        );
+
 
         public const int WM_NCLBUTTONDOWN = 0xA1;
         public const int HT_CAPTION = 0x2;
@@ -105,6 +117,8 @@ public FloatingGlucose()
                 var r = Screen.PrimaryScreen.WorkingArea;
                 this.Location = new Point(r.Width - this.Width, r.Height - this.Height);
             }
+            //draws round corners
+            //this.Region = System.Drawing.Region.FromHrgn(CreateRoundRectRgn(Width, Height, Width, Height, 20, 20));
         }
 
         private void setFormSize()