Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit d9a2374
Author: Apaczer <[email protected]>
Date:   Fri Jul 5 23:04:13 2024 +0200

    TOOLS: release `gm2xpkg` ver 0.4 (#81)

    * add IPK entries - Depends/Source/License
    * check libs interpreter for shared or static build

commit 05b0f77
Author: Apaczer <[email protected]>
Date:   Mon Jul 1 22:13:28 2024 +0200

    TOOLS: release gm2xpkg ver 0.3 (#80)

    * add [-i,-z,-p,-c] opts + *.cfg [FILE] read
    * add error infos or run, fix multiple opts pass
    * add sanity test if args != 0
    * add warnings for CLEAN opt
    * use DOCS[] array for packging text files

commit 78e80b0
Author: Apaczer <[email protected]>
Date:   Mon Jul 1 22:02:33 2024 +0200

    FONT: modify ttf fonts & change UNIFONT rendering (#79)

    - add `glyphs_replace.sh`
    - update NeonWave (MergedAudiowUNI) and GameShow font (MergedKdaTPrUNI) - add Cyrylic glyphs & rebuild(#76)
    - update FontiGrid & Nsdark font (MergedBebKaUNI) - add Cyrylic glyphs & rebuild
    - display UNIFONT with TTF_RenderUTF8_Solid (less blurriness)

commit a8383d8
Author: Apaczer <[email protected]>
Date:   Fri May 31 22:48:14 2024 +0200

    TOOLS: release `gm2xpkg` ver 0.2

    - correct MANUAL output
    - add $TARGET_DIR variable

commit d81300e
Author: Apaczer <[email protected]>
Date:   Wed May 29 23:31:27 2024 +0200

    TOOLS: release `gm2xpkg` ver 0.1 (#78)

    *  externalize mandatory variables (silence `-ne` opt warnings)
    *  use `bash` script and add `echo -e` for `\n` signs (revert c946ff1)
    *  source `pkg.cfg` file for defines
    * use bash parameter expansions (DRY)
    * add --help & --version option

commit b246f0d
Author: Apaczer <[email protected]>
Date:   Sun May 19 21:52:13 2024 +0200

    MAIN: correct reset AutoStart behavior

    clean all configs related + some spaces correction

commit 76619c7
Author: MayanKoyote <[email protected]>
Date:   Wed Apr 24 00:06:29 2024 +0500

    update Russian&Polish translation and _about_ru.txt file (#74)

    * translations/Russian and _about_ru.txt: adding a new line in the _about_ru.txt file and adding the 'new line' symbol on the keyboard in the main translation file.

    * translations/Polish: adding the 'new line' symbol on the keyboard in the main translation file.

    ---------

    Co-authored-by: Apaczer <[email protected]>

commit 1f82616
Author: Apaczer <[email protected]>
Date:   Thu Apr 18 22:28:49 2024 +0200

    InputDialog: incr acceptable bottomBarWidth by 30px

    check if new Bar width is not going to be bigger

commit b210e7e
Author: Apaczer <[email protected]>
Date:   Wed Feb 28 08:53:17 2024 +0100

    inputCommonActions: add hotkey to switch font in use (#71)

    * inputCommonActions: add hotkey to switch font back and forth from Default to Custom (if present).

    * Makefile - change default skin

commit ffe88f3
Author: Apaczer <[email protected]>
Date:   Tue Feb 27 20:32:03 2024 +0100

    MIYOO: grab lower available value for setCPU

    inline with MultiInt setting

commit cc2c5ba
Author: Apaczer <[email protected]>
Date:   Sun Feb 25 16:11:06 2024 +0100

    TOOLS-packager: remove legacy `echo -e` opt & upd `aliases.txt`

    valid only for MSYS2 build

commit d6d09f4
Author: Apaczer <[email protected]>
Date:   Tue Feb 27 15:54:13 2024 +0100

    Add '\n' char reading for Translator and from App's link (#70)

    * Translator: fix newline char reading from translation
    - insert '\n' to convert char to newline in translatable text string

    * Translator-setLang: omit '\n' finding in tran. file

    * update translations
    - example with newline
    - unified message of "Changes will be..."

    * resetSettings: correct message in reset set. box
    - don't break in half sentence with newline

    * add \n search in link value search

    * add \n insert in InputDialog return value

    * drawDialog: don't show newline in TopBar title
    - replace with space

    * TOOLS: update `gen_translate.sh` to convert "\n" to " "
    * TOOLS: generate `dictionary.txt` from tools

commit 66d062a
Author: Apaczer <[email protected]>
Date:   Mon Feb 26 17:40:51 2024 +0100

    INPUT_DIALOG: Update overlay keyboard layout, make it translatable  (#68)

    * add keyboard translated layout
    - add 3x custom  3row keyboards for translator

    * change default keyboard layout to "ortholinear"

    * add changeKeysCustom() to use with MODIFIER btn
    - for ALT-ernative characters
    - add `Alt=` for keyboard sign
    - change Bkspc&Space to simple ASCII chars
    - don't draw "Alt" if using default lang

    * add customKb bool to block switching kbd
    - only if Alt btn is activated

    * redraw space & backspace if to long for bottomBar
    - show instead "Lower Square Bracket" and "Left arrow" glyphs

    * use "⏎" for newline character in virtual keyboard
    - for "\n" char use "Return Symbol" (an UNI glyph U+23CE). Otherwise there will be nothing drew.

    * Update "MergedBebKaUNI" font
    - a few UNI chars brought inline with overall design

    * update Polish & Russian translations
    - with new custom keyboards examples

    * update Russian translation (#67)
    - make space for buttons with single chars for "Space" & "Backspace"
    - Making changes related to commit 4da6cd9.
    - add translation of 'alt' and correct translation of 'shift'
    - fix translation of 'backspace' ( just draw the ⌫ symbol)

    * update README

commit eafda53
Author: Apaczer <[email protected]>
Date:   Sat Mar 30 11:32:21 2024 +0100

    ACTIONS: update GH actions to v4 (#72)

commit bb3d316
Author: Apaczer <[email protected]>
Date:   Wed Feb 14 21:07:56 2024 +0100

    GameShow(skin) - add generic section.png

    in ./icons - fixes little white dots in a corner which otherwise represent sections icons

commit 492fd8a
Author: Apaczer <[email protected]>
Date:   Wed Feb 14 20:32:49 2024 +0100

    settingsDialog: save on allowCancel=true

    instead of write()

commit d1f2a57
Author: MayanKoyote <[email protected]>
Date:   Tue Feb 13 02:04:53 2024 +0500

    update Russian translation + fix typo in skinMenu (#66)

    * update Russian translation
    - making changes related to commit 300cdeb.

    * skinMenu: fix typo

    ---------

    Co-authored-by: Apaczer <[email protected]>

commit f1c6073
Author: Apaczer <[email protected]>
Date:   Mon Feb 12 12:37:19 2024 +0100

    ACTIONS - add IPK package auto-build (#65)

    * ACTIONS - run&upload IPK package build
    - Update c-cpp.yml

    * README: update installation ps

    * Makefile.miyoo: protect dist/miyoo dir

commit 300cdeb
Author: Apaczer <[email protected]>
Date:   Fri Feb 9 23:14:07 2024 +0100

    update/add Translations

commit 3bbd364
Author: Apaczer <[email protected]>
Date:   Fri Feb 9 22:55:16 2024 +0100

    SKINS: refactor themes+new skinMenu settings (#64)

    Menu:
    * Menu-setIcon/Backdrop: cleanup search of "skin:..." strings
    * Menu-search/setBackdrop: add generic.png reading
    * Menu-drawGrid: force showing linkLabel if skinBackdrop is missing

    skinMenu:
    * add "searchBackdrops" multString setting (def=0) Narrow search path of Backdrops to:
    - "Exec" binary name or path
    - "Link" link name
    * add `showIcon` bool setting
    * add "sectionBackdrops" bool setting

    MenuSetting:
    * increase `x` of box/rect for values
    * make place for settings `string title` (#63), centralize date&time settings value in effect

    Nsdark skin:
    * correct file extension on Nsdark icon retroarch
    * add def skin for Nsdark
    * Nsdark - update generic.png + add ebook.png
    - generic - in line with theme
    - ebook - for logs

    Gameshow skin:
    * decrease Title size in GameShow
    * GameShow - fix blending of black Alt. Text on inputDialog - issue: #62
    * cleanup sections in ./skins + add new "cores" section + favorites
    * GameShow - update exit.png backdrop
    * Gameshow - add sections' backdrops
    * GameShow - searchBackdrops only by Link names
    * GameShow - rm ./icons & disable `showLinkIcon` conf, update "generic.png" icon/backdrop

    NewComic skin:
    * remove this skin with "No Derivatives" CC license

    FontiGrid skin:
    * re-add default wallpaper & correct Makefile

    NeonWave skin:
    * decrease fontSize + add missing  backdrops
    * NeonWave - use backdrops only for `sections`
    * NeonWave - add icobg_off.png

    Other:
    * add *.xcf Template & Example for each skin
    * update Makefiles (to not include template in dist), suppress errors for `find` cmd
    * small update - Makefile linux
    * GMenu2X: small descrip correction for CPU step
    * update Polish transl. "Backspace" => "Bkspc"
    * FontHelper: rm useless(?) code & clean text wraping

commit 08e14e8
Author: Apaczer <[email protected]>
Date:   Fri Feb 9 20:18:16 2024 +0100

    README: update Installation instructions

commit 9776365
Author: Apaczer <[email protected]>
Date:   Thu Feb 8 19:22:54 2024 +0100

    MIYOO-setVolume: stash buffer to system(cmd).

    write snd lvl to /mnt/.volume.conf before return

commit c7758dc
Author: Apaczer <[email protected]>
Date:   Tue Jan 30 23:53:57 2024 +0100

    update`_about_pl.txt

    finalize

commit 4de8dd6
Author: MayanKoyote <[email protected]>
Date:   Wed Jan 31 03:39:17 2024 +0500

    update Russian translation + add _about_ru.txt (#53)

    - Making changes related to commit 33d9fdd.
    - Spelling error correction.
    - Making changes related to commit 7034101.
    - Punctuation fix.
    - Populate _about_ string.
    - Add about_ru.txt file
    ---------

    Co-authored-by: Apaczer <[email protected]>

commit de59b3e
Author: Apaczer <[email protected]>
Date:   Tue Jan 30 23:37:47 2024 +0100

    FONTS: Update custom skins to include only OFL fonts. (#61)

    * add Audiowide-Regular font (OFL) to NeonWave skin

    * add KdamThmorPro font (OFL) to Gameshow skin

    * add PlaypenSans font (OFL) to NewComicBook skin

    * rm partly-licensed font of Bublina..

    * comply with OFL terms & update personal info of mods

    * README: update fonts info

commit ae434ec
Author: Apaczer <[email protected]>
Date:   Mon Jan 29 14:34:43 2024 +0100

    TOOLS: gen_tr - check for uncommited changes

    font_mrg - correct stderr after sanity checks

commit b8d7681
Author: Apaczer <[email protected]>
Date:   Mon Jan 29 15:20:06 2024 +0100

    rm font under EULA terms => upd fontSize

commit 1ec2fa9
Author: Apaczer <[email protected]>
Date:   Sat Jan 27 18:02:20 2024 +0100

    correct/simplify _about_.txt + upd Polish translation

    #57

commit b1a5198
Author: Apaczer <[email protected]>
Date:   Sat Jan 27 15:36:49 2024 +0100

    MAIN: make about.txt translatable, update TOOLS (add sanity tests)

    #55

commit 1cd2ab9
Author: Apaczer <[email protected]>
Date:   Fri Jan 26 23:19:36 2024 +0100

    rm unmaintained Chinese(TW) translation

commit 6c3c8ec
Author: Apaczer <[email protected]>
Date:   Fri Jan 26 23:18:22 2024 +0100

    update TOOLS for UNIX system + upd translations

    - `sort` with `-f` option
    - use tmp file for sort operation instead of a pipe

commit 7034101
Author: Apaczer <[email protected]>
Date:   Fri Jan 26 23:17:42 2024 +0100

    MAIN: only disable AutoStart setting with quick "Y" press

    when it is active ofc

commit 0fb76d2
Author: Apaczer <[email protected]>
Date:   Fri Jan 26 20:56:09 2024 +0100

    update CONTRIBUTORS

    remove deprecated AUTHORS & INSTALL docs

commit c5a6beb
Author: Apaczer <[email protected]>
Date:   Fri Jan 26 20:30:42 2024 +0100

    add `font_merge.sh` tool + update/clean "Skins" licensing&info (#59)

    * add script TOOL `font_merge.sh`

    * clean skins/fonts Licensing, add fonts org. duplicate

    * replace default (non licensed) font with "Unifont" under GPLv2

    * increase default font size in evalIntConf befone initFont()

    * remove non licensed "RetroFW" skin

    * upd Makefiles to build with Default skin if requested

    * update README & CONTRIBUTORS

    * README: add themes info (list info with cmd `tree -L 2 -I 'icons|imgs|logos*|sections|wallpap*|backdrops|free_backdrop|font.ttf|skin.conf|ACKNOW*' -U` )

    * merging OFL fonts to include UNICODE glyphs

commit b3520db
Author: Apaczer <[email protected]>
Date:   Fri Jan 12 22:12:42 2024 +0100

    use SDL_JOYHATMOTION for 3'rd analog control (hat events) + add basic input.cfg for gamepad (#58)

    * add SDL_HAT api requests

    * add generic joystick mapping to input config

commit 7f55f08
Author: Apaczer <[email protected]>
Date:   Sat Dec 23 22:30:53 2023 +0100

    Settings: fix confInt["globalVolume"] write on sd.save

commit 1f78220
Author: Apaczer <[email protected]>
Date:   Sat Dec 23 21:12:41 2023 +0100

    Replace "favourite" with U.S. "favorite" in src & skins

    #50

commit 33d9fdd
Author: Apaczer <[email protected]>
Date:   Sat Dec 23 21:07:00 2023 +0100

    add TOOLS dir with `gen_translate.sh` & `packager.sh` scripts (#52)

    *) add gen_translate.sh tool
    - utilizing unifdef and g++ cmds for source code cleanup from unused preprocessors.
    - upd. translate.txt and finalize with above auto-gen tool.
    - upd. translations files

    *) add packager.sh tool
    - to generated IPK/ZIP packages of distributes 3-party apps/emulators etc.

commit ccfa8a6
Author: Apaczer <[email protected]>
Date:   Mon Dec 18 22:49:10 2023 +0100

    change GMenuNX occurrences back to GMenu2X

    +mv Makefile.linux to Makefile

commit 2de4f62
Author: MayanKoyote <[email protected]>
Date:   Mon Dec 18 19:50:12 2023 +0500

    update Russian translation (#48)

    * Making changes related to a commit 175a96a & e038bec
    * Minor cosmetic changes.

    ---------

    Co-authored-by: Apaczer <[email protected]>

commit ffbb255
Author: Ruhan Monte <[email protected]>
Date:   Sun Dec 17 17:31:00 2023 -0300

    Update Portuguese(Brazil)  (#47)

    ---------

    Co-authored-by: Apaczer <[email protected]>

commit 017b1da
Author: Apaczer <[email protected]>
Date:   Sun Dec 17 16:07:35 2023 +0100

    rm unmaintained lang translations' files

commit e038bec
Author: Apaczer <[email protected]>
Date:   Sat Dec 16 23:52:43 2023 +0100

    add missing translation strings + upd. dictionary

    +credit new beta tester

commit cb7d8ff
Author: Apaczer <[email protected]>
Date:   Sat Dec 16 23:46:34 2023 +0100

    TerminalDialog: show msgbox instead of end string

    use setAutoHide(0) to wait for any standard input before hiding

commit aa398ec
Author: Apaczer <[email protected]>
Date:   Sat Dec 16 21:26:52 2023 +0100

    Menu: iconTitle&Description translation correction

    +translate description also with drawGrid on Status Bar

commit 175a96a
Author: Apaczer <[email protected]>
Date:   Fri Dec 15 14:19:24 2023 +0100

    add missing translation strings + upd script

    correct dictionary entries

commit 28a7f05
Author: Apaczer <[email protected]>
Date:   Thu Dec 14 22:38:17 2023 +0100

    sed string instead of 1s line in writeDateCmd

commit bed8792
Author: Apaczer <[email protected]>
Date:   Thu Dec 14 17:19:13 2023 +0100

    FontHelper: correct wrapping for maxWidth=wrapRect.w

    +update firstline to false if line empty

commit e22ca90
Author: MayanKoyote <[email protected]>
Date:   Mon Dec 11 02:42:20 2023 +0500

    update Russian transaltion (#46)

    minor cosmetic changes to better fit into the screen frame

    ---------

    Co-authored-by: Apaczer <[email protected]>

commit 6f1df2f
Author: Apaczer <[email protected]>
Date:   Sun Dec 10 21:11:54 2023 +0100

    FontHelper: fix text wraping & refactor with maxWidth

commit 0dda88c
Author: Apaczer <[email protected]>
Date:   Tue Dec 5 22:54:47 2023 +0100

    add missing sections Translation strings

commit 53f136e
Author: tiopex <[email protected]>
Date:   Thu Nov 30 14:37:06 2023 +0100

    Remove remount partition during startup

commit 25b1216
Author: MayanKoyote <[email protected]>
Date:   Wed Nov 29 03:05:22 2023 +0500

    update Russian translation (#45)

    Making changes related to a commit cc0487a

commit adea69b
Author: Ruan Rui <[email protected]>
Date:   Wed Nov 29 06:04:06 2023 +0800

    Update Chinese(CN) translation (#44)

    * Update Chinese(CN)

    ---------

    Co-authored-by: Apaczer <[email protected]>

commit cc0487a
Author: Apaczer <[email protected]>
Date:   Mon Nov 27 21:44:25 2023 +0100

    add new Translations

    + update `clean_translations.sh` with usage info

commit ba3a484
Author: Apaczer <[email protected]>
Date:   Sun Nov 26 19:22:35 2023 +0100

    update Makefile.miyoo - use GMENU2X_HASH var

    to make it inline with BR2 config

commit a0eb98d
Author: MayanKoyote <[email protected]>
Date:   Thu Nov 23 02:25:47 2023 +0500

    updated Russian translation (#42)

    * update assets/translations/Russian (new, more fancy modern translation)
    * update Translators (remove old ones + add MayanKoyote for RUS)

    ---------

    Co-authored-by: Apaczer <[email protected]>

commit ee001d8
Author: Apaczer <[email protected]>
Date:   Tue Nov 14 22:10:58 2023 +0100

    restore Legacy icons

commit 089855c
Author: Apaczer <[email protected]>
Date:   Tue Nov 14 18:59:47 2023 +0100

    add FontiGrid icons pack (by BryMD)

commit 4a941de
Author: Apaczer <[email protected]>
Date:   Fri Nov 10 14:04:52 2023 +0100

    update skins - add RetroArch icons
  • Loading branch information
@Apaczer
Apaczer committed Jul 8, 2024
1 parent d0e1ea8 commit 142321b
Show file tree
Hide file tree
Showing 22 changed files with 602 additions and 52 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/c-cpp.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
image: miyoocfw/toolchain-shared-uclibc:master
steps:
- run: echo "submodule ${{ inputs.submodule }} on ${{ github.event }}"
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- if: inputs.submodule
run: git submodule update --init --depth 1 -- ${{ inputs.submodule }}
- name: generate commit sha
Expand All @@ -33,21 +33,21 @@ jobs:
cd ${{ inputs.submodule || '.' }}
make -f Makefile.miyoo dist COMMIT_HASH="${{ steps.commit.outputs.commit }}"
make -f Makefile.miyoo ipk
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: GMenu2X (uClibc)
path: |
${{ inputs.submodule || '.' }}/dist/miyoo/gmenu2x
${{ inputs.submodule || '.' }}/dist/miyoo/gmenu2x-debug
if-no-files-found: error # 'error', 'warn', 'ignore'; defaults to `warn`
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: GMenu2X ZIP-Bundle (uClibc)
path: |
${{ inputs.submodule || '.' }}/dist/miyoo/
!${{ inputs.submodule || '.' }}/dist/miyoo/gmenu2x-debug
if-no-files-found: error # 'error', 'warn', 'ignore'; defaults to `warn`
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: GMenu2X IPK-Package (uClibc)
path: |
Expand All @@ -61,7 +61,7 @@ jobs:
image: miyoocfw/toolchain-shared-musl:master
steps:
- run: echo "submodule ${{ inputs.submodule }} on ${{ github.event }}"
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- if: inputs.submodule
run: git submodule update --init --depth 1 -- ${{ inputs.submodule }}
- name: generate commit sha
Expand All @@ -75,21 +75,21 @@ jobs:
cd ${{ inputs.submodule || '.' }}
make -f Makefile.miyoo dist COMMIT_HASH="${{ steps.commit.outputs.commit }}"
make -f Makefile.miyoo ipk
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: GMenu2X (musl)
path: |
${{ inputs.submodule || '.' }}/dist/miyoo/gmenu2x
${{ inputs.submodule || '.' }}/dist/miyoo/gmenu2x-debug
if-no-files-found: error # 'error', 'warn', 'ignore'; defaults to `warn`
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: GMenu2X ZIP-Bundle (musl)
path: |
${{ inputs.submodule || '.' }}/dist/miyoo/
!${{ inputs.submodule || '.' }}/dist/miyoo/gmenu2x-debug
if-no-files-found: error # 'error', 'warn', 'ignore'; defaults to `warn`
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: GMenu2X IPK-Package (musl)
path: |
Expand Down
2 changes: 1 addition & 1 deletion _about_ru.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ GMenu2X разработан для MiyooCFW и распространяется
* B: Назад / Отменить действие;
* X: Перейти на один каталог вверх в файловом браузере;
* X-держать: Диалог быстрой настройки даты и времени;
* X + Y: Switch from/to Default font;
* X + Y: Переключение со шрифта темы на шрифт по умолчанию и обратно;
* Y: Показать руководство/README-файл;
* Y-держать: Перезапустить GMenu2X;
* L1(TB), R1(TA): Переключение влево/вправо между разделами или перемещение на страницу вверх/вниз в списках;
Expand Down
14 changes: 11 additions & 3 deletions assets/skins/FontiGrid/font-modify.info
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
MergedBebKaUNI font:
MergedBebKaUNI:
(1.003)
BebasKai has been modified with `fontforge` app by merging up BebasNeue-Bold font & supplementing output with Unifont glyphs.
- BebasKai (1.002) has been has been modified with `fontforge` app by merging up BebasNeue-Bold (1.003) font
- supplementing-with/merging-up Unifont (15.0.06) glyphs.
(1.003 v2)
Updated "Erase to the Left" an UNI glyph U+232b, "Bottom Square Bracket" an UNI glyph U+23B5, "Metrical Tetraseme" an UNI glyph U+23D8, "Arrow Left: an UNI glyph U+2190 - boldened to represent better "Backspace" and "Space" buttons (by MayanKoyote & Apaczer).
- updated/boldened glyphs to represent better "Backspace" and "Space" buttons:
"Erase to the Left" an UNI glyph U+232b,
"Bottom Square Bracket" an UNI glyph U+23B5,
"Metrical Tetraseme" an UNI glyph U+23D8,
"Arrow Left an UNI glyph U+2190 (credits @MayanKoyote & @Apaczer).

(2.000)
- clean rebuild font from the BebasKai (1.002), with previous patches
14 changes: 13 additions & 1 deletion assets/skins/GameShow/font-modify.info
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
MergedKdaTPrUNI font:
(1.004)
KdamThmorPro-Regular (1.003) has been modified with `fontforge` app by supplementing it with missing Unifont (15.0.06) glyphs.

KdamThmorPro-Regular has been modified with `fontforge` app by supplementing it with missing Unifont glyphs
(2.000)
- clean rebuild font from the KdamThmorPro-Regular (1.003), with previous patch
- Russian alhpabet & "Erase to the Left" have been altered (created from Latin alphabet letter materials):
"uni232B uni0445 uni0443 uni0423 uni043C uni043A uni044E uni044B uni0437
uni044F uni0441 uni0436 uni043E uni044A uni044C uni043B uni043D uni0424
uni043F uni0425 uni0433 uni0448 uni0435 uni0417 uni0432 uni0434 uni0430
uni0442 uni041C uni0447 uni0420 uni0449 uni0410 uni0451 uni042F uni042A
uni0411 uni0415 uni042B uni041A uni042C uni042E uni0438 uni041E uni0444
uni0446 uni0431 uni0439 uni0421 uni0416 uni0401 uni0413 uni041B uni0412
uni041D uni0422 uni041F uni044D uni0440 uni0428 uni0427 uni0414 uni0429
uni0419 uni0418 uni0426 uni042D" (credits @MayanKoyote)
28 changes: 27 additions & 1 deletion assets/skins/NeonWave/font-modify.info
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,28 @@
MergedAudiowUni:
Audiowide-Regular has been modified with `fontforge` app by converting lowercase letters to uppercase + supplementing it with Unifont glyphs
(1.004)
- Audiowide-Regular (1.003) has been modified with `fontforge` app by supplementing it with missing Unifont (15.0.06) glyphs.
- copied lowercase glyphs from uppercase for visuals":
"r rcommaaccent racute rcaron n eng napostrophe ncommaaccent l nacute ldotaccent
b ntilde hbar ncaron lcaron lcommaaccent s oslash a lacute e lslash sacute oe
oslashacute o scedilla adieresis edotaccent aacute agrave x scircumflex scaron
aogonek c amacron edieresis eacute egrave u z aring atilde abreve acircumflex
eogonek odieresis q ograve oacute emacron m cdotaccent ae ohungarumlaut
zdotaccent ebreve omacron ecaron ecircumflex otilde obreve ocircumflex
aeacute cacute udieresis zacute ugrave uacute ccedilla uhungarumlaut
uogonek umacron ccircumflex ccaron zcaron uring utilde ubreve ucircumflex
idieresis dcroat iacute igrave h w imacron v f wdieresis d itilde wgrave
wacute ibreve icircumflex g y dcaron wcircumflex hcircumflex gdotaccent
gcommaaccent eth ydieresis yacute ygrave gbreve gcircumflex t
ycircumflex tcommaaccent tcaron tbar k p kcommaaccent i ij iogonek j thorn"

(2.000)
- clean rebuild font from the Audiowide-Regular (1.003), with previous patch
- Russian alhpabet & "Erase to the Left" have been altered (created from Latin alphabet letter materials):
"uni232B uni0445 uni0443 uni0423 uni043C uni043A uni044E uni044B uni0437
uni044F uni0441 uni0436 uni043E uni044A uni044C uni043B uni043D uni0424
uni043F uni0425 uni0433 uni0448 uni0435 uni0417 uni0432 uni0434 uni0430
uni0442 uni041C uni0447 uni0420 uni0449 uni0410 uni0451 uni042F uni042A
uni0411 uni0415 uni042B uni041A uni042C uni042E uni0438 uni041E uni0444
uni0446 uni0431 uni0439 uni0421 uni0416 uni0401 uni0413 uni041B uni0412
uni041D uni0422 uni041F uni044D uni0440 uni0428 uni0427 uni0414 uni0429
uni0419 uni0418 uni0426 uni042D" (credits @MayanKoyote)
14 changes: 11 additions & 3 deletions assets/skins/Nsdark/font-modify.info
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
MergedBebKaUNI font:
MergedBebKaUNI:
(1.003)
BebasKai has been modified with `fontforge` app by merging up BebasNeue-Bold font & supplementing output with Unifont glyphs.
- BebasKai (1.002) has been has been modified with `fontforge` app by merging up BebasNeue-Bold (1.003) font
- supplementing-with/merging-up Unifont (15.0.06) glyphs.
(1.003 v2)
Updated "Erase to the Left" an UNI glyph U+232b, "Bottom Square Bracket" an UNI glyph U+23B5, "Metrical Tetraseme" an UNI glyph U+23D8, "Arrow Left: an UNI glyph U+2190 - boldened to represent better "Backspace" and "Space" buttons (by MayanKoyote & Apaczer).
- updated/boldened glyphs to represent better "Backspace" and "Space" buttons:
"Erase to the Left" an UNI glyph U+232b,
"Bottom Square Bracket" an UNI glyph U+23B5,
"Metrical Tetraseme" an UNI glyph U+23D8,
"Arrow Left an UNI glyph U+2190 (credits @MayanKoyote & @Apaczer).

(2.000)
- clean rebuild font from the BebasKai (1.002), with previous patches
2 changes: 1 addition & 1 deletion assets/translations/Polish
View file
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ _keyboard_t1_l2_=ąśdfghjkł;'\`456
_keyboard_t1_l3_=żźćvbńm,./-=0123
_keyboard_t2_l1_=QWĘRTYUIÓP{}&*()
_keyboard_t2_l2_=ĄŚDFGHJKŁ:"|~$%^
_keyboard_t2_l3_=ŻŹĆVBŃM<>?_+÷!@#
_keyboard_t2_l3_=ŻŹĆVBŃM<>?_+\n!@#
_keyboard_t3_l1_=
_keyboard_t3_l2_=
_keyboard_t3_l3_=
Expand Down
2 changes: 1 addition & 1 deletion assets/translations/Russian
View file
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ _keyboard_t1_l2_=фывапролджэ,_456
_keyboard_t1_l3_=ячсмитьбюё/.0123
_keyboard_t2_l1_=ЙЦУКЕНГШЩЗХЪ_=-+
_keyboard_t2_l2_=ФЫВАПРОЛДЖЭ"'\()
_keyboard_t2_l3_=ЯЧСМИТЬБЮЁ#:;/?!
_keyboard_t2_l3_=ЯЧСМИТЬБЮЁ:;\n/?!
_keyboard_t3_l1_=*·×÷+-/\&<=>|
_keyboard_t3_l2_=()[]{}@#$¤%^~
_keyboard_t3_l3_=_«»"'`.,:;!?§
Expand Down
17 changes: 15 additions & 2 deletions src/fonthelper.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,11 @@ void FontHelper::loadFont(const string &fontName, int fontSize) {
ERROR("TTF_OpenFont %s: %s", fontName.c_str(), TTF_GetError());
return;
}
fontFamilyName = TTF_FontFaceFamilyName(font);
if (fontFamilyName == "") {
WARNING("Unable to read TTF font family name.\n");
}
DEBUG("Font Name: %s", fontFamilyName.c_str());
TTF_SetFontHinting(this->font, TTF_HINTING_LIGHT);
TTF_SetFontHinting(this->fontOutline, TTF_HINTING_LIGHT);
TTF_SetFontOutline(this->fontOutline, outline);
Expand Down Expand Up @@ -191,14 +196,22 @@ void FontHelper::write(Surface *surface, const string &text, int x, int y, RGBAC

if (bgColor.a > 0) {
Surface bg;
bg.raw = TTF_RenderUTF8_Blended(fontOutline, text.c_str(), rgbatosdl(bgColor));
if (fontFamilyName.find("Unifont") == string::npos) {
bg.raw = TTF_RenderUTF8_Blended(fontOutline, text.c_str(), rgbatosdl(bgColor));
} else {
bg.raw = TTF_RenderUTF8_Solid(fontOutline, text.c_str(), rgbatosdl(bgColor));
}
bg.setAlpha(bgColor.a);
bg.blit(surface, x - outline, y - outline);
}

if (fgColor.a > 0) {
Surface fg;
fg.raw = TTF_RenderUTF8_Blended(font, text.c_str(), rgbatosdl(fgColor));
if (fontFamilyName.find("Unifont") == string::npos) {
fg.raw = TTF_RenderUTF8_Blended(font, text.c_str(), rgbatosdl(fgColor));
} else {
fg.raw = TTF_RenderUTF8_Solid(font, text.c_str(), rgbatosdl(fgColor));
}
fg.setAlpha(fgColor.a);
fg.blit(surface, x, y);
}
Expand Down
2 changes: 2 additions & 0 deletions src/fonthelper.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ class FontHelper {
FontHelper *setColor(RGBAColor color);
FontHelper *setOutlineColor(RGBAColor color);
TTF_Font *font, *fontOutline;

string fontFamilyName;
};

#endif /* FONTHELPER_H */
16 changes: 10 additions & 6 deletions src/gmenu2x.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ int main(int argc, char * argv[]) {

bool autoStart = false;
for (int i = 0; i < argc; i++) {
if(strcmp(argv[i],"--autostart")==0) {
if (strcmp(argv[i],"--autostart")==0) {
INFO("Launching Autostart");
autoStart = true;
}
Expand Down Expand Up @@ -330,7 +330,7 @@ void GMenu2X::main(bool autoStart) {
srand(time(0)); // Seed the rand with current time to get different number sequences
int randomInt = rand() % 10; // Generate a random val={0..x} to print "Hint" msg occasionally
// Hint messages
//while (true){
//while (true) {
if (confInt["showHints"] == 1) {
if (confInt["enableTTS"] == 1 && (confStr["lastCommand"] == "" || confStr["lastDirectory"] == "")) {
switch (randomInt) {
Expand Down Expand Up @@ -442,8 +442,11 @@ void GMenu2X::main(bool autoStart) {
reinit();
}
} else {
if (input[MANUAL]) { // Reset AutoStart settings
confStr["lastDirectory"] = "";
if (input[MANUAL]) { // Reset settings for viewAutoStart()
confInt["saveAutoStart"] = 0;
confInt["dialogAutoStart"] = 0;
confStr["lastDirectory"] = "";
confStr["lastCommand"] = "";
reinit_save();
}
}
Expand All @@ -464,7 +467,7 @@ void GMenu2X::main(bool autoStart) {
viewAutoStart();
}

if(confStr["lastCommand"] != "" && confStr["lastDirectory"] != "") {
if (confStr["lastCommand"] != "" && confStr["lastDirectory"] != "") {
INFO("Starting autostart()");
INFO("conf %s %s",confStr["lastDirectory"].c_str(),confStr["lastCommand"].c_str());
INFO("autostart %s %s",confStr["lastDirectory"],confStr["lastCommand"]);
Expand Down Expand Up @@ -1570,8 +1573,9 @@ void GMenu2X::viewAutoStart() {
switch (res) {
case CANCEL:
confInt["saveAutoStart"] = 0;
confStr["lastDirectory"] = "";
confInt["dialogAutoStart"] = 0;
confStr["lastDirectory"] = "";
confStr["lastCommand"] = "";
reinit_save();
case MODIFIER:
confInt["dialogAutoStart"] = 0;
Expand Down
31 changes: 24 additions & 7 deletions src/inputdialog.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,13 +151,30 @@ bool InputDialog::exec() {
string saveChar = gmenu2x->tr["Save"];
string exitChar = gmenu2x->tr["Exit"];

if (gmenu2x->tr.lang() == "") {altChar = ""; altBtn = "";}
if (gmenu2x->drawButton(bg, "r", spaceChar) +
gmenu2x->drawButton(bg, "l", backspaceChar) +
gmenu2x->drawButton(bg, "y", shiftChar) +
gmenu2x->drawButton(bg, altBtn, altChar) +
gmenu2x->drawButton(bg, "start", saveChar) +
gmenu2x->drawButton(bg, "b", exitChar) > gmenu2x->w) {spaceChar = "⎵" ; backspaceChar = "←";}
if (gmenu2x->tr.lang() == "") {
altChar = "";
altBtn = "";
}
int prevBarWidth = 0;
while (bottomBarWidth >= gmenu2x->w) {
bottomBarWidth = gmenu2x->drawButton(bg, "r", spaceChar) +
gmenu2x->drawButton(bg, "l", backspaceChar) +
gmenu2x->drawButton(bg, "y", shiftChar) +
gmenu2x->drawButton(bg, altBtn, altChar) +
gmenu2x->drawButton(bg, "start", saveChar) +
gmenu2x->drawButton(bg, "b", exitChar) - 30;
if (bottomBarWidth >= prevBarWidth && prevBarWidth != 0) {
spaceChar = gmenu2x->tr["Space"];
backspaceChar = gmenu2x->tr["Backspace"];
break;
} else if (bottomBarWidth < prevBarWidth && bottomBarWidth >= gmenu2x->w || bottomBarWidth < gmenu2x->w) {
break;
} else {
spaceChar = "⎵" ;
backspaceChar = "←";
}
prevBarWidth = bottomBarWidth;
}

bg->box(gmenu2x->bottomBarRect, (RGBAColor){0,0,0,255});

Expand Down
1 change: 1 addition & 0 deletions src/inputdialog.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ class InputDialog {
vector<stringlist> keyboard;
stringlist *kb;
int kbLength, kbWidth, kbHeight, kbLeft;
int bottomBarWidth = gmenu2x->w;
SDL_Rect kbRect;
IconButton *btnBackspaceX, *btnBackspaceL, *btnSpace, *btnConfirm, *btnChangeKeys;
string input;
Expand Down
2 changes: 1 addition & 1 deletion src/libopk/opkinfo.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ static bool display_info(char *package_path) {
size_t skey, sval;
printf("\n");
printf("Metadata file: %s\n\n", metadata_name);
while(opk_read_pair(opk, &key, &skey, &val, &sval) && key)
while (opk_read_pair(opk, &key, &skey, &val, &sval) && key)
printf("%.*s: %.*s\n", (int) skey, key, (int) sval, val);
}

Expand Down
8 changes: 4 additions & 4 deletions src/libopk/unsqfs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -273,11 +273,11 @@ struct squashfs_fragment_entry {
#define TRACE(s, args...) \
do { \
printf("unsquashfs: "s, ## args); \
} while(0)
} while (0)
#define ERROR(s, args...) \
do { \
fprintf(stderr, s, ## args); \
} while(0)
} while (0)
#else
#define TRACE(s, args...)
#define ERROR(s, args...)
Expand Down Expand Up @@ -767,7 +767,7 @@ static bool squashfs_opendir(struct PkgData *pdata,
TRACE("squashfs_opendir: Read directory header, %d directory entries\n",
dir_count);

while(dir_count--) {
while (dir_count--) {
if (!read_metadata(&accessor, dire, sizeof(*dire))) {
return false;
}
Expand All @@ -779,7 +779,7 @@ static bool squashfs_opendir(struct PkgData *pdata,
TRACE("squashfs_opendir: directory entry %s, inode "
"%d:%d, type %d\n", dire->name,
dirh.start_block, dire->offset, dire->type);
if((dir->dir_count % DIR_ENT_SIZE) == 0) {
if ((dir->dir_count % DIR_ENT_SIZE) == 0) {
struct dir_ent *new_dir = realloc(dir->dirs,
(dir->dir_count + DIR_ENT_SIZE)
* sizeof(struct dir_ent));
Expand Down
4 changes: 1 addition & 3 deletions src/menu.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -945,9 +945,7 @@ void Menu::exec() {
else if (gmenu2x->input[SECTION_NEXT]) incSectionIndex();

// SELLINKAPP SELECTED
else if (gmenu2x->input[MANUAL] && !gmenu2x->input[MODIFIER] && selLinkApp() != NULL && !selLinkApp()->getManualPath().empty()) {
gmenu2x->showManual();
}
else if (gmenu2x->input[MANUAL] && !gmenu2x->input[MODIFIER] && selLinkApp() != NULL && !selLinkApp()->getManualPath().empty()) gmenu2x->showManual();
// On Screen Help
// else if (gmenu2x->input[MANUAL]) {
// s->box(10,50,300,162, gmenu2x->skinConfColors[COLOR_MESSAGE_BOX_BG]);
Expand Down
Loading

0 comments on commit 142321b

Please sign in to comment.