Ticket #7991: myModif.7.patch

src/interface/Mainfrm.cpp

@@ -50 +50 @@
 #include "toolbar.h"
 #include "menu_bar.h"
 #include "string_coalescer.h"
+#include "select_dialog.h"
 
 #ifdef __WXMSW__
 #include <wx/module.h>
@@ -67 +68 @@
 DEFINE_EVENT_TYPE(fzEVT_TASKBAR_CLICK_DELAYED);
 #endif
 
+
+
+
 static int tab_hotkey_ids[10];
 
 BEGIN_EVENT_TABLE(CMainFrame, wxFrame)
@@ -336 +340 @@
     m_pContextControl->CreateTab();
 
     m_pContextControl->GetCurrentControls();
-    
+
     switch (message_log_position)
     {
     case 1:
@@ -508 +512 @@
         delete m_pMenuBar;
     }
     m_pMenuBar = CMenuBar::Load(this);
-    
+
     if (!m_pMenuBar)
         return false;
 
@@ -610 +614 @@
     {
         OnMenuEditSettings(event);
     }
+    else if(event.GetId() == XRCID("ID_MENU_EDIT_SELECT")) // Ma modification
+    {
+        OnSelectSettings(event);
+
+    }
     else if (event.GetId() == XRCID("ID_MENU_EDIT_NETCONFWIZARD"))
     {
         CNetConfWizard wizard(this, COptions::Get());
@@ -854 +863 @@
             CSiteManager::GetBookmarks(controls->site_bookmarks->path, controls->site_bookmarks->bookmarks);
             if (m_pMenuBar)
                 m_pMenuBar->UpdateBookmarkMenu();
-        }   
+        }
     }
     else if (event.GetId() == XRCID("ID_MENU_HELP_WELCOME"))
     {
@@ -946 +955 @@
     {
         if ((*iter)->m_pEngine != pEngine)
             continue;
-        
+
         pState = *iter;
         break;
     }
@@ -1242 +1251 @@
         }
 
         RememberSplitterPositions();
-        
+
 #ifdef __WXMAC__
         if (m_pToolBar)
             COptions::Get()->SetOption(OPTION_TOOLBAR_HIDDEN, m_pToolBar->IsShown() ? 0 : 1);
@@ -1539 +1548 @@
     CheckChangedSettings();
 }
 
+void CMainFrame::OnSelectSettings(wxCommandEvent& event)
+{
+
+        CContextControl::_context_controls* controls = m_pContextControl->GetCurrentControls();
+
+    CSelect_dialog *dlg= new CSelect_dialog(wxT("Select local files..."), (controls->pLocalListView));
+    dlg->ShowModal();
+    delete dlg;
+
+}
+
 void CMainFrame::OnToggleLogView(wxCommandEvent& event)
 {
     if (!m_pTopSplitter)
@@ -1586 +1606 @@
             shown = true;
         }
     }
-    
+
     if (COptions::Get()->GetOptionVal(OPTION_MESSAGELOG_POSITION) != 2)
         COptions::Get()->SetOption(OPTION_SHOW_MESSAGELOG, shown);
 }
@@ -1637 +1657 @@
             continue;
 
         controls->pLocalTreeViewPanel->SetHeader(controls->pLocalListViewPanel->DetachHeader());
-        
+
         if (layout == 3 && swap)
             controls->pLocalSplitter->SplitVertically(controls->pLocalListViewPanel, controls->pLocalTreeViewPanel);
         else if (layout)
@@ -1801 +1821 @@
 
     if (messagelog_position == -1)
         messagelog_position = COptions::Get()->GetOptionVal(OPTION_MESSAGELOG_POSITION);
