Skip to content

Commit be67d42

Browse files
IlhamSetiawanIlhamSetiawan
authored
Merge branch 'Deminder:main' into main
2 parents 79414f8 + 1dbafe5 commit be67d42

13 files changed

+460
-71
lines changed

‎.github/workflows/release.yaml

+44
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
on:
2+
push:
3+
tags:
4+
- 'v*'
5+
6+
name: Upload Extension Zip as Release Asset
7+
8+
jobs:
9+
build:
10+
name: Upload Release Asset
11+
runs-on: ubuntu-latest
12+
steps:
13+
- name: Checkout code
14+
uses: actions/checkout@v2
15+
with:
16+
submodules: 'recursive'
17+
- name: Setup build dependencies
18+
run: |
19+
npm install
20+
sudo apt-get update
21+
sudo apt-get install -y reuse gnome-shell-extensions gettext
22+
- name: Build project
23+
run: |
24+
make zip
25+
- name: Create Release
26+
id: create_release
27+
uses: actions/create-release@v1
28+
env:
29+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
30+
with:
31+
tag_name: ${{ github.ref }}
32+
release_name: Release version ${{ github.ref }}
33+
draft: true
34+
prerelease: false
35+
- name: Upload Extension Zip as Release Asset
36+
id: upload-release-asset
37+
uses: actions/upload-release-asset@v1
38+
env:
39+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
40+
with:
41+
upload_url: ${{ steps.create_release.outputs.upload_url }}
42+
asset_path: ./target/default/[email protected]
43+
asset_name: [email protected]
44+
asset_content_type: application/zip

‎.gitignore

-2
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,3 @@ debug-guest.sh
1010

1111
node_modules
1212
package-lock.json
13-
14-
src/modules/sdt

‎Makefile

+1-10
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,7 @@ endif
1111

1212
include sdt/build/default.mk
1313

14-
SDT_MODULES := util injection
15-
SDT_DIR := $(SRC_DIR)/modules/sdt
16-
SDT_FILES := $(patsubst %,$(SDT_DIR)/%.js,$(SDT_MODULES))
17-
18-
SOURCE_FILES += $(SDT_FILES)
19-
DEBUGMODE_MODULE := $(SDT_DIR)/util.js
20-
21-
$(SDT_FILES): $(SDT_DIR)/%.js: sdt/src/modules/%.js
22-
@mkdir -p $(@D)
23-
@cp $< $@
14+
DEBUGMODE_MODULE := $(SRC_DIR)/modules/sdt/util.js
2415

2516
include sdt/build/gnome-extension.mk
2617

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Requires `gnome-shell-extensions` and `gettext`:
3333
```(shell)
3434
make install
3535
```
36-
Automatically, switches to the last supported release version before install.
36+
OR automatically switch to the last supported release version before install `make supported-install`.
3737
## Development
3838

3939
### Debug

‎po/es.po

