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

Added and updated Ozone/Monochrome icons #432

Open
wants to merge 16 commits into
base: master
Choose a base branch
from

Conversation

Jaffacakelover
Copy link
Contributor

@Jaffacakelover Jaffacakelover commented May 22, 2022

All my pending icons for Retroarch's Ozone and Monochrome themes.

  • Monochrome = SVG and PNG
  • Ozone = PNG only
    All PNGs compressed using Pingo

New icons for cores:

  • Apple - Macintosh II (minivmac)
  • Apple - Macintosh II-content (minivmac)
  • Apple - Macintosh (minivmac, alternate)
  • Apple - Macintosh-content (minivmac, alternate)
  • Arduboy (Arduous)
  • Arduboy-content (Arduous)
  • Atari - 800 (Atari800, aternate)
  • Atari - 800-content (Atari800, aternate)
  • Atari - Falcon (Hatari, alternate)
  • Atari - Falcon-content (Hatari, alternate)
  • Commodore - C64 (Frodo, renamed)
  • Commodore - C64-content (Frodo, renamed)
  • Commodore - 128 (VICE x128)
  • Commodore - 128-content (VICE x128)
  • Commodore - CBM-II (VICE xcbm5x0)
  • Commodore - CBM-II-content (VICE xcbm5x0)
  • Commodore - PET (VICE xpet)
  • Commodore - PET-content (VICE xpet)
  • DOOM 3 - Resurrection of Evil (boom 3 xp)
  • DOOM 3 - Resurrection of Evil-content (boom 3 xp)
  • DOOM 3 (boom3)
  • DOOM 3-content (boom3)
  • Electronika - BK-0010 (M)
  • Electronika - BK-0010-content (M)
  • Game Music Emu (Game Music Emu)
  • Game Music Emu-content (Game Music Emu)
  • Gong (Gong)
  • Gong-content (Gong)
  • J2ME (SquirrelJME)
  • J2ME-content (SquirrelJME)
  • Java ME (SquirrelJME)
  • Java ME-content (SquirrelJME)
  • LowRes NX (LowRes NX)
  • LowRes NX-content (LowRes NX)
  • MAME 2003 Midway
  • Mega Duck (SameDuck)
  • Mega Duck-content (SameDuck)
  • Nintendo - Nintendo DSi (Digital)
  • Nintendo - Nintendo DSi (Digital)-content
  • Nintendo - Wii (Digital) (Dolphin)
  • Nintendo - Wii (Digital)-content (Dolphin)
  • Oberon - RISC (Oberon RISC Emulator)
  • Oberon - RISC-content (Oberon RISC Emulator)
  • Palm Inc - PalmPilot (Mu)
  • Palm Inc - PalmPilot-content (Mu)
  • Philips CD-i (SAME CDi / CDi 2015)
  • Philips CD-i-content (SAME CDi / CDi 2015)
  • PICO-8 (Retro8)
  • PICO-8-content (Retro8)
  • PocketCDG (PocketCDG)
  • PocketCDG-content (PocketCDG)
  • Quake II - Rogue (Quake II - Rogue)
  • Quake II - Rogue-content (Quake II - Rogue)
  • Quake II - Xatrix (Quake II - Xatrix)
  • Quake II - Xatrix-content (Quake II - Xatrix)
  • Quake II - Zaero (Quake II - Zaero)
  • Quake II - Zaero-content (Quake II - Zaero)
  • Sega - VMU (VeMUlator)
  • Sega - VMU-content (VeMUlator)
  • Sharp X1 (X Millennium)
  • Sharp X1-content (X Millennium)
  • Star Trek Voyager - Elite Force (vitaVoyager)
  • Star Trek Voyager - Elite Force-content (vitaVoyager)
  • Super Bros War (Super Bros War)
  • Super Bros War-content (Super Bros War)
  • The Powder Toy (The Powder Toy)
  • The Powder Toy-content (The Powder Toy)
  • VaporSpec (VaporSpec)
  • VaporSpec-content (VaporSpec)
  • WASM-4 (WASM-4)
  • WASM-4-content (WASM-4)
  • Wolfenstein 3D (Wolfenstein 3D)
  • Wolfenstein 3D-content (Wolfenstein 3D)

