#include "wx/mimetype.h"
#include "wx/image.h"
#include "wx/module.h"
+#include "wx/config.h"
#if wxUSE_TOOLTIPS
#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
wxFileIconsTable();
- int GetIconID(const wxString& extension);
+ int GetIconID(const wxString& extension, const wxString& mime = wxEmptyString);
wxImageList *GetImageList() { return &m_ImageList; }
protected:
wxImageList m_ImageList;
wxHashTable m_HashTable;
- wxMimeTypesManager m_Mime;
};
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)
+ */
}
{
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 += 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)
{
- wxFileIconEntry *entry = (wxFileIconEntry*) m_HashTable.Get(extension);
+ unsigned char mr = img.GetMaskRed(),
+ mg = img.GetMaskGreen(),
+ mb = img.GetMaskBlue();
+ unsigned char *dt = img.GetData(), *dttmp;
+ unsigned w = img.GetWidth(), h = img.GetHeight();
- if (entry) return (entry -> id);
+ 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;}
- wxFileType *ft = m_Mime.GetFileTypeFromExtension(extension);
+ 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)
+{
+ 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;
}
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;
}
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())
{
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,
{
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;
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 );
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 );
mainsizer->Fit( this );
mainsizer->SetSizeHints( this );
-
+
Centre( wxBOTH );
if (m_fileName.IsEmpty())
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 )
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 )
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();
}
projects / wxWidgets.git / blobdiff