Don't rewrite paths for icons anymore

2 files changed, 96 insertions, 108 deletions

diff --git a/win32/makedist/makedist.midori b/win32/makedist/makedist.midori
index fac4ff0c..1447ba2b 100755
--- a/win32/makedist/makedist.midori
+++ b/win32/makedist/makedist.midori
@@ -131,12 +131,12 @@ grab_icons()
   local list="$2"
   
   sizes=$(grep CreateDirectory $list |awk -F '"' '{print $2}' |awk -F '\' '{print $6}')
-  categories=$(grep InstallIconTheme $list | sed -r 's@.+"(.+)"@\1@g' | grep -v InstallIconTheme|awk -F '\' '{print $1}'|sort|uniq)
+  categories=$(grep InstallIconTheme $list | awk -F '"' '{print $2}'|sort|uniq)
 
 	
   for category in $categories
   do
-     category_icons=$(grep InstallIconTheme $list | sed -r 's@.+"(.+)"@\1@g' | grep -v InstallIconTheme|grep $category|awk -F '\' '{print $2}')
+     category_icons=$(grep InstallIconTheme $list |grep $category|awk -F '"' '{print $4}')
      for size in $sizes
      do
 	mkdir -p $workdir/share/icons/$theme/$category/$size
diff --git a/win32/makedist/midori.nsi b/win32/makedist/midori.nsi
index 6349f7dc..b100e070 100644
--- a/win32/makedist/midori.nsi
+++ b/win32/makedist/midori.nsi
@@ -136,25 +136,13 @@ Section "!Program Files" SEC01
 	CreateShortCut "$SMPROGRAMS\$StartmenuFolder\Midori.lnk" "${PRODUCT_EXE}"
 	!insertmacro MUI_STARTMENU_WRITE_END
 
-!macro InstallIconThemeRenameSmall OPath IPath
-	File "/oname=16x16\${OPath}.png" "${RESOURCEDIR}\share\icons\${ICON_THEME}\16x16\${IPath}.png"
-	File "/oname=22x22\${OPath}.png" "${RESOURCEDIR}\share\icons\${ICON_THEME}\22x22\${IPath}.png"
-	File "/oname=24x24\${OPath}.png" "${RESOURCEDIR}\share\icons\${ICON_THEME}\24x24\${IPath}.png"
-	File /nonfatal "/oname=32x32\${OPath}.png" "${RESOURCEDIR}\share\icons\${ICON_THEME}\32x32\${IPath}.png"
-!macroend
-
-!macro InstallIconThemeRename OPath IPath
-	!insertmacro InstallIconThemeRenameSmall ${OPath} ${IPath}
-	File /nonfatal "/oname=48x48\${OPath}.png" "${RESOURCEDIR}\share\icons\${ICON_THEME}\48x48\${IPath}.png"
-	File /nonfatal "/oname=scalable\${OPath}.svg" "${RESOURCEDIR}\share\icons\${ICON_THEME}\scalable\${IPath}.svg"
-!macroend
-
-!macro InstallIconThemeSmall IconPath
-	!insertmacro InstallIconThemeRenameSmall ${IconPath} ${IconPath}
-!macroend
-
-!macro InstallIconTheme IconPath
-	!insertmacro InstallIconThemeRename ${IconPath} ${IconPath}
+!macro InstallIconTheme ICat IName
+	File "/oname=${ICat}\16\${IName}.png" "${RESOURCEDIR}\share\icons\${ICON_THEME}\${ICat}\16\${IName}.png"
+	File "/oname=${Icat}\22\${IName}.png" "${RESOURCEDIR}\share\icons\${ICON_THEME}\${ICat}\22\${IName}.png"
+	File "/oname=${Icat}\24\${IName}.png" "${RESOURCEDIR}\share\icons\${ICON_THEME}\${ICat}\24\${IName}.png"
+	File /nonfatal "/oname=${ICat}\32\${IName}.png" "${RESOURCEDIR}\share\icons\${ICON_THEME}\${ICat}\32\${IName}.png"
+	File /nonfatal "/oname=${ICat}\48\${IName}.png" "${RESOURCEDIR}\share\icons\${ICON_THEME}\${ICat}\48\${IName}.png"
+	File /nonfatal "/oname=${ICat}\scalable\${IName}.svg" "${RESOURCEDIR}\share\icons\${ICON_THEME}\${ICat}\scalable\${IName}.svg"
 !macroend
 
 !macro CreateIconThemeSectionsSmall SectionPath
@@ -181,93 +169,93 @@ Section "!Program Files" SEC01
 	!insertmacro CreateIconThemeSections "places"
 	!insertmacro CreateIconThemeSections "status"
 
-	!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-down"
-	!insertmacro InstallIconTheme "actions\go-home"
-	!insertmacro InstallIconTheme "actions\go-jump"
-	!insertmacro InstallIconTheme "actions\go-next"
-	!insertmacro InstallIconTheme "actions\go-previous"
-	!insertmacro InstallIconTheme "actions\go-up"
-	!insertmacro InstallIconTheme "actions\gtk-cancel"
-	!insertmacro InstallIconTheme "actions\gtk-edit"
-	!insertmacro InstallIconTheme "actions\gtk-no"
-	!insertmacro InstallIconTheme "actions\gtk-ok"
-	!insertmacro InstallIconTheme "actions\gtk-save"
-	!insertmacro InstallIconTheme "actions\gtk-yes"
-	!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 "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\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\gtk-dialog-error"
-	!insertmacro InstallIconTheme "status\gtk-dialog-info"
-	!insertmacro InstallIconTheme "status\gtk-dialog-warning"
-	!insertmacro InstallIconTheme "status\locked"
-	!insertmacro InstallIconTheme "status\network-error"
-	!insertmacro InstallIconTheme "status\network-idle"
+	!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-down"
+	!insertmacro InstallIconTheme "actions" "go-home"
+	!insertmacro InstallIconTheme "actions" "go-jump"
+	!insertmacro InstallIconTheme "actions" "go-next"
+	!insertmacro InstallIconTheme "actions" "go-previous"
+	!insertmacro InstallIconTheme "actions" "go-up"
+	!insertmacro InstallIconTheme "actions" "gtk-cancel"
+	!insertmacro InstallIconTheme "actions" "gtk-edit"
+	!insertmacro InstallIconTheme "actions" "gtk-no"
+	!insertmacro InstallIconTheme "actions" "gtk-ok"
+	!insertmacro InstallIconTheme "actions" "gtk-save"
+	!insertmacro InstallIconTheme "actions" "gtk-yes"
+	!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 "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" "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" "gtk-dialog-error"
+	!insertmacro InstallIconTheme "status" "gtk-dialog-info"
+	!insertmacro InstallIconTheme "status" "gtk-dialog-warning"
+	!insertmacro InstallIconTheme "status" "locked"
+	!insertmacro InstallIconTheme "status" "network-error"
+	!insertmacro InstallIconTheme "status" "network-idle"
 
 SectionEnd