v48.1.0

.github/PULL_REQUEST_TEMPLATE/pr.md

@@ -0,0 +1,2 @@
+
+🚫 Do NOT open PRs to `master`. Use `development` branch instead.

.github/workflows/BlockMasterPRs.yml

@@ -0,0 +1,17 @@
+name: Block PRs to master
+
+on:
+    pull_request:
+        branches:
+          - master
+
+jobs:
+    block-master-prs:
+        runs-on: ubuntu-latest
+        steps:
+          - name: Block PRs to master
+            run: |
+                if [ "${{ github.actor }}" != "${{ github.repository_owner }}" ]; then
+                    echo 'Please open PRs to the development branch instead.'
+                    exit 1
+                fi

.github/workflows/Build.yml

@@ -1,10 +1,10 @@
-name: 'Translation Build'
+name: 'Build'
 
 on:
     workflow_dispatch:
     pull_request:
         types: [ 'opened' ]
-        branches: [ 'master' ]
+        branches: [ 'master', 'development' ]
         paths:
         - '**.po'
         - '**.ts'
@@ -15,10 +15,10 @@ on:
         - 'Makefile'
     push:
         branches:
-          - 'master'
+          - 'development'
 
 jobs:
-    build_translations:
+    build:
         runs-on: ubuntu-latest
         steps:
         - uses: actions/checkout@v3

AUTHORS

@@ -0,0 +1,5 @@
+
+Maintainer/Programmer: Roman Lefler
+
+German (Deutsch): Ahmet Ala
+Turkish (Türkçe): Ahmet Ala

CHANGELOG.md

@@ -0,0 +1,33 @@
+
+# v48.1.0
+
+## Features
+
+- Support for GNOME 46
+- Themes (choose between default, Light, Afterdark, and Immersive)
+- Label in panel can show any weather detail
+- Second available label in panel
+- Show or hide the condition icon in panel
+- Current weather details can be configured
+- Configure where panel is shown in top bar
+- Configure the location provider
+
+## Improvements
+
+- Change cloudy night icon to be more clear
+- Credits dialog in About
+- Use the word "Today" in the forecast
+- Weather data copyright always shows current year
+- Improve keyboard and mouse shortcuts in locations menus
+- Pop-up shows which city it thinks you're in when set to My Location
+- Better make script for packaging
+
+## Bug Fixes
+
+- Fix Mutter crash on some machines if Mutter couldn't find cursor when hovering the panel
+
+## Translations
+
+- German (thanks Ahmet Ala)
+- Turkish (thanks Ahmet Ala)
+

Makefile

@@ -11,28 +11,40 @@ BUILD        := $(DIST)/build
 SCHEMAOUTDIR := $(BUILD)/schemas
 PO			 := ./po
 ICONS        := ./icons
+THEMES       := ./themes
+AUTHORS	     := ./AUTHORS
 
