Kalakoi/GDevelop
1
0
Fork 0
mirror of https://github.com/4ian/GDevelop.git synced 2025-10-15 10:19:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add help buttons on TileSet/MapConfig dialogs

Browse Source
This commit is contained in:
victorlevasseur
2014-09-03 12:53:53 +02:00
parent 0d4ea49b55
commit b0e02ca6a6
12 changed files with 897 additions and 299 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Binaries/Output/Release_Windows/locale/fr_FR/TileMapObject.mo
View File

Binary file not shown.

198
Binaries/Output/Release_Windows/locale/fr_FR/TileMapObject.po
View File

@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Game Develop\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-09-01 10:53+0100\n"
"POT-Creation-Date: 2014-09-03 12:50+0100\n"
"PO-Revision-Date: \n"
"Last-Translator: Victor Levasseur <victorlevasseur01@orange.fr>\n"
"Language-Team: Florian \"4ian\" Rival <Florian.rival@gmail.com>\n"
@@ -15,105 +15,139 @@ msgstr ""
"X-Poedit-Basepath: ../../../../..\n"
"X-Poedit-SearchPath-0: Extensions/TileMapObject\n"
#: Extensions/TileMapObject/Extension.cpp:41
#: Extensions/TileMapObject/Extension.cpp:40
#: Extensions/TileMapObject/Extension.cpp:88
msgid "Tile Map Object"
msgstr "Objet carte de tuiles"
#: Extensions/TileMapObject/Extension.cpp:42
#: Extensions/TileMapObject/Extension.cpp:41
msgid "Extension allowing to use tile map objects."
msgstr ""
"Extension permettant d'utiliser des objets pour dessiner un carte avec des "
"tuiles."
#: Extensions/TileMapObject/Extension.cpp:47
#: Extensions/TileMapObject/Extension.cpp:46
msgid "Tile Map"
msgstr "Carte de tuiles"
#: Extensions/TileMapObject/Extension.cpp:48
#: Extensions/TileMapObject/Extension.cpp:47
msgid "Displays a tile map"
msgstr "Affiche une carte de tuiles"
#: Extensions/TileMapObject/Extension.cpp:57
#: Extensions/TileMapObject/Extension.cpp:56
msgid "Width"
msgstr "Largeur"
#: Extensions/TileMapObject/Extension.cpp:58
#: Extensions/TileMapObject/Extension.cpp:57
msgid "Test the width of a Tile Map Object."
msgstr "Teste la largeur d'un objet Carte de tuiles."
#: Extensions/TileMapObject/Extension.cpp:59
#: Extensions/TileMapObject/Extension.cpp:58
msgid "The width of _PARAM0_ is _PARAM1__PARAM2_"
msgstr "La largeur de _PARAM0_ est _PARAM1__PARAM2_"
#: Extensions/TileMapObject/Extension.cpp:60
#: Extensions/TileMapObject/Extension.cpp:73
#: Extensions/TileMapObject/Extension.cpp:59
#: Extensions/TileMapObject/Extension.cpp:72
msgid "Size"
msgstr "Taille"
#: Extensions/TileMapObject/Extension.cpp:63
#: Extensions/TileMapObject/Extension.cpp:76
#: Extensions/TileMapObject/Extension.cpp:62
#: Extensions/TileMapObject/Extension.cpp:75
#: Extensions/TileMapObject/Extension.cpp:92
msgid "Object"
msgstr "Objet"
#: Extensions/TileMapObject/Extension.cpp:64
#: Extensions/TileMapObject/Extension.cpp:77
#: Extensions/TileMapObject/Extension.cpp:63
#: Extensions/TileMapObject/Extension.cpp:76
msgid "Sign of the test"
msgstr "Signe du test"
#: Extensions/TileMapObject/Extension.cpp:65
#: Extensions/TileMapObject/Extension.cpp:78
#: Extensions/TileMapObject/Extension.cpp:64
#: Extensions/TileMapObject/Extension.cpp:77
msgid "Value to test"
msgstr "Valeur à tester"
#: Extensions/TileMapObject/Extension.cpp:70
#: Extensions/TileMapObject/Extension.cpp:69
msgid "Height"
msgstr "Hauteur"
#: Extensions/TileMapObject/Extension.cpp:71
#: Extensions/TileMapObject/Extension.cpp:70
msgid "Test the height of a Tile Map Object."
msgstr "Teste la hauteur d'un objet Carte de tuiles."
#: Extensions/TileMapObject/Extension.cpp:72
#: Extensions/TileMapObject/Extension.cpp:71
msgid "The height of _PARAM0_ is _PARAM1__PARAM2_"
msgstr "La hauteur de _PARAM0_ est _PARAM1__PARAM2_"
#: Extensions/TileMapObject/TileEditor.cpp:18
#: Extensions/TileMapObject/Extension.cpp:82
msgid "Collision with one tile"
msgstr "Collision avec une tuile"
#: Extensions/TileMapObject/Extension.cpp:83
msgid "Test if an object collides a specific tile."
msgstr "Teste si un objet est en collision avec une tuile."
#: Extensions/TileMapObject/Extension.cpp:84
msgid ""
"_PARAM4_ is in collision with the tile at _PARAM2_;_PARAM3_ (layer _PARAM1_) "
"of _PARAM0_"
msgstr ""
"_PARAM4_ est en collision avec le tuile _PARAM2_;_PARAM3_ (calque _PARAM1_) "
"de _PARAM0_"
#: Extensions/TileMapObject/Extension.cpp:85
msgid "Collisions"
msgstr "Collisions"
#: Extensions/TileMapObject/Extension.cpp:89
msgid "Tile layer (0: Back, 1: Middle, 2: Top)"
msgstr "Calque de la tuile (0 : fond, 1 : milieu, 2 : dessus)"
#: Extensions/TileMapObject/Extension.cpp:90
msgid "Tile column"
msgstr "Colonne de la tuile"
#: Extensions/TileMapObject/Extension.cpp:91
msgid "Tile row"
msgstr "Ligne de la tuile"
#: Extensions/TileMapObject/TileEditor.cpp:44
msgid "Rectangle Shape"
msgstr "Rectangle"
#: Extensions/TileMapObject/TileEditor.cpp:20
#: Extensions/TileMapObject/TileEditor.cpp:46
msgid "Triangle Shape (top-left)"
msgstr "Triangle (en haut à gauche)"
#: Extensions/TileMapObject/TileEditor.cpp:21
#: Extensions/TileMapObject/TileEditor.cpp:47
msgid "Triangle Shape (top-right)"
msgstr "Triangle (en haut à droite)"
#: Extensions/TileMapObject/TileEditor.cpp:22
#: Extensions/TileMapObject/TileEditor.cpp:48
msgid "Triangle Shape (bottom-right)"
msgstr "Triangle (en bas à droite)"
#: Extensions/TileMapObject/TileEditor.cpp:23
#: Extensions/TileMapObject/TileEditor.cpp:49
msgid "Triangle Shape (bottom-left)"
msgstr "Triangle (en bas à gauche)"
#: Extensions/TileMapObject/TileEditor.cpp:25
#: Extensions/TileMapObject/TileEditor.cpp:51
msgid "Half-rectangle (top)"
msgstr "Demi-rectangle (haut)"
#: Extensions/TileMapObject/TileEditor.cpp:26
#: Extensions/TileMapObject/TileEditor.cpp:52
msgid "Half-rectangle (right)"
msgstr "Demi-rectangle (droite)"
#: Extensions/TileMapObject/TileEditor.cpp:27
#: Extensions/TileMapObject/TileEditor.cpp:53
msgid "Half-rectangle (bottom)"
msgstr "Demi-rectangle (bas)"
#: Extensions/TileMapObject/TileEditor.cpp:28
#: Extensions/TileMapObject/TileEditor.cpp:54
msgid "Half-rectangle (left)"
msgstr "Demi-rectangle (gauche)"
#: Extensions/TileMapObject/TileMapConfigurationEditor.cpp:32
#: Extensions/TileMapObject/TileMapConfigurationEditor.cpp:59
msgid ""
"The map will be smaller after that change. You can possibly lose data.\n"
"Are you sure to continue ?"
@@ -121,10 +155,18 @@ msgstr ""
"La carte sera plus petite après ce changement. Des données seront perdues.\n"
"Etes-vous sûr(e) de continuer ?"
#: Extensions/TileMapObject/TileMapConfigurationEditor.cpp:33
#: Extensions/TileMapObject/TileMapConfigurationEditor.cpp:60
msgid "Map size"
msgstr "Taille de la carte"
#: Extensions/TileMapObject/TileMapConfigurationEditor.cpp:74
msgid ""
"http://www.wiki.compilgames.net/doku.php/en/game_develop/documentation/"
"manual/built_tilemap/tilemapconfig"
msgstr ""
"http://www.wiki.compilgames.net/doku.php/game_develop/documentation/manual/"
"built_tilemap/tilemapconfig"
#: Extensions/TileMapObject/TileMapDialogs.cpp:34
msgid "Tileset"
msgstr "Jeu de tuiles"
@@ -164,7 +206,7 @@ msgstr ""
msgid "Help about this object"
msgstr "Aide pour cet objet"
#: Extensions/TileMapObject/TileMapDialogs.cpp:203
#: Extensions/TileMapObject/TileMapDialogs.cpp:205
msgid ""
"The tileset is the texture containing all the tiles which will be used in "
"your tilemap object."
@@ -172,83 +214,92 @@ msgstr ""
"Le jeu de tuiles consiste en la texture qui contient toutes les tuiles qui "
"seront utilisée pour l'objet."
#: Extensions/TileMapObject/TileMapDialogs.cpp:210
#: Extensions/TileMapObject/TileMapDialogs.cpp:212
msgid ""
"Note: the tilemap object needs to have all the tiles in a single texture."
msgstr "Note: l'objet carte de tuiles ne peut utiliser qu'une seule texture."
#: Extensions/TileMapObject/TileMapDialogs.cpp:224
#: Extensions/TileMapObject/TileMapDialogs.cpp:227
msgid "Tileset texture:"
msgstr "Texture du jeu de tuiles:"
#: Extensions/TileMapObject/TileMapDialogs.cpp:250
#: Extensions/TileMapObject/TileMapDialogs.cpp:247
msgid "Tile size:"
msgstr "Taille des tuiles:"
#: Extensions/TileMapObject/TileMapDialogs.cpp:269
#: Extensions/TileMapObject/TileMapDialogs.cpp:302
#: Extensions/TileMapObject/TileMapDialogs.cpp:392
#: Extensions/TileMapObject/TileMapDialogs.cpp:266
#: Extensions/TileMapObject/TileMapDialogs.cpp:299
#: Extensions/TileMapObject/TileMapDialogs.cpp:429
msgid "x"
msgstr "x"
#: Extensions/TileMapObject/TileMapDialogs.cpp:279
#: Extensions/TileMapObject/TileMapDialogs.cpp:312
#: Extensions/TileMapObject/TileMapDialogs.cpp:276
#: Extensions/TileMapObject/TileMapDialogs.cpp:309
msgid "pixels"
msgstr "pixels"
#: Extensions/TileMapObject/TileMapDialogs.cpp:283
#: Extensions/TileMapObject/TileMapDialogs.cpp:280
msgid "Tile spacing:"
msgstr "Espace entre les tuiles:"
#: Extensions/TileMapObject/TileMapDialogs.cpp:374
#: Extensions/TileMapObject/TileMapDialogs.cpp:313
msgid "Preview:"
msgstr "Aperçu :"
#: Extensions/TileMapObject/TileMapDialogs.cpp:334
#: Extensions/TileMapObject/TileMapDialogs.cpp:455
msgid "Help on this dialog"
msgstr "Aide pour cette boîte de dialogue"
#: Extensions/TileMapObject/TileMapDialogs.cpp:411
msgid "Map size:"
msgstr "Taille de la carte:"
#: Extensions/TileMapObject/TileMapDialogs.cpp:402
#: Extensions/TileMapObject/TileMapDialogs.cpp:439
msgid "tiles"
msgstr "tuiles"
#: Extensions/TileMapObject/TileMapDialogs.cpp:465
#: Extensions/TileMapObject/TileMapDialogs.cpp:523
msgid "Collidable"
msgstr "Collisions ?"
#: Extensions/TileMapObject/TileMapDialogs.cpp:465
#: Extensions/TileMapObject/TileMapDialogs.cpp:523
msgid "Activates the collision mask for collision detection"
msgstr "Active le masque de collision"
#: Extensions/TileMapObject/TileMapDialogs.cpp:467
#: Extensions/TileMapObject/TileMapDialogs.cpp:525
msgid "Use a predefined shape"
msgstr "Utiliser une forme prédéfinie"
#: Extensions/TileMapObject/TileMapDialogs.cpp:485
#: Extensions/TileMapObject/TileMapDialogs.cpp:543
msgid "Add a point"
msgstr "Ajouter un point"
#: Extensions/TileMapObject/TileMapDialogs.cpp:485
#: Extensions/TileMapObject/TileMapDialogs.cpp:543
msgid "Add a point to the collision mask"
msgstr "Ajouter un point au masque de collision"
#: Extensions/TileMapObject/TileMapDialogs.cpp:487
#: Extensions/TileMapObject/TileMapDialogs.cpp:545
msgid "Edit point position..."
msgstr "Editer la position du point..."
#: Extensions/TileMapObject/TileMapDialogs.cpp:487
#: Extensions/TileMapObject/TileMapDialogs.cpp:545
msgid "Edit the selected point position..."
msgstr "Edite la position du point sélectionné..."
#: Extensions/TileMapObject/TileMapDialogs.cpp:489
#: Extensions/TileMapObject/TileMapDialogs.cpp:547
msgid "Remove selected point"
msgstr "Supprimer le point sélectionné"
#: Extensions/TileMapObject/TileMapDialogs.cpp:489
#: Extensions/TileMapObject/TileMapDialogs.cpp:547
msgid "Removes the selected point"
msgstr "Supprime le point sélectionné"
#: Extensions/TileMapObject/TileMapDialogs.cpp:491
#: Extensions/TileMapObject/TileMapDialogs.cpp:549
msgid "Reset to the default collision mask"
msgstr "Rétablir le masque de collision par défaut"
#: Extensions/TileMapObject/TileMapDialogs.cpp:491
#: Extensions/TileMapObject/TileMapDialogs.cpp:549
msgid "Reset the tile collision mask to the default one"
msgstr "Rétablit le masque de collision par défaut de la tuile"
@@ -256,7 +307,15 @@ msgstr "Rétablit le masque de collision par défaut de la tuile"
msgid "Tile editor"
msgstr "Editeur de tuile"
#: Extensions/TileMapObject/TileMapObjectEditor.cpp:182
#: Extensions/TileMapObject/TileMapObjectEditor.cpp:135
msgid "Do you want to cancel all the changes made ?"
msgstr "Êtes-vous sûr(e) d'annuler tous les changements apportés à l'objet ?"
#: Extensions/TileMapObject/TileMapObjectEditor.cpp:135
msgid "Confirm"
msgstr "Confirmation"
#: Extensions/TileMapObject/TileMapObjectEditor.cpp:188
msgid ""
"http://www.wiki.compilgames.net/doku.php/en/game_develop/documentation/"
"manual/built_tilemap"
@@ -264,11 +323,11 @@ msgstr ""
"http://www.wiki.compilgames.net/doku.php/game_develop/documentation/manual/"
"built_tilemap"
#: Extensions/TileMapObject/TileSetConfigurationEditor.cpp:19
#: Extensions/TileMapObject/TileSetConfigurationEditor.cpp:49
msgid "Images bank's editor"
msgstr "Editeur de la banque d'images"
#: Extensions/TileMapObject/TileSetConfigurationEditor.cpp:48
#: Extensions/TileMapObject/TileSetConfigurationEditor.cpp:97
msgid ""
"Please display the image bank's editor and select an image before clicking "
"on this button."
@@ -276,22 +335,33 @@ msgstr ""
"Affichez l'éditeur de la banque d'image, et sélectionnez une image avant de "
"cliquer sur ce bouton."
#: Extensions/TileMapObject/TileSetPanel.cpp:94
#: Extensions/TileMapObject/TileSetConfigurationEditor.cpp:133
msgid ""
"You haven't selected a tileset yet.\n"
"Click on \"Configure the tileset\" to choose one."
"http://www.wiki.compilgames.net/doku.php/en/game_develop/documentation/"
"manual/built_tilemap/tilesetconfig"
msgstr ""
"Vous n'avez pas encore choisi un jeu de tuiles.\n"
"Cliquer sur \"Configurer le jeu de tuiles\" pour en choisir un."
"http://www.wiki.compilgames.net/doku.php/game_develop/documentation/manual/"
"built_tilemap/tilesetconfig"
#: Extensions/TileMapObject/TileMapDialogs.h:65
#: Extensions/TileMapObject/TileSetPanel.cpp:126
msgid "You haven't selected a tileset yet."
msgstr "Vous n'avez pas sélectionné de jeu de tuiles."
#: Extensions/TileMapObject/TileMapDialogs.h:66
msgid "TileMap Object Editor"
msgstr "Editeur de carte de tuiles"
#: Extensions/TileMapObject/TileMapDialogs.h:101
#: Extensions/TileMapObject/TileMapDialogs.h:108
msgid "Tileset configuration"
msgstr "Configuration du jeu de tuiles"
#: Extensions/TileMapObject/TileMapDialogs.h:123
#: Extensions/TileMapObject/TileMapDialogs.h:133
msgid "Tilemap size configuration"
msgstr "Configuration de la taille de la carte"
#~ msgid ""
#~ "You haven't selected a tileset yet.\n"
#~ "Click on \"Configure the tileset\" to choose one."
#~ msgstr ""
#~ "Vous n'avez pas encore choisi un jeu de tuiles.\n"
#~ "Cliquer sur \"Configurer le jeu de tuiles\" pour en choisir un."

