diff --git a/WinGreed/frmPersonRound.Designer.cs b/WinGreed/frmPersonRound.Designer.cs index 6300d0e..032a59f 100644 --- a/WinGreed/frmPersonRound.Designer.cs +++ b/WinGreed/frmPersonRound.Designer.cs @@ -54,17 +54,18 @@ // this.label1.AutoSize = true; this.label1.Font = new System.Drawing.Font("Segoe UI", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point); - this.label1.Location = new System.Drawing.Point(23, 17); + this.label1.Location = new System.Drawing.Point(26, 23); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(105, 30); + this.label1.Size = new System.Drawing.Size(134, 37); this.label1.TabIndex = 0; this.label1.Text = "Nu kör vi"; // // btnThrow // - this.btnThrow.Location = new System.Drawing.Point(32, 81); + this.btnThrow.Location = new System.Drawing.Point(37, 108); + this.btnThrow.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.btnThrow.Name = "btnThrow"; - this.btnThrow.Size = new System.Drawing.Size(96, 23); + this.btnThrow.Size = new System.Drawing.Size(110, 31); this.btnThrow.TabIndex = 1; this.btnThrow.Text = "Kasta Tärningar"; this.btnThrow.UseVisualStyleBackColor = true; @@ -74,9 +75,10 @@ // this.btnDiceTmpl1.ImageKey = "dice1.ico"; this.btnDiceTmpl1.ImageList = this.imageList1; - this.btnDiceTmpl1.Location = new System.Drawing.Point(746, 82); + this.btnDiceTmpl1.Location = new System.Drawing.Point(853, 109); + this.btnDiceTmpl1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.btnDiceTmpl1.Name = "btnDiceTmpl1"; - this.btnDiceTmpl1.Size = new System.Drawing.Size(42, 44); + this.btnDiceTmpl1.Size = new System.Drawing.Size(48, 59); this.btnDiceTmpl1.TabIndex = 2; this.btnDiceTmpl1.UseVisualStyleBackColor = true; this.btnDiceTmpl1.Visible = false; @@ -98,9 +100,10 @@ // this.btnDiceTmpl2.ImageKey = "dice2.ico"; this.btnDiceTmpl2.ImageList = this.imageList1; - this.btnDiceTmpl2.Location = new System.Drawing.Point(746, 126); + this.btnDiceTmpl2.Location = new System.Drawing.Point(853, 168); + this.btnDiceTmpl2.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.btnDiceTmpl2.Name = "btnDiceTmpl2"; - this.btnDiceTmpl2.Size = new System.Drawing.Size(42, 44); + this.btnDiceTmpl2.Size = new System.Drawing.Size(48, 59); this.btnDiceTmpl2.TabIndex = 3; this.btnDiceTmpl2.UseVisualStyleBackColor = true; this.btnDiceTmpl2.Visible = false; @@ -110,9 +113,10 @@ // this.btnDiceTmpl4.ImageKey = "dice4.ico"; this.btnDiceTmpl4.ImageList = this.imageList1; - this.btnDiceTmpl4.Location = new System.Drawing.Point(746, 214); + this.btnDiceTmpl4.Location = new System.Drawing.Point(853, 285); + this.btnDiceTmpl4.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.btnDiceTmpl4.Name = "btnDiceTmpl4"; - this.btnDiceTmpl4.Size = new System.Drawing.Size(42, 44); + this.btnDiceTmpl4.Size = new System.Drawing.Size(48, 59); this.btnDiceTmpl4.TabIndex = 5; this.btnDiceTmpl4.UseVisualStyleBackColor = true; this.btnDiceTmpl4.Visible = false; @@ -122,9 +126,10 @@ // this.btnDiceTmpl3.ImageKey = "dice3.ico"; this.btnDiceTmpl3.ImageList = this.imageList1; - this.btnDiceTmpl3.Location = new System.Drawing.Point(746, 170); + this.btnDiceTmpl3.Location = new System.Drawing.Point(853, 227); + this.btnDiceTmpl3.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.btnDiceTmpl3.Name = "btnDiceTmpl3"; - this.btnDiceTmpl3.Size = new System.Drawing.Size(42, 44); + this.btnDiceTmpl3.Size = new System.Drawing.Size(48, 59); this.btnDiceTmpl3.TabIndex = 4; this.btnDiceTmpl3.UseVisualStyleBackColor = true; this.btnDiceTmpl3.Visible = false; @@ -134,9 +139,10 @@ // this.btnDiceTmpl6.ImageKey = "dice6.ico"; this.btnDiceTmpl6.ImageList = this.imageList1; - this.btnDiceTmpl6.Location = new System.Drawing.Point(746, 302); + this.btnDiceTmpl6.Location = new System.Drawing.Point(853, 403); + this.btnDiceTmpl6.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.btnDiceTmpl6.Name = "btnDiceTmpl6"; - this.btnDiceTmpl6.Size = new System.Drawing.Size(42, 44); + this.btnDiceTmpl6.Size = new System.Drawing.Size(48, 59); this.btnDiceTmpl6.TabIndex = 7; this.btnDiceTmpl6.UseVisualStyleBackColor = true; this.btnDiceTmpl6.Visible = false; @@ -146,9 +152,10 @@ // this.btnDiceTmpl5.ImageKey = "dice5.ico"; this.btnDiceTmpl5.ImageList = this.imageList1; - this.btnDiceTmpl5.Location = new System.Drawing.Point(746, 258); + this.btnDiceTmpl5.Location = new System.Drawing.Point(853, 344); + this.btnDiceTmpl5.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.btnDiceTmpl5.Name = "btnDiceTmpl5"; - this.btnDiceTmpl5.Size = new System.Drawing.Size(42, 44); + this.btnDiceTmpl5.Size = new System.Drawing.Size(48, 59); this.btnDiceTmpl5.TabIndex = 6; this.btnDiceTmpl5.UseVisualStyleBackColor = true; this.btnDiceTmpl5.Visible = false; @@ -156,9 +163,10 @@ // // btnClose // - this.btnClose.Location = new System.Drawing.Point(713, 583); + this.btnClose.Location = new System.Drawing.Point(815, 777); + this.btnClose.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.btnClose.Name = "btnClose"; - this.btnClose.Size = new System.Drawing.Size(75, 23); + this.btnClose.Size = new System.Drawing.Size(86, 31); this.btnClose.TabIndex = 8; this.btnClose.Text = "Stäng"; this.btnClose.UseVisualStyleBackColor = true; @@ -166,45 +174,47 @@ // // txtMaxValue // - this.txtMaxValue.Location = new System.Drawing.Point(669, 82); + this.txtMaxValue.Location = new System.Drawing.Point(765, 109); + this.txtMaxValue.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.txtMaxValue.Multiline = true; this.txtMaxValue.Name = "txtMaxValue"; - this.txtMaxValue.Size = new System.Drawing.Size(42, 44); + this.txtMaxValue.Size = new System.Drawing.Size(47, 57); this.txtMaxValue.TabIndex = 9; this.txtMaxValue.Visible = false; // // txtChosenValue // - this.txtChosenValue.Location = new System.Drawing.Point(669, 126); + this.txtChosenValue.Location = new System.Drawing.Point(765, 168); + this.txtChosenValue.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.txtChosenValue.Multiline = true; this.txtChosenValue.Name = "txtChosenValue"; - this.txtChosenValue.Size = new System.Drawing.Size(42, 44); + this.txtChosenValue.Size = new System.Drawing.Size(47, 57); this.txtChosenValue.TabIndex = 10; this.txtChosenValue.Visible = false; // // txtTotalPoints // - this.txtTotalPoints.Location = new System.Drawing.Point(350, 51); - this.txtTotalPoints.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.txtTotalPoints.Location = new System.Drawing.Point(400, 68); this.txtTotalPoints.Name = "txtTotalPoints"; - this.txtTotalPoints.Size = new System.Drawing.Size(110, 23); + this.txtTotalPoints.Size = new System.Drawing.Size(125, 27); this.txtTotalPoints.TabIndex = 11; // // lblRecentPoints // this.lblRecentPoints.AutoSize = true; this.lblRecentPoints.Font = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - this.lblRecentPoints.Location = new System.Drawing.Point(172, 48); + this.lblRecentPoints.Location = new System.Drawing.Point(197, 64); this.lblRecentPoints.Name = "lblRecentPoints"; - this.lblRecentPoints.Size = new System.Drawing.Size(158, 21); + this.lblRecentPoints.Size = new System.Drawing.Size(198, 28); this.lblRecentPoints.TabIndex = 12; this.lblRecentPoints.Text = "Aktuell poängsumma"; // // btnCollect // - this.btnCollect.Location = new System.Drawing.Point(495, 49); + this.btnCollect.Location = new System.Drawing.Point(566, 65); + this.btnCollect.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.btnCollect.Name = "btnCollect"; - this.btnCollect.Size = new System.Drawing.Size(75, 23); + this.btnCollect.Size = new System.Drawing.Size(86, 31); this.btnCollect.TabIndex = 13; this.btnCollect.Text = "Nöjd"; this.btnCollect.UseVisualStyleBackColor = true; @@ -214,33 +224,32 @@ // this.label2.AutoSize = true; this.label2.Font = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point); - this.label2.Location = new System.Drawing.Point(172, 80); + this.label2.Location = new System.Drawing.Point(197, 107); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(148, 21); + this.label2.Size = new System.Drawing.Size(186, 28); this.label2.TabIndex = 14; this.label2.Text = "Maxpoints / Chosen"; // // txtMaxPoints // - this.txtMaxPoints.Location = new System.Drawing.Point(359, 82); - this.txtMaxPoints.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.txtMaxPoints.Location = new System.Drawing.Point(410, 109); this.txtMaxPoints.Name = "txtMaxPoints"; - this.txtMaxPoints.Size = new System.Drawing.Size(48, 23); + this.txtMaxPoints.Size = new System.Drawing.Size(54, 27); this.txtMaxPoints.TabIndex = 15; // // txtChosenPoints // - this.txtChosenPoints.Location = new System.Drawing.Point(413, 82); - this.txtChosenPoints.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.txtChosenPoints.Location = new System.Drawing.Point(472, 109); this.txtChosenPoints.Name = "txtChosenPoints"; - this.txtChosenPoints.Size = new System.Drawing.Size(48, 23); + this.txtChosenPoints.Size = new System.Drawing.Size(54, 27); this.txtChosenPoints.TabIndex = 16; // // frmPersonRound // - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(800, 618); + this.BackColor = System.Drawing.Color.Green; + this.ClientSize = new System.Drawing.Size(914, 824); this.Controls.Add(this.txtChosenPoints); this.Controls.Add(this.txtMaxPoints); this.Controls.Add(this.label2); @@ -258,6 +267,7 @@ this.Controls.Add(this.btnDiceTmpl1); this.Controls.Add(this.btnThrow); this.Controls.Add(this.label1); + this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.Name = "frmPersonRound"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "Din tur -"; diff --git a/WinGreed/frmPersonRound.resx b/WinGreed/frmPersonRound.resx index 08166bc..131ccb2 100644 --- a/WinGreed/frmPersonRound.resx +++ b/WinGreed/frmPersonRound.resx @@ -65,7 +65,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAEZTeXN0ZW0uV2luZG93cy5Gb3JtcywgQ3VsdHVyZT1uZXV0cmFs LCBQdWJsaWNLZXlUb2tlbj1iNzdhNWM1NjE5MzRlMDg5BQEAAAAmU3lzdGVtLldpbmRvd3MuRm9ybXMu SW1hZ2VMaXN0U3RyZWFtZXIBAAAABERhdGEHAgIAAAAJAwAAAA8DAAAAnhUAAAJNU0Z0AUkBTAIBAQYB - AAFQAQABUAEAASABAAEgAQAE/wEJAQAI/wFCAU0BNgEEBgABNgEEAgABKAMAAYADAAFAAwABAQEAAQgG + AAFYAQABWAEAASABAAEgAQAE/wEJAQAI/wFCAU0BNgEEBgABNgEEAgABKAMAAYADAAFAAwABAQEAAQgG AAEgGAABgAIAAYADAAKAAQABgAMAAYABAAGAAQACgAIAA8ABAAHAAdwBwAEAAfABygGmAQABMwUAATMB AAEzAQABMwEAAjMCAAMWAQADHAEAAyIBAAMpAQADVQEAA00BAANCAQADOQEAAYABfAH/AQACUAH/AQAB kwEAAdYBAAH/AewBzAEAAcYB1gHvAQAB1gLnAQABkAGpAa0CAAH/ATMDAAFmAwABmQMAAcwCAAEzAwAC diff --git a/WinGreed/frmStart.Designer.cs b/WinGreed/frmStart.Designer.cs index 045170d..3a495ac 100644 --- a/WinGreed/frmStart.Designer.cs +++ b/WinGreed/frmStart.Designer.cs @@ -46,17 +46,18 @@ // this.label1.AutoSize = true; this.label1.Font = new System.Drawing.Font("Segoe UI", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point); - this.label1.Location = new System.Drawing.Point(25, 26); + this.label1.Location = new System.Drawing.Point(29, 35); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(294, 30); + this.label1.Size = new System.Drawing.Size(384, 37); this.label1.TabIndex = 0; this.label1.Text = "Welcome to World of Greed!"; // // btnSpela // - this.btnSpela.Location = new System.Drawing.Point(25, 97); + this.btnSpela.Location = new System.Drawing.Point(29, 129); + this.btnSpela.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.btnSpela.Name = "btnSpela"; - this.btnSpela.Size = new System.Drawing.Size(134, 23); + this.btnSpela.Size = new System.Drawing.Size(153, 31); this.btnSpela.TabIndex = 1; this.btnSpela.Text = "Spela en omgång"; this.btnSpela.UseVisualStyleBackColor = true; @@ -65,16 +66,17 @@ // lvMemberList // this.lvMemberList.Activation = System.Windows.Forms.ItemActivation.OneClick; - this.lvMemberList.BackColor = System.Drawing.SystemColors.Window; + this.lvMemberList.BackColor = System.Drawing.Color.Goldenrod; this.lvMemberList.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { this.Spelare, this.Vunnit, this.Points}); this.lvMemberList.GridLines = true; this.lvMemberList.HoverSelection = true; - this.lvMemberList.Location = new System.Drawing.Point(387, 97); + this.lvMemberList.Location = new System.Drawing.Point(442, 129); + this.lvMemberList.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.lvMemberList.Name = "lvMemberList"; - this.lvMemberList.Size = new System.Drawing.Size(302, 315); + this.lvMemberList.Size = new System.Drawing.Size(345, 419); this.lvMemberList.TabIndex = 2; this.lvMemberList.UseCompatibleStateImageBehavior = false; this.lvMemberList.View = System.Windows.Forms.View.Details; @@ -96,9 +98,10 @@ // // btnAddPlayer // - this.btnAddPlayer.Location = new System.Drawing.Point(27, 129); + this.btnAddPlayer.Location = new System.Drawing.Point(31, 172); + this.btnAddPlayer.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.btnAddPlayer.Name = "btnAddPlayer"; - this.btnAddPlayer.Size = new System.Drawing.Size(132, 23); + this.btnAddPlayer.Size = new System.Drawing.Size(151, 31); this.btnAddPlayer.TabIndex = 3; this.btnAddPlayer.Text = "Lägg till Spelare"; this.btnAddPlayer.UseVisualStyleBackColor = true; @@ -106,18 +109,20 @@ // // txtNewName // - this.txtNewName.Location = new System.Drawing.Point(165, 130); + this.txtNewName.Location = new System.Drawing.Point(189, 173); + this.txtNewName.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.txtNewName.Name = "txtNewName"; - this.txtNewName.Size = new System.Drawing.Size(177, 23); + this.txtNewName.Size = new System.Drawing.Size(202, 27); this.txtNewName.TabIndex = 4; this.txtNewName.Visible = false; this.txtNewName.TextChanged += new System.EventHandler(this.txtNewName_TextChanged); // // btnAddOk // - this.btnAddOk.Location = new System.Drawing.Point(350, 129); + this.btnAddOk.Location = new System.Drawing.Point(400, 172); + this.btnAddOk.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.btnAddOk.Name = "btnAddOk"; - this.btnAddOk.Size = new System.Drawing.Size(31, 23); + this.btnAddOk.Size = new System.Drawing.Size(35, 31); this.btnAddOk.TabIndex = 5; this.btnAddOk.Text = "Ok"; this.btnAddOk.UseCompatibleTextRendering = true; @@ -127,9 +132,10 @@ // // btnSound // - this.btnSound.Location = new System.Drawing.Point(350, 34); + this.btnSound.Location = new System.Drawing.Point(400, 45); + this.btnSound.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.btnSound.Name = "btnSound"; - this.btnSound.Size = new System.Drawing.Size(75, 23); + this.btnSound.Size = new System.Drawing.Size(86, 31); this.btnSound.TabIndex = 6; this.btnSound.Text = "sound"; this.btnSound.UseVisualStyleBackColor = true; @@ -138,27 +144,30 @@ // // lstLogBox // + this.lstLogBox.BackColor = System.Drawing.SystemColors.ActiveCaption; this.lstLogBox.FormattingEnabled = true; - this.lstLogBox.ItemHeight = 15; - this.lstLogBox.Location = new System.Drawing.Point(707, 97); + this.lstLogBox.ItemHeight = 20; + this.lstLogBox.Location = new System.Drawing.Point(808, 129); + this.lstLogBox.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.lstLogBox.Name = "lstLogBox"; - this.lstLogBox.Size = new System.Drawing.Size(120, 319); + this.lstLogBox.Size = new System.Drawing.Size(137, 424); this.lstLogBox.TabIndex = 7; // // lblLog // this.lblLog.AutoSize = true; - this.lblLog.Location = new System.Drawing.Point(707, 66); + this.lblLog.Location = new System.Drawing.Point(808, 88); this.lblLog.Name = "lblLog"; - this.lblLog.Size = new System.Drawing.Size(68, 15); + this.lblLog.Size = new System.Drawing.Size(84, 20); this.lblLog.TabIndex = 8; this.lblLog.Text = "PoängLogg"; // // frmStart // - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(897, 450); + this.BackColor = System.Drawing.Color.DimGray; + this.ClientSize = new System.Drawing.Size(1025, 600); this.Controls.Add(this.lblLog); this.Controls.Add(this.lstLogBox); this.Controls.Add(this.btnSound); @@ -168,6 +177,7 @@ this.Controls.Add(this.lvMemberList); this.Controls.Add(this.btnSpela); this.Controls.Add(this.label1); + this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.Name = "frmStart"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "G R E E D";