Ticket #2988: 2988.diff

source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Object/Object.cpp

@@ -1 @@
-/* Copyright (C) 2014 Wildfire Games.
+/* Copyright (C) 2015 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -97 +97 @@
 struct ObjectSidebarImpl
 {
     ObjectSidebarImpl(ScenarioEditor& scenarioEditor) :
-        m_ObjectListBox(NULL), m_ActorViewerActive(false),
+        m_ObjectListView(NULL), m_ActorViewerActive(false),
         m_ActorViewerEntity(_T("actor|structures/fndn_1x1.xml")),
         m_ActorViewerAnimation(_T("idle")), m_ActorViewerSpeed(0.f),
         m_ObjectSettings(scenarioEditor.GetObjectSettings())
@@ -104 +104 @@
     {
     }
 
-    wxListBox* m_ObjectListBox;
+    wxListView* m_ObjectListView;
     std::vector<AtlasMessage::sObjectsListItem> m_Objects;
     ObservableScopedConnection m_ToolConn;
 
@@ -152 +152 @@
     
     // ------------------------------------------------------------------------------------------
 
-    p->m_ObjectListBox = new wxListBox(this, ID_SelectObject, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_SINGLE|wxLB_HSCROLL);
-    m_MainSizer->Add(p->m_ObjectListBox, wxSizerFlags().Proportion(1).Expand());
+    p->m_ObjectListView = new wxListView(this, ID_SelectObject, wxDefaultPosition, wxDefaultSize, wxLC_REPORT | wxLC_SINGLE_SEL | wxLC_NO_HEADER);
+    p->m_ObjectListView->AppendColumn(_("Template Name"), wxLIST_FORMAT_LEFT, wxLIST_AUTOSIZE);
+
+    m_MainSizer->Add(p->m_ObjectListView, wxSizerFlags().Proportion(1).Expand());
     m_MainSizer->AddSpacer(3);
 
     // ------------------------------------------------------------------------------------------
@@ -208 +210 @@
     FilterObjects();
 }
 
-void ObjectSidebar::FilterObjects()
+int g_itemIdListView = 0;
+struct filterObject
 {
-    int filterType = wxDynamicCast(FindWindow(ID_ObjectType), wxChoice)->GetSelection();
-    wxString filterName = wxDynamicCast(FindWindow(ID_ObjectFilter), wxTextCtrl)->GetValue();
+    filterObject(const wxString filter, int filterType, wxListView* listView):m_filter(filter.Lower()), m_filterType(filterType),m_listView(listView)
+    {
+    }
 
-    p->m_ObjectListBox->Freeze();
-    p->m_ObjectListBox->Clear();
-    for (std::vector<AtlasMessage::sObjectsListItem>::iterator it = p->m_Objects.begin(); it != p->m_Objects.end(); ++it)
+    void operator()(const AtlasMessage::sObjectsListItem& it) const
     {
-        if (it->type == filterType)
+        if (it.type == m_filterType)
         {
-            wxString id = it->id.c_str();
-            wxString name = it->name.c_str();
+            wxString id = it.id.c_str();
+            wxString name = it.name.c_str();
 
-            if (name.Lower().Find(filterName.Lower()) != wxNOT_FOUND)
+            if (name.Lower().Find(m_filter) != wxNOT_FOUND)
             {
-                p->m_ObjectListBox->Append(name, new wxStringClientData(id));
+                wxListItem item;
+                item.SetColumn(0);
+                item.SetText(name);
+                item.SetId(++g_itemIdListView);
+                item.SetWidth(wxLIST_AUTOSIZE);
+                item.SetData(new wxStringClientData(id));
+                m_listView->InsertItem(item);
             }
         }
     }
-    p->m_ObjectListBox->Thaw();
+
+private:
+    wxString m_filter;
+    int m_filterType;
+    wxListView* m_listView;
+};
+
+void ObjectSidebar::FilterObjects()
+{
+    int filterType = wxDynamicCast(FindWindow(ID_ObjectType), wxChoice)->GetSelection();
+    wxString filterName = wxDynamicCast(FindWindow(ID_ObjectFilter), wxTextCtrl)->GetValue();
+
+    p->m_ObjectListView->Freeze();
+    p->m_ObjectListView->DeleteAllItems();
+    g_itemIdListView = -1;
+    std::for_each(p->m_Objects.begin(), p->m_Objects.end(), filterObject(filterName, filterType, p->m_ObjectListView));
+    p->m_ObjectListView->SetColumnWidth(0, wxLIST_AUTOSIZE);
+    p->m_ObjectListView->Thaw();
 }
 
 void ObjectSidebar::OnToggleViewer(wxCommandEvent& WXUNUSED(evt))
@@ -248 +273 @@
     FilterObjects();
 }
 
-void ObjectSidebar::OnSelectObject(wxCommandEvent& evt)
+void ObjectSidebar::OnSelectObject(wxListEvent& evt)
 {
     if (evt.GetInt() < 0)
         return;
 
-    wxString id = static_cast<wxStringClientData*>(evt.GetClientObject())->GetData();
+    wxString id = reinterpret_cast<wxStringClientData*>(evt.GetData())->GetData();
 
     // Always update the actor viewer's state even if it's inactive,
     // so it will be correct when first enabled
@@ -278 +303 @@
 BEGIN_EVENT_TABLE(ObjectSidebar, Sidebar)
     EVT_CHOICE(ID_ObjectType, ObjectSidebar::OnSelectType)
     EVT_TEXT(ID_ObjectFilter, ObjectSidebar::OnSelectFilter)
-    EVT_LISTBOX(ID_SelectObject, ObjectSidebar::OnSelectObject)
+    EVT_LIST_ITEM_SELECTED(ID_SelectObject, ObjectSidebar::OnSelectObject)
     EVT_BUTTON(ID_ToggleViewer, ObjectSidebar::OnToggleViewer)
 END_EVENT_TABLE();
 

source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Object/Object.h

@@ -1 @@
-/* Copyright (C) 2011 Wildfire Games.
+/* Copyright (C) 2015 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -16 +16 @@
  */
 
 #include "../Common/Sidebar.h"
+#include <wx/listctrl.h>
 
 class ITool;
 
@@ -35 +36 @@
     void OnToggleViewer(wxCommandEvent& evt);
     void OnSelectType(wxCommandEvent& evt);
     void OnSelectFilter(wxCommandEvent& evt);
-    void OnSelectObject(wxCommandEvent& evt);
+    void OnSelectObject(wxListEvent& evt);
 
     ObjectSidebarImpl* p;