6
Extensions/TileMapObject/TileMapConfigurationEditor.cpp
View File

@@ -27,6 +27,7 @@ freely, subject to the following restrictions:
#include "TileMapConfigurationEditor.h"
#include <wx/msgdlg.h>
#include "GDCore/Tools/HelpFileAccess.h"
TileMapConfigurationEditor::TileMapConfigurationEditor(wxWindow* parent, TileMap &tileMap_) :
TileMapConfigurationEditorBase(parent),
@@ -67,3 +68,8 @@ void TileMapConfigurationEditor::OnOkPressed(wxCommandEvent& event)
tileMap.SetSize(newMapWidth, newMapHeight);
EndModal(1);
}
void TileMapConfigurationEditor::OnHelpButtonClicked(wxHyperlinkEvent& event)
{
gd::HelpFileAccess::Get()->OpenURL(_("http://www.wiki.compilgames.net/doku.php/en/game_develop/documentation/manual/built_tilemap/tilemapconfig"));
}

1
Extensions/TileMapObject/TileMapConfigurationEditor.h
View File

@@ -39,6 +39,7 @@ public:
private:
TileMap &tileMap;
protected:
virtual void OnHelpButtonClicked(wxHyperlinkEvent& event);
virtual void OnCancelPressed(wxCommandEvent& event);
virtual void OnOkPressed(wxCommandEvent& event);
};

