oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,656 Commits 1 Branch 0 Tags
6fdfd03ffd138dab707e126607225e43dbdcf65a
Commit Graph
105 Commits
Author SHA1 Message Date
Mike Solar 6fdfd03ffd update: update copyright 2025-08-05 17:12:49 +08:00
Mike Solar 74f73ab3be change: change code style to Linux style except indent. 2025-08-03 03:09:40 +08:00
itsmattkc 0b0582ad5c style: decrease tab font size 2023-03-20 16:20:43 -07:00
itsmattkc c1c6893713 various: moved more to core lib 2023-01-19 16:01:31 -08:00
itsmattkc dd9c52ab59 start moving core frameworks to external libraries 2023-01-19 09:51:47 -08:00
itsmattkc 4d80044d6d upgrade to qt 6 compliance 2022-10-28 19:42:14 -07:00
itsmattkc 8b350bad46 ui: integrate previously merged icons 2022-09-01 13:02:29 -07:00
itsmattkc 5e6f4b9879 Merge pull request #2025 from pgilfernandez/icon_colorpicker_and_vertical_alignment 
Colorpicker and vertical alignment icons
 2022-09-01 12:54:28 -07:00
Pablo Gil f8c4108c9a deploy dark icons and PNGs for light and dark icons 2022-09-01 16:31:59 +02:00
Pablo Gil 42a59c7452 new icons for vertical alignment and color picker 2022-09-01 16:25:45 +02:00
itsmattkc 3dfaf807af viewertexteditor: rearranged toolbar, added valign buttons 2022-08-24 14:14:50 -07:00
itsmattkc 99d9be43ad ui: use new subtitles icon 2022-05-16 08:59:38 -07:00
Pablo Gil bb5ce42916 new subtitles icon 2022-05-16 10:07:28 +02:00
itsmattkc b63b792d5a nodeparamview: added icon to "edit text in viewer" button 2022-05-13 08:41:22 -07:00
itsmattkc 4b366a9b73 update copyright year to 2022 2022-05-10 10:38:56 -07:00
Pablo Gil a059216b07 fix dark colors 2022-05-05 11:14:56 +02:00
Pablo Gil 37668aeddc Text edit icon 2022-05-05 11:03:41 +02:00
itsmattkc 91b761693b code: use config macro 
Macro is much easier to use and more readable
 2022-05-04 09:50:34 -07:00