+97
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
# SPANISH TRANSLATION :D.
2+
# Copyright (C) YEAR Battery Indicator Icon
3+
# This file is distributed under the same license as the Battery Indicator Icon package.
4+
# Fernando Morales <[email protected]>, 2024.
5+
#
6+
msgid ""
7+
msgstr ""
8+
"Project-Id-Version: Battery Indicator Icon 9\n"
9+
"Report-Msgid-Bugs-To: \n"
10+
"POT-Creation-Date: 2023-09-17 12:53+0200\n"
11+
"PO-Revision-Date: 2024-02-28 15:22+(-0600)\n"
12+
"Last-Translator: Fernando Morales <[email protected]>\n"
13+
"Language-Team: LANGUAGE <[email protected]>\n"
14+
"Language: es\n"
15+
"MIME-Version: 1.0\n"
16+
"Content-Type: text/plain; charset=UTF-8\n"
17+
"Content-Transfer-Encoding: 8bit\n"
18+
19+
#: src/prefs.js:27
20+
msgid "Battery status icon style"
21+
msgstr "Estilo del icono del estado de la batería"
22+
23+
#: src/prefs.js:28
24+
msgid "Bold"
25+
msgstr "Negrita"
26+
27+
#: src/prefs.js:29
28+
msgid "Slim"
29+
msgstr "Delgado"
30+
31+
#: src/prefs.js:30
32+
msgid "Plump"
33+
msgstr "Grueso"
34+
35+
#: src/prefs.js:31
36+
msgid "Plain"
37+
msgstr "Plano"
38+
39+
#: src/prefs.js:32
40+
msgid "Circle"
41+
msgstr "Circular"
42+
43+
#: src/prefs.js:33
44+
msgid "Text"
45+
msgstr "Texto"
46+
47+
#: src/prefs.js:36
48+
msgid "Battery percentage text"
49+
msgstr "Texto del porcentaje de batería"
50+
51+
#: src/prefs.js:37
52+
msgid "Hidden"
53+
msgstr "Oculto"
54+
55+
#: src/prefs.js:38
56+
msgid "Inside the icon"
57+
msgstr "Dentro del icono"
58+
59+
#: src/prefs.js:39
60+
msgid "Inside the icon (vertical)"
61+
msgstr "Dentro del icono (vertical)"
62+
63+
#: src/prefs.js:40
64+
msgid "Next to the icon"
65+
msgstr "Al lado del icono"
66+
67+
#: src/prefs.js:45
68+
msgid "Horizontal scale"
69+
msgstr "Escala horizontal"
70+
71+
#: src/prefs.js:49
72+
msgid "Orientation"
73+
msgstr "Orientación"
74+
75+
#: src/prefs.js:50
76+
msgid "Vertical"
77+
msgstr "Vertical"
78+
79+
#: src/prefs.js:51
80+
msgid "Horizontal"
81+
msgstr "Horizontal"
82+
83+
#: src/schemas/org.gnome.shell.extensions.battery-indicator-icon.gschema.xml:14
84+
msgid "Battery status icon style (bold, slim, plain, circle, hidden)"
85+
msgstr "Estilo del icono de estado de la batería (Negrita, Delgado, Plano, Circular, Oculto)"
86+
87+
#: src/schemas/org.gnome.shell.extensions.battery-indicator-icon.gschema.xml:19
88+
msgid "Show battery percentage text in icon (hidden: 0, horizontal: 1, vertical: 2)"
89+
msgstr "Mostrar texto de porcentaje de batería en el icono (oculto: 0, horizontal: 1, vertical: 2)"
90+
91+
#: src/schemas/org.gnome.shell.extensions.battery-indicator-icon.gschema.xml:24
92+
msgid "Icon orientation (vertical, horizontal)"
93+
msgstr "Orientación del icono (vertical, horizontal)"
94+
95+
#: src/schemas/org.gnome.shell.extensions.battery-indicator-icon.gschema.xml:30
96+
msgid "Icon scale as aspect ratio width/height"
97+
msgstr "Escala de iconos como relación de aspecto en anchura/altura"

‎po/main.pot

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
#, fuzzy
77
msgid ""
88
msgstr ""
9-
"Project-Id-Version: Battery Indicator Icon 9\n"
9+
"Project-Id-Version: Battery Indicator Icon 13\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2023-09-17 12:53+0200\n"
11+
"POT-Creation-Date: 2024-04-04 17:08+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"

‎sdt

Submodule sdt updated 29 files

‎src/extension.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ export default class BatteryIndicatorIcon extends Extension {
241241
sysIndicator._drawicondbg = new BatteryDrawIcon({
242242
style_class: 'battery-indicator',
243243
});
244-
Main.uiGroup.add_actor(sysIndicator._drawicondbg);
244+
Main.uiGroup.add_child(sysIndicator._drawicondbg);
245245
}
246246
}
247247
}

‎src/metadata.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
2-
"shell-version": ["45"],
2+
"shell-version": ["45", "46"],
33
"uuid": "battery-indicator-icon@Deminder",
44
"gettext-domain": "battery-indicator-icon",
55
"settings-schema": "org.gnome.shell.extensions.battery-indicator-icon",
66
"description": "Replace the battery indicator icon with a circle or portrait.",
77
"name": "Battery Indicator Icon",
88
"url": "https://github.com/Deminder/battery-indicator-icon",
99
"session-modes": ["unlock-dialog", "user"],
10-
"version": 10
10+
"version": 14
1111
}

0 commit comments

Comments
 (0)