updates to the script list

Author: mjwagner2

.vscode/settings.json

@@ -61,6 +61,9 @@
         "optional": "cpp",
         "ratio": "cpp",
         "thread": "cpp",
-        "cinttypes": "cpp"
+        "cinttypes": "cpp",
+        "*.cpng": "cpp",
+        "bitset": "cpp",
+        "codecvt": "cpp"
     }
 }

app/daotk_app.cpp

@@ -213,7 +213,7 @@ MainWindow::MainWindow()
 
 	m_tabList->Append("Script");
 	m_ScriptViewForm = new ScriptView(splitscript);
-	m_ScriptList = new ScriptList(splitscript);
+	m_ScriptList = new ScriptList(splitscript, &m_image_dir);
 	splitscript->SplitVertically(m_ScriptList, m_ScriptViewForm, 180);
 
 	m_LogViewForm = new LogView(splitwin);
@@ -428,6 +428,28 @@ void MainWindow::Save()
 		jv.AddMember("d", jdata, alloc);
 		D.AddMember((rjs::Value::StringRefType)(v->name.c_str()), jv, alloc);
 	}
+	//Add script list info
+	std::vector<ScriptListObject> *sl = m_ScriptList->GetList();
+	for(int i=0; i<sl->size(); i++)
+	{
+		rjs::Value jv(rjs::kObjectType);
+		jv.AddMember("sls", rjs::Value((int)sl->at(i).status), alloc);
+		
+		rjs::Value jdp(rjs::kStringType);
+		jdp.Set(sl->at(i).path.c_str());
+		jv.AddMember("slp", jdp, alloc);
+
+		rjs::Value jdc(rjs::kStringType);
+		jdc.SetString( (rjs::Value::StringRefType)sl->at(i).created.FormatISOCombined().c_str() );
+		jv.AddMember("slc", jdc, alloc);
+
+		rjs::Value jdm(rjs::kStringType);
+		jdm.SetString( (rjs::Value::StringRefType)sl->at(i).modified.FormatISOCombined().c_str() );
+		jv.AddMember("slm", jdm, alloc);
+
+		D.AddMember( (rjs::Value::StringRefType)(wxString::Format("jlo%02d",i).c_str()), jv, alloc);
+	}
+
 
 	int initsize=2;
 	while(initsize < cest)
@@ -599,9 +621,32 @@ bool MainWindow::Load(const wxString &file)
 					}
 				}
 			}
-		}		
+		}	
+		//load script list info
+		std::vector< ScriptListObject >* slist = m_ScriptList->GetList();
+		slist->clear();
+
+		bool lo_found = true;
+		int i=0;
+		while( lo_found )
+		{
+			std::string name = wxString::Format("jlo%03d", i);
+			lo_found = D.HasMember( name.c_str() );
+			if( lo_found )
+			{
+				ScriptListObject slo;
+				rjs::Value &jv = D[ name.c_str() ];
+				slo.status = jv["sls"].GetInt();
+				slo.created.SetFromString( jv["slc"].GetString() );
+				slo.modified.SetFromString( jv["slm"].GetString() );
+
+				slist->push_back( slo );
+			}
+			i++;
+		}
 
 		UpdateDataTable();
+		m_ScriptList->UpdateScriptList();
 		SetProgress(0, wxString::Format("Successfully loaded \"%s\"", m_fileName.c_str()) );
 
 		return true;

app/scriptlist.cpp

@@ -2,24 +2,66 @@
 
 #include <wx/listctrl.h>
 #include <wx/imaglist.h>
+#include <wx/filename.h>
+#include <wx/splitter.h>
+
 #include <wex/icons/down_arrow_gray_13.cpng>
 #include <wex/icons/up_arrow_gray_13.cpng>
 #include <wex/icons/stock_add_16.cpng>
 #include <wex/icons/stock_remove_16.cpng>
 #include <wex/icons/stock_yes_20.cpng>
 #include <wex/icons/stock_no_20.cpng>
+#include <wex/icons/stock_exec_16.cpng>
+#include <wex/icons/qmark.cpng>
+
+#ifdef __WXOSX__
+#define FONTSIZE 13
+#else
+#define FONTSIZE 9
+#endif
+
+
+myDateTime myDateTime::Today()
+{
+    myDateTime D;
+    D.ParseDateTime( wxDateTime::Today().FormatISOCombined() );
 
+    return D;
+}
+
+wxString myDateTime::GetDisplayDate()
+{
+    if( this->IsLaterThan( wxDateTime::Today().ResetTime() ) )
+        return this->FormatTime();
+    else
+        return this->FormatDate();
+}
 