49
Extensions/TileMapObject/TileMapDialogs.cpp
View File

@@ -237,9 +237,6 @@ TileSetConfigurationEditorBase::TileSetConfigurationEditorBase(wxWindow* parent,
flexGridSizer2692->Add(flexGridSizer295, 1, wxALL|wxEXPAND, 5);
m_textureNameTextCtrl = new wxTextCtrl(m_mainPanel, wxID_ANY, wxT(""), wxDefaultPosition, wxSize(-1,-1), 0);
#if wxVERSION_NUMBER >= 3000
m_textureNameTextCtrl->SetHint(wxT(""));
#endif
flexGridSizer295->Add(m_textureNameTextCtrl, 0, wxALL|wxEXPAND, 5);
@@ -322,9 +319,28 @@ TileSetConfigurationEditorBase::TileSetConfigurationEditorBase(wxWindow* parent,
flexGridSizer2692->Add(m_tileSetPreviewPanel, 0, wxALL|wxEXPAND, 5);
wxFlexGridSizer* flexGridSizer468 = new wxFlexGridSizer(1, 3, 0, 0);
flexGridSizer468->SetFlexibleDirection( wxBOTH );
flexGridSizer468->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
flexGridSizer468->AddGrowableCol(2);
flexGridSizer468->AddGrowableRow(0);
flexGridSizer2671->Add(flexGridSizer468, 1, wxALL|wxEXPAND, 0);
m_staticBitmap470 = new wxStaticBitmap(m_mainPanel, wxID_ANY, wxXmlResource::Get()->LoadBitmap(wxT("help16")), wxDefaultPosition, wxSize(-1,-1), 0 );
flexGridSizer468->Add(m_staticBitmap470, 0, wxALL, 5);
m_hyperLink472 = new wxHyperlinkCtrl(m_mainPanel, wxID_ANY, _("Help on this dialog"), wxT(""), wxDefaultPosition, wxSize(-1,-1), wxHL_DEFAULT_STYLE);
m_hyperLink472->SetNormalColour(wxColour(wxT("#0000FF")));
m_hyperLink472->SetHoverColour(wxColour(wxT("#0000FF")));
m_hyperLink472->SetVisitedColour(wxColour(wxT("#FF0000")));
flexGridSizer468->Add(m_hyperLink472, 0, wxALL, 5);
m_stdBtnSizer2713 = new wxStdDialogButtonSizer();
flexGridSizer2671->Add(m_stdBtnSizer2713, 0, wxALL|wxALIGN_RIGHT, 5);
flexGridSizer468->Add(m_stdBtnSizer2713, 0, wxALL|wxALIGN_RIGHT, 5);
m_okButton = new wxButton(m_mainPanel, wxID_OK, wxT(""), wxDefaultPosition, wxSize(-1, -1), 0);
m_stdBtnSizer2713->AddButton(m_okButton);
@@ -345,6 +361,7 @@ TileSetConfigurationEditorBase::TileSetConfigurationEditorBase(wxWindow* parent,
m_tileHeightSpin->Connect(wxEVT_COMMAND_SPINCTRL_UPDATED, wxSpinEventHandler(TileSetConfigurationEditorBase::OnTileSetParameterUpdated), NULL, this);
m_spacingWidthSpin->Connect(wxEVT_COMMAND_SPINCTRL_UPDATED, wxSpinEventHandler(TileSetConfigurationEditorBase::OnTileSetParameterUpdated), NULL, this);
m_spacingHeightSpin->Connect(wxEVT_COMMAND_SPINCTRL_UPDATED, wxSpinEventHandler(TileSetConfigurationEditorBase::OnTileSetParameterUpdated), NULL, this);
m_hyperLink472->Connect(wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler(TileSetConfigurationEditorBase::OnHelpButtonClicked), NULL, this);
m_okButton->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(TileSetConfigurationEditorBase::OnOkButtonClicked), NULL, this);
m_cancelButton->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(TileSetConfigurationEditorBase::OnCancelButtonClicked), NULL, this);
@@ -358,6 +375,7 @@ TileSetConfigurationEditorBase::~TileSetConfigurationEditorBase()
m_tileHeightSpin->Disconnect(wxEVT_COMMAND_SPINCTRL_UPDATED, wxSpinEventHandler(TileSetConfigurationEditorBase::OnTileSetParameterUpdated), NULL, this);
m_spacingWidthSpin->Disconnect(wxEVT_COMMAND_SPINCTRL_UPDATED, wxSpinEventHandler(TileSetConfigurationEditorBase::OnTileSetParameterUpdated), NULL, this);
m_spacingHeightSpin->Disconnect(wxEVT_COMMAND_SPINCTRL_UPDATED, wxSpinEventHandler(TileSetConfigurationEditorBase::OnTileSetParameterUpdated), NULL, this);
m_hyperLink472->Disconnect(wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler(TileSetConfigurationEditorBase::OnHelpButtonClicked), NULL, this);
m_okButton->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(TileSetConfigurationEditorBase::OnOkButtonClicked), NULL, this);
m_cancelButton->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(TileSetConfigurationEditorBase::OnCancelButtonClicked), NULL, this);
@@ -422,9 +440,28 @@ TileMapConfigurationEditorBase::TileMapConfigurationEditorBase(wxWindow* parent,
flexGridSizer380->Add(m_staticText388, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5);
wxFlexGridSizer* flexGridSizer474 = new wxFlexGridSizer(1, 3, 0, 0);
flexGridSizer474->SetFlexibleDirection( wxBOTH );
flexGridSizer474->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
flexGridSizer474->AddGrowableCol(2);
flexGridSizer474->AddGrowableRow(0);
flexGridSizer367->Add(flexGridSizer474, 1, wxALL|wxEXPAND, 0);
m_staticBitmap476 = new wxStaticBitmap(this, wxID_ANY, wxXmlResource::Get()->LoadBitmap(wxT("help16")), wxDefaultPosition, wxSize(-1,-1), 0 );
flexGridSizer474->Add(m_staticBitmap476, 0, wxALL, 5);
m_hyperLink478 = new wxHyperlinkCtrl(this, wxID_ANY, _("Help on this dialog"), wxT(""), wxDefaultPosition, wxSize(-1,-1), wxHL_DEFAULT_STYLE);
m_hyperLink478->SetNormalColour(wxColour(wxT("#0000FF")));
m_hyperLink478->SetHoverColour(wxColour(wxT("#0000FF")));
m_hyperLink478->SetVisitedColour(wxColour(wxT("#FF0000")));
flexGridSizer474->Add(m_hyperLink478, 0, wxALL, 5);
m_stdBtnSizer371 = new wxStdDialogButtonSizer();
flexGridSizer367->Add(m_stdBtnSizer371, 0, wxALL|wxEXPAND, 5);
flexGridSizer474->Add(m_stdBtnSizer371, 0, wxALL|wxEXPAND, 5);
m_okButton = new wxButton(this, wxID_OK, wxT(""), wxDefaultPosition, wxSize(-1, -1), 0);
m_stdBtnSizer371->AddButton(m_okButton);
@@ -439,6 +476,7 @@ TileMapConfigurationEditorBase::TileMapConfigurationEditorBase(wxWindow* parent,
}
Centre(wxBOTH);
// Connect events
m_hyperLink478->Connect(wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler(TileMapConfigurationEditorBase::OnHelpButtonClicked), NULL, this);
m_okButton->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(TileMapConfigurationEditorBase::OnOkPressed), NULL, this);
m_cancelButton->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(TileMapConfigurationEditorBase::OnCancelPressed), NULL, this);
@@ -446,6 +484,7 @@ TileMapConfigurationEditorBase::TileMapConfigurationEditorBase(wxWindow* parent,
TileMapConfigurationEditorBase::~TileMapConfigurationEditorBase()
{
m_hyperLink478->Disconnect(wxEVT_COMMAND_HYPERLINK, wxHyperlinkEventHandler(TileMapConfigurationEditorBase::OnHelpButtonClicked), NULL, this);
m_okButton->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(TileMapConfigurationEditorBase::OnOkPressed), NULL, this);
m_cancelButton->Disconnect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(TileMapConfigurationEditorBase::OnCancelPressed), NULL, this);

