From 63fce626645ea707726ffc9f2102098829ec201d Mon Sep 17 00:00:00 2001 From: Peter de Ridder Date: Sat, 26 Jun 2010 15:31:44 +0200 Subject: [PATCH] Use icon with multiple sizes on Windows The icon is prepared already so 'convert' isn't needed anymore. --- data/midori.ico | Bin 0 -> 36660 bytes data/midori.rc | 2 +- wscript | 30 ------------------------------ 3 files changed, 1 insertion(+), 31 deletions(-) create mode 100644 data/midori.ico diff --git a/data/midori.ico b/data/midori.ico new file mode 100644 index 0000000000000000000000000000000000000000..d0d482bd104f602b73cdd8a9dad3eab3ca997a56 GIT binary patch literal 36660 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 ZjRN1H(HN~n1;)bXK4^n576oUi{2yv-$r%6u literal 0 HcmV?d00001 diff --git a/data/midori.rc b/data/midori.rc index b1f1556b..63a5dc09 100644 --- a/data/midori.rc +++ b/data/midori.rc @@ -1,2 +1,2 @@ -IDR_MAINFRAME ICON DISCARDABLE "../_build_/default/data/midori.ico" +IDR_MAINFRAME ICON DISCARDABLE "midori.ico" diff --git a/wscript b/wscript index fbbb6e8b..59595b48 100644 --- a/wscript +++ b/wscript @@ -124,8 +124,6 @@ def configure (conf): icons = 'no ' if is_mingw (conf.env) or Options.platform == 'win32': - if not conf.find_program ('convert', var='CONVERT'): - Utils.pprint ('YELLOW', 'midori.ico won\'t be created') conf.find_program ('windres', var='WINRC') conf.env['platform'] = 'win32' @@ -147,9 +145,6 @@ def configure (conf): Utils.pprint ('BLUE', 'Mingw recognized, assuming cross compile.') - if conf.env['CONVERT'] and not conf.env['WINRC']: - Utils.pprint ('YELLOW', 'midori.ico won\'t be created') - dirname_default ('LIBDIR', os.path.join (conf.env['PREFIX'], 'lib')) if conf.env['PREFIX'] == '/usr': dirname_default ('SYSCONFDIR', '/etc') @@ -415,31 +410,6 @@ def write_linguas_file (self): write_linguas_file = feature ('intltool_po')(write_linguas_file) def build (bld): - def image_to_win32ico (task): - 'Converts an image to a Win32 ico' - - if not os.path.exists (bld.env['CONVERT']): - return 1 - - infile = task.inputs[0].abspath (task.env) - outfile = task.outputs[0].abspath (task.env) - command = bld.env['CONVERT'] + ' -background transparent \ - -geometry 16x16 -extent 16x16 ' + \ - infile + ' ' + outfile - if Utils.exec_command (command): - return 1 - - if task.chmod: - os.chmod (outfile, task.chmod) - return 0 - - if bld.env['WINRC']: - obj = bld.new_task_gen ('copy', - fun = image_to_win32ico, - source = 'icons/16x16/midori.png', - target = 'data/midori.ico', - before = 'cc') - bld.add_group () bld.add_subdirs ('midori icons')