diff --git a/Cargo.toml b/Cargo.toml index 125a7ba..2343725 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,11 +1,11 @@ [package] name = "webapps" -version = "0.4.5" +version = "0.4.6" edition = "2021" [[bin]] path = "src/main.rs" -name = "cosmic-webapps" +name = "quick-webapps" [profile.dev] opt-level = 1 diff --git a/README.md b/README.md index a032c5b..4d5e2e7 100644 --- a/README.md +++ b/README.md @@ -1,17 +1,17 @@

- COSMIC Web Apps -

COSMIC Web Apps

+ Quick Web Apps +

Quick Web Apps

Web App Manager for Cosmic desktop written with love and libcosmic. Allow you to simply create web applications from given url working inside separate window of your browser of choice.


- COSMIC Web Apps Dark window - COSMIC Web Apps Creator - COSMIC Web Apps Icon selector + Quick Web Apps Dark window + Quick Web Apps Creator + Quick Web Apps Icon selector


@@ -64,7 +64,7 @@ app. `sudo just install` -That's all. You can run `COSMIC Web Apps` from you app launcher. +That's all. You can run `Quick Web Apps` from you app launcher. ### Uninstall diff --git a/i18n/en/webapps.ftl b/i18n/en/webapps.ftl index 3bf8b0a..975ba41 100644 --- a/i18n/en/webapps.ftl +++ b/i18n/en/webapps.ftl @@ -1,4 +1,4 @@ -app=COSMIC Web Apps +app=Quick Web Apps loading=Loading... open=Open number={ $number } diff --git a/i18n/es/webapps.ftl b/i18n/es/webapps.ftl index aa8e601..71d4f46 100644 --- a/i18n/es/webapps.ftl +++ b/i18n/es/webapps.ftl @@ -1,4 +1,4 @@ -app=COSMIC Web Apps +app=Quick Web Apps loading=Cargando... open=Abrir number={ $number } diff --git a/i18n/it/webapps.ftl b/i18n/it/webapps.ftl index 96bf400..7b5e37d 100644 --- a/i18n/it/webapps.ftl +++ b/i18n/it/webapps.ftl @@ -1,4 +1,4 @@ -app=COSMIC Web Apps +app=Quick Web Apps loading=Caricamento in corso... open=Apri number={ $number } diff --git a/i18n/pl/webapps.ftl b/i18n/pl/webapps.ftl index d83da6b..20d6e67 100644 --- a/i18n/pl/webapps.ftl +++ b/i18n/pl/webapps.ftl @@ -1,4 +1,4 @@ -app=COSMIC Web Apps +app=Quick Web Apps loading=Ładowanie... open=Otwórz number={ $number } diff --git a/i18n/rs/webapps.ftl b/i18n/rs/webapps.ftl index feb6df4..0fa5700 100644 --- a/i18n/rs/webapps.ftl +++ b/i18n/rs/webapps.ftl @@ -1,4 +1,4 @@ -app=COSMIC Web Apps +app=Quick Web Apps loading=Очитавање... open=Отвори number={ $number } diff --git a/i18n/tr/webapps.ftl b/i18n/tr/webapps.ftl index 7539a54..0d9c2c0 100644 --- a/i18n/tr/webapps.ftl +++ b/i18n/tr/webapps.ftl @@ -1,4 +1,4 @@ -app=COSMIC Web Apps +app=Quick Web Apps loading=Yükleniyor... open=Aç number={ $number } diff --git a/io.github.elevenhsoft.WebApps.json b/io.github.elevenhsoft.WebApps.json index 775a4fc..333b545 100644 --- a/io.github.elevenhsoft.WebApps.json +++ b/io.github.elevenhsoft.WebApps.json @@ -1,57 +1,57 @@ { - "app-id": "io.github.elevenhsoft.WebApps", - "runtime": "org.freedesktop.Platform", - "runtime-version": "23.08", - "sdk": "org.freedesktop.Sdk", - "sdk-extensions": [ - "org.freedesktop.Sdk.Extension.rust-stable" - ], - "command": "cosmic-webapps", - "finish-args": [ - "--share=ipc", - "--socket=fallback-x11", - "--socket=wayland", - "--device=dri", - "--share=network", - "--filesystem=/var/lib/flatpak:ro", - "--filesystem=~/.var/app:rw", - "--filesystem=~/.local/share/flatpak:ro", - "--filesystem=~/.local/share/applications:rw", - "--filesystem=~/.local/share/icons:create" - ], - "build-options": { - "append-path": "/usr/lib/sdk/rust-stable/bin" - }, - "modules": [ - { - "name": "cosmic-webapps", - "buildsystem": "simple", - "build-options": { - "env": { - "CARGO_HOME": "/run/build/cosmic-webapps/cargo" - } - }, - "build-commands": [ - "cargo --offline fetch --manifest-path Cargo.toml --verbose", - "cargo --offline build --release --verbose", - "install -Dm0755 ./target/release/cosmic-webapps /app/bin/cosmic-webapps", - "install -Dm0644 ./res/io.github.elevenhsoft.WebApps.desktop /app/share/applications/io.github.elevenhsoft.WebApps.desktop", - "install -Dm0644 ./res/io.github.elevenhsoft.WebApps.metainfo.xml /app/share/metainfo/io.github.elevenhsoft.WebApps.metainfo.xml", - "install -Dm0644 ./res/icons/hicolor/16x16/apps/io.github.elevenhsoft.WebApps.svg /app/share/icons/hicolor/16x16/apps/io.github.elevenhsoft.WebApps.svg", - "install -Dm0644 ./res/icons/hicolor/24x24/apps/io.github.elevenhsoft.WebApps.svg /app/share/icons/hicolor/24x24/apps/io.github.elevenhsoft.WebApps.svg", - "install -Dm0644 ./res/icons/hicolor/32x32/apps/io.github.elevenhsoft.WebApps.svg /app/share/icons/hicolor/32x32/apps/io.github.elevenhsoft.WebApps.svg", - "install -Dm0644 ./res/icons/hicolor/48x48/apps/io.github.elevenhsoft.WebApps.svg /app/share/icons/hicolor/48x48/apps/io.github.elevenhsoft.WebApps.svg", - "install -Dm0644 ./res/icons/hicolor/64x64/apps/io.github.elevenhsoft.WebApps.svg /app/share/icons/hicolor/64x64/apps/io.github.elevenhsoft.WebApps.svg", - "install -Dm0644 ./res/icons/hicolor/128x128/apps/io.github.elevenhsoft.WebApps.svg /app/share/icons/hicolor/128x128/apps/io.github.elevenhsoft.WebApps.svg", - "install -Dm0644 ./res/icons/hicolor/256x256/apps/io.github.elevenhsoft.WebApps.svg /app/share/icons/hicolor/256x256/apps/io.github.elevenhsoft.WebApps.svg" - ], - "sources": [ - { - "type": "dir", - "path": "." - }, - "cargo-sources.json" - ] + "app-id": "io.github.elevenhsoft.WebApps", + "runtime": "org.freedesktop.Platform", + "runtime-version": "23.08", + "sdk": "org.freedesktop.Sdk", + "sdk-extensions": [ + "org.freedesktop.Sdk.Extension.rust-stable" + ], + "command": "quick-webapps", + "finish-args": [ + "--share=ipc", + "--socket=fallback-x11", + "--socket=wayland", + "--device=dri", + "--share=network", + "--filesystem=/var/lib/flatpak:ro", + "--filesystem=~/.var/app:rw", + "--filesystem=~/.local/share/flatpak:ro", + "--filesystem=~/.local/share/applications:rw", + "--filesystem=~/.local/share/icons:create" + ], + "build-options": { + "append-path": "/usr/lib/sdk/rust-stable/bin" + }, + "modules": [ + { + "name": "quick-webapps", + "buildsystem": "simple", + "build-options": { + "env": { + "CARGO_HOME": "/run/build/quick-webapps/cargo" } - ] -} + }, + "build-commands": [ + "cargo --offline fetch --manifest-path Cargo.toml --verbose", + "cargo --offline build --release --verbose", + "install -Dm0755 ./target/release/quick-webapps /app/bin/quick-webapps", + "install -Dm0644 ./res/io.github.elevenhsoft.WebApps.desktop /app/share/applications/io.github.elevenhsoft.WebApps.desktop", + "install -Dm0644 ./res/io.github.elevenhsoft.WebApps.metainfo.xml /app/share/metainfo/io.github.elevenhsoft.WebApps.metainfo.xml", + "install -Dm0644 ./res/icons/hicolor/16x16/apps/io.github.elevenhsoft.WebApps.svg /app/share/icons/hicolor/16x16/apps/io.github.elevenhsoft.WebApps.svg", + "install -Dm0644 ./res/icons/hicolor/24x24/apps/io.github.elevenhsoft.WebApps.svg /app/share/icons/hicolor/24x24/apps/io.github.elevenhsoft.WebApps.svg", + "install -Dm0644 ./res/icons/hicolor/32x32/apps/io.github.elevenhsoft.WebApps.svg /app/share/icons/hicolor/32x32/apps/io.github.elevenhsoft.WebApps.svg", + "install -Dm0644 ./res/icons/hicolor/48x48/apps/io.github.elevenhsoft.WebApps.svg /app/share/icons/hicolor/48x48/apps/io.github.elevenhsoft.WebApps.svg", + "install -Dm0644 ./res/icons/hicolor/64x64/apps/io.github.elevenhsoft.WebApps.svg /app/share/icons/hicolor/64x64/apps/io.github.elevenhsoft.WebApps.svg", + "install -Dm0644 ./res/icons/hicolor/128x128/apps/io.github.elevenhsoft.WebApps.svg /app/share/icons/hicolor/128x128/apps/io.github.elevenhsoft.WebApps.svg", + "install -Dm0644 ./res/icons/hicolor/256x256/apps/io.github.elevenhsoft.WebApps.svg /app/share/icons/hicolor/256x256/apps/io.github.elevenhsoft.WebApps.svg" + ], + "sources": [ + { + "type": "dir", + "path": "." + }, + "cargo-sources.json" + ] + } + ] +} \ No newline at end of file diff --git a/justfile b/justfile index 9dddf8a..6b024de 100644 --- a/justfile +++ b/justfile @@ -1,4 +1,4 @@ -name := 'cosmic-webapps' +name := 'quick-webapps' export APPID := 'io.github.elevenhsoft.WebApps' rootdir := '' diff --git a/res/io.github.elevenhsoft.WebApps.desktop b/res/io.github.elevenhsoft.WebApps.desktop index 7ecf14e..679d777 100644 --- a/res/io.github.elevenhsoft.WebApps.desktop +++ b/res/io.github.elevenhsoft.WebApps.desktop @@ -1,9 +1,9 @@ [Desktop Entry] -Name=COSMIC Web Apps -Exec=cosmic-webapps +Name=Quick Web Apps +Exec=quick-webapps Terminal=false Type=Application StartupNotify=true Icon=io.github.elevenhsoft.WebApps Categories=X-COSMIC;Utility; -Keywords=App;Software;Manager; \ No newline at end of file +Keywords=App;Software;Manager; diff --git a/res/io.github.elevenhsoft.WebApps.metainfo.xml b/res/io.github.elevenhsoft.WebApps.metainfo.xml index f7055d1..a6bba79 100644 --- a/res/io.github.elevenhsoft.WebApps.metainfo.xml +++ b/res/io.github.elevenhsoft.WebApps.metainfo.xml @@ -8,14 +8,14 @@ https://github.com/elevenhsoft/WebApps/issues https://ko-fi.com/elevenhsoft - COSMIC Web Apps + Quick Web Apps Web applications at your fingertips MIT GPL-3.0-only -

