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>
274 lines
10 KiB
Text
274 lines
10 KiB
Text
// out: ../../../Neutral/Neutral.qss
|
|
|
|
// -----------------------------------------------------------------------------
|
|
// NEUTRAL GREY
|
|
// -----------------------------------------------------------------------------
|
|
|
|
// Override
|
|
@import '../Medium';
|
|
|
|
// Resource Location
|
|
@img-url: '../Medium/imgs/black';
|
|
|
|
@bg: #808080;
|
|
@accent: darken(@bg, 15);
|
|
@text-color: #000;
|
|
|
|
@hl-bg-color: #8FA0B2;
|
|
@hl-text-color: #000;
|
|
@hl-bg-color-secondary: rgba(255, 255, 255, 0.15);
|
|
|
|
@dock-bg-color: darken(@bg, 30);
|
|
@label-title: rgb(0, 0, 0);
|
|
|
|
// -----------------------------------------------------------------------------
|
|
// Tabs
|
|
// -----------------------------------------------------------------------------
|
|
|
|
@tabbar-bg-color: darken(@bg, 6);
|
|
@tab-text-color: @text-color;
|
|
@tab-text-color-hover: @text-color;
|
|
@tab-text-color-selected: @text-color;
|
|
|
|
// -----------------------------------------------------------------------------
|
|
// Titlebars
|
|
// -----------------------------------------------------------------------------
|
|
|
|
@title-text-color: @tab-text-color;
|
|
@title-text-color-active: rgba(255, 255, 255, 0.8);
|
|
@title-border-color: darken(@title-bg-color, 10);
|
|
@title-button-rollover-color: lighten(@title-bg-color, 10);
|
|
@title-button-preview-color: #15b884;
|
|
|
|
// -----------------------------------------------------------------------------
|
|
// Menu
|
|
// -----------------------------------------------------------------------------
|
|
|
|
@menu-bg-color: lighten(@bg, 20);
|
|
@menu-separator-color: rgba(0, 0, 0, 0.171);
|
|
|
|
// -----------------------------------------------------------------------------
|
|
// Scrollbars
|
|
// -----------------------------------------------------------------------------
|
|
|
|
@scrollbar-bg-color: darken(@bg, 6);
|
|
@scrollbar-handle-bg-color: lighten(@bg, 10);
|
|
|
|
// -----------------------------------------------------------------------------
|
|
// Palette Window
|
|
// -----------------------------------------------------------------------------
|
|
|
|
// All views (except list)
|
|
@palette-NumpadShortcutBorderColor: rgb(190, 190, 190);
|
|
|
|
// -----------------------------------------------------------------------------
|
|
// File Browser / Trees
|
|
// -----------------------------------------------------------------------------
|
|
|
|
// Trees
|
|
@tree-bg-color: darken(@bg, 4);
|
|
@prefs-tree-bg-color: @tree-bg-color;
|
|
|
|
// All Panes
|
|
@browser-folder-text-color: rgb(0, 22, 134);
|
|
|
|
// Right Pane
|
|
@browser-itemview-bg-color: lighten(@bg, 0);
|
|
|
|
// -----------------------------------------------------------------------------
|
|
// Button
|
|
// -----------------------------------------------------------------------------
|
|
|
|
@button-bg-color: lighten(@bg, 12);
|
|
@button-border-color: darken(@bg, 12);
|
|
|
|
@button-bg-color-hover: lighten(@button-bg-color, 8);
|
|
@button-border-color-pressed: darken(@button-bg-color-pressed, 8);
|
|
|
|
@button-bg-color-checked: darken(@bg, 15);
|
|
@button-border-color-checked: darken(@button-bg-color-checked, 10);
|
|
@button-text-color-checked: rgba(255, 255, 255, 0.917);
|
|
@button-text-color-focus: @button-text-color;
|
|
@button-border-color-focus: darken(@button-bg-color-focus, 40);
|
|
|
|
@button-border-color-disabled: darken(@bg, 5);
|
|
|
|
// For QDialogs
|
|
@button-dialog-border-color: @button-border-color;
|
|
|
|
// -----------------------------------------------------------------------------
|
|
// Tool Buttons
|
|
// -----------------------------------------------------------------------------
|
|
|
|
// Main
|
|
@toolbutton-border-color-hover: @button-border-color;
|
|
|
|
@toolbutton-border-color-checked: darken(@toolbutton-bg-color-checked, 30);
|
|
@toolbutton-text-color-checked: @text-color;
|
|
|
|
@toolbutton-bg-color-checked-hover: lighten(@toolbutton-bg-color-checked, 8);
|
|
@toolbutton-border-color-checked-hover: @toolbutton-border-color-checked;
|
|
|
|
// Lock
|
|
@toolbutton-lock-bg-color-checked: #bd5454;
|
|
@toolbutton-lock-border-color-checked: darken(@toolbutton-lock-bg-color-checked, 20);
|
|
@toolbutton-lock-border-color-checked-hover: @toolbutton-lock-border-color-checked;
|
|
|
|
// -----------------------------------------------------------------------------
|
|
// ComboBox
|
|
// -----------------------------------------------------------------------------
|
|
|
|
@combobox-dropdown-border-size: 1;
|
|
|
|
// -----------------------------------------------------------------------------
|
|
// Textfield
|
|
// -----------------------------------------------------------------------------
|
|
|
|
@input-bg-color: lighten(@bg, 25);
|
|
@input-border-color: @accent;
|
|
@input-border-color-focus: #000;
|
|
@input-bg-color-disabled: lighten(@bg, 10);
|
|
|
|
// -----------------------------------------------------------------------------
|
|
// CheckBox
|
|
// -----------------------------------------------------------------------------
|
|
|
|
@checkbox-text-color-hover: rgba(255, 255, 255, 0.8);
|
|
@checkbox-bg-color-checked: rgba(0, 0, 0, 0.8);
|
|
@checkbox-bg-color-disabled: rgba(255, 255, 255, 0.11);
|
|
@checkbox-border-color-disabled: rgba(0, 0, 0, 0.11);
|
|
@checkbox-bg-color-checked-disabled: darken(@bg, 10);
|
|
@checkbox-border-color-checked-disabled: darken(@bg, 15);
|
|
|
|
// -----------------------------------------------------------------------------
|
|
// Slider
|
|
// -----------------------------------------------------------------------------
|
|
|
|
// This one is used only for #ViewerFpsSlider
|
|
@slider-handle-margin: -2 0;
|
|
@slider-handle-bg-color: lighten(@bg, 15);
|
|
@slider-handle-border-color: @accent;
|
|
|
|
// DoublePairField, IntPairField
|
|
@slider-groove-color: darken(@bg, 22);
|
|
|
|
// -----------------------------------------------------------------------------
|
|
// Viewer Window
|
|
// -----------------------------------------------------------------------------
|
|
|
|
// FlipSlider
|
|
@flipslider-notstarted-color: rgb(167, 64, 64);
|
|
@flipslider-started-color: rgb(0, 168, 8);
|
|
|
|
// -----------------------------------------------------------------------------
|
|
// Schematic Viewer
|
|
// -----------------------------------------------------------------------------
|
|
|
|
@schematic-viewer-bg-color: darken(@bg, 10);
|
|
|
|
// Node Type Colors
|
|
@nodeLightness: 0;
|
|
@nodeSaturation: 0;
|
|
|
|
@schematic-TableColor: rgb(164, 164, 191);
|
|
@schematic-ActiveCameraColor: @xsheet-ActiveCamera-color;
|
|
@schematic-OtherCameraColor: @xsheet-OtherCamera-color;
|
|
@schematic-GroupColor: rgb(102, 152, 198);
|
|
@schematic-PegColor: rgb(190, 138, 86);
|
|
@schematic-SplineColor: rgb(123, 184, 33);
|
|
@schematic-ActiveOutputcolor: @xsheet-ActiveCamera-color;
|
|
@schematic-OtherOutputcolor: @xsheet-OtherCamera-color;
|
|
@schematic-XsheetColor: rgb(164, 164, 191);
|
|
@schematic-NormalFxColor: rgb(141, 156, 175);
|
|
@schematic-MacroFxColor: rgb(174, 140, 165);
|
|
@schematic-ImageAdjustFxColor: rgb(156, 154, 180);
|
|
@schematic-LayerBlendingFxColor: rgb(112, 155,165);
|
|
@schematic-MatteFxColor: rgb(186, 133, 133);
|
|
|
|
// -----------------------------------------------------------------------------
|
|
// XSheet
|
|
// -----------------------------------------------------------------------------
|
|
|
|
// XSheet Spreadsheet Viewer
|
|
@xsheet-error-text-color: rgb(192, 17, 17);
|
|
@xsheet-bg-color: darken(@bg, 4);
|
|
@xsheet-LightLine-color: rgba(0, 0, 0, 0.15);
|
|
@xsheet-MarkerLine-color: rgba(255, 255, 255, 0.2);
|
|
@xsheet-PreviewFrameText-color: #17239c;
|
|
@xsheet-OnionSkinAreaBG-color: darken(@bg, 8);
|
|
@xsheet-EmptyCell-color: @xsheet-OnionSkinAreaBG-color;
|
|
@xsheet-NotEmptyColumn-color: @xsheet-bg-color;
|
|
@xsheet-PlayRange-Color: @bg;
|
|
@xsheet-ColumnIconLine-color: darken(@bg, 20);
|
|
@xsheet-VerticalLineHead-color: @accent;
|
|
@xsheet-CurrentRowBG-color: saturate(lighten(fade(@hl-bg-color, 70), 20), 50);
|
|
|
|
@xsheet-CellArea-bg-color-focus: @input-bg-color;
|
|
@xsheet-CellFocus-color: #000;
|
|
|
|
@xsheet-FoldedColumnBG-color: lighten(@bg, 10);
|
|
@xsheet-FoldedColumnLine-color: darken(@bg, 5);
|
|
|
|
// Level Type Colors Adjustment
|
|
@columnBorderDesaturation: 0;
|
|
@columnBorderDarkness: 15;
|
|
|
|
@xsheet-LevelColumn-color: #78a578;
|
|
@xsheet-VectorColumn-color: #a7637d;
|
|
@xsheet-ChildColumn-color: #9a759c;
|
|
@xsheet-FullColorColumn-color: #839bb1;
|
|
@xsheet-FxColumn-color: #928562;
|
|
@xsheet-ReferenceColumn-color: #959595;
|
|
@xsheet-PaletteColumn-color: #599586;
|
|
@xsheet-MeshColumn-color: #8b73a7;
|
|
@xsheet-SoundColumn-color: #749e9e;
|
|
@xsheet-SoundColumnHL-color: #f5ffe6;
|
|
@xsheet-SoundColumnTrack-color: rgba(0,0,0,0.8);
|
|
@xsheet-ActiveCamera-color: rgb(100, 145, 190);
|
|
@xsheet-OtherCamera-color: rgb(143, 156, 158);
|
|
|
|
// Timeline
|
|
@timeline-FrameRangeMarkerLine-color: darken(@bg, 15);
|
|
|
|
// -----------------------------------------------------------------------------
|
|
// Keyframes
|
|
// -----------------------------------------------------------------------------
|
|
|
|
@keyframe-off-border-color-hover: @toolbutton-border-color-hover;
|
|
|
|
@keyframe-total-color: #c77a27;
|
|
@keyframe-total-color-hover: lighten(@keyframe-total-color, 10);
|
|
@keyframe-total-border-color: darken(@keyframe-total-color, 20);
|
|
@keyframe-total-border-color-hover: @keyframe-total-border-color;
|
|
|
|
@keyframe-partial-border-color: @keyframe-total-border-color;
|
|
@keyframe-partial-border-color-hover: @keyframe-total-border-color;
|
|
|
|
// For use in FX Settings Panels
|
|
@keyframe-highlight-border-color: @toolbutton-border-color-hover;
|
|
@keyframe-inbetween-color: #c0ba80;
|
|
@keyframe-inbetween-border-color: darken(@keyframe-inbetween-color, 40);
|
|
@keyframe-modified-border-color: darken(@keyframe-modified-color, 40);
|
|
|
|
// -----------------------------------------------------------------------------
|
|
// Function Editor
|
|
// -----------------------------------------------------------------------------
|
|
|
|
// Function Curve Panel
|
|
@function-panel-bg-color: darken(@bg, 15);
|
|
@function-panel-OtherCurves-color: rgb(197, 197, 197);
|
|
@function-panel-RulerBG-color: darken(@bg, 10);
|
|
@function-panel-Sub-color: rgb(255, 255, 255);
|
|
@function-panel-Selected-color: rgb(252, 174, 6);
|
|
|
|
// Function Spreadsheet Viewer
|
|
@function-ColumnHeaderBorder-color: @dock-bg-color;
|
|
@schematic-label-text-color: #000;
|
|
|
|
@function-KeyFrame-color: lighten(desaturate(spin(@keyframe-total-color, -0.2295), 14.0523), 3.9216);
|
|
@function-KeyFrameBorder-color: darken(@function-KeyFrame-color, 25);
|
|
|
|
@function-Inbetween-color: lighten(desaturate(spin(@keyframe-inbetween-color, -5.2841), 20.8935), 3.5294);
|
|
@function-InbetweenBorder-color: darken(desaturate(@function-Inbetween-color, 8), 25);
|
|
|
|
@xsheet-VerticalLineHead-color: darken(@bg, 20);
|