You can subscribe to this list here.
| 2005 |
Jan
(98) |
Feb
(101) |
Mar
(60) |
Apr
(38) |
May
(26) |
Jun
|
Jul
|
Aug
(159) |
Sep
(78) |
Oct
(31) |
Nov
|
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(4) |
Sep
(6) |
Oct
|
Nov
(1) |
Dec
(3) |
| 2010 |
Jan
|
Feb
|
Mar
|
Apr
(3) |
May
(5) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2011 |
Jan
(8) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Emilien K. <cur...@us...> - 2005-02-23 15:12:24
|
Update of /cvsroot/wxdevcenter/wxDevCenter/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22651/src Modified Files: Frame.cpp Log Message: Oublie de conversion des #include. Inversion de construction directe des membres. Index: Frame.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/Frame.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Frame.cpp 19 Dec 2004 21:19:07 -0000 1.2 --- Frame.cpp 23 Feb 2005 15:12:14 -0000 1.3 *************** *** 23,27 **** #include <wxDevCenter.h> ! #include "Frame.h" #include <wxDevCenter/DocView.h> --- 23,27 ---- #include <wxDevCenter.h> ! #include <wxDevCenter/Frame.h> #include <wxDevCenter/DocView.h> *************** *** 38,43 **** ViewEvent::ViewEvent(wxEventType commandType, int theId, View *pNewView, View *pOldView): wxEvent(theId, commandType), ! m_pNewView(pNewView), ! m_pOldView(pOldView) { } --- 38,43 ---- ViewEvent::ViewEvent(wxEventType commandType, int theId, View *pNewView, View *pOldView): wxEvent(theId, commandType), ! m_pOldView(pOldView), ! m_pNewView(pNewView) { } |
|
From: Emilien K. <cur...@us...> - 2005-02-23 15:09:00
|
Update of /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21372/include/wxDevCenter Modified Files: DocManager.h Log Message: Ambiguité sur l'opérateur ?: Index: DocManager.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/DocManager.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** DocManager.h 15 Jan 2005 14:05:17 -0000 1.6 --- DocManager.h 23 Feb 2005 15:08:50 -0000 1.7 *************** *** 342,346 **** * @return Identifiant de patron (-1 si erreur). */ ! int DocTemplateIDFromIndex(unsigned int nIndex)const{return nIndex<m_DocTemplateArray.GetCount()?m_DocTemplateArray[nIndex]->m_nID:-1;} /** Indice de patron dans le tableau de référencement depuis l'index. * @param nID Identifiant de patron. --- 342,346 ---- * @return Identifiant de patron (-1 si erreur). */ ! int DocTemplateIDFromIndex(unsigned int nIndex)const{return (nIndex<m_DocTemplateArray.GetCount())?(m_DocTemplateArray[nIndex]->m_nID):-1;} /** Indice de patron dans le tableau de référencement depuis l'index. * @param nID Identifiant de patron. |
|
From: Emilien K. <cur...@us...> - 2005-02-23 14:43:51
|
Update of /cvsroot/wxdevcenter/wxDevCenter/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11048/src Modified Files: Config.cpp Log Message: wxNullConfig -> wxEmptyString Index: Config.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/Config.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Config.cpp 23 Feb 2005 14:21:21 -0000 1.6 --- Config.cpp 23 Feb 2005 14:43:41 -0000 1.7 *************** *** 30,33 **** --- 30,34 ---- using namespace wxDevCenter; + wxString wxNullConfig::m_NullString = wxEmptyString; wxNullConfig Config::m_ConfigNull; |
|
From: Emilien K. <cur...@us...> - 2005-02-23 14:43:50
|
Update of /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11048/include/wxDevCenter Modified Files: Config.h Log Message: wxNullConfig -> wxEmptyString Index: Config.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/Config.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Config.h 23 Feb 2005 14:21:19 -0000 1.5 --- Config.h 23 Feb 2005 14:43:41 -0000 1.6 *************** *** 56,62 **** virtual ~wxNullConfig() {} void SetUmask(int WXUNUSED(mode)) { } virtual void SetPath(const wxString& WXUNUSED(strPath)) {} ! virtual const wxString& GetPath() const { return wxEmptyString; } virtual bool GetFirstGroup(wxString& WXUNUSED(str), long& WXUNUSED(lIndex)) const {return false;} virtual bool GetNextGroup (wxString& WXUNUSED(str), long& WXUNUSED(lIndex)) const {return false;} --- 56,64 ---- virtual ~wxNullConfig() {} + static wxString m_NullString; + void SetUmask(int WXUNUSED(mode)) { } virtual void SetPath(const wxString& WXUNUSED(strPath)) {} ! virtual const wxString& GetPath() const { return m_NullString; } virtual bool GetFirstGroup(wxString& WXUNUSED(str), long& WXUNUSED(lIndex)) const {return false;} virtual bool GetNextGroup (wxString& WXUNUSED(str), long& WXUNUSED(lIndex)) const {return false;} |
|
From: Emilien K. <cur...@us...> - 2005-02-23 14:22:09
|
Update of /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/msw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5705/include/wxDevCenter/msw Modified Files: Config.h Log Message: Transfert de la fonction Config::CreateSubConfig vers les spécialisations unix et msw. Index: Config.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/msw/Config.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Config.h 13 Feb 2005 15:19:50 -0000 1.4 --- Config.h 23 Feb 2005 14:21:19 -0000 1.5 *************** *** 115,118 **** --- 115,125 ---- virtual void CreateUserProfile(); /** @} */ + + protected: + /** Crée une sous-configuration et la place dans le dictionnaire. + * @param strSubConfName Nom de la sous-configuration à créer. + * @return True si sous-configuration crée avec succes.*/ + virtual bool CreateSubConfig(wxString strSubConfName); + }; |
|
From: Emilien K. <cur...@us...> - 2005-02-23 14:22:08
|
Update of /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5705/include/wxDevCenter Modified Files: Config.h Log Message: Transfert de la fonction Config::CreateSubConfig vers les spécialisations unix et msw. Index: Config.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/Config.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Config.h 13 Feb 2005 15:19:50 -0000 1.4 --- Config.h 23 Feb 2005 14:21:19 -0000 1.5 *************** *** 184,188 **** * @param strSubConfName Nom de la sous-configuration à créer. * @return True si sous-configuration crée avec succes.*/ ! virtual bool CreateSubConfig(wxString strSubConfName); /** Dictionnaire des sous-configurations.*/ wxConfigMap m_SubConfigMap; --- 184,188 ---- * @param strSubConfName Nom de la sous-configuration à créer. * @return True si sous-configuration crée avec succes.*/ ! virtual bool CreateSubConfig(wxString strSubConfName)=0; /** Dictionnaire des sous-configurations.*/ wxConfigMap m_SubConfigMap; |
|
From: Emilien K. <cur...@us...> - 2005-02-23 14:21:32
|
Update of /cvsroot/wxdevcenter/wxDevCenter/src/msw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5705/src/msw Modified Files: Config.cpp Log Message: Transfert de la fonction Config::CreateSubConfig vers les spécialisations unix et msw. Index: Config.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/msw/Config.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Config.cpp 13 Feb 2005 15:19:51 -0000 1.4 --- Config.cpp 23 Feb 2005 14:21:21 -0000 1.5 *************** *** 27,30 **** --- 27,31 ---- #include <wx/config.h> + #include <wx/fileconf.h> using namespace wxDevCenter; *************** *** 149,150 **** --- 150,183 ---- } } + + // Crée une sous-configuration et la place dans le dictionnaire. + bool ConfigWindows::CreateSubConfig(wxString strSubConfName) + { + wxFileConfig* pFC; + wxString strAppName, strDir; + strAppName << WXDC_SETUP_APPIDENT << wxT("/") << strSubConfName; + + // Création du répertoire de config global + strDir = GetGlobalConfPath() + wxT("/") + strSubConfName; + strDir.Replace(wxT("\\"), wxT("/")); + strDir = strDir.BeforeLast(wxT('/')); + if(!wxDirExists(strDir)) + wxMkDir(strDir); + // Création du répertoire de config utilisateur + strDir = GetUserConfPath() + wxT("/") + strSubConfName; + strDir.Replace(wxT("\\"), wxT("/")); + strDir = strDir.BeforeLast(wxT('/')); + if(!wxDirExists(strDir)) + wxMkDir(strDir); + + pFC = new wxFileConfig(strAppName, WXDC_SETUP_VENDOR, + GetUserConfPath() + wxT("/") + strSubConfName + wxT(".conf"), + GetGlobalConfPath() + wxT("/") + strSubConfName + wxT(".conf")); + + wxConfigBase* pConf = m_SubConfigMap[strSubConfName]; + if(pConf!=NULL) + delete pConf; + m_SubConfigMap[strSubConfName] = pFC; + + return true; + } |
|
From: Emilien K. <cur...@us...> - 2005-02-23 14:21:31
|
Update of /cvsroot/wxdevcenter/wxDevCenter/src/unix In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5705/src/unix Modified Files: Config.cpp Log Message: Transfert de la fonction Config::CreateSubConfig vers les spécialisations unix et msw. Index: Config.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/unix/Config.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Config.cpp 23 Feb 2005 13:39:59 -0000 1.4 --- Config.cpp 23 Feb 2005 14:21:22 -0000 1.5 *************** *** 26,29 **** --- 26,33 ---- + #include <wx/config.h> + #include <wx/fileconf.h> + + using namespace wxDevCenter; *************** *** 136,137 **** --- 140,173 ---- // Ne fait rien sous unix } + + // Crée une sous-configuration et la place dans le dictionnaire. + bool ConfigUnix::CreateSubConfig(wxString strSubConfName) + { + wxFileConfig* pFC; + wxString strAppName, strDir; + strAppName << WXDC_SETUP_APPIDENT << wxT("/") << strSubConfName; + + // Création du répertoire de config global + strDir = GetGlobalConfPath() + wxT("/") + strSubConfName; + strDir.Replace(wxT("\\"), wxT("/")); + strDir = strDir.BeforeLast(wxT('/')); + if(!wxDirExists(strDir)) + wxMkDir(strDir, 0777); + // Création du répertoire de config utilisateur + strDir = GetUserConfPath() + wxT("/") + strSubConfName; + strDir.Replace(wxT("\\"), wxT("/")); + strDir = strDir.BeforeLast(wxT('/')); + if(!wxDirExists(strDir)) + wxMkDir(strDir, 0777); + + pFC = new wxFileConfig(strAppName, WXDC_SETUP_VENDOR, + GetUserConfPath() + wxT("/") + strSubConfName + wxT(".conf"), + GetGlobalConfPath() + wxT("/") + strSubConfName + wxT(".conf")); + + wxConfigBase* pConf = m_SubConfigMap[strSubConfName]; + if(pConf!=NULL) + delete pConf; + m_SubConfigMap[strSubConfName] = pFC; + + return true; + } |
|
From: Emilien K. <cur...@us...> - 2005-02-23 14:21:30
|
Update of /cvsroot/wxdevcenter/wxDevCenter/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5705/src Modified Files: Config.cpp Log Message: Transfert de la fonction Config::CreateSubConfig vers les spécialisations unix et msw. Index: Config.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/Config.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Config.cpp 23 Feb 2005 11:43:56 -0000 1.5 --- Config.cpp 23 Feb 2005 14:21:21 -0000 1.6 *************** *** 73,108 **** } - // Crée une sous-configuration et la place dans le dictionnaire. - bool Config::CreateSubConfig(wxString strSubConfName) - { - wxFileConfig* pFC; - wxString strAppName, strDir; - strAppName << WXDC_SETUP_APPIDENT << wxT("/") << strSubConfName; - - // Création du répertoire de config global - strDir = GetGlobalConfPath() + wxT("/") + strSubConfName; - strDir.Replace(wxT("\\"), wxT("/")); - strDir = strDir.BeforeLast(wxT('/')); - if(!wxDirExists(strDir)) - wxMkDir(strDir); - // Création du répertoire de config utilisateur - strDir = GetUserConfPath() + wxT("/") + strSubConfName; - strDir.Replace(wxT("\\"), wxT("/")); - strDir = strDir.BeforeLast(wxT('/')); - if(!wxDirExists(strDir)) - wxMkDir(strDir); - - pFC = new wxFileConfig(strAppName, WXDC_SETUP_VENDOR, - GetUserConfPath() + wxT("/") + strSubConfName + wxT(".conf"), - GetGlobalConfPath() + wxT("/") + strSubConfName + wxT(".conf")); - - wxConfigBase* pConf = m_SubConfigMap[strSubConfName]; - if(pConf!=NULL) - delete pConf; - m_SubConfigMap[strSubConfName] = pFC; - - return true; - } - // Vide le buffer des sous-configurations. void Config::CloseSubConfig() --- 73,76 ---- |
|
From: Emilien K. <cur...@us...> - 2005-02-23 14:21:29
|
Update of /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/unix In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5705/include/wxDevCenter/unix Modified Files: Config.h Log Message: Transfert de la fonction Config::CreateSubConfig vers les spécialisations unix et msw. Index: Config.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/unix/Config.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Config.h 23 Feb 2005 11:43:56 -0000 1.4 --- Config.h 23 Feb 2005 14:21:20 -0000 1.5 *************** *** 114,117 **** --- 114,122 ---- virtual void CreateUserProfile(); /** @} */ + protected: + /** Crée une sous-configuration et la place dans le dictionnaire. + * @param strSubConfName Nom de la sous-configuration à créer. + * @return True si sous-configuration crée avec succes.*/ + virtual bool CreateSubConfig(wxString strSubConfName); }; |
|
From: Emilien K. <cur...@us...> - 2005-02-23 14:11:54
|
Update of /cvsroot/wxdevcenter/wxDevCenter/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3013/src Modified Files: Application.cpp Log Message: Casting int -> wxBitmapType Index: Application.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/Application.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Application.cpp 13 Feb 2005 15:19:51 -0000 1.10 --- Application.cpp 23 Feb 2005 14:11:45 -0000 1.11 *************** *** 430,434 **** wxBitmap Bmp; ! if(!Bmp.LoadFile(GetConfig().GetDataPath() + wxT("/img/") + strBmp, type)) { str = WXDC_ERROR_LOADDOCVIEWICON; --- 430,434 ---- wxBitmap Bmp; ! if(!Bmp.LoadFile(GetConfig().GetDataPath() + wxT("/img/") + strBmp, wxBitmapType(type))) { str = WXDC_ERROR_LOADDOCVIEWICON; |
|
From: Emilien K. <cur...@us...> - 2005-02-23 13:40:13
|
Update of /cvsroot/wxdevcenter/wxDevCenter/src/unix In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26313/src/unix Modified Files: Config.cpp Log Message: Oups ! Index: Config.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/unix/Config.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Config.cpp 13 Feb 2005 15:19:51 -0000 1.3 --- Config.cpp 23 Feb 2005 13:39:59 -0000 1.4 *************** *** 60,64 **** // Finalise la configuration. ! void ConfigWindows::Finalize() { if(m_pConfig!=NULL) --- 60,64 ---- // Finalise la configuration. ! void ConfigUnix::Finalize() { if(m_pConfig!=NULL) |
|
From: Emilien K. <cur...@us...> - 2005-02-23 11:44:05
|
Update of /cvsroot/wxdevcenter/wxDevCenter/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27182/src Modified Files: Config.cpp Log Message: Configuration unix. Index: Config.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/Config.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Config.cpp 13 Feb 2005 15:19:51 -0000 1.4 --- Config.cpp 23 Feb 2005 11:43:56 -0000 1.5 *************** *** 26,29 **** --- 26,30 ---- #include <wx/fileconf.h> + #include <wx/filefn.h> using namespace wxDevCenter; *************** *** 76,83 **** { wxFileConfig* pFC; ! wxString str; ! str << WXDC_SETUP_APPIDENT << wxT("/") << strSubConfName; ! pFC = new wxFileConfig(str, WXDC_SETUP_VENDOR, GetUserConfPath() + wxT("/") + strSubConfName + wxT(".conf"), GetGlobalConfPath() + wxT("/") + strSubConfName + wxT(".conf")); --- 77,97 ---- { wxFileConfig* pFC; ! wxString strAppName, strDir; ! strAppName << WXDC_SETUP_APPIDENT << wxT("/") << strSubConfName; ! // Création du répertoire de config global ! strDir = GetGlobalConfPath() + wxT("/") + strSubConfName; ! strDir.Replace(wxT("\\"), wxT("/")); ! strDir = strDir.BeforeLast(wxT('/')); ! if(!wxDirExists(strDir)) ! wxMkDir(strDir); ! // Création du répertoire de config utilisateur ! strDir = GetUserConfPath() + wxT("/") + strSubConfName; ! strDir.Replace(wxT("\\"), wxT("/")); ! strDir = strDir.BeforeLast(wxT('/')); ! if(!wxDirExists(strDir)) ! wxMkDir(strDir); ! ! pFC = new wxFileConfig(strAppName, WXDC_SETUP_VENDOR, GetUserConfPath() + wxT("/") + strSubConfName + wxT(".conf"), GetGlobalConfPath() + wxT("/") + strSubConfName + wxT(".conf")); |
|
From: Emilien K. <cur...@us...> - 2005-02-23 11:44:05
|
Update of /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/unix In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27182/include/wxDevCenter/unix Modified Files: Config.h Log Message: Configuration unix. Index: Config.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/unix/Config.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Config.h 13 Feb 2005 15:19:51 -0000 1.3 --- Config.h 23 Feb 2005 11:43:56 -0000 1.4 *************** *** 26,29 **** --- 26,31 ---- #define __WXDEVCENTER_CONFIG_UNIX + #include <wx/fileconf.h> + namespace wxDevCenter { |
|
From: Emilien K. <cur...@us...> - 2005-02-23 09:17:27
|
Update of /cvsroot/wxdevcenter/StdPlugin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23225 Modified Files: StdPlugin.bkl Log Message: Oups (mauvais chemin des données) Index: StdPlugin.bkl =================================================================== RCS file: /cvsroot/wxdevcenter/StdPlugin/StdPlugin.bkl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** StdPlugin.bkl 16 Feb 2005 23:12:07 -0000 1.1 --- StdPlugin.bkl 23 Feb 2005 09:17:18 -0000 1.2 *************** *** 34,38 **** <precomp-headers-header>StdPlugin.h</precomp-headers-header> ! <install-to>$(BINDIR)</install-to> </dll> --- 34,38 ---- <precomp-headers-header>StdPlugin.h</precomp-headers-header> ! <install-to>$(LIBDIR)/wxDevCenter/plugins</install-to> </dll> |
|
From: Emilien K. <cur...@us...> - 2005-02-23 09:16:56
|
Update of /cvsroot/wxdevcenter/StdPlugin/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22986/src Modified Files: BitmapCtrl.cpp BitmapDocView.cpp Controls.cpp Log Message: Fix du bug d'acces au SliderCtrl de taille de trait. Ajout de la prise en compte des modifs des couleurs via sliders au niveau des crayons et pinceaux. Index: BitmapCtrl.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/StdPlugin/src/BitmapCtrl.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** BitmapCtrl.cpp 11 Feb 2005 16:46:10 -0000 1.10 --- BitmapCtrl.cpp 23 Feb 2005 09:16:46 -0000 1.11 *************** *** 79,84 **** dc.BeginDrawing(); - // dc.Clear(); - dc.SetUserScale(dScale, dScale); dc.SetDeviceOrigin(-GetScrollPos(wxHORIZONTAL)*dScale, -GetScrollPos(wxVERTICAL)*dScale); --- 79,82 ---- *************** *** 92,96 **** --- 90,96 ---- void BitmapCtrl::OnDraw(wxDC* pDC) { + pDC->DrawBitmap(m_Bmp, 0, 0); + } *************** *** 250,253 **** --- 250,255 ---- void BitmapCtrl::OnMouseEvents(wxMouseEvent& event) { + if(wxWindow::FindFocus()!=this) + SetFocus(); wxExtendedMouseInterface::OnMouseEvent(event); } Index: Controls.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/StdPlugin/src/Controls.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Controls.cpp 13 Jan 2005 14:33:20 -0000 1.6 --- Controls.cpp 23 Feb 2005 09:16:46 -0000 1.7 *************** *** 151,154 **** --- 151,158 ---- SetToolTip(str); Refresh(); + + wxCommandEvent evt(wxEVT_COMMAND_TEXT_UPDATED, GetId()); + evt.SetString(GetLabel()); + GetParent()->ProcessEvent(evt); } *************** *** 166,169 **** --- 170,198 ---- } + wxString wxColourCtrl::GetLabel(bool bUseName)const + { + wxColour col = GetColour(); + wxString str = wxTheColourDatabase->FindName(col); + if(str.IsEmpty() && bUseName) + str.Printf(wxT("#%02hX%02hX%02hX"), (unsigned short)col.Red(), (unsigned short)col.Green(), (unsigned short)col.Blue()); + return str; + + } + + void wxColourCtrl::SetLabel(wxString str) + { + wxColour col = wxTheColourDatabase->Find(str); + if(!col.Ok()) + { + unsigned short r, g, b; + str.Replace(wxT("#"), wxT("")); + str.UpperCase(); + sscanf(str.GetData(), wxT("%02hX%02hX%02hX"), &r, &g, &b); + col.Set((unsigned char)r, (unsigned char)g, (unsigned char)b); + } + SetColour(col); + } + + void wxColourCtrl::OnMouseLeftClick(wxMouseEvent& WXUNUSED(event)) { Index: BitmapDocView.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/StdPlugin/src/BitmapDocView.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** BitmapDocView.cpp 11 Feb 2005 20:52:03 -0000 1.17 --- BitmapDocView.cpp 23 Feb 2005 09:16:46 -0000 1.18 *************** *** 276,280 **** BEGIN_EVENT_TABLE(BitmapView, View) - EVT_SIZE(BitmapView::OnSize) EVT_MENU(IDM_VIEW_CENTER, BitmapView::OnViewCenter) EVT_MENU(IDM_VIEW_EXTRASCROLL, BitmapView::OnExtraScroll) --- 276,279 ---- *************** *** 290,293 **** --- 289,295 ---- EVT_COMMAND_RANGE(ID_COLOR_PALETTE_START, ID_COLOR_PALETTE_END, wxEVT_COMMAND_RIGHT_CLICK, BitmapView::OnColorPaletteRightClick) + EVT_COLOUR(ID_COLOR_CURSOR_LEFT, BitmapView::OnSelLeftColourChanged) + EVT_COLOUR(ID_COLOR_CURSOR_RIGHT, BitmapView::OnSelRightColourChanged) + EVT_COMMAND_LEFT_CLICK(ID_COLOR_CURSOR_LEFT, BitmapView::OnColorLeftClick) EVT_COMMAND_LEFT_CLICK(ID_COLOR_CURSOR_RIGHT, BitmapView::OnColorRightClick) *************** *** 305,310 **** EVT_MENU_RANGE(ID_PEN_STYLE_FIRST, ID_PEN_STYLE_LAST, BitmapView::OnPenStyle) EVT_TEXT(ID_PEN_SIZE, BitmapView::OnPenSizeChange) - - EVT_ERASE_BACKGROUND(BitmapView::OnEraseBackground) END_EVENT_TABLE() --- 307,310 ---- *************** *** 314,317 **** --- 314,319 ---- View(), m_BVD(BVD_NONE), + m_pColourLeftButton(NULL), + m_pColourRightButton(NULL), m_ptSel(wxDefaultPosition) { *************** *** 361,364 **** --- 363,367 ---- SetWindowStyleFlag(GetWindowStyleFlag()|wxCLIP_CHILDREN); + m_pBitmapCtrl = new BitmapCtrl(this, ID_BITMAP_CTRL, wxDefaultPosition, wxDefaultSize, 0); wxSizer *pGlobalSizer = new wxBoxSizer(wxHORIZONTAL), *************** *** 372,376 **** pToolSizer->Add(CreateToolBar(), 0, wxGROW); ! pToolSizer->SetItemMinSize((size_t)1, 172, 48); pToolSizer->Add(CreatePenBar(), 0, wxGROW); --- 375,379 ---- pToolSizer->Add(CreateToolBar(), 0, wxGROW); ! pToolSizer->SetItemMinSize((size_t)1, 172, 72); pToolSizer->Add(CreatePenBar(), 0, wxGROW); *************** *** 532,541 **** } - void BitmapView::OnSize(wxSizeEvent& event) - { - Layout(); - event.Skip(); - } - void BitmapView::OnInitialUpdate() { --- 535,538 ---- *************** *** 662,670 **** } ! // Intercepte la peinture du fond pour empecher le flicking. ! void BitmapView::OnEraseBackground(wxEraseEvent& WXUNUSED(event)) { } // Création de la barre de pinceau. wxPanel* BitmapView::CreatePenBar() --- 659,677 ---- } ! // Intercepte le changement de couleur de la sélection gauche. ! void BitmapView::OnSelLeftColourChanged(wxCommandEvent& WXUNUSED(event)) { + if(m_pColourLeftButton) + m_Pen.SetColour(m_pColourLeftButton->GetColour()); } + // Intercepte le changement de couleur de la sélection droite. + void BitmapView::OnSelRightColourChanged(wxCommandEvent& WXUNUSED(event)) + { + if(m_pColourRightButton) + m_Brush.SetColour(m_pColourLeftButton->GetColour()); + } + + // Création de la barre de pinceau. wxPanel* BitmapView::CreatePenBar() |
|
From: Emilien K. <cur...@us...> - 2005-02-23 09:16:55
|
Update of /cvsroot/wxdevcenter/StdPlugin/include/wxDevCenter/StdPlugin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22986/include/wxDevCenter/StdPlugin Modified Files: BitmapDocView.h Controls.h Log Message: Fix du bug d'acces au SliderCtrl de taille de trait. Ajout de la prise en compte des modifs des couleurs via sliders au niveau des crayons et pinceaux. Index: BitmapDocView.h =================================================================== RCS file: /cvsroot/wxdevcenter/StdPlugin/include/wxDevCenter/StdPlugin/BitmapDocView.h,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** BitmapDocView.h 11 Feb 2005 20:22:40 -0000 1.12 --- BitmapDocView.h 23 Feb 2005 09:16:46 -0000 1.13 *************** *** 127,131 **** virtual bool OnCreate(); void OnInitialUpdate(); - void OnSize(wxSizeEvent& event); BitmapCtrl *m_pBitmapCtrl; wxPanel *m_pControlPanel; --- 127,130 ---- *************** *** 184,187 **** --- 183,190 ---- /** Intercepte le changement de couleur des wxSliderSpinCtrl.*/ void OnSliderSpinTextChanged(wxCommandEvent& event); + /** Intercepte le changement de couleur de la sélection gauche.*/ + void OnSelLeftColourChanged(wxCommandEvent& event); + /** Intercepte le changement de couleur de la sélection droite.*/ + void OnSelRightColourChanged(wxCommandEvent& event); /** @}*/ *************** *** 254,261 **** void OnLeftDragEnd(wxExtendedMouseEvent& event); - /** Intercepte la peinture du fond pour empecher le flicking.*/ - void OnEraseBackground(wxEraseEvent& event); - - /** @name Fonctions interne de manipulation du buffer. * @{ */ --- 257,260 ---- Index: Controls.h =================================================================== RCS file: /cvsroot/wxdevcenter/StdPlugin/include/wxDevCenter/StdPlugin/Controls.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Controls.h 13 Jan 2005 14:33:19 -0000 1.6 --- Controls.h 23 Feb 2005 09:16:46 -0000 1.7 *************** *** 51,58 **** --- 51,61 ---- * Contrôle de bouton de couleur. * Génère des évènements wxEVT_COMMAND_LEFT_CLICK et wxEVT_COMMAND_LEFT_DCLICK. + * Génère un évènement de type wxEVT_COMMAND_TEXT_UPDATED pour le changement de couleur qui peut être intercepté par EVT_COLOUR(...) */ #define wxCOL_PICK_ON_DBLCLIC 0x00001000 + #define EVT_COLOUR(id, func) EVT_TEXT(id, func) + class wxColourCtrl : public wxControl { *************** *** 66,69 **** --- 69,75 ---- wxColour PickColour(); + wxString GetLabel(bool bUseName=false)const; + void SetLabel(wxString str); + protected: void OnMouseLeftClick(wxMouseEvent& event); |
|
From: Emilien K. <cur...@us...> - 2005-02-22 16:44:30
|
Update of /cvsroot/wxdevcenter/wxDevCenter/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16757/src Modified Files: DocManager.cpp Log Message: Prévient du flicking lors de la création des vues. Index: DocManager.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/DocManager.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** DocManager.cpp 15 Jan 2005 09:47:22 -0000 1.5 --- DocManager.cpp 22 Feb 2005 16:44:14 -0000 1.6 *************** *** 343,347 **** --- 343,349 ---- pView->Create(m_pDefaultViewContainer, -1, wxDefaultPosition, wxDefaultSize, wxNO_BORDER); + pView->Hide(); pView->OnCreate(); + pView->Show(); m_ViewArray.Add(pView); |
|
From: Emilien K. <cur...@us...> - 2005-02-22 16:24:23
|
Update of /cvsroot/wxdevcenter/wxDevCenter/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10533/src Modified Files: MainFrame.cpp Log Message: Passe des SashWindows à wxFrameLayout. Index: MainFrame.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/MainFrame.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MainFrame.cpp 14 Jan 2005 14:34:59 -0000 1.4 --- MainFrame.cpp 22 Feb 2005 16:24:05 -0000 1.5 *************** *** 36,39 **** --- 36,58 ---- #include <wx/sashwin.h> + + + + // fl headers + #include <wx/fl/controlbar.h> // core API + // extra plugins + #include <wx/fl/barhintspl.h> // bevel for bars with "X"s and grooves + #include <wx/fl/rowdragpl.h> // NC-look with draggable rows + #include <wx/fl/cbcustom.h> // customization plugin + #include <wx/fl/hintanimpl.h> + + // beauty-care + #include <wx/fl/gcupdatesmgr.h> // smooth d&d + #include <wx/fl/antiflickpl.h> // double-buffered repaint of decorations + #include <wx/fl/dyntbar.h> // auto-layout toolbar + #include <wx/fl/dyntbarhnd.h> // control-bar dimension handler for it + + + using namespace wxDevCenter; *************** *** 72,77 **** BEGIN_EVENT_TABLE(MainFrame, TopFrame) EVT_CLOSE(MainFrame::OnClose) - EVT_SASH_DRAGGED(wxID_ANY , MainFrame::OnLeftSashDragged) - EVT_SIZE(MainFrame::OnSize) EVT_TREE_ITEM_ACTIVATED(wxID_ANY, MainFrame::OnFileSystemTreeCtrlItemActivate) EVT_TREE_BEGIN_DRAG(wxID_ANY, MainFrame::OnFileSystemTreeCtrlItemDrag) --- 91,94 ---- *************** *** 140,144 **** m_pGlobalSizer(NULL), m_pMDIFrame(NULL), - m_pLeftShashWindow(NULL), m_pStdFileSystemTree(NULL) { --- 157,160 ---- *************** *** 146,164 **** m_pMDIFrame = new MDIFrame(this, this, -1); ! m_pLeftShashWindow = new wxSashWindow(this, -1, wxDefaultPosition, wxSize(200, 30), wxCLIP_CHILDREN ); ! m_pLeftShashWindow->SetSashVisible(wxSASH_RIGHT, true); ! m_pLeftShashWindow->SetMinimumSizeX(24); ! ! m_pStdFileSystemTree = new FileSystemTreeCtrl(m_pLeftShashWindow, -1, wxGetApp().GetStandardFileSystem(), &wxGetApp().GetDocManager()); m_pStdFileSystemTree->OpenRoot(); - m_pGlobalSizer = new wxBoxSizer(wxHORIZONTAL); - m_pGlobalSizer->Add(m_pLeftShashWindow, 0, wxGROW); - m_pGlobalSizer->Add(m_pMDIFrame, 2, wxGROW); ! m_pGlobalSizer->SetItemMinSize(m_pLeftShashWindow, 200, 30); ! m_pGlobalSizer->SetItemMinSize(m_pMDIFrame, 48, 30); ! SetSizer(m_pGlobalSizer); // Création de la barre des menu puis réinitialisation de celle-ci --- 162,197 ---- m_pMDIFrame = new MDIFrame(this, this, -1); ! m_pStdFileSystemTree = new FileSystemTreeCtrl(this, -1, wxGetApp().GetStandardFileSystem(), &wxGetApp().GetDocManager()); m_pStdFileSystemTree->OpenRoot(); ! m_pFrameLayout = new wxFrameLayout(this, m_pMDIFrame); ! m_pFrameLayout->SetUpdatesManager( new cbGCUpdatesMgr() ); ! ! // setup plugins for testing ! m_pFrameLayout->PushDefaultPlugins(); ! m_pFrameLayout->AddPlugin( CLASSINFO( cbBarHintsPlugin ) ); // fancy "X"es and bevel for bars ! m_pFrameLayout->AddPlugin( CLASSINFO( cbAntiflickerPlugin ) ); ! m_pFrameLayout->AddPlugin( CLASSINFO( cbHintAnimationPlugin ) ); ! ! ! ! // drop in some bars ! cbDimInfo sizes( 160, 220, // when docked horizontally ! 220, 160, // when docked vertically ! 160, 220, // when floated ! FALSE, // the bar is not fixed-size ! 4, // vertical gap (bar border) ! 4 // horizontal gap (bar border) ! ); ! ! m_pFrameLayout->AddBar( m_pStdFileSystemTree, // bar window ! sizes, FL_ALIGN_LEFT, // alignment ( 0-top,1-bottom, etc) ! 0, // insert into 0th row (vert. position) ! 0, // offset from the start of row (in pixels) ! "Standard File System", // name for reference in customization pop-ups ! FALSE ! ); // Création de la barre des menu puis réinitialisation de celle-ci *************** *** 188,223 **** } - - - void MainFrame::OnSize(wxSizeEvent &event) - { - wxRect r = m_pLeftShashWindow->GetRect(); - wxSize s = event.GetSize(); - - m_pLeftShashWindow->SetMaximumSizeX(s.GetWidth()-24); - - if(r.width>=s.GetWidth()-24) - m_pGlobalSizer->SetItemMinSize(m_pLeftShashWindow, s.GetWidth()-24, r.height); - - Layout(); - } - - - void MainFrame::OnLeftSashDragged(wxSashEvent &event) - { - if(event.GetDragStatus()==wxSASH_STATUS_OK) - { - wxRect r = event.GetDragRect(); - wxSize s = GetClientSize(); - - if(r.width<s.GetWidth()-24) - m_pGlobalSizer->SetItemMinSize(m_pLeftShashWindow, r.width, r.height); - else - m_pGlobalSizer->SetItemMinSize(m_pLeftShashWindow, s.GetWidth()-24, r.height); - m_pGlobalSizer->Layout(); - } - } - - // Intercepte les changements pour la barre de status. void MainFrame::OnStatusChange(StatusEvent& event) --- 221,224 ---- |
|
From: Emilien K. <cur...@us...> - 2005-02-22 16:24:23
|
Update of /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10533/include/wxDevCenter Modified Files: MainFrame.h Log Message: Passe des SashWindows à wxFrameLayout. Index: MainFrame.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/MainFrame.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MainFrame.h 14 Jan 2005 14:34:58 -0000 1.2 --- MainFrame.h 22 Feb 2005 16:24:04 -0000 1.3 *************** *** 32,39 **** #include <wxDevCenter/FileSystemCtrl.h> - class wxSashEvent; class wxTreeEvent; class wxSashWindow; namespace wxDevCenter { --- 32,40 ---- #include <wxDevCenter/FileSystemCtrl.h> class wxTreeEvent; class wxSashWindow; + class wxFrameLayout; + namespace wxDevCenter { *************** *** 55,64 **** virtual ~MainFrame(void); /** Sizer global. Sizer global pour le redimensionnement du contenu.*/ wxSizer *m_pGlobalSizer; /** Conteneur des vues.*/ MDIFrame *m_pMDIFrame; - /** Splitter principal (vertical). Splitter vertical séparant le conteneur de vues et l'explorateur de fichier.*/ - wxSashWindow *m_pLeftShashWindow; /** Explorateur de fichier standard. Contrôle arborescent explorant le système de fichier standard. --- 56,66 ---- virtual ~MainFrame(void); + /** FrameLayout object.*/ + wxFrameLayout* m_pFrameLayout; + /** Sizer global. Sizer global pour le redimensionnement du contenu.*/ wxSizer *m_pGlobalSizer; /** Conteneur des vues.*/ MDIFrame *m_pMDIFrame; /** Explorateur de fichier standard. Contrôle arborescent explorant le système de fichier standard. *************** *** 109,118 **** * @{*/ void OnClose(wxCloseEvent &event); - /** Evènement redimensionnement de la fenêtre. - * Redimmensionne et replace les fenêtres filles.*/ - void OnSize(wxSizeEvent &event); - /** Evènement déplacement du splitter vertical. - * Redimmensionne et replace les fenêtres filles.*/ - void OnLeftSashDragged(wxSashEvent &event); /** Evènement activation d'un elément d'explorateur de fichier. * Ouvre un nouveau document correspondant au fichier demandé.*/ --- 111,114 ---- |
|
From: Emilien K. <cur...@us...> - 2005-02-16 23:12:50
|
Update of /cvsroot/wxdevcenter/wxDevCenter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15235 Modified Files: wxDevCenter.bkl Log Message: oups Index: wxDevCenter.bkl =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/wxDevCenter.bkl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** wxDevCenter.bkl 16 Feb 2005 22:45:08 -0000 1.3 --- wxDevCenter.bkl 16 Feb 2005 23:12:40 -0000 1.4 *************** *** 116,120 **** icons/wxDevCenter.ico img/wx.png ! img.wxDevCenter.png </files> </data-files-tree> --- 116,120 ---- icons/wxDevCenter.ico img/wx.png ! img/wxDevCenter.png </files> </data-files-tree> |
|
From: Emilien K. <cur...@us...> - 2005-02-16 23:12:16
|
Update of /cvsroot/wxdevcenter/StdPlugin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15115 Added Files: StdPlugin.bkl Log Message: Commit initial --- NEW FILE: StdPlugin.bkl --- <?xml version="1.0" ?> <makefile> <include file="wx.bkl"/> <using module="datafiles"/> <set var="DIRSPEC"> <if cond="PLATFORM_WIN32=='1'">msw</if> <if cond="PLATFORM_UNIX =='1'">unix</if> </set> <set var="DEBUGFLAG"> <if cond="BUILD=='debug'">d</if> </set> <!-- wxDevCenter executable. --> <dll id="StdPlugin" template="wxWidgets"> <libname>StdPlugin$(DEBUGFLAG)</libname> <include>include</include> <sources> src/BitmapCtrl.cpp src/BitmapDocView.cpp src/Controls.cpp src/extMouse.cpp src/OrganigramPanel.cpp src/SimpleTextDocView.cpp src/StdPlugin.cpp </sources> <precomp-headers>on</precomp-headers> <precomp-headers-header>StdPlugin.h</precomp-headers-header> <install-to>$(BINDIR)</install-to> </dll> <!-- Install headers. --> <data-files-tree > <srcdir>include/wxDevCenter</srcdir> <install-to>$(INCLUDEDIR)/wxDevCenter</install-to> <files> StdPlugin.h StdPlugin/BitmapCtrl.h StdPlugin/BitmapDocView.h StdPlugin/Controls.h StdPlugin/extmouse.h StdPlugin/language.h StdPlugin/OrganigramPanel.h StdPlugin/SimpleTextDocView.h </files> </data-files-tree> <!-- Install data. --> <data-files-tree > <srcdir>data</srcdir> <install-to>$(DATADIR)/wxDevCenter/data</install-to> <files> icons/filetypes/bmp.ico icons/filetypes/txt.ico img/scintilla.png img/bmp/brush.png img/bmp/DOT.png img/bmp/DOT_DASH.PNG img/bmp/ellipse.png img/bmp/handdraw.png img/bmp/line.png img/bmp/LONG_DASH.PNG img/bmp/rect.png img/bmp/rrect.png img/bmp/selall.png img/bmp/selcopy.png img/bmp/selcut.png img/bmp/selection.png img/bmp/selmove.png img/bmp/selpaste.png img/bmp/selremove.png img/bmp/SHORT_DASH.PNG img/bmp/SOLID.PNG img/bmp/spray.png img/bmp/TRANSPARENT.PNG </files> </data-files-tree> <!-- Install data. --> <data-files-tree > <srcdir>conf</srcdir> <install-to>$(DATADIR)/wxDevCenter/conf</install-to> <files> Text.conf Text/.conf Text/ADA.conf Text/APDL.conf Text/ASM.conf Text/ASP.conf Text/AU3.conf Text/AVE.conf Text/BAAM.conf Text/BASH.conf Text/Batch.conf Text/Bullant.conf Text/CLW no case.conf Text/CLW.conf Text/Config.conf Text/CPP no case.conf Text/CPP.conf Text/CSS.conf Text/Diff.conf Text/Eiffel.conf Text/EiffelKW.conf Text/ERLANG.conf Text/Error list.conf Text/ESCRIPT.conf Text/F77.conf Text/FORTH.conf Text/Fortran.conf Text/GUI2CLI.conf Text/HTML.conf Text/KIX.conf Text/LaTeX.conf Text/Lisp.conf Text/LOT.conf Text/LOUT.conf Text/LUA.conf Text/Makefile.conf Text/MATLab.conf Text/METAPOST.conf Text/MMIXAL.conf Text/MS-SQL.conf Text/NN Cron Table.conf Text/NSIS.conf Text/Octave.conf Text/Pascal.conf Text/Perl.conf Text/PHP.conf Text/POV.conf Text/Power Basic.conf Text/Properties.conf Text/PS.conf Text/Python.conf Text/Ruby.conf Text/Scriptol.conf Text/SPECMAN.conf Text/SQL.conf Text/TCL.conf Text/TeX.conf Text/Text.conf Text/Verilog.conf Text/Visual Basic Script.conf Text/Visual Basic.conf Text/XCode.conf Text/XML.conf Text/YAML.conf </files> </data-files-tree> </makefile> |
|
From: Emilien K. <cur...@us...> - 2005-02-16 22:45:24
|
Update of /cvsroot/wxdevcenter/wxDevCenter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8638 Modified Files: wxDevCenter.bkl Log Message: Ajout de l'installation des données et des entetes. Index: wxDevCenter.bkl =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/wxDevCenter.bkl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** wxDevCenter.bkl 11 Feb 2005 21:13:22 -0000 1.2 --- wxDevCenter.bkl 16 Feb 2005 22:45:08 -0000 1.3 *************** *** 4,24 **** <include file="wx.bkl"/> ! <set var="DIRSPEC"> ! <if cond="PLATFORM_WIN32 == 1">msw</if> ! <if cond="PLATFORM_UNIX == 1">unix</if> </set> ! <!-- EditOrx executable. --> ! <exe id="EditOrx" template="wxWidgets"> <app-type>gui</app-type> ! <exename>EditOrx</exename> <include>include</include> <sources> src/AboutBox.cpp src/Application.cpp src/DocManager.cpp src/DocType.cpp --- 4,42 ---- <include file="wx.bkl"/> ! <using module="datafiles"/> ! ! <set var="DIRSPEC"> ! <if cond="PLATFORM_WIN32=='1'">msw</if> ! <if cond="PLATFORM_UNIX =='1'">unix</if> </set> + <set var="DEBUGFLAG"> + <if cond="BUILD=='debug'">d</if> + </set> ! <!-- wxDevCenter plateform-specific intermediate library. --> ! <lib id="wxdcSpecific"> ! <include>include</include> ! <sources> ! src/$(DIRSPEC)/Config.cpp ! src/$(DIRSPEC)/FileSystemStandard.cpp ! </sources> ! </lib> ! ! <!-- wxDevCenter executable. --> ! <exe id="wxDevCenter" template="wxWidgets"> <app-type>gui</app-type> ! <exename>wxDevCenter$(DEBUGFLAG)</exename> + <depends>wxdcSpecific</depends> + <library>wxdcSpecific</library> + <include>include</include> <sources> src/AboutBox.cpp src/Application.cpp + src/Config.cpp src/DocManager.cpp src/DocType.cpp *************** *** 27,31 **** src/FileSystemCtrl.cpp src/FileSystemStandard.cpp - src/$(DIRSPEC)/FileSystemStandard.cpp src/FileTools.cpp src/Frame.cpp --- 45,48 ---- *************** *** 42,45 **** --- 59,123 ---- <sys-lib>$(wxlib_net)</sys-lib> <sys-lib>$(wxlib_stc)</sys-lib> + + <install-to>$(BINDIR)</install-to> </exe> + + <!-- Install headers. --> + <data-files-tree > + <srcdir>include</srcdir> + <install-to>$(INCLUDEDIR)</install-to> + <files> + wxDevCenter.h + wxDevCenterPlugin.h + wxDevCenter/AboutBox.h + wxDevCenter/Application.h + wxDevCenter/Config.h + wxDevCenter/DocManager.h + wxDevCenter/DocView.h + wxDevCenter/FileSystem.h + wxDevCenter/FileSystemCtrl.h + wxDevCenter/FileSystemStandard.h + wxDevCenter/FileTools.h + wxDevCenter/Frame.h + wxDevCenter/language.h + wxDevCenter/MainFrame.h + wxDevCenter/MDIFrame.h + wxDevCenter/Plugin.h + wxDevCenter/Project.h + wxDevCenter/setup.h + wxDevCenter/StatusBar.h + wxDevCenter/$(DIRSPEC)/Config.h + wxDevCenter/$(DIRSPEC)/FileSystemStandard.h + </files> + </data-files-tree> + + <!-- Install data. --> + <data-files-tree > + <srcdir>data</srcdir> + <install-to>$(DATADIR)/wxDevCenter/data</install-to> + <files> + icons/cd-dvd.ico + icons/computer.ico + icons/desktop.ico + icons/dir.ico + icons/docs.ico + icons/floppy.ico + icons/harddrive.ico + icons/icon-big.ico + icons/icon-list.ico + icons/icon-report.ico + icons/none.ico + icons/Progs.ico + icons/ramdisk.ico + icons/remote.ico + icons/removeable.ico + icons/shortcut.ico + icons/unknow.ico + icons/wxDevCenter.ico + img/wx.png + img.wxDevCenter.png + </files> + </data-files-tree> + + </makefile> |
|
From: Emilien K. <cur...@us...> - 2005-02-16 17:46:56
|
Update of /cvsroot/wxdevcenter/StdPlugin/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24897/src Modified Files: SimpleTextDocView.cpp Log Message: Suite du transfert de la conf des textes vers les fichiers .conf Index: SimpleTextDocView.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/StdPlugin/src/SimpleTextDocView.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** SimpleTextDocView.cpp 16 Feb 2005 15:10:02 -0000 1.6 --- SimpleTextDocView.cpp 16 Feb 2005 17:45:56 -0000 1.7 *************** *** 82,219 **** - static wxString s_LangageName[WXDC_NB_LEX] = - { - WXDC_LEXNAME_CONTAINER , - WXDC_LEXNAME_NULL , - WXDC_LEXNAME_PYTHON , - WXDC_LEXNAME_CPP , - WXDC_LEXNAME_HTML , - WXDC_LEXNAME_XML , - WXDC_LEXNAME_PERL , - WXDC_LEXNAME_SQL , - WXDC_LEXNAME_VB , - WXDC_LEXNAME_PROPERTIES, - WXDC_LEXNAME_ERRORLIST , - WXDC_LEXNAME_MAKEFILE , - WXDC_LEXNAME_BATCH , - WXDC_LEXNAME_XCODE , - WXDC_LEXNAME_LATEX , - WXDC_LEXNAME_LUA , - WXDC_LEXNAME_DIFF , - WXDC_LEXNAME_CONF , - WXDC_LEXNAME_PASCAL , - WXDC_LEXNAME_AVE , - WXDC_LEXNAME_ADA , - WXDC_LEXNAME_LISP , - WXDC_LEXNAME_RUBY , - WXDC_LEXNAME_EIFFEL , - WXDC_LEXNAME_EIFFELKW , - WXDC_LEXNAME_TCL , - WXDC_LEXNAME_NNCRONTAB , - WXDC_LEXNAME_BULLANT , - WXDC_LEXNAME_VBSCRIPT , - WXDC_LEXNAME_ASP , - WXDC_LEXNAME_PHP , - WXDC_LEXNAME_BAAN , - WXDC_LEXNAME_MATLAB , - WXDC_LEXNAME_SCRIPTOL , - WXDC_LEXNAME_ASM , - WXDC_LEXNAME_CPPNOCASE , - WXDC_LEXNAME_FORTRAN , - WXDC_LEXNAME_F77 , - WXDC_LEXNAME_CSS , - WXDC_LEXNAME_POV , - WXDC_LEXNAME_LOUT , - WXDC_LEXNAME_ESCRIPT , - WXDC_LEXNAME_PS , - WXDC_LEXNAME_NSIS , - WXDC_LEXNAME_MMIXAL , - WXDC_LEXNAME_CLW , - WXDC_LEXNAME_CLWNOCASE , - WXDC_LEXNAME_LOT , - WXDC_LEXNAME_YAML , - WXDC_LEXNAME_TEX , - WXDC_LEXNAME_METAPOST , - WXDC_LEXNAME_POWERBASIC, - WXDC_LEXNAME_FORTH , - WXDC_LEXNAME_ERLANG , - WXDC_LEXNAME_OCTAVE , - WXDC_LEXNAME_MSSQL , - WXDC_LEXNAME_VERILOG , - WXDC_LEXNAME_KIX , - WXDC_LEXNAME_GUI4CLI , - WXDC_LEXNAME_SPECMAN , - WXDC_LEXNAME_AU3 , - WXDC_LEXNAME_APDL , - WXDC_LEXNAME_BASH - }; - - static wxString s_LangageShortName[WXDC_NB_LEX] = - { - WXDC_LEXSHORTNAME_CONTAINER , - WXDC_LEXSHORTNAME_NULL , - WXDC_LEXSHORTNAME_PYTHON , - WXDC_LEXSHORTNAME_CPP , - WXDC_LEXSHORTNAME_HTML , - WXDC_LEXSHORTNAME_XML , - WXDC_LEXSHORTNAME_PERL , - WXDC_LEXSHORTNAME_SQL , - WXDC_LEXSHORTNAME_VB , - WXDC_LEXSHORTNAME_PROPERTIES, - WXDC_LEXSHORTNAME_ERRORLIST , - WXDC_LEXSHORTNAME_MAKEFILE , - WXDC_LEXSHORTNAME_BATCH , - WXDC_LEXSHORTNAME_XCODE , - WXDC_LEXSHORTNAME_LATEX , - WXDC_LEXSHORTNAME_LUA , - WXDC_LEXSHORTNAME_DIFF , - WXDC_LEXSHORTNAME_CONF , - WXDC_LEXSHORTNAME_PASCAL , - WXDC_LEXSHORTNAME_AVE , - WXDC_LEXSHORTNAME_ADA , - WXDC_LEXSHORTNAME_LISP , - WXDC_LEXSHORTNAME_RUBY , - WXDC_LEXSHORTNAME_EIFFEL , - WXDC_LEXSHORTNAME_EIFFELKW , - WXDC_LEXSHORTNAME_TCL , - WXDC_LEXSHORTNAME_NNCRONTAB , - WXDC_LEXSHORTNAME_BULLANT , - WXDC_LEXSHORTNAME_VBSCRIPT , - WXDC_LEXSHORTNAME_ASP , - WXDC_LEXSHORTNAME_PHP , - WXDC_LEXSHORTNAME_BAAN , - WXDC_LEXSHORTNAME_MATLAB , - WXDC_LEXSHORTNAME_SCRIPTOL , - WXDC_LEXSHORTNAME_ASM , - WXDC_LEXSHORTNAME_CPPNOCASE , - WXDC_LEXSHORTNAME_FORTRAN , - WXDC_LEXSHORTNAME_F77 , - WXDC_LEXSHORTNAME_CSS , - WXDC_LEXSHORTNAME_POV , - WXDC_LEXSHORTNAME_LOUT , - WXDC_LEXSHORTNAME_ESCRIPT , - WXDC_LEXSHORTNAME_PS , - WXDC_LEXSHORTNAME_NSIS , - WXDC_LEXSHORTNAME_MMIXAL , - WXDC_LEXSHORTNAME_CLW , - WXDC_LEXSHORTNAME_CLWNOCASE , - WXDC_LEXSHORTNAME_LOT , - WXDC_LEXSHORTNAME_YAML , - WXDC_LEXSHORTNAME_TEX , - WXDC_LEXSHORTNAME_METAPOST , - WXDC_LEXSHORTNAME_POWERBASIC, - WXDC_LEXSHORTNAME_FORTH , - WXDC_LEXSHORTNAME_ERLANG , - WXDC_LEXSHORTNAME_OCTAVE , - WXDC_LEXSHORTNAME_MSSQL , - WXDC_LEXSHORTNAME_VERILOG , - WXDC_LEXSHORTNAME_KIX , - WXDC_LEXSHORTNAME_GUI4CLI , - WXDC_LEXSHORTNAME_SPECMAN , - WXDC_LEXSHORTNAME_AU3 , - WXDC_LEXSHORTNAME_APDL , - WXDC_LEXSHORTNAME_BASH - }; - /** Traduction d'une couleur vers sa forme de sauvegarde de config. --- 82,85 ---- *************** *** 225,229 **** wxString str = wxTheColourDatabase->FindName(col); if(str.IsEmpty()) ! str.Printf(wxT("#%02d%02d%02d"), col.Red(), col.Green(), col.Blue()); return str; } --- 91,95 ---- wxString str = wxTheColourDatabase->FindName(col); if(str.IsEmpty()) ! str.Printf(wxT("#%02hX%02hX%02hX"), (unsigned short)col.Red(), (unsigned short)col.Green(), (unsigned short)col.Blue()); return str; } *************** *** 292,297 **** LanguageProperty::LangagePropertyStyle* pCurStyle; - InitPreferences(); - wxConfigBase& GlobalConfig = wxGetApp().GetConfig()[WXDC_SIMPLETEXT_CONFIG_ROOT]; GlobalConfig.SetPath(wxT("/")); --- 158,161 ---- *************** *** 307,312 **** Config.SetPath(wxT("/")); - pLang->iFolds = Config.Read(WXDC_SIMPLETEXT_VIEWCONFIGFOLDS, pLang->iFolds); pLang->strName = Config.Read(WXDC_SIMPLETEXT_VIEWCONFIGNAME, pLang->strName); for(NumKeyword = 0; NumKeyword<=wxSTC_KEYWORDSET_MAX; NumKeyword++) --- 171,178 ---- Config.SetPath(wxT("/")); pLang->strName = Config.Read(WXDC_SIMPLETEXT_VIEWCONFIGNAME, pLang->strName); + pLang->iFolds = Config.Read(WXDC_SIMPLETEXT_VIEWCONFIGFOLDS, pLang->iFolds); + + wxLogDebug("Lang %02d : %s - %s", iLang, pLang->strShortName, pLang->strName); for(NumKeyword = 0; NumKeyword<=wxSTC_KEYWORDSET_MAX; NumKeyword++) *************** *** 356,361 **** Config.SetPath(wxT("/")); - Config.Write(WXDC_SIMPLETEXT_VIEWCONFIGFOLDS, pLang->iFolds); Config.Write(WXDC_SIMPLETEXT_VIEWCONFIGNAME, pLang->strName); for(NumKeyword = 0; NumKeyword<=wxSTC_KEYWORDSET_MAX; NumKeyword++) --- 222,227 ---- Config.SetPath(wxT("/")); Config.Write(WXDC_SIMPLETEXT_VIEWCONFIGNAME, pLang->strName); + Config.Write(WXDC_SIMPLETEXT_VIEWCONFIGFOLDS, pLang->iFolds); for(NumKeyword = 0; NumKeyword<=wxSTC_KEYWORDSET_MAX; NumKeyword++) *************** *** 390,540 **** - void InitPreferences() - { - for(int i=0; i<WXDC_NB_LEX; i++) - { - g_LangagePropertyArray[i].strName = s_LangageName[i]; - g_LangagePropertyArray[i].strShortName = s_LangageShortName[i]; - } - - - LanguageProperty *pLang; - - /** Texte simple.*/ - pLang = &g_LangagePropertyArray[wxSTC_LEX_CPP]; - pLang->Styles[0].bUsed = true; - pLang->Styles[0].strLabel = WXDC_SIMPLETEXT_TEXT_DEFAULT; - - /** Langage C++. Basé sur la configuration donnée dans cpp.properties de SciTE.*/ - pLang->Styles[wxSTC_C_STRING].iFontStyle = WXDC_STC_STYLE_ITALIC; - pLang->Styles[wxSTC_C_CHARACTER].iFontStyle = WXDC_STC_STYLE_ITALIC; - pLang->Styles[wxSTC_C_PREPROCESSOR].iFontStyle = WXDC_STC_STYLE_BOLD; - pLang->Styles[wxSTC_C_COMMENT].colForeground = wxColor("FOREST GREEN"); - pLang->Styles[wxSTC_C_COMMENTLINE].colForeground = wxColor("FOREST GREEN"); - pLang->Styles[wxSTC_C_COMMENTDOC].colForeground = wxColor("FOREST GREEN"); - pLang->Styles[wxSTC_C_NUMBER].colForeground = wxColor("VIOLET"); - pLang->Styles[wxSTC_C_WORD].colForeground = wxColor("BLUE"); - pLang->Styles[wxSTC_C_STRING].colForeground = wxColor("VIOLET"); - pLang->Styles[wxSTC_C_CHARACTER].colForeground = wxColor("VIOLET"); - pLang->Styles[wxSTC_C_UUID].colForeground = wxColor("BLUE"); - pLang->Styles[wxSTC_C_PREPROCESSOR].colForeground = wxColor("BLUE"); - pLang->Styles[wxSTC_C_STRINGEOL].colForeground = wxColor("VIOLET"); - pLang->Styles[wxSTC_C_REGEX].colForeground = wxColor("BLUE"); - pLang->Styles[wxSTC_C_COMMENTLINEDOC].colBackground = wxColor("GREEN"); - pLang->Styles[wxSTC_C_WORD2].colForeground = wxColor("BLUE"); - pLang->Styles[wxSTC_C_COMMENTDOCKEYWORD].colForeground = wxColor("FIREBRICK"); - pLang->Styles[wxSTC_C_COMMENTDOCKEYWORDERROR].colForeground = wxColor("RED"); - pLang->Styles[wxSTC_C_GLOBALCLASS].colForeground = wxColor("BLUE"); - /** Style des folds.*/ - pLang->iFolds = WXDC_STC_FOLD_COMMENT | WXDC_STC_FOLD_COMPACT | WXDC_STC_FOLD_PREPROC; - /** Lexemes.*/ - pLang->Keywords[0].strKeys = _T("asm auto bool break case catch char class const const_cast \ - continue default delete do double dynamic_cast else enum explicit \ - export extern false float for friend goto if inline int long \ - mutable namespace new operator private protected public register \ - reinterpret_cast return short signed sizeof static static_cast \ - struct switch template this throw true try typedef typeid \ - typename union unsigned using virtual void volatile wchar_t \ - while"); - pLang->Keywords[2].strKeys = _T("file class"); - pLang->Keywords[3].strKeys = _T("a addindex addtogroup anchor arg attention author b brief bug c \ - class code date def defgroup deprecated dontinclude e em endcode \ - endhtmlonly endif endlatexonly endlink endverbatim enum example \ - exception f$ f[ f] file fn hideinitializer htmlinclude \ - htmlonly if image include ingroup internal invariant interface \ - latexonly li line link mainpage name namespace nosubgrouping note \ - overload p page par param post pre ref relates remarks return \ - retval sa section see showinitializer since skip skipline struct \ - subsection test throw todo typedef union until var verbatim \ - verbinclude version warning weakgroup $ @ "" & < > # { }"); - for(int i=0; i<=20; i++) - pLang->Styles[i].bUsed = true; - pLang->Styles[0].strLabel = WXDC_SIMPLETEXT_C_DEFAULT; - pLang->Styles[1].strLabel = WXDC_SIMPLETEXT_C_COMMENT; - pLang->Styles[2].strLabel = WXDC_SIMPLETEXT_C_COMMENTLINE; - pLang->Styles[3].strLabel = WXDC_SIMPLETEXT_C_COMMENTDOC; - pLang->Styles[4].strLabel = WXDC_SIMPLETEXT_C_NUMBER; - pLang->Styles[6].strLabel = WXDC_SIMPLETEXT_C_WORD; - pLang->Styles[7].strLabel = WXDC_SIMPLETEXT_C_STRING; - pLang->Styles[8].strLabel = WXDC_SIMPLETEXT_C_CHARACTER; - pLang->Styles[9].strLabel = WXDC_SIMPLETEXT_C_UUID; - pLang->Styles[10].strLabel = WXDC_SIMPLETEXT_C_PREPROC; - pLang->Styles[11].strLabel = WXDC_SIMPLETEXT_C_OPERATOR; - pLang->Styles[12].strLabel = WXDC_SIMPLETEXT_C_IDENTIFIER; - pLang->Styles[13].strLabel = WXDC_SIMPLETEXT_C_STRINGEOL; - pLang->Styles[14].strLabel = WXDC_SIMPLETEXT_C_NOTUSED; - pLang->Styles[15].strLabel = WXDC_SIMPLETEXT_C_REGEXP; - pLang->Styles[16].strLabel = WXDC_SIMPLETEXT_C_COMMENTLINEDOC; - pLang->Styles[17].strLabel = WXDC_SIMPLETEXT_C_WORD2; - pLang->Styles[18].strLabel = WXDC_SIMPLETEXT_C_COMMENTDOCKEYWORD; - pLang->Styles[19].strLabel = WXDC_SIMPLETEXT_C_COMMENTDOCKEYWORDERROR; - pLang->Styles[20].strLabel = WXDC_SIMPLETEXT_C_GLOBALCLASS; - - - /** Langage LUA. Basé sur la configuration donnée dans cpp.properties de SciTE.*/ - pLang = &g_LangagePropertyArray[wxSTC_LEX_LUA]; - /** Style.*/ - pLang->Styles[wxSTC_LUA_DEFAULT].colForeground = wxColor("BLACK"); - pLang->Styles[wxSTC_LUA_COMMENT].colForeground = wxColor("FOREST GREEN"); - pLang->Styles[wxSTC_LUA_COMMENTLINE].colForeground = wxColor("FOREST GREEN"); - pLang->Styles[wxSTC_LUA_COMMENTDOC].colForeground = wxColor("FOREST GREEN"); - pLang->Styles[wxSTC_LUA_NUMBER].colForeground = wxColor("VIOLET"); - pLang->Styles[wxSTC_LUA_WORD].colForeground = wxColor("BLUE"); - pLang->Styles[wxSTC_LUA_STRING].colForeground = wxColor("VIOLET"); - pLang->Styles[wxSTC_LUA_CHARACTER].colForeground = wxColor("VIOLET"); - pLang->Styles[wxSTC_LUA_LITERALSTRING].colForeground = wxColor("VIOLET"); - pLang->Styles[wxSTC_LUA_PREPROCESSOR].colForeground = wxColor("BLUE"); - pLang->Styles[wxSTC_LUA_OPERATOR].colForeground = wxColor("BLACK"); - pLang->Styles[wxSTC_LUA_IDENTIFIER].colForeground = wxColor("BLACK"); - pLang->Styles[wxSTC_LUA_STRINGEOL].colForeground = wxColor("VIOLET"); - /** Style des folds.*/ - pLang->iFolds = WXDC_STC_FOLD_COMMENT | WXDC_STC_FOLD_COMPACT | WXDC_STC_FOLD_PREPROC; - /** Lexemes.*/ - pLang->Keywords[0].strKeys = _T("and break do else elseif end false for function if \ - in local nil not or repeat return then true until while"); - pLang->Keywords[1].strKeys = _T("_VERSION assert collectgarbage dofile error gcinfo loadfile loadstring \ - print tonumber tostring type unpack \ - _ALERT _ERRORMESSAGE _INPUT _PROMPT _OUTPUT \ - _STDERR _STDIN _STDOUT call dostring foreach foreachi getn globals newtype \ - rawget rawset require sort tinsert tremove\ - _G getfenv getmetatable ipairs loadlib next pairs pcall \ - rawegal rawget rawset require setfenv setmetatable xpcall \ - string table math coroutine io os debug"); - pLang->Keywords[2].strKeys = _T("abs acos asin atan atan2 ceil cos deg exp \ - floor format frexp gsub ldexp log log10 max min mod rad random randomseed \ - sin sqrt strbyte strchar strfind strlen strlower strrep strsub strupper tan\ - string.byte string.char string.dump string.find string.len \ - string.lower string.rep string.sub string.upper string.format string.gfind string.gsub \ - table.concat table.foreach table.foreachi table.getn table.sort table.insert table.remove table.setn \ - math.abs math.acos math.asin math.atan math.atan2 math.ceil math.cos math.deg math.exp \ - math.floor math.frexp math.ldexp math.log math.log10 math.max math.min math.mod \ - math.pi math.rad math.random math.randomseed math.sin math.sqrt math.tan"); - pLang->Keywords[3].strKeys = _T("openfile closefile readfrom writeto appendto \ - remove rename flush seek tmpfile tmpname read write \ - clock date difftime execute exit getenv setlocale time \ - coroutine.create coroutine.resume coroutine.status \ - coroutine.wrap coroutine.yield \ - io.close io.flush io.input io.lines io.open io.output io.read io.tmpfile io.type io.write \ - io.stdin io.stdout io.stderr \ - os.clock os.date os.difftime os.execute os.exit os.getenv os.remove os.rename \ - os.setlocale os.time os.tmpname"); - for(int i=0; i<=13; i++) - pLang->Styles[i].bUsed = true; - pLang->Styles[0].strLabel = WXDC_SIMPLETEXT_LUA_DEFAULT; - pLang->Styles[1].strLabel = WXDC_SIMPLETEXT_LUA_COMMENT; - pLang->Styles[2].strLabel = WXDC_SIMPLETEXT_LUA_COMMENTLINE; - pLang->Styles[3].strLabel = WXDC_SIMPLETEXT_LUA_COMMENTDOC; - pLang->Styles[4].strLabel = WXDC_SIMPLETEXT_LUA_NUMBER; - pLang->Styles[6].strLabel = WXDC_SIMPLETEXT_LUA_WORD; - pLang->Styles[7].strLabel = WXDC_SIMPLETEXT_LUA_STRING; - pLang->Styles[8].strLabel = WXDC_SIMPLETEXT_LUA_CHARACTER; - pLang->Styles[9].strLabel = WXDC_SIMPLETEXT_LUA_LITERALSTRING; - pLang->Styles[10].strLabel = WXDC_SIMPLETEXT_LUA_PREPROCESSOR; - pLang->Styles[11].strLabel = WXDC_SIMPLETEXT_LUA_OPERATOR; - pLang->Styles[12].strLabel = WXDC_SIMPLETEXT_LUA_IDENTIFIER; - pLang->Styles[13].strLabel = WXDC_SIMPLETEXT_LUA_STRINGEOL; - } - - void QueryPreferences() { --- 256,259 ---- *************** *** 660,665 **** { m_pLanguage->Clear(); ! for(int i=0; i<WXDC_NB_LEX; i++) ! m_pLanguage->Append(g_LangagePropertyArray[i].strName); if(!m_pLanguage->IsEmpty()) m_pLanguage->SetSelection(0); --- 379,384 ---- { m_pLanguage->Clear(); ! for(int i=1; i<WXDC_NB_LEX; i++) ! m_pLanguage->Append(g_LangagePropertyArray[i].strName, (void*)i); if(!m_pLanguage->IsEmpty()) m_pLanguage->SetSelection(0); *************** *** 700,704 **** (pCurStyle->iFontStyle&WXDC_STC_STYLE_BOLD)?wxBOLD:wxNORMAL, (pCurStyle->iFontStyle&WXDC_STC_STYLE_UNDERL)!=0); ! m_pCheckBold->SetValue((pCurStyle->iFontStyle&WXDC_STC_STYLE_BOLD)!=0); m_pCheckItalic->SetValue((pCurStyle->iFontStyle&WXDC_STC_STYLE_ITALIC)!=0); --- 419,425 ---- (pCurStyle->iFontStyle&WXDC_STC_STYLE_BOLD)?wxBOLD:wxNORMAL, (pCurStyle->iFontStyle&WXDC_STC_STYLE_UNDERL)!=0); ! ! m_pFontSize->SetValue(pCurStyle->iFontSize); ! m_pCheckBold->SetValue((pCurStyle->iFontStyle&WXDC_STC_STYLE_BOLD)!=0); m_pCheckItalic->SetValue((pCurStyle->iFontStyle&WXDC_STC_STYLE_ITALIC)!=0); *************** *** 740,745 **** LanguageProperty* SimpleTextPrefDialog::GetCurrentLanguage() { ! int iLang = m_pLanguage->GetSelection(); ! return (iLang!=wxNOT_FOUND)?&g_LangagePropertyArray[iLang]:NULL; } --- 461,467 ---- LanguageProperty* SimpleTextPrefDialog::GetCurrentLanguage() { ! if(m_pLanguage->GetSelection()==wxNOT_FOUND) ! return NULL; ! return &g_LangagePropertyArray[(long)m_pLanguage->GetClientData(m_pLanguage->GetSelection())]; } *************** *** 793,796 **** --- 515,521 ---- pCurStyle->colBackground = col; break; + case ID_FONTSIZE: + pCurStyle->iFontSize = m_pFontSize->GetValue(); + break; } *************** *** 1025,1029 **** m_aMenu.Append(pMenu, WXDC_MENU_FIND); pMenu = new wxMenu(); ! for(int i=0; i<WXDC_NB_LEX; i++) pMenu->AppendCheckItem(IDM_LANG_START + i, g_LangagePropertyArray[i].strName); m_aMenu.Append(pMenu, WXDC_MENU_LANGUAGE); --- 750,754 ---- m_aMenu.Append(pMenu, WXDC_MENU_FIND); pMenu = new wxMenu(); ! for(int i=1; i<WXDC_NB_LEX; i++) pMenu->AppendCheckItem(IDM_LANG_START + i, g_LangagePropertyArray[i].strName); m_aMenu.Append(pMenu, WXDC_MENU_LANGUAGE); |
Update of /cvsroot/wxdevcenter/wxDevCenter/conf/Text In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24897/conf/Text Modified Files: CPP.conf LUA.conf Added Files: .conf ADA.conf APDL.conf ASM.conf ASP.conf AU3.conf AVE.conf BAAM.conf BASH.conf Batch.conf Bullant.conf CLW no case.conf CLW.conf CPP no case.conf CSS.conf Config.conf Diff.conf ERLANG.conf ESCRIPT.conf Eiffel.conf EiffelKW.conf Error list.conf F77.conf FORTH.conf Fortran.conf GUI2CLI.conf HTML.conf KIX.conf LOT.conf LOUT.conf LaTeX.conf Lisp.conf MATLab.conf METAPOST.conf MMIXAL.conf MS-SQL.conf Makefile.conf NN Cron Table.conf NSIS.conf Octave.conf PHP.conf POV.conf PS.conf Pascal.conf Perl.conf Power Basic.conf Properties.conf Python.conf Ruby.conf SPECMAN.conf SQL.conf Scriptol.conf TCL.conf TeX.conf Text.conf Verilog.conf Visual Basic Script.conf Visual Basic.conf XCode.conf XML.conf YAML.conf Log Message: Suite du transfert de la conf des textes vers les fichiers .conf --- NEW FILE: FORTH.conf --- name=FORTH --- NEW FILE: TCL.conf --- name=TCL --- NEW FILE: TeX.conf --- name=TeX --- NEW FILE: MS-SQL.conf --- name=MS-SQL --- NEW FILE: Properties.conf --- name=Properties Index: LUA.conf =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/conf/Text/LUA.conf,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** LUA.conf 16 Feb 2005 15:10:04 -0000 1.1 --- LUA.conf 16 Feb 2005 17:45:48 -0000 1.2 *************** *** 4,17 **** [keywords00] keywords=and break do else elseif end false for function if in local nil not or repeat return then true until while ! keyname= [keywords01] keywords=_VERSION assert collectgarbage dofile error gcinfo loadfile loadstring print tonumber tostring type unpack _ALERT _ERRORMESSAGE _INPUT _PROMPT _OUTPUT _STDERR _STDIN _STDOUT call dostring foreach foreachi getn globals newtype rawget rawset require sort tinsert tremove _G getfenv getmetatable ipairs loadlib next pairs pcall rawegal rawget rawset require setfenv setmetatable xpcall string table math coroutine io os debug ! keyname= [keywords02] keywords=abs acos asin atan atan2 ceil cos deg exp floor format frexp gsub ldexp log log10 max min mod rad random randomseed sin sqrt strbyte strchar strfind strlen strlower strrep strsub strupper tan string.byte string.char string.dump string.find string.len string.lower string.rep string.sub string.upper string.format string.gfind string.gsub table.concat table.foreach table.foreachi table.getn table.sort table.insert table.remove table.setn math.abs math.acos math.asin math.atan math.atan2 math.ceil math.cos math.deg math.exp math.floor math.frexp math.ldexp math.log math.log10 math.max math.min math.mod math.pi math.rad math.random math.randomseed math.sin math.sqrt math.tan ! keyname= [keywords03] keywords=openfile closefile readfrom writeto appendto remove rename flush seek tmpfile tmpname read write clock date difftime execute exit getenv setlocale time coroutine.create coroutine.resume coroutine.status coroutine.wrap coroutine.yield io.close io.flush io.input io.lines io.open io.output io.read io.tmpfile io.type io.write io.stdin io.stdout io.stderr os.clock os.date os.difftime os.execute os.exit os.getenv os.remove os.rename os.setlocale os.time os.tmpname ! keyname= [keywords04] keywords= --- 4,17 ---- [keywords00] keywords=and break do else elseif end false for function if in local nil not or repeat return then true until while ! keyname=LUA language keywords [keywords01] keywords=_VERSION assert collectgarbage dofile error gcinfo loadfile loadstring print tonumber tostring type unpack _ALERT _ERRORMESSAGE _INPUT _PROMPT _OUTPUT _STDERR _STDIN _STDOUT call dostring foreach foreachi getn globals newtype rawget rawset require sort tinsert tremove _G getfenv getmetatable ipairs loadlib next pairs pcall rawegal rawget rawset require setfenv setmetatable xpcall string table math coroutine io os debug ! keyname=LUA debug keywords [keywords02] keywords=abs acos asin atan atan2 ceil cos deg exp floor format frexp gsub ldexp log log10 max min mod rad random randomseed sin sqrt strbyte strchar strfind strlen strlower strrep strsub strupper tan string.byte string.char string.dump string.find string.len string.lower string.rep string.sub string.upper string.format string.gfind string.gsub table.concat table.foreach table.foreachi table.getn table.sort table.insert table.remove table.setn math.abs math.acos math.asin math.atan math.atan2 math.ceil math.cos math.deg math.exp math.floor math.frexp math.ldexp math.log math.log10 math.max math.min math.mod math.pi math.rad math.random math.randomseed math.sin math.sqrt math.tan ! keyname=Mathematics keywords [keywords03] keywords=openfile closefile readfrom writeto appendto remove rename flush seek tmpfile tmpname read write clock date difftime execute exit getenv setlocale time coroutine.create coroutine.resume coroutine.status coroutine.wrap coroutine.yield io.close io.flush io.input io.lines io.open io.output io.read io.tmpfile io.type io.write io.stdin io.stdout io.stderr os.clock os.date os.difftime os.execute os.exit os.getenv os.remove os.rename os.setlocale os.time os.tmpname ! keyname=IO keywords [keywords04] keywords= *************** *** 33,70 **** --- 33,83 ---- used=1 style-label=Default + fore=BLACK [style01] used=1 style-label=Comment + fore=FOREST GREEN [style02] used=1 style-label=Line comment + fore=FOREST GREEN [style03] used=1 style-label=Doc comment + fore=FOREST GREEN [style04] used=1 style-label=Number + fore=VIOLET [style06] used=1 style-label=Word + fore=BLUE [style07] used=1 style-label=String + fore=VIOLET [style08] used=1 style-label=Character + fore=VIOLET [style09] used=1 style-label=Literal string + fore=VIOLET [style10] used=1 style-label=Preprocessor + fore=BLUE [style11] used=1 style-label=Operator + fore=BLACK [style12] used=1 style-label=Identifier + fore=BLACK [style13] used=1 style-label=End of line not closed string + fore=VIOLET --- NEW FILE: CSS.conf --- name=CSS Stylesheet --- NEW FILE: AU3.conf --- name=AU3 --- NEW FILE: SQL.conf --- name=SQL --- NEW FILE: XML.conf --- name=XML --- NEW FILE: NSIS.conf --- name=NSIS --- NEW FILE: Pascal.conf --- name=Pascal --- NEW FILE: CLW.conf --- name=CLW --- NEW FILE: Lisp.conf --- name=Lisp --- NEW FILE: EiffelKW.conf --- name=EiffelKW --- NEW FILE: Ruby.conf --- name=Ruby --- NEW FILE: LaTeX.conf --- name=LaTeX --- NEW FILE: MATLab.conf --- name=MATLab --- NEW FILE: APDL.conf --- name=APDL --- NEW FILE: BAAM.conf --- name=BAAM --- NEW FILE: ERLANG.conf --- name=ERLANG --- NEW FILE: Diff.conf --- name=Diff --- NEW FILE: CLW no case.conf --- name=CLW no case --- NEW FILE: Visual Basic.conf --- name=Visual Basic --- NEW FILE: ASP.conf --- name=ASP --- NEW FILE: BASH.conf --- name=BASH --- NEW FILE: Eiffel.conf --- name=Eiffel --- NEW FILE: METAPOST.conf --- name=METAPOST --- NEW FILE: SPECMAN.conf --- name=SPECMAN --- NEW FILE: F77.conf --- name=F77 --- NEW FILE: Makefile.conf --- name=Makefile --- NEW FILE: .conf --- name= --- NEW FILE: CPP no case.conf --- name=C++ no case --- NEW FILE: Verilog.conf --- name=Verilog --- NEW FILE: Visual Basic Script.conf --- name=Visual Basic Script Index: CPP.conf =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/conf/Text/CPP.conf,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CPP.conf 16 Feb 2005 15:10:03 -0000 1.1 --- CPP.conf 16 Feb 2005 17:45:48 -0000 1.2 *************** *** 36,63 **** --- 36,75 ---- used=1 style-label=Comment + fore=FOREST GREEN [style02] used=1 style-label=Line comment + fore=FOREST GREEN [style03] used=1 style-label=Doc comment + fore=FOREST GREEN [style04] used=1 style-label=Number + fore=VIOLET [style05] used=0 style-label=C/C++ key-word + fore=BLUE [style06] used=1 style-label=String + font-style=I + fore=VIOLET [style07] used=1 style-label=Character + font-style=I + fore=VIOLET [style08] used=1 style-label=UUID + fore=BLUE [style09] used=1 style-label=Preprocessor + font-style=B + fore=BLUE [style10] used=1 *************** *** 69,72 **** --- 81,85 ---- used=1 style-label=End of line not closed string + fore=VIOLET [style13] used=0 *************** *** 75,91 **** --- 88,110 ---- used=1 style-label=Regular expression + fore=BLUE [style15] used=1 style-label=Comment line doc + fore=GREEN [style16] used=1 style-label=C/C++ additionnal key-word + fore=BLUE [style17] used=1 style-label=Doxygen document + fore=FIREBRICK [style18] used=1 style-label=Doxygen document error + fore=RED [style19] used=1 style-label=Global class + fore=BLUE --- NEW FILE: Fortran.conf --- name=Fortran --- NEW FILE: Power Basic.conf --- name=Power Basic --- NEW FILE: Perl.conf --- name=Perl --- NEW FILE: YAML.conf --- name=YAML --- NEW FILE: Batch.conf --- name=Batch --- NEW FILE: ESCRIPT.conf --- name=ESCRIPT --- NEW FILE: Python.conf --- name=Python --- NEW FILE: NN Cron Table.conf --- name=NN Cron Table --- NEW FILE: Bullant.conf --- name=Bullant --- NEW FILE: AVE.conf --- name=AVE --- NEW FILE: Error list.conf --- name=Error list --- NEW FILE: PHP.conf --- name=PHP --- NEW FILE: HTML.conf --- name=HTML --- NEW FILE: GUI2CLI.conf --- name=GUI2CLI --- NEW FILE: Octave.conf --- name=Octave --- NEW FILE: POV.conf --- name=POV --- NEW FILE: ASM.conf --- name=ASM --- NEW FILE: LOUT.conf --- name=LOUT --- NEW FILE: ADA.conf --- name=ADA --- NEW FILE: Scriptol.conf --- name=Scriptol --- NEW FILE: LOT.conf --- name=LOT --- NEW FILE: KIX.conf --- name=KIX --- NEW FILE: Config.conf --- name=Config --- NEW FILE: PS.conf --- name=PS --- NEW FILE: XCode.conf --- name=XCode --- NEW FILE: Text.conf --- name=Text --- NEW FILE: MMIXAL.conf --- name=MMIXAL |