Updates

.vscode/settings.json

@@ -83,6 +83,7 @@
  "kickass",
  "leftmenu",
  "leftmenubar",
+ "LUMA",
  "maxx",
  "maxy",
  "mult",
@@ -121,6 +122,7 @@
  "screencode",
  "screencodes",
  "SCRN",
+ "Selectored",
  "sheight",
  "Spacebar",
  "spacebarkey",

README.md

@@ -35,33 +35,80 @@ Linux: deb,apk,freebsd,pacman,p5p,rpm (via docker)
 Notes: "electron-builder": "23.6.0", for MACOS
 "electron-builder": "22.10.5", for PC
 
+## Current Bugs (0.9.6 from previous revisions as well)
+
+- [ ] Group/frame zoom not zooming/aligning the last frame in the stack
+
 ## Current Tasks (0.9.6)
 
 - [ ] after using a menu shortcuts (alt f) alt is trapped on
 - [ ] Adjust *something* to make touch pad pinch/zoom usable
 - [ ] Middle mouse Button Pan Control
+- [ ] What was I thinking
 - [ ] Recent Files menu
+ - [ ] Update Menu subsystem
+ - [ ] PC Version
+ - [ ] Mac Version
+ - [ ] Linux Version
 - [ ] Zoom Level display
 - [ ] Dirart Clip Art
 - [ ] Texture Generator
+ - [ ] Preview with dropdown
+ - [ ] features: Linear, random, radial, mono...
 - [ ] Font Pack
