diff --git a/PKGBUILD b/PKGBUILD index ab1eeba..b5a1e98 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -89,12 +89,12 @@ package() { cp -r "${pkgname}/src/qml" "${pkgdir}/usr/share/bubble/src/qml" # Install desktop entry, icon and AppStream metainfo - install -Dm644 "${pkgname}/dist/io.github.soyeb_jim285.Bubble.desktop" \ - "${pkgdir}/usr/share/applications/io.github.soyeb_jim285.Bubble.desktop" - install -Dm644 "${pkgname}/dist/io.github.soyeb_jim285.Bubble.svg" \ - "${pkgdir}/usr/share/icons/hicolor/scalable/apps/io.github.soyeb_jim285.Bubble.svg" - install -Dm644 "${pkgname}/dist/io.github.soyeb_jim285.Bubble.metainfo.xml" \ - "${pkgdir}/usr/share/metainfo/io.github.soyeb_jim285.Bubble.metainfo.xml" + install -Dm644 "${pkgname}/dist/io.github.tattvaorg.Bubble.desktop" \ + "${pkgdir}/usr/share/applications/io.github.tattvaorg.Bubble.desktop" + install -Dm644 "${pkgname}/dist/io.github.tattvaorg.Bubble.svg" \ + "${pkgdir}/usr/share/icons/hicolor/scalable/apps/io.github.tattvaorg.Bubble.svg" + install -Dm644 "${pkgname}/dist/io.github.tattvaorg.Bubble.metainfo.xml" \ + "${pkgdir}/usr/share/metainfo/io.github.tattvaorg.Bubble.metainfo.xml" # Install license install -Dm644 "${pkgname}/LICENSE" \ diff --git a/README.md b/README.md index 14a3627..0bd2676 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@
-Bubble Logo +Bubble Logo **A fast, modern Wayland file manager with Miller columns and a built-in Secure Vault.** @@ -201,6 +201,7 @@ To enable liquid glass in Lniri, add this window rule to `~/.config/niri/config. ```kdl window-rule { + match app-id="io.github.tattvaorg.Bubble" match app-id="io.github.soyeb_jim285.Bubble" match app-id="bubble" match app-id="Bubble" @@ -240,7 +241,7 @@ window-rule { ``` > [!TIP] -> - Both `match app-id="Bubble"` and `match app-id="io.github.soyeb_jim285.Bubble"` match automatically. If your environment requires a specific custom Wayland `app-id`, specify `BUBBLE_APP_ID= bubble`. +> - Both `match app-id="Bubble"` and `match app-id="io.github.tattvaorg.Bubble"` (as well as legacy `io.github.soyeb_jim285.Bubble`) match automatically. If your environment requires a specific custom Wayland `app-id`, specify `BUBBLE_APP_ID= bubble`. > - Transparency level and container transparency can be toggled and finely adjusted inside Bubble in **Settings (`Ctrl+,`)** under **Appearance**. --- diff --git a/bubble.desktop b/bubble.desktop index f3eba85..a24c60c 100644 --- a/bubble.desktop +++ b/bubble.desktop @@ -2,7 +2,7 @@ Name=Bubble Comment=File manager for Wayland Exec=bubble %U -Icon=io.github.soyeb_jim285.Bubble +Icon=io.github.tattvaorg.Bubble Terminal=false Type=Application Categories=System;FileManager; diff --git a/config.md b/config.md index 5d429e3..48180f9 100644 --- a/config.md +++ b/config.md @@ -277,6 +277,8 @@ In `~/.config/niri/config.kdl`, add window rules for Bubble to activate hardware ```kdl window-rule { + match app-id="io.github.tattvaorg.Bubble" + match app-id="io.github.soyeb_jim285.Bubble" match app-id="bubble" match app-id="Bubble" match title="Bubble" diff --git a/dist/io.github.soyeb_jim285.HyprFM.desktop b/dist/io.github.soyeb_jim285.HyprFM.desktop index c3126dd..2d7a0c4 100644 --- a/dist/io.github.soyeb_jim285.HyprFM.desktop +++ b/dist/io.github.soyeb_jim285.HyprFM.desktop @@ -3,7 +3,7 @@ Name=Bubble GenericName=File Manager Comment=A lightweight Qt6/QML file manager for Wayland Exec=bubble %F -Icon=io.github.soyeb_jim285.Bubble +Icon=io.github.tattvaorg.Bubble Terminal=false Type=Application Categories=System;FileManager;Qt; diff --git a/dist/io.github.soyeb_jim285.HyprFM.metainfo.xml b/dist/io.github.soyeb_jim285.HyprFM.metainfo.xml index 6df0759..e7bec8b 100644 --- a/dist/io.github.soyeb_jim285.HyprFM.metainfo.xml +++ b/dist/io.github.soyeb_jim285.HyprFM.metainfo.xml @@ -1,6 +1,6 @@ - io.github.soyeb_jim285.Bubble + io.github.tattvaorg.Bubble CC0-1.0 MIT @@ -29,14 +29,14 @@ - io.github.soyeb_jim285.Bubble.desktop + io.github.tattvaorg.Bubble.desktop - https://github.com/soyeb-jim285/bubble - https://github.com/soyeb-jim285/bubble/issues - https://github.com/soyeb-jim285/bubble + https://github.com/TattvaOrg/Bubble + https://github.com/TattvaOrg/Bubble/issues + https://github.com/TattvaOrg/Bubble - - Soyeb Pervez Jim + + Tattva diff --git a/dist/io.github.soyeb_jim285.Bubble.desktop b/dist/io.github.tattvaorg.Bubble.desktop similarity index 91% rename from dist/io.github.soyeb_jim285.Bubble.desktop rename to dist/io.github.tattvaorg.Bubble.desktop index c3126dd..2d7a0c4 100644 --- a/dist/io.github.soyeb_jim285.Bubble.desktop +++ b/dist/io.github.tattvaorg.Bubble.desktop @@ -3,7 +3,7 @@ Name=Bubble GenericName=File Manager Comment=A lightweight Qt6/QML file manager for Wayland Exec=bubble %F -Icon=io.github.soyeb_jim285.Bubble +Icon=io.github.tattvaorg.Bubble Terminal=false Type=Application Categories=System;FileManager;Qt; diff --git a/dist/io.github.soyeb_jim285.Bubble.metainfo.xml b/dist/io.github.tattvaorg.Bubble.metainfo.xml similarity index 93% rename from dist/io.github.soyeb_jim285.Bubble.metainfo.xml rename to dist/io.github.tattvaorg.Bubble.metainfo.xml index 6df0759..e4ec122 100644 --- a/dist/io.github.soyeb_jim285.Bubble.metainfo.xml +++ b/dist/io.github.tattvaorg.Bubble.metainfo.xml @@ -1,6 +1,6 @@ - io.github.soyeb_jim285.Bubble + io.github.tattvaorg.Bubble CC0-1.0 MIT @@ -29,28 +29,28 @@ - io.github.soyeb_jim285.Bubble.desktop + io.github.tattvaorg.Bubble.desktop - https://github.com/soyeb-jim285/bubble - https://github.com/soyeb-jim285/bubble/issues - https://github.com/soyeb-jim285/bubble + https://github.com/TattvaOrg/Bubble + https://github.com/TattvaOrg/Bubble/issues + https://github.com/TattvaOrg/Bubble - - Soyeb Pervez Jim + + Tattva Grid view with file preview - https://raw.githubusercontent.com/soyeb-jim285/bubble/v0.6.1/docs/screenshots/grid-view.png + https://raw.githubusercontent.com/TattvaOrg/Bubble/main/docs/screenshots/grid-view.png Miller column view - https://raw.githubusercontent.com/soyeb-jim285/bubble/v0.6.1/docs/screenshots/miller-view.png + https://raw.githubusercontent.com/TattvaOrg/Bubble/main/docs/screenshots/miller-view.png Quick preview overlay - https://raw.githubusercontent.com/soyeb-jim285/bubble/v0.6.1/docs/screenshots/quick-preview.png + https://raw.githubusercontent.com/TattvaOrg/Bubble/main/docs/screenshots/quick-preview.png diff --git a/dist/io.github.soyeb_jim285.Bubble.svg b/dist/io.github.tattvaorg.Bubble.svg similarity index 100% rename from dist/io.github.soyeb_jim285.Bubble.svg rename to dist/io.github.tattvaorg.Bubble.svg diff --git a/install.sh b/install.sh index bfcd014..f0729ce 100755 --- a/install.sh +++ b/install.sh @@ -339,9 +339,12 @@ if [[ $UNINSTALL -eq 1 ]]; then fi fi rm -rf "$PREFIX/share/bubble" + rm -f "$PREFIX/share/applications/io.github.tattvaorg.Bubble.desktop" rm -f "$PREFIX/share/applications/io.github.soyeb_jim285.Bubble.desktop" rm -f "$PREFIX/share/applications/bubble.desktop" + rm -f "$PREFIX/share/icons/hicolor/scalable/apps/io.github.tattvaorg.Bubble.svg" rm -f "$PREFIX/share/icons/hicolor/scalable/apps/io.github.soyeb_jim285.Bubble.svg" + rm -f "$PREFIX/share/metainfo/io.github.tattvaorg.Bubble.metainfo.xml" rm -f "$PREFIX/share/metainfo/io.github.soyeb_jim285.Bubble.metainfo.xml" rm -f "$PREFIX/share/libalpm/hooks/bubble-cleanup.hook" rm -f "$PREFIX/share/polkit-1/actions/org.bubble.vault.policy" @@ -538,18 +541,18 @@ install_prebuilt_binary() { rm -f "$PREFIX/share/applications/bubble.desktop" # Install desktop entry and icon - if [[ -f "$SCRIPT_DIR/dist/io.github.soyeb_jim285.Bubble.desktop" ]]; then - install -m 644 "$SCRIPT_DIR/dist/io.github.soyeb_jim285.Bubble.desktop" "$PREFIX/share/applications/" + if [[ -f "$SCRIPT_DIR/dist/io.github.tattvaorg.Bubble.desktop" ]]; then + install -m 644 "$SCRIPT_DIR/dist/io.github.tattvaorg.Bubble.desktop" "$PREFIX/share/applications/" elif command -v curl >/dev/null 2>&1; then - curl -sSL -f "https://raw.githubusercontent.com/${BUBBLE_REPO}/main/dist/io.github.soyeb_jim285.Bubble.desktop" \ - -o "$PREFIX/share/applications/io.github.soyeb_jim285.Bubble.desktop" 2>/dev/null || true + curl -sSL -f "https://raw.githubusercontent.com/${BUBBLE_REPO}/main/dist/io.github.tattvaorg.Bubble.desktop" \ + -o "$PREFIX/share/applications/io.github.tattvaorg.Bubble.desktop" 2>/dev/null || true fi - if [[ -f "$SCRIPT_DIR/dist/io.github.soyeb_jim285.Bubble.svg" ]]; then - install -m 644 "$SCRIPT_DIR/dist/io.github.soyeb_jim285.Bubble.svg" "$PREFIX/share/icons/hicolor/scalable/apps/" + if [[ -f "$SCRIPT_DIR/dist/io.github.tattvaorg.Bubble.svg" ]]; then + install -m 644 "$SCRIPT_DIR/dist/io.github.tattvaorg.Bubble.svg" "$PREFIX/share/icons/hicolor/scalable/apps/" elif command -v curl >/dev/null 2>&1; then - curl -sSL -f "https://raw.githubusercontent.com/${BUBBLE_REPO}/main/dist/io.github.soyeb_jim285.Bubble.svg" \ - -o "$PREFIX/share/icons/hicolor/scalable/apps/io.github.soyeb_jim285.Bubble.svg" 2>/dev/null || true + curl -sSL -f "https://raw.githubusercontent.com/${BUBBLE_REPO}/main/dist/io.github.tattvaorg.Bubble.svg" \ + -o "$PREFIX/share/icons/hicolor/scalable/apps/io.github.tattvaorg.Bubble.svg" 2>/dev/null || true fi # Extract vault helpers if present inside AppImage @@ -590,8 +593,8 @@ install_prebuilt_binary() { echo "==============================================" echo " Mode: Prebuilt Binary (AppImage)" echo " Binary installed to: $PREFIX/bin/bubble" - echo " Desktop file: $PREFIX/share/applications/io.github.soyeb_jim285.Bubble.desktop" - echo " Icon: $PREFIX/share/icons/hicolor/scalable/apps/io.github.soyeb_jim285.Bubble.svg" + echo " Desktop file: $PREFIX/share/applications/io.github.tattvaorg.Bubble.desktop" + echo " Icon: $PREFIX/share/icons/hicolor/scalable/apps/io.github.tattvaorg.Bubble.svg" echo if [[ "$MODE" == "user" && ":$PATH:" != *":$PREFIX/bin:"* ]]; then @@ -858,8 +861,8 @@ echo "==============================================" echo " Binary installed to: $PREFIX/bin/bubble" echo " Vault cleanup binary: $PREFIX/bin/bubble-vault-destroy" echo " Vault helper binary: $PREFIX/bin/bubble-vault-helper" -echo " Desktop file: $PREFIX/share/applications/io.github.soyeb_jim285.Bubble.desktop" -echo " Icon: $PREFIX/share/icons/hicolor/scalable/apps/io.github.soyeb_jim285.Bubble.svg" +echo " Desktop file: $PREFIX/share/applications/io.github.tattvaorg.Bubble.desktop" +echo " Icon: $PREFIX/share/icons/hicolor/scalable/apps/io.github.tattvaorg.Bubble.svg" echo # Path check for user mode diff --git a/io.github.soyeb_jim285.Bubble.yml b/io.github.tattvaorg.Bubble.yml similarity index 96% rename from io.github.soyeb_jim285.Bubble.yml rename to io.github.tattvaorg.Bubble.yml index 92493b8..06e5abc 100644 --- a/io.github.soyeb_jim285.Bubble.yml +++ b/io.github.tattvaorg.Bubble.yml @@ -4,8 +4,8 @@ # # flatpak install -y flathub org.kde.Platform//6.9 org.kde.Sdk//6.9 # flatpak-builder --force-clean --user --install \ -# build-flatpak io.github.soyeb_jim285.Bubble.yml -# flatpak run io.github.soyeb_jim285.Bubble +# build-flatpak io.github.tattvaorg.Bubble.yml +# flatpak run io.github.tattvaorg.Bubble # # For local iteration without committing, swap the `bubble` module's source # from `type: git` to `type: dir, path: .` (see comment below). @@ -13,7 +13,7 @@ # For Flathub submission, this file is copied to a separate flathub repo # and the `bubble` source must stay as `type: git` with a pinned tag/commit. -app-id: io.github.soyeb_jim285.Bubble +app-id: io.github.tattvaorg.Bubble runtime: org.kde.Platform runtime-version: '6.9' sdk: org.kde.Sdk @@ -195,11 +195,11 @@ modules: post-install: # Required by Flathub: every app must install its license file to # $FLATPAK_DEST/share/licenses/$FLATPAK_ID. - - install -Dm644 LICENSE /app/share/licenses/io.github.soyeb_jim285.Bubble/LICENSE + - install -Dm644 LICENSE /app/share/licenses/io.github.tattvaorg.Bubble/LICENSE sources: # ── FLATHUB SUBMISSION ── - type: git - url: https://github.com/soyeb-jim285/bubble.git + url: https://github.com/TattvaOrg/Bubble.git tag: v0.6.1 # ── LOCAL ITERATION ── diff --git a/scripts/build-appimage-local.sh b/scripts/build-appimage-local.sh index 6dc86a9..f4594e9 100755 --- a/scripts/build-appimage-local.sh +++ b/scripts/build-appimage-local.sh @@ -174,8 +174,8 @@ pushd "$ROOT_DIR" >/dev/null "$LINUXDEPLOY" \ --appdir "$APPDIR" \ --plugin qt \ - --desktop-file "$ROOT_DIR/dist/io.github.soyeb_jim285.Bubble.desktop" \ - --icon-file "$ROOT_DIR/dist/io.github.soyeb_jim285.Bubble.svg" + --desktop-file "$ROOT_DIR/dist/io.github.tattvaorg.Bubble.desktop" \ + --icon-file "$ROOT_DIR/dist/io.github.tattvaorg.Bubble.svg" deploy_deps_args=() for plugin_dir in \ diff --git a/scripts/release.sh b/scripts/release.sh index 12a1e33..fbd7ba8 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -10,7 +10,7 @@ # What it does, in order: # 1. Bumps every in-tree version reference: # - CMakeLists.txt project(bubble VERSION X.Y.Z ...) -# - io.github.soyeb_jim285.Bubble.yml bubble source `tag: vX.Y.Z` +# - io.github.tattvaorg.Bubble.yml bubble source `tag: vX.Y.Z` # - dist/*.metainfo.xml screenshot URLs + new entry # 2. Runs a quick cmake build as a smoke test (if build/ exists). # 3. Creates a "chore: release vX.Y.Z" commit on the current branch. @@ -41,8 +41,8 @@ REPO_ROOT=$(git rev-parse --show-toplevel) cd "$REPO_ROOT" CMAKE_FILE="CMakeLists.txt" -FLATPAK_FILE="io.github.soyeb_jim285.Bubble.yml" -META_FILE="dist/io.github.soyeb_jim285.Bubble.metainfo.xml" +FLATPAK_FILE="io.github.tattvaorg.Bubble.yml" +META_FILE="dist/io.github.tattvaorg.Bubble.metainfo.xml" for f in "$CMAKE_FILE" "$FLATPAK_FILE" "$META_FILE"; do [ -f "$f" ] || { echo "release.sh: missing $f" >&2; exit 1; } diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 4f36472..85efd57 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -307,11 +307,11 @@ if(KF6WindowSystem_FOUND) endif() install(TARGETS bubble bubble-vault-destroy bubble-vault-helper DESTINATION bin) -install(FILES "${CMAKE_SOURCE_DIR}/dist/io.github.soyeb_jim285.Bubble.desktop" +install(FILES "${CMAKE_SOURCE_DIR}/dist/io.github.tattvaorg.Bubble.desktop" DESTINATION share/applications) -install(FILES "${CMAKE_SOURCE_DIR}/dist/io.github.soyeb_jim285.Bubble.svg" +install(FILES "${CMAKE_SOURCE_DIR}/dist/io.github.tattvaorg.Bubble.svg" DESTINATION share/icons/hicolor/scalable/apps) -install(FILES "${CMAKE_SOURCE_DIR}/dist/io.github.soyeb_jim285.Bubble.metainfo.xml" +install(FILES "${CMAKE_SOURCE_DIR}/dist/io.github.tattvaorg.Bubble.metainfo.xml" DESTINATION share/metainfo) install(FILES "${CMAKE_SOURCE_DIR}/dist/bubble-cleanup.hook" DESTINATION share/libalpm/hooks) diff --git a/src/main.cpp b/src/main.cpp index 48108ed..de8ba80 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -236,7 +236,7 @@ int main(int argc, char *argv[]) " (e.g. \"Ubuntu on Wayland\", GNOME on Wayland, Hyprland, KDE\n" " Plasma Wayland).\n" " * If running via Flatpak, also grant Wayland socket access:\n" - " flatpak override --user --socket=wayland io.github.soyeb_jim285.Bubble\n" + " flatpak override --user --socket=wayland io.github.tattvaorg.Bubble\n" "\n", session); return 1; @@ -272,7 +272,7 @@ int main(int argc, char *argv[]) app.setApplicationName("Bubble"); app.setOrganizationName("bubble"); const QString customAppId = qEnvironmentVariable("BUBBLE_APP_ID"); - app.setDesktopFileName(!customAppId.isEmpty() ? customAppId : QStringLiteral("io.github.soyeb_jim285.Bubble")); + app.setDesktopFileName(!customAppId.isEmpty() ? customAppId : QStringLiteral("io.github.tattvaorg.Bubble")); // Startup timing: opt-in via BUBBLE_TIMING=1 so normal runs stay quiet. // Prints milliseconds from QGuiApplication construction at each phase. diff --git a/uninstall.sh b/uninstall.sh index 58af0c3..1e22752 100755 --- a/uninstall.sh +++ b/uninstall.sh @@ -226,7 +226,7 @@ for prefix in "${SCAN_PREFIXES[@]}"; do done # Desktop files - for desktop in io.github.soyeb_jim285.Bubble.desktop bubble.desktop hyprfm.desktop; do + for desktop in io.github.tattvaorg.Bubble.desktop io.github.soyeb_jim285.Bubble.desktop bubble.desktop hyprfm.desktop; do target="$prefix/share/applications/$desktop" if [[ -f "$target" || -L "$target" ]]; then if [[ $is_system -eq 1 ]]; then @@ -239,7 +239,9 @@ for prefix in "${SCAN_PREFIXES[@]}"; do # Icons & metainfo for item in \ + "share/icons/hicolor/scalable/apps/io.github.tattvaorg.Bubble.svg" \ "share/icons/hicolor/scalable/apps/io.github.soyeb_jim285.Bubble.svg" \ + "share/metainfo/io.github.tattvaorg.Bubble.metainfo.xml" \ "share/metainfo/io.github.soyeb_jim285.Bubble.metainfo.xml" \ "share/libalpm/hooks/bubble-cleanup.hook" \ "share/polkit-1/actions/org.bubble.vault.policy"; do