diff --git a/data/icons/arc-symbolic.svg b/data/icons/arc-symbolic.svg index fb2bea9..5da0547 100644 --- a/data/icons/arc-symbolic.svg +++ b/data/icons/arc-symbolic.svg @@ -3,5 +3,5 @@ https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/blob/master/Papirus/symbolic/actions/tool-arc-symbolic.svg https://www.gnu.org/licenses/gpl-3.0.html - + diff --git a/data/icons/color-symbolic.svg b/data/icons/color-symbolic.svg index 0410239..163f40f 100644 --- a/data/icons/color-symbolic.svg +++ b/data/icons/color-symbolic.svg @@ -7,7 +7,7 @@ Created by potrace 1.15, written by Peter Selinger 2001-2017 https://svgsilh.com/image/1745699.html https://creativecommons.org/publicdomain/zero/1.0 - + - - - + + + diff --git a/data/icons/document-export-symbolic.svg b/data/icons/document-export-symbolic.svg new file mode 100644 index 0000000..eb158e9 --- /dev/null +++ b/data/icons/document-export-symbolic.svg @@ -0,0 +1,8 @@ + + +https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/blob/master/Papirus/symbolic/actions/document-export-symbolic.svg +https://www.gnu.org/licenses/gpl-3.0.html + + + + diff --git a/data/icons/fill-symbolic.svg b/data/icons/fill-symbolic.svg index 7c652e2..0a66829 100644 --- a/data/icons/fill-symbolic.svg +++ b/data/icons/fill-symbolic.svg @@ -1,3 +1,3 @@ - + diff --git a/data/icons/fillrule-evenodd-symbolic.svg b/data/icons/fillrule-evenodd-symbolic.svg index 3f64343..da0de94 100644 --- a/data/icons/fillrule-evenodd-symbolic.svg +++ b/data/icons/fillrule-evenodd-symbolic.svg @@ -1,3 +1,3 @@ - + diff --git a/data/icons/fillrule-nonzero-symbolic.svg b/data/icons/fillrule-nonzero-symbolic.svg index 72e0cf2..be3096c 100644 --- a/data/icons/fillrule-nonzero-symbolic.svg +++ b/data/icons/fillrule-nonzero-symbolic.svg @@ -1,3 +1,3 @@ - + diff --git a/data/icons/full-line-symbolic.svg b/data/icons/full-line-symbolic.svg index 9323bfe..b17a91b 100644 --- a/data/icons/full-line-symbolic.svg +++ b/data/icons/full-line-symbolic.svg @@ -1,3 +1,3 @@ - + diff --git a/data/icons/linecap-symbolic.svg b/data/icons/linecap-symbolic.svg index fdfe9f6..0df89de 100644 --- a/data/icons/linecap-symbolic.svg +++ b/data/icons/linecap-symbolic.svg @@ -1,4 +1,4 @@ - - + + diff --git a/data/icons/linejoin-symbolic.svg b/data/icons/linejoin-symbolic.svg index 084caa7..8d5951e 100644 --- a/data/icons/linejoin-symbolic.svg +++ b/data/icons/linejoin-symbolic.svg @@ -1,3 +1,3 @@ - + diff --git a/data/icons/palette-symbolic.svg b/data/icons/palette-symbolic.svg index 0f00fd4..7846c46 100644 --- a/data/icons/palette-symbolic.svg +++ b/data/icons/palette-symbolic.svg @@ -7,7 +7,7 @@ Created by potrace 1.15, written by Peter Selinger 2001-2017 https://svgsilh.com/image/2026954.html https://creativecommons.org/publicdomain/zero/1.0/ - + - - - - + + + + diff --git a/data/icons/stroke-symbolic.svg b/data/icons/stroke-symbolic.svg index f693453..29ed599 100644 --- a/data/icons/stroke-symbolic.svg +++ b/data/icons/stroke-symbolic.svg @@ -1,3 +1,3 @@ - + diff --git a/data/icons/tool-ellipse-symbolic.svg b/data/icons/tool-ellipse-symbolic.svg index 20d5ae8..9d93d08 100644 --- a/data/icons/tool-ellipse-symbolic.svg +++ b/data/icons/tool-ellipse-symbolic.svg @@ -3,5 +3,5 @@ https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/blob/master/Papirus/symbolic/actions/tool-circle-move-symbolic.svg https://www.gnu.org/licenses/gpl-3.0.html - + diff --git a/data/icons/tool-line-symbolic.svg b/data/icons/tool-line-symbolic.svg index dbc7688..953d9b5 100644 --- a/data/icons/tool-line-symbolic.svg +++ b/data/icons/tool-line-symbolic.svg @@ -3,5 +3,5 @@ https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/blob/master/Papirus/symbolic/actions/tool-line-symbolic.svg https://www.gnu.org/licenses/gpl-3.0.html - + diff --git a/data/icons/tool-mirror-symbolic.svg b/data/icons/tool-mirror-symbolic.svg index fd269b0..403970b 100644 --- a/data/icons/tool-mirror-symbolic.svg +++ b/data/icons/tool-mirror-symbolic.svg @@ -3,6 +3,6 @@ https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/blob/master/Papirus/symbolic/actions/view-mirror-symbolic.svg https://www.gnu.org/licenses/gpl-3.0.html - - + + diff --git a/data/icons/tool-move-symbolic.svg b/data/icons/tool-move-symbolic.svg index 41bedc4..d77f2e3 100644 --- a/data/icons/tool-move-symbolic.svg +++ b/data/icons/tool-move-symbolic.svg @@ -8,7 +8,7 @@ https://www.gnu.org/licenses/gpl-3.0.html optimized with SVGO - + diff --git a/data/icons/tool-polygon-symbolic.svg b/data/icons/tool-polygon-symbolic.svg index e54e5b7..9c1a0b6 100644 --- a/data/icons/tool-polygon-symbolic.svg +++ b/data/icons/tool-polygon-symbolic.svg @@ -3,6 +3,6 @@ https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/blob/master/Papirus/symbolic/actions/tool-polygon-symbolic.svg https://www.gnu.org/licenses/gpl-3.0.html - - + + diff --git a/data/icons/tool-rectangle-symbolic.svg b/data/icons/tool-rectangle-symbolic.svg index 033e73a..e7dbfe0 100644 --- a/data/icons/tool-rectangle-symbolic.svg +++ b/data/icons/tool-rectangle-symbolic.svg @@ -3,5 +3,5 @@ https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/blob/master/Papirus/symbolic/actions/tool-rectangle-symbolic.svg https://www.gnu.org/licenses/gpl-3.0.html - + diff --git a/files.js b/files.js index 2442ac7..22a31bc 100644 --- a/files.js +++ b/files.js @@ -37,7 +37,7 @@ const Clipboard = St.Clipboard.get_default(); const CLIPBOARD_TYPE = St.ClipboardType.CLIPBOARD; const ICON_DIR = Me.dir.get_child('data').get_child('icons'); const ICON_NAMES = [ - 'arc', 'color', 'dashed-line', 'fillrule-evenodd', 'fillrule-nonzero', 'fill', 'full-line', 'linecap', 'linejoin', 'palette', 'smooth', 'stroke', + 'arc', 'color', 'dashed-line', 'document-export', 'fillrule-evenodd', 'fillrule-nonzero', 'fill', 'full-line', 'linecap', 'linejoin', 'palette', 'smooth', 'stroke', 'tool-ellipse', 'tool-line', 'tool-mirror', 'tool-move', 'tool-none', 'tool-polygon', 'tool-polyline', 'tool-rectangle', 'tool-resize', ]; const ThemedIconNames = { @@ -56,7 +56,7 @@ ICON_NAMES.forEach(name => { get: function() { if (!this[`_${name}`]) { let file = Gio.File.new_for_path(ICON_DIR.get_child(`${name}-symbolic.svg`).get_path()); - this[`_${name}`] = file.query_exists(null) ? new Gio.FileIcon({ file }) : new Gio.ThemedIcon({ name: 'error-symbolic' }); + this[`_${name}`] = file.query_exists(null) ? new Gio.FileIcon({ file }) : new Gio.ThemedIcon({ name: 'action-unavailable-symbolic' }); } return this[`_${name}`]; } diff --git a/menu.js b/menu.js index 4e51df1..2e4f536 100644 --- a/menu.js +++ b/menu.js @@ -275,10 +275,10 @@ var DrawingMenu = new Lang.Class({ this._addSeparator(this.menu); this._addDrawingNameItem(this.menu); - this._addOpenDrawingSubMenuItem(this.menu, Files.Icons.OPEN); - this._addSaveDrawingSubMenuItem(this.menu, Files.Icons.SAVE); + this._addOpenDrawingSubMenuItem(this.menu, 'document-open-symbolic'); + this._addSaveDrawingSubMenuItem(this.menu, 'document-save-as-symbolic'); - this.menu.addAction(getSummary('save-as-svg'), this.area.saveAsSvg.bind(this.area), 'image-x-generic-symbolic'); + this.menu.addAction(getSummary('save-as-svg'), this.area.saveAsSvg.bind(this.area), Files.Icons.DOCUMENT_EXPORT); this.menu.addAction(getSummary('open-preferences'), areaManager.openPreferences.bind(areaManager), 'document-page-setup-symbolic'); this.menu.addAction(getSummary('toggle-help'), () => { this.close(); this.area.toggleHelp(); }, 'preferences-desktop-keyboard-shortcuts-symbolic'); @@ -582,7 +582,7 @@ var DrawingMenu = new Lang.Class({ this.openDrawingSubMenuItem = item; this.openDrawingSubMenu = item.menu; item.setSensitive(Boolean(Files.Jsons.getSorted().length)); - item.icon.set_gicon(icon); + item.icon.set_icon_name(icon); item.menu.itemActivated = item.menu.close; @@ -650,7 +650,7 @@ var DrawingMenu = new Lang.Class({ this.saveDrawingSubMenuItem = item; this._updateSaveDrawingSubMenuItemSensitivity(); this.saveDrawingSubMenu = item.menu; - item.icon.set_gicon(icon); + item.icon.set_icon_name(icon); item.menu.itemActivated = item.menu.close;