diff --git a/resources/OpenBoard.qrc b/resources/OpenBoard.qrc index 3524fe7d..647410d3 100644 --- a/resources/OpenBoard.qrc +++ b/resources/OpenBoard.qrc @@ -546,5 +546,87 @@ images/OpenBoard.svg images/download_close.svg images/download_open.svg + images/toolbar/group.svg + images/toolbar/ungroup.svg + images/toolbar/window.svg + images/toolbar/plusBlack.svg + images/toolbar/plusBlackOn.svg + images/toolbar/quit.svg + images/toolbar/quitOn.svg + images/toolbar/background.svg + images/toolbar/documents.svg + images/toolbar/newPage.svg + images/toolbar/next.svg + images/toolbar/nextPageOn.svg + images/toolbar/previous.svg + images/toolbar/previousPageOn.svg + images/toolbar/redo.svg + images/toolbar/redoOn.svg + images/toolbar/stylus.svg + images/toolbar/undo.svg + images/toolbar/undoOn.svg + images/toolbar/smallPen.svg + images/toolbar/mediumPen.svg + images/toolbar/largePen.svg + images/toolbar/color.svg + images/toolbar/smallEraser.svg + images/toolbar/mediumEraser.svg + images/toolbar/largeEraser.svg + images/toolbar/web.svg + images/toolbar/board.svg + images/toolbar/home.svg + images/toolbar/profile.svg + images/toolbar/library.svg + images/toolbar/clearPage.svg + images/toolbar/reload.svg + images/toolbar/addBookmark.svg + images/toolbar/bookmarks.svg + images/toolbar/settings.svg + images/toolbar/eyeClosed.svg + images/toolbar/eyeOpened.svg + images/toolbar/pdf.svg + images/toolbar/deleteDocument.svg + images/toolbar/deleteFolder.svg + images/toolbar/newDocument.svg + images/toolbar/newFolder.svg + images/toolbar/addToLibrary.svg + images/toolbar/addInteractiveToLibrary.svg + images/toolbar/addToolToLibrary.svg + images/toolbar/duplicate.svg + images/toolbar/export.svg + images/toolbar/import.svg + images/toolbar/setBackground.svg + images/toolbar/removeBackground.svg + images/toolbar/open.svg + images/toolbar/addToPage.svg + images/toolbar/menu.svg + images/toolbar/addToDocument.svg + images/toolbar/print.svg + images/toolbar/addToWorkingDoc.svg + images/toolbar/rename.svg + images/toolbar/captureArea.svg + images/toolbar/captureScreen.svg + images/toolbar/captureWindow.svg + images/toolbar/extraTool.svg + images/toolbar/webUpload.svg + images/toolbar/stop.svg + images/toolbar/pause.svg + images/toolbar/cut.svg + images/toolbar/copy.svg + images/toolbar/paste.svg + images/toolbar/proto.svg + images/toolbar/mic.svg + images/toolbar/micOff.svg + images/toolbar/remove.svg + images/toolbar/pageSize.svg + images/toolbar/eraserTool.svg + images/toolbar/lineTool.svg + images/toolbar/tools.svg + images/toolbar/stylusTab.svg + images/toolbar/display.svg + images/toolbar/hide.svg + images/toolbar/record.svg + images/toolbar/updates.svg + images/toolbar/tutorial.svg diff --git a/resources/forms/mainWindow.ui b/resources/forms/mainWindow.ui index f4fdd0af..c073fe2e 100644 --- a/resources/forms/mainWindow.ui +++ b/resources/forms/mainWindow.ui @@ -178,7 +178,7 @@ - :/images/toolbar/stylus.png:/images/toolbar/stylus.png + :/images/toolbar/stylus.svg:/images/toolbar/stylus.svg Stylus @@ -196,7 +196,7 @@ - :/images/toolbar/background.png:/images/toolbar/background.png + :/images/toolbar/background.svg:/images/toolbar/background.svg Backgrounds @@ -208,7 +208,7 @@ - :/images/toolbar/undoOn.png:/images/toolbar/undoOn.png + :/images/toolbar/undoOn.svg:/images/toolbar/undoOn.svg Undo @@ -220,7 +220,7 @@ - :/images/toolbar/redoOn.png:/images/toolbar/redoOn.png + :/images/toolbar/redoOn.svg:/images/toolbar/redoOn.svg Redo @@ -232,7 +232,7 @@ - :/images/toolbar/previousPageOn.png:/images/toolbar/previousPageOn.png + :/images/toolbar/nextPageOn.svg:/images/toolbar/nextPageOn.svg Previous @@ -247,7 +247,7 @@ - :/images/toolbar/nextPageOn.png:/images/toolbar/nextPageOn.png + :/images/toolbar/previousPageOn.svg:/images/toolbar/previousPageOn.svg Next @@ -265,7 +265,7 @@ - :/images/toolbar/documents.png:/images/toolbar/documents.png + :/images/toolbar/documents.svg:/images/toolbar/documents.svg Documents @@ -280,7 +280,7 @@ - :/images/toolbar/web.png:/images/toolbar/web.png + :/images/toolbar/web.svg:/images/toolbar/web.svg Web @@ -301,7 +301,7 @@ - :/images/toolbar/smallPen.png:/images/toolbar/smallPen.png + :/images/toolbar/smallPen.svg:/images/toolbar/smallPen.svg Line @@ -316,7 +316,7 @@ - :/images/toolbar/mediumPen.png:/images/toolbar/mediumPen.png + :/images/toolbar/mediumPen.svg:/images/toolbar/mediumPen.svg Line @@ -331,7 +331,7 @@ - :/images/toolbar/largePen.png:/images/toolbar/largePen.png + :/images/toolbar/largePen.svg:/images/toolbar/largePen.svg Line @@ -343,7 +343,7 @@ - :/images/toolbar/quitOn.png:/images/toolbar/quitOn.png + :/images/toolbar/quitOn.svg:/images/toolbar/quitOn.svg Quit @@ -364,7 +364,7 @@ - :/images/toolbar/smallEraser.png:/images/toolbar/smallEraser.png + :/images/toolbar/smallEraser.svg:/images/toolbar/smallEraser.svg Eraser @@ -382,7 +382,7 @@ - :/images/toolbar/mediumEraser.png:/images/toolbar/mediumEraser.png + :/images/toolbar/mediumEraser.svg:/images/toolbar/mediumEraser.svg Eraser @@ -397,7 +397,7 @@ - :/images/toolbar/largeEraser.png:/images/toolbar/largeEraser.png + :/images/toolbar/largeEraser.svg:/images/toolbar/largeEraser.svg Eraser @@ -412,7 +412,7 @@ - :/images/toolbar/color.png:/images/toolbar/color.png + :/images/toolbar/color.svg:/images/toolbar/color.svg Color 1 @@ -427,7 +427,7 @@ - :/images/toolbar/color.png:/images/toolbar/color.png + :/images/toolbar/color.svg:/images/toolbar/color.svg Color 2 @@ -442,7 +442,7 @@ - :/images/toolbar/color.png:/images/toolbar/color.png + :/images/toolbar/color.svg:/images/toolbar/color.svg Color 3 @@ -457,7 +457,7 @@ - :/images/toolbar/color.png:/images/toolbar/color.png + :/images/toolbar/color.svg:/images/toolbar/color.svg Color 4 @@ -472,7 +472,7 @@ - :/images/toolbar/color.png:/images/toolbar/color.png + :/images/toolbar/color.svg:/images/toolbar/color.svg Color 5 @@ -484,7 +484,7 @@ - :/images/toolbar/previous.png:/images/toolbar/previous.png + :/images/toolbar/previous.svg:/images/toolbar/previous.svg Back @@ -499,7 +499,7 @@ - :/images/toolbar/next.png:/images/toolbar/next.png + :/images/toolbar/next.svg:/images/toolbar/next.svg Forward @@ -514,7 +514,7 @@ - :/images/toolbar/reload.png:/images/toolbar/reload.png + :/images/toolbar/reload.svg:/images/toolbar/reload.svg Reload @@ -526,7 +526,7 @@ - :/images/toolbar/home.png:/images/toolbar/home.png + :/images/toolbar/home.svg:/images/toolbar/home.svg Home @@ -538,7 +538,7 @@ - :/images/toolbar/bookmarks.png:/images/toolbar/bookmarks.png + :/images/toolbar/bookmarks.svg:/images/toolbar/bookmarks.svg Bookmarks @@ -550,7 +550,7 @@ - :/images/toolbar/addBookmark.png:/images/toolbar/addBookmark.png + :/images/toolbar/addBookmark.svg:/images/toolbar/addBookmark.svg Bookmark @@ -562,7 +562,7 @@ - :/images/toolbar/board.png:/images/toolbar/board.png + :/images/toolbar/board.svg:/images/toolbar/board.svg Board @@ -580,7 +580,7 @@ - :/images/toolbar/clearPage.png:/images/toolbar/clearPage.png + :/images/toolbar/clearPage.svg:/images/toolbar/clearPage.svg Erase @@ -592,7 +592,7 @@ - :/images/toolbar/settings.png:/images/toolbar/settings.png + :/images/toolbar/settings.svg:/images/toolbar/settings.svg Preferences @@ -607,7 +607,7 @@ - :/images/toolbar/library.png:/images/toolbar/library.png + :/images/toolbar/library.svg:/images/toolbar/library.svg Library @@ -622,7 +622,7 @@ - :/images/toolbar/menu.png:/images/toolbar/menu.png + :/images/toolbar/menu.svg:/images/toolbar/menu.svg OpenBoard @@ -634,7 +634,7 @@ - :/images/toolbar/display.png:/images/toolbar/display.png + :/images/toolbar/display.svg:/images/toolbar/display.svg Show Desktop @@ -649,7 +649,7 @@ - :/images/stylusPalette/zoomIn.png:/images/stylusPalette/zoomIn.png + :/images/stylusPalette/zoomIn.svg:/images/stylusPalette/zoomIn.svg Bigger @@ -664,7 +664,7 @@ - :/images/stylusPalette/zoomOut.png:/images/stylusPalette/zoomOut.png + :/images/stylusPalette/zoomOut.svg:/images/stylusPalette/zoomOut.svg Smaller @@ -679,7 +679,7 @@ - :/images/toolbar/newFolder.png:/images/toolbar/newFolder.png + :/images/toolbar/newFolder.svg:/images/toolbar/newFolder.svg New Folder @@ -691,7 +691,7 @@ - :/images/toolbar/newDocument.png:/images/toolbar/newDocument.png + :/images/toolbar/newDocument.svg:/images/toolbar/newDocument.svg New Document @@ -703,7 +703,7 @@ - :/images/toolbar/import.png:/images/toolbar/import.png + :/images/toolbar/import.svg:/images/toolbar/import.svg Import @@ -715,7 +715,7 @@ - :/images/toolbar/export.png:/images/toolbar/export.png + :/images/toolbar/export.svg:/images/toolbar/export.svg Export @@ -727,7 +727,7 @@ - :/images/toolbar/open.png:/images/toolbar/open.png + :/images/toolbar/open.svg:/images/toolbar/open.svg Open in Board @@ -742,7 +742,7 @@ - :/images/toolbar/duplicate.png:/images/toolbar/duplicate.png + :/images/toolbar/duplicate.svg:/images/toolbar/duplicate.svg Duplicate @@ -754,7 +754,7 @@ - :/images/toolbar/deleteDocument.png:/images/toolbar/deleteDocument.png + :/images/toolbar/deleteDocument.svg:/images/toolbar/deleteDocument.svg Delete @@ -769,7 +769,7 @@ - :/images/toolbar/addToWorkingDoc.png:/images/toolbar/addToWorkingDoc.png + :/images/toolbar/addToWorkingDoc.svg:/images/toolbar/addToWorkingDoc.svg Add to Working Document @@ -781,7 +781,7 @@ - :/images/toolbar/addToPage.png:/images/toolbar/addToPage.png + :/images/toolbar/addToPage.svg:/images/toolbar/addToPage.svg Add @@ -793,7 +793,7 @@ - :/images/toolbar/rename.png:/images/toolbar/rename.png + :/images/toolbar/rename.svg:/images/toolbar/rename.svg Rename @@ -808,7 +808,7 @@ - :/images/toolbar/tools.png:/images/toolbar/tools.png + :/images/toolbar/tools.svg:/images/toolbar/tools.svg Tools @@ -823,7 +823,7 @@ - :/images/toolbar/tools.png:/images/toolbar/tools.png + :/images/toolbar/tools.svg:/images/toolbar/tools.svg Tools @@ -841,7 +841,7 @@ - :/images/toolbar/display.png:/images/toolbar/display.png + :/images/toolbar/display.svg:/images/toolbar/display.svg Multi Screen @@ -853,7 +853,7 @@ - :/images/toolbar/addToPage.png:/images/toolbar/addToPage.png + :/images/toolbar/addToPage.svg:/images/toolbar/addToPage.svg Wide Size (16/9) @@ -874,7 +874,7 @@ - :/images/toolbar/addToPage.png:/images/toolbar/addToPage.png + :/images/toolbar/addToPage.svg:/images/toolbar/addToPage.svg Regular Size (4/3) @@ -898,7 +898,7 @@ - :/images/toolbar/addToPage.png:/images/toolbar/addToPage.png + :/images/toolbar/addToPage.svg:/images/toolbar/addToPage.svg Custom Size @@ -916,7 +916,7 @@ - :/images/toolbar/deleteDocument.png:/images/toolbar/deleteDocument.png + :/images/toolbar/deleteDocument.svg:/images/toolbar/deleteDocument.svg Stop Loading @@ -928,7 +928,7 @@ - :/images/toolbar/cut.png:/images/toolbar/cut.png + :/images/toolbar/cut.svg:/images/toolbar/cut.svg Cut @@ -940,7 +940,7 @@ - :/images/toolbar/copy.png:/images/toolbar/copy.png + :/images/toolbar/copy.svg:/images/toolbar/copy.svg Copy @@ -952,7 +952,7 @@ - :/images/toolbar/paste.png:/images/toolbar/paste.png + :/images/toolbar/paste.svg:/images/toolbar/paste.svg Paste @@ -1113,7 +1113,7 @@ - :/images/toolbar/record.png:/images/toolbar/record.png + :/images/toolbar/record.svg:/images/toolbar/record.svg Podcast @@ -1128,8 +1128,8 @@ - :/images/toolbar/record.png - :/images/toolbar/stop.png:/images/toolbar/record.png + :/images/toolbar/record.svg + :/images/toolbar/stop.svg:/images/toolbar/record.svg Record @@ -1177,7 +1177,7 @@ - :/images/toolbar/addToPage.png:/images/toolbar/addToPage.png + :/images/toolbar/addToPage.svg:/images/toolbar/addToPage.svg Add @@ -1422,7 +1422,7 @@ - :/images/toolbar/newDocument.png:/images/toolbar/newDocument.png + :/images/toolbar/newDocument.svg:/images/toolbar/newDocument.svg Pages @@ -1476,7 +1476,7 @@ - :/images/toolbar/pause.png:/images/toolbar/pause.png + :/images/toolbar/pause.svg:/images/toolbar/pause.svg Pause @@ -1488,7 +1488,7 @@ - :/images/toolbar/settings.png:/images/toolbar/settings.png + :/images/toolbar/settings.svg:/images/toolbar/settings.svg Podcast Config @@ -1500,7 +1500,7 @@ - :/images/toolbar/addToolToLibrary.png:/images/toolbar/addToolToLibrary.png + :/images/toolbar/addToolToLibrary.svg:/images/toolbar/addToolToLibrary.svg Capture Web Content @@ -1528,7 +1528,7 @@ - :/images/toolbar/captureArea.png:/images/toolbar/captureArea.png + :/images/toolbar/captureArea.svg:/images/toolbar/captureArea.svg Custom Capture @@ -1540,7 +1540,7 @@ - :/images/toolbar/captureWindow.png:/images/toolbar/captureWindow.png + :/images/toolbar/captureWindow.svg:/images/toolbar/captureWindow.svg Window Capture @@ -1570,8 +1570,8 @@ - :/images/toolbar/eyeClosed.png - :/images/toolbar/eyeOpened.png:/images/toolbar/eyeClosed.png + :/images/toolbar/eyeClosed.svg + :/images/toolbar/eyeOpened.svg:/images/toolbar/eyeClosed.svg Show on Display @@ -1601,7 +1601,7 @@ - :/images/toolbar/addToolToLibrary.png:/images/toolbar/addToolToLibrary.png + :/images/toolbar/addToolToLibrary.svg:/images/toolbar/addToolToLibrary.svg eduMedia @@ -1613,7 +1613,7 @@ - :/images/toolbar/updates.png:/images/toolbar/updates.png + :/images/toolbar/updates.svg:/images/toolbar/updates.svg Check Update @@ -1622,7 +1622,7 @@ - :/images/toolbar/hide.png:/images/toolbar/hide.png + :/images/toolbar/hide.svg:/images/toolbar/hide.svg Hide OpenBoard @@ -1665,7 +1665,7 @@ - :/images/toolbar/tutorial.png:/images/toolbar/tutorial.png + :/images/toolbar/tutorial.svg:/images/toolbar/tutorial.svg Open Tutorial diff --git a/resources/images/toolbar/addBookmark.svg b/resources/images/toolbar/addBookmark.svg new file mode 100644 index 00000000..97d2a04d --- /dev/null +++ b/resources/images/toolbar/addBookmark.svg @@ -0,0 +1,175 @@ + + + + + + + + + + + + + diff --git a/resources/images/toolbar/addInteractiveToLibrary.svg b/resources/images/toolbar/addInteractiveToLibrary.svg new file mode 100644 index 00000000..7e0c235b --- /dev/null +++ b/resources/images/toolbar/addInteractiveToLibrary.svg @@ -0,0 +1,221 @@ + +image/svg+xml diff --git a/resources/images/toolbar/addToDocument.svg b/resources/images/toolbar/addToDocument.svg new file mode 100644 index 00000000..b935fdf4 --- /dev/null +++ b/resources/images/toolbar/addToDocument.svg @@ -0,0 +1,120 @@ + + + + diff --git a/resources/images/toolbar/addToLibrary.svg b/resources/images/toolbar/addToLibrary.svg new file mode 100644 index 00000000..99552f12 --- /dev/null +++ b/resources/images/toolbar/addToLibrary.svg @@ -0,0 +1,184 @@ + +image/svg+xml diff --git a/resources/images/toolbar/addToPage.svg b/resources/images/toolbar/addToPage.svg new file mode 100644 index 00000000..b5316dc4 --- /dev/null +++ b/resources/images/toolbar/addToPage.svg @@ -0,0 +1,284 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/toolbar/addToWorkingDoc.svg b/resources/images/toolbar/addToWorkingDoc.svg new file mode 100644 index 00000000..dece7a63 --- /dev/null +++ b/resources/images/toolbar/addToWorkingDoc.svg @@ -0,0 +1,250 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/toolbar/addToolToLibrary.svg b/resources/images/toolbar/addToolToLibrary.svg new file mode 100644 index 00000000..96411bd3 --- /dev/null +++ b/resources/images/toolbar/addToolToLibrary.svg @@ -0,0 +1,275 @@ + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/toolbar/background.svg b/resources/images/toolbar/background.svg new file mode 100644 index 00000000..5b4b82c4 --- /dev/null +++ b/resources/images/toolbar/background.svg @@ -0,0 +1,141 @@ + + + +image/svg+xml diff --git a/resources/images/toolbar/board.svg b/resources/images/toolbar/board.svg new file mode 100644 index 00000000..128cd564 --- /dev/null +++ b/resources/images/toolbar/board.svg @@ -0,0 +1,311 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/toolbar/bookmarks.svg b/resources/images/toolbar/bookmarks.svg new file mode 100644 index 00000000..d4b420c5 --- /dev/null +++ b/resources/images/toolbar/bookmarks.svg @@ -0,0 +1,156 @@ + + + + + + + + + + + + + diff --git a/resources/images/toolbar/captureArea.svg b/resources/images/toolbar/captureArea.svg new file mode 100644 index 00000000..d60b7979 --- /dev/null +++ b/resources/images/toolbar/captureArea.svg @@ -0,0 +1,227 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/toolbar/captureScreen.svg b/resources/images/toolbar/captureScreen.svg new file mode 100644 index 00000000..b4dff438 --- /dev/null +++ b/resources/images/toolbar/captureScreen.svg @@ -0,0 +1,215 @@ + +image/svg+xml diff --git a/resources/images/toolbar/captureWindow.svg b/resources/images/toolbar/captureWindow.svg new file mode 100644 index 00000000..d6dd4cdd --- /dev/null +++ b/resources/images/toolbar/captureWindow.svg @@ -0,0 +1,267 @@ + +image/svg+xml diff --git a/resources/images/toolbar/clearPage.svg b/resources/images/toolbar/clearPage.svg new file mode 100644 index 00000000..3cf5d815 --- /dev/null +++ b/resources/images/toolbar/clearPage.svg @@ -0,0 +1,167 @@ + + + + + + + + + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/toolbar/color.svg b/resources/images/toolbar/color.svg new file mode 100644 index 00000000..5f5df9e6 --- /dev/null +++ b/resources/images/toolbar/color.svg @@ -0,0 +1,145 @@ + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/toolbar/copy.svg b/resources/images/toolbar/copy.svg new file mode 100644 index 00000000..66232a09 --- /dev/null +++ b/resources/images/toolbar/copy.svg @@ -0,0 +1,307 @@ + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/toolbar/cut.svg b/resources/images/toolbar/cut.svg new file mode 100644 index 00000000..5d5ff19e --- /dev/null +++ b/resources/images/toolbar/cut.svg @@ -0,0 +1,162 @@ + + + + diff --git a/resources/images/toolbar/deleteDocument.svg b/resources/images/toolbar/deleteDocument.svg new file mode 100644 index 00000000..76a4a9b0 --- /dev/null +++ b/resources/images/toolbar/deleteDocument.svg @@ -0,0 +1,173 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/toolbar/deleteFolder.svg b/resources/images/toolbar/deleteFolder.svg new file mode 100644 index 00000000..a9cd2297 --- /dev/null +++ b/resources/images/toolbar/deleteFolder.svg @@ -0,0 +1,271 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/toolbar/display.svg b/resources/images/toolbar/display.svg new file mode 100644 index 00000000..088100b1 --- /dev/null +++ b/resources/images/toolbar/display.svg @@ -0,0 +1,255 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/toolbar/documents.svg b/resources/images/toolbar/documents.svg new file mode 100644 index 00000000..40e870a2 --- /dev/null +++ b/resources/images/toolbar/documents.svg @@ -0,0 +1,294 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/toolbar/duplicate.svg b/resources/images/toolbar/duplicate.svg new file mode 100644 index 00000000..e86c5fd8 --- /dev/null +++ b/resources/images/toolbar/duplicate.svg @@ -0,0 +1,243 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/toolbar/eraserTool.svg b/resources/images/toolbar/eraserTool.svg new file mode 100644 index 00000000..c9376324 --- /dev/null +++ b/resources/images/toolbar/eraserTool.svg @@ -0,0 +1,81 @@ + + + + diff --git a/resources/images/toolbar/export.svg b/resources/images/toolbar/export.svg new file mode 100644 index 00000000..704013a9 --- /dev/null +++ b/resources/images/toolbar/export.svg @@ -0,0 +1,173 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/toolbar/extraTool.svg b/resources/images/toolbar/extraTool.svg new file mode 100644 index 00000000..9e090ce0 --- /dev/null +++ b/resources/images/toolbar/extraTool.svg @@ -0,0 +1,559 @@ + + + + diff --git a/resources/images/toolbar/eyeClosed.svg b/resources/images/toolbar/eyeClosed.svg new file mode 100644 index 00000000..ac4bd13c --- /dev/null +++ b/resources/images/toolbar/eyeClosed.svg @@ -0,0 +1,159 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/toolbar/eyeOpened.svg b/resources/images/toolbar/eyeOpened.svg new file mode 100644 index 00000000..a426a140 --- /dev/null +++ b/resources/images/toolbar/eyeOpened.svg @@ -0,0 +1,166 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + diff --git a/resources/images/toolbar/group.svg b/resources/images/toolbar/group.svg new file mode 100644 index 00000000..9c5e4b90 --- /dev/null +++ b/resources/images/toolbar/group.svg @@ -0,0 +1,157 @@ + +image/svg+xml diff --git a/resources/images/toolbar/hide.svg b/resources/images/toolbar/hide.svg new file mode 100644 index 00000000..903df8ea --- /dev/null +++ b/resources/images/toolbar/hide.svg @@ -0,0 +1,178 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/toolbar/home.svg b/resources/images/toolbar/home.svg new file mode 100644 index 00000000..20c3b062 --- /dev/null +++ b/resources/images/toolbar/home.svg @@ -0,0 +1,190 @@ + + + + diff --git a/resources/images/toolbar/import.svg b/resources/images/toolbar/import.svg new file mode 100644 index 00000000..93fba7f8 --- /dev/null +++ b/resources/images/toolbar/import.svg @@ -0,0 +1,164 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/toolbar/largeEraser.svg b/resources/images/toolbar/largeEraser.svg new file mode 100644 index 00000000..ad322172 --- /dev/null +++ b/resources/images/toolbar/largeEraser.svg @@ -0,0 +1,67 @@ + + + + diff --git a/resources/images/toolbar/largePen.svg b/resources/images/toolbar/largePen.svg new file mode 100644 index 00000000..efb7a92c --- /dev/null +++ b/resources/images/toolbar/largePen.svg @@ -0,0 +1,67 @@ + + + + diff --git a/resources/images/toolbar/library.svg b/resources/images/toolbar/library.svg new file mode 100644 index 00000000..3b51065e --- /dev/null +++ b/resources/images/toolbar/library.svg @@ -0,0 +1,180 @@ + +image/svg+xml diff --git a/resources/images/toolbar/lineTool.svg b/resources/images/toolbar/lineTool.svg new file mode 100644 index 00000000..7f0bc46b --- /dev/null +++ b/resources/images/toolbar/lineTool.svg @@ -0,0 +1,81 @@ + + + + diff --git a/resources/images/toolbar/mediumEraser.svg b/resources/images/toolbar/mediumEraser.svg new file mode 100644 index 00000000..cf26a737 --- /dev/null +++ b/resources/images/toolbar/mediumEraser.svg @@ -0,0 +1,67 @@ + + + + diff --git a/resources/images/toolbar/mediumPen.svg b/resources/images/toolbar/mediumPen.svg new file mode 100644 index 00000000..489e4a90 --- /dev/null +++ b/resources/images/toolbar/mediumPen.svg @@ -0,0 +1,67 @@ + + + + diff --git a/resources/images/toolbar/menu.svg b/resources/images/toolbar/menu.svg new file mode 100644 index 00000000..844a0aaf --- /dev/null +++ b/resources/images/toolbar/menu.svg @@ -0,0 +1,116 @@ + +image/svg+xml diff --git a/resources/images/toolbar/mic.svg b/resources/images/toolbar/mic.svg new file mode 100644 index 00000000..2045113e --- /dev/null +++ b/resources/images/toolbar/mic.svg @@ -0,0 +1,461 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/toolbar/micOff.svg b/resources/images/toolbar/micOff.svg new file mode 100644 index 00000000..07bde51b --- /dev/null +++ b/resources/images/toolbar/micOff.svg @@ -0,0 +1,517 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/toolbar/newDocument.svg b/resources/images/toolbar/newDocument.svg new file mode 100644 index 00000000..6ab59186 --- /dev/null +++ b/resources/images/toolbar/newDocument.svg @@ -0,0 +1,147 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/toolbar/newFolder.svg b/resources/images/toolbar/newFolder.svg new file mode 100644 index 00000000..fb0a3381 --- /dev/null +++ b/resources/images/toolbar/newFolder.svg @@ -0,0 +1,235 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/toolbar/newPage.svg b/resources/images/toolbar/newPage.svg new file mode 100644 index 00000000..13a61544 --- /dev/null +++ b/resources/images/toolbar/newPage.svg @@ -0,0 +1,181 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/toolbar/next.svg b/resources/images/toolbar/next.svg new file mode 100644 index 00000000..e5450d72 --- /dev/null +++ b/resources/images/toolbar/next.svg @@ -0,0 +1,93 @@ + + + + diff --git a/resources/images/toolbar/nextPageOn.svg b/resources/images/toolbar/nextPageOn.svg new file mode 100644 index 00000000..cd078970 --- /dev/null +++ b/resources/images/toolbar/nextPageOn.svg @@ -0,0 +1,183 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/toolbar/open.svg b/resources/images/toolbar/open.svg new file mode 100644 index 00000000..8ba3bfc1 --- /dev/null +++ b/resources/images/toolbar/open.svg @@ -0,0 +1,490 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/toolbar/pageSize.svg b/resources/images/toolbar/pageSize.svg new file mode 100644 index 00000000..5435919b --- /dev/null +++ b/resources/images/toolbar/pageSize.svg @@ -0,0 +1,280 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/toolbar/paste.svg b/resources/images/toolbar/paste.svg new file mode 100644 index 00000000..b3d50801 --- /dev/null +++ b/resources/images/toolbar/paste.svg @@ -0,0 +1,307 @@ + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/toolbar/pause.svg b/resources/images/toolbar/pause.svg new file mode 100644 index 00000000..238937f6 --- /dev/null +++ b/resources/images/toolbar/pause.svg @@ -0,0 +1,107 @@ + + + + diff --git a/resources/images/toolbar/pdf.svg b/resources/images/toolbar/pdf.svg new file mode 100644 index 00000000..b3cf5673 --- /dev/null +++ b/resources/images/toolbar/pdf.svg @@ -0,0 +1,122 @@ + + + +PDF diff --git a/resources/images/toolbar/plusBlack.svg b/resources/images/toolbar/plusBlack.svg new file mode 100644 index 00000000..28585109 --- /dev/null +++ b/resources/images/toolbar/plusBlack.svg @@ -0,0 +1,63 @@ + + + + diff --git a/resources/images/toolbar/plusBlackOn.svg b/resources/images/toolbar/plusBlackOn.svg new file mode 100644 index 00000000..caab71b0 --- /dev/null +++ b/resources/images/toolbar/plusBlackOn.svg @@ -0,0 +1,96 @@ + +image/svg+xml diff --git a/resources/images/toolbar/previous.svg b/resources/images/toolbar/previous.svg new file mode 100644 index 00000000..07d20510 --- /dev/null +++ b/resources/images/toolbar/previous.svg @@ -0,0 +1,93 @@ + + + + diff --git a/resources/images/toolbar/previousPageOn.svg b/resources/images/toolbar/previousPageOn.svg new file mode 100644 index 00000000..1e50424a --- /dev/null +++ b/resources/images/toolbar/previousPageOn.svg @@ -0,0 +1,183 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/toolbar/print.svg b/resources/images/toolbar/print.svg new file mode 100644 index 00000000..ac3732ba --- /dev/null +++ b/resources/images/toolbar/print.svg @@ -0,0 +1,606 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/toolbar/profile.svg b/resources/images/toolbar/profile.svg new file mode 100644 index 00000000..94bcaf4e --- /dev/null +++ b/resources/images/toolbar/profile.svg @@ -0,0 +1,111 @@ + +image/svg+xml diff --git a/resources/images/toolbar/proto.svg b/resources/images/toolbar/proto.svg new file mode 100644 index 00000000..92d49766 --- /dev/null +++ b/resources/images/toolbar/proto.svg @@ -0,0 +1,112 @@ + +HOTimage/svg+xml diff --git a/resources/images/toolbar/quit.svg b/resources/images/toolbar/quit.svg new file mode 100644 index 00000000..fd756d52 --- /dev/null +++ b/resources/images/toolbar/quit.svg @@ -0,0 +1,116 @@ + +image/svg+xml diff --git a/resources/images/toolbar/quitOn.svg b/resources/images/toolbar/quitOn.svg new file mode 100644 index 00000000..3de7a7e6 --- /dev/null +++ b/resources/images/toolbar/quitOn.svg @@ -0,0 +1,116 @@ + +image/svg+xml diff --git a/resources/images/toolbar/record.svg b/resources/images/toolbar/record.svg new file mode 100644 index 00000000..c8f90176 --- /dev/null +++ b/resources/images/toolbar/record.svg @@ -0,0 +1,128 @@ + +image/svg+xml diff --git a/resources/images/toolbar/redo.svg b/resources/images/toolbar/redo.svg new file mode 100644 index 00000000..171f2cca --- /dev/null +++ b/resources/images/toolbar/redo.svg @@ -0,0 +1,90 @@ + + + + diff --git a/resources/images/toolbar/redoOn.svg b/resources/images/toolbar/redoOn.svg new file mode 100644 index 00000000..ec1b31cc --- /dev/null +++ b/resources/images/toolbar/redoOn.svg @@ -0,0 +1,90 @@ + + + + diff --git a/resources/images/toolbar/reload.svg b/resources/images/toolbar/reload.svg new file mode 100644 index 00000000..a33b4a67 --- /dev/null +++ b/resources/images/toolbar/reload.svg @@ -0,0 +1,126 @@ + + + + diff --git a/resources/images/toolbar/remove.svg b/resources/images/toolbar/remove.svg new file mode 100644 index 00000000..3948bc34 --- /dev/null +++ b/resources/images/toolbar/remove.svg @@ -0,0 +1,89 @@ + + + + diff --git a/resources/images/toolbar/removeBackground.svg b/resources/images/toolbar/removeBackground.svg new file mode 100644 index 00000000..aa8ee2c7 --- /dev/null +++ b/resources/images/toolbar/removeBackground.svg @@ -0,0 +1,188 @@ + + + +image/svg+xml diff --git a/resources/images/toolbar/rename.svg b/resources/images/toolbar/rename.svg new file mode 100644 index 00000000..f2731803 --- /dev/null +++ b/resources/images/toolbar/rename.svg @@ -0,0 +1,275 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +Abc diff --git a/resources/images/toolbar/setBackground.svg b/resources/images/toolbar/setBackground.svg new file mode 100644 index 00000000..c661cfe5 --- /dev/null +++ b/resources/images/toolbar/setBackground.svg @@ -0,0 +1,170 @@ + + + +image/svg+xml diff --git a/resources/images/toolbar/settings.svg b/resources/images/toolbar/settings.svg new file mode 100644 index 00000000..56f58bac --- /dev/null +++ b/resources/images/toolbar/settings.svg @@ -0,0 +1,143 @@ + + + + diff --git a/resources/images/toolbar/smallEraser.svg b/resources/images/toolbar/smallEraser.svg new file mode 100644 index 00000000..7c9908fc --- /dev/null +++ b/resources/images/toolbar/smallEraser.svg @@ -0,0 +1,67 @@ + + + + diff --git a/resources/images/toolbar/smallPen.svg b/resources/images/toolbar/smallPen.svg new file mode 100644 index 00000000..d9c6a3ee --- /dev/null +++ b/resources/images/toolbar/smallPen.svg @@ -0,0 +1,67 @@ + + + + diff --git a/resources/images/toolbar/smallerText.svg b/resources/images/toolbar/smallerText.svg new file mode 100644 index 00000000..36b0cede --- /dev/null +++ b/resources/images/toolbar/smallerText.svg @@ -0,0 +1,183 @@ + + + + diff --git a/resources/images/toolbar/softwareUpdate.svg b/resources/images/toolbar/softwareUpdate.svg new file mode 100644 index 00000000..91f7a70c --- /dev/null +++ b/resources/images/toolbar/softwareUpdate.svg @@ -0,0 +1,329 @@ + + + + + + + + + + + + +image/svg+xml diff --git a/resources/images/toolbar/stop.svg b/resources/images/toolbar/stop.svg new file mode 100644 index 00000000..8ee5db84 --- /dev/null +++ b/resources/images/toolbar/stop.svg @@ -0,0 +1,81 @@ + + + + diff --git a/resources/images/toolbar/stylus.svg b/resources/images/toolbar/stylus.svg new file mode 100644 index 00000000..6565bac1 --- /dev/null +++ b/resources/images/toolbar/stylus.svg @@ -0,0 +1,385 @@ + + + + diff --git a/resources/images/toolbar/stylusTab.svg b/resources/images/toolbar/stylusTab.svg new file mode 100644 index 00000000..6565bac1 --- /dev/null +++ b/resources/images/toolbar/stylusTab.svg @@ -0,0 +1,385 @@ + + + + diff --git a/resources/images/toolbar/tools.svg b/resources/images/toolbar/tools.svg new file mode 100644 index 00000000..ab91d724 --- /dev/null +++ b/resources/images/toolbar/tools.svg @@ -0,0 +1,177 @@ + + + + diff --git a/resources/images/toolbar/tutorial.svg b/resources/images/toolbar/tutorial.svg new file mode 100644 index 00000000..644d291d --- /dev/null +++ b/resources/images/toolbar/tutorial.svg @@ -0,0 +1,140 @@ + +?image/svg+xml diff --git a/resources/images/toolbar/undo.svg b/resources/images/toolbar/undo.svg new file mode 100644 index 00000000..ad4ba035 --- /dev/null +++ b/resources/images/toolbar/undo.svg @@ -0,0 +1,90 @@ + + + + diff --git a/resources/images/toolbar/undoOn.svg b/resources/images/toolbar/undoOn.svg new file mode 100644 index 00000000..c1c93308 --- /dev/null +++ b/resources/images/toolbar/undoOn.svg @@ -0,0 +1,90 @@ + + + + diff --git a/resources/images/toolbar/ungroup.svg b/resources/images/toolbar/ungroup.svg new file mode 100644 index 00000000..dfc4f177 --- /dev/null +++ b/resources/images/toolbar/ungroup.svg @@ -0,0 +1,210 @@ + +image/svg+xml diff --git a/resources/images/toolbar/updates.svg b/resources/images/toolbar/updates.svg new file mode 100644 index 00000000..b0c92b28 --- /dev/null +++ b/resources/images/toolbar/updates.svg @@ -0,0 +1,136 @@ + + + + diff --git a/resources/images/toolbar/web.svg b/resources/images/toolbar/web.svg new file mode 100644 index 00000000..09c7b93b --- /dev/null +++ b/resources/images/toolbar/web.svg @@ -0,0 +1,321 @@ + + + + + + + + + + + + +image/svg+xml diff --git a/resources/images/toolbar/webTrap.svg b/resources/images/toolbar/webTrap.svg new file mode 100644 index 00000000..13df14ae --- /dev/null +++ b/resources/images/toolbar/webTrap.svg @@ -0,0 +1,106 @@ + +image/svg+xml diff --git a/resources/images/toolbar/webTrapEnabled.svg b/resources/images/toolbar/webTrapEnabled.svg new file mode 100644 index 00000000..301efafd --- /dev/null +++ b/resources/images/toolbar/webTrapEnabled.svg @@ -0,0 +1,120 @@ + +image/svg+xml diff --git a/resources/images/toolbar/webUpload.svg b/resources/images/toolbar/webUpload.svg new file mode 100644 index 00000000..6085c985 --- /dev/null +++ b/resources/images/toolbar/webUpload.svg @@ -0,0 +1,355 @@ + + + + + + + + + + + + +image/svg+xml diff --git a/resources/images/toolbar/window.svg b/resources/images/toolbar/window.svg new file mode 100644 index 00000000..d1c257fe --- /dev/null +++ b/resources/images/toolbar/window.svg @@ -0,0 +1,465 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/core/UBApplication.cpp b/src/core/UBApplication.cpp index 089448bd..05136945 100644 --- a/src/core/UBApplication.cpp +++ b/src/core/UBApplication.cpp @@ -520,7 +520,7 @@ void UBApplication::decorateActionMenu(QAction* action) pageSizeGroup->addAction(mainWindow->actionRegularPageSize); pageSizeGroup->addAction(mainWindow->actionCustomPageSize); - QMenu* documentSizeMenu = menu->addMenu(QIcon(":/images/toolbar/pageSize.png"),tr("Page Size")); + QMenu* documentSizeMenu = menu->addMenu(QIcon(":/images/toolbar/pageSize.svg"),tr("Page Size")); documentSizeMenu->addAction(mainWindow->actionWidePageSize); documentSizeMenu->addAction(mainWindow->actionRegularPageSize); documentSizeMenu->addAction(mainWindow->actionCustomPageSize); diff --git a/src/desktop/UBDesktopPalette.cpp b/src/desktop/UBDesktopPalette.cpp index 5e54043b..dd381d3e 100644 --- a/src/desktop/UBDesktopPalette.cpp +++ b/src/desktop/UBDesktopPalette.cpp @@ -52,7 +52,7 @@ UBDesktopPalette::UBDesktopPalette(QWidget *parent, UBRightPalette* _rightPalett { QList actions; - mActionUniboard = new QAction(QIcon(":/images/toolbar/board.png"), tr("Show OpenBoard"), this); + mActionUniboard = new QAction(QIcon(":/images/toolbar/board.svg"), tr("Show OpenBoard"), this); connect(mActionUniboard, SIGNAL(triggered()), this, SIGNAL(uniboardClick())); actions << mActionUniboard; @@ -66,17 +66,17 @@ UBDesktopPalette::UBDesktopPalette(QWidget *parent, UBRightPalette* _rightPalett if (UBPlatformUtils::hasVirtualKeyboard()) actions << UBApplication::mainWindow->actionVirtualKeyboard; - mActionCustomSelect = new QAction(QIcon(":/images/toolbar/captureArea.png"), tr("Capture Part of the Screen"), this); + mActionCustomSelect = new QAction(QIcon(":/images/toolbar/captureArea.svg"), tr("Capture Part of the Screen"), this); connect(mActionCustomSelect, SIGNAL(triggered()), this, SIGNAL(customClick())); actions << mActionCustomSelect; - mDisplaySelectAction = new QAction(QIcon(":/images/toolbar/captureScreen.png"), tr("Capture the Screen"), this); + mDisplaySelectAction = new QAction(QIcon(":/images/toolbar/captureScreen.svg"), tr("Capture the Screen"), this); connect(mDisplaySelectAction, SIGNAL(triggered()), this, SIGNAL(screenClick())); actions << mDisplaySelectAction; QIcon showHideIcon; - showHideIcon.addPixmap(QPixmap(":/images/toolbar/eyeOpened.png"), QIcon::Normal , QIcon::On); - showHideIcon.addPixmap(QPixmap(":/images/toolbar/eyeClosed.png"), QIcon::Normal , QIcon::Off); + showHideIcon.addFile(":/images/toolbar/eyeOpened.svg", QSize(), QIcon::Normal , QIcon::On); + showHideIcon.addFile(":/images/toolbar/eyeClosed.svg", QSize(), QIcon::Normal , QIcon::Off); mShowHideAction = new QAction(showHideIcon, "", this); mShowHideAction->setCheckable(true); @@ -90,7 +90,7 @@ UBDesktopPalette::UBDesktopPalette(QWidget *parent, UBRightPalette* _rightPalett // This palette can be minimized QIcon maximizeIcon; - maximizeIcon.addPixmap(QPixmap(":/images/toolbar/stylusTab.png"), QIcon::Normal, QIcon::On); + maximizeIcon.addFile(":/images/toolbar/stylusTab.svg", QSize(), QIcon::Normal, QIcon::On); mMaximizeAction = new QAction(maximizeIcon, tr("Show the stylus palette"), this); connect(mMaximizeAction, SIGNAL(triggered()), this, SLOT(maximizeMe())); connect(this, SIGNAL(maximizeStart()), this, SLOT(maximizeMe())); diff --git a/src/document/UBDocumentController.cpp b/src/document/UBDocumentController.cpp index c049c95f..cb2a1876 100644 --- a/src/document/UBDocumentController.cpp +++ b/src/document/UBDocumentController.cpp @@ -511,7 +511,7 @@ QVariant UBDocumentTreeModel::data(const QModelIndex &index, int role) const case UBDocumentTreeNode::Catalog : return QIcon(":images/folder.svg"); case UBDocumentTreeNode::Document : - return QIcon(":images/toolbar/board.png"); + return QIcon(":images/toolbar/board.svg"); } } break; diff --git a/src/domain/UBGraphicsGroupContainerItemDelegate.cpp b/src/domain/UBGraphicsGroupContainerItemDelegate.cpp index 457e3f06..a32abffb 100644 --- a/src/domain/UBGraphicsGroupContainerItemDelegate.cpp +++ b/src/domain/UBGraphicsGroupContainerItemDelegate.cpp @@ -56,8 +56,8 @@ void UBGraphicsGroupContainerItemDelegate::decorateMenu(QMenu *menu) { mLockAction = menu->addAction(tr("Locked"), this, SLOT(lock(bool))); QIcon lockIcon; - lockIcon.addPixmap(QPixmap(":/images/locked.svg"), QIcon::Normal, QIcon::On); - lockIcon.addPixmap(QPixmap(":/images/unlocked.svg"), QIcon::Normal, QIcon::Off); + lockIcon.addFile(":/images/locked.svg", QSize(), QIcon::Normal, QIcon::On); + lockIcon.addFile(":/images/unlocked.svg", QSize(), QIcon::Normal, QIcon::Off); mLockAction->setIcon(lockIcon); mLockAction->setCheckable(true); @@ -65,8 +65,8 @@ void UBGraphicsGroupContainerItemDelegate::decorateMenu(QMenu *menu) mShowOnDisplayAction->setCheckable(true); QIcon showIcon; - showIcon.addPixmap(QPixmap(":/images/eyeOpened.svg"), QIcon::Normal, QIcon::On); - showIcon.addPixmap(QPixmap(":/images/eyeClosed.svg"), QIcon::Normal, QIcon::Off); + showIcon.addFile(":/images/eyeOpened.svg", QSize(), QIcon::Normal, QIcon::On); + showIcon.addFile(":/images/eyeClosed.svg", QSize(), QIcon::Normal, QIcon::Off); mShowOnDisplayAction->setIcon(showIcon); } diff --git a/src/domain/UBGraphicsItemDelegate.cpp b/src/domain/UBGraphicsItemDelegate.cpp index 8c0dede6..92d72158 100644 --- a/src/domain/UBGraphicsItemDelegate.cpp +++ b/src/domain/UBGraphicsItemDelegate.cpp @@ -711,8 +711,8 @@ void UBGraphicsItemDelegate::decorateMenu(QMenu* menu) { mLockAction = menu->addAction(tr("Locked"), this, SLOT(lock(bool))); QIcon lockIcon; - lockIcon.addPixmap(QPixmap(":/images/locked.svg"), QIcon::Normal, QIcon::On); - lockIcon.addPixmap(QPixmap(":/images/unlocked.svg"), QIcon::Normal, QIcon::Off); + lockIcon.addFile(":/images/locked.svg", QSize(), QIcon::Normal, QIcon::On); + lockIcon.addFile(":/images/unlocked.svg", QSize(), QIcon::Normal, QIcon::Off); mLockAction->setIcon(lockIcon); mLockAction->setCheckable(true); @@ -720,8 +720,8 @@ void UBGraphicsItemDelegate::decorateMenu(QMenu* menu) mShowOnDisplayAction->setCheckable(true); QIcon showIcon; - showIcon.addPixmap(QPixmap(":/images/eyeOpened.svg"), QIcon::Normal, QIcon::On); - showIcon.addPixmap(QPixmap(":/images/eyeClosed.svg"), QIcon::Normal, QIcon::Off); + showIcon.addFile(":/images/eyeOpened.svg", QSize(), QIcon::Normal, QIcon::On); + showIcon.addFile(":/images/eyeClosed.svg", QSize(), QIcon::Normal, QIcon::Off); mShowOnDisplayAction->setIcon(showIcon); if (delegated()->data(UBGraphicsItemData::ItemCanBeSetAsBackground).toBool()) { @@ -729,7 +729,7 @@ void UBGraphicsItemDelegate::decorateMenu(QMenu* menu) mSetAsBackgroundAction->setCheckable(false); QIcon backgroundIcon; - backgroundIcon.addPixmap(QPixmap(":/images/setAsBackground.svg"), QIcon::Normal, QIcon::On); + backgroundIcon.addFile(":/images/setAsBackground.svg", QSize(), QIcon::Normal, QIcon::On); mSetAsBackgroundAction->setIcon(backgroundIcon); } @@ -738,7 +738,7 @@ void UBGraphicsItemDelegate::decorateMenu(QMenu* menu) mGotoContentSourceAction = menu->addAction(tr("Go to Content Source"), this, SLOT(gotoContentSource())); QIcon sourceIcon; - sourceIcon.addPixmap(QPixmap(":/images/toolbar/internet.png"), QIcon::Normal, QIcon::On); + sourceIcon.addFile(":/images/toolbar/internet.png", QSize(), QIcon::Normal, QIcon::On); mGotoContentSourceAction->setIcon(sourceIcon); } } diff --git a/src/domain/UBGraphicsWidgetItemDelegate.cpp b/src/domain/UBGraphicsWidgetItemDelegate.cpp index 33306450..19167e6f 100644 --- a/src/domain/UBGraphicsWidgetItemDelegate.cpp +++ b/src/domain/UBGraphicsWidgetItemDelegate.cpp @@ -87,8 +87,8 @@ void UBGraphicsWidgetItemDelegate::decorateMenu(QMenu* menu) freezeAction = menu->addAction(tr("Frozen"), this, SLOT(freeze(bool))); QIcon freezeIcon; - freezeIcon.addPixmap(QPixmap(":/images/frozen.svg"), QIcon::Normal, QIcon::On); - freezeIcon.addPixmap(QPixmap(":/images/unfrozen.svg"), QIcon::Normal, QIcon::Off); + freezeIcon.addFile(":/images/frozen.svg", QSize(), QIcon::Normal, QIcon::On); + freezeIcon.addFile(":/images/unfrozen.svg", QSize(), QIcon::Normal, QIcon::Off); freezeAction->setIcon(freezeIcon); freezeAction->setCheckable(true); @@ -97,8 +97,8 @@ void UBGraphicsWidgetItemDelegate::decorateMenu(QMenu* menu) { setAsToolAction = mMenu->addAction(tr("Transform as Tool "), this, SLOT(pin())); QIcon pinIcon; - pinIcon.addPixmap(QPixmap(":/images/unpin.svg"), QIcon::Normal, QIcon::On); - pinIcon.addPixmap(QPixmap(":/images/pin.svg"), QIcon::Normal, QIcon::Off); + pinIcon.addFile(":/images/unpin.svg", QSize(), QIcon::Normal, QIcon::On); + pinIcon.addFile(":/images/pin.svg", QSize(), QIcon::Normal, QIcon::Off); setAsToolAction->setIcon(pinIcon); } } diff --git a/src/web/browser/WBTabWidget.cpp b/src/web/browser/WBTabWidget.cpp index 338e08d0..1e5561ca 100644 --- a/src/web/browser/WBTabWidget.cpp +++ b/src/web/browser/WBTabWidget.cpp @@ -241,7 +241,7 @@ WBTabWidget::WBTabWidget(QWidget *parent) , mTabBar(new WBTabBar(this)) { setObjectName("ubWebBrowserTabWidget"); - mAddTabIcon = QPixmap(":/images/toolbar/plusBlack.png"); + mAddTabIcon = QPixmap(":/images/toolbar/plusBlack.svg"); setElideMode(Qt::ElideRight);