Accepting request 506308 from GNOME:Factory
1 OBS-URL: https://build.opensuse.org/request/show/506308 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-shell?expand=0&rev=129
This commit is contained in:
commit
13e43b2073
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:b72d5af0106de72ea71fe5059f5f8f117924c17a65c7d7ee65713ae83dd54ba4
|
|
||||||
size 27471
|
|
150
aboutMenu.js
Normal file
150
aboutMenu.js
Normal file
@ -0,0 +1,150 @@
|
|||||||
|
// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
|
||||||
|
|
||||||
|
const GLib = imports.gi.GLib;
|
||||||
|
const Gio = imports.gi.Gio;
|
||||||
|
const Lang = imports.lang;
|
||||||
|
const Clutter = imports.gi.Clutter;
|
||||||
|
const St = imports.gi.St;
|
||||||
|
const DBus = imports.gi.DBus;
|
||||||
|
|
||||||
|
const PanelMenu = imports.ui.panelMenu;
|
||||||
|
|
||||||
|
const AboutMenuButton = new Lang.Class({
|
||||||
|
Name: 'AboutMenuButton',
|
||||||
|
Extends: PanelMenu.Button,
|
||||||
|
_init: function() {
|
||||||
|
this._hostname = null;
|
||||||
|
this._updateHostnameId = 0;
|
||||||
|
this._ticket = 1;
|
||||||
|
|
||||||
|
let hbox;
|
||||||
|
let vbox;
|
||||||
|
let menuAlignment = 0.25;
|
||||||
|
|
||||||
|
if (Clutter.get_default_text_direction() == Clutter.TextDirection.RTL)
|
||||||
|
menuAlignment = 1.0 - menuAlignment;
|
||||||
|
this.parent(menuAlignment, 'About Me');
|
||||||
|
|
||||||
|
this.about_hbox = new St.BoxLayout({ style_class: 'panel-status-menu-box' });
|
||||||
|
this.hostname_label = new St.Label({y_align: Clutter.ActorAlign.CENTER});
|
||||||
|
this.about_hbox.add_child(this.hostname_label);
|
||||||
|
|
||||||
|
this.actor.add_child(this.about_hbox);
|
||||||
|
hbox = new St.BoxLayout({ name: 'aboutArea' });
|
||||||
|
this.menu.box.add_child(hbox);
|
||||||
|
|
||||||
|
vbox = new St.BoxLayout({vertical: true});
|
||||||
|
hbox.add(vbox);
|
||||||
|
|
||||||
|
///// Section: read '/etc/os-release' to get pretty name
|
||||||
|
//
|
||||||
|
// Note: previously this is defaulted to 'SUSE Linux Enterprise', now
|
||||||
|
// let's use a "safer" option.
|
||||||
|
let sysinfo_text = 'SUSE Linux';
|
||||||
|
try {
|
||||||
|
let success, contents, tag;
|
||||||
|
let _os_release = Gio.File.new_for_path('/etc/os-release');
|
||||||
|
[success, contents, tag] = _os_release.load_contents(null);
|
||||||
|
|
||||||
|
let osReleaseContentStr = contents.toString();
|
||||||
|
let prettyNameReg = /^PRETTY_NAME="(.+)"/;
|
||||||
|
let match = null;
|
||||||
|
for (let line of osReleaseContentStr.split('\n')) {
|
||||||
|
match = prettyNameReg.exec(line);
|
||||||
|
if (match) {
|
||||||
|
sysinfo_text = match[1];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (e) {
|
||||||
|
// NOTE soft fail, 'sysinfo_text' is the default
|
||||||
|
warn('ERROR: fail to read /etc/os-release');
|
||||||
|
}
|
||||||
|
|
||||||
|
this._sysinfo = new St.Label({ text: sysinfo_text, can_focus: true });
|
||||||
|
vbox.add(this._sysinfo);
|
||||||
|
this.actor.hide();
|
||||||
|
|
||||||
|
this._updateHostnameId = GLib.timeout_add(GLib.PRIORITY_DEFAULT,
|
||||||
|
this._ticket,
|
||||||
|
Lang.bind(this, function() {
|
||||||
|
if (this._ticket < 60*60)
|
||||||
|
this._ticket *= 2;
|
||||||
|
this._updateHostnameId = 0;
|
||||||
|
this._updateHostname();
|
||||||
|
return false;
|
||||||
|
}));
|
||||||
|
|
||||||
|
return;
|
||||||
|
},
|
||||||
|
|
||||||
|
_updateHostname: function(){
|
||||||
|
let hostname_text = get_hostname();
|
||||||
|
|
||||||
|
if ((this._hostname == null) || (this._hostname != hostname_text)) {
|
||||||
|
this._ticket = 1;
|
||||||
|
this._hostname = hostname_text;
|
||||||
|
this.hostname_label.set_text(this._hostname);
|
||||||
|
this.actor.show();
|
||||||
|
}
|
||||||
|
this._updateHostnameId = GLib.timeout_add_seconds(GLib.PRIORITY_DEFAULT,
|
||||||
|
this._ticket,
|
||||||
|
Lang.bind(this, function() {
|
||||||
|
if (this._ticket < 60*60)
|
||||||
|
this._ticket *= 2;
|
||||||
|
this._updateHostnameId = 0;
|
||||||
|
this._updateHostname();
|
||||||
|
return false;
|
||||||
|
}));
|
||||||
|
},
|
||||||
|
|
||||||
|
_destroy: function() {
|
||||||
|
this._ticket = 1;
|
||||||
|
if (this._updateHostnameId) {
|
||||||
|
GLib.source_remove (this._updateHostnameId);
|
||||||
|
this._updateHostnameId = 0;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
});
|
||||||
|
|
||||||
|
function get_hostname() {
|
||||||
|
let hostname;
|
||||||
|
let interface_name = [GLib.Variant.new_string('org.freedesktop.hostname1'),
|
||||||
|
GLib.Variant.new_string('Hostname')];
|
||||||
|
|
||||||
|
let call = {
|
||||||
|
bus_name: 'org.freedesktop.hostname1',
|
||||||
|
object_path: '/org/freedesktop/hostname1',
|
||||||
|
interface_name: 'org.freedesktop.DBus.Properties',
|
||||||
|
method_name: 'Get',
|
||||||
|
parameters: GLib.Variant.new_tuple(interface_name, 2),
|
||||||
|
reply_type: null,
|
||||||
|
flags: Gio.DBusCallFlags.NONE,
|
||||||
|
timeout_msec: -1,
|
||||||
|
cancellable: null,
|
||||||
|
};
|
||||||
|
|
||||||
|
try {
|
||||||
|
let dbusConnection = Gio.bus_get_sync(DBus.BusType.SYSTEM, null);
|
||||||
|
|
||||||
|
let message = dbusConnection.call_sync(
|
||||||
|
call.bus_name,
|
||||||
|
call.object_path,
|
||||||
|
call.interface_name,
|
||||||
|
call.method_name,
|
||||||
|
call.parameters,
|
||||||
|
call.reply_type,
|
||||||
|
call.flags,
|
||||||
|
call.timeout_msec,
|
||||||
|
call.cancellable
|
||||||
|
);
|
||||||
|
|
||||||
|
hostname = message.get_child_value(0).get_variant().get_string()[0];
|
||||||
|
|
||||||
|
} catch(e) {
|
||||||
|
hostname = 'localhost';
|
||||||
|
}
|
||||||
|
|
||||||
|
return hostname;
|
||||||
|
}
|
37
gnome-shell-1007468-lock-screen-SUSE-logo-missing.patch
Normal file
37
gnome-shell-1007468-lock-screen-SUSE-logo-missing.patch
Normal file
@ -0,0 +1,37 @@
|
|||||||
|
Index: gnome-shell-3.20.4/data/gnome-shell-theme.gresource.xml
|
||||||
|
===================================================================
|
||||||
|
--- gnome-shell-3.20.4.orig/data/gnome-shell-theme.gresource.xml
|
||||||
|
+++ gnome-shell-3.20.4/data/gnome-shell-theme.gresource.xml
|
||||||
|
@@ -38,5 +38,6 @@
|
||||||
|
<file>toggle-on-hc.svg</file>
|
||||||
|
<file>ws-switch-arrow-up.png</file>
|
||||||
|
<file>ws-switch-arrow-down.png</file>
|
||||||
|
+ <file>sle-background.png</file>
|
||||||
|
</gresource>
|
||||||
|
</gresources>
|
||||||
|
Index: gnome-shell-3.20.4/data/theme/gnome-shell.css
|
||||||
|
===================================================================
|
||||||
|
--- gnome-shell-3.20.4.orig/data/theme/gnome-shell.css
|
||||||
|
+++ gnome-shell-3.20.4/data/theme/gnome-shell.css
|
||||||
|
@@ -1544,6 +1544,9 @@ StScrollBar {
|
||||||
|
padding-top: 24px;
|
||||||
|
max-width: 23em; }
|
||||||
|
|
||||||
|
+.login-dialog-sle {
|
||||||
|
+ background: #2e3436 url(sle-background.png); }
|
||||||
|
+
|
||||||
|
.login-dialog {
|
||||||
|
border: none;
|
||||||
|
background-color: transparent; }
|
||||||
|
Index: gnome-shell-3.20.4/js/ui/unlockDialog.js
|
||||||
|
===================================================================
|
||||||
|
--- gnome-shell-3.20.4.orig/js/ui/unlockDialog.js
|
||||||
|
+++ gnome-shell-3.20.4/js/ui/unlockDialog.js
|
||||||
|
@@ -37,6 +37,7 @@ const UnlockDialog = new Lang.Class({
|
||||||
|
layout_manager: new Clutter.BoxLayout(),
|
||||||
|
visible: false });
|
||||||
|
|
||||||
|
+ this.actor.add_style_class_name('login-dialog-sle');
|
||||||
|
this.actor.add_constraint(new Layout.MonitorConstraint({ primary: true }));
|
||||||
|
parentActor.add_child(this.actor);
|
||||||
|
|
@ -1,20 +0,0 @@
|
|||||||
diff --git a/js/gdm/authPrompt.js b/js/gdm/authPrompt.js
|
|
||||||
index dd13753..4c0b0b7 100644
|
|
||||||
--- a/js/gdm/authPrompt.js
|
|
||||||
+++ b/js/gdm/authPrompt.js
|
|
||||||
@@ -13,6 +13,7 @@ const Params = imports.misc.params;
|
|
||||||
const ShellEntry = imports.ui.shellEntry;
|
|
||||||
const Tweener = imports.ui.tweener;
|
|
||||||
const UserWidget = imports.ui.userWidget;
|
|
||||||
+const Pango = imports.gi.Pango;
|
|
||||||
|
|
||||||
const DEFAULT_BUTTON_WELL_ICON_SIZE = 16;
|
|
||||||
const DEFAULT_BUTTON_WELL_ANIMATION_DELAY = 1.0;
|
|
||||||
@@ -113,6 +114,7 @@ const AuthPrompt = new Lang.Class({
|
|
||||||
this._message = new St.Label({ opacity: 0,
|
|
||||||
styleClass: 'login-dialog-message' });
|
|
||||||
this._message.clutter_text.line_wrap = true;
|
|
||||||
+ this._message.clutter_text.ellipsize = Pango.EllipsizeMode.NONE;
|
|
||||||
this.actor.add(this._message, { x_fill: false, x_align: St.Align.START, y_align: St.Align.START });
|
|
||||||
|
|
||||||
this._buttonBox = new St.BoxLayout({ style_class: 'login-dialog-button-box',
|
|
@ -1,176 +1,21 @@
|
|||||||
diff --git a/js/js-resources.gresource.xml b/js/js-resources.gresource.xml
|
Index: gnome-shell-3.20.4/js/js-resources.gresource.xml
|
||||||
index a1a4196..fa01cee 100644
|
===================================================================
|
||||||
--- a/js/js-resources.gresource.xml
|
--- gnome-shell-3.20.4.orig/js/js-resources.gresource.xml
|
||||||
+++ b/js/js-resources.gresource.xml
|
+++ gnome-shell-3.20.4/js/js-resources.gresource.xml
|
||||||
@@ -33,6 +33,7 @@
|
@@ -25,7 +25,7 @@
|
||||||
|
<file>misc/params.js</file>
|
||||||
<file>portalHelper/main.js</file>
|
<file>misc/smartcardManager.js</file>
|
||||||
|
<file>misc/util.js</file>
|
||||||
|
-
|
||||||
+ <file>ui/aboutMenu.js</file>
|
+ <file>ui/aboutMenu.js</file>
|
||||||
<file>ui/accessDialog.js</file>
|
<file>perf/core.js</file>
|
||||||
<file>ui/altTab.js</file>
|
<file>perf/hwtest.js</file>
|
||||||
<file>ui/animation.js</file>
|
|
||||||
diff --git a/js/ui/aboutMenu.js b/js/ui/aboutMenu.js
|
Index: gnome-shell-3.20.4/js/ui/panel.js
|
||||||
new file mode 100644
|
===================================================================
|
||||||
index 0000000..46c5de1
|
--- gnome-shell-3.20.4.orig/js/ui/panel.js
|
||||||
--- /dev/null
|
+++ gnome-shell-3.20.4/js/ui/panel.js
|
||||||
+++ b/js/ui/aboutMenu.js
|
@@ -755,6 +755,7 @@ const AggregateMenu = new Lang.Class({
|
||||||
@@ -0,0 +1,150 @@
|
|
||||||
+// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
|
|
||||||
+
|
|
||||||
+const GLib = imports.gi.GLib;
|
|
||||||
+const Gio = imports.gi.Gio;
|
|
||||||
+const Lang = imports.lang;
|
|
||||||
+const Clutter = imports.gi.Clutter;
|
|
||||||
+const St = imports.gi.St;
|
|
||||||
+const DBus = imports.gi.DBus;
|
|
||||||
+
|
|
||||||
+const PanelMenu = imports.ui.panelMenu;
|
|
||||||
+
|
|
||||||
+const AboutMenuButton = new Lang.Class({
|
|
||||||
+ Name: 'AboutMenuButton',
|
|
||||||
+ Extends: PanelMenu.Button,
|
|
||||||
+ _init: function() {
|
|
||||||
+ this._hostname = null;
|
|
||||||
+ this._updateHostnameId = 0;
|
|
||||||
+ this._ticket = 1;
|
|
||||||
+
|
|
||||||
+ let hbox;
|
|
||||||
+ let vbox;
|
|
||||||
+ let menuAlignment = 0.25;
|
|
||||||
+
|
|
||||||
+ if (Clutter.get_default_text_direction() == Clutter.TextDirection.RTL)
|
|
||||||
+ menuAlignment = 1.0 - menuAlignment;
|
|
||||||
+ this.parent(menuAlignment, 'About Me');
|
|
||||||
+
|
|
||||||
+ this.about_hbox = new St.BoxLayout({ style_class: 'panel-status-menu-box' });
|
|
||||||
+ this.hostname_label = new St.Label({y_align: Clutter.ActorAlign.CENTER});
|
|
||||||
+ this.about_hbox.add_child(this.hostname_label);
|
|
||||||
+
|
|
||||||
+ this.actor.add_child(this.about_hbox);
|
|
||||||
+ hbox = new St.BoxLayout({ name: 'aboutArea' });
|
|
||||||
+ this.menu.box.add_child(hbox);
|
|
||||||
+
|
|
||||||
+ vbox = new St.BoxLayout({vertical: true});
|
|
||||||
+ hbox.add(vbox);
|
|
||||||
+
|
|
||||||
+ ///// Section: read '/etc/os-release' to get pretty name
|
|
||||||
+ //
|
|
||||||
+ // Note: previously this is defaulted to 'SUSE Linux Enterprise', now
|
|
||||||
+ // let's use a "safer" option.
|
|
||||||
+ let sysinfo_text = 'SUSE Linux';
|
|
||||||
+ try {
|
|
||||||
+ let success, contents, tag;
|
|
||||||
+ let _os_release = Gio.File.new_for_path('/etc/os-release');
|
|
||||||
+ [success, contents, tag] = _os_release.load_contents(null);
|
|
||||||
+
|
|
||||||
+ let osReleaseContentStr = contents.toString();
|
|
||||||
+ let prettyNameReg = /^PRETTY_NAME="(.+)"/;
|
|
||||||
+ let match = null;
|
|
||||||
+ for (let line of osReleaseContentStr.split('\n')) {
|
|
||||||
+ match = prettyNameReg.exec(line);
|
|
||||||
+ if (match) {
|
|
||||||
+ sysinfo_text = match[1];
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+ catch (e) {
|
|
||||||
+ // NOTE soft fail, 'sysinfo_text' is the default
|
|
||||||
+ warn('ERROR: fail to read /etc/os-release');
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ this._sysinfo = new St.Label({ text: sysinfo_text, can_focus: true });
|
|
||||||
+ vbox.add(this._sysinfo);
|
|
||||||
+ this.actor.hide();
|
|
||||||
+
|
|
||||||
+ this._updateHostnameId = GLib.timeout_add(GLib.PRIORITY_DEFAULT,
|
|
||||||
+ this._ticket,
|
|
||||||
+ Lang.bind(this, function() {
|
|
||||||
+ if (this._ticket < 60*60)
|
|
||||||
+ this._ticket *= 2;
|
|
||||||
+ this._updateHostnameId = 0;
|
|
||||||
+ this._updateHostname();
|
|
||||||
+ return false;
|
|
||||||
+ }));
|
|
||||||
+
|
|
||||||
+ return;
|
|
||||||
+ },
|
|
||||||
+
|
|
||||||
+ _updateHostname: function(){
|
|
||||||
+ let hostname_text = get_hostname();
|
|
||||||
+
|
|
||||||
+ if ((this._hostname == null) || (this._hostname != hostname_text)) {
|
|
||||||
+ this._ticket = 1;
|
|
||||||
+ this._hostname = hostname_text;
|
|
||||||
+ this.hostname_label.set_text(this._hostname);
|
|
||||||
+ this.actor.show();
|
|
||||||
+ }
|
|
||||||
+ this._updateHostnameId = GLib.timeout_add_seconds(GLib.PRIORITY_DEFAULT,
|
|
||||||
+ this._ticket,
|
|
||||||
+ Lang.bind(this, function() {
|
|
||||||
+ if (this._ticket < 60*60)
|
|
||||||
+ this._ticket *= 2;
|
|
||||||
+ this._updateHostnameId = 0;
|
|
||||||
+ this._updateHostname();
|
|
||||||
+ return false;
|
|
||||||
+ }));
|
|
||||||
+ },
|
|
||||||
+
|
|
||||||
+ _destroy: function() {
|
|
||||||
+ this._ticket = 1;
|
|
||||||
+ if (this._updateHostnameId) {
|
|
||||||
+ GLib.source_remove (this._updateHostnameId);
|
|
||||||
+ this._updateHostnameId = 0;
|
|
||||||
+ }
|
|
||||||
+ },
|
|
||||||
+
|
|
||||||
+});
|
|
||||||
+
|
|
||||||
+function get_hostname() {
|
|
||||||
+ let hostname;
|
|
||||||
+ let interface_name = [GLib.Variant.new_string('org.freedesktop.hostname1'),
|
|
||||||
+ GLib.Variant.new_string('Hostname')];
|
|
||||||
+
|
|
||||||
+ let call = {
|
|
||||||
+ bus_name: 'org.freedesktop.hostname1',
|
|
||||||
+ object_path: '/org/freedesktop/hostname1',
|
|
||||||
+ interface_name: 'org.freedesktop.DBus.Properties',
|
|
||||||
+ method_name: 'Get',
|
|
||||||
+ parameters: GLib.Variant.new_tuple(interface_name, 2),
|
|
||||||
+ reply_type: null,
|
|
||||||
+ flags: Gio.DBusCallFlags.NONE,
|
|
||||||
+ timeout_msec: -1,
|
|
||||||
+ cancellable: null,
|
|
||||||
+ };
|
|
||||||
+
|
|
||||||
+ try {
|
|
||||||
+ let dbusConnection = Gio.bus_get_sync(DBus.BusType.SYSTEM, null);
|
|
||||||
+
|
|
||||||
+ let message = dbusConnection.call_sync(
|
|
||||||
+ call.bus_name,
|
|
||||||
+ call.object_path,
|
|
||||||
+ call.interface_name,
|
|
||||||
+ call.method_name,
|
|
||||||
+ call.parameters,
|
|
||||||
+ call.reply_type,
|
|
||||||
+ call.flags,
|
|
||||||
+ call.timeout_msec,
|
|
||||||
+ call.cancellable
|
|
||||||
+ );
|
|
||||||
+
|
|
||||||
+ hostname = message.get_child_value(0).get_variant().get_string()[0];
|
|
||||||
+
|
|
||||||
+ } catch(e) {
|
|
||||||
+ hostname = 'localhost';
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ return hostname;
|
|
||||||
+}
|
|
||||||
diff --git a/js/ui/panel.js b/js/ui/panel.js
|
|
||||||
index fe3fc39..8b7c780 100644
|
|
||||||
--- a/js/ui/panel.js
|
|
||||||
+++ b/js/ui/panel.js
|
|
||||||
@@ -758,6 +758,7 @@ const AggregateMenu = new Lang.Class({
|
|
||||||
});
|
});
|
||||||
|
|
||||||
const PANEL_ITEM_IMPLEMENTATIONS = {
|
const PANEL_ITEM_IMPLEMENTATIONS = {
|
||||||
@ -178,16 +23,16 @@ index fe3fc39..8b7c780 100644
|
|||||||
'activities': ActivitiesButton,
|
'activities': ActivitiesButton,
|
||||||
'aggregateMenu': AggregateMenu,
|
'aggregateMenu': AggregateMenu,
|
||||||
'appMenu': AppMenuButton,
|
'appMenu': AppMenuButton,
|
||||||
diff --git a/js/ui/sessionMode.js b/js/ui/sessionMode.js
|
Index: gnome-shell-3.20.4/js/ui/sessionMode.js
|
||||||
index ae08d08..99465d4 100644
|
===================================================================
|
||||||
--- a/js/ui/sessionMode.js
|
--- gnome-shell-3.20.4.orig/js/ui/sessionMode.js
|
||||||
+++ b/js/ui/sessionMode.js
|
+++ gnome-shell-3.20.4/js/ui/sessionMode.js
|
||||||
@@ -48,7 +48,7 @@ const _modes = {
|
@@ -48,7 +48,7 @@ const _modes = {
|
||||||
unlockDialog: imports.gdm.loginDialog.LoginDialog,
|
unlockDialog: imports.gdm.loginDialog.LoginDialog,
|
||||||
components: ['polkitAgent'],
|
components: ['polkitAgent'],
|
||||||
panel: {
|
panel: {
|
||||||
- left: [],
|
- left: [],
|
||||||
+ left: ['aboutMenu']
|
+ left: ['aboutMenu'],
|
||||||
center: ['dateMenu'],
|
center: ['dateMenu'],
|
||||||
right: ['a11yGreeter', 'keyboard', 'aggregateMenu'],
|
right: ['a11yGreeter', 'keyboard', 'aggregateMenu'],
|
||||||
},
|
},
|
||||||
|
@ -1,54 +0,0 @@
|
|||||||
diff -Npur gnome-shell-3.10.4/js/ui/aboutMenu.js gnome-shell-3.10.4-new/js/ui/aboutMenu.js
|
|
||||||
--- gnome-shell-3.10.4/js/ui/aboutMenu.js 2014-06-06 05:56:19.040026091 +0800
|
|
||||||
+++ gnome-shell-3.10.4-new/js/ui/aboutMenu.js 2014-06-06 05:59:43.328025099 +0800
|
|
||||||
@@ -12,6 +12,17 @@ const AboutMenuButton = new Lang.Class({
|
|
||||||
Name: 'AboutMenuButton',
|
|
||||||
Extends: PanelMenu.Button,
|
|
||||||
_init: function() {
|
|
||||||
+ let command = 'hostname';
|
|
||||||
+ let hostname_text;
|
|
||||||
+ try {
|
|
||||||
+ let [res, stdout, stderr, status] = GLib.spawn_command_line_sync(command);
|
|
||||||
+ hostname_text = String.fromCharCode.apply(null, stdout);
|
|
||||||
+ } catch (e) {
|
|
||||||
+ /* Donnot display the useless widget */
|
|
||||||
+ this.parent(null, 'About Me');
|
|
||||||
+ return;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
let hbox;
|
|
||||||
let vbox;
|
|
||||||
|
|
||||||
@@ -21,20 +31,6 @@ const AboutMenuButton = new Lang.Class({
|
|
||||||
this.parent(menuAlignment, 'About Me');
|
|
||||||
|
|
||||||
this.about_hbox = new St.BoxLayout({ style_class: 'panel-status-menu-box' });
|
|
||||||
- this.about_hbox.add_child(new St.Icon({ style_class: 'system-status-icon',
|
|
||||||
- icon_name: 'suse',
|
|
||||||
- icon_size: 24,
|
|
||||||
- y_align: Clutter.ActorAlign.CENTER
|
|
||||||
- }));
|
|
||||||
-
|
|
||||||
- let command = 'hostname';
|
|
||||||
- let hostname_text;
|
|
||||||
- try {
|
|
||||||
- let [res, stdout, stderr, status] = GLib.spawn_command_line_sync(command);
|
|
||||||
- hostname_text = String.fromCharCode.apply(null, stdout);
|
|
||||||
- } catch (e) {
|
|
||||||
- hostname_text = 'Welcome';
|
|
||||||
- }
|
|
||||||
this.about_hbox.add_child(new St.Label({ text: hostname_text,
|
|
||||||
y_align: Clutter.ActorAlign.CENTER
|
|
||||||
}));
|
|
||||||
diff -Npur gnome-shell-3.10.4/js/ui/userWidget.js gnome-shell-3.10.4-new/js/ui/userWidget.js
|
|
||||||
--- gnome-shell-3.10.4/js/ui/userWidget.js 2014-02-20 02:19:32.000000000 +0800
|
|
||||||
+++ gnome-shell-3.10.4-new/js/ui/userWidget.js 2014-06-06 05:57:33.740025728 +0800
|
|
||||||
@@ -50,7 +50,7 @@ const Avatar = new Lang.Class({
|
|
||||||
this.actor.style = 'background-image: url("%s");'.format(iconFile);
|
|
||||||
} else {
|
|
||||||
this.actor.style = null;
|
|
||||||
- this.actor.child = new St.Icon({ icon_name: 'avatar-default-symbolic',
|
|
||||||
+ this.actor.child = new St.Icon({ icon_name: 'sle-avatar',
|
|
||||||
icon_size: this._iconSize });
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Jun 26 05:57:59 UTC 2017 - xwang@suse.com
|
||||||
|
|
||||||
|
- Drop gnome-shell-970480-authprompt-wrapping-message.patch:
|
||||||
|
Fixed upstream.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Jun 6 22:56:30 UTC 2017 - zaitor@opensuse.org
|
Tue Jun 6 22:56:30 UTC 2017 - zaitor@opensuse.org
|
||||||
|
|
||||||
@ -159,6 +165,8 @@ Fri Feb 17 10:44:29 UTC 2017 - dimstar@opensuse.org
|
|||||||
- Drop
|
- Drop
|
||||||
gnome-shell-bgo774805-guard-against-animations-that-dont-load.patch:
|
gnome-shell-bgo774805-guard-against-animations-that-dont-load.patch:
|
||||||
Fixed upstream.
|
Fixed upstream.
|
||||||
|
- Drop gnome-shell-774381-app-window-overlay-app-list.patch:
|
||||||
|
Fixed upstream.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri Feb 17 10:44:28 UTC 2017 - dimstar@opensuse.org
|
Fri Feb 17 10:44:28 UTC 2017 - dimstar@opensuse.org
|
||||||
@ -201,6 +209,13 @@ Wed Jan 4 08:22:53 CST 2017 - federico@suse.com
|
|||||||
for bgo#774805 - make the authentication dialog work even if some
|
for bgo#774805 - make the authentication dialog work even if some
|
||||||
animations cannot be loaded.
|
animations cannot be loaded.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Nov 24 01:44:11 UTC 2016 - xwang@suse.com
|
||||||
|
|
||||||
|
- Add gnome-shell-774381-app-window-overlay-app-list.patch:
|
||||||
|
Fix app windows overlay app list in overview screen (bsc#1008539,
|
||||||
|
bgo#774381).
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri Nov 11 09:59:26 UTC 2016 - dimstar@opensuse.org
|
Fri Nov 11 09:59:26 UTC 2016 - dimstar@opensuse.org
|
||||||
|
|
||||||
@ -211,6 +226,13 @@ Fri Nov 11 09:59:26 UTC 2016 - dimstar@opensuse.org
|
|||||||
+ Misc. bug fixes: bgo#773875, bgo#740043, bgo#773893.
|
+ Misc. bug fixes: bgo#773875, bgo#740043, bgo#773893.
|
||||||
+ Updated translations.
|
+ Updated translations.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Nov 7 01:47:55 UTC 2016 - xwang@suse.com
|
||||||
|
|
||||||
|
- Add SUSE logo on lock screen for GNOME theme (bsc#1007468):
|
||||||
|
+ gnome-shell-1007468-lock-screen-SUSE-logo-missing.patch
|
||||||
|
+ sle-background.png
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Nov 1 18:03:33 CST 2016 - cxiong@suse.com
|
Tue Nov 1 18:03:33 CST 2016 - cxiong@suse.com
|
||||||
|
|
||||||
@ -238,6 +260,17 @@ Sat Oct 1 14:23:55 UTC 2016 - zaitor@opensuse.org
|
|||||||
- Add gnome-shell-network-initialize-connections-on-startup.patch:
|
- Add gnome-shell-network-initialize-connections-on-startup.patch:
|
||||||
Initialize primary and VPN connections on startup (bgo#772249).
|
Initialize primary and VPN connections on startup (bgo#772249).
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Sep 23 07:46:22 UTC 2016 - xwang@suse.com
|
||||||
|
|
||||||
|
- Drop gnome-shell-sle-theme.patch (bsc#999592): the patch is
|
||||||
|
included in gnome-shell-gdm-login-applet.patch.
|
||||||
|
- Drop source SLE-theme.tar.gz: SLE12SP2 doesn't use this source
|
||||||
|
any more.
|
||||||
|
- Update gnome-shell-gdm-login-applet.patch:
|
||||||
|
+ Use dbus function to get hostname
|
||||||
|
- Add aboutMenu.js: Create from gnome-shell-gdm-login-applet.patch
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Sep 22 19:41:29 UTC 2016 - zaitor@opensuse.org
|
Thu Sep 22 19:41:29 UTC 2016 - zaitor@opensuse.org
|
||||||
|
|
||||||
|
@ -28,8 +28,10 @@ Url: http://live.gnome.org/GnomeShell
|
|||||||
Source: http://download.gnome.org/sources/gnome-shell/3.24/%{name}-%{version}.tar.xz
|
Source: http://download.gnome.org/sources/gnome-shell/3.24/%{name}-%{version}.tar.xz
|
||||||
# SOURCE-FEATURE-SLE SLE-Classic specific core extension file, see bnc#862615
|
# SOURCE-FEATURE-SLE SLE-Classic specific core extension file, see bnc#862615
|
||||||
Source1: SLEClassicExt.js
|
Source1: SLEClassicExt.js
|
||||||
# SOURCE-FEATURE-SLE The SLE theme, with icons/background/gnome-shell.css, works with gnome-shell-sle-theme.patch
|
# SOURCE-FEATURE-SLE aboutMenu fate#314545 dliang@suse.com -- Add an applet on login UI to display suse icon, product name, hostname.
|
||||||
Source2: SLE-theme.tar.gz
|
Source2: aboutMenu.js
|
||||||
|
# SOURCE-FEATURE-SLE sle-background bsc#1007468 xwang@suse.com -- Add SUSE logo on lock screen for GNOME theme
|
||||||
|
Source3: sle-background.png
|
||||||
# PATCH-FIX-UPSTREAM gnome-shell-linking.patch bgo#768781 dimstar@opensuse.org -- Fix linking the various libs in private directories
|
# PATCH-FIX-UPSTREAM gnome-shell-linking.patch bgo#768781 dimstar@opensuse.org -- Fix linking the various libs in private directories
|
||||||
Patch0: gnome-shell-linking.patch
|
Patch0: gnome-shell-linking.patch
|
||||||
# PATCH-NEEDS-REBASE gnome-shell-private-connection.patch bnc#751211 bgo#646187 dimstar@opensuse.org -- create private connections if the user is not authorized Was PATCH-FIX-UPSTREAM
|
# PATCH-NEEDS-REBASE gnome-shell-private-connection.patch bnc#751211 bgo#646187 dimstar@opensuse.org -- create private connections if the user is not authorized Was PATCH-FIX-UPSTREAM
|
||||||
@ -50,16 +52,14 @@ Patch7: endSession-dialog-update-time-label-every-sec.patch
|
|||||||
Patch8: gnome-shell-864872-unlock-by-mouse-motion.patch
|
Patch8: gnome-shell-864872-unlock-by-mouse-motion.patch
|
||||||
# PATCH-FIX-SLE gnome-shell-lock-bg-on-primay.patch bnc#894050 dliang@suse.com -- display background of lock dialog on the primary screen.
|
# PATCH-FIX-SLE gnome-shell-lock-bg-on-primay.patch bnc#894050 dliang@suse.com -- display background of lock dialog on the primary screen.
|
||||||
Patch9: gnome-shell-lock-bg-on-primary.patch
|
Patch9: gnome-shell-lock-bg-on-primary.patch
|
||||||
# PATCH-FIX-SLE gnome-shell-970480-authprompt-wrapping-message.patch bnc#970480 tyang@suse.com -- fix wrapping message issue when password change operation fails.
|
|
||||||
Patch10: gnome-shell-970480-authprompt-wrapping-message.patch
|
|
||||||
# PATCH-FIX-SLE gs-fate318433-prevent-same-account-multi-logins.patch fate#318433 cxiong@suse.com -- prevent multiple simultaneous login.
|
# PATCH-FIX-SLE gs-fate318433-prevent-same-account-multi-logins.patch fate#318433 cxiong@suse.com -- prevent multiple simultaneous login.
|
||||||
Patch11: gs-fate318433-prevent-same-account-multi-logins.patch
|
Patch11: gs-fate318433-prevent-same-account-multi-logins.patch
|
||||||
# PATCH-FEATURE-SLE gnome-shell-sle-theme.patch dliang@suse.com -- Use sle theme avatar
|
|
||||||
Patch12: gnome-shell-sle-theme.patch
|
|
||||||
# PATCH-FIX-UPSTREAM gnome-shell-login-fix-session-button-can-be-clicked.patch bsc#1034584 bsc#1034827 bgo#781482 xwang@suse.com -- Disable session selection button function when it does not display.
|
# PATCH-FIX-UPSTREAM gnome-shell-login-fix-session-button-can-be-clicked.patch bsc#1034584 bsc#1034827 bgo#781482 xwang@suse.com -- Disable session selection button function when it does not display.
|
||||||
Patch13: gnome-shell-login-fix-session-button-can-be-clicked.patch
|
Patch13: gnome-shell-login-fix-session-button-can-be-clicked.patch
|
||||||
# PATCH-FIX-UPSTREAM gnome-shell-portalhelper-fixes.patch bgo#769692 bgo#783286 zaitor@opensuse.org -- Portalhelper fixes from upstream git
|
# PATCH-FIX-UPSTREAM gnome-shell-portalhelper-fixes.patch bgo#769692 bgo#783286 zaitor@opensuse.org -- Portalhelper fixes from upstream git
|
||||||
Patch14: gnome-shell-portalhelper-fixes.patch
|
Patch14: gnome-shell-portalhelper-fixes.patch
|
||||||
|
# PATCH-FEATURE-SLE gnome-shell-1007468-lock-screen-SUSE-logo-missing.patch xwang@suse.com -- Add SUSE logo on lock screen for GNOME theme.
|
||||||
|
Patch15: gnome-shell-1007468-lock-screen-SUSE-logo-missing.patch
|
||||||
## NOTE: Keep SLE Classic pathes at bottom.
|
## NOTE: Keep SLE Classic pathes at bottom.
|
||||||
## NOTE: Keep SLE Classic pathes at bottom.
|
## NOTE: Keep SLE Classic pathes at bottom.
|
||||||
# PATCH-FEATURE-SLE gs-sle-classic-ext.patch bnc#862615 cxiong@suse.com -- add SLE Classic support
|
# PATCH-FEATURE-SLE gs-sle-classic-ext.patch bnc#862615 cxiong@suse.com -- add SLE Classic support
|
||||||
@ -200,12 +200,8 @@ into GNOME Shell calendar.
|
|||||||
%patch7 -p1
|
%patch7 -p1
|
||||||
%patch8 -p1
|
%patch8 -p1
|
||||||
%patch9 -p1
|
%patch9 -p1
|
||||||
%patch10 -p1
|
|
||||||
%patch11 -p1
|
%patch11 -p1
|
||||||
### FIXME: The patch currently don't work. Re-enable when it's fixed
|
%patch15 -p1
|
||||||
%if 0
|
|
||||||
%patch12 -p1
|
|
||||||
%endif
|
|
||||||
%endif
|
%endif
|
||||||
%patch13 -p1
|
%patch13 -p1
|
||||||
%patch14 -p1
|
%patch14 -p1
|
||||||
@ -214,6 +210,10 @@ into GNOME Shell calendar.
|
|||||||
translation-update-upstream
|
translation-update-upstream
|
||||||
%endif
|
%endif
|
||||||
cp %{S:1} js/ui/
|
cp %{S:1} js/ui/
|
||||||
|
%if !0%{?is_opensuse}
|
||||||
|
cp %{S:2} js/ui/
|
||||||
|
cp %{S:3} data/theme/
|
||||||
|
%endif
|
||||||
|
|
||||||
%build
|
%build
|
||||||
# Needed for patch2
|
# Needed for patch2
|
||||||
@ -232,13 +232,6 @@ find %{buildroot} -type f -name "*.la" -delete -print
|
|||||||
install -d %{buildroot}%{_datadir}/gnome-shell/extensions
|
install -d %{buildroot}%{_datadir}/gnome-shell/extensions
|
||||||
# This is the directory where search providers get installed
|
# This is the directory where search providers get installed
|
||||||
install -d %{buildroot}%{_datadir}/gnome-shell/search-providers
|
install -d %{buildroot}%{_datadir}/gnome-shell/search-providers
|
||||||
# Install SLE theme
|
|
||||||
# WARNING: some of the followings might NOT be effective at all, as core themes
|
|
||||||
# are packed as GResource.
|
|
||||||
tar xzvf %{SOURCE2}
|
|
||||||
install -d %{buildroot}%{_datadir}/gnome-shell/theme
|
|
||||||
cp -r SLE-theme/icons %{buildroot}%{_datadir}/
|
|
||||||
cp SLE-theme/theme/* %{buildroot}%{_datadir}/gnome-shell/theme
|
|
||||||
|
|
||||||
%find_lang %{name} %{?no_lang_C}
|
%find_lang %{name} %{?no_lang_C}
|
||||||
%suse_update_desktop_file org.gnome.Shell
|
%suse_update_desktop_file org.gnome.Shell
|
||||||
@ -283,7 +276,6 @@ rm -rf %{buildroot}
|
|||||||
%{_datadir}/glib-2.0/schemas/org.gnome.shell.gschema.xml
|
%{_datadir}/glib-2.0/schemas/org.gnome.shell.gschema.xml
|
||||||
%{_datadir}/gnome-control-center/keybindings/50-gnome-shell-system.xml
|
%{_datadir}/gnome-control-center/keybindings/50-gnome-shell-system.xml
|
||||||
%{_datadir}/gnome-shell/
|
%{_datadir}/gnome-shell/
|
||||||
%{_datadir}/icons/*
|
|
||||||
%doc %{_mandir}/man?/gnome-shell.*
|
%doc %{_mandir}/man?/gnome-shell.*
|
||||||
%dir %{_datadir}/xdg-desktop-portal
|
%dir %{_datadir}/xdg-desktop-portal
|
||||||
%dir %{_datadir}/xdg-desktop-portal/portals
|
%dir %{_datadir}/xdg-desktop-portal/portals
|
||||||
|
3
sle-background.png
Normal file
3
sle-background.png
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:ffb9cbca2f9c45042c2b892be1f7536813005c0485dba438d5b17915126515c8
|
||||||
|
size 34068
|
Loading…
x
Reference in New Issue
Block a user