6
Extensions/TileMapObject/TileMapDialogs.h
View File

@@ -90,6 +90,8 @@ protected:
wxStaticText* m_staticText329;
wxStaticText* m_staticText462;
TileSetPanel* m_tileSetPreviewPanel;
wxStaticBitmap* m_staticBitmap470;
wxHyperlinkCtrl* m_hyperLink472;
wxStdDialogButtonSizer* m_stdBtnSizer2713;
wxButton* m_okButton;
wxButton* m_cancelButton;
@@ -98,6 +100,7 @@ protected:
virtual void OnTileSetTextureUpdated(wxCommandEvent& event) { event.Skip(); }
virtual void OnSetTextureButtonClicked(wxCommandEvent& event) { event.Skip(); }
virtual void OnTileSetParameterUpdated(wxSpinEvent& event) { event.Skip(); }
virtual void OnHelpButtonClicked(wxHyperlinkEvent& event) { event.Skip(); }
virtual void OnOkButtonClicked(wxCommandEvent& event) { event.Skip(); }
virtual void OnCancelButtonClicked(wxCommandEvent& event) { event.Skip(); }
@@ -115,11 +118,14 @@ protected:
wxStaticText* m_staticText384;
wxSpinCtrl* m_mapHeightSpin;
wxStaticText* m_staticText388;
wxStaticBitmap* m_staticBitmap476;
wxHyperlinkCtrl* m_hyperLink478;
wxStdDialogButtonSizer* m_stdBtnSizer371;
wxButton* m_okButton;
wxButton* m_cancelButton;
protected:
virtual void OnHelpButtonClicked(wxHyperlinkEvent& event) { event.Skip(); }
virtual void OnOkPressed(wxCommandEvent& event) { event.Skip(); }
virtual void OnCancelPressed(wxCommandEvent& event) { event.Skip(); }

740
Extensions/TileMapObject/TileMapDialogs.wxcp
View File

@@ -1,7 +1,7 @@
{
"metadata": {
"m_generatedFilesDir": ".",
"m_objCounter": 466,
"m_objCounter": 478,
"m_includeFiles": ["TileMapDialogsIds.h"],
"m_bitmapFunction": "wxCF6DCInitBitmapResources",
"m_bitmapsFile": "TileMapDialogs_wxsmith_bitmaps.cpp",
@@ -2227,10 +2227,6 @@
"type": "string",
"m_label": "Value:",
"m_value": ""
}, {
"type": "string",
"m_label": "Text Hint",
"m_value": ""
}, {
"type": "string",
"m_label": "Max Length:",
@@ -3368,73 +3364,49 @@
"m_children": []
}]
}, {
"m_type": 4467,
"proportion": 0,
"border": 5,
"m_type": 4403,
"proportion": 1,
"border": 0,
"gbSpan": "1,1",
"gbPosition": "0,0",
"m_styles": [],
"m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxALIGN_RIGHT"],
"m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND"],
"m_properties": [{
"type": "winid",
"m_label": "ID:",
"m_winid": "wxID_ANY"
}, {
"type": "string",
"m_label": "Size:",
"m_value": "-1,-1"
}, {
"type": "string",
"m_label": "Minimum Size:",
"m_value": "-1,-1"
}, {
"type": "string",
"m_label": "Name:",
"m_value": "m_stdBtnSizer2713"
}, {
"type": "multi-string",
"m_label": "Tooltip:",
"m_value": ""
}, {
"type": "colour",
"m_label": "Bg Colour:",
"colour": "<Default>"
}, {
"type": "colour",
"m_label": "Fg Colour:",
"colour": "<Default>"
}, {
"type": "font",
"m_label": "Font:",
"m_value": ""
}, {
"type": "bool",
"m_label": "Hidden",
"m_value": false
}, {
"type": "bool",
"m_label": "Disabled",
"m_value": false
}, {
"type": "bool",
"m_label": "Focused",
"m_value": false
}, {
"type": "string",
"m_label": "Class Name:",
"m_value": ""
}, {
"type": "string",
"m_label": "Include File:",
"m_value": ""
"m_value": "flexGridSizer468"
}, {
"type": "string",
"m_label": "Style:",
"m_value": ""
}, {
"type": "string",
"m_label": "# Columns:",
"m_value": "3"
}, {
"type": "string",
"m_label": "# Rows:",
"m_value": "1"
}, {
"type": "string",
"m_label": "Growable columns:",
"m_value": "2"
}, {
"type": "string",
"m_label": "Growable rows:",
"m_value": "0"
}, {
"type": "string",
"m_label": "Horizontal gap:",
"m_value": "0"
}, {
"type": "string",
"m_label": "Vertical gap:",
"m_value": "0"
}],
"m_events": [],
"m_children": [{
"m_type": 4468,
"m_type": 4409,
"proportion": 0,
"border": 5,
"gbSpan": "1,1",
@@ -3442,67 +3414,299 @@
"m_styles": [],
"m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM"],
"m_properties": [{
"type": "choice",
"type": "winid",
"m_label": "ID:",
"m_selection": 0,
"m_options": ["wxID_OK", "wxID_YES", "wxID_SAVE", "wxID_APPLY", "wxID_CLOSE", "wxID_NO", "wxID_CANCEL", "wxID_HELP", "wxID_CONTEXT_HELP"]
"m_winid": "wxID_ANY"
}, {
"type": "string",
"m_label": "Size:",
"m_value": "-1,-1"
}, {
"type": "string",
"m_label": "Minimum Size:",
"m_value": "-1,-1"
}, {
"type": "string",
"m_label": "Name:",
"m_value": "m_okButton"
"m_value": "m_staticBitmap470"
}, {
"type": "multi-string",
"m_label": "Tooltip:",
"m_value": ""
}, {
"type": "colour",
"m_label": "Bg Colour:",
"colour": "<Default>"
}, {
"type": "colour",
"m_label": "Fg Colour:",
"colour": "<Default>"
}, {
"type": "font",
"m_label": "Font:",
"m_value": ""
}, {
"type": "bool",
"m_label": "Default Button",
"m_label": "Hidden",
"m_value": false
}, {
"type": "bool",
"m_label": "Disabled",
"m_value": false
}, {
"type": "bool",
"m_label": "Focused",
"m_value": false
}, {
"type": "string",
"m_label": "Class Name:",
"m_value": ""
}, {
"type": "string",
"m_label": "Include File:",
"m_value": ""
}, {
"type": "string",
"m_label": "Style:",
"m_value": ""
}, {
"type": "bitmapPicker",
"m_label": "Bitmap File:",
"m_path": "../../Binaries/Output/Release_Windows/res/icons_default/help16.png"
}],
"m_events": [],
"m_children": []
}, {
"m_type": 4438,
"proportion": 0,
"border": 5,
"gbSpan": "1,1",
"gbPosition": "0,0",
"m_styles": ["wxHL_DEFAULT_STYLE"],
"m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM"],
"m_properties": [{
"type": "winid",
"m_label": "ID:",
"m_winid": "wxID_ANY"
}, {
"type": "string",
"m_label": "Size:",
"m_value": "-1,-1"
}, {
"type": "string",
"m_label": "Minimum Size:",
"m_value": "-1,-1"
}, {
"type": "string",
"m_label": "Name:",
"m_value": "m_hyperLink472"
}, {
"type": "multi-string",
"m_label": "Tooltip:",
"m_value": ""
}, {
"type": "colour",
"m_label": "Bg Colour:",
"colour": "<Default>"
}, {
"type": "colour",
"m_label": "Fg Colour:",
"colour": "<Default>"
}, {
"type": "font",
"m_label": "Font:",
"m_value": ""
}, {
"type": "bool",
"m_label": "Hidden",
"m_value": false
}, {
"type": "bool",
"m_label": "Disabled",
"m_value": false
}, {
"type": "bool",
"m_label": "Focused",
"m_value": false
}, {
"type": "string",
"m_label": "Class Name:",
"m_value": ""
}, {
"type": "string",
"m_label": "Include File:",
"m_value": ""
}, {
"type": "string",
"m_label": "Style:",
"m_value": ""
}, {
"type": "string",
"m_label": "Label:",
"m_value": "Help on this dialog"
}, {
"type": "string",
"m_label": "URL:",
"m_value": ""
}, {
"type": "colour",
"m_label": "Normal Colour:",
"colour": "#0000FF"
}, {
"type": "colour",
"m_label": "Visited Colour:",
"colour": "#FF0000"
}, {
"type": "colour",
"m_label": "Hover Colour:",
"colour": "#0000FF"
}],
"m_events": [{
"m_eventName": "wxEVT_COMMAND_BUTTON_CLICKED",
"m_eventClass": "wxCommandEvent",
"m_eventHandler": "wxCommandEventHandler",
"m_functionNameAndSignature": "OnOkButtonClicked(wxCommandEvent& event)",
"m_description": "Process a wxEVT_COMMAND_BUTTON_CLICKED event, when the button is clicked.",
"m_eventName": "wxEVT_COMMAND_HYPERLINK",
"m_eventClass": "wxHyperlinkEvent",
"m_eventHandler": "wxHyperlinkEventHandler",
"m_functionNameAndSignature": "OnHelpButtonClicked(wxHyperlinkEvent& event)",
"m_description": "The hyperlink was (left) clicked. If this event is not handled in user's code (or it's skipped; see wxEvent::Skip)\nthen a call to wxLaunchDefaultBrowser is done with the hyperlink's URL.",
"m_noBody": false
}],
"m_children": []
}, {
"m_type": 4468,
"m_type": 4467,
"proportion": 0,
"border": 5,
"gbSpan": "1,1",
"gbPosition": "0,0",
"m_styles": [],
"m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM"],
"m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxALIGN_RIGHT"],
"m_properties": [{
"type": "choice",
"type": "winid",
"m_label": "ID:",
"m_selection": 6,
"m_options": ["wxID_OK", "wxID_YES", "wxID_SAVE", "wxID_APPLY", "wxID_CLOSE", "wxID_NO", "wxID_CANCEL", "wxID_HELP", "wxID_CONTEXT_HELP"]
"m_winid": "wxID_ANY"
}, {
"type": "string",
"m_label": "Size:",
"m_value": "-1,-1"
}, {
"type": "string",
"m_label": "Minimum Size:",
"m_value": "-1,-1"
}, {
"type": "string",
"m_label": "Name:",
"m_value": "m_cancelButton"
"m_value": "m_stdBtnSizer2713"
}, {
"type": "multi-string",
"m_label": "Tooltip:",
"m_value": ""
}, {
"type": "colour",
"m_label": "Bg Colour:",
"colour": "<Default>"
}, {
"type": "colour",
"m_label": "Fg Colour:",
"colour": "<Default>"
}, {
"type": "font",
"m_label": "Font:",
"m_value": ""
}, {
"type": "bool",
"m_label": "Default Button",
"m_label": "Hidden",
"m_value": false
}, {
"type": "bool",
"m_label": "Disabled",
"m_value": false
}, {
"type": "bool",
"m_label": "Focused",
"m_value": false
}, {
"type": "string",
"m_label": "Class Name:",
"m_value": ""
}, {
"type": "string",
"m_label": "Include File:",
"m_value": ""
}, {
"type": "string",
"m_label": "Style:",
"m_value": ""
}],
"m_events": [{
"m_eventName": "wxEVT_COMMAND_BUTTON_CLICKED",
"m_eventClass": "wxCommandEvent",
"m_eventHandler": "wxCommandEventHandler",
"m_functionNameAndSignature": "OnCancelButtonClicked(wxCommandEvent& event)",
"m_description": "Process a wxEVT_COMMAND_BUTTON_CLICKED event, when the button is clicked.",
"m_noBody": false
}],
"m_children": []
"m_events": [],
"m_children": [{
"m_type": 4468,
"proportion": 0,
"border": 5,
"gbSpan": "1,1",
"gbPosition": "0,0",
"m_styles": [],
"m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM"],
"m_properties": [{
"type": "choice",
"m_label": "ID:",
"m_selection": 0,
"m_options": ["wxID_OK", "wxID_YES", "wxID_SAVE", "wxID_APPLY", "wxID_CLOSE", "wxID_NO", "wxID_CANCEL", "wxID_HELP", "wxID_CONTEXT_HELP"]
}, {
"type": "string",
"m_label": "Name:",
"m_value": "m_okButton"
}, {
"type": "multi-string",
"m_label": "Tooltip:",
"m_value": ""
}, {
"type": "bool",
"m_label": "Default Button",
"m_value": false
}],
"m_events": [{
"m_eventName": "wxEVT_COMMAND_BUTTON_CLICKED",
"m_eventClass": "wxCommandEvent",
"m_eventHandler": "wxCommandEventHandler",
"m_functionNameAndSignature": "OnOkButtonClicked(wxCommandEvent& event)",
"m_description": "Process a wxEVT_COMMAND_BUTTON_CLICKED event, when the button is clicked.",
"m_noBody": false
}],
"m_children": []
}, {
"m_type": 4468,
"proportion": 0,
"border": 5,
"gbSpan": "1,1",
"gbPosition": "0,0",
"m_styles": [],
"m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM"],
"m_properties": [{
"type": "choice",
"m_label": "ID:",
"m_selection": 6,
"m_options": ["wxID_OK", "wxID_YES", "wxID_SAVE", "wxID_APPLY", "wxID_CLOSE", "wxID_NO", "wxID_CANCEL", "wxID_HELP", "wxID_CONTEXT_HELP"]
}, {
"type": "string",
"m_label": "Name:",
"m_value": "m_cancelButton"
}, {
"type": "multi-string",
"m_label": "Tooltip:",
"m_value": ""
}, {
"type": "bool",
"m_label": "Default Button",
"m_value": false
}],
"m_events": [{
"m_eventName": "wxEVT_COMMAND_BUTTON_CLICKED",
"m_eventClass": "wxCommandEvent",
"m_eventHandler": "wxCommandEventHandler",
"m_functionNameAndSignature": "OnCancelButtonClicked(wxCommandEvent& event)",
"m_description": "Process a wxEVT_COMMAND_BUTTON_CLICKED event, when the button is clicked.",
"m_noBody": false
}],
"m_children": []
}]
}]
}]
}]
@@ -4127,73 +4331,49 @@
}]
}]
}, {
"m_type": 4467,
"proportion": 0,
"border": 5,
"m_type": 4403,
"proportion": 1,
"border": 0,
"gbSpan": "1,1",
"gbPosition": "0,0",
"m_styles": [],
"m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND"],
"m_properties": [{
"type": "winid",
"m_label": "ID:",
"m_winid": "wxID_ANY"
}, {
"type": "string",
"m_label": "Size:",
"m_value": "-1,-1"
}, {
"type": "string",
"m_label": "Minimum Size:",
"m_value": "-1,-1"
}, {
"type": "string",
"m_label": "Name:",
"m_value": "m_stdBtnSizer371"
}, {
"type": "multi-string",
"m_label": "Tooltip:",
"m_value": ""
}, {
"type": "colour",
"m_label": "Bg Colour:",
"colour": "<Default>"
}, {
"type": "colour",
"m_label": "Fg Colour:",
"colour": "<Default>"
}, {
"type": "font",
"m_label": "Font:",
"m_value": ""
}, {
"type": "bool",
"m_label": "Hidden",
"m_value": false
}, {
"type": "bool",
"m_label": "Disabled",
"m_value": false
}, {
"type": "bool",
"m_label": "Focused",
"m_value": false
}, {
"type": "string",
"m_label": "Class Name:",
"m_value": ""
}, {
"type": "string",
"m_label": "Include File:",
"m_value": ""
"m_value": "flexGridSizer474"
}, {
"type": "string",
"m_label": "Style:",
"m_value": ""
}, {
"type": "string",
"m_label": "# Columns:",
"m_value": "3"
}, {
"type": "string",
"m_label": "# Rows:",
"m_value": "1"
}, {
"type": "string",
"m_label": "Growable columns:",
"m_value": "2"
}, {
"type": "string",
"m_label": "Growable rows:",
"m_value": "0"
}, {
"type": "string",
"m_label": "Horizontal gap:",
"m_value": "0"
}, {
"type": "string",
"m_label": "Vertical gap:",
"m_value": "0"
}],
"m_events": [],
"m_children": [{
"m_type": 4468,
"m_type": 4409,
"proportion": 0,
"border": 5,
"gbSpan": "1,1",
@@ -4201,67 +4381,299 @@
"m_styles": [],
"m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM"],
"m_properties": [{
"type": "choice",
"type": "winid",
"m_label": "ID:",
"m_selection": 0,
"m_options": ["wxID_OK", "wxID_YES", "wxID_SAVE", "wxID_APPLY", "wxID_CLOSE", "wxID_NO", "wxID_CANCEL", "wxID_HELP", "wxID_CONTEXT_HELP"]
"m_winid": "wxID_ANY"
}, {
"type": "string",
"m_label": "Size:",
"m_value": "-1,-1"
}, {
"type": "string",
"m_label": "Minimum Size:",
"m_value": "-1,-1"
}, {
"type": "string",
"m_label": "Name:",
"m_value": "m_okButton"
"m_value": "m_staticBitmap476"
}, {
"type": "multi-string",
"m_label": "Tooltip:",
"m_value": ""
}, {
"type": "colour",
"m_label": "Bg Colour:",
"colour": "<Default>"
}, {
"type": "colour",
"m_label": "Fg Colour:",
"colour": "<Default>"
}, {
"type": "font",
"m_label": "Font:",
"m_value": ""
}, {
"type": "bool",
"m_label": "Default Button",
"m_label": "Hidden",
"m_value": false
}, {
"type": "bool",
"m_label": "Disabled",
"m_value": false
}, {
"type": "bool",
"m_label": "Focused",
"m_value": false
}, {
"type": "string",
"m_label": "Class Name:",
"m_value": ""
}, {
"type": "string",
"m_label": "Include File:",
"m_value": ""
}, {
"type": "string",
"m_label": "Style:",
"m_value": ""
}, {
"type": "bitmapPicker",
"m_label": "Bitmap File:",
"m_path": "../../Binaries/Output/Release_Windows/res/icons_default/help16.png"
}],
"m_events": [],
"m_children": []
}, {
"m_type": 4438,
"proportion": 0,
"border": 5,
"gbSpan": "1,1",
"gbPosition": "0,0",
"m_styles": ["wxHL_DEFAULT_STYLE"],
"m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM"],
"m_properties": [{
"type": "winid",
"m_label": "ID:",
"m_winid": "wxID_ANY"
}, {
"type": "string",
"m_label": "Size:",
"m_value": "-1,-1"
}, {
"type": "string",
"m_label": "Minimum Size:",
"m_value": "-1,-1"
}, {
"type": "string",
"m_label": "Name:",
"m_value": "m_hyperLink478"
}, {
"type": "multi-string",
"m_label": "Tooltip:",
"m_value": ""
}, {
"type": "colour",
"m_label": "Bg Colour:",
"colour": "<Default>"
}, {
"type": "colour",
"m_label": "Fg Colour:",
"colour": "<Default>"
}, {
"type": "font",
"m_label": "Font:",
"m_value": ""
}, {
"type": "bool",
"m_label": "Hidden",
"m_value": false
}, {
"type": "bool",
"m_label": "Disabled",
"m_value": false
}, {
"type": "bool",
"m_label": "Focused",
"m_value": false
}, {
"type": "string",
"m_label": "Class Name:",
"m_value": ""
}, {
"type": "string",
"m_label": "Include File:",
"m_value": ""
}, {
"type": "string",
"m_label": "Style:",
"m_value": ""
}, {
"type": "string",
"m_label": "Label:",
"m_value": "Help on this dialog"
}, {
"type": "string",
"m_label": "URL:",
"m_value": ""
}, {
"type": "colour",
"m_label": "Normal Colour:",
"colour": "#0000FF"
}, {
"type": "colour",
"m_label": "Visited Colour:",
"colour": "#FF0000"
}, {
"type": "colour",
"m_label": "Hover Colour:",
"colour": "#0000FF"
}],
"m_events": [{
"m_eventName": "wxEVT_COMMAND_BUTTON_CLICKED",
"m_eventClass": "wxCommandEvent",
"m_eventHandler": "wxCommandEventHandler",
"m_functionNameAndSignature": "OnOkPressed(wxCommandEvent& event)",
"m_description": "Process a wxEVT_COMMAND_BUTTON_CLICKED event, when the button is clicked.",
"m_eventName": "wxEVT_COMMAND_HYPERLINK",
"m_eventClass": "wxHyperlinkEvent",
"m_eventHandler": "wxHyperlinkEventHandler",
"m_functionNameAndSignature": "OnHelpButtonClicked(wxHyperlinkEvent& event)",
"m_description": "The hyperlink was (left) clicked. If this event is not handled in user's code (or it's skipped; see wxEvent::Skip)\nthen a call to wxLaunchDefaultBrowser is done with the hyperlink's URL.",
"m_noBody": false
}],
"m_children": []
}, {
"m_type": 4468,
"m_type": 4467,
"proportion": 0,
"border": 5,
"gbSpan": "1,1",
"gbPosition": "0,0",
"m_styles": [],
"m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM"],
"m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND"],
"m_properties": [{
"type": "choice",
"type": "winid",
"m_label": "ID:",
"m_selection": 6,
"m_options": ["wxID_OK", "wxID_YES", "wxID_SAVE", "wxID_APPLY", "wxID_CLOSE", "wxID_NO", "wxID_CANCEL", "wxID_HELP", "wxID_CONTEXT_HELP"]
"m_winid": "wxID_ANY"
}, {
"type": "string",
"m_label": "Size:",
"m_value": "-1,-1"
}, {
"type": "string",
"m_label": "Minimum Size:",
"m_value": "-1,-1"
}, {
"type": "string",
"m_label": "Name:",
"m_value": "m_cancelButton"
"m_value": "m_stdBtnSizer371"
}, {
"type": "multi-string",
"m_label": "Tooltip:",
"m_value": ""
}, {
"type": "colour",
"m_label": "Bg Colour:",
"colour": "<Default>"
}, {
"type": "colour",
"m_label": "Fg Colour:",
"colour": "<Default>"
}, {
"type": "font",
"m_label": "Font:",
"m_value": ""
}, {
"type": "bool",
"m_label": "Default Button",
"m_label": "Hidden",
"m_value": false
}, {
"type": "bool",
"m_label": "Disabled",
"m_value": false
}, {
"type": "bool",
"m_label": "Focused",
"m_value": false
}, {
"type": "string",
"m_label": "Class Name:",
"m_value": ""
}, {
"type": "string",
"m_label": "Include File:",
"m_value": ""
}, {
"type": "string",
"m_label": "Style:",
"m_value": ""
}],
"m_events": [{
"m_eventName": "wxEVT_COMMAND_BUTTON_CLICKED",
"m_eventClass": "wxCommandEvent",
"m_eventHandler": "wxCommandEventHandler",
"m_functionNameAndSignature": "OnCancelPressed(wxCommandEvent& event)",
"m_description": "Process a wxEVT_COMMAND_BUTTON_CLICKED event, when the button is clicked.",
"m_noBody": false
}],
"m_children": []
"m_events": [],
"m_children": [{
"m_type": 4468,
"proportion": 0,
"border": 5,
"gbSpan": "1,1",
"gbPosition": "0,0",
"m_styles": [],
"m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM"],
"m_properties": [{
"type": "choice",
"m_label": "ID:",
"m_selection": 0,
"m_options": ["wxID_OK", "wxID_YES", "wxID_SAVE", "wxID_APPLY", "wxID_CLOSE", "wxID_NO", "wxID_CANCEL", "wxID_HELP", "wxID_CONTEXT_HELP"]
}, {
"type": "string",
"m_label": "Name:",
"m_value": "m_okButton"
}, {
"type": "multi-string",
"m_label": "Tooltip:",
"m_value": ""
}, {
"type": "bool",
"m_label": "Default Button",
"m_value": false
}],
"m_events": [{
"m_eventName": "wxEVT_COMMAND_BUTTON_CLICKED",
"m_eventClass": "wxCommandEvent",
"m_eventHandler": "wxCommandEventHandler",
"m_functionNameAndSignature": "OnOkPressed(wxCommandEvent& event)",
"m_description": "Process a wxEVT_COMMAND_BUTTON_CLICKED event, when the button is clicked.",
"m_noBody": false
}],
"m_children": []
}, {
"m_type": 4468,
"proportion": 0,
"border": 5,
"gbSpan": "1,1",
"gbPosition": "0,0",
"m_styles": [],
"m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM"],
"m_properties": [{
"type": "choice",
"m_label": "ID:",
"m_selection": 6,
"m_options": ["wxID_OK", "wxID_YES", "wxID_SAVE", "wxID_APPLY", "wxID_CLOSE", "wxID_NO", "wxID_CANCEL", "wxID_HELP", "wxID_CONTEXT_HELP"]
}, {
"type": "string",
"m_label": "Name:",
"m_value": "m_cancelButton"
}, {
"type": "multi-string",
"m_label": "Tooltip:",
"m_value": ""
}, {
"type": "bool",
"m_label": "Default Button",
"m_value": false
}],
"m_events": [{
"m_eventName": "wxEVT_COMMAND_BUTTON_CLICKED",
"m_eventClass": "wxCommandEvent",
"m_eventHandler": "wxCommandEventHandler",
"m_functionNameAndSignature": "OnCancelPressed(wxCommandEvent& event)",
"m_description": "Process a wxEVT_COMMAND_BUTTON_CLICKED event, when the button is clicked.",
"m_noBody": false
}],
"m_children": []
}]
}]
}]
}]

