icons and branding refresh

This commit is contained in:
Dagen Brock 2016-11-02 21:28:16 -05:00
parent 2ca153f1f8
commit 85e71f201d
29 changed files with 2116 additions and 526 deletions

View File

@ -96,9 +96,11 @@ package-osx:
script: script:
- chmod +x make_dist_mac.sh - chmod +x make_dist_mac.sh
- ./make_dist_mac.sh - ./make_dist_mac.sh
- chmod +x make_dmg_mac.sh
- ./make_dmg_mac.sh
artifacts: artifacts:
paths: paths:
- gsplus-osx.tar.gz - GSplus-Install.dmg

View File

@ -2,8 +2,8 @@
# sudo pip install pillow # sudo pip install pillow
# ^^ on mac osx # ^^ on mac osx
from PIL import Image from PIL import Image
im = Image.open("gsp_icon_128.png") #Can be many different formats. #im = Image.open("gsp_icon_128.png") #Can be many different formats.
#im = Image.open("gsp_icon_256.png") #Can be many different formats. im = Image.open("gsp_icon_256.png") #Can be many different formats.
pix = im.load() pix = im.load()
print im.size #Get the width and hight of the image for iterating over print im.size #Get the width and hight of the image for iterating over
width = im.size[0] width = im.size[0]

BIN
assets/gsp-dmg-icons.icns Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 162 KiB

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 502 KiB

BIN
assets/gsp_dmg_icon_128.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 21 KiB

BIN
assets/gsp_dmg_icon_16.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
assets/gsp_dmg_icon_256.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 68 KiB

BIN
assets/gsp_dmg_icon_32.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
assets/gsp_dmg_icon_512.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 224 KiB

BIN
assets/gsp_dmg_icon_64.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.4 KiB

Binary file not shown.

BIN
assets/gsp_icon_1024.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 299 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 16 KiB

BIN
assets/gsp_icon_16.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
assets/gsp_icon_256.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 43 KiB

BIN
assets/gsp_icon_32.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

BIN
assets/gsp_icon_512.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 114 KiB

BIN
assets/gsp_icon_64.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.8 KiB

BIN
assets/gsp_icon_dmg.psd Normal file

Binary file not shown.

21
doc/README.TXT Normal file
View File

@ -0,0 +1,21 @@
Getting started
===============
1. Download the emulator package and put it in a folder
2. Download the Apple IIgs Firmware ROMs, for either a ROM01 or ROM03 machine.
(If you have a real IIgs, there are ways to save it from your machine too.)
Try: ftp://ftp.apple.asimov.net/pub/apple_II/emulators/rom_images/
3. Download some Apple IIgs software.
I recommend the excellent Apple IIgs dedicated site,
http://www.whatisthe2gs.apple2.org.za/
If you have a real IIgs, you can transfer your disks using ADTPro
http://adtpro.sourceforge.net/
4. Edit your config:
You can manually edit the config.txt file
.. or while the emulator is running... hit F4 to enter config menu.
Set up the ROM to point to your IIgs ROM file from step 2.
Set up the slots to point to disks from step 3.
5. Boot the Apple IIgs by running the emulator
Windows: gsplus32.exe
Mac/Ubuntu: ./gsplus

View File

@ -1,3 +1,4 @@
DEXTRAS=gsplus-osx/
DDIR=gsplus-osx/GSplus.app DDIR=gsplus-osx/GSplus.app
ADIR=assets ADIR=assets
mkdir -p $DDIR/Contents/MacOS mkdir -p $DDIR/Contents/MacOS
@ -7,4 +8,12 @@ cp gsplus $DDIR/Contents/MacOS
cp $ADIR/Info.plist $DDIR/Contents cp $ADIR/Info.plist $DDIR/Contents
cp $ADIR/gsp-icons.icns $DDIR/Contents/Resources cp $ADIR/gsp-icons.icns $DDIR/Contents/Resources
dylibbundler -od -b -x $DDIR/Contents/MacOS/gsplus -d $DDIR/Contents/libs/ dylibbundler -od -b -x $DDIR/Contents/MacOS/gsplus -d $DDIR/Contents/libs/
tar -cvzf gsplus-osx.tar.gz gsplus-osx/
# files to include in dmg
cp doc/gsplusmanual.pdf $DEXTRAS
cp doc/gsplusmanual.txt $DEXTRAS
cp doc/README.TXT $DEXTRAS
#tar -cvzf gsplus-osx.tar.gz gsplus-osx/
# packaging now in DMG script

21
make_dmg_mac.sh Executable file
View File

@ -0,0 +1,21 @@
#!/bin/sh
git clone https://github.com/andreyvit/yoursway-create-dmg.git
cd yoursway-create-dmg
test -f GSplus-Install.dmg && rm GSplus-Install.dmg
./create-dmg \
--volname "GSplus" \
--volicon "../assets/gsp-dmg-icons.icns" \
--background "../assets/gsp_dmg_bg_600x500.png" \
--window-pos 200 120 \
--window-size 600 500 \
--icon-size 100 \
--icon GSplus.app 180 130 \
--hide-extension GSplus.app \
--app-drop-link 410 130 \
--icon README.TXT 160 330 \
--icon gsplusmanual.pdf 300 330 \
--icon gsplusmanual.txt 440 330 \
GSplus-Install.dmg \
../gsplus-osx/
cp GSplus-Install.dmg ..

File diff suppressed because it is too large Load Diff

View File

