scope gobject classes 🤡 , code cleanup

cinatic · cinatic · commit ccce679475c4 · 2022-04-15T12:50:31.000+02:00
diff --git a/gitlab-extension@infinicode.de/components/settings/aboutPage.js b/gitlab-extension@infinicode.de/components/settings/aboutPage.js
@@ -1,162 +1,170 @@
-const ExtensionUtils = imports.misc.extensionUtils;
-const Me = ExtensionUtils.getCurrentExtension();
+const ExtensionUtils = imports.misc.extensionUtils
+const Me = ExtensionUtils.getCurrentExtension()
 
-const {Adw, GdkPixbuf, Gio, GLib, GObject, Gtk} = imports.gi;
+const { Adw, GdkPixbuf, Gio, GLib, GObject, Gtk } = imports.gi
 
 const { Settings } = Me.imports.helpers.settings
 const { Translations } = Me.imports.helpers.translations
 
-var AboutPage = GObject.registerClass(
+var AboutPage = GObject.registerClass({
+      GTypeName: 'GitlabExtension-AboutPage',
+    },
     class AboutPagePreferencesPage extends Adw.PreferencesPage {
-      _init() {
+      _init () {
         super._init({
           title: Translations.SETTINGS.TITLE_ABOUT,
           icon_name: 'help-about-symbolic',
           name: 'AboutPage'
-        });
+        })
 
         //Logo and project description-------------------------------------
-        let headerPreferencesGroup = new Adw.PreferencesGroup();
+        let headerPreferencesGroup = new Adw.PreferencesGroup()
 
-        let extensionHeaderBox = new Gtk.Box( {
+        let extensionHeaderBox = new Gtk.Box({
           orientation: Gtk.Orientation.VERTICAL,
           hexpand: false,
           vexpand: false
-        });
+        })
 
         let extensionTaskbarLabel = new Gtk.Label({
           label: `<span size="larger"><b>${Translations.EXTENSION.NAME}</b></span>`,
           use_markup: true,
           vexpand: true,
           valign: Gtk.Align.FILL
-        });
+        })
 
         let projectDescriptionLabel = new Gtk.Label({
           label: Translations.EXTENSION.DESCRIPTION,
           hexpand: false,
           vexpand: false,
-        });
-        extensionHeaderBox.append(extensionTaskbarLabel);
-        extensionHeaderBox.append(projectDescriptionLabel);
-        headerPreferencesGroup.add(extensionHeaderBox);
+        })
+        extensionHeaderBox.append(extensionTaskbarLabel)
+        extensionHeaderBox.append(projectDescriptionLabel)
+        headerPreferencesGroup.add(extensionHeaderBox)
 
-        this.add(headerPreferencesGroup);
+        this.add(headerPreferencesGroup)
         //-----------------------------------------------------------------------
 
         //Extension/OS Info Group------------------------------------------------
