Merge pull request #155 from SuperDude88/show-charts-preference

Show Charts Option

Author: SuperDude88

gui/desktop/mainwindow.hpp

@@ -137,6 +137,7 @@ class MainWindow : public QMainWindow
     bool isIslandMappedToChart(uint8_t island);
     uint8_t islandForChart(GameItem chart);
     GameItem chartForIsland(uint8_t islandNum);
+    void tracker_update_chart_visibility();
 
 private slots:
     void show_error_dialog(const std::string& s, const std::string& title = "An error has occured!");

gui/desktop/tracker/tracker.cpp

@@ -48,34 +48,22 @@ void MainWindow::initialize_tracker_world(Settings& settings,
     // Copy settings to modify them
     trackerSettings = settings;
 
-    // Show or hide chart tracker buttons depending on settings
-    for (auto chartButton : ui->tracker_tab->findChildren<TrackerChartButton*>())
-    {
-        // If charts are randomized, show all charts if either chart progression is enabled
-        if (trackerSettings.randomize_charts)
-        {
-            chartButton->setVisible(trackerSettings.progression_treasure_charts || trackerSettings.progression_triforce_charts);
-        }
-        // If charts aren't randomized, show chart only if their rerespective chart type is progression
-        else
-        {
-            chartButton->setVisible((trackerSettings.progression_treasure_charts && chartButton->isForTreasureChart()) ||
-                                    (trackerSettings.progression_triforce_charts && chartButton->isForTriforceChart()));
-        }
-    }
-
     selectedChartIsland = 0;
     if (settings.randomize_charts)
     {
         // With charts shuffled the required ones can be on any island
         // So for tracker purposes, treat all 49 charts as potentially progress
+        // Also force all charts to be shown on the map
         if (trackerSettings.progression_treasure_charts || trackerSettings.progression_triforce_charts)
         {
             trackerSettings.progression_treasure_charts = true;
             trackerSettings.progression_triforce_charts = true;
+            trackerPreferences.showCharts = true;
         }
     }
 
+    tracker_update_chart_visibility();
+
     // Give 3 hearts so that all heart checks pass logic
     trackerSettings.starting_hcs = 3;
 
@@ -459,6 +447,7 @@ bool MainWindow::autosave_current_tracker_preferences()
     pref["show_nonprogress_locations"] = trackerPreferences.showNonProgressLocations;
     pref["right_click_clear_all"] = trackerPreferences.rightClickClearAll;
     pref["clear_all_includes_dependent_locations"] = trackerPreferences.clearAllIncludesDependentLocations;
+    pref["show_charts"] = trackerPreferences.showCharts;
     pref["override_items_color"] = trackerPreferences.overrideItemsColor;
     pref["override_locations_color"] = trackerPreferences.overrideLocationsColor;
     pref["override_stats_color"] = trackerPreferences.overrideStatsColor;
@@ -562,6 +551,11 @@ void MainWindow::load_tracker_autosave()
         trackerPreferences.clearAllIncludesDependentLocations = pref["clear_all_includes_dungeon_mail"].as<bool>();
     }
 
+    if (pref["show_charts"])
+    {
+        trackerPreferences.showCharts = pref["show_charts"].as<bool>();
+    }
+
     if (!std::filesystem::exists(trackerPreferences.autosaveFilePath))
     {
         // No autosave file, don't try to do anything
@@ -1980,3 +1974,15 @@ void MainWindow::tracker_set_required_boss(const QString& bossName, Qt::CheckSta
 
     update_tracker();
 }
+
+void MainWindow::tracker_update_chart_visibility() {
+    // Show or hide chart buttons depending on the preference
+    for (auto chartButton : ui->tracker_tab->findChildren<TrackerChartButton*>())
+    {
+        // If charts are randomized and any are progression, showCharts is forced to be true
+        // If charts aren't randomized, show chart only if their respective chart type is progression
+        chartButton->setVisible(trackerPreferences.showCharts ||
+                                (trackerSettings.progression_treasure_charts && chartButton->isForTreasureChart()) ||
+                                (trackerSettings.progression_triforce_charts && chartButton->isForTriforceChart()));
+    }
+}

gui/desktop/tracker/tracker_preferences.hpp

@@ -10,6 +10,7 @@ struct TrackerPreferences {
     bool showNonProgressLocations = false;
     bool rightClickClearAll = true;
     bool clearAllIncludesDependentLocations = true;
+    bool showCharts = true;
     bool overrideItemsColor = false;
     bool overrideLocationsColor = false;
     bool overrideStatsColor = false;

gui/desktop/tracker/tracker_preferences_dialog.cpp

@@ -12,6 +12,11 @@ TrackerPreferencesDialog::TrackerPreferencesDialog(MainWindow* main_) : main(mai
     ui.show_nonprogress_locations->setChecked(main->trackerPreferences.showNonProgressLocations);
     ui.right_click_to_clear_all->setChecked(main->trackerPreferences.rightClickClearAll);
     ui.clear_all_includes_dependent_locations->setChecked(main->trackerPreferences.clearAllIncludesDependentLocations);
+    ui.show_charts->setChecked(main->trackerPreferences.showCharts);
+    if(main->trackerSettings.randomize_charts && (main->trackerSettings.progression_triforce_charts || main->trackerSettings.progression_treasure_charts)) {
+        ui.show_charts->setChecked(true);
+        ui.show_charts->setEnabled(false);
+    }
     ui.override_items_background_color->setChecked(main->trackerPreferences.overrideItemsColor);
     ui.override_locations_background_color->setChecked(main->trackerPreferences.overrideLocationsColor);
     ui.override_statistics_background_color->setChecked(main->trackerPreferences.overrideStatsColor);
@@ -64,6 +69,13 @@ void TrackerPreferencesDialog::on_clear_all_includes_dependent_locations_stateCh
 }
 
 
+void TrackerPreferencesDialog::on_show_charts_stateChanged(int arg1)
+{
+    main->trackerPreferences.showCharts = arg1;
+    main->tracker_update_chart_visibility();
+}
+
+
 void TrackerPreferencesDialog::on_override_items_background_color_stateChanged(int arg1)
 {
     main->trackerPreferences.overrideItemsColor = arg1;

gui/desktop/tracker/tracker_preferences_dialog.hpp

@@ -17,6 +17,7 @@ private slots:
     void on_show_nonprogress_locations_stateChanged(int arg1);
     void on_right_click_to_clear_all_stateChanged(int arg1);
     void on_clear_all_includes_dependent_locations_stateChanged(int arg1);
+    void on_show_charts_stateChanged(int arg1);
     void on_override_items_background_color_stateChanged(int arg1);
     void on_override_locations_background_color_stateChanged(int arg1);
     void on_override_statistics_background_color_stateChanged(int arg1);

gui/desktop/tracker/tracker_preferences_dialog.ui

@@ -88,6 +88,13 @@
      </property>
     </widget>
    </item>
+   <item>
+    <widget class="QCheckBox" name="show_charts">
+     <property name="text">
+      <string>Show Charts</string>
+     </property>
+    </widget>
+   </item>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
      <property name="spacing">