Updated icons for cores:

  • Apple - Macintosh
    • (replaced top-down unit with keyboard)
  • Apple - Macintosh-content
    • (replaced 3.5" floppy with 5.25" floppy)
  • Atari - Jaguar
    • (new 3 button pad icon)
  • Bandai - Pippin
    • (fixed Ozone ratio)
  • Bandai - Super Vision 8000
    • (fixed Ozone ratio)
  • Lutro
    • (new icon)
  • Lutro-content
    • (new icon)
  • Nintendo - GameCube
    • (c-stick now has octagon border)
  • Nintendo - GameCube-content
    • (resized to Mini-DVD, added label space)
  • Sega - 32x-content
    • (thinner lines at sides)
  • RPG Maker
    • (removed "2003" from Ozone to match Monochrome)
  • RPG Maker-content
    • (removed "2003" from Ozone to match Monochrome)

New icons for GUI:

  • explore
  • explore-content
  • menu_accessibility
  • menu_ai
  • menu_browser
  • Standalone Cores

Extras

  • Arcade Controller
  • Microsoft - Xbox Series
  • Microsoft - Xbox Series-content
  • Nintendo - Wii U (Digital)
  • Nintendo - Wii U (Digital)-content
  • Sony - PlayStation 5
  • Sony - PlayStation 5-content
  • Sony - PlayStation Vita (DLC)
  • Sony - PlayStation Vita (DLC)-content
  • Sony - PlayStation Vita (PSN)
  • Sony - PlayStation Vita (PSN)-content
  • Sony - PocketStation
  • Sony - PocketStation-content

Added and updated a lot of Ozone (PNG) and Monochrome (SVG+PNG) icons for themes. Full list in pull request.
Added missing PNG
revert Apple - Macintosh-content to 3.5" floppy (was changed to 5.25" floppy)
Resized icons to match current files (46x46 for main icons, 40x40 for content)
@fpscan fpscan requested a review from baxysquare May 23, 2022 09:21
@baxysquare
Copy link
Collaborator

I really like the quality and consistency in the icons of the designs. @Jaffacakelover has done some excellent work as usual.

My primary concern would be use of some logos in the designs. I worry that someday, Big Game companies might deliver a cease and desist for trademark infringement. There are lots of projects in the scene that are much more egregious, but Libretro might make for a higher profile target. That's probably a larger decision for the Libretro project leadership to weigh in on. Historically, @kivutar leaned toward leaving logos off of Monochrome icons unless it was absolutely necessary. I've always tried to follow that lead.

I'm also not sure if all these icons should be contributed to Monochrome. This also has me questioning my recent contributions as well. Since Monochrome is the primary foundational set, the icons that are there are because they're listed in the Libretro database, they are a part of the No-Intro Dat-O-Matic or they provide some sort of functionality to the UI/UX. This set should focus on providing the project with all the necessary icons needed for current full functionality, along with icons for cores and functions that may be added in the immediate future. Nothing more and nothing less.

Because it is the baseline set, I've always felt like any subsequent contributed theme should have 1-to-1 parity in order to properly qualify as a full set. That way, if an end user changes from Monochrome, it doesn't leave them with an ugly missing icon. It also means we should be careful to add only what is necessary for functionality.

For the last little while, I've been trying for a while to bring Monochrome up to relative parity with FlatUX in anticipation that cores might be added in the future. But reviewing this PR helps me realize that objective is flawed and I have "taken my eye off the ball" of that core focus. In response to that self-criticism, I just opened Issue #433. That way, contributors to this repository as well as developers from the full team can weigh in and let us know what needs to be added and perhaps, what needs to be removed or left out of Monochrome.

Copy link
Collaborator

@baxysquare baxysquare left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please see comments on the PR.

Removed icons that would not be associated with a core in the near future
VMU icons have core available to be assigned to (VeMUlator)
Icons with no core to assign to
Updated Java ME with mobile phone icons, removed Arcade Controller as unused
Removed vitaVoyager (core no longer in repo)
@Jaffacakelover
Copy link
Contributor Author

Jaffacakelover commented May 27, 2022

I've removed "unnecessary" icons from this pr (see image, updated).
('Atari - Falcon' and 'Apple - Macintosh II' could still get cut).
I can look at #433 and list "unnecessary" Monochrome/Ozone icons in the current repo.

