From 2ff5791a7f9320ee49a25e89940a09227a2fc2a8 Mon Sep 17 00:00:00 2001 From: Jeremy Bullock Date: Tue, 15 Sep 2020 15:50:09 -0600 Subject: [PATCH] Konero viewer buttons (#177) * Konero changes to viewer buttons * Schematic table icon --- .../imgs/black/schematic_table_transp.svg | 15 +++------ .../Medium/imgs/black/x_table_view_transp.svg | 21 ++++-------- .../imgs/white/schematic_table_transp.svg | 15 +++------ .../Medium/imgs/white/x_table_view_transp.svg | 21 ++++-------- toonz/sources/toonz/comboviewerpane.cpp | 22 ++++++------- toonz/sources/toonz/flipbook.cpp | 2 +- .../icons/dark/actions/16/folder_new.svg | 5 +-- .../toonz/icons/dark/actions/18/folder.svg | 11 ++----- .../icons/dark/actions/18/folder_anim.svg | 13 ++------ .../dark/actions/18/folder_anim_inactive.svg | 15 +++------ .../actions/18/folder_anim_inactive_on.svg | 17 +++++----- .../icons/dark/actions/18/folder_anim_on.svg | 18 +++++----- .../icons/dark/actions/18/folder_inactive.svg | 11 ++----- .../dark/actions/18/folder_inactive_on.svg | 13 ++++---- .../toonz/icons/dark/actions/18/folder_on.svg | 6 ++-- .../icons/dark/actions/18/folder_preset.svg | 11 ++----- .../dark/actions/18/folder_preset_on.svg | 33 ++++++++++--------- .../icons/dark/actions/18/folder_project.svg | 11 ++----- .../dark/actions/18/folder_project_on.svg | 11 ++++--- .../dark/actions/18/folder_project_root.svg | 23 ++++++------- .../toonz/icons/dark/actions/18/folder_vc.svg | 11 ++----- .../icons/dark/actions/18/folder_vc_on.svg | 11 ++++--- .../icons/dark/actions/18/pane_freeze.svg | 7 ---- .../icons/dark/actions/18/pane_subpreview.svg | 7 ---- .../icons/dark/actions/20/filebrowser.svg | 9 ++--- .../icons/dark/actions/20/load_scene.svg | 5 ++- .../icons/dark/actions/{18 => 20}/pane_3d.svg | 6 ++-- .../dark/actions/{18 => 20}/pane_cam.svg | 6 ++-- .../dark/actions/{18 => 20}/pane_close.svg | 4 +-- .../icons/dark/actions/20/pane_freeze.svg | 7 ++++ .../dark/actions/{18 => 20}/pane_grid.svg | 6 ++-- .../dark/actions/{18 => 20}/pane_minimize.svg | 10 +++--- .../dark/actions/{18 => 20}/pane_preview.svg | 10 +++--- .../dark/actions/{18 => 20}/pane_safe.svg | 6 ++-- .../icons/dark/actions/20/pane_subpreview.svg | 13 ++++++++ .../dark/actions/{18 => 20}/pane_table.svg | 12 ++++--- .../icons/dark/actions/20/revert_scene.svg | 7 ++-- .../icons/dark/actions/20/save_scene.svg | 7 ++-- .../icons/dark/actions/20/save_scene_as.svg | 13 +++----- .../icons/dark/actions/20/scene_settings.svg | 5 ++- .../icons/dark/actions/60/folder_browser.svg | 20 ++--------- .../dark/actions/60/folder_browser_link.svg | 25 ++++---------- .../dark/actions/60/folder_browser_up.svg | 24 +++----------- toonz/sources/toonz/pane.cpp | 8 ++--- toonz/sources/toonz/toonz.qrc | 20 +++++------ toonz/sources/toonz/tpanels.cpp | 12 +++---- toonz/sources/toonz/viewerpane.cpp | 22 ++++++------- 47 files changed, 237 insertions(+), 350 deletions(-) delete mode 100644 toonz/sources/toonz/icons/dark/actions/18/pane_freeze.svg delete mode 100644 toonz/sources/toonz/icons/dark/actions/18/pane_subpreview.svg rename toonz/sources/toonz/icons/dark/actions/{18 => 20}/pane_3d.svg (77%) rename toonz/sources/toonz/icons/dark/actions/{18 => 20}/pane_cam.svg (88%) rename toonz/sources/toonz/icons/dark/actions/{18 => 20}/pane_close.svg (84%) create mode 100644 toonz/sources/toonz/icons/dark/actions/20/pane_freeze.svg rename toonz/sources/toonz/icons/dark/actions/{18 => 20}/pane_grid.svg (77%) rename toonz/sources/toonz/icons/dark/actions/{18 => 20}/pane_minimize.svg (61%) rename toonz/sources/toonz/icons/dark/actions/{18 => 20}/pane_preview.svg (73%) rename toonz/sources/toonz/icons/dark/actions/{18 => 20}/pane_safe.svg (76%) create mode 100644 toonz/sources/toonz/icons/dark/actions/20/pane_subpreview.svg rename toonz/sources/toonz/icons/dark/actions/{18 => 20}/pane_table.svg (59%) diff --git a/stuff/config/qss/Medium/imgs/black/schematic_table_transp.svg b/stuff/config/qss/Medium/imgs/black/schematic_table_transp.svg index 4d350b97..1da4edd1 100644 --- a/stuff/config/qss/Medium/imgs/black/schematic_table_transp.svg +++ b/stuff/config/qss/Medium/imgs/black/schematic_table_transp.svg @@ -1,14 +1,9 @@ - - - - - - - - - - + + + + + diff --git a/stuff/config/qss/Medium/imgs/black/x_table_view_transp.svg b/stuff/config/qss/Medium/imgs/black/x_table_view_transp.svg index 99056824..0b3dc992 100644 --- a/stuff/config/qss/Medium/imgs/black/x_table_view_transp.svg +++ b/stuff/config/qss/Medium/imgs/black/x_table_view_transp.svg @@ -1,22 +1,15 @@ - - - - - - + + - - - - - - - - + + + + + diff --git a/stuff/config/qss/Medium/imgs/white/schematic_table_transp.svg b/stuff/config/qss/Medium/imgs/white/schematic_table_transp.svg index 4d350b97..1da4edd1 100644 --- a/stuff/config/qss/Medium/imgs/white/schematic_table_transp.svg +++ b/stuff/config/qss/Medium/imgs/white/schematic_table_transp.svg @@ -1,14 +1,9 @@ - - - - - - - - - - + + + + + diff --git a/stuff/config/qss/Medium/imgs/white/x_table_view_transp.svg b/stuff/config/qss/Medium/imgs/white/x_table_view_transp.svg index 99056824..0b3dc992 100644 --- a/stuff/config/qss/Medium/imgs/white/x_table_view_transp.svg +++ b/stuff/config/qss/Medium/imgs/white/x_table_view_transp.svg @@ -1,22 +1,15 @@ - - - - - - + + - - - - - - - - + + + + + diff --git a/toonz/sources/toonz/comboviewerpane.cpp b/toonz/sources/toonz/comboviewerpane.cpp index 48a1c356..473070cf 100644 --- a/toonz/sources/toonz/comboviewerpane.cpp +++ b/toonz/sources/toonz/comboviewerpane.cpp @@ -425,14 +425,14 @@ void ComboViewerPanel::initializeTitleBar(TPanelTitleBar *titleBar) { TPanelTitleBarButtonSet *viewModeButtonSet; m_referenceModeBs = viewModeButtonSet = new TPanelTitleBarButtonSet(); - int x = -216; - int iconWidth = 18; + int x = -232; + int iconWidth = 20; TPanelTitleBarButton *button; // buttons for show / hide toggle for the field guide and the safe area TPanelTitleBarButtonForSafeArea *safeAreaButton = new TPanelTitleBarButtonForSafeArea( - titleBar, getIconThemePath("actions/18/pane_safe.svg")); + titleBar, getIconThemePath("actions/20/pane_safe.svg")); safeAreaButton->setToolTip(tr("Safe Area (Right Click to Select)")); titleBar->add(QPoint(x, 0), safeAreaButton); ret = ret && connect(safeAreaButton, SIGNAL(toggled(bool)), @@ -446,7 +446,7 @@ void ComboViewerPanel::initializeTitleBar(TPanelTitleBar *titleBar) { CommandManager::instance()->getAction(MI_SafeArea)->isChecked()); button = new TPanelTitleBarButton( - titleBar, getIconThemePath("actions/18/pane_grid.svg")); + titleBar, getIconThemePath("actions/20/pane_grid.svg")); button->setToolTip(tr("Field Guide")); x += 1 + iconWidth; titleBar->add(QPoint(x, 0), button); @@ -461,7 +461,7 @@ void ComboViewerPanel::initializeTitleBar(TPanelTitleBar *titleBar) { // view mode toggles button = new TPanelTitleBarButton( - titleBar, getIconThemePath("actions/18/pane_table.svg")); + titleBar, getIconThemePath("actions/20/pane_table.svg")); button->setToolTip(tr("Camera Stand View")); x += 10 + 1 + iconWidth; titleBar->add(QPoint(x, 0), button); @@ -469,7 +469,7 @@ void ComboViewerPanel::initializeTitleBar(TPanelTitleBar *titleBar) { button->setPressed(true); button = new TPanelTitleBarButton(titleBar, - getIconThemePath("actions/18/pane_3d.svg")); + getIconThemePath("actions/20/pane_3d.svg")); button->setToolTip(tr("3D View")); x += +1 + iconWidth; titleBar->add(QPoint(x, 0), button); @@ -477,7 +477,7 @@ void ComboViewerPanel::initializeTitleBar(TPanelTitleBar *titleBar) { TPanelTitleBarButtonForCameraView* camButton = new TPanelTitleBarButtonForCameraView( - titleBar, getIconThemePath("actions/18/pane_cam.svg")); + titleBar, getIconThemePath("actions/20/pane_cam.svg")); camButton->setToolTip(tr("Camera View")); x += +1 + iconWidth; titleBar->add(QPoint(x, 0), camButton); @@ -489,7 +489,7 @@ void ComboViewerPanel::initializeTitleBar(TPanelTitleBar *titleBar) { // freeze button button = new TPanelTitleBarButton( - titleBar, getIconThemePath("actions/18/pane_freeze.svg")); + titleBar, getIconThemePath("actions/20/pane_freeze.svg")); x += 10 + iconWidth; button->setToolTip(tr("Freeze")); @@ -499,7 +499,7 @@ void ComboViewerPanel::initializeTitleBar(TPanelTitleBar *titleBar) { // preview toggles m_previewButton = new TPanelTitleBarButton( - titleBar, getIconThemePath("actions/18/pane_preview.svg")); + titleBar, getIconThemePath("actions/20/pane_preview.svg")); x += 10 + iconWidth; titleBar->add(QPoint(x, 0), m_previewButton); m_previewButton->setToolTip(tr("Preview")); @@ -507,8 +507,8 @@ void ComboViewerPanel::initializeTitleBar(TPanelTitleBar *titleBar) { SLOT(enableFullPreview(bool))); m_subcameraPreviewButton = new TPanelTitleBarButton( - titleBar, getIconThemePath("actions/18/pane_subpreview.svg")); - x += +1 + 22; // width of pane_preview_off.svg = 22px + titleBar, getIconThemePath("actions/20/pane_subpreview.svg")); + x += +1 + 24; // width of pane_preview_off.svg = 24px titleBar->add(QPoint(x, 0), m_subcameraPreviewButton); m_subcameraPreviewButton->setToolTip(tr("Sub-camera Preview")); diff --git a/toonz/sources/toonz/flipbook.cpp b/toonz/sources/toonz/flipbook.cpp index 38b80fac..eeaaf0f8 100644 --- a/toonz/sources/toonz/flipbook.cpp +++ b/toonz/sources/toonz/flipbook.cpp @@ -267,7 +267,7 @@ void FlipBook::addFreezeButtonToTitleBar() { if (panel) { TPanelTitleBar *titleBar = panel->getTitleBar(); m_freezeButton = new TPanelTitleBarButton( - titleBar, getIconThemePath("actions/18/pane_freeze.svg")); + titleBar, getIconThemePath("actions/20/pane_freeze.svg")); m_freezeButton->setToolTip("Freeze"); titleBar->add(QPoint(-64, 0), m_freezeButton); connect(m_freezeButton, SIGNAL(toggled(bool)), this, SLOT(freeze(bool))); diff --git a/toonz/sources/toonz/icons/dark/actions/16/folder_new.svg b/toonz/sources/toonz/icons/dark/actions/16/folder_new.svg index e0e68f39..6e6e3b13 100644 --- a/toonz/sources/toonz/icons/dark/actions/16/folder_new.svg +++ b/toonz/sources/toonz/icons/dark/actions/16/folder_new.svg @@ -7,8 +7,5 @@ - - - - + diff --git a/toonz/sources/toonz/icons/dark/actions/18/folder.svg b/toonz/sources/toonz/icons/dark/actions/18/folder.svg index 1da09f02..a8b94063 100644 --- a/toonz/sources/toonz/icons/dark/actions/18/folder.svg +++ b/toonz/sources/toonz/icons/dark/actions/18/folder.svg @@ -4,13 +4,6 @@ - - - - - - - - - + + diff --git a/toonz/sources/toonz/icons/dark/actions/18/folder_anim.svg b/toonz/sources/toonz/icons/dark/actions/18/folder_anim.svg index be78f78f..a12c36b3 100644 --- a/toonz/sources/toonz/icons/dark/actions/18/folder_anim.svg +++ b/toonz/sources/toonz/icons/dark/actions/18/folder_anim.svg @@ -4,16 +4,9 @@ - - - - - - - - - - + + + diff --git a/toonz/sources/toonz/icons/dark/actions/18/folder_anim_inactive.svg b/toonz/sources/toonz/icons/dark/actions/18/folder_anim_inactive.svg index 34ce4800..06052382 100644 --- a/toonz/sources/toonz/icons/dark/actions/18/folder_anim_inactive.svg +++ b/toonz/sources/toonz/icons/dark/actions/18/folder_anim_inactive.svg @@ -4,16 +4,9 @@ - - - - - - - - - - - + + + + diff --git a/toonz/sources/toonz/icons/dark/actions/18/folder_anim_inactive_on.svg b/toonz/sources/toonz/icons/dark/actions/18/folder_anim_inactive_on.svg index 8aa86c65..beb6cf6a 100644 --- a/toonz/sources/toonz/icons/dark/actions/18/folder_anim_inactive_on.svg +++ b/toonz/sources/toonz/icons/dark/actions/18/folder_anim_inactive_on.svg @@ -4,22 +4,21 @@ - - + + - - + - - + + + + + - - - diff --git a/toonz/sources/toonz/icons/dark/actions/18/folder_anim_on.svg b/toonz/sources/toonz/icons/dark/actions/18/folder_anim_on.svg index 8efb35cf..1b1e49a7 100644 --- a/toonz/sources/toonz/icons/dark/actions/18/folder_anim_on.svg +++ b/toonz/sources/toonz/icons/dark/actions/18/folder_anim_on.svg @@ -4,23 +4,21 @@ - - + + + + + + - - + + - - - - - - diff --git a/toonz/sources/toonz/icons/dark/actions/18/folder_inactive.svg b/toonz/sources/toonz/icons/dark/actions/18/folder_inactive.svg index f3caacf7..09a72142 100644 --- a/toonz/sources/toonz/icons/dark/actions/18/folder_inactive.svg +++ b/toonz/sources/toonz/icons/dark/actions/18/folder_inactive.svg @@ -4,13 +4,6 @@ - - - - - - - - - + + diff --git a/toonz/sources/toonz/icons/dark/actions/18/folder_inactive_on.svg b/toonz/sources/toonz/icons/dark/actions/18/folder_inactive_on.svg index 861245f1..8d72df24 100644 --- a/toonz/sources/toonz/icons/dark/actions/18/folder_inactive_on.svg +++ b/toonz/sources/toonz/icons/dark/actions/18/folder_inactive_on.svg @@ -4,19 +4,18 @@ - - + + - - + + + + - - - diff --git a/toonz/sources/toonz/icons/dark/actions/18/folder_on.svg b/toonz/sources/toonz/icons/dark/actions/18/folder_on.svg index 67ffaa4d..c0f2ae30 100644 --- a/toonz/sources/toonz/icons/dark/actions/18/folder_on.svg +++ b/toonz/sources/toonz/icons/dark/actions/18/folder_on.svg @@ -5,13 +5,13 @@ - + - + - + diff --git a/toonz/sources/toonz/icons/dark/actions/18/folder_preset.svg b/toonz/sources/toonz/icons/dark/actions/18/folder_preset.svg index b578b058..5a5d1bc9 100644 --- a/toonz/sources/toonz/icons/dark/actions/18/folder_preset.svg +++ b/toonz/sources/toonz/icons/dark/actions/18/folder_preset.svg @@ -4,15 +4,8 @@ - - - - - - - - - + + diff --git a/toonz/sources/toonz/icons/dark/actions/18/folder_preset_on.svg b/toonz/sources/toonz/icons/dark/actions/18/folder_preset_on.svg index ec33f921..7b089ef4 100644 --- a/toonz/sources/toonz/icons/dark/actions/18/folder_preset_on.svg +++ b/toonz/sources/toonz/icons/dark/actions/18/folder_preset_on.svg @@ -4,27 +4,28 @@ - - - - - - + + - + + + + + + + + + + + + + + + - - - - - - - - - diff --git a/toonz/sources/toonz/icons/dark/actions/18/folder_project.svg b/toonz/sources/toonz/icons/dark/actions/18/folder_project.svg index 8705fe97..9fe59293 100644 --- a/toonz/sources/toonz/icons/dark/actions/18/folder_project.svg +++ b/toonz/sources/toonz/icons/dark/actions/18/folder_project.svg @@ -4,13 +4,6 @@ - - - - - - - - - + + diff --git a/toonz/sources/toonz/icons/dark/actions/18/folder_project_on.svg b/toonz/sources/toonz/icons/dark/actions/18/folder_project_on.svg index 66dd6562..1757cc90 100644 --- a/toonz/sources/toonz/icons/dark/actions/18/folder_project_on.svg +++ b/toonz/sources/toonz/icons/dark/actions/18/folder_project_on.svg @@ -5,13 +5,14 @@ - - - - - + + + + + + diff --git a/toonz/sources/toonz/icons/dark/actions/18/folder_project_root.svg b/toonz/sources/toonz/icons/dark/actions/18/folder_project_root.svg index b1fdb64c..9f8cf6a5 100644 --- a/toonz/sources/toonz/icons/dark/actions/18/folder_project_root.svg +++ b/toonz/sources/toonz/icons/dark/actions/18/folder_project_root.svg @@ -5,23 +5,24 @@ - - - - - + + + + + + + + + + + + - - - - - - diff --git a/toonz/sources/toonz/icons/dark/actions/18/folder_vc.svg b/toonz/sources/toonz/icons/dark/actions/18/folder_vc.svg index af9142f4..71ec61f1 100644 --- a/toonz/sources/toonz/icons/dark/actions/18/folder_vc.svg +++ b/toonz/sources/toonz/icons/dark/actions/18/folder_vc.svg @@ -4,13 +4,6 @@ - - - - - - - - - + + diff --git a/toonz/sources/toonz/icons/dark/actions/18/folder_vc_on.svg b/toonz/sources/toonz/icons/dark/actions/18/folder_vc_on.svg index 7b7da3a3..d3a34cbb 100644 --- a/toonz/sources/toonz/icons/dark/actions/18/folder_vc_on.svg +++ b/toonz/sources/toonz/icons/dark/actions/18/folder_vc_on.svg @@ -5,13 +5,14 @@ - - - - - + + + + + + diff --git a/toonz/sources/toonz/icons/dark/actions/18/pane_freeze.svg b/toonz/sources/toonz/icons/dark/actions/18/pane_freeze.svg deleted file mode 100644 index 220617cc..00000000 --- a/toonz/sources/toonz/icons/dark/actions/18/pane_freeze.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/toonz/sources/toonz/icons/dark/actions/18/pane_subpreview.svg b/toonz/sources/toonz/icons/dark/actions/18/pane_subpreview.svg deleted file mode 100644 index bf186876..00000000 --- a/toonz/sources/toonz/icons/dark/actions/18/pane_subpreview.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/toonz/sources/toonz/icons/dark/actions/20/filebrowser.svg b/toonz/sources/toonz/icons/dark/actions/20/filebrowser.svg index cf46c14a..d5c834aa 100644 --- a/toonz/sources/toonz/icons/dark/actions/20/filebrowser.svg +++ b/toonz/sources/toonz/icons/dark/actions/20/filebrowser.svg @@ -4,12 +4,9 @@ - - - - - - + + + diff --git a/toonz/sources/toonz/icons/dark/actions/20/load_scene.svg b/toonz/sources/toonz/icons/dark/actions/20/load_scene.svg index eb7a3b6c..5a8feee3 100644 --- a/toonz/sources/toonz/icons/dark/actions/20/load_scene.svg +++ b/toonz/sources/toonz/icons/dark/actions/20/load_scene.svg @@ -2,7 +2,6 @@ - - - + + diff --git a/toonz/sources/toonz/icons/dark/actions/18/pane_3d.svg b/toonz/sources/toonz/icons/dark/actions/20/pane_3d.svg similarity index 77% rename from toonz/sources/toonz/icons/dark/actions/18/pane_3d.svg rename to toonz/sources/toonz/icons/dark/actions/20/pane_3d.svg index 7adc5706..0ddee53c 100644 --- a/toonz/sources/toonz/icons/dark/actions/18/pane_3d.svg +++ b/toonz/sources/toonz/icons/dark/actions/20/pane_3d.svg @@ -1,7 +1,7 @@ - - - + + + diff --git a/toonz/sources/toonz/icons/dark/actions/18/pane_cam.svg b/toonz/sources/toonz/icons/dark/actions/20/pane_cam.svg similarity index 88% rename from toonz/sources/toonz/icons/dark/actions/18/pane_cam.svg rename to toonz/sources/toonz/icons/dark/actions/20/pane_cam.svg index c7be87fe..4894a69a 100644 --- a/toonz/sources/toonz/icons/dark/actions/18/pane_cam.svg +++ b/toonz/sources/toonz/icons/dark/actions/20/pane_cam.svg @@ -1,7 +1,7 @@ - - - + + + diff --git a/toonz/sources/toonz/icons/dark/actions/18/pane_close.svg b/toonz/sources/toonz/icons/dark/actions/20/pane_close.svg similarity index 84% rename from toonz/sources/toonz/icons/dark/actions/18/pane_close.svg rename to toonz/sources/toonz/icons/dark/actions/20/pane_close.svg index 78c54a70..5d6f4125 100644 --- a/toonz/sources/toonz/icons/dark/actions/18/pane_close.svg +++ b/toonz/sources/toonz/icons/dark/actions/20/pane_close.svg @@ -1,7 +1,7 @@ - - + + diff --git a/toonz/sources/toonz/icons/dark/actions/20/pane_freeze.svg b/toonz/sources/toonz/icons/dark/actions/20/pane_freeze.svg new file mode 100644 index 00000000..9994630b --- /dev/null +++ b/toonz/sources/toonz/icons/dark/actions/20/pane_freeze.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/toonz/sources/toonz/icons/dark/actions/18/pane_grid.svg b/toonz/sources/toonz/icons/dark/actions/20/pane_grid.svg similarity index 77% rename from toonz/sources/toonz/icons/dark/actions/18/pane_grid.svg rename to toonz/sources/toonz/icons/dark/actions/20/pane_grid.svg index c25b1865..bf0869b9 100644 --- a/toonz/sources/toonz/icons/dark/actions/18/pane_grid.svg +++ b/toonz/sources/toonz/icons/dark/actions/20/pane_grid.svg @@ -1,7 +1,7 @@ - - - + + + diff --git a/toonz/sources/toonz/icons/dark/actions/18/pane_minimize.svg b/toonz/sources/toonz/icons/dark/actions/20/pane_minimize.svg similarity index 61% rename from toonz/sources/toonz/icons/dark/actions/18/pane_minimize.svg rename to toonz/sources/toonz/icons/dark/actions/20/pane_minimize.svg index d0254078..8c794f21 100644 --- a/toonz/sources/toonz/icons/dark/actions/18/pane_minimize.svg +++ b/toonz/sources/toonz/icons/dark/actions/20/pane_minimize.svg @@ -1,8 +1,10 @@ - - - - + + + + + + diff --git a/toonz/sources/toonz/icons/dark/actions/18/pane_preview.svg b/toonz/sources/toonz/icons/dark/actions/20/pane_preview.svg similarity index 73% rename from toonz/sources/toonz/icons/dark/actions/18/pane_preview.svg rename to toonz/sources/toonz/icons/dark/actions/20/pane_preview.svg index 3694281e..9f2c34c7 100644 --- a/toonz/sources/toonz/icons/dark/actions/18/pane_preview.svg +++ b/toonz/sources/toonz/icons/dark/actions/20/pane_preview.svg @@ -1,8 +1,10 @@ - - - - + + + + + + diff --git a/toonz/sources/toonz/icons/dark/actions/18/pane_safe.svg b/toonz/sources/toonz/icons/dark/actions/20/pane_safe.svg similarity index 76% rename from toonz/sources/toonz/icons/dark/actions/18/pane_safe.svg rename to toonz/sources/toonz/icons/dark/actions/20/pane_safe.svg index 12a03113..26c70eb2 100644 --- a/toonz/sources/toonz/icons/dark/actions/18/pane_safe.svg +++ b/toonz/sources/toonz/icons/dark/actions/20/pane_safe.svg @@ -1,7 +1,7 @@ - - - + + + diff --git a/toonz/sources/toonz/icons/dark/actions/20/pane_subpreview.svg b/toonz/sources/toonz/icons/dark/actions/20/pane_subpreview.svg new file mode 100644 index 00000000..8553334e --- /dev/null +++ b/toonz/sources/toonz/icons/dark/actions/20/pane_subpreview.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/toonz/sources/toonz/icons/dark/actions/18/pane_table.svg b/toonz/sources/toonz/icons/dark/actions/20/pane_table.svg similarity index 59% rename from toonz/sources/toonz/icons/dark/actions/18/pane_table.svg rename to toonz/sources/toonz/icons/dark/actions/20/pane_table.svg index 6aa0f1a2..78aac6de 100644 --- a/toonz/sources/toonz/icons/dark/actions/18/pane_table.svg +++ b/toonz/sources/toonz/icons/dark/actions/20/pane_table.svg @@ -1,9 +1,13 @@ - - - + + + + + - + + + diff --git a/toonz/sources/toonz/icons/dark/actions/20/revert_scene.svg b/toonz/sources/toonz/icons/dark/actions/20/revert_scene.svg index 50445152..f6091995 100644 --- a/toonz/sources/toonz/icons/dark/actions/20/revert_scene.svg +++ b/toonz/sources/toonz/icons/dark/actions/20/revert_scene.svg @@ -4,16 +4,15 @@ - - + - + - + diff --git a/toonz/sources/toonz/icons/dark/actions/20/save_scene.svg b/toonz/sources/toonz/icons/dark/actions/20/save_scene.svg index e49fc98f..7f91384c 100644 --- a/toonz/sources/toonz/icons/dark/actions/20/save_scene.svg +++ b/toonz/sources/toonz/icons/dark/actions/20/save_scene.svg @@ -4,13 +4,12 @@ - - - + + - + diff --git a/toonz/sources/toonz/icons/dark/actions/20/save_scene_as.svg b/toonz/sources/toonz/icons/dark/actions/20/save_scene_as.svg index 9fa82e03..2204d9ee 100644 --- a/toonz/sources/toonz/icons/dark/actions/20/save_scene_as.svg +++ b/toonz/sources/toonz/icons/dark/actions/20/save_scene_as.svg @@ -4,16 +4,13 @@ - - - - - - + + - + - + + diff --git a/toonz/sources/toonz/icons/dark/actions/20/scene_settings.svg b/toonz/sources/toonz/icons/dark/actions/20/scene_settings.svg index 8a06946f..cea74397 100644 --- a/toonz/sources/toonz/icons/dark/actions/20/scene_settings.svg +++ b/toonz/sources/toonz/icons/dark/actions/20/scene_settings.svg @@ -2,9 +2,8 @@ - - + - + diff --git a/toonz/sources/toonz/icons/dark/actions/60/folder_browser.svg b/toonz/sources/toonz/icons/dark/actions/60/folder_browser.svg index 1f25b077..a11b5b05 100644 --- a/toonz/sources/toonz/icons/dark/actions/60/folder_browser.svg +++ b/toonz/sources/toonz/icons/dark/actions/60/folder_browser.svg @@ -2,22 +2,8 @@ - - - - - - - - - - - - - - - - - + + + diff --git a/toonz/sources/toonz/icons/dark/actions/60/folder_browser_link.svg b/toonz/sources/toonz/icons/dark/actions/60/folder_browser_link.svg index 85d6c6fb..907697be 100644 --- a/toonz/sources/toonz/icons/dark/actions/60/folder_browser_link.svg +++ b/toonz/sources/toonz/icons/dark/actions/60/folder_browser_link.svg @@ -1,25 +1,12 @@ - - - - - - - - - - - - - - - - + + + + + - - - + diff --git a/toonz/sources/toonz/icons/dark/actions/60/folder_browser_up.svg b/toonz/sources/toonz/icons/dark/actions/60/folder_browser_up.svg index 47221733..11bc7d73 100644 --- a/toonz/sources/toonz/icons/dark/actions/60/folder_browser_up.svg +++ b/toonz/sources/toonz/icons/dark/actions/60/folder_browser_up.svg @@ -1,26 +1,12 @@ - - - - - - - - - - - - - - - - - - + + + + - + diff --git a/toonz/sources/toonz/pane.cpp b/toonz/sources/toonz/pane.cpp index c53e8830..51a2a90d 100644 --- a/toonz/sources/toonz/pane.cpp +++ b/toonz/sources/toonz/pane.cpp @@ -483,11 +483,11 @@ void TPanelTitleBar::paintEvent(QPaintEvent *) { if (dw->isFloating()) { QIcon paneCloseIcon = createQIcon("pane_close"); const static QPixmap closeButtonPixmap( - paneCloseIcon.pixmap(18, 18, QIcon::Normal, QIcon::Off)); + paneCloseIcon.pixmap(20, 18, QIcon::Normal, QIcon::Off)); const static QPixmap closeButtonPixmapOver( - paneCloseIcon.pixmap(18, 18, QIcon::Active)); + paneCloseIcon.pixmap(20, 18, QIcon::Active)); - QPoint closeButtonPos(rect.right() - 18, rect.top()); + QPoint closeButtonPos(rect.right() - 20, rect.top()); if (m_closeButtonHighlighted) painter.drawPixmap(closeButtonPos, closeButtonPixmapOver); @@ -507,7 +507,7 @@ void TPanelTitleBar::mousePressEvent(QMouseEvent *event) { if (dw->isFloating()) { QRect rect = this->rect(); - QRect closeButtonRect(rect.right() - 18, rect.top() + 1, 18, 18); + QRect closeButtonRect(rect.right() - 20, rect.top() + 1, 20, 18); if (closeButtonRect.contains(pos) && dw->isFloating()) { event->accept(); dw->hide(); diff --git a/toonz/sources/toonz/toonz.qrc b/toonz/sources/toonz/toonz.qrc index 5d59bcc4..f936ec86 100644 --- a/toonz/sources/toonz/toonz.qrc +++ b/toonz/sources/toonz/toonz.qrc @@ -408,16 +408,16 @@ icons/dark/actions/20/palettegizmo.svg - icons/dark/actions/18/pane_table.svg - icons/dark/actions/18/pane_safe.svg - icons/dark/actions/18/pane_grid.svg - icons/dark/actions/18/pane_cam.svg - icons/dark/actions/18/pane_freeze.svg - icons/dark/actions/18/pane_preview.svg - icons/dark/actions/18/pane_subpreview.svg - icons/dark/actions/18/pane_3d.svg - icons/dark/actions/18/pane_minimize.svg - icons/dark/actions/18/pane_close.svg + icons/dark/actions/20/pane_table.svg + icons/dark/actions/20/pane_safe.svg + icons/dark/actions/20/pane_grid.svg + icons/dark/actions/20/pane_cam.svg + icons/dark/actions/20/pane_freeze.svg + icons/dark/actions/20/pane_preview.svg + icons/dark/actions/20/pane_subpreview.svg + icons/dark/actions/20/pane_3d.svg + icons/dark/actions/20/pane_minimize.svg + icons/dark/actions/20/pane_close.svg icons/dark/actions/16/bold.svg diff --git a/toonz/sources/toonz/tpanels.cpp b/toonz/sources/toonz/tpanels.cpp index 7bb601ee..72b1ce82 100644 --- a/toonz/sources/toonz/tpanels.cpp +++ b/toonz/sources/toonz/tpanels.cpp @@ -874,8 +874,8 @@ public: panel->setWidget(toolbar); panel->setIsMaximizable(false); // panel->setAllowedAreas(Qt::LeftDockWidgetArea|Qt::RightDockWidgetArea); - panel->setFixedWidth(40); // 35 - toolbar->setFixedWidth(30); + panel->setFixedWidth(44); // 35 + toolbar->setFixedWidth(34); panel->setWindowTitle(QString("")); panel->getTitleBar()->showTitleBar(TApp::instance()->getShowTitleBars()); connect(TApp::instance(), SIGNAL(showTitleBars(bool)), panel->getTitleBar(), @@ -982,11 +982,11 @@ void FlipbookPanel::reset() { m_flipbook->reset(); } void FlipbookPanel::initializeTitleBar(TPanelTitleBar *titleBar) { bool ret = true; int x = -91; - int iconWidth = 18; + int iconWidth = 20; // safe area button TPanelTitleBarButtonForSafeArea *safeAreaButton = new TPanelTitleBarButtonForSafeArea( - titleBar, getIconThemePath("actions/18/pane_safe.svg")); + titleBar, getIconThemePath("actions/20/pane_safe.svg")); safeAreaButton->setToolTip(tr("Safe Area (Right Click to Select)")); titleBar->add(QPoint(x, 0), safeAreaButton); ret = ret && connect(safeAreaButton, SIGNAL(toggled(bool)), @@ -999,10 +999,10 @@ void FlipbookPanel::initializeTitleBar(TPanelTitleBar *titleBar) { safeAreaButton->setPressed( CommandManager::instance()->getAction(MI_SafeArea)->isChecked()); - x += 33 + iconWidth; + x += 28 + iconWidth; // minimize button m_button = new TPanelTitleBarButton( - titleBar, getIconThemePath("actions/18/pane_minimize.svg")); + titleBar, getIconThemePath("actions/20/pane_minimize.svg")); m_button->setToolTip(tr("Minimize")); m_button->setPressed(false); diff --git a/toonz/sources/toonz/viewerpane.cpp b/toonz/sources/toonz/viewerpane.cpp index 3674e3c6..530bc367 100644 --- a/toonz/sources/toonz/viewerpane.cpp +++ b/toonz/sources/toonz/viewerpane.cpp @@ -426,14 +426,14 @@ void SceneViewerPanel::initializeTitleBar(TPanelTitleBar *titleBar) { TPanelTitleBarButtonSet *viewModeButtonSet; m_referenceModeBs = viewModeButtonSet = new TPanelTitleBarButtonSet(); - int x = -216; - int iconWidth = 18; + int x = -232; + int iconWidth = 20; TPanelTitleBarButton *button; // buttons for show / hide toggle for the field guide and the safe area TPanelTitleBarButtonForSafeArea *safeAreaButton = new TPanelTitleBarButtonForSafeArea( - titleBar, getIconThemePath("actions/18/pane_safe.svg")); + titleBar, getIconThemePath("actions/20/pane_safe.svg")); safeAreaButton->setToolTip(tr("Safe Area (Right Click to Select)")); titleBar->add(QPoint(x, 0), safeAreaButton); ret = ret && connect(safeAreaButton, SIGNAL(toggled(bool)), @@ -447,7 +447,7 @@ void SceneViewerPanel::initializeTitleBar(TPanelTitleBar *titleBar) { CommandManager::instance()->getAction(MI_SafeArea)->isChecked()); button = new TPanelTitleBarButton( - titleBar, getIconThemePath("actions/18/pane_grid.svg")); + titleBar, getIconThemePath("actions/20/pane_grid.svg")); button->setToolTip(tr("Field Guide")); x += 1 + iconWidth; titleBar->add(QPoint(x, 0), button); @@ -462,7 +462,7 @@ void SceneViewerPanel::initializeTitleBar(TPanelTitleBar *titleBar) { // view mode toggles button = new TPanelTitleBarButton( - titleBar, getIconThemePath("actions/18/pane_table.svg")); + titleBar, getIconThemePath("actions/20/pane_table.svg")); button->setToolTip(tr("Camera Stand View")); x += 10 + iconWidth; titleBar->add(QPoint(x, 0), button); @@ -470,7 +470,7 @@ void SceneViewerPanel::initializeTitleBar(TPanelTitleBar *titleBar) { button->setPressed(true); button = new TPanelTitleBarButton(titleBar, - getIconThemePath("actions/18/pane_3d.svg")); + getIconThemePath("actions/20/pane_3d.svg")); button->setToolTip(tr("3D View")); x += +1 + iconWidth; titleBar->add(QPoint(x, 0), button); @@ -478,7 +478,7 @@ void SceneViewerPanel::initializeTitleBar(TPanelTitleBar *titleBar) { TPanelTitleBarButtonForCameraView *camButton = new TPanelTitleBarButtonForCameraView( - titleBar, getIconThemePath("actions/18/pane_cam.svg")); + titleBar, getIconThemePath("actions/20/pane_cam.svg")); camButton->setToolTip(tr("Camera View")); x += +1 + iconWidth; titleBar->add(QPoint(x, 0), camButton); @@ -491,7 +491,7 @@ void SceneViewerPanel::initializeTitleBar(TPanelTitleBar *titleBar) { // freeze button button = new TPanelTitleBarButton( - titleBar, getIconThemePath("actions/18/pane_freeze.svg")); + titleBar, getIconThemePath("actions/20/pane_freeze.svg")); x += 10 + iconWidth; button->setToolTip(tr("Freeze")); // RC1 @@ -501,7 +501,7 @@ void SceneViewerPanel::initializeTitleBar(TPanelTitleBar *titleBar) { // preview toggles m_previewButton = new TPanelTitleBarButton( - titleBar, getIconThemePath("actions/18/pane_preview.svg")); + titleBar, getIconThemePath("actions/20/pane_preview.svg")); x += 10 + iconWidth; titleBar->add(QPoint(x, 0), m_previewButton); m_previewButton->setToolTip(tr("Preview")); @@ -509,8 +509,8 @@ void SceneViewerPanel::initializeTitleBar(TPanelTitleBar *titleBar) { SLOT(enableFullPreview(bool))); m_subcameraPreviewButton = new TPanelTitleBarButton( - titleBar, getIconThemePath("actions/18/pane_subpreview.svg")); - x += +1 + 22; // width of pane_preview.svg = 22px + titleBar, getIconThemePath("actions/20/pane_subpreview.svg")); + x += +1 + 24; // width of pane_preview.svg = 24px titleBar->add(QPoint(x, 0), m_subcameraPreviewButton); m_subcameraPreviewButton->setToolTip(tr("Sub-camera Preview"));