X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655cf3107a360a95518fb7b5e972b37225a4cf71..77611ad4da9df336a0805508276a81b8f4437107:/src/generic/filedlgg.cpp?ds=sidebyside

diff --git a/src/generic/filedlgg.cpp b/src/generic/filedlgg.cpp
index 7aa9851717..0026835965 100644
--- a/src/generic/filedlgg.cpp
+++ b/src/generic/filedlgg.cpp
@@ -35,7 +35,8 @@
 #include "wx/mimetype.h"
 #include "wx/image.h"
 #include "wx/module.h"
-
+#include "wx/config.h"
+#include "wx/imaglist.h"
 
 #if wxUSE_TOOLTIPS
     #include "wx/tooltip.h"
@@ -54,36 +55,9 @@
 #include "wx/generic/repview.xpm"
 #include "wx/generic/new_dir.xpm"
 #include "wx/generic/dir_up.xpm"
-
-/* XPM */
-static char * folder_xpm[] = {
-/* width height ncolors chars_per_pixel */
-"16 16 6 1",
-/* colors */
-"         s None        c None",
-".        c #000000",
-"+        c #c0c0c0",
-"@        c #808080",
-"#        c #ffff00",
-"$        c #ffffff",
-/* pixels */
-"                ",
-"   @@@@@        ",
-"  @#+#+#@       ",
-" @#+#+#+#@@@@@@ ",
-" @$$$$$$$$$$$$@.",
-" @$#+#+#+#+#+#@.",
-" @$+#+#+#+#+#+@.",
-" @$#+#+#+#+#+#@.",
-" @$+#+#+#+#+#+@.",
-" @$#+#+#+#+#+#@.",
-" @$+#+#+#+#+#+@.",
-" @$#+#+#+#+#+#@.",
-" @@@@@@@@@@@@@@.",
-"  ..............",
-"                ",
-"                "};
-
+#include "wx/generic/folder.xpm"
+#include "wx/generic/deffile.xpm"
+#include "wx/generic/exefile.xpm"
 
 // ----------------------------------------------------------------------------
 // private classes - icons list management
