add tor icon toggle for proxy

requested by many
conformal · Nov 28, 2012 · 374f8c0 · 374f8c0
1 parent 62e3b73
commit 374f8c0
Show file tree

Hide file tree

Showing 10 changed files with 34 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -71,6 +71,8 @@ beforeinstall:
 	install -m 644 ${.CURDIR}/hsts-preload ${PREFIX}/share/xombrero
 	install -m 644 ${.CURDIR}/user-agent-headers ${PREFIX}/share/xombrero
 	install -m 644 ${.CURDIR}/http-accept-headers ${PREFIX}/share/xombrero
+	install -m 644 ${.CURDIR}/torenabled.ico ${PREFIX}/share/xombrero
+	install -m 644 ${.CURDIR}/tordisabled.ico ${PREFIX}/share/xombrero
 
 ${PROG} ${OBJS} beforedepend: javascript.h tooltip.h
 

diff --git a/dragonfly/Makefile b/dragonfly/Makefile
@@ -81,6 +81,8 @@ install: all
 	install -m 644 ../tld-rules $(DESTDIR)$(RESDIR)
 	install -m 644 ../style.css $(DESTDIR)$(RESDIR)
 	install -m 644 ../hsts-preload $(DESTDIR)$(RESDIR)
+	install -m 644 ../torenabled.ico $(DESTDIR)$(RESDIR)
+	install -m 644 ../tordisabled.ico $(DESTDIR)$(RESDIR)
 
 clean:
 	rm -f xombrero *.o

diff --git a/freebsd/Makefile b/freebsd/Makefile
@@ -79,6 +79,8 @@ install: all
 	install -m 644 ../tld-rules $(DESTDIR)$(RESDIR)
 	install -m 644 ../style.css $(DESTDIR)$(RESDIR)
 	install -m 644 ../hsts-preload $(DESTDIR)$(RESDIR)
+	install -m 644 ../torenabled.ico $(DESTDIR)$(RESDIR)
+	install -m 644 ../tordisabled.ico $(DESTDIR)$(RESDIR)
 
 clean:
 	rm -f xombrero *.o

diff --git a/linux/Makefile b/linux/Makefile
@@ -73,6 +73,8 @@ install: all
 	install -m 644 ../tld-rules $(DESTDIR)$(RESDIR)
 	install -m 644 ../style.css $(DESTDIR)$(RESDIR)
 	install -m 644 ../hsts-preload $(DESTDIR)$(RESDIR)
+	install -m 644 ../torenabled.ico $(DESTDIR)$(RESDIR)
+	install -m 644 ../tordisabled.ico $(DESTDIR)$(RESDIR)
 
 uninstall:
 	rm -f $(DESTDIR)$(BINDIR)/xombrero

diff --git a/netbsd/Makefile b/netbsd/Makefile
@@ -81,6 +81,8 @@ install: all
 	install -m 644 ../tld-rules $(DESTDIR)$(RESDIR)
 	install -m 644 ../style.css $(DESTDIR)$(RESDIR)
 	install -m 644 ../hsts-preload $(DESTDIR)$(RESDIR)
+	install -m 644 ../torenabled.ico $(DESTDIR)$(RESDIR)
+	install -m 644 ../tordisabled.ico $(DESTDIR)$(RESDIR)
 
 clean:
 	rm -f xombrero *.o

diff --git a/settings.c b/settings.c
@@ -3027,10 +3027,13 @@ setup_proxy(char *uri)
 				gtk_label_set_text(GTK_LABEL(t->sbe.proxy),
 				    "proxy");
 				gtk_widget_show(t->proxy_toggle);
-				button_set_stockid(t->proxy_toggle,
+				button_set_file(t->proxy_toggle,
-				    GTK_STOCK_CONNECT);
+				    "torenabled.ico");
 			}
 		}
+	} else {
+		TAILQ_FOREACH(t, &tabs, entry)
+			button_set_file(t->proxy_toggle, "tordisabled.ico");
 	}
 }
 

diff --git a/tordisabled.ico b/tordisabled.ico
diff --git a/torenabled.ico b/torenabled.ico
diff --git a/xombrero.c b/xombrero.c
@@ -3325,14 +3325,12 @@ proxy_cmd(struct tab *t, struct karg *args)
 		}
 		if (http_proxy) {
 			setup_proxy(NULL);
+			button_set_file(t->proxy_toggle, "tordisabled.ico");
 			show_oops(t, "http proxy disabled");
-			button_set_stockid(t->proxy_toggle,
-			    GTK_STOCK_DISCONNECT);
 		} else {
 			setup_proxy(http_proxy_save);
+			button_set_file(t->proxy_toggle, "torenabled.ico");
 			show_oops(t, "http_proxy = %s", http_proxy);
-			button_set_stockid(t->proxy_toggle,
-			    GTK_STOCK_CONNECT);
 		}
 	}
 done:
@@ -7262,6 +7260,11 @@ create_toolbar(struct tab *t)
 	/* toggle proxy button */
 	t->proxy_toggle = create_button("Proxy-Toggle", proxy_uri ?
 	    GTK_STOCK_CONNECT : GTK_STOCK_DISCONNECT, 0);
+	/* override icons */
+	if (proxy_uri)
+		button_set_file(t->proxy_toggle, "torenabled.ico");
+	else
+		button_set_file(t->proxy_toggle, "tordisabled.ico");
 	gtk_widget_set_sensitive(t->proxy_toggle, TRUE);
 	g_signal_connect(G_OBJECT(t->proxy_toggle), "clicked",
 	    G_CALLBACK(proxy_toggle_cb), t);
@@ -8240,6 +8243,17 @@ create_button(char *name, char *stockid, int size)
 	return (button);
 }
 
+void
+button_set_file(GtkWidget *button, char *filename)
+{
+	GtkWidget		*image;
+	char			file[PATH_MAX];
+
+	snprintf(file, sizeof file, "%s" PS "%s", resource_dir, filename);
+	image = gtk_image_new_from_file(file);
+	gtk_button_set_image(GTK_BUTTON(button), image);
+}
+
 void
 button_set_stockid(GtkWidget *button, char *stockid)
 {

diff --git a/xombrero.h b/xombrero.h
@@ -418,6 +418,7 @@ void			set_status(struct tab *t, gchar *fmt, ...);
 
 void			load_webkit_string(struct tab *, const char *, gchar *, int);
 void			button_set_stockid(GtkWidget *, char *);
+void			button_set_file(GtkWidget *, char *);
 void			webview_progress_changed_cb(WebKitWebView *, GParamSpec *, struct tab *);
 
 /* cookies */