svnno****@sourc*****
svnno****@sourc*****
Tue Sep 1 19:22:10 JST 2009
Revision: 3808
http://sourceforge.jp/projects/kazehakase/svn/view?view=rev&revision=3808
Author: ikezoe
Date: 2009-09-01 19:22:10 +0900 (Tue, 01 Sep 2009)
Log Message:
-----------
* src/actions/kz-actions.c: Remove "undo" and "redo" actions.
cleanup in kz_actions_set_sensitive().
Modified Paths:
--------------
kazehakase/trunk/ChangeLog
kazehakase/trunk/src/actions/kz-actions.c
Modified: kazehakase/trunk/ChangeLog
===================================================================
--- kazehakase/trunk/ChangeLog 2009-09-01 10:19:40 UTC (rev 3807)
+++ kazehakase/trunk/ChangeLog 2009-09-01 10:22:10 UTC (rev 3808)
@@ -4,6 +4,8 @@
kz_actions_set_sensitive.
* src/kz-window.c: Unify cb_embed_dom_key_up and cb_embed_dom_key_down.
* etc/kz-ui-*.xml.in: Remove "undo" and "redo" actions.
+ * src/actions/kz-actions.c: Remove "undo" and "redo" actions.
+ cleanup in kz_actions_set_sensitive().
2009-08-31 Hiroyuki Ikezoe <poinc****@ikezo*****>
Modified: kazehakase/trunk/src/actions/kz-actions.c
===================================================================
--- kazehakase/trunk/src/actions/kz-actions.c 2009-09-01 10:19:40 UTC (rev 3807)
+++ kazehakase/trunk/src/actions/kz-actions.c 2009-09-01 10:22:10 UTC (rev 3808)
@@ -638,54 +638,6 @@
static void
-act_undo (GtkAction *action, KzWindow *kz)
-{
- GtkWidget *widget;
-
- g_return_if_fail(KZ_IS_WINDOW(kz));
-
- widget = gtk_window_get_focus(GTK_WINDOW(kz));
-
- if (GTK_IS_EDITABLE (widget))
- {
- }
- else
- {
- KzEmbed *kzembed;
-
- kzembed = KZ_WINDOW_CURRENT_EMBED(kz);
- if (!kzembed)
- return;
- kz_embed_do_command(kzembed, "cmd_undo");
- }
-}
-
-
-static void
-act_redo (GtkAction *action, KzWindow *kz)
-{
- GtkWidget *widget;
-
- g_return_if_fail(KZ_IS_WINDOW(kz));
-
- widget = gtk_window_get_focus(GTK_WINDOW(kz));
-
- if (GTK_IS_EDITABLE (widget))
- {
- }
- else
- {
- KzEmbed *kzembed;
-
- kzembed = KZ_WINDOW_CURRENT_EMBED(kz);
- if (!kzembed)
- return;
- kz_embed_do_command(kzembed, "cmd_redo");
- }
-}
-
-
-static void
act_cut (GtkAction *action, KzWindow *kz)
{
GtkWidget *widget;
@@ -1762,8 +1714,6 @@
{"PrintPreview", GTK_STOCK_PRINT_PREVIEW, N_("Print Preview"), NULL, N_("Print preview"), G_CALLBACK(act_print_preview)},
{"Print", GTK_STOCK_PRINT, N_("_Print..."), CTRL"P", N_("Print the current page"), G_CALLBACK(act_print)},
- {"Undo", GTK_STOCK_UNDO, N_("_Undo"), CTRL"Z", N_("Undo the last action"), G_CALLBACK(act_undo)},
- {"Redo", GTK_STOCK_REDO, N_("_Redo"), SFCT"Z", N_("Redo the last undone action"), G_CALLBACK(act_redo)},
{"Cut", GTK_STOCK_CUT, N_("C_ut"), CTRL"X", N_("Cut the selection"), G_CALLBACK(act_cut)},
{"Copy", GTK_STOCK_COPY, N_("_Copy"), CTRL"C", N_("Copy the selection"), G_CALLBACK(act_copy)},
{"Paste", GTK_STOCK_PASTE, N_("_Paste"), CTRL"V", N_("Paste the clipboard"), G_CALLBACK(act_paste)},
@@ -2146,7 +2096,6 @@
void
kz_actions_set_sensitive (KzWindow *kz, KzEmbed *kzembed)
{
- KzTabLabel *kztab;
gboolean can_go_back = FALSE;
gboolean can_go_forward = FALSE;
gboolean can_go_up = FALSE;
@@ -2155,10 +2104,10 @@
gboolean can_go_index = FALSE, can_go_contents = FALSE,
can_go_start = FALSE, can_go_prev = FALSE, can_go_next = FALSE;
gboolean can_close_tab = TRUE;
- gint i, num, pos = 0;
+ gboolean can_add_feed = FALSE;
+ gint i, num;
GtkAction *action;
gboolean active;
- KzStopReloadActionState state;
g_return_if_fail (KZ_IS_WINDOW(kz));
/* g_return_if_fail (KZ_IS_EMBED (kzembed)); */
@@ -2167,23 +2116,23 @@
if (kzembed)
{
- kztab = kz_window_get_tab_label(kz, kzembed);
+ GtkAction *nav;
+ gchar *uri = NULL, *title = NULL;
can_stop = kz_embed_is_loading(kzembed);
can_go_back = kz_embed_can_go_back(kzembed);
can_go_forward = kz_embed_can_go_forward(kzembed);
can_go_up = kz_embed_can_go_up(kzembed);
-
+
can_go_index = kz_embed_can_go_nav_link(kzembed, KZ_EMBED_LINK_INDEX);
can_go_contents = kz_embed_can_go_nav_link(kzembed, KZ_EMBED_LINK_CONTENTS);
can_go_start = kz_embed_can_go_nav_link(kzembed, KZ_EMBED_LINK_START);
can_go_prev = kz_embed_can_go_nav_link(kzembed, KZ_EMBED_LINK_PREV);
can_go_next = kz_embed_can_go_nav_link(kzembed, KZ_EMBED_LINK_NEXT);
-
- can_close_tab = !kz_tab_label_get_lock(kztab);
- pos = kz_notebook_page_num(KZ_NOTEBOOK(kz->notebook),
- GTK_WIDGET(kzembed));
+ can_add_feed = (kz_embed_get_nav_link(kzembed, KZ_EMBED_LINK_RSS) != NULL);
+ can_close_tab = !kz_embed_get_lock(kzembed);
+
for (i = 0; i< num; i++)
{
KzEmbed *embed;
@@ -2194,129 +2143,65 @@
can_stop_all = kz_embed_is_loading(embed);
if (can_stop_all) break;
}
- }
-
- if (num > 0)
- {
- GtkAction *nav;
-
- KZ_WINDOW_SET_SENSITIVE(kz, "Back", can_go_back);
- KZ_WINDOW_SET_SENSITIVE(kz, "NavigationBack", can_go_back);
+ kz_embed_shistory_get_nth(kzembed, -1, TRUE, &uri, &title);
action = gtk_action_group_get_action(kz->actions,
"Back");
+ combine_favicon(action, uri, kz);
nav = gtk_action_group_get_action(kz->actions,
"NavigationBack");
- if (can_go_back)
- {
- gchar *uri = NULL, *title = NULL;
- kz_embed_shistory_get_nth(kzembed, -1,
- TRUE, &uri, &title);
- if (uri)
- {
- combine_favicon(action, uri, kz);
- combine_favicon(nav, uri, kz);
- g_free(uri);
- }
- g_free(title);
- }
- else
- {
- combine_favicon(action, NULL, kz);
- combine_favicon(nav, NULL, kz);
- }
- KZ_WINDOW_SET_SENSITIVE(kz, "Forward", can_go_forward);
+ combine_favicon(nav, uri, kz);
+ g_free(uri);
+ g_free(title);
+ uri = NULL;
+ title = NULL;
+
+ kz_embed_shistory_get_nth(kzembed, 1, TRUE, &uri, &title);
action = gtk_action_group_get_action(kz->actions,
"Forward");
- if (can_go_forward)
- {
- gchar *uri = NULL, *title = NULL;
- kz_embed_shistory_get_nth(kzembed, 1,
- TRUE, &uri, &title);
- if (uri)
- {
- combine_favicon(action, uri, kz);
- g_free(uri);
- }
- g_free(title);
- }
- else
- combine_favicon(action, NULL, kz);
+ combine_favicon(action, uri, kz);
+ g_free(uri);
+ g_free(title);
+ }
- KZ_WINDOW_SET_SENSITIVE(kz, "GoUp", can_go_up);
- KZ_WINDOW_SET_SENSITIVE(kz, "Stop", can_stop);
- KZ_WINDOW_SET_SENSITIVE(kz, "Reload", !can_stop);
- KZ_WINDOW_SET_SENSITIVE(kz, "StopAll", can_stop_all);
- KZ_WINDOW_SET_SENSITIVE(kz, "ReloadAll", TRUE);
- KZ_WINDOW_SET_SENSITIVE(kz, "CloseTab", can_close_tab);
- KZ_WINDOW_SET_SENSITIVE(kz, "Search", TRUE);
- KZ_WINDOW_SET_SENSITIVE(kz, "ExtractLinks", TRUE);
- KZ_WINDOW_SET_SENSITIVE(kz, "CopyTitle", TRUE);
- KZ_WINDOW_SET_SENSITIVE(kz, "CopyURL", TRUE);
- KZ_WINDOW_SET_SENSITIVE(kz, "Index", can_go_index);
- KZ_WINDOW_SET_SENSITIVE(kz, "Contents", can_go_contents);
- KZ_WINDOW_SET_SENSITIVE(kz, "Start", can_go_start);
- KZ_WINDOW_SET_SENSITIVE(kz, "Prev", can_go_prev);
- KZ_WINDOW_SET_SENSITIVE(kz, "Next", can_go_next);
- KZ_WINDOW_SET_VISIBLE (kz, "Index", can_go_index);
- KZ_WINDOW_SET_VISIBLE (kz, "Contents", can_go_contents);
- KZ_WINDOW_SET_VISIBLE (kz, "Start", can_go_start);
- KZ_WINDOW_SET_VISIBLE (kz, "Prev", can_go_prev);
- KZ_WINDOW_SET_VISIBLE (kz, "Next", can_go_next);
- KZ_WINDOW_SET_VISIBLE (kz, "Stop", can_stop);
- KZ_WINDOW_SET_VISIBLE (kz, "Reload", !can_stop);
+ KZ_WINDOW_SET_VISIBLE (kz, "Stop", can_stop);
+ KZ_WINDOW_SET_VISIBLE (kz, "Reload", !can_stop);
+ KZ_WINDOW_SET_SENSITIVE(kz, "Back", can_go_back);
+ KZ_WINDOW_SET_SENSITIVE(kz, "Forward", can_go_forward);
+ KZ_WINDOW_SET_SENSITIVE(kz, "GoUp", can_go_up);
+ KZ_WINDOW_SET_SENSITIVE(kz, "Stop", can_stop);
+ KZ_WINDOW_SET_SENSITIVE(kz, "Reload", !can_stop);
+ KZ_WINDOW_SET_SENSITIVE(kz, "CloseTab", can_close_tab);
+ KZ_WINDOW_SET_SENSITIVE(kz, "StopAll", can_stop_all);
+ KZ_WINDOW_SET_SENSITIVE(kz, "NavigationBack", can_go_back);
+ KZ_WINDOW_SET_SENSITIVE(kz, "ReloadAll", num > 0);
+ KZ_WINDOW_SET_SENSITIVE(kz, "Search", num > 0);
+ KZ_WINDOW_SET_SENSITIVE(kz, "ExtractLinks", num > 0);
+ KZ_WINDOW_SET_SENSITIVE(kz, "CopyTitle", num > 0);
+ KZ_WINDOW_SET_SENSITIVE(kz, "CopyURL", num > 0);
+ KZ_WINDOW_SET_SENSITIVE(kz, "StopReload", num > 0);
+ KZ_WINDOW_SET_SENSITIVE(kz, "PrevTab", num > 0);
+ KZ_WINDOW_SET_SENSITIVE(kz, "NextTab", num > 0);
+ KZ_WINDOW_SET_SENSITIVE(kz, "AddFirstFeedBookmark", can_add_feed);
+ KZ_WINDOW_SET_SENSITIVE(kz, "Index", can_go_index);
+ KZ_WINDOW_SET_SENSITIVE(kz, "Contents", can_go_contents);
+ KZ_WINDOW_SET_SENSITIVE(kz, "Start", can_go_start);
+ KZ_WINDOW_SET_SENSITIVE(kz, "Prev", can_go_prev);
+ KZ_WINDOW_SET_SENSITIVE(kz, "Next", can_go_next);
+ KZ_WINDOW_SET_VISIBLE (kz, "Index", can_go_index);
+ KZ_WINDOW_SET_VISIBLE (kz, "Contents", can_go_contents);
+ KZ_WINDOW_SET_VISIBLE (kz, "Start", can_go_start);
+ KZ_WINDOW_SET_VISIBLE (kz, "Prev", can_go_prev);
+ KZ_WINDOW_SET_VISIBLE (kz, "Next", can_go_next);
+ gtk_action_group_set_sensitive(kz->tabpop_actions, num > 0);
- /* Stop/Reload action */
- KZ_WINDOW_SET_SENSITIVE(kz, "StopReload", TRUE);
- action = gtk_action_group_get_action(kz->actions,
- "StopReload");
- state = can_stop?KZ_STOP_RELOAD_ACTION_STATE_STOP:KZ_STOP_RELOAD_ACTION_STATE_RELOAD;
- kz_stop_reload_action_set_state(
+ action = gtk_action_group_get_action(kz->actions, "StopReload");
+ kz_stop_reload_action_set_state(
KZ_STOP_RELOAD_ACTION(action),
- state);
- /* enable tab actions */
- gtk_action_group_set_sensitive (kz->tabpop_actions, TRUE);
- }
- else
- {
- KZ_WINDOW_SET_VISIBLE (kz, "Stop", FALSE);
- KZ_WINDOW_SET_VISIBLE (kz, "Reload", TRUE);
- KZ_WINDOW_SET_SENSITIVE(kz, "Back", FALSE);
- KZ_WINDOW_SET_SENSITIVE(kz, "Forward", FALSE);
- KZ_WINDOW_SET_SENSITIVE(kz, "Stop", FALSE);
- KZ_WINDOW_SET_SENSITIVE(kz, "Reload", FALSE);
- KZ_WINDOW_SET_SENSITIVE(kz, "StopAll", FALSE);
- KZ_WINDOW_SET_SENSITIVE(kz, "ReloadAll", FALSE);
- KZ_WINDOW_SET_SENSITIVE(kz, "CloseTab", FALSE);
- KZ_WINDOW_SET_SENSITIVE(kz, "PrevTab", FALSE);
- KZ_WINDOW_SET_SENSITIVE(kz, "NextTab", FALSE);
- KZ_WINDOW_SET_SENSITIVE(kz, "Search", FALSE);
- KZ_WINDOW_SET_SENSITIVE(kz, "ExtractLinks", FALSE);
- KZ_WINDOW_SET_SENSITIVE(kz, "CopyTitle", FALSE);
- KZ_WINDOW_SET_SENSITIVE(kz, "CopyURL", FALSE);
- KZ_WINDOW_SET_SENSITIVE(kz, "NavigationBack", FALSE);
- /* Stop/Reload action */
- KZ_WINDOW_SET_SENSITIVE(kz, "StopReload", FALSE);
- action = gtk_action_group_get_action(kz->actions,
- "StopReload");
- kz_stop_reload_action_set_state(
- KZ_STOP_RELOAD_ACTION(action),
- KZ_STOP_RELOAD_ACTION_STATE_RELOAD);
- /* disable tab actions */
- gtk_action_group_set_sensitive (kz->tabpop_actions, FALSE);
- }
+ can_stop?KZ_STOP_RELOAD_ACTION_STATE_STOP:KZ_STOP_RELOAD_ACTION_STATE_RELOAD);
- if (kzembed && kz_embed_get_nav_link(kzembed, KZ_EMBED_LINK_RSS))
- {
- KZ_WINDOW_SET_SENSITIVE(kz, "AddFirstFeedBookmark", TRUE);
- }
- else
- {
- KZ_WINDOW_SET_SENSITIVE(kz, "AddFirstFeedBookmark", FALSE);
- }
+ kz_actions_set_selection_sensitive(kz, kzembed);
- kz_actions_set_selection_sensitive (kz, kzembed);
-
/* Sidebar position menu */
action = gtk_action_group_get_action(kz->actions,
"ShowHideSidebar");