diff --git a/Gtkmm3_Mac/CMakeLists.txt b/Gtkmm3_Mac/CMakeLists.txt index 37ea2f2..d2157d0 100644 --- a/Gtkmm3_Mac/CMakeLists.txt +++ b/Gtkmm3_Mac/CMakeLists.txt @@ -1,6 +1,6 @@ set(CMAKE_CXX_STANDARD 17) cmake_minimum_required(VERSION 3.0.0) -project(My_GtkUI VERSION 5.4.0) +project(My_GtkUI VERSION 5.5.0) #Add GCR_CMake list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/../GCR_CMake/macros) @@ -45,6 +45,9 @@ set(RESOURCE_LIST STRIPBLANKS calcapp.ui STRIPBLANKS text_menu.xml STRIPBLANKS expender.ui + STRIPBLAKNS win_input.ui + STRIPBLANKS scores_win.ui + STRIPBLAKNS mine_menu.xml style.css reset.css dock_style.css @@ -65,6 +68,19 @@ set(RESOURCE_LIST icons/48x48/actions/game_running.png icons/48x48/actions/btnabout.png icons/48x48/actions/My_GtkUI.png + icons/scalable/status/1mines.svg + icons/scalable/status/2mines.svg + icons/scalable/status/3mines.svg + icons/scalable/status/4mines.svg + icons/scalable/status/5mines.svg + icons/scalable/status/6mines.svg + icons/scalable/status/7mines.svg + icons/scalable/status/8mines.svg + icons/scalable/status/exploded.svg + icons/scalable/status/flag.svg + icons/scalable/status/incorrect.svg + icons/scalable/status/maybe.svg + icons/scalable/status/mine.svg icons/scalable/status/24game.svg icons/scalable/status/24game_running.svg icons/scalable/status/audacious_whitesur.svg diff --git a/Gtkmm3_Mac/res/icons/scalable/status/1mines.svg b/Gtkmm3_Mac/res/icons/scalable/status/1mines.svg new file mode 100644 index 0000000..6bba912 --- /dev/null +++ b/Gtkmm3_Mac/res/icons/scalable/status/1mines.svg @@ -0,0 +1,80 @@ + + + + + + + + + + image/svg+xml + + + + + + + + 1 + + diff --git a/Gtkmm3_Mac/res/icons/scalable/status/2mines.svg b/Gtkmm3_Mac/res/icons/scalable/status/2mines.svg new file mode 100644 index 0000000..f9ac25f --- /dev/null +++ b/Gtkmm3_Mac/res/icons/scalable/status/2mines.svg @@ -0,0 +1,80 @@ + + + + + + + + + + image/svg+xml + + + + + + + + 2 + + diff --git a/Gtkmm3_Mac/res/icons/scalable/status/3mines.svg b/Gtkmm3_Mac/res/icons/scalable/status/3mines.svg new file mode 100644 index 0000000..57d249b --- /dev/null +++ b/Gtkmm3_Mac/res/icons/scalable/status/3mines.svg @@ -0,0 +1,80 @@ + + + + + + + + + + image/svg+xml + + + + + + + + 3 + + diff --git a/Gtkmm3_Mac/res/icons/scalable/status/4mines.svg b/Gtkmm3_Mac/res/icons/scalable/status/4mines.svg new file mode 100644 index 0000000..12906ee --- /dev/null +++ b/Gtkmm3_Mac/res/icons/scalable/status/4mines.svg @@ -0,0 +1,80 @@ + + + + + + + + + + image/svg+xml + + + + + + + + 4 + + diff --git a/Gtkmm3_Mac/res/icons/scalable/status/5mines.svg b/Gtkmm3_Mac/res/icons/scalable/status/5mines.svg new file mode 100644 index 0000000..7cb4c23 --- /dev/null +++ b/Gtkmm3_Mac/res/icons/scalable/status/5mines.svg @@ -0,0 +1,80 @@ + + + + + + + + + + image/svg+xml + + + + + + + + 5 + + diff --git a/Gtkmm3_Mac/res/icons/scalable/status/6mines.svg b/Gtkmm3_Mac/res/icons/scalable/status/6mines.svg new file mode 100644 index 0000000..960c218 --- /dev/null +++ b/Gtkmm3_Mac/res/icons/scalable/status/6mines.svg @@ -0,0 +1,80 @@ + + + + + + + + + + image/svg+xml + + + + + + + + 6 + + diff --git a/Gtkmm3_Mac/res/icons/scalable/status/7mines.svg b/Gtkmm3_Mac/res/icons/scalable/status/7mines.svg new file mode 100644 index 0000000..7e117a5 --- /dev/null +++ b/Gtkmm3_Mac/res/icons/scalable/status/7mines.svg @@ -0,0 +1,80 @@ + + + + + + + + + + image/svg+xml + + + + + + + + 7 + + diff --git a/Gtkmm3_Mac/res/icons/scalable/status/8mines.svg b/Gtkmm3_Mac/res/icons/scalable/status/8mines.svg new file mode 100644 index 0000000..a3894cc --- /dev/null +++ b/Gtkmm3_Mac/res/icons/scalable/status/8mines.svg @@ -0,0 +1,80 @@ + + + + + + + + + + image/svg+xml + + + + + + + + 8 + + diff --git a/Gtkmm3_Mac/res/icons/scalable/status/exploded.svg b/Gtkmm3_Mac/res/icons/scalable/status/exploded.svg new file mode 100644 index 0000000..3211acf --- /dev/null +++ b/Gtkmm3_Mac/res/icons/scalable/status/exploded.svg @@ -0,0 +1,125 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff --git a/Gtkmm3_Mac/res/icons/scalable/status/flag.svg b/Gtkmm3_Mac/res/icons/scalable/status/flag.svg new file mode 100644 index 0000000..ceb16a3 --- /dev/null +++ b/Gtkmm3_Mac/res/icons/scalable/status/flag.svg @@ -0,0 +1,90 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/Gtkmm3_Mac/res/icons/scalable/status/incorrect.svg b/Gtkmm3_Mac/res/icons/scalable/status/incorrect.svg new file mode 100644 index 0000000..ceb16a3 --- /dev/null +++ b/Gtkmm3_Mac/res/icons/scalable/status/incorrect.svg @@ -0,0 +1,90 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/Gtkmm3_Mac/res/icons/scalable/status/maybe.svg b/Gtkmm3_Mac/res/icons/scalable/status/maybe.svg new file mode 100644 index 0000000..1edbd8b --- /dev/null +++ b/Gtkmm3_Mac/res/icons/scalable/status/maybe.svg @@ -0,0 +1,101 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + diff --git a/Gtkmm3_Mac/res/icons/scalable/status/mine.svg b/Gtkmm3_Mac/res/icons/scalable/status/mine.svg new file mode 100644 index 0000000..c3faf76 --- /dev/null +++ b/Gtkmm3_Mac/res/icons/scalable/status/mine.svg @@ -0,0 +1,125 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff --git a/Gtkmm3_Mac/res/mine_menu.xml b/Gtkmm3_Mac/res/mine_menu.xml new file mode 100644 index 0000000..96984dc --- /dev/null +++ b/Gtkmm3_Mac/res/mine_menu.xml @@ -0,0 +1,27 @@ + + + +
+ + New Game + win.new_game + + + Custom Game + win.custom_game + + + Show Scores + win.scores + + + Show all mines + win.show_mines + + + Quit + win.quit + +
+
+
\ No newline at end of file diff --git a/Gtkmm3_Mac/res/scoreswin.ui b/Gtkmm3_Mac/res/scoreswin.ui new file mode 100644 index 0000000..d853dc7 --- /dev/null +++ b/Gtkmm3_Mac/res/scoreswin.ui @@ -0,0 +1,63 @@ + + + + + + + False + + + False + vertical + + + 400 + 300 + False + start + + + False + True + 1 + + + + + 3 + False + + + False + True + + + + False + False + 1 + + + + + Close + False + False + + + False + True + 2 + + + + + False + False + 2 + + + + + + diff --git a/Gtkmm3_Mac/res/win_input.ui b/Gtkmm3_Mac/res/win_input.ui new file mode 100644 index 0000000..646d156 --- /dev/null +++ b/Gtkmm3_Mac/res/win_input.ui @@ -0,0 +1,136 @@ + + + + + + + 300 + 150 + False + dialog + + + False + 10 + 10 + 10 + 10 + vertical + 2 + + + False + end + + + OK + True + True + True + + + True + True + 0 + + + + + Cancel + True + True + True + + + True + True + 1 + + + + + False + False + 0 + + + + + True + False + center + center + True + True + vertical + + + True + False + center + center + True + True + + + True + False + center + center + Input Name: + + + False + True + 0 + + + + + True + True + center + center + + + False + True + 1 + + + + + False + True + 0 + + + + + Show Scores Window + True + True + False + True + + + False + True + 1 + + + + + False + True + 1 + + + + + + btn_ok + btn_cancel + + +