diff --git a/vCardEditor/Model/FixedList.cs b/vCardEditor/Model/FixedList.cs index e7f4161..339b3ef 100644 --- a/vCardEditor/Model/FixedList.cs +++ b/vCardEditor/Model/FixedList.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Text; namespace vCardEditor.Model { @@ -17,7 +16,7 @@ namespace vCardEditor.Model set { _size = value; } } - public FixedList() : this(5) { } + public FixedList() { } public FixedList(int size) { diff --git a/vCardEditor/Presenter/MainPresenter.cs b/vCardEditor/Presenter/MainPresenter.cs index 8a979dd..fa9ec95 100644 --- a/vCardEditor/Presenter/MainPresenter.cs +++ b/vCardEditor/Presenter/MainPresenter.cs @@ -211,7 +211,7 @@ namespace VCFEditor.Presenter var contact = _repository.Contacts[_view.SelectedContactIndex]; _repository.SetDirtyFlag(_view.SelectedContactIndex); - contact.card.DeliveryAddresses.Add(new vCardDeliveryAddress( e.Data)); + contact.card.DeliveryAddresses.Add(new vCardDeliveryAddress(e.Data)); } private void AddressModifiedHandler(object sender, EventArg> e) @@ -274,7 +274,7 @@ namespace VCFEditor.Presenter void CloseFormHandler(object sender, EventArg e) { - if (_repository.dirty && _view.AskMessage("Exit without saving?", "Exit")) + if (_repository.dirty && !_view.AskMessage("Exit without saving?", "Exit")) e.Data = true; if (!e.Data) @@ -347,7 +347,7 @@ namespace VCFEditor.Presenter { if (_repository.Contacts != null && _repository.dirty) { - if (!_view.AskMessage("Save current file before?", "Load")) + if (_view.AskMessage("Save current file before?", "Load")) SaveContactsHandler(null, null); //_repository.SaveContactsToFile(_repository.fileName); } diff --git a/vCardEditor/Repository/ContactRepository.cs b/vCardEditor/Repository/ContactRepository.cs index 414b638..4dbeac3 100644 --- a/vCardEditor/Repository/ContactRepository.cs +++ b/vCardEditor/Repository/ContactRepository.cs @@ -148,7 +148,6 @@ namespace VCFEditor.Repository //Clean the flag for every contact, even the deleted ones. entry.isDirty = false; - } _dirty = false; _fileHandler.WriteAllText(fileName, sb.ToString()); @@ -272,7 +271,6 @@ namespace VCFEditor.Repository card.Phones.GetFirstChoice(vCardPhoneTypes.Home).FullNumber = string.Empty; } - //Cellular if (NewCard.Phones.GetFirstChoice(vCardPhoneTypes.Cellular) != null) { @@ -323,7 +321,6 @@ namespace VCFEditor.Repository private void SaveWebUrl(vCard NewCard, vCard card) { - if (NewCard.Websites.GetFirstChoice(vCardWebsiteTypes.Personal) != null) { if (card.Websites.GetFirstChoice(vCardWebsiteTypes.Personal) != null) diff --git a/vCardEditor/View/Customs/ExtendedPanel.cs b/vCardEditor/View/Customs/ExtendedPanel.cs index 75a4b99..ff116cf 100644 --- a/vCardEditor/View/Customs/ExtendedPanel.cs +++ b/vCardEditor/View/Customs/ExtendedPanel.cs @@ -11,9 +11,9 @@ namespace vCardEditor.View.Customs public ExtendedPanel() { InitializeComponent(); - - miCell.Click += MenuItemClickHandlers; + miCell.Tag = new vCardPhone(string.Empty, vCardPhoneTypes.Cellular); + miCell.Click += MenuItemClickHandlers; miHome.Tag = new vCardPhone(string.Empty, vCardPhoneTypes.Home); miHome.Click += MenuItemClickHandlers; @@ -46,6 +46,7 @@ namespace vCardEditor.View.Customs } public PanelType panelType { get; set; } + private void MenuItemClickHandlers(object sender, EventArgs e) { object tag = (sender as ToolStripMenuItem).Tag; @@ -110,34 +111,25 @@ namespace vCardEditor.View.Customs { if (MessageBox.Show("Are you sure?", "Question", MessageBoxButtons.YesNo) == DialogResult.Yes) { - var par = (sender as Control).Parent; - PanelContent.Controls.Remove(par); - - ReplaceControls(); + PanelContent.Controls.Remove((sender as Control).Parent); + for (int i = 0; i < PanelContent.Controls.Count; i++) + { + PanelContent.Controls[i].Location = new Point(5, (i * 30) + 10); + } CardInfoRemoved?.Invoke(sender, e); } } - private void ReplaceControls() - { - for (int i = 0; i < PanelContent.Controls.Count; i++) - { - PanelContent.Controls[i].Location = new Point(5, (i * 30) + 10); - } - } - private Point GetCoordinatesForNewControl() { Point pt; if (PanelContent.Controls.Count > 0) { - Control LastControl = PanelContent.Controls[PanelContent.Controls.Count - 1]; - pt = LastControl.Location; + pt = PanelContent.Controls[PanelContent.Controls.Count - 1].Location; pt.Y += 30; } else pt = new Point(5, 10); - return pt; } } diff --git a/vCardEditor/View/MainForm.cs b/vCardEditor/View/MainForm.cs index 470acab..5a2b40a 100644 --- a/vCardEditor/View/MainForm.cs +++ b/vCardEditor/View/MainForm.cs @@ -194,17 +194,19 @@ namespace vCardEditor.View public void AddExtraTextGroup(vCardPropeties type, string content) { - ExtraTextGroup etg = new ExtraTextGroup(); - etg.Content = content; - etg.Caption = type.ToString() + " :"; - etg.CardProp = type; + ExtraTextGroup etg = new ExtraTextGroup + { + Content = content, + Caption = type.ToString() + ":", + CardProp = type, + Dock = DockStyle.Top + }; etg.TextChangedEvent += (sender, e) => TextBoxValueChanged?.Invoke(sender, e); etg.ControlDeleted += (sender, e) => { - Control send = sender as Control; - panelTabExtra.Controls.Remove(send.Parent); + if (AskMessage("Are you sure?", "Question")) + panelTabExtra.Controls.Remove((sender as Control).Parent); }; - etg.Dock = DockStyle.Top; panelTabExtra.Controls.Add(etg); } @@ -418,14 +420,8 @@ namespace vCardEditor.View public bool AskMessage(string msg, string caption) { - bool result = true; // true == yes - DialogResult window = MessageBox.Show(msg, caption, MessageBoxButtons.YesNo); - - if (window != DialogResult.No) - result = false; - - return result; + return window == DialogResult.Yes; } private void miConfig_Click(object sender, EventArgs e)