diff --git a/src/HolzShots.Legacy/My Project/Resources.Designer.vb b/src/HolzShots.Legacy/My Project/Resources.Designer.vb index 4a59aa77..e9b86cab 100644 --- a/src/HolzShots.Legacy/My Project/Resources.Designer.vb +++ b/src/HolzShots.Legacy/My Project/Resources.Designer.vb @@ -250,16 +250,6 @@ Namespace My.Resources End Get End Property - ''' - ''' Looks up a localized resource of type System.Drawing.Bitmap. - ''' - Friend ReadOnly Property moveMedium() As System.Drawing.Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("moveMedium", resourceCulture) - Return CType(obj,System.Drawing.Bitmap) - End Get - End Property - ''' ''' Looks up a localized resource of type System.Drawing.Bitmap. ''' @@ -300,46 +290,6 @@ Namespace My.Resources End Get End Property - ''' - ''' Looks up a localized resource of type System.Drawing.Bitmap. - ''' - Friend ReadOnly Property selectAllMedium() As System.Drawing.Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("selectAllMedium", resourceCulture) - Return CType(obj,System.Drawing.Bitmap) - End Get - End Property - - ''' - ''' Looks up a localized resource of type System.Drawing.Icon similar to (Icon). - ''' - Friend ReadOnly Property textCursor() As System.Drawing.Icon - Get - Dim obj As Object = ResourceManager.GetObject("textCursor", resourceCulture) - Return CType(obj,System.Drawing.Icon) - End Get - End Property - - ''' - ''' Looks up a localized resource of type System.Drawing.Bitmap. - ''' - Friend ReadOnly Property textMedium() As System.Drawing.Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("textMedium", resourceCulture) - Return CType(obj,System.Drawing.Bitmap) - End Get - End Property - - ''' - ''' Looks up a localized resource of type System.Drawing.Bitmap. - ''' - Friend ReadOnly Property TexttoolsBackground() As System.Drawing.Bitmap - Get - Dim obj As Object = ResourceManager.GetObject("TexttoolsBackground", resourceCulture) - Return CType(obj,System.Drawing.Bitmap) - End Get - End Property - ''' ''' Looks up a localized resource of type System.Drawing.Bitmap. ''' diff --git a/src/HolzShots.Legacy/My Project/Resources.resx b/src/HolzShots.Legacy/My Project/Resources.resx index a580e13c..a8fba028 100644 --- a/src/HolzShots.Legacy/My Project/Resources.resx +++ b/src/HolzShots.Legacy/My Project/Resources.resx @@ -145,12 +145,6 @@ ..\Resources\CrossCursor.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\fontMedium.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\dateMedium.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\clipboardMedium.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -166,9 +160,6 @@ ..\Resources\windowsCursorMedium.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\selectAllMedium.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\clipboardSmall.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -178,9 +169,6 @@ ..\Resources\censorMedium.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\TexttoolsBackground.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\cursorMedium.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -190,21 +178,12 @@ ..\Resources\circleMedium.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\moveMedium.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\checkerboardBackground.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\uploadSmall.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\textCursor.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\textMedium.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\eraser.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a diff --git a/src/HolzShots.Legacy/Resources/TexttoolsBackground.png b/src/HolzShots.Legacy/Resources/TexttoolsBackground.png deleted file mode 100644 index c86edf55..00000000 Binary files a/src/HolzShots.Legacy/Resources/TexttoolsBackground.png and /dev/null differ diff --git a/src/HolzShots.Legacy/Resources/fontMedium.png b/src/HolzShots.Legacy/Resources/fontMedium.png deleted file mode 100644 index 26e7465b..00000000 Binary files a/src/HolzShots.Legacy/Resources/fontMedium.png and /dev/null differ diff --git a/src/HolzShots.Legacy/Resources/moveMedium.png b/src/HolzShots.Legacy/Resources/moveMedium.png deleted file mode 100644 index e47a0f01..00000000 Binary files a/src/HolzShots.Legacy/Resources/moveMedium.png and /dev/null differ diff --git a/src/HolzShots.Legacy/Resources/selectAllMedium.png b/src/HolzShots.Legacy/Resources/selectAllMedium.png deleted file mode 100644 index 050ab1b4..00000000 Binary files a/src/HolzShots.Legacy/Resources/selectAllMedium.png and /dev/null differ diff --git a/src/HolzShots.Legacy/Resources/textCursor.ico b/src/HolzShots.Legacy/Resources/textCursor.ico deleted file mode 100644 index b3047fc7..00000000 Binary files a/src/HolzShots.Legacy/Resources/textCursor.ico and /dev/null differ diff --git a/src/HolzShots.Legacy/Resources/textMedium.png b/src/HolzShots.Legacy/Resources/textMedium.png deleted file mode 100644 index a99b41b3..00000000 Binary files a/src/HolzShots.Legacy/Resources/textMedium.png and /dev/null differ diff --git a/src/HolzShots.Legacy/UI/Controls/PaintPanel.Designer.vb b/src/HolzShots.Legacy/UI/Controls/PaintPanel.Designer.vb index 46fcbda3..84ed8b66 100644 --- a/src/HolzShots.Legacy/UI/Controls/PaintPanel.Designer.vb +++ b/src/HolzShots.Legacy/UI/Controls/PaintPanel.Designer.vb @@ -23,234 +23,97 @@ Namespace UI.Controls 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. _ Private Sub InitializeComponent() - Me.WholePanel = New System.Windows.Forms.Panel() - Me.TextPanel = New System.Windows.Forms.Panel() - Me.InsertDate = New System.Windows.Forms.PictureBox() - Me.CancelButton = New System.Windows.Forms.PictureBox() - Me.SelectAll = New System.Windows.Forms.PictureBox() - Me.ChangeFont = New System.Windows.Forms.PictureBox() - Me.MoverBox = New System.Windows.Forms.PictureBox() - Me.text_ok = New System.Windows.Forms.Button() - Me.TextInput = New System.Windows.Forms.TextBox() - Me.tools_bg = New System.Windows.Forms.PictureBox() - Me.RawBox = New System.Windows.Forms.PictureBox() - Me.TheFontDialog = New System.Windows.Forms.FontDialog() - Me.EckenTeil = New System.Windows.Forms.PictureBox() - Me.VerticalLinealBox = New System.Windows.Forms.PictureBox() - Me.HorizontalLinealBox = New System.Windows.Forms.PictureBox() - Me.WholePanel.SuspendLayout() - Me.TextPanel.SuspendLayout() - CType(Me.InsertDate, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.CancelButton, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.SelectAll, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.ChangeFont, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.MoverBox, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.tools_bg, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.RawBox, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.EckenTeil, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.VerticalLinealBox, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.HorizontalLinealBox, System.ComponentModel.ISupportInitialize).BeginInit() - Me.SuspendLayout() - ' - 'WholePanel - ' - Me.WholePanel.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ - Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.WholePanel.AutoScroll = True - Me.WholePanel.BackColor = System.Drawing.Color.FromArgb(CType(CType(202, Byte), Integer), CType(CType(212, Byte), Integer), CType(CType(227, Byte), Integer)) - Me.WholePanel.Controls.Add(Me.TextPanel) - Me.WholePanel.Controls.Add(Me.RawBox) - Me.WholePanel.Location = New System.Drawing.Point(20, 20) - Me.WholePanel.Name = "WholePanel" - Me.WholePanel.Size = New System.Drawing.Size(534, 441) - Me.WholePanel.TabIndex = 14 - ' - 'TextPanel - ' - Me.TextPanel.BackColor = System.Drawing.SystemColors.GradientActiveCaption - Me.TextPanel.Controls.Add(Me.InsertDate) - Me.TextPanel.Controls.Add(Me.CancelButton) - Me.TextPanel.Controls.Add(Me.SelectAll) - Me.TextPanel.Controls.Add(Me.ChangeFont) - Me.TextPanel.Controls.Add(Me.MoverBox) - Me.TextPanel.Controls.Add(Me.text_ok) - Me.TextPanel.Controls.Add(Me.TextInput) - Me.TextPanel.Controls.Add(Me.tools_bg) - Me.TextPanel.Location = New System.Drawing.Point(108, 2) - Me.TextPanel.Name = "TextPanel" - Me.TextPanel.Size = New System.Drawing.Size(223, 111) - Me.TextPanel.TabIndex = 14 - Me.TextPanel.Visible = False - ' - 'InsertDate - ' - Me.InsertDate.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.InsertDate.BackColor = System.Drawing.Color.Transparent - Me.InsertDate.Image = Global.HolzShots.My.Resources.Resources.dateMedium - Me.InsertDate.Location = New System.Drawing.Point(79, 75) - Me.InsertDate.Name = "InsertDate" - Me.InsertDate.Size = New System.Drawing.Size(32, 32) - Me.InsertDate.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize - Me.InsertDate.TabIndex = 18 - Me.InsertDate.TabStop = False - ' - 'CancelButton - ' - Me.CancelButton.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.CancelButton.BackColor = System.Drawing.Color.Transparent - Me.CancelButton.Image = Global.HolzShots.My.Resources.Resources.cancelMedium - Me.CancelButton.Location = New System.Drawing.Point(117, 75) - Me.CancelButton.Name = "CancelButton" - Me.CancelButton.Size = New System.Drawing.Size(32, 32) - Me.CancelButton.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize - Me.CancelButton.TabIndex = 17 - Me.CancelButton.TabStop = False - ' - 'SelectAll - ' - Me.SelectAll.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.SelectAll.BackColor = System.Drawing.Color.Transparent - Me.SelectAll.Image = Global.HolzShots.My.Resources.Resources.selectAllMedium - Me.SelectAll.Location = New System.Drawing.Point(41, 75) - Me.SelectAll.Name = "SelectAll" - Me.SelectAll.Size = New System.Drawing.Size(32, 32) - Me.SelectAll.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize - Me.SelectAll.TabIndex = 16 - Me.SelectAll.TabStop = False - ' - 'ChangeFont - ' - Me.ChangeFont.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.ChangeFont.BackColor = System.Drawing.Color.Transparent - Me.ChangeFont.Image = Global.HolzShots.My.Resources.Resources.fontMedium - Me.ChangeFont.Location = New System.Drawing.Point(3, 75) - Me.ChangeFont.Name = "ChangeFont" - Me.ChangeFont.Size = New System.Drawing.Size(32, 32) - Me.ChangeFont.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize - Me.ChangeFont.TabIndex = 3 - Me.ChangeFont.TabStop = False - ' - 'MoverBox - ' - Me.MoverBox.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.MoverBox.BackColor = System.Drawing.Color.Transparent - Me.MoverBox.Cursor = System.Windows.Forms.Cursors.SizeAll - Me.MoverBox.Image = Global.HolzShots.My.Resources.Resources.moveMedium - Me.MoverBox.Location = New System.Drawing.Point(175, 75) - Me.MoverBox.Name = "MoverBox" - Me.MoverBox.Size = New System.Drawing.Size(44, 32) - Me.MoverBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage - Me.MoverBox.TabIndex = 2 - Me.MoverBox.TabStop = False - ' - 'text_ok - ' - Me.text_ok.Location = New System.Drawing.Point(175, 0) - Me.text_ok.Name = "text_ok" - Me.text_ok.Size = New System.Drawing.Size(47, 73) - Me.text_ok.TabIndex = 1 - Me.text_ok.Text = "Ok" - Me.text_ok.UseVisualStyleBackColor = True - ' - 'TextInput - ' - Me.TextInput.AcceptsReturn = True - Me.TextInput.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ - Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.TextInput.BackColor = System.Drawing.Color.AliceBlue - Me.TextInput.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - Me.TextInput.Font = New System.Drawing.Font("Consolas", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.TextInput.Location = New System.Drawing.Point(0, 0) - Me.TextInput.Multiline = True - Me.TextInput.Name = "TextInput" - Me.TextInput.Size = New System.Drawing.Size(177, 73) - Me.TextInput.TabIndex = 0 - Me.TextInput.Text = "Sample Text" - Me.TextInput.WordWrap = False - ' - 'tools_bg - ' - Me.tools_bg.Image = Global.HolzShots.My.Resources.Resources.TexttoolsBackground - Me.tools_bg.Location = New System.Drawing.Point(0, 73) - Me.tools_bg.Name = "tools_bg" - Me.tools_bg.Size = New System.Drawing.Size(222, 37) - Me.tools_bg.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize - Me.tools_bg.TabIndex = 15 - Me.tools_bg.TabStop = False - ' - 'RawBox - ' - Me.RawBox.BackColor = System.Drawing.SystemColors.GradientActiveCaption - Me.RawBox.BackgroundImage = Global.HolzShots.My.Resources.Resources.checkerboardBackground - Me.RawBox.Location = New System.Drawing.Point(2, 6) - Me.RawBox.Name = "RawBox" - Me.RawBox.Size = New System.Drawing.Size(100, 50) - Me.RawBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize - Me.RawBox.TabIndex = 12 - Me.RawBox.TabStop = False - ' - 'TheFontDialog - ' - Me.TheFontDialog.ShowColor = True - ' - 'EckenTeil - ' - Me.EckenTeil.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(241, Byte), Integer), CType(CType(249, Byte), Integer)) - Me.EckenTeil.Location = New System.Drawing.Point(0, 0) - Me.EckenTeil.Name = "EckenTeil" - Me.EckenTeil.Size = New System.Drawing.Size(20, 20) - Me.EckenTeil.TabIndex = 14 - Me.EckenTeil.TabStop = False - ' - 'VerticalLinealBox - ' - Me.VerticalLinealBox.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ - Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.VerticalLinealBox.Location = New System.Drawing.Point(0, 20) - Me.VerticalLinealBox.Name = "VerticalLinealBox" - Me.VerticalLinealBox.Size = New System.Drawing.Size(20, 441) - Me.VerticalLinealBox.TabIndex = 16 - Me.VerticalLinealBox.TabStop = False - ' - 'HorizontalLinealBox - ' - Me.HorizontalLinealBox.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.HorizontalLinealBox.Location = New System.Drawing.Point(20, 0) - Me.HorizontalLinealBox.Name = "HorizontalLinealBox" - Me.HorizontalLinealBox.Size = New System.Drawing.Size(534, 20) - Me.HorizontalLinealBox.TabIndex = 15 - Me.HorizontalLinealBox.TabStop = False - ' - 'PaintPanel - ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) - Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.BackColor = System.Drawing.SystemColors.GradientActiveCaption - Me.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None - Me.Controls.Add(Me.EckenTeil) - Me.Controls.Add(Me.VerticalLinealBox) - Me.Controls.Add(Me.HorizontalLinealBox) - Me.Controls.Add(Me.WholePanel) - Me.Name = "PaintPanel" - Me.Size = New System.Drawing.Size(554, 461) - Me.WholePanel.ResumeLayout(False) - Me.WholePanel.PerformLayout() - Me.TextPanel.ResumeLayout(False) - Me.TextPanel.PerformLayout() - CType(Me.InsertDate, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.CancelButton, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.SelectAll, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.ChangeFont, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.MoverBox, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.tools_bg, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.RawBox, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.EckenTeil, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.VerticalLinealBox, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.HorizontalLinealBox, System.ComponentModel.ISupportInitialize).EndInit() - Me.ResumeLayout(False) + WholePanel = New Panel() + RawBox = New PictureBox() + TheFontDialog = New FontDialog() + EckenTeil = New PictureBox() + VerticalLinealBox = New PictureBox() + HorizontalLinealBox = New PictureBox() + WholePanel.SuspendLayout() + CType(RawBox, ComponentModel.ISupportInitialize).BeginInit() + CType(EckenTeil, ComponentModel.ISupportInitialize).BeginInit() + CType(VerticalLinealBox, ComponentModel.ISupportInitialize).BeginInit() + CType(HorizontalLinealBox, ComponentModel.ISupportInitialize).BeginInit() + SuspendLayout() + ' + ' WholePanel + ' + WholePanel.Anchor = AnchorStyles.Top Or AnchorStyles.Bottom Or AnchorStyles.Left Or AnchorStyles.Right + WholePanel.AutoScroll = True + WholePanel.BackColor = Color.FromArgb(CByte(202), CByte(212), CByte(227)) + WholePanel.Controls.Add(RawBox) + WholePanel.Location = New Point(23, 23) + WholePanel.Margin = New Padding(4, 3, 4, 3) + WholePanel.Name = "WholePanel" + WholePanel.Size = New Size(623, 509) + WholePanel.TabIndex = 14 + ' + ' RawBox + ' + RawBox.BackColor = SystemColors.GradientActiveCaption + RawBox.BackgroundImage = My.Resources.Resources.checkerboardBackground + RawBox.Location = New Point(2, 7) + RawBox.Margin = New Padding(4, 3, 4, 3) + RawBox.Name = "RawBox" + RawBox.Size = New Size(100, 50) + RawBox.SizeMode = PictureBoxSizeMode.AutoSize + RawBox.TabIndex = 12 + RawBox.TabStop = False + ' + ' TheFontDialog + ' + TheFontDialog.ShowColor = True + ' + ' EckenTeil + ' + EckenTeil.BackColor = Color.FromArgb(CByte(240), CByte(241), CByte(249)) + EckenTeil.Location = New Point(0, 0) + EckenTeil.Margin = New Padding(4, 3, 4, 3) + EckenTeil.Name = "EckenTeil" + EckenTeil.Size = New Size(23, 23) + EckenTeil.TabIndex = 14 + EckenTeil.TabStop = False + ' + ' VerticalLinealBox + ' + VerticalLinealBox.Anchor = AnchorStyles.Top Or AnchorStyles.Bottom Or AnchorStyles.Left + VerticalLinealBox.Location = New Point(0, 23) + VerticalLinealBox.Margin = New Padding(4, 3, 4, 3) + VerticalLinealBox.Name = "VerticalLinealBox" + VerticalLinealBox.Size = New Size(23, 509) + VerticalLinealBox.TabIndex = 16 + VerticalLinealBox.TabStop = False + ' + ' HorizontalLinealBox + ' + HorizontalLinealBox.Anchor = AnchorStyles.Top Or AnchorStyles.Left Or AnchorStyles.Right + HorizontalLinealBox.Location = New Point(23, 0) + HorizontalLinealBox.Margin = New Padding(4, 3, 4, 3) + HorizontalLinealBox.Name = "HorizontalLinealBox" + HorizontalLinealBox.Size = New Size(623, 23) + HorizontalLinealBox.TabIndex = 15 + HorizontalLinealBox.TabStop = False + ' + ' PaintPanel + ' + AutoScaleDimensions = New SizeF(7F, 15F) + AutoScaleMode = AutoScaleMode.Font + BackColor = SystemColors.GradientActiveCaption + BackgroundImageLayout = ImageLayout.None + Controls.Add(EckenTeil) + Controls.Add(VerticalLinealBox) + Controls.Add(HorizontalLinealBox) + Controls.Add(WholePanel) + Margin = New Padding(4, 3, 4, 3) + Name = "PaintPanel" + Size = New Size(646, 532) + WholePanel.ResumeLayout(False) + WholePanel.PerformLayout() + CType(RawBox, ComponentModel.ISupportInitialize).EndInit() + CType(EckenTeil, ComponentModel.ISupportInitialize).EndInit() + CType(VerticalLinealBox, ComponentModel.ISupportInitialize).EndInit() + CType(HorizontalLinealBox, ComponentModel.ISupportInitialize).EndInit() + ResumeLayout(False) End Sub Friend WithEvents RawBox As System.Windows.Forms.PictureBox @@ -258,16 +121,7 @@ Namespace UI.Controls Friend WithEvents HorizontalLinealBox As System.Windows.Forms.PictureBox Friend WithEvents VerticalLinealBox As System.Windows.Forms.PictureBox Friend WithEvents EckenTeil As System.Windows.Forms.PictureBox - Friend WithEvents TextPanel As System.Windows.Forms.Panel - Friend WithEvents MoverBox As System.Windows.Forms.PictureBox - Friend WithEvents text_ok As System.Windows.Forms.Button - Friend WithEvents TextInput As System.Windows.Forms.TextBox Friend WithEvents TheFontDialog As System.Windows.Forms.FontDialog - Friend WithEvents ChangeFont As System.Windows.Forms.PictureBox - Friend WithEvents tools_bg As System.Windows.Forms.PictureBox - Friend WithEvents SelectAll As System.Windows.Forms.PictureBox - Friend WithEvents CancelButton As System.Windows.Forms.PictureBox - Friend WithEvents InsertDate As System.Windows.Forms.PictureBox End Class End Namespace diff --git a/src/HolzShots.Legacy/UI/Controls/PaintPanel.resx b/src/HolzShots.Legacy/UI/Controls/PaintPanel.resx index 05b9e425..0252f505 100644 --- a/src/HolzShots.Legacy/UI/Controls/PaintPanel.resx +++ b/src/HolzShots.Legacy/UI/Controls/PaintPanel.resx @@ -1,123 +1,123 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 17, 17 - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 17, 17 + \ No newline at end of file diff --git a/src/HolzShots.Legacy/UI/Controls/PaintPanel.vb b/src/HolzShots.Legacy/UI/Controls/PaintPanel.vb index 63ca1cc7..eb394f8c 100644 --- a/src/HolzShots.Legacy/UI/Controls/PaintPanel.vb +++ b/src/HolzShots.Legacy/UI/Controls/PaintPanel.vb @@ -72,9 +72,6 @@ Namespace UI.Controls Select Case value Case ShotEditorTool.None Cursor = Cursors.Default - Case ShotEditorTool.Text - CurrentToolObject = Nothing - Cursor = New Cursor(My.Resources.textCursor.Handle) Case ShotEditorTool.Crop CurrentToolObject = New Crop() Case ShotEditorTool.Marker @@ -193,7 +190,7 @@ Namespace UI.Controls Private Sub MouseLayerMouseDown(sender As Object, e As MouseEventArgs) Handles RawBox.MouseDown _mousedown = True - If _currentTool = ShotEditorTool.None OrElse _currentTool = ShotEditorTool.Text Then Exit Sub + If _currentTool = ShotEditorTool.None Then Exit Sub CurrentToolObject.BeginCoordinates = e.Location.ToVector2() RawBox.Invalidate() @@ -221,11 +218,7 @@ Namespace UI.Controls Private Sub MouseLayerMouseUp(sender As Object, e As MouseEventArgs) Handles RawBox.MouseUp If e.Button = MouseButtons.Left Then - If CurrentTool = ShotEditorTool.Text Then - TextPanel.BringToFront() - TextPanel.Location = New Point(e.Location.X + RawBox.Location.X, e.Location.Y + RawBox.Location.Y) - TextPanel.Visible = True - ElseIf CurrentToolObject IsNot Nothing AndAlso CurrentToolObject.GetType IsNot GetType(Scale) Then + If CurrentToolObject IsNot Nothing AndAlso CurrentToolObject.GetType IsNot GetType(Scale) Then If TypeOf CurrentToolObject IsNot Eyedropper Then InvokeFinalRender(CurrentToolObject) Else @@ -280,97 +273,6 @@ Namespace UI.Controls RawBox.Focus() End Sub - Private Sub TextOkClick() Handles text_ok.Click - TextPanel.Visible = False - - Using rtb As New RichTextBox With { - .Location = RawBox.Location, - .Parent = RawBox.Parent, - .Font = RawBox.Font, - .BorderStyle = BorderStyle.None - } - - Dim charLocation = rtb.GetPositionFromCharIndex(0) - - Dim location As New Point(TextPanel.Location.X - charLocation.X, TextPanel.Location.Y - charLocation.Y) - - Dim img = DirectCast(CurrentImage.Clone(), Image) - - Using g As Graphics = Graphics.FromImage(img) - g.TextRenderingHint = TextRenderingHint.AntiAlias - g.DrawString(TextInput.Text, TextInput.Font, New SolidBrush(TextInput.ForeColor), location) - End Using - - _undoStack.Push(img) - UpdateRawBox() - RawBox.Focus() - End Using - End Sub - -#Region "TextPanel" - - Dim _moverMouseDown As Boolean = False - Dim _dragPointMover As Point - Dim _startPOsitionMover As Point - - Private Sub PictureBox2MouseDown(sender As Object, e As MouseEventArgs) Handles MoverBox.MouseDown - If e.Button = MouseButtons.Left Then - _moverMouseDown = True - _startPOsitionMover = New Point(TextPanel.Location.X + EckenTeil.Location.X, TextPanel.Location.Y + EckenTeil.Location.Y) - _dragPointMover = EckenTeil.PointToScreen(New Point(TextPanel.Location.X + e.X, TextPanel.Location.Y + e.Y)) - End If - End Sub - - Private Sub PictureBox2MouseMove(sender As Object, e As MouseEventArgs) Handles MoverBox.MouseMove - If _moverMouseDown = True Then - Dim nCurPos As Point = EckenTeil.PointToScreen(New Point(TextPanel.Location.X + e.X, TextPanel.Location.Y + e.Y)) - TextPanel.Location = New Point(_startPOsitionMover.X + nCurPos.X - _dragPointMover.X, _startPOsitionMover.Y + nCurPos.Y - _dragPointMover.Y) - End If - End Sub - - Private Sub PictureBox2MouseUp(sender As Object, e As MouseEventArgs) Handles MoverBox.MouseUp - _moverMouseDown = False - End Sub - - Private Sub ChangeFontClick(sender As Object, e As EventArgs) Handles ChangeFont.Click - If TheFontDialog.ShowDialog() = DialogResult.OK Then - TextInput.Font = TheFontDialog.Font - TextInput.ForeColor = TheFontDialog.Color - End If - End Sub - - Private Sub TextPanelVisibleChanged(sender As Object, e As EventArgs) Handles TextPanel.VisibleChanged - ChangeFont.Parent = tools_bg - ChangeFont.Location = New Point(3, 2) - - MoverBox.Parent = tools_bg - MoverBox.Location = New Point(178, 2) - - SelectAll.Parent = tools_bg - SelectAll.Location = New Point(41, 2) - - InsertDate.Parent = tools_bg - InsertDate.Location = New Point(75, 2) - - CancelButton.Parent = tools_bg - CancelButton.Location = New Point(117, 2) - End Sub - - Private Sub SelectAllClick(sender As Object, e As EventArgs) Handles SelectAll.Click - TextInput.Focus() - TextInput.SelectAll() - End Sub - - Private Sub CancelButtonClick(sender As Object, e As EventArgs) Handles CancelButton.Click - TextPanel.Visible = False - End Sub - - Private Sub InsertDateClick(sender As Object, e As EventArgs) Handles InsertDate.Click - TextInput.Paste(_screenshot.Timestamp.ToString()) - End Sub - -#End Region - #Region "Ruler" Private Sub SaveLinealStuff(e As MouseEventArgs) diff --git a/src/HolzShots.Legacy/UI/ShotEditor.Designer.vb b/src/HolzShots.Legacy/UI/ShotEditor.Designer.vb index 2772a238..50813c29 100644 --- a/src/HolzShots.Legacy/UI/ShotEditor.Designer.vb +++ b/src/HolzShots.Legacy/UI/ShotEditor.Designer.vb @@ -22,7 +22,6 @@ Namespace UI EditStrip = New ToolStrip() CensorTool = New ToolStripButton() MarkerTool = New ToolStripButton() - TextToolButton = New ToolStripButton() CroppingTool = New ToolStripButton() EraserTool = New ToolStripButton() BlurTool = New ToolStripButton() @@ -34,7 +33,6 @@ Namespace UI ToolStripDropDownButton1 = New ToolStripDropDownButton() ZensToolStripMenuItem = New ToolStripMenuItem() MarkToolStripMenuItem = New ToolStripMenuItem() - TextToolStripMenuItem = New ToolStripMenuItem() CropToolStripMenuItem = New ToolStripMenuItem() EraseToolStripMenuItem = New ToolStripMenuItem() PixelateToolStripMenuItem = New ToolStripMenuItem() @@ -118,7 +116,7 @@ Namespace UI EditStrip.GripMargin = New Padding(0) EditStrip.GripStyle = ToolStripGripStyle.Hidden EditStrip.ImageScalingSize = New Size(32, 32) - EditStrip.Items.AddRange(New ToolStripItem() {CensorTool, MarkerTool, TextToolButton, CroppingTool, EraserTool, BlurTool, EllipseTool, PipettenTool, BrightenTool, ArrowTool, UndoStuff, ToolStripDropDownButton1}) + EditStrip.Items.AddRange(New ToolStripItem() {CensorTool, MarkerTool, CroppingTool, EraserTool, BlurTool, EllipseTool, PipettenTool, BrightenTool, ArrowTool, UndoStuff, ToolStripDropDownButton1}) EditStrip.Location = New Point(5, 47) EditStrip.Name = "EditStrip" EditStrip.Padding = New Padding(0) @@ -151,17 +149,6 @@ Namespace UI MarkerTool.Size = New Size(36, 37) MarkerTool.Text = "Mark (Ctrl+S)" ' - ' TextToolButton - ' - TextToolButton.CheckOnClick = True - TextToolButton.DisplayStyle = ToolStripItemDisplayStyle.Image - TextToolButton.Image = My.Resources.Resources.textMedium - TextToolButton.ImageTransparentColor = Color.Magenta - TextToolButton.Margin = New Padding(2, 0, 2, 2) - TextToolButton.Name = "TextToolButton" - TextToolButton.Size = New Size(36, 37) - TextToolButton.Text = "Insert Text (Ctrl+T)" - ' ' CroppingTool ' CroppingTool.CheckOnClick = True @@ -250,7 +237,7 @@ Namespace UI ' ToolStripDropDownButton1 ' ToolStripDropDownButton1.DisplayStyle = ToolStripItemDisplayStyle.Image - ToolStripDropDownButton1.DropDownItems.AddRange(New ToolStripItem() {ZensToolStripMenuItem, MarkToolStripMenuItem, TextToolStripMenuItem, CropToolStripMenuItem, EraseToolStripMenuItem, PixelateToolStripMenuItem, KreisToolStripMenuItem, ArrowToolStripMenuItem, ResetToolStripMenuItem, UploadToolStripMenuItem, SaveToolStripMenuItem, ClipboardToolStripMenuItem, PrintToolStripMenuItem, ChooseServiceToolStripMenuItem}) + ToolStripDropDownButton1.DropDownItems.AddRange(New ToolStripItem() {ZensToolStripMenuItem, MarkToolStripMenuItem, CropToolStripMenuItem, EraseToolStripMenuItem, PixelateToolStripMenuItem, KreisToolStripMenuItem, ArrowToolStripMenuItem, ResetToolStripMenuItem, UploadToolStripMenuItem, SaveToolStripMenuItem, ClipboardToolStripMenuItem, PrintToolStripMenuItem, ChooseServiceToolStripMenuItem}) ToolStripDropDownButton1.Image = CType(resources.GetObject("ToolStripDropDownButton1.Image"), Image) ToolStripDropDownButton1.ImageTransparentColor = Color.Magenta ToolStripDropDownButton1.Name = "ToolStripDropDownButton1" @@ -274,14 +261,6 @@ Namespace UI MarkToolStripMenuItem.Text = "Mark" MarkToolStripMenuItem.Visible = False ' - ' TextToolStripMenuItem - ' - TextToolStripMenuItem.Name = "TextToolStripMenuItem" - TextToolStripMenuItem.ShortcutKeys = Keys.Control Or Keys.T - TextToolStripMenuItem.Size = New Size(226, 22) - TextToolStripMenuItem.Text = "Text" - TextToolStripMenuItem.Visible = False - ' ' CropToolStripMenuItem ' CropToolStripMenuItem.Name = "CropToolStripMenuItem" @@ -540,7 +519,6 @@ Namespace UI Friend WithEvents CensorTool As System.Windows.Forms.ToolStripButton Friend WithEvents MarkerTool As System.Windows.Forms.ToolStripButton Friend WithEvents UndoStuff As System.Windows.Forms.ToolStripButton - Friend WithEvents TextToolButton As System.Windows.Forms.ToolStripButton Friend WithEvents CroppingTool As System.Windows.Forms.ToolStripButton Friend WithEvents ThePanel As PaintPanel Friend WithEvents ArrowTool As System.Windows.Forms.ToolStripButton @@ -549,7 +527,6 @@ Namespace UI Friend WithEvents ToolStripDropDownButton1 As System.Windows.Forms.ToolStripDropDownButton Friend WithEvents ZensToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem Friend WithEvents MarkToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem - Friend WithEvents TextToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem Friend WithEvents CropToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem Friend WithEvents EraseToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem Friend WithEvents PixelateToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem diff --git a/src/HolzShots.Legacy/UI/ShotEditor.vb b/src/HolzShots.Legacy/UI/ShotEditor.vb index 1cbfd8b5..bab1f996 100644 --- a/src/HolzShots.Legacy/UI/ShotEditor.vb +++ b/src/HolzShots.Legacy/UI/ShotEditor.vb @@ -195,7 +195,6 @@ Namespace UI ToolControlMap.Add(ShotEditorTool.Eyedropper, PipettenTool) ToolControlMap.Add(ShotEditorTool.Ellipse, EllipseTool) - ToolControlMap.Add(ShotEditorTool.Text, TextToolButton) ToolControlMap.Add(ShotEditorTool.Eraser, EraserTool) ToolControlMap.Add(ShotEditorTool.Crop, CroppingTool) ToolControlMap.Add(ShotEditorTool.Arrow, ArrowTool) @@ -244,9 +243,6 @@ Namespace UI Private Sub CircleToolClick() Handles EllipseTool.Click, KreisToolStripMenuItem.Click EnableTool(ShotEditorTool.Ellipse) End Sub - Private Sub TextToolButtonClick() Handles TextToolButton.Click, TextToolStripMenuItem.Click - EnableTool(ShotEditorTool.Text) - End Sub Private Sub EraserButtonClick() Handles EraserTool.Click, EraseToolStripMenuItem.Click EnableTool(ShotEditorTool.Eraser) End Sub diff --git a/src/HolzShots.LegacyNew/Drawing/Tools/Tool.cs b/src/HolzShots.LegacyNew/Drawing/Tools/Tool.cs index bee188e9..d2144fe1 100644 --- a/src/HolzShots.LegacyNew/Drawing/Tools/Tool.cs +++ b/src/HolzShots.LegacyNew/Drawing/Tools/Tool.cs @@ -2,16 +2,15 @@ namespace HolzShots.Drawing.Tools; public enum ShotEditorTool { - None = 0, - Censor = 1, - Marker = 2, - Text = 4, - Crop = 8, - Arrow = 16, - Eraser = 32, - Blur = 64, - Ellipse = 128, - Eyedropper = 256, - Brighten = 512, - LegacyNew = 1024 + None, + Censor, + Marker, + Crop, + Arrow, + Eraser, + Blur, + Ellipse, + Eyedropper, + Brighten, + LegacyNew, } diff --git a/src/HolzShots.LegacyNew/Properties/Resources.resx b/src/HolzShots.LegacyNew/Properties/Resources.resx index 1ab7a663..f7f598e6 100644 --- a/src/HolzShots.LegacyNew/Properties/Resources.resx +++ b/src/HolzShots.LegacyNew/Properties/Resources.resx @@ -157,12 +157,6 @@ ..\Resources\cancelMedium.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\fontMedium.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\dateMedium.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\clipboardMedium.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -178,9 +172,6 @@ ..\Resources\windowsCursorMedium.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\selectAllMedium.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\clipboardSmall.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -199,18 +190,12 @@ ..\Resources\circleMedium.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\moveMedium.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\checkerboardBackground.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\uploadSmall.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\textMedium.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\eraser.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a diff --git a/src/HolzShots.LegacyNew/Resources/fontMedium.png b/src/HolzShots.LegacyNew/Resources/fontMedium.png deleted file mode 100644 index 26e7465b..00000000 Binary files a/src/HolzShots.LegacyNew/Resources/fontMedium.png and /dev/null differ diff --git a/src/HolzShots.LegacyNew/Resources/selectAllMedium.png b/src/HolzShots.LegacyNew/Resources/selectAllMedium.png deleted file mode 100644 index 050ab1b4..00000000 Binary files a/src/HolzShots.LegacyNew/Resources/selectAllMedium.png and /dev/null differ diff --git a/src/HolzShots.LegacyNew/Resources/textMedium.png b/src/HolzShots.LegacyNew/Resources/textMedium.png deleted file mode 100644 index a99b41b3..00000000 Binary files a/src/HolzShots.LegacyNew/Resources/textMedium.png and /dev/null differ diff --git a/src/HolzShots.LegacyNew/UI/PaintPanel2.cs b/src/HolzShots.LegacyNew/UI/PaintPanel2.cs index 5b462387..8ce7a1d4 100644 --- a/src/HolzShots.LegacyNew/UI/PaintPanel2.cs +++ b/src/HolzShots.LegacyNew/UI/PaintPanel2.cs @@ -101,9 +101,6 @@ public ShotEditorTool CurrentTool case ShotEditorTool.None: Cursor = System.Windows.Forms.Cursors.Default; break; - case ShotEditorTool.Text: - CurrentToolObject = null; // TODO Change to default(_) if this is not a reference type - break; case ShotEditorTool.Crop: CurrentToolObject = new Crop(); @@ -250,7 +247,7 @@ private void DrawBoxMouseClick(object sender, MouseEventArgs e) private void MouseLayerMouseDown(object sender, MouseEventArgs e) { _mouseDown = true; - if (_currentTool == ShotEditorTool.None || _currentTool == ShotEditorTool.Text) + if (_currentTool == ShotEditorTool.None) return; CurrentToolObject.BeginCoordinates = e.Location.ToVector2();