update save dialogs

instat/clsPopup.vb

@@ -1,3 +1,152 @@
-Public Class clsPopup
+' R- Instat
+' Copyright (C) 2015-2017
+'
+' This program is free software: you can redistribute it and/or modify
+' it under the terms of the GNU General Public License as published by
+' the Free Software Foundation, either version 3 of the License, or
+' (at your option) any later version.
+'
+' This program is distributed in the hope that it will be useful,
+' but WITHOUT ANY WARRANTY; without even the implied warranty of
+' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+' GNU General Public License for more details.
+'
+' You should have received a copy of the GNU General Public License 
+' along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+'''--------------------------------------------------------------------------------------------
+''' <summary>
+''' An object of this class represents a popup component that's used and displayed as a control.
+''' <list type="bullet">
+'''     <item><description>
+'''                  set contents control of the popup
+'''     </description></item>
+'''     <item><description>
+'''                  set size of the popup
+'''     </description></item>
+'''     <item><description>
+'''                  specify the display position of the popup relative to the owner. Default is top
+'''     </description></item>
+'''     <item><description>
+'''                  attach the owner control and show the popup
+'''     </description></item>
+'''  </list>
+''' </summary>
+'''--------------------------------------------------------------------------------------------
+Public Class clsPopup
+    ''' <summary> 
+    ''' Event raised when the contents control loses focus. 
+    ''' This indicates that the popup is closing. 
+    '''</summary>
+    Public Event Closing()
+
+    ''' <summary>
+    ''' Container used as the 'frame' of the popup component
+    ''' </summary>
+    Private ReadOnly frm As Form
+
+    ''' <summary>
+    ''' specifies if the popup should hide automatically on lost focus or not
+    ''' </summary>
+    Public Property AutoHide As Boolean
+
+    ''' <summary>
+    ''' specifies the position of the popup relative to the owner(control)
+    ''' </summary> 
+    Public Property Position As PopupPosition
+
+    ''' <summary>
+    ''' enumeration of allowable popup positions
+    ''' </summary>
+    Public Enum PopupPosition
+        Top
+        Below
+    End Enum
+
+    Sub New()
+        'initialise variables and set defaults
+        frm = New Form With {
+            .ShowInTaskbar = False,
+            .FormBorderStyle = FormBorderStyle.None,
+            .StartPosition = FormStartPosition.Manual
+        }
+        'set default popup behaviours
+        AutoHide = True
+        Position = PopupPosition.Top
+    End Sub
+
+    Public Sub SetSize(width As Integer, height As Integer)
+        SetSize(New Size(width, height))
+    End Sub
+
+    Public Sub SetSize(size As Size)
+        frm.Size = size
+    End Sub
+
+    Public Sub SetLocation(x As Integer, y As Integer)
+        SetLocation(New Point(x, y))
+    End Sub
+
+    Public Sub SetLocation(point As Point)
+        frm.Location = point
+    End Sub
+
+    ''' <summary>
+    ''' sets the specified control as the contents control of the popup
+    ''' </summary>
+    ''' <param name="ctr">The System.Windows.Forms.Control to set as the control contained in the popup</param>
+    Public Sub SetContentControl(ctr As Control)
+        frm.Controls.Clear() 'remove any existing control first
+        frm.Controls.Add(ctr)
+        ctr.Dock = DockStyle.Fill 'the control will always be same size as the from
+
+        'attach the event handler that will determine auto closing
+        AddHandler ctr.LostFocus, Sub()
+                                      If AutoHide Then
+                                          Hide()
+                                      End If
+                                  End Sub
+    End Sub
+
+    ''' <summary>
+    ''' shows the popup relative to the location of the specified control(owner) 
+    ''' and the position specified
+    ''' </summary>
+    ''' <param name="owner">The System.Windows.Forms.Control to set popup location based on</param>
+    ''' <param name="position">PopupPosition to set the position of the popup</param>
+    Public Sub Show(owner As Control, position As PopupPosition)
+        Me.Position = position
+        Show(owner)
+    End Sub
+
+    ''' <summary>
+    ''' shows the popup relative to the location of the specified control(owner) 
+    '''  and the position set
+    ''' </summary>
+    ''' <param name="owner">The System.Windows.Forms.Control to set popup location based on</param> 
+    Public Sub Show(owner As Control)
+        'compute and get the location of the specified control relative to screen coordinates
+        'Don't use Point.Empty, it's not function so use Point(0, 0)
+        Dim ctrPos As Point = owner.PointToScreen(New Point(0, 0))
+
+        'then set location of the popup relative to the position specified
+        Select Case Position
+            Case PopupPosition.Top
+                SetLocation(ctrPos.X - 2, ctrPos.Y - frm.Height - 2)
+            Case PopupPosition.Below
+                SetLocation(ctrPos.X - 2, ctrPos.Y + owner.Height - 2)
+        End Select
+
+        'then show popup
+        frm.Show()
+    End Sub
+
+    ''' <summary>
+    ''' raises popup hiding event then hides the popup
+    ''' </summary>
+    Public Sub Hide()
+        RaiseEvent Closing()
+        frm.Close()
+    End Sub
 
 End Class

