Skip to content

Commit ccce679

Browse files
cinaticcinatic
committed
scope gobject classes 🤡 , code cleanup
1 parent 30b1fea commit ccce679

File tree

9 files changed

+109
-88
lines changed

9 files changed

+109
-88
lines changed

‎[email protected]/components/settings/aboutPage.js

Lines changed: 87 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -1,162 +1,170 @@
1-
const ExtensionUtils = imports.misc.extensionUtils;
2-
const Me = ExtensionUtils.getCurrentExtension();
1+
const ExtensionUtils = imports.misc.extensionUtils
2+
const Me = ExtensionUtils.getCurrentExtension()
33

4-
const {Adw, GdkPixbuf, Gio, GLib, GObject, Gtk} = imports.gi;
4+
const { Adw, GdkPixbuf, Gio, GLib, GObject, Gtk } = imports.gi
55

66
const { Settings } = Me.imports.helpers.settings
77
const { Translations } = Me.imports.helpers.translations
88

9-
var AboutPage = GObject.registerClass(
9+
var AboutPage = GObject.registerClass({
10+
GTypeName: 'GitlabExtension-AboutPage',
11+
},
1012
class AboutPagePreferencesPage extends Adw.PreferencesPage {
11-
_init() {
13+
_init () {
1214
super._init({
1315
title: Translations.SETTINGS.TITLE_ABOUT,
1416
icon_name: 'help-about-symbolic',
1517
name: 'AboutPage'
16-
});
18+
})
1719

1820
//Logo and project description-------------------------------------
19-
let headerPreferencesGroup = new Adw.PreferencesGroup();
21+
let headerPreferencesGroup = new Adw.PreferencesGroup()
2022

21-
let extensionHeaderBox = new Gtk.Box( {
23+
let extensionHeaderBox = new Gtk.Box({
2224
orientation: Gtk.Orientation.VERTICAL,
2325
hexpand: false,
2426
vexpand: false
25-
});
27+
})
2628

2729
let extensionTaskbarLabel = new Gtk.Label({
2830
label: `<span size="larger"><b>${Translations.EXTENSION.NAME}</b></span>`,
2931
use_markup: true,
3032
vexpand: true,
3133
valign: Gtk.Align.FILL
32-
});
34+
})
3335

3436
let projectDescriptionLabel = new Gtk.Label({
3537
label: Translations.EXTENSION.DESCRIPTION,
3638
hexpand: false,
3739
vexpand: false,
38-
});
39-
extensionHeaderBox.append(extensionTaskbarLabel);
40-
extensionHeaderBox.append(projectDescriptionLabel);
41-
headerPreferencesGroup.add(extensionHeaderBox);
40+
})
41+
extensionHeaderBox.append(extensionTaskbarLabel)
42+
extensionHeaderBox.append(projectDescriptionLabel)
43+
headerPreferencesGroup.add(extensionHeaderBox)
4244

43-
this.add(headerPreferencesGroup);
45+
this.add(headerPreferencesGroup)
4446
//-----------------------------------------------------------------------
4547

4648
//Extension/OS Info Group------------------------------------------------
47-
let extensionInfoGroup = new Adw.PreferencesGroup();
49+
let extensionInfoGroup = new Adw.PreferencesGroup()
4850
let extensionTaskbarVersionRow = new Adw.ActionRow({
4951
title: Translations.MISC.EXTENSION_VERSION,
50-
});
51-
let releaseVersion;
52-
if(Me.metadata.version)
53-
releaseVersion = Me.metadata.version;
54-
else
55-
releaseVersion = 'unknown';
52+
})
53+
let releaseVersion
54+
if (Me.metadata.version) {
55+
releaseVersion = Me.metadata.version
56+
} else {
57+
releaseVersion = 'unknown'
58+
}
5659
extensionTaskbarVersionRow.add_suffix(new Gtk.Label({
5760
label: releaseVersion + ''
58-
}));
59-
extensionInfoGroup.add(extensionTaskbarVersionRow);
61+
}))
62+
extensionInfoGroup.add(extensionTaskbarVersionRow)
6063

