debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Dynamically create homepage button from action

Browse source
This commit is contained in:
Christian Dywan 2010-06-29 08:15:52 +02:00
parent 3336938418
commit f2e4a93c72
1 changed files with 11 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
midori/midori-browser.c
View file

@ -70,7 +70,6 @@ struct _MidoriBrowser
GtkWidget* throbber; GtkWidget* throbber;
GtkWidget* navigationbar; GtkWidget* navigationbar;
GtkWidget* bookmarkbar; GtkWidget* bookmarkbar;
GtkToolItem* homepage;
GtkWidget* panel; GtkWidget* panel;
GtkWidget* notebook; GtkWidget* notebook;
@ -3559,17 +3558,6 @@ _action_location_active_changed (GtkAction* action,
} }
} }
static void
midori_browser_bookmark_homepage_clicked_cb (GtkToolItem* button,
MidoriBrowser* browser)
{
gchar* homepage;
g_object_get (browser->settings, "homepage", &homepage, NULL);
midori_browser_set_current_uri (browser, homepage);
g_free (homepage);
gtk_widget_grab_focus (midori_browser_get_current_tab (browser));
}
static gboolean static gboolean
midori_browser_bookmark_homepage_button_press_cb (GtkToolItem* button, midori_browser_bookmark_homepage_button_press_cb (GtkToolItem* button,
GdkEventButton* event, GdkEventButton* event,
@ -5983,13 +5971,6 @@ midori_browser_init (MidoriBrowser* browser)
GTK_ICON_SIZE_MENU); GTK_ICON_SIZE_MENU);
gtk_toolbar_set_style (GTK_TOOLBAR (browser->bookmarkbar), gtk_toolbar_set_style (GTK_TOOLBAR (browser->bookmarkbar),
GTK_TOOLBAR_BOTH_HORIZ); GTK_TOOLBAR_BOTH_HORIZ);
browser->homepage = gtk_tool_button_new_from_stock (STOCK_HOMEPAGE);
gtk_tool_item_set_is_important (browser->homepage, TRUE);
gtk_widget_show (GTK_WIDGET (browser->homepage));
g_signal_connect (browser->homepage, "clicked",
G_CALLBACK (midori_browser_bookmark_homepage_clicked_cb), browser);
g_signal_connect (gtk_bin_get_child (GTK_BIN (browser->homepage)), "button-press-event",
G_CALLBACK (midori_browser_bookmark_homepage_button_press_cb), browser);
#if HAVE_HILDON #if HAVE_HILDON
hildon_window_add_toolbar (HILDON_WINDOW (browser), hildon_window_add_toolbar (HILDON_WINDOW (browser),
GTK_TOOLBAR (browser->bookmarkbar)); GTK_TOOLBAR (browser->bookmarkbar));
@ -6371,9 +6352,7 @@ _midori_browser_update_settings (MidoriBrowser* browser)
_action_set_active (browser, "Transferbar", show_transferbar); _action_set_active (browser, "Transferbar", show_transferbar);
#endif #endif
_action_set_active (browser, "Statusbar", browser->show_statusbar); _action_set_active (browser, "Statusbar", browser->show_statusbar);
_action_set_visible (browser, "Homepage", homepage && *homepage);
sokoke_widget_set_visible (GTK_WIDGET (browser->homepage),
homepage && *homepage);
g_free (homepage); g_free (homepage);
g_free (toolbar_items); g_free (toolbar_items);
@ -6429,8 +6408,10 @@ midori_browser_settings_notify (MidoriWebSettings* web_settings,
else if (name == g_intern_string ("progress-in-location")) else if (name == g_intern_string ("progress-in-location"))
browser->progress_in_location = g_value_get_boolean (&value); browser->progress_in_location = g_value_get_boolean (&value);
else if (name == g_intern_string ("homepage")) else if (name == g_intern_string ("homepage"))
sokoke_widget_set_visible (GTK_WIDGET (browser->homepage), {
_action_set_visible (browser, "Homepage",
g_value_get_string (&value) && *g_value_get_string (&value)); g_value_get_string (&value) && *g_value_get_string (&value));
}
else if (name == g_intern_string ("search-engines-in-completion")) else if (name == g_intern_string ("search-engines-in-completion"))
{ {
if (g_value_get_boolean (&value)) if (g_value_get_boolean (&value))
@ -6517,13 +6498,18 @@ midori_bookmarkbar_insert_item (GtkWidget* toolbar,
static void static void
midori_bookmarkbar_populate (MidoriBrowser* browser) midori_bookmarkbar_populate (MidoriBrowser* browser)
{ {
GtkWidget* homepage;
sqlite3* db; sqlite3* db;
gint result; gint result;
const gchar* sqlcmd; const gchar* sqlcmd;
sqlite3_stmt* statement; sqlite3_stmt* statement;
/* FIXME: We need to insert copy of a homepage. */ homepage = gtk_action_create_tool_item (_action_by_name (browser, "Homepage"));
gtk_toolbar_insert (GTK_TOOLBAR (browser->bookmarkbar), browser->homepage, -1); gtk_tool_item_set_is_important (GTK_TOOL_ITEM (homepage), TRUE);
g_signal_connect (gtk_bin_get_child (GTK_BIN (homepage)), "button-press-event",
G_CALLBACK (midori_browser_bookmark_homepage_button_press_cb), browser);
gtk_toolbar_insert (GTK_TOOLBAR (browser->bookmarkbar),
(GtkToolItem*)homepage, -1);
db = g_object_get_data (G_OBJECT (browser->bookmarks), "db"); db = g_object_get_data (G_OBJECT (browser->bookmarks), "db");
if (!db) if (!db)