diff --git a/.semver.txt b/.semver.txt index 672e5f5..42de374 100644 --- a/.semver.txt +++ b/.semver.txt @@ -1 +1 @@ -1.0.39 +1.0.40 diff --git a/src/JiraTimeBot/Properties/AssemblyInfo.cs b/src/JiraTimeBot/Properties/AssemblyInfo.cs index 1d9f62b..9e6dc8d 100644 --- a/src/JiraTimeBot/Properties/AssemblyInfo.cs +++ b/src/JiraTimeBot/Properties/AssemblyInfo.cs @@ -1,31 +1,31 @@ -using System.Reflection; -using System.Runtime.InteropServices; -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("JiraTimeBot")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("JiraTimeBot")] -[assembly: AssemblyCopyright("Copyright © 2019")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("f3b89316-c38c-4ce6-9d88-0b1373cfba1a")] -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -[assembly: AssemblyVersion("1.0.39")] -[assembly: AssemblyFileVersion("1.0.39")] -[assembly: AssemblyInformationalVersion("1.0.39")] +using System.Reflection; +using System.Runtime.InteropServices; +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("JiraTimeBot")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("JiraTimeBot")] +[assembly: AssemblyCopyright("Copyright © 2019")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("f3b89316-c38c-4ce6-9d88-0b1373cfba1a")] +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +[assembly: AssemblyVersion("1.0.40")] +[assembly: AssemblyFileVersion("1.0.40")] +[assembly: AssemblyInformationalVersion("1.0.40")] diff --git a/src/JiraTimeBot/UI/frmMain.Designer.cs b/src/JiraTimeBot/UI/frmMain.Designer.cs index d0f30f8..66a0910 100644 --- a/src/JiraTimeBot/UI/frmMain.Designer.cs +++ b/src/JiraTimeBot/UI/frmMain.Designer.cs @@ -30,39 +30,25 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmMain)); - this.txtLog = new System.Windows.Forms.TextBox(); - this.btnStart = new System.Windows.Forms.Button(); this.ntfyIcon = new System.Windows.Forms.NotifyIcon(this.components); this.tmrStart = new System.Windows.Forms.Timer(this.components); - this.txtDummyMode = new System.Windows.Forms.CheckBox(); - this.btnMeeting = new System.Windows.Forms.Button(); - this.btnCancel = new System.Windows.Forms.Button(); - this.btnSettings = new System.Windows.Forms.Button(); this.tmrUpdate = new System.Windows.Forms.Timer(this.components); - this.dteForDay = new System.Windows.Forms.DateTimePicker(); + this.tlpControls = new System.Windows.Forms.TableLayoutPanel(); + this.panel2 = new System.Windows.Forms.Panel(); + this.btnCancel = new System.Windows.Forms.Button(); + this.btnMeeting = new System.Windows.Forms.Button(); + this.txtDummyMode = new System.Windows.Forms.CheckBox(); + this.btnStart = new System.Windows.Forms.Button(); + this.pnlTopControls = new System.Windows.Forms.Panel(); this.btnDoForDate = new System.Windows.Forms.Button(); + this.dteForDay = new System.Windows.Forms.DateTimePicker(); + this.btnSettings = new System.Windows.Forms.Button(); + this.txtLog = new System.Windows.Forms.TextBox(); + this.tlpControls.SuspendLayout(); + this.panel2.SuspendLayout(); + this.pnlTopControls.SuspendLayout(); this.SuspendLayout(); // - // txtLog - // - this.txtLog.Location = new System.Drawing.Point(132, 16); - this.txtLog.Multiline = true; - this.txtLog.Name = "txtLog"; - this.txtLog.ReadOnly = true; - this.txtLog.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; - this.txtLog.Size = new System.Drawing.Size(596, 294); - this.txtLog.TabIndex = 11; - // - // btnStart - // - this.btnStart.Location = new System.Drawing.Point(12, 229); - this.btnStart.Name = "btnStart"; - this.btnStart.Size = new System.Drawing.Size(114, 23); - this.btnStart.TabIndex = 12; - this.btnStart.Text = "Проставить время"; - this.btnStart.UseVisualStyleBackColor = true; - this.btnStart.Click += new System.EventHandler(this.btnStart_Click); - // // ntfyIcon // this.ntfyIcon.Text = "notifyIcon1"; @@ -73,111 +59,170 @@ this.tmrStart.Interval = 1500; this.tmrStart.Tick += new System.EventHandler(this.tmrStart_Tick); // - // txtDummyMode - // - this.txtDummyMode.AutoSize = true; - this.txtDummyMode.Location = new System.Drawing.Point(12, 206); - this.txtDummyMode.Name = "txtDummyMode"; - this.txtDummyMode.Size = new System.Drawing.Size(114, 17); - this.txtDummyMode.TabIndex = 13; - this.txtDummyMode.Text = "Тестовый прогон"; - this.txtDummyMode.UseVisualStyleBackColor = true; - // - // btnMeeting - // - this.btnMeeting.Location = new System.Drawing.Point(12, 258); - this.btnMeeting.Name = "btnMeeting"; - this.btnMeeting.Size = new System.Drawing.Size(114, 23); - this.btnMeeting.TabIndex = 14; - this.btnMeeting.Text = "Митинг"; - this.btnMeeting.UseVisualStyleBackColor = true; - this.btnMeeting.Click += new System.EventHandler(this.btnMeeting_Click); - // - // btnCancel - // - this.btnCancel.Enabled = false; - this.btnCancel.Location = new System.Drawing.Point(12, 287); - this.btnCancel.Name = "btnCancel"; - this.btnCancel.Size = new System.Drawing.Size(114, 23); - this.btnCancel.TabIndex = 15; - this.btnCancel.Text = "Отменить операцию"; - this.btnCancel.UseVisualStyleBackColor = true; - this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click); - // - // btnSettings - // - this.btnSettings.Location = new System.Drawing.Point(12, 16); - this.btnSettings.Name = "btnSettings"; - this.btnSettings.Size = new System.Drawing.Size(114, 23); - this.btnSettings.TabIndex = 16; - this.btnSettings.Text = "Настройки"; - this.btnSettings.UseVisualStyleBackColor = true; - this.btnSettings.Click += new System.EventHandler(this.btnSettings_Click); - // // tmrUpdate // this.tmrUpdate.Interval = 1000; this.tmrUpdate.Tick += new System.EventHandler(this.tmrUpdate_Tick); // + // tlpControls + // + this.tlpControls.ColumnCount = 2; + this.tlpControls.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 150F)); + this.tlpControls.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tlpControls.Controls.Add(this.txtLog, 2, 0); + this.tlpControls.Controls.Add(this.panel2, 0, 1); + this.tlpControls.Controls.Add(this.pnlTopControls, 0, 0); + this.tlpControls.Dock = System.Windows.Forms.DockStyle.Fill; + this.tlpControls.Location = new System.Drawing.Point(0, 0); + this.tlpControls.Name = "tlpControls"; + this.tlpControls.RowCount = 2; + this.tlpControls.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tlpControls.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 200F)); + this.tlpControls.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tlpControls.Size = new System.Drawing.Size(759, 416); + this.tlpControls.TabIndex = 19; + // + // panel2 + // + this.panel2.Controls.Add(this.btnCancel); + this.panel2.Controls.Add(this.btnMeeting); + this.panel2.Controls.Add(this.txtDummyMode); + this.panel2.Controls.Add(this.btnStart); + this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom; + this.panel2.Location = new System.Drawing.Point(3, 288); + this.panel2.Name = "panel2"; + this.panel2.Size = new System.Drawing.Size(144, 125); + this.panel2.TabIndex = 25; + // + // btnCancel + // + this.btnCancel.Enabled = false; + this.btnCancel.Location = new System.Drawing.Point(15, 91); + this.btnCancel.Name = "btnCancel"; + this.btnCancel.Size = new System.Drawing.Size(114, 23); + this.btnCancel.TabIndex = 19; + this.btnCancel.Text = "Отменить операцию"; + this.btnCancel.UseVisualStyleBackColor = true; + // + // btnMeeting + // + this.btnMeeting.Location = new System.Drawing.Point(15, 62); + this.btnMeeting.Name = "btnMeeting"; + this.btnMeeting.Size = new System.Drawing.Size(114, 23); + this.btnMeeting.TabIndex = 18; + this.btnMeeting.Text = "Митинг"; + this.btnMeeting.UseVisualStyleBackColor = true; + // + // txtDummyMode + // + this.txtDummyMode.AutoSize = true; + this.txtDummyMode.Location = new System.Drawing.Point(15, 10); + this.txtDummyMode.Name = "txtDummyMode"; + this.txtDummyMode.Size = new System.Drawing.Size(114, 17); + this.txtDummyMode.TabIndex = 17; + this.txtDummyMode.Text = "Тестовый прогон"; + this.txtDummyMode.UseVisualStyleBackColor = true; + // + // btnStart + // + this.btnStart.Location = new System.Drawing.Point(15, 33); + this.btnStart.Name = "btnStart"; + this.btnStart.Size = new System.Drawing.Size(114, 23); + this.btnStart.TabIndex = 16; + this.btnStart.Text = "Проставить время"; + this.btnStart.UseVisualStyleBackColor = true; + // + // pnlTopControls + // + this.pnlTopControls.Controls.Add(this.btnDoForDate); + this.pnlTopControls.Controls.Add(this.dteForDay); + this.pnlTopControls.Controls.Add(this.btnSettings); + this.pnlTopControls.Dock = System.Windows.Forms.DockStyle.Top; + this.pnlTopControls.Location = new System.Drawing.Point(3, 3); + this.pnlTopControls.Name = "pnlTopControls"; + this.pnlTopControls.Size = new System.Drawing.Size(144, 125); + this.pnlTopControls.TabIndex = 24; + // + // btnDoForDate + // + this.btnDoForDate.Location = new System.Drawing.Point(15, 84); + this.btnDoForDate.Name = "btnDoForDate"; + this.btnDoForDate.Size = new System.Drawing.Size(114, 36); + this.btnDoForDate.TabIndex = 25; + this.btnDoForDate.Text = "Проставить на дату"; + this.btnDoForDate.UseVisualStyleBackColor = true; + // // dteForDay // this.dteForDay.CustomFormat = "dd.MM.yyyy"; this.dteForDay.Format = System.Windows.Forms.DateTimePickerFormat.Short; - this.dteForDay.Location = new System.Drawing.Point(12, 69); + this.dteForDay.Location = new System.Drawing.Point(15, 57); this.dteForDay.MinDate = new System.DateTime(2019, 1, 1, 0, 0, 0, 0); this.dteForDay.Name = "dteForDay"; this.dteForDay.ShowUpDown = true; - this.dteForDay.Size = new System.Drawing.Size(113, 20); - this.dteForDay.TabIndex = 17; + this.dteForDay.Size = new System.Drawing.Size(114, 20); + this.dteForDay.TabIndex = 24; // - // btnDoForDate + // btnSettings // - this.btnDoForDate.Location = new System.Drawing.Point(13, 96); - this.btnDoForDate.Name = "btnDoForDate"; - this.btnDoForDate.Size = new System.Drawing.Size(112, 36); - this.btnDoForDate.TabIndex = 18; - this.btnDoForDate.Text = "Проставить на дату"; - this.btnDoForDate.UseVisualStyleBackColor = true; - this.btnDoForDate.Click += new System.EventHandler(this.btnDoForDate_Click); + this.btnSettings.Location = new System.Drawing.Point(15, 4); + this.btnSettings.Name = "btnSettings"; + this.btnSettings.Size = new System.Drawing.Size(114, 23); + this.btnSettings.TabIndex = 23; + this.btnSettings.Text = "Настройки"; + this.btnSettings.UseVisualStyleBackColor = true; + // + // txtLog + // + this.txtLog.Dock = System.Windows.Forms.DockStyle.Fill; + this.txtLog.Location = new System.Drawing.Point(153, 3); + this.txtLog.Multiline = true; + this.txtLog.Name = "txtLog"; + this.txtLog.ReadOnly = true; + this.tlpControls.SetRowSpan(this.txtLog, 2); + this.txtLog.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; + this.txtLog.Size = new System.Drawing.Size(603, 410); + this.txtLog.TabIndex = 27; // // frmMain // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(740, 320); - this.Controls.Add(this.btnDoForDate); - this.Controls.Add(this.dteForDay); - this.Controls.Add(this.btnSettings); - this.Controls.Add(this.btnCancel); - this.Controls.Add(this.btnMeeting); - this.Controls.Add(this.txtDummyMode); - this.Controls.Add(this.btnStart); - this.Controls.Add(this.txtLog); + this.ClientSize = new System.Drawing.Size(759, 416); + this.Controls.Add(this.tlpControls); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Margin = new System.Windows.Forms.Padding(2); + this.MinimumSize = new System.Drawing.Size(775, 455); this.Name = "frmMain"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "Бот логирования времени"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.frmMain_FormClosing); this.Load += new System.EventHandler(this.Form1_Load); this.Resize += new System.EventHandler(this.frmMain_Resize); + this.tlpControls.ResumeLayout(false); + this.tlpControls.PerformLayout(); + this.panel2.ResumeLayout(false); + this.panel2.PerformLayout(); + this.pnlTopControls.ResumeLayout(false); this.ResumeLayout(false); - this.PerformLayout(); } #endregion - private System.Windows.Forms.TextBox txtLog; - private System.Windows.Forms.Button btnStart; private System.Windows.Forms.NotifyIcon ntfyIcon; private System.Windows.Forms.Timer tmrStart; - private System.Windows.Forms.CheckBox txtDummyMode; - private System.Windows.Forms.Button btnMeeting; - private System.Windows.Forms.Button btnCancel; - private System.Windows.Forms.Button btnSettings; private System.Windows.Forms.Timer tmrUpdate; - private System.Windows.Forms.DateTimePicker dteForDay; + private System.Windows.Forms.TableLayoutPanel tlpControls; + private System.Windows.Forms.Panel pnlTopControls; private System.Windows.Forms.Button btnDoForDate; + private System.Windows.Forms.DateTimePicker dteForDay; + private System.Windows.Forms.Button btnSettings; + private System.Windows.Forms.Panel panel2; + private System.Windows.Forms.Button btnCancel; + private System.Windows.Forms.Button btnMeeting; + private System.Windows.Forms.CheckBox txtDummyMode; + private System.Windows.Forms.Button btnStart; + private System.Windows.Forms.TextBox txtLog; } }