Menu
▾
▴
wxdevcenter-cvs — cvs/svn commits for wxDevCenter and StdPlugin
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-01-14 15:36:44
|
Update of /cvsroot/wxdevcenter/StdPlugin/include/wxDevCenter/StdPlugin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30821/include/wxDevCenter/StdPlugin Modified Files: SimpleTextDocView.h Log Message: Statistiques du texte et de la position courante dans le panneau dédié (vue) de la barre de status Index: SimpleTextDocView.h =================================================================== RCS file: /cvsroot/wxdevcenter/StdPlugin/include/wxDevCenter/StdPlugin/SimpleTextDocView.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** SimpleTextDocView.h 19 Dec 2004 17:01:29 -0000 1.2 --- SimpleTextDocView.h 14 Jan 2005 15:36:34 -0000 1.3 *************** *** 299,302 **** --- 299,306 ---- /** Intercepte les évènements liés à la boite de dialogue rechercher/remplacer.*/ void OnFindReplace(wxFindDialogEvent &event); + + + /** Interception de la notification de changement de texte.*/ + void OnNotifyTextChanged(wxStyledTextEvent& event); public: SimpleTextDocument* GetDocument(){return (SimpleTextDocument*)m_pDocument;} *************** *** 325,328 **** --- 329,337 ---- bool IsContentModified()const; + /** Met à jour le status de la vue. + * Met à jour les informations relatives à la vue comme la position du curseur en caractères + * ou la taille totale du texte.*/ + void UpdateStatus(); + SimpleTextView(); ~SimpleTextView(); |
|
From: Emilien K. <cur...@us...> - 2005-01-14 14:35:15
|
Update of /cvsroot/wxdevcenter/wxDevCenter/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16571/src Modified Files: MainFrame.cpp StatusBar.cpp View.cpp Log Message: Liaison de la barre de status pour refléter le status des vues Index: StatusBar.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/StatusBar.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** StatusBar.cpp 3 Dec 2004 16:47:46 -0000 1.1 --- StatusBar.cpp 14 Jan 2005 14:34:59 -0000 1.2 *************** *** 27,36 **** using namespace wxDevCenter; ! //BEGIN_EVENT_TABLE(wxDevCenter::StatusBar, wxStatusBar) ! // EVT_SIZE(MyStatusBar::OnSize) ! // EVT_CHECKBOX(StatusBar_Checkbox, MyStatusBar::OnToggleClock) ! // EVT_BUTTON(-1, MyStatusBar::OnButton) ! // EVT_TIMER(-1, MyStatusBar::OnTimer) ! //END_EVENT_TABLE() --- 27,33 ---- using namespace wxDevCenter; ! BEGIN_EVENT_TABLE(wxDevCenter::StatusBar, wxStatusBar) ! EVT_STATUS_PANEL(StatusBar::OnStatusEvent) ! END_EVENT_TABLE() *************** *** 47,50 **** --- 44,54 ---- + void StatusBar::OnStatusEvent(StatusEvent& event) + { + SetStatusText(event.GetValue(), event.GetPane()); + event.StopPropagation(); + } + + ////////////////////////////////////////////////////////////////////// Index: MainFrame.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/MainFrame.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** MainFrame.cpp 12 Jan 2005 17:41:12 -0000 1.3 --- MainFrame.cpp 14 Jan 2005 14:34:59 -0000 1.4 *************** *** 223,227 **** void MainFrame::OnStatusChange(StatusEvent& event) { ! GetStatusBar()->SetStatusText(event.GetValue(), event.GetPane()); } --- 223,227 ---- void MainFrame::OnStatusChange(StatusEvent& event) { ! GetStatusBar()->ProcessEvent(event); } Index: View.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/View.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** View.cpp 12 Jan 2005 13:50:55 -0000 1.2 --- View.cpp 14 Jan 2005 14:34:59 -0000 1.3 *************** *** 26,29 **** --- 26,31 ---- #include <wxDevCenter/DocView.h> + #include <wxDevCenter/StatusBar.h> + using namespace wxDevCenter; *************** *** 70,73 **** --- 72,83 ---- + // Fixe le texte du status de la vue. + void View::SetStatusText(wxString strText) + { + StatusEvent evt(StatusBar::ID_FIELD_VIEW, strText); + ProcessEvent(evt); + } + + ////////////////////////////////////////////////////////////////////// // Fonctions de gestion de base des vues |
|
From: Emilien K. <cur...@us...> - 2005-01-14 14:35:08
|
Update of /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16571/include/wxDevCenter Modified Files: DocView.h MainFrame.h StatusBar.h Log Message: Liaison de la barre de status pour refléter le status des vues Index: DocView.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/DocView.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** DocView.h 12 Jan 2005 13:50:54 -0000 1.3 --- DocView.h 14 Jan 2005 14:34:58 -0000 1.4 *************** *** 134,137 **** --- 134,140 ---- virtual ~View(void); + /** Fixe le texte du status de la vue.*/ + void SetStatusText(wxString strText); + /** Attache la vue à une cadre.*/ void SetFrame(ViewFrame *pFrame); Index: MainFrame.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/MainFrame.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MainFrame.h 3 Dec 2004 16:47:44 -0000 1.1 --- MainFrame.h 14 Jan 2005 14:34:58 -0000 1.2 *************** *** 93,96 **** --- 93,98 ---- void OnStatusChange(StatusEvent& event); + + // Fonctions de retour des menus protected: Index: StatusBar.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/StatusBar.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** StatusBar.h 3 Dec 2004 16:47:44 -0000 1.1 --- StatusBar.h 14 Jan 2005 14:34:58 -0000 1.2 *************** *** 32,54 **** { class StatusBar : public wxStatusBar { ! friend class MainFrame; // Seule la fenêtre principale à acces à la barre de status ! protected: StatusBar(wxWindow* parent); virtual ~StatusBar(void); - public: // Identifiants des cases : enum StatusFieldID { ! ID_FIELD_TEXT = 0, ! ID_FIELD_EXTEND_INFO, ! ID_FIELD_CONTROL, ! ID_FIELD_PROJECT, ! ID_FIELD_STATUS }; }; --- 32,55 ---- { + class StatusEvent; class StatusBar : public wxStatusBar { ! DECLARE_EVENT_TABLE() ! public: StatusBar(wxWindow* parent); virtual ~StatusBar(void); // Identifiants des cases : enum StatusFieldID { ! ID_FIELD_TEXT = 0, ! ID_FIELD_VIEW = 1, ! ID_FIELD_PROJECT = 2, ! ID_FIELD_STATUS = 3 }; + protected: + void OnStatusEvent(StatusEvent& event); }; |
|
From: Emilien K. <cur...@us...> - 2005-01-13 16:09:51
|
Update of /cvsroot/wxdevcenter/wxDevCenter/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27969/src Modified Files: FileSystemStandard.cpp Log Message: Encore un truc du FS unix Index: FileSystemStandard.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/FileSystemStandard.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** FileSystemStandard.cpp 13 Jan 2005 16:00:45 -0000 1.7 --- FileSystemStandard.cpp 13 Jan 2005 16:09:39 -0000 1.8 *************** *** 400,405 **** m_iFindFlags = iFlags; ! if(!m_Dir.Open(strPath)) return ""; m_Dir.GetFirst(&str, wxEmptyString, m_iFindFlags); --- 400,409 ---- m_iFindFlags = iFlags; + strPath.RemoveProtocol(); + str = strPath; + if(str.IsEmpty()) + str = wxT("/"); ! if(!m_Dir.Open(str)) return ""; m_Dir.GetFirst(&str, wxEmptyString, m_iFindFlags); |
|
From: Emilien K. <cur...@us...> - 2005-01-13 16:00:59
|
Update of /cvsroot/wxdevcenter/wxDevCenter/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25781/src Modified Files: FileSystemStandard.cpp Log Message: Racine du FS unix Index: FileSystemStandard.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/FileSystemStandard.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** FileSystemStandard.cpp 3 Jan 2005 18:09:46 -0000 1.6 --- FileSystemStandard.cpp 13 Jan 2005 16:00:45 -0000 1.7 *************** *** 424,428 **** bool FileSystemStandardUnix::IsDirectory(FilePath strPath) { ! if(strPath=="/") return true; else --- 424,428 ---- bool FileSystemStandardUnix::IsDirectory(FilePath strPath) { ! if(strPath=="") return true; else *************** *** 432,445 **** int FileSystemStandardUnix::GetDirectorySystemType(FilePath strPath) { - if(strPath.Last()=='/') - strPath.RemoveLast(); - if(strPath.IsEmpty()) return WXDC_FS_DIRTYPE_MOUNT; ! else if(strPath=="/mnt") return WXDC_FS_DIRTYPE_MOUNT; ! else if(strPath=="/home") return WXDC_FS_DIRTYPE_HOME; ! else if(strPath.GetFileDir()=="/home") return WXDC_FS_DIRTYPE_DOC; else --- 432,442 ---- int FileSystemStandardUnix::GetDirectorySystemType(FilePath strPath) { if(strPath.IsEmpty()) return WXDC_FS_DIRTYPE_MOUNT; ! else if(strPath=="file:/mnt") return WXDC_FS_DIRTYPE_MOUNT; ! else if(strPath=="file:/home") return WXDC_FS_DIRTYPE_HOME; ! else if(strPath.GetFileDir()=="file:/home") return WXDC_FS_DIRTYPE_DOC; else |
|
From: Emilien K. <cur...@us...> - 2005-01-13 16:00:58
|
Update of /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25781/include/wxDevCenter Modified Files: FileSystemStandard.h Log Message: Racine du FS unix Index: FileSystemStandard.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/FileSystemStandard.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** FileSystemStandard.h 3 Jan 2005 18:00:46 -0000 1.5 --- FileSystemStandard.h 13 Jan 2005 16:00:44 -0000 1.6 *************** *** 124,128 **** FileSystemStandardUnix(); wxString GetRoot()const{return wxT("/");} ! FilePath GetRootPath()const{return wxT("file:/");} wxString FindFirst(FilePath strPath, int iFlags); wxString FindNext(); --- 124,128 ---- FileSystemStandardUnix(); wxString GetRoot()const{return wxT("/");} ! FilePath GetRootPath()const{return wxT("file:");} wxString FindFirst(FilePath strPath, int iFlags); wxString FindNext(); |
|
From: Emilien K. <cur...@us...> - 2005-01-13 14:52:31
|
Update of /cvsroot/wxdevcenter/StdPlugin/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12321/src Modified Files: extmouse.cpp Log Message: Fix d'un pb de "const...&" sous nunux Index: extmouse.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/StdPlugin/src/extmouse.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** extmouse.cpp 4 Jan 2005 16:53:05 -0000 1.4 --- extmouse.cpp 13 Jan 2005 14:52:21 -0000 1.5 *************** *** 247,251 **** } ! wxExtendedMouseEvent::wxExtendedMouseEvent(wxExtendedMouseEvent& event): wxCommandEvent(event.GetEventType(), event.GetId()), m_pt1(event.GetFromPos()), --- 247,251 ---- } ! wxExtendedMouseEvent::wxExtendedMouseEvent(const wxExtendedMouseEvent& event): wxCommandEvent(event.GetEventType(), event.GetId()), m_pt1(event.GetFromPos()), *************** *** 265,269 **** } - wxEvent* wxExtendedMouseEvent::Clone(void) const { --- 265,268 ---- |
|
From: Emilien K. <cur...@us...> - 2005-01-13 14:52:31
|
Update of /cvsroot/wxdevcenter/StdPlugin/include/wxDevCenter/StdPlugin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12321/include/wxDevCenter/StdPlugin Modified Files: extmouse.h Log Message: Fix d'un pb de "const...&" sous nunux Index: extmouse.h =================================================================== RCS file: /cvsroot/wxdevcenter/StdPlugin/include/wxDevCenter/StdPlugin/extmouse.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** extmouse.h 7 Jan 2005 17:41:43 -0000 1.5 --- extmouse.h 13 Jan 2005 14:52:21 -0000 1.6 *************** *** 127,131 **** public: wxExtendedMouseEvent(wxEventType commandType = wxEVT_NULL, wxWindowID id=-1, wxPoint ptFrom = wxDefaultPosition, wxPoint ptTo = wxDefaultPosition, unsigned short usFlags = 0); ! wxExtendedMouseEvent(wxExtendedMouseEvent& event); wxExtendedMouseEvent& operator=(const wxExtendedMouseEvent& event); wxEvent* Clone(void) const; --- 127,131 ---- public: wxExtendedMouseEvent(wxEventType commandType = wxEVT_NULL, wxWindowID id=-1, wxPoint ptFrom = wxDefaultPosition, wxPoint ptTo = wxDefaultPosition, unsigned short usFlags = 0); ! wxExtendedMouseEvent(const wxExtendedMouseEvent& event); wxExtendedMouseEvent& operator=(const wxExtendedMouseEvent& event); wxEvent* Clone(void) const; |
|
From: Emilien K. <cur...@us...> - 2005-01-13 14:47:20
|
Update of /cvsroot/wxdevcenter/StdPlugin/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11294/src Modified Files: BitmapDocView.cpp Log Message: Suppression de l'inclusion de <wx/recguard.h> Index: BitmapDocView.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/StdPlugin/src/BitmapDocView.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** BitmapDocView.cpp 11 Jan 2005 13:45:55 -0000 1.9 --- BitmapDocView.cpp 13 Jan 2005 14:47:10 -0000 1.10 *************** *** 14,18 **** #include <wx/dcmemory.h> #include <wx/toolbar.h> - #include <wx/recguard.h> using namespace wxDevCenter; --- 14,17 ---- *************** *** 573,578 **** } - - // Création de la barre de pinceau. wxPanel* BitmapView::CreatePenBar() --- 572,575 ---- |
|
From: Emilien K. <cur...@us...> - 2005-01-13 14:33:32
|
Update of /cvsroot/wxdevcenter/StdPlugin/include/wxDevCenter/StdPlugin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8534/include/wxDevCenter/StdPlugin Modified Files: Controls.h Log Message: Suppression du wxToggleBitmapButton car non utilisé et existe déjà sous GTK (d'où conflit) Index: Controls.h =================================================================== RCS file: /cvsroot/wxdevcenter/StdPlugin/include/wxDevCenter/StdPlugin/Controls.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Controls.h 7 Jan 2005 17:41:43 -0000 1.5 --- Controls.h 13 Jan 2005 14:33:19 -0000 1.6 *************** *** 72,95 **** }; - - - /** - * Controle de bouton pressoir à bitmap. - * Semblalbe à wxToggleButton mais avec une bitmap. - */ - class wxToggleBitmapButton : public wxStaticBitmap - { - DECLARE_EVENT_TABLE() - private: - bool m_bIsToggle; - public: - wxToggleBitmapButton(wxWindow* parent, wxWindowID id, const wxBitmap& label, const wxPoint& pos=wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0); - - bool GetValue() const{return m_bIsToggle;} - void SetValue(bool bToggle); - - protected: - void OnMouseLeftUp(wxMouseEvent& event); - }; - #endif --- 72,74 ---- |
|
From: Emilien K. <cur...@us...> - 2005-01-13 14:33:32
|
Update of /cvsroot/wxdevcenter/StdPlugin/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8534/src Modified Files: Controls.cpp Log Message: Suppression du wxToggleBitmapButton car non utilisé et existe déjà sous GTK (d'où conflit) Index: Controls.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/StdPlugin/src/Controls.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Controls.cpp 7 Jan 2005 17:41:44 -0000 1.5 --- Controls.cpp 13 Jan 2005 14:33:20 -0000 1.6 *************** *** 186,231 **** } - - /** - * Implémentation de la classe wxToggleBitmapButton - */ - - wxToggleBitmapButton::wxToggleBitmapButton(wxWindow* parent, wxWindowID id, const wxBitmap& label, const wxPoint& pos, const wxSize& size, long style): - wxStaticBitmap(parent, id, label, pos, size, style), - m_bIsToggle(false) - { - SetValue(true); - } - - BEGIN_EVENT_TABLE(wxToggleBitmapButton, wxControl) - EVT_LEFT_UP(wxToggleBitmapButton::OnMouseLeftUp) - END_EVENT_TABLE() - - - void wxToggleBitmapButton::SetValue(bool bToggle) - { - - wxLogDebug("wxToggleBitmapButton::SetValue %s", bToggle?"true":"false"); - - m_bIsToggle = bToggle; - - long style = GetWindowStyle(); - style &= ~wxBORDER_MASK; - - if(m_bIsToggle) - style |= wxRAISED_BORDER; - else - style |= wxSUNKEN_BORDER; - - SetWindowStyleFlag(style); - Refresh(); - } - - - void wxToggleBitmapButton::OnMouseLeftUp(wxMouseEvent& WXUNUSED(event)) - { - SetValue(!GetValue()); - wxCommandEvent evt(wxEVT_COMMAND_TOGGLEBUTTON_CLICKED, GetId()); - ProcessEvent(evt); - } - --- 186,187 ---- |
|
From: Emilien K. <cur...@us...> - 2005-01-12 17:41:22
|
Update of /cvsroot/wxdevcenter/wxDevCenter/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16948/src Modified Files: MainFrame.cpp Log Message: Index: MainFrame.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/MainFrame.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MainFrame.cpp 12 Jan 2005 13:50:55 -0000 1.2 --- MainFrame.cpp 12 Jan 2005 17:41:12 -0000 1.3 *************** *** 359,364 **** } - - void MainFrame::OnUpdateProjectClose(wxUpdateUIEvent &event) { --- 359,362 ---- |
|
From: Emilien K. <cur...@us...> - 2005-01-12 17:40:36
|
Update of /cvsroot/wxdevcenter/wxDevCenter/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16747/src Modified Files: FileSystemCtrl.cpp Log Message: Modifs du FSTreeCtrl et de la FSDialog pour préselectionner le chemin et le fichier par défaut Index: FileSystemCtrl.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/FileSystemCtrl.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** FileSystemCtrl.cpp 12 Jan 2005 13:50:55 -0000 1.3 --- FileSystemCtrl.cpp 12 Jan 2005 17:40:25 -0000 1.4 *************** *** 147,172 **** wxTreeItemId FileSystemTreeCtrl::ExpandTo(FilePath strPath) { ! wxTreeItemId idParent = GetRootItem(), idChild; ! wxArrayString arStr; wxTreeItemIdValue cookie; ! if(strPath.Last()=='\\' || strPath.Last()=='/') ! strPath.RemoveLast(); ! ! FilePath strChildPath = ((FileSystemTreeItemData*) GetItemData(GetRootItem()))->GetPath(); ! while(strChildPath!=strPath) { ! idChild = GetFirstChild(idParent, cookie); ! while(idChild.IsOk()) { ! strChildPath = ((FileSystemTreeItemData*) GetItemData(idChild))->GetPath(); ! if(strPath.StartsWith(strChildPath)) { ! idParent = idChild; ! Expand(idParent); ! break; } - idChild = GetNextChild(idParent, cookie); } } --- 147,178 ---- wxTreeItemId FileSystemTreeCtrl::ExpandTo(FilePath strPath) { ! wxTreeItemId idParent, idChild; wxTreeItemIdValue cookie; ! FilePath strParentPath = strPath; ! strParentPath.RemoveFilename(); ! if(strPath == strParentPath) // Répertoire racine { ! idChild = GetRootItem(); ! SelectItem(idChild); ! } ! else ! { ! idParent = ExpandTo(strParentPath); ! if(idParent.IsOk()) { ! idChild = GetFirstChild(idParent, cookie); ! while(idChild.IsOk()) { ! FilePath strChildPath = ((FileSystemTreeItemData*) GetItemData(idChild))->GetPath(); ! if(strPath.StartsWith(strChildPath)) ! { ! RefreshContent(idChild); ! SelectItem(idChild); ! break; ! } ! idChild = GetNextChild(idParent, cookie); } } } *************** *** 177,216 **** void FileSystemTreeCtrl::OnTreeItemExpanding(wxTreeEvent &event) { ! FileSystemTreeItemData *pItemData; ! wxTreeItemId NewId, ItemId = event.GetItem(); ! FilePath FP; ! wxString str; ! ! DeleteChildren(ItemId); ! ! // Insertion des répertoires ! if(m_nMode&WXDC_FSTC_MODE_DIR) ! { ! str = ((FileSystemTreeItemData*)GetItemData(ItemId))->GetPath(); ! FP = m_pFileSystem->FindFirst( str, wxDIR_DIRS); ! while(FP!="") ! { ! str = m_pFileSystem->GetCurrentFilePath(); ! pItemData = new FileSystemTreeItemData(str, CalcItemType(str)); ! NewId = AppendItem(ItemId, FP, pItemData->GetType(), -1, pItemData); ! AppendItem(NewId, "..."); ! FP = m_pFileSystem->FindNext(); ! } ! } ! ! // Insertion des fichiers ! if(m_nMode&WXDC_FSTC_MODE_FILE) ! { ! str = ((FileSystemTreeItemData*)GetItemData(ItemId))->GetPath(); ! FP = m_pFileSystem->FindFirst( str, wxDIR_FILES); ! while(FP!="") ! { ! str = m_pFileSystem->GetCurrentFilePath(); ! pItemData = new FileSystemTreeItemData(str, CalcItemType(str)); ! NewId = AppendItem(ItemId, FP, pItemData->GetType(), -1, pItemData); ! FP = m_pFileSystem->FindNext(); ! } ! } ! event.Skip(); } --- 183,187 ---- void FileSystemTreeCtrl::OnTreeItemExpanding(wxTreeEvent &event) { ! RefreshContent(event.GetItem()); event.Skip(); } *************** *** 263,266 **** --- 234,278 ---- + // Rafraichi le contenu d'un répertoire. + void FileSystemTreeCtrl::RefreshContent(wxTreeItemId idItem) + { + FileSystemTreeItemData *pItemData; + wxTreeItemId NewId; + wxString FP; + wxString str; + + DeleteChildren(idItem); + + // Insertion des répertoires + if(m_nMode&WXDC_FSTC_MODE_DIR) + { + str = ((FileSystemTreeItemData*)GetItemData(idItem))->GetPath(); + FP = m_pFileSystem->FindFirst( str, wxDIR_DIRS); + while(FP!="") + { + str = m_pFileSystem->GetCurrentFilePath(); + pItemData = new FileSystemTreeItemData(str, CalcItemType(str)); + NewId = AppendItem(idItem, FP, pItemData->GetType(), -1, pItemData); + AppendItem(NewId, "..."); + FP = m_pFileSystem->FindNext(); + } + } + + // Insertion des fichiers + if(m_nMode&WXDC_FSTC_MODE_FILE) + { + str = ((FileSystemTreeItemData*)GetItemData(idItem))->GetPath(); + FP = m_pFileSystem->FindFirst( str, wxDIR_FILES); + while(FP!="") + { + str = m_pFileSystem->GetCurrentFilePath(); + pItemData = new FileSystemTreeItemData(str, CalcItemType(str)); + NewId = AppendItem(idItem, FP, pItemData->GetType(), -1, pItemData); + FP = m_pFileSystem->FindNext(); + } + } + } + + ////////////////////////////////////////////////////////////////////// // *************** *** 491,494 **** --- 503,507 ---- if(item.IsOk()) { + m_pTree->Expand(item); m_pTree->SelectItem(item); m_pList->ReOpen(strDir); *************** *** 511,516 **** { long item = m_pList->FindItem(-1, strFileName); ! if(item!=-1) ! m_pList->SetItemState(item, wxLIST_STATE_SELECTED, wxLIST_MASK_STATE); } } --- 524,529 ---- { long item = m_pList->FindItem(-1, strFileName); ! if(item!=wxNOT_FOUND) ! m_pList->SetItemState(item, wxLIST_STATE_SELECTED, wxLIST_MASK_STATE|wxLIST_STATE_SELECTED); } } *************** *** 638,646 **** /** Sélection du fichier ou du répertoire.*/ ! FilePath path(defaultFile); ! m_pFiles->SetValue(path.GetFileName()); ! if(path.GetFileDir().IsEmpty()) ! path = defaultDir; ! m_pPathActual->SetValue(path); } --- 651,658 ---- /** Sélection du fichier ou du répertoire.*/ ! m_strInitPath = defaultFile; ! m_strInitFileName = m_strInitPath.GetFileName(); ! if(m_strInitPath.GetFileDir().IsEmpty()) ! m_strInitPath = defaultDir; } *************** *** 653,657 **** void FileSystemDialog::OnInitDialog(wxInitDialogEvent& WXUNUSED(event)) { ! OpenDirectory(m_pPathActual->GetValue()); FileSystemPanel* pPanel = NULL; --- 665,669 ---- void FileSystemDialog::OnInitDialog(wxInitDialogEvent& WXUNUSED(event)) { ! OpenDirectory(m_strInitPath); FileSystemPanel* pPanel = NULL; *************** *** 661,665 **** if(pPanel!=NULL) ! pPanel->SelectFile(m_pFiles->GetValue()); } --- 673,677 ---- if(pPanel!=NULL) ! pPanel->SelectFile(m_strInitFileName); } *************** *** 675,678 **** --- 687,691 ---- m_pListbook->SetSelection(n); pPanel->OpenDirectory(strPath); + break; } } *************** *** 778,791 **** void FileSystemDialog::OnTreeItemSelected(wxTreeEvent& event) { - wxString strPath = wxT(""); - // Retourne le répertoire demandé int iPanelSel = m_pListbook->GetSelection(); FileSystemPanel* pPanel = iPanelSel!=-1?(FileSystemPanel*) m_pListbook->GetPage(iPanelSel):NULL; if(pPanel!=NULL) ! strPath = pPanel->GetCurrentDirectory(); // Fixe le chemin dans le controle. ! m_pPathActual->SetValue(strPath); event.Skip(); --- 791,802 ---- void FileSystemDialog::OnTreeItemSelected(wxTreeEvent& event) { // Retourne le répertoire demandé int iPanelSel = m_pListbook->GetSelection(); FileSystemPanel* pPanel = iPanelSel!=-1?(FileSystemPanel*) m_pListbook->GetPage(iPanelSel):NULL; if(pPanel!=NULL) ! m_strPath = pPanel->GetCurrentDirectory(); // Fixe le chemin dans le controle. ! m_pPathActual->SetValue(m_strPath); event.Skip(); *************** *** 795,800 **** void FileSystemDialog::OnListSelectionChange(wxListEvent& WXUNUSED(event)) { ! wxString strFiles = GetActualPanel()->GetSelectedFiles(); ! m_pFiles->SetValue(strFiles); } --- 806,811 ---- void FileSystemDialog::OnListSelectionChange(wxListEvent& WXUNUSED(event)) { ! m_strFileName = GetActualPanel()->GetSelectedFiles(); ! m_pFiles->SetValue(m_strFileName); } *************** *** 804,809 **** FileSystemPanel* pPanel = GetActualPanel(); if(pPanel!=NULL) ! // Fixe le chemin dans le controle. ! m_pPathActual->SetValue(pPanel->GetCurrentDirectory()); } --- 815,823 ---- FileSystemPanel* pPanel = GetActualPanel(); if(pPanel!=NULL) ! { ! // Fixe le chemin actuel ! m_strPath = pPanel->GetCurrentDirectory(); ! m_pPathActual->SetValue(m_strPath); ! } } |
|
From: Emilien K. <cur...@us...> - 2005-01-12 17:40:36
|
Update of /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16747/include/wxDevCenter Modified Files: FileSystemCtrl.h Log Message: Modifs du FSTreeCtrl et de la FSDialog pour préselectionner le chemin et le fichier par défaut Index: FileSystemCtrl.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/FileSystemCtrl.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FileSystemCtrl.h 12 Jan 2005 13:50:54 -0000 1.2 --- FileSystemCtrl.h 12 Jan 2005 17:40:24 -0000 1.3 *************** *** 160,163 **** --- 160,166 ---- */ long CalcItemType(FilePath path); + + /** Rafraichi le contenu d'un répertoire.*/ + void RefreshContent(wxTreeItemId idItem); }; *************** *** 366,369 **** --- 369,384 ---- wxButton* m_pActivate; + + /** Chemin initial.*/ + FilePath m_strInitPath; + /** Nom du fichier initial.*/ + wxString m_strInitFileName; + + + /** Chemin actuel.*/ + FilePath m_strPath; + /** Nom du fichier courant.*/ + wxString m_strFileName; + public: /** Constructeur classique des FileDialog. |
|
From: Emilien K. <cur...@us...> - 2005-01-12 17:35:15
|
Update of /cvsroot/wxdevcenter/wxDevCenter/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15509/src Modified Files: Application.cpp Log Message: Chemins par défaut de la boite de dialogue des fichiers Index: Application.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/Application.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Application.cpp 12 Jan 2005 13:50:55 -0000 1.5 --- Application.cpp 12 Jan 2005 17:35:05 -0000 1.6 *************** *** 291,295 **** bool Application::OpenDocument() { ! FileSystemDialog FD(NULL, -1, &m_DocManager); FD.AttachFileSystems(&m_FileSystemManager); FD.SetWildcard(m_DocManager.GetAllWildcard()); --- 291,295 ---- bool Application::OpenDocument() { ! FileSystemDialog FD(NULL, -1, &m_DocManager, WXDC_DOCUMENT_REQUEST_OPEN, WXDC_SYSTEM_DEFAULT_PATH); FD.AttachFileSystems(&m_FileSystemManager); FD.SetWildcard(m_DocManager.GetAllWildcard()); *************** *** 315,319 **** if(path.IsEmpty() || bForceChooseName) // Sélection du fichier. { ! FileSystemDialog FD(NULL, -1, &m_DocManager, "Save document", "", path); FD.AttachFileSystems(&m_FileSystemManager); FD.SetWildcard(pDoc->GetDocTemplate()->GetDocWildcard(true)); --- 315,319 ---- if(path.IsEmpty() || bForceChooseName) // Sélection du fichier. { ! FileSystemDialog FD(NULL, -1, &m_DocManager, WXDC_DOCUMENT_REQUEST_SAVE, WXDC_SYSTEM_DEFAULT_PATH, path); FD.AttachFileSystems(&m_FileSystemManager); FD.SetWildcard(pDoc->GetDocTemplate()->GetDocWildcard(true)); |
|
From: Emilien K. <cur...@us...> - 2005-01-12 17:35:14
|
Update of /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15509/include/wxDevCenter Modified Files: language.h Log Message: Chemins par défaut de la boite de dialogue des fichiers Index: language.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/language.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** language.h 12 Jan 2005 13:50:54 -0000 1.3 --- language.h 12 Jan 2005 17:35:05 -0000 1.4 *************** *** 66,74 **** #ifdef __WINDOWS__ ! #define WXDC_SYSTEM_STDFS_NAME wxT("Bureau") #elif defined __UNIX_LIKE__ ! #define WXDC_SYSTEM_STDFS_NAME wxT("/") #endif --- 66,78 ---- #ifdef __WINDOWS__ ! #define WXDC_SYSTEM_STDFS_NAME wxT("Bureau") ! #define WXDC_SYSTEM_DEFAULT_PATH wxT("file:Bureau") ! ! #elif defined __UNIX_LIKE__ ! #define WXDC_SYSTEM_STDFS_NAME wxT("/") ! #define WXDC_SYSTEM_DEFAULT_PATH wxT("file:/") #endif *************** *** 135,138 **** --- 139,143 ---- #define WXDC_DOCUMENT_REQUEST_OPEN "Open document" + #define WXDC_DOCUMENT_REQUEST_SAVE "Save document" #define WXDC_DOCUMENT_REQUEST_NEW "New document" #define WXDC_DOCUMENT_REQUEST_TYPE "Choose a document type :" *************** *** 153,156 **** --- 158,162 ---- + ////////////////////////////////////////////////////////////////////// // Messages d'erreurs |
|
From: Emilien K. <cur...@us...> - 2005-01-12 17:29:10
|
Update of /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14096/include/wxDevCenter Modified Files: FileTools.h Log Message: Encore des fonctions de manipulation Index: FileTools.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/FileTools.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FileTools.h 12 Jan 2005 15:11:53 -0000 1.2 --- FileTools.h 12 Jan 2005 17:28:47 -0000 1.3 *************** *** 27,30 **** --- 27,32 ---- #define __WXDEVCENTER_FILETOOLS + class wxArrayString; + namespace wxDevCenter { *************** *** 74,79 **** ! /** Modifie tous les anti-slashes en slashes.*/ ! void ValidateSlashes(){Replace("\\", "/");} /** Teste si le chemin à un protocole et en ajoute un sinon.*/ void ValidateProtocol(wxString strProtocol=wxT("files")){if(!HasProtocol())SetProtocol(strProtocol);} --- 76,101 ---- ! /** Supprime le dernier nom de fichier(ou de répertoire) si existant. ! * Est équivalent à remonter d'un niveau dans l'arborescence si n'est pas à la racine. ! * @return Nom du fichier enlevé. ! */ ! wxString RemoveFilename(); ! /** Retourne le nombre de niveau d'arborescence. ! * @param pFilenameArray Tableau des niveaux d'arborescence (de la racine à la feuille). Non rempli si NULL. ! * @retun Nombre de niveaux d'arborescences. ! */ ! unsigned int GetDirLevel(wxArrayString* pFilenameArray = NULL)const; ! ! ! ! /** Modifie tous les anti-slashes en slashes et supprime le slash terminal si présent.*/ ! void ValidateSlashes() ! { ! if(Find(wxT('\\'))!=wxNOT_FOUND) ! Replace("\\", "/"); ! if(Last()==wxT('/')) ! RemoveLast(); ! } ! /** Teste si le chemin à un protocole et en ajoute un sinon.*/ void ValidateProtocol(wxString strProtocol=wxT("files")){if(!HasProtocol())SetProtocol(strProtocol);} |
|
From: Emilien K. <cur...@us...> - 2005-01-12 17:29:09
|
Update of /cvsroot/wxdevcenter/wxDevCenter/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14096/src Modified Files: FileTools.cpp Log Message: Encore des fonctions de manipulation Index: FileTools.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/FileTools.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FileTools.cpp 12 Jan 2005 15:11:54 -0000 1.2 --- FileTools.cpp 12 Jan 2005 17:28:58 -0000 1.3 *************** *** 25,28 **** --- 25,30 ---- #include <wxDevCenter/FileTools.h> + #include <wx/tokenzr.h> + using namespace wxDevCenter; *************** *** 159,160 **** --- 161,199 ---- } + // Supprime le dernier nom de fichier(ou de répertoire) si existant. + wxString FilePath::RemoveFilename() + { + wxString str; + + int i = Find(wxT('/'), true); + + if(i==wxNOT_FOUND) + { + str = GetFilePath(); + *this = GetFileProtocol() + wxT(":"); + } + else + { + str = Mid(i+1); + *this = Left(i); + } + return str; + } + + // Retourne le nombre de niveau d'arborescence. + unsigned int FilePath::GetDirLevel(wxArrayString* pFilenameArray)const + { + FilePath path = *this; + path.RemoveProtocol(); + unsigned int n = path.Freq(wxT('/')); + + if(pFilenameArray!=NULL) + { + wxStringTokenizer ST(path, wxT("/"), wxTOKEN_RET_EMPTY_ALL); + while(ST.HasMoreTokens()) + pFilenameArray->Add(ST.GetNextToken()); + } + return n+1; + } + + |
|
From: Emilien K. <cur...@us...> - 2005-01-12 15:12:07
|
Update of /cvsroot/wxdevcenter/wxDevCenter/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14819/src Modified Files: FileTools.cpp Log Message: Ajout des validations sur les chemins (protocoles et slashes). Index: FileTools.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/FileTools.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FileTools.cpp 3 Dec 2004 16:47:45 -0000 1.1 --- FileTools.cpp 12 Jan 2005 15:11:54 -0000 1.2 *************** *** 39,42 **** --- 39,43 ---- wxString(str) { + Validate(); } *************** *** 44,47 **** --- 45,49 ---- wxString(str) { + Validate(); } *************** *** 49,52 **** --- 51,55 ---- wxString(psz, nLength) { + Validate(); } *************** *** 54,57 **** --- 57,61 ---- wxString(psz, nLength) { + Validate(); } *************** *** 59,62 **** --- 63,67 ---- wxString(psz) { + Validate(); } |
|
From: Emilien K. <cur...@us...> - 2005-01-12 15:12:06
|
Update of /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14819/include/wxDevCenter Modified Files: FileTools.h Log Message: Ajout des validations sur les chemins (protocoles et slashes). Index: FileTools.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/FileTools.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FileTools.h 3 Dec 2004 16:47:44 -0000 1.1 --- FileTools.h 12 Jan 2005 15:11:53 -0000 1.2 *************** *** 72,75 **** --- 72,86 ---- */ void SetProtocol(wxString strProtocol); + + + /** Modifie tous les anti-slashes en slashes.*/ + void ValidateSlashes(){Replace("\\", "/");} + /** Teste si le chemin à un protocole et en ajoute un sinon.*/ + void ValidateProtocol(wxString strProtocol=wxT("files")){if(!HasProtocol())SetProtocol(strProtocol);} + + /** Valide le chemin. + * Effectue toute les opérations pour rendre le chemin entièrement valide. + */ + void Validate(){ValidateProtocol(); ValidateSlashes();} }; |
|
From: Emilien K. <cur...@us...> - 2005-01-12 13:51:36
|
Update of /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26046/include/wxDevCenter Modified Files: DocManager.h DocView.h FileSystemCtrl.h Frame.h MDIFrame.h language.h setup.h Log Message: Index: FileSystemCtrl.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/FileSystemCtrl.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FileSystemCtrl.h 3 Dec 2004 16:47:44 -0000 1.1 --- FileSystemCtrl.h 12 Jan 2005 13:50:54 -0000 1.2 *************** *** 406,409 **** --- 406,413 ---- * @param files Tableau des fichiers à remplir.*/ void GetSelectedFileList(wxArrayString& files); + + /** Navigue vers un répertoire. + * @param strPath Chemin vers le répertoire.*/ + void OpenDirectory(FilePath strPath); protected: /** Fixe le nom du bouton d'activation.*/ Index: DocView.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/DocView.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** DocView.h 7 Dec 2004 13:36:26 -0000 1.2 --- DocView.h 12 Jan 2005 13:50:54 -0000 1.3 *************** *** 108,112 **** ViewAssociation *m_pViewAssociation; ! /** Interception des évènements menus. Ne fais rien sur l'interception des évènements menus pour éviter le "bouclage" de l'évènement.*/ void OnMenu(wxCommandEvent& event); /** Interception des évènements de mise à jour des menus.*/ --- 108,114 ---- ViewAssociation *m_pViewAssociation; ! /** Interception des évènements menus. ! * Ne fais rien sur l'interception des évènements menus pour éviter le "bouclage" de l'évènement. ! */ void OnMenu(wxCommandEvent& event); /** Interception des évènements de mise à jour des menus.*/ *************** *** 124,127 **** --- 126,132 ---- virtual void RemoveMenu(wxMenuBar* pMenuBar, int iInsert); + /** Appelé par le document en cas de changement de chemin/nom. + */ + virtual void OnChangeFilename(); public: /** Constructeur. Constructeur standard sans passage de paramètre de construction spécifique.*/ *************** *** 198,201 **** --- 203,208 ---- bool GetModifiedFlag()const; + /** Fixe le chemin du document.*/ + void SetDocumentPath(FilePath strPath); /** Fixe le nom du document.*/ void SetDocumentName(wxString strName); Index: setup.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/setup.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** setup.h 3 Dec 2004 16:47:44 -0000 1.1 --- setup.h 12 Jan 2005 13:50:54 -0000 1.2 *************** *** 57,60 **** --- 57,61 ---- #pragma comment(lib, "wxmsw25d_stc.lib") + #pragma comment(lib, "wxmsw25d_fl.lib") #else *************** *** 73,76 **** --- 74,78 ---- #pragma comment(lib, "wxmsw25_stc.lib") + #pragma comment(lib, "wxmsw25_fl.lib") #endif Index: Frame.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/Frame.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Frame.h 3 Dec 2004 16:47:44 -0000 1.1 --- Frame.h 12 Jan 2005 13:50:54 -0000 1.2 *************** *** 166,169 **** --- 166,171 ---- virtual void ScrollToView(View *pView)=0; ViewFrame(TopFrame *pTopFrame); + + virtual void SetLabel(View *pView, wxString strLabel)=0; }; Index: MDIFrame.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/MDIFrame.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MDIFrame.h 3 Dec 2004 16:47:44 -0000 1.1 --- MDIFrame.h 12 Jan 2005 13:50:54 -0000 1.2 *************** *** 58,61 **** --- 58,63 ---- unsigned int GetViewCount(void); + virtual void SetLabel(View *pView, wxString strLabel); + // Actions sur les vues. void ScrollToView(View *pView); Index: DocManager.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/DocManager.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** DocManager.h 3 Jan 2005 14:56:14 -0000 1.3 --- DocManager.h 12 Jan 2005 13:50:54 -0000 1.4 *************** *** 178,181 **** --- 178,183 ---- /** @name Lecture des données du DocTemplate. * @{*/ + /** Identifiant du type de document.*/ + unsigned int GetDocType()const{return m_nID;} /** Nom du type de document.*/ wxString GetName()const{return m_strDocName;} Index: language.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/language.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** language.h 3 Dec 2004 17:27:28 -0000 1.2 --- language.h 12 Jan 2005 13:50:54 -0000 1.3 *************** *** 143,147 **** #define WXDC_DOCUMENT_STATUS_LOADED "%s loaded." // %s : Document path ! #define WXDC_DOCUMENT_STATUS_SAVED "%s loaded." // %s : Document path --- 143,147 ---- #define WXDC_DOCUMENT_STATUS_LOADED "%s loaded." // %s : Document path ! #define WXDC_DOCUMENT_STATUS_SAVED "%s saved." // %s : Document path |
|
From: Emilien K. <cur...@us...> - 2005-01-12 13:51:07
|
Update of /cvsroot/wxdevcenter/wxDevCenter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26046 Modified Files: wxDevCenter.nsi Log Message: Index: wxDevCenter.nsi =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/wxDevCenter.nsi,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** wxDevCenter.nsi 19 Dec 2004 21:19:33 -0000 1.1 --- wxDevCenter.nsi 12 Jan 2005 13:50:55 -0000 1.2 *************** *** 3,7 **** ; HM NIS Edit Wizard helper defines !define PRODUCT_NAME "wxDevCenter" ! !define PRODUCT_VERSION "0.1.0a" !define PRODUCT_PUBLISHER "Arcallians" !define PRODUCT_WEB_SITE "http://wxdevcenter.arcallians.org" --- 3,7 ---- ; HM NIS Edit Wizard helper defines !define PRODUCT_NAME "wxDevCenter" ! !define PRODUCT_VERSION "0.1.1 (alpha)" !define PRODUCT_PUBLISHER "Arcallians" !define PRODUCT_WEB_SITE "http://wxdevcenter.arcallians.org" *************** *** 82,86 **** File "data\icons\dir.ico" File "data\icons\docs.ico" - File "data\icons\EditOrx.ico" File "data\icons\floppy.ico" File "data\icons\harddrive.ico" --- 82,85 ---- *************** *** 90,93 **** --- 89,94 ---- File "data\icons\none.ico" File "data\icons\Progs.ico" + File "data\icons\ramdisk.ico" + File "data\icons\remote.ico" File "data\icons\removeable.ico" File "data\icons\shortcut.ico" *************** *** 121,125 **** SetOverwrite ifnewer File "..\StdPlugin\data\img\scintilla.png" ! ; Shortcuts !insertmacro MUI_STARTMENU_WRITE_BEGIN Application --- 122,140 ---- SetOverwrite ifnewer File "..\StdPlugin\data\img\scintilla.png" ! SetOutPath "$INSTDIR\data\img\bmp" ! SetOverwrite ifnewer ! File "..\StdPlugin\data\img\bmp\brush.png" ! File "..\StdPlugin\data\img\bmp\DOT.PNG" ! File "..\StdPlugin\data\img\bmp\DOT_DASH.PNG" ! File "..\StdPlugin\data\img\bmp\ellipse.png" ! File "..\StdPlugin\data\img\bmp\handdraw.png" ! File "..\StdPlugin\data\img\bmp\line.png" ! File "..\StdPlugin\data\img\bmp\LONG_DASH.PNG" ! File "..\StdPlugin\data\img\bmp\rect.png" ! File "..\StdPlugin\data\img\bmp\rrect.png" ! File "..\StdPlugin\data\img\bmp\SHORT_DASH.PNG" ! File "..\StdPlugin\data\img\bmp\SOLID.PNG" ! File "..\StdPlugin\data\img\bmp\spray.png" ! File "..\StdPlugin\data\img\bmp\TRANSPARENT.PNG" ; Shortcuts !insertmacro MUI_STARTMENU_WRITE_BEGIN Application *************** *** 168,171 **** --- 183,200 ---- Delete "$INSTDIR\uninst.exe" + Delete "$INSTDIR\data\img\bmp\brush.png" + Delete "$INSTDIR\data\img\bmp\DOT.PNG" + Delete "$INSTDIR\data\img\bmp\DOT_DASH.PNG" + Delete "$INSTDIR\data\img\bmp\ellipse.png" + Delete "$INSTDIR\data\img\bmp\handdraw.png" + Delete "$INSTDIR\data\img\bmp\line.png" + Delete "$INSTDIR\data\img\bmp\LONG_DASH.PNG" + Delete "$INSTDIR\data\img\bmp\rect.png" + Delete "$INSTDIR\data\img\bmp\rrect.png" + Delete "$INSTDIR\data\img\bmp\SHORT_DASH.PNG" + Delete "$INSTDIR\data\img\bmp\SOLID.PNG" + Delete "$INSTDIR\data\img\bmp\spray.png" + Delete "$INSTDIR\data\img\bmp\TRANSPARENT.PNG" + Delete "$INSTDIR\data\icons\filetypes\txt.ico" Delete "$INSTDIR\data\icons\filetypes\bmp.ico" *************** *** 175,178 **** --- 204,209 ---- Delete "$INSTDIR\data\icons\shortcut.ico" Delete "$INSTDIR\data\icons\removeable.ico" + Delete "$INSTDIR\data\icons\ramdisk.ico" + Delete "$INSTDIR\data\icons\remote.ico" Delete "$INSTDIR\data\icons\Progs.ico" Delete "$INSTDIR\data\icons\none.ico" *************** *** 182,186 **** Delete "$INSTDIR\data\icons\harddrive.ico" Delete "$INSTDIR\data\icons\floppy.ico" - Delete "$INSTDIR\data\icons\EditOrx.ico" Delete "$INSTDIR\data\icons\docs.ico" Delete "$INSTDIR\data\icons\dir.ico" --- 213,216 ---- *************** *** 216,219 **** --- 246,250 ---- RMDir "$INSTDIR\plugins" RMDir "$INSTDIR\lib" + RMDir "$INSTDIR\data\img\bmp" RMDir "$INSTDIR\data\img" RMDir "$INSTDIR\data\icons\filetypes" |
|
From: Emilien K. <cur...@us...> - 2005-01-12 13:51:06
|
Update of /cvsroot/wxdevcenter/wxDevCenter/data/icons In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26046/data/icons Removed Files: EditOrx.ico Log Message: --- EditOrx.ico DELETED --- |
|
From: Emilien K. <cur...@us...> - 2005-01-12 13:51:06
|
Update of /cvsroot/wxdevcenter/wxDevCenter/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26046/src Modified Files: Application.cpp DocManager.cpp Document.cpp FileSystemCtrl.cpp MDIFrame.cpp MainFrame.cpp View.cpp Log Message: Index: FileSystemCtrl.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/FileSystemCtrl.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FileSystemCtrl.cpp 3 Jan 2005 14:56:22 -0000 1.2 --- FileSystemCtrl.cpp 12 Jan 2005 13:50:55 -0000 1.3 *************** *** 598,602 **** pGlobalSizer->Add(m_pListbook, 1, wxGROW|wxALL, 4); - wxSizer* pBottomSizer = new wxBoxSizer(wxHORIZONTAL); wxSizer* pColumnSizer = new wxBoxSizer(wxVERTICAL); --- 598,601 ---- *************** *** 654,659 **** void FileSystemDialog::OnInitDialog(wxInitDialogEvent& WXUNUSED(event)) { ! FilePath path = m_pPathActual->GetValue(); ! wxString strProtocol = path.GetFileProtocol(); for(unsigned int n=0; n<m_pListbook->GetPageCount(); n++) { --- 653,671 ---- void FileSystemDialog::OnInitDialog(wxInitDialogEvent& WXUNUSED(event)) { ! OpenDirectory(m_pPathActual->GetValue()); ! ! FileSystemPanel* pPanel = NULL; ! ! if(m_pListbook->GetSelection()!=wxNOT_FOUND) ! pPanel = (FileSystemPanel*) m_pListbook->GetPage(m_pListbook->GetSelection()); ! ! if(pPanel!=NULL) ! pPanel->SelectFile(m_pFiles->GetValue()); ! } ! ! // Navigue vers un répertoire. ! void FileSystemDialog::OpenDirectory(FilePath strPath) ! { ! wxString strProtocol = strPath.GetFileProtocol(); for(unsigned int n=0; n<m_pListbook->GetPageCount(); n++) { *************** *** 662,667 **** { m_pListbook->SetSelection(n); ! pPanel->OpenDirectory(path); ! pPanel->SelectFile(m_pFiles->GetValue()); } } --- 674,678 ---- { m_pListbook->SetSelection(n); ! pPanel->OpenDirectory(strPath); } } Index: DocManager.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/DocManager.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** DocManager.cpp 3 Jan 2005 14:56:22 -0000 1.3 --- DocManager.cpp 12 Jan 2005 13:50:55 -0000 1.4 *************** *** 216,220 **** for(j=0; j<(int)m_DocTemplateArray[i]->GetExtensionCount(); j++) { ! if(m_DocTemplateArray[i]->GetExtension(j)==strExt) return m_DocTemplateArray[i]->m_nID; } --- 216,220 ---- for(j=0; j<(int)m_DocTemplateArray[i]->GetExtensionCount(); j++) { ! if(strExt.CmpNoCase(m_DocTemplateArray[i]->GetExtension(j))==0) return m_DocTemplateArray[i]->m_nID; } Index: MainFrame.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/MainFrame.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MainFrame.cpp 3 Dec 2004 16:47:45 -0000 1.1 --- MainFrame.cpp 12 Jan 2005 13:50:55 -0000 1.2 *************** *** 94,97 **** --- 94,99 ---- EVT_MENU(IDM_WINDOW_CLOSE , MainFrame::OnMenuWindowClose) EVT_MENU(IDM_WINDOW_CLOSEALL , MainFrame::OnMenuWindowCloseAll) + EVT_MENU(IDM_WINDOW_CLONE , MainFrame::OnMenuWindowClone) + EVT_MENU(IDM_WINDOW_NEW , MainFrame::OnMenuWindowNew) EVT_MENU(IDM_WINDOW_PREV , MainFrame::OnMenuWindowPrev) EVT_MENU(IDM_WINDOW_NEXT , MainFrame::OnMenuWindowNext) *************** *** 308,311 **** --- 310,343 ---- } + // Evènement Cloner la vue active. + void MainFrame::OnMenuWindowClone(wxCommandEvent& WXUNUSED(event)) + { + View *pActiveView = m_pMDIFrame->GetActiveView(); + if(pActiveView!=NULL) + { + View *pNewView = wxGetApp().GetDocManager().CreateView(pActiveView->GetDocument(), pActiveView->GetViewAssociation()->ID); + pActiveView->GetDocument()->AttachView(pNewView); + AddView(pNewView); + pNewView->OnInitialUpdate(); + } + } + + // Evènement Afficher une nouvelle vue pour le document actif. + void MainFrame::OnMenuWindowNew(wxCommandEvent& WXUNUSED(event)) + { + View *pActiveView = m_pMDIFrame->GetActiveView(); + if(pActiveView!=NULL) + { + Document *pDoc = pActiveView->GetDocument(); + int iTypeView = wxGetApp().GetDocManager().ChooseViewType(pDoc->GetDocTemplate()->GetDocType()); + if(iTypeView!=-1) + { + View *pNewView = wxGetApp().GetDocManager().CreateView(pDoc, iTypeView); + pDoc->AttachView(pNewView); + AddView(pNewView); + pNewView->OnInitialUpdate(); + } + } + } // Passe à la vue suivante Index: MDIFrame.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/MDIFrame.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MDIFrame.cpp 3 Dec 2004 16:47:45 -0000 1.1 --- MDIFrame.cpp 12 Jan 2005 13:50:55 -0000 1.2 *************** *** 124,128 **** } - // Retourne le nombre de vues attachées au cadre MDI. unsigned int MDIFrame::GetViewCount(void) --- 124,127 ---- *************** *** 131,134 **** --- 130,149 ---- } + void MDIFrame::SetLabel(View *pView, wxString strLabel) + { + int i; + for(i=0; i<(int)GetPageCount(); i++) + { + if(GetPage(i)==pView) + { + SetPageText(i, strLabel); + Layout(); + pView->Layout(); + pView->Refresh(); + break; + } + } + } + // Avance (ou recule) vers la vue suivante (ou précédente). void MDIFrame::ScrollView(bool bNext) Index: Application.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/Application.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Application.cpp 3 Jan 2005 15:07:38 -0000 1.4 --- Application.cpp 12 Jan 2005 13:50:55 -0000 1.5 *************** *** 330,344 **** } ! pDoc->m_strPath = path; ! Archive *pArchive = CreateDocumentArchive(path, Archive::write); ! if(pArchive==NULL) ! return false; ! if(pDoc->SaveDocument(pArchive)) ! { ! wxLogStatus(WXDC_DOCUMENT_STATUS_SAVED, path); ! return true; ! } ! else return false; } --- 330,337 ---- } ! if(!pDoc->OnSaveDocument(path)) return false; + wxLogStatus(WXDC_DOCUMENT_STATUS_SAVED, path); + return true; } Index: Document.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/Document.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Document.cpp 3 Dec 2004 16:47:45 -0000 1.1 --- Document.cpp 12 Jan 2005 13:50:55 -0000 1.2 *************** *** 63,70 **** --- 63,81 ---- // Propriétés du document + // Fixe le chemin du document. + void Document::SetDocumentPath(FilePath strPath) + { + m_strPath = strPath; + SetDocumentName(strPath.GetFileTitle()); + } + // Fixe le nom du document void Document::SetDocumentName(wxString strName) { m_strName = strName; + + unsigned int i; + for(i=0; i<m_ViewArray.GetCount(); i++) + m_ViewArray[i]->OnChangeFilename(); } *************** *** 167,173 **** bool Document::OnOpenDocument(FilePath strDocumentPath) { ! m_strPath = strDocumentPath; ! m_strName = FilePath(strDocumentPath).GetFileTitle(); ! Archive *pArchive = wxGetApp().CreateDocumentArchive(strDocumentPath, wxStreamBuffer::read); --- 178,182 ---- bool Document::OnOpenDocument(FilePath strDocumentPath) { ! SetDocumentPath(strDocumentPath); Archive *pArchive = wxGetApp().CreateDocumentArchive(strDocumentPath, wxStreamBuffer::read); *************** *** 188,191 **** --- 197,202 ---- bool Document::OnSaveDocument(FilePath strDocumentPath) { + SetDocumentPath(strDocumentPath); + Archive *pArchive = wxGetApp().CreateDocumentArchive(strDocumentPath, wxStreamBuffer::write); if(pArchive==NULL) Index: View.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/View.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** View.cpp 3 Dec 2004 16:47:46 -0000 1.1 --- View.cpp 12 Jan 2005 13:50:55 -0000 1.2 *************** *** 88,92 **** void View::InsertMenu(wxMenuBar* pMenuBar, int iInsert) { - wxLogDebug("View::InsertMenu"); for(int i=0; i<m_aMenu.GetCount(); i++) pMenuBar->Insert(iInsert+i, m_aMenu.GetMenu(i), m_aMenu.GetLabel(i)); --- 88,91 ---- *************** *** 96,104 **** void View::RemoveMenu(wxMenuBar* pMenuBar, int iInsert) { - wxLogDebug("View::RemoveMenu"); for(int i=0; i<m_aMenu.GetCount(); i++) m_aMenu.SetMenu(i, pMenuBar->Remove(iInsert)); } ////////////////////////////////////////////////////////////////////// --- 95,108 ---- void View::RemoveMenu(wxMenuBar* pMenuBar, int iInsert) { for(int i=0; i<m_aMenu.GetCount(); i++) m_aMenu.SetMenu(i, pMenuBar->Remove(iInsert)); } + // Appelé par le document en cas de changement de chemin/nom. + void View::OnChangeFilename() + { + m_pChildFrame->SetLabel(this, GetDocument()->GetDocumentName()); + } + ////////////////////////////////////////////////////////////////////// |
|
From: Emilien K. <cur...@us...> - 2005-01-11 13:46:10
|
Update of /cvsroot/wxdevcenter/StdPlugin/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29769/src Modified Files: BitmapDocView.cpp Log Message: Vérification du rectangle de mise à jour pour éviter les plantages Index: BitmapDocView.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/StdPlugin/src/BitmapDocView.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** BitmapDocView.cpp 10 Jan 2005 15:38:57 -0000 1.8 --- BitmapDocView.cpp 11 Jan 2005 13:45:55 -0000 1.9 *************** *** 64,67 **** --- 64,75 ---- } + void BitmapDocument::UpdateAllViews(wxDevCenter::View *pSender, unsigned int nUpdateCode, wxRect* pRect) + { + if(pRect!=NULL) + pRect->Intersect(wxRect(0, 0, m_Bmp.GetWidth(), m_Bmp.GetHeight())); + + Document::UpdateAllViews(pSender, nUpdateCode, (void*)pRect); + } + // Fixe la couleur d'un pixel. void BitmapDocument::SetPixel(wxPoint pt, wxColour col) *************** *** 453,466 **** { wxRect r = *((wxRect*)pUpdateInfo); ! bmp = GetDocument()->GetBitmap().GetSubBitmap(r); ! { // Local wxMemoryDC ! wxMemoryDC dc; ! dc.SelectObject(m_pBitmapCtrl->Bitmap()); ! dc.DrawBitmap(bmp, r.x, r.y, false); } - - m_pBitmapCtrl->Refresh(); - } } --- 461,476 ---- { wxRect r = *((wxRect*)pUpdateInfo); ! if(r.width!=0 && r.height!=0) ! { ! bmp = GetDocument()->GetBitmap().GetSubBitmap(r); ! { // Local wxMemoryDC ! wxMemoryDC dc; ! dc.SelectObject(m_pBitmapCtrl->Bitmap()); ! dc.DrawBitmap(bmp, r.x, r.y, false); ! } ! ! m_pBitmapCtrl->Refresh(); } } } |