6164
let commitRow = new Adw.ActionRow({
6265
title: Translations.MISC.GIT_COMMIT
63-
});
64-
let commitVersion;
65-
if(Me.metadata.commit)
66-
commitVersion = Me.metadata.commit;
66+
})
67+
let commitVersion
68+
if (Me.metadata.commit) {
69+
commitVersion = Me.metadata.commit
70+
}
6771
commitRow.add_suffix(new Gtk.Label({
6872
label: commitVersion ? commitVersion : '',
69-
}));
70-
if(commitVersion){
71-
extensionInfoGroup.add(commitRow);
73+
}))
74+
if (commitVersion) {
75+
extensionInfoGroup.add(commitRow)
7276
}
7377

7478
let gnomeVersionRow = new Adw.ActionRow({
7579
title: Translations.MISC.GNOME_VERSION,
76-
});
80+
})
7781
gnomeVersionRow.add_suffix(new Gtk.Label({
7882
label: imports.misc.config.PACKAGE_VERSION + '',
79-
}));
80-
extensionInfoGroup.add(gnomeVersionRow);
83+
}))
84+
extensionInfoGroup.add(gnomeVersionRow)
8185

8286
let osRow = new Adw.ActionRow({
8387
title: Translations.MISC.OS,
84-
});
85-
let osInfoText;
86-
let name = GLib.get_os_info("NAME");
87-
let prettyName = GLib.get_os_info("PRETTY_NAME");
88-
if(prettyName)
89-
osInfoText = prettyName;
90-
else
91-
osInfoText = name;
92-
let versionID = GLib.get_os_info("VERSION_ID");
93-
if(versionID)
94-
osInfoText += "; Version ID: " + versionID;
95-
let buildID = GLib.get_os_info("BUILD_ID");
96-
if(buildID)
97-
osInfoText += "; " + "Build ID: " +buildID;
88+
})
89+
let osInfoText
90+
let name = GLib.get_os_info('NAME')
91+
let prettyName = GLib.get_os_info('PRETTY_NAME')
92+
if (prettyName) {
93+
osInfoText = prettyName
94+
} else {
95+
osInfoText = name
96+
}
97+
let versionID = GLib.get_os_info('VERSION_ID')
98+
if (versionID) {
99+
osInfoText += '; Version ID: ' + versionID
100+
}
101+
let buildID = GLib.get_os_info('BUILD_ID')
102+
if (buildID) {
103+
osInfoText += '; ' + 'Build ID: ' + buildID
104+
}
98105
osRow.add_suffix(new Gtk.Label({
99106
label: osInfoText,
100107
single_line_mode: false,
101108
wrap: true,
102-
}));
103-
extensionInfoGroup.add(osRow);
109+
}))
110+
extensionInfoGroup.add(osRow)
104111

105112
let sessionTypeRow = new Adw.ActionRow({
106113
title: Translations.MISC.SESSION_TYPE,
107-
});
108-
let windowingLabel;
109-
if(Me.metadata.isWayland)
110-
windowingLabel = "Wayland";
111-
else
112-
windowingLabel = "X11";
114+
})
115+
let windowingLabel
116+
if (Me.metadata.isWayland) {
117+
windowingLabel = 'Wayland'
118+
} else {
119+
windowingLabel = 'X11'
120+
}
113121
sessionTypeRow.add_suffix(new Gtk.Label({
114122
label: windowingLabel,
115-
}));
116-
extensionInfoGroup.add(sessionTypeRow);
123+
}))
124+
extensionInfoGroup.add(sessionTypeRow)
117125

118-
this.add(extensionInfoGroup);
126+
this.add(extensionInfoGroup)
119127
//-----------------------------------------------------------------------
120128

121-
let linksGroup = new Adw.PreferencesGroup();
122-
let linksBox = new Adw.ActionRow();
129+
let linksGroup = new Adw.PreferencesGroup()
130+
let linksBox = new Adw.ActionRow()
123131