-    
+
     // First handle changes in message log position as it can make size of the other panes change
     {
         bool shown = m_pStatusView->IsShown();
         wxWindow* parent = m_pStatusView->GetParent();
-    
+
         bool changed;
         if (parent == m_pTopSplitter && messagelog_position != 0)
         {
@@ -2208 +2228 @@
     CContextControl::_context_controls* controls = m_pContextControl->GetCurrentControls();
     if (!controls)
         return;
-    
+
     wxString posString;
 
     // top_pos
@@ -2554 +2574 @@
         // create another instance of the module and call its Exit() member.
         // After that, the next call to a wxDisplay will create a new factory and
         // get the new display layout from Windows.
-        // 
+        //
         // Note: Both the factory pattern as well as the dynamic object system
         //       are perfect example of bad design.
         //

src/interface/select_dialog.cpp

@@ +1 @@
+#include <filezilla.h>
+/*#include <wx/utils.h>
+#include <wx/stattext.h>
+#include <wx/combobox.h>
+#include <wx/textctrl.h>
+#include <wx/sizer.h>
+#include <wx/string.h>
+#include <wx/statbox.h>
+*/
+
+#include "select_dialog.h"
+#include "context_control.h"
+#include "LocalListView.h"
+
+BEGIN_EVENT_TABLE(CSelect_dialog,wxDialog)
+
+    EVT_BUTTON(BS,CSelect_dialog::select_button)
+    EVT_BUTTON(BE,CSelect_dialog::erase_button)
+
+END_EVENT_TABLE()
+
+CSelect_dialog::CSelect_dialog(const wxString title, CLocalListView *lv )
+       : wxDialog(NULL, wxID_ANY, title, wxDefaultPosition, wxSize(600, 330)) // 600, 320
+{
+    Centre();
+
+    m_lv = lv;
+
+    m_buttonSelect = new wxButton(this, BS, wxT("Select"), wxPoint(50,270), wxDefaultSize, 0);
+    m_buttonErase = new wxButton(this, BE, _("&Unselect all"), wxPoint(140,270), wxDefaultSize, 0);
+    m_buttonCancel = new wxButton(this, wxID_CANCEL,wxT("Close"), wxPoint(370,270), wxDefaultSize, 0);
+    
+
+    m_nameBox = new wxStaticBox(this, -1, wxT("Select by name"),wxPoint(20,23),wxSize(150,70)); 
+    m_dateBox = new wxStaticBox(this, -1, wxT("Select by date"),wxPoint(200,23),wxSize(250,74));
+    m_sizeBox = new wxStaticBox(this, -1, wxT("Select by size"),wxPoint(20,150),wxSize(550,80));
+
+    m_nameText = new wxTextCtrl(this, -1,wxT(""),wxPoint(50,50)), wxSize(900,110);
+
+    m_comboD = new wxComboBox(this, -1, wxT("<unused>"), wxPoint(230,50), wxDefaultSize, 0, NULL, wxCB_READONLY);
+
+    m_comboS = new wxComboBox(this, -1, wxT("<unused>"), wxPoint(50,180), wxDefaultSize, 0, NULL, wxCB_READONLY);
+    m_sizeText = new wxTextCtrl(this, -1,wxT(""),wxPoint(280,180));
+    wxStaticText *m_than = new wxStaticText(this, -1, wxT("than"),wxPoint(245,185)); 
+    m_comboUnit = new wxComboBox(this, -1, wxT("ko (kilooctet)"), wxPoint(365,180), wxDefaultSize, 0, NULL, wxCB_READONLY); 
+    
+    m_comboS->Append(wxT("<unused>"));
+    m_comboS->Append(wxT("Larger"));
+    m_comboS->Append(wxT("Larger or equal"));
+    m_comboS->Append(wxT("Smaller"));
+    m_comboS->Append(wxT("Smaller or equal"));
+
+    m_comboD->Append(wxT("<unused>"));
+    m_comboD->Append(wxT("modified for 1 hour"));
+    m_comboD->Append(wxT("modified today"));
+    m_comboD->Append(wxT("modified for 2 days"));
+    m_comboD->Append(wxT("modified for 7 days"));
+    m_comboD->Append(wxT("modified for 1 month"));
+
+    m_comboUnit->Append(wxT("o (octet)"));
+    m_comboUnit->Append(wxT("Ko (kilooctet)"));
+    m_comboUnit->Append(wxT("Mo (megaoctet)"));
+    m_comboUnit->Append(wxT("Go (gigaoctet)"));
+            
+    
+
+}
+
+void CSelect_dialog::select_button(wxCommandEvent& event)
+{
+    wxString _name;
+    bool _dir;
+    wxLongLong _size;
+    wxDateTime _date;
+    bool _hasTime;
+    int i=0;
+
+    
+
+    bool select;
+
+    int unit;
+
+    if (m_comboUnit->GetValue() == wxT("o (octet)")) unit = 1;
+    if (m_comboUnit->GetValue() == wxT("Ko (kilooctet)")) unit = 1000;
+    if (m_comboUnit->GetValue() == wxT("Mo (megaoctet)")) unit = 1000000;
+    if (m_comboUnit->GetValue() == wxT("Go (gigaoctet)")) unit = 1000000000;
+
+
+    double sizeSpecified;
+
+        if (m_comboS->GetValue() != wxT("<unused>") && !(m_sizeText->GetValue()).ToDouble(&sizeSpecified))
+        {
+            wxMessageBox( wxT("Incorrect number") );    
+            return;
+        }
+
+    m_lv->StartSelect();
+
+    while(m_lv->GetNextFileSelect(_name, _dir, _size, _date, _hasTime))
+    {
+        select = true;      
+
+        if (_dir) select = false; // No select directory
+
+        // Name
+        if (!(_name.Contains(m_nameText->GetValue()))) select=false;
+
+        // Size
+        if (m_comboS->GetValue() == wxT("Larger") && sizeSpecified * unit >= _size.ToLong()) select = false ;
+        if (m_comboS->GetValue() == wxT("Larger or equal") && sizeSpecified * unit > _size.ToLong()) select = false ;
+        if (m_comboS->GetValue() == wxT("Smaller") && sizeSpecified * unit <= _size.ToLong()) select = false ;
+        if (m_comboS->GetValue() == wxT("Smaller or equal") && sizeSpecified * unit < _size.ToLong()) select = false ;
+
+
+        // Date
+
+        if (m_comboD->GetValue() == wxT("modified for 1 hour") && _date.IsEarlierThan(wxDateTime::UNow().Subtract(wxTimeSpan(1,0,0,0)))) select = false ;
+        if (m_comboD->GetValue() == wxT("modified today") && !(_date.IsSameDate(wxDateTime::UNow()))) select = false ;      
+        if (m_comboD->GetValue() == wxT("modified for 2 days") && _date.IsEarlierThan(wxDateTime::UNow().Subtract(wxDateSpan(0,0,0,2)))) select = false ;
+        if (m_comboD->GetValue() == wxT("modified for 7 days") && _date.IsEarlierThan(wxDateTime::UNow().Subtract(wxDateSpan(0,0,1,0)))) select = false ;
+        if (m_comboD->GetValue() == wxT("modified for 1 month") && _date.IsEarlierThan(wxDateTime::UNow().Subtract(wxDateSpan(0,1,0,0)))) select = false ;
+        
+            
+
+        if (select)
+            m_lv->SetItemState(i, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
+        
+        i++;
+    }
+
+    m_lv->FinishComparison();
+
+
+}
+
+void CSelect_dialog::erase_button(wxCommandEvent& event)
+{
+    wxString _name;
+    bool _dir;
+    wxLongLong _size;
+    wxDateTime _date;
+    bool _hasTime;
+    int i=0;
+    
+    m_lv->StartSelect();
+
+    while(m_lv->GetNextFileSelect(_name, _dir, _size, _date, _hasTime))
+    {
+        m_lv->SetItemState(i, 0, wxLIST_STATE_SELECTED);
+        i++;
+    }
+
+    m_lv->FinishComparison();
+
+}

src/interface/LocalListView.cpp

@@ -1856 +1856 @@
     }
 }
 
+
+void CLocalListView::StartSelect()
+{
+    m_selectIndex = 0;
+}
+
+bool CLocalListView::GetNextFileSelect(wxString& name, bool& dir, wxLongLong& size, wxDateTime& date, bool &hasTime)
+{
+
+    if (m_selectIndex >= m_fileData.size()) return false;
+
+    const CLocalFileData& data = m_fileData[m_indexMapping[m_selectIndex]];
+
+    name = data.name;
+    dir = data.dir;
+    size = data.size;
+    date = data.lastModified;
+    hasTime = true;
+
+    m_selectIndex++;
+
+    return true;
+}
+
+
+
 bool CLocalListView::GetNextFile(wxString& name, bool& dir, wxLongLong& size, wxDateTime& date, bool &hasTime)
 {
     if (++m_comparisonIndex >= (int)m_originalIndexMapping.size())
@@ -2219 +2245 @@
             continue;
 
         m_fileData[index].label = drive + _T(" (") + iter->volumeName + _T(")");
-        
+
         RefreshItem(item);
     }
 }

