gergely/astrognome
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #40 from gergelypolonkai/configure-house-system

Browse Source 
Add default house system to preferences dialog. Fixes #36
This commit is contained in:
Gergely Polonkai 2014-07-18 22:29:50 +02:00
commit 9ca605c9c4
2 changed files with 95 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/ag-preferences.c
View File

@ -1,4 +1,5 @@
#include <gtk/gtk.h>
#include <swe-glib.h>
#include "ag-settings.h"
#include "ag-preferences.h"
@ -9,6 +10,8 @@ typedef struct _AgPreferencesPrivate {
GtkCheckButton *maximized;
GtkCheckButton *planet_chars;
GtkCheckButton *aspect_chars;
GtkWidget *house_system;
GtkListStore *house_system_model;
AgSettings *settings;
} AgPreferencesPrivate;
@ -62,19 +65,67 @@ ag_preferences_class_init(AgPreferencesClass *klass)
AgPreferences,
aspect_chars
);
gtk_widget_class_bind_template_child_private(
widget_class,
AgPreferences,
house_system
);
gtk_widget_class_bind_template_child_private(
widget_class,
AgPreferences,
house_system_model
);
}
static void
ag_preferences_add_house_system(GsweHouseSystemInfo *house_system_info,
AgPreferencesPrivate *priv)
{
GtkTreeIter iter;
GEnumClass *house_system_type = g_type_class_ref(GSWE_TYPE_HOUSE_SYSTEM);
GEnumValue *enum_value;
enum_value = g_enum_get_value(
house_system_type,
gswe_house_system_info_get_house_system(house_system_info)
);
gtk_list_store_append(priv->house_system_model, &iter);
gtk_list_store_set(
priv->house_system_model, &iter,
0, enum_value->value_nick,
1, gswe_house_system_info_get_name(house_system_info),
-1
);
}
static void
ag_preferences_init(AgPreferences *prefs)
{
AgPreferencesPrivate *priv;
GSettings *settings_window,
*settings_main;
GList *house_system_list = gswe_all_house_systems();
AgPreferencesPrivate *priv = ag_preferences_get_instance_private(prefs);
GtkCellRenderer *cell_renderer;
priv = ag_preferences_get_instance_private(prefs);
gtk_widget_init_template(GTK_WIDGET(prefs));
priv->settings = ag_settings_get();
g_list_foreach(
house_system_list,
(GFunc)ag_preferences_add_house_system,
priv
);
cell_renderer = gtk_cell_renderer_text_new();
gtk_cell_layout_pack_start(
GTK_CELL_LAYOUT(priv->house_system),
cell_renderer,
TRUE
);
gtk_cell_layout_set_attributes(
GTK_CELL_LAYOUT(priv->house_system),
cell_renderer,
"text", 1,
NULL
);
settings_window = ag_settings_peek_window_settings(priv->settings);
g_settings_bind(
@ -100,6 +151,13 @@ ag_preferences_init(AgPreferences *prefs)
"active",
G_SETTINGS_BIND_DEFAULT
);
g_settings_bind(
settings_main,
"default-house-system",
priv->house_system,
"active-id",
G_SETTINGS_BIND_DEFAULT
);
}
void

34
src/resources/ui/ag-preferences.ui
View File

@ -2,6 +2,14 @@
<!-- Generated with glade 3.18.3 -->
<interface>
<requires lib="gtk+" version="3.12"/>
<object class="GtkListStore" id="house_system_model">
<columns>
<!-- column-name house-system-id -->
<column type="gchararray"/>
<!-- column-name house-system-name -->
<column type="gchararray"/>
</columns>
</object>
<template class="AgPreferences" parent="GtkDialog">
<property name="can_focus">False</property>
<property name="type_hint">normal</property>
@ -44,6 +52,7 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
<property name="width">2</property>
</packing>
</child>
<child>
@ -58,6 +67,7 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
<property name="width">2</property>
</packing>
</child>
<child>
@ -72,6 +82,30 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">2</property>
<property name="width">2</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Default house system</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">3</property>
</packing>
</child>
<child>
<object class="GtkComboBox" id="house_system">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="model">house_system_model</property>
<property name="id_column">0</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">3</property>
</packing>
</child>
</object>