141
Extensions/TileMapObject/TileMapDialogs.xrc
View File

@@ -378,9 +378,6 @@
<border>5</border>
<object class="wxTextCtrl" name="m_textureNameTextCtrl">
<style/>
<hint>
<![CDATA[]]>
</hint>
</object>
</object>
<object class="sizeritem">
@@ -540,30 +537,60 @@
</object>
</object>
</object>
<object class="sizeritem">
<flag>wxALL|wxALIGN_RIGHT</flag>
<border>5</border>
<object class="wxStdDialogButtonSizer" name="m_stdBtnSizer2713">
<object class="button">
<object class="wxButton" name="wxID_OK">
<label>
<![CDATA[]]>
</label>
<style/>
<bg/>
<fg/>
<default>0</default>
<object class="sizeritem" name="flexGridSizer468">
<flag>wxALL|wxEXPAND</flag>
<option>1</option>
<object class="wxFlexGridSizer">
<cols>3</cols>
<rows>1</rows>
<vgap>0</vgap>
<hgap>0</hgap>
<growablecols>2</growablecols>
<growablerows>0</growablerows>
<object class="sizeritem">
<flag>wxALL</flag>
<border>5</border>
<object class="wxStaticBitmap" name="m_staticBitmap470">
<bitmap>../../Binaries/Output/Release_Windows/res/icons_default/help16.png</bitmap>
</object>
</object>
<object class="button">
<object class="wxButton" name="wxID_CANCEL">
<object class="sizeritem">
<flag>wxALL</flag>
<border>5</border>
<object class="wxHyperlinkCtrl" name="m_hyperLink472">
<style>wxHL_DEFAULT_STYLE</style>
<label>
<![CDATA[]]>
<![CDATA[Help on this dialog]]>
</label>
<style/>
<bg/>
<fg/>
<default>0</default>
<url/>
</object>
</object>
<object class="sizeritem">
<flag>wxALL|wxALIGN_RIGHT</flag>
<border>5</border>
<object class="wxStdDialogButtonSizer" name="m_stdBtnSizer2713">
<object class="button">
<object class="wxButton" name="wxID_OK">
<label>
<![CDATA[]]>
</label>
<style/>
<bg/>
<fg/>
<default>0</default>
</object>
</object>
<object class="button">
<object class="wxButton" name="wxID_CANCEL">
<label>
<![CDATA[]]>
</label>
<style/>
<bg/>
<fg/>
<default>0</default>
</object>
</object>
</object>
</object>
</object>
@@ -661,30 +688,60 @@
</object>
</object>
</object>
<object class="sizeritem">
<object class="sizeritem" name="flexGridSizer474">
<flag>wxALL|wxEXPAND</flag>
<border>5</border>
<object class="wxStdDialogButtonSizer" name="m_stdBtnSizer371">
<object class="button">
<object class="wxButton" name="wxID_OK">
<label>
<![CDATA[]]>
</label>
<style/>
<bg/>
<fg/>
<default>0</default>
<option>1</option>
<object class="wxFlexGridSizer">
<cols>3</cols>
<rows>1</rows>
<vgap>0</vgap>
<hgap>0</hgap>
<growablecols>2</growablecols>
<growablerows>0</growablerows>
<object class="sizeritem">
<flag>wxALL</flag>
<border>5</border>
<object class="wxStaticBitmap" name="m_staticBitmap476">
<bitmap>../../Binaries/Output/Release_Windows/res/icons_default/help16.png</bitmap>
</object>
</object>
<object class="button">
<object class="wxButton" name="wxID_CANCEL">
<object class="sizeritem">
<flag>wxALL</flag>
<border>5</border>
<object class="wxHyperlinkCtrl" name="m_hyperLink478">
<style>wxHL_DEFAULT_STYLE</style>
<label>
<![CDATA[]]>
<![CDATA[Help on this dialog]]>
</label>
<style/>
<bg/>
<fg/>
<default>0</default>
<url/>
</object>
</object>
<object class="sizeritem">
<flag>wxALL|wxEXPAND</flag>
<border>5</border>
<object class="wxStdDialogButtonSizer" name="m_stdBtnSizer371">
<object class="button">
<object class="wxButton" name="wxID_OK">
<label>
<![CDATA[]]>
</label>
<style/>
<bg/>
<fg/>
<default>0</default>
</object>
</object>
<object class="button">
<object class="wxButton" name="wxID_CANCEL">
<label>
<![CDATA[]]>
</label>
<style/>
<bg/>
<fg/>
<default>0</default>
</object>
</object>
</object>
</object>
</object>

