diff --git a/ManeshTraderMac/ManeshTraderMac/Assets.xcassets/AppIcon.appiconset/Contents.json b/ManeshTraderMac/ManeshTraderMac/Assets.xcassets/AppIcon.appiconset/Contents.json index 3f00db4..64dc11e 100644 --- a/ManeshTraderMac/ManeshTraderMac/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/ManeshTraderMac/ManeshTraderMac/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,51 +1,61 @@ { "images" : [ { + "filename" : "icon_16x16.png", "idiom" : "mac", "scale" : "1x", "size" : "16x16" }, { + "filename" : "icon_16x16@2x.png", "idiom" : "mac", "scale" : "2x", "size" : "16x16" }, { + "filename" : "icon_32x32.png", "idiom" : "mac", "scale" : "1x", "size" : "32x32" }, { + "filename" : "icon_32x32@2x.png", "idiom" : "mac", "scale" : "2x", "size" : "32x32" }, { + "filename" : "icon_128x128.png", "idiom" : "mac", "scale" : "1x", "size" : "128x128" }, { + "filename" : "icon_128x128@2x.png", "idiom" : "mac", "scale" : "2x", "size" : "128x128" }, { + "filename" : "icon_256x256.png", "idiom" : "mac", "scale" : "1x", "size" : "256x256" }, { + "filename" : "icon_256x256@2x.png", "idiom" : "mac", "scale" : "2x", "size" : "256x256" }, { + "filename" : "icon_512x512.png", "idiom" : "mac", "scale" : "1x", "size" : "512x512" }, { + "filename" : "icon_512x512@2x.png", "idiom" : "mac", "scale" : "2x", "size" : "512x512" diff --git a/assets/icon/ManeshTrader.iconset/icon_128x128.png b/ManeshTraderMac/ManeshTraderMac/Assets.xcassets/AppIcon.appiconset/icon_128x128.png similarity index 100% rename from assets/icon/ManeshTrader.iconset/icon_128x128.png rename to ManeshTraderMac/ManeshTraderMac/Assets.xcassets/AppIcon.appiconset/icon_128x128.png diff --git a/assets/icon/ManeshTrader.iconset/icon_128x128@2x.png b/ManeshTraderMac/ManeshTraderMac/Assets.xcassets/AppIcon.appiconset/icon_128x128@2x.png similarity index 100% rename from assets/icon/ManeshTrader.iconset/icon_128x128@2x.png rename to ManeshTraderMac/ManeshTraderMac/Assets.xcassets/AppIcon.appiconset/icon_128x128@2x.png diff --git a/assets/icon/ManeshTrader.iconset/icon_16x16.png b/ManeshTraderMac/ManeshTraderMac/Assets.xcassets/AppIcon.appiconset/icon_16x16.png similarity index 100% rename from assets/icon/ManeshTrader.iconset/icon_16x16.png rename to ManeshTraderMac/ManeshTraderMac/Assets.xcassets/AppIcon.appiconset/icon_16x16.png diff --git a/assets/icon/ManeshTrader.iconset/icon_16x16@2x.png b/ManeshTraderMac/ManeshTraderMac/Assets.xcassets/AppIcon.appiconset/icon_16x16@2x.png similarity index 100% rename from assets/icon/ManeshTrader.iconset/icon_16x16@2x.png rename to ManeshTraderMac/ManeshTraderMac/Assets.xcassets/AppIcon.appiconset/icon_16x16@2x.png diff --git a/assets/icon/ManeshTrader.iconset/icon_256x256.png b/ManeshTraderMac/ManeshTraderMac/Assets.xcassets/AppIcon.appiconset/icon_256x256.png similarity index 100% rename from assets/icon/ManeshTrader.iconset/icon_256x256.png rename to ManeshTraderMac/ManeshTraderMac/Assets.xcassets/AppIcon.appiconset/icon_256x256.png diff --git a/assets/icon/ManeshTrader.iconset/icon_256x256@2x.png b/ManeshTraderMac/ManeshTraderMac/Assets.xcassets/AppIcon.appiconset/icon_256x256@2x.png similarity index 100% rename from assets/icon/ManeshTrader.iconset/icon_256x256@2x.png rename to ManeshTraderMac/ManeshTraderMac/Assets.xcassets/AppIcon.appiconset/icon_256x256@2x.png diff --git a/assets/icon/ManeshTrader.iconset/icon_32x32.png b/ManeshTraderMac/ManeshTraderMac/Assets.xcassets/AppIcon.appiconset/icon_32x32.png similarity index 100% rename from assets/icon/ManeshTrader.iconset/icon_32x32.png rename to ManeshTraderMac/ManeshTraderMac/Assets.xcassets/AppIcon.appiconset/icon_32x32.png diff --git a/assets/icon/ManeshTrader.iconset/icon_32x32@2x.png b/ManeshTraderMac/ManeshTraderMac/Assets.xcassets/AppIcon.appiconset/icon_32x32@2x.png similarity index 100% rename from assets/icon/ManeshTrader.iconset/icon_32x32@2x.png rename to ManeshTraderMac/ManeshTraderMac/Assets.xcassets/AppIcon.appiconset/icon_32x32@2x.png diff --git a/assets/icon/ManeshTrader.iconset/icon_512x512.png b/ManeshTraderMac/ManeshTraderMac/Assets.xcassets/AppIcon.appiconset/icon_512x512.png similarity index 100% rename from assets/icon/ManeshTrader.iconset/icon_512x512.png rename to ManeshTraderMac/ManeshTraderMac/Assets.xcassets/AppIcon.appiconset/icon_512x512.png diff --git a/assets/icon/ManeshTrader.iconset/icon_512x512@2x.png b/ManeshTraderMac/ManeshTraderMac/Assets.xcassets/AppIcon.appiconset/icon_512x512@2x.png similarity index 100% rename from assets/icon/ManeshTrader.iconset/icon_512x512@2x.png rename to ManeshTraderMac/ManeshTraderMac/Assets.xcassets/AppIcon.appiconset/icon_512x512@2x.png diff --git a/assets/icon/ManeshTrader.icns b/assets/icon/ManeshTrader.icns deleted file mode 100644 index f88f748..0000000 Binary files a/assets/icon/ManeshTrader.icns and /dev/null differ diff --git a/assets/icon/ManeshTrader.png b/assets/icon/ManeshTrader.png deleted file mode 100644 index bb9b5b9..0000000 Binary files a/assets/icon/ManeshTrader.png and /dev/null differ diff --git a/scripts/build_standalone_app.sh b/scripts/build_standalone_app.sh index 63ee5d7..7c0de05 100755 --- a/scripts/build_standalone_app.sh +++ b/scripts/build_standalone_app.sh @@ -4,30 +4,12 @@ set -euo pipefail ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)" PYTHON_BIN="$ROOT_DIR/.venv/bin/python" APP_NAME="ManeshTrader" -ICON_PATH="$ROOT_DIR/assets/icon/${APP_NAME}.icns" if [[ ! -x "$PYTHON_BIN" ]]; then echo "Missing virtual environment. Run ./run.sh --setup-only first." >&2 exit 1 fi -if [[ ! -f "$ICON_PATH" ]]; then - "$PYTHON_BIN" "$ROOT_DIR/scripts/generate_app_icon.py" - ICONSET_DIR="$ROOT_DIR/assets/icon/${APP_NAME}.iconset" - mkdir -p "$ICONSET_DIR" - sips -z 16 16 "$ROOT_DIR/assets/icon/${APP_NAME}.png" --out "$ICONSET_DIR/icon_16x16.png" >/dev/null - sips -z 32 32 "$ROOT_DIR/assets/icon/${APP_NAME}.png" --out "$ICONSET_DIR/icon_16x16@2x.png" >/dev/null - sips -z 32 32 "$ROOT_DIR/assets/icon/${APP_NAME}.png" --out "$ICONSET_DIR/icon_32x32.png" >/dev/null - sips -z 64 64 "$ROOT_DIR/assets/icon/${APP_NAME}.png" --out "$ICONSET_DIR/icon_32x32@2x.png" >/dev/null - sips -z 128 128 "$ROOT_DIR/assets/icon/${APP_NAME}.png" --out "$ICONSET_DIR/icon_128x128.png" >/dev/null - sips -z 256 256 "$ROOT_DIR/assets/icon/${APP_NAME}.png" --out "$ICONSET_DIR/icon_128x128@2x.png" >/dev/null - sips -z 256 256 "$ROOT_DIR/assets/icon/${APP_NAME}.png" --out "$ICONSET_DIR/icon_256x256.png" >/dev/null - sips -z 512 512 "$ROOT_DIR/assets/icon/${APP_NAME}.png" --out "$ICONSET_DIR/icon_256x256@2x.png" >/dev/null - sips -z 512 512 "$ROOT_DIR/assets/icon/${APP_NAME}.png" --out "$ICONSET_DIR/icon_512x512.png" >/dev/null - cp "$ROOT_DIR/assets/icon/${APP_NAME}.png" "$ICONSET_DIR/icon_512x512@2x.png" - iconutil -c icns "$ICONSET_DIR" -o "$ICON_PATH" -fi - "$PYTHON_BIN" -m pip install -q pyinstaller TS="$(date +%Y%m%d-%H%M%S)" @@ -42,7 +24,6 @@ mkdir -p "$DIST_PATH" "$WORK_PATH" "$SPEC_PATH" --noconfirm \ --windowed \ --name "$APP_NAME" \ - --icon "$ICON_PATH" \ --distpath "$DIST_PATH" \ --workpath "$WORK_PATH" \ --specpath "$SPEC_PATH" \ diff --git a/scripts/create_mac_app.sh b/scripts/create_mac_app.sh index 62bf764..7be73aa 100755 --- a/scripts/create_mac_app.sh +++ b/scripts/create_mac_app.sh @@ -4,7 +4,6 @@ set -euo pipefail ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)" APP_NAME="ManeshTrader" APP_PATH="$ROOT_DIR/${APP_NAME}.app" -ICON_PATH="$ROOT_DIR/assets/icon/${APP_NAME}.icns" if ! command -v osacompile >/dev/null 2>&1; then echo "Error: osacompile is not available on this macOS installation." >&2 @@ -27,9 +26,5 @@ rm -rf "$APP_PATH" osacompile -o "$APP_PATH" "$SCRIPT_FILE" rm -f "$SCRIPT_FILE" -if [[ -f "$ICON_PATH" ]]; then - cp "$ICON_PATH" "$APP_PATH/Contents/Resources/applet.icns" -fi - echo "Created: $APP_PATH" echo "You can drag ${APP_NAME}.app into /Applications if desired."