124-
let pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_scale(Me.path + '/media/donate-icon.svg', -1, 50, true);
125-
let donateImage = Gtk.Picture.new_for_pixbuf(pixbuf);
132+
let pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_scale(Me.path + '/media/donate-icon.svg', -1, 50, true)
133+
let donateImage = Gtk.Picture.new_for_pixbuf(pixbuf)
126134
let donateLinkButton = new Gtk.LinkButton({
127135
child: donateImage,
128136
uri: 'https://www.paypal.com/donate/?hosted_button_id=US78C8SZ6UHHQ',
129-
});
137+
})
130138

131-
pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_scale(Me.path + '/media/source-icon.svg', -1, 50, true);
132-
let sourceCodeImage = Gtk.Picture.new_for_pixbuf(pixbuf);
133-
let projectUrl = Me.metadata.url;
139+
pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_scale(Me.path + '/media/source-icon.svg', -1, 50, true)
140+
let sourceCodeImage = Gtk.Picture.new_for_pixbuf(pixbuf)
141+
let projectUrl = Me.metadata.url
134142
let projectLinkButton = new Gtk.LinkButton({
135143
child: sourceCodeImage,
136144
uri: projectUrl,
137-
});
145+
})
138146

139-
linksBox.add_prefix(projectLinkButton);
140-
linksBox.add_suffix(donateLinkButton);
141-
linksGroup.add(linksBox);
142-
this.add(linksGroup);
147+
linksBox.add_prefix(projectLinkButton)
148+
linksBox.add_suffix(donateLinkButton)
149+
linksGroup.add(linksBox)
150+
this.add(linksGroup)
143151

144-
let gnuSoftwareGroup = new Adw.PreferencesGroup();
152+
let gnuSoftwareGroup = new Adw.PreferencesGroup()
145153
let gnuSofwareLabel = new Gtk.Label({
146154
label: GNU_SOFTWARE,
147155
use_markup: true,
148156
justify: Gtk.Justification.CENTER
149-
});
157+
})
150158
let gnuSofwareLabelBox = new Gtk.Box({
151159
orientation: Gtk.Orientation.VERTICAL,
152160
valign: Gtk.Align.END,
153161
vexpand: true,
154-
});
155-
gnuSofwareLabelBox.append(gnuSofwareLabel);
156-
gnuSoftwareGroup.add(gnuSofwareLabelBox);
157-
this.add(gnuSoftwareGroup);
162+
})
163+
gnuSofwareLabelBox.append(gnuSofwareLabel)
164+
gnuSoftwareGroup.add(gnuSofwareLabelBox)
165+
this.add(gnuSoftwareGroup)
158166
}
159-
});
167+
})
160168

161169
var GNU_SOFTWARE = '<span size="small">' +
162170
'This program comes with absolutely no warranty.\n' +

‎[email protected]/components/settings/gitlabAccountListPage.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ const { NewGitlabAccountRow } = Me.imports.components.settings.subcomponents.new
1111
const { GitlabAccountModelList } = Me.imports.components.settings.subcomponents.gitlabAccountModelList
1212
const { GitlabAccountRow } = Me.imports.components.settings.subcomponents.gitlabAccountRow
1313

