From 75ce95bab4f94d19d12fd793b1bba26431eb5fa9 Mon Sep 17 00:00:00 2001 From: Natalia Portillo Date: Wed, 3 May 2017 01:47:34 +0100 Subject: [PATCH] Added option to remove file from list of files, so to ignore it. --- osrepodbmgr/ChangeLog | 9 +++++++ osrepodbmgr/MainWindow.cs | 23 ++++++++++++++++- osrepodbmgr/gtk-gui/MainWindow.cs | 25 ++++++++++++++++--- osrepodbmgr/gtk-gui/gui.stetic | 23 +++++++++++++++-- .../gtk-gui/osrepodbmgr.dlgMetadata.cs | 2 +- 5 files changed, 74 insertions(+), 8 deletions(-) diff --git a/osrepodbmgr/ChangeLog b/osrepodbmgr/ChangeLog index 5e14c2b..4c75c3b 100644 --- a/osrepodbmgr/ChangeLog +++ b/osrepodbmgr/ChangeLog @@ -1,3 +1,12 @@ +2017-05-03 Natalia Portillo + + * MainWindow.cs: + * gtk-gui/gui.stetic: + * gtk-gui/MainWindow.cs: + * gtk-gui/osrepodbmgr.dlgMetadata.cs: + Added option to remove file from list of files, so to ignore + it. + 2017-05-03 Natalia Portillo * dlgMetadata.cs: diff --git a/osrepodbmgr/MainWindow.cs b/osrepodbmgr/MainWindow.cs index ce0d91a..abeb718 100644 --- a/osrepodbmgr/MainWindow.cs +++ b/osrepodbmgr/MainWindow.cs @@ -310,7 +310,7 @@ public partial class MainWindow : Window thdCheckFiles.Abort(); prgProgress.Visible = false; btnStop.Visible = false; - btnClose.Visible = true; + btnClose.Visible = false; btnExit.Sensitive = true; Core.Failed -= ChkFilesFailed; Core.Finished -= ChkFilesFinished; @@ -352,6 +352,7 @@ public partial class MainWindow : Window btnAdd.Visible = true; btnPack.Visible = true; btnPack.Sensitive = true; + btnRemoveFile.Visible = true; txtFormat.IsEditable = true; txtMachine.IsEditable = true; @@ -452,6 +453,7 @@ public partial class MainWindow : Window btnAdd.Visible = false; btnPack.Visible = false; btnClose.Visible = false; + btnRemoveFile.Visible = false; if(fileView != null) fileView.Clear(); if(osView != null) @@ -1191,4 +1193,23 @@ public partial class MainWindow : Window _dlgMetadata.Destroy(); } + + protected void OnBtnRemoveFileClicked(object sender, EventArgs e) + { + TreeIter fileIter; + if(treeFiles.Selection.GetSelected(out fileIter)) + { + string name = (string)fileView.GetValue(fileIter, 0); + string filesPath; + + if(!string.IsNullOrEmpty(MainClass.tmpFolder) && Directory.Exists(MainClass.tmpFolder)) + filesPath = MainClass.tmpFolder; + else + filesPath = MainClass.path; + + MainClass.hashes.Remove(name); + MainClass.files.Remove(System.IO.Path.Combine(filesPath, name)); + fileView.Remove(ref fileIter); + } + } } diff --git a/osrepodbmgr/gtk-gui/MainWindow.cs b/osrepodbmgr/gtk-gui/MainWindow.cs index 66bbf34..a105935 100644 --- a/osrepodbmgr/gtk-gui/MainWindow.cs +++ b/osrepodbmgr/gtk-gui/MainWindow.cs @@ -119,6 +119,8 @@ public partial class MainWindow private global::Gtk.Button btnMetadata; + private global::Gtk.Button btnRemoveFile; + protected virtual void Build() { global::Stetic.Gui.Initialize(this); @@ -687,17 +689,30 @@ public partial class MainWindow w61.Position = 9; w61.Expand = false; w61.Fill = false; - this.vbox1.Add(this.hbox1); - global::Gtk.Box.BoxChild w62 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.hbox1])); - w62.Position = 12; + // Container child hbox1.Gtk.Box+BoxChild + this.btnRemoveFile = new global::Gtk.Button(); + this.btnRemoveFile.CanFocus = true; + this.btnRemoveFile.Name = "btnRemoveFile"; + this.btnRemoveFile.UseStock = true; + this.btnRemoveFile.UseUnderline = true; + this.btnRemoveFile.Label = "gtk-remove"; + this.hbox1.Add(this.btnRemoveFile); + global::Gtk.Box.BoxChild w62 = ((global::Gtk.Box.BoxChild)(this.hbox1[this.btnRemoveFile])); + w62.PackType = ((global::Gtk.PackType)(1)); + w62.Position = 10; w62.Expand = false; w62.Fill = false; + this.vbox1.Add(this.hbox1); + global::Gtk.Box.BoxChild w63 = ((global::Gtk.Box.BoxChild)(this.vbox1[this.hbox1])); + w63.Position = 12; + w63.Expand = false; + w63.Fill = false; this.Add(this.vbox1); if((this.Child != null)) { this.Child.ShowAll(); } - this.DefaultWidth = 778; + this.DefaultWidth = 857; this.DefaultHeight = 544; this.lblProgress.Hide(); this.prgProgress.Hide(); @@ -708,8 +723,10 @@ public partial class MainWindow this.btnAdd.Hide(); this.btnStop.Hide(); this.btnMetadata.Hide(); + this.btnRemoveFile.Hide(); this.Show(); this.DeleteEvent += new global::Gtk.DeleteEventHandler(this.OnDeleteEvent); + this.btnRemoveFile.Clicked += new global::System.EventHandler(this.OnBtnRemoveFileClicked); this.btnMetadata.Clicked += new global::System.EventHandler(this.OnBtnMetadataClicked); this.btnStop.Clicked += new global::System.EventHandler(this.OnBtnStopClicked); this.btnFolder.Clicked += new global::System.EventHandler(this.OnBtnFolderClicked); diff --git a/osrepodbmgr/gtk-gui/gui.stetic b/osrepodbmgr/gtk-gui/gui.stetic index 2058cf7..da62301 100644 --- a/osrepodbmgr/gtk-gui/gui.stetic +++ b/osrepodbmgr/gtk-gui/gui.stetic @@ -7,7 +7,7 @@ - + OS Repository DB Manager CenterOnParent @@ -757,6 +757,25 @@ False + + + + False + True + True + StockItem + gtk-remove + + gtk-remove + + + End + 10 + True + False + False + + 12 @@ -1237,7 +1256,7 @@ QNX/QNX/20090229/source.zip True - 8 + 0 diff --git a/osrepodbmgr/gtk-gui/osrepodbmgr.dlgMetadata.cs b/osrepodbmgr/gtk-gui/osrepodbmgr.dlgMetadata.cs index 6a82b60..10094f1 100644 --- a/osrepodbmgr/gtk-gui/osrepodbmgr.dlgMetadata.cs +++ b/osrepodbmgr/gtk-gui/osrepodbmgr.dlgMetadata.cs @@ -317,7 +317,7 @@ namespace osrepodbmgr this.notebook3 = new global::Gtk.Notebook(); this.notebook3.CanFocus = true; this.notebook3.Name = "notebook3"; - this.notebook3.CurrentPage = 8; + this.notebook3.CurrentPage = 0; // Container child notebook3.Gtk.Notebook+NotebookChild this.vbox3 = new global::Gtk.VBox(); this.vbox3.Name = "vbox3";