diff --git a/toonz/sources/toonz/Resources/canvas.svg b/toonz/sources/toonz/Resources/canvas.svg
new file mode 100644
index 0000000..9b27d38
--- /dev/null
+++ b/toonz/sources/toonz/Resources/canvas.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/toonz/sources/toonz/Resources/clone.svg b/toonz/sources/toonz/Resources/clone.svg
new file mode 100644
index 0000000..d6ab371
--- /dev/null
+++ b/toonz/sources/toonz/Resources/clone.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/toonz/sources/toonz/Resources/load_level.svg b/toonz/sources/toonz/Resources/load_level.svg
new file mode 100644
index 0000000..da42f1f
--- /dev/null
+++ b/toonz/sources/toonz/Resources/load_level.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/toonz/sources/toonz/Resources/merge.svg b/toonz/sources/toonz/Resources/merge.svg
new file mode 100644
index 0000000..a8bd92d
--- /dev/null
+++ b/toonz/sources/toonz/Resources/merge.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/toonz/sources/toonz/Resources/preferences.svg b/toonz/sources/toonz/Resources/preferences.svg
new file mode 100644
index 0000000..423a527
--- /dev/null
+++ b/toonz/sources/toonz/Resources/preferences.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/toonz/sources/toonz/Resources/redo.svg b/toonz/sources/toonz/Resources/redo.svg
new file mode 100644
index 0000000..6c68477
--- /dev/null
+++ b/toonz/sources/toonz/Resources/redo.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/toonz/sources/toonz/Resources/timestretch.svg b/toonz/sources/toonz/Resources/timestretch.svg
new file mode 100644
index 0000000..c95babb
--- /dev/null
+++ b/toonz/sources/toonz/Resources/timestretch.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/toonz/sources/toonz/Resources/touch.svg b/toonz/sources/toonz/Resources/touch.svg
new file mode 100644
index 0000000..79dc5f4
--- /dev/null
+++ b/toonz/sources/toonz/Resources/touch.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/toonz/sources/toonz/Resources/undo.svg b/toonz/sources/toonz/Resources/undo.svg
new file mode 100644
index 0000000..33ea1e0
--- /dev/null
+++ b/toonz/sources/toonz/Resources/undo.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/toonz/sources/toonz/mainwindow.cpp b/toonz/sources/toonz/mainwindow.cpp
index 1b62319..79387e2 100644
--- a/toonz/sources/toonz/mainwindow.cpp
+++ b/toonz/sources/toonz/mainwindow.cpp
@@ -1625,8 +1625,9 @@ void MainWindow::defineActions() {
createMenuFileAction(MI_NewRasterLevel, tr("&New Raster Level"), "");
newRasterLevelAction->setIconText(tr("New Raster Level"));
newRasterLevelAction->setIcon(createQIconPNG("new_raster_level"));
-
- createMenuFileAction(MI_LoadLevel, tr("&Load Level..."), "");
+ QAction *loadLevelAction =
+ createMenuFileAction(MI_LoadLevel, tr("&Load Level..."), "");
+ loadLevelAction->setIcon(QIcon(":Resources/load_level.svg"));
createMenuFileAction(MI_SaveLevel, tr("&Save Level"), "");
createMenuFileAction(MI_SaveAllLevels, tr("&Save All Levels"), "");
createMenuFileAction(MI_SaveLevelAs, tr("&Save Level As..."), "");
@@ -1659,7 +1660,9 @@ void MainWindow::defineActions() {
MI_FreezePreview, tr("Freeze Preview"), tr("Unfreeze Preview"));
// createAction(MI_SavePreview, "&Save Preview", "");
createRightClickMenuAction(MI_SavePreset, tr("&Save As Preset"), "");
- createMenuFileAction(MI_Preferences, tr("&Preferences..."), "Ctrl+U");
+ QAction *preferencesAction =
+ createMenuFileAction(MI_Preferences, tr("&Preferences..."), "Ctrl+U");
+ preferencesAction->setIcon(QIcon(":Resources/preferences.svg"));
createMenuFileAction(MI_ShortcutPopup, tr("&Configure Shortcuts..."), "");
createMenuFileAction(MI_PrintXsheet, tr("&Print Xsheet"), "");
createMenuFileAction("MI_RunScript", tr("Run Script..."), "");
@@ -1678,8 +1681,10 @@ void MainWindow::defineActions() {
createMenuEditAction(MI_SelectAll, tr("&Select All"), "Ctrl+A");
createMenuEditAction(MI_InvertSelection, tr("&Invert Selection"), "");
- createMenuEditAction(MI_Undo, tr("&Undo"), "Ctrl+Z");
- createMenuEditAction(MI_Redo, tr("&Redo"), "Ctrl+Y");
+ QAction *undoAction = createMenuEditAction(MI_Undo, tr("&Undo"), "Ctrl+Z");
+ undoAction->setIcon(QIcon(":Resources/undo.svg"));
+ QAction *redoAction = createMenuEditAction(MI_Redo, tr("&Redo"), "Ctrl+Y");
+ redoAction->setIcon(QIcon(":Resources/redo.svg"));
createMenuEditAction(MI_Cut, tr("&Cut"), "Ctrl+X");
createMenuEditAction(MI_Copy, tr("&Copy"), "Ctrl+C");
createMenuEditAction(MI_Paste, tr("&Insert Paste"), "Ctrl+V");
@@ -1706,10 +1711,11 @@ void MainWindow::defineActions() {
createMenuEditAction(MI_EnterGroup, tr("&Enter Group"), "");
createMenuEditAction(MI_ExitGroup, tr("&Exit Group"), "");
createMenuEditAction(MI_RemoveEndpoints, tr("&Remove Vector Overflow"), "");
-
- createToggle(MI_TouchGestureControl, tr("&Touch Gesture Control"), "",
- TouchGestureControl ? 1 : 0, MenuEditCommandType)
- ->setEnabled(true);
+ QAction *touchToggle =
+ createToggle(MI_TouchGestureControl, tr("&Touch Gesture Control"), "",
+ TouchGestureControl ? 1 : 0, MenuEditCommandType);
+ touchToggle->setEnabled(true);
+ touchToggle->setIcon(QIcon(":Resources/touch.svg"));
createMenuScanCleanupAction(MI_DefineScanner, tr("&Define Scanner..."), "");
createMenuScanCleanupAction(MI_ScanSettings, tr("&Scan Settings..."), "");
@@ -1765,6 +1771,7 @@ void MainWindow::defineActions() {
QAction *action =
createMenuLevelAction(MI_CanvasSize, tr("&Canvas Size..."), "");
if (action) action->setDisabled(true);
+ action->setIcon(QIcon(":Resources/canvas.svg"));
createMenuLevelAction(MI_FileInfo, tr("&Info..."), "");
createRightClickMenuAction(MI_ViewFile, tr("&View..."), "");
createMenuLevelAction(MI_RemoveUnused, tr("&Remove All Unused Levels"), "");
@@ -1799,13 +1806,16 @@ void MainWindow::defineActions() {
createMenuXsheetAction(MI_SaveSubxsheetAs, tr("&Save Sub-xsheet As..."), "");
createMenuXsheetAction(MI_Resequence, tr("Resequence"), "");
- createMenuXsheetAction(MI_CloneChild, tr("Clone Sub-xsheet"), "");
-
+ QAction *cloneAction =
+ createMenuXsheetAction(MI_CloneChild, tr("Clone Sub-xsheet"), "");
+ cloneAction->setIcon(QIcon(":Resources/clone.svg"));
createMenuXsheetAction(MI_ApplyMatchLines, tr("&Apply Match Lines..."), "");
createMenuXsheetAction(MI_MergeCmapped, tr("&Merge Tlv Levels..."), "");
createMenuXsheetAction(MI_DeleteMatchLines, tr("&Delete Match Lines"), "");
createMenuXsheetAction(MI_DeleteInk, tr("&Delete Lines..."), "");
- createMenuXsheetAction(MI_MergeColumns, tr("&Merge Levels"), "");
+ QAction *mergeLevelsAction =
+ createMenuXsheetAction(MI_MergeColumns, tr("&Merge Levels"), "");
+ mergeLevelsAction->setIcon(QIcon(":Resources/merge.svg"));
createMenuXsheetAction(MI_InsertFx, tr("&New FX..."), "Ctrl+F");
QAction *newOutputAction =
createMenuXsheetAction(MI_NewOutputFx, tr("&New Output"), "Ctrl+F");
@@ -1845,7 +1855,9 @@ void MainWindow::defineActions() {
createMenuCellsAction(MI_Each4, tr("&Each 4"), "");
createMenuCellsAction(MI_Rollup, tr("&Roll Up"), "");
createMenuCellsAction(MI_Rolldown, tr("&Roll Down"), "");
- createMenuCellsAction(MI_TimeStretch, tr("&Time Stretch..."), "");
+ QAction *timeStretchAction =
+ createMenuCellsAction(MI_TimeStretch, tr("&Time Stretch..."), "");
+ timeStretchAction->setIcon(QIcon(":Resources/timestretch.svg"));
createMenuCellsAction(MI_Duplicate, tr("&Duplicate Drawing "), "D");
createMenuCellsAction(MI_Autorenumber, tr("&Autorenumber"), "");
createMenuCellsAction(MI_CloneLevel, tr("&Clone"), "");
@@ -2380,9 +2392,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);
@@ -2507,9 +2519,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++) {
@@ -2536,9 +2548,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/toonz.qrc b/toonz/sources/toonz/toonz.qrc
index be7026c..ac283de 100644
--- a/toonz/sources/toonz/toonz.qrc
+++ b/toonz/sources/toonz/toonz.qrc
@@ -28,6 +28,7 @@
Resources/camera.png
Resources/camera_selected.png
Resources/camerastand_toggle.png
+ Resources/canvas.svg
Resources/center.png
Resources/centerHTitle.png
Resources/centerHTitle_inactive.png
@@ -51,6 +52,7 @@
Resources/cleanup_done_with_errors.svg
Resources/cleanup_computing.svg
Resources/cleanup_suspended.svg
+ Resources/clone.svg
Resources/pane_close.svg
Resources/pane_close_rollover.svg
Resources/collapse.png
@@ -127,6 +129,7 @@
Resources/link_closed.bmp
Resources/link_closed_rollover.bmp
Resources/link_parent.bmp
+ Resources/load_level.svg
Resources/lock.png
Resources/lock_over.png
Resources/loop.svg
@@ -136,6 +139,7 @@
Resources/magnet.png
Resources/magnet.svg
Resources/magnet_rollover.svg
+ Resources/merge.svg
Resources/motionpath_fileicon.svg
Resources/motionpath.svg
Resources/motionpath_delete.svg
@@ -197,6 +201,7 @@
Resources/play_click.svg
Resources/play_disabled.svg
Resources/play_over.svg
+ Resources/preferences.svg
Resources/preview_toggle.png
Resources/previuos_folder.png
Resources/projects.svg
@@ -208,6 +213,7 @@
Resources/record_click.svg
Resources/record_disabled.svg
Resources/record_over.svg
+ Resources/redo.svg
Resources/render_failed.svg
Resources/render_done.svg
Resources/render_done_with_errors.svg
@@ -294,10 +300,12 @@
Resources/texture_off.svg
Resources/texture_on.svg
Resources/thumbnails_view_act.png
+ Resources/timestretch.svg
Resources/toggle_audibility_click.png
Resources/toggle_audibility_over.png
Resources/toggle_lock.png
Resources/toolbar_arrow.png
+ Resources/touch.svg
Resources/tracker.svg
Resources/tracker_rollover.svg
Resources/type.svg
@@ -321,6 +329,7 @@
Resources/pane_preview_off.svg
Resources/pane_preview_on.svg
Resources/pane_preview_over.svg
+ Resources/undo.svg
Resources/viewtable_off.svg
Resources/viewtable_on.svg
Resources/viewtable_over.svg