diff --git a/FloatingGlucose/App.config b/FloatingGlucose/App.config index 60214f1..f96729a 100644 --- a/FloatingGlucose/App.config +++ b/FloatingGlucose/App.config @@ -77,6 +77,9 @@ Stretch + + False + diff --git a/FloatingGlucose/FloatingGlucose.cs b/FloatingGlucose/FloatingGlucose.cs index 0002450..5b6cbbf 100644 --- a/FloatingGlucose/FloatingGlucose.cs +++ b/FloatingGlucose/FloatingGlucose.cs @@ -509,7 +509,16 @@ private void FloatingGlucose_Load(object sender, EventArgs e) // as this messes up the gui a bit // we avoid this: double foo=7.0; foo.toString() => "7,0" in the nb-NO culture Thread.CurrentThread.CurrentCulture = CultureInfo.CreateSpecificCulture("en-GB"); - this.notifyIcon1.Icon = Properties.Resources.noun_335372_cc_v2; + + if (Default.EnableInvertedTrayIcon == true) + { + this.notifyIcon1.Icon = Properties.Resources.noun_335372_cc_v2_inverted; + } + else + { + this.notifyIcon1.Icon = Properties.Resources.noun_335372_cc_v2; + } + SystemEvents.SessionSwitch += SystemEvents_SessionSwitch; this.lblRawDelta.Visible = diff --git a/FloatingGlucose/FloatingGlucose.csproj b/FloatingGlucose/FloatingGlucose.csproj index 39f7a14..9b11dc1 100644 --- a/FloatingGlucose/FloatingGlucose.csproj +++ b/FloatingGlucose/FloatingGlucose.csproj @@ -234,6 +234,7 @@ Always + diff --git a/FloatingGlucose/FormGlucoseSettings.Designer.cs b/FloatingGlucose/FormGlucoseSettings.Designer.cs index 259d4ae..9462b6f 100644 --- a/FloatingGlucose/FormGlucoseSettings.Designer.cs +++ b/FloatingGlucose/FormGlucoseSettings.Designer.cs @@ -92,6 +92,9 @@ private void InitializeComponent() this.lblVersionInfo = new System.Windows.Forms.Label(); this.lblAck = new System.Windows.Forms.Label(); this.clrBack = new System.Windows.Forms.ColorDialog(); + this.chkEnableInvertedTrayIcon = new System.Windows.Forms.CheckBox(); + this.label20 = new System.Windows.Forms.Label(); + this.label21 = new System.Windows.Forms.Label(); this.groupBox1.SuspendLayout(); this.paneUserNamePassword.SuspendLayout(); this.panel2.SuspendLayout(); @@ -125,7 +128,7 @@ private void InitializeComponent() this.groupBox1.Controls.Add(this.lblDataSourceLocation); this.groupBox1.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.groupBox1.Location = new System.Drawing.Point(18, 11); - this.groupBox1.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.groupBox1.Margin = new System.Windows.Forms.Padding(2); this.groupBox1.Name = "groupBox1"; this.groupBox1.Padding = new System.Windows.Forms.Padding(15, 2, 2, 2); this.groupBox1.Size = new System.Drawing.Size(630, 194); @@ -141,7 +144,7 @@ private void InitializeComponent() this.paneUserNamePassword.Controls.Add(this.lblPassword); this.paneUserNamePassword.Enabled = false; this.paneUserNamePassword.Location = new System.Drawing.Point(7, 103); - this.paneUserNamePassword.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.paneUserNamePassword.Margin = new System.Windows.Forms.Padding(2); this.paneUserNamePassword.Name = "paneUserNamePassword"; this.paneUserNamePassword.Size = new System.Drawing.Size(619, 89); this.paneUserNamePassword.TabIndex = 14; @@ -151,7 +154,7 @@ private void InitializeComponent() this.txtPassword.Anchor = System.Windows.Forms.AnchorStyles.None; this.txtPassword.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.txtPassword.Location = new System.Drawing.Point(247, 50); - this.txtPassword.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.txtPassword.Margin = new System.Windows.Forms.Padding(2); this.txtPassword.MaximumSize = new System.Drawing.Size(256, 28); this.txtPassword.MinimumSize = new System.Drawing.Size(218, 20); this.txtPassword.Name = "txtPassword"; @@ -166,7 +169,7 @@ private void InitializeComponent() this.txtUserName.Anchor = System.Windows.Forms.AnchorStyles.None; this.txtUserName.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.txtUserName.Location = new System.Drawing.Point(247, 17); - this.txtUserName.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.txtUserName.Margin = new System.Windows.Forms.Padding(2); this.txtUserName.MaximumSize = new System.Drawing.Size(256, 28); this.txtUserName.MinimumSize = new System.Drawing.Size(218, 20); this.txtUserName.Name = "txtUserName"; @@ -201,7 +204,7 @@ private void InitializeComponent() this.txtDataSourceLocation.Anchor = System.Windows.Forms.AnchorStyles.None; this.txtDataSourceLocation.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.txtDataSourceLocation.Location = new System.Drawing.Point(254, 56); - this.txtDataSourceLocation.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.txtDataSourceLocation.Margin = new System.Windows.Forms.Padding(2); this.txtDataSourceLocation.MaximumSize = new System.Drawing.Size(256, 28); this.txtDataSourceLocation.MinimumSize = new System.Drawing.Size(218, 20); this.txtDataSourceLocation.Name = "txtDataSourceLocation"; @@ -215,7 +218,7 @@ private void InitializeComponent() this.btnBrowse.BackColor = System.Drawing.Color.Transparent; this.btnBrowse.FlatAppearance.BorderSize = 0; this.btnBrowse.Location = new System.Drawing.Point(525, 46); - this.btnBrowse.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.btnBrowse.Margin = new System.Windows.Forms.Padding(2); this.btnBrowse.Name = "btnBrowse"; this.btnBrowse.Size = new System.Drawing.Size(80, 28); this.btnBrowse.TabIndex = 7; @@ -228,7 +231,7 @@ private void InitializeComponent() this.cbDataSource.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cbDataSource.FormattingEnabled = true; this.cbDataSource.Location = new System.Drawing.Point(254, 21); - this.cbDataSource.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.cbDataSource.Margin = new System.Windows.Forms.Padding(2); this.cbDataSource.Name = "cbDataSource"; this.cbDataSource.Size = new System.Drawing.Size(256, 25); this.cbDataSource.TabIndex = 6; @@ -242,7 +245,7 @@ private void InitializeComponent() this.tblpDataSourceLocations.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); this.tblpDataSourceLocations.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); this.tblpDataSourceLocations.Location = new System.Drawing.Point(341, 49); - this.tblpDataSourceLocations.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.tblpDataSourceLocations.Margin = new System.Windows.Forms.Padding(2); this.tblpDataSourceLocations.Name = "tblpDataSourceLocations"; this.tblpDataSourceLocations.RowCount = 1; this.tblpDataSourceLocations.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); @@ -264,7 +267,7 @@ private void InitializeComponent() // this.btnUnitsMGDL.AutoSize = true; this.btnUnitsMGDL.Location = new System.Drawing.Point(332, 79); - this.btnUnitsMGDL.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.btnUnitsMGDL.Margin = new System.Windows.Forms.Padding(2); this.btnUnitsMGDL.Name = "btnUnitsMGDL"; this.btnUnitsMGDL.Size = new System.Drawing.Size(65, 21); this.btnUnitsMGDL.TabIndex = 4; @@ -276,7 +279,7 @@ private void InitializeComponent() this.btnUnitsMMOL.AutoSize = true; this.btnUnitsMMOL.Checked = true; this.btnUnitsMMOL.Location = new System.Drawing.Point(254, 79); - this.btnUnitsMMOL.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.btnUnitsMMOL.Margin = new System.Windows.Forms.Padding(2); this.btnUnitsMMOL.Name = "btnUnitsMMOL"; this.btnUnitsMMOL.Size = new System.Drawing.Size(71, 21); this.btnUnitsMMOL.TabIndex = 3; @@ -311,7 +314,7 @@ private void InitializeComponent() // this.btnVerifySubmit.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.btnVerifySubmit.Location = new System.Drawing.Point(9, 511); - this.btnVerifySubmit.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.btnVerifySubmit.Margin = new System.Windows.Forms.Padding(2); this.btnVerifySubmit.Name = "btnVerifySubmit"; this.btnVerifySubmit.Size = new System.Drawing.Size(172, 43); this.btnVerifySubmit.TabIndex = 1; @@ -324,7 +327,7 @@ private void InitializeComponent() this.panel2.Controls.Add(this.grpAlarmSettings); this.panel2.Controls.Add(this.groupBox1); this.panel2.Location = new System.Drawing.Point(4, 5); - this.panel2.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.panel2.Margin = new System.Windows.Forms.Padding(2); this.panel2.Name = "panel2"; this.panel2.Padding = new System.Windows.Forms.Padding(38, 8, 38, 8); this.panel2.Size = new System.Drawing.Size(652, 463); @@ -352,7 +355,7 @@ private void InitializeComponent() this.grpAlarmSettings.Controls.Add(this.btnEnableAlarms); this.grpAlarmSettings.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.grpAlarmSettings.Location = new System.Drawing.Point(18, 221); - this.grpAlarmSettings.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.grpAlarmSettings.Margin = new System.Windows.Forms.Padding(2); this.grpAlarmSettings.Name = "grpAlarmSettings"; this.grpAlarmSettings.Padding = new System.Windows.Forms.Padding(15, 2, 2, 2); this.grpAlarmSettings.Size = new System.Drawing.Size(630, 232); @@ -364,7 +367,7 @@ private void InitializeComponent() // this.chkEnableSoundAlarms.AutoSize = true; this.chkEnableSoundAlarms.Location = new System.Drawing.Point(328, 33); - this.chkEnableSoundAlarms.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.chkEnableSoundAlarms.Margin = new System.Windows.Forms.Padding(2); this.chkEnableSoundAlarms.Name = "chkEnableSoundAlarms"; this.chkEnableSoundAlarms.Size = new System.Drawing.Size(15, 14); this.chkEnableSoundAlarms.TabIndex = 19; @@ -384,7 +387,7 @@ private void InitializeComponent() // numStaleUrgent // this.numStaleUrgent.Location = new System.Drawing.Point(292, 201); - this.numStaleUrgent.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.numStaleUrgent.Margin = new System.Windows.Forms.Padding(2); this.numStaleUrgent.Maximum = new decimal(new int[] { 650, 0, @@ -429,7 +432,7 @@ private void InitializeComponent() // numStaleWarning // this.numStaleWarning.Location = new System.Drawing.Point(292, 173); - this.numStaleWarning.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.numStaleWarning.Margin = new System.Windows.Forms.Padding(2); this.numStaleWarning.Maximum = new decimal(new int[] { 650, 0, @@ -480,7 +483,7 @@ private void InitializeComponent() 0, 65536}); this.numUrgentLow.Location = new System.Drawing.Point(292, 145); - this.numUrgentLow.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.numUrgentLow.Margin = new System.Windows.Forms.Padding(2); this.numUrgentLow.Maximum = new decimal(new int[] { 650, 0, @@ -504,7 +507,7 @@ private void InitializeComponent() 0, 65536}); this.numLow.Location = new System.Drawing.Point(292, 118); - this.numLow.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.numLow.Margin = new System.Windows.Forms.Padding(2); this.numLow.Maximum = new decimal(new int[] { 650, 0, @@ -528,7 +531,7 @@ private void InitializeComponent() 0, 65536}); this.numHigh.Location = new System.Drawing.Point(292, 91); - this.numHigh.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.numHigh.Margin = new System.Windows.Forms.Padding(2); this.numHigh.Maximum = new decimal(new int[] { 650, 0, @@ -552,7 +555,7 @@ private void InitializeComponent() 0, 65536}); this.numUrgentHigh.Location = new System.Drawing.Point(292, 64); - this.numUrgentHigh.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.numUrgentHigh.Margin = new System.Windows.Forms.Padding(2); this.numUrgentHigh.Maximum = new decimal(new int[] { 650, 0, @@ -616,7 +619,7 @@ private void InitializeComponent() this.btnDisableAlarms.AutoSize = true; this.btnDisableAlarms.Checked = true; this.btnDisableAlarms.Location = new System.Drawing.Point(14, 29); - this.btnDisableAlarms.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.btnDisableAlarms.Margin = new System.Windows.Forms.Padding(2); this.btnDisableAlarms.Name = "btnDisableAlarms"; this.btnDisableAlarms.Size = new System.Drawing.Size(119, 21); this.btnDisableAlarms.TabIndex = 1; @@ -628,7 +631,7 @@ private void InitializeComponent() // this.btnEnableAlarms.AutoSize = true; this.btnEnableAlarms.Location = new System.Drawing.Point(175, 29); - this.btnEnableAlarms.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.btnEnableAlarms.Margin = new System.Windows.Forms.Padding(2); this.btnEnableAlarms.Name = "btnEnableAlarms"; this.btnEnableAlarms.Size = new System.Drawing.Size(116, 21); this.btnEnableAlarms.TabIndex = 0; @@ -652,7 +655,7 @@ private void InitializeComponent() this.tabSettings.Controls.Add(this.tabPageBasic); this.tabSettings.Controls.Add(this.tabPageAdvanced); this.tabSettings.Location = new System.Drawing.Point(9, 10); - this.tabSettings.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.tabSettings.Margin = new System.Windows.Forms.Padding(2); this.tabSettings.Name = "tabSettings"; this.tabSettings.SelectedIndex = 0; this.tabSettings.Size = new System.Drawing.Size(678, 496); @@ -665,9 +668,9 @@ private void InitializeComponent() this.tabPageBasic.Controls.Add(this.panel2); this.tabPageBasic.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.tabPageBasic.Location = new System.Drawing.Point(4, 22); - this.tabPageBasic.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.tabPageBasic.Margin = new System.Windows.Forms.Padding(2); this.tabPageBasic.Name = "tabPageBasic"; - this.tabPageBasic.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.tabPageBasic.Padding = new System.Windows.Forms.Padding(2); this.tabPageBasic.Size = new System.Drawing.Size(670, 470); this.tabPageBasic.TabIndex = 0; this.tabPageBasic.Text = "Basic Settings"; @@ -678,15 +681,18 @@ private void InitializeComponent() this.tabPageAdvanced.Controls.Add(this.groupBox2); this.tabPageAdvanced.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.tabPageAdvanced.Location = new System.Drawing.Point(4, 22); - this.tabPageAdvanced.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.tabPageAdvanced.Margin = new System.Windows.Forms.Padding(2); this.tabPageAdvanced.Name = "tabPageAdvanced"; - this.tabPageAdvanced.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.tabPageAdvanced.Padding = new System.Windows.Forms.Padding(2); this.tabPageAdvanced.Size = new System.Drawing.Size(670, 470); this.tabPageAdvanced.TabIndex = 1; this.tabPageAdvanced.Text = "Advanced Settings"; // // groupBox2 // + this.groupBox2.Controls.Add(this.label21); + this.groupBox2.Controls.Add(this.chkEnableInvertedTrayIcon); + this.groupBox2.Controls.Add(this.label20); this.groupBox2.Controls.Add(this.cbImageLayouts); this.groupBox2.Controls.Add(this.label24); this.groupBox2.Controls.Add(this.btnBrowseBackImage); @@ -709,7 +715,7 @@ private void InitializeComponent() this.groupBox2.Controls.Add(this.label7); this.groupBox2.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.groupBox2.Location = new System.Drawing.Point(26, 15); - this.groupBox2.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.groupBox2.Margin = new System.Windows.Forms.Padding(2); this.groupBox2.Name = "groupBox2"; this.groupBox2.Padding = new System.Windows.Forms.Padding(15, 2, 2, 2); this.groupBox2.Size = new System.Drawing.Size(630, 435); @@ -721,8 +727,8 @@ private void InitializeComponent() // this.cbImageLayouts.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cbImageLayouts.FormattingEnabled = true; - this.cbImageLayouts.Location = new System.Drawing.Point(289, 282); - this.cbImageLayouts.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.cbImageLayouts.Location = new System.Drawing.Point(289, 285); + this.cbImageLayouts.Margin = new System.Windows.Forms.Padding(2); this.cbImageLayouts.Name = "cbImageLayouts"; this.cbImageLayouts.Size = new System.Drawing.Size(135, 25); this.cbImageLayouts.TabIndex = 25; @@ -731,7 +737,7 @@ private void InitializeComponent() // this.label24.AutoSize = true; this.label24.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label24.Location = new System.Drawing.Point(28, 288); + this.label24.Location = new System.Drawing.Point(28, 291); this.label24.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label24.Name = "label24"; this.label24.Size = new System.Drawing.Size(173, 17); @@ -742,8 +748,8 @@ private void InitializeComponent() // this.btnBrowseBackImage.BackColor = System.Drawing.Color.Transparent; this.btnBrowseBackImage.FlatAppearance.BorderSize = 0; - this.btnBrowseBackImage.Location = new System.Drawing.Point(448, 249); - this.btnBrowseBackImage.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.btnBrowseBackImage.Location = new System.Drawing.Point(448, 252); + this.btnBrowseBackImage.Margin = new System.Windows.Forms.Padding(2); this.btnBrowseBackImage.Name = "btnBrowseBackImage"; this.btnBrowseBackImage.Size = new System.Drawing.Size(80, 28); this.btnBrowseBackImage.TabIndex = 23; @@ -755,8 +761,8 @@ private void InitializeComponent() // this.txtBackImage.Anchor = System.Windows.Forms.AnchorStyles.None; this.txtBackImage.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.txtBackImage.Location = new System.Drawing.Point(168, 252); - this.txtBackImage.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.txtBackImage.Location = new System.Drawing.Point(168, 255); + this.txtBackImage.Margin = new System.Windows.Forms.Padding(2); this.txtBackImage.MaximumSize = new System.Drawing.Size(256, 28); this.txtBackImage.MinimumSize = new System.Drawing.Size(218, 20); this.txtBackImage.Name = "txtBackImage"; @@ -768,7 +774,7 @@ private void InitializeComponent() // this.label23.AutoSize = true; this.label23.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label23.Location = new System.Drawing.Point(28, 252); + this.label23.Location = new System.Drawing.Point(28, 255); this.label23.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label23.Name = "label23"; this.label23.Size = new System.Drawing.Size(126, 17); @@ -777,8 +783,8 @@ private void InitializeComponent() // // txtBackColor // - this.txtBackColor.Location = new System.Drawing.Point(312, 219); - this.txtBackColor.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.txtBackColor.Location = new System.Drawing.Point(312, 222); + this.txtBackColor.Margin = new System.Windows.Forms.Padding(2); this.txtBackColor.Name = "txtBackColor"; this.txtBackColor.ReadOnly = true; this.txtBackColor.Size = new System.Drawing.Size(112, 23); @@ -789,7 +795,7 @@ private void InitializeComponent() // this.label22.AutoSize = true; this.label22.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label22.Location = new System.Drawing.Point(28, 219); + this.label22.Location = new System.Drawing.Point(28, 222); this.label22.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label22.Name = "label22"; this.label22.Size = new System.Drawing.Size(121, 17); @@ -810,7 +816,7 @@ private void InitializeComponent() // numOpacity // this.numOpacity.Location = new System.Drawing.Point(333, 95); - this.numOpacity.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.numOpacity.Margin = new System.Windows.Forms.Padding(2); this.numOpacity.Name = "numOpacity"; this.numOpacity.Size = new System.Drawing.Size(90, 23); this.numOpacity.TabIndex = 17; @@ -834,8 +840,8 @@ private void InitializeComponent() // chkDisableSoundOnWorkstationLock // this.chkDisableSoundOnWorkstationLock.AutoSize = true; - this.chkDisableSoundOnWorkstationLock.Location = new System.Drawing.Point(410, 188); - this.chkDisableSoundOnWorkstationLock.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.chkDisableSoundOnWorkstationLock.Location = new System.Drawing.Point(410, 191); + this.chkDisableSoundOnWorkstationLock.Margin = new System.Windows.Forms.Padding(2); this.chkDisableSoundOnWorkstationLock.Name = "chkDisableSoundOnWorkstationLock"; this.chkDisableSoundOnWorkstationLock.Size = new System.Drawing.Size(15, 14); this.chkDisableSoundOnWorkstationLock.TabIndex = 15; @@ -845,7 +851,7 @@ private void InitializeComponent() // this.label16.AutoSize = true; this.label16.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label16.Location = new System.Drawing.Point(28, 188); + this.label16.Location = new System.Drawing.Point(28, 191); this.label16.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label16.Name = "label16"; this.label16.Size = new System.Drawing.Size(353, 17); @@ -856,7 +862,7 @@ private void InitializeComponent() // this.chkEnableRAWGlucose.AutoSize = true; this.chkEnableRAWGlucose.Location = new System.Drawing.Point(410, 162); - this.chkEnableRAWGlucose.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.chkEnableRAWGlucose.Margin = new System.Windows.Forms.Padding(2); this.chkEnableRAWGlucose.Name = "chkEnableRAWGlucose"; this.chkEnableRAWGlucose.Size = new System.Drawing.Size(15, 14); this.chkEnableRAWGlucose.TabIndex = 13; @@ -866,7 +872,7 @@ private void InitializeComponent() // this.label10.AutoSize = true; this.label10.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label10.Location = new System.Drawing.Point(28, 160); + this.label10.Location = new System.Drawing.Point(28, 163); this.label10.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label10.Name = "label10"; this.label10.Size = new System.Drawing.Size(240, 17); @@ -882,7 +888,7 @@ private void InitializeComponent() 0, 65536}); this.numScaling.Location = new System.Drawing.Point(333, 66); - this.numScaling.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.numScaling.Margin = new System.Windows.Forms.Padding(2); this.numScaling.Name = "numScaling"; this.numScaling.Size = new System.Drawing.Size(90, 23); this.numScaling.TabIndex = 11; @@ -896,7 +902,7 @@ private void InitializeComponent() // this.chkEnableExceptions.AutoSize = true; this.chkEnableExceptions.Location = new System.Drawing.Point(410, 131); - this.chkEnableExceptions.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.chkEnableExceptions.Margin = new System.Windows.Forms.Padding(2); this.chkEnableExceptions.Name = "chkEnableExceptions"; this.chkEnableExceptions.Size = new System.Drawing.Size(15, 14); this.chkEnableExceptions.TabIndex = 10; @@ -927,7 +933,7 @@ private void InitializeComponent() // numRefreshInterval // this.numRefreshInterval.Location = new System.Drawing.Point(333, 37); - this.numRefreshInterval.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.numRefreshInterval.Margin = new System.Windows.Forms.Padding(2); this.numRefreshInterval.Minimum = new decimal(new int[] { 2, 0, @@ -977,6 +983,38 @@ private void InitializeComponent() this.lblAck.TabIndex = 5; this.lblAck.Text = "Acks..."; // + // chkEnableInvertedTrayIcon + // + this.chkEnableInvertedTrayIcon.AutoSize = true; + this.chkEnableInvertedTrayIcon.Location = new System.Drawing.Point(410, 329); + this.chkEnableInvertedTrayIcon.Margin = new System.Windows.Forms.Padding(2); + this.chkEnableInvertedTrayIcon.Name = "chkEnableInvertedTrayIcon"; + this.chkEnableInvertedTrayIcon.Size = new System.Drawing.Size(15, 14); + this.chkEnableInvertedTrayIcon.TabIndex = 27; + this.chkEnableInvertedTrayIcon.UseVisualStyleBackColor = true; + // + // label20 + // + this.label20.AutoSize = true; + this.label20.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label20.Location = new System.Drawing.Point(28, 329); + this.label20.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label20.Name = "label20"; + this.label20.Size = new System.Drawing.Size(138, 17); + this.label20.TabIndex = 26; + this.label20.Text = "Use inverted try icon"; + // + // label21 + // + this.label21.AutoSize = true; + this.label21.Font = new System.Drawing.Font("Microsoft Sans Serif", 10.2F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label21.Location = new System.Drawing.Point(427, 42); + this.label21.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label21.Name = "label21"; + this.label21.Size = new System.Drawing.Size(30, 17); + this.label21.TabIndex = 28; + this.label21.Text = "sec"; + // // FormGlucoseSettings // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -988,7 +1026,7 @@ private void InitializeComponent() this.Controls.Add(this.tabSettings); this.Controls.Add(this.btnVerifySubmit); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; - this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2); + this.Margin = new System.Windows.Forms.Padding(2); this.Name = "FormGlucoseSettings"; this.Text = "Glucose Settings"; this.Load += new System.EventHandler(this.FormGlucoseSettings_Load); @@ -1084,5 +1122,8 @@ private void InitializeComponent() private System.Windows.Forms.Label label24; public System.Windows.Forms.Label lblUsername; public System.Windows.Forms.Label lblPassword; + private System.Windows.Forms.Label label21; + private System.Windows.Forms.CheckBox chkEnableInvertedTrayIcon; + private System.Windows.Forms.Label label20; } } diff --git a/FloatingGlucose/FormGlucoseSettings.cs b/FloatingGlucose/FormGlucoseSettings.cs index c975c08..0e2d8fb 100644 --- a/FloatingGlucose/FormGlucoseSettings.cs +++ b/FloatingGlucose/FormGlucoseSettings.cs @@ -68,6 +68,9 @@ private void updateFormControlsFromSettings() this.txtBackColor.Text = Default.BackgroundColorHex; this.txtBackImage.Text = Default.BackgroundImage; this.cbImageLayouts.SelectedItem = Default.BackgroundImageLayout; + + this.chkEnableInvertedTrayIcon.Checked = Default.EnableInvertedTrayIcon; + //this is the default in the settings file //override it so it makes sense if (nsurl == "https://...") @@ -249,6 +252,7 @@ private void btnVerifySubmit_Click(object sender, EventArgs e) Default.BackgroundColorHex = this.txtBackColor.Text; Default.BackgroundImage = this.txtBackImage.Text; + Default.EnableInvertedTrayIcon = this.chkEnableInvertedTrayIcon.Checked; //Save plugin type based on the selected fullname Default.DataSourceFullName = (this.cbDataSource.SelectedItem as DataSourceInfo).FullName; diff --git a/FloatingGlucose/Properties/Resources.Designer.cs b/FloatingGlucose/Properties/Resources.Designer.cs index 49abc63..a925db4 100644 --- a/FloatingGlucose/Properties/Resources.Designer.cs +++ b/FloatingGlucose/Properties/Resources.Designer.cs @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// Runtime version:4.0.30319.42000 // -// Changes to this file may cause incorrect behavior and will be lost if +// Changes to this file can cause incorrect behavior and are lost if // the code is regenerated. // //------------------------------------------------------------------------------ @@ -13,13 +13,13 @@ namespace FloatingGlucose.Properties { /// - /// A strongly-typed resource class, for looking up localized strings, etc. + /// A highly typed resource class to search for localized strings etc. /// - // This class was auto-generated by the StronglyTypedResourceBuilder - // class via a tool like ResGen or Visual Studio. - // To add or remove a member, edit your .ResX file then rerun ResGen - // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + // This class was automatically generated by StronglyTypedResourceBuilder. + // -class via a tool like ResGen or Visual Studio. + // To add or remove a member, edit the .ResX file and then run ResGen + // with the /str option again, or you can recreate your PC project. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { @@ -47,8 +47,8 @@ internal Resources() { } /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. + /// Overwrites the CurrentUICulture property of the current thread for all + /// Resource assignments that use this highly typed resource class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Globalization.CultureInfo Culture { @@ -61,7 +61,7 @@ internal Resources() { } /// - /// Looks up a localized resource of type System.Byte[]. + /// Searches for a localized resource of type System.Byte[]. /// internal static byte[] alarm { get { @@ -71,7 +71,7 @@ internal static byte[] alarm { } /// - /// Looks up a localized resource of type System.Byte[]. + /// Searches for a localized resource of type System.Byte[]. /// internal static byte[] alarm2 { get { @@ -81,7 +81,7 @@ internal static byte[] alarm2 { } /// - /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). + /// Searches for a localized resource of type System.Drawing.Icon similar to (icon). /// internal static System.Drawing.Icon browse_file { get { @@ -91,7 +91,7 @@ internal static System.Drawing.Icon browse_file { } /// - /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). + /// Searches for a localized resource of type System.Drawing.Icon similar to (icon). /// internal static System.Drawing.Icon noun_335372_cc_v2 { get { @@ -99,5 +99,15 @@ internal static System.Drawing.Icon noun_335372_cc_v2 { return ((System.Drawing.Icon)(obj)); } } + + /// + /// Searches for a localized resource of type System.Drawing.Icon similar to (icon). + /// + internal static System.Drawing.Icon noun_335372_cc_v2_inverted { + get { + object obj = ResourceManager.GetObject("noun_335372_cc_v2_inverted", resourceCulture); + return ((System.Drawing.Icon)(obj)); + } + } } } diff --git a/FloatingGlucose/Properties/Resources.resx b/FloatingGlucose/Properties/Resources.resx index d9f8ed9..3a70b03 100644 --- a/FloatingGlucose/Properties/Resources.resx +++ b/FloatingGlucose/Properties/Resources.resx @@ -130,4 +130,7 @@ ..\Resources\noun_335372_cc_v2.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\noun_335372_cc_v2_inverted.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/FloatingGlucose/Properties/Settings.Designer.cs b/FloatingGlucose/Properties/Settings.Designer.cs index ffcad4c..c4cd945 100644 --- a/FloatingGlucose/Properties/Settings.Designer.cs +++ b/FloatingGlucose/Properties/Settings.Designer.cs @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// Runtime version:4.0.30319.42000 // -// Changes to this file may cause incorrect behavior and will be lost if +// Changes to this file can cause incorrect behavior and are lost if // the code is regenerated. // //------------------------------------------------------------------------------ @@ -12,7 +12,7 @@ namespace FloatingGlucose.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.0.1.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.2.0.0")] public sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); @@ -285,5 +285,17 @@ public string BackgroundImageLayout { this["BackgroundImageLayout"] = value; } } + + [global::System.Configuration.UserScopedSettingAttribute()] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Configuration.DefaultSettingValueAttribute("False")] + public bool EnableInvertedTrayIcon { + get { + return ((bool)(this["EnableInvertedTrayIcon"])); + } + set { + this["EnableInvertedTrayIcon"] = value; + } + } } } diff --git a/FloatingGlucose/Properties/Settings.settings b/FloatingGlucose/Properties/Settings.settings index 7e05cb7..0e7f463 100644 --- a/FloatingGlucose/Properties/Settings.settings +++ b/FloatingGlucose/Properties/Settings.settings @@ -68,5 +68,8 @@ Stretch + + False + \ No newline at end of file diff --git a/FloatingGlucose/Resources/noun_335372_cc_v2_inverted.ico b/FloatingGlucose/Resources/noun_335372_cc_v2_inverted.ico new file mode 100644 index 0000000..a194ee6 Binary files /dev/null and b/FloatingGlucose/Resources/noun_335372_cc_v2_inverted.ico differ