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>
193 lines
4.4 KiB
Text
193 lines
4.4 KiB
Text
/* -----------------------------------------------------------------------------
|
|
ComboViewer / Viewer / FlipBook
|
|
----------------------------------------------------------------------------- */
|
|
|
|
#ComboViewerPanel {
|
|
& Toolbar {
|
|
border-bottom: 1 solid @accent; // accent line against viewport
|
|
&::separator:horizontal {
|
|
margin: 0 0 0 2;
|
|
padding: 0;
|
|
}
|
|
& QToolButton {
|
|
margin: 0;
|
|
margin-bottom: 3; // Add 1px more margin here to allow the border-bottom
|
|
// of ToolBar to show.
|
|
margin-left: 2;
|
|
margin-right: 0;
|
|
margin-top: 2;
|
|
padding-right: -1;
|
|
padding-bottom: -1;
|
|
}
|
|
& QToolButton#qt_toolbar_ext_button {
|
|
margin-bottom: 1;
|
|
qproperty-icon: url('@{img-url}/toolbar_extension_horizontal.png');
|
|
}
|
|
}
|
|
}
|
|
|
|
#ComboViewerToolOptions {
|
|
border-bottom: 1 solid @accent; // accent line against viewport & ToolBar
|
|
}
|
|
|
|
#ComboViewer,
|
|
#ViewerPanel,
|
|
FlipBook {
|
|
& #ToolBarContainer {
|
|
background-color: transparent;
|
|
border-top: 1 solid @accent;
|
|
border-bottom: 1 solid @accent;
|
|
padding-right: -1; // hides right border on #ScrollRightButton when
|
|
// fps slider is disabled
|
|
}
|
|
}
|
|
|
|
#flipCustomize {
|
|
// options menu
|
|
&:extend(.button-tool all);
|
|
margin-left: 3;
|
|
&::menu-button {
|
|
background-color: transparent;
|
|
width: 35;
|
|
}
|
|
&::menu-arrow {
|
|
image: none;
|
|
}
|
|
}
|
|
|
|
QToolBar#FlipConsolePlayToolBar {
|
|
&::separator:horizontal {
|
|
border-color: @accent;
|
|
margin: 0 1 0 1;
|
|
}
|
|
& QToolButton {
|
|
padding-left: 0;
|
|
padding-top: -1;
|
|
padding-right: -1;
|
|
padding-bottom: -2;
|
|
margin: 2 1 2 1;
|
|
}
|
|
|
|
#KeyNo,
|
|
#KeyPartial,
|
|
#KeyTotal,
|
|
#PreviousKey,
|
|
#NextKey {
|
|
padding-right: 1;
|
|
padding-left: 1;
|
|
max-width: 20px;
|
|
max-height: 20px;
|
|
padding-bottom: 0;
|
|
padding-top: 0;
|
|
}
|
|
|
|
#PreviousKey,
|
|
#NextKey {
|
|
margin: 0 2;
|
|
}
|
|
}
|
|
|
|
#ViewerFpsSlider {
|
|
background-color: transparent;
|
|
background-image: url('@{img-url}/@{slider-groove-img}');
|
|
background-position: center center;
|
|
background-repeat: repeat-x;
|
|
border: 0;
|
|
height: 19;
|
|
margin: 0 3 0 37;
|
|
max-width: 300;
|
|
min-width: 0;
|
|
&::sub-line:horizontal {
|
|
subcontrol-origin: absolute;
|
|
background-color: @button-bg-color;
|
|
border: 1 solid @button-border-color;
|
|
border-top-left-radius: 2;
|
|
border-bottom-left-radius: 2;
|
|
height: 16;
|
|
left: -33;
|
|
width: 14;
|
|
}
|
|
&::add-line:horizontal {
|
|
subcontrol-position: left;
|
|
background-color: @button-bg-color;
|
|
border: 1 solid @button-border-color;
|
|
border-top-right-radius: 2;
|
|
border-bottom-right-radius: 2;
|
|
left: 18;
|
|
height: 16;
|
|
image-position: center center;
|
|
width: 13;
|
|
}
|
|
&::sub-line:horizontal,
|
|
&::add-line:horizontal {
|
|
&:hover {
|
|
&:extend(.Button:hover all);
|
|
}
|
|
&:pressed {
|
|
&:extend(.Button:pressed all);
|
|
}
|
|
&:disabled {
|
|
&:extend(.Button:disabled all);
|
|
}
|
|
}
|
|
&::handle {
|
|
&::horizontal {
|
|
@size: 9;
|
|
background-color: @slider-handle-bg-color;
|
|
border: 1 solid @slider-handle-border-color;
|
|
border-radius: 2;
|
|
margin: 2 0 3 0;
|
|
min-width: @size;
|
|
width: @size;
|
|
max-width: @size;
|
|
}
|
|
}
|
|
}
|
|
|
|
FlipConsole {
|
|
qproperty-FpsFieldColor: @input-bg-color;
|
|
}
|
|
|
|
FlipSlider {
|
|
qproperty-PBHeight: 15;
|
|
|
|
// slider
|
|
qproperty-PBOverlay: url('@{img-url}/@{flipslider-img}');
|
|
qproperty-PBColorMarginLeft: 1;
|
|
qproperty-PBColorMarginTop: 2;
|
|
qproperty-PBColorMarginRight: 1;
|
|
qproperty-PBColorMarginBottom: 2;
|
|
|
|
// marker
|
|
qproperty-PBMarker: url('@{img-url}/@{flipmarker-img}');
|
|
qproperty-PBMarkerMarginLeft: 3;
|
|
qproperty-PBMarkerMarginRight: 3;
|
|
qproperty-notStartedColor: @flipslider-notstarted-color;
|
|
qproperty-startedColor: @flipslider-started-color;
|
|
qproperty-baseColor: @flipslider-base-color;
|
|
qproperty-finishedColor: @flipslider-finished-color;
|
|
}
|
|
|
|
Ruler {
|
|
qproperty-ParentBGColor: @viewer-ruler-bg-color;
|
|
qproperty-ScaleColor: @viewer-ruler-scale-color;
|
|
qproperty-HandleColor: @viewer-ruler-handle-color;
|
|
qproperty-HandleDragColor: @viewer-ruler-handle-drag-color;
|
|
qproperty-BorderColor: @viewer-ruler-border-color;
|
|
}
|
|
|
|
#RulerToolOptionValues {
|
|
color: @viewer-ruler-ToolOptionValues-color;
|
|
}
|
|
|
|
#enableBlankFrameButton {
|
|
&:extend(.Button all);
|
|
background-color: transparent;
|
|
border-color: transparent;
|
|
color: @text-color-disabled;
|
|
padding: 0;
|
|
font-weight: bold;
|
|
&:checked {
|
|
border-width: 2px;
|
|
}
|
|
}
|