Mercurial > minori
changeset 309:bf89fbf7ff38
misc: remove copyrighted app icon
if someone comes up with a good icon, please be my guest
| author | Paper <paper@paper.us.eu.org> |
|---|---|
| date | Tue, 11 Jun 2024 04:24:59 -0400 |
| parents | da2c5a8ff306 |
| children | a4257370de16 |
| files | .builds/linux.yml Makefile.am dep/animone/src/fd/proc.cc rc/icons/icons.qrc rc/sys/linux/Minori.desktop rc/sys/osx/Minori.app/Contents/Info.plist src/gui/window.cc |
| diffstat | 7 files changed, 5 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/.builds/linux.yml Tue Jun 11 04:24:19 2024 -0400 +++ b/.builds/linux.yml Tue Jun 11 04:24:59 2024 -0400 @@ -30,12 +30,11 @@ # resources mkdir -p rc cp ../rc/sys/linux/Minori.desktop rc/Minori.desktop - cp ../rc/sys/linux/Minori.png rc/Minori.png # use linuxdeploy to make an appimage wget -O linuxdeploy "https://github.com/linuxdeploy/linuxdeploy/releases/download/1-alpha-20231026-1/linuxdeploy-x86_64.AppImage" chmod +x linuxdeploy - LD_LIBRARY_PATH=/usr/local/lib ./linuxdeploy --appdir Minori --executable $(which minori) -d rc/Minori.desktop -i rc/Minori.png --output appimage + LD_LIBRARY_PATH=/usr/local/lib ./linuxdeploy --appdir Minori --executable $(which minori) -d rc/Minori.desktop --output appimage artifacts: - minori/build/Minori-x86_64.AppImage triggers:
--- a/Makefile.am Tue Jun 11 04:24:19 2024 -0400 +++ b/Makefile.am Tue Jun 11 04:24:59 2024 -0400 @@ -54,8 +54,7 @@ $(top_srcdir)/rc/icons/24x24/globe.png \ $(top_srcdir)/rc/icons/24x24/inbox-film.png \ $(top_srcdir)/rc/icons/24x24/megaphone.png \ - $(top_srcdir)/rc/icons/24x24/question.png \ - $(top_srcdir)/rc/icons/favicon.png + $(top_srcdir)/rc/icons/24x24/question.png minori_linux_rc = \ $(top_srcdir)/rc/sys/linux/Minori.desktop \ @@ -70,7 +69,6 @@ $(top_srcdir)/rc/sys/win32/dark/dark.qrc \ $(top_srcdir)/rc/sys/win32/dark/dark.qss \ $(top_srcdir)/rc/sys/win32/favicon.ico \ - $(top_srcdir)/rc/sys/win32/resource.rc \ $(top_srcdir)/rc/sys/win32/version.rc minori_scripts = \
--- a/dep/animone/src/fd/proc.cc Tue Jun 11 04:24:19 2024 -0400 +++ b/dep/animone/src/fd/proc.cc Tue Jun 11 04:24:59 2024 -0400 @@ -6,6 +6,7 @@ #include <fstream> #include <sstream> #include <string> +#include <algorithm> #include <fcntl.h> #include <sys/stat.h> @@ -80,7 +81,7 @@ if (!util::ReadFile(path, result)) return false; - result.erase(std::remove(result.begin(), result.end(), '\n'), result.end()); + result.erase(std::remove(result.begin(), result.end(), '\n'), result.cend()); return true; }
--- a/rc/icons/icons.qrc Tue Jun 11 04:24:19 2024 -0400 +++ b/rc/icons/icons.qrc Tue Jun 11 04:24:59 2024 -0400 @@ -1,6 +1,5 @@ <!DOCTYPE rcc><RCC version="1.0"> <qresource prefix="icons/"> - <file>favicon.png</file> <file>16x16/arrow-circle-315.png</file> <file>16x16/category.png</file> <file>16x16/calendar.png</file>
--- a/rc/sys/linux/Minori.desktop Tue Jun 11 04:24:19 2024 -0400 +++ b/rc/sys/linux/Minori.desktop Tue Jun 11 04:24:59 2024 -0400 @@ -15,10 +15,7 @@ # Executable name Exec=minori -# Favicon -Icon=Minori - # Describes whether this application needs to be run in a terminal or not Terminal=false -Categories=Utility;Qt; \ No newline at end of file +Categories=Utility;Qt;
--- a/rc/sys/osx/Minori.app/Contents/Info.plist Tue Jun 11 04:24:19 2024 -0400 +++ b/rc/sys/osx/Minori.app/Contents/Info.plist Tue Jun 11 04:24:59 2024 -0400 @@ -10,8 +10,6 @@ <string>Copyright</string> <key>NSHumanReadableCopyright</key> <string>Copyright</string> - <key>CFBundleIconFile</key> - <string>Minori.icns</string> <key>CFBundleIdentifier</key> <string>org.eu.us.paper.Minori</string> <key>CFBundleInfoDictionaryVersion</key>
--- a/src/gui/window.cc Tue Jun 11 04:24:19 2024 -0400 +++ b/src/gui/window.cc Tue Jun 11 04:24:59 2024 -0400 @@ -77,8 +77,6 @@ MainWindow::MainWindow(QWidget* parent) : QMainWindow(parent) , async_synchronize_thread_(nullptr, nullptr) { - setWindowIcon(QIcon(":/icons/favicon.png")); - sidebar_.setFixedWidth(128); sidebar_.setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding);