From 82c45f4cc1c5f30f0828583de5b71a7091fe038c Mon Sep 17 00:00:00 2001 From: abakkk Date: Thu, 28 Mar 2019 14:59:14 +0100 Subject: [PATCH] rework of prefs --- locale/draw-on-your-screen.pot | 39 ++++++++---- prefs.js | 108 ++++++++++++++++++++++++--------- 2 files changed, 107 insertions(+), 40 deletions(-) diff --git a/locale/draw-on-your-screen.pot b/locale/draw-on-your-screen.pot index ef0631d..5a5fee2 100644 --- a/locale/draw-on-your-screen.pot +++ b/locale/draw-on-your-screen.pot @@ -17,6 +17,14 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +# add your name here, for example: +# "Aïssata\n" +# "Ali\n" +# "丽" +# It will be displayed in About page +msgid "Translators" +msgstr "" + #: extension.js msgid "Leaving drawing mode" msgstr "" @@ -90,8 +98,17 @@ msgstr "" msgid "Dashed" msgstr "" +msgid "Color" +msgstr "" + #: prefs.js +msgid "Preferences" +msgstr "" + +msgid "About" +msgstr "" + # GLOBAL_KEYBINDINGS msgid "Enter/leave drawing mode" @@ -231,13 +248,20 @@ msgstr "" msgid "Escape key" msgstr "" -# +# About page -msgid "" -"Start drawing with Super+Alt+D\n" -"Then save your beautiful work by taking a screenshot" +# you are free to translate the extension name +#msgid "Draw On You Screen" +#msgstr "" + +msgid "Version %s" msgstr "" +msgid "Start drawing with Super+Alt+D and save your beautiful work by taking a screenshot" +msgstr "" + +# Prefs page + msgid "Global" msgstr "" @@ -284,11 +308,4 @@ msgid "" "(See \"Add a drawing background\" or edit the SVG file afterwards)" msgstr "" -msgid "" -"This program comes with ABSOLUTELY NO WARRANTY.\n" -"See the GNU General Public License, version 2 or later for details." -msgstr "" -msgid "Author" -msgstr "" diff --git a/prefs.js b/prefs.js index 922437d..890ec9d 100644 --- a/prefs.js +++ b/prefs.js @@ -23,12 +23,14 @@ const GObject = imports.gi.GObject; const Gtk = imports.gi.Gtk; const Lang = imports.lang; +const Mainloop = imports.mainloop; const ExtensionUtils = imports.misc.extensionUtils; const Extension = ExtensionUtils.getCurrentExtension(); const Convenience = Extension.imports.convenience; const Metadata = Extension.metadata; const _ = imports.gettext.domain(Extension.metadata["gettext-domain"]).gettext; +const _GTK = imports.gettext.domain('gtk30').gettext; const MARGIN = 10; @@ -92,6 +94,82 @@ function buildPrefsWidget() { return prefsPage; } +function buildPrefsWidget() { + let topStack = new TopStack(); + let switcher = new Gtk.StackSwitcher({halign: Gtk.Align.CENTER, visible: true, stack: topStack}); + Mainloop.timeout_add(0, () => { + let window = topStack.get_toplevel(); + window.resize(720,500); + let headerBar = window.get_titlebar(); + headerBar.custom_title = switcher; + return false; + }); + + topStack.show_all(); + return topStack; +} + +const TopStack = new GObject.Class({ + Name: 'DrawOnYourScreenTopStack', + GTypeName: 'DrawOnYourScreenTopStack', + Extends: Gtk.Stack, + + _init: function(params) { + this.parent({ transition_type: 1, transition_duration: 500, expand: true }); + this.prefsPage = new PrefsPage(); + this.add_titled(this.prefsPage, 'prefs', _("Preferences")); + this.aboutPage = new AboutPage(); + this.add_titled(this.aboutPage, 'about', _("About")); + } +}); + +const AboutPage = new GObject.Class({ + Name: 'DrawOnYourScreenAboutPage', + GTypeName: 'DrawOnYourScreenAboutPage', + Extends: Gtk.ScrolledWindow, + + _init: function(params) { + this.parent(); + + let vbox= new Gtk.Box({ orientation: Gtk.Orientation.VERTICAL, margin: MARGIN*3 }); + this.add(vbox); + + let name = " " + _(Metadata.name) + ""; + let version = _("Version %s").format(Metadata.version.toString()); + let description = _(Metadata.description); + let link = "" + Metadata.url + ""; + let licenceName = _GTK("GNU General Public License, version 2 or later"); + let licenceLink = "https://www.gnu.org/licenses/old-licenses/gpl-2.0.html"; + let licence = "" + _GTK("This program comes with absolutely no warranty.\nSee the %s for details.").format(licenceLink, licenceName) + ""; + + let aboutLabel = new Gtk.Label({ wrap: true, justify: 2, use_markup: true, label: + name + "\n\n" + version + "\n\n" + description + "\n\n" + link + "\n\n" + licence + "\n" }); + + vbox.add(aboutLabel); + + let creditBox = new Gtk.Box({ orientation: Gtk.Orientation.HORIZONTAL, margin: 2*MARGIN }); + let leftBox = new Gtk.Box({ orientation: Gtk.Orientation.VERTICAL }); + let rightBox = new Gtk.Box({ orientation: Gtk.Orientation.VERTICAL }); + let leftLabel = new Gtk.Label({ wrap: true, valign: 1, halign: 2, justify: 1, use_markup: true, label: "" + _GTK("Created by") + "" }); + let rightLabel = new Gtk.Label({ wrap: true, valign: 1, halign: 1, justify: 0, use_markup: true, label: "Abakkk" }); + leftBox.pack_start(leftLabel, true, true, 0); + rightBox.pack_start(rightLabel, true, true, 0); + creditBox.pack_start(leftBox, true, true, 5); + creditBox.pack_start(rightBox, true, true, 5); + vbox.add(creditBox); + + if (_("Translators") != "Translators") { + leftBox.pack_start(new Gtk.Label(), true, true, 0); + rightBox.pack_start(new Gtk.Label(), true, true, 0); + leftLabel = new Gtk.Label({ wrap: true, valign: 1, halign: 2, justify: 1, use_markup: true, label: "" + _GTK("Translated by") + "" }); + rightLabel = new Gtk.Label({ wrap: true, valign: 1, halign: 1, justify: 0, use_markup: true, label: "" + _("Translators") + "" }); + leftBox.pack_start(leftLabel, true, true, 0); + rightBox.pack_start(rightLabel, true, true, 0); + } + } + +}); + const PrefsPage = new GObject.Class({ Name: 'DrawOnYourScreenPrefsPage', GTypeName: 'DrawOnYourScreenPrefsPage', @@ -105,13 +183,7 @@ const PrefsPage = new GObject.Class({ let box = new Gtk.Box({orientation: Gtk.Orientation.VERTICAL, margin: MARGIN*3 }); this.add(box); - let textBox1 = new Gtk.Box({ orientation: Gtk.Orientation.VERTICAL, margin: MARGIN }); - let text1 = new Gtk.Label({ wrap: true, justify: 2, use_markup: true, - label: " " + _("Start drawing with Super+Alt+D\nThen save your beautiful work by taking a screenshot") + "" }); - textBox1.pack_start(text1, false, false, 0); - box.add(textBox1); - - let listBox = new Gtk.ListBox({ selection_mode: 0, hexpand: true, margin_top: 2*MARGIN, margin_bottom: 2*MARGIN }); + let listBox = new Gtk.ListBox({ selection_mode: 0, hexpand: true }); box.add(listBox); let styleContext = listBox.get_style_context(); @@ -226,28 +298,6 @@ const PrefsPage = new GObject.Class({ noteBox.pack_start(noteLabel, true, true, 4); listBox.add(noteBox); - this.addSeparator(listBox); - - let licence = _("This program comes with ABSOLUTELY NO WARRANTY.\nSee the GNU General Public License, version 2 or later for details."); - - let textBox2 = new Gtk.Box({ orientation: Gtk.Orientation.VERTICAL }); - let text2 = new Gtk.Label({ wrap: true, justify: 2, use_markup: true, - label: "Version" + " " + Metadata.version +"\n\n" + "" + Metadata.url + "" + "\n\n" + licence + "\n" }); - textBox2.pack_start(text2, false, false, 0); - - let creditBox = new Gtk.Box({ orientation: Gtk.Orientation.HORIZONTAL }); - let leftBox = new Gtk.Box({ orientation: Gtk.Orientation.VERTICAL }); - let rightBox = new Gtk.Box({ orientation: Gtk.Orientation.VERTICAL }); - let leftLabel = new Gtk.Label({ wrap: true, valign: 1, halign: 2, justify: 1, use_markup: true, label: "" + _("Author") + ":" }); - let rightLabel = new Gtk.Label({ wrap: true, valign: 1, halign: 1, justify: 0, use_markup: true, label: "Abakkk" }); - leftBox.pack_start(leftLabel, true, true, 0); - rightBox.pack_start(rightLabel, true, true, 0); - creditBox.pack_start(leftBox, true, true, 5); - creditBox.pack_start(rightBox, true, true, 5); - textBox2.pack_start(creditBox, false, false, 0); - - box.add(textBox2); - let children = listBox.get_children(); for (let i = 0; i < children.length; i++) { if (children[i].activatable)