diff options
Diffstat (limited to 'Tools/GtkLauncher/main.c')
| -rw-r--r-- | Tools/GtkLauncher/main.c | 31 |
1 files changed, 23 insertions, 8 deletions
diff --git a/Tools/GtkLauncher/main.c b/Tools/GtkLauncher/main.c index 7470e1714..cef7cd399 100644 --- a/Tools/GtkLauncher/main.c +++ b/Tools/GtkLauncher/main.c @@ -25,9 +25,13 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "autotoolsconfig.h" #include "LauncherInspectorWindow.h" #include <errno.h> +#include <gdk/gdkkeysyms.h> +#ifdef WTF_USE_GSTREAMER #include <gst/gst.h> +#endif #include <gtk/gtk.h> #include <stdlib.h> #include <string.h> @@ -104,6 +108,11 @@ static void goForwardCb(GtkWidget* widget, WebKitWebView* webView) webkit_web_view_go_forward(webView); } +static void reloadCb(GtkWidget* widget, WebKitWebView* webView) +{ + webkit_web_view_reload(webView); +} + static WebKitWebView* createWebViewCb(WebKitWebView* webView, WebKitWebFrame* web_frame, GtkWidget* window) { @@ -251,19 +260,19 @@ static GtkWidget* createStatusbar() return GTK_WIDGET(statusbar); } -static GtkWidget* createToolbar(GtkWidget* uriEntry, WebKitWebView* webView) +static GtkWidget* createToolbar(GtkWidget* window, GtkWidget* uriEntry, WebKitWebView* webView) { GtkWidget *toolbar = gtk_toolbar_new(); -#if GTK_CHECK_VERSION(2, 15, 0) gtk_orientable_set_orientation(GTK_ORIENTABLE(toolbar), GTK_ORIENTATION_HORIZONTAL); -#else - gtk_toolbar_set_orientation(GTK_TOOLBAR(toolbar), GTK_ORIENTATION_HORIZONTAL); -#endif gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_BOTH_HORIZ); GtkToolItem *item; + /* Keyboard accelerators */ + GtkAccelGroup *accelGroup = gtk_accel_group_new(); + gtk_window_add_accel_group(GTK_WINDOW(window), accelGroup); + /* the back button */ item = gtk_tool_button_new_from_stock(GTK_STOCK_GO_BACK); g_signal_connect(G_OBJECT(item), "clicked", G_CALLBACK(goBackCb), webView); @@ -274,6 +283,12 @@ static GtkWidget* createToolbar(GtkWidget* uriEntry, WebKitWebView* webView) g_signal_connect(G_OBJECT(item), "clicked", G_CALLBACK(goForwardCb), webView); gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1); + /* The reload button */ + item = gtk_tool_button_new_from_stock(GTK_STOCK_REFRESH); + g_signal_connect(G_OBJECT(item), "clicked", G_CALLBACK(reloadCb), webView); + gtk_toolbar_insert(GTK_TOOLBAR(toolbar), item, -1); + gtk_widget_add_accelerator(GTK_WIDGET(item), "clicked", accelGroup, GDK_KEY_F5, 0, GTK_ACCEL_VISIBLE); + /* The URL entry */ item = gtk_tool_item_new(); gtk_tool_item_set_expand(item, TRUE); @@ -313,7 +328,7 @@ static GtkWidget* createWindow(WebKitWebView** outWebView) vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0); #endif statusbar = createStatusbar(webView); - gtk_box_pack_start(GTK_BOX(vbox), createToolbar(uriEntry, webView), FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(vbox), createToolbar(window, uriEntry, webView), FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(vbox), createBrowser(window, uriEntry, statusbar, webView, vbox), TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox), statusbar, FALSE, FALSE, 0); @@ -484,13 +499,13 @@ int main(int argc, char* argv[]) }; gtk_init(&argc, &argv); - gst_init(&argc, &argv); GOptionContext *context = g_option_context_new(0); g_option_context_add_main_entries(context, commandLineOptions, 0); g_option_context_add_group(context, gtk_get_option_group(TRUE)); +#ifdef WTF_USE_GSTREAMER g_option_context_add_group(context, gst_init_get_option_group()); - +#endif webkitSettings = webkit_web_settings_new(); g_object_set(webkitSettings, "enable-developer-extras", TRUE, NULL); if (!addWebSettingsGroupToContext(context, webkitSettings)) { |