src/interface/select_dialog.h

@@ +1 @@
+#ifndef _SELECT_DIALOG_H
+#define _SELECT_DIALOG_H
+
+#include <wx/wx.h>
+#include "context_control.h"
+#include "LocalListView.h"
+
+enum
+{
+    BS=1,
+    BE=2    
+}; 
+
+class CSelect_dialog : public wxDialog
+{
+public:
+        CSelect_dialog(const wxString title, CLocalListView *lv);
+
+    void select_button(wxCommandEvent& event);
+    void erase_button (wxCommandEvent& event);
+private:
+
+    wxButton *m_buttonSelect, *m_buttonCancel, *m_buttonErase; 
+    wxComboBox *m_comboD, *m_comboS, *m_comboUnit;  
+    wxTextCtrl *m_sizeText, *m_nameText;
+    wxStaticBox *m_sizeBox, *m_dateBox, *m_nameBox;
+    CLocalListView *m_lv;
+
+    DECLARE_EVENT_TABLE()
+    
+};
+#endif

src/interface/Makefile.am

@@ -64 +64 @@
         RemoteListView.cpp \
         RemoteTreeView.cpp \
         search.cpp \
+        select_dialog.cpp \
         settings/optionspage.cpp \
         settings/optionspage_connection.cpp \
         settings/optionspage_connection_active.cpp \
