af90cdedbe
* add multi arc mockup * implement mutli arc * add join and smooth option * reset multiarc and arc when deactivated * create self loop if the last point is the same as the first * make join option in multiarc consistent with tape tool * fix a bug where thickness don't affect mutliarc in vector level * remove join option in geometric tool * stop mutliarc after closing shape * double click can also end multi arc * fix a bug where multiArc will produce buggy stroke * fix a bug where geometric tools is not deactivated * add multiArc shortcut * rewrite multiArc * revert changes to tvectorimage * add undo data for multiArc * Paste as Copy Command for XSheet * Remove unneeded code * Bug fix * prevent guide lines from jumping around in MultiArc * make stroke color consistent in MultiArc * remove color in MultiArc's undo data * make color consistent in MultiArc with previous version * Fix single image raster levels * fix compilation error * fix a bug where multiArc might generate bugged stroke * Remove ICONV dep (#3304) * fix crash on saving studio palette * Move to Paste Special Menu * Don't Set Fixed Width if Docking a Floating Panel * Update how_to_build_win.md New draft of pr for requested changes to windows build instructions. * fix geometric tool multiarc smooth option * fix level saving failure * fix wrong warning after saving palette * fix a bug where moving a control point while holding alt has unintended result * fix travis-install (#3389) * Fix assert debug crash in flipconsole.cpp Fix crash when using the viewer controls in the console (debug) * Redraw Audio Waveform Fills the waveform rather than outlines it. * Update .gitignore * fix undo data when drawing arc and mutliarc * fix overwriting raster drawing palette (#3387) * mode sensitive fx settings * Create New Style Command Button (#3394) * Create New Style Command Button This PR creates a new button in the pallette editor that creates a new style. Button is large and easy access for a faster and easier workflow. Original code developed by Turtletooth for Tahoma. Given permission to develop within Openoonz. Co-Authored-By: Jeremy Bullock <turtletooth@users.noreply.github.com> * Update paletteviewergui.cpp Made changes to the PR per request by Shun. * Fixed a space within the code that wasn't suppose to be there. Co-authored-by: Jeremy Bullock <turtletooth@users.noreply.github.com> * tahoma license (#3396) * new style button optional * fix loading pegbars (removing updateKeyframes) * periodic random expression * add fx in linear color space this commit is based on source for the ComposeAdd plugin fx by DWANGO Co., Ltd. in dwango_opentoonz_plugins and opentoonz_plugin_utility repositories. * fractal noise iwa fx * skip unnecessary icon invalidation * fix frame range fill with tablet * stop function editor to open by dbl clicking key * Expanding the radius of the rotation handle. This just changes when the cursor transforms into the rotation tool. (cherry picked from commit 7722ae989bbdc6aa5cb48df7a4c08bae1fe6ea39) * fix vector img patern stroke style * Update Stylesheets - Support the new icon sizes - XSheet and Timeline significantly redesigned - Lots of margin fixes and refactoring - Remove deprecated icons, as some icons are moved into binary - New Light theme * New Icons - Redesigns almost every icon as symbolic - Adds icons for most commands * Add Option for Icon Themes - Adds option for icon themes - Removes useless label from Preferences category list * Update Icon Functions - Adds themePath() boolean - Adds function for recoloring black pixels in pixmaps to any color - Rebuilds createQIcon to use fromTheme() and recolorPixmap() - Removes createQIconOnOff as it seemed to be a rarely used duplicate of createQIcon - Removes a grey horizontal line drawn above the console play bar in the viewer * Set Default Icon Theme and Paths - Sets search paths for icons for use with QIcon::fromTheme() - Sets default start icon theme on first install - Sets flag for displaying icons in menus, so we can selectively hide them * Set Icons for Commands - Sets icons for the commands - Hides icons being displayed in menus as most icons are 20x20, they will look blurry when shrunk to 16x16 - Selectively allows icons to display for Tools in menus * Change Icon Sizes, General Fixes and Stylesheet Additions - Change icon sizes to new size - Remove margin around FX Editor window - Remove white line under color sliders in Style Editor - Make keyframe icons uniform and color stylable in the stylesheets - Removes deprecated stylesheet strings - Redesign GUI for palette list view - Make tree list header sort row stylable - Remove black lines from scrollbars in New Project window - Remove margin around combobox in Level Strip - Alter how some lines are drawn in the Timeline to fix some alpha issues - Make conditional fixed onion skin and normal onion skin dots contrast more against a light background area to make sure they have good visibility - Make text always viewable in the FPS field in console bar - Increase size of radio buttons in Cleanup Settings - Increase size of switches in motion path nodes - Remove unessesary "Layer" label in Timeline and other rects - Various colors made stylable in the stylesheets; palette numpad and selection frame, cleanup settings border, scene cast folder path, schematic lines, ruler, xsheet lines, keyframes, cell input box and more - Moves some external stylesheet icons into binary * Make TPanelTitleBar Icon States Stylable - Makes icon states for TPanelTitleBar buttons stylable in stylesheets * Travis Fixes * Swap Startup Popup Logos They were in the wrong folders * Revert "Swap Startup Popup Logos" This reverts commit 815908a9f3e725f48507dab8a2270bdfa045649d. * Fix Startup Popup Logo It wasn't switching * Feedback Changes - Change render visualization to clapboard - Fix text contrast on levels in XSheet * Make Cell Selection More Clear * Darken Light Theme and Tint Empty Cell Selection * Fix missing icons * Fix memo button * Bring back colors * Hide Motion Tab * Fix Play Range Area (Light) Make play range area more visible * Vector Column Color Co-authored-by: pojienie <pojienie@gmail.com> Co-authored-by: rim <11380091+rozhuk-im@users.noreply.github.com> Co-authored-by: shun-iwasawa <shun.iwasawa@ghibli.jp> Co-authored-by: Rodney <rodney.baker@gmail.com> Co-authored-by: DoctorRyan <65507211+DoctorRyan@users.noreply.github.com> Co-authored-by: shun-iwasawa <shun-iwasawa@users.noreply.github.com> Co-authored-by: Kite <konero@users.noreply.github.com> Co-authored-by: Jeremy Bullock <turtletooth@users.noreply.github.com> Co-authored-by: DoctorRyan <doctorryan1969.gmail.com>
281 lines
12 KiB
Text
281 lines
12 KiB
Text
/* -----------------------------------------------------------------------------
|
|
XSheet Viewer
|
|
----------------------------------------------------------------------------- */
|
|
|
|
/* ScrollAreas (Row, Column and Cell)
|
|
----------------------------------------------------------------------------- */
|
|
|
|
#xsheetArea,
|
|
#ScrollArea {
|
|
background-color: @xsheet-empty-bg-color;
|
|
border: 0;
|
|
}
|
|
|
|
#xsheetScrollArea {
|
|
border: 0;
|
|
}
|
|
|
|
#cornerWidget {
|
|
& QToolButton {
|
|
padding: 0;
|
|
}
|
|
}
|
|
|
|
#XsheetCellArea {
|
|
& QLineEdit {
|
|
margin-top: 1; // make it align with cell-selection box
|
|
&:focus {
|
|
border-radius: 0;
|
|
border-width: 2; // boost the contrast
|
|
border-left-width: 2; // make it align with cell-selection box
|
|
border-color: @xsheet-CellFocus-color;
|
|
background-color: @xsheet-CellArea-bg-color-focus;
|
|
}
|
|
}
|
|
}
|
|
|
|
#RenameCellField {
|
|
padding-right: 3;
|
|
}
|
|
|
|
/* xsheetColumnHeader (Context Menus)
|
|
----------------------------------------------------------------------------- */
|
|
|
|
#xsheetColumnAreaMenu_Preview {
|
|
background-color: @xsheet-menu-preview-color;
|
|
}
|
|
|
|
#xsheetColumnAreaMenu_Lock {
|
|
background-color: @xsheet-menu-lock-color;
|
|
}
|
|
|
|
#xsheetColumnAreaMenu_Camstand {
|
|
background-color: @xsheet-menu-camstand-color;
|
|
}
|
|
|
|
#xsheetColumnAreaMenu_Preview,
|
|
#xsheetColumnAreaMenu_Lock,
|
|
#xsheetColumnAreaMenu_Camstand {
|
|
color: @xsheet-menu-text-color;
|
|
}
|
|
|
|
#noteTextEdit{
|
|
color: @xsheet-notes-text-color;
|
|
}
|
|
|
|
#DvMiniToolBar {
|
|
border: 1 solid @accent;
|
|
}
|
|
|
|
/* XSheet Spreadsheet
|
|
----------------------------------------------------------------------------- */
|
|
|
|
XsheetViewer {
|
|
qproperty-TextColor: @xsheet-text-color;
|
|
qproperty-ErrorTextColor: @xsheet-error-text-color;
|
|
qproperty-BGColor: @xsheet-bg-color;
|
|
qproperty-LightLineColor: @xsheet-LightLine-color;
|
|
qproperty-MarkerLineColor: @xsheet-MarkerLine-color;
|
|
qproperty-VerticalLineColor: @xsheet-VerticalLine-color;
|
|
qproperty-VerticalLineHeadColor: @xsheet-VerticalLineHead-color;
|
|
qproperty-PreviewFrameTextColor: @xsheet-PreviewFrameText-color;
|
|
qproperty-CurrentRowBgColor: @xsheet-CurrentRowBG-color;
|
|
qproperty-OnionSkinAreaBgColor: @xsheet-OnionSkinAreaBG-color;
|
|
qproperty-CellFocusColor: @xsheet-CellFocus-color;
|
|
qproperty-ColumnIconLineColor: @xsheet-ColumnIconLine-color;
|
|
qproperty-EmptyColumnHeadColor: @xsheet-EmptyColumnHead-color;
|
|
qproperty-ColumnHeadPastelizer: @xsheet-ColumnHeadPastelizer-color;
|
|
qproperty-SelectedColumnHead: @xsheet-SelectedColumnHead-color;
|
|
qproperty-PlayRangeColor: @xsheet-PlayRange-Color;
|
|
|
|
qproperty-FoldedColumnBGColor: @xsheet-FoldedColumnBG-color;
|
|
qproperty-FoldedColumnLineColor: @xsheet-FoldedColumnLine-color;
|
|
|
|
qproperty-EmptyCellColor: @xsheet-EmptyCell-color;
|
|
qproperty-NotEmptyColumnColor: @xsheet-NotEmptyColumn-color; // Not empty "cell"
|
|
qproperty-SelectedEmptyCellColor: @xsheet-SelectedEmptyCell-color;
|
|
|
|
// Level Type Colors
|
|
qproperty-LevelColumnColor: @xsheet-LevelColumn-color;
|
|
qproperty-LevelColumnBorderColor: desaturate(darken(@xsheet-LevelColumn-color, @columnBorderDarkness), @columnBorderDesaturation);
|
|
qproperty-SelectedLevelColumnColor: mix(shade(@xsheet-LevelColumn-color, @cellHighlightLightness), @cellHighlightTintColor, @cellHighlightTintAmount);
|
|
|
|
qproperty-VectorColumnColor: @xsheet-VectorColumn-color;
|
|
qproperty-VectorColumnBorderColor: desaturate(darken(@xsheet-VectorColumn-color, @columnBorderDarkness), @columnBorderDesaturation);
|
|
qproperty-SelectedVectorColumnColor: mix(shade(@xsheet-VectorColumn-color, @cellHighlightLightness), @cellHighlightTintColor, @cellHighlightTintAmount);
|
|
|
|
qproperty-ChildColumnColor: @xsheet-ChildColumn-color;
|
|
qproperty-ChildColumnBorderColor: desaturate(darken(@xsheet-ChildColumn-color, @columnBorderDarkness), @columnBorderDesaturation);
|
|
qproperty-SelectedChildColumnColor: mix(shade(@xsheet-ChildColumn-color, @cellHighlightLightness), @cellHighlightTintColor, @cellHighlightTintAmount);
|
|
|
|
qproperty-FullcolorColumnColor: @xsheet-FullColorColumn-color;
|
|
qproperty-FullcolorColumnBorderColor: desaturate(darken(@xsheet-FullColorColumn-color, @columnBorderDarkness), @columnBorderDesaturation);
|
|
qproperty-SelectedFullcolorColumnColor: mix(shade(@xsheet-FullColorColumn-color, @cellHighlightLightness), @cellHighlightTintColor, @cellHighlightTintAmount);
|
|
|
|
qproperty-FxColumnColor: @xsheet-FxColumn-color;
|
|
qproperty-FxColumnBorderColor: desaturate(darken(@xsheet-FxColumn-color, @columnBorderDarkness), @columnBorderDesaturation);
|
|
qproperty-SelectedFxColumnColor: mix(shade(@xsheet-FxColumn-color, @cellHighlightLightness), @cellHighlightTintColor, @cellHighlightTintAmount);
|
|
|
|
qproperty-ReferenceColumnColor: @xsheet-ReferenceColumn-color;
|
|
qproperty-ReferenceColumnBorderColor: desaturate(darken(@xsheet-ReferenceColumn-color, @columnBorderDarkness), @columnBorderDesaturation);
|
|
qproperty-SelectedReferenceColumnColor: mix(shade(@xsheet-ReferenceColumn-color, @cellHighlightLightness), @cellHighlightTintColor, @cellHighlightTintAmount);
|
|
|
|
qproperty-PaletteColumnColor: @xsheet-PaletteColumn-color;
|
|
qproperty-PaletteColumnBorderColor: desaturate(darken(@xsheet-PaletteColumn-color, @columnBorderDarkness), @columnBorderDesaturation);
|
|
qproperty-SelectedPaletteColumnColor: mix(shade(@xsheet-PaletteColumn-color, @cellHighlightLightness), @cellHighlightTintColor, @cellHighlightTintAmount);
|
|
|
|
qproperty-MeshColumnColor: @xsheet-MeshColumn-color;
|
|
qproperty-MeshColumnBorderColor: desaturate(darken(@xsheet-MeshColumn-color, @columnBorderDarkness), @columnBorderDesaturation);
|
|
qproperty-SelectedMeshColumnColor: mix(shade(@xsheet-MeshColumn-color, @cellHighlightLightness), @cellHighlightTintColor, @cellHighlightTintAmount);
|
|
|
|
qproperty-SoundTextColumnColor: @xsheet-SoundTextColumn-color;
|
|
qproperty-SoundTextColumnBorderColor: desaturate(darken(@xsheet-SoundTextColumn-color, @columnBorderDarkness), @columnBorderDesaturation);
|
|
qproperty-SelectedSoundTextColumnColor: mix(shade(@xsheet-SoundTextColumn-color, @cellHighlightLightness), @cellHighlightTintColor, @cellHighlightTintAmount);
|
|
|
|
qproperty-SoundColumnColor: @xsheet-SoundColumn-color;
|
|
qproperty-SoundColumnBorderColor: desaturate(darken(@xsheet-SoundColumn-color, @columnBorderDarkness), @columnBorderDesaturation);
|
|
qproperty-SelectedSoundColumnColor: mix(shade(@xsheet-SoundColumn-color, @cellHighlightLightness), @cellHighlightTintColor, @cellHighlightTintAmount);
|
|
qproperty-SoundColumnHlColor: @xsheet-SoundColumnHL-color;
|
|
qproperty-SoundColumnTrackColor: @xsheet-SoundColumnTrack-color;
|
|
|
|
qproperty-ActiveCameraColor: @xsheet-ActiveCamera-color;
|
|
qproperty-SelectedActiveCameraColor: mix(shade(@xsheet-ActiveCamera-color, @cellHighlightLightness), @cellHighlightTintColor, @cellHighlightTintAmount);
|
|
qproperty-OtherCameraColor: @xsheet-OtherCamera-color;
|
|
qproperty-SelectedOtherCameraColor: mix(shade(@xsheet-OtherCamera-color, @cellHighlightLightness), @cellHighlightTintColor, @cellHighlightTintAmount);
|
|
|
|
qproperty-LightLightBGColor: @function-LightLightBG-color;
|
|
qproperty-LightBGColor: @xsheet-LightBG-color;
|
|
qproperty-DarkBGColor: @xsheet-DarkBG-color;
|
|
qproperty-DarkLineColor: @xsheet-DarkLine-color;
|
|
|
|
// Column Header: Vertical
|
|
qproperty-TimelineIconLineColor: @timeline-IconLine-color;
|
|
qproperty-XsheetColumnNameBgColor: @xsheet-ColumnNameBg-color;
|
|
qproperty-XsheetDragBarHighlightColor: @xsheet-DragBarHighlight-color;
|
|
|
|
qproperty-XsheetPreviewButtonBgOnColor: @xsheet-PreviewButtonBgOn-color;
|
|
qproperty-XsheetPreviewButtonOnImage: url('@{img-url}/x_prev_eye_on.svg');
|
|
qproperty-XsheetPreviewButtonBgOffColor: transparent;
|
|
qproperty-XsheetPreviewButtonOffImage: url('@{img-url}/x_prev_eye_off.svg');
|
|
|
|
qproperty-XsheetCamstandButtonBgOnColor: @xsheet-CamstandButtonBgOn-color;
|
|
qproperty-XsheetCamstandButtonOnImage: url('@{img-url}/x_table_view_on.svg');
|
|
qproperty-XsheetCamstandButtonTranspImage: url('@{img-url}/x_table_view_transp.svg');
|
|
qproperty-XsheetCamstandButtonBgOffColor: transparent;
|
|
qproperty-XsheetCamstandButtonOffImage: url('@{img-url}/x_table_view_off.svg');
|
|
|
|
qproperty-XsheetLockButtonBgOnColor: @xsheet-LockButtonBgOn-color;
|
|
qproperty-XsheetLockButtonOnImage: url('@{img-url}/x_lock_on.svg');
|
|
qproperty-XsheetLockButtonBgOffColor: transparent;
|
|
qproperty-XsheetLockButtonOffImage: url('@{img-url}/x_lock_off.svg');
|
|
|
|
qproperty-XsheetConfigButtonBgColor: @xsheet-ConfigButtonBg-color;
|
|
qproperty-XsheetConfigButtonImage: url('@{img-url}/x_config.svg');
|
|
|
|
qproperty-FrameRangeMarkerLineColor: @timeline-FrameRangeMarkerLine-color;
|
|
|
|
// Column Header: Horizontal
|
|
qproperty-TimelinePreviewButtonBgOnColor: @bg;
|
|
qproperty-TimelinePreviewButtonOnImage: url('@{img-url}/preview_small.svg');
|
|
qproperty-TimelinePreviewButtonBgOffColor: @bg;
|
|
qproperty-TimelinePreviewButtonOffImage: url('none');
|
|
|
|
qproperty-TimelineCamstandButtonBgOnColor: @bg;
|
|
qproperty-TimelineCamstandButtonOnImage: url('@{img-url}/table_small.svg');
|
|
qproperty-TimelineCamstandButtonTranspImage: url('@{img-url}/trans_small.svg');
|
|
qproperty-TimelineCamstandButtonBgOffColor: @bg;
|
|
qproperty-TimelineCamstandButtonOffImage: url('none');
|
|
|
|
qproperty-TimelineLockButtonBgOnColor: @bg;
|
|
qproperty-TimelineLockButtonOnImage: url('@{img-url}/lock_on_small.svg');
|
|
qproperty-TimelineLockButtonBgOffColor: @bg;
|
|
qproperty-TimelineLockButtonOffImage: url('none');
|
|
|
|
qproperty-TimelineConfigButtonBgColor: @bg;
|
|
qproperty-TimelineConfigButtonImage: url('@{img-url}/timeline_config.svg');
|
|
|
|
// Header Control
|
|
qproperty-LayerHeaderPreviewImage: url('@{img-url}/layer_header_prev_eye.svg');
|
|
qproperty-LayerHeaderPreviewOverImage: url('@{img-url}/layer_header_prev_eye_over.svg');
|
|
qproperty-LayerHeaderCamstandImage: url('@{img-url}/layer_header_table_view.svg');
|
|
qproperty-LayerHeaderCamstandOverImage: url('@{img-url}/layer_header_table_view_over.svg');
|
|
qproperty-LayerHeaderLockImage: url('@{img-url}/layer_lock_on.svg');
|
|
qproperty-LayerHeaderLockOverImage: url('@{img-url}/layer_lock_on_over.svg');
|
|
}
|
|
|
|
/* -----------------------------------------------------------------------------
|
|
Function Editor
|
|
----------------------------------------------------------------------------- */
|
|
|
|
#FunctionEditor {
|
|
& QToolBar {
|
|
border-bottom: 1 solid @accent;
|
|
background-color: transparent;
|
|
padding-bottom: 10;
|
|
& QToolBar {
|
|
border: 0;
|
|
}
|
|
& QToolButton {
|
|
margin-bottom: 2;
|
|
}
|
|
}
|
|
}
|
|
|
|
#FunctionParametersPanel {
|
|
&:extend(.frame all);
|
|
}
|
|
|
|
#FunctionEditorTree {
|
|
&:extend(.treeview all);
|
|
border-top: 1 solid @accent;
|
|
}
|
|
|
|
FunctionTreeView {
|
|
qproperty-TextColor: @function-treeview-text-color;
|
|
}
|
|
|
|
/* Function Editor Spreadsheet
|
|
----------------------------------------------------------------------------- */
|
|
|
|
// If a qproperty shares the same likeness with XSheet then pair the variables.
|
|
// XSheet should be considered as parent.
|
|
|
|
FunctionPanel {
|
|
qproperty-BGColor: @function-panel-bg-color;
|
|
qproperty-ValueLineColor: @function-panel-ValueLine-color;
|
|
qproperty-FrameLineColor: @function-panel-FrameLine-color;
|
|
qproperty-OtherCurvesColor: @function-panel-OtherCurves-color;
|
|
qproperty-RulerBackground: @function-panel-RulerBG-color;
|
|
qproperty-TextColor: @function-panel-Text-color;
|
|
qproperty-SubColor: @function-panel-Sub-color;
|
|
qproperty-SelectedColor: @function-panel-Selected-color;
|
|
}
|
|
|
|
SpreadsheetViewer {
|
|
qproperty-LightLightBGColor: @function-LightLightBG-color; // paired
|
|
qproperty-CurrentRowBgColor: @xsheet-CurrentRowBG-color; // paired
|
|
qproperty-LightLineColor: @xsheet-LightLine-color; // paired
|
|
qproperty-MarkerLineColor: @xsheet-MarkerLine-color; // paired
|
|
qproperty-BGColor: @xsheet-NotEmptyColumn-color; // paired
|
|
qproperty-VerticalLineColor: @xsheet-VerticalLine-color; // paired
|
|
qproperty-KeyFrameColor: @function-KeyFrame-color;
|
|
qproperty-KeyFrameBorderColor: @function-KeyFrameBorder-color;
|
|
qproperty-SelectedKeyFrameColor: @function-SelectedKeyFrame-color;
|
|
qproperty-InBetweenColor: @function-Inbetween-color;
|
|
qproperty-InBetweenBorderColor: @function-InbetweenBorder-color;
|
|
qproperty-SelectedInBetweenColor: @function-SelectedInbetween-color;
|
|
qproperty-SelectedEmptyColor: @xsheet-SelectedEmptyCell-color; // paired
|
|
qproperty-SelectedSceneRangeEmptyColor: @function-SelectedSceneRangeEmpty-color;
|
|
qproperty-TextColor: @xsheet-text-color; // paired
|
|
qproperty-ColumnHeaderBorderColor: @function-ColumnHeaderBorder-color; // paired
|
|
}
|
|
|
|
#FunctionSegmentViewer {}
|
|
|
|
#ExpressionField {
|
|
background-color: @function-ExpressionFieldBG-color;
|
|
border: 1 solid @function-ExpressionFieldBorder-color;
|
|
margin: 0;
|
|
}
|
|
|
|
// #FunctionSegmentViewerLinkButton {}
|