From 79382dc5265c75cd226c2f3ebc7034087944955a Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Tue, 24 Feb 2015 22:23:00 +0200 Subject: [PATCH] v0.5 --- .../F_SB_PictureTagger.Designer.vb | 24 +++++++++- SB-PictureTagger/F_SB_PictureTagger.resx | 12 +++++ SB-PictureTagger/F_SB_PictureTagger.vb | 44 ++++++++++--------- SB-PictureTagger/SB-PictureTagger.vbproj | 1 + 4 files changed, 60 insertions(+), 21 deletions(-) diff --git a/SB-PictureTagger/F_SB_PictureTagger.Designer.vb b/SB-PictureTagger/F_SB_PictureTagger.Designer.vb index 9686abe..08f78dc 100644 --- a/SB-PictureTagger/F_SB_PictureTagger.Designer.vb +++ b/SB-PictureTagger/F_SB_PictureTagger.Designer.vb @@ -57,6 +57,8 @@ Partial Class Main Me.cb_AutoSave = New System.Windows.Forms.CheckBox() Me.cb_marks_visible = New System.Windows.Forms.CheckBox() Me.Label7 = New System.Windows.Forms.Label() + Me.ShapeContainer1 = New Microsoft.VisualBasic.PowerPacks.ShapeContainer() + Me.OvalShape1 = New Microsoft.VisualBasic.PowerPacks.OvalShape() CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit() Me.GroupBox1.SuspendLayout() Me.GroupBox2.SuspendLayout() @@ -377,8 +379,25 @@ Partial Class Main Me.Label7.AutoSize = True Me.Label7.Location = New System.Drawing.Point(9, 633) Me.Label7.Name = "Label7" - Me.Label7.Size = New System.Drawing.Size(0, 13) + Me.Label7.Size = New System.Drawing.Size(65, 13) Me.Label7.TabIndex = 13 + Me.Label7.Text = "Pfadangabe" + ' + 'ShapeContainer1 + ' + Me.ShapeContainer1.Location = New System.Drawing.Point(0, 0) + Me.ShapeContainer1.Margin = New System.Windows.Forms.Padding(0) + Me.ShapeContainer1.Name = "ShapeContainer1" + Me.ShapeContainer1.Shapes.AddRange(New Microsoft.VisualBasic.PowerPacks.Shape() {Me.OvalShape1}) + Me.ShapeContainer1.Size = New System.Drawing.Size(1106, 723) + Me.ShapeContainer1.TabIndex = 14 + Me.ShapeContainer1.TabStop = False + ' + 'OvalShape1 + ' + Me.OvalShape1.Location = New System.Drawing.Point(156, 216) + Me.OvalShape1.Name = "OvalShape1" + Me.OvalShape1.Size = New System.Drawing.Size(81, 77) ' 'Main ' @@ -397,6 +416,7 @@ Partial Class Main Me.Controls.Add(Me.b_last) Me.Controls.Add(Me.b_next) Me.Controls.Add(Me.PictureBox1) + Me.Controls.Add(Me.ShapeContainer1) Me.Name = "Main" Me.Text = "SB-PictureTagger" CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit() @@ -448,5 +468,7 @@ Partial Class Main Friend WithEvents NumericUpDown_OrdnerTiefe As System.Windows.Forms.NumericUpDown Friend WithEvents Label9 As System.Windows.Forms.Label Friend WithEvents tb_Place_Title As System.Windows.Forms.TextBox + Friend WithEvents ShapeContainer1 As Microsoft.VisualBasic.PowerPacks.ShapeContainer + Friend WithEvents OvalShape1 As Microsoft.VisualBasic.PowerPacks.OvalShape End Class diff --git a/SB-PictureTagger/F_SB_PictureTagger.resx b/SB-PictureTagger/F_SB_PictureTagger.resx index 78bf064..fe3f17d 100644 --- a/SB-PictureTagger/F_SB_PictureTagger.resx +++ b/SB-PictureTagger/F_SB_PictureTagger.resx @@ -129,4 +129,16 @@ True + + True + + + True + + + True + + + True + \ No newline at end of file diff --git a/SB-PictureTagger/F_SB_PictureTagger.vb b/SB-PictureTagger/F_SB_PictureTagger.vb index b2a44a7..8be52da 100644 --- a/SB-PictureTagger/F_SB_PictureTagger.vb +++ b/SB-PictureTagger/F_SB_PictureTagger.vb @@ -31,11 +31,11 @@ Public Class Main Settings.PictureTagger.pub_aSupportedFiles(5) = ".tif" 'Portable oder Nicht komming soon! - End Sub 'LoadConfigForm + End Sub 'LoadConfigForm ### in work ### Private Sub SaveConfigForm() 'Wird noch Programmert, stürzt sich auf Stammbaum.Settings 'Wie zuletz verwendetes Verzeichnis ... - End Sub 'SaveConfigForm ### in work ### + End Sub 'SaveConfigForm ### in work ### '################################################################################################################### @@ -92,31 +92,35 @@ Public Class Main If ChangesAreTrue() And (Settings.PictureTagger.Pub_oLoaded_TaggedIMG.ID <> "" Or Nothing) And System.IO.File.Exists(Settings.PictureTagger.Pub_oLoaded_TaggedIMG.Path) Then 'Überprüfe ob Tagg Speichern erlaubt - If (cb_AutoSave.Checked Or WithoutQestion) Or (MessageBox.Show("Willst du die Änderungen Speichern?", "SB-PictureTagger", MessageBoxButtons.YesNo) = DialogResult.Yes) Then - - 'TextBox sichern - Stammbaum.Settings.PictureTagger.Pub_oLoaded_TaggedIMG.Title = tb_Bild_Title.Text - Stammbaum.Settings.PictureTagger.Pub_oLoaded_TaggedIMG.Time = tb_Bild_Time.Text - Stammbaum.Settings.PictureTagger.Pub_oLoaded_TaggedIMG.Description = rtb_Bild_Description.Text - - Stammbaum.Settings.PictureTagger.Pub_oLoaded_TaggedIMG.Ort.Title = tb_Place_Title.Text - Stammbaum.Settings.PictureTagger.Pub_oLoaded_TaggedIMG.Ort.Adresse = tb_Place_Addresse.Text - Stammbaum.Settings.PictureTagger.Pub_oLoaded_TaggedIMG.Ort.GPS = tb_Place_GPS.Text - Stammbaum.Settings.PictureTagger.Pub_oLoaded_TaggedIMG.Ort.Description = rtb_Place_Description.Text - - 'Lese Markierungen <-- in Planung (Fieleicht Überflüsig, jenachdem wie Markierungen angesteuert werden - - 'In TaggSource speichern - Stammbaum.Module.PictureTagger.PT_SaveTaggedIMG() - + If cb_AutoSave.Checked Or WithoutQestion Then + _SaveTaggs() + ElseIf (MessageBox.Show("Willst du die Änderungen Speichern?", "SB-PictureTagger", MessageBoxButtons.YesNo) = DialogResult.Yes) Then + _SaveTaggs() End If End If End Sub 'Save Taggs when Changes are hapened + Private Sub _SaveTaggs() + 'TextBox sichern + Stammbaum.Settings.PictureTagger.Pub_oLoaded_TaggedIMG.Title = tb_Bild_Title.Text + Stammbaum.Settings.PictureTagger.Pub_oLoaded_TaggedIMG.Time = tb_Bild_Time.Text + Stammbaum.Settings.PictureTagger.Pub_oLoaded_TaggedIMG.Description = rtb_Bild_Description.Text + + Stammbaum.Settings.PictureTagger.Pub_oLoaded_TaggedIMG.Ort.Title = tb_Place_Title.Text + Stammbaum.Settings.PictureTagger.Pub_oLoaded_TaggedIMG.Ort.Adresse = tb_Place_Addresse.Text + Stammbaum.Settings.PictureTagger.Pub_oLoaded_TaggedIMG.Ort.GPS = tb_Place_GPS.Text + Stammbaum.Settings.PictureTagger.Pub_oLoaded_TaggedIMG.Ort.Description = rtb_Place_Description.Text + + 'Lese Markierungen <-- in Planung (Fieleicht Überflüsig, jenachdem wie Markierungen angesteuert werden + + 'In TaggSource speichern + Stammbaum.Module.PictureTagger.PT_SaveTaggedIMG() + End Sub 'Eigendliche Sicherungs Rotiene + Private Sub LoadTaggedIMG() - + 'Textvelder Lehren Clear_Form() diff --git a/SB-PictureTagger/SB-PictureTagger.vbproj b/SB-PictureTagger/SB-PictureTagger.vbproj index 9ad6e7b..85d8ee7 100644 --- a/SB-PictureTagger/SB-PictureTagger.vbproj +++ b/SB-PictureTagger/SB-PictureTagger.vbproj @@ -49,6 +49,7 @@ On +