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

Show progress in location independant of statusbar visibility

Browse source
This commit is contained in:
Christian Dywan 2008-10-22 00:26:20 +02:00
parent 2c90d97a7b
commit 9ba3f59ff7
1 changed files with 11 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
midori/midori-browser.c
View file

@ -252,9 +252,8 @@ _midori_browser_update_interface (MidoriBrowser* browser)
"tooltip", _("Reload the current page"), "tooltip", _("Reload the current page"),
"sensitive", can_reload, NULL); "sensitive", can_reload, NULL);
gtk_widget_hide (browser->progressbar); gtk_widget_hide (browser->progressbar);
if (!GTK_WIDGET_VISIBLE (browser->statusbar)) if (!sokoke_object_get_boolean (browser->settings, "show-navigationbar")
if (!sokoke_object_get_boolean (browser->settings, && !sokoke_object_get_boolean (browser->settings, "show-statusbar"))
"show-navigationbar"))
gtk_widget_hide (browser->navigationbar); gtk_widget_hide (browser->navigationbar);
} }
else else
@ -264,13 +263,11 @@ _midori_browser_update_interface (MidoriBrowser* browser)
"stock-id", GTK_STOCK_STOP, "stock-id", GTK_STOCK_STOP,
"tooltip", _("Stop loading the current page"), NULL); "tooltip", _("Stop loading the current page"), NULL);
gtk_widget_show (browser->progressbar); gtk_widget_show (browser->progressbar);
if (!GTK_WIDGET_VISIBLE (browser->statusbar)) if (!GTK_WIDGET_VISIBLE (browser->statusbar) && !GTK_WIDGET_VISIBLE (browser->navigationbar))
{
if (!GTK_WIDGET_VISIBLE (browser->navigationbar))
gtk_widget_show (browser->navigationbar); gtk_widget_show (browser->navigationbar);
g_object_set (_action_by_name (browser, "Location"), "progress", action = _action_by_name (browser, "Location");
midori_view_get_progress (MIDORI_VIEW (view)), NULL); midori_location_action_set_progress (MIDORI_LOCATION_ACTION (action),
} midori_view_get_progress (MIDORI_VIEW (view)));
} }
katze_throbber_set_animated (KATZE_THROBBER (browser->throbber), loading); katze_throbber_set_animated (KATZE_THROBBER (browser->throbber), loading);
@ -325,7 +322,6 @@ _midori_browser_update_progress (MidoriBrowser* browser,
gtk_progress_bar_set_text (GTK_PROGRESS_BAR (browser->progressbar), gtk_progress_bar_set_text (GTK_PROGRESS_BAR (browser->progressbar),
message); message);
g_free (message); g_free (message);
if (!GTK_WIDGET_VISIBLE (browser->statusbar))
midori_location_action_set_progress (action, progress); midori_location_action_set_progress (action, progress);
} }
else else
@ -1594,9 +1590,6 @@ _action_statusbar_activate (GtkToggleAction* action,
gboolean active = gtk_toggle_action_get_active (action); gboolean active = gtk_toggle_action_get_active (action);
g_object_set (browser->settings, "show-statusbar", active, NULL); g_object_set (browser->settings, "show-statusbar", active, NULL);
sokoke_widget_set_visible (browser->statusbar, active); sokoke_widget_set_visible (browser->statusbar, active);
if (active)
g_object_set (_action_by_name (browser, "Location"),
"progress", 0.0, NULL);
} }
static void static void
@ -1792,7 +1785,7 @@ static void
_action_location_activate (GtkAction* action, _action_location_activate (GtkAction* action,
MidoriBrowser* browser) MidoriBrowser* browser)
{ {
if (!GTK_WIDGET_VISIBLE (browser->navigationbar)) if (!sokoke_object_get_boolean (browser->settings, "show-navigationbar"))
gtk_widget_show (browser->navigationbar); gtk_widget_show (browser->navigationbar);
} }
@ -1814,8 +1807,7 @@ static void
_action_location_focus_out (GtkAction* action, _action_location_focus_out (GtkAction* action,
MidoriBrowser* browser) MidoriBrowser* browser)
{ {
if (GTK_WIDGET_VISIBLE (browser->statusbar) && if (!sokoke_object_get_boolean (browser->settings, "show-navigationbar"))
!sokoke_object_get_boolean (browser->settings, "show-navigationbar"))
gtk_widget_hide (browser->navigationbar); gtk_widget_hide (browser->navigationbar);
} }