itsmattkc fe7444e762 implemented underline, strikethrough, trackselect, and smallcaps icons 2022-04-25 12:40:55 -07:00
Pablo Gil 27cb53cc44 Icon track tool (#1901) 
* initial icon design

* Dark SVG and all PNGs
 2022-04-25 12:16:16 -07:00
Pablo Gil 006d4e76a0 Updated icon "text-underline" (#1903) 
* initial redesign

* updated Dark SVG and all PNGs
 2022-04-25 12:15:56 -07:00
Pablo Gil c04cad8ef3 Icon "text-strikethrough" (#1902) 
* initial design

* Dark SVG and all PNGs
 2022-04-25 12:15:42 -07:00
Pablo Gil 812885461e Icon "text-small-caps" (#1904) 
* initial design

* Dark SVG and all PNGs
 2022-04-25 12:15:20 -07:00
itsmattkc 9617436584 ui: disable native OS styling 
There really isn't much point to maintaining this and it directly opposes Qt's code so we'll be fighting them forever
 2022-03-30 15:07:33 -07:00
itsmattkc a4e86bac72 Merge branch 'pr/1881' 2022-03-28 13:40:27 -07:00
itsmattkc 9022a4f825 add icons for olive-light 2022-03-28 13:37:49 -07:00
itsmattkc c4711370c4 add skip existing option to style script 2022-03-28 13:37:42 -07:00
itsmattkc 99be25a67b added new icons to tracks 2022-03-28 13:33:40 -07:00
itsmattkc 16580841a6 Squashed commit of the following: 
commit 8619bb044081da81b4eef238d138bd051e678a4c
Merge: 1a767e0c2 1c30c4d36
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Sun Mar 27 23:59:10 2022 -0700

    Merge branch 'master' into gizmo-rework

commit 1a767e0c2279cac3baf96a9028c1b78ec0491e00
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Sun Mar 27 17:23:07 2022 -0700

    implement custom html parser/exporter

commit bbd9361d345ce864d198f4340b3d59f526e642e5
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Wed Mar 9 22:27:17 2022 -0800

    textgizmo: further improved behavior

commit 27634d5d377f03cab009bca418765d73764893f2
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Wed Mar 9 22:26:19 2022 -0800

    textgizmo: improved double click behavior

commit 0897ebfa36e676461c7a47305a3c1bf66e7a9fd1
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Wed Mar 9 10:20:57 2022 -0800

    text: added more features and improvements

commit 9d6446a25d977ea0c66e5f5c69239aed0e92fe83
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Wed Mar 9 10:14:59 2022 -0800

    text: don't create color input

commit d1d3b9d46e74d8197ba3485a8e965068eb245166
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Wed Mar 9 09:10:23 2022 -0800

    text: convert to reference space

commit 3ba1565129a0bdd74b860b1869fec5ef30025abb
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Mon Mar 7 17:57:26 2022 -0800

    finally got scaling to work

    holy shit I never thought it'd be this easy

commit 081368cfac9b49a171db6c1d576e134903dffac0
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Mon Mar 7 11:25:58 2022 -0800

    improved text behavior

commit f3eda52eee29b7cd354d7d90b3ae1a819e1b1cf2
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Mon Mar 7 11:08:31 2022 -0800

    implemented font styles (weights and italics)

commit 0898b613ec9b473ac93996536d00541e0a2a3f74
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Mon Mar 7 01:26:13 2022 -0800

    implemented beginnings of text gizmo

commit bffb8ede2d425e7391d16bc03e613d4d90367add
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Sun Mar 6 17:55:03 2022 -0800

    conformed transform node to new gizmos

commit 1a1f86fa9bec9ea6b67f77032748c04b6b4c95fd
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Sat Mar 5 11:16:34 2022 -0800

    update polygon node

commit 2388dd69164e8c57e0a1d221c7680a0d39173c2c
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Fri Mar 4 15:31:39 2022 -0800

    implement glsl hack for corner pin

commit e96df6cb326fb278cc6555890ff0ac1d37ebf4bf
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Thu Mar 3 17:06:14 2022 -0800

    updated corner pin

commit c70aa0e72d4e83045c84259294608c1380e8929b
Merge: 5afed6383 780342881
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Thu Mar 3 17:04:40 2022 -0800

    Merge branch 'master' into gizmo-rework

commit 5afed6383952d7d936b5eeda2556339c854610af
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Thu Mar 3 16:55:57 2022 -0800

    use float points for more precise math

commit 159ade0d2812d556dee57f99e3f733ef1e838d01
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Thu Mar 3 16:55:40 2022 -0800

    ported shape node

commit 28f9500d7bc6cd2661ee9ea591db7b3f8d583196
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Thu Mar 3 15:50:19 2022 -0800

    implemented enough dragging code to reimplement crop

    Requires far less boiler-plate code per node

commit 5aeaa59227ad2f1dc3c7f499c636de843a262a88
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Wed Mar 2 19:45:04 2022 -0800

    update just merged corner pin for new gizmos

commit 8a2d041650d1b873c6d87664564ebcdf92a3760f
Merge: c916e8e08 f5b4729a1
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Wed Mar 2 19:38:36 2022 -0800

    Merge branch 'master' into gizmo-rework

commit c916e8e08016c1d0b72d85087db76e4137587d52
Author: itsmattkc <34096995+itsmattkc@users.noreply.github.com>
Date:   Wed Mar 2 19:35:09 2022 -0800

    gizmos: rewrote drawing into standard routines

    Work towards a far more maintainable gizmo system
 2022-03-28 00:01:48 -07:00
Pablo Gil 7318d321a6 fix missing "padlock_opened" references 2022-03-15 17:27:21 +01:00
Pablo Gil ebf734fec0 autogenerated .png and manually updated .qrc 2022-03-15 16:47:57 +01:00
Pablo Gil edf7b483dc adding "mute" and "lock" timeline icons 2022-03-15 16:40:45 +01:00
itsmattkc adc30216a2 further revised icon system 
- Move QRC generation to CMake so they can be generated automatically rather than with generate-style.sh
- Removed QRC generation from generate-style.sh
- Added extra "disabled icon" generation in generate-style.sh
- Added disabled icon loading to main code
 2022-01-28 16:39:55 -08:00
Pablo Gil 4243f4921e Icons big cleanup (#1728) 
* full icon review, simplification and standarization:
- all icons share the same template (with grid and guides)
- simplified svg code
- changed names for better organization:
	- italic > text-italic
	- justify-center > align-justify-left
	- underline > text-underline
- updated previous design with Olive icons guideline
- created new icon for text-bold in case it is needed
- updated design for align-center, right and left to follow Olive icons guideline
- created new icons for alignements in case they are needed:
	- align-justify-all
	- align-justify-center
	- align-justify-left
	- align-justify-right
- updated .qrc files
- updated all .png files

* added missing "mini-map" icon

* fixed SVGs docnames and default export-filenames

* more cleanup and standarization to recently updated icons:
- align-justify-all
- align-justify-center
- align-justify-left
- align-justify-right
- text-bold
- text-italic
- text-underline

* changed some unused colors to #212121 in case the files are edited in the future, now they are set to the correct color
 2022-01-28 15:36:38 -08:00
itsmattkc 090fbb09d0 contexts in param view 2021-12-08 14:08:12 -08:00
itsmattkc cf1bd65b15 colorcoding: added f suffix for floats 2021-10-25 16:31:08 -07:00
itsmattkc 2acf261ebf use enum for color coding 2021-10-06 13:06:34 -07:00
Pablo Gil 0bf818441c tweak some colors to improve differentiation 2021-08-17 16:50:50 +02:00
Pablo Gil 8a881e03af tweak Luminance black/white limit to better suit new "color table" 2021-08-16 18:32:46 +02:00
Pablo Gil 4905251a5d tweak bright "color table" to a more relaxed ones to use in Nodes and Clips 2021-08-16 18:32:04 +02:00
Pablo Gil e5c2960ed6 remove "mini-map" Node toolbar button text and add new icon 2021-07-29 20:21:37 +02:00
Pablo Gil c2a506082a add mini-map icon 2021-07-28 19:27:49 +02:00
itsmattkc 539b0582bf Merge pull request #1399 from pgilfernandez/icon_nodes2 
[UI] Nodes View toolbar iconset
 2021-07-10 09:08:38 -07:00
itsmattkc 77d4b18a60 updated copyright year for 2021 [skip ci] 2021-04-17 18:56:50 +10:00
itsmattkc 3ce29f9093 apparently these weren't committed before, whoops 2021-01-22 17:07:42 +11:00
itsmattkc b4dd976e90 revised UI color system when showing nodes 
Olive now has a set of colors that categories can be "assigned" to. The timeline also shares the same colors as the NodeView. Colors can be configured per node (aka per clip).
 2021-01-15 18:44:34 +11:00
itsmattkc ad0cefecaf remove now commented out ifdef guard 2021-01-14 10:30:33 +11:00
itsmattkc 19eabf2830 fixed variable that didn't change since it was behind an ifdef guard 2020-12-30 18:27:44 +11:00
itsmattkc c0095a40ce cache platform palette on load 2020-12-30 18:10:38 +11:00
itsmattkc 240fe81961 extend UI styling to 5.15.2 since they still haven't fixed this bug 2020-11-27 12:49:51 +11:00