diff --git a/resources/kImageAnnotator_resources.qrc b/resources/kImageAnnotator_resources.qrc index 9acd1ec4..b38fdb22 100644 --- a/resources/kImageAnnotator_resources.qrc +++ b/resources/kImageAnnotator_resources.qrc @@ -25,7 +25,6 @@ icons/dark/fillType_borderAndNoFill.svg icons/dark/fillType_noBorderAndNoFill.svg - icons/light/arrow.svg icons/light/doubleArrow.svg @@ -51,24 +50,22 @@ icons/light/fillType_borderAndNoFill.svg icons/light/fillType_noBorderAndNoFill.svg - - stickers/face_blowing_a_kiss.svg - stickers/face_savoring_food.svg - stickers/grinning_face_with_big_eyes.svg - stickers/grinning_face_with_smiling_eyes.svg - stickers/grinning_face_with_sweat.svg - stickers/grinning_squinting_face.svg - stickers/hushed_face.svg - stickers/nerd_face.svg - stickers/neutral_face.svg - stickers/smiling_face_with_heart_eyes.svg - stickers/smiling_face_with_hearts.svg - stickers/confused_face.svg - stickers/face_with_symbols_on_mouth.svg - stickers/pouting_face.svg - stickers/smiling_face_with_sunglasses.svg - stickers/check_mark.svg - stickers/cross_mark.svg + stickers/heart_eyes.svg + stickers/sunglasses.svg + stickers/stuck_out_tongue.svg + stickers/stuck_out_tongue_closed_eyes.svg + stickers/sweat_smile.svg + stickers/grimacing.svg + stickers/rage.svg + stickers/astonished.svg + stickers/hushed.svg + stickers/laughing.svg + stickers/kissing_heart.svg + stickers/pushpin.svg + stickers/hearts.svg + stickers/ballot_box_with_check.svg + stickers/negative_squared_cross_mark.svg + stickers/bulb.svg diff --git a/resources/stickers/astonished.svg b/resources/stickers/astonished.svg new file mode 100644 index 00000000..e2793217 --- /dev/null +++ b/resources/stickers/astonished.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/stickers/ballot_box_with_check.svg b/resources/stickers/ballot_box_with_check.svg new file mode 100644 index 00000000..904d0fc8 --- /dev/null +++ b/resources/stickers/ballot_box_with_check.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/stickers/bulb.svg b/resources/stickers/bulb.svg new file mode 100644 index 00000000..88b62e38 --- /dev/null +++ b/resources/stickers/bulb.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/stickers/check_mark.svg b/resources/stickers/check_mark.svg deleted file mode 100644 index 6db06782..00000000 --- a/resources/stickers/check_mark.svg +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - - diff --git a/resources/stickers/confused_face.svg b/resources/stickers/confused_face.svg deleted file mode 100644 index f999b25a..00000000 --- a/resources/stickers/confused_face.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/resources/stickers/cross_mark.svg b/resources/stickers/cross_mark.svg deleted file mode 100644 index 3f85bd5a..00000000 --- a/resources/stickers/cross_mark.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/resources/stickers/face_blowing_a_kiss.svg b/resources/stickers/face_blowing_a_kiss.svg deleted file mode 100644 index 7e5f5048..00000000 --- a/resources/stickers/face_blowing_a_kiss.svg +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/resources/stickers/face_savoring_food.svg b/resources/stickers/face_savoring_food.svg deleted file mode 100644 index a117e1c3..00000000 --- a/resources/stickers/face_savoring_food.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/resources/stickers/face_with_symbols_on_mouth.svg b/resources/stickers/face_with_symbols_on_mouth.svg deleted file mode 100644 index e5b143cd..00000000 --- a/resources/stickers/face_with_symbols_on_mouth.svg +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/resources/stickers/grimacing.svg b/resources/stickers/grimacing.svg new file mode 100644 index 00000000..3fdb9bf2 --- /dev/null +++ b/resources/stickers/grimacing.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/stickers/grinning_face_with_big_eyes.svg b/resources/stickers/grinning_face_with_big_eyes.svg deleted file mode 100644 index 9692c20f..00000000 --- a/resources/stickers/grinning_face_with_big_eyes.svg +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/resources/stickers/grinning_face_with_smiling_eyes.svg b/resources/stickers/grinning_face_with_smiling_eyes.svg deleted file mode 100644 index 4863e22f..00000000 --- a/resources/stickers/grinning_face_with_smiling_eyes.svg +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/resources/stickers/grinning_face_with_sweat.svg b/resources/stickers/grinning_face_with_sweat.svg deleted file mode 100644 index 8b8f9d09..00000000 --- a/resources/stickers/grinning_face_with_sweat.svg +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/resources/stickers/grinning_squinting_face.svg b/resources/stickers/grinning_squinting_face.svg deleted file mode 100644 index 0f76d28e..00000000 --- a/resources/stickers/grinning_squinting_face.svg +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/resources/stickers/heart_eyes.svg b/resources/stickers/heart_eyes.svg new file mode 100644 index 00000000..18b1867c --- /dev/null +++ b/resources/stickers/heart_eyes.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/stickers/hearts.svg b/resources/stickers/hearts.svg new file mode 100644 index 00000000..67f49c3d --- /dev/null +++ b/resources/stickers/hearts.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/stickers/hushed.svg b/resources/stickers/hushed.svg new file mode 100644 index 00000000..579bf480 --- /dev/null +++ b/resources/stickers/hushed.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/stickers/hushed_face.svg b/resources/stickers/hushed_face.svg deleted file mode 100644 index a5b94e45..00000000 --- a/resources/stickers/hushed_face.svg +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/resources/stickers/kissing_heart.svg b/resources/stickers/kissing_heart.svg new file mode 100644 index 00000000..5e00b8e4 --- /dev/null +++ b/resources/stickers/kissing_heart.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/stickers/laughing.svg b/resources/stickers/laughing.svg new file mode 100644 index 00000000..e82c405a --- /dev/null +++ b/resources/stickers/laughing.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/stickers/negative_squared_cross_mark.svg b/resources/stickers/negative_squared_cross_mark.svg new file mode 100644 index 00000000..814a6e44 --- /dev/null +++ b/resources/stickers/negative_squared_cross_mark.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/stickers/nerd_face.svg b/resources/stickers/nerd_face.svg deleted file mode 100644 index 79ead351..00000000 --- a/resources/stickers/nerd_face.svg +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/resources/stickers/neutral_face.svg b/resources/stickers/neutral_face.svg deleted file mode 100644 index 3f4153d1..00000000 --- a/resources/stickers/neutral_face.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/resources/stickers/pouting_face.svg b/resources/stickers/pouting_face.svg deleted file mode 100644 index 68c4633f..00000000 --- a/resources/stickers/pouting_face.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/resources/stickers/pushpin.svg b/resources/stickers/pushpin.svg new file mode 100644 index 00000000..2ab6da3e --- /dev/null +++ b/resources/stickers/pushpin.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/stickers/rage.svg b/resources/stickers/rage.svg new file mode 100644 index 00000000..f370594b --- /dev/null +++ b/resources/stickers/rage.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/stickers/smiling_face_with_heart_eyes.svg b/resources/stickers/smiling_face_with_heart_eyes.svg deleted file mode 100644 index f4e567ea..00000000 --- a/resources/stickers/smiling_face_with_heart_eyes.svg +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/resources/stickers/smiling_face_with_hearts.svg b/resources/stickers/smiling_face_with_hearts.svg deleted file mode 100644 index be797951..00000000 --- a/resources/stickers/smiling_face_with_hearts.svg +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/resources/stickers/smiling_face_with_sunglasses.svg b/resources/stickers/smiling_face_with_sunglasses.svg deleted file mode 100644 index de72aad7..00000000 --- a/resources/stickers/smiling_face_with_sunglasses.svg +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/resources/stickers/stuck_out_tongue.svg b/resources/stickers/stuck_out_tongue.svg new file mode 100644 index 00000000..e249672d --- /dev/null +++ b/resources/stickers/stuck_out_tongue.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/stickers/stuck_out_tongue_closed_eyes.svg b/resources/stickers/stuck_out_tongue_closed_eyes.svg new file mode 100644 index 00000000..f6b04039 --- /dev/null +++ b/resources/stickers/stuck_out_tongue_closed_eyes.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/stickers/sunglasses.svg b/resources/stickers/sunglasses.svg new file mode 100644 index 00000000..fff644a8 --- /dev/null +++ b/resources/stickers/sunglasses.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/stickers/sweat_smile.svg b/resources/stickers/sweat_smile.svg new file mode 100644 index 00000000..de6eb5de --- /dev/null +++ b/resources/stickers/sweat_smile.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/widgets/StickerPicker.cpp b/src/widgets/StickerPicker.cpp index f905eaab..a36e09c9 100644 --- a/src/widgets/StickerPicker.cpp +++ b/src/widgets/StickerPicker.cpp @@ -71,23 +71,23 @@ void StickerPicker::init(const QIcon &icon, const QString &tooltip) void StickerPicker::addDefaultStickers() { - QStringList defaultStickers{ QStringLiteral("face_blowing_a_kiss"), - QStringLiteral("face_savoring_food"), - QStringLiteral("grinning_face_with_big_eyes"), - QStringLiteral("grinning_face_with_smiling_eyes"), - QStringLiteral("grinning_face_with_sweat"), - QStringLiteral("grinning_squinting_face"), - QStringLiteral("hushed_face"), - QStringLiteral("nerd_face"), - QStringLiteral("neutral_face"), - QStringLiteral("smiling_face_with_heart_eyes"), - QStringLiteral("smiling_face_with_hearts"), - QStringLiteral("confused_face"), - QStringLiteral("face_with_symbols_on_mouth"), - QStringLiteral("pouting_face"), - QStringLiteral("smiling_face_with_sunglasses"), - QStringLiteral("check_mark"), - QStringLiteral("cross_mark") + QStringList defaultStickers{ QStringLiteral("heart_eyes"), + QStringLiteral("sunglasses"), + QStringLiteral("stuck_out_tongue"), + QStringLiteral("stuck_out_tongue_closed_eyes"), + QStringLiteral("sweat_smile"), + QStringLiteral("grimacing"), + QStringLiteral("rage"), + QStringLiteral("astonished"), + QStringLiteral("hushed"), + QStringLiteral("laughing"), + QStringLiteral("kissing_heart"), + QStringLiteral("pushpin"), + QStringLiteral("hearts"), + QStringLiteral("ballot_box_with_check"), + QStringLiteral("negative_squared_cross_mark"), + QStringLiteral("bulb") + }; for(const auto& sticker : defaultStickers) { diff --git a/tests/widgets/StickerPickerTest.cpp b/tests/widgets/StickerPickerTest.cpp index c1da3822..65b897db 100644 --- a/tests/widgets/StickerPickerTest.cpp +++ b/tests/widgets/StickerPickerTest.cpp @@ -23,7 +23,7 @@ void StickerPickerTest::TestSelectSticker_Should_EmitSignal_When_StickerChanged( { StickerPicker stickerPicker(QIcon(), QStringLiteral("test")); QSignalSpy spy(&stickerPicker, &StickerPicker::stickerSelected); - auto expectedStickerPath = QStringLiteral(":/stickers/nerd_face.svg"); + auto expectedStickerPath = QStringLiteral(":/stickers/rage.svg"); stickerPicker.setSticker(expectedStickerPath);