diff --git a/AUTHORS b/AUTHORS index 68ec1880..f0e7c330 100644 --- a/AUTHORS +++ b/AUTHORS @@ -11,10 +11,11 @@ Contributors: Dale Whittaker Anders F Björklund -Icons: +Graphics: extension: Nancy Runge midori: Nancy Runge news-feed: Nancy Runge + logo-shade: Nancy Runge Translations: de: Enrico Tröger diff --git a/data/logo-shade.svg b/data/logo-shade.svg new file mode 100644 index 00000000..7a21a99b --- /dev/null +++ b/data/logo-shade.svg @@ -0,0 +1,150 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Nancy Runge <nancy@twotoasts.de> + + + + + + + + + + + + + + + + + diff --git a/midori/midori-view.c b/midori/midori-view.c index 3149d064..636a53a2 100644 --- a/midori/midori-view.c +++ b/midori/midori-view.c @@ -672,6 +672,8 @@ webkit_web_frame_load_done_cb (WebKitWebFrame* web_frame, data = g_strdup_printf ( "Not found - %s" "

Not found - %s

" + "" "

The page you were opening doesn't exist." "

Try to load the page again, " "or move on to another page." @@ -1393,6 +1395,8 @@ midori_view_set_uri (MidoriView* view, data = g_strdup_printf ( "No documentation installed" "

No documentation installed

" + "" "

There is no documentation installed at %s." "You may want to ask your distribution or " "package maintainer for it or if this a custom build " diff --git a/wscript b/wscript index aec27955..4f1d460a 100644 --- a/wscript +++ b/wscript @@ -163,6 +163,16 @@ def set_options (opt): help='Enables API documentation', dest='enable_api_docs') def build (bld): + def mkdir (path): + if not os.access (path, os.F_OK): + os.mkdir (path) + + def _install_files (folder, destination, source): + try: + install_files (folder, destination, source) + except: + pass + bld.add_subdirs ('katze midori icons') install_files ('DOCDIR', '/midori/', 'AUTHORS ChangeLog COPYING README') @@ -201,6 +211,18 @@ def build (bld): if bld.env ()['INTLTOOL']: install_files ('DATADIR', 'applications', 'midori.desktop') + if bld.env ()['RSVG_CONVERT']: + mkdir (blddir + '/data') + convert = subprocess.Popen ([bld.env ()['RSVG_CONVERT'], + '-o', blddir + '/data/logo-shade.png', + srcdir + '/data/logo-shade.svg'], + stderr=subprocess.PIPE) + if not convert.wait (): + _install_files ('DATADIR', APPNAME, + blddir + '/data/logo-shade.png') + else: + Params.pprint ('BLUE', "logo-shade could not be rasterized.") + def shutdown (): if Params.g_commands['install'] or Params.g_commands['uninstall']: dir = Common.path_install ('DATADIR', 'icons/hicolor')