COSMIC Web Apps written with love and libcosmic. +

Quick Web Apps written with love and libcosmic. Allow you to simply create web applications from given URL working inside separate window of your browser of choice. Works on most mainstream desktop environments with all the mainstream web browsers installed via flatpak. @@ -52,6 +52,14 @@ + + +

Add support for PNG icons

+

Use xdg desktop portal file picker instead of cosmic-files

+

Add editable name from home screen for web apps

+

Updated dependencies

+
+

Add spanish translation

diff --git a/scripts/icon-installer.sh b/scripts/icon-installer.sh index 9ec65bd..ea25657 100755 --- a/scripts/icon-installer.sh +++ b/scripts/icon-installer.sh @@ -64,18 +64,6 @@ download error_message=$(mkdir -p $LOCAL_DESTDIR 2>&1) -# Check if app is flatpak sandboxed -# if [ -n "$FLATPAK_ID" ]; then -# echo "COSMIC Web Apps is probably sandboxed." -# echo "You do NOT have write permission on $LOCAL_DESTDIR." -# echo "Writing to $FLATPAK_DESTDIR." -# install $FLATPAK_DESTDIR Papirus "$EXTRA_THEMES" -# else -# echo "COSMIC Web Apps is not sandboxed." -# echo "You have write permission on $LOCAL_DESTDIR." -# install $LOCAL_DESTDIR Papirus "$EXTRA_THEMES" -# fi - install $LOCAL_DESTDIR Papirus "$EXTRA_THEMES" trap cleanup EXIT HUP INT TERM diff --git a/src/common.rs b/src/common.rs index 0c72dba..704f4cc 100644 --- a/src/common.rs +++ b/src/common.rs @@ -78,7 +78,7 @@ pub fn system_fonts() -> PathBuf { } pub fn my_icons_location() -> PathBuf { - icons_location().join("CosmicWebApps") + icons_location().join("QuickWebApps") } pub fn webapplauncher_is_valid( diff --git a/src/supported_browsers.rs b/src/supported_browsers.rs index 47904a2..82ae49d 100644 --- a/src/supported_browsers.rs +++ b/src/supported_browsers.rs @@ -8,189 +8,189 @@ pub fn native_browsers() -> Vec { "Firefox", "firefox", "/usr/bin/firefox", - ".local/share/cosmic-webapps/firefox", + ".local/share/quick-webapps/firefox", ), Browser::new( BrowserType::Firefox, "Firefox Developer Edition", "firefox-developer-edition", "/usr/bin/firefox-developer-edition", - ".local/share/cosmic-webapps/firefox", + ".local/share/quick-webapps/firefox", ), Browser::new( BrowserType::Firefox, "Firefox Nightly", "firefox-nightly", "/usr/bin/firefox-nightly", - ".local/share/cosmic-webapps/firefox", + ".local/share/quick-webapps/firefox", ), Browser::new( BrowserType::Firefox, "Firefox ESR", "firefox-esr", "/usr/bin/firefox-esr", - ".local/share/cosmic-webapps/firefox", + ".local/share/quick-webapps/firefox", ), Browser::new( BrowserType::Chromium, "Brave Browser", "brave-browser", "/usr/bin/brave-browser", - ".local/share/cosmic-webapps/chromium", + ".local/share/quick-webapps/chromium", ), Browser::new( BrowserType::Chromium, "Brave (bin)", "brave-bin", "/usr/bin/brave-bin", - ".local/share/cosmic-webapps/chromium", + ".local/share/quick-webapps/chromium", ), Browser::new( BrowserType::Chromium, "Chrome", "google-chrome-stable", "/usr/bin/google-chrome-stable", - ".local/share/cosmic-webapps/chromium", + ".local/share/quick-webapps/chromium", ), Browser::new( BrowserType::Chromium, "Chrome Beta", "google-chrome-beta", "/usr/bin/google-chrome-beta", - ".local/share/cosmic-webapps/chromium", + ".local/share/quick-webapps/chromium", ), Browser::new( BrowserType::Chromium, "Chromium", "chromium", "/usr/bin/chromium", - ".local/share/cosmic-webapps/chromium", + ".local/share/quick-webapps/chromium", ), Browser::new( BrowserType::Chromium, "Chromium Browser", "chromium-browser", "/usr/bin/chromium-browser", - ".local/share/cosmic-webapps/chromium", + ".local/share/quick-webapps/chromium", ), Browser::new( BrowserType::Chromium, "Chromium (bin)", "chromium-bin", "/usr/bin/chromium-bin-browser", - ".local/share/cosmic-webapps/chromium", + ".local/share/quick-webapps/chromium", ), Browser::new( BrowserType::Firefox, "Librewolf", "librewolf", "/usr/bin/librewolf", - ".local/share/cosmic-webapps/firefox", + ".local/share/quick-webapps/firefox", ), Browser::new( BrowserType::Firefox, "Waterfox", "waterfox", "/usr/bin/waterfox", - ".local/share/cosmic-webapps/firefox", + ".local/share/quick-webapps/firefox", ), Browser::new( BrowserType::Firefox, "Waterfox (current)", "waterfox-current", "/usr/bin/waterfox-current", - ".local/share/cosmic-webapps/firefox", + ".local/share/quick-webapps/firefox", ), Browser::new( BrowserType::Firefox, "Waterfox (classic)", "waterfox-classic", "/usr/bin/waterfox-classic", - ".local/share/cosmic-webapps/firefox", + ".local/share/quick-webapps/firefox", ), Browser::new( BrowserType::Firefox, "Waterfox 3rd Generation", "waterfox-g3", "/usr/bin/waterfox-g3", - ".local/share/cosmic-webapps/firefox", + ".local/share/quick-webapps/firefox", ), Browser::new( BrowserType::Firefox, "Waterfox 4rd Generation", "waterfox-g4", "/usr/bin/waterfox-g4", - ".local/share/cosmic-webapps/firefox", + ".local/share/quick-webapps/firefox", ), Browser::new( BrowserType::Chromium, "Vivaldi", "vivaldi-stable", "/usr/bin/vivaldi-stable", - ".local/share/cosmic-webapps/chromium", + ".local/share/quick-webapps/chromium", ), Browser::new( BrowserType::Chromium, "Vivaldi Snapshot", "vivaldi-snapshot", "/usr/bin/vivaldi-snapshot", - ".local/share/cosmic-webapps/chromium", + ".local/share/quick-webapps/chromium", ), Browser::new( BrowserType::Chromium, "Microsoft Edge", "microsoft-edge-stable", "/usr/bin/microsoft-edge-stable", - ".local/share/cosmic-webapps/chromium", + ".local/share/quick-webapps/chromium", ), Browser::new( BrowserType::Chromium, "Microsoft Edge Beta", "microsoft-edge-beta", "/usr/bin/microsoft-edge-beta", - ".local/share/cosmic-webapps/chromium", + ".local/share/quick-webapps/chromium", ), Browser::new( BrowserType::Chromium, "Microsoft Edge Dev", "microsoft-edge-dev", "/usr/bin/microsoft-edge-dev", - ".local/share/cosmic-webapps/chromium", + ".local/share/quick-webapps/chromium", ), Browser::new( BrowserType::Chromium, "FlashPeak Slimjet", "flashpeak-slimjet", "/usr/bin/flashpeak-slimjet", - ".local/share/cosmic-webapps/chromium", + ".local/share/quick-webapps/chromium", ), Browser::new( BrowserType::Chromium, "Yandex", "yandex-browser", "/usr/bin/yandex-browser", - ".local/share/cosmic-webapps/chromium", + ".local/share/quick-webapps/chromium", ), Browser::new( BrowserType::Chromium, "Naver Whale", "naver-whale-stable", "/usr/bin/naver-whale-stable", - ".local/share/cosmic-webapps/chromium", + ".local/share/quick-webapps/chromium", ), Browser::new( BrowserType::Chromium, "Brave", "brave", "/usr/bin/brave", - ".local/share/cosmic-webapps/chromium", + ".local/share/quick-webapps/chromium", ), Browser::new( BrowserType::Falkon, "Falkon", "falkon", "/usr/bin/falkon", - ".local/share/cosmic-webapps/falkon", + ".local/share/quick-webapps/falkon", ), ] } @@ -375,84 +375,84 @@ pub fn nix_browsers() -> Vec { "Firefox", "firefox", "/run/current-system/sw/bin/firefox", - ".local/share/cosmic-webapps/firefox", + ".local/share/quick-webapps/firefox", ), Browser::new( BrowserType::Firefox, "Floorp", "floorp", "/run/current-system/sw/bin/floorp", - ".local/share/cosmic-webapps/firefox", - ), + ".local/share/quick-webapps/firefox", + ), Browser::new( BrowserType::Chromium, "Brave", "brave", "/run/current-system/sw/bin/brave", - ".local/share/cosmic-webapps/chromium", + ".local/share/quick-webapps/chromium", ), Browser::new( BrowserType::Chromium, "Chrome", "google-chrome-stable", "/run/current-system/sw/bin/google-chrome-stable", - ".local/share/cosmic-webapps/chromium", + ".local/share/quick-webapps/chromium", ), Browser::new( BrowserType::Chromium, "Chromium", "chromium", "/run/current-system/sw/bin/chromium", - ".local/share/cosmic-webapps/chromium", + ".local/share/quick-webapps/chromium", ), Browser::new( BrowserType::Firefox, "Librewolf", "librewolf", "/run/current-system/sw/bin/librewolf", - ".local/share/cosmic-webapps/firefox", + ".local/share/quick-webapps/firefox", ), Browser::new( BrowserType::Chromium, "Vivaldi", "vivaldi-stable", "/run/current-system/sw/bin/vivaldi", - ".local/share/cosmic-webapps/chromium", + ".local/share/quick-webapps/chromium", ), Browser::new( BrowserType::Chromium, "Microsoft Edge", "microsoft-edge-stable", "/run/current-system/sw/bin/microsoft-edge-stable", - ".local/share/cosmic-webapps/chromium", + ".local/share/quick-webapps/chromium", ), Browser::new( BrowserType::Chromium, "Microsoft Edge Beta", "microsoft-edge-beta", "/run/current-system/sw/bin/microsoft-edge-beta", - ".local/share/cosmic-webapps/chromium", + ".local/share/quick-webapps/chromium", ), Browser::new( BrowserType::Chromium, "Microsoft Edge Dev", "microsoft-edge-dev", "/run/current-system/sw/bin/microsoft-edge-dev", - ".local/share/cosmic-webapps/chromium", + ".local/share/quick-webapps/chromium", ), Browser::new( BrowserType::Chromium, "Yandex", "yandex-browser", "/run/current-system/sw/bin/yandex-browser", - ".local/share/cosmic-webapps/chromium", + ".local/share/quick-webapps/chromium", ), Browser::new( BrowserType::Falkon, "Falkon", "falkon", "/run/current-system/sw/bin/falkon", - ".local/share/cosmic-webapps/falkon", + ".local/share/quick-webapps/falkon", ), ] }