-- [ ] Gradient Shader
-- [ ] lvllvl style character palette layout
-- [ ] Light to Dark character palette layout
-- [ ] Custom Layout (and save)
-- [ ] complex copy and paste: selection (inter program copy), frame to frame, byte-array (string), png
-- [ ] Anim player export
-- [ ] Wide/Long Screen export
-- [ ] Faux Terminal BBS export prg
-- [ ] Guide Layer and adjustment controls
-- [ ] Guide Layer to Frame conversion
+ - [ ] Note: Fonts stored in one large PETMATE file, saved to the application folder
+ - [ ] Note: Name of Frame is the font name and config "FontName:3x3:F/P:CharCount"
+ - [ ] Note: Line 1 of each font frame will list the letter and its width. Width of 0 means the letter is not in the font (or is its ID doesn't exist). Font ID's are the ROM ID of the c64 CHAR ROM. So, "ABC" defined would be 1:3,2:3,3:3,
+- [ ] Colour Selector Component
+ - [ ] Buttons to sort by Colour ID (default Commodore colours)
+ - [ ] Sub Title with Colour Sort Name
+ - [ ] Colour Sort: by Light To Dark LUMA
+ - [ ] Colour Sort: by Dark to Light LUMA
+- [ ] Gradient/Shader
+ - [ ] Toolbar Icon/Button
+ - [ ] what does the control/alt/shift modifiers do?
+ - [ ] the palette component (max steps, colours and gradients?)
+ - [ ] drop down for various versions
+ - [ ] local save file
+ - [ ] exports for local save file to allow portable settings
+- [ ] Character Palette Updates
+ - [ ] Dropdown to select various palette types
+ - [ ] lvllvl style character palette layout
+ - [ ] Light to Dark character palette layout
+ - [ ] Custom Layout (and save/export/portable)
+ - [ ] Frame export to layout
+- [ ] Copy and Paste 096
+ - [ ] All brush Copies will have String, Byte Array (SEQ), PNG and brush
+ - [ ] Inter Instance Copy/Paste
+ - [ ] Frames Paste Frame, Brushes Paste Brushes but can only be done via menus?
+ - [ ] Note Sure: Multiple Frame Copy?
+- [ ] PRG Exporter 096
+ - [ ] Update Export Windows Options
+ - [ ] Anim player export
+ - [ ] Wide/Long Screen export
+ - [ ] Faux Terminal BBS export prg
+ - [ ] Export with Dirart frame (and position of prg file before after dirart)
+ - [ ] Export with SID file
+- [ ] Guide Layer
+ - [ ] Import Image
+ - [ ] Image Placement (Position, Zoom, Lock)
+ - [ ] Image Transparency
+ - [ ] Convert Guide to PETSCII (live, no colours, 4x4)
+ - [ ] Toolbar Icon/Button
+ - [ ] Import Image
+- [ ] Shadow Characters (Icon Suggestion)
+ - [ ] Same FG/BG character colours makes colour palette useless
+ - [ ] Toggle to show in image and a way to show in palette that is obvious.
+- [ ] selections / brushes should colour cycle slightly to show they are highlighted and not drawing
 
 ## Competed Tasks (0.9.6)
 
+- [x] Fontawesome and Supporting have been updated to current versions (as of 3/7/2024)
+- [x] General UI: Move Component Palettes to top of UI and shift frame stack around it
+
 ## Competed Tasks (0.9.5)
 
-Note: I migrated c1541.git (repo) internally. It seems that the commander and other aspects of the repo do not
-work well with macosx. I don't need an external c1541 console app so now x1541.ts will handle all D64 operations internally
+Note: I migrated c1541.git (repo) internally. It seems that the commander and other aspects of the repo do not work well with macosx. I don't need an external c1541 console app so now x1541.ts will handle all D64 operations internally
 
 - [x] Colour Palette margin/padding issues on some linux versions. Test in debian works fine
 - [x] MacOSX does not like c1541 js, need to figure out. Ended up migrating c1541.git to x1541 internally.

assets/dirartpalette.petmate

@@ -0,0 +1 @@
+{"version":2,"screens":[0],"framebufs":[{"width":16,"height":25,"backgroundColor":6,"borderColor":14,"borderOn":false,"charset":"dirart","name":"dirartPalette","framebuf":[[{"code":112,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":110,"color":14}],[{"code":109,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":125,"color":14}],[{"code":85,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":73,"color":14}],[{"code":74,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":75,"color":14}],[{"code":114,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":114,"color":14}],[{"code":113,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":113,"color":14}],[{"code":107,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":64,"color":14},{"code":115,"color":14}],[{"code":35,"color":14},{"code":35,"color":14},{"code":35,"color":14},{"code":35,"color":14},{"code":35,"color":14},{"code":35,"color":14},{"code":35,"color":14},{"code":35,"color":14},{"code":35,"color":14},{"code":35,"color":14},{"code":35,"color":14},{"code":35,"color":14},{"code":35,"color":14},{"code":35,"color":14},{"code":35,"color":14},{"code":35,"color":14}],[{"code":45,"color":14},{"code":61,"color":14},{"code":45,"color":14},{"code":61,"color":14},{"code":45,"color":14},{"code":61,"color":14},{"code":45,"color":14},{"code":61,"color":14},{"code":45,"color":14},{"code":61,"color":14},{"code":45,"color":14},{"code":61,"color":14},{"code":45,"color":14},{"code":61,"color":14},{"code":45,"color":14},{"code":61,"color":14}],[{"code":67,"color":14},{"code":67,"color":14},{"code":67,"color":14},{"code":67,"color":14},{"code":67,"color":14},{"code":67,"color":14},{"code":67,"color":14},{"code":67,"color":14},{"code":67,"color":14},{"code":67,"color":14},{"code":67,"color":14},{"code":67,"color":14},{"code":67,"color":14},{"code":67,"color":14},{"code":67,"color":14},{"code":67,"color":14}],[{"code":93,"color":14},{"code":32,"color":14},{"code":32,"color":14},{"code":32,"color":14},{"code":32,"color":14},{"code":32,"color":14},{"code":32,"color":14},{"code":32,"color":14},{"code":32,"color":14},{"code":32,"color":14},{"code":32,"color":14},{"code":32,"color":14},{"code":32,"color":14},{"code":32,"color":14},{"code":32,"color":14},{"code":93,"color":14}],[{"code":61,"color":14},{"code":61,"color":14},{"code":61,"color":14},{"code":61,"color":14},{"code":61,"color":14},{"code":61,"color":14},{"code":61,"color":14},{"code":61,"color":14},{"code":61,"color":14},{"code":61,"color":14},{"code":61,"color":14},{"code":61,"color":14},{"code":61,"color":14},{"code":61,"color":14},{"code":61,"color":14},{"code":61,"color":14}],[{"code":33,"color":14},{"code":32,"color":14},{"code":32,"color":14},{"code":32,"color":14},{"code":32,"color":14},{"code":32,"color":14},{"code":32,"color":14},{"code":32,"color":14},{"code":32,"color":14},{"code":32,"color":14},{"code":32,"color":14},{"code":32,"color":14},{"code":32,"color":14},{"code":32,"color":14},{"code":32,"color":14},{"code":33,"color":14}],[{"code":82,"color":14},{"code":111,"color":14},{"code":82,"color":14},{"code":70,"color":14},{"code":64,"color":14},{"code":68,"color":14},{"code":69,"color":14},{"code":119,"color":14},{"code":119,"color":14},{"code":69,"color":14},{"code":68,"color":14},{"code":64,"color":14},{"code":70,"color":14},{"code":82,"color":14},{"code":111,"color":14},{"code":82,"color":14}],[{"code":67,"color":14},{"code":68,"color":14},{"code":67,"color":14},{"code":68,"color":14},{"code":67,"color":14},{"code":68,"color":14},{"code":67,"color":14},{"code":68,"color":14},{"code":67,"color":14},{"code":68,"color":14},{"code":67,"color":14},{"code":68,"color":14},{"code":67,"color":14},{"code":68,"color":14},{"code":67,"color":14},{"code":68,"color":14}],[{"code":45,"color":14},{"code":45,"color":14},{"code":45,"color":14},{"code":45,"color":14},{"code":45,"color":14},{"code":45,"color":14},{"code":45,"color":14},{"code":45,"color":14},{"code":45,"color":14},{"code":45,"color":14},{"code":45,"color":14},{"code":45,"color":14},{"code":45,"color":14},{"code":45,"color":14},{"code":45,"color":14},{"code":45,"color":14}],[{"code":45,"color":14},{"code":61,"color":14},{"code":58,"color":14},{"code":32,"color":14},{"code":32,"color":14},{"code":32,"color":14},{"code":32,"color":14},{"code":32,"color":14},{"code":32,"color":14},{"code":32,"color":14},{"code":32,"color":14},{"code":32,"color":14},{"code":32,"color":14},{"code":58,"color":14},{"code":61,"color":14},{"code":45,"color":14}],[{"code":45,"color":14},{"code":32,"color":14},{"code":32,"color":14},{"code":32,"color":14},{"code":32,"color":14},{"code":32,"color":14},{"code":32,"color":14},{"code":32,"color":14},{"code":32,"color":14},{"code":32,"color":14},{"code":32,"color":14},{"code":32,"color":14},{"code":32,"color":14},{"code":32,"color":14},{"code":32,"color":14},{"code":45,"color":14}],[{"code":43,"color":14},{"code":45,"color":14},{"code":45,"color":14},{"code":45,"color":14},{"code":45,"color":14},{"code":45,"color":14},{"code":45,"color":14},{"code":45,"color":14},{"code":45,"color":14},{"code":45,"color":14},{"code":45,"color":14},{"code":45,"color":14},{"code":45,"color":14},{"code":45,"color":14},{"code":45,"color":14},{"code":43,"color":14}],[{"code":61,"color":14},{"code":45,"color":14},{"code":45,"color":14},{"code":45,"color":14},{"code":45,"color":14},{"code":45,"color":14},{"code":45,"color":14},{"code":45,"color":14},{"code":45,"color":14},{"code":45,"color":14},{"code":45,"color":14},{"code":45,"color":14},{"code":45,"color":14},{"code":45,"color":14},{"code":45,"color":14},{"code":61,"color":14}],[{"code":78,"color":14},{"code":77,"color":14},{"code":78,"color":14},{"code":77,"color":14},{"code":78,"color":14},{"code":77,"color":14},{"code":78,"color":14},{"code":77,"color":14},{"code":78,"color":14},{"code":77,"color":14},{"code":78,"color":14},{"code":77,"color":14},{"code":78,"color":14},{"code":77,"color":14},{"code":78,"color":14},{"code":77,"color":14}],[{"code":81,"color":14},{"code":81,"color":14},{"code":81,"color":14},{"code":81,"color":14},{"code":81,"color":14},{"code":81,"color":14},{"code":81,"color":14},{"code":81,"color":14},{"code":81,"color":14},{"code":81,"color":14},{"code":81,"color":14},{"code":81,"color":14},{"code":81,"color":14},{"code":81,"color":14},{"code":81,"color":14},{"code":81,"color":14}],[{"code":77,"color":14},{"code":78,"color":14},{"code":77,"color":14},{"code":78,"color":14},{"code":77,"color":14},{"code":78,"color":14},{"code":77,"color":14},{"code":78,"color":14},{"code":77,"color":14},{"code":78,"color":14},{"code":77,"color":14},{"code":78,"color":14},{"code":77,"color":14},{"code":78,"color":14},{"code":77,"color":14},{"code":78,"color":14}],[{"code":78,"color":14},{"code":78,"color":14},{"code":78,"color":14},{"code":78,"color":14},{"code":78,"color":14},{"code":78,"color":14},{"code":78,"color":14},{"code":78,"color":14},{"code":78,"color":14},{"code":78,"color":14},{"code":78,"color":14},{"code":78,"color":14},{"code":78,"color":14},{"code":78,"color":14},{"code":78,"color":14},{"code":78,"color":14}],[{"code":77,"color":14},{"code":77,"color":14},{"code":77,"color":14},{"code":77,"color":14},{"code":77,"color":14},{"code":77,"color":14},{"code":77,"color":14},{"code":77,"color":14},{"code":77,"color":14},{"code":77,"color":14},{"code":77,"color":14},{"code":77,"color":14},{"code":77,"color":14},{"code":77,"color":14},{"code":77,"color":14},{"code":77,"color":14}]]}],"customFonts":{}}

package.json

@@ -4,7 +4,9 @@
  "description": "Petmate 9 - a C64 PETSCII graphics editor",
  "private": false,
  "author": "Janne Hellsten <[email protected]>",
- "contributors": ["Wolfgang Bochar <[email protected]>"],
+ "contributors": [
+ "Wolfgang Bochar <[email protected]>"
+ ],
  "license": "MIT",
  "homepage": "./",
  "main": "public/electron.js",
@@ -20,10 +22,10 @@
  "dist-linux": "npx electron-builder --x64 --linux --c.extraMetadata.main=build/electron.js -p never"
  },
  "dependencies": {
- "@fortawesome/fontawesome-svg-core": "^1.2.8",
+ "@fortawesome/fontawesome-svg-core": "^6.5.1",
  "@fortawesome/free-brands-svg-icons": "^5.5.0",
- "@fortawesome/free-solid-svg-icons": "^5.5.0",
- "@fortawesome/react-fontawesome": "^0.1.3",
+ "@fortawesome/free-solid-svg-icons": "^6.5.1",
+ "@fortawesome/react-fontawesome": "^0.2.0",
  "c64jasm": "^0.8.1",
  "classnames": "^2.2.6",
  "electron-devtools-installer": "^3.1.1",
@@ -81,7 +83,11 @@
  "linux": {
  "icon": "resources/icons",
  "target": [
- "rpm","deb","apk","freebsd","pacman"
+ "rpm",
+ "deb",
+ "apk",
+ "freebsd",
+ "pacman"
  ],
  "description": "Petmate 9",
  "category": "Graphics"

public/electron.js

@@ -98,7 +98,13 @@ app.on('ready', () => {
  createWindow();
 
  const menuBuilder = new MenuBuilder(mainWindow);
+ app.addRecentDocument("c:\\test123.petmate");
  menuBuilder.buildMenu();
+ app.addRecentDocument("c:\\test123.petmate");
+ menuBuilder.buildMenu();
+
+
+
 });
 
 app.on('window-all-closed', () => {

public/menu.js

@@ -42,6 +42,7 @@ module.exports = class MenuBuilder {
  // @ts-ignore
  const menu = Menu.buildFromTemplate(template);
  Menu.setApplicationMenu(menu);
+
  return menu;
  }