14-
var GitlabAccountListPage = GObject.registerClass(
14+
var GitlabAccountListPage = GObject.registerClass({
15+
GTypeName: 'GitlabExtension-GitlabAccountListPage',
16+
},
1517
class GitlabAccountListPreferencePage extends Adw.PreferencesPage {
1618
_init () {
1719
super._init({
@@ -27,7 +29,7 @@ var GitlabAccountListPage = GObject.registerClass(
2729

2830
class GitlabAccountListPreferenceGroup extends Adw.PreferencesGroup {
2931
static {
30-
GObject.registerClass(this)
32+
GObject.registerClass({ GTypeName: 'GitlabExtension-GitlabAccountListPreferenceGroup' }, this)
3133

3234
this.install_action('account.add', null, self => self._gitlabAccountModelList.append())
3335
this.install_action('account.remove', 's', (self, name, param) => self._gitlabAccountModelList.remove(param.unpack()))

‎[email protected]/components/settings/settingsPage.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@ const { Adw, Gio, GObject, Gtk } = imports.gi
66
const { Settings } = Me.imports.helpers.settings
77
const { Translations } = Me.imports.helpers.translations
88

9-
var SettingsPage = GObject.registerClass(
9+
var SettingsPage = GObject.registerClass({
10+
GTypeName: 'GitlabExtension-SettingsPage',
11+
},
1012
class GitlabSettingsPreferencePage extends Adw.PreferencesPage {
1113
_init () {
1214
super._init({
@@ -22,7 +24,7 @@ var SettingsPage = GObject.registerClass(
2224

2325
class GeneralPreferenceGroup extends Adw.PreferencesGroup {
2426
static {
25-
GObject.registerClass(this)
27+
GObject.registerClass({ GTypeName: 'GitlabExtension-GeneralPreferenceGroup' }, this)
2628
}
2729

2830
constructor () {

‎[email protected]/components/settings/subcomponents/gitlabAccountItem.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ const { GObject } = imports.gi
66
const { DEFAULT_GITLAB_DATA } = Me.imports.helpers.settings
77

88
var GitlabAccountItem = GObject.registerClass({
9+
GTypeName: 'GitlabExtension-GitlabAccountItem',
910
Properties: {
1011
'id': GObject.ParamSpec.string('id', 'id', 'id', GObject.ParamFlags.READWRITE, null),
1112
'name': GObject.ParamSpec.string('name', 'name', 'name', GObject.ParamFlags.READWRITE, DEFAULT_GITLAB_DATA.name),

‎[email protected]/components/settings/subcomponents/gitlabAccountModelList.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@ const SETTING_KEYS_TO_REFRESH = [
1212
GITLAB_ACCOUNTS
1313
]
1414

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 {
1618
static [GObject.interfaces] = [Gio.ListModel]
1719

1820
#items = []

‎[email protected]/components/settings/subcomponents/gitlabAccountRow.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ const _ = Gettext.gettext
88
const { Settings, SETTINGS_SCHEMA_DOMAIN } = Me.imports.helpers.settings
99
const { initTranslations, Translations } = Me.imports.helpers.translations
1010

11-
var GitlabAccountRow = GObject.registerClass(class GitlabAccountRowClass extends Adw.PreferencesRow {
11+
var GitlabAccountRow = GObject.registerClass({
12+
GTypeName: 'GitlabExtension-GitlabAccountRow',
13+
}, class GitlabAccountRowClass extends Adw.PreferencesRow {
1214
constructor (item, gitlabAccountModelList) {
1315
super({ name: item.name })
1416

‎[email protected]/components/settings/subcomponents/newGitlabAccountRow.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ const { Adw, Gio, GObject, Gtk } = imports.gi
55

66
const { Translations } = Me.imports.helpers.translations
77

8-
var NewGitlabAccountRow = GObject.registerClass(
8+
var NewGitlabAccountRow = GObject.registerClass({
9+
GTypeName: 'GitlabExtension-NewGitlabAccountRow',
10+
},
911
class NewGitlabAccountRowClass extends Adw.PreferencesRow {
1012

1113
constructor () {

‎[email protected]/components/settings/subcomponents/newItemModel.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
const { Gio, GObject } = imports.gi
22

3-
var NewItemModel = GObject.registerClass(class NewItemModelClass extends GObject.Object {
3+
var NewItemModel = GObject.registerClass({
4+
GTypeName: 'GitlabExtension-NewItemModel',
5+
}, class GitlabNewItemModelClass extends GObject.Object {
46
static [GObject.interfaces] = [Gio.ListModel]
57

68
#item = new GObject.Object()

‎[email protected]/po/[email protected]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: gnome-shell-extension-gitlab-extension\n"
1010
"Report-Msgid-Bugs-To: [email protected]\n"
11-
"POT-Creation-Date: 2022-04-15 12:04+0200\n"
11+
"POT-Creation-Date: 2022-04-15 12:50+0200\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <[email protected]>\n"

0 commit comments

Comments
 (0)