diff --git a/cropeditor/cropscene.cpp b/cropeditor/cropscene.cpp index 73ed969..49e5084 100644 --- a/cropeditor/cropscene.cpp +++ b/cropeditor/cropscene.cpp @@ -35,19 +35,19 @@ CropScene::CropScene(QObject *parent, QPixmap pixmap) static_cast(settings::settings().value("brushStyle", static_cast(Qt::SolidPattern)).toInt())); menu = new QMenuBar; - addDrawingAction(menu, "Free draw", ":/icons/pencil.svg", [] { return new PathItem; }); + addDrawingAction(menu, "Free draw", ":/icons/pencil.png", [] { return new PathItem; }); addDrawingAction(menu, "Blur", ":/icons/blur.png", [] { return new BlurItem; }); - addDrawingAction(menu, "Straight line", ":/icons/line.svg", [] { return new LineItem; }); - addDrawingAction(menu, "Text", ":/icons/text.svg", [] { return new TextItem; }); - addDrawingAction(menu, "Rectangle", ":/icons/rectangle.svg", [] { return new RectItem; }); - addDrawingAction(menu, "Ellipse", ":/icons/circle.svg", [] { return new EllipseItem; }); - addDrawingAction(menu, "Arrow", ":/icons/arrow.svg", [] { return new ArrowItem; }); + addDrawingAction(menu, "Straight line", ":/icons/line.png", [] { return new LineItem; }); + addDrawingAction(menu, "Text", ":/icons/text.png", [] { return new TextItem; }); + addDrawingAction(menu, "Rectangle", ":/icons/rectangle.png", [] { return new RectItem; }); + addDrawingAction(menu, "Ellipse", ":/icons/circle.png", [] { return new EllipseItem; }); + addDrawingAction(menu, "Arrow", ":/icons/arrow.png", [] { return new ArrowItem; }); menu->addSeparator(); - addDrawingAction(menu, "Eraser", ":/icons/erase.svg", [] { return new EraserItem; }); + addDrawingAction(menu, "Eraser", ":/icons/erase.png", [] { return new EraserItem; }); QAction *clear = menu->addAction(""); clear->setToolTip("Clear all drawing"); - clear->setIcon(QIcon(":/icons/delete.svg")); + clear->setIcon(QIcon(":/icons/delete.png")); connect(clear, &QAction::triggered, [&] { auto its = items(); for (auto i : its) { @@ -60,12 +60,12 @@ CropScene::CropScene(QObject *parent, QPixmap pixmap) } }); - addDrawingAction(menu, "Crop", ":/icons/crop.svg", [] { return nullptr; }); + addDrawingAction(menu, "Crop", ":/icons/crop.png", [] { return nullptr; }); menu->addSeparator(); QAction *settings = menu->addAction(""); settings->setToolTip("Settings"); - settings->setIcon(QIcon(":/icons/settings.svg")); + settings->setIcon(QIcon(":/icons/settings.png")); connect(settings, &QAction::triggered, [&] { hide(); BrushPenSelection(this).exec(); @@ -76,20 +76,20 @@ CropScene::CropScene(QObject *parent, QPixmap pixmap) display->setDisabled(true); QAction *fonts = menu->addAction(""); - fonts->setIcon(QIcon(":/icons/fontsettings.svg")); + fonts->setIcon(QIcon(":/icons/fontsettings.png")); connect(fonts, &QAction::triggered, this, &CropScene::fontAsk); menu->addAction(fonts); menu->addSeparator(); QAction *confirm = menu->addAction(""); confirm->setToolTip("Confirm"); - confirm->setIcon(QIcon(":/icons/accept.svg")); + confirm->setIcon(QIcon(":/icons/accept.png")); connect(confirm, &QAction::triggered, [this] { done(true); }); menu->addAction(confirm); QAction *cancel = menu->addAction(""); cancel->setToolTip("Cancel"); - cancel->setIcon(QIcon(":/icons/cancel.svg")); + cancel->setIcon(QIcon(":/icons/cancel.png")); connect(cancel, &QAction::triggered, [this] { done(false); }); menu->addAction(cancel); diff --git a/icon.qrc b/icon.qrc index f19863d..3c1d69c 100644 --- a/icon.qrc +++ b/icon.qrc @@ -1,21 +1,21 @@ - icons/icon.png icons/icon.svg + icons/icon.png icons/icon.ico - icons/pencil.svg - icons/rectangle.svg - icons/line.svg - icons/text.svg - icons/delete.svg - icons/arrow.svg - icons/settings.svg - icons/fontsettings.svg - icons/erase.svg + icons/pencil.png + icons/rectangle.png + icons/line.png + icons/text.png + icons/delete.png + icons/arrow.png + icons/settings.png + icons/fontsettings.png + icons/erase.png icons/blur.png - icons/accept.svg - icons/cancel.svg - icons/crop.svg - icons/circle.svg + icons/accept.png + icons/cancel.png + icons/crop.png + icons/circle.png diff --git a/icons/accept.png b/icons/accept.png new file mode 100644 index 0000000..13edeba Binary files /dev/null and b/icons/accept.png differ diff --git a/icons/arrow.png b/icons/arrow.png new file mode 100644 index 0000000..8407380 Binary files /dev/null and b/icons/arrow.png differ diff --git a/icons/blur.png b/icons/blur.png index d105e5b..bcc1aa1 100644 Binary files a/icons/blur.png and b/icons/blur.png differ diff --git a/icons/cancel.png b/icons/cancel.png new file mode 100644 index 0000000..2288739 Binary files /dev/null and b/icons/cancel.png differ diff --git a/icons/circle.png b/icons/circle.png new file mode 100644 index 0000000..460a0b7 Binary files /dev/null and b/icons/circle.png differ diff --git a/icons/crop.png b/icons/crop.png new file mode 100644 index 0000000..9a08c61 Binary files /dev/null and b/icons/crop.png differ diff --git a/icons/delete.png b/icons/delete.png new file mode 100644 index 0000000..451d62d Binary files /dev/null and b/icons/delete.png differ diff --git a/icons/erase.png b/icons/erase.png new file mode 100644 index 0000000..010b805 Binary files /dev/null and b/icons/erase.png differ diff --git a/icons/fontsettings.png b/icons/fontsettings.png new file mode 100644 index 0000000..9681d64 Binary files /dev/null and b/icons/fontsettings.png differ diff --git a/icons/icon.png b/icons/icon.png index cc3b7fb..8667c3f 100644 Binary files a/icons/icon.png and b/icons/icon.png differ diff --git a/icons/line.png b/icons/line.png new file mode 100644 index 0000000..f77ffc8 Binary files /dev/null and b/icons/line.png differ diff --git a/icons/pencil.png b/icons/pencil.png new file mode 100644 index 0000000..6d13c2a Binary files /dev/null and b/icons/pencil.png differ diff --git a/icons/rectangle.png b/icons/rectangle.png new file mode 100644 index 0000000..e724024 Binary files /dev/null and b/icons/rectangle.png differ diff --git a/icons/settings.png b/icons/settings.png new file mode 100644 index 0000000..55e8173 Binary files /dev/null and b/icons/settings.png differ diff --git a/icons/text.png b/icons/text.png new file mode 100644 index 0000000..713010f Binary files /dev/null and b/icons/text.png differ