From e40d6f5a5eb4ece940e3b955c43e07725acf8238 Mon Sep 17 00:00:00 2001 From: dm1sh Date: Thu, 12 May 2022 12:02:35 +0300 Subject: [PATCH] Disabled solveable menu checkbox --- .clang-uml | 8 ----- .vscode/launch.json | 29 +++++++++++++++++ .vscode/settings.json | 74 ++++++++++++++++++++++++++++++++++++++++++- .vscode/tasks.json | 19 +++++++++++ MainFrame.cpp | 1 + 5 files changed, 122 insertions(+), 9 deletions(-) delete mode 100644 .clang-uml create mode 100644 .vscode/launch.json create mode 100644 .vscode/tasks.json diff --git a/.clang-uml b/.clang-uml deleted file mode 100644 index 9f3270e..0000000 --- a/.clang-uml +++ /dev/null @@ -1,8 +0,0 @@ -compilation_database_dir: build -output_directory: diagrams -generate_method_arguments: none -diagrams: - config_class: - type: class - glob: - - ./*.h diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000..fc674e8 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,29 @@ +{ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + { + "name": "make - Build and debug active file", + "type": "cppdbg", + "request": "launch", + "program": "${fileDirname}/build/wxMahjong", + "args": [], + "stopAtEntry": false, + "cwd": "${fileDirname}", + "environment": [{"name": "LD_LIBRARY_PATH", "value": "$LD_LIBRARY_PATH:/usr/local/lib"}], + "externalConsole": false, + "MIMode": "gdb", + "setupCommands": [ + { + "description": "Enable pretty-printing for gdb", + "text": "-enable-pretty-printing", + "ignoreFailures": true + } + ], + "preLaunchTask": "C/C++: g++ build active file", + "miDebuggerPath": "/usr/bin/gdb" + } + ] +} \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index 864b595..58aaa2a 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -3,5 +3,77 @@ "${default}", "/usr/local/include/wx-3.1/", "/usr/local/lib/wx/include/gtk3-unicode-3.1" - ] + ], + "files.associations": { + "hash_map": "cpp", + "*.tcc": "cpp", + "deque": "cpp", + "list": "cpp", + "string": "cpp", + "vector": "cpp", + "hash_set": "cpp", + "valarray": "cpp", + "iterator": "cpp", + "random": "cpp", + "array": "cpp", + "string_view": "cpp", + "chrono": "cpp", + "numeric": "cpp", + "streambuf": "cpp", + "*.inc": "cpp", + "any": "cpp", + "atomic": "cpp", + "bit": "cpp", + "cctype": "cpp", + "cinttypes": "cpp", + "clocale": "cpp", + "cmath": "cpp", + "compare": "cpp", + "complex": "cpp", + "concepts": "cpp", + "condition_variable": "cpp", + "csignal": "cpp", + "cstdarg": "cpp", + "cstddef": "cpp", + "cstdint": "cpp", + "cstdio": "cpp", + "cstdlib": "cpp", + "cstring": "cpp", + "ctime": "cpp", + "cwchar": "cpp", + "cwctype": "cpp", + "map": "cpp", + "set": "cpp", + "unordered_map": "cpp", + "unordered_set": "cpp", + "exception": "cpp", + "algorithm": "cpp", + "functional": "cpp", + "memory": "cpp", + "memory_resource": "cpp", + "optional": "cpp", + "ratio": "cpp", + "system_error": "cpp", + "tuple": "cpp", + "type_traits": "cpp", + "utility": "cpp", + "fstream": "cpp", + "initializer_list": "cpp", + "iomanip": "cpp", + "iosfwd": "cpp", + "iostream": "cpp", + "istream": "cpp", + "limits": "cpp", + "mutex": "cpp", + "new": "cpp", + "numbers": "cpp", + "ostream": "cpp", + "semaphore": "cpp", + "sstream": "cpp", + "stdexcept": "cpp", + "stop_token": "cpp", + "thread": "cpp", + "typeinfo": "cpp", + "variant": "cpp" + } } diff --git a/.vscode/tasks.json b/.vscode/tasks.json new file mode 100644 index 0000000..f832e2f --- /dev/null +++ b/.vscode/tasks.json @@ -0,0 +1,19 @@ +{ + "tasks": [ + { + "type": "cppbuild", + "label": "C/C++: g++ build active file", + "command": "make", + "args": [], + "options": { + "cwd": "${fileDirname}" + }, + "group": { + "kind": "build", + "isDefault": true + }, + "detail": "Make build this project." + } + ], + "version": "2.0.0" +} \ No newline at end of file diff --git a/MainFrame.cpp b/MainFrame.cpp index decccb6..f5944c7 100644 --- a/MainFrame.cpp +++ b/MainFrame.cpp @@ -24,6 +24,7 @@ void MainFrame::initMenu() { menuGame->Append(IDM_New_Game, _("Начать сначала")); menuGame->Append(IDM_Open, _("Открыть карту")); menuGame->AppendCheckItem(IDM_Solveable, _("Генерировать решаемую карту")); + menuGame->Enable(IDM_Solveable, false); // TODO: finish solveable table generation menuGame->AppendSeparator(); menuGame->Append(IDM_Undo, _("Отменить ход")); menuGame->Append(IDM_Reshuffle, _("Перемешать поле"));