Menu
▾
▴
[Wxdevcenter-cvs] StdPlugin/include/wxDevCenter/StdPlugin BitmapCtrl.h,1.3,1.4 BitmapDocView.h,1.1,1.2 Controls.h,1.4,1.5 extmouse.h,1.4,1.5 language.h,1.3,1.4
|
From: Emilien K. <cur...@us...> - 2005-01-07 17:41:57
|
Update of /cvsroot/wxdevcenter/StdPlugin/include/wxDevCenter/StdPlugin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28962/include/wxDevCenter/StdPlugin Modified Files: BitmapCtrl.h BitmapDocView.h Controls.h extmouse.h language.h Log Message: Tout ce qu'il faut pour les bitmaps Index: BitmapCtrl.h =================================================================== RCS file: /cvsroot/wxdevcenter/StdPlugin/include/wxDevCenter/StdPlugin/BitmapCtrl.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** BitmapCtrl.h 4 Jan 2005 15:31:55 -0000 1.3 --- BitmapCtrl.h 7 Jan 2005 17:41:43 -0000 1.4 *************** *** 148,152 **** /** Interception des évènements de la souris.*/ ! void OnMouseEvent(wxMouseEvent& event); }; --- 148,152 ---- /** Interception des évènements de la souris.*/ ! void OnMouseEvents(wxMouseEvent& event); }; Index: extmouse.h =================================================================== RCS file: /cvsroot/wxdevcenter/StdPlugin/include/wxDevCenter/StdPlugin/extmouse.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** extmouse.h 4 Jan 2005 16:53:05 -0000 1.4 --- extmouse.h 7 Jan 2005 17:41:43 -0000 1.5 *************** *** 293,295 **** --- 293,348 ---- (wxObjectEventFunction)(wxCommandEventFunction)(wxExtendedMouseEventFunction)&fn, (wxObject *) NULL ), + + #define EVT_EXTMOUSE_LEFT_EVENTS(id, fn) \ + EVT_EXTMOUSE_LEFT_CLICK(id, fn) \ + EVT_EXTMOUSE_LEFT_DBLCLICK(id, fn) \ + EVT_EXTMOUSE_LEFT_DOWN(id, fn) \ + EVT_EXTMOUSE_LEFT_UP(id, fn) \ + EVT_EXTMOUSE_LEFT_BEGIN_DRAG(id, fn) \ + EVT_EXTMOUSE_LEFT_END_DRAG(id, fn) \ + EVT_EXTMOUSE_LEFT_MOVE_DRAG(id, fn) + + #define EVT_EXTMOUSE_RIGHT_EVENTS(id, fn) \ + EVT_EXTMOUSE_RIGHT_CLICK(id, fn) \ + EVT_EXTMOUSE_RIGHT_DBLCLICK(id, fn) \ + EVT_EXTMOUSE_RIGHT_DOWN(id, fn) \ + EVT_EXTMOUSE_RIGHT_UP(id, fn) \ + EVT_EXTMOUSE_RIGHT_BEGIN_DRAG(id, fn) \ + EVT_EXTMOUSE_RIGHT_END_DRAG(id, fn) \ + EVT_EXTMOUSE_RIGHT_MOVE_DRAG(id, fn) + + #define EVT_EXTMOUSE_MIDDLE_EVENTS(id, fn) \ + EVT_EXTMOUSE_MIDDLE_CLICK(id, fn) \ + EVT_EXTMOUSE_MIDDLE_DBLCLICK(id, fn) \ + EVT_EXTMOUSE_MIDDLE_DOWN(id, fn) \ + EVT_EXTMOUSE_MIDDLE_UP(id, fn) \ + EVT_EXTMOUSE_MIDDLE_BEGIN_DRAG(id, fn) \ + EVT_EXTMOUSE_MIDDLE_END_DRAG(id, fn) \ + EVT_EXTMOUSE_MIDDLE_MOVE_DRAG(id, fn) + + + #define EVT_EXTMOUSE_EVENTS(id, fn) \ + EVT_EXTMOUSE_LEFT_CLICK(id, fn) \ + EVT_EXTMOUSE_LEFT_DBLCLICK(id, fn) \ + EVT_EXTMOUSE_LEFT_DOWN(id, fn) \ + EVT_EXTMOUSE_LEFT_UP(id, fn) \ + EVT_EXTMOUSE_LEFT_BEGIN_DRAG(id, fn) \ + EVT_EXTMOUSE_LEFT_END_DRAG(id, fn) \ + EVT_EXTMOUSE_LEFT_MOVE_DRAG(id, fn) \ + EVT_EXTMOUSE_RIGHT_CLICK(id, fn) \ + EVT_EXTMOUSE_RIGHT_DBLCLICK(id, fn) \ + EVT_EXTMOUSE_RIGHT_DOWN(id, fn) \ + EVT_EXTMOUSE_RIGHT_UP(id, fn) \ + EVT_EXTMOUSE_RIGHT_BEGIN_DRAG(id, fn) \ + EVT_EXTMOUSE_RIGHT_END_DRAG(id, fn) \ + EVT_EXTMOUSE_RIGHT_MOVE_DRAG(id, fn) \ + EVT_EXTMOUSE_MIDDLE_CLICK(id, fn) \ + EVT_EXTMOUSE_MIDDLE_DBLCLICK(id, fn) \ + EVT_EXTMOUSE_MIDDLE_DOWN(id, fn) \ + EVT_EXTMOUSE_MIDDLE_UP(id, fn) \ + EVT_EXTMOUSE_MIDDLE_BEGIN_DRAG(id, fn) \ + EVT_EXTMOUSE_MIDDLE_END_DRAG(id, fn) \ + EVT_EXTMOUSE_MIDDLE_MOVE_DRAG(id, fn) + + #endif Index: BitmapDocView.h =================================================================== RCS file: /cvsroot/wxdevcenter/StdPlugin/include/wxDevCenter/StdPlugin/BitmapDocView.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BitmapDocView.h 3 Dec 2004 16:51:28 -0000 1.1 --- BitmapDocView.h 7 Jan 2005 17:41:43 -0000 1.2 *************** *** 18,23 **** --- 18,28 ---- #include <wxDevCenter/DocView.h> #include <wxDevCenter/StdPlugin/BitmapCtrl.h> + #include <wxDevCenter/StdPlugin/extmouse.h> + #include <wxDevCenter/StdPlugin/Controls.h> #include <wx/image.h> + #include <wx/colour.h> + #include <wx/toolbar.h> + class wxDevCenter::Archive; *************** *** 45,52 **** /** Acces au buffer de l'image.*/ wxImage& GetImage(){return m_Image;} - }; --- 50,68 ---- /** Acces au buffer de l'image.*/ wxImage& GetImage(){return m_Image;} + /** Fixe la couleur d'un pixel.*/ + void SetPixel(wxPoint pt, wxColour col); + + /** Revoie le type de bitmap depuis l'extension d'un fichier. + * @param strFile Nom du fichier. + * @return Type du fichier parmis les wxBITMAP_TYPE_*. + */ + static int GetBitmapType(wxDevCenter::FilePath strFile); + }; + #define WXDC_BITMAP_PALETTE_WIDTH 8 + #define WXDC_BITMAP_PALETTE_HEIGHT 12 + #define WXDC_BITMAP_PALETTE_SIZE (WXDC_BITMAP_PALETTE_WIDTH*WXDC_BITMAP_PALETTE_HEIGHT) *************** *** 60,63 **** --- 76,80 ---- void OnSize(wxSizeEvent& event); BitmapCtrl *m_pBitmapCtrl; + wxPanel *m_pControlPanel; /** Interception du menu : Affichage/Centrer.*/ *************** *** 71,74 **** --- 88,136 ---- void OnUpdateExtraScroll(wxUpdateUIEvent& event); + /** Interception d'un drag gauche.*/ + void OnLeftDrag(wxExtendedMouseEvent& event); + + /** Création de la barre de controle.*/ + wxPanel* CreateControlPanel(); + + + /** Contrôles divers.*/ + /** Controle de couleur du bouton gauche.*/ + wxColourCtrl* m_pColourLeftButton; + /** Controle de couleur du bouton droit.*/ + wxColourCtrl* m_pColourRightButton; + /** Controle de couleur sélectionné pour édition aux sliders.*/ + wxColourCtrl* m_pColourSelected; + /** Tableau de couleurs utilisateurs.*/ + wxColourCtrl* m_pColourArray[WXDC_BITMAP_PALETTE_SIZE]; + + /** SliderSpin rouge*/ + wxSliderSpinCtrl* m_pRedSSC; + /** SliderSpin vert*/ + wxSliderSpinCtrl* m_pGreenSSC; + /** SliderSpin bleu*/ + wxSliderSpinCtrl* m_pBlueSSC; + /** Entrée couleur HTML.*/ + wxTextCtrl* m_pHTMLColor; + + /** Interception du changement de controle de couleur actif sur bouton gauche.*/ + void OnColorPaletteLeftClick(wxCommandEvent& event); + /** Interception du changement de controle de couleur actif sur bouton droit.*/ + void OnColorPaletteRightClick(wxCommandEvent& event); + /** Interception du click sur le bouton gauche. */ + void OnColorLeftClick(wxCommandEvent& event); + /** Interception du click sur le bouton droit. */ + void OnColorRightClick(wxCommandEvent& event); + + /** Fixe la couleur gauche.*/ + void SetLeftColor(wxColour col); + /** Fixe la couleur droite.*/ + void SetRightColor(wxColour col); + /** Fixe le controle de couleur actif.*/ + void SetActiveColorCtrl(wxColourCtrl* pColor); + + /** Intercepte le changement de couleur des wxSliderSpinCtrl.*/ + void OnSliderSpinTextChanged(wxCommandEvent& event); + public: BitmapDocument* GetDocument(){return (BitmapDocument*)m_pDocument;} Index: Controls.h =================================================================== RCS file: /cvsroot/wxdevcenter/StdPlugin/include/wxDevCenter/StdPlugin/Controls.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Controls.h 6 Jan 2005 16:23:20 -0000 1.4 --- Controls.h 7 Jan 2005 17:41:43 -0000 1.5 *************** *** 14,17 **** --- 14,19 ---- #include <wx/spinctrl.h> #include <wx/slider.h> + #include <wx/tglbtn.h> + /** *************** *** 31,34 **** --- 33,40 ---- int GetMaxValue()const; void SetMaxValue(int maxValue); + + virtual wxSize GetBestSize() const; + + virtual bool SetBackgroundColour(const wxColour& colour); protected: void OnSpinChange(wxSpinEvent& event); *************** *** 66,68 **** --- 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 Index: language.h =================================================================== RCS file: /cvsroot/wxdevcenter/StdPlugin/include/wxDevCenter/StdPlugin/language.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** language.h 19 Dec 2004 17:01:29 -0000 1.3 --- language.h 7 Jan 2005 17:41:43 -0000 1.4 *************** *** 52,71 **** #define WXDC_VIEWTYPE_TEXT_DESCRIPT "Advanced text editor with syntax-hilight and others." - #define WXDC_DOCTYPE_TEXTURE_NAME "Texture" - #define WXDC_DOCTYPE_TEXTURE_DESCRIPT "Bitmap with non top-left corner origin" - #define WXDC_VIEWTYPE_TEXTURE_STD_NAME "Texture editing" - #define WXDC_VIEWTYPE_TEXTURE_STD_DESCRIPT "Texture center positionning view" - - #define WXDC_DOCTYPE_ANIM_NAME "Animation" - #define WXDC_DOCTYPE_ANIM_DESCRIPT "Animation based on textures" - #define WXDC_DOCTYPE_ANIM_DEFAULTEXT "orx-anim" - #define WXDC_VIEWTYPE_ANIM_EDIT_NAME "Animation edition" - #define WXDC_VIEWTYPE_ANIM_EDIT_DESCRIPT "Animation edition with texture importing." - - #define WXDC_DOCTYPE_ANIMSET_NAME "Animation set" - #define WXDC_DOCTYPE_ANIMSET_DESCRIPT "Animations self-linked with transitions" - #define WXDC_DOCTYPE_ANIMSET_DEFAULTEXT "animset" - #define WXDC_VIEWTYPE_ANIMSET_EDIT_NAME "Animation set organigram" - #define WXDC_VIEWTYPE_ANIMSET_EDIT_DESCRIPT "Animation set organigram with link edition." ////////////////////////////////////////////////////////////////////// --- 52,55 ---- *************** *** 149,168 **** #define WXDC_SIMPLETEXT_REPLACE "Replace" - ////////////////////////////////////////////////////////////////////// - // Doc/Vue Bitmap et Texture - - #define WXDC_BITMAP_MENU_VIEW "View" - #define WXDC_BITMAP_MENU_VIEW_CENTER "Center" - #define WXDC_BITMAP_MENU_VIEW_EXTRASCROLL "Extra scroll" - - #define WXDC_TEXTURE_MENU_TEXTURE "Texture" - #define WXDC_TEXTURE_MENU_TEXTURE_MERGEIMAGE "Merge image ..." - - ////////////////////////////////////////////////////////////////////// - // Doc/Vue Animation - #define WXDC_ANIM_MENU_TEXTURE "&Texture" - #define WXDC_ANIM_MENU_TEXTURE_INSERT "&Insert...\tIns" - #define WXDC_ANIM_MENU_TEXTURE_REMOVE "&Remove\tDel" - ////////////////////////////////////////////////////////////////////// --- 133,136 ---- *************** *** 297,300 **** --- 265,280 ---- + ////////////////////////////////////////////////////////////////////// + // Doc/Vue Bitmap + + #define WXDC_BITMAP_MENU_VIEW wxT("View") + #define WXDC_BITMAP_MENU_VIEW_CENTER wxT("Center") + #define WXDC_BITMAP_MENU_VIEW_EXTRASCROLL wxT("Extra scroll") + + #define WXDC_BITMAP_ERROR_LOAD wxT("Can not load this bitmap.") + #define WXDC_BITMAP_ERROR_SAVE wxT("Can not save this bitmap.") + #define WXDC_BITMAP_ERROR_GIF_SAVE wxT("GIF bitmap can not be saved.") + + #endif |
