Change the "Change font..." icon

This commit is contained in:
Victor Levasseur
2015-07-29 23:21:18 +02:00
parent 25230a4437
commit 0d13ce8d76
4 changed files with 32 additions and 34 deletions

View File

@@ -40,7 +40,7 @@ TextObjectEditorBase::TextObjectEditorBase(wxWindow* parent, wxWindowID id, cons
#endif
m_toolbar->AddControl(m_fontTextCtrl);
m_toolbar->AddTool(CHANGE_FONT_BUTTON, wxT(""), wxXmlResource::Get()->LoadBitmap(wxT("texteicon")), wxNullBitmap, wxITEM_NORMAL, _("Change the font file"), wxT(""), NULL);
m_toolbar->AddTool(CHANGE_FONT_BUTTON, wxT(""), wxXmlResource::Get()->LoadBitmap(wxT("open16")), wxNullBitmap, wxITEM_NORMAL, _("Change the font file"), wxT(""), NULL);
m_toolbar->AddSeparator();

View File

@@ -115,21 +115,19 @@ static unsigned char xml_res_file_2[] = {
195,101,100,5,140,112,95,232,50,204,103,208,96,184,204,208,177,116,35,178,
2,0,165,16,69,66,24,11,10,65,0,0,0,0,73,69,78,68,174,66,96,130};
static size_t xml_res_size_3 = 290;
static size_t xml_res_size_3 = 248;
static unsigned char xml_res_file_3[] = {
137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,16,0,0,0,16,8,4,0,0,
0,181,250,55,234,0,0,0,32,99,72,82,77,0,0,122,38,0,0,128,132,0,0,250,0,
137,80,78,71,13,10,26,10,0,0,0,13,73,72,68,82,0,0,0,16,0,0,0,16,4,3,0,0,
0,237,221,226,82,0,0,0,32,99,72,82,77,0,0,122,38,0,0,128,132,0,0,250,0,
0,0,128,232,0,0,117,48,0,0,234,96,0,0,58,152,0,0,23,112,156,186,81,60,0,
0,0,2,98,75,71,68,0,255,135,143,204,191,0,0,0,175,73,68,65,84,40,207,205,
209,33,75,67,97,20,135,241,31,215,186,182,116,133,193,210,202,108,87,100,
69,120,225,38,139,193,180,112,187,88,76,130,96,53,238,83,236,35,44,202,
64,6,182,149,33,88,246,6,251,187,162,114,191,128,229,94,223,96,23,79,58,
156,255,195,121,14,28,254,75,85,22,191,102,141,6,142,16,44,29,60,187,115,
46,25,186,150,204,221,251,180,166,192,20,239,248,114,33,58,243,36,26,227,
35,11,94,192,68,116,41,128,135,94,90,96,102,15,34,70,54,224,212,107,6,106,
187,110,215,74,221,117,39,182,249,222,168,234,84,65,84,162,20,251,176,248,
193,130,214,6,87,56,198,32,3,111,110,52,30,181,42,73,141,86,114,251,103,
95,248,6,87,138,38,84,104,89,45,121,0,0,0,0,73,69,78,68,174,66,96,130};
0,0,33,80,76,84,69,255,255,255,60,70,152,52,63,147,60,71,152,36,50,133,
231,231,232,249,250,250,255,255,255,35,156,207,61,171,223,76,177,228,102,
43,178,207,0,0,0,2,116,82,78,83,0,166,73,38,203,229,0,0,0,1,98,75,71,68,
0,136,5,29,72,0,0,0,75,73,68,65,84,8,215,99,96,128,1,38,99,99,1,48,131,
69,217,216,16,194,112,50,6,1,3,6,150,208,244,114,32,48,96,224,232,232,92,
5,4,11,128,140,142,89,48,70,39,140,1,18,130,48,58,97,12,160,16,148,209,
9,99,116,204,130,49,58,97,140,142,9,112,87,0,0,250,23,46,18,71,134,209,
10,0,0,0,0,73,69,78,68,174,66,96,130};
static size_t xml_res_size_4 = 383;
static unsigned char xml_res_file_4[] = {
@@ -152,7 +150,7 @@ static unsigned char xml_res_file_4[] = {
239,56,140,118,180,163,29,43,17,74,156,52,223,85,61,158,38,183,129,74,119,
180,82,29,90,183,0,0,0,0,73,69,78,68,174,66,96,130};
static size_t xml_res_size_5 = 878;
static size_t xml_res_size_5 = 886;
static unsigned char xml_res_file_5[] = {
60,63,120,109,108,32,118,101,114,115,105,111,110,61,34,49,46,48,34,32,101,
110,99,111,100,105,110,103,61,34,85,84,70,45,56,34,63,62,10,60,114,101,
@@ -182,22 +180,22 @@ static unsigned char xml_res_file_5[] = {
100,111,119,115,95,114,101,115,95,97,99,116,105,111,110,115,95,105,116,
97,108,105,99,49,54,46,112,110,103,60,47,111,98,106,101,99,116,62,10,32,
32,60,111,98,106,101,99,116,32,99,108,97,115,115,61,34,119,120,66,105,116,
109,97,112,34,32,110,97,109,101,61,34,116,101,120,116,101,105,99,111,110,
34,62,84,101,120,116,79,98,106,101,99,116,68,105,97,108,111,103,115,95,
116,101,120,116,111,98,106,101,99,116,95,98,105,116,109,97,112,115,46,99,
112,112,36,46,46,95,46,46,95,46,46,95,66,105,110,97,114,105,101,115,95,
79,117,116,112,117,116,95,82,101,108,101,97,115,101,95,87,105,110,100,111,
119,115,95,114,101,115,95,116,101,120,116,101,105,99,111,110,46,112,110,
103,60,47,111,98,106,101,99,116,62,10,32,32,60,111,98,106,101,99,116,32,
99,108,97,115,115,61,34,119,120,66,105,116,109,97,112,34,32,110,97,109,
101,61,34,117,110,100,101,114,108,105,110,101,49,54,34,62,84,101,120,116,
79,98,106,101,99,116,68,105,97,108,111,103,115,95,116,101,120,116,111,98,
106,101,99,116,95,98,105,116,109,97,112,115,46,99,112,112,36,46,46,95,46,
46,95,46,46,95,66,105,110,97,114,105,101,115,95,79,117,116,112,117,116,
95,82,101,108,101,97,115,101,95,87,105,110,100,111,119,115,95,114,101,115,
95,97,99,116,105,111,110,115,95,117,110,100,101,114,108,105,110,101,49,
54,46,112,110,103,60,47,111,98,106,101,99,116,62,10,60,47,114,101,115,111,
117,114,99,101,62,10};
109,97,112,34,32,110,97,109,101,61,34,111,112,101,110,49,54,34,62,84,101,
120,116,79,98,106,101,99,116,68,105,97,108,111,103,115,95,116,101,120,116,
111,98,106,101,99,116,95,98,105,116,109,97,112,115,46,99,112,112,36,46,
46,95,46,46,95,46,46,95,66,105,110,97,114,105,101,115,95,79,117,116,112,
117,116,95,82,101,108,101,97,115,101,95,87,105,110,100,111,119,115,95,114,
101,115,95,105,99,111,110,115,95,100,101,102,97,117,108,116,95,111,112,
101,110,49,54,46,112,110,103,60,47,111,98,106,101,99,116,62,10,32,32,60,
111,98,106,101,99,116,32,99,108,97,115,115,61,34,119,120,66,105,116,109,
97,112,34,32,110,97,109,101,61,34,117,110,100,101,114,108,105,110,101,49,
54,34,62,84,101,120,116,79,98,106,101,99,116,68,105,97,108,111,103,115,
95,116,101,120,116,111,98,106,101,99,116,95,98,105,116,109,97,112,115,46,
99,112,112,36,46,46,95,46,46,95,46,46,95,66,105,110,97,114,105,101,115,
95,79,117,116,112,117,116,95,82,101,108,101,97,115,101,95,87,105,110,100,
111,119,115,95,114,101,115,95,97,99,116,105,111,110,115,95,117,110,100,
101,114,108,105,110,101,49,54,46,112,110,103,60,47,111,98,106,101,99,116,
62,10,60,47,114,101,115,111,117,114,99,101,62,10};
void wxC9DFDInitBitmapResources()
{
@@ -215,7 +213,7 @@ void wxC9DFDInitBitmapResources()
XRC_ADD_FILE(wxT("XRC_resource/TextObjectDialogs_textobject_bitmaps.cpp$.._.._.._Binaries_Output_Release_Windows_res_actions_bold16.png"), xml_res_file_0, xml_res_size_0, wxT("image/png"));
XRC_ADD_FILE(wxT("XRC_resource/TextObjectDialogs_textobject_bitmaps.cpp$.._.._.._Binaries_Output_Release_Windows_res_error.png"), xml_res_file_1, xml_res_size_1, wxT("image/png"));
XRC_ADD_FILE(wxT("XRC_resource/TextObjectDialogs_textobject_bitmaps.cpp$.._.._.._Binaries_Output_Release_Windows_res_actions_italic16.png"), xml_res_file_2, xml_res_size_2, wxT("image/png"));
XRC_ADD_FILE(wxT("XRC_resource/TextObjectDialogs_textobject_bitmaps.cpp$.._.._.._Binaries_Output_Release_Windows_res_texteicon.png"), xml_res_file_3, xml_res_size_3, wxT("image/png"));
XRC_ADD_FILE(wxT("XRC_resource/TextObjectDialogs_textobject_bitmaps.cpp$.._.._.._Binaries_Output_Release_Windows_res_icons_default_open16.png"), xml_res_file_3, xml_res_size_3, wxT("image/png"));
XRC_ADD_FILE(wxT("XRC_resource/TextObjectDialogs_textobject_bitmaps.cpp$.._.._.._Binaries_Output_Release_Windows_res_actions_underline16.png"), xml_res_file_4, xml_res_size_4, wxT("image/png"));
XRC_ADD_FILE(wxT("XRC_resource/TextObjectDialogs_textobject_bitmaps.cpp$E__Developpement_GD_Extensions_TextObject_Dialogs_TextObjectDialogs_textobject_bitmaps.xrc"), xml_res_file_5, xml_res_size_5, wxT("text/xml"));
wxXmlResource::Get()->Load(wxT("memory:XRC_resource/TextObjectDialogs_textobject_bitmaps.cpp$E__Developpement_GD_Extensions_TextObject_Dialogs_TextObjectDialogs_textobject_bitmaps.xrc"));

View File

@@ -3,6 +3,6 @@
<object class="wxBitmap" name="bold16">..\..\..\Binaries\Output\Release_Windows\res\actions\bold16.png</object>
<object class="wxBitmap" name="error">..\..\..\Binaries\Output\Release_Windows\res\error.png</object>
<object class="wxBitmap" name="italic16">..\..\..\Binaries\Output\Release_Windows\res\actions\italic16.png</object>
<object class="wxBitmap" name="texteicon">..\..\..\Binaries\Output\Release_Windows\res\texteicon.png</object>
<object class="wxBitmap" name="open16">..\..\..\Binaries\Output\Release_Windows\res\icons_default\open16.png</object>
<object class="wxBitmap" name="underline16">..\..\..\Binaries\Output\Release_Windows\res\actions\underline16.png</object>
</resource>

View File

@@ -351,7 +351,7 @@
}, {
"type": "bitmapPicker",
"m_label": "Bitmap File:",
"m_path": "../../../Binaries/Output/Release_Windows/res/texteicon.png"
"m_path": "../../../Binaries/Output/Release_Windows/res/icons_default/open16.png"
}, {
"type": "filePicker",
"m_label": "Disabled-Bitmap File",