Created chart editing tab, making it the default
This commit is contained in:
		
							
								
								
									
										122
									
								
								src/ag-window.c
									
									
									
									
									
								
							
							
						
						
									
										122
									
								
								src/ag-window.c
									
									
									
									
									
								
							| @@ -1,4 +1,5 @@ | |||||||
| #include <string.h> | #include <string.h> | ||||||
|  | #include <glib/gi18n.h> | ||||||
| #include <libgd/gd.h> | #include <libgd/gd.h> | ||||||
|  |  | ||||||
| #include "ag-app.h" | #include "ag-app.h" | ||||||
| @@ -8,11 +9,25 @@ struct _AgWindowPrivate { | |||||||
|     GtkWidget *grid; |     GtkWidget *grid; | ||||||
|     GtkWidget *header_bar; |     GtkWidget *header_bar; | ||||||
|     GtkWidget *notebook; |     GtkWidget *notebook; | ||||||
|  |     GtkWidget *name; | ||||||
|  |     GtkWidget *north_lat; | ||||||
|  |     GtkWidget *south_lat; | ||||||
|  |     GtkWidget *latitude; | ||||||
|  |     GtkWidget *east_long; | ||||||
|  |     GtkWidget *west_long; | ||||||
|  |     GtkWidget *longitude; | ||||||
|  |     GtkWidget *year; | ||||||
|  |     GtkWidget *month; | ||||||
|  |     GtkWidget *day; | ||||||
|  |     GtkWidget *hour; | ||||||
|  |     GtkWidget *minute; | ||||||
|  |     GtkWidget *second; | ||||||
|     GtkBuilder *builder; |     GtkBuilder *builder; | ||||||
|  |  | ||||||
|     gint tab_chart; |     gint tab_chart; | ||||||
|     gint tab_aspects; |     gint tab_aspects; | ||||||
|     gint tab_points; |     gint tab_points; | ||||||
|  |     gint tab_edit; | ||||||
| }; | }; | ||||||
|  |  | ||||||
| G_DEFINE_TYPE(AgWindow, ag_window, GTK_TYPE_APPLICATION_WINDOW); | G_DEFINE_TYPE(AgWindow, ag_window, GTK_TYPE_APPLICATION_WINDOW); | ||||||
| @@ -54,6 +69,8 @@ set_tab_cb(GSimpleAction *action, GVariant *parameter, gpointer user_data) | |||||||
|         target_tab = window->priv->tab_aspects; |         target_tab = window->priv->tab_aspects; | ||||||
|     } else if (strcmp(target, "points") == 0) { |     } else if (strcmp(target, "points") == 0) { | ||||||
|         target_tab = window->priv->tab_points; |         target_tab = window->priv->tab_points; | ||||||
|  |     } else if (strcmp(target, "edit") == 0) { | ||||||
|  |         target_tab = window->priv->tab_edit; | ||||||
|     } else { |     } else { | ||||||
|         g_warning("Unknown tab!"); |         g_warning("Unknown tab!"); | ||||||
|  |  | ||||||
| @@ -72,7 +89,7 @@ change_tab_cb(GSimpleAction *action, GVariant *state, gpointer user_data) | |||||||
| static GActionEntry win_entries[] = { | static GActionEntry win_entries[] = { | ||||||
|     { "close",      close_cb,     NULL, NULL,      NULL }, |     { "close",      close_cb,     NULL, NULL,      NULL }, | ||||||
|     { "gear-menu",  gear_menu_cb, NULL, "false",   NULL }, |     { "gear-menu",  gear_menu_cb, NULL, "false",   NULL }, | ||||||
|     { "tab-change", set_tab_cb,   "s",  "'chart'", change_tab_cb }, |     { "tab-change", set_tab_cb,   "s",  "'edit'", change_tab_cb }, | ||||||
| }; | }; | ||||||
|  |  | ||||||
| static void | static void | ||||||
| @@ -110,6 +127,101 @@ ag_window_class_init(AgWindowClass *klass) | |||||||
|     g_type_class_add_private(klass, sizeof(AgWindowPrivate)); |     g_type_class_add_private(klass, sizeof(AgWindowPrivate)); | ||||||
| } | } | ||||||
|  |  | ||||||
|  | static GtkWidget * | ||||||
|  | notebook_edit(AgWindow *window) | ||||||
|  | { | ||||||
|  |     GtkWidget *grid; | ||||||
|  |     GtkWidget *label; | ||||||
|  |     AgWindowPrivate *priv = window->priv; | ||||||
|  |  | ||||||
|  |     grid = gtk_grid_new(); | ||||||
|  |  | ||||||
|  |     label = gtk_label_new(_("Name")); | ||||||
|  |     gtk_grid_attach(GTK_GRID(grid), label, 0, 0, 1, 1); | ||||||
|  |  | ||||||
|  |     priv->name = gtk_entry_new(); | ||||||
|  |     gtk_grid_attach(GTK_GRID(grid), priv->name, 1, 0, 6, 1); | ||||||
|  |  | ||||||
|  |     label = gtk_label_new(_("Country")); | ||||||
|  |     gtk_grid_attach(GTK_GRID(grid), label, 0, 1, 1, 1); | ||||||
|  |  | ||||||
|  |     label = gtk_label_new(_("City")); | ||||||
|  |     gtk_grid_attach(GTK_GRID(grid), label, 0, 2, 1, 1); | ||||||
|  |  | ||||||
|  |     label = gtk_label_new(_("Latitude")); | ||||||
|  |     gtk_grid_attach(GTK_GRID(grid), label, 0, 3, 2, 1); | ||||||
|  |  | ||||||
|  |     priv->north_lat = gtk_radio_button_new_with_label(NULL, _("North")); | ||||||
|  |     gtk_grid_attach(GTK_GRID(grid), priv->north_lat, 0, 4, 1, 1); | ||||||
|  |  | ||||||
|  |     priv->south_lat = gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON(priv->north_lat), _("South")); | ||||||
|  |     gtk_grid_attach(GTK_GRID(grid), priv->south_lat, 1, 4, 1, 1); | ||||||
|  |  | ||||||
|  |     priv->latitude = gtk_spin_button_new_with_range(0.0, 90.0, 0.1); | ||||||
|  |     gtk_spin_button_set_digits(GTK_SPIN_BUTTON(priv->latitude), 6); | ||||||
|  |     gtk_grid_attach(GTK_GRID(grid), priv->latitude, 0, 5, 2, 1); | ||||||
|  |  | ||||||
|  |     label = gtk_label_new(_("Longitude")); | ||||||
|  |     gtk_grid_attach(GTK_GRID(grid), label, 2, 3, 2, 1); | ||||||
|  |  | ||||||
|  |     priv->east_long = gtk_radio_button_new_with_label(NULL, _("East")); | ||||||
|  |     gtk_grid_attach(GTK_GRID(grid), priv->east_long, 2, 4, 1, 1); | ||||||
|  |  | ||||||
|  |     priv->west_long = gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON(priv->east_long), _("West")); | ||||||
|  |     gtk_grid_attach(GTK_GRID(grid), priv->west_long, 3, 4, 1, 1); | ||||||
|  |  | ||||||
|  |     priv->longitude = gtk_spin_button_new_with_range(0.0, 180.0, 0.1); | ||||||
|  |     gtk_spin_button_set_digits(GTK_SPIN_BUTTON(priv->longitude), 6); | ||||||
|  |     gtk_grid_attach(GTK_GRID(grid), priv->longitude, 2, 5, 2, 1); | ||||||
|  |  | ||||||
|  |     label = gtk_label_new(_("Year")); | ||||||
|  |     gtk_grid_attach(GTK_GRID(grid), label, 4, 1, 1, 1); | ||||||
|  |  | ||||||
|  |     priv->year = gtk_spin_button_new_with_range(G_MININT, G_MAXINT, 1); | ||||||
|  |     gtk_spin_button_set_digits(GTK_SPIN_BUTTON(priv->year), 0); | ||||||
|  |     gtk_spin_button_set_value(GTK_SPIN_BUTTON(priv->year), 0); | ||||||
|  |     gtk_grid_attach(GTK_GRID(grid), priv->year, 4, 2, 1, 1); | ||||||
|  |  | ||||||
|  |     label = gtk_label_new(_("Month")); | ||||||
|  |     gtk_grid_attach(GTK_GRID(grid), label, 5, 1, 1, 1); | ||||||
|  |  | ||||||
|  |     priv->month = gtk_spin_button_new_with_range(1, 12, 1); | ||||||
|  |     gtk_spin_button_set_digits(GTK_SPIN_BUTTON(priv->month), 0); | ||||||
|  |     gtk_grid_attach(GTK_GRID(grid), priv->month, 5, 2, 1, 1); | ||||||
|  |  | ||||||
|  |     label = gtk_label_new(_("Day")); | ||||||
|  |     gtk_grid_attach(GTK_GRID(grid), label, 6, 1, 1, 1); | ||||||
|  |  | ||||||
|  |     priv->day = gtk_spin_button_new_with_range(1, 31, 1); | ||||||
|  |     gtk_spin_button_set_digits(GTK_SPIN_BUTTON(priv->day), 0); | ||||||
|  |     gtk_grid_attach(GTK_GRID(grid), priv->day, 6, 2, 1, 1); | ||||||
|  |  | ||||||
|  |     label = gtk_label_new(_("Hour")); | ||||||
|  |     gtk_grid_attach(GTK_GRID(grid), label, 4, 3, 1, 1); | ||||||
|  |  | ||||||
|  |     priv->hour = gtk_spin_button_new_with_range(0, 23, 1); | ||||||
|  |     gtk_spin_button_set_digits(GTK_SPIN_BUTTON(priv->hour), 0); | ||||||
|  |     gtk_grid_attach(GTK_GRID(grid), priv->hour, 4, 4, 1, 1); | ||||||
|  |  | ||||||
|  |     label = gtk_label_new(_("Minute")); | ||||||
|  |     gtk_grid_attach(GTK_GRID(grid), label, 5, 3, 1, 1); | ||||||
|  |  | ||||||
|  |     priv->minute = gtk_spin_button_new_with_range(0, 59, 1); | ||||||
|  |     gtk_spin_button_set_digits(GTK_SPIN_BUTTON(priv->minute), 0); | ||||||
|  |     gtk_grid_attach(GTK_GRID(grid), priv->minute, 5, 4, 1, 1); | ||||||
|  |  | ||||||
|  |     label = gtk_label_new(_("Second")); | ||||||
|  |     gtk_grid_attach(GTK_GRID(grid), label, 6, 3, 1, 1); | ||||||
|  |  | ||||||
|  |     priv->second = gtk_spin_button_new_with_range(0, 61, 1); | ||||||
|  |     gtk_spin_button_set_digits(GTK_SPIN_BUTTON(priv->second), 0); | ||||||
|  |     gtk_grid_attach(GTK_GRID(grid), priv->second, 6, 4, 1, 1); | ||||||
|  |  | ||||||
|  |     gtk_widget_show_all(grid); | ||||||
|  |  | ||||||
|  |     return grid; | ||||||
|  | } | ||||||
|  |  | ||||||
| static void | static void | ||||||
| window_populate(AgWindow *window) | window_populate(AgWindow *window) | ||||||
| { | { | ||||||
| @@ -117,6 +229,7 @@ window_populate(AgWindow *window) | |||||||
|     GtkWidget *menu_button; |     GtkWidget *menu_button; | ||||||
|     GObject *menu; |     GObject *menu; | ||||||
|     GtkWidget *placeholder; |     GtkWidget *placeholder; | ||||||
|  |     GtkWidget *tab; | ||||||
|  |  | ||||||
|     priv->header_bar = gd_header_bar_new(); |     priv->header_bar = gd_header_bar_new(); | ||||||
|     menu_button = gd_header_menu_button_new(); |     menu_button = gd_header_menu_button_new(); | ||||||
| @@ -131,8 +244,12 @@ window_populate(AgWindow *window) | |||||||
|     gtk_menu_button_set_menu_model(GTK_MENU_BUTTON(menu_button), G_MENU_MODEL(menu)); |     gtk_menu_button_set_menu_model(GTK_MENU_BUTTON(menu_button), G_MENU_MODEL(menu)); | ||||||
|  |  | ||||||
|     priv->notebook = gtk_notebook_new(); |     priv->notebook = gtk_notebook_new(); | ||||||
|  |     gtk_notebook_set_show_tabs(GTK_NOTEBOOK(priv->notebook), FALSE); | ||||||
|     gtk_grid_attach(GTK_GRID(priv->grid), priv->notebook, 0, 1, 1, 1); |     gtk_grid_attach(GTK_GRID(priv->grid), priv->notebook, 0, 1, 1, 1); | ||||||
|  |  | ||||||
|  |     tab = notebook_edit(window); | ||||||
|  |     priv->tab_edit = gtk_notebook_append_page(GTK_NOTEBOOK(priv->notebook), tab, NULL); | ||||||
|  |  | ||||||
|     placeholder = gtk_label_new("PLACEHOLDER FOR THE CHART WEBKIT"); |     placeholder = gtk_label_new("PLACEHOLDER FOR THE CHART WEBKIT"); | ||||||
|     priv->tab_chart = gtk_notebook_append_page(GTK_NOTEBOOK(priv->notebook), placeholder, NULL); |     priv->tab_chart = gtk_notebook_append_page(GTK_NOTEBOOK(priv->notebook), placeholder, NULL); | ||||||
|  |  | ||||||
| @@ -142,7 +259,8 @@ window_populate(AgWindow *window) | |||||||
|     placeholder = gtk_label_new("PLACEHOLDER FOR THE POINTS TABLES"); |     placeholder = gtk_label_new("PLACEHOLDER FOR THE POINTS TABLES"); | ||||||
|     priv->tab_points = gtk_notebook_append_page(GTK_NOTEBOOK(priv->notebook), placeholder, NULL); |     priv->tab_points = gtk_notebook_append_page(GTK_NOTEBOOK(priv->notebook), placeholder, NULL); | ||||||
|  |  | ||||||
|     gtk_notebook_set_show_tabs(GTK_NOTEBOOK(priv->notebook), FALSE); |     /* TODO: change to the Chart tab if we are opening an existing chart! */ | ||||||
|  |     gtk_notebook_set_current_page(GTK_NOTEBOOK(priv->notebook), priv->tab_edit); | ||||||
|  |  | ||||||
|     gtk_widget_show_all(priv->grid); |     gtk_widget_show_all(priv->grid); | ||||||
| } | } | ||||||
|   | |||||||
| @@ -48,6 +48,12 @@ | |||||||
|         <attribute name="target">points</attribute> |         <attribute name="target">points</attribute> | ||||||
|         <attribute name="accel">F8</attribute> |         <attribute name="accel">F8</attribute> | ||||||
|       </item> |       </item> | ||||||
|  |       <item> | ||||||
|  |         <attribute name="label" translatable="yes">Edit chart</attribute> | ||||||
|  |         <attribute name="action">win.tab-change</attribute> | ||||||
|  |         <attribute name="target">edit</attribute> | ||||||
|  |         <attribute name="accel"><Shift>F3</attribute> | ||||||
|  |       </item> | ||||||
|     </section> |     </section> | ||||||
|   </menu> |   </menu> | ||||||
| </interface> | </interface> | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user