summaryrefslogtreecommitdiff
path: root/thunar/thunar-standard-view.h
diff options
context:
space:
mode:
authorBenedikt Meurer <benny@xfce.org>2005-07-11 21:55:32 +0000
committerBenedikt Meurer <benny@xfce.org>2005-07-11 21:55:32 +0000
commit139930daf186db03d49efb1d78f4cd665d586030 (patch)
tree0576e9d8d01255211c4e90a585175d54fa610208 /thunar/thunar-standard-view.h
parent54ce86c5f7436c2cdc443737bb2ee9b58140266c (diff)
downloadthunar-139930daf186db03d49efb1d78f4cd665d586030.tar.gz
2005-07-11 Benedikt Meurer <benny@xfce.org>
* thunar/thunar-navigator.c(thunar_navigator_class_init): Use EXO_PARAM_READWRITE instead of G_PARAM_READWRITE. * thunar/thunar-list-model.c: Fix several bugs related to incorrect signal registration/removal in the hidden files handling. * thunar/thunar-view.{c,h}: Add a new "ui-manager" property, which is set by the surrounding window for the view in question. The view in turn can hook its own actions - and thereby menu and toolbar items - into the ui manager, using GtkUIManager's merging capabilities. * thunar/thunar-window.c(thunar_window_init): Tell the main view about our UI manager. * thunar/thunar-window-ui.xml, thunar/thunar-standard-view-ui.xml, thunar/thunar-standard-view.{c,h}, thunar/Makefile.am: Add initial support for menu merging to the standard view class - and thereby to the icon and details view. You can now control the "show-hidden" property of the main view's model from the menu bar. (Old svn revision: 16381)
Diffstat (limited to 'thunar/thunar-standard-view.h')
-rw-r--r--thunar/thunar-standard-view.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/thunar/thunar-standard-view.h b/thunar/thunar-standard-view.h
index 4ac3f70b..8951fcf5 100644
--- a/thunar/thunar-standard-view.h
+++ b/thunar/thunar-standard-view.h
@@ -51,6 +51,10 @@ struct _ThunarStandardView
ThunarListModel *model;
gchar *statusbar_text;
+ GtkActionGroup *action_group;
+ GtkUIManager *ui_manager;
+ guint ui_merge_id;
+
gint loading_idle_id;
};