-ScriptList::ScriptList(wxWindow *parent)
+bool myDateTime::SetFromString(const std::string datestr )
+{
+    myDateTime D;
+    D.ParseDateTime( datestr );
+    if( D.IsValid() )
+        (*this) = D;
+    return D.IsValid();
+}
+
+ScriptList::ScriptList(wxSplitterWindow *parent, wxFileName *imagedir)
     : wxPanel(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize)
 {
 
-    wxImageList imlist;
-    imlist.Add( wxBITMAP_PNG_FROM_DATA(stock_yes_20) );
-    imlist.Add( wxBITMAP_PNG_FROM_DATA(stock_no_20) );
-    
-    m_list = new wxListCtrl(this, ID_SCRIPT_LIST, wxDefaultPosition, wxDefaultSize, wxLC_REPORT|wxLC_SMALL_ICON);
-    m_list->SetImageList( &imlist, wxIMAGE_LIST_NORMAL);
+    m_parent = parent;
+
+    m_imagelist = new wxImageList(16,16); //create and add image list to listctrl before adding images
+        
+    m_list = new wxListCtrl(this, ID_SCRIPT_LIST, wxDefaultPosition, wxDefaultSize, wxLC_LIST|wxLC_SINGLE_SEL);
+    m_list->SetFont( wxFont(FONTSIZE, wxFONTFAMILY_TELETYPE, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL) );
+    m_list->SetImageList( m_imagelist, wxIMAGE_LIST_SMALL);
+
+    m_imagelist->Add( wxIcon( imagedir->GetPath() + "/edit.png", wxBITMAP_TYPE_PNG ) ); //ID_IMG::NONE
+    m_imagelist->Add( wxIcon( imagedir->GetPath() + "/pass.png", wxBITMAP_TYPE_PNG ) ); //ID_IMG::OK
+    m_imagelist->Add( wxIcon( imagedir->GetPath() + "/fail.png", wxBITMAP_TYPE_PNG ) );  //ID_IMG::FAILED
+    m_imagelist->Add( wxIcon( imagedir->GetPath() + "/busy.png", wxBITMAP_TYPE_PNG ) );  //ID_IMG::WORKING
 
     wxBoxSizer *main = new wxBoxSizer(wxVERTICAL);
     wxBoxSizer *button = new wxBoxSizer(wxHORIZONTAL);
@@ -38,31 +80,84 @@ ScriptList::ScriptList(wxWindow *parent)
 
     this->SetSizer(main);
 
-    
-    m_list->AppendColumn( "File" );
-    m_list->AppendColumn( "Modified" );
+    return;
+}
+
+void ScriptList::UpdateScriptList()
+{
+    m_list->DeleteAllItems();
 
-    // long itemid = m_list->InsertItem(0, 0);
-    // m_list->SetItem(itemid, 0, "A new file");
-    // m_list->SetItem(itemid, 1, "89/12");
+    m_list->SetItemCount((long)m_scripts.size());
 
-    // itemid = m_list->InsertItem(1, 1);
-    // m_list->SetItem(itemid, 0, "An old file");
-    // m_list->SetItem(itemid, 1, "2587");
+    wxSize maxextent(-1,-1);
+    for(int i=0; i<(int)m_scripts.size(); i++)
+    {
 
-    return;
+        int index = m_list->InsertItem((long)i, (int)( m_scripts.at(i).status) );
+
+        wxArrayString spath = wxSplit(m_scripts.at(i).path, '/');
+        int psize = spath.Last().size();
+
+        int pmax=25, dmax=8;
+
+        wxString truncpath = m_scripts.at(i).path;
+        if(psize < pmax-1)
+            truncpath = ".." + truncpath.SubString(truncpath.length()-(pmax-2), truncpath.length() );
+        else if( truncpath.length() > pmax )
+            truncpath = truncpath.SubString(0,pmax-2) + "..";
+
+        //                                                  "%-20s%-4s%-8s%-2s%-8s", 
+        wxString prettypath = wxString::Format( 
+            wxString::Format("%s-%ds%s-3s%s-%ds%s-2s%s-%ds", "%", pmax, "%", "%", dmax, "%", "%", dmax),
+                                truncpath.c_str(),
+                                "",
+                                m_scripts.at(i).modified.GetDisplayDate().c_str(),
+                                "",
+                                m_scripts.at(i).created.GetDisplayDate().c_str()
+                             );
+
+        m_list->SetItemText(index, prettypath);
+        
+        wxSize thisextent = m_list->GetTextExtent(prettypath);
+        if(thisextent.GetWidth() > maxextent.GetWidth())
+            maxextent = thisextent;
+    }
+    m_parent->SetSashPosition(maxextent.GetWidth(), true);
 }
 
