Редизайн + вынос настроек

This commit is contained in:
Danil Kislov
2019-03-16 02:08:24 +03:00
parent e053220f63
commit 1ccf2414d2
6 changed files with 446 additions and 220 deletions
+20 -168
View File
@@ -30,17 +30,6 @@
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmMain));
this.actTime = new System.Windows.Forms.DateTimePicker();
this.txtJiraLogin = new System.Windows.Forms.TextBox();
this.lbl1 = new System.Windows.Forms.Label();
this.label1 = new System.Windows.Forms.Label();
this.txtJiraPassword = new System.Windows.Forms.TextBox();
this.label2 = new System.Windows.Forms.Label();
this.txtMercurialEmail = new System.Windows.Forms.TextBox();
this.label3 = new System.Windows.Forms.Label();
this.btnSave = new System.Windows.Forms.Button();
this.label4 = new System.Windows.Forms.Label();
this.txtRepoPath = new System.Windows.Forms.TextBox();
this.txtLog = new System.Windows.Forms.TextBox();
this.btnStart = new System.Windows.Forms.Button();
this.ntfyIcon = new System.Windows.Forms.NotifyIcon(this.components);
@@ -48,116 +37,22 @@
this.txtDummyMode = new System.Windows.Forms.CheckBox();
this.btnMeeting = new System.Windows.Forms.Button();
this.btnCancel = new System.Windows.Forms.Button();
this.chkAddComments = new System.Windows.Forms.CheckBox();
this.label5 = new System.Windows.Forms.Label();
this.txtRoundTo = new System.Windows.Forms.TextBox();
this.btnSettings = new System.Windows.Forms.Button();
this.SuspendLayout();
//
// actTime
//
this.actTime.Format = System.Windows.Forms.DateTimePickerFormat.Time;
this.actTime.Location = new System.Drawing.Point(100, 147);
this.actTime.Name = "actTime";
this.actTime.Size = new System.Drawing.Size(100, 20);
this.actTime.TabIndex = 0;
//
// txtJiraLogin
//
this.txtJiraLogin.Location = new System.Drawing.Point(100, 42);
this.txtJiraLogin.Name = "txtJiraLogin";
this.txtJiraLogin.Size = new System.Drawing.Size(100, 20);
this.txtJiraLogin.TabIndex = 1;
//
// lbl1
//
this.lbl1.AutoSize = true;
this.lbl1.Location = new System.Drawing.Point(34, 45);
this.lbl1.Name = "lbl1";
this.lbl1.Size = new System.Drawing.Size(64, 13);
this.lbl1.TabIndex = 2;
this.lbl1.Text = "Логин Jira*:";
//
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(27, 71);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(71, 13);
this.label1.TabIndex = 4;
this.label1.Text = "Пароль Jira*:";
//
// txtJiraPassword
//
this.txtJiraPassword.Location = new System.Drawing.Point(100, 68);
this.txtJiraPassword.Name = "txtJiraPassword";
this.txtJiraPassword.PasswordChar = '*';
this.txtJiraPassword.Size = new System.Drawing.Size(100, 20);
this.txtJiraPassword.TabIndex = 3;
//
// label2
//
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(12, 98);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(82, 13);
this.label2.TabIndex = 6;
this.label2.Text = "Mercurial name:";
//
// txtMercurialEmail
//
this.txtMercurialEmail.Location = new System.Drawing.Point(100, 95);
this.txtMercurialEmail.Name = "txtMercurialEmail";
this.txtMercurialEmail.Size = new System.Drawing.Size(100, 20);
this.txtMercurialEmail.TabIndex = 5;
//
// label3
//
this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(7, 151);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(91, 13);
this.label3.TabIndex = 7;
this.label3.Text = "Время запуска*:";
//
// btnSave
//
this.btnSave.Location = new System.Drawing.Point(78, 196);
this.btnSave.Name = "btnSave";
this.btnSave.Size = new System.Drawing.Size(75, 23);
this.btnSave.TabIndex = 8;
this.btnSave.Text = "Save";
this.btnSave.UseVisualStyleBackColor = true;
this.btnSave.Click += new System.EventHandler(this.btnSave_Click);
//
// label4
//
this.label4.AutoSize = true;
this.label4.Location = new System.Drawing.Point(18, 19);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(76, 13);
this.label4.TabIndex = 10;
this.label4.Text = "Путь до репо:";
//
// txtRepoPath
//
this.txtRepoPath.Location = new System.Drawing.Point(100, 16);
this.txtRepoPath.Name = "txtRepoPath";
this.txtRepoPath.Size = new System.Drawing.Size(100, 20);
this.txtRepoPath.TabIndex = 9;
//
// txtLog
//
this.txtLog.Location = new System.Drawing.Point(218, 16);
this.txtLog.Location = new System.Drawing.Point(12, 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(510, 294);
this.txtLog.Size = new System.Drawing.Size(716, 294);
this.txtLog.TabIndex = 11;
//
// btnStart
//
this.btnStart.Location = new System.Drawing.Point(9, 254);
this.btnStart.Location = new System.Drawing.Point(12, 324);
this.btnStart.Name = "btnStart";
this.btnStart.Size = new System.Drawing.Size(114, 23);
this.btnStart.TabIndex = 12;
@@ -179,7 +74,7 @@
// txtDummyMode
//
this.txtDummyMode.AutoSize = true;
this.txtDummyMode.Location = new System.Drawing.Point(9, 231);
this.txtDummyMode.Location = new System.Drawing.Point(208, 328);
this.txtDummyMode.Name = "txtDummyMode";
this.txtDummyMode.Size = new System.Drawing.Size(114, 17);
this.txtDummyMode.TabIndex = 13;
@@ -188,7 +83,7 @@
//
// btnMeeting
//
this.btnMeeting.Location = new System.Drawing.Point(142, 254);
this.btnMeeting.Location = new System.Drawing.Point(132, 324);
this.btnMeeting.Name = "btnMeeting";
this.btnMeeting.Size = new System.Drawing.Size(70, 23);
this.btnMeeting.TabIndex = 14;
@@ -199,68 +94,39 @@
// btnCancel
//
this.btnCancel.Enabled = false;
this.btnCancel.Location = new System.Drawing.Point(9, 286);
this.btnCancel.Location = new System.Drawing.Point(328, 324);
this.btnCancel.Name = "btnCancel";
this.btnCancel.Size = new System.Drawing.Size(203, 23);
this.btnCancel.Size = new System.Drawing.Size(190, 23);
this.btnCancel.TabIndex = 15;
this.btnCancel.Text = "Отменить операцию";
this.btnCancel.UseVisualStyleBackColor = true;
this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
//
// chkAddComments
// btnSettings
//
this.chkAddComments.AutoSize = true;
this.chkAddComments.Location = new System.Drawing.Point(45, 175);
this.chkAddComments.Name = "chkAddComments";
this.chkAddComments.Size = new System.Drawing.Size(133, 17);
this.chkAddComments.TabIndex = 16;
this.chkAddComments.Text = "Добавлять описание";
this.chkAddComments.UseVisualStyleBackColor = true;
//
// label5
//
this.label5.AutoSize = true;
this.label5.Location = new System.Drawing.Point(-2, 124);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(100, 13);
this.label5.TabIndex = 18;
this.label5.Text = "Округл. времени*:";
//
// txtRoundTo
//
this.txtRoundTo.Location = new System.Drawing.Point(100, 121);
this.txtRoundTo.Name = "txtRoundTo";
this.txtRoundTo.Size = new System.Drawing.Size(100, 20);
this.txtRoundTo.TabIndex = 17;
this.txtRoundTo.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox1_KeyPress);
this.btnSettings.Location = new System.Drawing.Point(645, 324);
this.btnSettings.Name = "btnSettings";
this.btnSettings.Size = new System.Drawing.Size(82, 23);
this.btnSettings.TabIndex = 16;
this.btnSettings.Text = "Настройки";
this.btnSettings.UseVisualStyleBackColor = true;
this.btnSettings.Click += new System.EventHandler(this.btnSettings_Click);
//
// frmMain
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(740, 318);
this.Controls.Add(this.label5);
this.Controls.Add(this.txtRoundTo);
this.Controls.Add(this.chkAddComments);
this.ClientSize = new System.Drawing.Size(740, 357);
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.Controls.Add(this.label4);
this.Controls.Add(this.txtRepoPath);
this.Controls.Add(this.btnSave);
this.Controls.Add(this.label3);
this.Controls.Add(this.label2);
this.Controls.Add(this.txtMercurialEmail);
this.Controls.Add(this.label1);
this.Controls.Add(this.txtJiraPassword);
this.Controls.Add(this.lbl1);
this.Controls.Add(this.txtJiraLogin);
this.Controls.Add(this.actTime);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Margin = new System.Windows.Forms.Padding(2);
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);
@@ -271,18 +137,6 @@
}
#endregion
private System.Windows.Forms.DateTimePicker actTime;
private System.Windows.Forms.TextBox txtJiraLogin;
private System.Windows.Forms.Label lbl1;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.TextBox txtJiraPassword;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.TextBox txtMercurialEmail;
private System.Windows.Forms.Label label3;
private System.Windows.Forms.Button btnSave;
private System.Windows.Forms.Label label4;
private System.Windows.Forms.TextBox txtRepoPath;
private System.Windows.Forms.TextBox txtLog;
private System.Windows.Forms.Button btnStart;
private System.Windows.Forms.NotifyIcon ntfyIcon;
@@ -290,9 +144,7 @@
private System.Windows.Forms.CheckBox txtDummyMode;
private System.Windows.Forms.Button btnMeeting;
private System.Windows.Forms.Button btnCancel;
private System.Windows.Forms.CheckBox chkAddComments;
private System.Windows.Forms.Label label5;
private System.Windows.Forms.TextBox txtRoundTo;
private System.Windows.Forms.Button btnSettings;
}
}