wok-next rev 19475
epdfview: don't use custom icons
| author | Aleksej Bobylev <al.bobylev@gmail.com> |
|---|---|
| date | Tue Nov 01 03:15:40 2016 +0200 (2016-11-01) |
| parents | f0167c6f681a |
| children | 8073d596c2c0 |
| files | epdfview-cups/receipt epdfview-cups/stuff/no-stock-icons.patch epdfview/receipt epdfview/stuff/no-stock-icons.patch |
line diff
1.1 --- a/epdfview-cups/receipt Tue Nov 01 02:58:15 2016 +0200 1.2 +++ b/epdfview-cups/receipt Tue Nov 01 03:15:40 2016 +0200 1.3 @@ -28,24 +28,19 @@ 1.4 -e 's/location->values\[0\].string.text/ippGetString(location, 0, NULL)/' \ 1.5 -e 's/.*IPP_TAG_KEYWORD.*/ ipp_t *request = ippNewRequest(IPP_GET_PRINTER_ATTRIBUTES);\n&/' \ 1.6 src/PrintPter.cxx 1.7 + patch -p1 -i $stuff/no-stock-icons.patch 1.8 ./configure \ 1.9 --with-cups \ 1.10 $CONFIGURE_ARGS && 1.11 make && make install 1.12 + cp -f $stuff/*.desktop $install/usr/share/applications 1.13 } 1.14 1.15 # Rules to gen a SliTaz package suitable for Tazpkg. 1.16 genpkg_rules() 1.17 { 1.18 - mkdir -p $fs/usr/share/pixmaps 1.19 - cp -a $install/usr/bin $fs/usr 1.20 - cp -a $install/usr/share/epdfview $fs/usr/share 1.21 - cd $fs/usr/share/pixmaps 1.22 - ln -sf /usr/share/epdfview/pixmaps/icon_epdfview-32.png epdfview.png 1.23 + cook_copy_files epdfview *.desktop *.xml 1.24 + mkdir -p $fs/usr/share/icons/hicolor/48x48/apps 1.25 + cp $install/usr/share/epdfview/pixmaps/icon_epdfview-48.png \ 1.26 + $fs/usr/share/icons/hicolor/48x48/apps/epdfview.png 1.27 } 1.28 - 1.29 -# Pre install commands for Tazpkg. 1.30 -pre_install() 1.31 -{ 1.32 - [ -x "$1/usr/bin/epdfview" ] && yes y | tazpkg remove epdfview 1.33 -}
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 2.2 +++ b/epdfview-cups/stuff/no-stock-icons.patch Tue Nov 01 03:15:40 2016 +0200 2.3 @@ -0,0 +1,192 @@ 2.4 +--- a/src/gtk/FindView.cxx 2.5 ++++ b/srv/gtk/FindView.cxx 2.6 +@@ -50,7 +50,7 @@ 2.7 + gtk_toolbar_set_style (GTK_TOOLBAR (m_FindBar), GTK_TOOLBAR_BOTH_HORIZ); 2.8 + 2.9 + // The "Close" button. 2.10 +- m_Close = gtk_tool_button_new_from_stock (GTK_STOCK_CLOSE); 2.11 ++ m_Close = gtk_tool_button_new (gtk_image_new_from_icon_name ("window-close", GTK_ICON_SIZE_SMALL_TOOLBAR), _("Close")); 2.12 + gtk_toolbar_insert (GTK_TOOLBAR (m_FindBar), m_Close, -1); 2.13 + 2.14 + // The text to find entry. 2.15 +@@ -65,13 +65,13 @@ 2.16 + gtk_toolbar_insert (GTK_TOOLBAR (m_FindBar), textToFindItem, -1); 2.17 + 2.18 + // The "Find Next" button. 2.19 +- m_FindNext = gtk_tool_button_new_from_stock (EPDFVIEW_STOCK_FIND_NEXT); 2.20 ++ m_FindNext = gtk_tool_button_new (gtk_image_new_from_icon_name ("go-next", GTK_ICON_SIZE_SMALL_TOOLBAR), _("Find _Next")); 2.21 + gtk_tool_item_set_is_important (m_FindNext, TRUE); 2.22 + gtk_toolbar_insert (GTK_TOOLBAR (m_FindBar), m_FindNext, -1); 2.23 + 2.24 + // The "Find Previous" button. 2.25 + m_FindPrevious = 2.26 +- gtk_tool_button_new_from_stock (EPDFVIEW_STOCK_FIND_PREVIOUS); 2.27 ++ gtk_tool_button_new (gtk_image_new_from_icon_name ("go-previous", GTK_ICON_SIZE_SMALL_TOOLBAR), _("Find _Previous")); 2.28 + gtk_tool_item_set_is_important (m_FindPrevious, TRUE); 2.29 + gtk_toolbar_insert (GTK_TOOLBAR (m_FindBar), m_FindPrevious, -1); 2.30 + 2.31 +--- a/src/gtk/MainView.cxx 2.32 ++++ b/src/gtk/MainView.cxx 2.33 +@@ -92,80 +92,80 @@ 2.34 + { "GoMenu", NULL, N_("_Go"), NULL, NULL, NULL }, 2.35 + { "HelpMenu", NULL, N_("_Help"), NULL, NULL, NULL }, 2.36 + 2.37 +- { "OpenFile", GTK_STOCK_OPEN, N_("_Open"), "<control>O", 2.38 ++ { "OpenFile", "document-open", N_("_Open"), "<control>O", 2.39 + N_("Open a PDF document"), 2.40 + G_CALLBACK (main_window_open_file_cb) }, 2.41 + 2.42 +- { "ReloadFile", GTK_STOCK_REFRESH, N_("_Reload"), "<control>R", 2.43 ++ { "ReloadFile", "view-refresh", N_("_Reload"), "<control>R", 2.44 + N_("Reload the current document"), 2.45 + G_CALLBACK (main_window_reload_cb) }, 2.46 + 2.47 +- { "SaveFile", GTK_STOCK_SAVE, N_("_Save a Copy..."), "<control>S", 2.48 ++ { "SaveFile", "document-save", N_("_Save a Copy..."), "<control>S", 2.49 + N_("Save a copy of the current document"), 2.50 + G_CALLBACK (main_window_save_file_cb) }, 2.51 + 2.52 + #if defined (HAVE_CUPS) 2.53 +- { "Print", GTK_STOCK_PRINT, N_("_Print..."), "<control>P", 2.54 ++ { "Print", "document-print", N_("_Print..."), "<control>P", 2.55 + N_("Print the current document"), 2.56 + G_CALLBACK (main_window_print_cb) }, 2.57 + #endif // HAVE_CUPS 2.58 + 2.59 +- { "Quit", GTK_STOCK_CLOSE, N_("_Close"), "<control>W", 2.60 ++ { "Quit", "window-close", N_("_Close"), "<control>W", 2.61 + N_("Close this window"), 2.62 + G_CALLBACK (main_window_quit_cb) }, 2.63 + 2.64 +- { "Find", GTK_STOCK_FIND, N_("_Find"), "<control>F", 2.65 ++ { "Find", "edit-find", N_("_Find"), "<control>F", 2.66 + N_("Find a word in the document"), 2.67 + G_CALLBACK (main_window_find_cb) }, 2.68 + 2.69 +- { "Preferences", GTK_STOCK_PREFERENCES, N_("_Preferences..."), NULL, 2.70 ++ { "Preferences", "preferences-system", N_("_Preferences..."), NULL, 2.71 + N_("Change the application's preferences"), 2.72 + G_CALLBACK (main_window_preferences_cb) }, 2.73 + 2.74 +- { "ZoomIn", GTK_STOCK_ZOOM_IN, N_("Zoom _In"), "<control>plus", 2.75 ++ { "ZoomIn", "zoom-in", N_("Zoom _In"), "<control>plus", 2.76 + N_("Enlarge the document"), 2.77 + G_CALLBACK (main_window_zoom_in_cb) }, 2.78 + 2.79 +- { "ZoomOut", GTK_STOCK_ZOOM_OUT, N_("Zoom _Out"), "<control>minus", 2.80 ++ { "ZoomOut", "zoom-out", N_("Zoom _Out"), "<control>minus", 2.81 + N_("Shrink the document"), 2.82 + G_CALLBACK (main_window_zoom_out_cb) }, 2.83 + 2.84 +- { "RotateRight", EPDFVIEW_STOCK_ROTATE_RIGHT, N_("Rotate _Right"), "<control>bracketright", 2.85 ++ { "RotateRight", "object-rotate-right", N_("Rotate _Right"), "<control>bracketright", 2.86 + N_("Rotate the document 90 degrees clockwise"), 2.87 + G_CALLBACK (main_window_rotate_right_cb) }, 2.88 + 2.89 +- { "RotateLeft", EPDFVIEW_STOCK_ROTATE_LEFT, N_("Rotate _Left"), "<control>bracketleft", 2.90 ++ { "RotateLeft", "object-rotate-left", N_("Rotate _Left"), "<control>bracketleft", 2.91 + N_("Rotate the document 90 degrees counter-clockwise"), 2.92 + G_CALLBACK (main_window_rotate_left_cb) }, 2.93 + 2.94 +- { "GoToFirstPage", GTK_STOCK_GOTO_FIRST, N_("_First Page"), "<control>Home", 2.95 ++ { "GoToFirstPage", "go-first", N_("_First Page"), "<control>Home", 2.96 + N_("Go to the first page"), 2.97 + G_CALLBACK (main_window_go_to_first_page_cb) }, 2.98 + 2.99 +- { "GoToNextPage", GTK_STOCK_GO_FORWARD, N_("_Next Page"), "<Shift>Page_Down", 2.100 ++ { "GoToNextPage", "go-next", N_("_Next Page"), "<Shift>Page_Down", 2.101 + N_("Go to the next page"), 2.102 + G_CALLBACK (main_window_go_to_next_page_cb) }, 2.103 + 2.104 +- { "GoToPreviousPage", GTK_STOCK_GO_BACK, N_("_Previous Page"), "<Shift>Page_Up", 2.105 ++ { "GoToPreviousPage", "go-previous", N_("_Previous Page"), "<Shift>Page_Up", 2.106 + N_("Go to the previous page"), 2.107 + G_CALLBACK (main_window_go_to_previous_page_cb) }, 2.108 + 2.109 +- { "GoToLastPage", GTK_STOCK_GOTO_LAST, N_("_Last Page"), "<control>End", 2.110 ++ { "GoToLastPage", "go-last", N_("_Last Page"), "<control>End", 2.111 + N_("Go to the last page"), 2.112 + G_CALLBACK (main_window_go_to_last_page_cb) }, 2.113 + 2.114 +- { "About", GTK_STOCK_ABOUT, N_("_About"), NULL, 2.115 ++ { "About", "help-about", N_("_About"), NULL, 2.116 + N_("Display application's credits"), 2.117 + G_CALLBACK (main_window_about_box_cb) }, 2.118 + 2.119 + // Accelerator keys. 2.120 +- { "Slash", GTK_STOCK_FIND, NULL, "slash", NULL, 2.121 ++ { "Slash", "edit-find", NULL, "slash", NULL, 2.122 + G_CALLBACK (main_window_find_cb) }, 2.123 + 2.124 +- { "KPAdd", GTK_STOCK_ZOOM_IN, NULL, "<control>KP_Add", NULL, 2.125 ++ { "KPAdd", "zoom-in", NULL, "<control>KP_Add", NULL, 2.126 + G_CALLBACK (main_window_zoom_in_cb) }, 2.127 + 2.128 +- { "KPSubtract", GTK_STOCK_ZOOM_OUT, NULL, "<control>KP_Subtract", 2.129 ++ { "KPSubtract", "zoom-out", NULL, "<control>KP_Subtract", 2.130 + NULL, 2.131 + G_CALLBACK (main_window_zoom_out_cb) } 2.132 + }; 2.133 +@@ -188,21 +188,21 @@ 2.134 + N_("Show or hide the document's outline"), 2.135 + G_CALLBACK (main_window_show_index_cb), FALSE }, 2.136 + 2.137 +- { "ZoomFit", GTK_STOCK_ZOOM_FIT, N_("Zoom to _Fit"), NULL, 2.138 ++ { "ZoomFit", "zoom-fit-best", N_("Zoom to _Fit"), NULL, 2.139 + N_("Make the current document fill the window"), 2.140 + G_CALLBACK (main_window_zoom_fit_cb), FALSE }, 2.141 + 2.142 +- { "ZoomWidth", EPDFVIEW_STOCK_ZOOM_WIDTH, N_("Zoom to _Width"), NULL, 2.143 ++ { "ZoomWidth", "format-justify-fill", N_("Zoom to _Width"), NULL, 2.144 + N_("Make the current document fill the window width"), 2.145 + G_CALLBACK (main_window_zoom_width_cb), FALSE }, 2.146 + }; 2.147 + 2.148 + static GtkRadioActionEntry g_PageScrollEntries[] = 2.149 + { 2.150 +- { "PageModeScroll", GTK_STOCK_FULLSCREEN, N_("Scroll"), NULL, 2.151 ++ { "PageModeScroll", "view-fullscreen", N_("Scroll"), NULL, 2.152 + N_("Mouse scroll page"), (int)PagePterModeScroll }, 2.153 + 2.154 +- { "PageModeText", GTK_STOCK_SELECT_ALL, N_("Select Text"), NULL, 2.155 ++ { "PageModeText", "edit-select-all", N_("Select Text"), NULL, 2.156 + N_(" Mouse select text"), (int)PagePterModeSelectText }, 2.157 + }; 2.158 + 2.159 +@@ -1031,35 +1031,7 @@ 2.160 + void 2.161 + MainView::setMainWindowIcon () 2.162 + { 2.163 +- const gchar *iconFiles[] = 2.164 +- { 2.165 +- "icon_epdfview-48.png", 2.166 +- "icon_epdfview-32.png", 2.167 +- "icon_epdfview-24.png", 2.168 +- }; 2.169 +- 2.170 +- GList *iconList = NULL; 2.171 +- int iconFilesNum = G_N_ELEMENTS (iconFiles); 2.172 +- for ( int iconIndex = 0 ; iconIndex < iconFilesNum ; iconIndex++ ) 2.173 +- { 2.174 +- gchar *filename = g_strconcat (DATADIR, "/pixmaps/", 2.175 +- iconFiles[iconIndex], NULL); 2.176 +- GError *error = NULL; 2.177 +- GdkPixbuf *iconPixbuf = gdk_pixbuf_new_from_file (filename, &error); 2.178 +- if ( NULL != iconPixbuf ) 2.179 +- { 2.180 +- iconList = g_list_prepend (iconList, iconPixbuf); 2.181 +- } 2.182 +- else 2.183 +- { 2.184 +- g_warning ("Error loading icon: %s\n", error->message); 2.185 +- g_error_free (error); 2.186 +- } 2.187 +- g_free (filename); 2.188 +- } 2.189 +- gtk_window_set_default_icon_list (iconList); 2.190 +- g_list_foreach (iconList, (GFunc)g_object_unref, NULL); 2.191 +- g_list_free (iconList); 2.192 ++ gtk_window_set_default_icon_name ("epdfview"); 2.193 + } 2.194 + 2.195 + ///
3.1 --- a/epdfview/receipt Tue Nov 01 02:58:15 2016 +0200 3.2 +++ b/epdfview/receipt Tue Nov 01 03:15:40 2016 +0200 3.3 @@ -23,18 +23,19 @@ 3.4 src/epdfview.h 3.5 find . -name '*.[ch]*' | xargs sed -i 's|<glib/.*h|<glib.h|' 3.6 patch -Np1 -i $stuff/0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch 3.7 + patch -p1 -i $stuff/no-stock-icons.patch 3.8 ./configure \ 3.9 --without-cups \ 3.10 $CONFIGURE_ARGS && 3.11 make && make install 3.12 + cp -f $stuff/*.desktop $install/usr/share/applications 3.13 } 3.14 3.15 # Rules to gen a SliTaz package suitable for Tazpkg. 3.16 genpkg_rules() 3.17 { 3.18 - mkdir -p $fs/usr/share 3.19 - cp -a $install/usr/bin $fs/usr 3.20 - cp -a $install/usr/share/epdfview $fs/usr/share 3.21 - find $fs -name 'icon*[83]*' -delete 3.22 + cook_copy_files epdfview *.desktop *.xml 3.23 + mkdir -p $fs/usr/share/icons/hicolor/48x48/apps 3.24 + cp $install/usr/share/epdfview/pixmaps/icon_epdfview-48.png \ 3.25 + $fs/usr/share/icons/hicolor/48x48/apps/epdfview.png 3.26 } 3.27 -
4.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 4.2 +++ b/epdfview/stuff/no-stock-icons.patch Tue Nov 01 03:15:40 2016 +0200 4.3 @@ -0,0 +1,192 @@ 4.4 +--- a/src/gtk/FindView.cxx 4.5 ++++ b/srv/gtk/FindView.cxx 4.6 +@@ -50,7 +50,7 @@ 4.7 + gtk_toolbar_set_style (GTK_TOOLBAR (m_FindBar), GTK_TOOLBAR_BOTH_HORIZ); 4.8 + 4.9 + // The "Close" button. 4.10 +- m_Close = gtk_tool_button_new_from_stock (GTK_STOCK_CLOSE); 4.11 ++ m_Close = gtk_tool_button_new (gtk_image_new_from_icon_name ("window-close", GTK_ICON_SIZE_SMALL_TOOLBAR), _("Close")); 4.12 + gtk_toolbar_insert (GTK_TOOLBAR (m_FindBar), m_Close, -1); 4.13 + 4.14 + // The text to find entry. 4.15 +@@ -65,13 +65,13 @@ 4.16 + gtk_toolbar_insert (GTK_TOOLBAR (m_FindBar), textToFindItem, -1); 4.17 + 4.18 + // The "Find Next" button. 4.19 +- m_FindNext = gtk_tool_button_new_from_stock (EPDFVIEW_STOCK_FIND_NEXT); 4.20 ++ m_FindNext = gtk_tool_button_new (gtk_image_new_from_icon_name ("go-next", GTK_ICON_SIZE_SMALL_TOOLBAR), _("Find _Next")); 4.21 + gtk_tool_item_set_is_important (m_FindNext, TRUE); 4.22 + gtk_toolbar_insert (GTK_TOOLBAR (m_FindBar), m_FindNext, -1); 4.23 + 4.24 + // The "Find Previous" button. 4.25 + m_FindPrevious = 4.26 +- gtk_tool_button_new_from_stock (EPDFVIEW_STOCK_FIND_PREVIOUS); 4.27 ++ gtk_tool_button_new (gtk_image_new_from_icon_name ("go-previous", GTK_ICON_SIZE_SMALL_TOOLBAR), _("Find _Previous")); 4.28 + gtk_tool_item_set_is_important (m_FindPrevious, TRUE); 4.29 + gtk_toolbar_insert (GTK_TOOLBAR (m_FindBar), m_FindPrevious, -1); 4.30 + 4.31 +--- a/src/gtk/MainView.cxx 4.32 ++++ b/src/gtk/MainView.cxx 4.33 +@@ -92,80 +92,80 @@ 4.34 + { "GoMenu", NULL, N_("_Go"), NULL, NULL, NULL }, 4.35 + { "HelpMenu", NULL, N_("_Help"), NULL, NULL, NULL }, 4.36 + 4.37 +- { "OpenFile", GTK_STOCK_OPEN, N_("_Open"), "<control>O", 4.38 ++ { "OpenFile", "document-open", N_("_Open"), "<control>O", 4.39 + N_("Open a PDF document"), 4.40 + G_CALLBACK (main_window_open_file_cb) }, 4.41 + 4.42 +- { "ReloadFile", GTK_STOCK_REFRESH, N_("_Reload"), "<control>R", 4.43 ++ { "ReloadFile", "view-refresh", N_("_Reload"), "<control>R", 4.44 + N_("Reload the current document"), 4.45 + G_CALLBACK (main_window_reload_cb) }, 4.46 + 4.47 +- { "SaveFile", GTK_STOCK_SAVE, N_("_Save a Copy..."), "<control>S", 4.48 ++ { "SaveFile", "document-save", N_("_Save a Copy..."), "<control>S", 4.49 + N_("Save a copy of the current document"), 4.50 + G_CALLBACK (main_window_save_file_cb) }, 4.51 + 4.52 + #if defined (HAVE_CUPS) 4.53 +- { "Print", GTK_STOCK_PRINT, N_("_Print..."), "<control>P", 4.54 ++ { "Print", "document-print", N_("_Print..."), "<control>P", 4.55 + N_("Print the current document"), 4.56 + G_CALLBACK (main_window_print_cb) }, 4.57 + #endif // HAVE_CUPS 4.58 + 4.59 +- { "Quit", GTK_STOCK_CLOSE, N_("_Close"), "<control>W", 4.60 ++ { "Quit", "window-close", N_("_Close"), "<control>W", 4.61 + N_("Close this window"), 4.62 + G_CALLBACK (main_window_quit_cb) }, 4.63 + 4.64 +- { "Find", GTK_STOCK_FIND, N_("_Find"), "<control>F", 4.65 ++ { "Find", "edit-find", N_("_Find"), "<control>F", 4.66 + N_("Find a word in the document"), 4.67 + G_CALLBACK (main_window_find_cb) }, 4.68 + 4.69 +- { "Preferences", GTK_STOCK_PREFERENCES, N_("_Preferences..."), NULL, 4.70 ++ { "Preferences", "preferences-system", N_("_Preferences..."), NULL, 4.71 + N_("Change the application's preferences"), 4.72 + G_CALLBACK (main_window_preferences_cb) }, 4.73 + 4.74 +- { "ZoomIn", GTK_STOCK_ZOOM_IN, N_("Zoom _In"), "<control>plus", 4.75 ++ { "ZoomIn", "zoom-in", N_("Zoom _In"), "<control>plus", 4.76 + N_("Enlarge the document"), 4.77 + G_CALLBACK (main_window_zoom_in_cb) }, 4.78 + 4.79 +- { "ZoomOut", GTK_STOCK_ZOOM_OUT, N_("Zoom _Out"), "<control>minus", 4.80 ++ { "ZoomOut", "zoom-out", N_("Zoom _Out"), "<control>minus", 4.81 + N_("Shrink the document"), 4.82 + G_CALLBACK (main_window_zoom_out_cb) }, 4.83 + 4.84 +- { "RotateRight", EPDFVIEW_STOCK_ROTATE_RIGHT, N_("Rotate _Right"), "<control>bracketright", 4.85 ++ { "RotateRight", "object-rotate-right", N_("Rotate _Right"), "<control>bracketright", 4.86 + N_("Rotate the document 90 degrees clockwise"), 4.87 + G_CALLBACK (main_window_rotate_right_cb) }, 4.88 + 4.89 +- { "RotateLeft", EPDFVIEW_STOCK_ROTATE_LEFT, N_("Rotate _Left"), "<control>bracketleft", 4.90 ++ { "RotateLeft", "object-rotate-left", N_("Rotate _Left"), "<control>bracketleft", 4.91 + N_("Rotate the document 90 degrees counter-clockwise"), 4.92 + G_CALLBACK (main_window_rotate_left_cb) }, 4.93 + 4.94 +- { "GoToFirstPage", GTK_STOCK_GOTO_FIRST, N_("_First Page"), "<control>Home", 4.95 ++ { "GoToFirstPage", "go-first", N_("_First Page"), "<control>Home", 4.96 + N_("Go to the first page"), 4.97 + G_CALLBACK (main_window_go_to_first_page_cb) }, 4.98 + 4.99 +- { "GoToNextPage", GTK_STOCK_GO_FORWARD, N_("_Next Page"), "<Shift>Page_Down", 4.100 ++ { "GoToNextPage", "go-next", N_("_Next Page"), "<Shift>Page_Down", 4.101 + N_("Go to the next page"), 4.102 + G_CALLBACK (main_window_go_to_next_page_cb) }, 4.103 + 4.104 +- { "GoToPreviousPage", GTK_STOCK_GO_BACK, N_("_Previous Page"), "<Shift>Page_Up", 4.105 ++ { "GoToPreviousPage", "go-previous", N_("_Previous Page"), "<Shift>Page_Up", 4.106 + N_("Go to the previous page"), 4.107 + G_CALLBACK (main_window_go_to_previous_page_cb) }, 4.108 + 4.109 +- { "GoToLastPage", GTK_STOCK_GOTO_LAST, N_("_Last Page"), "<control>End", 4.110 ++ { "GoToLastPage", "go-last", N_("_Last Page"), "<control>End", 4.111 + N_("Go to the last page"), 4.112 + G_CALLBACK (main_window_go_to_last_page_cb) }, 4.113 + 4.114 +- { "About", GTK_STOCK_ABOUT, N_("_About"), NULL, 4.115 ++ { "About", "help-about", N_("_About"), NULL, 4.116 + N_("Display application's credits"), 4.117 + G_CALLBACK (main_window_about_box_cb) }, 4.118 + 4.119 + // Accelerator keys. 4.120 +- { "Slash", GTK_STOCK_FIND, NULL, "slash", NULL, 4.121 ++ { "Slash", "edit-find", NULL, "slash", NULL, 4.122 + G_CALLBACK (main_window_find_cb) }, 4.123 + 4.124 +- { "KPAdd", GTK_STOCK_ZOOM_IN, NULL, "<control>KP_Add", NULL, 4.125 ++ { "KPAdd", "zoom-in", NULL, "<control>KP_Add", NULL, 4.126 + G_CALLBACK (main_window_zoom_in_cb) }, 4.127 + 4.128 +- { "KPSubtract", GTK_STOCK_ZOOM_OUT, NULL, "<control>KP_Subtract", 4.129 ++ { "KPSubtract", "zoom-out", NULL, "<control>KP_Subtract", 4.130 + NULL, 4.131 + G_CALLBACK (main_window_zoom_out_cb) } 4.132 + }; 4.133 +@@ -188,21 +188,21 @@ 4.134 + N_("Show or hide the document's outline"), 4.135 + G_CALLBACK (main_window_show_index_cb), FALSE }, 4.136 + 4.137 +- { "ZoomFit", GTK_STOCK_ZOOM_FIT, N_("Zoom to _Fit"), NULL, 4.138 ++ { "ZoomFit", "zoom-fit-best", N_("Zoom to _Fit"), NULL, 4.139 + N_("Make the current document fill the window"), 4.140 + G_CALLBACK (main_window_zoom_fit_cb), FALSE }, 4.141 + 4.142 +- { "ZoomWidth", EPDFVIEW_STOCK_ZOOM_WIDTH, N_("Zoom to _Width"), NULL, 4.143 ++ { "ZoomWidth", "format-justify-fill", N_("Zoom to _Width"), NULL, 4.144 + N_("Make the current document fill the window width"), 4.145 + G_CALLBACK (main_window_zoom_width_cb), FALSE }, 4.146 + }; 4.147 + 4.148 + static GtkRadioActionEntry g_PageScrollEntries[] = 4.149 + { 4.150 +- { "PageModeScroll", GTK_STOCK_FULLSCREEN, N_("Scroll"), NULL, 4.151 ++ { "PageModeScroll", "view-fullscreen", N_("Scroll"), NULL, 4.152 + N_("Mouse scroll page"), (int)PagePterModeScroll }, 4.153 + 4.154 +- { "PageModeText", GTK_STOCK_SELECT_ALL, N_("Select Text"), NULL, 4.155 ++ { "PageModeText", "edit-select-all", N_("Select Text"), NULL, 4.156 + N_(" Mouse select text"), (int)PagePterModeSelectText }, 4.157 + }; 4.158 + 4.159 +@@ -1031,35 +1031,7 @@ 4.160 + void 4.161 + MainView::setMainWindowIcon () 4.162 + { 4.163 +- const gchar *iconFiles[] = 4.164 +- { 4.165 +- "icon_epdfview-48.png", 4.166 +- "icon_epdfview-32.png", 4.167 +- "icon_epdfview-24.png", 4.168 +- }; 4.169 +- 4.170 +- GList *iconList = NULL; 4.171 +- int iconFilesNum = G_N_ELEMENTS (iconFiles); 4.172 +- for ( int iconIndex = 0 ; iconIndex < iconFilesNum ; iconIndex++ ) 4.173 +- { 4.174 +- gchar *filename = g_strconcat (DATADIR, "/pixmaps/", 4.175 +- iconFiles[iconIndex], NULL); 4.176 +- GError *error = NULL; 4.177 +- GdkPixbuf *iconPixbuf = gdk_pixbuf_new_from_file (filename, &error); 4.178 +- if ( NULL != iconPixbuf ) 4.179 +- { 4.180 +- iconList = g_list_prepend (iconList, iconPixbuf); 4.181 +- } 4.182 +- else 4.183 +- { 4.184 +- g_warning ("Error loading icon: %s\n", error->message); 4.185 +- g_error_free (error); 4.186 +- } 4.187 +- g_free (filename); 4.188 +- } 4.189 +- gtk_window_set_default_icon_list (iconList); 4.190 +- g_list_foreach (iconList, (GFunc)g_object_unref, NULL); 4.191 +- g_list_free (iconList); 4.192 ++ gtk_window_set_default_icon_name ("epdfview"); 4.193 + } 4.194 + 4.195 + ///