@@ -176 +177 @@
          RemoteListView.h \
          RemoteTreeView.h \
          search.h \
+         select_dialog.h \
          settings/optionspage.h \
          settings/optionspage_connection.h \
          settings/optionspage_connection_active.h \

src/interface/resources/menus.xrc

@@ -43 +43 @@
     </object>
     <object class="wxMenu">
       <label>&amp;Edit</label>
+      <object class="wxMenuItem" name="ID_MENU_EDIT_SELECT">
+        <label>Se&amp;lect local files...</label>
+      </object>     
+      <object class="separator"/>
       <object class="wxMenuItem" name="ID_MENU_EDIT_NETCONFWIZARD">
         <label>&amp;Network configuration wizard...</label>
       </object>
@@ -597 +601 @@
       <label>&amp;Configure speed limits...</label>
     </object>
   </object>
-</resource>
- No newline at end of file
+</resource>

src/interface/Mainfrm.h

@@ -55 +55 @@
     void ProcessCommandLine();
 
     void PostInitialize();
-    
+
     bool ConnectToServer(const CServer& server, const CServerPath& path = CServerPath());
 
     CContextControl* GetContextControl() { return m_pContextControl; }
@@ -118 +118 @@
     void OnSiteManager(wxCommandEvent& event);
     void OnProcessQueue(wxCommandEvent& event);
     void OnMenuEditSettings(wxCommandEvent& event);
+    void OnSelectSettings(wxCommandEvent& event);
     void OnToggleToolBar(wxCommandEvent& event);
     void OnToggleLogView(wxCommandEvent& event);
     void OnToggleLocalTreeView(wxCommandEvent& event);

src/interface/LocalListView.h

@@ -64 +64 @@
     virtual bool GetNextFile(wxString& name, bool &dir, wxLongLong &size, wxDateTime& date, bool &hasTime);
     virtual void FinishComparison();
 
+    virtual void StartSelect();
+    virtual bool GetNextFileSelect(wxString& name, bool &dir, wxLongLong &size, wxDateTime& date, bool &hasTime);
+
     virtual bool ItemIsDir(int index) const;
     virtual wxLongLong ItemGetSize(int index) const;
 
@@ -87 +90 @@
     wxDropTarget* m_pDropTarget;
     int m_dropTarget;
 
+    unsigned int m_selectIndex;
+
     // Event handlers
     DECLARE_EVENT_TABLE();
     void OnItemActivated(wxListEvent& event);

src/tinyxml/tinyxml.cpp

@@ -57 +57 @@
     {
         unsigned char c = (unsigned char) str[i];
 
-        if ( c == '&' )
+        if (    c == '&' 
+             && i < ( (int)str.length() - 2 )
+             && str[i+1] == '#'
+             && str[i+2] == 'x' )
         {
+            // Hexadecimal character reference.
+            // Pass through unchanged.
+            // &#xA9;   -- copyright symbol, for example.
+            //
+            // The -1 is a bug fix from Rob Laveaux. It keeps
+            // an overflow from happening if there is no ';'.
+            // There are actually 2 ways to exit this loop -
+            // while fails (error case) and break (semicolon found).
+            // However, there is no mechanism (currently) for
+            // this function to return an error.
+            while ( i<(int)str.length()-1 )
+            {
+                outString->append( str.c_str() + i, 1 );
+                ++i;
+                if ( str[i] == ';' )
+                    break;
+            }
+        }
+        else if ( c == '&' )
+        {
             outString->append( entity[0].str, entity[0].strLength );
             ++i;
         }