Skip to content

Commit

Permalink
Change Application ID (#1076)
Browse files Browse the repository at this point in the history
* Change Application ID

* Update AppData file: Add developer_name tag
  • Loading branch information
scx authored and gunterkoenigsmann committed Jan 6, 2019
1 parent 2c9e6b3 commit d9fc869
Show file tree
Hide file tree
Showing 16 changed files with 41 additions and 39 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/COPYING")
set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${VERSION}")
set(CPACK_PACKAGE_CONTACT "The wxMaxima Team <[email protected]>")
set(CPACK_PACKAGE_SECTION "science")
set(CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/data/wxmaxima.png")
set(CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/data/io.github.wxmaxima_developers.wxMaxima.png")
set(CPACK_PACKAGE_VERSION "${VERSION}")


Expand Down
2 changes: 1 addition & 1 deletion Doxygen/Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ PROJECT_BRIEF = "A feature-rich gui for the computer algebra system max
# exceed 55 pixels and the maximum width should not exceed 200 pixels.
# Doxygen will copy the logo to the output directory.

PROJECT_LOGO = @SRCDIR@/../data/wxmaxima.png
PROJECT_LOGO = @SRCDIR@/../data/io.github.wxmaxima_developers.wxMaxima.png

# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
Expand Down
4 changes: 2 additions & 2 deletions art/readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ They were renamed to match the names of the gtk system icons they
replace.


wxMaxima icons (wxmac.icns, maximaicon.ico, wxmaxima.png) were created
wxMaxima icons (wxmac.icns, maximaicon.ico, io.github.wxmaxima_developers.wxMaxima.png) were created
by Sven Hodapp and are licensed under GPL.
wxmaxima.svg was an attempt to make a scaleable vector image that
io.github.wxmaxima_developers.wxMaxima.svg was an attempt to make a scaleable vector image that
resembles these icons by Gunter Königsmann (http://www.physikbuch.de)
and is under GPL, too.
26 changes: 13 additions & 13 deletions data/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,31 @@ if(APPLE)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.in ${CMAKE_CURRENT_BINARY_DIR}/Info.plist)
endif()

set(DATAFILES
${CMAKE_CURRENT_SOURCE_DIR}/wxmaxima.png
${CMAKE_CURRENT_SOURCE_DIR}/wxmaxima.svg)
set(DATAFILES
${CMAKE_CURRENT_SOURCE_DIR}/io.github.wxmaxima_developers.wxMaxima.png
${CMAKE_CURRENT_SOURCE_DIR}/io.github.wxmaxima_developers.wxMaxima.svg)

set(PIXMAPS
${CMAKE_CURRENT_SOURCE_DIR}/text-x-wxmathml.svg
${CMAKE_CURRENT_SOURCE_DIR}/text-x-wxmaxima-batch.svg
${CMAKE_CURRENT_SOURCE_DIR}/wxmaxima-16.xpm
${CMAKE_CURRENT_SOURCE_DIR}/wxmaxima.png
${CMAKE_CURRENT_SOURCE_DIR}/wxmaxima.svg
${CMAKE_CURRENT_SOURCE_DIR}/io.github.wxmaxima_developers.wxMaxima.png
${CMAKE_CURRENT_SOURCE_DIR}/io.github.wxmaxima_developers.wxMaxima.svg
${CMAKE_CURRENT_SOURCE_DIR}/wxmaxima-32.xpm)

if(WIN32)
add_subdirectory(fonts)
add_subdirectory(winrc)
install(FILES ${DATAFILES} DESTINATION wxMaxima/data)
else()
install(FILES ${DATAFILES} DESTINATION share/wxMaxima)
install(FILES ${PIXMAPS} DESTINATION share/pixmaps)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/wxmaxima DESTINATION share/bash-completion/completions)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/wxmaxima.1 DESTINATION share/man/man1)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/wxMaxima.appdata.xml DESTINATION share/metainfo)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/wxMaxima.desktop DESTINATION share/applications)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/x-wxmathml.xml DESTINATION share/mime/packages)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/x-wxmaxima-batch.xml DESTINATION share/mime/packages)
install(FILES ${DATAFILES} DESTINATION share/wxMaxima)
install(FILES ${PIXMAPS} DESTINATION share/pixmaps)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/wxmaxima DESTINATION share/bash-completion/completions)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/wxmaxima.1 DESTINATION share/man/man1)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/io.github.wxmaxima_developers.wxMaxima.appdata.xml DESTINATION share/metainfo)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/io.github.wxmaxima_developers.wxMaxima.desktop DESTINATION share/applications)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/x-wxmathml.xml DESTINATION share/mime/packages)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/x-wxmaxima-batch.xml DESTINATION share/mime/packages)
endif()

