Update gtk141

Gtkmm3/gtk141_minesweeper2/src/InputBox.cc

@@ -12,14 +12,6 @@ InputBox::InputBox(BaseObjectType *cobject, const Glib::RefPtr<Gtk::Builder> &re
 
 void InputBox::on_response(int response_id)
 {
-    if (response_id == Gtk::RESPONSE_OK)
-    {
-        read_scores(check_scores->get_active());
-    }
-    hide();
-}
-
-void InputBox::read_scores(bool show_scores_win){
     // Open a file to save json data
     std::fstream outfile;
     outfile.open("scores.json", std::ios_base::out);
@@ -36,10 +28,19 @@ void InputBox::read_scores(bool show_scores_win){
         outfile << data;
     }
     outfile.close();
+    if (response_id == Gtk::RESPONSE_OK)
+    {
+        read_scores(check_scores->get_active());
+    }
+    hide();
+}
 
+void InputBox::read_scores(bool show_scores_win)
+{
     // If show scores checkbutton is checked, show scores window
-        if(show_scores_win){
+    if (show_scores_win)
-            scores_win1->show_with_vectors(names, times);
+    {
+        scores_win1->update_and_show();
     }
 }
 

Gtkmm3/gtk141_minesweeper2/src/MineSweeper.cc

@@ -213,6 +213,8 @@ void MineSweeper::cell_clicked(MineCell *cell1)
             winned = false;
             cell1->cleared = true;
             cell1->set_image_from_icon_name("exploded", Gtk::ICON_SIZE_LARGE_TOOLBAR);
+
+            // End the game
             game_lost(cell1->y * 7 + cell1->x);
             status_label.set_label("You lost!");
             game_ended = true;

Gtkmm3/gtk141_minesweeper2/src/ScoresWin.cc

@@ -18,29 +18,48 @@ ScoresWin::ScoresWin(BaseObjectType *cobject, const Glib::RefPtr<Gtk::Builder> &
     tree_view->append_column("time", column1.win_time);
 }
 
-void ScoresWin::show_with_vectors(std::vector<std::string> &name_vec, std::vector<int> &time_vec){
+void ScoresWin::update_and_show()
+{
+    std::fstream infile;
+    infile.open("scores.json", std::ios_base::in);
+
+    if (infile.is_open())
+    {
+        // Read data from json file
+        json data = json::parse(infile);
+        std::vector<std::string> name_vec = data["name"];
+        std::vector<int> time_vec = data["time"];
+        
         // Clear the store
         store->clear();
 
         // Append data to the store
-    for(int i = 0; i < name_vec.size(); i++){
+        for (int i = 0; i < name_vec.size(); i++)
+        {
             auto row = *(store->append());
             row[column1.player_name] = name_vec[i];
             row[column1.win_time] = time_vec[i];
         }
+    }
 
     show_all();
 }
 
-int ScoresWin::sort_func(const Gtk::TreeModel::iterator &iter1, const Gtk::TreeModel::iterator &iter2){
+int ScoresWin::sort_func(const Gtk::TreeModel::iterator &iter1, const Gtk::TreeModel::iterator &iter2)
+{
+    // Sort by the game time
     auto row1 = *iter1;
     auto row2 = *iter2;
-    if(row1[column1.win_time] < row2[column1.win_time]){
+    if (row1[column1.win_time] < row2[column1.win_time])
+    {
         return -1;
     }
-    if(row1[column1.win_time] == row2[column1.win_time]){
+    if (row1[column1.win_time] == row2[column1.win_time])
+    {
         return 0;
-    }else{
+    }
+    else
+    {
         return 1;
     }
 }

Gtkmm3/gtk141_minesweeper2/src/ScoresWin.hh

@@ -7,7 +7,7 @@ class ScoresWin : public Gtk::Window{
     public:
         static ScoresWin *create();
         ScoresWin(BaseObjectType *cobject, const Glib::RefPtr<Gtk::Builder> &ref_Glade);
-        void show_with_vectors(std::vector<std::string> &name_vec, std::vector<int> &time_vec);
+        void update_and_show();
 
     private:
         Glib::RefPtr<Gtk::Builder> ref_builder;