26
Extensions/TileMapObject/TileMapDialogs_wxsmith_bitmaps.cpp
View File

@@ -386,17 +386,17 @@ void wxCF6DCInitBitmapResources()
else wxFileSystem::AddHandler(new wxMemoryFSHandlerBase);
}
XRC_ADD_FILE(wxT("XRC_resource/TileMapDialogs_wxsmith_bitmaps.cpp$.._.._Binaries_Output_Release_Windows_res_icons_default_add16.png"), xml_res_file_0, xml_res_size_0, wxT("image/x-apple-ios-png"));
XRC_ADD_FILE(wxT("XRC_resource/TileMapDialogs_wxsmith_bitmaps.cpp$.._.._Binaries_Output_Release_Windows_res_icons_default_edit16.png"), xml_res_file_1, xml_res_size_1, wxT("image/x-apple-ios-png"));
XRC_ADD_FILE(wxT("XRC_resource/TileMapDialogs_wxsmith_bitmaps.cpp$.._.._Binaries_Output_Release_Windows_res_icons_default_help16.png"), xml_res_file_2, xml_res_size_2, wxT("image/x-apple-ios-png"));
XRC_ADD_FILE(wxT("XRC_resource/TileMapDialogs_wxsmith_bitmaps.cpp$.._.._Binaries_Output_Release_Windows_res_icons_default_image16.png"), xml_res_file_3, xml_res_size_3, wxT("image/x-apple-ios-png"));
XRC_ADD_FILE(wxT("XRC_resource/TileMapDialogs_wxsmith_bitmaps.cpp$.._.._Binaries_Output_Release_Windows_res_icons_default_layer16.png"), xml_res_file_4, xml_res_size_4, wxT("image/x-apple-ios-png"));
XRC_ADD_FILE(wxT("XRC_resource/TileMapDialogs_wxsmith_bitmaps.cpp$.._.._Binaries_Output_Release_Windows_res_maskEdit16.png"), xml_res_file_5, xml_res_size_5, wxT("image/x-apple-ios-png"));
XRC_ADD_FILE(wxT("XRC_resource/TileMapDialogs_wxsmith_bitmaps.cpp$.._.._Binaries_Output_Release_Windows_res_icons_default_options16.png"), xml_res_file_6, xml_res_size_6, wxT("image/x-apple-ios-png"));
XRC_ADD_FILE(wxT("XRC_resource/TileMapDialogs_wxsmith_bitmaps.cpp$.._.._Binaries_Output_Release_Windows_CppPlatform_Extensions_pathfindingobstacleicon16.png"), xml_res_file_7, xml_res_size_7, wxT("image/x-apple-ios-png"));
XRC_ADD_FILE(wxT("XRC_resource/TileMapDialogs_wxsmith_bitmaps.cpp$.._.._Binaries_Output_Release_Windows_res_icons_default_remove16.png"), xml_res_file_8, xml_res_size_8, wxT("image/x-apple-ios-png"));
XRC_ADD_FILE(wxT("XRC_resource/TileMapDialogs_wxsmith_bitmaps.cpp$.._.._Binaries_Output_Release_Windows_res_tilemasktrianglebr16.png"), xml_res_file_9, xml_res_size_9, wxT("image/x-apple-ios-png"));
XRC_ADD_FILE(wxT("XRC_resource/TileMapDialogs_wxsmith_bitmaps.cpp$.._.._Binaries_Output_Release_Windows_res_icons_default_undo16.png"), xml_res_file_10, xml_res_size_10, wxT("image/x-apple-ios-png"));
XRC_ADD_FILE(wxT("XRC_resource/TileMapDialogs_wxsmith_bitmaps.cpp$_home_victor_Developpement_GD_Extensions_TileMapObject_TileMapDialogs_wxsmith_bitmaps.xrc"), xml_res_file_11, xml_res_size_11, wxT("text/xml"));
wxXmlResource::Get()->Load(wxT("memory:XRC_resource/TileMapDialogs_wxsmith_bitmaps.cpp$_home_victor_Developpement_GD_Extensions_TileMapObject_TileMapDialogs_wxsmith_bitmaps.xrc"));
XRC_ADD_FILE(wxT("XRC_resource/TileMapDialogs_wxsmith_bitmaps.cpp$.._.._Binaries_Output_Release_Windows_res_icons_default_add16.png"), xml_res_file_0, xml_res_size_0, wxT("image/png"));
XRC_ADD_FILE(wxT("XRC_resource/TileMapDialogs_wxsmith_bitmaps.cpp$.._.._Binaries_Output_Release_Windows_res_icons_default_edit16.png"), xml_res_file_1, xml_res_size_1, wxT("image/png"));
XRC_ADD_FILE(wxT("XRC_resource/TileMapDialogs_wxsmith_bitmaps.cpp$.._.._Binaries_Output_Release_Windows_res_icons_default_help16.png"), xml_res_file_2, xml_res_size_2, wxT("image/png"));
XRC_ADD_FILE(wxT("XRC_resource/TileMapDialogs_wxsmith_bitmaps.cpp$.._.._Binaries_Output_Release_Windows_res_icons_default_image16.png"), xml_res_file_3, xml_res_size_3, wxT("image/png"));
XRC_ADD_FILE(wxT("XRC_resource/TileMapDialogs_wxsmith_bitmaps.cpp$.._.._Binaries_Output_Release_Windows_res_icons_default_layer16.png"), xml_res_file_4, xml_res_size_4, wxT("image/png"));
XRC_ADD_FILE(wxT("XRC_resource/TileMapDialogs_wxsmith_bitmaps.cpp$.._.._Binaries_Output_Release_Windows_res_maskEdit16.png"), xml_res_file_5, xml_res_size_5, wxT("image/png"));
XRC_ADD_FILE(wxT("XRC_resource/TileMapDialogs_wxsmith_bitmaps.cpp$.._.._Binaries_Output_Release_Windows_res_icons_default_options16.png"), xml_res_file_6, xml_res_size_6, wxT("image/png"));
XRC_ADD_FILE(wxT("XRC_resource/TileMapDialogs_wxsmith_bitmaps.cpp$.._.._Binaries_Output_Release_Windows_CppPlatform_Extensions_pathfindingobstacleicon16.png"), xml_res_file_7, xml_res_size_7, wxT("image/png"));
XRC_ADD_FILE(wxT("XRC_resource/TileMapDialogs_wxsmith_bitmaps.cpp$.._.._Binaries_Output_Release_Windows_res_icons_default_remove16.png"), xml_res_file_8, xml_res_size_8, wxT("image/png"));
XRC_ADD_FILE(wxT("XRC_resource/TileMapDialogs_wxsmith_bitmaps.cpp$.._.._Binaries_Output_Release_Windows_res_tilemasktrianglebr16.png"), xml_res_file_9, xml_res_size_9, wxT("image/png"));
XRC_ADD_FILE(wxT("XRC_resource/TileMapDialogs_wxsmith_bitmaps.cpp$.._.._Binaries_Output_Release_Windows_res_icons_default_undo16.png"), xml_res_file_10, xml_res_size_10, wxT("image/png"));
XRC_ADD_FILE(wxT("XRC_resource/TileMapDialogs_wxsmith_bitmaps.cpp$E__Developpement_GD_Extensions_TileMapObject_TileMapDialogs_wxsmith_bitmaps.xrc"), xml_res_file_11, xml_res_size_11, wxT("text/xml"));
wxXmlResource::Get()->Load(wxT("memory:XRC_resource/TileMapDialogs_wxsmith_bitmaps.cpp$E__Developpement_GD_Extensions_TileMapObject_TileMapDialogs_wxsmith_bitmaps.xrc"));
}

