diff --git a/icons/calc_lg.png b/icons/calc_lg.png index 48f5f91..f22871c 100644 Binary files a/icons/calc_lg.png and b/icons/calc_lg.png differ diff --git a/icons/calc_sm.png b/icons/calc_sm.png index bbe76e2..9f53feb 100644 Binary files a/icons/calc_sm.png and b/icons/calc_sm.png differ diff --git a/icons/rpcalc-icon.png b/icons/rpcalc-icon.png index 48f5f91..f22871c 100644 Binary files a/icons/rpcalc-icon.png and b/icons/rpcalc-icon.png differ diff --git a/icons/rpcalc-icon.svg b/icons/rpcalc-icon.svg new file mode 100644 index 0000000..58b795b --- /dev/null +++ b/icons/rpcalc-icon.svg @@ -0,0 +1,235 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + diff --git a/install.py b/install.py index 656fba5..900927a 100755 --- a/install.py +++ b/install.py @@ -258,15 +258,15 @@ def main(): 'iconPath = None', 'iconPath = \'{0}\' # modified by install script\n' .format(iconPrefixDir)) - if os.path.isfile(os.path.join('icons', progName + '-icon.png')): - pngIconPrefixDir = os.path.join(prefixDir, 'share', 'icons', - 'hicolor', '32x32', 'apps') - pngIconBuildDir = os.path.join(buildRoot, pngIconPrefixDir[1:]) - print(' Copying app icon files to {0}'.format(pngIconBuildDir)) - if not os.path.isdir(pngIconBuildDir): - os.makedirs(pngIconBuildDir) - shutil.copy2(os.path.join('icons', progName + '-icon.png'), - pngIconBuildDir) + if os.path.isfile(os.path.join('icons', progName + '-icon.svg')): + svgIconPrefixDir = os.path.join(prefixDir, 'share', 'icons', + 'hicolor', 'scalable', 'apps') + svgIconBuildDir = os.path.join(buildRoot, svgIconPrefixDir[1:]) + print(' Copying app icon files to {0}'.format(svgIconBuildDir)) + if not os.path.isdir(svgIconBuildDir): + os.makedirs(svgIconBuildDir) + shutil.copy2(os.path.join('icons', progName + '-icon.svg'), + svgIconBuildDir) if os.path.isfile(progName + '.desktop'): desktopPrefixDir = os.path.join(prefixDir, 'share', 'applications') desktopBuildDir = os.path.join(buildRoot, desktopPrefixDir[1:]) diff --git a/uninstall.py b/uninstall.py index 4a63bf8..d79842b 100755 --- a/uninstall.py +++ b/uninstall.py @@ -74,8 +74,8 @@ def main(): removeAll(os.path.join(prefixDir, 'share', 'doc', progName)) removeAll(os.path.join(prefixDir, 'share', progName)) removeAll(os.path.join(prefixDir, 'share', 'icons', progName)) - removeAll(os.path.join(prefixDir, 'share', 'icons', 'hicolor', '32x32', - 'apps', progName + '-icon.png')) + removeAll(os.path.join(prefixDir, 'share', 'icons', 'hicolor', 'scalable', + 'apps', progName + '-icon.svg')) removeAll(os.path.join(prefixDir, 'share', 'applications', progName + '.desktop')) removeAll(os.path.join(prefixDir, 'bin', progName))