Skip to content

Commit a80fe82

Browse files
manongjohnmanongjohn
committed
Merge branch 'master' from opentoonz
2 parents caf5b6e + 830dc34 commit a80fe82

File tree

111 files changed

+7525
-2463
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

111 files changed

+7525
-2463
lines changed

‎stuff/config/current.txt‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,7 @@
187187
<item>"STD_colorRaylitFx.intensity" "Intensity" </item>
188188
<item>"STD_colorRaylitFx.decay" "Decay" </item>
189189
<item>"STD_colorRaylitFx.smoothness" "Smoothness" </item>
190+
<item>"STD_colorRaylitFx.radius" "Radius" </item>
190191
<item>"STD_colorRaylitFx.includeInput" "Keep Image" </item>
191192

192193
<item>"STD_erodeDilateFx" "Erode/Dilate" </item>
@@ -370,6 +371,7 @@
370371
<item>"STD_raylitFx.intensity" "Intensity" </item>
371372
<item>"STD_raylitFx.decay" "Decay" </item>
372373
<item>"STD_raylitFx.smoothness" "Smoothness" </item>
374+
<item>"STD_raylitFx.radius" "Radius" </item>
373375
<item>"STD_raylitFx.includeInput" "Keep Image" </item>
374376
<item>"STD_raylitFx.invert" "Invert" </item>
375377

@@ -1185,6 +1187,7 @@
11851187
<item>"STD_iwa_PNPerspectiveFx.eyeLevel" "Eye Level"</item>
11861188
<item>"STD_iwa_PNPerspectiveFx.alpha_rendering" "Alpha Rendering"</item>
11871189
<item>"STD_iwa_PNPerspectiveFx.waveHeight" "Wave Height"</item>
1190+
<item>"STD_iwa_PNPerspectiveFx.normalize_fresnel" "Normalize Intensity"</item>
11881191

11891192
<item>"STD_iwa_SoapBubbleFx" "SoapBubble Iwa" </item>
11901193
<item>"STD_iwa_SoapBubbleFx.renderMode" "Render Mode" </item>
@@ -1350,10 +1353,23 @@
13501353

13511354
<item>"STD_iwa_BloomFx" "Bloom Iwa" </item>
13521355
<item>"STD_iwa_BloomFx.gamma" "Gamma" </item>
1356+
<item>"STD_iwa_BloomFx.auto_gain" "Auto Gain" </item>
1357+
<item>"STD_iwa_BloomFx.gain_adjust" "Gain Adjustment" </item>
13531358
<item>"STD_iwa_BloomFx.gain" "Gain" </item>
1359+
<item>"STD_iwa_BloomFx.decay" "Decay" </item>
13541360
<item>"STD_iwa_BloomFx.size" "Size" </item>
1361+
<item>"STD_iwa_BloomFx.alpha_mode" "Alpha Mode" </item>
13551362
<item>"STD_iwa_BloomFx.alpha_rendering" "Alpha Rendering" </item>
13561363

1364+
<item>"STD_iwa_RainbowFx" "Rainbow Iwa" </item>
1365+
<item>"STD_iwa_RainbowFx.center" "Center" </item>
1366+
<item>"STD_iwa_RainbowFx.radius" "Radius" </item>
1367+
<item>"STD_iwa_RainbowFx.intensity" "Intensity" </item>
1368+
<item>"STD_iwa_RainbowFx.width_scale" "Width Scale" </item>
1369+
<item>"STD_iwa_RainbowFx.inside" "Inside Intensity" </item>
1370+
<item>"STD_iwa_RainbowFx.secondary_rainbow" "Secondary Rainbow Intesity" </item>
1371+
<item>"STD_iwa_RainbowFx.alpha_rendering" "Alpha Rendering" </item>
1372+
13571373
<!------------------------------ Tiled Particles Iwa ------------------------------------------->
13581374

13591375
<item>STD_iwa_TiledParticlesFx "Tiled Particles Iwa" </item>

‎stuff/config/qss/Blue/Blue.qss‎

