diff --git a/#prefs3.ui# b/#prefs3.ui#
deleted file mode 100644
index dbe26cb..0000000
--- a/#prefs3.ui#
+++ /dev/null
@@ -1,1232 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/main.js b/main.js
deleted file mode 100644
index 97694b4..0000000
--- a/main.js
+++ /dev/null
@@ -1,469 +0,0 @@
-const { St, GLib, Gio, Clutter } = imports.gi;
-
-const ExtensionUtils = imports.misc.extensionUtils;
-const Me = ExtensionUtils.getCurrentExtension();
-
-const Mainloop = imports.mainloop;
-const Main = imports.ui.main;
-
-const PanelMenu = imports.ui.panelMenu;
-const PopupMenu = imports.ui.popupMenu;
-
-const { playerAction, updatePlayers } = Me.imports.utils;
-
-const { startMainloop, mainloop } = Me.imports.mainloop;
-
-var maxDisplayLength,
- updateDelay,
- showTrackName,
- showPlayerIcon,
- showControls,
- showSeperators,
- showMenu,
- extensionPosition,
- extensionIndex,
- coloredPlayerIcon,
- showAllOnHover,
- sepChars,
- mouseActions,
- elementOrder;
-
-var onMaxLengthChanged,
- onUpdateDelayChanged,
- onShowTrackNameChanged,
- onShowPlayerIconChanged,
- onShowControlsChanged,
- onShowMenuChanged,
- onShowSeperatorsChanged,
- onExtensionPositionChanged,
- onExtensionIndexChanged,
- onColoredPlayerIconChanged,
- onShowAllOnHoverChanged,
- onSepCharsChanged,
- onMouseActionsChanged,
- onElementOrderChanged;
-
-var buttonNext,
- buttonPrev,
- buttonToggle,
- buttonLabel,
- buttonPlayer,
- iconNext,
- iconPause,
- iconPlay,
- iconPrev,
- iconPlayer,
- labelSeperatorStart,
- labelSeperatorEnd,
- container,
- box,
- menuIcon;
-
-var settings, settingsMap, positions, playerIcons;
-
-var currentPlayer, currentMetadata, currentLabel, currentStatus;
-
-var loopFinished, contentRemoved, mouseHovered, sourceChanged;
-
-var initVars = () => {
- playerIcons = ["chromium", "firefox"];
- positions = {
- left: "_leftBox",
- center: "_centerBox",
- right: "_rightBox",
- };
-
- settings = ExtensionUtils.getSettings();
- loopFinished = true;
- contentRemoved = true;
-
- currentMetadata = null;
- currentPlayer = null;
- currentStatus = null;
- currentLabel = null;
- sourceChanged = false;
-};
-
-var bindSignals = () => {
- onMaxLengthChanged = settings.connect("changed::max-text-width", () => {
- maxDisplayLength = settings.get_int("max-text-width");
- if (maxDisplayLength === 0) {
- buttonLabel.set_style(`max-width: none; padding: 0px 3px;`);
- } else {
- buttonLabel.set_style(`max-width: ${maxDisplayLength}px; padding: 0px 3px;`);
- }
- });
-
- onUpdateDelayChanged = settings.connect("changed::update-delay", () => {
- updateDelay = settings.get_int("update-delay");
- startMainloop();
- });
-
- onShowTrackNameChanged = settings.connect("changed::show-text", () => {
- showTrackName = settings.get_boolean("show-text");
- removeContent();
- addContent();
- });
-
- onShowPlayerIconChanged = settings.connect("changed::show-player-icon", () => {
- showPlayerIcon = settings.get_boolean("show-player-icon");
- removeContent();
- addContent();
- });
-
- onShowControlsChanged = settings.connect("changed::show-control-icons", () => {
- showControls = settings.get_boolean("show-control-icons");
- removeContent();
- addContent();
- });
-
- onShowSeperatorsChanged = settings.connect("changed::show-seperators", () => {
- showSeperators = settings.get_boolean("show-seperators");
- removeContent();
- addContent();
- });
-
- onShowMenuChanged = settings.connect("changed::show-sources-menu", () => {
- showMenu = settings.get_boolean("show-sources-menu");
- if (!showMenu) {
- if (showTrackName) {
- altSourceMenu = new PanelMenu.Button(1);
- } else {
- }
- }
- removeContent();
- addContent();
- });
-
- onExtensionPositionChanged = settings.connect("changed::extension-position", () => {
- removeContent();
- extensionPosition = settings.get_string("extension-position");
- addContent();
- });
-
- onExtensionIndexChanged = settings.connect("changed::extension-index", () => {
- extensionIndex = settings.get_int("extension-index");
- removeContent();
- addContent();
- });
-
- onColoredPlayerIconChanged = settings.connect("changed::colored-player-icon", () => {
- coloredPlayerIcon = settings.get_boolean("colored-player-icon");
- _updatePlayerIconEffects();
- });
-
- onShowAllOnHoverChanged = settings.connect("changed::show-all-on-hover", () => {
- showAllOnHover = settings.get_boolean("show-all-on-hover");
- });
-
- onSepCharsChanged = settings.connect("changed::seperator-chars", () => {
- sepChars = settings.get_strv("seperator-chars");
- labelSeperatorStart.set_text(sepChars[0]);
- labelSeperatorEnd.set_text(sepChars[1]);
- });
-
- onMouseActionsChanged = settings.connect("changed::mouse-actions", () => {
- mouseActions = settings.get_strv("mouse-actions");
- });
-
- onElementOrderChanged = settings.connect("changed::element-order", () => {
- elementOrder = settings.get_strv("element-order");
- removeContent();
- addContent();
- });
-};
-
-var initSettings = () => {
- _initNewSettings();
- maxDisplayLength = settings.get_int("max-text-width");
- updateDelay = settings.get_int("update-delay");
- showTrackName = settings.get_boolean("show-text");
- showPlayerIcon = settings.get_boolean("show-player-icon");
- showControls = settings.get_boolean("show-control-icons");
- showSeperators = settings.get_boolean("show-seperators");
- showMenu = settings.get_boolean("show-sources-menu");
- extensionPosition = settings.get_string("extension-position");
- extensionIndex = settings.get_int("extension-index");
- coloredPlayerIcon = settings.get_boolean("colored-player-icon");
- showAllOnHover = settings.get_boolean("show-all-on-hover");
- mouseActions = settings.get_strv("mouse-actions");
- sepChars = settings.get_strv("seperator-chars");
- elementOrder = settings.get_strv("element-order");
-};
-
-var initWidgets = () => {
- buttonToggle = new St.Button({ style_class: "panel-button" });
- buttonNext = new St.Button({
- style_class: "panel-button",
- });
- buttonPrev = new St.Button({
- style_class: "panel-button",
- });
- buttonLabel = new St.Button({
- style: `max-width: ${maxDisplayLength}px; padding: 0px 3px;`,
- style_class: "panel-button",
- label: "No media",
- });
- buttonPlayer = new St.Button({
- style_class: "panel-button",
- });
-
- iconPlay = new St.Icon({
- icon_name: "media-playback-start-symbolic",
- style_class: "system-status-icon",
- });
- iconPause = new St.Icon({
- icon_name: "media-playback-pause-symbolic",
- style_class: "system-status-icon",
- });
- iconNext = new St.Icon({
- icon_name: "media-skip-forward-symbolic",
- style_class: "system-status-icon",
- });
- iconPrev = new St.Icon({
- icon_name: "media-skip-backward-symbolic",
- style_class: "system-status-icon",
- });
- iconPlayer = new St.Icon({
- style_class: "system-status-icon",
- });
-
- labelSeperatorStart = new St.Label({
- y_align: Clutter.ActorAlign.CENTER,
- style_class: "panel-button",
- style: "padding: 3px",
- });
-
- labelSeperatorEnd = new St.Label({
- y_align: Clutter.ActorAlign.CENTER,
- style_class: "panel-button",
- style: "padding: 3px",
- });
-
- box = new St.BoxLayout();
-
- container = new PanelMenu.Button(0.5);
- container.set_style_class_name(null);
-
- container.add_child(box);
- container.menu.connect("open-state-changed", (menu, open) => {
- if (open) {
- menuIcon.add_style_pseudo_class("active");
- try {
- (() => {
- updatePlayers(container, changeSource);
- })();
- } catch (error) {
- logError(error);
- }
- } else {
- menuIcon.remove_style_pseudo_class("active");
- }
- });
- container.menu.addMenuItem(new PopupMenu.PopupMenuItem("Players", { reactive: false }));
-
- menuIcon = PopupMenu.arrowIcon(St.Side.BOTTOM);
- menuIcon.add_style_class_name("panel-button");
- menuIcon.set_style("padding: 3px;");
-
- buttonNext.set_child(iconNext);
- buttonNext.connect("button-release-event", () => {
- (() => {
- playerAction(currentPlayer, "next");
- })();
- });
-
- buttonPrev.set_child(iconPrev);
- buttonPrev.connect("button-release-event", () => {
- (() => {
- playerAction(currentPlayer, "previous");
- })();
- });
-
- buttonToggle.set_child(iconPlay);
- buttonToggle.connect("button-release-event", () => {
- (() => {
- playerAction(currentPlayer, "toggle_play");
- })();
- });
-
- buttonPlayer.set_child(iconPlayer);
- buttonPlayer.connect("button-release-event", _mouseAction);
-
- buttonLabel.connect("button-release-event", _mouseAction);
- buttonLabel.connect("enter-event", () => {
- if (showAllOnHover) {
- buttonLabel.set_style("max-width: none; padding: 0px 3px;");
- }
- });
- buttonLabel.connect("leave-event", () => {
- if (showAllOnHover) {
- buttonLabel.set_style(`max-width: ${maxDisplayLength}px; padding: 0px 3px;`);
- }
- });
-
- labelSeperatorStart.set_text(sepChars[0]);
- labelSeperatorEnd.set_text(sepChars[1]);
-
- _updatePlayerIconEffects();
-};
-
-var disconnectSignals = () => {
- settings.disconnect(onMaxLengthChanged);
- settings.disconnect(onUpdateDelayChanged);
- settings.disconnect(onShowControlsChanged);
- settings.disconnect(onShowPlayerIconChanged);
- settings.disconnect(onShowTrackNameChanged);
- settings.disconnect(onShowSeperatorsChanged);
- settings.disconnect(onExtensionPositionChanged);
- settings.disconnect(onExtensionIndexChanged);
- settings.disconnect(onShowAllOnHoverChanged);
- settings.disconnect(onColoredPlayerIconChanged);
- settings.disconnect(onMouseActionsChanged);
- settings.disconnect(onSepCharsChanged);
- settings.disconnect(onElementOrderChanged);
-};
-
-var destroyWidgets = () => {
- buttonNext.destroy();
- buttonPrev.destroy();
- buttonToggle.destroy();
- buttonLabel.destroy();
- iconNext.destroy();
- iconPause.destroy();
- iconPlay.destroy();
- iconPrev.destroy();
- iconPlayer.destroy();
- labelSeperatorStart.destroy();
- labelSeperatorEnd.destroy();
- container.destroy();
-};
-
-var nullifyVars = () => {
- currentMetadata = null;
- currentPlayer = null;
- currentStatus = null;
- currentLabel = null;
- sourceChanged = false;
-};
-
-var addContent = () => {
- if (contentRemoved) {
- log("[Media-Controls] Adding content");
- // Deleting reference as safety measuremnt
- delete Main.panel.statusArea["sourceMenu"];
- Main.panel.addToStatusArea("sourceMenu", container, extensionIndex, extensionPosition);
- for (element of elementOrder) {
- if (element === "icon" && showPlayerIcon) {
- box.add(buttonPlayer);
- } else if (element === "title" && showTrackName) {
- if (showSeperators) {
- box.add(labelSeperatorStart);
- }
-
- box.add(buttonLabel);
-
- if (showSeperators) {
- box.add(labelSeperatorEnd);
- }
- } else if (element === "controls" && showControls) {
- box.add(buttonPrev);
-
- box.add(buttonToggle);
-
- box.add(buttonNext);
- } else if (element === "menu" && showMenu) {
- box.add(menuIcon);
- }
- }
-
- contentRemoved = false;
- }
-};
-
-var removeContent = () => {
- if (!contentRemoved) {
- log("[Media-Controls] Removing content");
- box.remove_child(buttonNext);
- box.remove_child(buttonToggle);
- box.remove_child(buttonPrev);
- box.remove_child(buttonLabel);
- box.remove_child(buttonPlayer);
- box.remove_child(labelSeperatorStart);
- box.remove_child(labelSeperatorEnd);
- box.remove_child(menuIcon);
-
- delete Main.panel.statusArea["sourceMenu"];
-
- contentRemoved = true;
- }
-};
-
-var updateToggleButtonIcon = () => {
- if (currentStatus === "Playing") {
- buttonToggle.set_child(iconPause);
- } else {
- buttonToggle.set_child(iconPlay);
- }
-};
-
-const _updatePlayerIconEffects = () => {
- if (coloredPlayerIcon) {
- iconPlayer.clear_effects();
- iconPlayer.set_style("-st-icon-style: requested");
- iconPlayer.set_fallback_icon_name("audio-x-generic");
- } else {
- iconPlayer.set_style("-st-icon-style: symbolic");
- iconPlayer.add_effect(new Clutter.DesaturateEffect());
- iconPlayer.set_fallback_icon_name("audio-x-generic-symbolic");
- }
-};
-
-const _mouseAction = (event) => {
- let button = 1;
- if (event.pseudo_class && event.pseudo_class.includes("active")) {
- button = 0;
- }
- if (mouseActions[button] === "toggle_menu") {
- container.menu.open();
- } else {
- playerAction(currentPlayer, mouseActions[button]);
- }
-};
-
-/**
- * Changes the currentPlayer
- * @param {string} player
- */
-const _changeSource = (player) => {
- log(`[Media-Controls] Changing player to ${player}`);
- currentPlayer = player;
- sourceChanged = true;
-};
-
-/**
- * Replace old settings with new settings
- */
-const _initNewSettings = () => {
- let elOrder = settings.get_strv("element-order");
- if (elOrder.length === 3) {
- settingsMap = {
- "hide-text": "show-text",
- "hide-player-icon": "show-player-icon",
- "hide-control-icons": "show-control-icons",
- "hide-seperators": "show-seperators",
- };
- Object.keys(settingsMap).forEach((old) => {
- let oldVal = settings.get_boolean(old);
- settings.set_boolean(settingsMap[old], !oldVal);
- });
-
- settings.set_strv("element-order", [...elOrder, "menu"]);
-
- let msActions = settings.get_strv("mouse-actions");
- if (msActions.includes("toggle")) {
- msActions[msActions.indexOf("toggle")] = "toggle_play";
- }
- settings.set_strv("mouse-actions", msActions);
- }
-};
diff --git a/metadata.json b/metadata.json
index 78f5095..3f22eb5 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,5 +1,4 @@
{
- "development": true,
"description": "Show controls for the current playing media in the panel",
"name": "Media Controls",
"settings-schema": "org.gnome.shell.extensions.mediacontrols",
@@ -9,5 +8,5 @@
],
"url": "https://github.com/cliffniff/media-controls",
"uuid": "mediacontrols@cliffniff.github.com",
- "version": 16
+ "version": 17
}
\ No newline at end of file
diff --git a/player.js b/player.js
index f424727..17fd28b 100644
--- a/player.js
+++ b/player.js
@@ -599,11 +599,11 @@ const Player = GObject.registerClass(
}
} catch (error) {
if (
- error.toString().includes("Expected type") ||
- error.toString().includes("Error opening file")
+ !(
+ error.toString().includes("Expected type") ||
+ error.toString().includes("Error opening file")
+ )
) {
- log("[MediaControls] Failed to retrieve icon.");
- } else {
logError(error);
}
return null;
@@ -697,6 +697,9 @@ const Player = GObject.registerClass(
}
destroy() {
+ this._extension = null;
+ this._playerProxy = null;
+ this._otherProxy = null;
super.destroy();
}
diff --git a/prefs.js b/prefs.js
index cc71076..64e82e9 100644
--- a/prefs.js
+++ b/prefs.js
@@ -451,8 +451,12 @@ const addToBacklistListBox = (app) => {
);
deleteButton.visible = true;
+ deleteButton.app = app;
deleteButton.connect("clicked", (widget) => {
+ let currentBacklistApps = settings.get_strv("backlist-apps");
+ currentBacklistApps.splice(currentBacklistApps.indexOf(widget.app), 1);
+ settings.set_strv("backlist-apps", currentBacklistApps);
widgetBacklistBox.remove(widget.get_parent().get_parent());
});
diff --git a/prefs3.ui b/prefs3.ui
index dbe26cb..afc7a83 100644
--- a/prefs3.ui
+++ b/prefs3.ui
@@ -460,7 +460,7 @@ ex. track name, artist
False
start
center
- What's new in v15?
+ What's new in v17?
@@ -612,8 +612,10 @@ ex. track name, artist
start
8
8
- <b>Seperator characters</b>
- True
+ Seperator characters
+
+
+
0
@@ -856,8 +858,10 @@ ex. track name, artist
True
False
start
- <b>Show/hide elements</b>
- True
+ how/hide elements
+
+
+
0
@@ -967,8 +971,10 @@ ex. track name, artist
True
False
start
- <b>Element order</b>
- True
+ Element order
+
+
+
0
@@ -1055,8 +1061,10 @@ ex. track name, artist
True
False
start
- <b>Mouse actions</b>
- True
+ Mouse actions
+
+
+
0
@@ -1069,8 +1077,10 @@ ex. track name, artist
False
start
center
- <b>Cache images</b>
- True
+ Cache images
+
+
+
0
@@ -1178,6 +1188,9 @@ ex. track name, artist
False
start
Blacklist players
+
+
+
0
@@ -1198,6 +1211,8 @@ ex. track name, artist
diff --git a/prefs4.ui b/prefs4.ui
index 7a560b1..793da95 100644
--- a/prefs4.ui
+++ b/prefs4.ui
@@ -353,7 +353,7 @@ ex. track name, artist