Ticket #8406: focus_newly_created_directory_local_only.patch

src/interface/LocalListView.cpp

@@ -1220 +1220 @@
         wxBell();
 
     DisplayDir(m_dir);
+
+    if (res)
+    {
+        CLocalPath lp(fn.GetPath());
+        FocusSingleItem(lp.GetLastSegment());
 }
+}
 
 void CLocalListView::OnMenuDelete(wxCommandEvent& event)
 {
@@ -1311 +1317 @@
         wxCommandEvent cmdEvent;
         OnMenuUpload(cmdEvent);
     }
+    else if (code == 'N' && event.ControlDown() && event.ShiftDown())
+    {
+        wxCommandEvent cmdEvent;
+        OnMenuMkdir(cmdEvent);
+    }
     else
         event.Skip();
 }
@@ -1593 +1604 @@
     }
 }
 
+void CLocalListView::FocusSingleItem(const wxString& itemName, long int state /*= wxLIST_STATE_FOCUSED*/) 
+{
+    if (itemName == _T(""))
+        return;
+
+    for (unsigned int i = 0; i < m_indexMapping.size(); i++)
+    {
+        const CLocalFileData &data = m_fileData[m_indexMapping[i]];
+        if (data.name == itemName)
+        {
+            SetItemState(i, state, state);
+            EnsureVisible(i);
+        }
+        else
+        {
+            SetItemState(i, 0, state);
+        }
+    }
+    return;
+}
+
 void CLocalListView::OnStateChange(CState* pState, enum t_statechange_notifications notification, const wxString& data, const void* data2)
 {
     if (notification == STATECHANGE_LOCAL_DIR)

src/interface/state.h

@@ -169 +169 @@
     wxString GetPreviouslyVisitedLocalSubdir() const { return m_previouslyVisitedLocalSubdir; }
     wxString GetPreviouslyVisitedRemoteSubdir() const { return m_previouslyVisitedRemoteSubdir; }
 
+    void SetPreviouslyVisitedLocalSubdir(wxString new_subdir) { m_previouslyVisitedLocalSubdir = new_subdir; }
+    void SetPreviouslyVisitedRemoteSubdir(wxString new_subdir) { m_previouslyVisitedRemoteSubdir = new_subdir; }
+
 protected:
     void SetServer(const CServer* server);
 

src/interface/RemoteListView.cpp

@@ -1845 +1851 @@
         wxCommandEvent cmdEvent;
         OnMenuDownload(cmdEvent);
     }
+    else if (code == 'N' && event.ControlDown() && event.ShiftDown())
+    {
+        wxCommandEvent cmdEvent;
+        OnMenuMkdir(cmdEvent);
+    }
     else
         event.Skip();
 }

src/interface/LocalListView.h

@@ -53 +53 @@
     // ReselectItems
     void ReselectItems(const std::list<wxString>& selectedNames, wxString focused);
 
+    // Set focus (or other) state on the named item, remove the same state from every other
+    void FocusSingleItem(const wxString& itemName, long int state = wxLIST_STATE_FOCUSED);
+
 #ifdef __WXMSW__
     void DisplayDrives();
     void DisplayShares(wxString computer);

src/interface/state.cpp

@@ -308 +308 @@
     }
 
     if (p == m_localDir.GetParent())
-        m_previouslyVisitedLocalSubdir = m_localDir.GetLastSegment();
+        SetPreviouslyVisitedLocalSubdir(m_localDir.GetLastSegment());
     else
-        m_previouslyVisitedLocalSubdir = _T("");
+        SetPreviouslyVisitedLocalSubdir(_T(""));
     
 
     m_localDir = p;
@@ -335 +335 @@
             m_pDirectoryListing = 0;
             NotifyHandlers(STATECHANGE_REMOTE_DIR);
         }
-        m_previouslyVisitedRemoteSubdir = _T("");
+        SetPreviouslyVisitedRemoteSubdir(_T(""));
         return true;
     }
 
@@ -343 +343 @@
     
     if (pDirectoryListing && m_pDirectoryListing &&
         pDirectoryListing->path == m_pDirectoryListing->path.GetParent())
-        m_previouslyVisitedRemoteSubdir = m_pDirectoryListing->path.GetLastSegment();
-    else
-        m_previouslyVisitedRemoteSubdir = _T("");
+        SetPreviouslyVisitedRemoteSubdir(m_pDirectoryListing->path.GetLastSegment());
+    else if (!modified) // On modification (like mkdir), there might be hinting stored so we don't clear the m_previouslyVisitedRemoteSubdir
+        SetPreviouslyVisitedRemoteSubdir(_T(""));
 
     if (modified)
     {