Lines changed: 36 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1193,30 +1193,49 @@ QGroupBox:disabled {
11931193
/* -----------------------------------------------------------------------------
11941194
Slider
11951195
----------------------------------------------------------------------------- */
1196-
.Slider::groove:horizontal,
1197-
QSlider::groove:horizontal {
1196+
.Slider::groove,
1197+
QSlider::groove {
11981198
background-color: transparent;
11991199
background-image: url('../Default/imgs/white/slider-groove.svg');
12001200
background-position: center center;
1201-
background-repeat: repeat-x;
12021201
margin: 0;
1202+
}
1203+
.Slider::groove:horizontal,
1204+
QSlider::groove:horizontal {
1205+
background-repeat: repeat-x;
12031206
height: 20;
12041207
min-height: 20;
12051208
}
1206-
.Slider::groove:horizontal:disabled,
1207-
QSlider::groove:horizontal:disabled {
1209+
.Slider::groove:vertical,
1210+
QSlider::groove:vertical {
1211+
background-repeat: repeat-y;
1212+
width: 20;
1213+
min-width: 20;
1214+
}
1215+
.Slider::groove:disabled,
1216+
QSlider::groove:disabled {
12081217
background-image: url('../Default/imgs/white/slider-groove_disabled.svg');
12091218
}
12101219
.Slider::handle:horizontal,
12111220
QSlider::handle:horizontal {
1212-
width: 10;
12131221
margin: -2 -1;
1222+
width: 10;
12141223
image: url('../Default/imgs/white/slider-handle.svg');
12151224
}
12161225
.Slider::handle:horizontal:disabled,
12171226
QSlider::handle:horizontal:disabled {
12181227
image: url('../Default/imgs/white/slider-handle_disabled.svg');
12191228
}
1229+
.Slider::handle:vertical,
1230+
QSlider::handle:vertical {
1231+
margin: -1 -2;
1232+
height: 10;
1233+
image: url('../Default/imgs/white/slider-v-handle.svg');
1234+
}
1235+
.Slider::handle:vertical:disabled,
1236+
QSlider::handle:vertical:disabled {
1237+
image: url('../Default/imgs/white/slider-v-handle_disabled.svg');
1238+
}
12201239
/* -----------------------------------------------------------------------------
12211240
Double Slider
12221241
----------------------------------------------------------------------------- */
@@ -1669,6 +1688,17 @@ QDialog #dialogButtonFrame QPushButton:focus:pressed {
16691688
width: 16;
16701689
margin-right: -1;
16711690
}
1691+
#ShortcutViewer {
1692+
font-size: 17px;
1693+
}
1694+
#ShortcutViewer QLineEdit {
1695+
color: black;
1696+
border-color: #b8bc7f;
1697+
background-color: white;
1698+
}
1699+
#ShortcutViewer QLineEdit:focus {
1700+
background-color: #abceff;
1701+
}
16721702
/* -----------------------------------------------------------------------------
16731703
New Project / Configure Project Window
16741704
----------------------------------------------------------------------------- */

‎stuff/config/qss/Dark/Dark.qss‎

Lines changed: 36 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1193,30 +1193,49 @@ QGroupBox:disabled {
11931193
/* -----------------------------------------------------------------------------
11941194
Slider
11951195
----------------------------------------------------------------------------- */
1196-
.Slider::groove:horizontal,
1197-
QSlider::groove:horizontal {
1196+
.Slider::groove,
1197+
QSlider::groove {
11981198
background-color: transparent;
11991199
background-image: url('../Default/imgs/white/slider-groove_dark.svg');
12001200
background-position: center center;
1201-
background-repeat: repeat-x;
12021201
margin: 0;
1202+
}
1203+
.Slider::groove:horizontal,
1204+
QSlider::groove:horizontal {
1205+
background-repeat: repeat-x;
12031206
height: 20;
12041207
min-height: 20;
12051208
}
1206-
.Slider::groove:horizontal:disabled,
1207-
QSlider::groove:horizontal:disabled {
1209+
.Slider::groove:vertical,
1210+
QSlider::groove:vertical {
1211+
background-repeat: repeat-y;
1212+
width: 20;
1213+
min-width: 20;
1214+
}
1215+
.Slider::groove:disabled,
1216+
QSlider::groove:disabled {
12081217
background-image: url('../Default/imgs/white/slider-groove_disabled_dark.svg');
12091218
}
12101219
.Slider::handle:horizontal,
12111220
QSlider::handle:horizontal {
1212-
width: 10;
12131221
margin: -2 -1;
1222+
width: 10;
12141223
image: url('../Default/imgs/white/slider-handle.svg');
12151224
}
12161225
.Slider::handle:horizontal:disabled,
12171226
QSlider::handle:horizontal:disabled {
12181227
image: url('../Default/imgs/white/slider-handle_disabled.svg');
12191228
}
1229+
.Slider::handle:vertical,
1230+
QSlider::handle:vertical {
1231+
margin: -1 -2;
1232+
height: 10;
1233+
image: url('../Default/imgs/white/slider-v-handle.svg');
1234+
}
1235+
.Slider::handle:vertical:disabled,
1236+
QSlider::handle:vertical:disabled {
1237+
image: url('../Default/imgs/white/slider-v-handle_disabled.svg');
1238+
}
12201239
/* -----------------------------------------------------------------------------
12211240
Double Slider
12221241
----------------------------------------------------------------------------- */
@@ -1669,6 +1688,17 @@ QDialog #dialogButtonFrame QPushButton:focus:pressed {
16691688
width: 16;
16701689
margin-right: -1;
16711690
}
1691+
#ShortcutViewer {
1692+
font-size: 17px;
1693+
}
1694+
#ShortcutViewer QLineEdit {
1695+
color: black;
1696+
border-color: #b8bc7f;
1697+
background-color: white;
1698+
}
1699+
#ShortcutViewer QLineEdit:focus {
1700+
background-color: #abceff;
1701+
}
16721702
/* -----------------------------------------------------------------------------
16731703
New Project / Configure Project Window
16741704
----------------------------------------------------------------------------- */

