Updating branch refs/heads/master
to 879d6c41a7ba57908a1884e268de03f1be7e0c91 (commit)
from 52c8b4aea907d9ae0c69d8831432f4c862722273 (commit)
commit 879d6c41a7ba57908a1884e268de03f1be7e0c91
Author: Paweł Forysiuk <tuxa...@o2.pl>
Date: Thu Aug 23 22:13:22 2012 +0200
nsis: Clean up and sync required icon names with current usage
win32/makedist/midori-0.3.3.nsi | 170 +++++++++++++++++---------------------
1 files changed, 76 insertions(+), 94 deletions(-)
diff --git a/win32/makedist/midori-0.3.3.nsi b/win32/makedist/midori-0.3.3.nsi
index eb60d23..5d7a6f7 100644
--- a/win32/makedist/midori-0.3.3.nsi
+++ b/win32/makedist/midori-0.3.3.nsi
@@ -196,112 +196,94 @@ Section "${ICON_THEME} icons" SEC07
SetOutPath "$INSTDIR\share\icons\${ICON_THEME}"
!insertmacro CreateIconThemeSections "actions"
- !insertmacro CreateIconThemeSectionsSmall "animations"
+ #!insertmacro CreateIconThemeSectionsSmall "animations"
!insertmacro CreateIconThemeSections "apps"
!insertmacro CreateIconThemeSections "categories"
!insertmacro CreateIconThemeSections "devices"
- !insertmacro CreateIconThemeSections "emblems"
- !insertmacro CreateIconThemeSections "emotes"
!insertmacro CreateIconThemeSections "mimetypes"
!insertmacro CreateIconThemeSections "places"
!insertmacro CreateIconThemeSections "status"
- !insertmacro InstallIconTheme "actions\gtk-add"
- !insertmacro InstallIconTheme "actions\gtk-bold"
+ !insertmacro InstallIconTheme "actions\bookmark-new"
+ !insertmacro InstallIconTheme "actions\document-open"
+ !insertmacro InstallIconTheme "actions\document-open-recent"
+ !insertmacro InstallIconTheme "actions\document-print"
+ !insertmacro InstallIconTheme "actions\document-properties"
+ !insertmacro InstallIconTheme "actions\document-save-as"
+ !insertmacro InstallIconTheme "actions\document-save"
+ !insertmacro InstallIconTheme "actions\edit-clear"
+ !insertmacro InstallIconTheme "actions\edit-copy"
+ !insertmacro InstallIconTheme "actions\edit-cut"
+ !insertmacro InstallIconTheme "actions\edit-delete"
+ !insertmacro InstallIconTheme "actions\edit-find"
+ !insertmacro InstallIconTheme "actions\edit-paste"
+ !insertmacro InstallIconTheme "actions\edit-redo"
+ !insertmacro InstallIconTheme "actions\edit-select-all"
+ !insertmacro InstallIconTheme "actions\edit-undo"
+ !insertmacro InstallIconTheme "actions\folder-new"
+ !insertmacro InstallIconTheme "actions\format-indent-more"
+ !insertmacro InstallIconTheme "actions\go-home"
+ !insertmacro InstallIconTheme "actions\go-jump"
+ !insertmacro InstallIconTheme "actions\go-next"
+ !insertmacro InstallIconTheme "actions\go-previous"
!insertmacro InstallIconTheme "actions\gtk-cancel"
- !insertmacro InstallIconTheme "actions\gtk-cancel"
- !insertmacro InstallIconTheme "actions\gtk-clear"
- !insertmacro InstallIconTheme "actions\gtk-copy"
- !insertmacro InstallIconTheme "actions\gtk-cut"
- !insertmacro InstallIconTheme "actions\gtk-delete"
- !insertmacro InstallIconTheme "actions\gtk-find"
- !insertmacro InstallIconTheme "actions\gtk-fullscreen"
- !insertmacro InstallIconTheme "actions\gtk-go-back-ltr"
- !insertmacro InstallIconTheme "actions\gtk-go-back-ltr"
- !insertmacro InstallIconTheme "actions\gtk-go-down"
- !insertmacro InstallIconTheme "actions\gtk-go-forward-ltr"
- !insertmacro InstallIconTheme "actions\gtk-go-forward-ltr"
- !insertmacro InstallIconTheme "actions\gtk-go-up"
- !insertmacro InstallIconTheme "actions\gtk-goto-first-ltr"
- !insertmacro InstallIconTheme "actions\gtk-goto-first-ltr"
- !insertmacro InstallIconTheme "actions\gtk-goto-last-ltr"
- !insertmacro InstallIconTheme "actions\gtk-goto-last-ltr"
- !insertmacro InstallIconTheme "actions\gtk-home"
- !insertmacro InstallIconTheme "actions\gtk-indent-ltr"
- !insertmacro InstallIconTheme "actions\gtk-indent-rtl"
- !insertmacro InstallIconTheme "actions\gtk-italic"
- !insertmacro InstallIconTheme "actions\gtk-jump-to-ltr"
- !insertmacro InstallIconTheme "actions\gtk-jump-to-ltr"
- !insertmacro InstallIconTheme "actions\gtk-media-next-ltr"
- !insertmacro InstallIconTheme "actions\gtk-media-next-rtl"
- !insertmacro InstallIconTheme "actions\gtk-media-previous-ltr"
- !insertmacro InstallIconTheme "actions\gtk-media-previous-rtl"
- !insertmacro InstallIconTheme "actions\gtk-open"
- !insertmacro InstallIconTheme "actions\gtk-paste"
- !insertmacro InstallIconTheme "actions\gtk-print"
- !insertmacro InstallIconTheme "actions\gtk-properties"
- !insertmacro InstallIconTheme "actions\gtk-redo-ltr"
- !insertmacro InstallIconTheme "actions\gtk-refresh"
- !insertmacro InstallIconTheme "actions\gtk-remove"
+ !insertmacro InstallIconTheme "actions\gtk-edit"
+ !insertmacro InstallIconTheme "actions\gtk-no"
+ !insertmacro InstallIconTheme "actions\gtk-ok"
!insertmacro InstallIconTheme "actions\gtk-save"
- !insertmacro InstallIconTheme "actions\gtk-save-as"
- !insertmacro InstallIconTheme "actions\gtk-select-all"
- !insertmacro InstallIconTheme "actions\gtk-stop"
- !insertmacro InstallIconTheme "actions\gtk-underline"
- !insertmacro InstallIconTheme "actions\gtk-undo-ltr"
- !insertmacro InstallIconTheme "actions\stock_add-bookmark"
- !insertmacro InstallIconTheme "actions\stock_new-tab"
- !insertmacro InstallIconTheme "actions\stock_new-window"
- !insertmacro InstallIconThemeSmall "animations\process-working"
- !insertmacro InstallIconTheme "apps\gnome-settings-theme"
- !insertmacro InstallIconTheme "apps\gtk-help"
- !insertmacro InstallIconTheme "apps\terminal"
+ !insertmacro InstallIconTheme "actions\help-about"
+ !insertmacro InstallIconTheme "actions\help-contents"
+ !insertmacro InstallIconTheme "actions\list-add"
+ !insertmacro InstallIconTheme "actions\list-remove"
+ !insertmacro InstallIconTheme "actions\media-skip-backward"
+ !insertmacro InstallIconTheme "actions\media-skip-forward"
+ !insertmacro InstallIconTheme "actions\process-stop"
+ !insertmacro InstallIconTheme "actions\stop"
+ !insertmacro InstallIconTheme "actions\tab-new"
+ !insertmacro InstallIconTheme "actions\tools-check-spelling"
+ !insertmacro InstallIconTheme "actions\view-fullscreen"
+ !insertmacro InstallIconTheme "actions\view-refresh"
+ !insertmacro InstallIconTheme "actions\window-close"
+ !insertmacro InstallIconTheme "actions\window-new"
+ !insertmacro InstallIconTheme "actions\zoom-in"
+ !insertmacro InstallIconTheme "actions\zoom-out"
+
+ #!insertmacro InstallIconThemeSmall "animations\process-working"
+
+ !insertmacro InstallIconTheme "apps\internet-news-reader"
+ !insertmacro InstallIconTheme "apps\midori"
+ !insertmacro InstallIconTheme "apps\preferences-desktop-theme"
!insertmacro InstallIconTheme "apps\web-browser"
+
!insertmacro InstallIconTheme "categories\gtk-preferences"
- #!insertmacro InstallIconTheme "cookie-manager"
- #!insertmacro InstallIconTheme "document-open-recent"
- #!insertmacro InstallIconTheme "extention"
- #!insertmacro InstallIconTheme "feed-panel"
- #!insertmacro InstallIconTheme "gtk-about"
- #!insertmacro InstallIconTheme "gtk-close"
- #!insertmacro InstallIconTheme "gtk-convert"
- #!insertmacro InstallIconTheme "gtk-dialog-authentication"
- #!insertmacro InstallIconTheme "gtk-dnd-multiple"
- #!insertmacro InstallIconTheme "gtk-edit"
- #!insertmacro InstallIconTheme "gtk-execute"
- #!insertmacro InstallIconTheme "gtk-file"
- #!insertmacro InstallIconTheme "gtk-index"
- #!insertmacro InstallIconTheme "gtk-info"
- #!insertmacro InstallIconTheme "gtk-ok"
- #!insertmacro InstallIconTheme "gtk-orientation-portait"
- #!insertmacro InstallIconTheme "gtk-quit"
- #!insertmacro InstallIconTheme "gtk-select-color"
- #!insertmacro InstallIconTheme "gtk-select-font"
- #!insertmacro InstallIconTheme "gtk-sort-ascending"
- #!insertmacro InstallIconTheme "gtk-spell-check"
- #!insertmacro InstallIconTheme "gtk-undelete"
- #!insertmacro InstallIconTheme "gtk-yes"
- #!insertmacro InstallIconTheme "gtk-zoom-100"
- #!insertmacro InstallIconTheme "gtk-zoom-in"
- #!insertmacro InstallIconTheme "gtk-zoom-out"
- !insertmacro InstallIconTheme
"mimetypes\gnome-mime-application-x-shockwave-flash"
- !insertmacro InstallIconTheme "mimetypes\gnome-mime-image"
+
+ !insertmacro InstallIconTheme "devices\drive-harddisk"
+ !insertmacro InstallIconTheme "devices\media-optical-dvd-rom"
+
+ !insertmacro InstallIconTheme "mimetypes\application-x-shockwave-flash"
+ !insertmacro InstallIconTheme "mimetypes\extension"
+ !insertmacro InstallIconTheme "mimetypes\gtk-file"
+ !insertmacro InstallIconTheme "mimetypes\image-x-generic"
!insertmacro InstallIconTheme "mimetypes\package"
- !insertmacro InstallIconTheme "mimetypes\stock_script"
- !insertmacro InstallIconTheme "mimetypes\vcard"
- #!insertmacro InstallIconTheme "internet-news-reader"
- #!insertmacro InstallIconTheme "place-holder"
- !insertmacro InstallIconTheme "places\gnome-stock-trash"
- !insertmacro InstallIconTheme "places\gtk-directory"
- !insertmacro InstallIconTheme "places\gtk-network"
- !insertmacro InstallIconTheme "status\gtk-dialog-error"
- !insertmacro InstallIconTheme "status\gtk-dialog-info"
- !insertmacro InstallIconTheme "status\gtk-dialog-warning"
- !insertmacro InstallIconTheme "status\gtk-missing-image"
- !insertmacro InstallIconTheme "status\network-offline"
- #!insertmacro InstallIconTheme "stock_bookmark"
- #!insertmacro InstallIconTheme "stock_mail-send"
- #!insertmacro InstallIconTheme "tab-panel"
+ !insertmacro InstallIconTheme "mimetypes\text-html"
+ !insertmacro InstallIconTheme "mimetypes\text-x-generic"
+ !insertmacro InstallIconTheme "mimetypes\text-x-javascript"
+
+ !insertmacro InstallIconTheme "places\folder-documents"
+ !insertmacro InstallIconTheme "places\folder-downloads"
+ !insertmacro InstallIconTheme "places\folder-music"
+ !insertmacro InstallIconTheme "places\folder-pictures"
+ !insertmacro InstallIconTheme "places\folder"
+ !insertmacro InstallIconTheme "places\folder-videos"
+ !insertmacro InstallIconTheme "places\inode-directory"
+ !insertmacro InstallIconTheme "places\user-bookmarks"
+ !insertmacro InstallIconTheme "places\user-desktop"
+ !insertmacro InstallIconTheme "places\user-home"
+ !insertmacro InstallIconTheme "places\user-trash"
+
+ !insertmacro InstallIconTheme "status\dialog-password"
+ #!insertmacro InstallIconTheme "status\locked"
+
SectionEnd
Section "Desktop Shortcuts" SEC03
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
