diff -crB nautilus-3.4.2/libnautilus-private/nautilus.convert nautilus-3.4.2.mod/libnautilus-private/nautilus.convert
*** nautilus-3.4.2/libnautilus-private/nautilus.convert 2012-05-14 21:37:55.000000000 +0200
--- nautilus-3.4.2.mod/libnautilus-private/nautilus.convert 2013-01-09 11:46:39.000000000 +0100
***************
*** 2,7 ****
--- 2,14 ----
tabs-open-position = /desktop/gnome/file_views/tabs_open_position
always-use-browser = /apps/nautilus/preferences/always_use_browser
always-use-location-entry = /apps/nautilus/preferences/always_use_location_entry
+ show-up-icon-toolbar = /apps/nautilus/preferences/show-up-icon-toolbar
+ show-edit-icon-toolbar = /apps/nautilus/preferences/show-edit-icon-toolbar
+ show-reload-icon-toolbar = /apps/nautilus/preferences/show-reload-icon-toolbar
+ show-home-icon-toolbar = /apps/nautilus/preferences/show-home-icon-toolbar
+ show-computer-icon-toolbar = /apps/nautilus/preferences/show-computer-icon-toolbar
+ show-search-icon-toolbar = /apps/nautilus/preferences/show-search-icon-toolbar
+ show-label-search-icon-toolbar = /apps/nautilus/preferences/show-label-search-icon-toolbar
confirm-trash = /apps/nautilus/preferences/confirm_trash
enable-delete = /apps/nautilus/preferences/enable_delete
show-icon-text = /apps/nautilus/preferences/show_icon_text
diff -crB nautilus-3.4.2/libnautilus-private/nautilus-global-preferences.h nautilus-3.4.2.mod/libnautilus-private/nautilus-global-preferences.h
*** nautilus-3.4.2/libnautilus-private/nautilus-global-preferences.h 2012-05-14 21:37:55.000000000 +0200
--- nautilus-3.4.2.mod/libnautilus-private/nautilus-global-preferences.h 2013-01-09 11:46:39.000000000 +0100
***************
*** 79,84 ****
--- 79,94 ----
#define NAUTILUS_PREFERENCES_ALWAYS_USE_LOCATION_ENTRY "always-use-location-entry"
+ /* Nautilus patch Raya Christian*/
+ #define NAUTILUS_PREFERENCES_SHOW_UP_ICON_TOOLBAR "show-up-icon-toolbar"
+ #define NAUTILUS_PREFERENCES_SHOW_EDIT_ICON_TOOLBAR "show-edit-icon-toolbar"
+ #define NAUTILUS_PREFERENCES_SHOW_RELOAD_ICON_TOOLBAR "show-reload-icon-toolbar"
+ #define NAUTILUS_PREFERENCES_SHOW_HOME_ICON_TOOLBAR "show-home-icon-toolbar"
+ #define NAUTILUS_PREFERENCES_SHOW_COMPUTER_ICON_TOOLBAR "show-computer-icon-toolbar"
+ #define NAUTILUS_PREFERENCES_SHOW_SEARCH_ICON_TOOLBAR "show-search-icon-toolbar"
+ #define NAUTILUS_PREFERENCES_SHOW_LABEL_SEARCH_ICON_TOOLBAR "show-label-search-icon-toolbar"
+
+
/* Which views should be displayed for new windows */
#define NAUTILUS_WINDOW_STATE_START_WITH_STATUS_BAR "start-with-status-bar"
#define NAUTILUS_WINDOW_STATE_START_WITH_SIDEBAR "start-with-sidebar"
diff -crB nautilus-3.4.2/libnautilus-private/org.gnome.nautilus.gschema.xml.in nautilus-3.4.2.mod/libnautilus-private/org.gnome.nautilus.gschema.xml.in
*** nautilus-3.4.2/libnautilus-private/org.gnome.nautilus.gschema.xml.in 2012-05-14 21:37:55.000000000 +0200
--- nautilus-3.4.2.mod/libnautilus-private/org.gnome.nautilus.gschema.xml.in 2013-01-09 11:46:39.000000000 +0100
***************
*** 82,87 ****
--- 82,122 ----
<_summary>Always use the location entry, instead of the pathbar
<_description>If set to true, then Nautilus browser windows will always use a textual input entry for the location toolbar, instead of the pathbar.
+
+ false
+ Show Up button in nautilus toolbar
+ If set to true, then Nautilus browser windows will show the button.
+
+
+ false
+ Show refresh button in nautilus toolbar
+ If set to true, then Nautilus browser windows will show the button.
+
+
+ false
+ Show toggle button location entry/pathbar
+ If set to true, then Nautilus browser windows will show the button.
+
+
+ false
+ Show Home button in nautilus toolbar
+ If set to true, then Nautilus browser windows will show the button.
+
+
+ false
+ Show Computer button in nautilus toolbar
+ If set to true, then Nautilus browser windows will show the button.
+
+
+ true
+ Show Search button in nautilus toolbar
+ If set to true, then Nautilus browser windows will show the button.
+
+
+ true
+ Show the Search button label in nautilus toolbar
+ If set to true, then Nautilus browser windows will show the Search label button.
+
true
<_summary>Whether to ask for confirmation when deleting files, or emptying Trash
Only in nautilus-3.4.2.mod/: nautiluspatch_3.4.2-0ubuntu6-1.txt
diff -crB nautilus-3.4.2/src/nautilus-actions.h nautilus-3.4.2.mod/src/nautilus-actions.h
*** nautilus-3.4.2/src/nautilus-actions.h 2012-05-14 21:37:55.000000000 +0200
--- nautilus-3.4.2.mod/src/nautilus-actions.h 2013-01-09 11:46:39.000000000 +0100
***************
*** 29,34 ****
--- 29,38 ----
#define NAUTILUS_ACTION_STOP "Stop"
#define NAUTILUS_ACTION_RELOAD "Reload"
#define NAUTILUS_ACTION_BACK "Back"
+
+ /* Nautilus patch Raya Christian*/
+ #define NAUTILUS_ACTION_COMPUTER "Computer"
+
#define NAUTILUS_ACTION_UP "Up"
#define NAUTILUS_ACTION_UP_ACCEL "UpAccel"
#define NAUTILUS_ACTION_UP_ACCEL "UpAccel"
***************
*** 43,48 ****
--- 47,56 ----
#define NAUTILUS_ACTION_GO_HOME "Home"
#define NAUTILUS_ACTION_ADD_BOOKMARK "Add Bookmark"
#define NAUTILUS_ACTION_EDIT_BOOKMARKS "Edit Bookmarks"
+
+ /* Nautilus patch Raya Christian*/
+ #define NAUTILUS_ACTION_EDIT "Edit"
+
#define NAUTILUS_ACTION_HOME "Home"
#define NAUTILUS_ACTION_ZOOM_IN "Zoom In"
#define NAUTILUS_ACTION_ZOOM_OUT "Zoom Out"
diff -crB nautilus-3.4.2/src/nautilus-file-management-properties.c nautilus-3.4.2.mod/src/nautilus-file-management-properties.c
*** nautilus-3.4.2/src/nautilus-file-management-properties.c 2013-01-09 10:22:07.000000000 +0100
--- nautilus-3.4.2.mod/src/nautilus-file-management-properties.c 2013-01-09 11:46:39.000000000 +0100
***************
*** 62,67 ****
--- 62,77 ----
#define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_SHOW_HIDDEN_WIDGET "hidden_files_checkbutton"
#define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_TREE_VIEW_FOLDERS_WIDGET "treeview_folders_checkbutton"
+ /* Nautilus patch Raya Christian*/
+ #define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_SHOW_UP_ICON_TOOLBAR_WIDGET "show_up_icon_toolbar_checkbutton"
+ #define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_SHOW_RELOAD_ICON_TOOLBAR_WIDGET "show_reload_icon_toolbar_checkbutton"
+ #define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_SHOW_EDIT_ICON_TOOLBAR_WIDGET "show_edit_icon_toolbar_checkbutton"
+ #define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_SHOW_HOME_ICON_TOOLBAR_WIDGET "show_home_icon_toolbar_checkbutton"
+ #define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_SHOW_COMPUTER_ICON_TOOLBAR_WIDGET "show_computer_icon_toolbar_checkbutton"
+ #define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_SHOW_SEARCH_ICON_TOOLBAR_WIDGET "show_search_icon_toolbar_checkbutton"
+ #define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_SHOW_LABEL_SEARCH_ICON_TOOLBAR_WIDGET "show_label_search_icon_toolbar_checkbutton"
+
+
/* int enums */
#define NAUTILUS_FILE_MANAGEMENT_PROPERTIES_THUMBNAIL_LIMIT_WIDGET "preview_image_size_combobox"
***************
*** 720,725 ****
--- 730,760 ----
4);
create_date_format_menu (builder);
+
+ /* Nautilus patch Raya Christian*/
+ bind_builder_bool (builder, nautilus_preferences,
+ NAUTILUS_FILE_MANAGEMENT_PROPERTIES_SHOW_UP_ICON_TOOLBAR_WIDGET,
+ NAUTILUS_PREFERENCES_SHOW_UP_ICON_TOOLBAR);
+ bind_builder_bool (builder, nautilus_preferences,
+ NAUTILUS_FILE_MANAGEMENT_PROPERTIES_SHOW_RELOAD_ICON_TOOLBAR_WIDGET,
+ NAUTILUS_PREFERENCES_SHOW_RELOAD_ICON_TOOLBAR);
+ bind_builder_bool (builder, nautilus_preferences,
+ NAUTILUS_FILE_MANAGEMENT_PROPERTIES_SHOW_EDIT_ICON_TOOLBAR_WIDGET,
+ NAUTILUS_PREFERENCES_SHOW_EDIT_ICON_TOOLBAR);
+ bind_builder_bool (builder, nautilus_preferences,
+ NAUTILUS_FILE_MANAGEMENT_PROPERTIES_SHOW_HOME_ICON_TOOLBAR_WIDGET,
+ NAUTILUS_PREFERENCES_SHOW_HOME_ICON_TOOLBAR);
+ bind_builder_bool (builder, nautilus_preferences,
+ NAUTILUS_FILE_MANAGEMENT_PROPERTIES_SHOW_COMPUTER_ICON_TOOLBAR_WIDGET,
+ NAUTILUS_PREFERENCES_SHOW_COMPUTER_ICON_TOOLBAR);
+ bind_builder_bool (builder, nautilus_preferences,
+ NAUTILUS_FILE_MANAGEMENT_PROPERTIES_SHOW_SEARCH_ICON_TOOLBAR_WIDGET,
+ NAUTILUS_PREFERENCES_SHOW_SEARCH_ICON_TOOLBAR);
+ bind_builder_bool (builder, nautilus_preferences,
+ NAUTILUS_FILE_MANAGEMENT_PROPERTIES_SHOW_LABEL_SEARCH_ICON_TOOLBAR_WIDGET,
+ NAUTILUS_PREFERENCES_SHOW_LABEL_SEARCH_ICON_TOOLBAR);
+
+
/* setup preferences */
bind_builder_bool (builder, nautilus_icon_view_preferences,
NAUTILUS_FILE_MANAGEMENT_PROPERTIES_LABELS_BESIDE_ICONS_WIDGET,
diff -crB nautilus-3.4.2/src/nautilus-file-management-properties.ui nautilus-3.4.2.mod/src/nautilus-file-management-properties.ui
*** nautilus-3.4.2/src/nautilus-file-management-properties.ui 2012-05-08 06:28:08.000000000 +0200
--- nautilus-3.4.2.mod/src/nautilus-file-management-properties.ui 2013-01-09 11:46:39.000000000 +0100
***************
*** 1607,1612 ****
--- 1607,1791 ----
False
+
+
+
+
+
+ True
+ False
+ Toolbar
+
+
+ 2
+ False
+
+
False
diff -crB nautilus-3.4.2/src/nautilus-navigation-action.c nautilus-3.4.2.mod/src/nautilus-navigation-action.c
*** nautilus-3.4.2/src/nautilus-navigation-action.c 2012-05-14 21:37:55.000000000 +0200
--- nautilus-3.4.2.mod/src/nautilus-navigation-action.c 2013-01-09 11:46:39.000000000 +0100
***************
*** 149,154 ****
--- 149,168 ----
case NAUTILUS_NAVIGATION_DIRECTION_BACK:
fill_menu (window, menu, TRUE);
break;
+
+
+ /* Nautilus patch Raya Christian*/
+ case NAUTILUS_NAVIGATION_DIRECTION_UP:
+ return;
+ case NAUTILUS_NAVIGATION_DIRECTION_RELOAD:
+ return;
+ case NAUTILUS_NAVIGATION_DIRECTION_HOME:
+ return;
+ case NAUTILUS_NAVIGATION_DIRECTION_COMPUTER:
+ return;
+ case NAUTILUS_NAVIGATION_DIRECTION_EDIT:
+ return;
+
default:
g_assert_not_reached ();
break;
diff -crB nautilus-3.4.2/src/nautilus-navigation-action.h nautilus-3.4.2.mod/src/nautilus-navigation-action.h
*** nautilus-3.4.2/src/nautilus-navigation-action.h 2011-07-31 20:29:17.000000000 +0200
--- nautilus-3.4.2.mod/src/nautilus-navigation-action.h 2013-01-09 11:46:39.000000000 +0100
***************
*** 47,53 ****
typedef enum
{
NAUTILUS_NAVIGATION_DIRECTION_BACK,
! NAUTILUS_NAVIGATION_DIRECTION_FORWARD
} NautilusNavigationDirection;
struct _NautilusNavigationAction
--- 47,58 ----
typedef enum
{
NAUTILUS_NAVIGATION_DIRECTION_BACK,
! NAUTILUS_NAVIGATION_DIRECTION_FORWARD,
! NAUTILUS_NAVIGATION_DIRECTION_UP,
! NAUTILUS_NAVIGATION_DIRECTION_RELOAD,
! NAUTILUS_NAVIGATION_DIRECTION_HOME,
! NAUTILUS_NAVIGATION_DIRECTION_COMPUTER,
! NAUTILUS_NAVIGATION_DIRECTION_EDIT
} NautilusNavigationDirection;
struct _NautilusNavigationAction
diff -crB nautilus-3.4.2/src/nautilus-toolbar.c nautilus-3.4.2.mod/src/nautilus-toolbar.c
*** nautilus-3.4.2/src/nautilus-toolbar.c 2012-05-08 06:28:09.000000000 +0200
--- nautilus-3.4.2.mod/src/nautilus-toolbar.c 2013-01-09 11:46:39.000000000 +0100
***************
*** 64,69 ****
--- 64,76 ----
static void
toolbar_update_appearance (NautilusToolbar *self)
{
+
+ /* Nautilus patch Raya Christian*/
+ GtkAction *action;
+ GtkWidget *widgetitem;
+ gboolean icon_toolbar;
+
+
gboolean show_location_entry;
show_location_entry = self->priv->show_location_entry ||
***************
*** 79,84 ****
--- 86,124 ----
gtk_widget_set_visible (self->priv->search_bar,
self->priv->show_search_bar);
+
+
+ /* Nautilus patch Raya Christian*/
+ widgetitem = gtk_ui_manager_get_widget (self->priv->ui_manager, "/Toolbar/Up");
+ icon_toolbar = g_settings_get_boolean (nautilus_preferences, NAUTILUS_PREFERENCES_SHOW_UP_ICON_TOOLBAR);
+ if ( icon_toolbar == FALSE ) { gtk_widget_hide (widgetitem); }
+ else {gtk_widget_show (widgetitem);}
+
+ widgetitem = gtk_ui_manager_get_widget (self->priv->ui_manager, "/Toolbar/Reload");
+ icon_toolbar = g_settings_get_boolean (nautilus_preferences, NAUTILUS_PREFERENCES_SHOW_RELOAD_ICON_TOOLBAR);
+ if ( icon_toolbar == FALSE ) { gtk_widget_hide (widgetitem); }
+ else {gtk_widget_show (widgetitem);}
+
+ widgetitem = gtk_ui_manager_get_widget (self->priv->ui_manager, "/Toolbar/Edit");
+ icon_toolbar = g_settings_get_boolean (nautilus_preferences, NAUTILUS_PREFERENCES_SHOW_EDIT_ICON_TOOLBAR);
+ if ( icon_toolbar == FALSE ) { gtk_widget_hide (widgetitem); }
+ else {gtk_widget_show (widgetitem);}
+
+ widgetitem = gtk_ui_manager_get_widget (self->priv->ui_manager, "/Toolbar/Home");
+ icon_toolbar = g_settings_get_boolean (nautilus_preferences, NAUTILUS_PREFERENCES_SHOW_HOME_ICON_TOOLBAR);
+ if ( icon_toolbar == FALSE ) { gtk_widget_hide (widgetitem); }
+ else {gtk_widget_show (widgetitem);}
+
+ widgetitem = gtk_ui_manager_get_widget (self->priv->ui_manager, "/Toolbar/Computer");
+ icon_toolbar = g_settings_get_boolean (nautilus_preferences, NAUTILUS_PREFERENCES_SHOW_COMPUTER_ICON_TOOLBAR);
+ if ( icon_toolbar == FALSE ) { gtk_widget_hide (widgetitem); }
+ else {gtk_widget_show (widgetitem);}
+
+ widgetitem = gtk_ui_manager_get_widget (self->priv->ui_manager, "/Toolbar/Search");
+ icon_toolbar = g_settings_get_boolean (nautilus_preferences, NAUTILUS_PREFERENCES_SHOW_SEARCH_ICON_TOOLBAR);
+ if ( icon_toolbar == FALSE ) { gtk_widget_hide (widgetitem); }
+ else {gtk_widget_show (widgetitem);}
+
}
static void
***************
*** 137,142 ****
--- 177,205 ----
g_signal_connect_swapped (nautilus_preferences,
"changed::" NAUTILUS_PREFERENCES_ALWAYS_USE_LOCATION_ENTRY,
G_CALLBACK (toolbar_update_appearance), self);
+
+ /* Nautilus patch Raya Christian*/
+ g_signal_connect_swapped (nautilus_preferences,
+ "changed::" NAUTILUS_PREFERENCES_SHOW_UP_ICON_TOOLBAR,
+ G_CALLBACK (toolbar_update_appearance), self);
+ g_signal_connect_swapped (nautilus_preferences,
+ "changed::" NAUTILUS_PREFERENCES_SHOW_EDIT_ICON_TOOLBAR,
+ G_CALLBACK (toolbar_update_appearance), self);
+ g_signal_connect_swapped (nautilus_preferences,
+ "changed::" NAUTILUS_PREFERENCES_SHOW_RELOAD_ICON_TOOLBAR,
+ G_CALLBACK (toolbar_update_appearance), self);
+ g_signal_connect_swapped (nautilus_preferences,
+ "changed::" NAUTILUS_PREFERENCES_SHOW_HOME_ICON_TOOLBAR,
+ G_CALLBACK (toolbar_update_appearance), self);
+ g_signal_connect_swapped (nautilus_preferences,
+ "changed::" NAUTILUS_PREFERENCES_SHOW_COMPUTER_ICON_TOOLBAR,
+ G_CALLBACK (toolbar_update_appearance), self);
+ g_signal_connect_swapped (nautilus_preferences,
+ "changed::" NAUTILUS_PREFERENCES_SHOW_SEARCH_ICON_TOOLBAR,
+ G_CALLBACK (toolbar_update_appearance), self);
+ g_signal_connect_swapped (nautilus_preferences,
+ "changed::" NAUTILUS_PREFERENCES_SHOW_LABEL_SEARCH_ICON_TOOLBAR,
+ G_CALLBACK (toolbar_update_appearance), self);
toolbar_update_appearance (self);
}
***************
*** 282,287 ****
--- 345,359 ----
return self->priv->search_bar;
}
+
+ /* Nautilus patch Raya Christian*/
+ GtkWidget *
+ nautilus_toolbar_get_show_location_entry (NautilusToolbar *self)
+ {
+ return self->priv->show_location_entry;
+ }
+
+
void
nautilus_toolbar_set_show_main_bar (NautilusToolbar *self,
gboolean show_main_bar)
diff -crB nautilus-3.4.2/src/nautilus-toolbar.h nautilus-3.4.2.mod/src/nautilus-toolbar.h
*** nautilus-3.4.2/src/nautilus-toolbar.h 2012-05-08 06:28:09.000000000 +0200
--- nautilus-3.4.2.mod/src/nautilus-toolbar.h 2013-01-09 11:46:39.000000000 +0100
***************
*** 63,68 ****
--- 63,71 ----
GType nautilus_toolbar_get_type (void);
GtkWidget *nautilus_toolbar_new (GtkActionGroup *action_group);
+
+ /* Nautilus patch Raya Christian*/
+ GtkWidget *nautilus_toolbar_get_show_location_entry (NautilusToolbar *self);
GtkWidget *nautilus_toolbar_get_path_bar (NautilusToolbar *self);
GtkWidget *nautilus_toolbar_get_location_bar (NautilusToolbar *self);
diff -crB nautilus-3.4.2/src/nautilus-toolbar-ui.xml nautilus-3.4.2.mod/src/nautilus-toolbar-ui.xml
*** nautilus-3.4.2/src/nautilus-toolbar-ui.xml 2012-05-08 06:28:09.000000000 +0200
--- nautilus-3.4.2.mod/src/nautilus-toolbar-ui.xml 2013-01-09 11:46:39.000000000 +0100
***************
*** 2,7 ****
!
\ No newline at end of file
--- 2,12 ----
+
+
+
+
+
!
diff -crB nautilus-3.4.2/src/nautilus-tree-sidebar.c nautilus-3.4.2.mod/src/nautilus-tree-sidebar.c
*** nautilus-3.4.2/src/nautilus-tree-sidebar.c 2012-05-14 21:37:55.000000000 +0200
--- nautilus-3.4.2.mod/src/nautilus-tree-sidebar.c 2013-01-09 11:46:39.000000000 +0100
***************
*** 1333,1339 ****
(view->details->child_model, "row_loaded",
G_CALLBACK (row_loaded_callback),
view, G_CONNECT_AFTER);
! home_uri = nautilus_get_home_directory_uri ();
icon = g_themed_icon_new (NAUTILUS_ICON_HOME);
fm_tree_model_add_root_uri (view->details->child_model, home_uri, _("Home"), icon, NULL);
g_object_unref (icon);
--- 1333,1340 ----
(view->details->child_model, "row_loaded",
G_CALLBACK (row_loaded_callback),
view, G_CONNECT_AFTER);
!
! home_uri = nautilus_get_home_directory_uri ();
icon = g_themed_icon_new (NAUTILUS_ICON_HOME);
fm_tree_model_add_root_uri (view->details->child_model, home_uri, _("Home"), icon, NULL);
g_object_unref (icon);
diff -crB nautilus-3.4.2/src/nautilus-window.c nautilus-3.4.2.mod/src/nautilus-window.c
*** nautilus-3.4.2/src/nautilus-window.c 2013-01-09 10:22:07.000000000 +0100
--- nautilus-3.4.2.mod/src/nautilus-window.c 2013-01-09 11:46:39.000000000 +0100
***************
*** 2077,2082 ****
--- 2077,2085 ----
void
nautilus_window_split_view_off (NautilusWindow *window)
{
+ /* Nautilus patch Raya Christian*/
+ gboolean show_label_search_icon_toolbar;
+
NautilusWindowPane *pane, *active_pane;
GList *l, *next;
***************
*** 2096,2102 ****
active_pane->action_group);
nautilus_window_update_show_hide_menu_items (window);
! window_set_search_action_text (window, TRUE);
}
gboolean
--- 2099,2111 ----
active_pane->action_group);
nautilus_window_update_show_hide_menu_items (window);
!
! /* Nautilus patch Raya Christian*/
! /*window_set_search_action_text (window, TRUE);*/
! show_label_search_icon_toolbar = g_settings_get_boolean (nautilus_preferences, NAUTILUS_PREFERENCES_SHOW_LABEL_SEARCH_ICON_TOOLBAR);
! window_set_search_action_text (window, show_label_search_icon_toolbar);
!
!
}
gboolean
diff -crB nautilus-3.4.2/src/nautilus-window-menus.c nautilus-3.4.2.mod/src/nautilus-window-menus.c
*** nautilus-3.4.2/src/nautilus-window-menus.c 2013-01-09 10:22:07.000000000 +0100
--- nautilus-3.4.2.mod/src/nautilus-window-menus.c 2013-01-09 11:41:57.000000000 +0100
***************
*** 317,322 ****
--- 317,323 ----
"Andy Hertzfeld",
"Arlo Rose",
"Christian Neumair",
+ "Christian Raya",
"Cosimo Cecchi",
"Darin Adler",
"David Camp",
***************
*** 1030,1037 ****
/* name, stock id, label */ { NAUTILUS_ACTION_FORWARD, GTK_STOCK_GO_FORWARD, N_("_Forward"),
"Right", N_("Go to the next visited location"),
G_CALLBACK (action_forward_callback) },
! /* name, stock id, label */ { "Go to Location", NULL, N_("_Location..."),
! "L", N_("Specify a location to open"),
G_CALLBACK (action_go_to_location_callback) },
/* name, stock id, label */ { "SplitViewNextPane", NULL, N_("S_witch to Other Pane"),
"F6", N_("Move focus to the other pane in a split view window"),
--- 1031,1038 ----
/* name, stock id, label */ { NAUTILUS_ACTION_FORWARD, GTK_STOCK_GO_FORWARD, N_("_Forward"),
"Right", N_("Go to the next visited location"),
G_CALLBACK (action_forward_callback) },
! /* name, stock id, label */ { "Go to Location", NULL, N_("Toggle _Location bar / Path bar"),
! "F12", N_("Specify a location to open"),
G_CALLBACK (action_go_to_location_callback) },
/* name, stock id, label */ { "SplitViewNextPane", NULL, N_("S_witch to Other Pane"),
"F6", N_("Move focus to the other pane in a split view window"),
***************
*** 1105,1110 ****
--- 1106,1115 ----
GtkActionGroup *
nautilus_window_create_toolbar_action_group (NautilusWindow *window)
{
+ /* Nautilus patch Raya Christian*/
+ gboolean show_label_search_icon_toolbar;
+
+
NautilusNavigationState *navigation_state;
GtkActionGroup *action_group;
GtkAction *action;
***************
*** 1144,1157 ****
g_object_unref (action);
! action = GTK_ACTION
! (gtk_toggle_action_new (NAUTILUS_ACTION_SEARCH,
! _("Search"),
! _("Search documents and folders by name"),
! NULL));
gtk_action_group_add_action (action_group, action);
gtk_action_set_icon_name (GTK_ACTION (action), "edit-find-symbolic");
! gtk_action_set_is_important (GTK_ACTION (action), TRUE);
g_object_unref (action);
--- 1149,1241 ----
g_object_unref (action);
!
! /* Nautilus patch Raya Christian*/
! action = g_object_new (NAUTILUS_TYPE_NAVIGATION_ACTION,
! "name", NAUTILUS_ACTION_UP,
! "label", _("_Up"),
! "stock_id", GTK_STOCK_GO_UP,
! "tooltip", _("Go to parent folder"),
! "arrow-tooltip", _("Forward history"),
! "window", window,
! "direction", NAUTILUS_NAVIGATION_DIRECTION_UP,
! NULL);
! g_signal_connect (action, "activate",
! G_CALLBACK (action_up_callback), window);
! gtk_action_group_add_action (action_group, action);
!
! g_object_unref (action);
!
! action = g_object_new (NAUTILUS_TYPE_NAVIGATION_ACTION,
! "name", NAUTILUS_ACTION_RELOAD,
! "label", _("_Reload"),
! "stock_id", GTK_STOCK_REFRESH,
! "tooltip", _("Reload the current location"),
! "window", window,
! "direction", NAUTILUS_NAVIGATION_DIRECTION_RELOAD,
! NULL);
! g_signal_connect (action, "activate",
! G_CALLBACK (action_reload_callback), window);
! gtk_action_group_add_action (action_group, action);
!
! g_object_unref (action);
!
! action = g_object_new (NAUTILUS_TYPE_NAVIGATION_ACTION,
! "name", NAUTILUS_ACTION_HOME,
! "label", _("_Home"),
! "stock_id", GTK_STOCK_HOME,
! "tooltip", _("Go to home directory"),
! "window", window,
! "direction", NAUTILUS_NAVIGATION_DIRECTION_HOME,
! NULL);
! g_signal_connect (action, "activate",
! G_CALLBACK (action_home_callback), window);
! gtk_action_group_add_action (action_group, action);
!
! g_object_unref (action);
!
! action = g_object_new (NAUTILUS_TYPE_NAVIGATION_ACTION,
! "name", NAUTILUS_ACTION_COMPUTER,
! "label", _("_Computer"),
! "stock_id", GTK_STOCK_HARDDISK,
! "tooltip", _("Go to Computer"),
! "window", window,
! "direction", NAUTILUS_NAVIGATION_DIRECTION_COMPUTER,
! NULL);
! g_signal_connect (action, "activate",
! G_CALLBACK (action_go_to_computer_callback), window);
! gtk_action_group_add_action (action_group, action);
!
! g_object_unref (action);
!
!
! action = g_object_new (NAUTILUS_TYPE_NAVIGATION_ACTION,
! "name", NAUTILUS_ACTION_EDIT,
! "label", _("Location"),
! "stock_id", GTK_STOCK_EDIT,
! "tooltip", _("Toggle Location bar / Path bar (F12)"),
! "window", window,
! "direction", NAUTILUS_NAVIGATION_DIRECTION_EDIT,
! NULL);
! g_signal_connect (action, "activate",
! G_CALLBACK (action_go_to_location_callback), window);
! gtk_action_group_add_action (action_group, action);
!
! g_object_unref (action);
!
! action = GTK_ACTION (gtk_toggle_action_new (NAUTILUS_ACTION_SEARCH,
! _("Search"),_("Search documents and folders by name"),
! NULL));
!
!
gtk_action_group_add_action (action_group, action);
gtk_action_set_icon_name (GTK_ACTION (action), "edit-find-symbolic");
!
!
! /* Nautilus patch Raya Christian*/
! /*gtk_action_set_is_important (GTK_ACTION (action), TRUE);*/
! show_label_search_icon_toolbar = g_settings_get_boolean (nautilus_preferences, NAUTILUS_PREFERENCES_SHOW_LABEL_SEARCH_ICON_TOOLBAR);
! gtk_action_set_is_important (GTK_ACTION (action), show_label_search_icon_toolbar);
g_object_unref (action);
***************
*** 1202,1208 ****
{
GtkActionGroup *action_group;
const gchar *nav_state_actions[] = {
! NAUTILUS_ACTION_BACK, NAUTILUS_ACTION_FORWARD,
NAUTILUS_ACTION_SEARCH, NULL
};
--- 1286,1292 ----
{
GtkActionGroup *action_group;
const gchar *nav_state_actions[] = {
! NAUTILUS_ACTION_BACK, NAUTILUS_ACTION_FORWARD, NAUTILUS_ACTION_UP, NAUTILUS_ACTION_RELOAD, NAUTILUS_ACTION_COMPUTER, NAUTILUS_ACTION_HOME, NAUTILUS_ACTION_EDIT,
NAUTILUS_ACTION_SEARCH, NULL
};
***************
*** 1256,1261 ****
--- 1340,1350 ----
action = gtk_action_group_get_action (action_group, NAUTILUS_ACTION_HOME);
g_object_set (action, "short_label", _("_Home"), NULL);
+ /* Nautilus patch Raya Christian*/
+ action = gtk_action_group_get_action (action_group, NAUTILUS_ACTION_EDIT);
+ g_object_set (action, "short_label", _("_Location"), NULL);
+
+
action = gtk_action_group_get_action (action_group, NAUTILUS_ACTION_SHOW_HIDDEN_FILES);
g_signal_handlers_block_by_func (action, action_show_hidden_files_callback, window);
gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action),
diff -crB nautilus-3.4.2/src/nautilus-window-pane.c nautilus-3.4.2.mod/src/nautilus-window-pane.c
*** nautilus-3.4.2/src/nautilus-window-pane.c 2012-05-14 21:37:55.000000000 +0200
--- nautilus-3.4.2.mod/src/nautilus-window-pane.c 2013-01-09 11:46:39.000000000 +0100
***************
*** 1048,1057 ****
void
nautilus_window_pane_ensure_location_bar (NautilusWindowPane *pane)
{
remember_focus_widget (pane);
nautilus_toolbar_set_show_main_bar (NAUTILUS_TOOLBAR (pane->tool_bar), TRUE);
! nautilus_toolbar_set_show_location_entry (NAUTILUS_TOOLBAR (pane->tool_bar), TRUE);
if (!g_settings_get_boolean (nautilus_window_state,
NAUTILUS_WINDOW_STATE_START_WITH_TOOLBAR)) {
--- 1048,1069 ----
void
nautilus_window_pane_ensure_location_bar (NautilusWindowPane *pane)
{
+ /* Nautilus patch Raya Christian*/
+ gboolean fl_active;
+
remember_focus_widget (pane);
nautilus_toolbar_set_show_main_bar (NAUTILUS_TOOLBAR (pane->tool_bar), TRUE);
!
!
! /* Nautilus patch Raya Christian*/
! /*nautilus_toolbar_set_show_location_entry (NAUTILUS_TOOLBAR (pane->tool_bar), TRUE);*/
! fl_active = nautilus_toolbar_get_show_location_entry (NAUTILUS_TOOLBAR (pane->tool_bar));
! if (fl_active) {
! nautilus_toolbar_set_show_location_entry (NAUTILUS_TOOLBAR (pane->tool_bar), FALSE);
! } else {
! nautilus_toolbar_set_show_location_entry (NAUTILUS_TOOLBAR (pane->tool_bar), TRUE);
! }
if (!g_settings_get_boolean (nautilus_window_state,
NAUTILUS_WINDOW_STATE_START_WITH_TOOLBAR)) {