Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

List branch #62

Merged
merged 86 commits into from
Mar 29, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
86 commits
Select commit Hold shift + click to select a range
15c466c
Adding New Pocket Go
Jan 21, 2020
bd609fd
Merge branch 'UNIVERSAL' of https://github.com/fgl82/simplemenu.git i…
Jan 21, 2020
050cf2c
Fixing relative size
Jan 22, 2020
c824218
Pushing SDL_Color to graphics.c to keep the code generic
Jan 22, 2020
8b65c5b
Unused joystick
Jan 22, 2020
1469571
Merge branch 'UNIVERSAL' into UNIVERSAL_DEV
fgl82 Jan 22, 2020
d21bbbf
Tidying stuff up
Jan 22, 2020
1b76c4f
Zooming Images to screen size
Jan 25, 2020
97dd1ad
setting height for 2devices that use 320x240
Jan 25, 2020
c3a96b8
Changing footer for full screen mode
Jan 25, 2020
8a56b8e
transparent footer
Jan 25, 2020
3276912
Fixing resolution for console and managing smoothing
Jan 25, 2020
40a5af9
Updating resources
Jan 25, 2020
ab89bd3
Merge branch 'UNIVERSAL' into UNIVERSAL_DEV
fgl82 Jan 26, 2020
3b87310
Fixing indentation
Jan 26, 2020
a65eb10
Fixing full screen footer, adding the chance of not scaling and also
Jan 26, 2020
2b3c7a8
Fixing foter
Jan 26, 2020
40c33e8
Adding better navigation in full screen mode using shoulder buttons
Jan 26, 2020
cdc0d77
Merge branch 'UNIVERSAL_DEV' of https://github.com/fgl82/simplemenu.git
Jan 26, 2020
f525057
Replacing images for rectangles, making fullscreen menu more compact and
Jan 29, 2020
34aa059
Merge branch 'UNIVERSAL' into UNIVERSAL_DEV
fgl82 Jan 29, 2020
64e7cbc
Better indication of total items per page, smaller fullscreen text,
Feb 5, 2020
e0af811
Merge branch 'UNIVERSAL_DEV' of https://github.com/fgl82/simplemenu.g…
Feb 5, 2020
b557482
first commit of the list branch
Feb 11, 2020
b60ced4
Fixing memory leak
Feb 11, 2020
c39873d
Adding numbers in full screen mode and making it display 12 games
Feb 12, 2020
dc7b0b4
Fixing favorites
Feb 12, 2020
d197e71
Restoring execution
Feb 12, 2020
f4a2139
Setting 12 games per page when coming back to full screen and altering
Feb 12, 2020
d5c1e63
Fixing 12 games per page when comming back to full screen and altering
Feb 12, 2020
8260d4e
Fixing relative distance of text in full screen mode and ignoring
Feb 12, 2020
b5ae255
Fixing how much text you can see in full screen
Feb 12, 2020
65850d6
Fixing bugs and tuning fullscreen mode letter box
Feb 13, 2020
92fa5c9
Better
Feb 13, 2020
e3faaa5
Changing alpha navigation in fullscren mode
Feb 13, 2020
57d77fa
Fixing bugs
Feb 13, 2020
3e3fc9b
Showing the logo before loading the games
Feb 15, 2020
65da13e
Fixing delete functionality
Feb 16, 2020
d3964b2
Improving fullscreen menu appearance when deleting games
Feb 16, 2020
28b1865
Improving menu behavior in fullscreen mode
Feb 16, 2020
41ec6c7
more tweaks
Feb 16, 2020
8211b7c
Keeping the strip roms state between sessions
Feb 16, 2020
efe47c5
POC for only highlighting letters that exist in the current rom list
Feb 16, 2020
700594a
Graying out letters in alpha nav, fullscreen
Feb 17, 2020
69b6096
Fixing seg fault when exiting if showing the menu
Feb 17, 2020
39fa831
Fixing showing favorites in the right spot, bad, bad code, but works
Feb 17, 2020
8e297e6
Merge branch 'UNIVERSAL' into LIST_BRANCH
fgl82 Feb 17, 2020
e594356
List branch (#54)
fgl82 Feb 17, 2020
ad4529f
Fixing favrites bug, adding logo and imporving full screen mode
Feb 17, 2020
a0930d2
Merge branch 'LIST_BRANCH' of https://github.com/fgl82/simplemenu.git…
Feb 17, 2020
d5d9e94
no idea
Feb 17, 2020
c3efda3
Making it fullscreen
Feb 18, 2020
092167c
whatever
Feb 18, 2020
e1ec37f
Merge branch 'UNIVERSAL_DEV' into LIST_BRANCH
fgl82 Feb 18, 2020
96dca76
List branch (#56)
fgl82 Feb 18, 2020
23cd423
Merge branch 'UNIVERSAL' into UNIVERSAL_DEV
fgl82 Feb 18, 2020
977ad6b
tweaks
Feb 18, 2020
278832a
Improving speed with less calls to getNthElement
Feb 20, 2020
51ecfb9
Fixing scroll down
Feb 20, 2020
4d6ad88
Fixing scroll up and down plus advance section
Feb 21, 2020
4fe9ba7
More fixes when changing page and loading
Feb 21, 2020
e4e160a
Fixing section switching
Feb 21, 2020
5cb54f6
Fixing favorites
Feb 21, 2020
edcfd8f
Fixing switching between fullscreen and menu mode
Feb 21, 2020
418a14c
Fixing random select
Feb 21, 2020
e748e4d
Removing printfs
Feb 21, 2020
2b26640
Fixing coming in and out of favorites in different modes
Feb 21, 2020
15f6f65
Fixing section switching in fullscreen mode
Feb 21, 2020
a2e2351
Fixing reintroduced bug when switching sections in different modes
Feb 21, 2020
f9b4f73
Fixing section switching in fullscreen
Feb 22, 2020
e309625
Fixing favorites
Feb 22, 2020
04159f8
Fixing favorites deletion
Feb 22, 2020
daf8456
Configurable media folder
Feb 22, 2020
ba922d9
Merge branch 'UNIVERSAL_DEV' into LIST_BRANCH
fgl82 Feb 22, 2020
4dee8c8
Increasing 10K limit to 50K and other small tweaks
Mar 2, 2020
7ad5c81
Merge branch 'LIST_BRANCH' of https://github.com/fgl82/simplemenu.git…
Mar 2, 2020
bfc27ee
Adding favorites logo and new background
Mar 2, 2020
4fb39a1
(bad) initial check of if sections have games
Mar 4, 2020
1dc2983
Adding simpleback
Mar 4, 2020
43ea6c7
removing check for no roms and allowing display of empty sections, to
Mar 8, 2020
e2d417d
Fixing loading of an empty section
Mar 9, 2020
bba0aad
Fixing no sec switch in favs
Mar 10, 2020
0c2ebc5
CHANGES
Mar 28, 2020
7d99fa4
Changes
Mar 28, 2020
b874a70
fixing rom name on screen when no picture
Mar 29, 2020
8240d28
Merge branch 'UNIVERSAL' into LIST_BRANCH
fgl82 Mar 29, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions simplemenu/output/apps/20_pyclock.fgl
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
title=Clock
description=Clock, alarm, timer, calendar
exec=/usr/bin/pyclock
icon=skin:icons/pyclock.png
4 changes: 4 additions & 0 deletions simplemenu/output/apps/25_gmenu2x.fgl
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
title=Gmenu2x
description=Gmenu2x
exec=/usr/bin/gmenu2x
icon=skin:icons/reboot.png
12 changes: 0 additions & 12 deletions simplemenu/output/config/config.cfg

This file was deleted.

22 changes: 22 additions & 0 deletions simplemenu/output/config/config.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
[GENERAL]
font = resources/akashi.ttf
media_folder = media

[MENU_MODE]
logo_background = resources/simpleback.png

[FULLSCREEN_MODE]
display_footer = 0
display_menu = 1
background = resources/back.png

[SYSTEM]
screen_timeout_in_seconds = 30
allow_shutdown = 0

[CPU]
underclocked_speed = 408
normal_speed = 702
overclocked_speed = 732
sleep_speed = 200
; Not used for RG-350 or New Pocket Go
19 changes: 0 additions & 19 deletions simplemenu/output/config/last_state.cfg

This file was deleted.

22 changes: 22 additions & 0 deletions simplemenu/output/config/last_state.sav
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
1;
1;
0;
0;0;0;0
1;0;0;0
2;0;0;0
3;0;0;0
4;0;0;0
5;0;0;0
6;0;0;0
7;0;0;0
8;0;0;0
9;0;0;0
10;0;0;0
11;0;0;0
12;0;0;0
13;0;0;0
14;0;0;0
15;0;0;0
16;0;0;0
17;0;0;0
18;0;0;0
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[CONSOLES]
consoleList = GAME BOY,GAME BOY COLOR,GAME BOY ADVANCE,GAME BOY,GAME BOY COLOR,GAME BOY ADVANCE,NES,SNES,GAME GEAR,MASTER SYSTEM,SEGA GENESIS,PLAYSTATION,PC ENGINE,NEO GEO POCKET,NEO GEO POCKET COLOR,NEO-GEO,ARCADE,FINAL BURN ALPHA,WONDERSWAN,GAMES,APPS
consoleList = GAME BOY,GAME BOY COLOR,GAME BOY ADVANCE,NES,SNES,GAME GEAR,MASTER SYSTEM,SEGA GENESIS,PLAYSTATION,PC ENGINE,NEO GEO POCKET,NEO GEO POCKET COLOR,NEO-GEO,ARCADE,FINAL BURN ALPHA,WONDERSWAN,GAMES,APPS

[GAME BOY]
execDirs = /media/data/apps/
Expand Down Expand Up @@ -276,7 +276,7 @@ onlyFileNamesNoPathOrExtension = no
[APPS]
execDirs = /usr/bin/
execs = #
romDirs = /media/home/.simplemenu/scripts/,/media/data/apps/
romDirs = /media/home/.simplemenu/apps/,/media/data/apps/
romExts = .opk,.fgl
headerBackGround = 2e6a9e
headerFont = FFFFFF
Expand Down
17 changes: 8 additions & 9 deletions simplemenu/output/make_opk.sh
Original file line number Diff line number Diff line change
@@ -1,33 +1,32 @@
#!/bin/sh

OPK_NAME='simplemenu.opk'
OPK_NAME='SimpleMenu.opk'

echo ${OPK_NAME}

# create default.gcw0.desktop
cat > default.gcw0.desktop <<EOF
[Desktop Entry]
Name=SimpleMenu
Comment=A sensible launcher
Exec=simplemenu.dge
Comment=A simple launcher
Exec=simplemenu
Terminal=false
Type=Application
StartupNotify=false
Icon=smenu
Icon=simplemenu
Categories=applications;
EOF

# create opk
FLIST="simplemenu.dge"
chmod 777 simplemenu
FLIST="simplemenu"
FLIST="${FLIST} invoker.dge"
FLIST="${FLIST} frontend_start"
FLIST="${FLIST} usb_mode_on.sh"
FLIST="${FLIST} usb_mode_off.sh"
FLIST="${FLIST} resources"
FLIST="${FLIST} scripts"
FLIST="${FLIST} config"
FLIST="${FLIST} apps"
FLIST="${FLIST} default.gcw0.desktop"
FLIST="${FLIST} smenu.png"
FLIST="${FLIST} simplemenu.png"

rm -f ${OPK_NAME}
mksquashfs ${FLIST} ${OPK_NAME} -all-root -no-xattrs -noappend -no-exports
Expand Down
Binary file modified simplemenu/output/resources/back.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed simplemenu/output/resources/ngpc/background.png
Binary file not shown.
Binary file added simplemenu/output/resources/ngpc/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
95 changes: 0 additions & 95 deletions simplemenu/output/resources/ngpc/system.svg

This file was deleted.

29 changes: 0 additions & 29 deletions simplemenu/output/resources/ngpc/theme.xml

This file was deleted.

1 change: 0 additions & 1 deletion simplemenu/output/resources/scripts/logo.svg

This file was deleted.

Binary file added simplemenu/output/resources/simpleback.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed simplemenu/output/resources/transback.png
Binary file not shown.
Binary file removed simplemenu/output/resources/transback1.png
Binary file not shown.
3 changes: 2 additions & 1 deletion simplemenu/pc
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#!/bin/sh
make clean
make PLATFORM=PC
cd output
./simplemenu.dge
./simplemenu
cd ..
2 changes: 1 addition & 1 deletion simplemenu/rg
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ make clean
make PLATFORM=RG-350
cd output
./make_opk.sh
scp simplemenu.opk root@10.1.1.2:/media/data/apps
scp SimpleMenu.opk root@10.1.1.2:/media/data/apps
11 changes: 9 additions & 2 deletions simplemenu/src/headers/globals.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,12 @@

int running;

char mediaFolder[100];
int MAX_GAMES_IN_SECTION;

char mediaFolder[1000];
char simpleBackground[1000];
char fullscreenBackground[1000];
char menuFont[1000];

int itsStoppedBecauseOfAnError;
char *errorMessage;
Expand All @@ -35,6 +40,8 @@ int currentlySectionSwitching;
int currentlyChoosingEmulator;
int stripGames;
int shutDownEnabled;
int footerVisibleInFullscreenMode;
int menuVisibleInFullscreenMode;
int loading;

int OC_UC;
Expand Down Expand Up @@ -105,7 +112,7 @@ struct MenuSection {
};


struct MenuSection menuSections[50];
struct MenuSection menuSections[100];

struct OPKDesktopFile {
char parentOPK[200];
Expand Down
Loading