73 lines
2.7 KiB
Diff
73 lines
2.7 KiB
Diff
From 89a7d9a149cf2902723df154479fb184eea26e4d Mon Sep 17 00:00:00 2001
|
|
From: yuanxing <yuanxing@kylinos.com.cn>
|
|
Date: Wed, 27 Jan 2021 14:16:12 +0800
|
|
Subject: [PATCH 6/9] fix(themes):change the default theme to kiran
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
- 将默认的消息主题修改为kiran
|
|
---
|
|
data/org.mate.NotificationDaemon.gschema.xml.in | 2 +-
|
|
src/capplet/mate-notification-properties.c | 10 +++++-----
|
|
src/themes/kiran/kiran.c | 2 +-
|
|
3 files changed, 7 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/data/org.mate.NotificationDaemon.gschema.xml.in b/data/org.mate.NotificationDaemon.gschema.xml.in
|
|
index fdac60a..c5c4009 100644
|
|
--- a/data/org.mate.NotificationDaemon.gschema.xml.in
|
|
+++ b/data/org.mate.NotificationDaemon.gschema.xml.in
|
|
@@ -16,7 +16,7 @@
|
|
<description>Monitor to display the notification. Allowed values: -1 (display on active monitor) and 0 to n - 1 where n is the number of monitors.</description>
|
|
</key>
|
|
<key name="theme" type="s">
|
|
- <default>'nodoka'</default>
|
|
+ <default>'kiran'</default>
|
|
<summary>Current theme</summary>
|
|
<description>The theme used when displaying notifications.</description>
|
|
</key>
|
|
diff --git a/src/capplet/mate-notification-properties.c b/src/capplet/mate-notification-properties.c
|
|
index 09b6643..42066b0 100644
|
|
--- a/src/capplet/mate-notification-properties.c
|
|
+++ b/src/capplet/mate-notification-properties.c
|
|
@@ -324,7 +324,11 @@ static void notification_properties_dialog_setup_themes(NotificationAppletDialog
|
|
theme_name = get_theme_name(filename);
|
|
|
|
/* FIXME: other solution than hardcode? */
|
|
- if (g_str_equal(theme_name, "coco"))
|
|
+ if(g_str_equal(theme_name, "kiran"))
|
|
+ {
|
|
+ theme_label = g_strdup(_("Kiran"));
|
|
+ }
|
|
+ else if (g_str_equal(theme_name, "coco"))
|
|
{
|
|
theme_label = g_strdup(_("Coco"));
|
|
}
|
|
@@ -340,10 +344,6 @@ static void notification_properties_dialog_setup_themes(NotificationAppletDialog
|
|
{
|
|
theme_label = g_strdup(_("Standard theme"));
|
|
}
|
|
- else if (g_str_equal(theme_name, "kiran"))
|
|
- {
|
|
- theme_label = g_strdup(_("Kiran"));
|
|
- }
|
|
else
|
|
{
|
|
theme_label = g_strdup(theme_name);
|
|
diff --git a/src/themes/kiran/kiran.c b/src/themes/kiran/kiran.c
|
|
index ac8d471..165b03c 100644
|
|
--- a/src/themes/kiran/kiran.c
|
|
+++ b/src/themes/kiran/kiran.c
|
|
@@ -728,7 +728,7 @@ set_notification_text(GtkWindow *nw, const char *summary, const char *body)
|
|
gtk_widget_set_size_request(
|
|
((body != NULL && *body != '\0')
|
|
? windata->body_label : windata->summary_label),
|
|
- WIDTH - (IMAGE_SIZE + IMAGE_PADDING*2) -40,
|
|
+ WIDTH - (IMAGE_SIZE + IMAGE_PADDING*2) -80,
|
|
-1);
|
|
|
|
}
|
|
--
|
|
2.27.0
|
|
|