Permalink
Browse files

Reorganized to move images to common location & factor out welcome pa…

…ge from source folder.
  • Loading branch information...
dmarmor committed Sep 2, 2018
1 parent 63e8a2f commit 357e838973bd8ba736d23a6faeb8ca5293925edd
Showing with 33 additions and 22 deletions.
  1. +3 −2 .gitignore
  2. +22 −12 app/Makefile
  3. BIN app/src/firstrun/icon128.png
  4. BIN app/{src/firstrun → welcome/img}/m1s1.png
  5. BIN app/{src/firstrun → welcome/img}/m1s2.png
  6. BIN app/{src/firstrun → welcome/img}/m2s1.png
  7. BIN app/{src/firstrun → welcome/img}/m2s2.png
  8. BIN app/{src/firstrun → welcome/img}/m3s1.png
  9. BIN app/{src/firstrun → welcome/img/master}/m1s1_master.psd
  10. BIN app/{src/firstrun → welcome/img/master}/m1s2_master.psd
  11. BIN app/{src/firstrun → welcome/img/master}/m2s1_master.png
  12. BIN app/{src/firstrun → welcome/img/master}/m2s2_master.psd
  13. BIN app/{src/firstrun → welcome/img/master}/m3s1_master.psd
  14. 0 app/{src/firstrun → welcome}/welcome.css
  15. +6 −6 app/{src/firstrun → welcome}/welcome.html
  16. +2 −2 helper/Makefile
  17. BIN helper/images/screenshot1.png
  18. BIN {app → images}/icons/app.psd
  19. BIN {app → images}/icons/docbg.png
  20. BIN {app → images}/icons/document.psd
  21. BIN {app → images}/icons/epichrome.psd
  22. BIN {app → images}/icons/source/GenericApplicationIcon.icns
  23. BIN {app → images}/icons/source/app.tiff
  24. BIN {app → images}/icons/source/chrome.icns
  25. BIN {app → images}/icons/source/chrome.tiff
  26. BIN {app → images}/icons/source/document.icns
  27. BIN {app → images}/icons/source/grid.eps
  28. BIN {helper/images → images/webstore}/webstore_icon.png
  29. BIN {helper/images → images/webstore}/webstore_icon.psd
  30. BIN {helper/images → images/webstore}/webstore_promo.psd
  31. BIN {helper/images → images/webstore}/webstore_screenshot1.png
  32. BIN {helper/images → images/webstore}/webstore_screenshot1.psd
  33. BIN {helper/images → images/webstore}/webstore_screenshot2.png
  34. BIN {helper/images → images/webstore}/webstore_screenshot2.psd
View
@@ -6,12 +6,13 @@
/certificates/**
/research/**
/app/epichrome.app/**
/app/icons/source/**
/app/icons/*.icns
/app/icons/**
/app/welcome/img/icon*.png
/builder/**
/helper/*.zip
/helper/extension/**
/helper/store/**
/helper/src/*.png
/helper/src/*.gif
/images/icons/source/**
/tests/**
View
@@ -22,7 +22,7 @@
VERSION:=$(shell source src/version.sh ; echo "$$mcssbVersion")
APP:=epichrome.app
APP:=Epichrome.app
HELPERBG:=../helper/src/background.js
DEBUG_UPDATE_FREQ:=30
HOSTID:=$(shell sed -En 's/^.*chrome\.runtime\.connectNative[^a-zA-Z]+([a-zA-Z]([a-zA-Z0-9._-]*[a-zA-Z])?).*$$/\1/p' ${HELPERBG})
@@ -55,7 +55,7 @@ INSTALL_PATH:=/Applications/Epichrome.app
.PHONY: install clean clean-all debug
.PRECIOUS: icons/app.icns icons/document.icns
.PRECIOUS: icons/app.icns icons/document.icns welcome/img/icon128.png
${APP}: ${APP_SCPT}/main.scpt \
@@ -77,12 +77,12 @@ ${APP}: ${APP_SCPT}/main.scpt \
${APP_RNTM_NMEX}/${HELPERID}.json \
${APP_RNTM_FRUN}/welcome.html \
${APP_RNTM_FRUN}/welcome.css \
${APP_RNTM_FRUN}/icon128.png \
${APP_RNTM_FRUN}/m1s1.png \
${APP_RNTM_FRUN}/m1s2.png \
${APP_RNTM_FRUN}/m2s1.png \
${APP_RNTM_FRUN}/m2s2.png \
${APP_RNTM_FRUN}/m3s1.png \
${APP_RNTM_FRUN}/img/icon128.png \
${APP_RNTM_FRUN}/img/m1s1.png \
${APP_RNTM_FRUN}/img/m1s2.png \
${APP_RNTM_FRUN}/img/m2s1.png \
${APP_RNTM_FRUN}/img/m2s2.png \
${APP_RNTM_FRUN}/img/m3s1.png \
${APP_RNTM_RSRC}/app.icns \
${APP_RNTM_RSRC}/document.icns
@@ -95,7 +95,8 @@ clean:
clean-all: clean
find . \( -name '*~' -or -name '.DS_Store' \) -exec rm {} \;
rm icons/*.icns
rm -rf icons
rm -f welcome/img/icon128.png
install: ${APP}
if [[ -e "${INSTALL_PATH}" ]] ; then rm -rf "${INSTALL_PATH}" ; fi
@@ -123,7 +124,7 @@ ${APP_RSRC}/applet.icns: icons/epichrome.icns
cp -p $< $@
@touch ${APP} ${APP_CTNT} ${APP_RSRC}
${APP_RSRC}/docbg.png: icons/docbg.png
${APP_RSRC}/docbg.png: ../images/icons/docbg.png
cp -p $< $@
@touch ${APP} ${APP_CTNT} ${APP_RSRC}
@@ -152,14 +153,23 @@ ${APP_RNTM_NMEX}/${HELPERID}.json: src/install-extension.json
cp -p $< ${APP_RNTM_NMEX}/${HELPERID}.json
@touch ${APP} ${APP_CTNT} ${APP_RSRC} ${APP_RNTM} ${APP_RNTM_RSRC} ${APP_RNTM_NMEX}
${APP_RNTM_FRUN}/%: src/firstrun/%
${APP_RNTM_FRUN}/welcome.%: welcome/welcome.%
cp -p $< ${APP_RNTM_FRUN}/
@touch ${APP} ${APP_CTNT} ${APP_RSRC} ${APP_RNTM} ${APP_RNTM_RSRC} ${APP_RNTM_FRUN}
${APP_RNTM_FRUN}/img/%.png: welcome/img/%.png
mkdir -p ${APP_RNTM_FRUN}/img
cp -p $< ${APP_RNTM_FRUN}/img
@touch ${APP} ${APP_CTNT} ${APP_RSRC} ${APP_RNTM} ${APP_RNTM_RSRC} ${APP_RNTM_FRUN} ${APP_RNTM_FRUN}/img
welcome/img/icon128.png: ../images/icons/app.psd
@mkdir -p icons
sips -s format png -z 128 128 $< --out $@
${APP_RNTM_RSRC}/%.icns: icons/%.icns
cp -p $< ${APP_RNTM_RSRC}/
@touch ${APP} ${APP_CTNT} ${APP_RSRC} ${APP_RNTM} ${APP_RNTM_RSRC}
%.icns: %.psd
icons/%.icns: ../images/icons/%.psd
@mkdir -p icons
src/makeicon.sh -f $< $@
Binary file not shown.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -32,7 +32,7 @@
<body id="body">
<!-- TITLE BOX -->
<div id="title">
<img src="icon128.png" height="64" width="64" /><h1>Welcome to Your Epichrome App!</h1>
<img src="img/icon128.png" height="64" width="64" /><h1>Welcome to Your Epichrome App!</h1>
</div> <!-- #title -->
<!-- MAIN TEXT -->
<div id="container">
@@ -44,28 +44,28 @@
</tr>
<tr class="step">
<td class="text">Within a few seconds of launch, an orange exclamation point should appear to the right side of your location bar. Click it and select <i>&ldquo;New extension added (Epichrome Helper)&rdquo;</i> from the drop-down menu. (Don&rsquo;t click the &ldquo;Set as default&rdquo; button just below unless you really want this app to be your default browser.)</td>
<td class="image"><img src="m1s1.png" width="280px"></td>
<td class="image"><img src="img/m1s1.png" width="280px"></td>
<tr class="step">
<td class="text">A window will pop up with info about Epichrome Helper. Click the Enable Extension button (or you can remove Epichrome Helper with the other button).</td>
<td class="image"><img src="m1s2.png" width="280px"></td>
<td class="image"><img src="img/m1s2.png" width="280px"></td>
</tr>
<tr class="heading">
<td colspan="2">Method 2:</td>
</tr>
<tr class="step">
<td class="text">If the exclamation point doesn&rsquo;t appear, you can select Extensions from the Window menu...</td>
<td class="image"><img src="m2s1.png" width="188px"></td>
<td class="image"><img src="img/m2s1.png" width="188px"></td>
</tr>
<tr class="step">
<td class="text">...and use the on/off slider to enable Epichrome Helper.</td>
<td class="image"><img src="m2s2.png" width="280px"></td>
<td class="image"><img src="img/m2s2.png" width="280px"></td>
</tr>
<tr class="heading">
<td colspan="2" class="heading">Method 3:</td>
</tr>
<tr class="step">
<td class="text">If for some reason Epichrome Helper wasn&rsquo;t automatically installed, or if you accidentally delete it, you can add it to Chrome from the Chrome Web Store using <a href="https://chrome.google.com/webstore/detail/epichrome-helper/ngbmbabjgimgbfobhfhjpfhpmpnhbeea" target="_blank">this link</a>.</td>
<td class="image"><img src="m3s1.png" width="260px"></td>
<td class="image"><img src="img/m3s1.png" width="260px"></td>
</tr>
</table>
<p>When you&rsquo;re done, restart this app and you&rsquo;ll be off and running! If you have any issues, please report them <a href="https://github.com/dmarmor/epichrome/issues" target="_blank">here</a>. Enjoy!</p>
View
@@ -1,6 +1,6 @@
#
# Makefile: Build rules for the Epichrome Runtime extension.
# Copyright (C) 2017 David Marmor
# Copyright (C) 2018 David Marmor
#
# https://github.com/dmarmor/epichrome
#
@@ -21,7 +21,7 @@
#
ICON_SIZES:=16 48 128
ICON_SOURCE:=../app/icons/app.psd
ICON_SOURCE:=../images/icons/app.psd
EXTVERSION:=$(shell sed -En 's/^.*"version"[^0-9]*([0-9][0-9.]*[0-9]).*$$/\1/p' src/manifest.json)
ZIPPREFIX:=epichrome-runtime-
ZIP:=${ZIPPREFIX}${EXTVERSION}.zip
Binary file not shown.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 357e838

Please sign in to comment.