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-08-25 20:36:16
|
Update of /cvsroot/wxdevcenter/StdPlugin/build/bakefiles In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32099/build/bakefiles Added Files: install.bkl StdPlugin.bkl Text.bkl wx.bkl Bitmap.bkl Log Message: Rearrange bakefile and source file hierarchy. --- NEW FILE: wx.bkl --- <?xml version="1.0" ?> <makefile> <!-- Options --> <!-- Static or shared library compilation. --> <option name="SHARED"> <values>0,1</values> <values-description>LIB,DLL</values-description> <default-value>1</default-value> <description> What type of library to build ? </description> </option> <!-- Unicode strings or not (unicode or ansi). --> <option name="UNICODE"> <values>0,1</values> <values-description>ANSI,Unicode</values-description> <default-value>0</default-value> <description> Compile Unicode build of wxWidgets ? </description> </option> <!-- Build mode. --> <option name="BUILD"> <values>debug,release</values> <values-description>Debug,Release</values-description> <default-value>release</default-value> <description> Type of compiled binaries. </description> </option> <!-- wxWidgets version. --> <option name="WXVER"> <values>25, 26</values> <values-description>wx2.5.x, wx2.6.x</values-description> <default-value>26</default-value> <description> Version of wxWidgets. </description> </option> <set var="WXPORTNAME_DEFAULT"> <if cond="PLATFORM_WIN32=='1'">msw</if> <if cond="PLATFORM_UNIX=='1'">gtk2</if> <if cond="PLATFORM_MAC=='1'">mac</if> <if cond="PLATFORM_OS2=='1'">os2</if> </set> <!-- wxWidgets port. --> <option name="WXPORTNAME"> <values>msw,gtk,gtk2,x11,mac,os2</values> <default-value>$(WXPORTNAME_DEFAULT)</default-value> <description>Port to use for wxWidgets library.</description> </option> <!-- Variables declarations. --> <!-- ISDLL : 1 if choose to compile library for dynamic use. --> <set var="ISDLL" cond="SHARED=='1'">1</set> <set var="ISDLL" cond="SHARED=='0'">0</set> <!-- Preporcessor definition to say if wx is used in shared mode. --> <set var="WXUSINGDLL"> <if cond="SHARED=='1'">WXUSINGDLL</if> </set> <set var="SUFFIX"> <if cond="BUILD=='debug'">D</if> </set> <!-- UNICODE_DEFINE : Preprocessor definition for unicode use. --> <set var="UNICODE_DEFINE"> <if cond="FORMAT!='autoconf' and UNICODE=='1'">_UNICODE</if> </set> <set var="DEBUG_DEFINE"> <if cond="FORMAT!='autoconf' and BUILD=='debug'">__WXDEBUG__</if> </set> <!-- DEBUGINFO : is debug mode actived ? --> <set var="DEBUGINFO"> <if cond="BUILD=='debug'">on</if> <if cond="BUILD=='release'">off</if> </set> <!-- DEBUGRUNTIME : is runtime debug library used ? --> <set var="DEBUGRUNTIME"> <if cond="BUILD=='debug'">on</if> <if cond="BUILD=='release'">off</if> </set> <!-- OPTIMIZEFLAG : type of optimization. --> <set var="OPTIMIZEFLAG"> <if cond="BUILD=='debug'">off</if> <if cond="BUILD=='release'">speed</if> </set> <!-- WARNINGS : level of compilation warning to show. --> <set var="WARNINGS"> <if cond="BUILD=='debug'">max</if> <if cond="BUILD=='release'">no</if> </set> <!-- wxWidgets plateforms definitions. --> <!-- Set the main definition for plateform. --> <set var="WXDEF_PLATEFORM"> <if cond="PLATFORM_WIN32=='1'">__WINDOWS__</if> <!-- <if cond="PLATFORM_UNIX=='1'">__UNIX_LIKE__</if> <if cond="PLATFORM_MAC=='1'">__WXMAC__ </if> <if cond="PLATFORM_OS2=='1'">__WXOS2__ </if>--> </set> <set var="TARGETING_WIN32"> <if cond="FORMAT=='autoconf' or FORMAT=='gnu'">0</if> <if cond="FORMAT!='autoconf' and FORMAT!='gnu'">1</if> </set> <!-- wxWidgets library variable definitions. --> <!-- wxWidgets libraries string flags. --> <set var="WXLIBPOSTFIX"> <if cond="BUILD=='debug' and UNICODE=='1'">ud</if> <if cond="BUILD=='debug' and UNICODE=='0'">d</if> <if cond="BUILD=='release' and UNICODE=='1'">u</if> </set> <set var="WXVERSIONTAG"> <if cond="TARGETING_WIN32=='1' and WXVER=='25'">25</if> <if cond="TARGETING_WIN32=='1' and WXVER=='26'">26</if> <if cond="TARGETING_WIN32=='0' and WXVER=='25'">2.5</if> <if cond="TARGETING_WIN32=='0' and WXVER=='26'">2.6</if> </set> <set var="WXNAMEPREFIX"> <if cond="TARGETING_WIN32=='1'">wxbase$(WXVERSIONTAG)$(WXLIBPOSTFIX)</if> <if cond="TARGETING_WIN32=='0'">wx_base$(WXLIBPOSTFIX)</if> </set> <set var="WXNAMEPREFIXGUI"> <if cond="TARGETING_WIN32=='1'">wx$(WXPORTNAME)$(WXVERSIONTAG)$(WXLIBPOSTFIX)</if> <if cond="TARGETING_WIN32=='0'">wx_$(WXPORTNAME)$(WXLIBPOSTFIX)</if> </set> <!-- wxWidgets library tag. --> <!-- wxWidgets lib. --> <define-tag name="wxlib" rules="exe,dll,lib"> <if cond="TARGETING_WIN32=='1'"> <sys-lib>$(WXNAMEPREFIX)</sys-lib> </if> <if cond="TARGETING_WIN32=='0'"> <sys-lib>$(WXNAMEPREFIX)-$(WXVERSIONTAG)</sys-lib> </if> </define-tag> <!-- wxWidgets base lib. Can be : net, odbc, xml. --> <define-tag name="wxlib-base" rules="exe,dll,lib"> <if cond="TARGETING_WIN32=='1'"> <sys-lib>$(WXNAMEPREFIX)_$(value)</sys-lib> </if> <if cond="TARGETING_WIN32=='0'"> <sys-lib>$(WXNAMEPREFIX)_$(value)-$(WXVERSIONTAG)</sys-lib> </if> </define-tag> <!-- wxWidgets GUI lib. Can be : adv, animate, core, dbgrid, deprecated, fl, gizmos, gl, html, mmedia, ogl, plot, stc, svg, xrc. --> <define-tag name="wxlib-gui" rules="exe,dll,lib"> <if cond="TARGETING_WIN32=='1'"> <sys-lib>$(WXNAMEPREFIXGUI)_$(value)</sys-lib> </if> <if cond="TARGETING_WIN32=='0'"> <sys-lib>$(WXNAMEPREFIXGUI)_$(value)-$(WXVERSIONTAG)</sys-lib> </if> </define-tag> <!-- wxWidgets dependent lib. Can be : expat, jpeg, png, regex, tiff, zlib. --> <define-tag name="wxlib-depend" rules="exe,dll,lib"> <if cond="TARGETING_WIN32=='1'"> <sys-lib>wx$(value)$(WXLIBPOSTFIX)</sys-lib> </if> <if cond="TARGETING_WIN32=='0'"> <sys-lib>$(WXNAMEPREFIX)$(WXVERSIONTAG)</sys-lib> <!-- Already in wxlib. --> </if> </define-tag> <!-- Template definitions. --> <!-- Base for all target using wxWidgets. --> <template id="wxBase"> <cxx-rtti>on</cxx-rtti> <cxx-exceptions>on</cxx-exceptions> <threading>multi</threading> <warnings>$(WARNINGS)</warnings> <define>$(UNICODE_DEFINE)</define> <define>$(DEBUG_DEFINE)</define> <optimize>$(OPTIMIZEFLAG)</optimize> <debug-info>$(DEBUGINFO)</debug-info> <debug-runtime-libs>$(DEBUGRUNTIME)</debug-runtime-libs> <define>$(WXUSINGDLL)</define> <define>$(WXDEF_PLATEFORM)</define> <if cond="PLATFORM_UNIX=='1'"> <cppflags>`wx-config --cppflags`</cppflags> </if> <if cond="PLATFORM_UNIX=='1'"> <ldflags>`wx-config --libs`</ldflags> </if> </template> <!-- Lib based on wxWidgets. --> <template id="wxLib" template="wxBase"> </template> <!-- Base for module (dll or exe) based on wxWidgets. --> <template id="wxModule" template="wxBase"> <!-- If targeting the Windows OS, link with the libraries manually. --> <if cond="FORMAT!='autoconf' and FORMAT!='gnu'"> <if cond="FORMAT=='borland'"> <sys-lib>ole2w32</sys-lib> </if> <if cond="FORMAT!='borland'"> <sys-lib>kernel32</sys-lib> <sys-lib>user32</sys-lib> <sys-lib>gdi32</sys-lib> <sys-lib>comdlg32</sys-lib> <sys-lib>winspool</sys-lib> <sys-lib>winmm</sys-lib> <sys-lib>shell32</sys-lib> <sys-lib>comctl32</sys-lib> <sys-lib>odbc32</sys-lib> <sys-lib>ole32</sys-lib> <sys-lib>oleaut32</sys-lib> <sys-lib>uuid</sys-lib> <sys-lib>rpcrt4</sys-lib> <sys-lib>advapi32</sys-lib> <sys-lib>wsock32</sys-lib> </if> <if cond="FORMAT=='msvc' or FORMAT=='msvc6prj' or FORMAT=='borland'"> <sys-lib>oleacc</sys-lib> </if> </if> <!-- end if windows. --> <wxlib /> </template> <template id="wxDLL" template="wxModule"> </template> <template id="wxEXE" template="wxModule"> </template> </makefile> --- NEW FILE: install.bkl --- <?xml version="1.0" ?> <makefile> <using module="datafiles" /> <!-- Install headers. --> <data-files-tree > <srcdir>include/wxDevCenter</srcdir> <install-to>$(INCLUDEDIR)/wxDevCenter</install-to> <files> StdPlugin.h StdPlugin/Controls.h StdPlugin/extmouse.h StdPlugin/language.h </files> </data-files-tree> <!-- Install feature descriptor. --> <data-files-tree > <srcdir>features</srcdir> <install-to>$(DATADIR)/wxDevCenter/features</install-to> <files> StdPlugin/feature.xml </files> </data-files-tree> </makefile> --- NEW FILE: Text.bkl --- <?xml version="1.0" ?> <makefile> <dll id="Text" template="wxDLL"> <libname>Text-$(STDPLUGIN_VERSION)</libname> <dirname>./plugins/StdPlugin.Text</dirname> <include>$(WXDCINCLUDE)</include> <include>include</include> <sources> src/Controls.cpp src/Text/SimpleTextDocView.cpp </sources> <wxlib /> <wxlib-gui>core</wxlib-gui> <wxlib-gui>adv</wxlib-gui> <wxlib-gui>stc</wxlib-gui> <lib-path>$(WXDCLIB)</lib-path> <sys-lib>wxDevCenterLib</sys-lib> <install-to>$(LIBDIR)/wxDevCenter/plugins/StdPlugin.Text</install-to> </dll> <using module="datafiles" /> <!-- Install plugin descriptors. --> <data-files-tree > <srcdir>plugins</srcdir> <install-to>$(DATADIR)/wxDevCenter/plugins</install-to> <files> StdPlugin.Text/plugin.xml </files> </data-files-tree> <!-- Install headers. --> <data-files-tree > <srcdir>include/wxDevCenter</srcdir> <install-to>$(INCLUDEDIR)/wxDevCenter</install-to> <files> StdPlugin/Bitmap/BitmapCtrl.h StdPlugin/Bitmap/BitmapDocView.h StdPlugin/Bitmap/BitmapProp.h </files> </data-files-tree> <!-- Install StdPlugin.Text data. --> <data-files-tree > <srcdir>data</srcdir> <install-to>$(DATADIR)/wxDevCenter/data</install-to> <files> <!-- Document type icon. --> icons/filetypes/txt.ico <!-- About pictures. --> icons/scintilla.png </files> </data-files-tree> <!-- Install config. --> <data-files-tree > <srcdir>conf</srcdir> <install-to>$(DATADIR)/wxDevCenter/conf</install-to> <files> StdPlugin.Text.conf StdPlugin.Text/.conf StdPlugin.Text/ADA.conf StdPlugin.Text/APDL.conf StdPlugin.Text/ASM.conf StdPlugin.Text/ASP.conf StdPlugin.Text/AU3.conf StdPlugin.Text/AVE.conf StdPlugin.Text/BAAM.conf StdPlugin.Text/BASH.conf StdPlugin.Text/Batch.conf StdPlugin.Text/Bullant.conf StdPlugin.Text/CLW-no-case.conf StdPlugin.Text/CLW.conf StdPlugin.Text/Config.conf StdPlugin.Text/CPP-no-case.conf StdPlugin.Text/CPP.conf StdPlugin.Text/CSS.conf StdPlugin.Text/Diff.conf StdPlugin.Text/Eiffel.conf StdPlugin.Text/EiffelKW.conf StdPlugin.Text/ERLANG.conf StdPlugin.Text/Error-list.conf StdPlugin.Text/ESCRIPT.conf StdPlugin.Text/F77.conf StdPlugin.Text/FORTH.conf StdPlugin.Text/Fortran.conf StdPlugin.Text/GUI2CLI.conf StdPlugin.Text/HTML.conf StdPlugin.Text/KIX.conf StdPlugin.Text/LaTeX.conf StdPlugin.Text/Lisp.conf StdPlugin.Text/LOT.conf StdPlugin.Text/LOUT.conf StdPlugin.Text/LUA.conf StdPlugin.Text/Makefile.conf StdPlugin.Text/MATLab.conf StdPlugin.Text/METAPOST.conf StdPlugin.Text/MMIXAL.conf StdPlugin.Text/MS-SQL.conf StdPlugin.Text/NN-Cron-Table.conf StdPlugin.Text/NSIS.conf StdPlugin.Text/Octave.conf StdPlugin.Text/Pascal.conf StdPlugin.Text/Perl.conf StdPlugin.Text/PHP.conf StdPlugin.Text/POV.conf StdPlugin.Text/Power-Basic.conf StdPlugin.Text/Properties.conf StdPlugin.Text/PS.conf StdPlugin.Text/Python.conf StdPlugin.Text/Ruby.conf StdPlugin.Text/Scriptol.conf StdPlugin.Text/SPECMAN.conf StdPlugin.Text/SQL.conf StdPlugin.Text/TCL.conf StdPlugin.Text/TeX.conf StdPlugin.Text/Text.conf StdPlugin.Text/Verilog.conf StdPlugin.Text/Visual-Basic-Script.conf StdPlugin.Text/Visual-Basic.conf StdPlugin.Text/XCode.conf StdPlugin.Text/XML.conf StdPlugin.Text/YAML.conf </files> </data-files-tree> </makefile> --- NEW FILE: Bitmap.bkl --- <?xml version="1.0" ?> <makefile> <dll id="Bitmap" template="wxDLL"> <libname>Bitmap-$(STDPLUGIN_VERSION)</libname> <dirname>./plugins/StdPlugin.Bitmap</dirname> <include>$(WXDCINCLUDE)</include> <include>include</include> <sources> src/Bitmap/BitmapCtrl.cpp src/Bitmap/BitmapDocView.cpp src/Bitmap/BitmapProp.cpp src/Controls.cpp src/extmouse.cpp </sources> <wxlib /> <wxlib-gui>core</wxlib-gui> <wxlib-gui>adv</wxlib-gui> <lib-path>$(WXDCLIB)</lib-path> <sys-lib>wxDevCenterLib</sys-lib> <install-to>$(LIBDIR)/wxDevCenter/plugins/StdPlugin.Bitmap</install-to> </dll> <using module="datafiles" /> <!-- Install plugin descriptors. --> <data-files-tree > <srcdir>plugins</srcdir> <install-to>$(DATADIR)/wxDevCenter/plugins</install-to> <files> StdPlugin.Bitmap/plugin.xml </files> </data-files-tree> <!-- Install headers. --> <data-files-tree > <srcdir>include/wxDevCenter</srcdir> <install-to>$(INCLUDEDIR)/wxDevCenter</install-to> <files> StdPlugin/Bitmap/BitmapCtrl.h StdPlugin/Bitmap/BitmapDocView.h StdPlugin/Bitmap/BitmapProp.h </files> </data-files-tree> <!-- Install StdPlugin.Bitmap data. --> <data-files-tree > <srcdir>data</srcdir> <install-to>$(DATADIR)/wxDevCenter/data</install-to> <files> <!-- Document type icon. --> icons/filetypes/bmp.ico <!-- Drawing tools. --> icons/StdPlugin.Bitmap/brush.png icons/StdPlugin.Bitmap/ellipse.png icons/StdPlugin.Bitmap/handdraw.png icons/StdPlugin.Bitmap/line.png icons/StdPlugin.Bitmap/rect.png icons/StdPlugin.Bitmap/rrect.png icons/StdPlugin.Bitmap/selall.png icons/StdPlugin.Bitmap/selcopy.png icons/StdPlugin.Bitmap/selcut.png icons/StdPlugin.Bitmap/selection.png icons/StdPlugin.Bitmap/selmove.png icons/StdPlugin.Bitmap/selpaste.png icons/StdPlugin.Bitmap/selremove.png icons/StdPlugin.Bitmap/sizeall.png icons/StdPlugin.Bitmap/spray.png <!-- Pen type. --> icons/StdPlugin.Bitmap/dot.png icons/StdPlugin.Bitmap/dot_dash.png icons/StdPlugin.Bitmap/long_dash.png icons/StdPlugin.Bitmap/short_dash.png icons/StdPlugin.Bitmap/solid.png icons/StdPlugin.Bitmap/transparent.png <!-- Bitmap format. --> icons/StdPlugin.Bitmap/landscape.png icons/StdPlugin.Bitmap/portrait.png </files> </data-files-tree> <!-- Install config. --> <data-files-tree > <srcdir>conf</srcdir> <install-to>$(DATADIR)/wxDevCenter/conf</install-to> <files> StdPlugin.Bitmap.conf </files> </data-files-tree> </makefile> --- NEW FILE: StdPlugin.bkl --- <?xml version="1.0" ?> <makefile> <set var="BUILDDIR">./build/$(BUILD)</set> <set var="STDPLUGIN_VERSION">0.3.0</set> <option name="WXDCINCLUDE"> <description>Additional path to find wxDevCenter include directory.</description> <values>../wxDevCenter/include</values> </option> <option name="WXDCLIB"> <description>Additional path to find wxDevCenter include directory.</description> <values>../wxDevCenter/lib</values> </option> </makefile> |
|
From: Emilien K. <cur...@us...> - 2005-08-25 20:36:16
|
Update of /cvsroot/wxdevcenter/StdPlugin/build In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32099/build Removed Files: install.bkl wx.bkl StdPlugin.bkl Log Message: Rearrange bakefile and source file hierarchy. --- wx.bkl DELETED --- --- install.bkl DELETED --- --- StdPlugin.bkl DELETED --- |
|
From: Emilien K. <cur...@us...> - 2005-08-25 20:36:16
|
Update of /cvsroot/wxdevcenter/StdPlugin/include/wxDevCenter/StdPlugin/Bitmap In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32099/include/wxDevCenter/StdPlugin/Bitmap Added Files: BitmapCtrl.h BitmapProp.h BitmapDocView.h Log Message: Rearrange bakefile and source file hierarchy. --- NEW FILE: BitmapCtrl.h --- (This appears to be a binary file; contents omitted.) --- NEW FILE: BitmapDocView.h --- (This appears to be a binary file; contents omitted.) --- NEW FILE: BitmapProp.h --- (This appears to be a binary file; contents omitted.) |
|
From: Emilien K. <cur...@us...> - 2005-08-25 20:36:16
|
Update of /cvsroot/wxdevcenter/StdPlugin/src/Text In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32099/src/Text Added Files: SimpleTextDocView.cpp Log Message: Rearrange bakefile and source file hierarchy. --- NEW FILE: SimpleTextDocView.cpp --- (This appears to be a binary file; contents omitted.) |
|
From: Emilien K. <cur...@us...> - 2005-08-25 20:35:56
|
Update of /cvsroot/wxdevcenter/StdPlugin/src/Text In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32044/src/Text Log Message: Directory /cvsroot/wxdevcenter/StdPlugin/src/Text added to the repository |
|
From: Emilien K. <cur...@us...> - 2005-08-25 20:35:56
|
Update of /cvsroot/wxdevcenter/StdPlugin/include/wxDevCenter/StdPlugin/Text In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32044/include/wxDevCenter/StdPlugin/Text Log Message: Directory /cvsroot/wxdevcenter/StdPlugin/include/wxDevCenter/StdPlugin/Text added to the repository |
|
From: Emilien K. <cur...@us...> - 2005-08-25 20:35:56
|
Update of /cvsroot/wxdevcenter/StdPlugin/src/Bitmap In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32044/src/Bitmap Log Message: Directory /cvsroot/wxdevcenter/StdPlugin/src/Bitmap added to the repository |
|
From: Emilien K. <cur...@us...> - 2005-08-25 20:35:56
|
Update of /cvsroot/wxdevcenter/StdPlugin/build/bakefiles In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32044/build/bakefiles Log Message: Directory /cvsroot/wxdevcenter/StdPlugin/build/bakefiles added to the repository |
|
From: Emilien K. <cur...@us...> - 2005-08-25 20:35:56
|
Update of /cvsroot/wxdevcenter/StdPlugin/include/wxDevCenter/StdPlugin/Bitmap In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32044/include/wxDevCenter/StdPlugin/Bitmap Log Message: Directory /cvsroot/wxdevcenter/StdPlugin/include/wxDevCenter/StdPlugin/Bitmap added to the repository |
|
From: Emilien K. <cur...@us...> - 2005-08-25 17:06:50
|
Update of /cvsroot/wxdevcenter/StdPlugin/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3150/src Modified Files: BitmapProp.cpp Log Message: Read config and use it to propose many format for bitmap. Index: BitmapProp.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/StdPlugin/src/BitmapProp.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** BitmapProp.cpp 25 Aug 2005 14:18:28 -0000 1.4 --- BitmapProp.cpp 25 Aug 2005 17:06:40 -0000 1.5 *************** *** 11,14 **** --- 11,16 ---- #include <wx/bmpbuttn.h> #include <wx/artprov.h> + #include <wx/confbase.h> + using namespace wxDevCenter; *************** *** 139,142 **** --- 141,145 ---- #define ID_RES_TEXT_CTRL 26 #define ID_RESUNIT_CHOICE 27 + #define ID_AUTOFORMAT_CHOICE 28 BEGIN_EVENT_TABLE(BitmapPropertiesDialog, wxDialog) *************** *** 152,155 **** --- 155,159 ---- EVT_CHOICE(ID_UNIT_CHOICE, BitmapPropertiesDialog::OnChangeUnit) EVT_CHOICE(ID_RESUNIT_CHOICE, BitmapPropertiesDialog::OnChangeUnit) + EVT_CHOICE(ID_AUTOFORMAT_CHOICE, BitmapPropertiesDialog::OnAutoFormat) END_EVENT_TABLE() *************** *** 159,163 **** m_bIsUpdatingCtrl(false) { ! // Création des controles. m_pWidthTextCtrl = new wxTextCtrl(this, ID_WIDTH_TEXT_CTRL, wxT("21.0")); m_pHeightTextCtrl = new wxTextCtrl(this, ID_HEIGHT_TEXT_CTRL, wxT("29.7")); --- 163,168 ---- m_bIsUpdatingCtrl(false) { ! // Création des controles. ! m_pFormatAuto = new wxChoice(this, ID_AUTOFORMAT_CHOICE, wxDefaultPosition, wxDefaultSize, 0, NULL); m_pWidthTextCtrl = new wxTextCtrl(this, ID_WIDTH_TEXT_CTRL, wxT("21.0")); m_pHeightTextCtrl = new wxTextCtrl(this, ID_HEIGHT_TEXT_CTRL, wxT("29.7")); *************** *** 174,177 **** --- 179,184 ---- wxSizer* pGlobalSizer = new wxBoxSizer(wxVERTICAL); + // Format automatique + pGlobalSizer->Add(m_pFormatAuto, 0, wxEXPAND|wxALL, 8); // Zone de taille *************** *** 191,195 **** pGlobalSizer->Add(pSizeSizer, 0, wxEXPAND|wxALL, 8); ! // Zone de résolution wxSizer* pResSizer = new wxStaticBoxSizer(wxVERTICAL, this, wxT("Résolution")); pLineSizer = new wxGridSizer(1, 3, 8, 8); --- 198,202 ---- pGlobalSizer->Add(pSizeSizer, 0, wxEXPAND|wxALL, 8); ! // Zone de résolution wxSizer* pResSizer = new wxStaticBoxSizer(wxVERTICAL, this, wxT("Résolution")); pLineSizer = new wxGridSizer(1, 3, 8, 8); *************** *** 206,209 **** --- 213,276 ---- } + // Destructor. + BitmapPropertiesDialog::~BitmapPropertiesDialog() + { + ClearFormat(); + } + + + // Affiche la taille dans une certaine unitée. + void BitmapPropertiesDialog::ShowSize(const SizeUnit& unit) + { + ShowSize(unit.name); + } + + // Affiche la résolution en une certaine unité. + void BitmapPropertiesDialog::ShowRes(const SizeUnit& unit) + { + ShowRes(unit.name); + } + + // Affiche la taille dans une certaine unitée. + void BitmapPropertiesDialog::ShowSize(const wxString& unit) + { + if(unit.CmpNoCase(wxT("Pixel"))==0 || unit.CmpNoCase(wxT("Pixels"))==0) + { + m_pUnitChoice->SetSelection(0); + } + + for(int l=1; l<m_pUnitChoice->GetCount(); l++) + { + SizeUnit* pUnit = (SizeUnit*) m_pUnitChoice->GetClientData(l); + if(pUnit!=NULL) + { + if(pUnit->name.IsSameAs(unit, false)) + { + m_pUnitChoice->SetSelection(l); + return; + } + } + } + } + + // Affiche la résolution en une certaine unité. + void BitmapPropertiesDialog::ShowRes(const wxString& unit) + { + for(int l=0; l<m_pResUnitChoice->GetCount(); l++) + { + SizeUnit* pUnit = (SizeUnit*) m_pResUnitChoice->GetClientData(l); + if(pUnit!=NULL) + { + if(pUnit->name.IsSameAs(unit, false)) + { + m_pResUnitChoice->SetSelection(l); + return; + } + } + } + } + + + // Mise à jour initiale. void BitmapPropertiesDialog::OnInitialUpdate(wxInitDialogEvent& WXUNUSED(event)) *************** *** 211,215 **** long l, nb = sizeof(SizeUnits)/sizeof(SizeUnit); ! // Ajoute les unités de taille. m_pUnitChoice->Append(wxT("Pixel"), (void*)NULL); for(l=0; l<nb; l++) --- 278,284 ---- long l, nb = sizeof(SizeUnits)/sizeof(SizeUnit); ! ReadAutoFormat(); ! ! // Ajoute les unités de taille. m_pUnitChoice->Append(wxT("Pixel"), (void*)NULL); for(l=0; l<nb; l++) *************** *** 217,221 **** m_pUnitChoice->SetSelection(0); ! // Ajoute les unités de résolution. for(l=0; l<nb; l++) m_pResUnitChoice->Append(wxT("Pixel/") + SizeUnits[l].name, (void*)&SizeUnits[l]); --- 286,290 ---- m_pUnitChoice->SetSelection(0); ! // Ajoute les unités de résolution. for(l=0; l<nb; l++) m_pResUnitChoice->Append(wxT("Pixel/") + SizeUnits[l].name, (void*)&SizeUnits[l]); *************** *** 225,229 **** } ! // Met à jour les controles. void BitmapPropertiesDialog::UpdateCtrl(bool bUpdateSize, bool bUpdateRes) { --- 294,298 ---- } ! // Met à jour les controles. void BitmapPropertiesDialog::UpdateCtrl(bool bUpdateSize, bool bUpdateRes) { *************** *** 250,254 **** } ! // Zone de résolution. if(bUpdateRes) { --- 319,323 ---- } ! // Zone de résolution. if(bUpdateRes) { *************** *** 265,269 **** } ! // Récapitulatif de taille. m_pSizeTextCtrl->SetLabel(wxString::Format(wxT("%dx%d pixels - %gppp"), m_BmpProp.GetSize().x,m_BmpProp.GetSize().y, m_BmpProp.GetRes(Units::Inch))); --- 334,338 ---- } ! // Récapitulatif de taille. m_pSizeTextCtrl->SetLabel(wxString::Format(wxT("%dx%d pixels - %gppp"), m_BmpProp.GetSize().x,m_BmpProp.GetSize().y, m_BmpProp.GetRes(Units::Inch))); *************** *** 271,275 **** } ! // Interception d'un changement d'unté d'affichage. void BitmapPropertiesDialog::OnChangeUnit(wxCommandEvent& WXUNUSED(event)) { --- 340,344 ---- } ! // Interception d'un changement d'unté d'affichage. void BitmapPropertiesDialog::OnChangeUnit(wxCommandEvent& WXUNUSED(event)) { *************** *** 310,314 **** } ! // Interception d'un changement de résolution. void BitmapPropertiesDialog::OnResChanged(wxCommandEvent& WXUNUSED(event)) { --- 379,383 ---- } ! // Interception d'un changement de résolution. void BitmapPropertiesDialog::OnResChanged(wxCommandEvent& WXUNUSED(event)) { *************** *** 343,344 **** --- 412,474 ---- } + // Interception de l'application d'un format. + void BitmapPropertiesDialog::OnAutoFormat(wxCommandEvent& event) + { + if(event.GetSelection()!=wxNOT_FOUND) + { + wxString *pStr = (wxString*) event.GetClientData(); + if(pStr!=NULL) + { + /** Ouvre la config.*/ + wxConfigBase& Config = Application::GetApp().GetConfig()[WXDC_BITMAP_CONFIG_ROOT]; + Config.SetPath(wxT("/formats")); + + wxString strUnit; + wxSize sz; + double dRes; + sz.x = Config.Read(*pStr + wxT("size-x"), 0l); + sz.y = Config.Read(*pStr + wxT("size-y"), 0l); + Config.Read(*pStr + wxT("res"), &dRes, 0.0); + + m_BmpProp.SetSize(sz); + m_BmpProp.SetRes(dRes); + + UpdateCtrl(); + + strUnit = Config.Read(*pStr + wxT("size-unit"), wxT("Pixel")); + ShowSize(strUnit); + strUnit = Config.Read(*pStr + wxT("res-unit"), wxT("Inch")); + ShowRes(strUnit); + + } + } + } + + + // Lit les formats préprogrammés et les insere dans le wxChoice. + void BitmapPropertiesDialog::ReadAutoFormat() + { + /** Ouvre la config.*/ + wxConfigBase& Config = Application::GetApp().GetConfig()[WXDC_BITMAP_CONFIG_ROOT]; + Config.SetPath(wxT("/formats")); + + wxString str; + long dummy; + bool bCont = Config.GetFirstGroup(str, dummy); + while(bCont) + { + str << wxT("/"); + m_pFormatAuto->Append(Config.Read(str + wxT("name"), wxT("Unknow")) , (void*)new wxString(str)); + bCont = Config.GetNextGroup(str, dummy); + } + } + + // Efface tous les formats. + void BitmapPropertiesDialog::ClearFormat() + { + if(m_pFormatAuto==NULL) + return; + m_pFormatAuto->Clear(); + } + + |
|
From: Emilien K. <cur...@us...> - 2005-08-25 17:06:50
|
Update of /cvsroot/wxdevcenter/StdPlugin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3150 Modified Files: GNUmakefile Log Message: Read config and use it to propose many format for bitmap. Index: GNUmakefile =================================================================== RCS file: /cvsroot/wxdevcenter/StdPlugin/GNUmakefile,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** GNUmakefile 25 Aug 2005 14:33:36 -0000 1.7 --- GNUmakefile 25 Aug 2005 17:06:39 -0000 1.8 *************** *** 174,178 **** done $(INSTALL) -d $(prefix)/share/wxDevCenter/conf ! for f in StdPlugin.Text.conf StdPlugin.Text/.conf StdPlugin.Text/ADA.conf StdPlugin.Text/APDL.conf StdPlugin.Text/ASM.conf StdPlugin.Text/ASP.conf StdPlugin.Text/AU3.conf StdPlugin.Text/AVE.conf StdPlugin.Text/BAAM.conf StdPlugin.Text/BASH.conf StdPlugin.Text/Batch.conf StdPlugin.Text/Bullant.conf StdPlugin.Text/CLW-no-case.conf StdPlugin.Text/CLW.conf StdPlugin.Text/Config.conf StdPlugin.Text/CPP-no-case.conf StdPlugin.Text/CPP.conf StdPlugin.Text/CSS.conf StdPlugin.Text/Diff.conf StdPlugin.Text/Eiffel.conf StdPlugin.Text/EiffelKW.conf StdPlugin.Text/ERLANG.conf StdPlugin.Text/Error-list.conf StdPlugin.Text/ESCRIPT.conf StdPlugin.Text/F77.conf StdPlugin.Text/FORTH.conf StdPlugin.Text/Fortran.conf StdPlugin.Text/GUI2CLI.conf StdPlugin.Text/HTML.conf StdPlugin.Text/KIX.conf StdPlugin.Text/LaTeX.conf StdPlugin.Text/Lisp.conf StdPlugin.Text/LOT.conf StdPlugin.Text/LOUT.conf StdPlugin.Text/LUA.conf StdPlugin.Text/Makefile.conf StdPlugin.Text/MATLab.conf StdPlugin.Text/METAPOST.conf StdPlugin.Text/MMIXAL.conf StdPlugin.Text/MS-SQL.conf StdPlugin.Text/NN-Cron-Table.conf StdPlugin.Text/NSIS.conf StdPlugin.Text/Octave.conf StdPlugin.Text/Pascal.conf StdPlugin.Text/Perl.conf StdPlugin.Text/PHP.conf StdPlugin.Text/POV.conf StdPlugin.Text/Power-Basic.conf StdPlugin.Text/Properties.conf StdPlugin.Text/PS.conf StdPlugin.Text/Python.conf StdPlugin.Text/Ruby.conf StdPlugin.Text/Scriptol.conf StdPlugin.Text/SPECMAN.conf StdPlugin.Text/SQL.conf StdPlugin.Text/TCL.conf StdPlugin.Text/TeX.conf StdPlugin.Text/Text.conf StdPlugin.Text/Verilog.conf StdPlugin.Text/Visual-Basic-Script.conf StdPlugin.Text/Visual-Basic.conf StdPlugin.Text/XCode.conf StdPlugin.Text/XML.conf StdPlugin.Text/YAML.conf; do \ if test ! -d $(prefix)/share/wxDevCenter/conf/`dirname $$f` ; then \ $(INSTALL) -d $(prefix)/share/wxDevCenter/conf/`dirname $$f`; \ --- 174,178 ---- done $(INSTALL) -d $(prefix)/share/wxDevCenter/conf ! for f in StdPlugin.Bitmap.conf StdPlugin.Text.conf StdPlugin.Text/.conf StdPlugin.Text/ADA.conf StdPlugin.Text/APDL.conf StdPlugin.Text/ASM.conf StdPlugin.Text/ASP.conf StdPlugin.Text/AU3.conf StdPlugin.Text/AVE.conf StdPlugin.Text/BAAM.conf StdPlugin.Text/BASH.conf StdPlugin.Text/Batch.conf StdPlugin.Text/Bullant.conf StdPlugin.Text/CLW-no-case.conf StdPlugin.Text/CLW.conf StdPlugin.Text/Config.conf StdPlugin.Text/CPP-no-case.conf StdPlugin.Text/CPP.conf StdPlugin.Text/CSS.conf StdPlugin.Text/Diff.conf StdPlugin.Text/Eiffel.conf StdPlugin.Text/EiffelKW.conf StdPlugin.Text/ERLANG.conf StdPlugin.Text/Error-list.conf StdPlugin.Text/ESCRIPT.conf StdPlugin.Text/F77.conf StdPlugin.Text/FORTH.conf StdPlugin.Text/Fortran.conf StdPlugin.Text/GUI2CLI.conf StdPlugin.Text/HTML.conf StdPlugin.Text/KIX.conf StdPlugin.Text/LaTeX.conf StdPlugin.Text/Lisp.conf StdPlugin.Text/LOT.conf StdPlugin.Text/LOUT.conf StdPlugin.Text/LUA.conf StdPlugin.Text/Makefile.conf StdPlugin.Text/MATLab.conf StdPlugin.Text/METAPOST.conf StdPlugin.Text/MMIXAL.conf StdPlugin.Text/MS-SQL.conf StdPlugin.Text/NN-Cron-Table.conf StdPlugin.Text/NSIS.conf StdPlugin.Text/Octave.conf StdPlugin.Text/Pascal.conf StdPlugin.Text/Perl.conf StdPlugin.Text/PHP.conf StdPlugin.Text/POV.conf StdPlugin.Text/Power-Basic.conf StdPlugin.Text/Properties.conf StdPlugin.Text/PS.conf StdPlugin.Text/Python.conf StdPlugin.Text/Ruby.conf StdPlugin.Text/Scriptol.conf StdPlugin.Text/SPECMAN.conf StdPlugin.Text/SQL.conf StdPlugin.Text/TCL.conf StdPlugin.Text/TeX.conf StdPlugin.Text/Text.conf StdPlugin.Text/Verilog.conf StdPlugin.Text/Visual-Basic-Script.conf StdPlugin.Text/Visual-Basic.conf StdPlugin.Text/XCode.conf StdPlugin.Text/XML.conf StdPlugin.Text/YAML.conf; do \ if test ! -d $(prefix)/share/wxDevCenter/conf/`dirname $$f` ; then \ $(INSTALL) -d $(prefix)/share/wxDevCenter/conf/`dirname $$f`; \ |
|
From: Emilien K. <cur...@us...> - 2005-08-25 17:06:50
|
Update of /cvsroot/wxdevcenter/StdPlugin/include/wxDevCenter/StdPlugin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3150/include/wxDevCenter/StdPlugin Modified Files: language.h BitmapProp.h Log Message: Read config and use it to propose many format for bitmap. Index: BitmapProp.h =================================================================== RCS file: /cvsroot/wxdevcenter/StdPlugin/include/wxDevCenter/StdPlugin/BitmapProp.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** BitmapProp.h 25 Aug 2005 14:18:28 -0000 1.4 --- BitmapProp.h 25 Aug 2005 17:06:39 -0000 1.5 *************** *** 20,28 **** struct SizeUnit { ! /** Nom de l'unité.*/ wxString name; /** Symbole.*/ wxString symbol; ! /** Coeficient de conversion depuis un twip (nombre de twip dans une unité).*/ double coef; --- 20,28 ---- struct SizeUnit { ! /** Nom de l'unité.*/ wxString name; /** Symbole.*/ wxString symbol; ! /** Coeficient de conversion depuis un twip (nombre de twip dans une unité).*/ double coef; *************** *** 117,121 **** ! /** Classe de boite de dialogue de configuration des propri�t�s d'une bitmap. * Utile pour modifier la taille d'une bitmap ou meme demander des dimensions de cration. */ --- 117,121 ---- ! /** Classe de boite de dialogue de configuration des propriétés d'une bitmap. * Utile pour modifier la taille d'une bitmap ou meme demander des dimensions de cration. */ *************** *** 131,145 **** /** Hauteur.*/ wxTextCtrl* m_pHeightTextCtrl; ! /** Unité.*/ wxChoice* m_pUnitChoice; ! /** Récapitulatif.*/ wxStaticText* m_pSizeTextCtrl; ! /** Résolution.*/ wxTextCtrl* m_pResTextCtrl; ! /** Unité.*/ wxChoice* m_pResUnitChoice; ! /** Flag de mise à jour.*/ bool m_bIsUpdatingCtrl; public: --- 131,148 ---- /** Hauteur.*/ wxTextCtrl* m_pHeightTextCtrl; ! /** Unité.*/ wxChoice* m_pUnitChoice; ! /** Récapitulatif.*/ wxStaticText* m_pSizeTextCtrl; ! /** Résolution.*/ wxTextCtrl* m_pResTextCtrl; ! /** Unité.*/ wxChoice* m_pResUnitChoice; ! /** Choix d'un format préprogrammé.*/ ! wxChoice* m_pFormatAuto; ! ! /** Flag de mise à jour.*/ bool m_bIsUpdatingCtrl; public: *************** *** 147,162 **** BitmapPropertiesDialog(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER, const wxString& name = wxT("BitmapPropertiesDialog")); ! /** Fixe les propriétés.*/ void SetProperties(const BitmapProperties& BmpProp){m_BmpProp = BmpProp;} ! /** Retourne les propriétés.*/ BitmapProperties GetProperties()const{return m_BmpProp;} ! /** Met à jour les controles.*/ void UpdateCtrl(bool bUpdateSize=true, bool bUpdateRes=true); protected: ! /** Mise à jour initiale.*/ void OnInitialUpdate(wxInitDialogEvent& event); ! /** Interception d'un changement d'unté d'affichage.*/ void OnChangeUnit(wxCommandEvent& event); --- 150,189 ---- BitmapPropertiesDialog(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER, const wxString& name = wxT("BitmapPropertiesDialog")); ! /** Destructor.*/ ! virtual ~BitmapPropertiesDialog(); ! ! /** Fixe les propriétés.*/ void SetProperties(const BitmapProperties& BmpProp){m_BmpProp = BmpProp;} ! /** Retourne les propriétés.*/ BitmapProperties GetProperties()const{return m_BmpProp;} ! /** Met à jour les controles.*/ void UpdateCtrl(bool bUpdateSize=true, bool bUpdateRes=true); + + /** Affiche la taille dans une certaine unitée. + * @param unit Unité.*/ + void ShowSize(const SizeUnit& unit); + /** Affiche la résolution en une certaine unité. + * @param unit Unité.*/ + void ShowRes(const SizeUnit& unit); + /** Affiche la taille dans une certaine unitée. + * @param unit Unité.*/ + void ShowSize(const wxString& unit); + /** Affiche la résolution en une certaine unité. + * @param unit Unité.*/ + void ShowRes(const wxString& unit); + + protected: ! /** Lit les formats préprogrammés et les insere dans le wxChoice.*/ ! void ReadAutoFormat(); ! ! /** Efface tous les formats.*/ ! void ClearFormat(); ! ! /** Mise à jour initiale.*/ void OnInitialUpdate(wxInitDialogEvent& event); ! /** Interception d'un changement d'unté d'affichage.*/ void OnChangeUnit(wxCommandEvent& event); *************** *** 164,170 **** void OnSizeChanged(wxCommandEvent& event); ! /** Interception d'un changement de résolution.*/ void OnResChanged(wxCommandEvent& event); /** Interception de la demande de format paysage.*/ void OnFormatLandscape(wxCommandEvent& event); --- 191,200 ---- void OnSizeChanged(wxCommandEvent& event); ! /** Interception d'un changement de résolution.*/ void OnResChanged(wxCommandEvent& event); + /** Interception de l'application d'un format.*/ + void OnAutoFormat(wxCommandEvent& event); + /** Interception de la demande de format paysage.*/ void OnFormatLandscape(wxCommandEvent& event); Index: language.h =================================================================== RCS file: /cvsroot/wxdevcenter/StdPlugin/include/wxDevCenter/StdPlugin/language.h,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** language.h 23 Aug 2005 15:44:32 -0000 1.16 --- language.h 25 Aug 2005 17:06:39 -0000 1.17 *************** *** 278,281 **** --- 278,283 ---- // Doc/Vue Bitmap + #define WXDC_BITMAP_CONFIG_ROOT wxT("StdPlugin.Bitmap") + #define WXDC_BITMAP_MENU_VIEW wxT("View") #define WXDC_BITMAP_MENU_VIEW_CENTER wxT("Center") |
|
From: Emilien K. <cur...@us...> - 2005-08-25 17:06:50
|
Update of /cvsroot/wxdevcenter/StdPlugin/build In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3150/build Modified Files: install.bkl Log Message: Read config and use it to propose many format for bitmap. Index: install.bkl =================================================================== RCS file: /cvsroot/wxdevcenter/StdPlugin/build/install.bkl,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** install.bkl 25 Aug 2005 14:33:36 -0000 1.7 --- install.bkl 25 Aug 2005 17:06:39 -0000 1.8 *************** *** 96,99 **** --- 96,100 ---- <install-to>$(DATADIR)/wxDevCenter/conf</install-to> <files> + StdPlugin.Bitmap.conf StdPlugin.Text.conf StdPlugin.Text/.conf |
|
From: Emilien K. <cur...@us...> - 2005-08-25 17:06:49
|
Update of /cvsroot/wxdevcenter/StdPlugin/conf In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3150/conf Added Files: StdPlugin.Bitmap.conf Log Message: Read config and use it to propose many format for bitmap. --- NEW FILE: StdPlugin.Bitmap.conf --- [formats] [formats/A4-300] name=A4 paper 300dpi size-x=2480 size-y=3508 res=300 size-unit=Millimeter res-unit=Inch [formats/A4-150] name=A4 paper 150dpi size-x=1240 size-y=1754 res=150 size-unit=Millimeter res-unit=Inch [formats/s640] name=Screen 640x480 size-x=640 size-y=480 res=72 size-unit=Pixel res-unit=Inch [formats/s800] name=Screen 800x600 size-x=800 size-y=600 res=72 size-unit=Pixel res-unit=Inch [formats/s1024] name=Screen 1024x768 size-x=1024 size-y=726 res=72 size-unit=Pixel res-unit=Inch [formats/s1280] name=Screen 1280x1024 size-x=1280 size-y=1024 res=72 size-unit=Pixel res-unit=Inch [formats/icon16] name=Icon 16x16 size-x=16 size-y=16 res=72 size-unit=Pixel res-unit=Inch [formats/icon32] name=Icon 32x32 size-x=32 size-y=32 res=72 size-unit=Pixel res-unit=Inch [formats/icon48] name=Icon 48x48 size-x=48 size-y=48 res=72 size-unit=Pixel res-unit=Inch [formats/icon64] name=Icon 64x64 size-x=64 size-y=64 res=72 size-unit=Pixel res-unit=Inch |
|
From: Emilien K. <cur...@us...> - 2005-08-25 15:49:52
|
Update of /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13725/include/wxDevCenter Modified Files: FileTools.h Log Message: Create a safe function to create directories. Fix user configuration profile creation problem. Index: FileTools.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/FileTools.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** FileTools.h 14 May 2005 12:15:54 -0000 1.6 --- FileTools.h 25 Aug 2005 15:49:25 -0000 1.7 *************** *** 107,115 **** - - - } // Fin des namespaces #endif --- 107,118 ---- + } // Fin des namespaces + /** Crée un répertoire et tous les répertoire ascendants si eux-même n'éxistent pas. + * @param dir Chemin du répertoire à créer. + * @param perm permissions sur le répertoire. + * @return false si le répertoire ne peut être créé.*/ + bool wxSafeMkDir(const wxString& dir, int perm = 0777); #endif |
|
From: Emilien K. <cur...@us...> - 2005-08-25 15:49:52
|
Update of /cvsroot/wxdevcenter/wxDevCenter/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13725/src Modified Files: FileTools.cpp Log Message: Create a safe function to create directories. Fix user configuration profile creation problem. Index: FileTools.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/FileTools.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** FileTools.cpp 14 May 2005 12:15:56 -0000 1.6 --- FileTools.cpp 25 Aug 2005 15:49:25 -0000 1.7 *************** *** 191,192 **** --- 191,209 ---- + ////////////////////////////////////////////////////////////////////// + // Autres fonctions + + // Crée un répertoire et tous les répertoire ascendants si eux-même n'éxistent pas. + bool wxSafeMkDir(const wxString& dir, int perm) + { + wxString strParent = wxPathOnly(dir); + if(!wxDirExists(strParent)) + { + if(!wxSafeMkDir(strParent, perm)) + { + return false; + } + } + return wxMkdir( dir, perm); + } + |
|
From: Emilien K. <cur...@us...> - 2005-08-25 15:49:52
|
Update of /cvsroot/wxdevcenter/wxDevCenter/src/unix In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13725/src/unix Modified Files: Config.cpp Log Message: Create a safe function to create directories. Fix user configuration profile creation problem. Index: Config.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/unix/Config.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Config.cpp 11 Aug 2005 09:58:17 -0000 1.10 --- Config.cpp 25 Aug 2005 15:49:25 -0000 1.11 *************** *** 106,110 **** void ConfigUnix::CreateUserProfile() { ! // Ne fait rien sous unix } --- 106,112 ---- void ConfigUnix::CreateUserProfile() { ! wxString str = GetUserConfPath(); ! if(!wxDirExists(str)) ! wxSafeMkDir(str, 0755); } *************** *** 121,125 **** strDir = strDir.BeforeLast(wxT('/')); if(!wxDirExists(strDir)) ! wxMkDir(strDir, 0777); // Création du répertoire de config utilisateur strDir = GetUserConfPath() + wxT("/") + strSubConfName; --- 123,127 ---- strDir = strDir.BeforeLast(wxT('/')); if(!wxDirExists(strDir)) ! wxSafeMkDir(strDir, 0755); // Création du répertoire de config utilisateur strDir = GetUserConfPath() + wxT("/") + strSubConfName; *************** *** 127,131 **** strDir = strDir.BeforeLast(wxT('/')); if(!wxDirExists(strDir)) ! wxMkDir(strDir, 0777); pFC = new wxFileConfig(strAppName, WXDC_SETUP_VENDOR, --- 129,133 ---- strDir = strDir.BeforeLast(wxT('/')); if(!wxDirExists(strDir)) ! wxSafeMkDir(strDir, 0755); pFC = new wxFileConfig(strAppName, WXDC_SETUP_VENDOR, |
|
From: Emilien K. <cur...@us...> - 2005-08-25 14:33:44
|
Update of /cvsroot/wxdevcenter/StdPlugin/build In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27992/build Modified Files: install.bkl Log Message: Add Landscape and Portrait icons. Separate rules for installing data for Bitmap and Text. Index: install.bkl =================================================================== RCS file: /cvsroot/wxdevcenter/StdPlugin/build/install.bkl,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** install.bkl 24 Aug 2005 10:55:35 -0000 1.6 --- install.bkl 25 Aug 2005 14:33:36 -0000 1.7 *************** *** 20,38 **** </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 ! icons/scintilla.png icons/StdPlugin.Bitmap/brush.png - icons/StdPlugin.Bitmap/dot.png - icons/StdPlugin.Bitmap/dot_dash.png icons/StdPlugin.Bitmap/ellipse.png icons/StdPlugin.Bitmap/handdraw.png icons/StdPlugin.Bitmap/line.png - icons/StdPlugin.Bitmap/long_dash.png icons/StdPlugin.Bitmap/rect.png icons/StdPlugin.Bitmap/rrect.png --- 20,36 ---- </data-files-tree> ! <!-- Install StdPlugin.Bitmap data. --> <data-files-tree > <srcdir>data</srcdir> <install-to>$(DATADIR)/wxDevCenter/data</install-to> <files> + <!-- Document type icon. --> icons/filetypes/bmp.ico ! ! <!-- Drawing tools. --> icons/StdPlugin.Bitmap/brush.png icons/StdPlugin.Bitmap/ellipse.png icons/StdPlugin.Bitmap/handdraw.png icons/StdPlugin.Bitmap/line.png icons/StdPlugin.Bitmap/rect.png icons/StdPlugin.Bitmap/rrect.png *************** *** 45,55 **** icons/StdPlugin.Bitmap/selremove.png icons/StdPlugin.Bitmap/sizeall.png icons/StdPlugin.Bitmap/short_dash.png icons/StdPlugin.Bitmap/solid.png - icons/StdPlugin.Bitmap/spray.png icons/StdPlugin.Bitmap/transparent.png </files> </data-files-tree> <!-- Install feature descriptor. --> <data-files-tree > --- 43,75 ---- icons/StdPlugin.Bitmap/selremove.png icons/StdPlugin.Bitmap/sizeall.png + icons/StdPlugin.Bitmap/spray.png + + <!-- Pen type. --> + icons/StdPlugin.Bitmap/dot.png + icons/StdPlugin.Bitmap/dot_dash.png + icons/StdPlugin.Bitmap/long_dash.png icons/StdPlugin.Bitmap/short_dash.png icons/StdPlugin.Bitmap/solid.png icons/StdPlugin.Bitmap/transparent.png + + <!-- Bitmap format. --> + icons/StdPlugin.Bitmap/landscape.png + icons/StdPlugin.Bitmap/portrait.png </files> </data-files-tree> + <!-- Install StdPlugin.Text data. --> + <data-files-tree > + <srcdir>data</srcdir> + <install-to>$(DATADIR)/wxDevCenter/data</install-to> + <files> + <!-- Document type icon. --> + icons/filetypes/txt.ico + <!-- About pictures. --> + icons/scintilla.png + </files> + </data-files-tree> + + <!-- Install feature descriptor. --> <data-files-tree > |
|
From: Emilien K. <cur...@us...> - 2005-08-25 14:33:44
|
Update of /cvsroot/wxdevcenter/StdPlugin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27992 Modified Files: GNUmakefile Log Message: Add Landscape and Portrait icons. Separate rules for installing data for Bitmap and Text. Index: GNUmakefile =================================================================== RCS file: /cvsroot/wxdevcenter/StdPlugin/GNUmakefile,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** GNUmakefile 24 Aug 2005 10:55:34 -0000 1.6 --- GNUmakefile 25 Aug 2005 14:33:36 -0000 1.7 *************** *** 146,150 **** done $(INSTALL) -d $(prefix)/share/wxDevCenter/data ! for f in icons/filetypes/bmp.ico icons/filetypes/txt.ico icons/scintilla.png icons/StdPlugin.Bitmap/brush.png icons/StdPlugin.Bitmap/dot.png icons/StdPlugin.Bitmap/dot_dash.png icons/StdPlugin.Bitmap/ellipse.png icons/StdPlugin.Bitmap/handdraw.png icons/StdPlugin.Bitmap/line.png icons/StdPlugin.Bitmap/long_dash.png icons/StdPlugin.Bitmap/rect.png icons/StdPlugin.Bitmap/rrect.png icons/StdPlugin.Bitmap/selall.png icons/StdPlugin.Bitmap/selcopy.png icons/StdPlugin.Bitmap/selcut.png icons/StdPlugin.Bitmap/selection.png icons/StdPlugin.Bitmap/selmove.png icons/StdPlugin.Bitmap/selpaste.png icons/StdPlugin.Bitmap/selremove.png icons/StdPlugin.Bitmap/sizeall.png icons/StdPlugin.Bitmap/short_dash.png icons/StdPlugin.Bitmap/solid.png icons/StdPlugin.Bitmap/spray.png icons/StdPlugin.Bitmap/transparent.png; do \ if test ! -d $(prefix)/share/wxDevCenter/data/`dirname $$f` ; then \ $(INSTALL) -d $(prefix)/share/wxDevCenter/data/`dirname $$f`; \ --- 146,157 ---- done $(INSTALL) -d $(prefix)/share/wxDevCenter/data ! for f in icons/filetypes/bmp.ico icons/StdPlugin.Bitmap/brush.png icons/StdPlugin.Bitmap/ellipse.png icons/StdPlugin.Bitmap/handdraw.png icons/StdPlugin.Bitmap/line.png icons/StdPlugin.Bitmap/rect.png icons/StdPlugin.Bitmap/rrect.png icons/StdPlugin.Bitmap/selall.png icons/StdPlugin.Bitmap/selcopy.png icons/StdPlugin.Bitmap/selcut.png icons/StdPlugin.Bitmap/selection.png icons/StdPlugin.Bitmap/selmove.png icons/StdPlugin.Bitmap/selpaste.png icons/StdPlugin.Bitmap/selremove.png icons/StdPlugin.Bitmap/sizeall.png icons/StdPlugin.Bitmap/spray.png icons/StdPlugin.Bitmap/dot.png icons/StdPlugin.Bitmap/dot_dash.png icons/StdPlugin.Bitmap/long_dash.png icons/StdPlugin.Bitmap/short_dash.png icons/StdPlugin.Bitmap/solid.png icons/StdPlugin.Bitmap/transparent.png icons/StdPlugin.Bitmap/landscape.png icons/StdPlugin.Bitmap/portrait.png; do \ ! if test ! -d $(prefix)/share/wxDevCenter/data/`dirname $$f` ; then \ ! $(INSTALL) -d $(prefix)/share/wxDevCenter/data/`dirname $$f`; \ ! fi; \ ! $(INSTALL) -m 644 data//$$f $(prefix)/share/wxDevCenter/data/$$f; \ ! done ! $(INSTALL) -d $(prefix)/share/wxDevCenter/data ! for f in icons/filetypes/txt.ico icons/scintilla.png; do \ if test ! -d $(prefix)/share/wxDevCenter/data/`dirname $$f` ; then \ $(INSTALL) -d $(prefix)/share/wxDevCenter/data/`dirname $$f`; \ |
|
From: Emilien K. <cur...@us...> - 2005-08-25 14:19:17
|
Update of /cvsroot/wxdevcenter/StdPlugin/data/icons/StdPlugin.Bitmap In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23947/data/icons/StdPlugin.Bitmap Added Files: landscape.svg portrait.svg portrait.png landscape.png Log Message: Add Portrait/Landscape format for bitmap properties. --- NEW FILE: portrait.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: landscape.svg --- <?xml version="1.0" encoding="UTF-8" standalone="no"?> <!-- Created with Inkscape (http://www.inkscape.org/) --> <svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://web.resource.org/cc/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" inkscape:export-ydpi="90.000000" inkscape:export-xdpi="90.000000" inkscape:export-filename="/home/mimile/workspace/StdPlugin/data/icons/StdPlugin.Bitmap/landscape.png" sodipodi:docname="landscape.svg" sodipodi:docbase="/home/mimile/workspace/StdPlugin/data/icons/StdPlugin.Bitmap" inkscape:version="0.41" sodipodi:version="0.32" id="svg1291" height="32px" width="32px"> <defs id="defs3" /> <sodipodi:namedview inkscape:window-y="34" inkscape:window-x="0" inkscape:window-height="916" inkscape:window-width="1278" showguides="true" inkscape:document-units="px" inkscape:grid-bbox="true" showgrid="true" inkscape:current-layer="layer1" inkscape:cy="15.609554" inkscape:cx="15.731037" inkscape:zoom="22.395604" inkscape:pageshadow="2" inkscape:pageopacity="0.0" borderopacity="1.0" bordercolor="#666666" pagecolor="#ffffff" id="base" /> <metadata id="metadata4"> <rdf:RDF id="RDF5"> <cc:Work id="Work6" rdf:about=""> <dc:format id="format7">image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" id="type9" /> </cc:Work> </rdf:RDF> </metadata> <g inkscape:groupmode="layer" inkscape:label="Layer 1" id="layer1"> <rect y="7.0000000" x="1.0000000" height="17.000000" width="30.000000" id="rect1301" style="fill:#ffffff;fill-opacity:1.0000000;fill-rule:nonzero;stroke:#000000;stroke-width:1.0000000;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000;stroke-dasharray:none" /> <path sodipodi:nodetypes="ccccccccccccccccc" id="path2065" d="M 13.000000,16.000000 L 22.000000,10.000000 L 31.000000,17.000000 L 31.000000,24.000000 L 1.0000000,24.000000 L 1.0000000,17.532875 L 8.0000000,9.0000000 L 15.902846,20.046124 L 13.000000,16.000000 L 13.000000,16.000000 L 13.000000,16.000000 L 13.000000,16.000000 L 13.000000,16.000000 L 13.000000,16.000000 L 13.000000,16.000000 L 13.000000,16.000000 L 13.000000,16.000000 z " style="stroke-miterlimit:4.0000000;stroke-dasharray:none;stroke-opacity:1.0000000;stroke-linejoin:miter;stroke-linecap:butt;stroke-width:0.40000000;stroke:#000000;fill-rule:evenodd;fill-opacity:1.0000000;fill:#35b23d" /> <path sodipodi:nodetypes="cccc" id="path2826" d="M 7.9926400,9.0044157 L 11.267910,13.580471 L 4.4195289,13.446516 L 7.9926400,9.0044157 z " style="stroke-miterlimit:4.0000000;stroke-dasharray:none;fill:#ffffff;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.40000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" /> <path sodipodi:nodetypes="cccc" id="path4344" d="M 21.951717,10.089990 L 26.120021,13.326497 L 15.119038,14.576742 L 21.951717,10.089990 z " style="fill:#ffffff;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.40000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" /> </g> </svg> --- NEW FILE: portrait.svg --- <?xml version="1.0" encoding="UTF-8" standalone="no"?> <!-- Created with Inkscape (http://www.inkscape.org/) --> <svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://web.resource.org/cc/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" inkscape:export-ydpi="101.25000" inkscape:export-xdpi="101.25000" inkscape:export-filename="/home/mimile/workspace/StdPlugin/data/icons/StdPlugin.Bitmap/portrait.png" sodipodi:docname="portrait.svg" sodipodi:docbase="/home/mimile/workspace/StdPlugin/data/icons/StdPlugin.Bitmap" inkscape:version="0.41" sodipodi:version="0.32" id="svg4372" height="32px" width="32px"> <defs id="defs3" /> <sodipodi:namedview inkscape:window-y="34" inkscape:window-x="0" inkscape:window-height="916" inkscape:window-width="1278" inkscape:document-units="px" inkscape:grid-bbox="true" showgrid="true" inkscape:current-layer="layer1" inkscape:cy="16.530555" inkscape:cx="13.690982" inkscape:zoom="22.627417" inkscape:pageshadow="2" inkscape:pageopacity="0.0" borderopacity="1.0" bordercolor="#666666" pagecolor="#ffffff" id="base" /> <metadata id="metadata4"> <rdf:RDF id="RDF5"> <cc:Work id="Work6" rdf:about=""> <dc:format id="format7">image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" id="type9" /> </cc:Work> </rdf:RDF> </metadata> <g inkscape:groupmode="layer" inkscape:label="Layer 1" id="layer1"> <rect transform="matrix(1.635927e-3,0.999999,-0.999999,1.635927e-3,0.000000,0.000000)" y="-25.037373" x="1.0524247" height="17.000006" width="30.000010" id="rect1301" style="fill:#ffffff;fill-opacity:1.0000000;fill-rule:nonzero;stroke:#000000;stroke-width:1.0000004;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" /> <path transform="translate(-2.740039,-1.073787)" d="M 23.069358 8.7538643 A 3.7786019 5.4800777 0 1 1 15.512154,8.7538643 A 3.7786019 5.4800777 0 1 1 23.069358 8.7538643 z" sodipodi:ry="5.4800777" sodipodi:rx="3.7786019" sodipodi:cy="8.7538643" sodipodi:cx="19.290756" id="path4383" style="fill:#000000;fill-opacity:1.0000000;fill-rule:nonzero;stroke:#000000;stroke-width:0.40000001;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" sodipodi:type="arc" /> <path sodipodi:nodetypes="cccssccc" id="path4385" d="M 16.625000,13.062500 C 14.603268,13.062500 12.822740,14.389616 11.531250,16.500000 C 10.239760,18.610384 9.4374998,21.526462 9.4375000,24.718750 C 9.4375000,25.516822 8.7910945,30.402211 10.141680,30.801247 C 11.492266,31.200283 21.302848,31.200283 22.653434,30.801247 C 24.004020,30.402211 23.843750,25.516822 23.843750,24.718750 C 23.843750,21.526462 23.041490,18.610384 21.750000,16.500000 C 20.458510,14.389616 18.646732,13.062500 16.625000,13.062500 z " style="stroke-opacity:1.0000000;stroke-miterlimit:4.0000000;stroke-linejoin:miter;stroke-width:0.40000001;stroke:none;fill-rule:nonzero;fill-opacity:1.0000000;fill:#000000" /> </g> </svg> --- NEW FILE: landscape.png --- (This appears to be a binary file; contents omitted.) |
|
From: Emilien K. <cur...@us...> - 2005-08-25 14:18:37
|
Update of /cvsroot/wxdevcenter/StdPlugin/include/wxDevCenter/StdPlugin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23685/include/wxDevCenter/StdPlugin Modified Files: BitmapProp.h Log Message: Add Portrait/Landscape format for bitmap properties. Index: BitmapProp.h =================================================================== RCS file: /cvsroot/wxdevcenter/StdPlugin/include/wxDevCenter/StdPlugin/BitmapProp.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** BitmapProp.h 25 Aug 2005 09:17:43 -0000 1.3 --- BitmapProp.h 25 Aug 2005 14:18:28 -0000 1.4 *************** *** 3,7 **** * @author Cursor * ! * @brief D�claration des classes des propri�t�s des bitmaps. */ --- 3,7 ---- * @author Cursor * ! * @brief Déclaration des classes des propri�t�s des bitmaps. */ *************** *** 103,106 **** --- 103,116 ---- * @param unit Unité de la résolution.*/ void SetRes(double dRes, const SizeUnit& unit); + + /** Fixe l'image en mode paysage.*/ + void SetLandscape(); + /** Fixe l'image en mode portrait.*/ + void SetPortrait(); + + /** Teste si l'image est en mode paysage.*/ + bool IsLandscape()const{return m_Size.x>=m_Size.y;} + /** Teste si l'image est en mode portrait.*/ + bool IsPortrait()const{return m_Size.x<m_Size.y;} }; *************** *** 155,159 **** /** Interception d'un changement de résolution.*/ ! void OnResChanged(wxCommandEvent& event); }; --- 165,174 ---- /** Interception d'un changement de résolution.*/ ! void OnResChanged(wxCommandEvent& event); ! ! /** Interception de la demande de format paysage.*/ ! void OnFormatLandscape(wxCommandEvent& event); ! /** Interception de la demande de format portrait.*/ ! void OnFormatPortrait(wxCommandEvent& event); }; |
|
From: Emilien K. <cur...@us...> - 2005-08-25 14:18:37
|
Update of /cvsroot/wxdevcenter/StdPlugin/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23685/src Modified Files: BitmapProp.cpp Log Message: Add Portrait/Landscape format for bitmap properties. Index: BitmapProp.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/StdPlugin/src/BitmapProp.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** BitmapProp.cpp 25 Aug 2005 09:17:43 -0000 1.3 --- BitmapProp.cpp 25 Aug 2005 14:18:28 -0000 1.4 *************** *** 3,7 **** * @author Cursor * ! * @brief Impl�mentation des classes des propri�t�s des bitmaps. */ --- 3,7 ---- * @author Cursor * ! * @brief Implémentation des classes des propriétés des bitmaps. */ *************** *** 9,17 **** #include <wxDevCenter/StdPlugin/BitmapProp.h> using namespace wxDevCenter; using namespace StdPlugin::Bitmap; ////////////////////////////////////////////////////////////////////// ! // Unités de mesures. ////////////////////////////////////////////////////////////////////// --- 9,20 ---- #include <wxDevCenter/StdPlugin/BitmapProp.h> + #include <wx/bmpbuttn.h> + #include <wx/artprov.h> + using namespace wxDevCenter; using namespace StdPlugin::Bitmap; ////////////////////////////////////////////////////////////////////// ! // Unités de mesures. ////////////////////////////////////////////////////////////////////// *************** *** 99,102 **** --- 102,128 ---- } + // Fixe l'image en mode paysage. + void BitmapProperties::SetLandscape() + { + if(IsPortrait()) + { + wxCoord temp; + temp = m_Size.x; + m_Size.x = m_Size.y; + m_Size.y = temp; + } + } + + // Fixe l'image en mode portrait. + void BitmapProperties::SetPortrait() + { + if(IsLandscape()) + { + wxCoord temp; + temp = m_Size.x; + m_Size.x = m_Size.y; + m_Size.y = temp; + } + } *************** *** 107,114 **** #define ID_WIDTH_TEXT_CTRL 20 #define ID_HEIGHT_TEXT_CTRL 21 ! #define ID_UNIT_CHOICE 22 ! #define ID_SIZETEXT_CTRL 23 ! #define ID_RES_TEXT_CTRL 24 ! #define ID_RESUNIT_CHOICE 25 BEGIN_EVENT_TABLE(BitmapPropertiesDialog, wxDialog) --- 133,142 ---- #define ID_WIDTH_TEXT_CTRL 20 #define ID_HEIGHT_TEXT_CTRL 21 ! #define ID_LANDSCAPE 22 ! #define ID_PORTRAIT 23 ! #define ID_UNIT_CHOICE 24 ! #define ID_SIZETEXT_CTRL 25 ! #define ID_RES_TEXT_CTRL 26 ! #define ID_RESUNIT_CHOICE 27 BEGIN_EVENT_TABLE(BitmapPropertiesDialog, wxDialog) *************** *** 119,122 **** --- 147,153 ---- EVT_TEXT(ID_RES_TEXT_CTRL, BitmapPropertiesDialog::OnResChanged) + EVT_BUTTON(ID_LANDSCAPE, BitmapPropertiesDialog::OnFormatLandscape) + EVT_BUTTON(ID_PORTRAIT, BitmapPropertiesDialog::OnFormatPortrait) + EVT_CHOICE(ID_UNIT_CHOICE, BitmapPropertiesDialog::OnChangeUnit) EVT_CHOICE(ID_RESUNIT_CHOICE, BitmapPropertiesDialog::OnChangeUnit) *************** *** 136,142 **** m_pResUnitChoice = new wxChoice(this, ID_RESUNIT_CHOICE, wxDefaultPosition, wxDefaultSize, 0, NULL); // Mise en page ! wxSizer* pLineSizer; wxSizer* pGlobalSizer = new wxBoxSizer(wxVERTICAL); // Zone de taille --- 167,177 ---- m_pResUnitChoice = new wxChoice(this, ID_RESUNIT_CHOICE, wxDefaultPosition, wxDefaultSize, 0, NULL); + wxBitmapButton *pBmp1 = new wxBitmapButton(this, ID_LANDSCAPE, wxArtProvider::GetIcon(wxT("StdPlugin.Bitmap/landscape"), wxART_BUTTON, wxSize(16, 16))), + *pBmp2 = new wxBitmapButton(this, ID_PORTRAIT, wxArtProvider::GetIcon(wxT("StdPlugin.Bitmap/portrait"), wxART_BUTTON, wxSize(16, 16))); + // Mise en page ! wxSizer* pLineSizer, *pSizer;; wxSizer* pGlobalSizer = new wxBoxSizer(wxVERTICAL); + // Zone de taille *************** *** 145,149 **** pLineSizer->Add(new wxStaticText(this, -1, wxT("Largeur : ")), 0, wxEXPAND|wxALL, 4); pLineSizer->Add(m_pWidthTextCtrl, 0, wxEXPAND|wxALL, 4); ! pLineSizer->AddStretchSpacer(1); pLineSizer->Add(new wxStaticText(this, -1, wxT("Longueur : ")), 0, wxEXPAND|wxALL, 4); pLineSizer->Add(m_pHeightTextCtrl, 0, wxEXPAND|wxALL, 4); --- 180,187 ---- pLineSizer->Add(new wxStaticText(this, -1, wxT("Largeur : ")), 0, wxEXPAND|wxALL, 4); pLineSizer->Add(m_pWidthTextCtrl, 0, wxEXPAND|wxALL, 4); ! pSizer = new wxBoxSizer(wxHORIZONTAL); ! pSizer->Add(pBmp1, 0, wxCENTER|wxALL, 4); ! pSizer->Add(pBmp2, 0, wxCENTER|wxALL, 4); ! pLineSizer->Add(pSizer, 0, wxCENTER|wxALL, 4); pLineSizer->Add(new wxStaticText(this, -1, wxT("Longueur : ")), 0, wxEXPAND|wxALL, 4); pLineSizer->Add(m_pHeightTextCtrl, 0, wxEXPAND|wxALL, 4); *************** *** 291,292 **** --- 329,344 ---- } + // Interception de la demande de format paysage. + void BitmapPropertiesDialog::OnFormatLandscape(wxCommandEvent& WXUNUSED(event)) + { + m_BmpProp.SetLandscape(); + UpdateCtrl(); + } + + // Interception de la demande de format portrait. + void BitmapPropertiesDialog::OnFormatPortrait(wxCommandEvent& WXUNUSED(event)) + { + m_BmpProp.SetPortrait(); + UpdateCtrl(); + } + |
|
From: Emilien K. <cur...@us...> - 2005-08-25 09:17:51
|
Update of /cvsroot/wxdevcenter/StdPlugin/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24776/src Modified Files: BitmapProp.cpp Log Message: Add resolution system in the bitmap properties dialog. Index: BitmapProp.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/StdPlugin/src/BitmapProp.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** BitmapProp.cpp 24 Aug 2005 15:43:30 -0000 1.2 --- BitmapProp.cpp 25 Aug 2005 09:17:43 -0000 1.3 *************** *** 74,79 **** wxRealPoint BitmapProperties::GetSize(const SizeUnit& unit)const { ! return wxRealPoint(SizeUnit::Convert(GetSize().x/GetRes(), Units::Point, unit), ! SizeUnit::Convert(GetSize().y/GetRes(), Units::Point, unit)); } --- 74,79 ---- wxRealPoint BitmapProperties::GetSize(const SizeUnit& unit)const { ! return wxRealPoint(SizeUnit::Convert(GetSize().x/GetRes(), Units::Inch, unit), ! SizeUnit::Convert(GetSize().y/GetRes(), Units::Inch, unit)); } *************** *** 81,85 **** double BitmapProperties::GetRes(const SizeUnit& unit)const { ! return SizeUnit::Convert(GetRes(), Units::Point, unit); } --- 81,85 ---- double BitmapProperties::GetRes(const SizeUnit& unit)const { ! return SizeUnit::Convert(GetRes(), Units::Inch, unit); } *************** *** 88,93 **** void BitmapProperties::SetSize(wxRealPoint size, const SizeUnit& unit) { ! SetSize(wxSize( (wxCoord) (SizeUnit::Convert(size.x, unit, Units::Point) * GetRes()) , ! (wxCoord) (SizeUnit::Convert(size.y, unit, Units::Point) * GetRes()) )); } --- 88,93 ---- void BitmapProperties::SetSize(wxRealPoint size, const SizeUnit& unit) { ! SetSize(wxSize( (wxCoord) (SizeUnit::Convert(size.x, unit, Units::Inch) * GetRes()) , ! (wxCoord) (SizeUnit::Convert(size.y, unit, Units::Inch) * GetRes()) )); } *************** *** 96,100 **** void BitmapProperties::SetRes(double dRes, const SizeUnit& unit) { ! SetRes(SizeUnit::Convert(dRes, unit, Units::Point)); } --- 96,100 ---- void BitmapProperties::SetRes(double dRes, const SizeUnit& unit) { ! SetRes(SizeUnit::Convert(dRes, unit, Units::Inch)); } *************** *** 117,120 **** --- 117,121 ---- EVT_TEXT(ID_WIDTH_TEXT_CTRL, BitmapPropertiesDialog::OnSizeChanged) EVT_TEXT(ID_HEIGHT_TEXT_CTRL, BitmapPropertiesDialog::OnSizeChanged) + EVT_TEXT(ID_RES_TEXT_CTRL, BitmapPropertiesDialog::OnResChanged) EVT_CHOICE(ID_UNIT_CHOICE, BitmapPropertiesDialog::OnChangeUnit) *************** *** 124,128 **** // Standard constructor. BitmapPropertiesDialog::BitmapPropertiesDialog(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style, const wxString& name): ! wxDialog(parent, id, title, pos, size, style, name) { // Création des controles. --- 125,130 ---- // Standard constructor. BitmapPropertiesDialog::BitmapPropertiesDialog(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style, const wxString& name): ! wxDialog(parent, id, title, pos, size, style, name), ! m_bIsUpdatingCtrl(false) { // Création des controles. *************** *** 131,139 **** m_pUnitChoice = new wxChoice(this, ID_UNIT_CHOICE, wxDefaultPosition, wxDefaultSize, 0, NULL); m_pSizeTextCtrl = new wxStaticText(this, ID_SIZETEXT_CTRL, wxT("")); - m_pResTextCtrl = new wxTextCtrl(this, ID_RES_TEXT_CTRL, wxT("72.0")); m_pResUnitChoice = new wxChoice(this, ID_RESUNIT_CHOICE, wxDefaultPosition, wxDefaultSize, 0, NULL); - // Mise en page wxSizer* pLineSizer; --- 133,139 ---- *************** *** 193,196 **** --- 193,198 ---- SizeUnit* pUnit; + m_bIsUpdatingCtrl = true; + // Zone de taille. if(bUpdateSize) *************** *** 226,231 **** // Récapitulatif de taille. ! m_pSizeTextCtrl->SetLabel(wxString::Format(wxT("%dx%d pixels - %gppp"), m_BmpProp.GetSize().x,m_BmpProp.GetSize().y, m_BmpProp.GetRes())); } --- 228,234 ---- // Récapitulatif de taille. ! m_pSizeTextCtrl->SetLabel(wxString::Format(wxT("%dx%d pixels - %gppp"), m_BmpProp.GetSize().x,m_BmpProp.GetSize().y, m_BmpProp.GetRes(Units::Inch))); + m_bIsUpdatingCtrl = false; } *************** *** 233,237 **** void BitmapPropertiesDialog::OnChangeUnit(wxCommandEvent& WXUNUSED(event)) { ! UpdateCtrl(); } --- 236,241 ---- void BitmapPropertiesDialog::OnChangeUnit(wxCommandEvent& WXUNUSED(event)) { ! if(!m_bIsUpdatingCtrl) ! UpdateCtrl(); } *************** *** 239,272 **** void BitmapPropertiesDialog::OnSizeChanged(wxCommandEvent& WXUNUSED(event)) { ! SizeUnit* pUnit; ! int id = m_pUnitChoice->GetSelection(); ! ! if(id==wxNOT_FOUND || id==0) ! { ! long lX, lY; ! if(!m_pWidthTextCtrl->GetValue().ToLong(&lX, 0)) ! lX = m_BmpProp.GetSize().x; ! if(!m_pHeightTextCtrl->GetValue().ToLong(&lY, 0)) ! lY = m_BmpProp.GetSize().y; ! m_BmpProp.SetSize(wxSize(lX, lY)); ! } ! else { ! double dX, dY; ! pUnit = (SizeUnit*) m_pUnitChoice->GetClientData(id); ! if(!m_pWidthTextCtrl->GetValue().ToDouble(&dX)) ! dX = m_BmpProp.GetSize(*pUnit).x; ! if(!m_pHeightTextCtrl->GetValue().ToDouble(&dY)) ! dY = m_BmpProp.GetSize(*pUnit).y; ! m_BmpProp.SetSize(wxRealPoint(dX, dY), *pUnit); } - - UpdateCtrl(false, true); } // Interception d'un changement de résolution. ! void BitmapPropertiesDialog::OnResChanged(wxCommandEvent& event) { ! UpdateCtrl(true, false); } --- 243,292 ---- void BitmapPropertiesDialog::OnSizeChanged(wxCommandEvent& WXUNUSED(event)) { ! if(!m_bIsUpdatingCtrl) { ! SizeUnit* pUnit; ! int id = m_pUnitChoice->GetSelection(); ! ! if(id==wxNOT_FOUND || id==0) ! { ! long lX, lY; ! if(!m_pWidthTextCtrl->GetValue().ToLong(&lX, 0)) ! lX = m_BmpProp.GetSize().x; ! if(!m_pHeightTextCtrl->GetValue().ToLong(&lY, 0)) ! lY = m_BmpProp.GetSize().y; ! m_BmpProp.SetSize(wxSize(lX, lY)); ! } ! else ! { ! double dX, dY; ! pUnit = (SizeUnit*) m_pUnitChoice->GetClientData(id); ! if(!m_pWidthTextCtrl->GetValue().ToDouble(&dX)) ! dX = m_BmpProp.GetSize(*pUnit).x; ! if(!m_pHeightTextCtrl->GetValue().ToDouble(&dY)) ! dY = m_BmpProp.GetSize(*pUnit).y; ! m_BmpProp.SetSize(wxRealPoint(dX, dY), *pUnit); ! } ! ! UpdateCtrl(false, true); } } // Interception d'un changement de résolution. ! void BitmapPropertiesDialog::OnResChanged(wxCommandEvent& WXUNUSED(event)) { ! if(!m_bIsUpdatingCtrl) ! { ! SizeUnit* pUnit; ! int id = m_pResUnitChoice->GetSelection(); ! if(id!=wxNOT_FOUND) ! { ! pUnit = (SizeUnit*) m_pResUnitChoice->GetClientData(id); ! double dR; ! if(!m_pResTextCtrl->GetValue().ToDouble(&dR)) ! dR = m_BmpProp.GetRes(*pUnit); ! m_BmpProp.SetRes(dR, *pUnit); ! UpdateCtrl(true, false); ! } ! } } |
|
From: Emilien K. <cur...@us...> - 2005-08-25 09:17:51
|
Update of /cvsroot/wxdevcenter/StdPlugin/include/wxDevCenter/StdPlugin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24776/include/wxDevCenter/StdPlugin Modified Files: BitmapProp.h Log Message: Add resolution system in the bitmap properties dialog. Index: BitmapProp.h =================================================================== RCS file: /cvsroot/wxdevcenter/StdPlugin/include/wxDevCenter/StdPlugin/BitmapProp.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** BitmapProp.h 24 Aug 2005 15:43:30 -0000 1.2 --- BitmapProp.h 25 Aug 2005 09:17:43 -0000 1.3 *************** *** 34,38 **** static double Convert(double d, const SizeUnit& UnitIn, const SizeUnit& UnitOut) { ! return d*UnitIn.coef/UnitOut.coef; } --- 34,38 ---- static double Convert(double d, const SizeUnit& UnitIn, const SizeUnit& UnitOut) { ! return d*(UnitIn.coef/UnitOut.coef); } *************** *** 59,63 **** /** Taille en pixels.*/ wxSize m_Size; ! /** Résolution en ppp (point per pixel).*/ double m_dRes; public: --- 59,63 ---- /** Taille en pixels.*/ wxSize m_Size; ! /** Résolution en ppp (pixel par pouce).*/ double m_dRes; public: *************** *** 73,77 **** wxSize GetSize()const{return m_Size;} /** Retourne la résolution. ! * @return Résolution en ppp.*/ double GetRes()const{return m_dRes;} --- 73,77 ---- wxSize GetSize()const{return m_Size;} /** Retourne la résolution. ! * @return Résolution en ppp (pixel par pouce).*/ double GetRes()const{return m_dRes;} *************** *** 80,84 **** void SetSize(wxSize size){m_Size = size;}; /** Fixe la résolution. ! * @param dRes Nouvelle résolution en ppp.*/ void SetRes(double dRes){m_dRes = dRes;} --- 80,84 ---- void SetSize(wxSize size){m_Size = size;}; /** Fixe la résolution. ! * @param dRes Nouvelle résolution en ppp (pixel par pouce).*/ void SetRes(double dRes){m_dRes = dRes;} *************** *** 131,134 **** --- 131,136 ---- wxChoice* m_pResUnitChoice; + /** Flag de mise à jour.*/ + bool m_bIsUpdatingCtrl; public: /** Standard constructor.*/ |
|
From: Emilien K. <cur...@us...> - 2005-08-24 16:31:31
|
Update of /cvsroot/wxdevcenter/StdPlugin/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11890/src Modified Files: BitmapDocView.cpp Log Message: Cancel the bitmap document creation if the user click 'cancel' in the bitmap properties dialog box. Index: BitmapDocView.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/StdPlugin/src/BitmapDocView.cpp,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** BitmapDocView.cpp 24 Aug 2005 16:27:25 -0000 1.29 --- BitmapDocView.cpp 24 Aug 2005 16:31:24 -0000 1.30 *************** *** 651,656 **** ClearCommands(); Do(new action::Create(this)); } ! return true; } --- 651,658 ---- ClearCommands(); Do(new action::Create(this)); + return true; } ! else ! return false; } |
