aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--shell/ChangeLog12
-rw-r--r--shell/e-shell-folder-commands.c15
-rw-r--r--shell/e-shell-folder-commands.h1
-rw-r--r--shell/e-shell-view-menu.c38
4 files changed, 65 insertions, 1 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 15652e0b15..621cf77da1 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,15 @@
+2001-06-05 Jason Leach <jleach@ximian.com>
+
+ * e-shell-view-menu.c: Plug in all the folder tree right click
+ menu verbs so bonobo-warnings aren't emitted (even though the
+ respective implementation functions are currently unimplemented).
+ (command_delete_folder): New function, see above.
+ (command_rename_folder): Ditto.
+ (command_folder_properties): Ditto.
+
+ * e-shell-folder-commands.c (e_shell_command_delete_folder): New
+ function, currently unimplemented.
+
2001-06-04 Jason Leach <jleach@ximian.com>
(Fixing bug #1299: Shell saves shortcuts when display name
diff --git a/shell/e-shell-folder-commands.c b/shell/e-shell-folder-commands.c
index 6843c89da4..dee3e88674 100644
--- a/shell/e-shell-folder-commands.c
+++ b/shell/e-shell-folder-commands.c
@@ -297,6 +297,18 @@ e_shell_command_move_folder (EShell *shell,
gtk_widget_show (folder_selection_dialog);
}
+void
+e_shell_command_delete_folder (EShell *shell,
+ EShellView *shell_view)
+{
+ g_return_if_fail (shell != NULL);
+ g_return_if_fail (E_IS_SHELL (shell));
+ g_return_if_fail (shell_view != NULL);
+ g_return_if_fail (E_IS_SHELL_VIEW (shell_view));
+
+ g_warning ("To be implemented");
+}
+
void
e_shell_command_rename_folder (EShell *shell,
@@ -304,7 +316,8 @@ e_shell_command_rename_folder (EShell *shell,
{
g_return_if_fail (shell != NULL);
g_return_if_fail (E_IS_SHELL (shell));
- g_return_if_fail (shell_view != NULL && E_IS_SHELL_VIEW (shell_view));
+ g_return_if_fail (shell_view != NULL);
+ g_return_if_fail (E_IS_SHELL_VIEW (shell_view));
g_warning ("To be implemented");
}
diff --git a/shell/e-shell-folder-commands.h b/shell/e-shell-folder-commands.h
index 379b401f9a..95585f1d43 100644
--- a/shell/e-shell-folder-commands.h
+++ b/shell/e-shell-folder-commands.h
@@ -33,6 +33,7 @@ void e_shell_command_open_folder_in_other_window (EShell *shell, EShellView *sh
void e_shell_command_copy_folder (EShell *shell, EShellView *shell_view);
void e_shell_command_move_folder (EShell *shell, EShellView *shell_view);
+void e_shell_command_delete_folder (EShell *shell, EShellView *shell_view);
void e_shell_command_rename_folder (EShell *shell, EShellView *shell_view);
void e_shell_command_add_to_shortcut_bar (EShell *shell, EShellView *shell_view);
diff --git a/shell/e-shell-view-menu.c b/shell/e-shell-view-menu.c
index 12d2b3ab02..1edeffeafe 100644
--- a/shell/e-shell-view-menu.c
+++ b/shell/e-shell-view-menu.c
@@ -372,6 +372,28 @@ command_copy_folder (BonoboUIComponent *uih,
}
static void
+command_delete_folder (BonoboUIComponent *uih,
+ void *data,
+ const char *path)
+{
+ EShellView *shell_view;
+
+ shell_view = E_SHELL_VIEW (data);
+ e_shell_command_delete_folder (e_shell_view_get_shell (shell_view), shell_view);
+}
+
+static void
+command_rename_folder (BonoboUIComponent *uih,
+ void *data,
+ const char *path)
+{
+ EShellView *shell_view;
+
+ shell_view = E_SHELL_VIEW (data);
+ e_shell_command_rename_folder (e_shell_view_get_shell (shell_view), shell_view);
+}
+
+static void
command_add_folder_to_shortcut_bar (BonoboUIComponent *uih,
void *data,
const char *path)
@@ -382,6 +404,17 @@ command_add_folder_to_shortcut_bar (BonoboUIComponent *uih,
e_shell_command_add_to_shortcut_bar (e_shell_view_get_shell (shell_view), shell_view);
}
+static void
+command_folder_properties (BonoboUIComponent *uih,
+ void *data,
+ const char *path)
+{
+ EShellView *shell_view;
+
+ shell_view = E_SHELL_VIEW (data);
+ e_shell_command_folder_properties (e_shell_view_get_shell (shell_view), shell_view);
+}
+
/* Going to a folder. */
@@ -556,8 +589,13 @@ BonoboUIVerb folder_verbs [] = {
BONOBO_UI_VERB ("MoveFolder", command_move_folder),
BONOBO_UI_VERB ("CopyFolder", command_copy_folder),
+ BONOBO_UI_VERB ("DeleteFolder", command_delete_folder),
+ BONOBO_UI_VERB ("RenameFolder", command_rename_folder),
+
BONOBO_UI_VERB ("AddFolderToShortcutBar", command_add_folder_to_shortcut_bar),
+ BONOBO_UI_VERB ("ChangeFolderProperties", command_folder_properties),
+
BONOBO_UI_VERB_END
};