[gtk] Update GTK+ backend for new display properties
Hleb Valoshka
pirogronian
parent
60c42c2588
commit
adff12a0aa
|
|
@ -888,6 +888,42 @@ void actionRenderPlanets(GtkToggleAction* action, AppData* app)
|
|||
}
|
||||
|
||||
|
||||
void actionRenderDwarfPlanets(GtkToggleAction* action, AppData* app)
|
||||
{
|
||||
setRenderFlag(app, Renderer::ShowDwarfPlanets, gtk_toggle_action_get_active(action));
|
||||
}
|
||||
|
||||
|
||||
void actionRenderMoons(GtkToggleAction* action, AppData* app)
|
||||
{
|
||||
setRenderFlag(app, Renderer::ShowMoons, gtk_toggle_action_get_active(action));
|
||||
}
|
||||
|
||||
|
||||
void actionRenderMinorMoons(GtkToggleAction* action, AppData* app)
|
||||
{
|
||||
setRenderFlag(app, Renderer::ShowMinorMoons, gtk_toggle_action_get_active(action));
|
||||
}
|
||||
|
||||
|
||||
void actionRenderAsteroids(GtkToggleAction* action, AppData* app)
|
||||
{
|
||||
setRenderFlag(app, Renderer::ShowAsteroids, gtk_toggle_action_get_active(action));
|
||||
}
|
||||
|
||||
|
||||
void actionRenderComets(GtkToggleAction* action, AppData* app)
|
||||
{
|
||||
setRenderFlag(app, Renderer::ShowComets, gtk_toggle_action_get_active(action));
|
||||
}
|
||||
|
||||
|
||||
void actionRenderSpacecrafts(GtkToggleAction* action, AppData* app)
|
||||
{
|
||||
setRenderFlag(app, Renderer::ShowSpacecrafts, gtk_toggle_action_get_active(action));
|
||||
}
|
||||
|
||||
|
||||
void actionRenderRingShadows(GtkToggleAction* action, AppData* app)
|
||||
{
|
||||
setRenderFlag(app, Renderer::ShowRingShadows, gtk_toggle_action_get_active(action));
|
||||
|
|
@ -972,6 +1008,12 @@ void actionLabelMoons(GtkToggleAction* action, AppData* app)
|
|||
}
|
||||
|
||||
|
||||
void actionLabelMinorMoons(GtkToggleAction* action, AppData* app)
|
||||
{
|
||||
setLabelMode(app, Renderer::MinorMoonLabels, gtk_toggle_action_get_active(action));
|
||||
}
|
||||
|
||||
|
||||
void actionLabelNebulae(GtkToggleAction* action, AppData* app)
|
||||
{
|
||||
setLabelMode(app, Renderer::NebulaLabels, gtk_toggle_action_get_active(action));
|
||||
|
|
@ -990,6 +1032,12 @@ void actionLabelPlanets(GtkToggleAction* action, AppData* app)
|
|||
}
|
||||
|
||||
|
||||
void actionLabelDwarfPlanets(GtkToggleAction* action, AppData* app)
|
||||
{
|
||||
setLabelMode(app, Renderer::DwarfPlanetLabels, gtk_toggle_action_get_active(action));
|
||||
}
|
||||
|
||||
|
||||
void actionLabelSpacecraft(GtkToggleAction* action, AppData* app)
|
||||
{
|
||||
setLabelMode(app, Renderer::SpacecraftLabels, gtk_toggle_action_get_active(action));
|
||||
|
|
@ -1256,7 +1304,9 @@ void resyncLabelActions(AppData* app)
|
|||
{
|
||||
case Renderer::StarLabels: actionName = "LabelStars"; break;
|
||||
case Renderer::PlanetLabels: actionName = "LabelPlanets"; break;
|
||||
case Renderer::DwarfPlanetLabels: actionName = "LabelDwarfPlanets"; break;
|
||||
case Renderer::MoonLabels: actionName = "LabelMoons"; break;
|
||||
case Renderer::MinorMoonLabels: actionName = "LabelMinorMoons"; break;
|
||||
case Renderer::ConstellationLabels: actionName = "LabelConstellations"; break;
|
||||
case Renderer::GalaxyLabels: actionName = "LabelGalaxies"; break;
|
||||
case Renderer::AsteroidLabels: actionName = "LabelAsteroids"; break;
|
||||
|
|
@ -1301,6 +1351,12 @@ void resyncRenderActions(AppData* app)
|
|||
{
|
||||
case Renderer::ShowStars: actionName = "RenderStars"; break;
|
||||
case Renderer::ShowPlanets: actionName = "RenderPlanets"; break;
|
||||
case Renderer::ShowDwarfPlanets: actionName = "RenderDwarfPlanets"; break;
|
||||
case Renderer::ShowMoons: actionName = "RenderMoons"; break;
|
||||
case Renderer::ShowMinorMoons: actionName = "RenderMinorMoons"; break;
|
||||
case Renderer::ShowAsteroids: actionName = "RenderAsteroids"; break;
|
||||
case Renderer::ShowComets: actionName = "RenderComets"; break;
|
||||
case Renderer::ShowSpacecrafts: actionName = "RenderSpacecrafts"; break;
|
||||
case Renderer::ShowGalaxies: actionName = "RenderGalaxies"; break;
|
||||
case Renderer::ShowDiagrams: actionName = "RenderConstellations"; break;
|
||||
case Renderer::ShowCloudMaps: actionName = "RenderClouds"; break;
|
||||
|
|
|
|||
|
|
@ -90,6 +90,12 @@ void actionRenderNightLights(GtkToggleAction*, AppData*);
|
|||
void actionRenderOpenClusters(GtkToggleAction*, AppData*);
|
||||
void actionRenderOrbits(GtkToggleAction*, AppData*);
|
||||
void actionRenderPlanets(GtkToggleAction*, AppData*);
|
||||
void actionRenderDwarfPlanets(GtkToggleAction*, AppData*);
|
||||
void actionRenderMoons(GtkToggleAction*, AppData*);
|
||||
void actionRenderMinorMoons(GtkToggleAction*, AppData*);
|
||||
void actionRenderAsteroids(GtkToggleAction*, AppData*);
|
||||
void actionRenderComets(GtkToggleAction*, AppData*);
|
||||
void actionRenderSpacecrafts(GtkToggleAction*, AppData*);
|
||||
void actionRenderRingShadows(GtkToggleAction*, AppData*);
|
||||
void actionRenderStars(GtkToggleAction*, AppData*);
|
||||
|
||||
|
|
@ -108,9 +114,11 @@ void actionLabelGalaxies(GtkToggleAction*, AppData*);
|
|||
void actionLabelGlobulars(GtkToggleAction*, AppData*);
|
||||
void actionLabelLocations(GtkToggleAction*, AppData*);
|
||||
void actionLabelMoons(GtkToggleAction*, AppData*);
|
||||
void actionLabelMinorMoons(GtkToggleAction*, AppData*);
|
||||
void actionLabelNebulae(GtkToggleAction*, AppData*);
|
||||
void actionLabelOpenClusters(GtkToggleAction*, AppData*);
|
||||
void actionLabelPlanets(GtkToggleAction*, AppData*);
|
||||
void actionLabelDwarfPlanets(GtkToggleAction*, AppData*);
|
||||
void actionLabelSpacecraft(GtkToggleAction*, AppData*);
|
||||
void actionLabelStars(GtkToggleAction*, AppData*);
|
||||
|
||||
|
|
|
|||
|
|
@ -52,6 +52,12 @@
|
|||
<menuitem action='RenderNightLights'/>
|
||||
<menuitem action='RenderOpenClusters'/>
|
||||
<menuitem action='RenderPlanets'/>
|
||||
<menuitem action='RenderDwarfPlanets'/>
|
||||
<menuitem action='RenderMoons'/>
|
||||
<menuitem action='RenderMinorMoons'/>
|
||||
<menuitem action='RenderAsteroids'/>
|
||||
<menuitem action='RenderComets'/>
|
||||
<menuitem action='RenderSpacecrafts'/>
|
||||
<menuitem action='RenderRingShadows'/>
|
||||
<menuitem action='RenderStars'/>
|
||||
</menu>
|
||||
|
|
@ -69,9 +75,11 @@
|
|||
<menuitem action='LabelGlobulars'/>
|
||||
<menuitem action='LabelLocations'/>
|
||||
<menuitem action='LabelMoons'/>
|
||||
<menuitem action='LabelMinorMoons'/>
|
||||
<menuitem action='LabelNebulae'/>
|
||||
<menuitem action='LabelOpenClusters'/>
|
||||
<menuitem action='LabelPlanets'/>
|
||||
<menuitem action='LabelDwarfPlanets'/>
|
||||
<menuitem action='LabelSpacecraft'/>
|
||||
<menuitem action='LabelStars'/>
|
||||
</menu>
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
|
||||
/* Definitions: Helpers */
|
||||
static void getFlag(GKeyFile* file, int *flags, int setting, const gchar* section, const gchar* key, int* errors);
|
||||
|
||||
static void getFlag64(GKeyFile* file, uint64_t *flags, uint64_t setting, const gchar* section, const gchar* key, int* errors);
|
||||
|
||||
/* ENTRY: Initializes and reads into memory the preferences */
|
||||
void initSettingsFile(AppData* app)
|
||||
|
|
@ -88,7 +88,8 @@ void applySettingsFileMain(AppData* app, GKeyFile* file)
|
|||
{
|
||||
GError* e;
|
||||
float ambientLight, visualMagnitude, galaxyLightGain;
|
||||
int errors, verbosity, starStyle, textureResolution, distanceLimit, rf, om, lm;
|
||||
int errors, verbosity, starStyle, textureResolution, distanceLimit, om, lm;
|
||||
uint64_t rf;
|
||||
|
||||
/* See comment in applySettingsFilePrefs() */
|
||||
e = NULL;
|
||||
|
|
@ -140,29 +141,35 @@ void applySettingsFileMain(AppData* app, GKeyFile* file)
|
|||
/* Render Flags */
|
||||
errors = 0;
|
||||
rf = Renderer::ShowNothing;
|
||||
getFlag(file, &rf, Renderer::ShowStars, "RenderFlags", "stars", &errors);
|
||||
getFlag(file, &rf, Renderer::ShowPlanets, "RenderFlags", "planets", &errors);
|
||||
getFlag(file, &rf, Renderer::ShowGalaxies, "RenderFlags", "galaxies", &errors);
|
||||
getFlag(file, &rf, Renderer::ShowDiagrams, "RenderFlags", "diagrams", &errors);
|
||||
getFlag(file, &rf, Renderer::ShowCloudMaps, "RenderFlags", "cloudMaps", &errors);
|
||||
getFlag(file, &rf, Renderer::ShowOrbits, "RenderFlags", "orbits", &errors);
|
||||
getFlag(file, &rf, Renderer::ShowCelestialSphere, "RenderFlags", "celestialSphere", &errors);
|
||||
getFlag(file, &rf, Renderer::ShowNightMaps, "RenderFlags", "nightMaps", &errors);
|
||||
getFlag(file, &rf, Renderer::ShowAtmospheres, "RenderFlags", "atmospheres", &errors);
|
||||
getFlag(file, &rf, Renderer::ShowSmoothLines, "RenderFlags", "smoothLines", &errors);
|
||||
getFlag(file, &rf, Renderer::ShowEclipseShadows, "RenderFlags", "eclipseShadows", &errors);
|
||||
getFlag(file, &rf, Renderer::ShowRingShadows, "RenderFlags", "ringShadows", &errors);
|
||||
getFlag(file, &rf, Renderer::ShowBoundaries, "RenderFlags", "boundaries", &errors);
|
||||
getFlag(file, &rf, Renderer::ShowAutoMag, "RenderFlags", "autoMag", &errors);
|
||||
getFlag(file, &rf, Renderer::ShowCometTails, "RenderFlags", "cometTails", &errors);
|
||||
getFlag(file, &rf, Renderer::ShowMarkers, "RenderFlags", "markers", &errors);
|
||||
getFlag(file, &rf, Renderer::ShowPartialTrajectories, "RenderFlags", "partialTrajectories", &errors);
|
||||
getFlag(file, &rf, Renderer::ShowNebulae, "RenderFlags", "nebulae", &errors);
|
||||
getFlag(file, &rf, Renderer::ShowOpenClusters, "RenderFlags", "openClusters", &errors);
|
||||
getFlag(file, &rf, Renderer::ShowGlobulars, "RenderFlags", "globulars", &errors);
|
||||
getFlag(file, &rf, Renderer::ShowGalacticGrid, "RenderFlags", "gridGalactic", &errors);
|
||||
getFlag(file, &rf, Renderer::ShowEclipticGrid, "RenderFlags", "gridEcliptic", &errors);
|
||||
getFlag(file, &rf, Renderer::ShowHorizonGrid, "RenderFlags", "gridHorizontal", &errors);
|
||||
getFlag64(file, &rf, Renderer::ShowStars, "RenderFlags", "stars", &errors);
|
||||
getFlag64(file, &rf, Renderer::ShowPlanets, "RenderFlags", "planets", &errors);
|
||||
getFlag64(file, &rf, Renderer::ShowDwarfPlanets, "RenderFlags", "dwarfPlanets", &errors);
|
||||
getFlag64(file, &rf, Renderer::ShowMoons, "RenderFlags", "moons", &errors);
|
||||
getFlag64(file, &rf, Renderer::ShowMinorMoons, "RenderFlags", "minorMoons", &errors);
|
||||
getFlag64(file, &rf, Renderer::ShowAsteroids, "RenderFlags", "asteroids", &errors);
|
||||
getFlag64(file, &rf, Renderer::ShowComets, "RenderFlags", "comets", &errors);
|
||||
getFlag64(file, &rf, Renderer::ShowSpacecrafts, "RenderFlags", "spacecrafts", &errors);
|
||||
getFlag64(file, &rf, Renderer::ShowGalaxies, "RenderFlags", "galaxies", &errors);
|
||||
getFlag64(file, &rf, Renderer::ShowDiagrams, "RenderFlags", "diagrams", &errors);
|
||||
getFlag64(file, &rf, Renderer::ShowCloudMaps, "RenderFlags", "cloudMaps", &errors);
|
||||
getFlag64(file, &rf, Renderer::ShowOrbits, "RenderFlags", "orbits", &errors);
|
||||
getFlag64(file, &rf, Renderer::ShowCelestialSphere, "RenderFlags", "celestialSphere", &errors);
|
||||
getFlag64(file, &rf, Renderer::ShowNightMaps, "RenderFlags", "nightMaps", &errors);
|
||||
getFlag64(file, &rf, Renderer::ShowAtmospheres, "RenderFlags", "atmospheres", &errors);
|
||||
getFlag64(file, &rf, Renderer::ShowSmoothLines, "RenderFlags", "smoothLines", &errors);
|
||||
getFlag64(file, &rf, Renderer::ShowEclipseShadows, "RenderFlags", "eclipseShadows", &errors);
|
||||
getFlag64(file, &rf, Renderer::ShowRingShadows, "RenderFlags", "ringShadows", &errors);
|
||||
getFlag64(file, &rf, Renderer::ShowBoundaries, "RenderFlags", "boundaries", &errors);
|
||||
getFlag64(file, &rf, Renderer::ShowAutoMag, "RenderFlags", "autoMag", &errors);
|
||||
getFlag64(file, &rf, Renderer::ShowCometTails, "RenderFlags", "cometTails", &errors);
|
||||
getFlag64(file, &rf, Renderer::ShowMarkers, "RenderFlags", "markers", &errors);
|
||||
getFlag64(file, &rf, Renderer::ShowPartialTrajectories, "RenderFlags", "partialTrajectories", &errors);
|
||||
getFlag64(file, &rf, Renderer::ShowNebulae, "RenderFlags", "nebulae", &errors);
|
||||
getFlag64(file, &rf, Renderer::ShowOpenClusters, "RenderFlags", "openClusters", &errors);
|
||||
getFlag64(file, &rf, Renderer::ShowGlobulars, "RenderFlags", "globulars", &errors);
|
||||
getFlag64(file, &rf, Renderer::ShowGalacticGrid, "RenderFlags", "gridGalactic", &errors);
|
||||
getFlag64(file, &rf, Renderer::ShowEclipticGrid, "RenderFlags", "gridEcliptic", &errors);
|
||||
getFlag64(file, &rf, Renderer::ShowHorizonGrid, "RenderFlags", "gridHorizontal", &errors);
|
||||
|
||||
/* If any flag is missing, use defaults for all. */
|
||||
if (errors > 0)
|
||||
|
|
@ -191,7 +198,9 @@ void applySettingsFileMain(AppData* app, GKeyFile* file)
|
|||
|
||||
getFlag(file, &lm, Renderer::StarLabels, "LabelMode", "star", &errors);
|
||||
getFlag(file, &lm, Renderer::PlanetLabels, "LabelMode", "planet", &errors);
|
||||
getFlag(file, &lm, Renderer::DwarfPlanetLabels, "LabelMode", "dwarfplanet", &errors);
|
||||
getFlag(file, &lm, Renderer::MoonLabels, "LabelMode", "moon", &errors);
|
||||
getFlag(file, &lm, Renderer::MinorMoonLabels, "LabelMode", "minormoon", &errors);
|
||||
getFlag(file, &lm, Renderer::ConstellationLabels, "LabelMode", "constellation", &errors);
|
||||
getFlag(file, &lm, Renderer::GalaxyLabels, "LabelMode", "galaxy", &errors);
|
||||
getFlag(file, &lm, Renderer::AsteroidLabels, "LabelMode", "asteroid", &errors);
|
||||
|
|
@ -212,7 +221,8 @@ void applySettingsFileMain(AppData* app, GKeyFile* file)
|
|||
/* ENTRY: Saves settings to file */
|
||||
void saveSettingsFile(AppData* app)
|
||||
{
|
||||
int rf, om, lm;
|
||||
int om, lm;
|
||||
uint64_t rf;
|
||||
GKeyFile* file = app->settingsFile;
|
||||
char* fn = g_build_filename(g_get_home_dir(), CELESTIARC, NULL);
|
||||
FILE* outfile;
|
||||
|
|
@ -244,29 +254,35 @@ void saveSettingsFile(AppData* app)
|
|||
g_key_file_set_boolean(file, "Window", "fullScreen", app->fullScreen);
|
||||
|
||||
rf = app->renderer->getRenderFlags();
|
||||
g_key_file_set_boolean(file, "RenderFlags", "stars", rf & Renderer::ShowStars);
|
||||
g_key_file_set_boolean(file, "RenderFlags", "planets", rf & Renderer::ShowPlanets);
|
||||
g_key_file_set_boolean(file, "RenderFlags", "galaxies", rf & Renderer::ShowGalaxies);
|
||||
g_key_file_set_boolean(file, "RenderFlags", "diagrams", rf & Renderer::ShowDiagrams);
|
||||
g_key_file_set_boolean(file, "RenderFlags", "cloudMaps", rf & Renderer::ShowCloudMaps);
|
||||
g_key_file_set_boolean(file, "RenderFlags", "orbits", rf & Renderer::ShowOrbits);
|
||||
g_key_file_set_boolean(file, "RenderFlags", "celestialSphere", rf & Renderer::ShowCelestialSphere);
|
||||
g_key_file_set_boolean(file, "RenderFlags", "nightMaps", rf & Renderer::ShowNightMaps);
|
||||
g_key_file_set_boolean(file, "RenderFlags", "atmospheres", rf & Renderer::ShowAtmospheres);
|
||||
g_key_file_set_boolean(file, "RenderFlags", "smoothLines", rf & Renderer::ShowSmoothLines);
|
||||
g_key_file_set_boolean(file, "RenderFlags", "eclipseShadows", rf & Renderer::ShowEclipseShadows);
|
||||
g_key_file_set_boolean(file, "RenderFlags", "ringShadows", rf & Renderer::ShowRingShadows);
|
||||
g_key_file_set_boolean(file, "RenderFlags", "boundaries", rf & Renderer::ShowBoundaries);
|
||||
g_key_file_set_boolean(file, "RenderFlags", "autoMag", rf & Renderer::ShowAutoMag);
|
||||
g_key_file_set_boolean(file, "RenderFlags", "cometTails", rf & Renderer::ShowCometTails);
|
||||
g_key_file_set_boolean(file, "RenderFlags", "markers", rf & Renderer::ShowMarkers);
|
||||
g_key_file_set_boolean(file, "RenderFlags", "partialTrajectories", rf & Renderer::ShowPartialTrajectories);
|
||||
g_key_file_set_boolean(file, "RenderFlags", "nebulae", rf & Renderer::ShowNebulae);
|
||||
g_key_file_set_boolean(file, "RenderFlags", "openClusters", rf & Renderer::ShowOpenClusters);
|
||||
g_key_file_set_boolean(file, "RenderFlags", "globulars", rf & Renderer::ShowGlobulars);
|
||||
g_key_file_set_boolean(file, "RenderFlags", "gridGalactic", rf & Renderer::ShowGalacticGrid);
|
||||
g_key_file_set_boolean(file, "RenderFlags", "gridEcliptic", rf & Renderer::ShowEclipticGrid);
|
||||
g_key_file_set_boolean(file, "RenderFlags", "gridHorizontal", rf & Renderer::ShowHorizonGrid);
|
||||
g_key_file_set_boolean(file, "RenderFlags", "stars", (rf & Renderer::ShowStars) != 0);
|
||||
g_key_file_set_boolean(file, "RenderFlags", "planets", (rf & Renderer::ShowPlanets) != 0);
|
||||
g_key_file_set_boolean(file, "RenderFlags", "dwarfPlanets", (rf & Renderer::ShowDwarfPlanets) != 0);
|
||||
g_key_file_set_boolean(file, "RenderFlags", "moons", (rf & Renderer::ShowMoons) != 0);
|
||||
g_key_file_set_boolean(file, "RenderFlags", "minorMoons", (rf & Renderer::ShowMinorMoons) != 0);
|
||||
g_key_file_set_boolean(file, "RenderFlags", "asteroids", (rf & Renderer::ShowAsteroids) != 0);
|
||||
g_key_file_set_boolean(file, "RenderFlags", "comets", (rf & Renderer::ShowComets) != 0);
|
||||
g_key_file_set_boolean(file, "RenderFlags", "spacecrafts", (rf & Renderer::ShowSpacecrafts) != 0);
|
||||
g_key_file_set_boolean(file, "RenderFlags", "galaxies", (rf & Renderer::ShowGalaxies) != 0);
|
||||
g_key_file_set_boolean(file, "RenderFlags", "diagrams", (rf & Renderer::ShowDiagrams) != 0);
|
||||
g_key_file_set_boolean(file, "RenderFlags", "cloudMaps", (rf & Renderer::ShowCloudMaps) != 0);
|
||||
g_key_file_set_boolean(file, "RenderFlags", "orbits", (rf & Renderer::ShowOrbits) != 0);
|
||||
g_key_file_set_boolean(file, "RenderFlags", "celestialSphere", (rf & Renderer::ShowCelestialSphere) != 0);
|
||||
g_key_file_set_boolean(file, "RenderFlags", "nightMaps", (rf & Renderer::ShowNightMaps) != 0);
|
||||
g_key_file_set_boolean(file, "RenderFlags", "atmospheres", (rf & Renderer::ShowAtmospheres) != 0);
|
||||
g_key_file_set_boolean(file, "RenderFlags", "smoothLines", (rf & Renderer::ShowSmoothLines) != 0);
|
||||
g_key_file_set_boolean(file, "RenderFlags", "eclipseShadows", (rf & Renderer::ShowEclipseShadows) != 0);
|
||||
g_key_file_set_boolean(file, "RenderFlags", "ringShadows", (rf & Renderer::ShowRingShadows) != 0);
|
||||
g_key_file_set_boolean(file, "RenderFlags", "boundaries", (rf & Renderer::ShowBoundaries) != 0);
|
||||
g_key_file_set_boolean(file, "RenderFlags", "autoMag", (rf & Renderer::ShowAutoMag) != 0);
|
||||
g_key_file_set_boolean(file, "RenderFlags", "cometTails", (rf & Renderer::ShowCometTails) != 0);
|
||||
g_key_file_set_boolean(file, "RenderFlags", "markers", (rf & Renderer::ShowMarkers) != 0);
|
||||
g_key_file_set_boolean(file, "RenderFlags", "partialTrajectories", (rf & Renderer::ShowPartialTrajectories) != 0);
|
||||
g_key_file_set_boolean(file, "RenderFlags", "nebulae", (rf & Renderer::ShowNebulae) != 0);
|
||||
g_key_file_set_boolean(file, "RenderFlags", "openClusters", (rf & Renderer::ShowOpenClusters) != 0);
|
||||
g_key_file_set_boolean(file, "RenderFlags", "globulars", (rf & Renderer::ShowGlobulars) != 0);
|
||||
g_key_file_set_boolean(file, "RenderFlags", "gridGalactic", (rf & Renderer::ShowGalacticGrid) != 0);
|
||||
g_key_file_set_boolean(file, "RenderFlags", "gridEcliptic", (rf & Renderer::ShowEclipticGrid) != 0);
|
||||
g_key_file_set_boolean(file, "RenderFlags", "gridHorizontal", (rf & Renderer::ShowHorizonGrid) != 0);
|
||||
|
||||
om = app->renderer->getOrbitMask();
|
||||
g_key_file_set_boolean(file, "OrbitMask", "planet", om & Body::Planet);
|
||||
|
|
@ -280,7 +296,9 @@ void saveSettingsFile(AppData* app)
|
|||
lm = app->renderer->getLabelMode();
|
||||
g_key_file_set_boolean(file, "LabelMode", "star", lm & Renderer::StarLabels);
|
||||
g_key_file_set_boolean(file, "LabelMode", "planet", lm & Renderer::PlanetLabels);
|
||||
g_key_file_set_boolean(file, "LabelMode", "dwarfplanet", lm & Renderer::DwarfPlanetLabels);
|
||||
g_key_file_set_boolean(file, "LabelMode", "moon", lm & Renderer::MoonLabels);
|
||||
g_key_file_set_boolean(file, "LabelMode", "minormoon", lm & Renderer::MinorMoonLabels);
|
||||
g_key_file_set_boolean(file, "LabelMode", "constellation", lm & Renderer::ConstellationLabels);
|
||||
g_key_file_set_boolean(file, "LabelMode", "galaxy", lm & Renderer::GalaxyLabels);
|
||||
g_key_file_set_boolean(file, "LabelMode", "asteroid", lm & Renderer::AsteroidLabels);
|
||||
|
|
@ -318,3 +336,14 @@ static void getFlag(GKeyFile* file, int *flags, int setting, const gchar* sectio
|
|||
if (e != NULL)
|
||||
*errors += 1;
|
||||
}
|
||||
|
||||
|
||||
static void getFlag64(GKeyFile* file, uint64_t *flags, uint64_t setting, const gchar* section, const gchar* key, int* errors)
|
||||
{
|
||||
GError* e = NULL;
|
||||
|
||||
*flags |= setting * g_key_file_get_boolean(file, section, key, &e);
|
||||
|
||||
if (e != NULL)
|
||||
*errors += 1;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -150,6 +150,12 @@ static const GtkToggleActionEntry actionsRenderFlags[] = {
|
|||
{ "RenderOpenClusters", NULL, "Open Clusters", NULL, NULL, G_CALLBACK(actionRenderOpenClusters), FALSE },
|
||||
{ "RenderOrbits", NULL, "Orbits", "O", NULL, G_CALLBACK(actionRenderOrbits), FALSE },
|
||||
{ "RenderPlanets", NULL, "Planets", NULL, NULL, G_CALLBACK(actionRenderPlanets), FALSE },
|
||||
{ "RenderDwarfPlanets", NULL, "Dwarf Planets", NULL, NULL, G_CALLBACK(actionRenderDwarfPlanets), FALSE },
|
||||
{ "RenderMoons", NULL, "Moons", NULL, NULL, G_CALLBACK(actionRenderMoons), FALSE },
|
||||
{ "RenderMinorMoons", NULL, "Minor Moons", NULL, NULL, G_CALLBACK(actionRenderMinorMoons), FALSE },
|
||||
{ "RenderComets", NULL, "Comets", NULL, NULL, G_CALLBACK(actionRenderComets), FALSE },
|
||||
{ "RenderAsteroids", NULL, "Asteroids", NULL, NULL, G_CALLBACK(actionRenderAsteroids), FALSE },
|
||||
{ "RenderSpacecrafts", NULL, "Spacecrafts", NULL, NULL, G_CALLBACK(actionRenderSpacecrafts), FALSE },
|
||||
{ "RenderRingShadows", NULL, "Ring Shadows", NULL, NULL, G_CALLBACK(actionRenderRingShadows), FALSE },
|
||||
{ "RenderStars", NULL, "Stars", NULL, NULL, G_CALLBACK(actionRenderStars), FALSE },
|
||||
};
|
||||
|
|
@ -173,9 +179,11 @@ static const GtkToggleActionEntry actionsLabelFlags[] = {
|
|||
{ "LabelGlobulars", NULL, "Globulars", "<shift>E", NULL, G_CALLBACK(actionLabelGlobulars), FALSE },
|
||||
{ "LabelLocations", NULL, "Locations", NULL, NULL, G_CALLBACK(actionLabelLocations), FALSE },
|
||||
{ "LabelMoons", NULL, "Moons", "M", NULL, G_CALLBACK(actionLabelMoons), FALSE },
|
||||
{ "LabelMinorMoons", NULL, "Minor Moons", "M", NULL, G_CALLBACK(actionLabelMinorMoons), FALSE },
|
||||
{ "LabelNebulae", NULL, "Nebulae", NULL, NULL, G_CALLBACK(actionLabelNebulae), FALSE },
|
||||
{ "LabelOpenClusters", NULL, "Open Clusters", NULL, NULL, G_CALLBACK(actionLabelOpenClusters), FALSE },
|
||||
{ "LabelPlanets", NULL, "Planets", "P", NULL, G_CALLBACK(actionLabelPlanets), FALSE },
|
||||
{ "LabelDwarfPlanets", NULL, "Dwarf Planets", "P", NULL, G_CALLBACK(actionLabelDwarfPlanets), FALSE },
|
||||
{ "LabelSpacecraft", NULL, "Spacecraft", "N", NULL, G_CALLBACK(actionLabelSpacecraft), FALSE },
|
||||
{ "LabelStars", NULL, "Stars", "B", NULL, G_CALLBACK(actionLabelStars), FALSE },
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue