Menu
▾
▴
[Wxdevcenter-cvs] wxDevCenter/src ArtProvider.cpp,NONE,1.1 FileSystemStandard.cpp,1.15,1.16 FileSystemCtrl.cpp,1.8,1.9 MainFrame.cpp,1.17,1.18 Application.cpp,1.29,1.30 DocManager.cpp,1.11,1.12
|
From: Emilien K. <cur...@us...> - 2005-08-13 14:07:46
|
Update of /cvsroot/wxdevcenter/wxDevCenter/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10072/src Modified Files: FileSystemStandard.cpp FileSystemCtrl.cpp MainFrame.cpp Application.cpp DocManager.cpp Added Files: ArtProvider.cpp Log Message: Modify icon querying system to use wxArtProvider. --- NEW FILE: ArtProvider.cpp --- (This appears to be a binary file; contents omitted.) Index: FileSystemStandard.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/FileSystemStandard.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** FileSystemStandard.cpp 14 May 2005 12:15:56 -0000 1.15 --- FileSystemStandard.cpp 13 Aug 2005 14:07:37 -0000 1.16 *************** *** 27,30 **** --- 27,31 ---- #include <wx/utils.h> + #include <wx/artprov.h> using namespace wxDevCenter; *************** *** 74,108 **** wxImageList* pIL = new wxImageList(width, width, true, WXDC_STDFS_FILETYPES + Application::GetApp().GetDocManager().GetDocTemplateCount()); ! wxIconBundle IB; ! IB = Application::GetApp().LoadAppIconBundle(wxT("none")); ! pIL->Add(IB.GetIcon(width)); ! IB = Application::GetApp().LoadAppIconBundle(wxT("unknow")); ! pIL->Add(IB.GetIcon(width)); ! IB = Application::GetApp().LoadAppIconBundle(wxT("dir")); ! pIL->Add(IB.GetIcon(width)); ! IB = Application::GetApp().LoadAppIconBundle(wxT("desktop")); ! pIL->Add(IB.GetIcon(width)); ! IB = Application::GetApp().LoadAppIconBundle(wxT("desktop")); ! pIL->Add(IB.GetIcon(width)); ! IB = Application::GetApp().LoadAppIconBundle(wxT("docs")); ! pIL->Add(IB.GetIcon(width)); ! IB = Application::GetApp().LoadAppIconBundle(wxT("computer")); ! pIL->Add(IB.GetIcon(width)); ! IB = Application::GetApp().LoadAppIconBundle(wxT("floppy")); ! pIL->Add(IB.GetIcon(width)); ! IB = Application::GetApp().LoadAppIconBundle(wxT("harddrive")); ! pIL->Add(IB.GetIcon(width)); ! IB = Application::GetApp().LoadAppIconBundle(wxT("cd-dvd")); ! pIL->Add(IB.GetIcon(width)); ! IB = Application::GetApp().LoadAppIconBundle(wxT("ramdisk")); ! pIL->Add(IB.GetIcon(width)); ! IB = Application::GetApp().LoadAppIconBundle(wxT("remote")); ! pIL->Add(IB.GetIcon(width)); for(unsigned long l=0; l<Application::GetApp().GetDocManager().GetDocTemplateCount(); l++) ! { ! IB = Application::GetApp().LoadAppIconBundle(Application::GetApp().GetDocManager().GetDocTemplate(l).GetViewTemplate(0).strIcons); ! pIL->Add(IB.GetIcon(width)); ! } return pIL; } --- 75,94 ---- wxImageList* pIL = new wxImageList(width, width, true, WXDC_STDFS_FILETYPES + Application::GetApp().GetDocManager().GetDocTemplateCount()); ! pIL->Add(wxArtProvider::GetIcon(wxART_MAKE_ART_ID(none), wxART_FRAME_ICON, wxSize(width, width))); ! pIL->Add(wxArtProvider::GetIcon(wxART_MAKE_ART_ID(unknow), wxART_FRAME_ICON, wxSize(width, width))); ! pIL->Add(wxArtProvider::GetIcon(wxART_MAKE_ART_ID(dir), wxART_FRAME_ICON, wxSize(width, width))); ! pIL->Add(wxArtProvider::GetIcon(wxART_MAKE_ART_ID(desktop), wxART_FRAME_ICON, wxSize(width, width))); ! pIL->Add(wxArtProvider::GetIcon(wxART_MAKE_ART_ID(desktop), wxART_FRAME_ICON, wxSize(width, width))); ! pIL->Add(wxArtProvider::GetIcon(wxART_MAKE_ART_ID(docs), wxART_FRAME_ICON, wxSize(width, width))); ! pIL->Add(wxArtProvider::GetIcon(wxART_MAKE_ART_ID(computer), wxART_FRAME_ICON, wxSize(width, width))); ! pIL->Add(wxArtProvider::GetIcon(wxART_MAKE_ART_ID(floppy), wxART_FRAME_ICON, wxSize(width, width))); ! pIL->Add(wxArtProvider::GetIcon(wxART_MAKE_ART_ID(harddrive), wxART_FRAME_ICON, wxSize(width, width))); ! pIL->Add(wxArtProvider::GetIcon(wxART_MAKE_ART_ID(cd-dvd), wxART_FRAME_ICON, wxSize(width, width))); ! pIL->Add(wxArtProvider::GetIcon(wxART_MAKE_ART_ID(ramdisk), wxART_FRAME_ICON, wxSize(width, width))); ! pIL->Add(wxArtProvider::GetIcon(wxART_MAKE_ART_ID(remote), wxART_FRAME_ICON, wxSize(width, width))); for(unsigned long l=0; l<Application::GetApp().GetDocManager().GetDocTemplateCount(); l++) ! pIL->Add(wxArtProvider::GetIcon(Application::GetApp().GetDocManager().GetDocTemplate(l).GetViewTemplate(0).strIcons, wxART_FRAME_ICON, wxSize(width, width))); ! return pIL; } Index: FileSystemCtrl.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/FileSystemCtrl.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** FileSystemCtrl.cpp 17 Mar 2005 17:51:24 -0000 1.8 --- FileSystemCtrl.cpp 13 Aug 2005 14:07:37 -0000 1.9 *************** *** 31,34 **** --- 31,35 ---- #include <wx/splitter.h> #include <wx/tokenzr.h> + #include <wx/artprov.h> using namespace wxDevCenter; *************** *** 690,694 **** for(unsigned int n=0; n<pFSM->GetCount(); n++) { ! wxBitmap bmp = pFSM->Item(n).GetIconBundle().GetIcon(48); AttachFileSystem(&(pFSM->Item(n)), pFSM->Item(n).GetFileSystemName(), bmp); } --- 691,696 ---- for(unsigned int n=0; n<pFSM->GetCount(); n++) { ! wxBitmap bmp = wxArtProvider::GetBitmap(pFSM->Item(n).GetIconName(), wxART_OTHER, wxSize(16, 16)); ! // wxBitmap bmp = pFSM->Item(n).GetIconBundle().GetIcon(48); AttachFileSystem(&(pFSM->Item(n)), pFSM->Item(n).GetFileSystemName(), bmp); } Index: Application.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/Application.cpp,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** Application.cpp 12 Aug 2005 15:50:00 -0000 1.29 --- Application.cpp 13 Aug 2005 14:07:37 -0000 1.30 *************** *** 34,37 **** --- 34,38 ---- #include <wxDevCenter/FileTools.h> #include <wxDevCenter/Project.h> + #include <wxDevCenter/ArtProvider.h> #include <wx/dynlib.h> *************** *** 69,72 **** --- 70,75 ---- m_ConfigManager.LogConfig(); + + wxArtProvider::PushProvider(new ArtProvider); // Initialise les gestionnaires *************** *** 135,140 **** Application::Application(void): wxApp(), ! m_pStandardFileSystem(NULL), ! m_IconBundleCache(40) { ms_pTheApp = this; --- 138,142 ---- Application::Application(void): wxApp(), ! m_pStandardFileSystem(NULL) { ms_pTheApp = this; *************** *** 404,465 **** - - wxIcon Application::LoadAppIcon(wxString strIcon, wxSize size) - { - if(!IconIsInCache(strIcon)) - DoCahceIcon(strIcon); - return m_IconBundleCache[strIcon].GetIcon(size); - } - - // Charge un ensemble d'icones de l'application. - wxIconBundle Application::LoadAppIconBundle(wxString strIcon) - { - if(!IconIsInCache(strIcon)) - DoCahceIcon(strIcon); - return m_IconBundleCache[strIcon]; - } - - // Charge une icone dans le cache. - bool Application::DoCahceIcon(wxString strIcon) - { - long l; - wxIconBundle IB; - wxString strPathRoot, strPath, strName; - wxArrayString arFiles; - - l=0; - while(strPathRoot = GetConfig().GetDataPath(l++),!strPathRoot.IsEmpty()) - { - strPathRoot << wxT("/icons/") << strIcon; - strPathRoot.Replace(wxT("\\"), wxT("/")); - strPath = strPathRoot.BeforeLast(wxT('/')); - strName = strPathRoot.AfterLast(wxT('/')); - if(wxDir::Exists(strPath)) - { - wxDir::GetAllFiles(strPath, &arFiles, strName + wxT("*.gif"), wxDIR_FILES); - wxDir::GetAllFiles(strPath, &arFiles, strName + wxT("*.png"), wxDIR_FILES); - wxDir::GetAllFiles(strPath, &arFiles, strName + wxT(".ico"), wxDIR_FILES); - } - } - - wxBitmap EmptyBitmap(16, 16, 24); - wxIcon EmptyIcon; - EmptyIcon.CopyFromBitmap(EmptyBitmap); - IB.AddIcon(EmptyIcon); - - for(unsigned int n=0; n<arFiles.GetCount(); n++) - IB.AddIcon(arFiles[n], wxBITMAP_TYPE_ANY); - - m_IconBundleCache[strIcon] = IB; - return true; - } - - // Teste si une icone est en cache. - bool Application::IconIsInCache(wxString strIcon)const - { - return (m_IconBundleCache.find(strIcon)!=m_IconBundleCache.end()); - } - - wxBitmap Application::LoadAppBitmap(wxString strBmp, long type) { --- 406,409 ---- Index: MainFrame.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/MainFrame.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** MainFrame.cpp 2 Aug 2005 17:13:01 -0000 1.17 --- MainFrame.cpp 13 Aug 2005 14:07:37 -0000 1.18 *************** *** 32,38 **** #include <wxDevCenter/WorkBar.h> #include <wx/dataobj.h> #include <wx/dnd.h> - #include <wx/sashwin.h> // wxdockit includes --- 32,38 ---- #include <wxDevCenter/WorkBar.h> + #include <wx/artprov.h> #include <wx/dataobj.h> #include <wx/dnd.h> // wxdockit includes *************** *** 111,115 **** // Chargement de l'icone de l'application. ! m_Icon = Application::GetApp().LoadAppIcon("wxDevCenter", wxSize(16, 16)); SetIcon(m_Icon); --- 111,115 ---- // Chargement de l'icone de l'application. ! m_Icon = wxArtProvider::GetIcon(wxART_MAKE_ART_ID(wxDevCenter), wxART_FRAME_ICON, wxSize(16, 16)); SetIcon(m_Icon); *************** *** 369,382 **** void MainFrame::OnCurrentViewChanged(ViewEvent &event) { - wxString str; View *pNewView = event.GetNewView(); if(pNewView!=NULL) { InsertViewMenu(pNewView); ! SetIcons(Application::GetApp().LoadAppIconBundle(pNewView->GetViewTemplate()->strIcons)); ! str.Append(WXDC_NAME).Append(wxT(" - ")).Append(pNewView->GetDocument()->GetDocumentName()); if(pNewView->GetDocument()->GetModifiedFlag()) ! str.Append(wxT("*")); ! SetTitle(str); } UpdateWindowUI(); --- 369,388 ---- void MainFrame::OnCurrentViewChanged(ViewEvent &event) { View *pNewView = event.GetNewView(); if(pNewView!=NULL) { InsertViewMenu(pNewView); ! wxString strIconName = pNewView->GetViewTemplate()->strIcons; ! wxIconBundle IB; ! IB.AddIcon(wxArtProvider::GetIcon(strIconName, wxART_FRAME_ICON, wxSize(16, 16))); ! IB.AddIcon(wxArtProvider::GetIcon(strIconName, wxART_FRAME_ICON, wxSize(32, 32))); ! IB.AddIcon(wxArtProvider::GetIcon(strIconName, wxART_FRAME_ICON, wxSize(48, 48))); ! IB.AddIcon(wxArtProvider::GetIcon(strIconName, wxART_FRAME_ICON, wxSize(64, 64))); ! SetIcons(IB); ! wxString strName; ! strName.Append(WXDC_NAME).Append(wxT(" - ")).Append(pNewView->GetDocument()->GetDocumentName()); if(pNewView->GetDocument()->GetModifiedFlag()) ! strName.Append(wxT("*")); ! SetTitle(strName); } UpdateWindowUI(); Index: DocManager.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/DocManager.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** DocManager.cpp 12 Aug 2005 15:50:00 -0000 1.11 --- DocManager.cpp 13 Aug 2005 14:07:37 -0000 1.12 *************** *** 28,31 **** --- 28,32 ---- #include <wx/arrimpl.cpp> + #include <wx/artprov.h> using namespace wxDevCenter; *************** *** 408,422 **** for(unsigned int n=0; n<GetDocTemplateCount(); n++) ! { ! wxIconBundle IB = Application::GetApp().LoadAppIconBundle(GetDocTemplate(n).GetViewTemplate(0).strIcons); ! pIL->Add(IB.GetIcon(iSize)); ! } return pIL; } // Retourne le bundle d'icones associé à un identifiant de type de document. ! wxIconBundle* DocManager::GetIconBundle(unsigned int nDocType, unsigned int nViewType) { ! return new wxIconBundle(Application::GetApp().LoadAppIconBundle(GetDocTemplate(nDocType).GetViewTemplate(nViewType).strIcons)); } --- 409,420 ---- for(unsigned int n=0; n<GetDocTemplateCount(); n++) ! pIL->Add(wxArtProvider::GetIcon(GetDocTemplate(n).GetViewTemplate(0).strIcons, wxART_OTHER, wxSize(iSize, iSize))); return pIL; } // Retourne le bundle d'icones associé à un identifiant de type de document. ! wxString DocManager::GetIconName(unsigned int nDocType, unsigned int nViewType)const { ! return GetDocTemplate(nDocType).GetViewTemplate(nViewType).strIcons; } |
