3.2

1 files changed, 73 insertions, 0 deletions

diff --git a/shared/customComboBox.cpp b/shared/customComboBox.cpp
new file mode 100644
index 00000000..f2eec7a9
--- /dev/null
+++ b/shared/customComboBox.cpp
@@ -0,0 +1,73 @@
+#include "customComboBox.h"
+
+
+CustomComboBox::CustomComboBox(wxWindow* parent,
+                               wxWindowID id,
+                               const wxString& value,
+                               const wxPoint& pos,
+                               const wxSize& size,
+                               int n,
+                               const wxString choices[],
+                               long style,
+                               const wxValidator& validator,
+                               const wxString& name) :
+    wxComboBox(parent, id, value, pos, size, n, choices, style, validator, name)
+{
+    //register key event to enable item deletion
+    this->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(CustomComboBox::OnKeyEvent), NULL, this );
+}
+
+
+void CustomComboBox::OnKeyEvent(wxKeyEvent& event)
+{
+    const int keyCode = event.GetKeyCode();
+    if (keyCode == WXK_DELETE || keyCode == WXK_NUMPAD_DELETE)
+    {
+        //try to delete the currently selected config history item
+        const int selectedItem = this->GetCurrentSelection();
+        if (0 <= selectedItem && selectedItem < static_cast<int>(this->GetCount()) &&
+                (GetValue() != GetString(selectedItem) || //avoid problems when letter shall be deleted instead of list item
+                 GetValue() == wxEmptyString) //exception: always allow removing empty entry
+           )
+        {
+            //save old (selected) value: deletion seems to have influence on this
+            const wxString currentVal = this->GetValue();
+            this->SetSelection(wxNOT_FOUND);
+
+            //delete selected row
+            this->Delete(selectedItem);
+
+            //(re-)set value
+            this->SetValue(currentVal);
+
+            //eat up key event
+            return;
+        }
+    }
+    event.Skip();
+}
+
+
+void CustomComboBox::addPairToFolderHistory(const wxString& newFolder, unsigned int maxHistSize)
+{
+    const wxString oldVal = this->GetValue();
+
+    //insert new folder or put it to the front if already existing
+#ifdef FFS_WIN //don't respect case in windows build
+    const int pos = FindString(newFolder, false);
+#elif defined FFS_LINUX
+    const int pos = FindString(newFolder, true);
+#endif
+    if (pos != wxNOT_FOUND)
+        this->Delete(pos);
+
+    this->Insert(newFolder, 0);
+
+    //keep maximal size of history list
+    if (this->GetCount() > maxHistSize)
+        this->Delete(maxHistSize);
+
+    this->SetSelection(wxNOT_FOUND);  //don't select anything
+    this->SetValue(oldVal);           //but preserve main text!
+}
+