@ -24,6 +24,7 @@
// @todo: mouse clip bugs.. great western shootout. Paint 8/16. still in win32 // @todo: mouse clip bugs.. great western shootout. Paint 8/16. still in win32
#include "SDL.h" #include "SDL.h"
#include "SDL_image.h" #include "SDL_image.h"
#include "glog.h"
#include <stdbool.h> #include <stdbool.h>
#include <time.h> #include <time.h>
@ -264,7 +265,7 @@ dev_video_init()
void do_icon() { void do_icon() {
#ifdef HAVE_ICON #ifdef HAVE_ICON
//surface = SDL_CreateRGBSurfaceFrom(pixels,w,h,depth,pitch,rmask,gmask,bmask,amask); //surface = SDL_CreateRGBSurfaceFrom(pixels,w,h,depth,pitch,rmask,gmask,bmask,amask);
int size = 128; // icon size int size = 256; // icon size
SDL_Surface *surface; // declare an SDL_Surface to be filled in with pixel data from an image file SDL_Surface *surface; // declare an SDL_Surface to be filled in with pixel data from an image file
surface = SDL_CreateRGBSurfaceFrom(icon_pixels,size,size,32,size*4,0xff000000,0x00ff0000,0x0000ff00,0x000000ff); surface = SDL_CreateRGBSurfaceFrom(icon_pixels,size,size,32,size*4,0xff000000,0x00ff0000,0x0000ff00,0x000000ff);

View File

@ -79,7 +79,7 @@ CAPTION "About"
FONT 8, "MS Sans Serif" FONT 8, "MS Sans Serif"
BEGIN BEGIN
DEFPUSHBUTTON "OK",IDOK,78,61,50,14 DEFPUSHBUTTON "OK",IDOK,78,61,50,14
LTEXT "GSport: GS Emulator.\nBased on KEGS by Kent Dickey\nWindows Port by Chea Chee Keong\n\nThis software is licensed under GNU GPL.", LTEXT "GSplus: GS Emulator.\nBased on KEGS by Kent Dickey and GSport\nWindows Port by Chea Chee Keong\n\nThis software is licensed under GNU GPL.",
IDC_STATIC,38,7,162,45,NOT WS_GROUP IDC_STATIC,38,7,162,45,NOT WS_GROUP
ICON "GSPORT32_ICON",IDC_STATIC,7,7,21,20,0 ICON "GSPORT32_ICON",IDC_STATIC,7,7,21,20,0
END END
@ -148,14 +148,14 @@ CAPTION "Help About Key Commands"
FONT 8, "MS Sans Serif" FONT 8, "MS Sans Serif"
BEGIN BEGIN
DEFPUSHBUTTON "OK",IDOK,65,151,50,14 DEFPUSHBUTTON "OK",IDOK,65,151,50,14
LTEXT "GSport Key Commands",IDC_STATIC,7,7,82,10 LTEXT "GSplus Key Commands",IDC_STATIC,7,7,82,10
LTEXT "Alt/F1\t\tOpen-Apple\nF2\t\tClose-Apple\nF7\t\tToggle Fast Disk Emulation\nF8\t\tToggle Mouse Pointer\n\t\tDisplay\n", LTEXT "Alt/F1\t\tOpen-Apple\nF2\t\tClose-Apple\nF7\t\tToggle Fast Disk Emulation\nF8\t\tToggle Mouse Pointer\n\t\tDisplay\n",
IDC_STATIC,21,25,151,42 IDC_STATIC,21,25,151,42
LTEXT "F11\t\tToggle Fullscreen Display\nF12\t\tReset\nCtrl-Alt-Break\tReboot Emulator\nCtrl-Alt-Esc\tControl-Panel\nCtrl-Break\tReset Emulator", LTEXT "F11\t\tToggle Fullscreen Display\nF12\t\tReset\nCtrl-Alt-Break\tReboot Emulator\nCtrl-Alt-Esc\tControl-Panel\nCtrl-Break\tReset Emulator",
IDC_STATIC,21,66,141,50 IDC_STATIC,21,66,141,50
CONTROL "",IDC_STATIC,"Static",SS_BLACKFRAME | WS_DISABLED | CONTROL "",IDC_STATIC,"Static",SS_BLACKFRAME | WS_DISABLED |
WS_BORDER,7,17,172,1 WS_BORDER,7,17,172,1
LTEXT "Please visit http://gsport.sourceforge.net", LTEXT "Please visit http://apple2.gs/plus",
IDC_STATIC,21,124,144,19 IDC_STATIC,21,124,144,19
END END

View File

@ -66,7 +66,7 @@ void get_cwd(LPTSTR buffer, int size)
hSelf = GetModuleHandle(NULL); hSelf = GetModuleHandle(NULL);
GetModuleFileName(hSelf,buffer,size); GetModuleFileName(hSelf,buffer,size);
PathRemoveFileSpec(buffer); PathRemoveFileSpec(buffer);
printf("Local directory: [%s]\n",buffer); //printf("Local directory: [%s]\n",buffer);
} }
void void
@ -161,7 +161,7 @@ main(int argc, char **argv)
// Create the window. // Create the window.
get_default_window_size(&size); get_default_window_size(&size);
HWND hwnd = CreateWindowEx(WS_EX_ACCEPTFILES, "gsport", "GSport - Apple //gs Emulator", HWND hwnd = CreateWindowEx(WS_EX_ACCEPTFILES, "gsport", "GSplus - Apple //gs Emulator",
WS_TILED | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX, WS_TILED | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX,
CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT,
size.cx, size.cy, size.cx, size.cy,