Merge branch 'develop' v0.1.0-rc.1

1 files changed, 28 insertions, 12 deletions

diff --git a/badwolf.c b/badwolf.c
index 117f19a..6147885 100644
--- a/badwolf.c
+++ b/badwolf.c
@@ -108,10 +108,11 @@ GtkWidget *badwolf_new_tab_box(const gchar *title, struct Client *browser)
 {
 	(void)browser;
 	GtkWidget *tab_box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
-	GtkWidget *close   = gtk_button_new_from_icon_name("window-close", GTK_ICON_SIZE_SMALL_TOOLBAR);
-	GtkWidget *label   = gtk_label_new(title);
+	GtkWidget *close =
+	    gtk_button_new_from_icon_name("window-close-symbolic", GTK_ICON_SIZE_SMALL_TOOLBAR);
+	GtkWidget *label = gtk_label_new(title);
 	GtkWidget *playing =
-	    gtk_image_new_from_icon_name("media-playback-start-symbolic", GTK_ICON_SIZE_SMALL_TOOLBAR);
+	    gtk_image_new_from_icon_name("audio-volume-high-symbolic", GTK_ICON_SIZE_SMALL_TOOLBAR);
 
 	gtk_label_set_width_chars(GTK_LABEL(label), BADWOLF_TAB_LABEL_CHARWIDTH);
 	gtk_label_set_ellipsize(GTK_LABEL(label), BADWOLF_TAB_LABEL_ELLIPSIZE);
@@ -327,13 +328,28 @@ new_browser(struct Window *window, gchar *target_url, WebKitWebView *related_web
 
 	gtk_widget_set_tooltip_text(browser->javascript, "Toggle javascript");
 
-	gtk_box_pack_start(GTK_BOX(browser->toolbar), GTK_WIDGET(browser->javascript), FALSE, FALSE, BADWOLF_TOOLBAR_PADDING);
-	gtk_box_pack_start(GTK_BOX(browser->toolbar), GTK_WIDGET(browser->location), TRUE, TRUE, BADWOLF_TOOLBAR_PADDING);
-	gtk_box_pack_start(GTK_BOX(browser->toolbar), GTK_WIDGET(browser->search), FALSE, FALSE, BADWOLF_TOOLBAR_PADDING);
+	gtk_box_pack_start(GTK_BOX(browser->toolbar),
+	                   GTK_WIDGET(browser->javascript),
+	                   FALSE,
+	                   FALSE,
+	                   BADWOLF_TOOLBAR_PADDING);
+	gtk_box_pack_start(GTK_BOX(browser->toolbar),
+	                   GTK_WIDGET(browser->location),
+	                   TRUE,
+	                   TRUE,
+	                   BADWOLF_TOOLBAR_PADDING);
+	gtk_box_pack_start(GTK_BOX(browser->toolbar),
+	                   GTK_WIDGET(browser->search),
+	                   FALSE,
+	                   FALSE,
+	                   BADWOLF_TOOLBAR_PADDING);
 
-	gtk_box_pack_start(GTK_BOX(browser->box), GTK_WIDGET(browser->toolbar), FALSE, FALSE, BADWOLF_BOX_PADDING);
-	gtk_box_pack_start(GTK_BOX(browser->box), GTK_WIDGET(browser->webView), TRUE, TRUE, BADWOLF_BOX_PADDING);
-	gtk_box_pack_start(GTK_BOX(browser->box), GTK_WIDGET(browser->statusbar), FALSE, FALSE, BADWOLF_BOX_PADDING);
+	gtk_box_pack_start(
+	    GTK_BOX(browser->box), GTK_WIDGET(browser->toolbar), FALSE, FALSE, BADWOLF_BOX_PADDING);
+	gtk_box_pack_start(
+	    GTK_BOX(browser->box), GTK_WIDGET(browser->webView), TRUE, TRUE, BADWOLF_BOX_PADDING);
+	gtk_box_pack_start(
+	    GTK_BOX(browser->box), GTK_WIDGET(browser->statusbar), FALSE, FALSE, BADWOLF_BOX_PADDING);
 
 	gtk_widget_set_halign(browser->statusbar, GTK_ALIGN_START);
 	gtk_label_set_single_line_mode(GTK_LABEL(browser->statusbar), TRUE);
@@ -433,8 +449,8 @@ void closeCb_clicked(GtkButton *close, gpointer user_data)
 	(void)close;
 	struct Client *browser = (struct Client *)user_data;
 	GtkNotebook *notebook  = GTK_NOTEBOOK(browser->window->notebook);
-	GValue position = G_VALUE_INIT;
-	g_value_init (&position, G_TYPE_INT);
+	GValue position        = G_VALUE_INIT;
+	g_value_init(&position, G_TYPE_INT);
 
 	gtk_container_child_get_property(GTK_CONTAINER(notebook), browser->box, "position", &position);
 
@@ -453,7 +469,7 @@ int main(int argc, char *argv[])
 
 	window->main_window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 	window->notebook    = gtk_notebook_new();
-	window->new_tab     = gtk_button_new_from_icon_name("tab-new", GTK_ICON_SIZE_SMALL_TOOLBAR);
+	window->new_tab = gtk_button_new_from_icon_name("tab-new-symbolic", GTK_ICON_SIZE_SMALL_TOOLBAR);
 
 	gtk_window_set_role(GTK_WINDOW(window->main_window), "browser");