From e37a7450b41cee773d32076da0b96564762c4fef Mon Sep 17 00:00:00 2001 From: scorpio810 Date: Wed, 14 Jun 2017 11:56:32 +0000 Subject: [PATCH] Convert svg icons to png Workaround to fix segfault on Fedora, thanks Remi for reporting this issue see : https://bugzilla.redhat.com/show_bug.cgi?id=1461390 git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4978 bfdf4180-ca20-0410-9c96-a3a8aa849046 --- ico/16x16/edit-download.svg | 13 --------- ico/16x16/edit-download.svg.png | Bin 0 -> 236 bytes ico/16x16/help-contents.svg | 14 --------- ico/16x16/help-contents.svg.png | Bin 0 -> 226 bytes ico/16x16/help-donate.svg | 13 --------- ico/16x16/help-donate.svg.png | Bin 0 -> 207 bytes ico/16x16/kdenlive-show-video.svg | 13 --------- ico/16x16/kdenlive-show-video.svg.png | Bin 0 -> 220 bytes qelectrotech.qrc | 8 +++--- sources/qeticons.cpp | 40 +++++++++++++------------- 10 files changed, 24 insertions(+), 77 deletions(-) delete mode 100644 ico/16x16/edit-download.svg create mode 100644 ico/16x16/edit-download.svg.png delete mode 100644 ico/16x16/help-contents.svg create mode 100644 ico/16x16/help-contents.svg.png delete mode 100644 ico/16x16/help-donate.svg create mode 100644 ico/16x16/help-donate.svg.png delete mode 100644 ico/16x16/kdenlive-show-video.svg create mode 100644 ico/16x16/kdenlive-show-video.svg.png diff --git a/ico/16x16/edit-download.svg b/ico/16x16/edit-download.svg deleted file mode 100644 index 293505e8d..000000000 --- a/ico/16x16/edit-download.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - diff --git a/ico/16x16/edit-download.svg.png b/ico/16x16/edit-download.svg.png new file mode 100644 index 0000000000000000000000000000000000000000..98f4e83bdca1858d2339117c951e01318ffd6226 GIT binary patch literal 236 zcmeAS@N?(olHy`uVBq!ia0vp^tRT$61|)m))t&+=mSQK*5Dp-y;YjHK@;M7UB8!1) zZh$Z&r~}U&Kt-9JE{-7_ zGj&fd6lF3LaJ~57h^gPPU>ehbOAJiYkK}5LG%n`5GsC2@m8n53Or`nZuWpsAQO^yJ z*)9E2^xfL>`PwD1@Bb#JO!?`vnUb*S-6g5v ZFwFk0?2+|t+Ag4_44$rjF6*2UngEtSQNsWL literal 0 HcmV?d00001 diff --git a/ico/16x16/help-contents.svg b/ico/16x16/help-contents.svg deleted file mode 100644 index 09c1dd570..000000000 --- a/ico/16x16/help-contents.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - diff --git a/ico/16x16/help-contents.svg.png b/ico/16x16/help-contents.svg.png new file mode 100644 index 0000000000000000000000000000000000000000..8183d91da9116a1e22313de7e3330f5e72685aa3 GIT binary patch literal 226 zcmeAS@N?(olHy`uVBq!ia0vp^tRT$61|)m))t&+=mSQK*5Dp-y;YjHK@;M7UB8!1) zZh$Z&r~}U&Kt=JME{-7_ zGg%KV6g=d>;Ck?T{w0U51cM_Nj?Z;=5 - - - - - diff --git a/ico/16x16/help-donate.svg.png b/ico/16x16/help-donate.svg.png new file mode 100644 index 0000000000000000000000000000000000000000..aad0dc9de5cd1e49adfc604c07b1aeee66c708c5 GIT binary patch literal 207 zcmeAS@N?(olHy`uVBq!ia0vp^%s|Y_!3HE73d0rwDVAa<&kznEsNqQI0P;BtJR*yM zYHolqBd3(sUZ9|4iEBhjaDG}zd16s2LwR|*US?i)adKios$PCk`s{Z$Qb0vMo-U3d z95Wdm8TS2W^!4?%0gC1P`}c1?6C)#I;Q#;sPksIRbuY8Jy83URObi!f>gTe~DWM4f_;)s2 literal 0 HcmV?d00001 diff --git a/ico/16x16/kdenlive-show-video.svg b/ico/16x16/kdenlive-show-video.svg deleted file mode 100644 index 07d7db594..000000000 --- a/ico/16x16/kdenlive-show-video.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - diff --git a/ico/16x16/kdenlive-show-video.svg.png b/ico/16x16/kdenlive-show-video.svg.png new file mode 100644 index 0000000000000000000000000000000000000000..2f80f512b46d1af41221bea4d7600f9b2d0a618c GIT binary patch literal 220 zcmeAS@N?(olHy`uVBq!ia0vp^tRT$61|)m))t&+=mSQK*5Dp-y;YjHK@;M7UB8!1) zZh$Z&r~}U&Kt++BE{-7_ zGg%LAUhsbejj6L|DOe^e}I-Sc)I$z JtaD0e0s#L=OECZd literal 0 HcmV?d00001 diff --git a/qelectrotech.qrc b/qelectrotech.qrc index 98020e2d4..95ccc8b33 100644 --- a/qelectrotech.qrc +++ b/qelectrotech.qrc @@ -249,10 +249,10 @@ ico/24x16/br.png ico/22x22/grid.png ico/22x22/terminalstrip.png - ico/16x16/help-contents.svg - ico/16x16/help-donate.svg - ico/16x16/edit-download.svg - ico/16x16/kdenlive-show-video.svg + ico/16x16/help-contents.svg.png + ico/16x16/help-donate.svg.png + ico/16x16/edit-download.svg.png + ico/16x16/kdenlive-show-video.svg.png ico/22x22/format-text-subscript.svg.png ico/22x22/format-text-superscript.svg.png diff --git a/sources/qeticons.cpp b/sources/qeticons.cpp index e78f44693..c6081a8a5 100644 --- a/sources/qeticons.cpp +++ b/sources/qeticons.cpp @@ -293,22 +293,22 @@ void QET::Icons::initIcons() { EditRename .addFile(":/ico/22x22/edit-rename.png"); EditSelectAll .addFile(":/ico/16x16/edit-select-all.png"); EditSelectAll .addFile(":/ico/22x22/edit-select-all.png"); - EditTableCellMerge .addFile(":ico/16x16/edit-table-cell-merge.png"); - EditTableCellMerge .addFile(":ico/22x22/edit-table-cell-merge.png"); - EditTableCellSplit .addFile(":ico/16x16/edit-table-cell-split.png"); - EditTableCellSplit .addFile(":ico/22x22/edit-table-cell-split.png"); - EditTableDeleteColumn .addFile(":ico/16x16/edit-table-delete-column.png"); - EditTableDeleteColumn .addFile(":ico/22x22/edit-table-delete-column.png"); - EditTableDeleteRow .addFile(":ico/16x16/edit-table-delete-row.png"); - EditTableDeleteRow .addFile(":ico/22x22/edit-table-delete-row.png"); - EditTableInsertColumnLeft .addFile(":ico/16x16/edit-table-insert-column-left.png"); - EditTableInsertColumnLeft .addFile(":ico/22x22/edit-table-insert-column-left.png"); - EditTableInsertColumnRight.addFile(":ico/16x16/edit-table-insert-column-right.png"); - EditTableInsertColumnRight.addFile(":ico/22x22/edit-table-insert-column-right.png"); - EditTableInsertRowAbove .addFile(":ico/16x16/edit-table-insert-row-above.png"); - EditTableInsertRowAbove .addFile(":ico/22x22/edit-table-insert-row-above.png"); - EditTableInsertRowUnder .addFile(":ico/16x16/edit-table-insert-row-under.png"); - EditTableInsertRowUnder .addFile(":ico/22x22/edit-table-insert-row-under.png"); + EditTableCellMerge .addFile(":/ico/16x16/edit-table-cell-merge.png"); + EditTableCellMerge .addFile(":/ico/22x22/edit-table-cell-merge.png"); + EditTableCellSplit .addFile(":/ico/16x16/edit-table-cell-split.png"); + EditTableCellSplit .addFile(":/ico/22x22/edit-table-cell-split.png"); + EditTableDeleteColumn .addFile(":/ico/16x16/edit-table-delete-column.png"); + EditTableDeleteColumn .addFile(":/ico/22x22/edit-table-delete-column.png"); + EditTableDeleteRow .addFile(":/ico/16x16/edit-table-delete-row.png"); + EditTableDeleteRow .addFile(":/ico/22x22/edit-table-delete-row.png"); + EditTableInsertColumnLeft .addFile(":/ico/16x16/edit-table-insert-column-left.png"); + EditTableInsertColumnLeft .addFile(":/ico/22x22/edit-table-insert-column-left.png"); + EditTableInsertColumnRight.addFile(":/ico/16x16/edit-table-insert-column-right.png"); + EditTableInsertColumnRight.addFile(":/ico/22x22/edit-table-insert-column-right.png"); + EditTableInsertRowAbove .addFile(":/ico/16x16/edit-table-insert-row-above.png"); + EditTableInsertRowAbove .addFile(":/ico/22x22/edit-table-insert-row-above.png"); + EditTableInsertRowUnder .addFile(":/ico/16x16/edit-table-insert-row-under.png"); + EditTableInsertRowUnder .addFile(":/ico/22x22/edit-table-insert-row-under.png"); if (rtl) { EditUndo.addPixmap(QPixmap(":/ico/16x16/edit-undo.png").transformed(reverse)); EditUndo.addPixmap(QPixmap(":/ico/22x22/edit-undo.png").transformed(reverse)); @@ -384,12 +384,12 @@ void QET::Icons::initIcons() { ProjectFile .addFile(":/ico/oxygen-icons/16x16/mimetypes/application-x-qet-project.png"); ProjectFile .addFile(":/ico/oxygen-icons/22x22/mimetypes/application-x-qet-project.png"); ProjectFile .addFile(":/ico/oxygen-icons/32x32/mimetypes/application-x-qet-project.png"); - QETDonate .addFile(":/ico/16x16/help-donate.svg"); - QETDownload .addFile(":/ico/16x16/edit-download.svg"); + QETDonate .addFile(":/ico/16x16/help-donate.svg.png"); + QETDownload .addFile(":/ico/16x16/edit-download.svg.png"); QETIcon .addFile(":/ico/256x256/qelectrotech.png"); ProjectFileGP .addFile(":/ico/16x16/project-WH.png"); QETLogo .addFile(":/ico/16x16/qet.png"); - QETManual .addFile(":/ico/16x16/help-contents.svg"); + QETManual .addFile(":/ico/16x16/help-contents.svg.png"); QETLogo .addFile(":/ico/256x256/qet.png"); QETOxygenLogo .addFile(":/ico/oxygen-icons/128x128/apps/qelectrotech.png"); QETOxygenLogo .addFile(":/ico/oxygen-icons/16x16/apps/qelectrotech.png"); @@ -398,7 +398,7 @@ void QET::Icons::initIcons() { QETOxygenLogo .addFile(":/ico/oxygen-icons/32x32/apps/qelectrotech.png"); QETOxygenLogo .addFile(":/ico/oxygen-icons/48x48/apps/qelectrotech.png"); QETOxygenLogo .addFile(":/ico/oxygen-icons/64x64/apps/qelectrotech.png"); - QETVideo .addFile(":/ico/16x16/kdenlive-show-video.svg"); + QETVideo .addFile(":/ico/16x16/kdenlive-show-video.svg.png"); QtLogo .addFile(":/ico/32x32/qt.png"); Raise .addFile(":/ico/22x22/raise.png"); Remove .addFile(":/ico/16x16/list-remove.png");