rpm/nemo
SHA256
1
0
Fork 0
forked from pool/nemo
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/X11:Cinnamon:Factory/nemo?expand=0&rev=50

Browse Source
This commit is contained in:
Marguerite Su 2013-10-28 16:20:26 +00:00 committed by Git OBS Bridge
parent 1b9bc64148
commit 9fa4e90225
2 changed files with 207 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

205
nemo-2.0.1-GTK_STOCK.patch
View File

@ -784,3 +784,208 @@ Index: nemo-2.0.1/src/nemo-window-menus.c
N_("Prefere_nces"),
NULL, N_("Edit Nemo preferences"),
G_CALLBACK (action_preferences_callback) },
Index: nemo-2.0.1/src/nemo-view.c
===================================================================
--- nemo-2.0.1.orig/src/nemo-view.c
+++ nemo-2.0.1/src/nemo-view.c
@@ -1036,7 +1036,7 @@ nemo_view_confirm_multiple (GtkWindow *p
"This will open %'d separate windows.", count), count);
}
dialog = eel_show_yes_no_dialog (prompt, detail,
- GTK_STOCK_OK, GTK_STOCK_CANCEL,
+ _("_OK"), _("_Cancel"),
parent_window);
g_free (detail);
@@ -1294,9 +1294,9 @@ choose_program (NemoView *view,
dialog = gtk_dialog_new_with_buttons (_("Open with"),
nemo_view_get_containing_window (view),
GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_STOCK_CANCEL,
+ _("_Cancel"),
GTK_RESPONSE_CANCEL,
- GTK_STOCK_OK,
+ _("_OK"),
GTK_RESPONSE_OK,
NULL);
@@ -1567,11 +1567,11 @@ select_pattern (NemoView *view)
dialog = gtk_dialog_new_with_buttons (_("Select Items Matching"),
nemo_view_get_containing_window (view),
GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_STOCK_HELP,
+ _("_Help"),
GTK_RESPONSE_HELP,
- GTK_STOCK_CANCEL,
+ _("_Cancel"),
GTK_RESPONSE_CANCEL,
- GTK_STOCK_OK,
+ _("_OK"),
GTK_RESPONSE_OK,
NULL);
gtk_dialog_set_default_response (GTK_DIALOG (dialog),
@@ -1701,10 +1701,10 @@ action_save_search_as_callback (GtkActio
dialog = gtk_dialog_new_with_buttons (_("Save Search as"),
nemo_view_get_containing_window (directory_view),
0,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
NULL);
save_button = gtk_dialog_add_button (GTK_DIALOG (dialog),
- GTK_STOCK_SAVE, GTK_RESPONSE_OK);
+ _("_Save"), GTK_RESPONSE_OK);
gtk_dialog_set_default_response (GTK_DIALOG (dialog),
GTK_RESPONSE_OK);
gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
@@ -6786,8 +6786,8 @@ action_browse_for_move_to_folder_callbac
dialog = gtk_file_chooser_dialog_new (_("Select Target Folder For Move"),
nemo_view_get_containing_window (view),
GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OPEN, GTK_RESPONSE_OK,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_Open"), GTK_RESPONSE_OK,
NULL);
g_signal_connect (dialog, "response",
@@ -6807,8 +6807,8 @@ action_browse_for_copy_to_folder_callbac
dialog = gtk_file_chooser_dialog_new (_("Select Target Folder For Copy"),
nemo_view_get_containing_window (view),
GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OPEN, GTK_RESPONSE_OK,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_Open"), GTK_RESPONSE_OK,
NULL);
g_signal_connect (dialog, "response",
@@ -7729,7 +7729,7 @@ action_connect_to_server_link_callback (
dialog = gtk_dialog_new_with_buttons (title,
nemo_view_get_containing_window (view),
0,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
_("_Connect"), GTK_RESPONSE_OK,
NULL);
@@ -7955,7 +7955,7 @@ static const GtkActionEntry directory_vi
/* name, stock id, label */ { "New Documents", "document-new", N_("Create New _Document") },
/* name, stock id, label */ { "Open With", NULL, N_("Open Wit_h"),
NULL, N_("Choose a program with which to open the selected item") },
- /* name, stock id */ { "Properties", GTK_STOCK_PROPERTIES,
+ /* name, stock id */ { "Properties", "_Properties",
/* label, accelerator */ N_("_Properties"), "<alt>Return",
/* tooltip */ N_("View or modify the properties of each selected item"),
G_CALLBACK (action_properties_callback) },
@@ -8018,21 +8018,21 @@ static const GtkActionEntry directory_vi
/* label, accelerator */ N_("E_mpty Trash"), NULL,
/* tooltip */ N_("Delete all items in the Trash"),
G_CALLBACK (action_empty_trash_callback) },
- /* name, stock id */ { "Cut", GTK_STOCK_CUT,
+ /* name, stock id */ { "Cut", "Cu_t",
/* label, accelerator */ NULL, NULL,
/* tooltip */ N_("Prepare the selected files to be moved with a Paste command"),
G_CALLBACK (action_cut_files_callback) },
- /* name, stock id */ { "Copy", GTK_STOCK_COPY,
+ /* name, stock id */ { "Copy", "_Copy",
/* label, accelerator */ NULL, NULL,
/* tooltip */ N_("Prepare the selected files to be copied with a Paste command"),
G_CALLBACK (action_copy_files_callback) },
- /* name, stock id */ { "Paste", GTK_STOCK_PASTE,
+ /* name, stock id */ { "Paste", "_Paste",
/* label, accelerator */ NULL, NULL,
/* tooltip */ N_("Move or copy files previously selected by a Cut or Copy command"),
G_CALLBACK (action_paste_files_callback) },
/* We make accelerator "" instead of null here to not inherit the stock
accelerator for paste */
- /* name, stock id */ { "Paste Files Into", GTK_STOCK_PASTE,
+ /* name, stock id */ { "Paste Files Into", "_Paste",
/* label, accelerator */ N_("_Paste Into Folder"), "",
/* tooltip */ N_("Move or copy files previously selected by a Cut or Copy command into the selected folder"),
G_CALLBACK (action_paste_files_into_callback) },
@@ -8078,11 +8078,11 @@ static const GtkActionEntry directory_vi
/* label, accelerator */ N_("_Restore"), NULL,
NULL,
G_CALLBACK (action_restore_from_trash_callback) },
- /* name, stock id */ { "Undo", GTK_STOCK_UNDO,
+ /* name, stock id */ { "Undo", "_Undo",
/* label, accelerator */ N_("_Undo"), "<control>Z",
/* tooltip */ N_("Undo the last action"),
G_CALLBACK (action_undo_callback) },
- /* name, stock id */ { "Redo", GTK_STOCK_REDO,
+ /* name, stock id */ { "Redo", "_Redo",
/* label, accelerator */ N_("_Redo"), "<control>Y",
/* tooltip */ N_("Redo the last undone action"),
G_CALLBACK (action_redo_callback) },
@@ -8171,15 +8171,15 @@ static const GtkActionEntry directory_vi
/* tooltip */ N_("Open this folder in a new tab"),
G_CALLBACK (action_location_open_in_new_tab_callback) },
- /* name, stock id */ { NEMO_ACTION_LOCATION_CUT, GTK_STOCK_CUT,
+ /* name, stock id */ { NEMO_ACTION_LOCATION_CUT, "Cu_t",
/* label, accelerator */ NULL, "",
/* tooltip */ N_("Prepare this folder to be moved with a Paste command"),
G_CALLBACK (action_location_cut_callback) },
- /* name, stock id */ { NEMO_ACTION_LOCATION_COPY, GTK_STOCK_COPY,
+ /* name, stock id */ { NEMO_ACTION_LOCATION_COPY, "_Copy",
/* label, accelerator */ NULL, "",
/* tooltip */ N_("Prepare this folder to be copied with a Paste command"),
G_CALLBACK (action_location_copy_callback) },
- /* name, stock id */ { NEMO_ACTION_LOCATION_PASTE_FILES_INTO, GTK_STOCK_PASTE,
+ /* name, stock id */ { NEMO_ACTION_LOCATION_PASTE_FILES_INTO, "_Paste",
/* label, accelerator */ N_("_Paste Into Folder"), "",
/* tooltip */ N_("Move or copy files previously selected by a Cut or Copy command into this folder"),
G_CALLBACK (action_location_paste_files_into_callback) },
@@ -8221,7 +8221,7 @@ static const GtkActionEntry directory_vi
/* tooltip */ N_("Detect media in the selected drive"),
G_CALLBACK (action_location_detect_media_callback) },
- /* name, stock id */ { "LocationProperties", GTK_STOCK_PROPERTIES,
+ /* name, stock id */ { "LocationProperties", "_Properties",
/* label, accelerator */ N_("_Properties"), NULL,
/* tooltip */ N_("View or modify the properties of this folder"),
G_CALLBACK (action_location_properties_callback) },
@@ -9443,7 +9443,7 @@ real_update_menus (NemoView *view)
GTK_IMAGE_MENU_ITEM (menuitem), app_icon != NULL);
if (app_icon == NULL) {
- app_icon = g_themed_icon_new (GTK_STOCK_OPEN);
+ app_icon = g_themed_icon_new ("document-open");
}
gtk_action_set_gicon (action, app_icon);
Index: nemo-2.0.1/src/nemo-location-bar.c
===================================================================
--- nemo-2.0.1.orig/src/nemo-location-bar.c
+++ nemo-2.0.1/src/nemo-location-bar.c
@@ -193,7 +193,7 @@ drag_data_received_callback (GtkWidget *
GTK_MESSAGE_QUESTION,
prompt,
detail,
- GTK_STOCK_CANCEL, GTK_STOCK_OK,
+ _("_Cancel"), _("_OK"),
NULL) != 0 /* GNOME_OK */;
g_free (prompt);
Index: nemo-2.0.1/src/nemo-query-editor.c
===================================================================
--- nemo-2.0.1.orig/src/nemo-query-editor.c
+++ nemo-2.0.1/src/nemo-query-editor.c
@@ -561,7 +561,7 @@ type_combo_changed (GtkComboBox *combo_b
dialog = gtk_dialog_new_with_buttons (_("Select type"),
GTK_WINDOW (toplevel),
0,
- GTK_STOCK_OK, GTK_RESPONSE_OK,
+ _("_OK"), GTK_RESPONSE_OK,
NULL);
gtk_window_set_default_size (GTK_WINDOW (dialog), 400, 600);
@@ -928,7 +928,7 @@ nemo_query_editor_add_row (NemoQueryEdit
create_type_widgets (row);
button = gtk_button_new ();
- image = gtk_image_new_from_stock (GTK_STOCK_REMOVE,
+ image = gtk_image_new_from_icon_name ("list-remove",
GTK_ICON_SIZE_SMALL_TOOLBAR);
gtk_container_add (GTK_CONTAINER (button), image);
gtk_widget_show (image);

3
nemo.spec
View File

@ -116,7 +116,7 @@ find %{buildroot}%{_libdir} -type f -name "*.la" -print -delete
%suse_update_desktop_file %{name}-autorun-software
# we need to own this directory
mkdir -p %{buildroot}%{_libdir}/nemo
mkdir -p %{buildroot}%{_libdir}/nemo/extensions-3.0
%fdupes %{buildroot}%{_datadir}
@ -167,6 +167,7 @@ mkdir -p %{buildroot}%{_libdir}/nemo
%defattr(-,root,root)
%doc %{_datadir}/gtk-doc/html/libnemo-extension
%dir %{_libdir}/nemo
%dir %{_libdir}/nemo/extensions-3.0
%{_libdir}/libnemo-extension.so.1
%{_libdir}/libnemo-extension.so.1.4.0