[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 4/8] ui/cocoa: Show QEMU icon in the about window
From: |
Gerd Hoffmann |
Subject: |
[PULL 4/8] ui/cocoa: Show QEMU icon in the about window |
Date: |
Thu, 11 Mar 2021 13:33:57 +0100 |
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
- [PULL 0/8] Ui 20210311 patches, Gerd Hoffmann, 2021/03/11
- [PULL 2/8] ui/cocoa: Use kCGColorSpaceSRGB, Gerd Hoffmann, 2021/03/11
- [PULL 3/8] docs: Fix removal text of -show-cursor, Gerd Hoffmann, 2021/03/11
- [PULL 4/8] ui/cocoa: Show QEMU icon in the about window,
Gerd Hoffmann <=
- [PULL 8/8] ui/cocoa: Fix mouse association state, Gerd Hoffmann, 2021/03/11
- [PULL 7/8] ui/cocoa: Mark variables static, Gerd Hoffmann, 2021/03/11
- [PULL 6/8] ui/cocoa: Clear modifiers whenever possible, Gerd Hoffmann, 2021/03/11
- [PULL 5/8] ui/cocoa: Do not rely on the first argument, Gerd Hoffmann, 2021/03/11
- [PULL 1/8] ui/gtk: Remove NULL checks in gd_switch, Gerd Hoffmann, 2021/03/11
- Re: [PULL 0/8] Ui 20210311 patches, Peter Maydell, 2021/03/12