Initial app structure, added menu, dialogs, background drawing

.clang-uml

@@ -0,0 +1,8 @@
+compilation_database_dir: build
+output_directory: diagrams
+generate_method_arguments: none
+diagrams:
+  config_class:
+    type: class
+    glob:
+      - ./*.h

.gitignore

@@ -0,0 +1,3 @@
+build/
+class_diagram/
+diagrams/

.vscode/settings.json

@@ -0,0 +1,7 @@
+{
+  "C_Cpp.default.includePath": [
+    "${default}",
+    "/usr/local/include/wx-3.1/",
+    "/usr/local/lib/wx/include/gtk3-unicode-3.1"
+  ]
+}

AboutDlg.cpp

@@ -0,0 +1,5 @@
+#include "./AboutDlg.h"
+
+AboutDlg::AboutDlg(wxWindow *parent, wxWindowID id) : wxDialog::wxDialog(parent, id, _("О программе"))
+{
+}

AboutDlg.h

@@ -0,0 +1,13 @@
+#ifndef ABOUTDLG_H
+#define ABOUTDLG_H
+
+#include "./wxw.h"
+
+class AboutDlg : public wxDialog
+{
+public:
+    AboutDlg(wxWindow *parent, wxWindowID id);
+    ~AboutDlg() {};
+};
+
+#endif

App.cpp

@@ -0,0 +1,12 @@
+#include "./App.h"
+#include "./GameFrame.h"
+
+wxIMPLEMENT_APP(MyApp);
+
+bool MyApp::OnInit()
+{
+    GameFrame *frame = new GameFrame();
+    frame->Show(true);
+    SetTopWindow(frame);
+    return true;
+}

App.h

@@ -0,0 +1,12 @@
+#ifndef APP_H_
+#define APP_H_
+
+#include "./wxw.h"
+
+class MyApp : public wxApp
+{
+    public:
+    virtual bool OnInit();
+};
+
+#endif

CREDITS

@@ -0,0 +1,2 @@
+This game uses the following assets:
+mahjong tiles by FluffyStuff ( https://github.com/FluffyStuff/riichi-mahjong-tiles ) licensed under CC BY 4.0

GameFrame.cpp

@@ -0,0 +1,65 @@
+#include "./GameFrame.h"
+
+#include "./HelpDlg.h"
+#include "./RulesDlg.h"
+#include "./AboutDlg.h"
+
+BEGIN_EVENT_TABLE(GameFrame, wxFrame)
+    EVT_MENU(IDM_Exit, GameFrame::OnExit)
+    EVT_MENU(IDM_Help, GameFrame::OnHelp)
+    EVT_MENU(IDM_Rules, GameFrame::OnRules)
+    EVT_MENU(IDM_About, GameFrame::OnHelp)
+    EVT_PAINT(GameFrame::OnPaint)
+END_EVENT_TABLE()
+
+GameFrame::GameFrame()
+    : wxFrame(nullptr, wxID_ANY, _("Маджонг (пасьянс)"))
+{
+    InitMenu();
+}
+
+void GameFrame::InitMenu() {
+    wxMenu *menuGame = new wxMenu;
+    menuGame->Append(IDM_New_Game, _("Начать сначала"));
+    menuGame->AppendSeparator();
+    menuGame->Append(IDM_Exit, _("Выход"));
+
+    wxMenu *menuHelp = new wxMenu;
+    menuHelp->Append(IDM_Help, _("Инструкция"));
+    menuHelp->Append(IDM_Rules, _("Правила игры"));
+    menuHelp->Append(IDM_About, _("О программе"));
+
+    wxMenuBar *menuBar = new wxMenuBar;
+    menuBar->Append(menuGame, _("Игра"));
+    menuBar->Append(menuHelp, _("Помощь"));
+
+    SetMenuBar(menuBar);
+}
+
+void GameFrame::OnExit(wxCommandEvent &event) {
+    Close();
+}
+
+void GameFrame::OnHelp(wxCommandEvent &event) {
+    HelpDlg *dlg = new HelpDlg(this, -1);
+
+    dlg->Show();
+}
+
+void GameFrame::OnRules(wxCommandEvent &event) {
+    RulesDlg *dlg = new RulesDlg(this, -1);
+
+    dlg->Show();
+}
+
+void GameFrame::OnAbout(wxCommandEvent &event) {
+    AboutDlg *dlg = new AboutDlg(this, -1);
+
+    dlg->Show();
+}
+
+void GameFrame::OnPaint(wxPaintEvent& event) {
+    wxPaintDC dc(this);
+
+    paint.drawTable(dc, GetSize());
+}

GameFrame.h

@@ -0,0 +1,38 @@
+#ifndef GAMEFRAME_H_
+#define GAMEFRAME_H_
+
+#include "./wxw.h"
+
+#include "./Graphics.h"
+
+/// @uml{style[#line.dotted:blue]}
+class GameFrame : public wxFrame
+{
+public:
+    GameFrame();
+
+private:
+    Graphics paint;
+
+    void InitMenu();
+
+    void OnExit(wxCommandEvent &event);
+    void OnHelp(wxCommandEvent &event);
+    void OnRules(wxCommandEvent &event);
+    void OnAbout(wxCommandEvent &event);
+
+    void OnPaint(wxPaintEvent& event);
+
+    DECLARE_EVENT_TABLE()
+};
+
+enum
+{
+    IDM_Exit = wxID_EXIT,
+    IDM_Help = wxID_HELP,
+    IDM_About = wxID_ABOUT,
+    IDM_New_Game = 1,
+    IDM_Rules
+};
+
+#endif

Graphics.cpp

@@ -0,0 +1,9 @@
+#include "./Graphics.h"
+
+void Graphics::drawTable(wxDC& dc, wxSize wndSize) {
+    drawBG(dc, wndSize);
+}
+
+void Graphics::drawBG(wxDC& dc, wxSize wndSize) {
+    dc.GradientFillConcentric(wxRect(wxPoint(0, 0), wndSize), wxColor(7, 85, 45), wxColor(1, 45, 22));
+}

Graphics.h

@@ -0,0 +1,15 @@
+#ifndef GRAPHICS_H
+#define GRAPHICS_H
+
+#include "./wxw.h"
+
+class Graphics {
+public:
+    Graphics() {};
+    ~Graphics() {};
+
+    void drawTable(wxDC& dc, wxSize wndSize);
+    void drawBG(wxDC& dc, wxSize wndSize);
+};
+
+#endif

HelpDlg.cpp

@@ -0,0 +1,5 @@
+#include "./HelpDlg.h"
+
+HelpDlg::HelpDlg(wxWindow *parent, wxWindowID id) : wxDialog::wxDialog(parent, id, _("Инструкция по использованию программы"))
+{
+}

HelpDlg.h

@@ -0,0 +1,13 @@
+#ifndef HELPDLG_H
+#define HELPDLG_H
+
+#include "./wxw.h"
+
+class HelpDlg : public wxDialog
+{
+public:
+    HelpDlg(wxWindow *parent, wxWindowID id);
+    ~HelpDlg() {};
+};
+
+#endif

LICENSE

@@ -0,0 +1,7 @@
+Copyright 2022 dm1sh
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

Makefile

@@ -0,0 +1,18 @@
+# CXX = $(shell wx-config --cxx)
+CXX = clang++
+ 
+PROGRAM = wxMahjong
+BDIR = build
+
+OBJECTS := $(addprefix $(BDIR)/,$(patsubst %.cpp,%.o,$(wildcard *.cpp)))
+
+$(BDIR)/%.o: %.cpp
+	$(CXX) -c `wx-config --cxxflags` -o $@ $<
+
+all: $(PROGRAM)
+
+$(PROGRAM): $(OBJECTS)
+	$(CXX) -o $(BDIR)/$(PROGRAM) $(OBJECTS) `wx-config --libs`
+
+clean:
+	rm -f $(BDIR)/*.o $(PROGRAM)

RulesDlg.cpp

@@ -0,0 +1,5 @@
+#include "./RulesDlg.h"
+
+RulesDlg::RulesDlg(wxWindow *parent, wxWindowID id) : wxDialog::wxDialog(parent, id, _("Правила игры"))
+{
+}

RulesDlg.h

@@ -0,0 +1,13 @@
+#ifndef RULESDLG_H
+#define RULESDLG_H
+
+#include "./wxw.h"
+
+class RulesDlg : public wxDialog
+{
+public:
+    RulesDlg(wxWindow *parent, wxWindowID id);
+    ~RulesDlg() {};
+};
+
+#endif

wxw.h

@@ -0,0 +1,31 @@
+#ifndef WXW_H_
+#define WXW_H_
+
+#include <wx/wxprec.h>
+
+#ifndef WX_PRECOMP
+#include <wx/wx.h>
+#endif
+
+#ifdef _
+#undef _
+#endif
+#define _(s) wxString::FromUTF8(s)
+
+// class wxTrackable {};
+// class wxObject {};
+// class wxEventHandler : wxObject, wxTrackable {};
+// class wxEventFilter {};
+// class wxAppConsole : wxEventHandler, wxEventFilter {};
+// class wxApp : wxAppConsole {};
+
+// class wxWindow : wxEventHandler {};
+// class wxNotOwnedWindow : wxWindow {};
+// class wxTopLevelWindow : wxNotOwnedWindow {};
+// class wxFrame : wxTopLevelWindow {};
+
+// class wxCommandEvent {};
+
+// #define DECLARE_EVENT_TABLE() void none();
+
+#endif