This Trac instance is not used for development anymore!

We migrated our development workflow to git and Gitea.
To test the future redirection, replace trac by ariadne in the page URL.

Changeset 10117 for ps


Ignore:
Timestamp:
08/28/11 01:43:18 (13 years ago)
Author:
ben
Message:

Fixes some Atlas button layouts with wxWidgets 2.9 (wxGridSizer seems preferable to wxBoxSizer for equally sized buttons).

Location:
ps/trunk/source/tools/atlas/AtlasUI/ScenarioEditor/Sections
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • ps/trunk/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Map/Map.cpp

    r10064 r10117  
    299299        /////////////////////////////////////////////////////////////////////////
    300300        // Simulation buttons
    301         wxStaticBoxSizer* sizer = new wxStaticBoxSizer(wxHORIZONTAL, this, _("Simulation test"));
    302         sizer->Add(new wxButton(this, ID_SimPlay, _("Play")), wxSizerFlags().Proportion(1));
    303         sizer->Add(new wxButton(this, ID_SimFast, _("Fast")), wxSizerFlags().Proportion(1));
    304         sizer->Add(new wxButton(this, ID_SimSlow, _("Slow")), wxSizerFlags().Proportion(1));
    305         sizer->Add(new wxButton(this, ID_SimPause, _("Pause")), wxSizerFlags().Proportion(1));
    306         sizer->Add(new wxButton(this, ID_SimReset, _("Reset")), wxSizerFlags().Proportion(1));
     301        wxStaticBoxSizer* sizer = new wxStaticBoxSizer(wxVERTICAL, this, _("Simulation test"));
     302        wxGridSizer* gridSizer = new wxGridSizer(5);
     303        gridSizer->Add(new wxButton(this, ID_SimPlay, _("Play")), wxSizerFlags().Expand());
     304        gridSizer->Add(new wxButton(this, ID_SimFast, _("Fast")), wxSizerFlags().Expand());
     305        gridSizer->Add(new wxButton(this, ID_SimSlow, _("Slow")), wxSizerFlags().Expand());
     306        gridSizer->Add(new wxButton(this, ID_SimPause, _("Pause")), wxSizerFlags().Expand());
     307        gridSizer->Add(new wxButton(this, ID_SimReset, _("Reset")), wxSizerFlags().Expand());
     308        sizer->Add(gridSizer, wxSizerFlags().Expand());
    307309        UpdateSimButtons();
    308310        m_MainSizer->Add(sizer, wxSizerFlags().Expand().Border(wxTOP, 16));

  • ps/trunk/source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Player/Player.cpp

    r10102 r10117  
    7070        SetSizer(sizer);
    7171
    72         /////////////////////////////////////////////////////////////////////////
    73         // Player Info
    74         wxStaticBoxSizer* playerInfoSizer = new wxStaticBoxSizer(wxVERTICAL, this, _("Player info"));
    75         wxFlexGridSizer* gridSizer = new wxFlexGridSizer(2, 5, 5);
    76         gridSizer->AddGrowableCol(1);
    77         gridSizer->Add(new wxStaticText(this, wxID_ANY, _("Name")), wxSizerFlags().Align(wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT));
    78         wxTextCtrl* nameCtrl = new wxTextCtrl(this, wxID_ANY);
    79         gridSizer->Add(nameCtrl, wxSizerFlags(1).Expand().Align(wxALIGN_RIGHT));
    80         m_Controls.name = nameCtrl;
    81         gridSizer->Add(new wxStaticText(this, wxID_ANY, _("Civilisation")), wxSizerFlags().Align(wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT));
    82         wxChoice* civChoice = new wxChoice(this, wxID_ANY);
    83         gridSizer->Add(civChoice, wxSizerFlags(1).Expand().Align(wxALIGN_RIGHT));
    84         m_Controls.civ = civChoice;
    85         gridSizer->Add(new wxStaticText(this, wxID_ANY, _("Colour")), wxSizerFlags().Align(wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT));
    86         wxButton* colourButton = new wxButton(this, ID_PlayerColour);
    87         gridSizer->Add(Tooltipped(colourButton, _("Set player colour")), wxSizerFlags(1).Expand().Align(wxALIGN_RIGHT));
    88         m_Controls.colour = colourButton;
    89         gridSizer->Add(new wxStaticText(this, wxID_ANY, _("Default AI")), wxSizerFlags().Align(wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT));
    90         wxChoice* aiChoice = new wxChoice(this, wxID_ANY);
    91         gridSizer->Add(Tooltipped(aiChoice, _("Select default AI")), wxSizerFlags(1).Expand().Align(wxALIGN_RIGHT));
    92         m_Controls.ai = aiChoice;
    93 
    94         playerInfoSizer->Add(gridSizer, wxSizerFlags(1).Expand());
    95         sizer->Add(playerInfoSizer, wxSizerFlags().Expand().Border(wxTOP, 10));
    96 
    97         /////////////////////////////////////////////////////////////////////////
    98         // Resources
    99         wxStaticBoxSizer* resourceSizer = new wxStaticBoxSizer(wxVERTICAL, this, _("Resources"));
    100         gridSizer = new wxFlexGridSizer(2, 5, 5);
    101         gridSizer->AddGrowableCol(1);
    102         gridSizer->Add(new wxStaticText(this, wxID_ANY, _("Food")), wxSizerFlags().Align(wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT));
    103         wxSpinCtrl* foodCtrl = new wxSpinCtrl(this, ID_PlayerFood, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, INT_MAX);
    104         gridSizer->Add(Tooltipped(foodCtrl, _("Initial value of food resource")), wxSizerFlags().Expand());
    105         m_Controls.food = foodCtrl;
    106         gridSizer->Add(new wxStaticText(this, wxID_ANY, _("Wood")), wxSizerFlags().Align(wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT));
    107         wxSpinCtrl* woodCtrl = new wxSpinCtrl(this, ID_PlayerWood, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, INT_MAX);
    108         gridSizer->Add(Tooltipped(woodCtrl, _("Initial value of wood resource")), wxSizerFlags().Expand());
    109         m_Controls.wood = woodCtrl;
    110         gridSizer->Add(new wxStaticText(this, wxID_ANY, _("Metal")), wxSizerFlags().Align(wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT));
    111         wxSpinCtrl* metalCtrl = new wxSpinCtrl(this, ID_PlayerMetal, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, INT_MAX);
    112         gridSizer->Add(Tooltipped(metalCtrl, _("Initial value of metal resource")), wxSizerFlags().Expand());
    113         m_Controls.metal = metalCtrl;
    114         gridSizer->Add(new wxStaticText(this, wxID_ANY, _("Stone")), wxSizerFlags().Align(wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT));
    115         wxSpinCtrl* stoneCtrl = new wxSpinCtrl(this, ID_PlayerStone, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, INT_MAX);
    116         gridSizer->Add(Tooltipped(stoneCtrl, _("Initial value of stone resource")), wxSizerFlags().Expand());
    117         m_Controls.stone = stoneCtrl;
    118         gridSizer->Add(new wxStaticText(this, wxID_ANY, _("Pop limit")), wxSizerFlags().Align(wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT));
    119         wxSpinCtrl* popCtrl = new wxSpinCtrl(this, ID_PlayerPop, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, INT_MAX);
    120         gridSizer->Add(Tooltipped(popCtrl, _("Population limit for this player")), wxSizerFlags().Expand());
    121         m_Controls.pop = popCtrl;
    122 
    123         resourceSizer->Add(gridSizer, wxSizerFlags(1).Expand());
    124         sizer->Add(resourceSizer, wxSizerFlags().Expand().Border(wxTOP, 10));
    125 
    126         /////////////////////////////////////////////////////////////////////////
    127         // Diplomacy
    128         wxStaticBoxSizer* diplomacySizer = new wxStaticBoxSizer(wxVERTICAL, this, _("Diplomacy"));
    129         wxBoxSizer* boxSizer = new wxBoxSizer(wxHORIZONTAL);
    130         boxSizer->Add(new wxStaticText(this, wxID_ANY, _("Team")), wxSizerFlags().Align(wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT));
    131         wxChoice* teamCtrl = new wxChoice(this, wxID_ANY);
    132         teamCtrl->Append(_("None"));
    133         teamCtrl->Append(_T("1"));
    134         teamCtrl->Append(_T("2"));
    135         teamCtrl->Append(_T("3"));
    136         teamCtrl->Append(_T("4"));
    137         boxSizer->Add(teamCtrl);
    138         m_Controls.team = teamCtrl;
    139         diplomacySizer->Add(boxSizer, wxSizerFlags(1).Expand());
    140 
    141         // TODO: possibly have advanced panel where each player's diplomacy can be set?
    142         // Advanced panel
    143         /*wxCollapsiblePane* advPane = new wxCollapsiblePane(this, wxID_ANY, _("Advanced"));
    144         wxWindow* pane = advPane->GetPane();
    145         diplomacySizer->Add(advPane, 0, wxGROW | wxALL, 2);*/
    146 
    147         sizer->Add(diplomacySizer, wxSizerFlags().Expand().Border(wxTOP, 10));
    148 
    149         /////////////////////////////////////////////////////////////////////////
    150         // Camera
    151         wxStaticBoxSizer* cameraSizer = new wxStaticBoxSizer(wxHORIZONTAL, this, _("Starting Camera"));
    152         wxButton* cameraSet = new wxButton(this, ID_CameraSet, _("Set"));
    153         cameraSizer->Add(Tooltipped(cameraSet, _("Set player camera to this view")), wxSizerFlags(1));
    154         wxButton* cameraView = new wxButton(this, ID_CameraView, _("View"));
    155         cameraView->Enable(false);
    156         cameraSizer->Add(Tooltipped(cameraView, _("View the player camera")), wxSizerFlags(1));
    157         wxButton* cameraClear = new wxButton(this, ID_CameraClear, _("Clear"));
    158         cameraClear->Enable(false);
    159         cameraSizer->Add(Tooltipped(cameraClear, _("Clear player camera")), wxSizerFlags(1));
    160 
    161         sizer->Add(cameraSizer, wxSizerFlags().Expand().Border(wxTOP, 10));
     72        {
     73            /////////////////////////////////////////////////////////////////////////
     74            // Player Info
     75            wxStaticBoxSizer* playerInfoSizer = new wxStaticBoxSizer(wxVERTICAL, this, _("Player info"));
     76            wxFlexGridSizer* gridSizer = new wxFlexGridSizer(2, 5, 5);
     77            gridSizer->AddGrowableCol(1);
     78            gridSizer->Add(new wxStaticText(this, wxID_ANY, _("Name")), wxSizerFlags().Align(wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT));
     79            wxTextCtrl* nameCtrl = new wxTextCtrl(this, wxID_ANY);
     80            gridSizer->Add(nameCtrl, wxSizerFlags(1).Expand().Align(wxALIGN_RIGHT));
     81            m_Controls.name = nameCtrl;
     82            gridSizer->Add(new wxStaticText(this, wxID_ANY, _("Civilisation")), wxSizerFlags().Align(wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT));
     83            wxChoice* civChoice = new wxChoice(this, wxID_ANY);
     84            gridSizer->Add(civChoice, wxSizerFlags(1).Expand().Align(wxALIGN_RIGHT));
     85            m_Controls.civ = civChoice;
     86            gridSizer->Add(new wxStaticText(this, wxID_ANY, _("Colour")), wxSizerFlags().Align(wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT));
     87            wxButton* colourButton = new wxButton(this, ID_PlayerColour);
     88            gridSizer->Add(Tooltipped(colourButton, _("Set player colour")), wxSizerFlags(1).Expand().Align(wxALIGN_RIGHT));
     89            m_Controls.colour = colourButton;
     90            gridSizer->Add(new wxStaticText(this, wxID_ANY, _("Default AI")), wxSizerFlags().Align(wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT));
     91            wxChoice* aiChoice = new wxChoice(this, wxID_ANY);
     92            gridSizer->Add(Tooltipped(aiChoice, _("Select default AI")), wxSizerFlags(1).Expand().Align(wxALIGN_RIGHT));
     93            m_Controls.ai = aiChoice;
     94
     95            playerInfoSizer->Add(gridSizer, wxSizerFlags(1).Expand());
     96            sizer->Add(playerInfoSizer, wxSizerFlags().Expand().Border(wxTOP, 10));
     97        }
     98
     99        {
     100            /////////////////////////////////////////////////////////////////////////
     101            // Resources
     102            wxStaticBoxSizer* resourceSizer = new wxStaticBoxSizer(wxVERTICAL, this, _("Resources"));
     103            wxFlexGridSizer* gridSizer = new wxFlexGridSizer(2, 5, 5);
     104            gridSizer->AddGrowableCol(1);
     105            gridSizer->Add(new wxStaticText(this, wxID_ANY, _("Food")), wxSizerFlags().Align(wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT));
     106            wxSpinCtrl* foodCtrl = new wxSpinCtrl(this, ID_PlayerFood, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, INT_MAX);
     107            gridSizer->Add(Tooltipped(foodCtrl, _("Initial value of food resource")), wxSizerFlags().Expand());
     108            m_Controls.food = foodCtrl;
     109            gridSizer->Add(new wxStaticText(this, wxID_ANY, _("Wood")), wxSizerFlags().Align(wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT));
     110            wxSpinCtrl* woodCtrl = new wxSpinCtrl(this, ID_PlayerWood, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, INT_MAX);
     111            gridSizer->Add(Tooltipped(woodCtrl, _("Initial value of wood resource")), wxSizerFlags().Expand());
     112            m_Controls.wood = woodCtrl;
     113            gridSizer->Add(new wxStaticText(this, wxID_ANY, _("Metal")), wxSizerFlags().Align(wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT));
     114            wxSpinCtrl* metalCtrl = new wxSpinCtrl(this, ID_PlayerMetal, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, INT_MAX);
     115            gridSizer->Add(Tooltipped(metalCtrl, _("Initial value of metal resource")), wxSizerFlags().Expand());
     116            m_Controls.metal = metalCtrl;
     117            gridSizer->Add(new wxStaticText(this, wxID_ANY, _("Stone")), wxSizerFlags().Align(wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT));
     118            wxSpinCtrl* stoneCtrl = new wxSpinCtrl(this, ID_PlayerStone, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, INT_MAX);
     119            gridSizer->Add(Tooltipped(stoneCtrl, _("Initial value of stone resource")), wxSizerFlags().Expand());
     120            m_Controls.stone = stoneCtrl;
     121            gridSizer->Add(new wxStaticText(this, wxID_ANY, _("Pop limit")), wxSizerFlags().Align(wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT));
     122            wxSpinCtrl* popCtrl = new wxSpinCtrl(this, ID_PlayerPop, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, INT_MAX);
     123            gridSizer->Add(Tooltipped(popCtrl, _("Population limit for this player")), wxSizerFlags().Expand());
     124            m_Controls.pop = popCtrl;
     125
     126            resourceSizer->Add(gridSizer, wxSizerFlags(1).Expand());
     127            sizer->Add(resourceSizer, wxSizerFlags().Expand().Border(wxTOP, 10));
     128        }
     129        {
     130            /////////////////////////////////////////////////////////////////////////
     131            // Diplomacy
     132            wxStaticBoxSizer* diplomacySizer = new wxStaticBoxSizer(wxVERTICAL, this, _("Diplomacy"));
     133            wxBoxSizer* boxSizer = new wxBoxSizer(wxHORIZONTAL);
     134            boxSizer->Add(new wxStaticText(this, wxID_ANY, _("Team")), wxSizerFlags().Align(wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT));
     135            wxChoice* teamCtrl = new wxChoice(this, wxID_ANY);
     136            teamCtrl->Append(_("None"));
     137            teamCtrl->Append(_T("1"));
     138            teamCtrl->Append(_T("2"));
     139            teamCtrl->Append(_T("3"));
     140            teamCtrl->Append(_T("4"));
     141            boxSizer->Add(teamCtrl);
     142            m_Controls.team = teamCtrl;
     143            diplomacySizer->Add(boxSizer, wxSizerFlags(1).Expand());
     144
     145            // TODO: possibly have advanced panel where each player's diplomacy can be set?
     146            // Advanced panel
     147            /*wxCollapsiblePane* advPane = new wxCollapsiblePane(this, wxID_ANY, _("Advanced"));
     148            wxWindow* pane = advPane->GetPane();
     149            diplomacySizer->Add(advPane, 0, wxGROW | wxALL, 2);*/
     150
     151            sizer->Add(diplomacySizer, wxSizerFlags().Expand().Border(wxTOP, 10));
     152        }
     153
     154        {
     155            /////////////////////////////////////////////////////////////////////////
     156            // Camera
     157            wxStaticBoxSizer* cameraSizer = new wxStaticBoxSizer(wxVERTICAL, this, _("Starting Camera"));
     158            wxGridSizer* gridSizer = new wxGridSizer(3);
     159            wxButton* cameraSet = new wxButton(this, ID_CameraSet, _("Set"));
     160            gridSizer->Add(Tooltipped(cameraSet, _("Set player camera to this view")), wxSizerFlags().Expand());
     161            wxButton* cameraView = new wxButton(this, ID_CameraView, _("View"));
     162            cameraView->Enable(false);
     163            gridSizer->Add(Tooltipped(cameraView, _("View the player camera")), wxSizerFlags().Expand());
     164            wxButton* cameraClear = new wxButton(this, ID_CameraClear, _("Clear"));
     165            cameraClear->Enable(false);
     166            gridSizer->Add(Tooltipped(cameraClear, _("Clear player camera")), wxSizerFlags().Expand());
     167            cameraSizer->Add(gridSizer, wxSizerFlags().Expand());
     168
     169            sizer->Add(cameraSizer, wxSizerFlags().Expand().Border(wxTOP, 10));
     170        }
    162171
    163172        Layout();
Note: See TracChangeset for help on using the changeset viewer.