Move bottom buttons to main.c

Author: johanmalm

main.c

@@ -10,6 +10,7 @@
 #include "stack-appearance.h"
 #include "stack-lang.h"
 #include "stack-mouse.h"
+#include "update.h"
 #include "xml.h"
 
 static void
@@ -20,27 +21,36 @@ activate(GtkApplication *app, gpointer user_data)
 	/* window */
 	state->window = gtk_application_window_new(app);
 	gtk_window_set_title(GTK_WINDOW(state->window), "Tweaks");
-	gtk_window_set_default_size(GTK_WINDOW(state->window), 640, 480);
+	gtk_window_set_default_size(GTK_WINDOW(state->window), 800, 600);
 
 	/* grid */
 	GtkWidget *grid = gtk_grid_new();
-	gtk_grid_set_row_homogeneous(GTK_GRID(grid), TRUE);
 	gtk_container_add(GTK_CONTAINER(state->window), grid);
-
-	/* sidebar + stack */
 	GtkWidget *sidebar = gtk_stack_sidebar_new();
-	GtkWidget *stack = gtk_stack_new();
 	GtkWidget *separator = gtk_separator_new(GTK_ORIENTATION_VERTICAL);
-	gtk_grid_attach(GTK_GRID(grid), sidebar, 0, 0, 1, 1);
-	gtk_grid_attach(GTK_GRID(grid), separator, 1, 0, 1, 1);
+	GtkWidget *stack = gtk_stack_new();
+	GtkWidget *bottom_buttons = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);
+	gtk_grid_attach(GTK_GRID(grid), sidebar, 0, 0, 1, 2);
+	gtk_grid_attach(GTK_GRID(grid), separator, 1, 0, 1, 2);
 	gtk_grid_attach(GTK_GRID(grid), stack, 2, 0, 1, 1);
-	gtk_stack_sidebar_set_stack(GTK_STACK_SIDEBAR(sidebar), GTK_STACK(stack));
+	gtk_grid_attach(GTK_GRID(grid), bottom_buttons, 0, 1, 3, 1);
 
-	/* Stacks */
+	/* sidebar + stack */
+	gtk_stack_sidebar_set_stack(GTK_STACK_SIDEBAR(sidebar), GTK_STACK(stack));
 	stack_appearance_init(state, stack);
 	stack_mouse_init(state, stack);
 	stack_lang_init(state, stack);
 
+	/* bottom buttons */
+	GtkWidget *button = gtk_button_new_with_label("Update");
+	g_signal_connect(button, "clicked", G_CALLBACK(update), state);
+	gtk_container_add(GTK_CONTAINER(bottom_buttons), button);
+	button = gtk_button_new_with_label("Quit");
+	g_signal_connect_swapped(button, "clicked", G_CALLBACK(gtk_widget_destroy), state->window);
+	gtk_container_add(GTK_CONTAINER(bottom_buttons), button);
+	gtk_button_box_set_layout(GTK_BUTTON_BOX(bottom_buttons), GTK_BUTTONBOX_END);
+
+	/* show */
 	gtk_widget_show_all(state->window);
 }
 

stack-appearance.c

@@ -3,7 +3,6 @@
 #include "state.h"
 #include "stack-appearance.h"
 #include "theme.h"
-#include "update.h"
 #include "xml.h"
 
 void
@@ -94,16 +93,5 @@ stack_appearance_init(struct state *state, GtkWidget *stack)
 	gtk_combo_box_set_active(GTK_COMBO_BOX(state->widgets.icon_theme_name), active);
 	gtk_grid_attach(GTK_GRID(grid), state->widgets.icon_theme_name, 1, row++, 1, 1);
 	theme_free_vector(&icon_themes);
