aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--shell/ChangeLog9
-rw-r--r--shell/Evolution-Icon.idl23
-rw-r--r--shell/e-shell-view.c29
3 files changed, 38 insertions, 23 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 2e36d7450b..70198c682e 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,12 @@
+2001-08-16 Jason Leach <jleach@ximian.com>
+
+ * e-shell-view.c (folder_selected_cb): Desensitize the
+ move/copy/delete/rename in the menus (including right click) for
+ stock folders.
+
+ * Evolution-Icon.idl: Actually remove this file from CVS (its
+ contents are now in Evolution-common.idl).
+
2001-08-16 Ettore Perazzoli <ettore@ximian.com>
* e-shell-view-menu.c: Remove the Help menu verbs and add a
diff --git a/shell/Evolution-Icon.idl b/shell/Evolution-Icon.idl
deleted file mode 100644
index f8a3d66817..0000000000
--- a/shell/Evolution-Icon.idl
+++ /dev/null
@@ -1,23 +0,0 @@
-/* -*- Mode: IDL; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Icon definition.
- *
- * Authors:
- * Ettore Perazzoli <ettore@ximian.com>
- *
- * Copyright (C) 2000, 2001 Ximian, Inc.
- */
-
-module GNOME {
-module Evolution {
-
-struct Icon {
- short width, height;
- boolean hasAlpha;
- sequence <octet> rgba_data; // Row-by-row, left-to-right, top-to-bottom RGBA bytes
-};
-typedef sequence <Icon> AnimatedIcon;
-
-};
-};
-
diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c
index d1d9129446..0c4f548582 100644
--- a/shell/e-shell-view.c
+++ b/shell/e-shell-view.c
@@ -546,8 +546,37 @@ folder_selected_cb (EStorageSetView *storage_set_view,
void *data)
{
EShellView *shell_view;
+ EShellViewPrivate *priv;
+ EStorageSet *storage_set;
+ EFolder *folder;
shell_view = E_SHELL_VIEW (data);
+ priv = shell_view->priv;
+
+ /* Adjust sensitivity for menu options depending on whether
+ the folder selected is a stock folder */
+ storage_set = e_shell_get_storage_set (priv->shell);
+ folder = e_storage_set_get_folder (storage_set, path);
+ if (folder) {
+ BonoboUIComponent *uic;
+ char *txt;
+
+ if (e_folder_get_is_stock (folder))
+ txt = "0";
+ else
+ txt = "1";
+
+ uic = e_shell_view_get_bonobo_ui_component (shell_view);
+
+ bonobo_ui_component_set_prop (uic, "/commands/MoveFolder",
+ "sensitive", txt, NULL);
+ bonobo_ui_component_set_prop (uic, "/commands/CopyFolder",
+ "sensitive", txt, NULL);
+ bonobo_ui_component_set_prop (uic, "/commands/DeleteFolder",
+ "sensitive", txt, NULL);
+ bonobo_ui_component_set_prop (uic, "/commands/RenameFolder",
+ "sensitive", txt, NULL);
+ }
switch_on_folder_tree_click (shell_view, path);
}