@@ -91,38 +65,48 @@ static char * folder_xpm[] = {
 
 class wxFileIconEntry : public wxObject
 {
-    public:
-        wxFileIconEntry(int i) { id = i; }
-    
-        int id;
+public:
+    wxFileIconEntry(int i) { id = i; }
+
+    int id;
 };
 
 
 class wxFileIconsTable
 {
-    public:
+public:
+    wxFileIconsTable();
 
-        wxFileIconsTable();
-        
-        int GetIconID(const wxString& extension);
-        wxImageList *GetImageList() { return &m_ImageList; }
+    int GetIconID(const wxString& extension, const wxString& mime = wxEmptyString);
+    wxImageList *GetImageList() { return &m_ImageList; }
 
-    protected:        
-        wxImageList m_ImageList;
-        wxHashTable m_HashTable;
-        wxMimeTypesManager m_Mime;
+protected:
+    wxImageList m_ImageList;
+    wxHashTable m_HashTable;
 };
 
 static wxFileIconsTable *g_IconsTable = NULL;
 
+#define FI_FOLDER     0
+#define FI_UNKNOWN    1
+#define FI_EXECUTABLE 2
 
 wxFileIconsTable::wxFileIconsTable() :
                     m_ImageList(16, 16),
-                    m_HashTable(wxKEY_STRING),
-                    m_Mime()
+                    m_HashTable(wxKEY_STRING)
 {
     m_HashTable.DeleteContents(TRUE);
-    m_ImageList.Add(wxBitmap(folder_xpm));
+    m_ImageList.Add(wxBitmap(folder_xpm));  // FI_FOLDER
+    m_ImageList.Add(wxBitmap(deffile_xpm)); // FI_UNKNOWN
+    if (GetIconID(wxEmptyString, _T("application/x-executable")) == FI_UNKNOWN)
+    {                                       // FI_EXECUTABLE
+        m_ImageList.Add(wxBitmap(exefile_xpm));
+        m_HashTable.Delete(_T("exe"));
+        m_HashTable.Put(_T("exe"), new wxFileIconEntry(FI_EXECUTABLE));
+    }
+    /* else put into list by GetIconID
+       (KDE defines application/x-executable for *.exe and has nice icon)
+     */
 }
 
 
@@ -131,14 +115,16 @@ static wxBitmap CreateAntialiasedBitmap(const wxImage& img)
 {
     wxImage small(16, 16);
     unsigned char *p1, *p2, *ps;
-    unsigned char mr = img.GetMaskRed(), mg = img.GetMaskGreen(), mb = img.GetMaskBlue();
-    
+    unsigned char mr = img.GetMaskRed(),
+                  mg = img.GetMaskGreen(),
+                  mb = img.GetMaskBlue();
+
     unsigned x, y;
     unsigned sr, sg, sb, smask;
-    
+
     p1 = img.GetData(), p2 = img.GetData() + 3 * 32, ps = small.GetData();
     small.SetMaskColour(mr, mr, mr);
-    
+
     for (y = 0; y < 16; y++)
     {
         for (x = 0; x < 16; x++)
@@ -160,8 +146,8 @@ static wxBitmap CreateAntialiasedBitmap(const wxImage& img)
                 sr += p2[0], sg += p2[1], sb += p2[2];
             else smask++;
             p2 += 3;
-            
-            if (smask > 2) 
+
+            if (smask > 2)
                 ps[0] = ps[1] = ps[2] = mr;
             else
                 ps[0] = sr >> 2, ps[1] = sg >> 2, ps[2] = sb >> 2;
@@ -169,42 +155,94 @@ static wxBitmap CreateAntialiasedBitmap(const wxImage& img)
         }
         p1 += 32 * 3, p2 += 32 * 3;
     }
-    
+
     return small.ConvertToBitmap();
 }
 
 
-int wxFileIconsTable::GetIconID(const wxString& extension)
+// finds empty borders and return non-empty area of image:
+static wxImage CutEmptyBorders(const wxImage& img)
+{
+    unsigned char mr = img.GetMaskRed(),
+                  mg = img.GetMaskGreen(),
+                  mb = img.GetMaskBlue();
+    unsigned char *dt = img.GetData(), *dttmp;
+    unsigned w = img.GetWidth(), h = img.GetHeight();
+
+    unsigned top, bottom, left, right, i;
+    bool empt;
+
+#define MK_DTTMP(x,y)      dttmp = dt + ((x + y * w) * 3)
+#define NOEMPTY_PIX(empt)  if (dttmp[0] != mr || dttmp[1] != mg || dttmp[2] != mb) {empt = FALSE; break;}
+
+    for (empt = TRUE, top = 0; empt && top < h; top++)
+    {
+        MK_DTTMP(0, top);
+        for (i = 0; i < w; i++, dttmp+=3)
+            NOEMPTY_PIX(empt)
+    }
+    for (empt = TRUE, bottom = h-1; empt && bottom > top; bottom--)
+    {
+        MK_DTTMP(0, bottom);
+        for (i = 0; i < w; i++, dttmp+=3)
+            NOEMPTY_PIX(empt)
+    }
+    for (empt = TRUE, left = 0; empt && left < w; left++)
+    {
+        MK_DTTMP(left, 0);
+        for (i = 0; i < h; i++, dttmp+=3*w)
+            NOEMPTY_PIX(empt)
+    }
+    for (empt = TRUE, right = w-1; empt && right > left; right--)
+    {
+        MK_DTTMP(right, 0);
+        for (i = 0; i < h; i++, dttmp+=3*w)
+            NOEMPTY_PIX(empt)
+    }
+    top--, left--, bottom++, right++;
+
+    return img.GetSubImage(wxRect(left, top, right - left + 1, bottom - top + 1));
+}
+
+
+
+int wxFileIconsTable::GetIconID(const wxString& extension, const wxString& mime)
 {
-    wxFileIconEntry *entry = (wxFileIconEntry*) m_HashTable.Get(extension);
-    
-    if (entry) return (entry -> id);
-    
-    wxFileType *ft = m_Mime.GetFileTypeFromExtension(extension);
+    if (!extension.IsEmpty())
+    {
+        wxFileIconEntry *entry = (wxFileIconEntry*) m_HashTable.Get(extension);
+        if (entry) return (entry -> id);
+    }
+
+    wxFileType *ft = (mime.IsEmpty()) ?
+                   wxTheMimeTypesManager -> GetFileTypeFromExtension(extension) :
+                   wxTheMimeTypesManager -> GetFileTypeFromMimeType(mime);
     wxIcon ic;
-    if (ft == NULL || (!ft -> GetIcon(&ic)))
+    if (ft == NULL || (!ft -> GetIcon(&ic)) || (!ic.Ok()))
     {
-        int newid = GetIconID(wxT("txt"));
+        int newid = FI_UNKNOWN;
         m_HashTable.Put(extension, new wxFileIconEntry(newid));
         return newid;
     }
     wxImage img(ic);
     delete ft;
-    
+
     int id = m_ImageList.GetImageCount();
     if (img.GetWidth() == 16 && img.GetHeight() == 16)
         m_ImageList.Add(img.ConvertToBitmap());
     else
-        m_ImageList.Add(CreateAntialiasedBitmap(img.Scale(32, 32)));
+    {
+        if (img.GetWidth() != 32 || img.GetHeight() != 32)
+            m_ImageList.Add(CreateAntialiasedBitmap(CutEmptyBorders(img).Rescale(32, 32)));
+        else
+            m_ImageList.Add(CreateAntialiasedBitmap(img));
+    }
     m_HashTable.Put(extension, new wxFileIconEntry(id));
     return id;
 }
 
 
 
