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>
360 lines
9.7 KiB
Text
360 lines
9.7 KiB
Text
|
|
// Note: The compiler has trouble with Qt names when they have been extended to
|
|
// so we extend Qt names to mixins as a workaround for now.
|
|
|
|
/* -----------------------------------------------------------------------------
|
|
Push Button
|
|
----------------------------------------------------------------------------- */
|
|
|
|
.Button {
|
|
background-color: @button-bg-color;
|
|
border-color: @button-border-color;
|
|
border-width: @button-border-width;
|
|
border-style: solid;
|
|
border-radius: 2;
|
|
color: @button-text-color;
|
|
margin: 0;
|
|
padding: 3 15;
|
|
&:hover {
|
|
background-color: @button-bg-color-hover;
|
|
border-color: @button-border-color-hover;
|
|
color: @button-text-color-hover;
|
|
}
|
|
&:pressed {
|
|
background-color: @button-bg-color-pressed;
|
|
border-color: @button-border-color-pressed;
|
|
color: @button-text-color-pressed;
|
|
}
|
|
&:checked {
|
|
background-color: @button-bg-color-checked;
|
|
border-color: @button-border-color-checked;
|
|
color: @button-text-color-checked;
|
|
&:hover {
|
|
background-color: @button-bg-color-checked-hover;
|
|
border-color: @button-border-color-checked-hover;
|
|
&:pressed {
|
|
background: @button-bg-color-checked-hover-pressed;
|
|
}
|
|
}
|
|
}
|
|
&:disabled {
|
|
background-color: @button-bg-color-disabled;
|
|
border-color: @button-border-color-disabled;
|
|
color: @button-text-color-disabled;
|
|
}
|
|
}
|
|
|
|
QPushButton {
|
|
&:extend(.Button all);
|
|
}
|
|
|
|
#PushButton_NoPadding {
|
|
padding: 3;
|
|
}
|
|
|
|
/* -----------------------------------------------------------------------------
|
|
ComboBox
|
|
----------------------------------------------------------------------------- */
|
|
|
|
.ComboBox {
|
|
&:extend(.Button);
|
|
padding: 1 0 1 4;
|
|
margin: 1 0;
|
|
&:editable { /* for editable ComboBox */
|
|
color: @input-text-color;
|
|
background-color: @input-bg-color;
|
|
border-color: @input-border-color;
|
|
padding: 1 0 1 3;
|
|
selection-background-color: @input-selection-bg-color;
|
|
selection-color: @input-selection-text-color;
|
|
}
|
|
&:hover {
|
|
background-color: @button-bg-color-hover;
|
|
&:editable {
|
|
background-color: @input-bg-color;
|
|
}
|
|
}
|
|
&:checked {
|
|
border-color: @input-border-color-focus;
|
|
}
|
|
&:focus {
|
|
border-color: @input-border-color-focus;
|
|
}
|
|
&:disabled {
|
|
&:extend(.Button:disabled);
|
|
}
|
|
&::drop-down {
|
|
border: 0;
|
|
image: url('@{img-url}/combo_downarrow.svg');
|
|
image-position: center center;
|
|
width: 16;
|
|
&:editable {
|
|
background-color: @button-bg-color;
|
|
border-left: @combobox-dropdown-border-size solid @button-border-color;
|
|
border-top-right-radius: @combobox-dropdown-border-radius;
|
|
border-bottom-right-radius: @combobox-dropdown-border-radius;
|
|
}
|
|
&:hover {
|
|
border-color: @combobox-dropdown-border-color-hover;
|
|
&:editable {
|
|
background-color: @button-bg-color-hover;
|
|
border-color: @button-border-color;
|
|
}
|
|
}
|
|
&:disabled {
|
|
image: url('@{img-url}/combo_downarrow_disabled.svg');
|
|
&:editable {
|
|
background-color: @combobox-dropdown-bg-color-disabled-editable;
|
|
}
|
|
}
|
|
}
|
|
& QAbstractItemView {
|
|
background-color: @menu-bg-color;
|
|
border: 1 solid @menu-border-color;
|
|
selection-background-color: @menu-item-bg-color-selected;
|
|
selection-color: @menu-item-text-color-selected;
|
|
}
|
|
}
|
|
|
|
QComboBox {
|
|
&:extend(.ComboBox all);
|
|
}
|
|
|
|
/* -----------------------------------------------------------------------------
|
|
Textfield
|
|
----------------------------------------------------------------------------- */
|
|
|
|
.LineEdit {
|
|
background-color: @input-bg-color;
|
|
border: 1 solid @input-border-color;
|
|
border-radius: @input-border-radius;
|
|
color: @input-text-color;
|
|
selection-background-color: @input-selection-bg-color;
|
|
selection-color: @input-selection-text-color;
|
|
padding: 0 0 0 1;
|
|
&:focus {
|
|
background-color: @input-bg-color-focus;
|
|
border-color: @input-border-color-focus;
|
|
color: @input-text-color-focus;
|
|
}
|
|
&:disabled {
|
|
background-color: @input-bg-color-disabled;
|
|
border-color: @input-border-color-disabled;
|
|
color: @input-text-color-disabled;
|
|
}
|
|
}
|
|
|
|
QPlainTextEdit
|
|
,QLineEdit {
|
|
&:extend(.LineEdit all);
|
|
}
|
|
|
|
/* -----------------------------------------------------------------------------
|
|
CheckBox
|
|
----------------------------------------------------------------------------- */
|
|
|
|
.CheckBox {
|
|
color: @text-color;
|
|
&:hover {
|
|
color: @checkbox-text-color-hover;
|
|
}
|
|
&:disabled {
|
|
color: @text-color-disabled;
|
|
}
|
|
&::indicator {
|
|
background-color: @checkbox-bg-color;
|
|
border: 1 solid @checkbox-border-color;
|
|
border-radius: @checkbox-border-radius;
|
|
height: @checkbox-size; /* fix for QGroupBox */
|
|
padding: 1;
|
|
width: @checkbox-size; /* fix for QMenu */
|
|
&:hover {
|
|
background-color: @checkbox-bg-color-hover;
|
|
border-color: @checkbox-border-color-hover;
|
|
}
|
|
&:checked {
|
|
background-color: @checkbox-bg-color-checked;
|
|
border-color: @checkbox-border-color-checked;
|
|
image: url('@{img-url}/@{checkbox-img}');
|
|
&:hover {
|
|
&:extend(.CheckBox::indicator:hover);
|
|
background-color: @checkbox-bg-color-checked-hover;
|
|
border-color: @checkbox-border-color-checked-hover;
|
|
}
|
|
&:disabled {
|
|
background-color: @checkbox-bg-color-checked-disabled;
|
|
border-color: @checkbox-border-color-checked-disabled;
|
|
image: url('@{img-url}/@{checkbox-img-disabled}');
|
|
}
|
|
}
|
|
&:indeterminate {
|
|
background-color: @checkbox-bg-color-checked;
|
|
border-color: @checkbox-border-color-checked;
|
|
image: url('@{img-url}/@{checkbox-partially-img}');
|
|
&:hover {
|
|
&:extend(.CheckBox::indicator:hover);
|
|
}
|
|
&:disabled {
|
|
background-color: @checkbox-bg-color-checked-disabled;
|
|
border-color: @checkbox-border-color-checked-disabled;
|
|
image: url('@{img-url}/@{checkbox-partially-img-disabled}');
|
|
}
|
|
}
|
|
&:disabled {
|
|
background-color: @checkbox-bg-color-disabled;
|
|
border-color: @checkbox-border-color-disabled;
|
|
}
|
|
}
|
|
}
|
|
|
|
QCheckBox {
|
|
&:extend(.CheckBox all);
|
|
}
|
|
|
|
/* -----------------------------------------------------------------------------
|
|
RadioButton
|
|
----------------------------------------------------------------------------- */
|
|
|
|
.RadioButton {
|
|
color: @text-color;
|
|
&:hover {
|
|
color: @checkbox-text-color-hover;
|
|
}
|
|
&:checked {
|
|
color: @text-color;
|
|
}
|
|
&:disabled {
|
|
color: @text-color-disabled;
|
|
}
|
|
padding: 0;
|
|
margin: 0;
|
|
&::indicator {
|
|
@size: 13;
|
|
width: @size;
|
|
height: @size;
|
|
background-color: transparent;
|
|
border: 0;
|
|
image-position: center center;
|
|
&:unchecked {
|
|
image: url('@{img-url}/@{radiobutton-img-unchecked}');
|
|
&:hover {
|
|
image: url('@{img-url}/@{radiobutton-img-unchecked-hover}');
|
|
}
|
|
}
|
|
&:checked {
|
|
image: url('@{img-url}/@{radiobutton-img-checked}');
|
|
&:disabled {
|
|
background-color: transparent;
|
|
image: url('@{img-url}/@{radiobutton-img-checked-disabled}');
|
|
}
|
|
}
|
|
&:disabled {
|
|
image: url('@{img-url}/@{radiobutton-img-unchecked-disabled}');
|
|
}
|
|
}
|
|
}
|
|
|
|
QRadioButton {
|
|
&:extend(.RadioButton all);
|
|
}
|
|
|
|
/* -----------------------------------------------------------------------------
|
|
GroupBox
|
|
----------------------------------------------------------------------------- */
|
|
|
|
.GroupBox {
|
|
&:extend(.frame all);
|
|
margin: 6 0 0 0;
|
|
padding: 5 0;
|
|
&::title {
|
|
subcontrol-origin: margin;
|
|
left: 15;
|
|
margin: -3 0 0 0;
|
|
padding: 0 3;
|
|
&:hover {
|
|
color: @checkbox-text-color-hover;
|
|
}
|
|
&:disabled {
|
|
color: @text-color-disabled;
|
|
}
|
|
}
|
|
&::indicator {
|
|
&:extend(.CheckBox::indicator all);
|
|
subcontrol-origin: margin;
|
|
margin-top: 2;
|
|
}
|
|
&:disabled {
|
|
color: @text-color-disabled;
|
|
}
|
|
}
|
|
|
|
QGroupBox {
|
|
&:extend(.GroupBox all);
|
|
}
|
|
|
|
/* -----------------------------------------------------------------------------
|
|
Slider
|
|
----------------------------------------------------------------------------- */
|
|
|
|
.Slider {
|
|
&::groove:horizontal {
|
|
background-color: transparent;
|
|
background-image: url('@{img-url}/@{slider-groove-img}');
|
|
background-position: center center;
|
|
background-repeat: repeat-x;
|
|
margin: 0;
|
|
height: 20;
|
|
min-height: 20;
|
|
&:disabled {
|
|
background-image: url('@{img-url}/@{slider-groove-img-disabled}');
|
|
}
|
|
}
|
|
&::handle:horizontal {
|
|
width: @slider-handle-width;
|
|
margin: @slider-handle-margin;
|
|
image: url('@{img-url}/@{slider-handle-img}');
|
|
&:disabled {
|
|
image: url('@{img-url}/@{slider-handle-img-disabled}');
|
|
}
|
|
}
|
|
}
|
|
|
|
QSlider {
|
|
&:extend(.Slider all);
|
|
}
|
|
|
|
/* -----------------------------------------------------------------------------
|
|
Double Slider
|
|
----------------------------------------------------------------------------- */
|
|
|
|
#IntPairField,
|
|
#DoublePairField {
|
|
qproperty-LightLineColor: @slider-groove-color;
|
|
qproperty-LightLineEdgeColor: @slider-groove-color;
|
|
qproperty-DarkLineColor: @slider-groove-color;
|
|
qproperty-MiddleLineColor: @slider-groove-color;
|
|
|
|
qproperty-HandleLeftPixmap: url("@{img-url}/@{slider-left-handle}");
|
|
qproperty-HandleRightPixmap: url("@{img-url}/@{slider-right-handle}");
|
|
|
|
qproperty-HandleLeftGrayPixmap: url("@{img-url}/@{slider-left-handle-disabled}");
|
|
qproperty-HandleRightGrayPixmap: url("@{img-url}/@{slider-right-handle-disabled}");
|
|
}
|
|
|
|
/* -----------------------------------------------------------------------------
|
|
Progress Bar
|
|
----------------------------------------------------------------------------- */
|
|
|
|
QProgressBar {
|
|
text-align: center;
|
|
background-color: @progressbar-bg-color;
|
|
border: 1 solid @progressbar-border-color;
|
|
border-radius: 3; /* 2 fits inside 3 */
|
|
padding: 0;
|
|
&::chunk {
|
|
margin: -1; /* hide border of chunk except for right side */
|
|
background-color: @progressbar-chunk-bg-color;
|
|
border: 1 solid @progressbar-chunk-border-color;
|
|
border-radius: 2;
|
|
}
|
|
}
|