[niepce] Added original icon
- From: Hubert Figuière <hub src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [niepce] Added original icon
- Date: Wed, 1 Jan 2020 18:00:28 +0000 (UTC)
commit b450ebe80a8d6807633cef7d8b0e46ce9bf96eac
Author: Hubert Figuière <hub figuiere net>
Date: Mon Dec 30 23:23:05 2019 -0500
Added original icon
- It's ugly though
data/org.gnome.Niepce.desktop.in | 2 +-
data/org.gnome.Niepce.svg | 147 ++++++++++++++++++++++++++++++++++++
src/fwk/toolkit/application.cpp | 4 +-
src/niepce/gresource.xml | 1 +
src/niepce/ui/niepceapplication.cpp | 4 +-
src/niepce/ui/niepcewindow.cpp | 3 +-
6 files changed, 156 insertions(+), 5 deletions(-)
---
diff --git a/data/org.gnome.Niepce.desktop.in b/data/org.gnome.Niepce.desktop.in
index 4289496..0aee19b 100644
--- a/data/org.gnome.Niepce.desktop.in
+++ b/data/org.gnome.Niepce.desktop.in
@@ -5,7 +5,7 @@ Comment=Manage and edit your photos
Keywords=photo;
Exec=niepce %u
# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-Icon=niepce
+Icon=org.gnome.Niepce
StartupNotify=true
Terminal=false
Type=Application
diff --git a/data/org.gnome.Niepce.svg b/data/org.gnome.Niepce.svg
new file mode 100644
index 0000000..feb934e
--- /dev/null
+++ b/data/org.gnome.Niepce.svg
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://creativecommons.org/ns#";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:xlink="http://www.w3.org/1999/xlink";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ sodipodi:docname="Niepce-icon.svg"
+ inkscape:version="1.0beta2 (2b71d25d45, 2019-12-03)"
+ id="svg8"
+ version="1.1"
+ viewBox="0 0 97.022499 97.022499"
+ height="97.022499mm"
+ width="97.022499mm">
+ <defs
+ id="defs2">
+ <linearGradient
+ id="linearGradient1304"
+ inkscape:collect="always">
+ <stop
+ id="stop1300"
+ offset="0"
+ style="stop-color:#000000;stop-opacity:1;" />
+ <stop
+ id="stop1302"
+ offset="1"
+ style="stop-color:#000000;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ gradientTransform="translate(7.6293946e-6)"
+ gradientUnits="userSpaceOnUse"
+ y2="107.06963"
+ x2="92.984558"
+ y1="78.825714"
+ x1="62.797028"
+ id="linearGradient1306"
+ xlink:href="#linearGradient1304"
+ inkscape:collect="always" />
+ <linearGradient
+ gradientTransform="matrix(0.98399507,0,0,2.0494209,1.6056295,-64.318915)"
+ gradientUnits="userSpaceOnUse"
+ y2="64.806305"
+ x2="93.24836"
+ y1="64.806305"
+ x1="107.39354"
+ id="linearGradient1363"
+ xlink:href="#linearGradient1304"
+ inkscape:collect="always" />
+ </defs>
+ <sodipodi:namedview
+ fit-margin-bottom="0"
+ fit-margin-right="0"
+ fit-margin-left="0"
+ fit-margin-top="0"
+ inkscape:window-maximized="1"
+ inkscape:window-y="0"
+ inkscape:window-x="0"
+ inkscape:window-height="836"
+ inkscape:window-width="1600"
+ showgrid="false"
+ inkscape:document-rotation="0"
+ inkscape:current-layer="layer1"
+ inkscape:document-units="mm"
+ inkscape:cy="105.05682"
+ inkscape:cx="54.743873"
+ inkscape:zoom="0.98994949"
+ inkscape:pageshadow="2"
+ inkscape:pageopacity="0.0"
+ borderopacity="1.0"
+ bordercolor="#666666"
+ pagecolor="#ffffff"
+ id="base" />
+ <metadata
+ id="metadata5">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ transform="translate(-26.001617,-41.768429)"
+ id="layer1"
+ inkscape:groupmode="layer"
+ inkscape:label="Layer 1">
+ <rect
+ ry="24.141954"
+ rx="24.141954"
+ y="43.268429"
+ x="27.501617"
+ height="94.022499"
+ width="94.022499"
+ id="rect1279"
+
style="fill:none;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <rect
+
style="fill:none;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect1279-3"
+ width="83.145836"
+ height="82.523605"
+ x="32.939949"
+ y="49.017876"
+ rx="21.34918"
+ ry="21.189409" />
+ <circle
+ r="18.398792"
+ cy="90.279678"
+ cx="74.512863"
+ id="path1298"
+
style="fill:url(#linearGradient1306);fill-opacity:1;stroke:#000000;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
/>
+ <text
+ id="text1328"
+ y="96.868172"
+ x="67.687309"
+
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:19.7556px;line-height:1.25;font-family:Caladea;-inkscape-font-specification:'Caladea
Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.264583"
+ xml:space="preserve"><tspan
+
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:19.7556px;font-family:Caladea;-inkscape-font-specification:'Caladea
Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#ffffff;stroke-width:0.264583"
+ y="96.868172"
+ x="67.687309"
+ id="tspan1326"
+ sodipodi:role="line">N</tspan></text>
+ <rect
+ ry="0"
+ rx="0"
+ y="56.758652"
+ x="93.361557"
+ height="11.737828"
+ width="13.91879"
+ id="rect1332"
+
style="fill:url(#linearGradient1363);fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
/>
+ <rect
+
style="fill:none;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect1332-0"
+ width="14.145183"
+ height="5.7273884"
+ x="40.727154"
+ y="59.078918"
+ rx="0"
+ ry="0" />
+ </g>
+</svg>
diff --git a/src/fwk/toolkit/application.cpp b/src/fwk/toolkit/application.cpp
index c564c3a..bb06134 100644
--- a/src/fwk/toolkit/application.cpp
+++ b/src/fwk/toolkit/application.cpp
@@ -1,7 +1,7 @@
/*
* niepce - framework/application.cpp
*
- * Copyright (C) 2007-2018 Hubert Figuiere
+ * Copyright (C) 2007-2019 Hubert Figuière
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -18,6 +18,7 @@
*/
#include <glibmm/i18n.h>
+#include <glibmm/miscutils.h>
#include <gtkmm/main.h>
#include <gtkmm/aboutdialog.h>
#include <gtkmm/settings.h>
@@ -39,6 +40,7 @@ Application::Application(int & argc, char** &argv, const char* app_id,
, m_module_manager(new ModuleManager())
, m_gtkapp(Gtk::Application::create(argc, argv, app_id))
{
+ Glib::set_prgname(app_id);
m_gtkapp->signal_startup().connect(
sigc::mem_fun(*this, &Application::on_startup));
getIconTheme()->add_resource_path("/org/gnome/Niepce");
diff --git a/src/niepce/gresource.xml b/src/niepce/gresource.xml
index b7670f9..b493a19 100644
--- a/src/niepce/gresource.xml
+++ b/src/niepce/gresource.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<gresources>
<gresource prefix="/org/gnome/Niepce">
+ <file alias="/scalable/apps/org.gnome.Niepce.svg">data/org.gnome.Niepce.svg</file>
<file alias="/pixmaps/niepce-set-star.png">data/icons/niepce-set-star.png</file>
<file alias="/pixmaps/niepce-unset-star.png">data/icons/niepce-unset-star.png</file>
<file alias="/pixmaps/niepce-missing.png">data/icons/niepce-missing.png</file>
diff --git a/src/niepce/ui/niepceapplication.cpp b/src/niepce/ui/niepceapplication.cpp
index 6989106..822551c 100644
--- a/src/niepce/ui/niepceapplication.cpp
+++ b/src/niepce/ui/niepceapplication.cpp
@@ -1,7 +1,7 @@
/*
* niepce - ui/niepceapplication.cpp
*
- * Copyright (C) 2007-2015 Hubert Figuiere
+ * Copyright (C) 2007-2019 Hubert Figuière
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -74,7 +74,7 @@ void NiepceApplication::on_about()
// dlg.set_name("Niepce");
dlg.set_program_name("Niepce Digital");
dlg.set_version(VERSION);
- dlg.set_logo_icon_name("camera-photo");
+ dlg.set_logo_icon_name("org.gnome.Niepce");
dlg.set_license_type(Gtk::LICENSE_GPL_3_0);
dlg.set_comments(Glib::ustring(_("A digital photo application.\n\n"
"Build options: ")) +
diff --git a/src/niepce/ui/niepcewindow.cpp b/src/niepce/ui/niepcewindow.cpp
index c20bb24..91d4d5e 100644
--- a/src/niepce/ui/niepcewindow.cpp
+++ b/src/niepce/ui/niepcewindow.cpp
@@ -191,8 +191,9 @@ NiepceWindow::buildWidget()
m_notifcenter = niepce::NotificationCenter::make(reinterpret_cast<uint64_t>(this));
- Glib::ustring name("camera-photo");
+ Glib::ustring name("org.gnome.Niepce");
set_icon_from_theme(name);
+ win.set_icon_name(name);
m_notifcenter->signal_lib_notification.connect(
sigc::mem_fun(*this, &NiepceWindow::on_lib_notification));
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