# allow local execution (./wxmaxima-local) from the build directory without installation
Expand Down
4 changes: 2 additions & 2 deletions data/generate_pngs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
/* SVG images are converted to PNG (using inkscape) and then converted to C using xxd */
/* This file is part of wxMaxima. */
/* Copyright (C) 2018 wxMaxima Team (https://wxMaxima-developers.github.io/wxmaxima/) */
/* Copyright (C) 2018 wxMaxima Team (https://wxMaxima-developers.github.io/wxmaxima/) */
/* 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 */
Expand All @@ -24,7 +24,7 @@
/* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
END

for i in wxmaxima.svg; do
for i in io.github.wxmaxima_developers.wxMaxima.svg; do
PNGIMAGENAME=$(basename "$i" .svg).png
echo "Converting image $i to $$PNGIMAGENAME"
inkscape "--export-png=$PNGIMAGENAME" --export-width=128 "$i"
Expand Down
6 changes: 3 additions & 3 deletions data/icon.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<component type="desktop">
<id>wxMaxima.desktop</id>
<id>io.github.wxmaxima_developers.wxMaxima</id>
<metadata_license>CC0-1.0</metadata_license>
<project_license>GPL-2.0+</project_license>
<name>wxMaxima</name>
Expand Down Expand Up @@ -42,13 +42,14 @@
<url type="bugtracker">https://github.com/wxMaxima-developers/wxmaxima/issues</url>
<url type="homepage">https://wxMaxima-developers.github.io/wxmaxima/</url>
<url type="help">https://wxmaxima-developers.github.io/wxmaxima/help.html</url>
<developer_name>wxMaxima Team</developer_name>
<kudos>
<kudo>ModernToolkit</kudo>
<kudo>HiDpiIcon</kudo>
<kudo>HighContrast</kudo>
<kudo>UserDocs</kudo>
</kudos>
<launchable type="desktop-id">wxMaxima.desktop</launchable>
<launchable type="desktop-id">io.github.wxmaxima_developers.wxMaxima.desktop</launchable>
<content_rating type="oars-1.0">
<content_attribute id="social-info">mild</content_attribute>
</content_rating>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ X-GNOME-FullName[de]=wxMaxima - GUI für Maxima
X-GNOME-FullName[ru]=wxMaxima - графический интерфейс для Maxima
X-GNOME-FullName[uk]=wxMaxima — графічний інтерфейс до Maxima
Exec=wxmaxima %f
Icon=wxmaxima
Icon=io.github.wxmaxima_developers.wxMaxima
Type=Application
Terminal=false
StartupNotify=true
Expand Down
File renamed without changes
File renamed without changes
5 changes: 3 additions & 2 deletions locales/README
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,6 @@ In order to translate wxMaxima to a new language two things have to been done:
If one of the messages contained in the wxMaxima.pot from the git repository
changes while your work is still in progress, this is no problem, neither:
msgmerge will find a solution to this.
- For Linux desktop integration additionally data/wxMaxima.desktop
additionally needs to be equipped with a translation.
- For Linux desktop integration additionally
data/io.github.wxmaxima_developers.wxMaxima.desktop needs to be equipped with
a translation.
4 changes: 2 additions & 2 deletions snap/snapcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ summary: A nightly build of wxMaxima, a gui for Maxima, a full-featured CAS.
description: wxMaxima is a quite full-featured graphical user interface for maxima.
confinement: strict
grade: stable
icon: data/wxmaxima.svg
icon: data/io.github.wxmaxima_developers.wxMaxima.svg

apps:
wxmaxima:
command: wxmaxima
# desktop: usr/share/applications/wxMaxima.desktop
# desktop: usr/share/applications/io.github.wxmaxima_developers.wxMaxima.desktop
plugs:
- network
- network-bind
Expand Down
4 changes: 2 additions & 2 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ if(APPLE)
file(GLOB RESOURCES_FILES
${CMAKE_BINARY_DIR}/data/wxmathml.lisp
${CMAKE_SOURCE_DIR}/test/testbench_simple.wxmx
${CMAKE_SOURCE_DIR}/data/wxmaxima.png
${CMAKE_SOURCE_DIR}/data/wxmaxima.svg)
${CMAKE_SOURCE_DIR}/data/io.github.wxmaxima_developers.wxMaxima.png
${CMAKE_SOURCE_DIR}/data/io.github.wxmaxima_developers.wxMaxima.svg)
file(GLOB RESOURCES_FILES_OSX
${CMAKE_SOURCE_DIR}/art/wxmac.icns
${CMAKE_SOURCE_DIR}/art/wxmac-doc.icns
Expand Down
2 changes: 1 addition & 1 deletion src/wxMaxima.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6429,7 +6429,7 @@ MyAboutDialog::MyAboutDialog(wxWindow *parent, int id, const wxString title, wxS
"<body>"
"<center>"
"<p>"
"<img src=\"%s/wxmaxima.png\">"
"<img src=\"%s/io.github.wxmaxima_developers.wxMaxima.png\">"
"</p>"
"<h1>wxMaxima</h1>"
"<p>%s</p>"
Expand Down
2 changes: 1 addition & 1 deletion src/wxMaximaIcon.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
wxIcon wxMaximaIcon()
{
wxImage img;
wxMemoryInputStream istream(wxmaxima_png,wxmaxima_png_len);
wxMemoryInputStream istream(io_github_wxmaxima_developers_wxMaxima_png,io_github_wxmaxima_developers_wxMaxima_png_len);
img.LoadFile(istream);
wxIcon icon;
icon.CopyFromBitmap(wxBitmap(img));
Expand Down
12 changes: 6 additions & 6 deletions wxmaxima.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ make DESTDIR=${RPM_BUILD_ROOT}

%install
make install DESTDIR=${RPM_BUILD_ROOT}
install -D -m 644 wxmaxima.desktop ${RPM_BUILD_ROOT}/usr/share/applications/wxmaxima.desktop
install -D -m 644 wxmaxima.png ${RPM_BUILD_ROOT}/usr/share/pixmaps/wxmaxima.png
install -D -m 644 wxmaxima.svg ${RPM_BUILD_ROOT}/usr/share/pixmaps/wxmaxima.svg
install -D -m 644 io.github.wxmaxima_developers.wxMaxima.desktop ${RPM_BUILD_ROOT}/usr/share/applications/io.github.wxmaxima_developers.wxMaxima.desktop
install -D -m 644 io.github.wxmaxima_developers.wxMaxima.png ${RPM_BUILD_ROOT}/usr/share/pixmaps/io.github.wxmaxima_developers.wxMaxima.png
install -D -m 644 io.github.wxmaxima_developers.wxMaxima.svg ${RPM_BUILD_ROOT}/usr/share/pixmaps/io.github.wxmaxima_developers.wxMaxima.svg

%find_lang %{name}

Expand All @@ -35,9 +35,9 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root,-)
%{_bindir}/wxmaxima
%{_datadir}/wxMaxima/*
/usr/share/pixmaps/wxmaxima.png
/usr/share/pixmaps/wxmaxima.svg
/usr/share/applications/wxmaxima.desktop
/usr/share/pixmaps/io.github.wxmaxima_developers.wxMaxima.png
/usr/share/pixmaps/io.github.wxmaxima_developers.wxMaxima.svg
/usr/share/applications/io.github.wxmaxima_developers.wxMaxima.desktop

%changelog
* Fri Jun 23 2006 Andrej Vodopivec <[email protected]>
Expand Down

0 comments on commit d9fc869

Please sign in to comment.