‎stuff/config/qss/Default/Default.qss‎

Lines changed: 36 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1193,30 +1193,49 @@ QGroupBox:disabled {
11931193
/* -----------------------------------------------------------------------------
11941194
Slider
11951195
----------------------------------------------------------------------------- */
1196-
.Slider::groove:horizontal,
1197-
QSlider::groove:horizontal {
1196+
.Slider::groove,
1197+
QSlider::groove {
11981198
background-color: transparent;
11991199
background-image: url('imgs/white/slider-groove.svg');
12001200
background-position: center center;
1201-
background-repeat: repeat-x;
12021201
margin: 0;
1202+
}
1203+
.Slider::groove:horizontal,
1204+
QSlider::groove:horizontal {
1205+
background-repeat: repeat-x;
12031206
height: 20;
12041207
min-height: 20;
12051208
}
1206-
.Slider::groove:horizontal:disabled,
1207-
QSlider::groove:horizontal:disabled {
1209+
.Slider::groove:vertical,
1210+
QSlider::groove:vertical {
1211+
background-repeat: repeat-y;
1212+
width: 20;
1213+
min-width: 20;
1214+
}
1215+
.Slider::groove:disabled,
1216+
QSlider::groove:disabled {
12081217
background-image: url('imgs/white/slider-groove_disabled.svg');
12091218
}
12101219
.Slider::handle:horizontal,
12111220
QSlider::handle:horizontal {
1212-
width: 10;
12131221
margin: -2 -1;
1222+
width: 10;
12141223
image: url('imgs/white/slider-handle.svg');
12151224
}
12161225
.Slider::handle:horizontal:disabled,
12171226
QSlider::handle:horizontal:disabled {
12181227
image: url('imgs/white/slider-handle_disabled.svg');
12191228
}
1229+
.Slider::handle:vertical,
1230+
QSlider::handle:vertical {
1231+
margin: -1 -2;
1232+
height: 10;
1233+
image: url('imgs/white/slider-v-handle.svg');
1234+
}
1235+
.Slider::handle:vertical:disabled,
1236+
QSlider::handle:vertical:disabled {
1237+
image: url('imgs/white/slider-v-handle_disabled.svg');
1238+
}
12201239
/* -----------------------------------------------------------------------------
12211240
Double Slider
12221241
----------------------------------------------------------------------------- */
@@ -1669,6 +1688,17 @@ QDialog #dialogButtonFrame QPushButton:focus:pressed {
16691688
width: 16;
16701689
margin-right: -1;
16711690
}
1691+
#ShortcutViewer {
1692+
font-size: 17px;
1693+
}
1694+
#ShortcutViewer QLineEdit {
1695+
color: black;
1696+
border-color: #b8bc7f;
1697+
background-color: white;
1698+
}
1699+
#ShortcutViewer QLineEdit:focus {
1700+
background-color: #abceff;
1701+
}
16721702
/* -----------------------------------------------------------------------------
16731703
New Project / Configure Project Window
16741704
----------------------------------------------------------------------------- */

‎stuff/config/qss/Default/imgs/black/slider-v-handle.svg‎

Lines changed: 55 additions & 0 deletions
Loading

‎stuff/config/qss/Default/imgs/black/slider-v-handle_disabled.svg‎

Lines changed: 55 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)