-void ScriptList::Add(const char *scriptpath)
+void ScriptList::Add()
 {
     /* 
     Adds a new path to the script list
     */
+   wxFileDialog dlg(this, "Add Script", wxEmptyString, wxEmptyString,
+		"LK Script Files (*.lk)|*.lk",
+		wxFD_OPEN | wxFD_FILE_MUST_EXIST);
+
+	if (dlg.ShowModal() == wxID_OK)
+    {
+        wxStructStat structstat;
+        wxStat( dlg.GetPath(), &structstat);
+        
+
+        ScriptListObject S;
+        S.path = dlg.GetPath();
+        S.modified.ParseISOCombined( wxDateTime(structstat.st_mtime).FormatISOCombined() );
+        S.created.ParseISOCombined( wxDateTime(structstat.st_ctime).FormatISOCombined() );
+        S.status = ScriptList::ID_IMG::NONE;
+
+        m_scripts.push_back( S );
+
+        UpdateScriptList();
+    }
 }
 
 void ScriptList::Delete(size_t sel)
 {
+    m_list->DeleteItem( sel );
+    m_scripts.erase( m_scripts.begin() + sel );
 
+    UpdateScriptList();
 }
 
 void ScriptList::SortById()
@@ -82,21 +177,33 @@ void ScriptList::OnScriptSelected( wxListEvent &evt )
 
 void ScriptList::OnCommand( wxCommandEvent &evt )
 {
+    int sel=-1;
+    sel = m_list->GetNextItem(sel, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED); 
+    if( sel < -1 )
+        return;
+
     switch( evt.GetId() )
     {
         case ID_SCRIPT_ADD:
+            Add();
         break;
         case ID_SCRIPT_DEL:
-        break;
+            Delete(sel);
+            break;
         case ID_SCRIPT_UP:
-        break;
         case ID_SCRIPT_DOWN:
-        break;
+            MoveItemInList( sel, evt.GetId() == ID_SCRIPT_UP );
+            break;
         default:
         break;
     }
 }
 
+std::vector< ScriptListObject >* ScriptList::GetList()
+{
+    return &m_scripts;
+}
+
 BEGIN_EVENT_TABLE(ScriptList, wxPanel)
     EVT_LIST_ITEM_SELECTED(ID_SCRIPT_LIST, ScriptList::OnScriptSelected )
     EVT_BUTTON(ID_SCRIPT_ADD, ScriptList::OnCommand )

app/scriptlist.h

@@ -2,6 +2,7 @@
 #define __scriptlist_h
 
 #include <wx/wx.h>
+#include <wx/datetime.h>
 #include <lk/absyn.h>
 #include <lk/env.h>
 
@@ -10,16 +11,31 @@
 
 class wxListCtrl;
 class wxListEvent;
+class wxImageList;
+class wxFileName;
+class wxSplitterWindow;
+
+class myDateTime : public wxDateTime
+{
+public:
+    bool SetFromString(const std::string datstr);
+    wxString GetDisplayDate(); 
+    static myDateTime Today();
+};
 
 struct ScriptListObject
 {
     std::string path;
-    int id;
+    myDateTime modified;
+    myDateTime created;
+    unsigned char status;   //see ID_INT struct in ScriptList for options
 
     ScriptListObject()
     {
         path.clear();
-        id=-1;
+        modified.SetToCurrent();
+        created.SetToCurrent();
+        status = 0;
     };
 };
 
@@ -29,18 +45,26 @@ class ScriptList : public wxPanel
 {
     wxListCtrl *m_list;
     std::vector< ScriptListObject > m_scripts;
+    wxImageList *m_imagelist;
+    wxSplitterWindow *m_parent;
 
     void OnScriptSelected( wxListEvent &);
     void OnCommand( wxCommandEvent &);
 
 public:
 
-    ScriptList(wxWindow *parent);
+    struct ID_IMG { enum A {NONE=0, OK, FAIL, WORKING}; };
+    
+    ScriptList(wxSplitterWindow *parent, wxFileName *imagedir);
 
-    void Add(const char *scriptpath);
+    void Add();
     void Delete(size_t sel);
     void SortById();
     void MoveItemInList(size_t sel, bool is_up);
+    void UpdateScriptList();
+    
+
+    std::vector< ScriptListObject >* GetList();
 
     DECLARE_EVENT_TABLE()
 };