-
-
-
 // ----------------------------------------------------------------------------
 // private functions
 // ----------------------------------------------------------------------------
@@ -380,13 +418,15 @@ void wxFileData::MakeItem( wxListItem &item )
     item.ClearAttributes();
     if (IsExe()) item.SetTextColour(*wxRED);
     if (IsDir()) item.SetTextColour(*wxBLUE);
-    
+
     if (IsDir())
-        item.m_image = 0;
+        item.m_image = FI_FOLDER;
+    else if (IsExe())
+        item.m_image = FI_EXECUTABLE;
     else if (m_name.Find(wxT('.')) != wxNOT_FOUND)
         item.m_image = g_IconsTable -> GetIconID(m_name.AfterLast(wxT('.')));
     else
-        item.m_image = -1;
+        item.m_image = FI_UNKNOWN;
 
     if (IsLink())
     {
@@ -404,11 +444,11 @@ IMPLEMENT_DYNAMIC_CLASS(wxFileCtrl,wxListCtrl);
 
 BEGIN_EVENT_TABLE(wxFileCtrl,wxListCtrl)
     EVT_LIST_DELETE_ITEM(-1, wxFileCtrl::OnListDeleteItem)
+    EVT_LIST_DELETE_ALL_ITEMS(-1, wxFileCtrl::OnListDeleteAllItems)
     EVT_LIST_END_LABEL_EDIT(-1, wxFileCtrl::OnListEndLabelEdit)
 END_EVENT_TABLE()
 
 
-
 wxFileCtrl::wxFileCtrl()
 {
     m_dirName = wxT("/");
@@ -476,11 +516,19 @@ long wxFileCtrl::Add( wxFileData *fd, wxListItem &item )
 
 void wxFileCtrl::Update()
 {
-    ClearAll();
     long my_style = GetWindowStyleFlag();
+    int name_col_width = 0;
+    if (my_style & wxLC_REPORT)
+    {
+        if (GetColumnCount() > 0)
+            name_col_width = GetColumnWidth( 0 );
+    }
+
+    ClearAll();
     if (my_style & wxLC_REPORT)
     {
-        InsertColumn( 0, _("Name"), wxLIST_FORMAT_LEFT, 130 );
+        if (name_col_width < 140) name_col_width = 140;
+        InsertColumn( 0, _("Name"), wxLIST_FORMAT_LEFT, name_col_width );
         InsertColumn( 1, _("Size"), wxLIST_FORMAT_LEFT, 60 );
         InsertColumn( 2, _("Date"), wxLIST_FORMAT_LEFT, 65 );
         InsertColumn( 3, _("Time"), wxLIST_FORMAT_LEFT, 50 );
@@ -634,6 +682,23 @@ void wxFileCtrl::OnListDeleteItem( wxListEvent &event )
     delete fd;
 }
 
+void wxFileCtrl::OnListDeleteAllItems( wxListEvent &WXUNUSED(event) )
+{
+    wxListItem item;
+    item.m_mask = wxLIST_MASK_DATA;
+
+    item.m_itemId = GetNextItem( -1, wxLIST_NEXT_ALL );
+    while ( item.m_itemId != -1 )
+    {
+        GetItem( item );
+        wxFileData *fd = (wxFileData*)item.m_data;
+        delete fd;
+        item.m_data = 0;
+        SetItem( item );
+        item.m_itemId = GetNextItem( item.m_itemId, wxLIST_NEXT_ALL );
+    }
+}
+
 void wxFileCtrl::OnListEndLabelEdit( wxListEvent &event )
 {
     wxFileData *fd = (wxFileData*)event.m_item.m_data;
@@ -708,8 +773,8 @@ BEGIN_EVENT_TABLE(wxFileDialog,wxDialog)
         EVT_CHECKBOX(ID_CHECK,wxFileDialog::OnCheck)
 END_EVENT_TABLE()
 
-long wxFileDialog::m_lastViewStyle = wxLC_LIST;
-bool wxFileDialog::m_lastShowHidden = FALSE;
+long wxFileDialog::s_lastViewStyle = wxLC_LIST;
+bool wxFileDialog::s_lastShowHidden = FALSE;
 
 wxFileDialog::wxFileDialog(wxWindow *parent,
                  const wxString& message,
@@ -722,6 +787,12 @@ wxFileDialog::wxFileDialog(wxWindow *parent,
 {
     wxBeginBusyCursor();
 
+    if (wxConfig::Get(FALSE))
+    {
+        wxConfig::Get() -> Read(wxT("/wxWindows/wxFileDialog/ViewStyle"), &s_lastViewStyle);
+        wxConfig::Get() -> Read(wxT("/wxWindows/wxFileDialog/ShowHidden"), &s_lastShowHidden);
+    }
+
     m_message = message;
     m_dialogStyle = style;
 
@@ -818,11 +889,11 @@ wxFileDialog::wxFileDialog(wxWindow *parent,
 
     if (m_dialogStyle & wxMULTIPLE)
         m_list = new wxFileCtrl( this, ID_LIST_CTRL, m_dir, firstWild, wxDefaultPosition,
-	                         wxSize(440,180), m_lastViewStyle | wxSUNKEN_BORDER );
+                                 wxSize(440,180), s_lastViewStyle | wxSUNKEN_BORDER );
     else
         m_list = new wxFileCtrl( this, ID_LIST_CTRL, m_dir, firstWild, wxDefaultPosition,
-	                         wxSize(440,180), m_lastViewStyle | wxSUNKEN_BORDER | wxLC_SINGLE_SEL );
-    m_list -> ShowHidden(m_lastShowHidden);
+                                 wxSize(440,180), s_lastViewStyle | wxSUNKEN_BORDER | wxLC_SINGLE_SEL );
+    m_list -> ShowHidden(s_lastShowHidden);
     mainsizer->Add( m_list, 1, wxEXPAND | wxLEFT|wxRIGHT, 10 );
 
     wxBoxSizer *textsizer = new wxBoxSizer( wxHORIZONTAL );
@@ -835,7 +906,7 @@ wxFileDialog::wxFileDialog(wxWindow *parent,
     m_choice = new wxChoice( this, ID_CHOICE );
     choicesizer->Add( m_choice, 1, wxCENTER|wxALL, 10 );
     m_check = new wxCheckBox( this, ID_CHECK, _("Show hidden files") );
-    m_check->SetValue( m_lastShowHidden );
+    m_check->SetValue( s_lastShowHidden );
     choicesizer->Add( m_check, 0, wxCENTER|wxALL, 10 );
     choicesizer->Add( new wxButton( this, wxID_CANCEL, _("Cancel") ), 0, wxCENTER | wxALL, 10 );
     mainsizer->Add( choicesizer, 0, wxEXPAND );
@@ -857,9 +928,11 @@ wxFileDialog::wxFileDialog(wxWindow *parent,
 
     Centre( wxBOTH );
 
+/*
     if (m_fileName.IsEmpty())
         m_list->SetFocus();
     else
+*/
         m_text->SetFocus();
 
     wxEndBusyCursor();
@@ -867,6 +940,11 @@ wxFileDialog::wxFileDialog(wxWindow *parent,
 
 wxFileDialog::~wxFileDialog()
 {
+    if (wxConfig::Get(FALSE))
+    {
+        wxConfig::Get() -> Write(wxT("/wxWindows/wxFileDialog/ViewStyle"), s_lastViewStyle);
+        wxConfig::Get() -> Write(wxT("/wxWindows/wxFileDialog/ShowHidden"), s_lastShowHidden);
+    }
 }
 
 void wxFileDialog::OnChoice( wxCommandEvent &event )
@@ -886,7 +964,7 @@ void wxFileDialog::OnChoice( wxCommandEvent &event )
 
 void wxFileDialog::OnCheck( wxCommandEvent &event )
 {
-    m_list->ShowHidden( (m_lastShowHidden = event.GetInt() != 0) );
+    m_list->ShowHidden( (s_lastShowHidden = event.GetInt() != 0) );
 }
 
 void wxFileDialog::OnActivated( wxListEvent &event )
@@ -1026,14 +1104,14 @@ void wxFileDialog::OnListOk( wxCommandEvent &WXUNUSED(event) )
 void wxFileDialog::OnList( wxCommandEvent &WXUNUSED(event) )
 {
     m_list->ChangeToListMode();
-    m_lastViewStyle = wxLC_LIST;
+    s_lastViewStyle = wxLC_LIST;
     m_list->SetFocus();
 }
 
 void wxFileDialog::OnReport( wxCommandEvent &WXUNUSED(event) )
 {
     m_list->ChangeToReportMode();
-    m_lastViewStyle = wxLC_REPORT;
+    s_lastViewStyle = wxLC_REPORT;
     m_list->SetFocus();
 }
 
@@ -1095,10 +1173,11 @@ void wxFileDialog::GetPaths( wxArrayString& paths ) const
     item.m_mask = wxLIST_MASK_TEXT;
 
     item.m_itemId = m_list->GetNextItem( -1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
-    while ( item.m_itemId != -1 ) {
+    while ( item.m_itemId != -1 )
+    {
         m_list->GetItem( item );
         paths.Add( dir + item.m_text );
-        item.m_itemId = m_list->GetNextItem( item.m_itemId + 1,
+        item.m_itemId = m_list->GetNextItem( item.m_itemId,
             wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
     }
 }
@@ -1117,10 +1196,11 @@ void wxFileDialog::GetFilenames(wxArrayString& files) const
     item.m_mask = wxLIST_MASK_TEXT;
 
     item.m_itemId = m_list->GetNextItem( -1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
-    while ( item.m_itemId != -1 ) {
+    while ( item.m_itemId != -1 )
+    {
         m_list->GetItem( item );
         files.Add( item.m_text );
-        item.m_itemId = m_list->GetNextItem( item.m_itemId + 1,
+        item.m_itemId = m_list->GetNextItem( item.m_itemId,
             wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED );
     }
 }