-
-	/* bottom button box */
-	GtkWidget *hbbox = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);
-	gtk_box_pack_start(GTK_BOX(vbox), hbbox, TRUE, TRUE, 5);
-	widget = gtk_button_new_with_label("Update");
-	g_signal_connect(widget, "clicked", G_CALLBACK(update), state);
-	gtk_container_add(GTK_CONTAINER(hbbox), widget);
-	widget = gtk_button_new_with_label("Quit");
-	g_signal_connect_swapped(widget, "clicked", G_CALLBACK(gtk_widget_destroy), state->window);
-	gtk_container_add(GTK_CONTAINER(hbbox), widget);
-	gtk_button_box_set_layout(GTK_BUTTON_BOX(hbbox), GTK_BUTTONBOX_END);
 }
 

stack-lang.c

@@ -3,7 +3,6 @@
 #include "state.h"
 #include "stack-lang.h"
 #include "theme.h"
-#include "update.h"
 #include "xml.h"
 
 void
@@ -48,16 +47,5 @@ stack_lang_init(struct state *state, GtkWidget *stack)
 	gtk_combo_box_set_active(GTK_COMBO_BOX(state->widgets.keyboard_layout), active);
 	gtk_grid_attach(GTK_GRID(grid), state->widgets.keyboard_layout, 1, row++, 1, 1);
 	keyboard_layouts_finish(keyboard_layouts);
-
-	/* bottom button box */
-	GtkWidget *hbbox = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);
-	gtk_box_pack_start(GTK_BOX(vbox), hbbox, TRUE, TRUE, 5);
-	widget = gtk_button_new_with_label("Update");
-	g_signal_connect(widget, "clicked", G_CALLBACK(update), state);
-	gtk_container_add(GTK_CONTAINER(hbbox), widget);
-	widget = gtk_button_new_with_label("Quit");
-	g_signal_connect_swapped(widget, "clicked", G_CALLBACK(gtk_widget_destroy), state->window);
-	gtk_container_add(GTK_CONTAINER(hbbox), widget);
-	gtk_button_box_set_layout(GTK_BUTTON_BOX(hbbox), GTK_BUTTONBOX_END);
 }
 

stack-mouse.c

@@ -3,7 +3,6 @@
 #include "state.h"
 #include "stack-mouse.h"
 #include "theme.h"
-#include "update.h"
 #include "xml.h"
 
 void
@@ -13,7 +12,7 @@ stack_mouse_init(struct state *state, GtkWidget *stack)
 
 	GtkWidget *vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
 	gtk_stack_add_named(GTK_STACK(stack), vbox, "mouse");
-	gtk_container_child_set(GTK_CONTAINER(stack), vbox, "title", "Mouse and Touchpad", NULL);
+	gtk_container_child_set(GTK_CONTAINER(stack), vbox, "title", "Mouse & Touchpad", NULL);
 
 	/* the grid with settings */
 	int row = 0;
@@ -61,16 +60,5 @@ stack_mouse_init(struct state *state, GtkWidget *stack)
 	gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(state->widgets.natural_scroll), "yes");
 	gtk_combo_box_set_active(GTK_COMBO_BOX(state->widgets.natural_scroll), xml_get_bool_text("/labwc_config/libinput/device/naturalscroll"));
 	gtk_grid_attach(GTK_GRID(grid), state->widgets.natural_scroll, 1, row++, 1, 1);
-
-	/* bottom button box */
-	GtkWidget *hbbox = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);
-	gtk_box_pack_start(GTK_BOX(vbox), hbbox, TRUE, TRUE, 5);
-	widget = gtk_button_new_with_label("Update");
-	g_signal_connect(widget, "clicked", G_CALLBACK(update), state);
-	gtk_container_add(GTK_CONTAINER(hbbox), widget);
-	widget = gtk_button_new_with_label("Quit");
-	g_signal_connect_swapped(widget, "clicked", G_CALLBACK(gtk_widget_destroy), state->window);
-	gtk_container_add(GTK_CONTAINER(hbbox), widget);
-	gtk_button_box_set_layout(GTK_BUTTON_BOX(hbbox), GTK_BUTTONBOX_END);
 }