From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
Gerd Hoffmann <kraxel@redhat.com>,
Akihiko Odaki <akihiko.odaki@gmail.com>
Subject: [PULL 4/8] ui/cocoa: Show QEMU icon in the about window
Date: Thu, 11 Mar 2021 13:33:57 +0100 [thread overview]
Message-ID: <20210311123401.340122-5-kraxel@redhat.com> (raw)
In-Reply-To: <20210311123401.340122-1-kraxel@redhat.com>
From: Akihiko Odaki <akihiko.odaki@gmail.com>
Signed-off-by: Akihiko Odaki <akihiko.odaki@gmail.com>
Message-Id: <20210309122226.23117-1-akihiko.odaki@gmail.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
ui/cocoa.m | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/ui/cocoa.m b/ui/cocoa.m
index 3e1a7b7d5195..e589534fa460 100644
--- a/ui/cocoa.m
+++ b/ui/cocoa.m
@@ -39,6 +39,7 @@
#include "qapi/qapi-commands-misc.h"
#include "sysemu/blockdev.h"
#include "qemu-version.h"
+#include "qemu/cutils.h"
#include "qemu/main-loop.h"
#include "qemu/module.h"
#include <Carbon/Carbon.h>
@@ -1385,18 +1386,13 @@ QemuCocoaView *cocoaView;
y = about_height - picture_height - 10;
NSRect picture_rect = NSMakeRect(x, y, picture_width, picture_height);
- /* Get the path to the QEMU binary */
- NSString *binary_name = [NSString stringWithCString: gArgv[0]
- encoding: NSASCIIStringEncoding];
- binary_name = [binary_name lastPathComponent];
- NSString *program_path = [[NSString alloc] initWithFormat: @"%@/%@",
- [[NSBundle mainBundle] bundlePath], binary_name];
-
/* Make the picture of QEMU */
NSImageView *picture_view = [[NSImageView alloc] initWithFrame:
picture_rect];
- NSImage *qemu_image = [[NSWorkspace sharedWorkspace] iconForFile:
- program_path];
+ char *qemu_image_path_c = get_relocated_path(CONFIG_QEMU_ICONDIR "/hicolor/512x512/apps/qemu.png");
+ NSString *qemu_image_path = [NSString stringWithUTF8String:qemu_image_path_c];
+ g_free(qemu_image_path_c);
+ NSImage *qemu_image = [[NSImage alloc] initWithContentsOfFile:qemu_image_path];
[picture_view setImage: qemu_image];
[picture_view setImageScaling: NSImageScaleProportionallyUpOrDown];
[superView addSubview: picture_view];
--
2.29.2
next prev parent reply other threads:[~2021-03-11 12:37 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-11 12:33 [PULL 0/8] Ui 20210311 patches Gerd Hoffmann
2021-03-11 12:33 ` [PULL 1/8] ui/gtk: Remove NULL checks in gd_switch Gerd Hoffmann
2021-03-11 12:33 ` [PULL 2/8] ui/cocoa: Use kCGColorSpaceSRGB Gerd Hoffmann
2021-03-11 12:33 ` [PULL 3/8] docs: Fix removal text of -show-cursor Gerd Hoffmann
2021-03-11 12:33 ` Gerd Hoffmann [this message]
2021-03-11 12:33 ` [PULL 5/8] ui/cocoa: Do not rely on the first argument Gerd Hoffmann
2021-03-11 12:33 ` [PULL 6/8] ui/cocoa: Clear modifiers whenever possible Gerd Hoffmann
2021-03-11 12:34 ` [PULL 7/8] ui/cocoa: Mark variables static Gerd Hoffmann
2021-03-11 12:34 ` [PULL 8/8] ui/cocoa: Fix mouse association state Gerd Hoffmann
2021-03-12 17:47 ` [PULL 0/8] Ui 20210311 patches Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210311123401.340122-5-kraxel@redhat.com \
--to=kraxel@redhat.com \
--cc=akihiko.odaki@gmail.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).