diff --git a/data/gnome-shell-icons.gresource.xml b/data/gnome-shell-icons.gresource.xml new file mode 100644 index 000000000..c1c6b9d83 --- /dev/null +++ b/data/gnome-shell-icons.gresource.xml @@ -0,0 +1,28 @@ + + + + scalable/actions/color-pick.svg + scalable/actions/carousel-arrow-next-symbolic.svg + scalable/actions/carousel-arrow-previous-symbolic.svg + scalable/actions/pointer-double-click-symbolic.svg + scalable/actions/pointer-drag-symbolic.svg + scalable/actions/pointer-primary-click-symbolic.svg + scalable/actions/pointer-secondary-click-symbolic.svg + scalable/actions/preview-close-symbolic.svg + scalable/actions/screenshot-ui-area-symbolic.svg + scalable/actions/screenshot-ui-display-symbolic.svg + scalable/actions/screenshot-ui-show-pointer-symbolic.svg + scalable/actions/screenshot-ui-window-symbolic.svg + scalable/status/keyboard-caps-lock-symbolic.svg + scalable/status/keyboard-enter-symbolic.svg + scalable/status/keyboard-hide-symbolic.svg + scalable/status/keyboard-layout-symbolic.svg + scalable/status/keyboard-shift-symbolic.svg + scalable/status/message-indicator-symbolic.svg + scalable/status/no-events-symbolic.svg + scalable/status/no-notifications-symbolic.svg + scalable/status/screen-privacy-disabled-symbolic.svg + scalable/status/screen-privacy-symbolic.svg + + + diff --git a/data/gnome-shell-theme.gresource.xml b/data/gnome-shell-theme.gresource.xml index 4e4e67757..3df1b7235 100644 --- a/data/gnome-shell-theme.gresource.xml +++ b/data/gnome-shell-theme.gresource.xml @@ -3,37 +3,19 @@ calendar-today.svg calendar-today-light.svg - carousel-arrow-next-24-symbolic.svg - carousel-arrow-back-24-symbolic.svg checkbox.svg checkbox-focused.svg checkbox-off-focused-light.svg checkbox-off-focused.svg checkbox-off-light.svg checkbox-off.svg - color-pick.svg gnome-shell.css gnome-shell-high-contrast.css gnome-shell-start.svg - message-indicator-symbolic.svg no-events.svg no-notifications.svg pad-osd.css - eye-open-negative-filled-symbolic.svg - eye-not-looking-symbolic.svg - pointer-double-click-symbolic.svg - pointer-drag-symbolic.svg - pointer-primary-click-symbolic.svg - pointer-secondary-click-symbolic.svg - window-close-24-symbolic.svg - keyboard-caps-lock-filled-symbolic.svg - keyboard-enter-symbolic.svg - keyboard-hide-symbolic.svg - keyboard-layout-filled-symbolic.svg - keyboard-shift-filled-symbolic.svg process-working.svg - screen-privacy-disabled-symbolic.svg - screen-privacy-symbolic.svg toggle-off.svg toggle-off-hc.svg toggle-off-light.svg @@ -41,9 +23,5 @@ toggle-on-hc.svg toggle-on-light.svg workspace-placeholder.svg - screenshot-ui-area-symbolic.svg - screenshot-ui-display-symbolic.svg - screenshot-ui-window-symbolic.svg - select-mode-symbolic.svg diff --git a/data/icons/scalable/actions/carousel-arrow-next-symbolic.svg b/data/icons/scalable/actions/carousel-arrow-next-symbolic.svg new file mode 100644 index 000000000..c8091b20b --- /dev/null +++ b/data/icons/scalable/actions/carousel-arrow-next-symbolic.svg @@ -0,0 +1,4 @@ + + + + diff --git a/data/icons/scalable/actions/carousel-arrow-previous-symbolic.svg b/data/icons/scalable/actions/carousel-arrow-previous-symbolic.svg new file mode 100644 index 000000000..85ad3ae97 --- /dev/null +++ b/data/icons/scalable/actions/carousel-arrow-previous-symbolic.svg @@ -0,0 +1,4 @@ + + + + diff --git a/data/theme/color-pick.svg b/data/icons/scalable/actions/color-pick.svg similarity index 100% rename from data/theme/color-pick.svg rename to data/icons/scalable/actions/color-pick.svg diff --git a/data/icons/scalable/actions/pointer-double-click-symbolic.svg b/data/icons/scalable/actions/pointer-double-click-symbolic.svg new file mode 100644 index 000000000..f249aaae6 --- /dev/null +++ b/data/icons/scalable/actions/pointer-double-click-symbolic.svg @@ -0,0 +1,4 @@ + + + + diff --git a/data/icons/scalable/actions/pointer-drag-symbolic.svg b/data/icons/scalable/actions/pointer-drag-symbolic.svg new file mode 100644 index 000000000..7ad812150 --- /dev/null +++ b/data/icons/scalable/actions/pointer-drag-symbolic.svg @@ -0,0 +1,4 @@ + + + + diff --git a/data/icons/scalable/actions/pointer-primary-click-symbolic.svg b/data/icons/scalable/actions/pointer-primary-click-symbolic.svg new file mode 100644 index 000000000..7a99169a5 --- /dev/null +++ b/data/icons/scalable/actions/pointer-primary-click-symbolic.svg @@ -0,0 +1,4 @@ + + + + diff --git a/data/icons/scalable/actions/pointer-secondary-click-symbolic.svg b/data/icons/scalable/actions/pointer-secondary-click-symbolic.svg new file mode 100644 index 000000000..4fccfb8a8 --- /dev/null +++ b/data/icons/scalable/actions/pointer-secondary-click-symbolic.svg @@ -0,0 +1,4 @@ + + + + diff --git a/data/icons/scalable/actions/preview-close-symbolic.svg b/data/icons/scalable/actions/preview-close-symbolic.svg new file mode 100644 index 000000000..9ba08edbf --- /dev/null +++ b/data/icons/scalable/actions/preview-close-symbolic.svg @@ -0,0 +1,4 @@ + + + + diff --git a/data/icons/scalable/actions/screenshot-ui-area-symbolic.svg b/data/icons/scalable/actions/screenshot-ui-area-symbolic.svg new file mode 100644 index 000000000..6cf587049 --- /dev/null +++ b/data/icons/scalable/actions/screenshot-ui-area-symbolic.svg @@ -0,0 +1,4 @@ + + + + diff --git a/data/icons/scalable/actions/screenshot-ui-display-symbolic.svg b/data/icons/scalable/actions/screenshot-ui-display-symbolic.svg new file mode 100644 index 000000000..b8b3f4a20 --- /dev/null +++ b/data/icons/scalable/actions/screenshot-ui-display-symbolic.svg @@ -0,0 +1,4 @@ + + + + diff --git a/data/icons/scalable/actions/screenshot-ui-show-pointer-symbolic.svg b/data/icons/scalable/actions/screenshot-ui-show-pointer-symbolic.svg new file mode 100644 index 000000000..36fab0070 --- /dev/null +++ b/data/icons/scalable/actions/screenshot-ui-show-pointer-symbolic.svg @@ -0,0 +1,4 @@ + + + + diff --git a/data/icons/scalable/actions/screenshot-ui-window-symbolic.svg b/data/icons/scalable/actions/screenshot-ui-window-symbolic.svg new file mode 100644 index 000000000..b667bedb4 --- /dev/null +++ b/data/icons/scalable/actions/screenshot-ui-window-symbolic.svg @@ -0,0 +1,4 @@ + + + + diff --git a/data/icons/scalable/status/keyboard-caps-lock-symbolic.svg b/data/icons/scalable/status/keyboard-caps-lock-symbolic.svg new file mode 100644 index 000000000..9efd39432 --- /dev/null +++ b/data/icons/scalable/status/keyboard-caps-lock-symbolic.svg @@ -0,0 +1,4 @@ + + + + diff --git a/data/icons/scalable/status/keyboard-enter-symbolic.svg b/data/icons/scalable/status/keyboard-enter-symbolic.svg new file mode 100644 index 000000000..7fe839b4a --- /dev/null +++ b/data/icons/scalable/status/keyboard-enter-symbolic.svg @@ -0,0 +1,4 @@ + + + + diff --git a/data/icons/scalable/status/keyboard-hide-symbolic.svg b/data/icons/scalable/status/keyboard-hide-symbolic.svg new file mode 100644 index 000000000..264a556bb --- /dev/null +++ b/data/icons/scalable/status/keyboard-hide-symbolic.svg @@ -0,0 +1,4 @@ + + + + diff --git a/data/icons/scalable/status/keyboard-layout-symbolic.svg b/data/icons/scalable/status/keyboard-layout-symbolic.svg new file mode 100644 index 000000000..6023da25e --- /dev/null +++ b/data/icons/scalable/status/keyboard-layout-symbolic.svg @@ -0,0 +1,4 @@ + + + + diff --git a/data/icons/scalable/status/keyboard-shift-symbolic.svg b/data/icons/scalable/status/keyboard-shift-symbolic.svg new file mode 100644 index 000000000..7255259bd --- /dev/null +++ b/data/icons/scalable/status/keyboard-shift-symbolic.svg @@ -0,0 +1,4 @@ + + + + diff --git a/data/icons/scalable/status/message-indicator-symbolic.svg b/data/icons/scalable/status/message-indicator-symbolic.svg new file mode 100644 index 000000000..9873de505 --- /dev/null +++ b/data/icons/scalable/status/message-indicator-symbolic.svg @@ -0,0 +1,4 @@ + + + + diff --git a/data/icons/scalable/status/no-events-symbolic.svg b/data/icons/scalable/status/no-events-symbolic.svg new file mode 100644 index 000000000..9c7c889a0 --- /dev/null +++ b/data/icons/scalable/status/no-events-symbolic.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/data/icons/scalable/status/no-notifications-symbolic.svg b/data/icons/scalable/status/no-notifications-symbolic.svg new file mode 100644 index 000000000..91f2a2b63 --- /dev/null +++ b/data/icons/scalable/status/no-notifications-symbolic.svg @@ -0,0 +1,4 @@ + + + + diff --git a/data/icons/scalable/status/screen-privacy-disabled-symbolic.svg b/data/icons/scalable/status/screen-privacy-disabled-symbolic.svg new file mode 100644 index 000000000..f64ee0b1e --- /dev/null +++ b/data/icons/scalable/status/screen-privacy-disabled-symbolic.svg @@ -0,0 +1,4 @@ + + + + diff --git a/data/icons/scalable/status/screen-privacy-symbolic.svg b/data/icons/scalable/status/screen-privacy-symbolic.svg new file mode 100644 index 000000000..c14da9d69 --- /dev/null +++ b/data/icons/scalable/status/screen-privacy-symbolic.svg @@ -0,0 +1,4 @@ + + + + diff --git a/data/meson.build b/data/meson.build index c4264e015..311a2b8f9 100644 --- a/data/meson.build +++ b/data/meson.build @@ -49,6 +49,7 @@ subdir('theme') data_resources = [ {'name': 'dbus-interfaces'}, + {'name': 'icons'}, {'name': 'osk-layouts'}, {'name': 'theme', 'deps': theme_deps} ] diff --git a/data/org.gnome.Shell-symbolic.Source.svg b/data/org.gnome.Shell-symbolic.Source.svg new file mode 100644 index 000000000..3117847ab --- /dev/null +++ b/data/org.gnome.Shell-symbolic.Source.svg @@ -0,0 +1,511 @@ + + + + + + + + + + status + + no-notifications + + + + + message-indicator + + + + + screen-privacy + + + + + screen-privacy-disabled + + + + + no-events + + + + + + keyboard-shift + + + + + keyboard-caps-lock + + + + + keyboard-layout + + + + + keyboard-hide + + + + + keyboard-enter + + + + + + actions + + carousel-arrow-previous + + + + + carousel-arrow-next + + + + + pointer-secondary-click + + + + + pointer-primary-click + + + + + pointer-drag + + + + + pointer-double-click + + + + + screenshot-ui-area + + + + + screenshot-ui-display + + + + + screenshot-ui-window + + + + + screenshot-ui-window + + + + + screenshot-ui-show-pointer + + + + + preview-close + + + + + diff --git a/data/theme/carousel-arrow-back-24-symbolic.svg b/data/theme/carousel-arrow-back-24-symbolic.svg deleted file mode 100644 index 984893092..000000000 --- a/data/theme/carousel-arrow-back-24-symbolic.svg +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - image/svg+xml - - - - - - - - - diff --git a/data/theme/carousel-arrow-next-24-symbolic.svg b/data/theme/carousel-arrow-next-24-symbolic.svg deleted file mode 100644 index 7d6356f23..000000000 --- a/data/theme/carousel-arrow-next-24-symbolic.svg +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - image/svg+xml - - - - - - - - - diff --git a/data/theme/eye-not-looking-symbolic.svg b/data/theme/eye-not-looking-symbolic.svg deleted file mode 100644 index a168c87d8..000000000 --- a/data/theme/eye-not-looking-symbolic.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/data/theme/eye-open-negative-filled-symbolic.svg b/data/theme/eye-open-negative-filled-symbolic.svg deleted file mode 100644 index 1e5351c99..000000000 --- a/data/theme/eye-open-negative-filled-symbolic.svg +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - image/svg+xml - - Gnome Symbolic Icon Theme - - - - Gnome Symbolic Icon Theme - - - - - - - - - - - - - - - diff --git a/data/theme/keyboard-caps-lock-filled-symbolic.svg b/data/theme/keyboard-caps-lock-filled-symbolic.svg deleted file mode 100644 index b2468aeb2..000000000 --- a/data/theme/keyboard-caps-lock-filled-symbolic.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/theme/keyboard-enter-symbolic.svg b/data/theme/keyboard-enter-symbolic.svg deleted file mode 100644 index 51e6dae0f..000000000 --- a/data/theme/keyboard-enter-symbolic.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/theme/keyboard-hide-symbolic.svg b/data/theme/keyboard-hide-symbolic.svg deleted file mode 100644 index fbe0edaec..000000000 --- a/data/theme/keyboard-hide-symbolic.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/theme/keyboard-layout-filled-symbolic.svg b/data/theme/keyboard-layout-filled-symbolic.svg deleted file mode 100644 index bdc4b01f1..000000000 --- a/data/theme/keyboard-layout-filled-symbolic.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/theme/keyboard-shift-filled-symbolic.svg b/data/theme/keyboard-shift-filled-symbolic.svg deleted file mode 100644 index f072d3966..000000000 --- a/data/theme/keyboard-shift-filled-symbolic.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/theme/message-indicator-symbolic.svg b/data/theme/message-indicator-symbolic.svg deleted file mode 100644 index 257a984b0..000000000 --- a/data/theme/message-indicator-symbolic.svg +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - image/svg+xml - - - - - - - - - diff --git a/data/theme/pointer-double-click-symbolic.svg b/data/theme/pointer-double-click-symbolic.svg deleted file mode 100644 index 526783410..000000000 --- a/data/theme/pointer-double-click-symbolic.svg +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - diff --git a/data/theme/pointer-drag-symbolic.svg b/data/theme/pointer-drag-symbolic.svg deleted file mode 100644 index be37e6fc4..000000000 --- a/data/theme/pointer-drag-symbolic.svg +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - diff --git a/data/theme/pointer-primary-click-symbolic.svg b/data/theme/pointer-primary-click-symbolic.svg deleted file mode 100644 index f44799107..000000000 --- a/data/theme/pointer-primary-click-symbolic.svg +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - diff --git a/data/theme/pointer-secondary-click-symbolic.svg b/data/theme/pointer-secondary-click-symbolic.svg deleted file mode 100644 index b72e17886..000000000 --- a/data/theme/pointer-secondary-click-symbolic.svg +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - diff --git a/data/theme/screen-privacy-disabled-symbolic.svg b/data/theme/screen-privacy-disabled-symbolic.svg deleted file mode 100644 index aad5d2e46..000000000 --- a/data/theme/screen-privacy-disabled-symbolic.svg +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/data/theme/screen-privacy-symbolic.svg b/data/theme/screen-privacy-symbolic.svg deleted file mode 100644 index 9157a5d4e..000000000 --- a/data/theme/screen-privacy-symbolic.svg +++ /dev/null @@ -1,109 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/data/theme/screenshot-ui-area-symbolic.svg b/data/theme/screenshot-ui-area-symbolic.svg deleted file mode 100644 index 627288d8b..000000000 --- a/data/theme/screenshot-ui-area-symbolic.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/data/theme/screenshot-ui-display-symbolic.svg b/data/theme/screenshot-ui-display-symbolic.svg deleted file mode 100644 index 5c740ab50..000000000 --- a/data/theme/screenshot-ui-display-symbolic.svg +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - diff --git a/data/theme/screenshot-ui-window-symbolic.svg b/data/theme/screenshot-ui-window-symbolic.svg deleted file mode 100644 index c9124a4bb..000000000 --- a/data/theme/screenshot-ui-window-symbolic.svg +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - diff --git a/data/theme/select-mode-symbolic.svg b/data/theme/select-mode-symbolic.svg deleted file mode 100644 index 4b99430ad..000000000 --- a/data/theme/select-mode-symbolic.svg +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/data/theme/window-close-24-symbolic.svg b/data/theme/window-close-24-symbolic.svg deleted file mode 100644 index 0cda83183..000000000 --- a/data/theme/window-close-24-symbolic.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - image/svg+xml - - - - - - - diff --git a/js/ui/appDisplay.js b/js/ui/appDisplay.js index a9aa8fb81..c8f60493d 100644 --- a/js/ui/appDisplay.js +++ b/js/ui/appDisplay.js @@ -238,8 +238,8 @@ var BaseAppView = GObject.registerClass({ this._nextPageArrow = new St.Icon({ style_class: 'page-navigation-arrow', icon_name: rtl - ? 'carousel-arrow-back-24-symbolic' - : 'carousel-arrow-next-24-symbolic', + ? 'carousel-arrow-previous-symbolic' + : 'carousel-arrow-next-symbolic', opacity: 0, reactive: false, visible: false, @@ -249,8 +249,8 @@ var BaseAppView = GObject.registerClass({ this._prevPageArrow = new St.Icon({ style_class: 'page-navigation-arrow', icon_name: rtl - ? 'carousel-arrow-next-24-symbolic' - : 'carousel-arrow-back-24-symbolic', + ? 'carousel-arrow-next-symbolic' + : 'carousel-arrow-previous-symbolic', opacity: 0, reactive: false, visible: false, diff --git a/js/ui/keyboard.js b/js/ui/keyboard.js index 965c75dc3..cff4a6f8e 100644 --- a/js/ui/keyboard.js +++ b/js/ui/keyboard.js @@ -28,12 +28,12 @@ const defaultKeysPre = [ [ [], [], - [{ width: 1.5, level: 1, extraClassName: 'shift-key-lowercase', icon: 'keyboard-shift-filled-symbolic' }], + [{ width: 1.5, level: 1, extraClassName: 'shift-key-lowercase', icon: 'keyboard-shift-symbolic' }], [{ label: '?123', width: 1.5, level: 2 }], ], [ [], [], - [{ width: 1.5, level: 0, extraClassName: 'shift-key-uppercase', icon: 'keyboard-shift-filled-symbolic' }], + [{ width: 1.5, level: 0, extraClassName: 'shift-key-uppercase', icon: 'keyboard-shift-symbolic' }], [{ label: '?123', width: 1.5, level: 2 }], ], [ [], @@ -52,23 +52,23 @@ const defaultKeysPost = [ [ [{ width: 1.5, keyval: Clutter.KEY_BackSpace, icon: 'edit-clear-symbolic' }], [{ width: 2, keyval: Clutter.KEY_Return, extraClassName: 'enter-key', icon: 'keyboard-enter-symbolic' }], - [{ width: 3, level: 1, right: true, extraClassName: 'shift-key-lowercase', icon: 'keyboard-shift-filled-symbolic' }], - [{ action: 'emoji', icon: 'face-smile-symbolic' }, { action: 'languageMenu', extraClassName: 'layout-key', icon: 'keyboard-layout-filled-symbolic' }, { action: 'hide', extraClassName: 'hide-key', icon: 'go-down-symbolic' }], + [{ width: 3, level: 1, right: true, extraClassName: 'shift-key-lowercase', icon: 'keyboard-shift-symbolic' }], + [{ action: 'emoji', icon: 'face-smile-symbolic' }, { action: 'languageMenu', extraClassName: 'layout-key', icon: 'keyboard-layout-symbolic' }, { action: 'hide', extraClassName: 'hide-key', icon: 'go-down-symbolic' }], ], [ [{ width: 1.5, keyval: Clutter.KEY_BackSpace, icon: 'edit-clear-symbolic' }], [{ width: 2, keyval: Clutter.KEY_Return, extraClassName: 'enter-key', icon: 'keyboard-enter-symbolic' }], - [{ width: 3, level: 0, right: true, extraClassName: 'shift-key-uppercase', icon: 'keyboard-shift-filled-symbolic' }], - [{ action: 'emoji', icon: 'face-smile-symbolic' }, { action: 'languageMenu', extraClassName: 'layout-key', icon: 'keyboard-layout-filled-symbolic' }, { action: 'hide', extraClassName: 'hide-key', icon: 'go-down-symbolic' }], + [{ width: 3, level: 0, right: true, extraClassName: 'shift-key-uppercase', icon: 'keyboard-shift-symbolic' }], + [{ action: 'emoji', icon: 'face-smile-symbolic' }, { action: 'languageMenu', extraClassName: 'layout-key', icon: 'keyboard-layout-symbolic' }, { action: 'hide', extraClassName: 'hide-key', icon: 'go-down-symbolic' }], ], [ [{ width: 1.5, keyval: Clutter.KEY_BackSpace, icon: 'edit-clear-symbolic' }], [{ width: 2, keyval: Clutter.KEY_Return, extraClassName: 'enter-key', icon: 'keyboard-enter-symbolic' }], [{ label: '=/<', width: 3, level: 3, right: true }], - [{ action: 'emoji', icon: 'face-smile-symbolic' }, { action: 'languageMenu', extraClassName: 'layout-key', icon: 'keyboard-layout-filled-symbolic' }, { action: 'hide', extraClassName: 'hide-key', icon: 'go-down-symbolic' }], + [{ action: 'emoji', icon: 'face-smile-symbolic' }, { action: 'languageMenu', extraClassName: 'layout-key', icon: 'keyboard-layout-symbolic' }, { action: 'hide', extraClassName: 'hide-key', icon: 'go-down-symbolic' }], ], [ [{ width: 1.5, keyval: Clutter.KEY_BackSpace, icon: 'edit-clear-symbolic' }], [{ width: 2, keyval: Clutter.KEY_Return, extraClassName: 'enter-key', icon: 'keyboard-enter-symbolic' }], [{ label: '?123', width: 3, level: 2, right: true }], - [{ action: 'emoji', icon: 'face-smile-symbolic' }, { action: 'languageMenu', extraClassName: 'layout-key', icon: 'keyboard-layout-filled-symbolic' }, { action: 'hide', extraClassName: 'hide-key', icon: 'go-down-symbolic' }], + [{ action: 'emoji', icon: 'face-smile-symbolic' }, { action: 'languageMenu', extraClassName: 'layout-key', icon: 'keyboard-layout-symbolic' }, { action: 'hide', extraClassName: 'hide-key', icon: 'go-down-symbolic' }], ], ]; @@ -530,10 +530,10 @@ var Key = GObject.registerClass({ if (latched) { this.keyButton.add_style_pseudo_class('latched'); - this._icon.icon_name = 'keyboard-caps-lock-filled-symbolic'; + this._icon.icon_name = 'keyboard-caps-lock-symbolic'; } else { this.keyButton.remove_style_pseudo_class('latched'); - this._icon.icon_name = 'keyboard-shift-filled-symbolic'; + this._icon.icon_name = 'keyboard-shift-symbolic'; } } }); diff --git a/js/ui/main.js b/js/ui/main.js index ee7cdedca..d0fd97861 100644 --- a/js/ui/main.js +++ b/js/ui/main.js @@ -98,6 +98,7 @@ let _defaultCssStylesheet = null; let _cssStylesheet = null; let _themeResource = null; let _oskResource = null; +let _iconResource = null; Gio._promisify(Gio._LocalFilePrototype, 'delete_async', 'delete_finish'); Gio._promisify(Gio._LocalFilePrototype, 'touch_async', 'touch_finish'); @@ -189,6 +190,7 @@ function _initializeUI() { Shell.AppUsage.get_default(); reloadThemeResource(); + _loadIcons(); _loadOskLayouts(); _loadDefaultStylesheet(); @@ -440,6 +442,12 @@ function reloadThemeResource() { _themeResource._register(); } +/** @private */ +function _loadIcons() { + _iconResource = Gio.Resource.load('%s/gnome-shell-icons.gresource'.format(global.datadir)); + _iconResource._register(); +} + function _loadOskLayouts() { _oskResource = Gio.Resource.load('%s/gnome-shell-osk-layouts.gresource'.format(global.datadir)); _oskResource._register(); diff --git a/js/ui/screenshot.js b/js/ui/screenshot.js index 544513fec..f35ab6034 100644 --- a/js/ui/screenshot.js +++ b/js/ui/screenshot.js @@ -1250,7 +1250,7 @@ var ScreenshotUI = GObject.registerClass({ style_class: 'screenshot-ui-show-pointer-button', toggle_mode: true, }); - this._showPointerButton.set_child(new St.Icon({ icon_name: 'select-mode-symbolic' })); + this._showPointerButton.set_child(new St.Icon({ icon_name: 'screenshot-ui-show-pointer-symbolic' })); this._showPointerButtonContainer.add_child(this._showPointerButton); this.add_child(new Tooltip(this._showPointerButton, { diff --git a/src/st/st-password-entry.c b/src/st/st-password-entry.c index 847ba3a14..89eef4245 100644 --- a/src/st/st-password-entry.c +++ b/src/st/st-password-entry.c @@ -224,7 +224,7 @@ st_password_entry_init (StPasswordEntry *entry) priv->peek_password_icon = g_object_new (ST_TYPE_ICON, "style-class", "peek-password", - "icon-name", "eye-not-looking-symbolic", + "icon-name", "view-reveal-symbolic", NULL); st_entry_set_secondary_icon (ST_ENTRY (entry), priv->peek_password_icon); @@ -332,12 +332,12 @@ st_password_entry_set_password_visible (StPasswordEntry *entry, if (priv->password_visible) { clutter_text_set_password_char (CLUTTER_TEXT (clutter_text), 0); - st_icon_set_icon_name (ST_ICON (priv->peek_password_icon), "eye-open-negative-filled-symbolic"); + st_icon_set_icon_name (ST_ICON (priv->peek_password_icon), "view-conceal-symbolic"); } else { clutter_text_set_password_char (CLUTTER_TEXT (clutter_text), BLACK_CIRCLE); - st_icon_set_icon_name (ST_ICON (priv->peek_password_icon), "eye-not-looking-symbolic"); + st_icon_set_icon_name (ST_ICON (priv->peek_password_icon), "view-reveal-symbolic"); } g_object_notify_by_pspec (G_OBJECT (entry), props[PROP_PASSWORD_VISIBLE]); diff --git a/src/st/st-texture-cache.c b/src/st/st-texture-cache.c index b7b547a78..7062221b6 100644 --- a/src/st/st-texture-cache.c +++ b/src/st/st-texture-cache.c @@ -187,7 +187,7 @@ st_texture_cache_init (StTextureCache *self) self->priv->icon_theme = gtk_icon_theme_new (); gtk_icon_theme_add_resource_path (self->priv->icon_theme, - "/org/gnome/shell/theme/icons"); + "/org/gnome/shell/icons"); g_signal_connect (self->priv->icon_theme, "changed", G_CALLBACK (on_gtk_icon_theme_changed), self);