Commit a291b73a authored by David Bordoley's avatar David Bordoley Committed by Alexander Larsson

Remove favorites .desktop file

2002-05-01 David Bordoley <bordoley@msu.edu>

       * data/Makefile.am:
       Remove favorites .desktop file

       * src/file-manager/nautilus-directory-view-ui.xml:
       Added stock icon for move to trash

       * src/nautilus-shell-ui.xml:
       Removed nautilus quick references
       Changed "Nautilus User Manual" to "Contents"
       Added stock help icon
       Added F1 shortcut key for help

       * src/nautilus-windows-menus.c:
       Removed nautilus quick references
parent 21d6ff40
2002-05-01 David Bordoley <bordoley@msu.edu>
* data/Makefile.am:
Remove favorites .desktop file
* src/file-manager/nautilus-directory-view-ui.xml:
Added stock icon for move to trash
* src/nautilus-shell-ui.xml:
Removed nautilus quick references
Changed "Nautilus User Manual" to "Contents"
Added stock help icon
Added F1 shortcut key for help
* src/nautilus-windows-menus.c:
Removed nautilus quick references
2002-05-01 Jacob Berkman <jacob@ximian.com>
* configure.in (AC_OUTPUT): remove new sidebar
......
......@@ -3,8 +3,7 @@ NULL=
@INTLTOOL_DESKTOP_RULE@
@INTLTOOL_DIRECTORY_RULE@
DESKTOP_IN_FILES= favorites.desktop.in \
applications.desktop.in \
DESKTOP_IN_FILES= applications.desktop.in \
starthere.desktop.in \
sysconfig.desktop.in \
preferences.desktop.in \
......@@ -21,8 +20,7 @@ DESKTOP_FILES=$(DESKTOP_IN_FILES:.desktop.in=.desktop)
DIRECTORY_FILES=$(DIRECTORY_IN_FILES:.directory.in=.directory)
startheredir= $(sysconfdir)/X11/starthere
starthere_DATA= favorites.desktop \
applications.desktop \
starthere_DATA= applications.desktop \
sysconfig.desktop \
preferences.desktop \
serverconfig.desktop \
......
......@@ -137,6 +137,7 @@
<menuitem name="Trash"
_label="Move to _Trash"
accel="*Control*t"
pixtype="stock" pixname="gtk-delete"
verb="Trash"/>
<menuitem name="Delete"
_label="De_lete"
......@@ -257,7 +258,9 @@
<menuitem name="Rename" verb="Rename"/>
</placeholder>
<placeholder name="Dangerous File Actions" delimit="top">
<menuitem name="Trash" verb="Trash"/>
<menuitem name="Trash"
pixtype="stock" pixname="gtk-delete"
verb="Trash"/>
<menuitem name="Delete" verb="Delete"/>
</placeholder>
<placeholder name="File Clipboard Actions" delimit="top">
......
......@@ -92,7 +92,6 @@
#define COMMAND_PATH_CLOSE_WINDOW "/commands/Close"
#define USER_MANUAL_URI "help:nautilus-user-manual"
#define QUICK_REFERENCE_URI "help:nautilus-quick-reference"
#define CUSTOMER_FEEDBACK_URI "http://www.eazel.com/feedback.html"
#define START_HERE_URI "start-here:"
......@@ -637,14 +636,6 @@ help_menu_nautilus_manual_callback (BonoboUIComponent *component,
nautilus_window_go_to (NAUTILUS_WINDOW (user_data), USER_MANUAL_URI);
}
static void
help_menu_nautilus_quick_reference_callback (BonoboUIComponent *component,
gpointer user_data,
const char *verb)
{
nautilus_window_go_to (NAUTILUS_WINDOW (user_data), QUICK_REFERENCE_URI);
}
static void
help_menu_nautilus_feedback_callback (BonoboUIComponent *component,
gpointer user_data,
......@@ -1118,7 +1109,6 @@ nautilus_window_initialize_menus_part_1 (NautilusWindow *window)
BONOBO_UI_VERB ("About Nautilus", help_menu_about_nautilus_callback),
BONOBO_UI_VERB ("Nautilus Manual", help_menu_nautilus_manual_callback),
BONOBO_UI_VERB ("Nautilus Quick Reference", help_menu_nautilus_quick_reference_callback),
BONOBO_UI_VERB ("Nautilus Feedback", help_menu_nautilus_feedback_callback),
BONOBO_UI_VERB ("User Level Customization", user_level_customize_callback),
BONOBO_UI_VERB ("Stop", stop_button_callback),
......
......@@ -271,14 +271,11 @@
<submenu name="Help" _label="_Help">
<menuitem name="Nautilus Manual"
_label="Nautilus User _Manual"
_tip="Display on-line help for Nautilus"
_label="_Contents"
_tip="Display Nautilus help"
accel="F1"
pixtype="stock" pixname="gtk-help"
verb="Nautilus Manual"/>
<menuitem name="Nautilus Quick Reference"
_label="Nautilus Quick _Reference"
_tip="Display quick reference pages for Nautilus"
verb="Nautilus Quick Reference"/>
<separator/>
<menuitem name="About Nautilus"
_label="_About Nautilus"
_tip="Display credits for the creators of Nautilus"
......
......@@ -92,7 +92,6 @@
#define COMMAND_PATH_CLOSE_WINDOW "/commands/Close"
#define USER_MANUAL_URI "help:nautilus-user-manual"
#define QUICK_REFERENCE_URI "help:nautilus-quick-reference"
#define CUSTOMER_FEEDBACK_URI "http://www.eazel.com/feedback.html"
#define START_HERE_URI "start-here:"
......@@ -637,14 +636,6 @@ help_menu_nautilus_manual_callback (BonoboUIComponent *component,
nautilus_window_go_to (NAUTILUS_WINDOW (user_data), USER_MANUAL_URI);
}
static void
help_menu_nautilus_quick_reference_callback (BonoboUIComponent *component,
gpointer user_data,
const char *verb)
{
nautilus_window_go_to (NAUTILUS_WINDOW (user_data), QUICK_REFERENCE_URI);
}
static void
help_menu_nautilus_feedback_callback (BonoboUIComponent *component,
gpointer user_data,
......@@ -1118,7 +1109,6 @@ nautilus_window_initialize_menus_part_1 (NautilusWindow *window)
BONOBO_UI_VERB ("About Nautilus", help_menu_about_nautilus_callback),
BONOBO_UI_VERB ("Nautilus Manual", help_menu_nautilus_manual_callback),
BONOBO_UI_VERB ("Nautilus Quick Reference", help_menu_nautilus_quick_reference_callback),
BONOBO_UI_VERB ("Nautilus Feedback", help_menu_nautilus_feedback_callback),
BONOBO_UI_VERB ("User Level Customization", user_level_customize_callback),
BONOBO_UI_VERB ("Stop", stop_button_callback),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment