Compare commits
21 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 3dff544396 | |||
| 7e7eab2bea | |||
| c568b44997 | |||
| ce818c0ae5 | |||
| ef2e301c08 | |||
| ba274f42b2 | |||
| 2ceaa05a5a | |||
| 047e454a7c | |||
| 86618ce1f9 | |||
| 59724c5dd5 | |||
| 3bb500fed4 | |||
| dcd3945bb7 | |||
| f414f616c4 | |||
| e21e90c5e6 | |||
| 1e7b2ef51f | |||
| c291de7479 | |||
| aee1a18270 | |||
| 6c67f26e7d | |||
| deb651acbf | |||
| d2011f6d7f | |||
| 416adec904 |
1
.gitignore
vendored
1
.gitignore
vendored
@ -23,7 +23,6 @@ data/gnome-shell-wayland.desktop
|
||||
data/gnome-shell-wayland.desktop.in
|
||||
data/gnome-shell-extension-prefs.desktop
|
||||
data/gnome-shell-extension-prefs.desktop.in
|
||||
data/gnome-shell-theme.gresource
|
||||
data/gschemas.compiled
|
||||
data/perf-background.xml
|
||||
data/org.gnome.shell.gschema.xml
|
||||
|
||||
40
NEWS
40
NEWS
@ -1,19 +1,35 @@
|
||||
3.15.1
|
||||
3.14.3
|
||||
======
|
||||
* Use GResources for theme loading [Cosimo; #736936]
|
||||
* Reset the OSK to primary on monitor changes [Rui; #738536]
|
||||
* Use LC_TIME locale for format string translations [Florian; #738640]
|
||||
* Summarize queued up notifications [Devyani; #702460]
|
||||
* Improve handling of multi-day events [Andreas; #727302]
|
||||
* Support EXTERNAL scroll policy type [Florian; #739379]
|
||||
* Misc. bugfixes [Owen, Rui; #738652, #739252]
|
||||
* Properly remove network connections from list [Ryan; #740227]
|
||||
* Fix handling of cancel button on login screen [Ray; #740141]
|
||||
* Fix build when using dash as default shell [Alexander; #739241]
|
||||
* Make event list in calendar scrollable [Stalin; #705115]
|
||||
* Fix calendar-server crash on DBus timeout [Giovanni; #735308]
|
||||
* Fix gestures triggering erroneously [Florian; #740237]
|
||||
|
||||
Contributors:
|
||||
Andreas Brauchli, Cosimo Cecchi, Devyani Kota, Rui Matos, Florian Müllner,
|
||||
Jasper St. Pierre, Owen W. Taylor
|
||||
Giovanni Campagna, Ryan Lortie, Florian Müllner, Stalin Pereira, Ray Strode,
|
||||
Alexander Tsoy
|
||||
|
||||
Translations:
|
||||
Bahodir Mansurov [uz@cyrillic]
|
||||
3.14.2
|
||||
======
|
||||
* Do not hard-depend on latest NetworkManager [Florian; #738485]
|
||||
* Fix check for isToday in calendar [Darcy; #738725]
|
||||
* Fix workspace changes from app picker [Yuki; #737534]
|
||||
* Misc. bug fixes [Yuki; #739497]
|
||||
|
||||
Contributors:
|
||||
Darcy, Florian Müllner, Yuki
|
||||
|
||||
3.14.1.5
|
||||
========
|
||||
* Fix handing of SystemBackground [Owen; #738652]
|
||||
* Summarize queued up notifications [Devyani; #702460]
|
||||
* Plug an animation object leak [Rui; #739252]
|
||||
* Improve handling of multi-day events [Andreas; #727302]
|
||||
|
||||
Contributors:
|
||||
Andreas Brauchli, Devyani Kota, Rui Matos, Owen W. Taylor
|
||||
|
||||
3.14.1
|
||||
======
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
AC_PREREQ(2.63)
|
||||
AC_INIT([gnome-shell],[3.15.1],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])
|
||||
AC_INIT([gnome-shell],[3.14.3],[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-shell],[gnome-shell])
|
||||
|
||||
AC_CONFIG_HEADERS([config.h])
|
||||
AC_CONFIG_SRCDIR([src/shell-global.c])
|
||||
@ -76,7 +76,7 @@ AC_MSG_RESULT($enable_systemd)
|
||||
CLUTTER_MIN_VERSION=1.15.90
|
||||
GOBJECT_INTROSPECTION_MIN_VERSION=0.10.1
|
||||
GJS_MIN_VERSION=1.39.0
|
||||
MUTTER_MIN_VERSION=3.15.1
|
||||
MUTTER_MIN_VERSION=3.14.3
|
||||
GTK_MIN_VERSION=3.13.2
|
||||
GIO_MIN_VERSION=2.37.0
|
||||
LIBECAL_MIN_VERSION=3.5.3
|
||||
@ -232,7 +232,9 @@ esac
|
||||
AM_CFLAGS="$AM_CFLAGS $WARN_CFLAGS"
|
||||
AC_SUBST(AM_CFLAGS)
|
||||
|
||||
BROWSER_PLUGIN_DIR="${BROWSER_PLUGIN_DIR:-"\${libdir}/mozilla/plugins"}"
|
||||
if test -z "${BROWSER_PLUGIN_DIR}"; then
|
||||
BROWSER_PLUGIN_DIR="\${libdir}/mozilla/plugins"
|
||||
fi
|
||||
AC_ARG_VAR([BROWSER_PLUGIN_DIR],[Where to install the plugin to])
|
||||
|
||||
AC_CONFIG_FILES([
|
||||
|
||||
@ -35,11 +35,44 @@ introspection_DATA = \
|
||||
org.gnome.ShellSearchProvider.xml \
|
||||
org.gnome.ShellSearchProvider2.xml
|
||||
|
||||
resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/theme --generate-dependencies $(srcdir)/gnome-shell-theme.gresource.xml)
|
||||
gnome-shell-theme.gresource: gnome-shell-theme.gresource.xml $(resource_files)
|
||||
$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/theme $<
|
||||
resourcedir = $(pkgdatadir)
|
||||
resource_DATA = gnome-shell-theme.gresource
|
||||
themedir = $(pkgdatadir)/theme
|
||||
dist_theme_DATA = \
|
||||
theme/calendar-arrow-left.svg \
|
||||
theme/calendar-arrow-right.svg \
|
||||
theme/calendar-today.svg \
|
||||
theme/checkbox-focused.svg \
|
||||
theme/checkbox-off-focused.svg \
|
||||
theme/checkbox-off.svg \
|
||||
theme/checkbox.svg \
|
||||
theme/close-window.svg \
|
||||
theme/close.svg \
|
||||
theme/corner-ripple-ltr.png \
|
||||
theme/corner-ripple-rtl.png \
|
||||
theme/dash-placeholder.svg \
|
||||
theme/filter-selected-ltr.svg \
|
||||
theme/filter-selected-rtl.svg \
|
||||
theme/gnome-shell.css \
|
||||
theme/logged-in-indicator.svg \
|
||||
theme/message-tray-background.png \
|
||||
theme/more-results.svg \
|
||||
theme/noise-texture.png \
|
||||
theme/page-indicator-active.svg \
|
||||
theme/page-indicator-inactive.svg \
|
||||
theme/page-indicator-checked.svg \
|
||||
theme/page-indicator-hover.svg \
|
||||
theme/panel-button-border.svg \
|
||||
theme/panel-button-highlight-narrow.svg \
|
||||
theme/panel-button-highlight-wide.svg \
|
||||
theme/process-working.svg \
|
||||
theme/running-indicator.svg \
|
||||
theme/source-button-border.svg \
|
||||
theme/summary-counter.svg \
|
||||
theme/toggle-off-us.svg \
|
||||
theme/toggle-off-intl.svg \
|
||||
theme/toggle-on-us.svg \
|
||||
theme/toggle-on-intl.svg \
|
||||
theme/ws-switch-arrow-up.png \
|
||||
theme/ws-switch-arrow-down.png
|
||||
|
||||
backgrounddir = $(pkgdatadir)
|
||||
background_DATA = perf-background.xml
|
||||
@ -83,9 +116,7 @@ EXTRA_DIST = \
|
||||
perf-background.xml.in \
|
||||
org.gnome.Shell.PortalHelper.desktop.in \
|
||||
org.gnome.Shell.PortalHelper.service.in \
|
||||
org.gnome.shell.gschema.xml.in.in \
|
||||
gnome-shell-theme.gresource.xml \
|
||||
$(resource_files)
|
||||
org.gnome.shell.gschema.xml.in.in
|
||||
|
||||
CLEANFILES += \
|
||||
gnome-shell.desktop.in \
|
||||
@ -97,5 +128,4 @@ CLEANFILES += \
|
||||
perf-background.xml \
|
||||
gschemas.compiled \
|
||||
org.gnome.shell.gschema.valid \
|
||||
org.gnome.shell.gschema.xml.in \
|
||||
gnome-shell-theme.gresource
|
||||
org.gnome.shell.gschema.xml.in
|
||||
|
||||
@ -1,41 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<gresources>
|
||||
<gresource prefix="/org/gnome/shell/theme">
|
||||
<file>calendar-arrow-left.svg</file>
|
||||
<file>calendar-arrow-right.svg</file>
|
||||
<file>calendar-today.svg</file>
|
||||
<file>checkbox-focused.svg</file>
|
||||
<file>checkbox-off-focused.svg</file>
|
||||
<file>checkbox-off.svg</file>
|
||||
<file>checkbox.svg</file>
|
||||
<file>close-window.svg</file>
|
||||
<file>close.svg</file>
|
||||
<file>corner-ripple-ltr.png</file>
|
||||
<file>corner-ripple-rtl.png</file>
|
||||
<file>dash-placeholder.svg</file>
|
||||
<file>filter-selected-ltr.svg</file>
|
||||
<file>filter-selected-rtl.svg</file>
|
||||
<file>gnome-shell.css</file>
|
||||
<file>logged-in-indicator.svg</file>
|
||||
<file>message-tray-background.png</file>
|
||||
<file>more-results.svg</file>
|
||||
<file>noise-texture.png</file>
|
||||
<file>page-indicator-active.svg</file>
|
||||
<file>page-indicator-inactive.svg</file>
|
||||
<file>page-indicator-checked.svg</file>
|
||||
<file>page-indicator-hover.svg</file>
|
||||
<file>panel-button-border.svg</file>
|
||||
<file>panel-button-highlight-narrow.svg</file>
|
||||
<file>panel-button-highlight-wide.svg</file>
|
||||
<file>process-working.svg</file>
|
||||
<file>running-indicator.svg</file>
|
||||
<file>source-button-border.svg</file>
|
||||
<file>summary-counter.svg</file>
|
||||
<file>toggle-off-us.svg</file>
|
||||
<file>toggle-off-intl.svg</file>
|
||||
<file>toggle-on-us.svg</file>
|
||||
<file>toggle-on-intl.svg</file>
|
||||
<file>ws-switch-arrow-up.png</file>
|
||||
<file>ws-switch-arrow-down.png</file>
|
||||
</gresource>
|
||||
</gresources>
|
||||
@ -1,7 +1,6 @@
|
||||
// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
|
||||
|
||||
const Clutter = imports.gi.Clutter;
|
||||
const Gio = imports.gi.Gio;
|
||||
const Lang = imports.lang;
|
||||
const Signals = imports.signals;
|
||||
const St = imports.gi.St;
|
||||
@ -127,7 +126,7 @@ const AuthPrompt = new Lang.Class({
|
||||
|
||||
this._initButtons();
|
||||
|
||||
let spinnerIcon = Gio.File.new_for_uri('resource:///org/gnome/shell/theme/process-working.svg');
|
||||
let spinnerIcon = global.datadir + '/theme/process-working.svg';
|
||||
this._spinner = new Animation.AnimatedIcon(spinnerIcon, DEFAULT_BUTTON_WELL_ICON_SIZE);
|
||||
this._spinner.actor.opacity = 0;
|
||||
this._spinner.actor.show();
|
||||
@ -261,6 +260,7 @@ const AuthPrompt = new Lang.Class({
|
||||
|
||||
_onVerificationComplete: function() {
|
||||
this.verificationStatus = AuthPromptStatus.VERIFICATION_SUCCEEDED;
|
||||
this.cancelButton.reactive = false;
|
||||
},
|
||||
|
||||
_onReset: function() {
|
||||
@ -432,6 +432,7 @@ const AuthPrompt = new Lang.Class({
|
||||
reset: function() {
|
||||
let oldStatus = this.verificationStatus;
|
||||
this.verificationStatus = AuthPromptStatus.NOT_VERIFYING;
|
||||
this.cancelButton.reactive = true;
|
||||
|
||||
if (oldStatus == AuthPromptStatus.VERIFYING)
|
||||
this._userVerifier.cancel();
|
||||
@ -500,6 +501,9 @@ const AuthPrompt = new Lang.Class({
|
||||
},
|
||||
|
||||
cancel: function() {
|
||||
if (this.verificationStatus == AuthPromptStatus.NOT_VERIFYING || this.verificationStatus == AuthPromptStatus.VERIFICATION_SUCCEEDED) {
|
||||
return;
|
||||
}
|
||||
this.reset();
|
||||
this.emit('cancelled');
|
||||
}
|
||||
|
||||
@ -537,24 +537,24 @@ const LoginDialog = new Lang.Class({
|
||||
}
|
||||
},
|
||||
|
||||
_updateLogoTexture: function(cache, file) {
|
||||
if (this._logoFile && !this._logoFile.equal(file))
|
||||
_updateLogoTexture: function(cache, uri) {
|
||||
if (this._logoFileUri != uri)
|
||||
return;
|
||||
|
||||
this._logoBin.destroy_all_children();
|
||||
if (this._logoFile) {
|
||||
if (this._logoFileUri) {
|
||||
let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
|
||||
this._logoBin.add_child(this._textureCache.load_file_async(this._logoFile,
|
||||
-1, _LOGO_ICON_HEIGHT,
|
||||
scaleFactor));
|
||||
this._logoBin.add_child(this._textureCache.load_uri_async(this._logoFileUri,
|
||||
-1, _LOGO_ICON_HEIGHT,
|
||||
scaleFactor));
|
||||
}
|
||||
},
|
||||
|
||||
_updateLogo: function() {
|
||||
let path = this._settings.get_string(GdmUtil.LOGO_KEY);
|
||||
|
||||
this._logoFile = path ? Gio.file_new_for_path(path) : null;
|
||||
this._updateLogoTexture(this._textureCache, this._logoFile);
|
||||
this._logoFileUri = path ? Gio.file_new_for_path(path).get_uri() : null;
|
||||
this._updateLogoTexture(this._textureCache, this._logoFileUri);
|
||||
},
|
||||
|
||||
_onPrompted: function() {
|
||||
@ -643,6 +643,8 @@ const LoginDialog = new Lang.Class({
|
||||
realmManager.release();
|
||||
}));
|
||||
this._updateCancelButton();
|
||||
|
||||
this._authPrompt.updateSensitivity(true);
|
||||
this._showPrompt();
|
||||
},
|
||||
|
||||
|
||||
@ -35,7 +35,7 @@ function releaseKeyboard() {
|
||||
}
|
||||
|
||||
function holdKeyboard() {
|
||||
global.display.freeze_keyboard(global.get_current_time());
|
||||
global.freeze_keyboard(global.get_current_time());
|
||||
}
|
||||
|
||||
const KeyboardManager = new Lang.Class({
|
||||
|
||||
@ -12,7 +12,7 @@ const ANIMATED_ICON_UPDATE_TIMEOUT = 100;
|
||||
const Animation = new Lang.Class({
|
||||
Name: 'Animation',
|
||||
|
||||
_init: function(file, width, height, speed) {
|
||||
_init: function(filename, width, height, speed) {
|
||||
this.actor = new St.Bin();
|
||||
this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
|
||||
this._speed = speed;
|
||||
@ -23,7 +23,7 @@ const Animation = new Lang.Class({
|
||||
this._frame = 0;
|
||||
|
||||
let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
|
||||
this._animations = St.TextureCache.get_default().load_sliced_image (file, width, height, scaleFactor,
|
||||
this._animations = St.TextureCache.get_default().load_sliced_image (filename, width, height, scaleFactor,
|
||||
Lang.bind(this, this._animationsLoaded));
|
||||
this.actor.set_child(this._animations);
|
||||
},
|
||||
@ -82,7 +82,7 @@ const AnimatedIcon = new Lang.Class({
|
||||
Name: 'AnimatedIcon',
|
||||
Extends: Animation,
|
||||
|
||||
_init: function(file, size) {
|
||||
this.parent(file, size, size, ANIMATED_ICON_UPDATE_TIMEOUT);
|
||||
_init: function(filename, size) {
|
||||
this.parent(filename, size, size, ANIMATED_ICON_UPDATE_TIMEOUT);
|
||||
}
|
||||
});
|
||||
|
||||
@ -379,7 +379,9 @@ const AllView = new Lang.Class({
|
||||
this.actor.add_actor(this._scrollView);
|
||||
|
||||
this._scrollView.set_policy(Gtk.PolicyType.NEVER,
|
||||
Gtk.PolicyType.EXTERNAL);
|
||||
Gtk.PolicyType.AUTOMATIC);
|
||||
// we are only using ScrollView for the fade effect, hide scrollbars
|
||||
this._scrollView.vscroll.hide();
|
||||
this._adjustment = this._scrollView.vscroll.adjustment;
|
||||
|
||||
this._pageIndicators = new PageIndicators();
|
||||
@ -1562,10 +1564,11 @@ const AppIcon = new Lang.Class({
|
||||
this.actor.connect('destroy', Lang.bind(this, this._onDestroy));
|
||||
|
||||
this._menuTimeoutId = 0;
|
||||
this._stateChangedId = this.app.connect('notify::state',
|
||||
Lang.bind(this,
|
||||
this._onStateChanged));
|
||||
this._onStateChanged();
|
||||
this._stateChangedId = this.app.connect('notify::state', Lang.bind(this,
|
||||
function () {
|
||||
this._updateRunningStyle();
|
||||
}));
|
||||
this._updateRunningStyle();
|
||||
},
|
||||
|
||||
_onDestroy: function() {
|
||||
@ -1586,7 +1589,7 @@ const AppIcon = new Lang.Class({
|
||||
}
|
||||
},
|
||||
|
||||
_onStateChanged: function() {
|
||||
_updateRunningStyle: function() {
|
||||
if (this.app.state != Shell.AppState.STOPPED)
|
||||
this.actor.add_style_class_name('running');
|
||||
else
|
||||
|
||||
@ -127,16 +127,6 @@ const ANIMATION_MIN_WAKEUP_INTERVAL = 1.0;
|
||||
|
||||
let _backgroundCache = null;
|
||||
|
||||
function _fileEqual0(file1, file2) {
|
||||
if (file1 == file2)
|
||||
return true;
|
||||
|
||||
if (!file1 || !file2)
|
||||
return false;
|
||||
|
||||
return file1.equal(file2);
|
||||
}
|
||||
|
||||
const BackgroundCache = new Lang.Class({
|
||||
Name: 'BackgroundCache',
|
||||
|
||||
@ -146,25 +136,25 @@ const BackgroundCache = new Lang.Class({
|
||||
this._backgroundSources = {};
|
||||
},
|
||||
|
||||
monitorFile: function(file) {
|
||||
let key = file.hash();
|
||||
if (this._fileMonitors[key])
|
||||
monitorFile: function(filename) {
|
||||
if (this._fileMonitors[filename])
|
||||
return;
|
||||
|
||||
let file = Gio.File.new_for_path(filename);
|
||||
let monitor = file.monitor(Gio.FileMonitorFlags.NONE, null);
|
||||
monitor.connect('changed',
|
||||
Lang.bind(this, function() {
|
||||
this.emit('file-changed', file);
|
||||
this.emit('file-changed', filename);
|
||||
}));
|
||||
|
||||
this._fileMonitors[key] = monitor;
|
||||
this._fileMonitors[filename] = monitor;
|
||||
},
|
||||
|
||||
getAnimation: function(params) {
|
||||
params = Params.parse(params, { file: null,
|
||||
params = Params.parse(params, { filename: null,
|
||||
onLoaded: null });
|
||||
|
||||
if (_fileEqual0(this._animationFile, params.file)) {
|
||||
if (this._animationFilename == params.filename) {
|
||||
if (params.onLoaded) {
|
||||
let id = GLib.idle_add(GLib.PRIORITY_DEFAULT, Lang.bind(this, function() {
|
||||
params.onLoaded(this._animation);
|
||||
@ -175,10 +165,10 @@ const BackgroundCache = new Lang.Class({
|
||||
return;
|
||||
}
|
||||
|
||||
let animation = new Animation({ file: params.file });
|
||||
let animation = new Animation({ filename: params.filename });
|
||||
|
||||
animation.load(Lang.bind(this, function() {
|
||||
this._animationFile = params.file;
|
||||
this._animationFilename = params.filename;
|
||||
this._animation = animation;
|
||||
|
||||
if (params.onLoaded) {
|
||||
@ -231,14 +221,14 @@ const Background = new Lang.Class({
|
||||
params = Params.parse(params, { monitorIndex: 0,
|
||||
layoutManager: Main.layoutManager,
|
||||
settings: null,
|
||||
file: null,
|
||||
filename: null,
|
||||
style: null });
|
||||
|
||||
this.background = new Meta.Background({ meta_screen: global.screen });
|
||||
this.background._delegate = this;
|
||||
|
||||
this._settings = params.settings;
|
||||
this._file = params.file;
|
||||
this._filename = params.filename;
|
||||
this._style = params.style;
|
||||
this._monitorIndex = params.monitorIndex;
|
||||
this._layoutManager = params.layoutManager;
|
||||
@ -305,21 +295,20 @@ const Background = new Lang.Class({
|
||||
this.background.set_gradient(shadingType, color, secondColor);
|
||||
},
|
||||
|
||||
_watchFile: function(file) {
|
||||
let key = file.hash();
|
||||
if (this._fileWatches[key])
|
||||
_watchFile: function(filename) {
|
||||
if (this._fileWatches[filename])
|
||||
return;
|
||||
|
||||
this._cache.monitorFile(file);
|
||||
this._cache.monitorFile(filename);
|
||||
let signalId = this._cache.connect('file-changed',
|
||||
Lang.bind(this, function(cache, changedFile) {
|
||||
if (changedFile.equal(file)) {
|
||||
if (changedFile == filename) {
|
||||
let imageCache = Meta.BackgroundImageCache.get_default();
|
||||
imageCache.purge(changedFile);
|
||||
this.emit('changed');
|
||||
}
|
||||
}));
|
||||
this._fileWatches[key] = signalId;
|
||||
this._fileWatches[filename] = signalId;
|
||||
},
|
||||
|
||||
_removeAnimationTimeout: function() {
|
||||
@ -342,9 +331,9 @@ const Background = new Lang.Class({
|
||||
this._animation.transitionProgress,
|
||||
this._style);
|
||||
} else if (files.length > 0) {
|
||||
this.background.set_file(files[0], this._style);
|
||||
this.background.set_filename(files[0], this._style);
|
||||
} else {
|
||||
this.background.set_file(null, this._style);
|
||||
this.background.set_filename(null, this._style);
|
||||
}
|
||||
this._queueUpdateAnimation();
|
||||
});
|
||||
@ -401,28 +390,28 @@ const Background = new Lang.Class({
|
||||
GLib.Source.set_name_by_id(this._updateAnimationTimeoutId, '[gnome-shell] this._updateAnimation');
|
||||
},
|
||||
|
||||
_loadAnimation: function(file) {
|
||||
this._cache.getAnimation({ file: file,
|
||||
onLoaded: Lang.bind(this, function(animation) {
|
||||
this._animation = animation;
|
||||
_loadAnimation: function(filename) {
|
||||
this._cache.getAnimation({ filename: filename,
|
||||
onLoaded: Lang.bind(this, function(animation) {
|
||||
this._animation = animation;
|
||||
|
||||
if (!this._animation || this._cancellable.is_cancelled()) {
|
||||
this._setLoaded();
|
||||
return;
|
||||
}
|
||||
if (!this._animation || this._cancellable.is_cancelled()) {
|
||||
this._setLoaded();
|
||||
return;
|
||||
}
|
||||
|
||||
this._updateAnimation();
|
||||
this._watchFile(file);
|
||||
})
|
||||
});
|
||||
this._updateAnimation();
|
||||
this._watchFile(filename);
|
||||
})
|
||||
});
|
||||
},
|
||||
|
||||
_loadImage: function(file) {
|
||||
this.background.set_file(file, this._style);
|
||||
this._watchFile(file);
|
||||
_loadImage: function(filename) {
|
||||
this.background.set_filename(filename, this._style);
|
||||
this._watchFile(filename);
|
||||
|
||||
let cache = Meta.BackgroundImageCache.get_default();
|
||||
let image = cache.load(file);
|
||||
let image = cache.load(filename);
|
||||
if (image.is_loaded())
|
||||
this._setLoaded();
|
||||
else {
|
||||
@ -434,11 +423,11 @@ const Background = new Lang.Class({
|
||||
}
|
||||
},
|
||||
|
||||
_loadFile: function(file) {
|
||||
if (file.get_basename().endsWith('.xml'))
|
||||
this._loadAnimation(file);
|
||||
_loadFile: function(filename) {
|
||||
if (filename.endsWith('.xml'))
|
||||
this._loadAnimation(filename);
|
||||
else
|
||||
this._loadImage(file);
|
||||
this._loadImage(filename);
|
||||
},
|
||||
|
||||
_load: function () {
|
||||
@ -446,12 +435,12 @@ const Background = new Lang.Class({
|
||||
|
||||
this._loadPattern();
|
||||
|
||||
if (!this._file) {
|
||||
if (!this._filename) {
|
||||
this._setLoaded();
|
||||
return;
|
||||
}
|
||||
|
||||
this._loadFile(this._file);
|
||||
this._loadFile(this._filename);
|
||||
},
|
||||
});
|
||||
Signals.addSignalMethods(Background.prototype);
|
||||
@ -462,12 +451,12 @@ const SystemBackground = new Lang.Class({
|
||||
Name: 'SystemBackground',
|
||||
|
||||
_init: function() {
|
||||
let file = Gio.File.new_for_uri('resource:///org/gnome/shell/theme/noise-texture.png');
|
||||
let filename = global.datadir + '/theme/noise-texture.png';
|
||||
|
||||
if (_systemBackground == null) {
|
||||
_systemBackground = new Meta.Background({ meta_screen: global.screen });
|
||||
_systemBackground.set_color(DEFAULT_BACKGROUND_COLOR);
|
||||
_systemBackground.set_file(file, GDesktopEnums.BackgroundStyle.WALLPAPER);
|
||||
_systemBackground.set_filename(filename, GDesktopEnums.BackgroundStyle.WALLPAPER);
|
||||
}
|
||||
|
||||
this.actor = new Meta.BackgroundActor({ meta_screen: global.screen,
|
||||
@ -475,7 +464,7 @@ const SystemBackground = new Lang.Class({
|
||||
background: _systemBackground });
|
||||
|
||||
let cache = Meta.BackgroundImageCache.get_default();
|
||||
let image = cache.load(file);
|
||||
let image = cache.load(filename);
|
||||
if (image.is_loaded()) {
|
||||
image = null;
|
||||
let id = GLib.idle_add(GLib.PRIORITY_DEFAULT, Lang.bind(this, function() {
|
||||
@ -524,17 +513,20 @@ const BackgroundSource = new Lang.Class({
|
||||
},
|
||||
|
||||
getBackground: function(monitorIndex) {
|
||||
let file = null;
|
||||
let filename = null;
|
||||
let style;
|
||||
|
||||
if (this._overrideImage != null) {
|
||||
file = Gio.File.new_for_path(this._overrideImage);
|
||||
filename = this._overrideImage;
|
||||
style = GDesktopEnums.BackgroundStyle.ZOOM; // Hardcode
|
||||
} else {
|
||||
style = this._settings.get_enum(BACKGROUND_STYLE_KEY);
|
||||
if (style != GDesktopEnums.BackgroundStyle.NONE) {
|
||||
let uri = this._settings.get_string(PICTURE_URI_KEY);
|
||||
file = Gio.File.new_for_commandline_arg(uri);
|
||||
if (GLib.uri_parse_scheme(uri) != null)
|
||||
filename = Gio.File.new_for_uri(uri).get_path();
|
||||
else
|
||||
filename = uri;
|
||||
}
|
||||
}
|
||||
|
||||
@ -542,7 +534,7 @@ const BackgroundSource = new Lang.Class({
|
||||
// they can have variants that depend on the aspect ratio and
|
||||
// size of the monitor; for other backgrounds we can use the
|
||||
// same background object for all monitors.
|
||||
if (file == null || !file.get_basename().endsWith('.xml'))
|
||||
if (filename == null || !filename.endsWith('.xml'))
|
||||
monitorIndex = 0;
|
||||
|
||||
if (!(monitorIndex in this._backgrounds)) {
|
||||
@ -550,7 +542,7 @@ const BackgroundSource = new Lang.Class({
|
||||
monitorIndex: monitorIndex,
|
||||
layoutManager: this._layoutManager,
|
||||
settings: this._settings,
|
||||
file: file,
|
||||
filename: filename,
|
||||
style: style
|
||||
});
|
||||
|
||||
@ -583,9 +575,9 @@ const Animation = new Lang.Class({
|
||||
Name: 'Animation',
|
||||
|
||||
_init: function(params) {
|
||||
params = Params.parse(params, { file: null });
|
||||
params = Params.parse(params, { filename: null });
|
||||
|
||||
this.file = params.file;
|
||||
this.filename = params.filename;
|
||||
this.keyFrameFiles = [];
|
||||
this.transitionProgress = 0.0;
|
||||
this.transitionDuration = 0.0;
|
||||
@ -593,7 +585,9 @@ const Animation = new Lang.Class({
|
||||
},
|
||||
|
||||
load: function(callback) {
|
||||
this._show = new GnomeDesktop.BGSlideShow({ filename: this.file.get_path() });
|
||||
let file = Gio.File.new_for_path(this.filename);
|
||||
|
||||
this._show = new GnomeDesktop.BGSlideShow({ filename: this.filename });
|
||||
|
||||
this._show.load_async(null,
|
||||
Lang.bind(this,
|
||||
@ -613,16 +607,16 @@ const Animation = new Lang.Class({
|
||||
if (this._show.get_num_slides() < 1)
|
||||
return;
|
||||
|
||||
let [progress, duration, isFixed, filename1, filename2] = this._show.get_current_slide(monitor.width, monitor.height);
|
||||
let [progress, duration, isFixed, file1, file2] = this._show.get_current_slide(monitor.width, monitor.height);
|
||||
|
||||
this.transitionDuration = duration;
|
||||
this.transitionProgress = progress;
|
||||
|
||||
if (filename1)
|
||||
this.keyFrameFiles.push(Gio.File.new_for_path(filename1));
|
||||
if (file1)
|
||||
this.keyFrameFiles.push(file1);
|
||||
|
||||
if (filename2)
|
||||
this.keyFrameFiles.push(Gio.File.new_for_path(filename2));
|
||||
if (file2)
|
||||
this.keyFrameFiles.push(file2);
|
||||
},
|
||||
});
|
||||
Signals.addSignalMethods(Animation.prototype);
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
|
||||
const Clutter = imports.gi.Clutter;
|
||||
const Gio = imports.gi.Gio;
|
||||
const Gtk = imports.gi.Gtk;
|
||||
const GLib = imports.gi.GLib;
|
||||
const Lang = imports.lang;
|
||||
const St = imports.gi.St;
|
||||
@ -17,7 +18,6 @@ const ELLIPSIS_CHAR = '\u2026';
|
||||
|
||||
// alias to prevent xgettext from picking up strings translated in GTK+
|
||||
const gtk30_ = Gettext_gtk30.gettext;
|
||||
const NC_ = function(context, str) { return str; };
|
||||
|
||||
// in org.gnome.desktop.interface
|
||||
const CLOCK_FORMAT_KEY = 'clock-format';
|
||||
@ -252,11 +252,24 @@ const DBusEventSource = new Lang.Class({
|
||||
this._initialized = false;
|
||||
this._dbusProxy = new CalendarServer();
|
||||
this._dbusProxy.init_async(GLib.PRIORITY_DEFAULT, null, Lang.bind(this, function(object, result) {
|
||||
let loaded = false;
|
||||
|
||||
try {
|
||||
this._dbusProxy.init_finish(result);
|
||||
loaded = true;
|
||||
} catch(e) {
|
||||
log('Error loading calendars: ' + e.message);
|
||||
return;
|
||||
if (e.matches(Gio.DBusError, Gio.DBusError.TIMED_OUT)) {
|
||||
// Ignore timeouts and install signals as normal, because with high
|
||||
// probability the service will appear later on, and we will get a
|
||||
// NameOwnerChanged which will finish loading
|
||||
//
|
||||
// (But still _initialized to false, because the proxy does not know
|
||||
// about the HasCalendars property and would cause an exception trying
|
||||
// to read it)
|
||||
} else {
|
||||
log('Error loading calendars: ' + e.message);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
this._dbusProxy.connectSignal('Changed', Lang.bind(this, this._onChanged));
|
||||
@ -272,9 +285,11 @@ const DBusEventSource = new Lang.Class({
|
||||
this.emit('notify::has-calendars');
|
||||
}));
|
||||
|
||||
this._initialized = true;
|
||||
this.emit('notify::has-calendars');
|
||||
this._onNameAppeared();
|
||||
this._initialized = loaded;
|
||||
if (loaded) {
|
||||
this.emit('notify::has-calendars');
|
||||
this._onNameAppeared();
|
||||
}
|
||||
}));
|
||||
},
|
||||
|
||||
@ -296,6 +311,7 @@ const DBusEventSource = new Lang.Class({
|
||||
},
|
||||
|
||||
_onNameAppeared: function(owner) {
|
||||
this._initialized = true;
|
||||
this._resetCache();
|
||||
this._loadEvents(true);
|
||||
},
|
||||
@ -732,6 +748,8 @@ const EventsList = new Lang.Class({
|
||||
},
|
||||
|
||||
_addEvent: function(event, index, includeDayName, periodBegin, periodEnd) {
|
||||
let eventBox = new St.BoxLayout();
|
||||
eventBox.set_vertical(false);
|
||||
let dayString;
|
||||
if (includeDayName) {
|
||||
if (event.date >= periodBegin)
|
||||
@ -752,7 +770,7 @@ const EventsList = new Lang.Class({
|
||||
let rtl = this.actor.get_text_direction() == Clutter.TextDirection.RTL;
|
||||
|
||||
let layout = this.actor.layout_manager;
|
||||
layout.attach(dayLabel, rtl ? 2 : 0, index, 1, 1);
|
||||
eventBox.add_actor(dayLabel);
|
||||
let clockFormat = this._desktopSettings.get_string(CLOCK_FORMAT_KEY);
|
||||
let timeString = _formatEventTime(event, clockFormat, periodBegin, periodEnd);
|
||||
let timeLabel = new St.Label({ style_class: 'events-day-time',
|
||||
@ -772,11 +790,12 @@ const EventsList = new Lang.Class({
|
||||
if (event.allDay || event.end <= periodEnd)
|
||||
postEllipsisLabel.opacity = 0;
|
||||
|
||||
let timeLabelBoxLayout = new St.BoxLayout();
|
||||
let timeLabelBoxLayout = new St.BoxLayout({ x_align: Clutter.ActorAlign.START });
|
||||
timeLabelBoxLayout.add(preEllipsisLabel);
|
||||
timeLabelBoxLayout.add(timeLabel);
|
||||
timeLabelBoxLayout.add(postEllipsisLabel);
|
||||
layout.attach(timeLabelBoxLayout, 1, index, 1, 1);
|
||||
timeLabelBoxLayout.set_size(50, 1);
|
||||
eventBox.add_actor(timeLabelBoxLayout);
|
||||
|
||||
let titleLabel = new St.Label({ style_class: 'events-day-task',
|
||||
text: event.summary,
|
||||
@ -784,7 +803,8 @@ const EventsList = new Lang.Class({
|
||||
titleLabel.clutter_text.line_wrap = true;
|
||||
titleLabel.clutter_text.ellipsize = false;
|
||||
|
||||
layout.attach(titleLabel, rtl ? 0 : 2, index, 1, 1);
|
||||
eventBox.add_actor(titleLabel);
|
||||
this._eventListBox.add_actor(eventBox);
|
||||
},
|
||||
|
||||
_addPeriod: function(header, index, periodBegin, periodEnd, includeDayName, showNothingScheduled) {
|
||||
@ -794,8 +814,7 @@ const EventsList = new Lang.Class({
|
||||
return index;
|
||||
|
||||
let label = new St.Label({ style_class: 'events-day-header', text: header });
|
||||
let layout = this.actor.layout_manager;
|
||||
layout.attach(label, 0, index, 3, 1);
|
||||
this._eventListBox.add_actor(label);
|
||||
index++;
|
||||
|
||||
for (let n = 0; n < events.length; n++) {
|
||||
@ -814,27 +833,21 @@ const EventsList = new Lang.Class({
|
||||
},
|
||||
|
||||
_showOtherDay: function(day) {
|
||||
this.actor.destroy_all_children();
|
||||
|
||||
let dayBegin = _getBeginningOfDay(day);
|
||||
let dayEnd = _getEndOfDay(day);
|
||||
|
||||
let dayFormat;
|
||||
let dayString;
|
||||
let now = new Date();
|
||||
if (_sameYear(day, now))
|
||||
/* Translators: Shown on calendar heading when selected day occurs on current year */
|
||||
dayFormat = Shell.util_translate_time_string(NC_("calendar heading",
|
||||
"%A, %B %d"));
|
||||
dayString = day.toLocaleFormat(C_("calendar heading", "%A, %B %d"));
|
||||
else
|
||||
/* Translators: Shown on calendar heading when selected day occurs on different year */
|
||||
dayFormat = Shell.util_translate_time_string(NC_("calendar heading",
|
||||
"%A, %B %d, %Y"));
|
||||
let dayString = day.toLocaleFormat(dayFormat);
|
||||
dayString = day.toLocaleFormat(C_("calendar heading", "%A, %B %d, %Y"));
|
||||
this._addPeriod(dayString, 0, dayBegin, dayEnd, false, true);
|
||||
},
|
||||
|
||||
_showToday: function() {
|
||||
this.actor.destroy_all_children();
|
||||
let index = 0;
|
||||
|
||||
let now = new Date();
|
||||
@ -879,6 +892,24 @@ const EventsList = new Lang.Class({
|
||||
if (this._eventSource.isLoading)
|
||||
return;
|
||||
|
||||
this.actor.destroy_all_children();
|
||||
|
||||
let layout = this.actor.layout_manager;
|
||||
|
||||
this._eventListContainer = new St.BoxLayout({ x_expand: true, y_expand: true });
|
||||
this._eventListContainer.set_vertical(true);
|
||||
|
||||
this._eventListBox = new St.BoxLayout();
|
||||
this._eventListBox.set_vertical(true);
|
||||
|
||||
let eventScrollView = new St.ScrollView({style_class: 'vfade',
|
||||
hscrollbar_policy: Gtk.PolicyType.NEVER,
|
||||
vscrollbar_policy: Gtk.PolicyType.AUTOMATIC});
|
||||
eventScrollView.add_actor(this._eventListBox);
|
||||
this._eventListContainer.add_actor(eventScrollView);
|
||||
|
||||
layout.attach(this._eventListContainer, 0, 0, 1, 1);
|
||||
|
||||
let today = new Date();
|
||||
if (_sameDay (this._date, today)) {
|
||||
this._showToday();
|
||||
|
||||
@ -604,9 +604,15 @@ const NetworkAgent = new Lang.Class({
|
||||
Name: 'NetworkAgent',
|
||||
|
||||
_init: function() {
|
||||
this._native = new Shell.NetworkAgent({ identifier: 'org.gnome.Shell.NetworkAgent',
|
||||
capabilities: NMClient.SecretAgentCapabilities.VPN_HINTS
|
||||
});
|
||||
try {
|
||||
this._native = new Shell.NetworkAgent({ identifier: 'org.gnome.Shell.NetworkAgent',
|
||||
capabilities: NMClient.SecretAgentCapabilities.VPN_HINTS
|
||||
});
|
||||
} catch(e) {
|
||||
// Support older versions without NetworkAgent:capabilities
|
||||
this._native = new Shell.NetworkAgent({ identifier: 'org.gnome.Shell.NetworkAgent'
|
||||
});
|
||||
}
|
||||
|
||||
this._dialogs = { };
|
||||
this._vpnRequests = { };
|
||||
|
||||
@ -36,8 +36,6 @@ const NotificationDirection = {
|
||||
RECEIVED: 'chat-received'
|
||||
};
|
||||
|
||||
const N_ = function(s) { return s; };
|
||||
|
||||
function makeMessageFromTpMessage(tpMessage, direction) {
|
||||
let [text, flags] = tpMessage.to_text();
|
||||
|
||||
@ -952,70 +950,70 @@ const ChatNotification = new Lang.Class({
|
||||
// Show only the time if date is on today
|
||||
if(daysAgo < 1){
|
||||
/* Translators: Time in 24h format */
|
||||
format = N_("%H\u2236%M");
|
||||
format = _("%H\u2236%M");
|
||||
}
|
||||
// Show the word "Yesterday" and time if date is on yesterday
|
||||
else if(daysAgo <2){
|
||||
/* Translators: this is the word "Yesterday" followed by a
|
||||
time string in 24h format. i.e. "Yesterday, 14:30" */
|
||||
// xgettext:no-c-format
|
||||
format = N_("Yesterday, %H\u2236%M");
|
||||
format = _("Yesterday, %H\u2236%M");
|
||||
}
|
||||
// Show a week day and time if date is in the last week
|
||||
else if (daysAgo < 7) {
|
||||
/* Translators: this is the week day name followed by a time
|
||||
string in 24h format. i.e. "Monday, 14:30" */
|
||||
// xgettext:no-c-format
|
||||
format = N_("%A, %H\u2236%M");
|
||||
format = _("%A, %H\u2236%M");
|
||||
|
||||
} else if (date.getYear() == now.getYear()) {
|
||||
/* Translators: this is the month name and day number
|
||||
followed by a time string in 24h format.
|
||||
i.e. "May 25, 14:30" */
|
||||
// xgettext:no-c-format
|
||||
format = N_("%B %d, %H\u2236%M");
|
||||
format = _("%B %d, %H\u2236%M");
|
||||
} else {
|
||||
/* Translators: this is the month name, day number, year
|
||||
number followed by a time string in 24h format.
|
||||
i.e. "May 25 2012, 14:30" */
|
||||
// xgettext:no-c-format
|
||||
format = N_("%B %d %Y, %H\u2236%M");
|
||||
format = _("%B %d %Y, %H\u2236%M");
|
||||
}
|
||||
} else {
|
||||
// Show only the time if date is on today
|
||||
if(daysAgo < 1){
|
||||
/* Translators: Time in 24h format */
|
||||
format = N_("%l\u2236%M %p");
|
||||
format = _("%l\u2236%M %p");
|
||||
}
|
||||
// Show the word "Yesterday" and time if date is on yesterday
|
||||
else if(daysAgo <2){
|
||||
/* Translators: this is the word "Yesterday" followed by a
|
||||
time string in 12h format. i.e. "Yesterday, 2:30 pm" */
|
||||
// xgettext:no-c-format
|
||||
format = N_("Yesterday, %l\u2236%M %p");
|
||||
format = _("Yesterday, %l\u2236%M %p");
|
||||
}
|
||||
// Show a week day and time if date is in the last week
|
||||
else if (daysAgo < 7) {
|
||||
/* Translators: this is the week day name followed by a time
|
||||
string in 12h format. i.e. "Monday, 2:30 pm" */
|
||||
// xgettext:no-c-format
|
||||
format = N_("%A, %l\u2236%M %p");
|
||||
format = _("%A, %l\u2236%M %p");
|
||||
|
||||
} else if (date.getYear() == now.getYear()) {
|
||||
/* Translators: this is the month name and day number
|
||||
followed by a time string in 12h format.
|
||||
i.e. "May 25, 2:30 pm" */
|
||||
// xgettext:no-c-format
|
||||
format = N_("%B %d, %l\u2236%M %p");
|
||||
format = _("%B %d, %l\u2236%M %p");
|
||||
} else {
|
||||
/* Translators: this is the month name, day number, year
|
||||
number followed by a time string in 12h format.
|
||||
i.e. "May 25 2012, 2:30 pm"*/
|
||||
// xgettext:no-c-format
|
||||
format = N_("%B %d %Y, %l\u2236%M %p");
|
||||
format = _("%B %d %Y, %l\u2236%M %p");
|
||||
}
|
||||
}
|
||||
return date.toLocaleFormat(Shell.util_translate_time_string(format));
|
||||
return date.toLocaleFormat(format);
|
||||
},
|
||||
|
||||
appendTimestamp: function() {
|
||||
@ -1266,8 +1264,9 @@ const SubscriptionRequestNotification = new Lang.Class({
|
||||
let file = contact.get_avatar_file();
|
||||
|
||||
if (file) {
|
||||
let uri = file.get_uri();
|
||||
let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor;
|
||||
iconBox.child = textureCache.load_file_async(file, iconBox._size, iconBox._size, scaleFactor);
|
||||
iconBox.child = textureCache.load_uri_async(uri, iconBox._size, iconBox._size, scaleFactor);
|
||||
}
|
||||
else {
|
||||
iconBox.child = new St.Icon({ icon_name: 'avatar-default',
|
||||
|
||||
@ -59,7 +59,7 @@ const DateMenuButton = new Lang.Class({
|
||||
|
||||
// Fill up the first column
|
||||
|
||||
vbox = new St.BoxLayout({vertical: true});
|
||||
vbox = new St.BoxLayout({vertical: true, x_expand: true, y_expand: true });
|
||||
hbox.add(vbox);
|
||||
|
||||
// Date
|
||||
@ -96,11 +96,11 @@ const DateMenuButton = new Lang.Class({
|
||||
|
||||
this._openCalendarItem = new PopupMenu.PopupMenuItem(_("Open Calendar"));
|
||||
this._openCalendarItem.connect('activate', Lang.bind(this, this._onOpenCalendarActivate));
|
||||
vbox.add(this._openCalendarItem.actor, {y_align: St.Align.END, expand: true, y_fill: false});
|
||||
vbox.add(this._openCalendarItem.actor, {y_align: St.Align.END, expand: false, y_fill: false});
|
||||
|
||||
this._openClocksItem = new PopupMenu.PopupMenuItem(_("Open Clocks"));
|
||||
this._openClocksItem.connect('activate', Lang.bind(this, this._onOpenClocksActivate));
|
||||
vbox.add(this._openClocksItem.actor, {y_align: St.Align.END, expand: true, y_fill: false});
|
||||
vbox.add(this._openClocksItem.actor, {y_align: St.Align.END, expand: false, y_fill: false});
|
||||
|
||||
Shell.AppSystem.get_default().connect('installed-changed',
|
||||
Lang.bind(this, this._appInstalledChanged));
|
||||
@ -129,7 +129,7 @@ const DateMenuButton = new Lang.Class({
|
||||
/* Translators: This is the date format to use when the calendar popup is
|
||||
* shown - it is shown just below the time in the shell (e.g. "Tue 9:29 AM").
|
||||
*/
|
||||
let dateFormat = Shell.util_translate_time_string ("%A %B %e, %Y");
|
||||
let dateFormat = _("%A %B %e, %Y");
|
||||
this._date.set_label(now.toLocaleFormat(dateFormat));
|
||||
}
|
||||
}));
|
||||
@ -147,7 +147,7 @@ const DateMenuButton = new Lang.Class({
|
||||
let now = new Date();
|
||||
return now.getYear() == date.getYear() &&
|
||||
now.getMonth() == date.getMonth() &&
|
||||
now.getDay() == date.getDay();
|
||||
now.getDate() == date.getDate();
|
||||
},
|
||||
|
||||
_appInstalledChanged: function() {
|
||||
|
||||
@ -6,6 +6,8 @@ const Meta = imports.gi.Meta;
|
||||
const Clutter = imports.gi.Clutter;
|
||||
const St = imports.gi.St;
|
||||
|
||||
const Main = imports.ui.main;
|
||||
|
||||
const EDGE_THRESHOLD = 20;
|
||||
const DRAG_DISTANCE = 80;
|
||||
|
||||
@ -13,9 +15,10 @@ const EdgeDragAction = new Lang.Class({
|
||||
Name: 'EdgeDragAction',
|
||||
Extends: Clutter.GestureAction,
|
||||
|
||||
_init : function(side) {
|
||||
_init : function(side, allowedModes) {
|
||||
this.parent();
|
||||
this._side = side;
|
||||
this._allowedModes = allowedModes;
|
||||
this.set_n_touch_points(1);
|
||||
|
||||
global.display.connect('grab-op-begin', Lang.bind(this, function() {
|
||||
@ -34,6 +37,9 @@ const EdgeDragAction = new Lang.Class({
|
||||
if (this.get_n_current_points() == 0)
|
||||
return false;
|
||||
|
||||
if (!(this._allowedModes & Main.keybindingMode))
|
||||
return false;
|
||||
|
||||
let [x, y] = this.get_press_coords(0);
|
||||
let monitorRect = this._getMonitorRect(x, y);
|
||||
|
||||
|
||||
@ -74,7 +74,7 @@ function disableExtension(uuid) {
|
||||
|
||||
if (extension.stylesheet) {
|
||||
let theme = St.ThemeContext.get_for_stage(global.stage).get_theme();
|
||||
theme.unload_stylesheet(extension.stylesheet);
|
||||
theme.unload_stylesheet(extension.stylesheet.get_path());
|
||||
}
|
||||
|
||||
try {
|
||||
@ -118,7 +118,7 @@ function enableExtension(uuid) {
|
||||
let stylesheetFile = extension.dir.get_child(stylesheetNames[i]);
|
||||
if (stylesheetFile.query_exists(null)) {
|
||||
let theme = St.ThemeContext.get_for_stage(global.stage).get_theme();
|
||||
theme.load_stylesheet(stylesheetFile);
|
||||
theme.load_stylesheet(stylesheetFile.get_path());
|
||||
extension.stylesheet = stylesheetFile;
|
||||
break;
|
||||
}
|
||||
|
||||
@ -422,7 +422,10 @@ const LayoutManager = new Lang.Class({
|
||||
this.panelBox.set_position(this.primaryMonitor.x, this.primaryMonitor.y);
|
||||
this.panelBox.set_size(this.primaryMonitor.width, -1);
|
||||
|
||||
this.keyboardIndex = this.primaryIndex;
|
||||
if (this.keyboardIndex < 0)
|
||||
this.keyboardIndex = this.primaryIndex;
|
||||
else
|
||||
this._updateKeyboardBox();
|
||||
|
||||
this.trayBox.set_position(this.bottomMonitor.x,
|
||||
this.bottomMonitor.y + this.bottomMonitor.height);
|
||||
|
||||
@ -129,9 +129,6 @@ function _initializeUI() {
|
||||
Shell.WindowTracker.get_default();
|
||||
Shell.AppUsage.get_default();
|
||||
|
||||
let resource = Gio.Resource.load(global.datadir + '/gnome-shell-theme.gresource');
|
||||
resource._register();
|
||||
|
||||
_loadDefaultStylesheet();
|
||||
|
||||
// Setup the stage hierarchy early
|
||||
@ -225,26 +222,12 @@ function _initializeUI() {
|
||||
});
|
||||
}
|
||||
|
||||
function _getDefaultStylesheet() {
|
||||
let stylesheet;
|
||||
|
||||
stylesheet = Gio.File.new_for_uri('resource:///org/gnome/shell/theme/' + sessionMode.stylesheetName);
|
||||
if (stylesheet.query_exists(null))
|
||||
return stylesheet;
|
||||
|
||||
stylesheet = Gio.File.new_for_path(global.datadir + '/theme/' + sessionMode.stylesheetName);
|
||||
if (stylesheet.query_exists(null))
|
||||
return stylesheet;
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
function _loadDefaultStylesheet() {
|
||||
if (!sessionMode.isPrimary)
|
||||
return;
|
||||
|
||||
let stylesheet = _getDefaultStylesheet();
|
||||
if (_defaultCssStylesheet && _defaultCssStylesheet.equal(stylesheet))
|
||||
let stylesheet = global.datadir + '/theme/' + sessionMode.stylesheetName;
|
||||
if (_defaultCssStylesheet == stylesheet)
|
||||
return;
|
||||
|
||||
_defaultCssStylesheet = stylesheet;
|
||||
@ -271,7 +254,7 @@ function getThemeStylesheet() {
|
||||
* Set the theme CSS file that the shell will load
|
||||
*/
|
||||
function setThemeStylesheet(cssStylesheet) {
|
||||
_cssStylesheet = Gio.File.new_for_path(cssStylesheet);
|
||||
_cssStylesheet = cssStylesheet;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -1951,7 +1951,9 @@ const MessageTray = new Lang.Class({
|
||||
this._messageTrayMenuButton.actor.connect('key-press-event',
|
||||
Lang.bind(this, this._onTrayButtonKeyPress));
|
||||
|
||||
let gesture = new EdgeDragAction.EdgeDragAction(St.Side.BOTTOM);
|
||||
let gesture = new EdgeDragAction.EdgeDragAction(St.Side.BOTTOM,
|
||||
Shell.KeyBindingMode.NORMAL |
|
||||
Shell.KeyBindingMode.OVERVIEW);
|
||||
gesture.connect('activated', Lang.bind(this, this.toggle));
|
||||
global.stage.add_action(gesture);
|
||||
},
|
||||
|
||||
@ -194,7 +194,7 @@ const ModalDialog = new Lang.Class({
|
||||
},
|
||||
|
||||
placeSpinner: function(layoutInfo) {
|
||||
let spinnerIcon = Gio.File.new_for_uri('resource:///org/gnome/shell/theme/process-working.svg');
|
||||
let spinnerIcon = global.datadir + '/theme/process-working.svg';
|
||||
this._workSpinner = new Animation.AnimatedIcon(spinnerIcon, WORK_SPINNER_ICON_SIZE);
|
||||
this._workSpinner.actor.opacity = 0;
|
||||
this._workSpinner.actor.show();
|
||||
|
||||
@ -273,7 +273,7 @@ const AppMenuButton = new Lang.Class({
|
||||
_onStyleChanged: function(actor) {
|
||||
let node = actor.get_theme_node();
|
||||
let [success, icon] = node.lookup_url('spinner-image', false);
|
||||
if (!success || (this._spinnerIcon && this._spinnerIcon.equal(icon)))
|
||||
if (!success || this._spinnerIcon == icon)
|
||||
return;
|
||||
this._spinnerIcon = icon;
|
||||
this._spinner = new Animation.AnimatedIcon(this._spinnerIcon, PANEL_ICON_SIZE);
|
||||
|
||||
@ -85,8 +85,7 @@ const Clock = new Lang.Class({
|
||||
let date = new Date();
|
||||
/* Translators: This is a time format for a date in
|
||||
long format */
|
||||
let dateFormat = Shell.util_translate_time_string("%A, %B %d");
|
||||
this._date.text = date.toLocaleFormat(dateFormat);
|
||||
this._date.text = date.toLocaleFormat(_("%A, %B %d"));
|
||||
},
|
||||
|
||||
destroy: function() {
|
||||
|
||||
@ -876,8 +876,7 @@ const NMWirelessDialog = new Lang.Class({
|
||||
x_align: Clutter.ActorAlign.CENTER,
|
||||
y_align: Clutter.ActorAlign.CENTER });
|
||||
|
||||
let file = Gio.File.new_for_uri('resource:///org/gnome/shell/theme/process-working.svg');
|
||||
this._noNetworksSpinner = new Animation.AnimatedIcon(file, 24, 24);
|
||||
this._noNetworksSpinner = new Animation.AnimatedIcon(global.datadir + '/theme/process-working.svg', 24, 24);
|
||||
this._noNetworksBox.add_actor(this._noNetworksSpinner.actor);
|
||||
this._noNetworksBox.add_actor(new St.Label({ style_class: 'no-networks-label',
|
||||
text: _("No Networks") }));
|
||||
@ -1867,7 +1866,7 @@ const NMApplet = new Lang.Class({
|
||||
_connectionRemoved: function(connection) {
|
||||
let pos = this._connections.indexOf(connection);
|
||||
if (pos != -1)
|
||||
this._connections.splice(connection, 1);
|
||||
this._connections.splice(pos, 1);
|
||||
|
||||
let section = connection._section;
|
||||
|
||||
|
||||
@ -65,7 +65,8 @@ const ShowOverviewAction = new Lang.Class({
|
||||
},
|
||||
|
||||
vfunc_gesture_prepare : function(action, actor) {
|
||||
return this.get_n_current_points() == this.get_n_touch_points();
|
||||
return Main.keybindingMode == Shell.KeyBindingMode.NORMAL &&
|
||||
this.get_n_current_points() == this.get_n_touch_points();
|
||||
},
|
||||
|
||||
_getBoundingRect : function(motion) {
|
||||
@ -193,8 +194,10 @@ const ViewSelector = new Lang.Class({
|
||||
// the windows to animate, but now we no longer want to
|
||||
// show it given that we are now on the apps page or
|
||||
// search page.
|
||||
if (this._activePage != this._workspacesPage)
|
||||
if (this._activePage != this._workspacesPage) {
|
||||
this._workspacesPage.opacity = 0;
|
||||
this._workspacesPage.hide();
|
||||
}
|
||||
}));
|
||||
|
||||
Main.wm.addKeybinding('toggle-application-view',
|
||||
@ -213,7 +216,8 @@ const ViewSelector = new Lang.Class({
|
||||
|
||||
let gesture;
|
||||
|
||||
gesture = new EdgeDragAction.EdgeDragAction(St.Side.LEFT);
|
||||
gesture = new EdgeDragAction.EdgeDragAction(St.Side.LEFT,
|
||||
Shell.KeyBindingMode.NORMAL);
|
||||
gesture.connect('activated', Lang.bind(this, function() {
|
||||
if (Main.overview.visible)
|
||||
Main.overview.hide();
|
||||
|
||||
@ -478,7 +478,9 @@ const WorkspaceSwitchAction = new Lang.Class({
|
||||
},
|
||||
|
||||
vfunc_gesture_prepare : function(action, actor) {
|
||||
return this.get_n_current_points() == this.get_n_touch_points();
|
||||
let allowedModes = Shell.KeyBindingMode.NORMAL | Shell.KeyBindingMode.OVERVIEW;
|
||||
return this.get_n_current_points() == this.get_n_touch_points() &&
|
||||
(allowedModes & Main.keybindingMode);
|
||||
},
|
||||
|
||||
vfunc_gesture_end : function(action, actor) {
|
||||
@ -526,7 +528,7 @@ const AppSwitchAction = new Lang.Class({
|
||||
},
|
||||
|
||||
vfunc_gesture_prepare : function(action, actor) {
|
||||
if (Main.overview.visible) {
|
||||
if (Main.keybindingMode != Shell.KeyBindingMode.NORMAL) {
|
||||
this.cancel();
|
||||
return false;
|
||||
}
|
||||
|
||||
@ -68,7 +68,6 @@ th
|
||||
tr
|
||||
ug
|
||||
uk
|
||||
uz@cyrillic
|
||||
vi
|
||||
zh_CN
|
||||
zh_HK
|
||||
|
||||
1877
po/uz@cyrillic.po
1877
po/uz@cyrillic.po
File diff suppressed because it is too large
Load Diff
@ -176,18 +176,54 @@ static void
|
||||
calendar_sources_init (CalendarSources *sources)
|
||||
{
|
||||
GError *error = NULL;
|
||||
GDBusConnection *session_bus;
|
||||
GVariant *result;
|
||||
|
||||
sources->priv = CALENDAR_SOURCES_GET_PRIVATE (sources);
|
||||
|
||||
/* XXX Not sure what to do if this fails.
|
||||
* Should this class implement GInitable or pass the
|
||||
* registry in as a G_PARAM_CONSTRUCT_ONLY property? */
|
||||
sources->priv->registry = e_source_registry_new_sync (NULL, &error);
|
||||
/* WORKAROUND: the hardcoded timeout for e_source_registry_new_sync()
|
||||
(and other library calls that eventually call g_dbus_proxy_new[_sync]())
|
||||
is 25 seconds. This has been shown to be too small for
|
||||
evolution-source-registry in certain cases (slow disk, concurrent IO,
|
||||
many configured sources), so we first ensure that the service
|
||||
starts with a manual call and a higher timeout.
|
||||
|
||||
HACK: every time the DBus API is bumped in e-d-s we need
|
||||
to update this!
|
||||
*/
|
||||
session_bus = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &error);
|
||||
if (session_bus == NULL)
|
||||
{
|
||||
g_error ("Failed to connect to the session bus: %s", error->message);
|
||||
}
|
||||
|
||||
result = g_dbus_connection_call_sync (session_bus, "org.freedesktop.DBus",
|
||||
"/", "org.freedesktop.DBus",
|
||||
"StartServiceByName",
|
||||
g_variant_new ("(su)",
|
||||
"org.gnome.evolution.dataserver.Sources3",
|
||||
0),
|
||||
NULL,
|
||||
G_DBUS_CALL_FLAGS_NONE,
|
||||
60 * 1000,
|
||||
NULL, &error);
|
||||
if (result != NULL)
|
||||
{
|
||||
g_variant_unref (result);
|
||||
sources->priv->registry = e_source_registry_new_sync (NULL, &error);
|
||||
}
|
||||
|
||||
if (error != NULL)
|
||||
{
|
||||
g_error ("%s: %s", G_STRFUNC, error->message);
|
||||
/* Any error is fatal, but we don't want to crash gnome-shell-calendar-server
|
||||
because of e-d-s problems. So just exit here.
|
||||
*/
|
||||
g_warning ("Failed to start evolution-source-registry: %s", error->message);
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
|
||||
g_object_unref (session_bus);
|
||||
|
||||
sources->priv->source_added_id = g_signal_connect (sources->priv->registry,
|
||||
"source-added",
|
||||
G_CALLBACK (calendar_sources_registry_source_changed_cb),
|
||||
|
||||
@ -1132,6 +1132,14 @@ shell_global_end_modal (ShellGlobal *global,
|
||||
sync_input_region (global);
|
||||
}
|
||||
|
||||
void
|
||||
shell_global_freeze_keyboard (ShellGlobal *global,
|
||||
guint32 timestamp)
|
||||
{
|
||||
if (global->stage_xwindow != None)
|
||||
meta_display_freeze_keyboard (global->meta_display, global->stage_xwindow, timestamp);
|
||||
}
|
||||
|
||||
/* Code to close all file descriptors before we exec; copied from gspawn.c in GLib.
|
||||
*
|
||||
* Authors: Padraig O'Briain, Matthias Clasen, Lennart Poettering
|
||||
|
||||
@ -45,6 +45,8 @@ gboolean shell_global_begin_modal (ShellGlobal *global,
|
||||
MetaModalOptions options);
|
||||
void shell_global_end_modal (ShellGlobal *global,
|
||||
guint32 timestamp);
|
||||
void shell_global_freeze_keyboard (ShellGlobal *global,
|
||||
guint32 timestamp);
|
||||
|
||||
void shell_global_set_stage_input_region (ShellGlobal *global,
|
||||
GSList *rectangles);
|
||||
|
||||
@ -12,7 +12,6 @@
|
||||
#include <gdk/gdkx.h>
|
||||
#include <X11/extensions/XTest.h>
|
||||
|
||||
#include <locale.h>
|
||||
#ifdef HAVE__NL_TIME_FIRST_WEEKDAY
|
||||
#include <langinfo.h>
|
||||
#endif
|
||||
@ -209,32 +208,6 @@ shell_util_get_week_start ()
|
||||
return week_start;
|
||||
}
|
||||
|
||||
/**
|
||||
* shell_util_translate_time_string:
|
||||
* @str: String to translate
|
||||
*
|
||||
* Translate @str according to the locale defined by LC_TIME; unlike
|
||||
* dcgettext(), the translations is still taken from the LC_MESSAGES
|
||||
* catalogue and not the LC_TIME one.
|
||||
*
|
||||
* Returns: the translated string
|
||||
*/
|
||||
const char *
|
||||
shell_util_translate_time_string (const char *str)
|
||||
{
|
||||
const char *locale = g_getenv ("LC_TIME");
|
||||
const char *res;
|
||||
|
||||
if (locale)
|
||||
setlocale (LC_MESSAGES, locale);
|
||||
|
||||
res = gettext (str);
|
||||
|
||||
setlocale (LC_MESSAGES, "");
|
||||
|
||||
return res;
|
||||
}
|
||||
|
||||
/**
|
||||
* shell_write_string_to_stream:
|
||||
* @stream: a #GOutputStream
|
||||
|
||||
@ -21,7 +21,6 @@ int shell_util_get_week_start (void);
|
||||
|
||||
char *shell_util_format_date (const char *format,
|
||||
gint64 time_ms);
|
||||
const char *shell_util_translate_time_string (const char *str);
|
||||
|
||||
gboolean shell_write_string_to_stream (GOutputStream *stream,
|
||||
const char *str,
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
struct _StBorderImage {
|
||||
GObject parent;
|
||||
|
||||
GFile *file;
|
||||
char *filename;
|
||||
int border_top;
|
||||
int border_right;
|
||||
int border_bottom;
|
||||
@ -48,7 +48,7 @@ st_border_image_finalize (GObject *object)
|
||||
{
|
||||
StBorderImage *image = ST_BORDER_IMAGE (object);
|
||||
|
||||
g_object_unref (image->file);
|
||||
g_free (image->filename);
|
||||
|
||||
G_OBJECT_CLASS (st_border_image_parent_class)->finalize (object);
|
||||
}
|
||||
@ -67,18 +67,18 @@ st_border_image_init (StBorderImage *image)
|
||||
}
|
||||
|
||||
StBorderImage *
|
||||
st_border_image_new (GFile *file,
|
||||
int border_top,
|
||||
int border_right,
|
||||
int border_bottom,
|
||||
int border_left,
|
||||
int scale_factor)
|
||||
st_border_image_new (const char *filename,
|
||||
int border_top,
|
||||
int border_right,
|
||||
int border_bottom,
|
||||
int border_left,
|
||||
int scale_factor)
|
||||
{
|
||||
StBorderImage *image;
|
||||
|
||||
image = g_object_new (ST_TYPE_BORDER_IMAGE, NULL);
|
||||
|
||||
image->file = g_object_ref (file);
|
||||
image->filename = g_strdup (filename);
|
||||
image->border_top = border_top;
|
||||
image->border_right = border_right;
|
||||
image->border_bottom = border_bottom;
|
||||
@ -88,18 +88,12 @@ st_border_image_new (GFile *file,
|
||||
return image;
|
||||
}
|
||||
|
||||
/**
|
||||
* st_border_image_get_file:
|
||||
* @image: a #StBorder_Image
|
||||
*
|
||||
* Returns: (transfer none): the #GFile for the #StBorder_Image
|
||||
*/
|
||||
GFile *
|
||||
st_border_image_get_file (StBorderImage *image)
|
||||
const char *
|
||||
st_border_image_get_filename (StBorderImage *image)
|
||||
{
|
||||
g_return_val_if_fail (ST_IS_BORDER_IMAGE (image), NULL);
|
||||
|
||||
return image->file;
|
||||
return image->filename;
|
||||
}
|
||||
|
||||
void
|
||||
@ -141,5 +135,5 @@ st_border_image_equal (StBorderImage *image,
|
||||
image->border_right == other->border_right &&
|
||||
image->border_bottom == other->border_bottom &&
|
||||
image->border_left == other->border_left &&
|
||||
g_file_equal (image->file, other->file));
|
||||
strcmp (image->filename, other->filename) == 0);
|
||||
}
|
||||
|
||||
@ -22,7 +22,6 @@
|
||||
#define __ST_BORDER_IMAGE_H__
|
||||
|
||||
#include <glib-object.h>
|
||||
#include <gio/gio.h>
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
@ -40,14 +39,14 @@ typedef struct _StBorderImageClass StBorderImageClass;
|
||||
|
||||
GType st_border_image_get_type (void) G_GNUC_CONST;
|
||||
|
||||
StBorderImage *st_border_image_new (GFile *file,
|
||||
StBorderImage *st_border_image_new (const char *filename,
|
||||
int border_top,
|
||||
int border_right,
|
||||
int border_bottom,
|
||||
int border_left,
|
||||
int scale_factor);
|
||||
|
||||
GFile *st_border_image_get_file (StBorderImage *image);
|
||||
const char *st_border_image_get_filename (StBorderImage *image);
|
||||
void st_border_image_get_borders (StBorderImage *image,
|
||||
int *border_top,
|
||||
int *border_right,
|
||||
|
||||
@ -373,7 +373,6 @@ st_scroll_view_get_preferred_width (ClutterActor *actor,
|
||||
break;
|
||||
case GTK_POLICY_ALWAYS:
|
||||
case GTK_POLICY_AUTOMATIC:
|
||||
case GTK_POLICY_EXTERNAL:
|
||||
/* Should theoretically use the min width of the hscrollbar,
|
||||
* but that's not cleanly defined at the moment */
|
||||
min_width = 0;
|
||||
@ -383,7 +382,6 @@ st_scroll_view_get_preferred_width (ClutterActor *actor,
|
||||
switch (priv->vscrollbar_policy)
|
||||
{
|
||||
case GTK_POLICY_NEVER:
|
||||
case GTK_POLICY_EXTERNAL:
|
||||
account_for_vscrollbar = FALSE;
|
||||
break;
|
||||
case GTK_POLICY_ALWAYS:
|
||||
@ -445,7 +443,6 @@ st_scroll_view_get_preferred_height (ClutterActor *actor,
|
||||
switch (priv->vscrollbar_policy)
|
||||
{
|
||||
case GTK_POLICY_NEVER:
|
||||
case GTK_POLICY_EXTERNAL:
|
||||
break;
|
||||
case GTK_POLICY_ALWAYS:
|
||||
case GTK_POLICY_AUTOMATIC:
|
||||
@ -457,7 +454,6 @@ st_scroll_view_get_preferred_height (ClutterActor *actor,
|
||||
switch (priv->hscrollbar_policy)
|
||||
{
|
||||
case GTK_POLICY_NEVER:
|
||||
case GTK_POLICY_EXTERNAL:
|
||||
account_for_hscrollbar = FALSE;
|
||||
break;
|
||||
case GTK_POLICY_ALWAYS:
|
||||
@ -484,7 +480,6 @@ st_scroll_view_get_preferred_height (ClutterActor *actor,
|
||||
break;
|
||||
case GTK_POLICY_ALWAYS:
|
||||
case GTK_POLICY_AUTOMATIC:
|
||||
case GTK_POLICY_EXTERNAL:
|
||||
/* Should theoretically use the min height of the vscrollbar,
|
||||
* but that's not cleanly defined at the moment */
|
||||
min_height = 0;
|
||||
@ -572,7 +567,7 @@ st_scroll_view_allocate (ClutterActor *actor,
|
||||
}
|
||||
else
|
||||
{
|
||||
hscrollbar_visible = priv->hscrollbar_policy == GTK_POLICY_ALWAYS;
|
||||
hscrollbar_visible = priv->hscrollbar_policy != GTK_POLICY_NEVER;
|
||||
|
||||
/* try without a vertical scrollbar */
|
||||
clutter_actor_get_preferred_height (priv->child, avail_width, &child_min_height, NULL);
|
||||
@ -581,20 +576,18 @@ st_scroll_view_allocate (ClutterActor *actor,
|
||||
}
|
||||
else
|
||||
{
|
||||
vscrollbar_visible = priv->vscrollbar_policy == GTK_POLICY_ALWAYS;
|
||||
vscrollbar_visible = priv->vscrollbar_policy != GTK_POLICY_NEVER;
|
||||
|
||||
if (priv->hscrollbar_policy == GTK_POLICY_AUTOMATIC)
|
||||
hscrollbar_visible = child_min_width > avail_height - (vscrollbar_visible ? 0 : sb_width);
|
||||
else
|
||||
hscrollbar_visible = priv->hscrollbar_policy == GTK_POLICY_ALWAYS;
|
||||
hscrollbar_visible = priv->hscrollbar_policy != GTK_POLICY_NEVER;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
hscrollbar_visible = priv->hscrollbar_policy != GTK_POLICY_NEVER &&
|
||||
priv->hscrollbar_policy != GTK_POLICY_EXTERNAL;
|
||||
vscrollbar_visible = priv->vscrollbar_policy != GTK_POLICY_NEVER &&
|
||||
priv->vscrollbar_policy != GTK_POLICY_EXTERNAL;
|
||||
hscrollbar_visible = priv->hscrollbar_policy != GTK_POLICY_NEVER;
|
||||
vscrollbar_visible = priv->vscrollbar_policy != GTK_POLICY_NEVER;
|
||||
}
|
||||
|
||||
/* Whether or not we show the scrollbars, if the scrollbars are visible
|
||||
@ -636,19 +629,15 @@ st_scroll_view_allocate (ClutterActor *actor,
|
||||
|
||||
clutter_actor_allocate (priv->hscroll, &child_box, flags);
|
||||
|
||||
/* In case the scrollbar policy is NEVER or EXTERNAL or scrollbars
|
||||
* should be overlayed, we don't trim the content box allocation by
|
||||
* the scrollbar size.
|
||||
/* In case the scrollbar policy is NEVER or scrollbars should be
|
||||
* overlayed, we don't trim the content box allocation by the
|
||||
* scrollbar size.
|
||||
* Fold this into the scrollbar sizes to simplify the rest of the
|
||||
* computations.
|
||||
*/
|
||||
if (priv->hscrollbar_policy == GTK_POLICY_NEVER ||
|
||||
priv->hscrollbar_policy == GTK_POLICY_EXTERNAL ||
|
||||
priv->overlay_scrollbars)
|
||||
if (priv->hscrollbar_policy == GTK_POLICY_NEVER || priv->overlay_scrollbars)
|
||||
sb_height = 0;
|
||||
if (priv->vscrollbar_policy == GTK_POLICY_NEVER ||
|
||||
priv->vscrollbar_policy == GTK_POLICY_EXTERNAL ||
|
||||
priv->overlay_scrollbars)
|
||||
if (priv->vscrollbar_policy == GTK_POLICY_NEVER || priv->overlay_scrollbars)
|
||||
sb_width = 0;
|
||||
|
||||
/* Child */
|
||||
|
||||
@ -28,8 +28,8 @@
|
||||
#include <glib.h>
|
||||
|
||||
#define CACHE_PREFIX_ICON "icon:"
|
||||
#define CACHE_PREFIX_FILE "file:"
|
||||
#define CACHE_PREFIX_FILE_FOR_CAIRO "file-for-cairo:"
|
||||
#define CACHE_PREFIX_URI "uri:"
|
||||
#define CACHE_PREFIX_URI_FOR_CAIRO "uri-for-cairo:"
|
||||
|
||||
struct _StTextureCachePrivate
|
||||
{
|
||||
@ -101,7 +101,7 @@ st_texture_cache_class_init (StTextureCacheClass *klass)
|
||||
G_SIGNAL_RUN_LAST,
|
||||
0, /* no default handler slot */
|
||||
NULL, NULL, NULL,
|
||||
G_TYPE_NONE, 1, G_TYPE_FILE);
|
||||
G_TYPE_NONE, 1, G_TYPE_STRING);
|
||||
}
|
||||
|
||||
/* Evicts all cached textures for named icons */
|
||||
@ -147,7 +147,7 @@ st_texture_cache_init (StTextureCache *self)
|
||||
g_free, cogl_object_unref);
|
||||
self->priv->outstanding_requests = g_hash_table_new_full (g_str_hash, g_str_equal,
|
||||
g_free, NULL);
|
||||
self->priv->file_monitors = g_hash_table_new_full (g_file_hash, (GEqualFunc) g_file_equal,
|
||||
self->priv->file_monitors = g_hash_table_new_full (g_str_hash, g_str_equal,
|
||||
g_object_unref, g_object_unref);
|
||||
|
||||
}
|
||||
@ -268,7 +268,7 @@ typedef struct {
|
||||
|
||||
GtkIconInfo *icon_info;
|
||||
StIconColors *colors;
|
||||
GFile *file;
|
||||
char *uri;
|
||||
} AsyncTextureLoadData;
|
||||
|
||||
static void
|
||||
@ -282,8 +282,8 @@ texture_load_data_free (gpointer p)
|
||||
if (data->colors)
|
||||
st_icon_colors_unref (data->colors);
|
||||
}
|
||||
else if (data->file)
|
||||
g_object_unref (data->file);
|
||||
else if (data->uri)
|
||||
g_free (data->uri);
|
||||
|
||||
if (data->key)
|
||||
g_free (data->key);
|
||||
@ -405,17 +405,83 @@ out:
|
||||
return rotated_pixbuf;
|
||||
}
|
||||
|
||||
static GdkPixbuf*
|
||||
decode_image (const char *val)
|
||||
{
|
||||
int i;
|
||||
GError *error = NULL;
|
||||
GdkPixbuf *res = NULL;
|
||||
struct {
|
||||
const char *prefix;
|
||||
const char *mime_type;
|
||||
} formats[] = {
|
||||
{ "data:image/x-icon;base64,", "image/x-icon" },
|
||||
{ "data:image/png;base64,", "image/png" }
|
||||
};
|
||||
|
||||
g_return_val_if_fail (val, NULL);
|
||||
|
||||
for (i = 0; i < G_N_ELEMENTS (formats); i++)
|
||||
{
|
||||
if (g_str_has_prefix (val, formats[i].prefix))
|
||||
{
|
||||
gsize len;
|
||||
guchar *data = NULL;
|
||||
char *unescaped;
|
||||
|
||||
unescaped = g_uri_unescape_string (val + strlen (formats[i].prefix), NULL);
|
||||
if (unescaped)
|
||||
{
|
||||
data = g_base64_decode (unescaped, &len);
|
||||
g_free (unescaped);
|
||||
}
|
||||
|
||||
if (data)
|
||||
{
|
||||
GdkPixbufLoader *loader;
|
||||
|
||||
loader = gdk_pixbuf_loader_new_with_mime_type (formats[i].mime_type, &error);
|
||||
if (loader &&
|
||||
gdk_pixbuf_loader_write (loader, data, len, &error) &&
|
||||
gdk_pixbuf_loader_close (loader, &error))
|
||||
{
|
||||
res = gdk_pixbuf_loader_get_pixbuf (loader);
|
||||
g_object_ref (res);
|
||||
}
|
||||
g_object_unref (loader);
|
||||
g_free (data);
|
||||
}
|
||||
}
|
||||
}
|
||||
if (!res)
|
||||
{
|
||||
if (error)
|
||||
{
|
||||
g_warning ("%s\n", error->message);
|
||||
g_error_free (error);
|
||||
}
|
||||
else
|
||||
g_warning ("incorrect data uri");
|
||||
}
|
||||
return res;
|
||||
}
|
||||
|
||||
static GdkPixbuf *
|
||||
impl_load_pixbuf_file (GFile *file,
|
||||
impl_load_pixbuf_file (const char *uri,
|
||||
int available_width,
|
||||
int available_height,
|
||||
int scale,
|
||||
GError **error)
|
||||
{
|
||||
GdkPixbuf *pixbuf = NULL;
|
||||
GFile *file;
|
||||
char *contents = NULL;
|
||||
gsize size;
|
||||
|
||||
if (g_str_has_prefix (uri, "data:"))
|
||||
return decode_image (uri);
|
||||
|
||||
file = g_file_new_for_uri (uri);
|
||||
if (g_file_load_contents (file, NULL, &contents, &size, NULL, error))
|
||||
{
|
||||
pixbuf = impl_load_pixbuf_data ((const guchar *) contents, size,
|
||||
@ -424,6 +490,7 @@ impl_load_pixbuf_file (GFile *file,
|
||||
error);
|
||||
}
|
||||
|
||||
g_object_unref (file);
|
||||
g_free (contents);
|
||||
|
||||
return pixbuf;
|
||||
@ -440,9 +507,9 @@ load_pixbuf_thread (GSimpleAsyncResult *result,
|
||||
|
||||
data = g_async_result_get_user_data (G_ASYNC_RESULT (result));
|
||||
g_assert (data != NULL);
|
||||
g_assert (data->file != NULL);
|
||||
g_assert (data->uri != NULL);
|
||||
|
||||
pixbuf = impl_load_pixbuf_file (data->file, data->width, data->height, data->scale, &error);
|
||||
pixbuf = impl_load_pixbuf_file (data->uri, data->width, data->height, data->scale, &error);
|
||||
|
||||
if (error != NULL)
|
||||
{
|
||||
@ -580,7 +647,7 @@ static void
|
||||
load_texture_async (StTextureCache *cache,
|
||||
AsyncTextureLoadData *data)
|
||||
{
|
||||
if (data->file)
|
||||
if (data->uri)
|
||||
{
|
||||
GSimpleAsyncResult *result;
|
||||
result = g_simple_async_result_new (G_OBJECT (cache), on_pixbuf_loaded, data, load_texture_async);
|
||||
@ -947,43 +1014,46 @@ file_changed_cb (GFileMonitor *monitor,
|
||||
gpointer user_data)
|
||||
{
|
||||
StTextureCache *cache = user_data;
|
||||
char *key;
|
||||
guint file_hash;
|
||||
char *uri, *key;
|
||||
|
||||
if (event_type != G_FILE_MONITOR_EVENT_CHANGED)
|
||||
return;
|
||||
|
||||
file_hash = g_file_hash (file);
|
||||
uri = g_file_get_uri (file);
|
||||
|
||||
key = g_strdup_printf (CACHE_PREFIX_FILE "%u", file_hash);
|
||||
key = g_strconcat (CACHE_PREFIX_URI, uri, NULL);
|
||||
g_hash_table_remove (cache->priv->keyed_cache, key);
|
||||
g_free (key);
|
||||
|
||||
key = g_strdup_printf (CACHE_PREFIX_FILE_FOR_CAIRO "%u", file_hash);
|
||||
key = g_strconcat (CACHE_PREFIX_URI_FOR_CAIRO, uri, NULL);
|
||||
g_hash_table_remove (cache->priv->keyed_cache, key);
|
||||
g_free (key);
|
||||
|
||||
g_signal_emit (cache, signals[TEXTURE_FILE_CHANGED], 0, file);
|
||||
g_signal_emit (cache, signals[TEXTURE_FILE_CHANGED], 0, uri);
|
||||
|
||||
g_free (uri);
|
||||
}
|
||||
|
||||
static void
|
||||
ensure_monitor_for_file (StTextureCache *cache,
|
||||
GFile *file)
|
||||
ensure_monitor_for_uri (StTextureCache *cache,
|
||||
const gchar *uri)
|
||||
{
|
||||
StTextureCachePrivate *priv = cache->priv;
|
||||
GFile *file = g_file_new_for_uri (uri);
|
||||
|
||||
if (g_hash_table_lookup (priv->file_monitors, file) == NULL)
|
||||
if (g_hash_table_lookup (priv->file_monitors, uri) == NULL)
|
||||
{
|
||||
GFileMonitor *monitor = g_file_monitor_file (file, G_FILE_MONITOR_NONE,
|
||||
NULL, NULL);
|
||||
g_signal_connect (monitor, "changed",
|
||||
G_CALLBACK (file_changed_cb), cache);
|
||||
g_hash_table_insert (priv->file_monitors, g_object_ref (file), monitor);
|
||||
g_hash_table_insert (priv->file_monitors, g_strdup (uri), monitor);
|
||||
}
|
||||
g_object_unref (file);
|
||||
}
|
||||
|
||||
typedef struct {
|
||||
GFile *gfile;
|
||||
gchar *path;
|
||||
gint grid_width, grid_height;
|
||||
gint scale_factor;
|
||||
ClutterActor *actor;
|
||||
@ -995,7 +1065,7 @@ static void
|
||||
on_data_destroy (gpointer data)
|
||||
{
|
||||
AsyncImageData *d = (AsyncImageData *)data;
|
||||
g_object_unref (d->gfile);
|
||||
g_free (d->path);
|
||||
g_object_unref (d->actor);
|
||||
g_free (d);
|
||||
}
|
||||
@ -1068,7 +1138,7 @@ load_sliced_image (GSimpleAsyncResult *result,
|
||||
loader = gdk_pixbuf_loader_new ();
|
||||
g_signal_connect (loader, "size-prepared", G_CALLBACK (on_loader_size_prepared), data);
|
||||
|
||||
if (!g_file_load_contents (data->gfile, NULL, &buffer, &length, NULL, NULL))
|
||||
if (!g_file_get_contents (data->path, &buffer, &length, NULL))
|
||||
goto out;
|
||||
|
||||
if (!gdk_pixbuf_loader_write (loader, (const guchar *) buffer, length, NULL))
|
||||
@ -1103,7 +1173,7 @@ load_sliced_image (GSimpleAsyncResult *result,
|
||||
/**
|
||||
* st_texture_cache_load_sliced_image:
|
||||
* @cache: A #StTextureCache
|
||||
* @file: A #GFile
|
||||
* @path: Path to a filename
|
||||
* @grid_width: Width in pixels
|
||||
* @grid_height: Height in pixels
|
||||
* @scale: Scale factor of the display
|
||||
@ -1119,7 +1189,7 @@ load_sliced_image (GSimpleAsyncResult *result,
|
||||
*/
|
||||
ClutterActor *
|
||||
st_texture_cache_load_sliced_image (StTextureCache *cache,
|
||||
GFile *file,
|
||||
const gchar *path,
|
||||
gint grid_width,
|
||||
gint grid_height,
|
||||
gint scale,
|
||||
@ -1134,7 +1204,7 @@ st_texture_cache_load_sliced_image (StTextureCache *cache,
|
||||
data->grid_width = grid_width;
|
||||
data->grid_height = grid_height;
|
||||
data->scale_factor = scale;
|
||||
data->gfile = g_object_ref (file);
|
||||
data->path = g_strdup (path);
|
||||
data->actor = actor;
|
||||
data->load_callback = load_callback;
|
||||
data->load_callback_data = user_data;
|
||||
@ -1151,9 +1221,9 @@ st_texture_cache_load_sliced_image (StTextureCache *cache,
|
||||
}
|
||||
|
||||
/**
|
||||
* st_texture_cache_load_file_async:
|
||||
* st_texture_cache_load_uri_async:
|
||||
* @cache: The texture cache instance
|
||||
* @file: a #GFile of the image file from which to create a pixbuf
|
||||
* @uri: uri of the image file from which to create a pixbuf
|
||||
* @available_width: available width for the image, can be -1 if not limited
|
||||
* @available_height: available height for the image, can be -1 if not limited
|
||||
* @scale: scale factor of the display
|
||||
@ -1165,18 +1235,18 @@ st_texture_cache_load_sliced_image (StTextureCache *cache,
|
||||
* Return value: (transfer none): A new #ClutterActor with no image loaded initially.
|
||||
*/
|
||||
ClutterActor *
|
||||
st_texture_cache_load_file_async (StTextureCache *cache,
|
||||
GFile *file,
|
||||
int available_width,
|
||||
int available_height,
|
||||
int scale)
|
||||
st_texture_cache_load_uri_async (StTextureCache *cache,
|
||||
const gchar *uri,
|
||||
int available_width,
|
||||
int available_height,
|
||||
int scale)
|
||||
{
|
||||
ClutterActor *texture;
|
||||
AsyncTextureLoadData *request;
|
||||
StTextureCachePolicy policy;
|
||||
gchar *key;
|
||||
|
||||
key = g_strdup_printf (CACHE_PREFIX_FILE "%u", g_file_hash (file));
|
||||
key = g_strconcat (CACHE_PREFIX_URI, uri, NULL);
|
||||
|
||||
policy = ST_TEXTURE_CACHE_POLICY_NONE; /* XXX */
|
||||
|
||||
@ -1194,7 +1264,7 @@ st_texture_cache_load_file_async (StTextureCache *cache,
|
||||
request->cache = cache;
|
||||
/* Transfer ownership of key */
|
||||
request->key = key;
|
||||
request->file = g_object_ref (file);
|
||||
request->uri = g_strdup (uri);
|
||||
request->policy = policy;
|
||||
request->width = available_width;
|
||||
request->height = available_height;
|
||||
@ -1203,31 +1273,31 @@ st_texture_cache_load_file_async (StTextureCache *cache,
|
||||
load_texture_async (cache, request);
|
||||
}
|
||||
|
||||
ensure_monitor_for_file (cache, file);
|
||||
ensure_monitor_for_uri (cache, uri);
|
||||
|
||||
return CLUTTER_ACTOR (texture);
|
||||
}
|
||||
|
||||
static CoglTexture *
|
||||
st_texture_cache_load_file_sync_to_cogl_texture (StTextureCache *cache,
|
||||
StTextureCachePolicy policy,
|
||||
GFile *file,
|
||||
int available_width,
|
||||
int available_height,
|
||||
int scale,
|
||||
GError **error)
|
||||
st_texture_cache_load_uri_sync_to_cogl_texture (StTextureCache *cache,
|
||||
StTextureCachePolicy policy,
|
||||
const gchar *uri,
|
||||
int available_width,
|
||||
int available_height,
|
||||
int scale,
|
||||
GError **error)
|
||||
{
|
||||
CoglTexture *texdata;
|
||||
GdkPixbuf *pixbuf;
|
||||
char *key;
|
||||
|
||||
key = g_strdup_printf (CACHE_PREFIX_FILE "%u", g_file_hash (file));
|
||||
key = g_strconcat (CACHE_PREFIX_URI, uri, NULL);
|
||||
|
||||
texdata = g_hash_table_lookup (cache->priv->keyed_cache, key);
|
||||
|
||||
if (texdata == NULL)
|
||||
{
|
||||
pixbuf = impl_load_pixbuf_file (file, available_width, available_height, scale, error);
|
||||
pixbuf = impl_load_pixbuf_file (uri, available_width, available_height, scale, error);
|
||||
if (!pixbuf)
|
||||
goto out;
|
||||
|
||||
@ -1243,7 +1313,7 @@ st_texture_cache_load_file_sync_to_cogl_texture (StTextureCache *cache,
|
||||
else
|
||||
cogl_object_ref (texdata);
|
||||
|
||||
ensure_monitor_for_file (cache, file);
|
||||
ensure_monitor_for_uri (cache, uri);
|
||||
|
||||
out:
|
||||
g_free (key);
|
||||
@ -1251,25 +1321,25 @@ out:
|
||||
}
|
||||
|
||||
static cairo_surface_t *
|
||||
st_texture_cache_load_file_sync_to_cairo_surface (StTextureCache *cache,
|
||||
StTextureCachePolicy policy,
|
||||
GFile *file,
|
||||
int available_width,
|
||||
int available_height,
|
||||
int scale,
|
||||
GError **error)
|
||||
st_texture_cache_load_uri_sync_to_cairo_surface (StTextureCache *cache,
|
||||
StTextureCachePolicy policy,
|
||||
const gchar *uri,
|
||||
int available_width,
|
||||
int available_height,
|
||||
int scale,
|
||||
GError **error)
|
||||
{
|
||||
cairo_surface_t *surface;
|
||||
GdkPixbuf *pixbuf;
|
||||
char *key;
|
||||
|
||||
key = g_strdup_printf (CACHE_PREFIX_FILE_FOR_CAIRO "%u", g_file_hash (file));
|
||||
key = g_strconcat (CACHE_PREFIX_URI_FOR_CAIRO, uri, NULL);
|
||||
|
||||
surface = g_hash_table_lookup (cache->priv->keyed_cache, key);
|
||||
|
||||
if (surface == NULL)
|
||||
{
|
||||
pixbuf = impl_load_pixbuf_file (file, available_width, available_height, scale, error);
|
||||
pixbuf = impl_load_pixbuf_file (uri, available_width, available_height, scale, error);
|
||||
if (!pixbuf)
|
||||
goto out;
|
||||
|
||||
@ -1285,7 +1355,7 @@ st_texture_cache_load_file_sync_to_cairo_surface (StTextureCache *cache,
|
||||
else
|
||||
cairo_surface_reference (surface);
|
||||
|
||||
ensure_monitor_for_file (cache, file);
|
||||
ensure_monitor_for_uri (cache, uri);
|
||||
|
||||
out:
|
||||
g_free (key);
|
||||
@ -1295,7 +1365,7 @@ out:
|
||||
/**
|
||||
* st_texture_cache_load_file_to_cogl_texture: (skip)
|
||||
* @cache: A #StTextureCache
|
||||
* @file: A #GFile in supported image format
|
||||
* @file_path: Path to a file in supported image format
|
||||
* @scale: Scale factor of the display
|
||||
*
|
||||
* This function synchronously loads the given file path
|
||||
@ -1306,30 +1376,35 @@ out:
|
||||
*/
|
||||
CoglTexture *
|
||||
st_texture_cache_load_file_to_cogl_texture (StTextureCache *cache,
|
||||
GFile *file,
|
||||
const gchar *file_path,
|
||||
gint scale)
|
||||
{
|
||||
CoglTexture *texture;
|
||||
GFile *file;
|
||||
char *uri;
|
||||
GError *error = NULL;
|
||||
|
||||
texture = st_texture_cache_load_file_sync_to_cogl_texture (cache, ST_TEXTURE_CACHE_POLICY_FOREVER,
|
||||
file, -1, -1, scale, &error);
|
||||
file = g_file_new_for_path (file_path);
|
||||
uri = g_file_get_uri (file);
|
||||
|
||||
texture = st_texture_cache_load_uri_sync_to_cogl_texture (cache, ST_TEXTURE_CACHE_POLICY_FOREVER,
|
||||
uri, -1, -1, scale, &error);
|
||||
g_object_unref (file);
|
||||
g_free (uri);
|
||||
|
||||
if (texture == NULL)
|
||||
{
|
||||
char *uri = g_file_get_uri (file);
|
||||
g_warning ("Failed to load %s: %s", uri, error->message);
|
||||
g_warning ("Failed to load %s: %s", file_path, error->message);
|
||||
g_clear_error (&error);
|
||||
g_free (uri);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
return texture;
|
||||
}
|
||||
|
||||
/**
|
||||
* st_texture_cache_load_file_to_cairo_surface:
|
||||
* @cache: A #StTextureCache
|
||||
* @file: A #GFile in supported image format
|
||||
* @file_path: Path to a file in supported image format
|
||||
* @scale: Scale factor of the display
|
||||
*
|
||||
* This function synchronously loads the given file path
|
||||
@ -1340,23 +1415,28 @@ st_texture_cache_load_file_to_cogl_texture (StTextureCache *cache,
|
||||
*/
|
||||
cairo_surface_t *
|
||||
st_texture_cache_load_file_to_cairo_surface (StTextureCache *cache,
|
||||
GFile *file,
|
||||
const gchar *file_path,
|
||||
gint scale)
|
||||
{
|
||||
cairo_surface_t *surface;
|
||||
GFile *file;
|
||||
char *uri;
|
||||
GError *error = NULL;
|
||||
|
||||
surface = st_texture_cache_load_file_sync_to_cairo_surface (cache, ST_TEXTURE_CACHE_POLICY_FOREVER,
|
||||
file, -1, -1, scale, &error);
|
||||
file = g_file_new_for_path (file_path);
|
||||
uri = g_file_get_uri (file);
|
||||
|
||||
surface = st_texture_cache_load_uri_sync_to_cairo_surface (cache, ST_TEXTURE_CACHE_POLICY_FOREVER,
|
||||
uri, -1, -1, scale, &error);
|
||||
g_object_unref (file);
|
||||
g_free (uri);
|
||||
|
||||
if (surface == NULL)
|
||||
{
|
||||
char *uri = g_file_get_uri (file);
|
||||
g_warning ("Failed to load %s: %s", uri, error->message);
|
||||
g_warning ("Failed to load %s: %s", file_path, error->message);
|
||||
g_clear_error (&error);
|
||||
g_free (uri);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
return surface;
|
||||
}
|
||||
|
||||
|
||||
@ -70,7 +70,7 @@ StTextureCache* st_texture_cache_get_default (void);
|
||||
|
||||
ClutterActor *
|
||||
st_texture_cache_load_sliced_image (StTextureCache *cache,
|
||||
GFile *file,
|
||||
const gchar *path,
|
||||
gint grid_width,
|
||||
gint grid_height,
|
||||
gint scale,
|
||||
@ -87,18 +87,18 @@ ClutterActor *st_texture_cache_load_gicon (StTextureCache *cache,
|
||||
gint size,
|
||||
gint scale);
|
||||
|
||||
ClutterActor *st_texture_cache_load_file_async (StTextureCache *cache,
|
||||
GFile *file,
|
||||
int available_width,
|
||||
int available_height,
|
||||
int scale);
|
||||
ClutterActor *st_texture_cache_load_uri_async (StTextureCache *cache,
|
||||
const gchar *uri,
|
||||
int available_width,
|
||||
int available_height,
|
||||
int scale);
|
||||
|
||||
CoglTexture *st_texture_cache_load_file_to_cogl_texture (StTextureCache *cache,
|
||||
GFile *file,
|
||||
const gchar *file_path,
|
||||
gint scale);
|
||||
|
||||
cairo_surface_t *st_texture_cache_load_file_to_cairo_surface (StTextureCache *cache,
|
||||
GFile *file,
|
||||
const gchar *file_path,
|
||||
gint scale);
|
||||
|
||||
/**
|
||||
|
||||
@ -600,7 +600,7 @@ create_cairo_pattern_of_background_image (StThemeNode *node,
|
||||
cairo_pattern_t *pattern;
|
||||
cairo_content_t content;
|
||||
cairo_matrix_t matrix;
|
||||
GFile *file;
|
||||
const char *file;
|
||||
|
||||
StTextureCache *texture_cache;
|
||||
|
||||
@ -1037,7 +1037,7 @@ st_theme_node_prerender_background (StThemeNode *node,
|
||||
}
|
||||
else
|
||||
{
|
||||
GFile *background_image;
|
||||
const char *background_image;
|
||||
|
||||
background_image = st_theme_node_get_background_image (node);
|
||||
|
||||
@ -1303,14 +1303,14 @@ st_theme_node_load_border_image (StThemeNode *node)
|
||||
if (border_image == NULL)
|
||||
goto out;
|
||||
|
||||
GFile *file;
|
||||
file = st_border_image_get_file (border_image);
|
||||
const char *filename;
|
||||
filename = st_border_image_get_filename (border_image);
|
||||
|
||||
int scale_factor;
|
||||
g_object_get (node->context, "scale-factor", &scale_factor, NULL);
|
||||
|
||||
node->border_slices_texture = st_texture_cache_load_file_to_cogl_texture (st_texture_cache_get_default (),
|
||||
file, scale_factor);
|
||||
filename, scale_factor);
|
||||
if (node->border_slices_texture == COGL_INVALID_HANDLE)
|
||||
goto out;
|
||||
|
||||
@ -1348,7 +1348,7 @@ st_theme_node_load_background_image (StThemeNode *node)
|
||||
{
|
||||
if (node->background_texture == COGL_INVALID_HANDLE)
|
||||
{
|
||||
GFile *background_image;
|
||||
const char *background_image;
|
||||
StShadow *background_image_shadow_spec;
|
||||
|
||||
background_image = st_theme_node_get_background_image (node);
|
||||
|
||||
@ -68,7 +68,7 @@ struct _StThemeNode {
|
||||
|
||||
int transition_duration;
|
||||
|
||||
GFile *background_image;
|
||||
char *background_image;
|
||||
StBorderImage *border_image;
|
||||
StShadow *box_shadow;
|
||||
StShadow *background_image_shadow;
|
||||
|
||||
@ -158,10 +158,7 @@ st_theme_node_finalize (GObject *object)
|
||||
}
|
||||
|
||||
if (node->background_image)
|
||||
{
|
||||
g_object_unref (node->background_image);
|
||||
node->background_image = NULL;
|
||||
}
|
||||
g_free (node->background_image);
|
||||
|
||||
if (node->background_texture != COGL_INVALID_HANDLE)
|
||||
cogl_handle_unref (node->background_texture);
|
||||
@ -908,7 +905,7 @@ st_theme_node_get_double (StThemeNode *node,
|
||||
* parent's parent, and so forth. Note that if the property has a
|
||||
* value of 'inherit' it will be inherited even if %FALSE is passed
|
||||
* in for @inherit; this only affects the default behavior for inheritance.
|
||||
* @file: (out) (transfer full): location to store the newly allocated value that was
|
||||
* @value: (out): location to store the newly allocated value that was
|
||||
* determined. If the property is not found, the value in this location
|
||||
* will not be changed.
|
||||
*
|
||||
@ -923,7 +920,7 @@ gboolean
|
||||
st_theme_node_lookup_url (StThemeNode *node,
|
||||
const char *property_name,
|
||||
gboolean inherit,
|
||||
GFile **file)
|
||||
char **value)
|
||||
{
|
||||
gboolean result = FALSE;
|
||||
int i;
|
||||
@ -938,6 +935,7 @@ st_theme_node_lookup_url (StThemeNode *node,
|
||||
{
|
||||
CRTerm *term = decl->value;
|
||||
CRStyleSheet *base_stylesheet;
|
||||
GFile *file;
|
||||
|
||||
if (term->type != TERM_URI && term->type != TERM_STRING)
|
||||
continue;
|
||||
@ -947,21 +945,23 @@ st_theme_node_lookup_url (StThemeNode *node,
|
||||
else
|
||||
base_stylesheet = NULL;
|
||||
|
||||
*file = _st_theme_resolve_url (node->theme,
|
||||
base_stylesheet,
|
||||
decl->value->content.str->stryng->str);
|
||||
file = _st_theme_resolve_url (node->theme,
|
||||
base_stylesheet,
|
||||
decl->value->content.str->stryng->str);
|
||||
*value = g_file_get_path (file);
|
||||
g_object_unref (file);
|
||||
result = TRUE;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (!result && inherit && node->parent_node)
|
||||
result = st_theme_node_lookup_url (node->parent_node, property_name, inherit, file);
|
||||
result = st_theme_node_lookup_url (node->parent_node, property_name, inherit, value);
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
/**
|
||||
/*
|
||||
* st_theme_node_get_url:
|
||||
* @node: a #StThemeNode
|
||||
* @property_name: The name of the string property
|
||||
@ -972,18 +972,18 @@ st_theme_node_lookup_url (StThemeNode *node,
|
||||
* and lets you handle the case where the theme does not specify the
|
||||
* indicated value.
|
||||
*
|
||||
* Returns: (transfer full): the newly allocated value if found.
|
||||
* Return value: the newly allocated value if found.
|
||||
* If @property_name is not found, a warning will be logged and %NULL
|
||||
* will be returned.
|
||||
*/
|
||||
GFile *
|
||||
char *
|
||||
st_theme_node_get_url (StThemeNode *node,
|
||||
const char *property_name)
|
||||
{
|
||||
GFile *file;
|
||||
char *value;
|
||||
|
||||
if (st_theme_node_lookup_url (node, property_name, FALSE, &file))
|
||||
return file;
|
||||
if (st_theme_node_lookup_url (node, property_name, FALSE, &value))
|
||||
return value;
|
||||
else
|
||||
{
|
||||
g_warning ("Did not find string property '%s'", property_name);
|
||||
@ -1926,7 +1926,8 @@ _st_theme_node_ensure_background (StThemeNode *node)
|
||||
CRTerm *term;
|
||||
/* background: property sets all terms to specified or default values */
|
||||
node->background_color = TRANSPARENT_COLOR;
|
||||
g_clear_object (&node->background_image);
|
||||
g_free (node->background_image);
|
||||
node->background_image = NULL;
|
||||
node->background_position_set = FALSE;
|
||||
node->background_size = ST_BACKGROUND_SIZE_AUTO;
|
||||
|
||||
@ -1942,7 +1943,7 @@ _st_theme_node_ensure_background (StThemeNode *node)
|
||||
if (node->parent_node)
|
||||
{
|
||||
st_theme_node_get_background_color (node->parent_node, &node->background_color);
|
||||
node->background_image = g_object_ref (st_theme_node_get_background_image (node->parent_node));
|
||||
node->background_image = g_strdup (st_theme_node_get_background_image (node->parent_node));
|
||||
}
|
||||
}
|
||||
else if (term_is_none (term))
|
||||
@ -1963,7 +1964,8 @@ _st_theme_node_ensure_background (StThemeNode *node)
|
||||
base_stylesheet,
|
||||
term->content.str->stryng->str);
|
||||
|
||||
node->background_image = file;
|
||||
node->background_image = g_file_get_path (file);
|
||||
g_object_unref (file);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -2060,25 +2062,30 @@ _st_theme_node_ensure_background (StThemeNode *node)
|
||||
if (decl->value->type == TERM_URI)
|
||||
{
|
||||
CRStyleSheet *base_stylesheet;
|
||||
GFile *file;
|
||||
|
||||
if (decl->parent_statement != NULL)
|
||||
base_stylesheet = decl->parent_statement->parent_sheet;
|
||||
else
|
||||
base_stylesheet = NULL;
|
||||
|
||||
g_clear_object (&node->background_image);
|
||||
node->background_image = _st_theme_resolve_url (node->theme,
|
||||
base_stylesheet,
|
||||
decl->value->content.str->stryng->str);
|
||||
g_free (node->background_image);
|
||||
file = _st_theme_resolve_url (node->theme,
|
||||
base_stylesheet,
|
||||
decl->value->content.str->stryng->str);
|
||||
|
||||
node->background_image = g_file_get_path (file);
|
||||
g_object_unref (file);
|
||||
}
|
||||
else if (term_is_inherit (decl->value))
|
||||
{
|
||||
g_clear_object (&node->background_image);
|
||||
node->background_image = g_object_ref (st_theme_node_get_background_image (node->parent_node));
|
||||
g_free (node->background_image);
|
||||
node->background_image = g_strdup (st_theme_node_get_background_image (node->parent_node));
|
||||
}
|
||||
else if (term_is_none (decl->value))
|
||||
{
|
||||
g_clear_object (&node->background_image);
|
||||
g_free (node->background_image);
|
||||
node->background_image = NULL;
|
||||
}
|
||||
}
|
||||
else if (strcmp (property_name, "-gradient-direction") == 0)
|
||||
@ -2135,13 +2142,7 @@ st_theme_node_get_background_color (StThemeNode *node,
|
||||
*color = node->background_color;
|
||||
}
|
||||
|
||||
/**
|
||||
* st_theme_node_get_background_image:
|
||||
* @node: a #StThemeNode
|
||||
*
|
||||
* Returns: (transfer none): @node's background image.
|
||||
*/
|
||||
GFile *
|
||||
const char *
|
||||
st_theme_node_get_background_image (StThemeNode *node)
|
||||
{
|
||||
g_return_val_if_fail (ST_IS_THEME_NODE (node), NULL);
|
||||
@ -2893,6 +2894,7 @@ st_theme_node_get_border_image (StThemeNode *node)
|
||||
int border_left;
|
||||
|
||||
GFile *file;
|
||||
char *filename;
|
||||
|
||||
/* Support border-image: none; to suppress a previously specified border image */
|
||||
if (term_is_none (term))
|
||||
@ -2971,15 +2973,17 @@ st_theme_node_get_border_image (StThemeNode *node)
|
||||
base_stylesheet = NULL;
|
||||
|
||||
file = _st_theme_resolve_url (node->theme, base_stylesheet, url);
|
||||
filename = g_file_get_path (file);
|
||||
g_object_unref (file);
|
||||
|
||||
if (file == NULL)
|
||||
if (filename == NULL)
|
||||
goto next_property;
|
||||
|
||||
node->border_image = st_border_image_new (file,
|
||||
node->border_image = st_border_image_new (filename,
|
||||
border_top, border_right, border_bottom, border_left,
|
||||
scale_factor);
|
||||
|
||||
g_object_unref (file);
|
||||
g_free (filename);
|
||||
|
||||
return node->border_image;
|
||||
}
|
||||
@ -3849,9 +3853,7 @@ st_theme_node_paint_equal (StThemeNode *node,
|
||||
!clutter_color_equal (&node->background_gradient_end, &other->background_gradient_end))
|
||||
return FALSE;
|
||||
|
||||
if ((node->background_image != NULL) &&
|
||||
(other->background_image != NULL) &&
|
||||
!g_file_equal (node->background_image, other->background_image))
|
||||
if (g_strcmp0 (node->background_image, other->background_image) != 0)
|
||||
return FALSE;
|
||||
|
||||
_st_theme_node_ensure_geometry (node);
|
||||
|
||||
@ -162,7 +162,7 @@ gboolean st_theme_node_lookup_shadow (StThemeNode *node,
|
||||
gboolean st_theme_node_lookup_url (StThemeNode *node,
|
||||
const char *property_name,
|
||||
gboolean inherit,
|
||||
GFile **file);
|
||||
char **value);
|
||||
|
||||
/* Easier-to-use variants of the above, for application-level use */
|
||||
void st_theme_node_get_color (StThemeNode *node,
|
||||
@ -174,7 +174,7 @@ gdouble st_theme_node_get_length (StThemeNode *node,
|
||||
const char *property_name);
|
||||
StShadow *st_theme_node_get_shadow (StThemeNode *node,
|
||||
const char *property_name);
|
||||
GFile *st_theme_node_get_url (StThemeNode *node,
|
||||
char *st_theme_node_get_url (StThemeNode *node,
|
||||
const char *property_name);
|
||||
|
||||
/* Specific getters for particular properties: cached
|
||||
@ -188,7 +188,7 @@ void st_theme_node_get_background_gradient (StThemeNode *node,
|
||||
ClutterColor *start,
|
||||
ClutterColor *end);
|
||||
|
||||
GFile *st_theme_node_get_background_image (StThemeNode *node);
|
||||
const char *st_theme_node_get_background_image (StThemeNode *node);
|
||||
|
||||
int st_theme_node_get_border_width (StThemeNode *node,
|
||||
StSide side);
|
||||
|
||||
@ -60,13 +60,13 @@ struct _StTheme
|
||||
{
|
||||
GObject parent;
|
||||
|
||||
GFile *application_stylesheet;
|
||||
GFile *default_stylesheet;
|
||||
GFile *theme_stylesheet;
|
||||
char *application_stylesheet;
|
||||
char *default_stylesheet;
|
||||
char *theme_stylesheet;
|
||||
GSList *custom_stylesheets;
|
||||
|
||||
GHashTable *stylesheets_by_file;
|
||||
GHashTable *files_by_stylesheet;
|
||||
GHashTable *stylesheets_by_filename;
|
||||
GHashTable *filenames_by_stylesheet;
|
||||
|
||||
CRCascade *cascade;
|
||||
};
|
||||
@ -98,25 +98,12 @@ G_DEFINE_TYPE (StTheme, st_theme, G_TYPE_OBJECT)
|
||||
#define strqcmp(str,lit,lit_len) \
|
||||
(strlen (str) != (lit_len) || memcmp (str, lit, lit_len))
|
||||
|
||||
static gboolean
|
||||
file_equal0 (GFile *file1,
|
||||
GFile *file2)
|
||||
{
|
||||
if (file1 == file2)
|
||||
return TRUE;
|
||||
|
||||
if ((file1 == NULL) || (file2 == NULL))
|
||||
return FALSE;
|
||||
|
||||
return g_file_equal (file1, file2);
|
||||
}
|
||||
|
||||
static void
|
||||
st_theme_init (StTheme *theme)
|
||||
{
|
||||
theme->stylesheets_by_file = g_hash_table_new_full (g_file_hash, (GEqualFunc) g_file_equal,
|
||||
(GDestroyNotify)g_object_unref, (GDestroyNotify)cr_stylesheet_unref);
|
||||
theme->files_by_stylesheet = g_hash_table_new (g_direct_hash, g_direct_equal);
|
||||
theme->stylesheets_by_filename = g_hash_table_new_full (g_str_hash, g_str_equal,
|
||||
(GDestroyNotify)g_free, (GDestroyNotify)cr_stylesheet_unref);
|
||||
theme->filenames_by_stylesheet = g_hash_table_new (g_direct_hash, g_direct_equal);
|
||||
}
|
||||
|
||||
static void
|
||||
@ -137,10 +124,10 @@ st_theme_class_init (StThemeClass *klass)
|
||||
*/
|
||||
g_object_class_install_property (object_class,
|
||||
PROP_APPLICATION_STYLESHEET,
|
||||
g_param_spec_object ("application-stylesheet",
|
||||
g_param_spec_string ("application-stylesheet",
|
||||
"Application Stylesheet",
|
||||
"Stylesheet with application-specific styling",
|
||||
G_TYPE_FILE,
|
||||
NULL,
|
||||
G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
|
||||
|
||||
/**
|
||||
@ -151,10 +138,10 @@ st_theme_class_init (StThemeClass *klass)
|
||||
*/
|
||||
g_object_class_install_property (object_class,
|
||||
PROP_THEME_STYLESHEET,
|
||||
g_param_spec_object ("theme-stylesheet",
|
||||
g_param_spec_string ("theme-stylesheet",
|
||||
"Theme Stylesheet",
|
||||
"Stylesheet with theme-specific styling",
|
||||
G_TYPE_FILE,
|
||||
NULL,
|
||||
G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
|
||||
|
||||
/**
|
||||
@ -165,10 +152,10 @@ st_theme_class_init (StThemeClass *klass)
|
||||
*/
|
||||
g_object_class_install_property (object_class,
|
||||
PROP_DEFAULT_STYLESHEET,
|
||||
g_param_spec_object ("default-stylesheet",
|
||||
g_param_spec_string ("default-stylesheet",
|
||||
"Default Stylesheet",
|
||||
"Stylesheet with global default styling",
|
||||
G_TYPE_FILE,
|
||||
NULL,
|
||||
G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
|
||||
|
||||
signals[STYLESHEETS_CHANGED] =
|
||||
@ -181,32 +168,23 @@ st_theme_class_init (StThemeClass *klass)
|
||||
}
|
||||
|
||||
static CRStyleSheet *
|
||||
parse_stylesheet (GFile *file,
|
||||
GError **error)
|
||||
parse_stylesheet (const char *filename,
|
||||
GError **error)
|
||||
{
|
||||
enum CRStatus status;
|
||||
CRStyleSheet *stylesheet;
|
||||
char *contents;
|
||||
gsize length;
|
||||
|
||||
if (file == NULL)
|
||||
if (filename == NULL)
|
||||
return NULL;
|
||||
|
||||
if (!g_file_load_contents (file, NULL, &contents, &length, NULL, error))
|
||||
return NULL;
|
||||
|
||||
status = cr_om_parser_simply_parse_buf ((const guchar *) contents,
|
||||
length,
|
||||
CR_UTF_8,
|
||||
&stylesheet);
|
||||
g_free (contents);
|
||||
status = cr_om_parser_simply_parse_file ((const guchar *) filename,
|
||||
CR_UTF_8,
|
||||
&stylesheet);
|
||||
|
||||
if (status != CR_OK)
|
||||
{
|
||||
char *uri = g_file_get_uri (file);
|
||||
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
|
||||
"Error parsing stylesheet '%s'; errcode:%d", uri, status);
|
||||
g_free (uri);
|
||||
"Error parsing stylesheet '%s'; errcode:%d", filename, status);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@ -225,12 +203,12 @@ _st_theme_parse_declaration_list (const char *str)
|
||||
|
||||
/* Just g_warning for now until we have something nicer to do */
|
||||
static CRStyleSheet *
|
||||
parse_stylesheet_nofail (GFile *file)
|
||||
parse_stylesheet_nofail (const char *filename)
|
||||
{
|
||||
GError *error = NULL;
|
||||
CRStyleSheet *result;
|
||||
|
||||
result = parse_stylesheet (file, &error);
|
||||
result = parse_stylesheet (filename, &error);
|
||||
if (error)
|
||||
{
|
||||
g_warning ("%s", error->message);
|
||||
@ -241,33 +219,35 @@ parse_stylesheet_nofail (GFile *file)
|
||||
|
||||
static void
|
||||
insert_stylesheet (StTheme *theme,
|
||||
GFile *file,
|
||||
const char *filename,
|
||||
CRStyleSheet *stylesheet)
|
||||
{
|
||||
char *filename_copy;
|
||||
|
||||
if (stylesheet == NULL)
|
||||
return;
|
||||
|
||||
g_object_ref (file);
|
||||
filename_copy = g_strdup(filename);
|
||||
cr_stylesheet_ref (stylesheet);
|
||||
|
||||
g_hash_table_insert (theme->stylesheets_by_file, file, stylesheet);
|
||||
g_hash_table_insert (theme->files_by_stylesheet, stylesheet, file);
|
||||
g_hash_table_insert (theme->stylesheets_by_filename, filename_copy, stylesheet);
|
||||
g_hash_table_insert (theme->filenames_by_stylesheet, stylesheet, filename_copy);
|
||||
}
|
||||
|
||||
gboolean
|
||||
st_theme_load_stylesheet (StTheme *theme,
|
||||
GFile *file,
|
||||
const char *path,
|
||||
GError **error)
|
||||
{
|
||||
CRStyleSheet *stylesheet;
|
||||
|
||||
stylesheet = parse_stylesheet (file, error);
|
||||
stylesheet = parse_stylesheet (path, error);
|
||||
if (!stylesheet)
|
||||
return FALSE;
|
||||
|
||||
stylesheet->app_data = GUINT_TO_POINTER (TRUE);
|
||||
|
||||
insert_stylesheet (theme, file, stylesheet);
|
||||
insert_stylesheet (theme, path, stylesheet);
|
||||
cr_stylesheet_ref (stylesheet);
|
||||
theme->custom_stylesheets = g_slist_prepend (theme->custom_stylesheets, stylesheet);
|
||||
g_signal_emit (theme, signals[STYLESHEETS_CHANGED], 0);
|
||||
@ -277,11 +257,11 @@ st_theme_load_stylesheet (StTheme *theme,
|
||||
|
||||
void
|
||||
st_theme_unload_stylesheet (StTheme *theme,
|
||||
GFile *file)
|
||||
const char *path)
|
||||
{
|
||||
CRStyleSheet *stylesheet;
|
||||
|
||||
stylesheet = g_hash_table_lookup (theme->stylesheets_by_file, file);
|
||||
stylesheet = g_hash_table_lookup (theme->stylesheets_by_filename, path);
|
||||
if (!stylesheet)
|
||||
return;
|
||||
|
||||
@ -289,8 +269,8 @@ st_theme_unload_stylesheet (StTheme *theme,
|
||||
return;
|
||||
|
||||
theme->custom_stylesheets = g_slist_remove (theme->custom_stylesheets, stylesheet);
|
||||
g_hash_table_remove (theme->stylesheets_by_file, file);
|
||||
g_hash_table_remove (theme->files_by_stylesheet, stylesheet);
|
||||
g_hash_table_remove (theme->stylesheets_by_filename, path);
|
||||
g_hash_table_remove (theme->filenames_by_stylesheet, stylesheet);
|
||||
cr_stylesheet_unref (stylesheet);
|
||||
g_signal_emit (theme, signals[STYLESHEETS_CHANGED], 0);
|
||||
}
|
||||
@ -299,7 +279,7 @@ st_theme_unload_stylesheet (StTheme *theme,
|
||||
* st_theme_get_custom_stylesheets:
|
||||
* @theme: an #StTheme
|
||||
*
|
||||
* Returns: (transfer full) (element-type GFile): the list of stylesheet files
|
||||
* Returns: (transfer full) (element-type utf8): the list of stylesheet filenames
|
||||
* that were loaded with st_theme_load_stylesheet()
|
||||
*/
|
||||
GSList*
|
||||
@ -311,9 +291,9 @@ st_theme_get_custom_stylesheets (StTheme *theme)
|
||||
for (iter = theme->custom_stylesheets; iter; iter = iter->next)
|
||||
{
|
||||
CRStyleSheet *stylesheet = iter->data;
|
||||
GFile *file = g_hash_table_lookup (theme->files_by_stylesheet, stylesheet);
|
||||
gchar *filename = g_hash_table_lookup (theme->filenames_by_stylesheet, stylesheet);
|
||||
|
||||
result = g_slist_prepend (result, g_object_ref (file));
|
||||
result = g_slist_prepend (result, g_strdup (filename));
|
||||
}
|
||||
|
||||
return result;
|
||||
@ -354,12 +334,12 @@ st_theme_finalize (GObject * object)
|
||||
g_slist_free (theme->custom_stylesheets);
|
||||
theme->custom_stylesheets = NULL;
|
||||
|
||||
g_hash_table_destroy (theme->stylesheets_by_file);
|
||||
g_hash_table_destroy (theme->files_by_stylesheet);
|
||||
g_hash_table_destroy (theme->stylesheets_by_filename);
|
||||
g_hash_table_destroy (theme->filenames_by_stylesheet);
|
||||
|
||||
g_clear_object (&theme->application_stylesheet);
|
||||
g_clear_object (&theme->theme_stylesheet);
|
||||
g_clear_object (&theme->default_stylesheet);
|
||||
g_free (theme->application_stylesheet);
|
||||
g_free (theme->theme_stylesheet);
|
||||
g_free (theme->default_stylesheet);
|
||||
|
||||
if (theme->cascade)
|
||||
{
|
||||
@ -382,39 +362,36 @@ st_theme_set_property (GObject *object,
|
||||
{
|
||||
case PROP_APPLICATION_STYLESHEET:
|
||||
{
|
||||
GFile *file = g_value_get_object (value);
|
||||
const char *path = g_value_get_string (value);
|
||||
|
||||
if (!file_equal0 (file, theme->application_stylesheet))
|
||||
if (path != theme->application_stylesheet)
|
||||
{
|
||||
g_clear_object (&theme->application_stylesheet);
|
||||
if (file != NULL)
|
||||
theme->application_stylesheet = g_object_ref (file);
|
||||
g_free (theme->application_stylesheet);
|
||||
theme->application_stylesheet = g_strdup (path);
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
case PROP_THEME_STYLESHEET:
|
||||
{
|
||||
GFile *file = g_value_get_object (value);
|
||||
const char *path = g_value_get_string (value);
|
||||
|
||||
if (!file_equal0 (file, theme->theme_stylesheet))
|
||||
if (path != theme->theme_stylesheet)
|
||||
{
|
||||
g_clear_object (&theme->theme_stylesheet);
|
||||
if (file != NULL)
|
||||
theme->theme_stylesheet = g_object_ref (file);
|
||||
g_free (theme->theme_stylesheet);
|
||||
theme->theme_stylesheet = g_strdup (path);
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
case PROP_DEFAULT_STYLESHEET:
|
||||
{
|
||||
GFile *file = g_value_get_object (value);
|
||||
const char *path = g_value_get_string (value);
|
||||
|
||||
if (!file_equal0 (file, theme->default_stylesheet))
|
||||
if (path != theme->default_stylesheet)
|
||||
{
|
||||
g_clear_object (&theme->default_stylesheet);
|
||||
if (file != NULL)
|
||||
theme->default_stylesheet = g_object_ref (file);
|
||||
g_free (theme->default_stylesheet);
|
||||
theme->default_stylesheet = g_strdup (path);
|
||||
}
|
||||
|
||||
break;
|
||||
@ -436,13 +413,13 @@ st_theme_get_property (GObject *object,
|
||||
switch (prop_id)
|
||||
{
|
||||
case PROP_APPLICATION_STYLESHEET:
|
||||
g_value_set_object (value, theme->application_stylesheet);
|
||||
g_value_set_string (value, theme->application_stylesheet);
|
||||
break;
|
||||
case PROP_THEME_STYLESHEET:
|
||||
g_value_set_object (value, theme->theme_stylesheet);
|
||||
g_value_set_string (value, theme->theme_stylesheet);
|
||||
break;
|
||||
case PROP_DEFAULT_STYLESHEET:
|
||||
g_value_set_object (value, theme->default_stylesheet);
|
||||
g_value_set_string (value, theme->default_stylesheet);
|
||||
break;
|
||||
default:
|
||||
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
||||
@ -462,9 +439,9 @@ st_theme_get_property (GObject *object,
|
||||
* Return value: the newly created theme object
|
||||
**/
|
||||
StTheme *
|
||||
st_theme_new (GFile *application_stylesheet,
|
||||
GFile *theme_stylesheet,
|
||||
GFile *default_stylesheet)
|
||||
st_theme_new (const char *application_stylesheet,
|
||||
const char *theme_stylesheet,
|
||||
const char *default_stylesheet)
|
||||
{
|
||||
StTheme *theme = g_object_new (ST_TYPE_THEME,
|
||||
"application-stylesheet", application_stylesheet,
|
||||
@ -875,19 +852,26 @@ add_matched_properties (StTheme *a_this,
|
||||
|
||||
if (import_rule->sheet == NULL)
|
||||
{
|
||||
GFile *file = NULL;
|
||||
char *filename = NULL;
|
||||
|
||||
if (import_rule->url->stryng && import_rule->url->stryng->str)
|
||||
{
|
||||
GFile *file;
|
||||
|
||||
file = _st_theme_resolve_url (a_this,
|
||||
a_nodesheet,
|
||||
import_rule->url->stryng->str);
|
||||
import_rule->sheet = parse_stylesheet (file, NULL);
|
||||
filename = g_file_get_path (file);
|
||||
|
||||
g_object_unref (file);
|
||||
}
|
||||
|
||||
if (filename)
|
||||
import_rule->sheet = parse_stylesheet (filename, NULL);
|
||||
|
||||
if (import_rule->sheet)
|
||||
{
|
||||
insert_stylesheet (a_this, file, import_rule->sheet);
|
||||
insert_stylesheet (a_this, filename, import_rule->sheet);
|
||||
/* refcount of stylesheets starts off at zero, so we don't need to unref! */
|
||||
}
|
||||
else
|
||||
@ -898,8 +882,8 @@ add_matched_properties (StTheme *a_this,
|
||||
import_rule->sheet = (CRStyleSheet *) - 1;
|
||||
}
|
||||
|
||||
if (file)
|
||||
g_object_unref (file);
|
||||
if (filename)
|
||||
g_free (filename);
|
||||
}
|
||||
|
||||
if (import_rule->sheet != (CRStyleSheet *) - 1)
|
||||
@ -1024,8 +1008,8 @@ _st_theme_get_matched_properties (StTheme *theme,
|
||||
return props;
|
||||
}
|
||||
|
||||
/* Resolve an url from an url() reference in a stylesheet into a GFile,
|
||||
* if possible. The resolution here is distinctly lame and
|
||||
/* Resolve an url from an url() reference in a stylesheet into an absolute
|
||||
* local filename, if possible. The resolution here is distinctly lame and
|
||||
* will fail on many examples.
|
||||
*/
|
||||
GFile *
|
||||
@ -1034,7 +1018,7 @@ _st_theme_resolve_url (StTheme *theme,
|
||||
const char *url)
|
||||
{
|
||||
char *scheme;
|
||||
GFile *resource;
|
||||
GFile *stylesheet, *resource;
|
||||
|
||||
if ((scheme = g_uri_parse_scheme (url)))
|
||||
{
|
||||
@ -1043,18 +1027,21 @@ _st_theme_resolve_url (StTheme *theme,
|
||||
}
|
||||
else if (base_stylesheet != NULL)
|
||||
{
|
||||
GFile *base_file = NULL, *parent;
|
||||
const char *base_filename = NULL;
|
||||
char *dirname;
|
||||
|
||||
base_file = g_hash_table_lookup (theme->files_by_stylesheet, base_stylesheet);
|
||||
base_filename = g_hash_table_lookup (theme->filenames_by_stylesheet, base_stylesheet);
|
||||
|
||||
/* This is an internal function, if we get here with
|
||||
a bad @base_stylesheet we have a problem. */
|
||||
g_assert (base_file);
|
||||
g_assert (base_filename);
|
||||
|
||||
parent = g_file_get_parent (base_file);
|
||||
resource = g_file_resolve_relative_path (parent, url);
|
||||
dirname = g_path_get_dirname (base_filename);
|
||||
stylesheet = g_file_new_for_path (dirname);
|
||||
resource = g_file_resolve_relative_path (stylesheet, url);
|
||||
|
||||
g_object_unref (parent);
|
||||
g_object_unref (stylesheet);
|
||||
g_free (dirname);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
@ -47,12 +47,12 @@ typedef struct _StThemeClass StThemeClass;
|
||||
|
||||
GType st_theme_get_type (void) G_GNUC_CONST;
|
||||
|
||||
StTheme *st_theme_new (GFile *application_stylesheet,
|
||||
GFile *theme_stylesheet,
|
||||
GFile *default_stylesheet);
|
||||
StTheme *st_theme_new (const char *application_stylesheet,
|
||||
const char *theme_stylesheet,
|
||||
const char *default_stylesheet);
|
||||
|
||||
gboolean st_theme_load_stylesheet (StTheme *theme, GFile *file, GError **error);
|
||||
void st_theme_unload_stylesheet (StTheme *theme, GFile *file);
|
||||
gboolean st_theme_load_stylesheet (StTheme *theme, const char *path, GError **error);
|
||||
void st_theme_unload_stylesheet (StTheme *theme, const char *path);
|
||||
GSList *st_theme_get_custom_stylesheets (StTheme *theme);
|
||||
|
||||
G_END_DECLS
|
||||
|
||||
@ -277,26 +277,26 @@ current_paint_state (StWidget *widget)
|
||||
|
||||
static void
|
||||
st_widget_texture_cache_changed (StTextureCache *cache,
|
||||
GFile *file,
|
||||
const char *uri,
|
||||
gpointer user_data)
|
||||
{
|
||||
StWidget *actor = ST_WIDGET (user_data);
|
||||
StThemeNode *node = actor->priv->theme_node;
|
||||
char *path;
|
||||
gboolean changed = FALSE;
|
||||
GFile *theme_file;
|
||||
|
||||
if (node == NULL)
|
||||
return;
|
||||
|
||||
theme_file = st_theme_node_get_background_image (node);
|
||||
if ((theme_file != NULL) && g_file_equal (theme_file, file))
|
||||
path = g_filename_from_uri (uri, NULL, NULL);
|
||||
|
||||
if (g_strcmp0 (st_theme_node_get_background_image (node), path) == 0)
|
||||
{
|
||||
st_theme_node_invalidate_background_image (node);
|
||||
changed = TRUE;
|
||||
}
|
||||
|
||||
theme_file = st_border_image_get_file (st_theme_node_get_border_image (node));
|
||||
if ((theme_file != NULL) && g_file_equal (theme_file, file))
|
||||
if (g_strcmp0 (st_border_image_get_filename (st_theme_node_get_border_image (node)), path) == 0)
|
||||
{
|
||||
st_theme_node_invalidate_border_image (node);
|
||||
changed = TRUE;
|
||||
@ -317,6 +317,8 @@ st_widget_texture_cache_changed (StTextureCache *cache,
|
||||
if (CLUTTER_ACTOR_IS_MAPPED (CLUTTER_ACTOR (actor)))
|
||||
clutter_actor_queue_redraw (CLUTTER_ACTOR (actor));
|
||||
}
|
||||
|
||||
g_free (path);
|
||||
}
|
||||
|
||||
static void
|
||||
|
||||
@ -173,21 +173,17 @@ assert_background_image (StThemeNode *node,
|
||||
const char *node_description,
|
||||
const char *expected)
|
||||
{
|
||||
GFile *value = st_theme_node_get_background_image (node);
|
||||
GFile *expected_file;
|
||||
const char *value = st_theme_node_get_background_image (node);
|
||||
if (expected == NULL)
|
||||
expected = "(null)";
|
||||
if (value == NULL)
|
||||
value = "(null)";
|
||||
|
||||
if (expected != NULL && value != NULL)
|
||||
if (strcmp (expected, value) != 0)
|
||||
{
|
||||
expected_file = g_file_new_for_path (expected);
|
||||
|
||||
if (!g_file_equal (expected_file, value))
|
||||
{
|
||||
char *uri = g_file_get_uri (expected_file);
|
||||
g_print ("%s: %s.background-image: expected: %s, got: %s\n",
|
||||
test, node_description, expected, uri);
|
||||
fail = TRUE;
|
||||
g_free (uri);
|
||||
}
|
||||
g_print ("%s: %s.background-image: expected: %s, got: %s\n",
|
||||
test, node_description, expected, value);
|
||||
fail = TRUE;
|
||||
}
|
||||
}
|
||||
|
||||
@ -430,16 +426,14 @@ main (int argc, char **argv)
|
||||
StTheme *theme;
|
||||
StThemeContext *context;
|
||||
PangoFontDescription *font_desc;
|
||||
GFile *file;
|
||||
|
||||
gtk_init (&argc, &argv);
|
||||
|
||||
if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
|
||||
return 1;
|
||||
|
||||
file = g_file_new_for_path ("st/test-theme.css");
|
||||
theme = st_theme_new (file, NULL, NULL);
|
||||
g_object_unref (file);
|
||||
theme = st_theme_new ("st/test-theme.css",
|
||||
NULL, NULL);
|
||||
|
||||
stage = clutter_stage_new ();
|
||||
context = st_theme_context_get_for_stage (CLUTTER_STAGE (stage));
|
||||
|
||||
@ -312,9 +312,6 @@ function test() {
|
||||
button.label = 'NEVER';
|
||||
break;
|
||||
case 'NEVER':
|
||||
button.label = 'EXTERNAL';
|
||||
break;
|
||||
case 'EXTERNAL':
|
||||
button.label = 'AUTOMATIC';
|
||||
break;
|
||||
}
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
|
||||
|
||||
const Clutter = imports.gi.Clutter;
|
||||
const Gio = imports.gi.Gio;
|
||||
const GLib = imports.gi.GLib;
|
||||
const St = imports.gi.St;
|
||||
|
||||
@ -11,7 +10,7 @@ function init(stage) {
|
||||
Environment.init();
|
||||
let context = St.ThemeContext.get_for_stage(stage);
|
||||
let stylesheetPath = GLib.getenv("GNOME_SHELL_TESTSDIR") + "/testcommon/test.css";
|
||||
let theme = new St.Theme({ application_stylesheet: Gio.File.new_for_path(stylesheetPath) });
|
||||
let theme = new St.Theme({ application_stylesheet: stylesheetPath });
|
||||
context.set_theme(theme);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user