I've also marked on the image which icons in this pr contain company logos.
There are many icons in the repo's themes that use logos already. Official console logos are also used on the Download page of the Retroarch website! As you say, a discussion for higher-ups.
I can look at #433 and list Monochrome/Ozone icons that use logos in the current repo.

I set out updating icons over all themes at once (for parity) but hit a snag in the previous commits over the handling of NeoActive / RetroActive / RetroSystem themes (which were set to be merged into FlatUX). Is this now resolved?
How do you think's best to proceed with these updates? Is it better to:

  1. Update baseline themes only (first)? (Ozone, Monochrome)
  2. Update all themes at once?
  3. Update all themes except FlatUX at once?

@baxysquare
Copy link
Collaborator

I'd say option 1, with a few twists.

Updating Monochrome is the A-1 priority for contributors. Since it's the primary baseline, it needs to be a complete set upon every release. Icons for UX functionality and soon-to-be-added cores take precedence. From there, work from the #433 to-do list based on the Libretro database, and the No-Intro Dat-O-Matic to help forge ahead.

The next priority would be to work toward merging Monochrome and Ozone into what should become a #341 universal theme as well as the de-facto baseline theme. Perhaps we should call it "Monozone" when all is said and done. 😜

Last but not least, the community needs to decide if FlatUX is a "baseline theme" worthy of fulfilling the intended goal of #17 blazed by @gouchi and @kivutar. FlatUX could really use someone to take the lead by refining and blending the existing work, if you feel so inclined. We're ready to "pass the baton."

Up to this point, Monochrome and FlatUI have been the themes where the community contributes. To my knowledge, all the other themes have been end-to-end creations by a single author. There haven't been any outside contributors, so you're blazing new trails by attempting to contribute to them all. Hopefully that helps to explain one of the reasons I've encouraged you to create your own theme.

Already included as Apple - I and Apple - II
Reverting to current naming conventions
@fpscan
Copy link
Collaborator

fpscan commented Jun 2, 2022

Hi @baxysquare

So is it ready to be merged?

@hizzlekizzle

Any comment on @baxysquare concerns in the above comments

My primary concern would be use of some logos in the designs. I worry that someday, Big Game companies might deliver a cease and desist for trademark infringement.

Updated Ozone with matching deletions
@baxysquare baxysquare requested a review from fpscan June 2, 2022 14:20
Restored 2 icons used by core.. Renamed copies of 'Nintendo - Nintendo DSI (DLC)'.
Quake 2 Rogue, Xatrix and Zaero are listed as separate cores in Android RA
Jaffacakelover added a commit to Jaffacakelover/retroarch-assets that referenced this pull request Jul 9, 2022
New Monochrome / Ozone icons. Combined with libretro#432 to complete libretro#433.
@LibretroAdmin
Copy link
Contributor

Hi there,

Does this PR become obsolete by this one, or does this one still serve a purpose?

#435

Just asking.

@Jaffacakelover
Copy link
Contributor Author

Yes, this commit has different files to #435, so adding both would be desired.

@RobLoach
Copy link
Member

RobLoach commented Jul 9, 2023

I'm really liking these! 🔥

@baxysquare
Copy link
Collaborator

It appears the branch for this PR has conflicts that need to be resolved.

Screenshot 2023-08-23 at 8 46 26 AM

@Jaffacakelover
Copy link
Contributor Author

The two Apple files aren't in my fork? Are they conflicting with another pull request?

@baxysquare
Copy link
Collaborator

That is incredibly weird. The issue with the Philips CDi has been resolved but the Macintosh files still won't resolve with this pull or with #456, at least on my end. I've tried opening in GitHub Desktop and it will let me preview and create another pull request that says it's able to merge, but I'm guessing that will cause more problems, rather than solve them.

@fpscan or @LibretroAdmin is this something you could help us with? Thanks for your patience as I'm clearly not a "GitHub master."

@WizzardSK
Copy link
Contributor

Can we merge this? Btw, I suggest to rename Arduboy to "Arduboy Inc - Arduboy" according to database.

@baxysquare
Copy link
Collaborator

On my end, it appears the branch for this PR still has conflicts that need to be resolved. I've tried doing so in the Desktop app without success, and I have limited command line access.

Screenshot 2024-01-02 at 8 51 43 AM

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants