Skip to content

Commit

Permalink
Rename extension property enabled to available
Browse files Browse the repository at this point in the history
  • Loading branch information
sonnyp committed Oct 3, 2024
1 parent efb14d9 commit d79bc8c
Show file tree
Hide file tree
Showing 14 changed files with 356 additions and 535 deletions.
3 changes: 1 addition & 2 deletions .eslintrc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,10 @@ env:
parser: "@babel/eslint-parser"
parserOptions:
sourceType: module
ecmaVersion: 2023
requireConfigFile: false
babelOptions:
plugins:
- "@babel/plugin-syntax-import-assertions"
- "@babel/plugin-syntax-import-attributes"
extends:
- eslint:recommended
- plugin:import/errors
Expand Down
4 changes: 4 additions & 0 deletions .gitconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[re.sonny.Commit]
title-length-hint=72
body-length-wrap=50
auto-capitalize-title=true
2 changes: 1 addition & 1 deletion demos
Submodule demos updated 42 files
+1 βˆ’0 .gitignore
+1 βˆ’1 src/About Dialog/code.rs
+1 βˆ’1 src/About Dialog/main.blp
+1 βˆ’1 src/About Dialog/main.js
+1 βˆ’1 src/About Dialog/main.py
+1 βˆ’1 src/About Dialog/main.vala
+2 βˆ’2 src/Advanced Buttons/main.blp
+2 βˆ’2 src/Animation/main.blp
+2 βˆ’1 src/Audio/main.json
+1 βˆ’1 src/Avatar/main.blp
+1 βˆ’1 src/Banner/main.blp
+1 βˆ’1 src/Boxed Lists/main.blp
+2 βˆ’2 src/Breakpoints/main.blp
+121 βˆ’0 src/CSS Gradients/main.vala
+1 βˆ’1 src/Carousel/main.blp
+1 βˆ’1 src/Clamp/main.blp
+1 βˆ’1 src/Dialog/main.blp
+2 βˆ’1 src/HTTP Image/main.json
+2 βˆ’1 src/HTTP Request/main.json
+2 βˆ’1 src/HTTP Server/main.json
+1 βˆ’1 src/Header Bar/main.blp
+1 βˆ’1 src/Message Dialogs/main.blp
+1 βˆ’1 src/Navigation Split View/main.blp
+1 βˆ’1 src/Navigation View/main.blp
+1 βˆ’1 src/Overlay Split View/main.blp
+4 βˆ’4 src/Preferences Dialog/main.blp
+4 βˆ’4 src/Spinner/code.rs
+17 βˆ’16 src/Spinner/main.blp
+4 βˆ’4 src/Spinner/main.js
+2 βˆ’1 src/Spinner/main.json
+4 βˆ’4 src/Spinner/main.py
+4 βˆ’4 src/Spinner/main.vala
+1 βˆ’1 src/Status Page/main.blp
+2 βˆ’2 src/Styling with CSS/main.blp
+3 βˆ’3 src/Tab View/main.blp
+1 βˆ’1 src/Toasts/main.blp
+1 βˆ’1 src/Toolbar View/main.blp
+2 βˆ’1 src/Video/main.json
+3 βˆ’3 src/View Switcher/main.blp
+2 βˆ’1 src/Web View/main.json
+2 βˆ’1 src/WebSocket Client/main.json
+1 βˆ’1 src/Window/main.blp
801 changes: 309 additions & 492 deletions package-lock.json

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
{
"private": true,
"devDependencies": {
"@babel/eslint-parser": "^7.22.11",
"@babel/plugin-syntax-import-assertions": "^7.22.5",
"@babel/core": "^7.25.7",
"@babel/eslint-parser": "^7.25.7",
"@babel/plugin-syntax-import-attributes": "^7.25.7",
"@rollup/plugin-commonjs": "^22.0.1",
"@rollup/plugin-node-resolve": "^13.3.0",
"eslint": "^8.48.0",
Expand Down
2 changes: 1 addition & 1 deletion src/Extensions/Extension.blp
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ template $Extension: ListBoxRow {
Label label_title {}

[end]
Image image_enabled {
Image image_available {
icon-name: "re.sonny.Workbench-test-pass-symbolic";

styles [
Expand Down
12 changes: 6 additions & 6 deletions src/Extensions/Extension.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export default GObject.registerClass(
Template,
InternalChildren: [
"label_title",
"image_enabled",
"image_available",
"installation_guide",
"label_command",
],
Expand All @@ -21,8 +21,8 @@ export default GObject.registerClass(
GObject.ParamFlags.READWRITE,
"",
),
enabled: GObject.ParamSpec.boolean(
"enabled",
available: GObject.ParamSpec.boolean(
"available",
"",
"",
GObject.ParamFlags.READWRITE,
Expand All @@ -49,14 +49,14 @@ export default GObject.registerClass(
);

this.bind_property(
"enabled",
this._image_enabled,
"available",
this._image_available,
"visible",
GObject.BindingFlags.SYNC_CREATE,
);

this.bind_property(
"enabled",
"available",
this._installation_guide,
"visible",
GObject.BindingFlags.SYNC_CREATE | GObject.BindingFlags.INVERT_BOOLEAN,
Expand Down
4 changes: 2 additions & 2 deletions src/Extensions/Extensions.blp
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,12 @@ Adw.Dialog dialog {

$Extension {
title: _("JavaScript");
enabled: true;
available: true;
}

$Extension {
title: _("Python");
enabled: true;
available: true;
}

$Extension extension_rust {
Expand Down
32 changes: 16 additions & 16 deletions src/Extensions/Extensions.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,21 +26,21 @@ export function Extensions({ window }) {

picture_illustration.set_resource(illustration);

extension_rust.enabled = isRustEnabled();
extension_rust.available = isRustAvailable();
extension_rust.command = `flatpak install flathub org.freedesktop.Sdk.Extension.rust-stable//${freedesktop_version} org.freedesktop.Sdk.Extension.${llvm}//${freedesktop_version}`;

extension_vala.enabled = isValaEnabled();
extension_vala.available = isValaAvailable();
extension_vala.command = `flatpak install flathub org.freedesktop.Sdk.Extension.vala//${freedesktop_version}`;

extension_typescript.enabled = isTypeScriptEnabled();
extension_typescript.available = isTypeScriptAvailable();
extension_typescript.command = `flatpak install flathub org.freedesktop.Sdk.Extension.${node}//${freedesktop_version} org.freedesktop.Sdk.Extension.typescript//${freedesktop_version}`;

for (const extension of [
extension_rust,
extension_vala,
extension_typescript,
]) {
if (!extension.enabled) {
if (!extension.available) {
all_set_hint.set_visible(false);
restart_hint.set_visible(true);
}
Expand All @@ -53,27 +53,27 @@ export function Extensions({ window }) {
window.add_action(action_extensions);
}

let rust_enabled = null;
export function isRustEnabled() {
rust_enabled ??=
let rust_available = null;
export function isRustAvailable() {
rust_available ??=
Gio.File.new_for_path("/usr/lib/sdk/rust-stable").query_exists(null) &&
Gio.File.new_for_path(`/usr/lib/sdk/${llvm}`).query_exists(null);
return rust_enabled;
return rust_available;
}

let vala_enabled = null;
export function isValaEnabled() {
vala_enabled ??=
let vala_available = null;
export function isValaAvailable() {
vala_available ??=
Gio.File.new_for_path("/usr/lib/sdk/vala").query_exists(null);
return vala_enabled;
return vala_available;
}

let typescript_enabled = null;
export function isTypeScriptEnabled() {
typescript_enabled ??=
let typescript_available = null;
export function isTypeScriptAvailable() {
typescript_available ??=
Gio.File.new_for_path("/usr/lib/sdk/typescript").query_exists(null) &&
Gio.File.new_for_path(`/usr/lib/sdk/${node}`).query_exists(null);
return typescript_enabled;
return typescript_available;
}

const llvm = "llvm18";
Expand Down
4 changes: 2 additions & 2 deletions src/langs/rust/rust.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ import Gio from "gi://Gio";

import { createLSPClient } from "../../common.js";
import { getLanguage, copy } from "../../util.js";
import { isRustEnabled } from "../../Extensions/Extensions.js";
import { isRustAvailable } from "../../Extensions/Extensions.js";

export function setup({ document }) {
if (!isRustEnabled()) return;
if (!isRustAvailable()) return;

const { file, buffer, code_view } = document;

Expand Down
4 changes: 2 additions & 2 deletions src/langs/typescript/typescript.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ import Gio from "gi://Gio";

import { createLSPClient } from "../../common.js";
import { getLanguage, copy } from "../../util.js";
import { isTypeScriptEnabled } from "../../Extensions/Extensions.js";
import { isTypeScriptAvailable } from "../../Extensions/Extensions.js";

export function setup({ document }) {
if (!isTypeScriptEnabled()) return;
if (!isTypeScriptAvailable()) return;

const { file, buffer, code_view } = document;

Expand Down
4 changes: 2 additions & 2 deletions src/langs/vala/vala.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import Gio from "gi://Gio";

import { isValaEnabled } from "../../Extensions/Extensions.js";
import { isValaAvailable } from "../../Extensions/Extensions.js";
import { createLSPClient } from "../../common.js";
import { getLanguage } from "../../util.js";

export function setup({ document }) {
if (!isValaEnabled()) return;
if (!isValaAvailable()) return;

const { file, buffer, code_view } = document;

Expand Down
12 changes: 6 additions & 6 deletions src/window.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ import {
import {
action_extensions,
Extensions,
isRustEnabled,
isTypeScriptEnabled,
isValaEnabled,
isRustAvailable,
isTypeScriptAvailable,
isValaAvailable,
} from "./Extensions/Extensions.js";
import { JavaScriptDocument } from "./langs/javascript/JavaScriptDocument.js";
import { BlueprintDocument } from "./langs/blueprint/BlueprintDocument.js";
Expand Down Expand Up @@ -245,13 +245,13 @@ export default function Window({ application, session }) {

async function runCode() {
const { language } = panel_code;
if (language === "Vala" && !isValaEnabled()) {
if (language === "Vala" && !isValaAvailable()) {
action_extensions.activate(null);
return;
} else if (language === "Rust" && !isRustEnabled()) {
} else if (language === "Rust" && !isRustAvailable()) {
action_extensions.activate(null);
return;
} else if (language === "TypeScript" && !isTypeScriptEnabled()) {
} else if (language === "TypeScript" && !isTypeScriptAvailable()) {
action_extensions.activate(null);
return;
}
Expand Down
2 changes: 1 addition & 1 deletion troll

0 comments on commit d79bc8c

Please sign in to comment.