[gnome-shell] dialog: Add MessageDialogContent
- From: Florian Müllner <fmuellner src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell] dialog: Add MessageDialogContent
- Date: Sun, 16 Jul 2017 16:18:30 +0000 (UTC)
commit b5860d687d70cdd1326367f7579eabbd67cd82af
Author: Florian Müllner <fmuellner gnome org>
Date: Sat Jul 15 05:12:57 2017 +0200
dialog: Add MessageDialogContent
A lot of our modal dialogs share a similar structure:
[Icon] Some title
Maybe a subtitle
And sometimes even a body for stuff like
longer descriptions.
A dedicated widget with a common style will allow us to significantly
reduce duplication of both code and CSS.
https://bugzilla.gnome.org/show_bug.cgi?id=784985
data/theme/gnome-shell-high-contrast.css | 20 ++++++
data/theme/gnome-shell-sass | 2 +-
data/theme/gnome-shell.css | 20 ++++++
js/ui/dialog.js | 100 ++++++++++++++++++++++++++++++
4 files changed, 141 insertions(+), 1 deletions(-)
---
diff --git a/data/theme/gnome-shell-high-contrast.css b/data/theme/gnome-shell-high-contrast.css
index d2ee9f0..be23adc 100644
--- a/data/theme/gnome-shell-high-contrast.css
+++ b/data/theme/gnome-shell-high-contrast.css
@@ -225,6 +225,26 @@ StScrollBar {
.end-session-dialog-subject {
font-size: 14pt; }
+/* Message Dialog */
+.message-dialog-main-layout {
+ padding: 12px 20px 0;
+ spacing: 12px; }
+
+.message-dialog-content {
+ max-width: 28em;
+ spacing: 20px; }
+
+.message-dialog-icon {
+ min-width: 48px;
+ icon-size: 48px; }
+
+.message-dialog-title {
+ font-weight: bold; }
+
+.message-dialog-subtitle {
+ color: #999999;
+ font-weight: bold; }
+
/* End Session Dialog */
.end-session-dialog {
spacing: 42px;
diff --git a/data/theme/gnome-shell-sass b/data/theme/gnome-shell-sass
index 718b45a..8e42cb4 160000
--- a/data/theme/gnome-shell-sass
+++ b/data/theme/gnome-shell-sass
@@ -1 +1 @@
-Subproject commit 718b45a9c1d9490334a0230f27b1631a1706f818
+Subproject commit 8e42cb424f727d9bf5be4f70971042760c5925ee
diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css
index 555cbed..beafb18 100644
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@@ -225,6 +225,26 @@ StScrollBar {
.end-session-dialog-subject {
font-size: 14pt; }
+/* Message Dialog */
+.message-dialog-main-layout {
+ padding: 12px 20px 0;
+ spacing: 12px; }
+
+.message-dialog-content {
+ max-width: 28em;
+ spacing: 20px; }
+
+.message-dialog-icon {
+ min-width: 48px;
+ icon-size: 48px; }
+
+.message-dialog-title {
+ font-weight: bold; }
+
+.message-dialog-subtitle {
+ color: #8e8e80;
+ font-weight: bold; }
+
/* End Session Dialog */
.end-session-dialog {
spacing: 42px;
diff --git a/js/ui/dialog.js b/js/ui/dialog.js
index 941ef75..e266847 100644
--- a/js/ui/dialog.js
+++ b/js/ui/dialog.js
@@ -1,6 +1,9 @@
// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
const Clutter = imports.gi.Clutter;
+const Gio = imports.gi.Gio;
+const GObject = imports.gi.GObject;
+const Pango = imports.gi.Pango;
const St = imports.gi.St;
const Lang = imports.lang;
@@ -129,3 +132,100 @@ const Dialog = new Lang.Class({
this._buttonKeys = {};
},
});
+
+const MessageDialogContent = new Lang.Class({
+ Name: 'MessageDialogContent',
+ Extends: St.BoxLayout,
+ Properties: {
+ 'icon': GObject.ParamSpec.object('icon', 'icon', 'icon',
+ GObject.ParamFlags.READWRITE |
+ GObject.ParamFlags.CONSTRUCT,
+ Gio.Icon.$gtype),
+ 'title': GObject.ParamSpec.string('title', 'title', 'title',
+ GObject.ParamFlags.READWRITE |
+ GObject.ParamFlags.CONSTRUCT,
+ null),
+ 'subtitle': GObject.ParamSpec.string('subtitle', 'subtitle', 'subtitle',
+ GObject.ParamFlags.READWRITE |
+ GObject.ParamFlags.CONSTRUCT,
+ null),
+ 'body': GObject.ParamSpec.string('body', 'body', 'body',
+ GObject.ParamFlags.READWRITE |
+ GObject.ParamFlags.CONSTRUCT,
+ null)
+ },
+
+ _init: function(params) {
+ this._icon = new St.Icon({ y_align: Clutter.ActorAlign.START });
+ this._title = new St.Label({ style_class: 'headline' });
+ this._subtitle = new St.Label();
+ this._body = new St.Label();
+
+ ['icon', 'title', 'subtitle', 'body'].forEach(prop => {
+ this[`_${prop}`].add_style_class_name(`message-dialog-${prop}`);
+ });
+
+ let textProps = { ellipsize_mode: Pango.EllipsizeMode.NONE,
+ line_wrap: true };
+ Object.assign(this._subtitle.clutter_text, textProps);
+ Object.assign(this._body.clutter_text, textProps);
+
+ if (!params.hasOwnProperty('style_class'))
+ params.style_class = 'message-dialog-main-layout';
+
+ this.parent(params);
+
+ this.messageBox = new St.BoxLayout({ style_class: 'message-dialog-content',
+ x_expand: true,
+ vertical: true });
+
+ this.messageBox.add_actor(this._title);
+ this.messageBox.add_actor(this._subtitle);
+ this.messageBox.add_actor(this._body);
+
+ this.add_actor(this._icon);
+ this.add_actor(this.messageBox);
+ },
+
+ get icon() {
+ return this._icon.gicon;
+ },
+
+ get title() {
+ return this._title.text;
+ },
+
+ get subtitle() {
+ return this._subtitle.text;
+ },
+
+ get body() {
+ return this._body.text;
+ },
+
+ set icon(icon) {
+ Object.assign(this._icon, { gicon: icon, visible: icon != null });
+ this.notify('icon');
+ },
+
+ set title(title) {
+ this._setLabel(this._title, 'title', title);
+ },
+
+ set subtitle(subtitle) {
+ this._setLabel(this._subtitle, 'subtitle', subtitle);
+ },
+
+ set body(body) {
+ this._setLabel(this._body, 'body', body);
+ },
+
+ _setLabel(label, prop, value) {
+ Object.assign(label, { text: value || '', visible: value != null });
+ this.notify(prop);
+ },
+
+ insertBeforeBody: function(actor) {
+ this.messageBox.insert_child_below(actor, this._body);
+ }
+});
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]