22
Extensions/TileMapObject/TileMapDialogs_wxsmith_bitmaps.xrc
View File

@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<resource xmlns="http://www.wxwindows.org/wxxrc" version="2.3.0.1">
<object class="wxBitmap" name="add16">../../Binaries/Output/Release_Windows/res/icons_default/add16.png</object>
<object class="wxBitmap" name="edit16">../../Binaries/Output/Release_Windows/res/icons_default/edit16.png</object>
<object class="wxBitmap" name="help16">../../Binaries/Output/Release_Windows/res/icons_default/help16.png</object>
<object class="wxBitmap" name="image16">../../Binaries/Output/Release_Windows/res/icons_default/image16.png</object>
<object class="wxBitmap" name="layer16">../../Binaries/Output/Release_Windows/res/icons_default/layer16.png</object>
<object class="wxBitmap" name="maskEdit16">../../Binaries/Output/Release_Windows/res/maskEdit16.png</object>
<object class="wxBitmap" name="options16">../../Binaries/Output/Release_Windows/res/icons_default/options16.png</object>
<object class="wxBitmap" name="pathfindingobstacleicon16">../../Binaries/Output/Release_Windows/CppPlatform/Extensions/pathfindingobstacleicon16.png</object>
<object class="wxBitmap" name="remove16">../../Binaries/Output/Release_Windows/res/icons_default/remove16.png</object>
<object class="wxBitmap" name="tilemasktrianglebr16">../../Binaries/Output/Release_Windows/res/tilemasktrianglebr16.png</object>
<object class="wxBitmap" name="undo16">../../Binaries/Output/Release_Windows/res/icons_default/undo16.png</object>
<object class="wxBitmap" name="add16">..\..\Binaries\Output\Release_Windows\res\icons_default\add16.png</object>
<object class="wxBitmap" name="edit16">..\..\Binaries\Output\Release_Windows\res\icons_default\edit16.png</object>
<object class="wxBitmap" name="help16">..\..\Binaries\Output\Release_Windows\res\icons_default\help16.png</object>
<object class="wxBitmap" name="image16">..\..\Binaries\Output\Release_Windows\res\icons_default\image16.png</object>
<object class="wxBitmap" name="layer16">..\..\Binaries\Output\Release_Windows\res\icons_default\layer16.png</object>
<object class="wxBitmap" name="maskEdit16">..\..\Binaries\Output\Release_Windows\res\maskEdit16.png</object>
<object class="wxBitmap" name="options16">..\..\Binaries\Output\Release_Windows\res\icons_default\options16.png</object>
<object class="wxBitmap" name="pathfindingobstacleicon16">..\..\Binaries\Output\Release_Windows\CppPlatform\Extensions\pathfindingobstacleicon16.png</object>
<object class="wxBitmap" name="remove16">..\..\Binaries\Output\Release_Windows\res\icons_default\remove16.png</object>
<object class="wxBitmap" name="tilemasktrianglebr16">..\..\Binaries\Output\Release_Windows\res\tilemasktrianglebr16.png</object>
<object class="wxBitmap" name="undo16">..\..\Binaries\Output\Release_Windows\res\icons_default\undo16.png</object>
</resource>

6
Extensions/TileMapObject/TileSetConfigurationEditor.cpp
View File

@@ -31,6 +31,7 @@ freely, subject to the following restrictions:
#include "GDCore/IDE/Dialogs/ResourcesEditor.h"
#include "GDCore/Tools/Log.h"
#include "GDCore/Tools/Localization.h"
#include "GDCore/Tools/HelpFileAccess.h"
#include "GDCpp/Project.h"
TileSetConfigurationEditor::TileSetConfigurationEditor(wxWindow* parent, TileSet &tileSet_, gd::Project & game_, gd::MainFrameWrapper & mainFrameWrapper) :
@@ -126,3 +127,8 @@ void TileSetConfigurationEditor::OnTileSetParameterUpdated(wxSpinEvent& event)
{
UpdatePreviewTileSetPanel();
}
void TileSetConfigurationEditor::OnHelpButtonClicked(wxHyperlinkEvent& event)
{
gd::HelpFileAccess::Get()->OpenURL(_("http://www.wiki.compilgames.net/doku.php/en/game_develop/documentation/manual/built_tilemap/tilesetconfig"));
}

1
Extensions/TileMapObject/TileSetConfigurationEditor.h
View File

@@ -49,6 +49,7 @@ private:
void UpdatePreviewTileSetPanel();
protected:
virtual void OnHelpButtonClicked(wxHyperlinkEvent& event);
virtual void OnTileSetParameterUpdated(wxSpinEvent& event);
virtual void OnTileSetTextureUpdated(wxCommandEvent& event);
virtual void OnCancelButtonClicked(wxCommandEvent& event);