From eff4f2e19b794675c8f30bec4d64f3f11f6ebb4c Mon Sep 17 00:00:00 2001 From: Jeremy Bullock Date: Aug 24 2017 22:32:24 +0000 Subject: Merge pull request #1376 from manongjohn/XsheetFixes Xsheet fixes --- diff --git a/stuff/config/qss/Astral_048_VeryDark/Astral_048_VeryDark.qss b/stuff/config/qss/Astral_048_VeryDark/Astral_048_VeryDark.qss index 78d0296..943c3d3 100644 --- a/stuff/config/qss/Astral_048_VeryDark/Astral_048_VeryDark.qss +++ b/stuff/config/qss/Astral_048_VeryDark/Astral_048_VeryDark.qss @@ -1440,7 +1440,7 @@ FxSettings QToolBar QToolBar { #ScriptConsole { font-family: 'Courier New', monospace; border: 0; - color: #000; + color: #000000; padding: 3px; } #ScriptConsole QFrame { @@ -1658,7 +1658,7 @@ FlipSlider { qproperty-PBColorMarginBottom: 2; qproperty-PBMarkerMarginLeft: 3; qproperty-PBMarkerMarginRight: 3; - qproperty-notStartedColor: #CC2222; + qproperty-notStartedColor: #cc2222; qproperty-startedColor: #00ff00; qproperty-baseColor: #232323; } @@ -1685,21 +1685,24 @@ Ruler { /* xsheetColumnHeader (Context Menus) ----------------------------------------------------------------------------- */ #xsheetColumnAreaMenu_Preview { - background-color: #E6E678; + background-color: #e6e678; } #xsheetColumnAreaMenu_Lock { - background-color: #F5F5F5; + background-color: #f5f5f5; } #xsheetColumnAreaMenu_Camstand { - background-color: #FFA480; + background-color: #ffa480; } #xsheetColumnAreaMenu_Preview, #xsheetColumnAreaMenu_Lock, #xsheetColumnAreaMenu_Camstand { - color: #000; + color: #000000; } #noteTextEdit { - color: #000; + color: #000000; +} +#flipOrientationButton { + padding: 2px 12px; } /* XSheet Spreadsheet ----------------------------------------------------------------------------- */ @@ -1707,50 +1710,50 @@ XsheetViewer { qproperty-TextColor: #cccccc; qproperty-BGColor: #484848; qproperty-LightLineColor: #2c2c2c; - qproperty-MarkerLineColor: #1E96C4; + qproperty-MarkerLineColor: #1e96c4; qproperty-VerticalLineColor: #222222; qproperty-VerticalLineHeadColor: #808080; - qproperty-PreviewFrameTextColor: #96E6E6; + qproperty-PreviewFrameTextColor: #96e6e6; qproperty-CurrentRowBgColor: #506082; qproperty-EmptyColumnHeadColor: #606060; - qproperty-SelectedColumnTextColor: #E66464; + qproperty-SelectedColumnTextColor: #e66464; qproperty-EmptyCellColor: #404040; qproperty-NotEmptyColumnColor: #484848; - qproperty-SelectedEmptyCellColor: #6C6C6C; - qproperty-LevelColumnColor: #4C6E4C; - qproperty-LevelColumnBorderColor: #8FB38F; - qproperty-SelectedLevelColumnColor: #6B8C6B; - qproperty-VectorColumnColor: #7B7B4C; - qproperty-VectorColumnBorderColor: #BBBB9A; - qproperty-SelectedVectorColumnColor: #8C8C60; - qproperty-ChildColumnColor: #6A526B; - qproperty-ChildColumnBorderColor: #B1A3B3; - qproperty-SelectedChildColumnColor: #7A617A; - qproperty-FullcolorColumnColor: #657A96; - qproperty-FullcolorColumnBorderColor: #9EB8BB; - qproperty-SelectedFullcolorColumnColor: #8896A7; - qproperty-FxColumnColor: #56553C; - qproperty-FxColumnBorderColor: #95958A; - qproperty-SelectedFxColumnColor: #6A6D5A; + qproperty-SelectedEmptyCellColor: #6c6c6c; + qproperty-LevelColumnColor: #4c6e4c; + qproperty-LevelColumnBorderColor: #8fb38f; + qproperty-SelectedLevelColumnColor: #6b8c6b; + qproperty-VectorColumnColor: #7b7b4c; + qproperty-VectorColumnBorderColor: #bbbb9a; + qproperty-SelectedVectorColumnColor: #8c8c60; + qproperty-ChildColumnColor: #6a526b; + qproperty-ChildColumnBorderColor: #b1a3b3; + qproperty-SelectedChildColumnColor: #7a617a; + qproperty-FullcolorColumnColor: #657a96; + qproperty-FullcolorColumnBorderColor: #9eb8bb; + qproperty-SelectedFullcolorColumnColor: #8896a7; + qproperty-FxColumnColor: #56553c; + qproperty-FxColumnBorderColor: #95958a; + qproperty-SelectedFxColumnColor: #6a6d5a; qproperty-ReferenceColumnColor: #616161; - qproperty-ReferenceColumnBorderColor: #A2A2A2; + qproperty-ReferenceColumnBorderColor: #a2a2a2; qproperty-SelectedReferenceColumnColor: #828282; - qproperty-PaletteColumnColor: #3A655F; - qproperty-PaletteColumnBorderColor: #86ACA7; - qproperty-SelectedPaletteColumnColor: #5F8581; - qproperty-MeshColumnColor: #684D86; - qproperty-MeshColumnBorderColor: #BA92EF; - qproperty-SelectedMeshColumnColor: #8A75A2; + qproperty-PaletteColumnColor: #3a655f; + qproperty-PaletteColumnBorderColor: #86aca7; + qproperty-SelectedPaletteColumnColor: #5f8581; + qproperty-MeshColumnColor: #684d86; + qproperty-MeshColumnBorderColor: #ba92ef; + qproperty-SelectedMeshColumnColor: #8a75a2; qproperty-SoundColumnColor: #657456; - qproperty-SoundColumnBorderColor: #A0AF7D; - qproperty-SelectedSoundColumnColor: #7F956A; - qproperty-SoundColumnHlColor: #34FE5E; - qproperty-SoundColumnTrackColor: #B6C29D; - qproperty-ColumnHeadPastelizer: #000; + qproperty-SoundColumnBorderColor: #a0af7d; + qproperty-SelectedSoundColumnColor: #7f956a; + qproperty-SoundColumnHlColor: #34fe5e; + qproperty-SoundColumnTrackColor: #b6c29d; + qproperty-ColumnHeadPastelizer: #000000; qproperty-SelectedColumnHead: #506082; qproperty-LightLightBGColor: #404040; - qproperty-LightBGColor: #F0F0F0; - qproperty-DarkBGColor: #E1E1E1; + qproperty-LightBGColor: #f0f0f0; + qproperty-DarkBGColor: #e1e1e1; qproperty-DarkLineColor: #969696; } /* ----------------------------------------------------------------------------- @@ -1777,7 +1780,7 @@ XsheetViewer { ----------------------------------------------------------------------------- */ FunctionTreeView { qproperty-TextColor: #cccccc; - qproperty-CurrentTextColor: #E66464; + qproperty-CurrentTextColor: #e66464; } FunctionPanel { qproperty-BGColor: #3b3b3b; @@ -1786,14 +1789,14 @@ FunctionPanel { qproperty-OtherCurvesColor: #888888; qproperty-RulerBackground: #333333; qproperty-TextColor: #cccccc; - qproperty-SubColor: #000; - qproperty-SelectedColor: #FFA500; + qproperty-SubColor: #000000; + qproperty-SelectedColor: #ffa500; } SpreadsheetViewer { qproperty-LightLightBGColor: #404040; qproperty-CurrentRowBgColor: #506082; qproperty-LightLineColor: #2c2c2c; - qproperty-MarkerLineColor: #1E96C4; + qproperty-MarkerLineColor: #1e96c4; qproperty-BGColor: #484848; qproperty-VerticalLineColor: #222222; qproperty-KeyFrameColor: #995d1d; @@ -1802,15 +1805,15 @@ SpreadsheetViewer { qproperty-InBetweenColor: #666250; qproperty-InBetweenBorderColor: #cdcec8; qproperty-SelectedInBetweenColor: #7e8079; - qproperty-SelectedEmptyColor: #6C6C6C; + qproperty-SelectedEmptyColor: #6c6c6c; qproperty-SelectedSceneRangeEmptyColor: #757575; qproperty-TextColor: #cccccc; qproperty-ColumnHeaderBorderColor: #808080; - qproperty-SelectedColumnTextColor: #E66464; + qproperty-SelectedColumnTextColor: #e66464; } #ExpressionField { background-color: #e6e6e6; - border: 1px solid #333; + border: 1px solid #333333; margin: 0; } #FunctionSegmentViewerLinkButton { diff --git a/stuff/config/qss/Astral_072_Dark/Astral_072_Dark.qss b/stuff/config/qss/Astral_072_Dark/Astral_072_Dark.qss index a16dcc8..994bef1 100644 --- a/stuff/config/qss/Astral_072_Dark/Astral_072_Dark.qss +++ b/stuff/config/qss/Astral_072_Dark/Astral_072_Dark.qss @@ -1440,7 +1440,7 @@ FxSettings QToolBar QToolBar { #ScriptConsole { font-family: 'Courier New', monospace; border: 0; - color: #000; + color: #000000; padding: 3px; } #ScriptConsole QFrame { @@ -1658,7 +1658,7 @@ FlipSlider { qproperty-PBColorMarginBottom: 2; qproperty-PBMarkerMarginLeft: 3; qproperty-PBMarkerMarginRight: 3; - qproperty-notStartedColor: #CC2222; + qproperty-notStartedColor: #cc2222; qproperty-startedColor: #00ff00; qproperty-baseColor: #404040; } @@ -1685,21 +1685,24 @@ Ruler { /* xsheetColumnHeader (Context Menus) ----------------------------------------------------------------------------- */ #xsheetColumnAreaMenu_Preview { - background-color: #E6E678; + background-color: #e6e678; } #xsheetColumnAreaMenu_Lock { - background-color: #F5F5F5; + background-color: #f5f5f5; } #xsheetColumnAreaMenu_Camstand { - background-color: #FFA480; + background-color: #ffa480; } #xsheetColumnAreaMenu_Preview, #xsheetColumnAreaMenu_Lock, #xsheetColumnAreaMenu_Camstand { - color: #000; + color: #000000; } #noteTextEdit { - color: #000; + color: #000000; +} +#flipOrientationButton { + padding: 2px 12px; } /* XSheet Spreadsheet ----------------------------------------------------------------------------- */ @@ -1707,50 +1710,50 @@ XsheetViewer { qproperty-TextColor: #cccccc; qproperty-BGColor: #484848; qproperty-LightLineColor: #2c2c2c; - qproperty-MarkerLineColor: #1E96C4; + qproperty-MarkerLineColor: #1e96c4; qproperty-VerticalLineColor: #222222; qproperty-VerticalLineHeadColor: #808080; - qproperty-PreviewFrameTextColor: #96E6E6; + qproperty-PreviewFrameTextColor: #96e6e6; qproperty-CurrentRowBgColor: #506082; qproperty-EmptyColumnHeadColor: #606060; - qproperty-SelectedColumnTextColor: #E66464; + qproperty-SelectedColumnTextColor: #e66464; qproperty-EmptyCellColor: #404040; qproperty-NotEmptyColumnColor: #484848; - qproperty-SelectedEmptyCellColor: #6C6C6C; - qproperty-LevelColumnColor: #4C6E4C; - qproperty-LevelColumnBorderColor: #8FB38F; - qproperty-SelectedLevelColumnColor: #6B8C6B; - qproperty-VectorColumnColor: #7B7B4C; - qproperty-VectorColumnBorderColor: #BBBB9A; - qproperty-SelectedVectorColumnColor: #8C8C60; - qproperty-ChildColumnColor: #6A526B; - qproperty-ChildColumnBorderColor: #B1A3B3; - qproperty-SelectedChildColumnColor: #7A617A; - qproperty-FullcolorColumnColor: #657A96; - qproperty-FullcolorColumnBorderColor: #9EB8BB; - qproperty-SelectedFullcolorColumnColor: #8896A7; - qproperty-FxColumnColor: #56553C; - qproperty-FxColumnBorderColor: #95958A; - qproperty-SelectedFxColumnColor: #6A6D5A; + qproperty-SelectedEmptyCellColor: #6c6c6c; + qproperty-LevelColumnColor: #4c6e4c; + qproperty-LevelColumnBorderColor: #8fb38f; + qproperty-SelectedLevelColumnColor: #6b8c6b; + qproperty-VectorColumnColor: #7b7b4c; + qproperty-VectorColumnBorderColor: #bbbb9a; + qproperty-SelectedVectorColumnColor: #8c8c60; + qproperty-ChildColumnColor: #6a526b; + qproperty-ChildColumnBorderColor: #b1a3b3; + qproperty-SelectedChildColumnColor: #7a617a; + qproperty-FullcolorColumnColor: #657a96; + qproperty-FullcolorColumnBorderColor: #9eb8bb; + qproperty-SelectedFullcolorColumnColor: #8896a7; + qproperty-FxColumnColor: #56553c; + qproperty-FxColumnBorderColor: #95958a; + qproperty-SelectedFxColumnColor: #6a6d5a; qproperty-ReferenceColumnColor: #616161; - qproperty-ReferenceColumnBorderColor: #A2A2A2; + qproperty-ReferenceColumnBorderColor: #a2a2a2; qproperty-SelectedReferenceColumnColor: #828282; - qproperty-PaletteColumnColor: #3A655F; - qproperty-PaletteColumnBorderColor: #86ACA7; - qproperty-SelectedPaletteColumnColor: #5F8581; - qproperty-MeshColumnColor: #684D86; - qproperty-MeshColumnBorderColor: #BA92EF; - qproperty-SelectedMeshColumnColor: #8A75A2; + qproperty-PaletteColumnColor: #3a655f; + qproperty-PaletteColumnBorderColor: #86aca7; + qproperty-SelectedPaletteColumnColor: #5f8581; + qproperty-MeshColumnColor: #684d86; + qproperty-MeshColumnBorderColor: #ba92ef; + qproperty-SelectedMeshColumnColor: #8a75a2; qproperty-SoundColumnColor: #657456; - qproperty-SoundColumnBorderColor: #A0AF7D; - qproperty-SelectedSoundColumnColor: #7F956A; - qproperty-SoundColumnHlColor: #34FE5E; - qproperty-SoundColumnTrackColor: #B6C29D; - qproperty-ColumnHeadPastelizer: #000; + qproperty-SoundColumnBorderColor: #a0af7d; + qproperty-SelectedSoundColumnColor: #7f956a; + qproperty-SoundColumnHlColor: #34fe5e; + qproperty-SoundColumnTrackColor: #b6c29d; + qproperty-ColumnHeadPastelizer: #000000; qproperty-SelectedColumnHead: #506082; qproperty-LightLightBGColor: #404040; - qproperty-LightBGColor: #F0F0F0; - qproperty-DarkBGColor: #E1E1E1; + qproperty-LightBGColor: #f0f0f0; + qproperty-DarkBGColor: #e1e1e1; qproperty-DarkLineColor: #969696; } /* ----------------------------------------------------------------------------- @@ -1777,7 +1780,7 @@ XsheetViewer { ----------------------------------------------------------------------------- */ FunctionTreeView { qproperty-TextColor: #cccccc; - qproperty-CurrentTextColor: #E66464; + qproperty-CurrentTextColor: #e66464; } FunctionPanel { qproperty-BGColor: #3b3b3b; @@ -1786,14 +1789,14 @@ FunctionPanel { qproperty-OtherCurvesColor: #888888; qproperty-RulerBackground: #333333; qproperty-TextColor: #cccccc; - qproperty-SubColor: #000; - qproperty-SelectedColor: #FFA500; + qproperty-SubColor: #000000; + qproperty-SelectedColor: #ffa500; } SpreadsheetViewer { qproperty-LightLightBGColor: #404040; qproperty-CurrentRowBgColor: #506082; qproperty-LightLineColor: #2c2c2c; - qproperty-MarkerLineColor: #1E96C4; + qproperty-MarkerLineColor: #1e96c4; qproperty-BGColor: #484848; qproperty-VerticalLineColor: #222222; qproperty-KeyFrameColor: #995d1d; @@ -1802,15 +1805,15 @@ SpreadsheetViewer { qproperty-InBetweenColor: #666250; qproperty-InBetweenBorderColor: #cdcec8; qproperty-SelectedInBetweenColor: #7e8079; - qproperty-SelectedEmptyColor: #6C6C6C; + qproperty-SelectedEmptyColor: #6c6c6c; qproperty-SelectedSceneRangeEmptyColor: #757575; qproperty-TextColor: #cccccc; qproperty-ColumnHeaderBorderColor: #808080; - qproperty-SelectedColumnTextColor: #E66464; + qproperty-SelectedColumnTextColor: #e66464; } #ExpressionField { background-color: #e6e6e6; - border: 1px solid #333; + border: 1px solid #333333; margin: 0; } #FunctionSegmentViewerLinkButton { diff --git a/stuff/config/qss/Astral_072_Dark/less/layouts/xsheet.less b/stuff/config/qss/Astral_072_Dark/less/layouts/xsheet.less index 7b9870f..f17862c 100644 --- a/stuff/config/qss/Astral_072_Dark/less/layouts/xsheet.less +++ b/stuff/config/qss/Astral_072_Dark/less/layouts/xsheet.less @@ -40,6 +40,11 @@ color: @xsheet-notes-text-color; } +#flipOrientationButton +{ + padding: 2px 12px; +} + /* XSheet Spreadsheet ----------------------------------------------------------------------------- */ diff --git a/stuff/config/qss/Astral_128_Neutral/Astral_128_Neutral.qss b/stuff/config/qss/Astral_128_Neutral/Astral_128_Neutral.qss index c5aa6b6..35a43e6 100644 --- a/stuff/config/qss/Astral_128_Neutral/Astral_128_Neutral.qss +++ b/stuff/config/qss/Astral_128_Neutral/Astral_128_Neutral.qss @@ -188,7 +188,7 @@ QGroupBox { #PaletteTabBar::tab { background-color: QLinearGradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #a1a1a1, stop: 1 #878787); border-right: 1px solid #393939; - color: #000; + color: #000000; margin: 0 0 1px 0; padding: 3px 4px 3px 4px; } @@ -201,7 +201,7 @@ QGroupBox { #StyleEditorTabBar::tab:selected, #PaletteTabBar::tab:selected { background-color: QLinearGradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #e3e3e3, stop: 1 #cccccc); - color: #000; + color: #000000; margin: 0; padding: 1px 4px 2px 4px; } @@ -217,7 +217,7 @@ QGroupBox { border-top: 1px solid #393939; border-right: 1px solid #393939; border-left: 1px solid #393939; - color: #000; + color: #000000; margin: 3px -1px 1px 0; padding: 2px 7px 1px 7px; } @@ -226,7 +226,7 @@ QGroupBox { background-color: QLinearGradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #e3e3e3, stop: 1 #cccccc); border-top-right-radius: 2px; border-top-left-radius: 2px; - color: #000; + color: #000000; margin: 1px -1px 0 0; padding: 2px 7px 2px 7px; } @@ -270,7 +270,7 @@ QTreeWidget::item, #ShortcutTree::item, ProjectPopup QTreeView::item, #Tasks QTreeView::item { - color: #000; + color: #000000; } .tree-list::item:selected, QTreeWidget::item:selected, @@ -281,7 +281,7 @@ QTreeWidget::item:selected, ProjectPopup QTreeView::item:selected, #Tasks QTreeView::item:selected { background-color: #000080; - color: #fff; + color: #ffffff; } .tree-list::item:focus, QTreeWidget::item:focus, @@ -406,7 +406,7 @@ ProjectPopup QTreeView::branch:has-children:has-siblings:open { ----------------------------------------------------------------------------- */ QWidget { background-color: #808080; - color: #000; + color: #000000; } QWidget:disabled { color: #595959; @@ -479,11 +479,11 @@ QMenuBar::item { } QMenuBar::item:selected { background-color: #b3b3b3; - color: #000; + color: #000000; } QMenuBar::item:pressed { background-color: #000080; - color: #fff; + color: #ffffff; } /* ----------------------------------------------------------------------------- Room Tabs @@ -496,7 +496,7 @@ QMenuBar::item:pressed { background-color: QLinearGradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #adadad, stop: 1 #949494); border-top: 1px solid #525252; border-right: 1px solid #525252; - color: #000; + color: #000000; margin: 0 0 0 0; padding: 2px 10px 3px 10px; } @@ -505,7 +505,7 @@ QMenuBar::item:pressed { } #TopBarTab::tab:selected { background-color: #cddcc0; - color: #000; + color: #000000; } #TopBarTab::tab:first { border-left: 1px solid #525252; @@ -526,14 +526,14 @@ QMenu::item { } QMenu::item:selected { background-color: #000080; - color: #fff; + color: #ffffff; } QMenu::item:checked { - color: #000; + color: #000000; } QMenu::item:checked:selected { background-color: #000080; - color: #fff; + color: #ffffff; } QMenu::item:disabled { background: none; @@ -570,7 +570,7 @@ TPanelTitleBar { height: 20px; min-height: 20px; qproperty-TitleColor: #bfbfbf; - qproperty-ActiveTitleColor: #fff; + qproperty-ActiveTitleColor: #ffffff; qproperty-BorderPixmap: url('../Astral_072_Dark/imgs/black/none'); qproperty-ActiveBorderPixmap: url('../Astral_072_Dark/imgs/black/none'); qproperty-FloatBorderPixmap: url('../Astral_072_Dark/imgs/black/none'); @@ -806,7 +806,7 @@ QComboBox { background-color: QLinearGradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #adadad, stop: 1 #949494); border: 1px solid #5a5a5a; border-radius: 2px; - color: #000; + color: #000000; padding: 3px 15px; } .QPushButton:hover, @@ -825,7 +825,7 @@ QPushButton:pressed, #FunctionSegmentViewerLinkButton:pressed { background-color: QLinearGradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #4d4d4d, stop: 1 #666666); border-color: #404040; - color: #000; + color: #000000; } .QPushButton:checked, QPushButton:checked, @@ -883,7 +883,7 @@ QComboBox QAbstractItemView { background-color: #c0c0c0; border: 1px solid #404040; selection-background-color: #000080; - selection-color: #fff; + selection-color: #ffffff; } /* -------------------------------------------------------------------------- */ .QLineEdit, @@ -894,9 +894,9 @@ QLineEdit, background-color: #d9d9d9; border: 1px solid #5a5a5a; border-radius: 2px; - color: #000; + color: #000000; selection-background-color: #000080; - selection-color: #fff; + selection-color: #ffffff; padding: 0 0 0 1px; } .QLineEdit:focus, @@ -904,7 +904,7 @@ QLineEdit:focus, #TaskSheetItem:focus, #tasksRemoveBox:focus, #tasksAddBox:focus { - background-color: #fff; + background-color: #ffffff; border-color: #5a5a5a; } .QLineEdit:disabled, @@ -919,11 +919,11 @@ QLineEdit:disabled, /* -------------------------------------------------------------------------- */ .QCheckBox, QCheckBox { - color: #000; + color: #000000; } .QCheckBox:hover, QCheckBox:hover { - color: #000; + color: #000000; } .QCheckBox:disabled, QCheckBox:disabled { @@ -1065,9 +1065,9 @@ QSlider::handle:horizontal { /* Right Pane ----------------------------------------------------------------------------- */ DvItemViewerPanel { - qproperty-TextColor: #000; + qproperty-TextColor: #000000; qproperty-AlternateBackground: #a6a6a6; - qproperty-SelectedTextColor: #fff; + qproperty-SelectedTextColor: #ffffff; qproperty-FolderTextColor: #000eb6; qproperty-SelectedItemBackground: #000080; } @@ -1092,11 +1092,11 @@ DvItemViewerPanel { padding: 1px; } DvDirTreeView { - qproperty-TextColor: #000; - qproperty-SelectedTextColor: #fff; + qproperty-TextColor: #000000; + qproperty-SelectedTextColor: #ffffff; qproperty-SelectedItemBackground: #000080; qproperty-FolderTextColor: #000eb6; - qproperty-SelectedFolderTextColor: #fff; + qproperty-SelectedFolderTextColor: #ffffff; alternate-background-color: #9a9a9a; background-color: #9a9a9a; border: 1px solid #404040; @@ -1139,7 +1139,7 @@ DvDirTreeView { margin-bottom: 3px; } ParamsPage { - qproperty-TextColor: #000; + qproperty-TextColor: #000000; } /* ----------------------------------------------------------------------------- Camera Settings @@ -1303,7 +1303,7 @@ PaletteViewer QToolBar QToolButton { padding: 1px 1px 2px 1px; } #PageViewer { - qproperty-TextColor: #000; + qproperty-TextColor: #000000; } #PaletteLockButton { border-radius: 0; @@ -1362,11 +1362,11 @@ QDialog #dialogButtonFrame QPushButton { } #PreferencesPopup QListWidget::item:hover { background-color: #b3b3b3; - color: #000; + color: #000000; } #PreferencesPopup QListWidget::item:selected { background-color: #000080; - color: #fff; + color: #ffffff; } /* ----------------------------------------------------------------------------- Keyboard Shortcuts @@ -1440,7 +1440,7 @@ FxSettings QToolBar QToolBar { #ScriptConsole { font-family: 'Courier New', monospace; border: 0; - color: #000; + color: #000000; padding: 3px; } #ScriptConsole QFrame { @@ -1453,7 +1453,7 @@ FxSettings QToolBar QToolBar { Task Viewer ----------------------------------------------------------------------------- */ #TaskSheetItemLabel { - color: #000; + color: #000000; } #Tasks QToolBar { border-bottom: 1px solid #404040; @@ -1658,13 +1658,13 @@ FlipSlider { qproperty-PBColorMarginBottom: 2; qproperty-PBMarkerMarginLeft: 3; qproperty-PBMarkerMarginRight: 3; - qproperty-notStartedColor: #CC2222; + qproperty-notStartedColor: #cc2222; qproperty-startedColor: #00ff00; qproperty-baseColor: #787878; } Ruler { qproperty-ParentBGColor: #b3b3b3; - qproperty-ScaleColor: #000; + qproperty-ScaleColor: #000000; } #RulerToolOptionValues { color: #000000; @@ -1685,26 +1685,29 @@ Ruler { /* xsheetColumnHeader (Context Menus) ----------------------------------------------------------------------------- */ #xsheetColumnAreaMenu_Preview { - background-color: #E6E678; + background-color: #e6e678; } #xsheetColumnAreaMenu_Lock { - background-color: #F5F5F5; + background-color: #f5f5f5; } #xsheetColumnAreaMenu_Camstand { - background-color: #FFA480; + background-color: #ffa480; } #xsheetColumnAreaMenu_Preview, #xsheetColumnAreaMenu_Lock, #xsheetColumnAreaMenu_Camstand { - color: #000; + color: #000000; } #noteTextEdit { - color: #000; + color: #000000; +} +#flipOrientationButton { + padding: 2px 12px; } /* XSheet Spreadsheet ----------------------------------------------------------------------------- */ XsheetViewer { - qproperty-TextColor: #000; + qproperty-TextColor: #000000; qproperty-BGColor: #a4a4a4; qproperty-LightLineColor: #676767; qproperty-MarkerLineColor: #00fff6; @@ -1776,7 +1779,7 @@ XsheetViewer { /* Function Editor Spreadsheet ----------------------------------------------------------------------------- */ FunctionTreeView { - qproperty-TextColor: #000; + qproperty-TextColor: #000000; qproperty-CurrentTextColor: #b30000; } FunctionPanel { @@ -1785,8 +1788,8 @@ FunctionPanel { qproperty-FrameLineColor: #d2d2d2; qproperty-OtherCurvesColor: #969696; qproperty-RulerBackground: #ffffff; - qproperty-TextColor: #000; - qproperty-SubColor: #fff; + qproperty-TextColor: #000000; + qproperty-SubColor: #ffffff; qproperty-SelectedColor: #0000ff; } SpreadsheetViewer { @@ -1804,13 +1807,13 @@ SpreadsheetViewer { qproperty-SelectedInBetweenColor: #e1e1d8; qproperty-SelectedEmptyColor: #d2d2d2; qproperty-SelectedSceneRangeEmptyColor: #d2d2d2; - qproperty-TextColor: #000; + qproperty-TextColor: #000000; qproperty-ColumnHeaderBorderColor: #343434; qproperty-SelectedColumnTextColor: #b30000; } #ExpressionField { background-color: #e6e6e6; - border: 1px solid #333; + border: 1px solid #333333; margin: 0; } #FunctionSegmentViewerLinkButton { diff --git a/toonz/sources/toonz/columncommand.cpp b/toonz/sources/toonz/columncommand.cpp index 0aa1e17..744e883 100644 --- a/toonz/sources/toonz/columncommand.cpp +++ b/toonz/sources/toonz/columncommand.cpp @@ -1223,8 +1223,9 @@ public: void execute() override { TColumnSelection *selection = dynamic_cast( TApp::instance()->getCurrentSelection()->getSelection()); - TXsheet *xsh = TApp::instance()->getCurrentXsheet()->getXsheet(); - int cc = TApp::instance()->getCurrentColumn()->getColumnIndex(); + TXsheet *xsh = TApp::instance()->getCurrentXsheet()->getXsheet(); + int cc = TApp::instance()->getCurrentColumn()->getColumnIndex(); + bool sound_changed = false; for (int i = 0; i < xsh->getColumnCount(); i++) { /*- 空のカラムの場合は飛ばす -*/ if (xsh->isColumnEmpty(i)) continue; @@ -1271,6 +1272,7 @@ public: column->setCamstandVisible(negate); else column->setCamstandVisible(!column->isCamstandVisible()); + if (column->getSoundColumn()) sound_changed = true; } /*TAB if(cmd & (CMD_ENABLE_PREVIEW|CMD_DISABLE_PREVIEW|CMD_TOGGLE_PREVIEW)) @@ -1293,6 +1295,8 @@ column->setCamstandVisible(!column->isCamstandVisible()); } */ } + if (sound_changed) + TApp::instance()->getCurrentXsheet()->notifyXsheetSoundChanged(); TApp::instance()->getCurrentXsheet()->notifyXsheetChanged(); TApp::instance()->getCurrentScene()->setDirtyFlag(true); } diff --git a/toonz/sources/toonz/mainwindow.cpp b/toonz/sources/toonz/mainwindow.cpp index d7f3516..086ce1b 100644 --- a/toonz/sources/toonz/mainwindow.cpp +++ b/toonz/sources/toonz/mainwindow.cpp @@ -2001,7 +2001,7 @@ void MainWindow::defineActions() { tr("Add As Cleanup Task"), ""); createRightClickMenuAction(MI_SelectRowKeyframes, - tr("Select All Keys in this Row"), ""); + tr("Select All Keys in this Frame"), ""); createRightClickMenuAction(MI_SelectColumnKeyframes, tr("Select All Keys in this Column"), ""); createRightClickMenuAction(MI_SelectAllKeyframes, tr("Select All Keys"), ""); @@ -2014,9 +2014,9 @@ void MainWindow::defineActions() { createRightClickMenuAction(MI_SelectFollowingKeysInColumn, tr("Select Following Keys in this Column"), ""); createRightClickMenuAction(MI_SelectPreviousKeysInRow, - tr("Select Previous Keys in this Row"), ""); + tr("Select Previous Keys in this Frame"), ""); createRightClickMenuAction(MI_SelectFollowingKeysInRow, - tr("Select Following Keys in this Row"), ""); + tr("Select Following Keys in this Frame"), ""); createRightClickMenuAction(MI_InvertKeyframeSelection, tr("Invert Key Selection"), ""); @@ -2289,9 +2289,9 @@ RecentFiles::~RecentFiles() {} void RecentFiles::addFilePath(QString path, FileType fileType) { QList files = - (fileType == Scene) - ? m_recentScenes - : (fileType == Level) ? m_recentLevels : m_recentFlipbookImages; + (fileType == Scene) ? m_recentScenes : (fileType == Level) + ? m_recentLevels + : m_recentFlipbookImages; int i; for (i = 0; i < files.size(); i++) if (files.at(i) == path) files.removeAt(i); @@ -2416,9 +2416,9 @@ void RecentFiles::saveRecentFiles() { QList RecentFiles::getFilesNameList(FileType fileType) { QList files = - (fileType == Scene) - ? m_recentScenes - : (fileType == Level) ? m_recentLevels : m_recentFlipbookImages; + (fileType == Scene) ? m_recentScenes : (fileType == Level) + ? m_recentLevels + : m_recentFlipbookImages; QList names; int i; for (i = 0; i < files.size(); i++) { @@ -2445,9 +2445,9 @@ void RecentFiles::refreshRecentFilesMenu(FileType fileType) { menu->setEnabled(false); else { CommandId clearActionId = - (fileType == Scene) - ? MI_ClearRecentScene - : (fileType == Level) ? MI_ClearRecentLevel : MI_ClearRecentImage; + (fileType == Scene) ? MI_ClearRecentScene : (fileType == Level) + ? MI_ClearRecentLevel + : MI_ClearRecentImage; menu->setActions(names); menu->addSeparator(); QAction *clearAction = CommandManager::instance()->getAction(clearActionId); diff --git a/toonz/sources/toonz/xshcellviewer.cpp b/toonz/sources/toonz/xshcellviewer.cpp index a31e947..b31188e 100644 --- a/toonz/sources/toonz/xshcellviewer.cpp +++ b/toonz/sources/toonz/xshcellviewer.cpp @@ -730,21 +730,33 @@ void RenameCellField::focusOutEvent(QFocusEvent *e) { // Override shortcut keys for cell selection commands bool RenameCellField::eventFilter(QObject *obj, QEvent *e) { - if (e->type() != QEvent::ShortcutOverride) return false; + // We really shouldn't allow OT defined shortcuts to be checked and used while + // renaming a cell + // but if we must, we should only return true or false if we're executing our + // OT action; + // otherwise pass event forward in case another object is interested in it. + if (e->type() != QEvent::ShortcutOverride) + return QObject::eventFilter(obj, e); // return false; TCellSelection *cellSelection = dynamic_cast( TApp::instance()->getCurrentSelection()->getSelection()); - if (!cellSelection) return false; + if (!cellSelection) return QObject::eventFilter(obj, e); // return false; QKeyEvent *ke = (QKeyEvent *)e; std::string keyStr = QKeySequence(ke->key() + ke->modifiers()).toString().toStdString(); QAction *action = CommandManager::instance()->getActionFromShortcut(keyStr); - if (!action) return false; + if (!action) return QObject::eventFilter(obj, e); // return false; std::string actionId = CommandManager::instance()->getIdFromAction(action); - if (actionId == "MI_Undo" || actionId == "MI_Redo") return true; + // These are usally standard ctrl/command strokes for text editing. + // Default to standard behavior and don't execute OT's action while renaming + // cell. + if (actionId == "MI_Undo" || actionId == "MI_Redo" || + actionId == "MI_Clear" || actionId == "MI_Copy" || + actionId == "MI_Paste" || actionId == "MI_Cut") + return QObject::eventFilter(obj, e); // return true; return TCellSelection::isEnabledCommand(actionId); } @@ -1394,6 +1406,7 @@ void CellArea::drawLevelCell(QPainter &p, int row, int col, bool isReference) { // if the same level & same fId with the previous cell, // draw continue line + QString fnum; if (sameLevel && prevCell.m_frameId == cell.m_frameId) { // not on line marker PredefinedLine which = @@ -1411,17 +1424,17 @@ void CellArea::drawLevelCell(QPainter &p, int row, int col, bool isReference) { // convert the last one digit of the frame number to alphabet // Ex. 12 -> 1B 21 -> 2A 30 -> 3 if (Preferences::instance()->isShowFrameNumberWithLettersEnabled()) - p.drawText(nameRect, Qt::AlignRight | Qt::AlignBottom, - m_viewer->getFrameNumberWithLetters(fid.getNumber())); + fnum = m_viewer->getFrameNumberWithLetters(fid.getNumber()); else { std::string frameNumber(""); // set number if (fid.getNumber() > 0) frameNumber = std::to_string(fid.getNumber()); // add letter if (fid.getLetter() != 0) frameNumber.append(1, fid.getLetter()); - p.drawText(nameRect, Qt::AlignRight | Qt::AlignBottom, - QString::fromStdString(frameNumber)); + fnum = QString::fromStdString(frameNumber); } + + p.drawText(nameRect, Qt::AlignRight | Qt::AlignBottom, fnum); } // draw level name @@ -1430,11 +1443,14 @@ void CellArea::drawLevelCell(QPainter &p, int row, int col, bool isReference) { Preferences::instance()->isLevelNameOnEachMarkerEnabled())) { std::wstring levelName = cell.m_level->getName(); QString text = QString::fromStdWString(levelName); -#if QT_VERSION >= 0x050500 QFontMetrics fm(font); - QString elidaName = elideText(text, fm, nameRect.width(), QString("~")); +#if QT_VERSION >= 0x050500 + // QFontMetrics fm(font); + QString elidaName = + elideText(text, fm, nameRect.width() - fm.width(fnum), QString("~")); #else - QString elidaName = elideText(text, font, nameRect.width()); + QString elidaName = + elideText(text, font, nameRect.width() - fm.width(fnum)); #endif p.drawText(nameRect, Qt::AlignLeft | Qt::AlignBottom, elidaName); } diff --git a/toonz/sources/toonz/xsheetcmd.cpp b/toonz/sources/toonz/xsheetcmd.cpp index 1542d9a..491f258 100644 --- a/toonz/sources/toonz/xsheetcmd.cpp +++ b/toonz/sources/toonz/xsheetcmd.cpp @@ -925,6 +925,7 @@ public: TApp *app = TApp::instance(); TKeyframeSelection *selection = dynamic_cast( app->getCurrentSelection()->getSelection()); + if (!selection) return; int row = app->getCurrentFrame()->getFrame(); selection->selectNone(); @@ -958,7 +959,7 @@ public: TApp *app = TApp::instance(); TKeyframeSelection *selection = dynamic_cast( app->getCurrentSelection()->getSelection()); - + if (!selection) return; int col = app->getCurrentColumn()->getColumnIndex(); TStageObjectId objectId = app->getCurrentObject()->getObjectId(); if (app->getCurrentObject()->getObjectId() == TStageObjectId::CameraId(0)) { diff --git a/toonz/sources/toonz/xshnoteviewer.cpp b/toonz/sources/toonz/xshnoteviewer.cpp index c8c2b19..6db3a19 100644 --- a/toonz/sources/toonz/xshnoteviewer.cpp +++ b/toonz/sources/toonz/xshnoteviewer.cpp @@ -554,6 +554,11 @@ void NoteArea::createLayout() { setFixedSize(rect.size()); + if (o->isVerticalTimeline()) + m_noteButton->setFixedSize(44, 26); + else + m_noteButton->setFixedSize(44, 22); + // has two elements: main layout and header panel QVBoxLayout *panelLayout = new QVBoxLayout(); panelLayout->setMargin(1); diff --git a/toonz/sources/toonz/xshrowviewer.cpp b/toonz/sources/toonz/xshrowviewer.cpp index fe323d9..ebf6917 100644 --- a/toonz/sources/toonz/xshrowviewer.cpp +++ b/toonz/sources/toonz/xshrowviewer.cpp @@ -517,6 +517,12 @@ void RowArea::paintEvent(QPaintEvent *event) { drawPinnedCenterKeys(p, r0, r1); drawPlayRange(p, r0, r1); + p.setPen(m_viewer->getVerticalLineColor()); + p.setBrush(Qt::NoBrush); + if (m_viewer->orientation()->isVerticalTimeline()) + p.drawRect(toBeUpdated.adjusted(0, -1, -1, 0)); + else + p.drawRect(toBeUpdated.adjusted(-1, 0, 0, -1)); } //----------------------------------------------------------------------------- diff --git a/toonz/sources/toonzlib/orientation.cpp b/toonz/sources/toonzlib/orientation.cpp index 3c91719..f352415 100644 --- a/toonz/sources/toonzlib/orientation.cpp +++ b/toonz/sources/toonzlib/orientation.cpp @@ -290,7 +290,7 @@ TopToBottomOrientation::TopToBottomOrientation() { addRect(PredefinedRect::FRAME_LABEL, QRect(CELL_WIDTH / 2, 1, CELL_WIDTH / 2, CELL_HEIGHT - 2)); addRect(PredefinedRect::FRAME_HEADER, - QRect(0, 0, FRAME_HEADER_WIDTH - 1, CELL_HEIGHT)); + QRect(0, 0, FRAME_HEADER_WIDTH, CELL_HEIGHT)); addRect(PredefinedRect::PLAY_RANGE, QRect(PLAY_RANGE_X, 0, PLAY_MARKER_SIZE, CELL_HEIGHT)); addRect(PredefinedRect::ONION, @@ -586,7 +586,7 @@ LeftToRightOrientation::LeftToRightOrientation() { addRect(PredefinedRect::FRAME_LABEL, QRect(CELL_WIDTH / 4, 1, CELL_WIDTH / 2, FRAME_HEADER_HEIGHT - 2)); addRect(PredefinedRect::FRAME_HEADER, - QRect(0, 0, CELL_WIDTH, FRAME_HEADER_HEIGHT - 1)); + QRect(0, 0, CELL_WIDTH, FRAME_HEADER_HEIGHT)); addRect(PredefinedRect::PLAY_RANGE, QRect(0, PLAY_RANGE_Y, CELL_WIDTH, PLAY_MARKER_SIZE)); addRect(PredefinedRect::ONION, diff --git a/toonz/sources/translations/chinese/toonz.ts b/toonz/sources/translations/chinese/toonz.ts index 5acc28f..bf179c4 100644 --- a/toonz/sources/translations/chinese/toonz.ts +++ b/toonz/sources/translations/chinese/toonz.ts @@ -3522,7 +3522,7 @@ Do you want to create it? 添加为清稿任务 - Select All Keys in this Row + Select All Keys in this Frame 选择此行的全部关键帧 @@ -3550,11 +3550,11 @@ Do you want to create it? 选择此列后面的关键帧 - Select Previous Keys in this Row + Select Previous Keys in this Frame 选择此行前面的关键帧 - Select Following Keys in this Row + Select Following Keys in this Frame 选择此行后面的关键帧 diff --git a/toonz/sources/translations/french/toonz.ts b/toonz/sources/translations/french/toonz.ts index 9b20b08..6d81d46 100644 --- a/toonz/sources/translations/french/toonz.ts +++ b/toonz/sources/translations/french/toonz.ts @@ -3524,8 +3524,8 @@ Voulez-vous le créer? Ajouter comme Tâche de Nettoyage - Select All Keys in this Row - Sélectionner Toutes les Clés de cette Ligne + Select All Keys in this Frame + Sélectionner Toutes les Clés de cette Image Select All Keys in this Column @@ -3552,12 +3552,12 @@ Voulez-vous le créer? Sélectionner les Clés Suivantes de cette Colonne - Select Previous Keys in this Row - Sélectionner les Clés Précédentes de cette Ligne + Select Previous Keys in this Frame + Sélectionner les Clés Précédentes de cette Image - Select Following Keys in this Row - Sélectionner les Clés Suivantes de cette Ligne + Select Following Keys in this Frame + Sélectionner les Clés Suivantes de cette Image Invert Key Selection diff --git a/toonz/sources/translations/german/toonz.ts b/toonz/sources/translations/german/toonz.ts index 990d93a..815cf8a 100644 --- a/toonz/sources/translations/german/toonz.ts +++ b/toonz/sources/translations/german/toonz.ts @@ -3653,8 +3653,8 @@ Möchten Sie einen erstellen? Als Säuberungs-Aufgabe hinzufügen - Select All Keys in this Row - Alle Keys in dieser Reihe wählen + Select All Keys in this Frame + Alle Keys in dieser Frame Select All Keys in this Column @@ -3681,12 +3681,12 @@ Möchten Sie einen erstellen? Alle nachfolgenden Keys in dieser Spalte wählen - Select Previous Keys in this Row - Alle vorherigen Keys in dieser Reihe wählen + Select Previous Keys in this Frame + Alle vorherigen Keys in dieser Frame - Select Following Keys in this Row - Alle nachfolgenden Keys in dieser Reihe wählen + Select Following Keys in this Frame + Alle nachfolgenden Keys in dieser Frame Invert Key Selection diff --git a/toonz/sources/translations/italian/toonz.ts b/toonz/sources/translations/italian/toonz.ts index 7898c3c..ef4e671 100644 --- a/toonz/sources/translations/italian/toonz.ts +++ b/toonz/sources/translations/italian/toonz.ts @@ -3522,8 +3522,8 @@ Vuoi crearla? Aggiungi Come Task di Cleanup - Select All Keys in this Row - Seleziona Tutte le Chiavi di questa Riga + Select All Keys in this Frame + Seleziona Tutte le Chiavi di questa Fotogramma Select All Keys in this Column @@ -3550,12 +3550,12 @@ Vuoi crearla? Seleziona le Chiavi Successive di questa Colonna - Select Previous Keys in this Row - Seleziona le Chiavi Precedenti di questa Riga + Select Previous Keys in this Frame + Seleziona le Chiavi Precedenti di questa Fotogramma - Select Following Keys in this Row - Seleziona le Chiavi Successive di questa Riga + Select Following Keys in this Frame + Seleziona le Chiavi Successive di questa Fotogramma Invert Key Selection diff --git a/toonz/sources/translations/japanese/toonz.ts b/toonz/sources/translations/japanese/toonz.ts index 56b9f27..b0b41b4 100644 --- a/toonz/sources/translations/japanese/toonz.ts +++ b/toonz/sources/translations/japanese/toonz.ts @@ -3542,7 +3542,7 @@ Do you want to create it? トレースタスクとして追加 - Select All Keys in this Row + Select All Keys in this Frame このフレームのキーをすべて選択 @@ -3570,11 +3570,11 @@ Do you want to create it? この列の後ろのキーをすべて選択 - Select Previous Keys in this Row + Select Previous Keys in this Frame このフレームの前のキーをすべて選択 - Select Following Keys in this Row + Select Following Keys in this Frame このフレームの後ろのキーをすべて選択 diff --git a/toonz/sources/translations/spanish/toonz.ts b/toonz/sources/translations/spanish/toonz.ts index 6a67e3f..a4bdcc1 100644 --- a/toonz/sources/translations/spanish/toonz.ts +++ b/toonz/sources/translations/spanish/toonz.ts @@ -3551,8 +3551,8 @@ Do you want to create it? Agregar como tarea de limpieza - Select All Keys in this Row - Seleccionar todos los claves en esta fila + Select All Keys in this Frame + Seleccionar todos los claves en esta fotograma Select All Keys in this Column @@ -3579,12 +3579,12 @@ Do you want to create it? Seleccionar los claves siguientes en esta columna - Select Previous Keys in this Row - Seleccionar los claves anteriores en esta fila + Select Previous Keys in this Frame + Seleccionar los claves anteriores en esta fotograma - Select Following Keys in this Row - Seleccionar los claves siguientes en esta fila + Select Following Keys in this Frame + Seleccionar los claves siguientes en esta fotograma Invert Key Selection