-        let extensionInfoGroup = new Adw.PreferencesGroup();
+        let extensionInfoGroup = new Adw.PreferencesGroup()
         let extensionTaskbarVersionRow = new Adw.ActionRow({
           title: Translations.MISC.EXTENSION_VERSION,
-        });
-        let releaseVersion;
-        if(Me.metadata.version)
-          releaseVersion = Me.metadata.version;
-        else
-          releaseVersion = 'unknown';
+        })
+        let releaseVersion
+        if (Me.metadata.version) {
+          releaseVersion = Me.metadata.version
+        } else {
+          releaseVersion = 'unknown'
+        }
         extensionTaskbarVersionRow.add_suffix(new Gtk.Label({
           label: releaseVersion + ''
-        }));
-        extensionInfoGroup.add(extensionTaskbarVersionRow);
+        }))
+        extensionInfoGroup.add(extensionTaskbarVersionRow)
 
         let commitRow = new Adw.ActionRow({
           title: Translations.MISC.GIT_COMMIT
-        });
-        let commitVersion;
-        if(Me.metadata.commit)
-          commitVersion = Me.metadata.commit;
+        })
+        let commitVersion
+        if (Me.metadata.commit) {
+          commitVersion = Me.metadata.commit
+        }
         commitRow.add_suffix(new Gtk.Label({
           label: commitVersion ? commitVersion : '',
-        }));
-        if(commitVersion){
-          extensionInfoGroup.add(commitRow);
+        }))
+        if (commitVersion) {
+          extensionInfoGroup.add(commitRow)
         }
 
         let gnomeVersionRow = new Adw.ActionRow({
           title: Translations.MISC.GNOME_VERSION,
-        });
+        })
         gnomeVersionRow.add_suffix(new Gtk.Label({
           label: imports.misc.config.PACKAGE_VERSION + '',
-        }));
-        extensionInfoGroup.add(gnomeVersionRow);
+        }))
+        extensionInfoGroup.add(gnomeVersionRow)
 
         let osRow = new Adw.ActionRow({
           title: Translations.MISC.OS,
-        });
-        let osInfoText;
-        let name = GLib.get_os_info("NAME");
-        let prettyName = GLib.get_os_info("PRETTY_NAME");
-        if(prettyName)
-          osInfoText = prettyName;
-        else
-          osInfoText = name;
-        let versionID = GLib.get_os_info("VERSION_ID");
-        if(versionID)
-          osInfoText += "; Version ID: " + versionID;
-        let buildID = GLib.get_os_info("BUILD_ID");
-        if(buildID)
-          osInfoText += "; " + "Build ID: " +buildID;
+        })
+        let osInfoText
+        let name = GLib.get_os_info('NAME')
+        let prettyName = GLib.get_os_info('PRETTY_NAME')
+        if (prettyName) {
+          osInfoText = prettyName
+        } else {
+          osInfoText = name
+        }
+        let versionID = GLib.get_os_info('VERSION_ID')
+        if (versionID) {
+          osInfoText += '; Version ID: ' + versionID
+        }
+        let buildID = GLib.get_os_info('BUILD_ID')
+        if (buildID) {
+          osInfoText += '; ' + 'Build ID: ' + buildID
+        }
         osRow.add_suffix(new Gtk.Label({
           label: osInfoText,
           single_line_mode: false,
           wrap: true,
-        }));
-        extensionInfoGroup.add(osRow);
+        }))
+        extensionInfoGroup.add(osRow)
 
         let sessionTypeRow = new Adw.ActionRow({
           title: Translations.MISC.SESSION_TYPE,
-        });
-        let windowingLabel;
-        if(Me.metadata.isWayland)
-          windowingLabel = "Wayland";
-        else
-          windowingLabel = "X11";
+        })
+        let windowingLabel
+        if (Me.metadata.isWayland) {
+          windowingLabel = 'Wayland'
+        } else {
+          windowingLabel = 'X11'
+        }
         sessionTypeRow.add_suffix(new Gtk.Label({
           label: windowingLabel,
-        }));
-        extensionInfoGroup.add(sessionTypeRow);
+        }))
+        extensionInfoGroup.add(sessionTypeRow)
 
-        this.add(extensionInfoGroup);
+        this.add(extensionInfoGroup)
         //-----------------------------------------------------------------------
 
-        let linksGroup = new Adw.PreferencesGroup();
-        let linksBox = new Adw.ActionRow();
+        let linksGroup = new Adw.PreferencesGroup()
+        let linksBox = new Adw.ActionRow()
 
-        let pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_scale(Me.path + '/media/donate-icon.svg', -1, 50, true);
-        let donateImage = Gtk.Picture.new_for_pixbuf(pixbuf);
+        let pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_scale(Me.path + '/media/donate-icon.svg', -1, 50, true)
+        let donateImage = Gtk.Picture.new_for_pixbuf(pixbuf)
         let donateLinkButton = new Gtk.LinkButton({
           child: donateImage,
           uri: 'https://www.paypal.com/donate/?hosted_button_id=US78C8SZ6UHHQ',
-        });
+        })
 
-        pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_scale(Me.path + '/media/source-icon.svg', -1, 50, true);
-        let sourceCodeImage = Gtk.Picture.new_for_pixbuf(pixbuf);
-        let projectUrl = Me.metadata.url;
+        pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_scale(Me.path + '/media/source-icon.svg', -1, 50, true)
+        let sourceCodeImage = Gtk.Picture.new_for_pixbuf(pixbuf)
+        let projectUrl = Me.metadata.url
         let projectLinkButton = new Gtk.LinkButton({
           child: sourceCodeImage,
           uri: projectUrl,
-        });
+        })
 
-        linksBox.add_prefix(projectLinkButton);
-        linksBox.add_suffix(donateLinkButton);
-        linksGroup.add(linksBox);
-        this.add(linksGroup);
+        linksBox.add_prefix(projectLinkButton)
+        linksBox.add_suffix(donateLinkButton)
+        linksGroup.add(linksBox)
+        this.add(linksGroup)
 
-        let gnuSoftwareGroup = new Adw.PreferencesGroup();
+        let gnuSoftwareGroup = new Adw.PreferencesGroup()
         let gnuSofwareLabel = new Gtk.Label({
           label: GNU_SOFTWARE,
           use_markup: true,
           justify: Gtk.Justification.CENTER
-        });
+        })
         let gnuSofwareLabelBox = new Gtk.Box({
           orientation: Gtk.Orientation.VERTICAL,
           valign: Gtk.Align.END,
           vexpand: true,
-        });
-        gnuSofwareLabelBox.append(gnuSofwareLabel);
-        gnuSoftwareGroup.add(gnuSofwareLabelBox);
-        this.add(gnuSoftwareGroup);
+        })
+        gnuSofwareLabelBox.append(gnuSofwareLabel)
+        gnuSoftwareGroup.add(gnuSofwareLabelBox)
+        this.add(gnuSoftwareGroup)
       }
-    });
+    })
 
 var GNU_SOFTWARE = '<span size="small">' +
     'This program comes with absolutely no warranty.\n' +
diff --git a/gitlab-extension@infinicode.de/components/settings/gitlabAccountListPage.js b/gitlab-extension@infinicode.de/components/settings/gitlabAccountListPage.js
@@ -11,7 +11,9 @@ const { NewGitlabAccountRow } = Me.imports.components.settings.subcomponents.new
 const { GitlabAccountModelList } = Me.imports.components.settings.subcomponents.gitlabAccountModelList
 const { GitlabAccountRow } = Me.imports.components.settings.subcomponents.gitlabAccountRow
 
