diff --git a/toonz/sources/toonz/Resources/3D.png b/toonz/sources/toonz/Resources/3D.png
deleted file mode 100644
index 5d7bac9..0000000
Binary files a/toonz/sources/toonz/Resources/3D.png and /dev/null differ
diff --git a/toonz/sources/toonz/Resources/3D_on.png b/toonz/sources/toonz/Resources/3D_on.png
deleted file mode 100644
index c5297fb..0000000
Binary files a/toonz/sources/toonz/Resources/3D_on.png and /dev/null differ
diff --git a/toonz/sources/toonz/Resources/3D_over.png b/toonz/sources/toonz/Resources/3D_over.png
deleted file mode 100644
index a594214..0000000
Binary files a/toonz/sources/toonz/Resources/3D_over.png and /dev/null differ
diff --git a/toonz/sources/toonz/Resources/close_pane.svg b/toonz/sources/toonz/Resources/close_pane.svg
deleted file mode 100644
index 7c5bb86..0000000
--- a/toonz/sources/toonz/Resources/close_pane.svg
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-
diff --git a/toonz/sources/toonz/Resources/close_pane_rollover.svg b/toonz/sources/toonz/Resources/close_pane_rollover.svg
deleted file mode 100644
index 8b5a793..0000000
--- a/toonz/sources/toonz/Resources/close_pane_rollover.svg
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
diff --git a/toonz/sources/toonz/Resources/fieldguide.png b/toonz/sources/toonz/Resources/fieldguide.png
deleted file mode 100644
index 986f428..0000000
Binary files a/toonz/sources/toonz/Resources/fieldguide.png and /dev/null differ
diff --git a/toonz/sources/toonz/Resources/fieldguide_on.png b/toonz/sources/toonz/Resources/fieldguide_on.png
deleted file mode 100644
index fb56a64..0000000
Binary files a/toonz/sources/toonz/Resources/fieldguide_on.png and /dev/null differ
diff --git a/toonz/sources/toonz/Resources/fieldguide_over.png b/toonz/sources/toonz/Resources/fieldguide_over.png
deleted file mode 100644
index 40cf560..0000000
Binary files a/toonz/sources/toonz/Resources/fieldguide_over.png and /dev/null differ
diff --git a/toonz/sources/toonz/Resources/freeze.png b/toonz/sources/toonz/Resources/freeze.png
deleted file mode 100644
index c85832d..0000000
Binary files a/toonz/sources/toonz/Resources/freeze.png and /dev/null differ
diff --git a/toonz/sources/toonz/Resources/freeze_on.png b/toonz/sources/toonz/Resources/freeze_on.png
deleted file mode 100644
index 53e3e12..0000000
Binary files a/toonz/sources/toonz/Resources/freeze_on.png and /dev/null differ
diff --git a/toonz/sources/toonz/Resources/freeze_over.png b/toonz/sources/toonz/Resources/freeze_over.png
deleted file mode 100644
index b45d472..0000000
Binary files a/toonz/sources/toonz/Resources/freeze_over.png and /dev/null differ
diff --git a/toonz/sources/toonz/Resources/minimize.png b/toonz/sources/toonz/Resources/minimize.png
deleted file mode 100644
index 11db8f2..0000000
Binary files a/toonz/sources/toonz/Resources/minimize.png and /dev/null differ
diff --git a/toonz/sources/toonz/Resources/minimize_on.png b/toonz/sources/toonz/Resources/minimize_on.png
deleted file mode 100644
index 01ac0a0..0000000
Binary files a/toonz/sources/toonz/Resources/minimize_on.png and /dev/null differ
diff --git a/toonz/sources/toonz/Resources/minimize_over.png b/toonz/sources/toonz/Resources/minimize_over.png
deleted file mode 100644
index 01ac0a0..0000000
Binary files a/toonz/sources/toonz/Resources/minimize_over.png and /dev/null differ
diff --git a/toonz/sources/toonz/Resources/pane_3d_off.svg b/toonz/sources/toonz/Resources/pane_3d_off.svg
new file mode 100644
index 0000000..0c3d4e1
--- /dev/null
+++ b/toonz/sources/toonz/Resources/pane_3d_off.svg
@@ -0,0 +1,24 @@
+
+
\ No newline at end of file
diff --git a/toonz/sources/toonz/Resources/pane_3d_on.svg b/toonz/sources/toonz/Resources/pane_3d_on.svg
new file mode 100644
index 0000000..a4fdb9e
--- /dev/null
+++ b/toonz/sources/toonz/Resources/pane_3d_on.svg
@@ -0,0 +1,30 @@
+
+
\ No newline at end of file
diff --git a/toonz/sources/toonz/Resources/pane_3d_over.svg b/toonz/sources/toonz/Resources/pane_3d_over.svg
new file mode 100644
index 0000000..174d1b2
--- /dev/null
+++ b/toonz/sources/toonz/Resources/pane_3d_over.svg
@@ -0,0 +1,30 @@
+
+
\ No newline at end of file
diff --git a/toonz/sources/toonz/Resources/pane_cam_off.svg b/toonz/sources/toonz/Resources/pane_cam_off.svg
new file mode 100644
index 0000000..a229819
--- /dev/null
+++ b/toonz/sources/toonz/Resources/pane_cam_off.svg
@@ -0,0 +1,24 @@
+
+
\ No newline at end of file
diff --git a/toonz/sources/toonz/Resources/pane_cam_on.svg b/toonz/sources/toonz/Resources/pane_cam_on.svg
new file mode 100644
index 0000000..e453b5b
--- /dev/null
+++ b/toonz/sources/toonz/Resources/pane_cam_on.svg
@@ -0,0 +1,30 @@
+
+
\ No newline at end of file
diff --git a/toonz/sources/toonz/Resources/pane_cam_over.svg b/toonz/sources/toonz/Resources/pane_cam_over.svg
new file mode 100644
index 0000000..94d6c26
--- /dev/null
+++ b/toonz/sources/toonz/Resources/pane_cam_over.svg
@@ -0,0 +1,30 @@
+
+
\ No newline at end of file
diff --git a/toonz/sources/toonz/Resources/pane_close.svg b/toonz/sources/toonz/Resources/pane_close.svg
new file mode 100644
index 0000000..a3a52b1
--- /dev/null
+++ b/toonz/sources/toonz/Resources/pane_close.svg
@@ -0,0 +1,32 @@
+
+
\ No newline at end of file
diff --git a/toonz/sources/toonz/Resources/pane_close_rollover.svg b/toonz/sources/toonz/Resources/pane_close_rollover.svg
new file mode 100644
index 0000000..5fc46ad
--- /dev/null
+++ b/toonz/sources/toonz/Resources/pane_close_rollover.svg
@@ -0,0 +1,38 @@
+
+
\ No newline at end of file
diff --git a/toonz/sources/toonz/Resources/pane_freeze_off.svg b/toonz/sources/toonz/Resources/pane_freeze_off.svg
new file mode 100644
index 0000000..78f9013
--- /dev/null
+++ b/toonz/sources/toonz/Resources/pane_freeze_off.svg
@@ -0,0 +1,27 @@
+
+
\ No newline at end of file
diff --git a/toonz/sources/toonz/Resources/pane_freeze_on.svg b/toonz/sources/toonz/Resources/pane_freeze_on.svg
new file mode 100644
index 0000000..02282f4
--- /dev/null
+++ b/toonz/sources/toonz/Resources/pane_freeze_on.svg
@@ -0,0 +1,33 @@
+
+
\ No newline at end of file
diff --git a/toonz/sources/toonz/Resources/pane_freeze_over.svg b/toonz/sources/toonz/Resources/pane_freeze_over.svg
new file mode 100644
index 0000000..a651bfb
--- /dev/null
+++ b/toonz/sources/toonz/Resources/pane_freeze_over.svg
@@ -0,0 +1,33 @@
+
+
\ No newline at end of file
diff --git a/toonz/sources/toonz/Resources/pane_grid_off.svg b/toonz/sources/toonz/Resources/pane_grid_off.svg
new file mode 100644
index 0000000..1ae3897
--- /dev/null
+++ b/toonz/sources/toonz/Resources/pane_grid_off.svg
@@ -0,0 +1,24 @@
+
+
\ No newline at end of file
diff --git a/toonz/sources/toonz/Resources/pane_grid_on.svg b/toonz/sources/toonz/Resources/pane_grid_on.svg
new file mode 100644
index 0000000..06d8de3
--- /dev/null
+++ b/toonz/sources/toonz/Resources/pane_grid_on.svg
@@ -0,0 +1,30 @@
+
+
\ No newline at end of file
diff --git a/toonz/sources/toonz/Resources/pane_grid_over.svg b/toonz/sources/toonz/Resources/pane_grid_over.svg
new file mode 100644
index 0000000..95a7167
--- /dev/null
+++ b/toonz/sources/toonz/Resources/pane_grid_over.svg
@@ -0,0 +1,30 @@
+
+
\ No newline at end of file
diff --git a/toonz/sources/toonz/Resources/pane_minimize.svg b/toonz/sources/toonz/Resources/pane_minimize.svg
new file mode 100644
index 0000000..f178c77
--- /dev/null
+++ b/toonz/sources/toonz/Resources/pane_minimize.svg
@@ -0,0 +1,32 @@
+
+
\ No newline at end of file
diff --git a/toonz/sources/toonz/Resources/pane_minimize_on.svg b/toonz/sources/toonz/Resources/pane_minimize_on.svg
new file mode 100644
index 0000000..5b4c543
--- /dev/null
+++ b/toonz/sources/toonz/Resources/pane_minimize_on.svg
@@ -0,0 +1,32 @@
+
+
\ No newline at end of file
diff --git a/toonz/sources/toonz/Resources/pane_minimize_over.svg b/toonz/sources/toonz/Resources/pane_minimize_over.svg
new file mode 100644
index 0000000..5b4c543
--- /dev/null
+++ b/toonz/sources/toonz/Resources/pane_minimize_over.svg
@@ -0,0 +1,32 @@
+
+
\ No newline at end of file
diff --git a/toonz/sources/toonz/Resources/pane_preview_off.svg b/toonz/sources/toonz/Resources/pane_preview_off.svg
new file mode 100644
index 0000000..f4ef372
--- /dev/null
+++ b/toonz/sources/toonz/Resources/pane_preview_off.svg
@@ -0,0 +1,35 @@
+
+
\ No newline at end of file
diff --git a/toonz/sources/toonz/Resources/pane_preview_on.svg b/toonz/sources/toonz/Resources/pane_preview_on.svg
new file mode 100644
index 0000000..134da8c
--- /dev/null
+++ b/toonz/sources/toonz/Resources/pane_preview_on.svg
@@ -0,0 +1,41 @@
+
+
\ No newline at end of file
diff --git a/toonz/sources/toonz/Resources/pane_preview_over.svg b/toonz/sources/toonz/Resources/pane_preview_over.svg
new file mode 100644
index 0000000..834269c
--- /dev/null
+++ b/toonz/sources/toonz/Resources/pane_preview_over.svg
@@ -0,0 +1,41 @@
+
+
\ No newline at end of file
diff --git a/toonz/sources/toonz/Resources/pane_safe_off.svg b/toonz/sources/toonz/Resources/pane_safe_off.svg
new file mode 100644
index 0000000..82cfcb5
--- /dev/null
+++ b/toonz/sources/toonz/Resources/pane_safe_off.svg
@@ -0,0 +1,24 @@
+
+
\ No newline at end of file
diff --git a/toonz/sources/toonz/Resources/pane_safe_on.svg b/toonz/sources/toonz/Resources/pane_safe_on.svg
new file mode 100644
index 0000000..4a45a2f
--- /dev/null
+++ b/toonz/sources/toonz/Resources/pane_safe_on.svg
@@ -0,0 +1,30 @@
+
+
\ No newline at end of file
diff --git a/toonz/sources/toonz/Resources/pane_safe_over.svg b/toonz/sources/toonz/Resources/pane_safe_over.svg
new file mode 100644
index 0000000..22ccd8b
--- /dev/null
+++ b/toonz/sources/toonz/Resources/pane_safe_over.svg
@@ -0,0 +1,30 @@
+
+
\ No newline at end of file
diff --git a/toonz/sources/toonz/Resources/pane_subpreview_off.svg b/toonz/sources/toonz/Resources/pane_subpreview_off.svg
new file mode 100644
index 0000000..5073360
--- /dev/null
+++ b/toonz/sources/toonz/Resources/pane_subpreview_off.svg
@@ -0,0 +1,58 @@
+
+
\ No newline at end of file
diff --git a/toonz/sources/toonz/Resources/pane_subpreview_on.svg b/toonz/sources/toonz/Resources/pane_subpreview_on.svg
new file mode 100644
index 0000000..7898876
--- /dev/null
+++ b/toonz/sources/toonz/Resources/pane_subpreview_on.svg
@@ -0,0 +1,64 @@
+
+
\ No newline at end of file
diff --git a/toonz/sources/toonz/Resources/pane_subpreview_over.svg b/toonz/sources/toonz/Resources/pane_subpreview_over.svg
new file mode 100644
index 0000000..5c99a7b
--- /dev/null
+++ b/toonz/sources/toonz/Resources/pane_subpreview_over.svg
@@ -0,0 +1,64 @@
+
+
\ No newline at end of file
diff --git a/toonz/sources/toonz/Resources/pane_table_off.svg b/toonz/sources/toonz/Resources/pane_table_off.svg
new file mode 100644
index 0000000..991c33a
--- /dev/null
+++ b/toonz/sources/toonz/Resources/pane_table_off.svg
@@ -0,0 +1,36 @@
+
+
\ No newline at end of file
diff --git a/toonz/sources/toonz/Resources/pane_table_on.svg b/toonz/sources/toonz/Resources/pane_table_on.svg
new file mode 100644
index 0000000..bb931b4
--- /dev/null
+++ b/toonz/sources/toonz/Resources/pane_table_on.svg
@@ -0,0 +1,42 @@
+
+
\ No newline at end of file
diff --git a/toonz/sources/toonz/Resources/pane_table_over.svg b/toonz/sources/toonz/Resources/pane_table_over.svg
new file mode 100644
index 0000000..0bfc053
--- /dev/null
+++ b/toonz/sources/toonz/Resources/pane_table_over.svg
@@ -0,0 +1,42 @@
+
+
\ No newline at end of file
diff --git a/toonz/sources/toonz/Resources/safearea.png b/toonz/sources/toonz/Resources/safearea.png
deleted file mode 100644
index a52ae16..0000000
Binary files a/toonz/sources/toonz/Resources/safearea.png and /dev/null differ
diff --git a/toonz/sources/toonz/Resources/safearea_on.png b/toonz/sources/toonz/Resources/safearea_on.png
deleted file mode 100644
index 850f5dc..0000000
Binary files a/toonz/sources/toonz/Resources/safearea_on.png and /dev/null differ
diff --git a/toonz/sources/toonz/Resources/safearea_over.png b/toonz/sources/toonz/Resources/safearea_over.png
deleted file mode 100644
index dd09486..0000000
Binary files a/toonz/sources/toonz/Resources/safearea_over.png and /dev/null differ
diff --git a/toonz/sources/toonz/Resources/standard.png b/toonz/sources/toonz/Resources/standard.png
deleted file mode 100644
index 5ae9afc..0000000
Binary files a/toonz/sources/toonz/Resources/standard.png and /dev/null differ
diff --git a/toonz/sources/toonz/Resources/standard_on.png b/toonz/sources/toonz/Resources/standard_on.png
deleted file mode 100644
index 2a9b3b0..0000000
Binary files a/toonz/sources/toonz/Resources/standard_on.png and /dev/null differ
diff --git a/toonz/sources/toonz/Resources/standard_over.png b/toonz/sources/toonz/Resources/standard_over.png
deleted file mode 100644
index 31162f1..0000000
Binary files a/toonz/sources/toonz/Resources/standard_over.png and /dev/null differ
diff --git a/toonz/sources/toonz/Resources/subcamera_preview.png b/toonz/sources/toonz/Resources/subcamera_preview.png
deleted file mode 100644
index deefa67..0000000
Binary files a/toonz/sources/toonz/Resources/subcamera_preview.png and /dev/null differ
diff --git a/toonz/sources/toonz/Resources/subcamera_preview_on.png b/toonz/sources/toonz/Resources/subcamera_preview_on.png
deleted file mode 100644
index 04d7368..0000000
Binary files a/toonz/sources/toonz/Resources/subcamera_preview_on.png and /dev/null differ
diff --git a/toonz/sources/toonz/Resources/subcamera_preview_over.png b/toonz/sources/toonz/Resources/subcamera_preview_over.png
deleted file mode 100644
index 3eeaf15..0000000
Binary files a/toonz/sources/toonz/Resources/subcamera_preview_over.png and /dev/null differ
diff --git a/toonz/sources/toonz/Resources/view_camera.png b/toonz/sources/toonz/Resources/view_camera.png
deleted file mode 100644
index 313c270..0000000
Binary files a/toonz/sources/toonz/Resources/view_camera.png and /dev/null differ
diff --git a/toonz/sources/toonz/Resources/view_camera_on.png b/toonz/sources/toonz/Resources/view_camera_on.png
deleted file mode 100644
index a25fa6a..0000000
Binary files a/toonz/sources/toonz/Resources/view_camera_on.png and /dev/null differ
diff --git a/toonz/sources/toonz/Resources/view_camera_over.png b/toonz/sources/toonz/Resources/view_camera_over.png
deleted file mode 100644
index 9e0d831..0000000
Binary files a/toonz/sources/toonz/Resources/view_camera_over.png and /dev/null differ
diff --git a/toonz/sources/toonz/Resources/viewpreview.png b/toonz/sources/toonz/Resources/viewpreview.png
deleted file mode 100644
index c19615d..0000000
Binary files a/toonz/sources/toonz/Resources/viewpreview.png and /dev/null differ
diff --git a/toonz/sources/toonz/Resources/viewpreview_on.png b/toonz/sources/toonz/Resources/viewpreview_on.png
deleted file mode 100644
index cf39d5a..0000000
Binary files a/toonz/sources/toonz/Resources/viewpreview_on.png and /dev/null differ
diff --git a/toonz/sources/toonz/Resources/viewpreview_over.png b/toonz/sources/toonz/Resources/viewpreview_over.png
deleted file mode 100644
index db1fd40..0000000
Binary files a/toonz/sources/toonz/Resources/viewpreview_over.png and /dev/null differ
diff --git a/toonz/sources/toonz/comboviewerpane.cpp b/toonz/sources/toonz/comboviewerpane.cpp
index 05bd8b7..d1f4488 100644
--- a/toonz/sources/toonz/comboviewerpane.cpp
+++ b/toonz/sources/toonz/comboviewerpane.cpp
@@ -432,16 +432,16 @@ void ComboViewerPanel::initializeTitleBar(TPanelTitleBar *titleBar) {
TPanelTitleBarButtonSet *viewModeButtonSet;
m_referenceModeBs = viewModeButtonSet = new TPanelTitleBarButtonSet();
int x = -232;
- int iconWidth = 17;
+ int iconWidth = 20;
TPanelTitleBarButton *button;
// buttons for show / hide toggle for the field guide and the safe area
TPanelTitleBarButtonForSafeArea *safeAreaButton =
- new TPanelTitleBarButtonForSafeArea(titleBar, ":Resources/safearea.png",
- ":Resources/safearea_over.png",
- ":Resources/safearea_on.png");
+ new TPanelTitleBarButtonForSafeArea(titleBar, ":Resources/pane_safe_off.svg",
+ ":Resources/pane_safe_over.svg",
+ ":Resources/pane_safe_on.svg");
safeAreaButton->setToolTip(tr("Safe Area (Right Click to Select)"));
- titleBar->add(QPoint(x, 1), safeAreaButton);
+ titleBar->add(QPoint(x, 0), safeAreaButton);
ret = ret && connect(safeAreaButton, SIGNAL(toggled(bool)),
CommandManager::instance()->getAction(MI_SafeArea),
SLOT(trigger()));
@@ -452,12 +452,12 @@ void ComboViewerPanel::initializeTitleBar(TPanelTitleBar *titleBar) {
safeAreaButton->setPressed(
CommandManager::instance()->getAction(MI_SafeArea)->isChecked());
- button = new TPanelTitleBarButton(titleBar, ":Resources/fieldguide.png",
- ":Resources/fieldguide_over.png",
- ":Resources/fieldguide_on.png");
+ button = new TPanelTitleBarButton(titleBar, ":Resources/pane_grid_off.svg",
+ ":Resources/pane_grid_over.svg",
+ ":Resources/pane_grid_on.svg");
button->setToolTip(tr("Field Guide"));
- x += 5 + iconWidth;
- titleBar->add(QPoint(x, 1), button);
+ x += 1 + iconWidth;
+ titleBar->add(QPoint(x, 0), button);
ret = ret && connect(button, SIGNAL(toggled(bool)),
CommandManager::instance()->getAction(MI_FieldGuide),
SLOT(trigger()));
@@ -468,61 +468,61 @@ void ComboViewerPanel::initializeTitleBar(TPanelTitleBar *titleBar) {
CommandManager::instance()->getAction(MI_FieldGuide)->isChecked());
// view mode toggles
- button = new TPanelTitleBarButton(titleBar, ":Resources/standard.png",
- ":Resources/standard_over.png",
- ":Resources/standard_on.png");
+ button = new TPanelTitleBarButton(titleBar, ":Resources/pane_table_off.svg",
+ ":Resources/pane_table_over.svg",
+ ":Resources/pane_table_on.svg");
button->setToolTip(tr("Camera Stand View"));
x += 10 + iconWidth;
- titleBar->add(QPoint(x, 1), button);
+ titleBar->add(QPoint(x, 0), button);
button->setButtonSet(viewModeButtonSet, SceneViewer::NORMAL_REFERENCE);
button->setPressed(true);
- button = new TPanelTitleBarButton(titleBar, ":Resources/3D.png",
- ":Resources/3D_over.png",
- ":Resources/3D_on.png");
+ button = new TPanelTitleBarButton(titleBar, ":Resources/pane_3d_off.svg",
+ ":Resources/pane_3d_over.svg",
+ ":Resources/pane_3d_on.svg");
button->setToolTip(tr("3D View"));
- x += 19; // width of standard.png = 18pixels
- titleBar->add(QPoint(x, 1), button);
+ x += 21; // width of pane_table_off.svg = 20px
+ titleBar->add(QPoint(x, 0), button);
button->setButtonSet(viewModeButtonSet, SceneViewer::CAMERA3D_REFERENCE);
- button = new TPanelTitleBarButton(titleBar, ":Resources/view_camera.png",
- ":Resources/view_camera_over.png",
- ":Resources/view_camera_on.png");
+ button = new TPanelTitleBarButton(titleBar, ":Resources/pane_cam_off.svg",
+ ":Resources/pane_cam_over.svg",
+ ":Resources/pane_cam_on.svg");
button->setToolTip(tr("Camera View"));
- x += 18; // width of 3D.png = 18pixels
- titleBar->add(QPoint(x, 1), button);
+ x += 21; // width of pane_3d_off.svg = 20px
+ titleBar->add(QPoint(x, 0), button);
button->setButtonSet(viewModeButtonSet, SceneViewer::CAMERA_REFERENCE);
ret = ret && connect(viewModeButtonSet, SIGNAL(selected(int)), m_sceneViewer,
SLOT(setReferenceMode(int)));
// freeze button
- button = new TPanelTitleBarButton(titleBar, ":Resources/freeze.png",
- ":Resources/freeze_over.png",
- ":Resources/freeze_on.png");
- x += 10 + 19; // width of viewcamera.png = 18pixels
+ button = new TPanelTitleBarButton(titleBar, ":Resources/pane_freeze_off.svg",
+ ":Resources/pane_freeze_over.svg",
+ ":Resources/pane_freeze_on.svg");
+ x += 10 + 20; // width of pane_cam_off.svg = 20px
button->setToolTip(tr("Freeze")); // RC1
- titleBar->add(QPoint(x, 1), button);
+ titleBar->add(QPoint(x, 0), button);
ret = ret && connect(button, SIGNAL(toggled(bool)), m_sceneViewer,
SLOT(freeze(bool)));
// preview toggles
m_previewButton = new TPanelTitleBarButton(
- titleBar, ":Resources/viewpreview.png", ":Resources/viewpreview_over.png",
- ":Resources/viewpreview_on.png");
- x += 5 + iconWidth;
- titleBar->add(QPoint(x, 1), m_previewButton);
+ titleBar, ":Resources/pane_preview_off.svg", ":Resources/pane_preview_over.svg",
+ ":Resources/pane_preview_on.svg");
+ x += 10 + iconWidth;
+ titleBar->add(QPoint(x, 0), m_previewButton);
m_previewButton->setToolTip(tr("Preview"));
ret = ret && connect(m_previewButton, SIGNAL(toggled(bool)),
SLOT(enableFullPreview(bool)));
m_subcameraPreviewButton =
- new TPanelTitleBarButton(titleBar, ":Resources/subcamera_preview.png",
- ":Resources/subcamera_preview_over.png",
- ":Resources/subcamera_preview_on.png");
- x += 28; // width of viewpreview.png =28pixels
+ new TPanelTitleBarButton(titleBar, ":Resources/pane_subpreview_off.svg",
+ ":Resources/pane_subpreview_over.svg",
+ ":Resources/pane_subpreview_on.svg");
+ x += 26; // width of pane_preview_off.svg = 25px
- titleBar->add(QPoint(x, 1), m_subcameraPreviewButton);
+ titleBar->add(QPoint(x, 0), m_subcameraPreviewButton);
m_subcameraPreviewButton->setToolTip(tr("Sub-camera Preview"));
ret = ret && connect(m_subcameraPreviewButton, SIGNAL(toggled(bool)),
SLOT(enableSubCameraPreview(bool)));
diff --git a/toonz/sources/toonz/flipbook.cpp b/toonz/sources/toonz/flipbook.cpp
index 40ce0b2..baefdfb 100644
--- a/toonz/sources/toonz/flipbook.cpp
+++ b/toonz/sources/toonz/flipbook.cpp
@@ -268,11 +268,11 @@ void FlipBook::addFreezeButtonToTitleBar() {
TPanel *panel = qobject_cast(parentWidget());
if (panel) {
TPanelTitleBar *titleBar = panel->getTitleBar();
- m_freezeButton = new TPanelTitleBarButton(titleBar, ":Resources/freeze.png",
- ":Resources/freeze_over.png",
- ":Resources/freeze_on.png");
+ m_freezeButton = new TPanelTitleBarButton(titleBar, ":Resources/pane_freeze_off.svg",
+ ":Resources/pane_freeze_over.svg",
+ ":Resources/pane_freeze_on.svg");
m_freezeButton->setToolTip("Freeze");
- titleBar->add(QPoint(-55, 1), m_freezeButton);
+ titleBar->add(QPoint(-55, 0), m_freezeButton);
connect(m_freezeButton, SIGNAL(toggled(bool)), this, SLOT(freeze(bool)));
QPoint p(titleBar->width() - 62, 1);
m_freezeButton->move(p);
diff --git a/toonz/sources/toonz/linetestcapturepane.cpp b/toonz/sources/toonz/linetestcapturepane.cpp
index 1f716f5..376b98b 100644
--- a/toonz/sources/toonz/linetestcapturepane.cpp
+++ b/toonz/sources/toonz/linetestcapturepane.cpp
@@ -1141,13 +1141,13 @@ void LineTestCapturePane::initializeTitleBar(TPanelTitleBar *titleBar) {
bool ret = true;
int x = -50;
- int iconWidth = 17;
+ int iconWidth = 20;
TPanelTitleBarButton *button;
- button = new TPanelTitleBarButton(titleBar, ":Resources/freeze.png",
- ":Resources/freeze_over.png",
- ":Resources/freeze_on.png");
+ button = new TPanelTitleBarButton(titleBar, ":Resources/pane_freeze_off.svg",
+ ":Resources/pane_freeze_over.svg",
+ ":Resources/pane_freeze_on.svg");
button->setToolTip("Freeze");
- titleBar->add(QPoint(x, 2), button);
+ titleBar->add(QPoint(x, 0), button);
ret = ret && connect(button, SIGNAL(toggled(bool)), this, SLOT(freeze(bool)));
assert(ret);
diff --git a/toonz/sources/toonz/linetestpane.cpp b/toonz/sources/toonz/linetestpane.cpp
index d2d2f25..c6b938f 100644
--- a/toonz/sources/toonz/linetestpane.cpp
+++ b/toonz/sources/toonz/linetestpane.cpp
@@ -390,8 +390,8 @@ void LineTestPane::initializeTitleBar(TPanelTitleBar *titleBar) {
TPanelTitleBarButton *button;
m_cameraStandButton = new TPanelTitleBarButton(
- titleBar, ":Resources/standard.png", ":Resources/standard_over.png",
- ":Resources/standard_on.png");
+ titleBar, ":Resources/pane_table_off.svg", ":Resources/pane_table_over.svg",
+ ":Resources/pane_table_on.svg");
m_cameraStandButton->setToolTip("Camera Stand View");
x += 18 + iconWidth;
titleBar->add(QPoint(x, 2), m_cameraStandButton);
@@ -399,8 +399,8 @@ void LineTestPane::initializeTitleBar(TPanelTitleBar *titleBar) {
m_cameraStandButton->setPressed(true);
m_previewButton = new TPanelTitleBarButton(
- titleBar, ":Resources/viewpreview.png", ":Resources/viewpreview_over.png",
- ":Resources/viewpreview_on.png");
+ titleBar, ":Resources/pane_preview_off.svg", ":Resources/pane_preview_over.svg",
+ ":Resources/pane_preview_on.svg");
m_previewButton->setToolTip(tr("Preview"));
x += 5 + iconWidth;
titleBar->add(QPoint(x, 2), m_previewButton);
diff --git a/toonz/sources/toonz/pane.cpp b/toonz/sources/toonz/pane.cpp
index 80fc976..31a4ebc 100644
--- a/toonz/sources/toonz/pane.cpp
+++ b/toonz/sources/toonz/pane.cpp
@@ -373,11 +373,11 @@ void TPanelTitleBar::paintEvent(QPaintEvent *) {
if (dw->isFloating()) {
const static QPixmap closeButtonPixmap(
- svgToPixmap(":/Resources/close_pane.svg", QSize(16, 16)));
+ svgToPixmap(":/Resources/pane_close.svg", QSize(18, 18)));
const static QPixmap closeButtonPixmapOver(
- svgToPixmap(":/Resources/close_pane_rollover.svg", QSize(16, 16)));
+ svgToPixmap(":/Resources/pane_close_rollover.svg", QSize(18, 18)));
- QPoint closeButtonPos(rect.right() - 17, rect.top() + 1);
+ QPoint closeButtonPos(rect.right() - 18, rect.top() + 1);
if (m_closeButtonHighlighted)
painter.drawPixmap(closeButtonPos, closeButtonPixmapOver);
@@ -397,7 +397,7 @@ void TPanelTitleBar::mousePressEvent(QMouseEvent *event) {
if (dw->isFloating()) {
QRect rect = this->rect();
- QRect closeButtonRect(rect.right() - 18, rect.top() + 2, 13, 13);
+ QRect closeButtonRect(rect.right() - 18, rect.top() + 1, 18, 18);
if (closeButtonRect.contains(pos) && dw->isFloating()) {
event->accept();
dw->hide();
@@ -417,7 +417,7 @@ void TPanelTitleBar::mouseMoveEvent(QMouseEvent *event) {
if (dw->isFloating()) {
QPoint pos = event->pos();
QRect rect = this->rect();
- QRect closeButtonRect(rect.right() - 18, rect.top() + 2, 13, 13);
+ QRect closeButtonRect(rect.right() - 18, rect.top() + 1, 18, 18);
if (closeButtonRect.contains(pos) && dw->isFloating())
m_closeButtonHighlighted = true;
diff --git a/toonz/sources/toonz/toonz.qrc b/toonz/sources/toonz/toonz.qrc
index 3df60e9..a199c33 100644
--- a/toonz/sources/toonz/toonz.qrc
+++ b/toonz/sources/toonz/toonz.qrc
@@ -1,8 +1,8 @@
- Resources/3D.png
- Resources/3D_on.png
- Resources/3D_over.png
+ Resources/pane_3d_off.svg
+ Resources/pane_3d_on.svg
+ Resources/pane_3d_over.svg
Resources/3Dside_l.svg
Resources/3Dside_r.svg
Resources/3Dtop.svg
@@ -51,8 +51,8 @@
Resources/cleanup_done_with_errors.svg
Resources/cleanup_computing.svg
Resources/cleanup_suspended.svg
- Resources/close_pane.svg
- Resources/close_pane_rollover.svg
+ Resources/pane_close.svg
+ Resources/pane_close_rollover.svg
Resources/collapse.png
Resources/collapse_click.png
Resources/collapse_over.png
@@ -97,9 +97,9 @@
Resources/frameprev.svg
Resources/frameprev_click.svg
Resources/frameprev_over.svg
- Resources/freeze.png
- Resources/freeze_on.png
- Resources/freeze_over.png
+ Resources/pane_freeze_off.svg
+ Resources/pane_freeze_on.svg
+ Resources/pane_freeze_over.svg
Resources/fx.svg
Resources/geometric.svg
Resources/geometric_rollover.svg
@@ -255,9 +255,9 @@
Resources/special_off.svg
Resources/special_on.svg
Resources/splash.svg
- Resources/standard.png
- Resources/standard_on.png
- Resources/standard_over.png
+ Resources/pane_table_off.svg
+ Resources/pane_table_on.svg
+ Resources/pane_table_over.svg
Resources/startup.png
Resources/start_off.svg
Resources/start_on.svg
@@ -308,18 +308,18 @@
Resources/unknown.svg
Resources/upTitle.png
Resources/v_chandle.png
- Resources/view_camera.png
- Resources/view_camera_on.png
- Resources/view_camera_over.png
+ Resources/pane_cam_off.svg
+ Resources/pane_cam_on.svg
+ Resources/pane_cam_over.svg
Resources/viewicon_off.svg
Resources/viewicon_on.svg
Resources/viewicon_over.svg
Resources/viewlist_off.svg
Resources/viewlist_on.svg
Resources/viewlist_over.svg
- Resources/viewpreview.png
- Resources/viewpreview_on.png
- Resources/viewpreview_over.png
+ Resources/pane_preview_off.svg
+ Resources/pane_preview_on.svg
+ Resources/pane_preview_over.svg
Resources/viewtable_off.svg
Resources/viewtable_on.svg
Resources/viewtable_over.svg
@@ -385,9 +385,9 @@
Resources/use_subcamera_preview.svg
Resources/use_subcamera_preview_over.svg
Resources/use_subcamera_preview_click.svg
- Resources/subcamera_preview.png
- Resources/subcamera_preview_over.png
- Resources/subcamera_preview_on.png
+ Resources/pane_subpreview_off.svg
+ Resources/pane_subpreview_over.svg
+ Resources/pane_subpreview_on.svg
Resources/round_cap.svg
Resources/butt_cap.svg
Resources/projecting_cap.svg
@@ -396,14 +396,15 @@
Resources/miter_join.svg
Resources/init.js
Resources/scripticon.png
- Resources/safearea.png
- Resources/safearea_over.png
- Resources/safearea_on.png
- Resources/minimize.png
- Resources/minimize_over.png
- Resources/fieldguide.png
- Resources/fieldguide_over.png
- Resources/fieldguide_on.png
+ Resources/pane_safe_off.svg
+ Resources/pane_safe_over.svg
+ Resources/pane_safe_on.svg
+ Resources/pane_minimize.svg
+ Resources/pane_minimize_over.svg
+ Resources/pane_minimize_on.svg
+ Resources/pane_grid_off.svg
+ Resources/pane_grid_over.svg
+ Resources/pane_grid_on.svg
Resources/folderup_icon.svg
Resources/link_icon.svg
Resources/folder_icon.svg
diff --git a/toonz/sources/toonz/tpanels.cpp b/toonz/sources/toonz/tpanels.cpp
index 951753e..47383c5 100644
--- a/toonz/sources/toonz/tpanels.cpp
+++ b/toonz/sources/toonz/tpanels.cpp
@@ -954,15 +954,15 @@ void FlipbookPanel::reset() { m_flipbook->reset(); }
void FlipbookPanel::initializeTitleBar(TPanelTitleBar *titleBar) {
bool ret = true;
- int x = -87;
- int iconWidth = 17;
+ int x = -91;
+ int iconWidth = 20;
// safe area button
TPanelTitleBarButtonForSafeArea *safeAreaButton =
- new TPanelTitleBarButtonForSafeArea(titleBar, ":Resources/safearea.png",
- ":Resources/safearea_over.png",
- ":Resources/safearea_on.png");
+ new TPanelTitleBarButtonForSafeArea(titleBar, ":Resources/pane_safe_off.svg",
+ ":Resources/pane_safe_over.svg",
+ ":Resources/pane_safe_on.svg");
safeAreaButton->setToolTip("Safe Area (Right Click to Select)");
- titleBar->add(QPoint(x, 1), safeAreaButton);
+ titleBar->add(QPoint(x, 0), safeAreaButton);
ret = ret && connect(safeAreaButton, SIGNAL(toggled(bool)),
CommandManager::instance()->getAction(MI_SafeArea),
SLOT(trigger()));
@@ -975,9 +975,9 @@ void FlipbookPanel::initializeTitleBar(TPanelTitleBar *titleBar) {
x += 33 + iconWidth;
// minimize button
- m_button = new TPanelTitleBarButton(titleBar, ":Resources/minimize.png",
- ":Resources/minimize_over.png",
- ":Resources/minimize_over.png");
+ m_button = new TPanelTitleBarButton(titleBar, ":Resources/pane_minimize.svg",
+ ":Resources/pane_minimize_over.svg",
+ ":Resources/pane_minimize_on.svg");
m_button->setToolTip("Minimize");
m_button->setPressed(false);
diff --git a/toonz/sources/toonz/viewerpane.cpp b/toonz/sources/toonz/viewerpane.cpp
index 43afba2..cae95e6 100644
--- a/toonz/sources/toonz/viewerpane.cpp
+++ b/toonz/sources/toonz/viewerpane.cpp
@@ -331,16 +331,16 @@ void SceneViewerPanel::initializeTitleBar(TPanelTitleBar *titleBar) {
TPanelTitleBarButtonSet *viewModeButtonSet;
m_referenceModeBs = viewModeButtonSet = new TPanelTitleBarButtonSet();
int x = -232;
- int iconWidth = 17;
+ int iconWidth = 20;
TPanelTitleBarButton *button;
// buttons for show / hide toggle for the field guide and the safe area
TPanelTitleBarButtonForSafeArea *safeAreaButton =
- new TPanelTitleBarButtonForSafeArea(titleBar, ":Resources/safearea.png",
- ":Resources/safearea_over.png",
- ":Resources/safearea_on.png");
+ new TPanelTitleBarButtonForSafeArea(titleBar, ":Resources/pane_safe_off.svg",
+ ":Resources/pane_safe_over.svg",
+ ":Resources/pane_safe_on.svg");
safeAreaButton->setToolTip(tr("Safe Area (Right Click to Select)"));
- titleBar->add(QPoint(x, 1), safeAreaButton);
+ titleBar->add(QPoint(x, 0), safeAreaButton);
ret = ret && connect(safeAreaButton, SIGNAL(toggled(bool)),
CommandManager::instance()->getAction(MI_SafeArea),
SLOT(trigger()));
@@ -351,12 +351,12 @@ void SceneViewerPanel::initializeTitleBar(TPanelTitleBar *titleBar) {
safeAreaButton->setPressed(
CommandManager::instance()->getAction(MI_SafeArea)->isChecked());
- button = new TPanelTitleBarButton(titleBar, ":Resources/fieldguide.png",
- ":Resources/fieldguide_over.png",
- ":Resources/fieldguide_on.png");
+ button = new TPanelTitleBarButton(titleBar, ":Resources/pane_grid_off.svg",
+ ":Resources/pane_grid_over.svg",
+ ":Resources/pane_grid_on.svg");
button->setToolTip(tr("Field Guide"));
- x += 5 + iconWidth;
- titleBar->add(QPoint(x, 1), button);
+ x += 1 + iconWidth;
+ titleBar->add(QPoint(x, 0), button);
ret = ret && connect(button, SIGNAL(toggled(bool)),
CommandManager::instance()->getAction(MI_FieldGuide),
SLOT(trigger()));
@@ -367,61 +367,61 @@ void SceneViewerPanel::initializeTitleBar(TPanelTitleBar *titleBar) {
CommandManager::instance()->getAction(MI_FieldGuide)->isChecked());
// view mode toggles
- button = new TPanelTitleBarButton(titleBar, ":Resources/standard.png",
- ":Resources/standard_over.png",
- ":Resources/standard_on.png");
+ button = new TPanelTitleBarButton(titleBar, ":Resources/pane_table_off.svg",
+ ":Resources/pane_table_over.svg",
+ ":Resources/pane_table_on.svg");
button->setToolTip(tr("Camera Stand View"));
x += 10 + iconWidth;
- titleBar->add(QPoint(x, 1), button);
+ titleBar->add(QPoint(x, 0), button);
button->setButtonSet(viewModeButtonSet, SceneViewer::NORMAL_REFERENCE);
button->setPressed(true);
- button = new TPanelTitleBarButton(titleBar, ":Resources/3D.png",
- ":Resources/3D_over.png",
- ":Resources/3D_on.png");
+ button = new TPanelTitleBarButton(titleBar, ":Resources/pane_3d_off.svg",
+ ":Resources/pane_3d_over.svg",
+ ":Resources/pane_3d_on.svg");
button->setToolTip(tr("3D View"));
- x += 19; // width of standard.png = 18pixels
- titleBar->add(QPoint(x, 1), button);
+ x += 21; // width of pane_table_off.svg = 20px
+ titleBar->add(QPoint(x, 0), button);
button->setButtonSet(viewModeButtonSet, SceneViewer::CAMERA3D_REFERENCE);
- button = new TPanelTitleBarButton(titleBar, ":Resources/view_camera.png",
- ":Resources/view_camera_over.png",
- ":Resources/view_camera_on.png");
+ button = new TPanelTitleBarButton(titleBar, ":Resources/pane_cam_off.svg",
+ ":Resources/pane_cam_over.svg",
+ ":Resources/pane_cam_on.svg");
button->setToolTip(tr("Camera View"));
- x += 18; // width of 3D.png = 18pixels
- titleBar->add(QPoint(x, 1), button);
+ x += 21; // width of pane_3d_off.svg = 20px
+ titleBar->add(QPoint(x, 0), button);
button->setButtonSet(viewModeButtonSet, SceneViewer::CAMERA_REFERENCE);
ret = ret && connect(viewModeButtonSet, SIGNAL(selected(int)), m_sceneViewer,
SLOT(setReferenceMode(int)));
// freeze button
- button = new TPanelTitleBarButton(titleBar, ":Resources/freeze.png",
- ":Resources/freeze_over.png",
- ":Resources/freeze_on.png");
- x += 10 + 19; // width of viewcamera.png = 18pixels
+ button = new TPanelTitleBarButton(titleBar, ":Resources/pane_freeze_off.svg",
+ ":Resources/pane_freeze_over.svg",
+ ":Resources/pane_freeze_on.svg");
+ x += 10 + 20; // width of pane_cam_off.svg = 20px
button->setToolTip(tr("Freeze")); // RC1
- titleBar->add(QPoint(x, 1), button);
+ titleBar->add(QPoint(x, 0), button);
ret = ret && connect(button, SIGNAL(toggled(bool)), m_sceneViewer,
SLOT(freeze(bool)));
// preview toggles
m_previewButton = new TPanelTitleBarButton(
- titleBar, ":Resources/viewpreview.png", ":Resources/viewpreview_over.png",
- ":Resources/viewpreview_on.png");
- x += 5 + iconWidth;
- titleBar->add(QPoint(x, 1), m_previewButton);
+ titleBar, ":Resources/pane_preview_off.svg", ":Resources/pane_preview_over.svg",
+ ":Resources/pane_preview_on.svg");
+ x += 10 + iconWidth;
+ titleBar->add(QPoint(x, 0), m_previewButton);
m_previewButton->setToolTip(tr("Preview"));
ret = ret && connect(m_previewButton, SIGNAL(toggled(bool)),
SLOT(enableFullPreview(bool)));
m_subcameraPreviewButton =
- new TPanelTitleBarButton(titleBar, ":Resources/subcamera_preview.png",
- ":Resources/subcamera_preview_over.png",
- ":Resources/subcamera_preview_on.png");
- x += 28; // width of viewpreview.png =28pixels
+ new TPanelTitleBarButton(titleBar, ":Resources/pane_subpreview_off.svg",
+ ":Resources/pane_subpreview_over.svg",
+ ":Resources/pane_subpreview_on.svg");
+ x += 26; // width of pane_preview_off.svg = 25px
- titleBar->add(QPoint(x, 1), m_subcameraPreviewButton);
+ titleBar->add(QPoint(x, 0), m_subcameraPreviewButton);
m_subcameraPreviewButton->setToolTip(tr("Sub-camera Preview"));
ret = ret && connect(m_subcameraPreviewButton, SIGNAL(toggled(bool)),
SLOT(enableSubCameraPreview(bool)));