-METADATA   := $(STATIC)/metadata.json
-STYLESHEET := $(STATIC)/stylesheet.css
+STATICSRCS := $(wildcard $(STATIC)/*)
 SCHEMASRC  := $(SCHEMAS)/org.gnome.shell.extensions.$(NAME).gschema.xml
 # This excludes .d.ts files
 SRCS       := $(shell find $(SRC) -type f -name '*.ts' ! -name '*.d.ts')
 POFILES	   := $(wildcard $(PO)/*.po)
 # This intentionally includes the license file
 ICONSSRCS  := $(wildcard $(ICONS)/*)
+CSSSRCS    := $(wildcard $(THEMES)/*.css)
 
 SCHEMAOUT    := $(SCHEMAOUTDIR)/gschemas.compiled
 SCHEMACP     := $(SCHEMAOUTDIR)/org.gnome.shell.extensions.$(NAME).gschema.xml
-METADATACP   := $(BUILD)/metadata.json
-STYLESHEETCP := $(BUILD)/stylesheet.css
+STATICOUT    := $(STATICSRCS:$(STATIC)/%=$(BUILD)/%)
 ZIP		     := $(DIST)/$(NAME)-v$(VERSION).zip
 POT			 := $(PO)/$(UUID).pot
 ICONSOUT	 := $(ICONSSRCS:$(ICONS)/%=$(BUILD)/icons/%)
+CSSOUT		 := $(BUILD)/stylesheet.css
 MOS          := $(POFILES:$(PO)/%.po=$(BUILD)/locale/%/LC_MESSAGES/$(UUID).mo)
 
+# Packages should use make DESTDIR=... for packaging
+ifeq ($(strip $(DESTDIR)),)
+	INSTALLTYPE = local
+	INSTALLBASE = $(HOME)/.local/share/gnome-shell/extensions
+else
+	INSTALLTYPE = system
+	SHARE_PREFIX = $(DESTDIR)/usr/share
+	INSTALLBASE = $(SHARE_PREFIX)/gnome-shell/extensions
+endif
+
 .PHONY: out pack install clean copyicons ts
 
-out: $(POT) ts $(SCHEMAOUT) $(SCHEMACP) $(METADATACP) $(STYLESHEETCP) $(ICONSOUT) $(MOS)
+out: $(POT) ts $(SCHEMAOUT) $(SCHEMACP) $(STATICOUT) $(ICONSOUT) $(MOS) $(CSSOUT)
 
 pack: $(ZIP)
 
@@ -42,20 +54,40 @@ install: out
 	rm -rf ~/.local/share/gnome-shell/extensions/$(UUID)
 	mkdir -p ~/.local/share/gnome-shell/extensions
 	cp -r $(BUILD) ~/.local/share/gnome-shell/extensions/$(UUID)
+ifeq ($(INSTALLTYPE),system)
+	rm -r $(addprefix $(INSTALLBASE)/$(UUID)/, schemas locale LICENSE)
+	mkdir -p $(SHARE_PREFIX)/glib-2.0/schemas \
+		$(SHARE_PREFIX)/locale \
+		$(SHARE_PREFIX)/licenses/$(UUID)
+	cp -r $(BUILD)/schemas/*gschema.xml $(SHARE_PREFIX)/glib-2.0/schemas
+	cp -r $(BUILD)/locale/* $(SHARE_PREFIX)/locale
+	cp -r $(BUILD)/LICENSE $(SHARE_PREFIX)/licenses/$(UUID)
+endif
 
 clean:
 	rm -rf $(DIST)
 	rm -f $(POT)
 
-./node_modules: package.json
+./node_modules/.package-lock.json: package.json
 	printf -- 'NEEDED: npm\n'
 	npm install
 
 ts: $(BUILD)/extension.js
 
-$(BUILD)/extension.js: $(SRCS) ./node_modules
+# Build files with tsc
+# Also inserts "const authors=FILE" into resources.js
+$(BUILD)/extension.js $(BUILD)/resource.js: $(SRCS) $(AUTHORS) ./node_modules/.package-lock.json
 	printf -- 'NEEDED: tsc\n'
 	tsc
+	@touch $(BUILD)/extension.js
+
+	@if ! grep -q '// Inserted' $(BUILD)/resource.js; then \
+		printf '// Inserted\n\nconst authors = `' >> $(BUILD)/resource.js; \
+		cat $(AUTHORS) >> $(BUILD)/resource.js; \
+		printf '`;' >> $(BUILD)/resource.js; \
+	else \
+		touch $(BUILD)/resource.js; \
+	fi
 
 $(SCHEMAOUT): $(SCHEMASRC)
 	printf -- 'NEEDED: glib-compile-schemas\n'
@@ -66,13 +98,9 @@ $(SCHEMACP): $(SCHEMASRC)
 	mkdir -p $(SCHEMAOUTDIR)
 	cp $(SCHEMASRC) $(SCHEMACP)
 
-$(METADATACP): $(METADATA)
-	mkdir -p $(BUILD)
-	cp $(METADATA) $(METADATACP)
-
-$(STYLESHEETCP): $(STYLESHEET)
+$(STATICOUT): $(BUILD)/%: $(STATIC)/%
 	mkdir -p $(BUILD)
-	cp $(STYLESHEET) $(STYLESHEETCP)
+	cp $< $@
 
 $(POT): $(SRCS)
 	printf -- 'NEEDED: xgettext\n'
@@ -93,6 +121,11 @@ $(BUILD)/icons:
 $(BUILD)/icons/%: $(ICONS)/% $(BUILD)/icons
 	cp $< $@
 
+# Explicitly putting stylesheet.css here makes it
+# first in the outputted file
+$(CSSOUT): $(THEMES)/stylesheet.css $(CSSSRCS)
+	cat $^ > $@
+
 $(ZIP): out
 	printf -- 'NEEDED: zip\n'
 	mkdir -p $(DIST)

README.md

@@ -4,9 +4,13 @@ A highly configurable GNOME shell extension for viewing the weather.
 
 ![Screenshot](./docs/screenshot.png)
 
-Also has support for translations (albeit translations are probably poor).
+Support for themes, the following screenshot uses the *Immersive* theme:
 
-![International Screenshot](./docs/intlscreenshot.png)
+![Immersive Theme Screenshot](./docs/immersivescreenshot.png)
+
+## Installation
+
+[![Get on GNOME Extensions](./docs/ego.png)](https://extensions.gnome.org/extension/8261/simpleweather/)
 
 ## Features
 

docs/setup.md

@@ -0,0 +1,13 @@
+
+# Set Up for Development
+
+Note that working on this project requires the GNOME shell,
+the GNU gettext utilities, and npm.
+
+If you are just translating you can use any text editor or
+a specialized translation editor.
+
+If you want to write code then preferably use an editor that supports
+TypeScript/LSPs like VS Code, Neovim, or Emacs.
+
+

docs/themes.md

@@ -0,0 +1,68 @@
+
+# Themes
+
+Themes are done by dynamically adding the correct classes onto widgets for the chosen theme.
+
+## Files and Naming
+
+Themes are stored in the `themes/` directory as `<name>.css`.
+
+In order for them to appear in the settings, they must be added to
+`src/preferences/generalPage.ts` in the themes model and array.
+
+Each class takes the name of `sw-style-<theme>-<class>`.
+
+Example of a "sky" theme in `themes/sky.css`:
+
+```css
+.sw-style-sky-bg {
+    background: #C2DAE6;
+}
+
+.sw-style-sky-forecast-box:hover {
+    background: #DAEBF2;
+}
+```
+
+> **Note**
+> `light` is a good example of a theme.
+
+### Notes
+
+Prefer `background` over `background-color` in case a GTK style uses a background image.
+
+### Classes
+
+```
+menu
+|--- bg
+|    |--- left-box
+|    |--- forecast-box
+|    |--- faded
+```
+
+Additional clases:
+
+```
+button
+```
+
+### "Attributes"
+
+There are "attribute" classes which show some kind of logic in the program.
+They look like `swa-<name>`.
+Attributes should be in selectors in conjunction with the normal classes.
+
+The `menu` can have the following:
+
+- `open` when pop-up is open
+- any of the following for weather conditions: `clear`, `cloudy`, `rainy`, `snowy`, `stormy`, `windy`
+- either `day` or `night`
+
+For example, this selector makes the faded text yellow on a sunny day:
+
+```css
+.sw-style-<theme>-menu.swa-clear.swa-day .sw-style-<theme>-faded {
+    color: yellow;
+}
+```