-var GitlabAccountListPage = GObject.registerClass(
+var GitlabAccountListPage = GObject.registerClass({
+      GTypeName: 'GitlabExtension-GitlabAccountListPage',
+    },
     class GitlabAccountListPreferencePage extends Adw.PreferencesPage {
       _init () {
         super._init({
@@ -27,7 +29,7 @@ var GitlabAccountListPage = GObject.registerClass(
 
 class GitlabAccountListPreferenceGroup extends Adw.PreferencesGroup {
   static {
-    GObject.registerClass(this)
+    GObject.registerClass({ GTypeName: 'GitlabExtension-GitlabAccountListPreferenceGroup' }, this)
 
     this.install_action('account.add', null, self => self._gitlabAccountModelList.append())
     this.install_action('account.remove', 's', (self, name, param) => self._gitlabAccountModelList.remove(param.unpack()))
diff --git a/gitlab-extension@infinicode.de/components/settings/settingsPage.js b/gitlab-extension@infinicode.de/components/settings/settingsPage.js
@@ -6,7 +6,9 @@ const { Adw, Gio, GObject, Gtk } = imports.gi
 const { Settings } = Me.imports.helpers.settings
 const { Translations } = Me.imports.helpers.translations
 
-var SettingsPage = GObject.registerClass(
+var SettingsPage = GObject.registerClass({
+      GTypeName: 'GitlabExtension-SettingsPage',
+    },
     class GitlabSettingsPreferencePage extends Adw.PreferencesPage {
       _init () {
         super._init({
@@ -22,7 +24,7 @@ var SettingsPage = GObject.registerClass(
 
 class GeneralPreferenceGroup extends Adw.PreferencesGroup {
   static {
-    GObject.registerClass(this)
+    GObject.registerClass({ GTypeName: 'GitlabExtension-GeneralPreferenceGroup' }, this)
   }
 
   constructor () {
diff --git a/gitlab-extension@infinicode.de/components/settings/subcomponents/gitlabAccountItem.js b/gitlab-extension@infinicode.de/components/settings/subcomponents/gitlabAccountItem.js
@@ -6,6 +6,7 @@ const { GObject } = imports.gi
 const { DEFAULT_GITLAB_DATA } = Me.imports.helpers.settings
 
 var GitlabAccountItem = GObject.registerClass({
+  GTypeName: 'GitlabExtension-GitlabAccountItem',
   Properties: {
     'id': GObject.ParamSpec.string('id', 'id', 'id', GObject.ParamFlags.READWRITE, null),
     'name': GObject.ParamSpec.string('name', 'name', 'name', GObject.ParamFlags.READWRITE, DEFAULT_GITLAB_DATA.name),
diff --git a/gitlab-extension@infinicode.de/components/settings/subcomponents/gitlabAccountModelList.js b/gitlab-extension@infinicode.de/components/settings/subcomponents/gitlabAccountModelList.js
@@ -12,7 +12,9 @@ const SETTING_KEYS_TO_REFRESH = [
   GITLAB_ACCOUNTS
 ]
 
-var GitlabAccountModelList = GObject.registerClass(class GitlabAccountModelList extends GObject.Object {
+var GitlabAccountModelList = GObject.registerClass({
+  GTypeName: 'GitlabExtension-GitlabAccountModelList',
+}, class GitlabAccountModelList extends GObject.Object {
   static [GObject.interfaces] = [Gio.ListModel]
 
   #items = []
diff --git a/gitlab-extension@infinicode.de/components/settings/subcomponents/gitlabAccountRow.js b/gitlab-extension@infinicode.de/components/settings/subcomponents/gitlabAccountRow.js
@@ -8,7 +8,9 @@ const _ = Gettext.gettext
 const { Settings, SETTINGS_SCHEMA_DOMAIN } = Me.imports.helpers.settings
 const { initTranslations, Translations } = Me.imports.helpers.translations
 
-var GitlabAccountRow = GObject.registerClass(class GitlabAccountRowClass extends Adw.PreferencesRow {
+var GitlabAccountRow = GObject.registerClass({
+  GTypeName: 'GitlabExtension-GitlabAccountRow',
+}, class GitlabAccountRowClass extends Adw.PreferencesRow {
   constructor (item, gitlabAccountModelList) {
     super({ name: item.name })
 
diff --git a/gitlab-extension@infinicode.de/components/settings/subcomponents/newGitlabAccountRow.js b/gitlab-extension@infinicode.de/components/settings/subcomponents/newGitlabAccountRow.js
@@ -5,7 +5,9 @@ const { Adw, Gio, GObject, Gtk } = imports.gi
 
 const { Translations } = Me.imports.helpers.translations
 
-var NewGitlabAccountRow = GObject.registerClass(
+var NewGitlabAccountRow = GObject.registerClass({
+      GTypeName: 'GitlabExtension-NewGitlabAccountRow',
+    },
     class NewGitlabAccountRowClass extends Adw.PreferencesRow {
 
       constructor () {
diff --git a/gitlab-extension@infinicode.de/components/settings/subcomponents/newItemModel.js b/gitlab-extension@infinicode.de/components/settings/subcomponents/newItemModel.js
@@ -1,6 +1,8 @@
 const { Gio, GObject } = imports.gi
 
-var NewItemModel = GObject.registerClass(class NewItemModelClass extends GObject.Object {
+var NewItemModel = GObject.registerClass({
+  GTypeName: 'GitlabExtension-NewItemModel',
+}, class GitlabNewItemModelClass extends GObject.Object {
   static [GObject.interfaces] = [Gio.ListModel]
 
   #item = new GObject.Object()
diff --git a/gitlab-extension@infinicode.de/po/gitlab-extension@infinicode.de.pot b/gitlab-extension@infinicode.de/po/gitlab-extension@infinicode.de.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-shell-extension-gitlab-extension\n"
 "Report-Msgid-Bugs-To: fh@infinicode.de\n"
-"POT-Creation-Date: 2022-04-15 12:04+0200\n"
+"POT-Creation-Date: 2022-04-15 12:50+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,9 @@ const SETTING_KEYS_TO_REFRESH = [`
`12`	`12`	`GITLAB_ACCOUNTS`
`13`	`13`	`]`
`14`	`14`
`15`		`-var GitlabAccountModelList = GObject.registerClass(class GitlabAccountModelList extends GObject.Object {`
	`15`	`+var GitlabAccountModelList = GObject.registerClass({`
	`16`	`+ GTypeName: 'GitlabExtension-GitlabAccountModelList',`
	`17`	`+}, class GitlabAccountModelList extends GObject.Object {`
`16`	`18`	`static [GObject.interfaces] = [Gio.ListModel]`
`17`	`19`
`18`	`20`	`#items = []`