instat/dlgClimaticCheckDataTemperature.vb

@@ -107,11 +107,15 @@ Public Class dlgClimaticCheckDataTemperature
         ucrReceiverElement1.SetParameter(New RParameter("x", 0, bNewIncludeArgumentName:=False))
         ucrReceiverElement1.SetParameterIsString()
         ucrReceiverElement1.bWithQuotes = False
+        ucrReceiverElement1.SetClimaticType("temp_max")
+        ucrReceiverElement1.bAutoFill = True
         ucrReceiverElement1.SetMeAsReceiver()
 
         ucrReceiverElement2.Selector = ucrSelectorTemperature
         ucrReceiverElement2.SetParameter(New RParameter("x", 1, bNewIncludeArgumentName:=False))
         ucrReceiverElement2.SetParameterIsString()
+        ucrReceiverElement2.SetClimaticType("temp_min")
+        ucrReceiverElement2.bAutoFill = True
         ucrReceiverElement2.bWithQuotes = False
 
         'Checkboxes for options

instat/dlgClimsoftWizard.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+
+    Version 2.0
+
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+
+    Example:
+
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

instat/dlgClimsoftWizard.vb

@@ -0,0 +1,3 @@
+Public Class dlgClimsoftWizard
+
+End Class

instat/dlgCumulativeDistribution.resx

@@ -157,13 +157,13 @@
     <value>10, 236</value>
   </data>
   <data name="cmdPlotOptions.Size" type="System.Drawing.Size, System.Drawing">
-    <value>120, 25</value>
+    <value>119, 23</value>
   </data>
   <data name="cmdPlotOptions.TabIndex" type="System.Int32, mscorlib">
     <value>7</value>
   </data>
   <data name="cmdPlotOptions.Text" xml:space="preserve">
-    <value>Options</value>
+    <value>Plot Options</value>
   </data>
   <data name="&gt;&gt;cmdPlotOptions.Name" xml:space="preserve">
     <value>cmdPlotOptions</value>

instat/dlgDescribeTwoVarGraph.resx

@@ -126,14 +126,14 @@
     <value>10, 197</value>
   </data>
   <data name="cmdOptions.Size" type="System.Drawing.Size, System.Drawing">
-    <value>120, 23</value>
+    <value>119, 23</value>
   </data>
   <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="cmdOptions.TabIndex" type="System.Int32, mscorlib">
     <value>5</value>
   </data>
   <data name="cmdOptions.Text" xml:space="preserve">
-    <value>Options</value>
+    <value>Plot Options</value>
   </data>
   <data name="&gt;&gt;cmdOptions.Name" xml:space="preserve">
     <value>cmdOptions</value>
@@ -804,4 +804,4 @@
   <data name="&gt;&gt;ucrReceiverSecondVar.ZOrder" xml:space="preserve">
     <value>5</value>
   </data>
-</root>
+</root>