fergalmoran/flameshot
1
0
Fork 0
mirror of https://github.com/fergalmoran/flameshot.git synced 2025-12-22 09:51:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixing icon regression (#1051)

Browse Source 
* fixing icon regression

* fixed symlink
This commit is contained in:
borgmanJeremy
2020-10-12 08:40:35 -05:00
committed by GitHub
parent ac7142c4df
commit f11073bc00
13 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/graphics.qrc
View File

@@ -1,7 +1,9 @@
<RCC>
<qresource prefix="/">
<file>img/app/org.flameshot.Flameshot.svg</file>
<file>img/app/flameshot.svg</file>
<file>img/app/org.flameshot.Flameshot.png</file>
<file>img/app/flameshot.png</file>
<file>img/material/black/undo-variant.svg</file>
<file>img/material/black/text.svg</file>
<file>img/material/black/square.svg</file>

1
data/img/app/flameshot.png Symbolic link
View File

@@ -0,0 +1 @@
org.flameshot.Flameshot.png

1
data/img/app/flameshot.svg Symbolic link
View File

@@ -0,0 +1 @@
org.flameshot.Flameshot.svg

1
data/img/hicolor/128x128/apps/flameshot.png Symbolic link
View File

@@ -0,0 +1 @@
org.flameshot.Flameshot.png

1
data/img/hicolor/48x48/apps/flameshot.png Symbolic link
View File

@@ -0,0 +1 @@
org.flameshot.Flameshot.png

1
data/img/hicolor/scalable/apps/flameshot.svg Symbolic link
View File

@@ -0,0 +1 @@
org.flameshot.Flameshot.svg

11
src/CMakeLists.txt
View File

@@ -171,6 +171,17 @@ configure_file(${CMAKE_SOURCE_DIR}/data/img/hicolor/128x128/apps/org.flameshot.F
configure_file(${CMAKE_SOURCE_DIR}/data/img/hicolor/scalable/apps/org.flameshot.Flameshot.svg
${CMAKE_CURRENT_BINARY_DIR}/share/icons/hicolor/scalable/apps/org.flameshot.Flameshot.svg COPYONLY)
## Install icon with both names
configure_file(${CMAKE_SOURCE_DIR}/data/img/hicolor/48x48/apps/flameshot.png
${CMAKE_CURRENT_BINARY_DIR}/share/icons/hicolor/48x48/apps/flameshot.png COPYONLY)
configure_file(${CMAKE_SOURCE_DIR}/data/img/hicolor/128x128/apps/flameshot.png
${CMAKE_CURRENT_BINARY_DIR}/share/icons/hicolor/128x128/apps/flameshot.png COPYONLY)
configure_file(${CMAKE_SOURCE_DIR}/data/img/hicolor/scalable/apps/flameshot.svg
${CMAKE_CURRENT_BINARY_DIR}/share/icons/hicolor/scalable/apps/flameshot.svg COPYONLY)
# Install assets
install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/share/ DESTINATION ${CMAKE_INSTALL_DATAROOTDIR})

2
src/config/configwindow.cpp
View File

@@ -39,7 +39,7 @@ ConfigWindow::ConfigWindow(QWidget* parent)
setAttribute(Qt::WA_DeleteOnClose);
const int size = GlobalValues::buttonBaseSize() * 12;
setMinimumSize(size, size);
setWindowIcon(QIcon(":img/app/org.flameshot.Flameshot.svg"));
setWindowIcon(QIcon(":img/app/flameshot.svg"));
setWindowTitle(tr("Configuration"));
auto changedSlot = [this](QString s) {

6
src/core/controller.cpp
View File

@@ -224,8 +224,8 @@ void Controller::enableTrayIcon()
m_trayIcon = new QSystemTrayIcon();
m_trayIcon->setToolTip(QStringLiteral("Flameshot"));
m_trayIcon->setContextMenu(trayIconMenu);
QIcon trayicon = QIcon::fromTheme(
"flameshot-tray", QIcon(":img/app/org.flameshot.Flameshot.png"));
QIcon trayicon =
QIcon::fromTheme("flameshot-tray", QIcon(":img/app/flameshot.png"));
m_trayIcon->setIcon(trayicon);
auto trayIconActivated = [this](QSystemTrayIcon::ActivationReason r) {
@@ -260,7 +260,7 @@ void Controller::sendTrayNotification(const QString& text,
{
if (m_trayIcon) {
m_trayIcon->showMessage(
title, text, QIcon(":img/app/org.flameshot.Flameshot.svg"), timeout);
title, text, QIcon(":img/app/flameshot.svg"), timeout);
}
}

2
src/tools/imgur/imguruploader.cpp
View File

@@ -50,7 +50,7 @@ ImgurUploader::ImgurUploader(const QPixmap& capture, QWidget* parent)
, m_pixmap(capture)
{
setWindowTitle(tr("Upload to Imgur"));
setWindowIcon(QIcon(":img/app/org.flameshot.Flameshot.svg"));
setWindowIcon(QIcon(":img/app/flameshot.svg"));
#if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0))
QRect position = frameGeometry();

2
src/tools/launcher/applauncherwidget.cpp
View File

@@ -52,7 +52,7 @@ AppLauncherWidget::AppLauncherWidget(const QPixmap& p, QWidget* parent)
, m_pixmap(p)
{
setAttribute(Qt::WA_DeleteOnClose);
setWindowIcon(QIcon(":img/app/org.flameshot.Flameshot.svg"));
setWindowIcon(QIcon(":img/app/flameshot.svg"));
setWindowTitle(tr("Open With"));
m_keepOpen = ConfigHandler().keepOpenAppLauncherValue();

3
src/utils/screenshotsaver.cpp
View File

@@ -108,8 +108,7 @@ bool ScreenshotSaver::saveToFilesystemGUI(const QPixmap& capture)
QString msg = QObject::tr("Error trying to save as ") + savePath;
QMessageBox saveErrBox(
QMessageBox::Warning, QObject::tr("Save Error"), msg);
saveErrBox.setWindowIcon(
QIcon(":img/app/org.flameshot.Flameshot.svg"));
saveErrBox.setWindowIcon(QIcon(":img/app/flameshot.svg"));
saveErrBox.exec();
}
}

2
src/widgets/infowindow.cpp
View File

@@ -36,7 +36,7 @@ InfoWindow::InfoWindow(QWidget* parent)
: QWidget(parent)
{
setAttribute(Qt::WA_DeleteOnClose);
setWindowIcon(QIcon(":img/app/org.flameshot.Flameshot.svg"));
setWindowIcon(QIcon(":img/app/flameshot.svg"));
setWindowTitle(tr("About"));
#if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0))