diff options
author | Antenore Gatta <antenore@simbiosi.org> | 2018-05-03 23:57:27 +0300 |
---|---|---|
committer | Antenore Gatta <antenore@simbiosi.org> | 2018-05-03 23:57:27 +0300 |
commit | cababba3c43f4c1a6a43b7ed93f5c10cb837b930 (patch) | |
tree | dec859b40a3ab6927ed7eaf2b1a90134daaa32e5 | |
parent | 0c4dc672646656fb0f812854a958e9684935a983 (diff) |
Renamed files and icons accordingly to the uniq app id
-rw-r--r-- | .gitignore | 13 | ||||
-rwxr-xr-x | data/desktop/128x128/apps/org.remmina.Remmina.png (renamed from data/desktop/128x128/apps/remmina.png) | bin | 7930 -> 7930 bytes | |||
-rw-r--r-- | data/desktop/16x16/apps/org.remmina.Remmina.png (renamed from data/desktop/16x16/apps/remmina.png) | bin | 824 -> 824 bytes | |||
-rw-r--r-- | data/desktop/22x22/apps/org.remmina.Remmina.png (renamed from data/desktop/22x22/apps/remmina.png) | bin | 4151 -> 4151 bytes | |||
-rw-r--r-- | data/desktop/24x24/apps/org.remmina.Remmina.png (renamed from data/desktop/24x24/apps/remmina.png) | bin | 1146 -> 1146 bytes | |||
-rw-r--r-- | data/desktop/32x32/apps/org.remmina.Remmina.png (renamed from data/desktop/32x32/apps/remmina.png) | bin | 1467 -> 1467 bytes | |||
-rw-r--r-- | data/desktop/48x48/apps/org.remmina.Remmina.png (renamed from data/desktop/48x48/apps/remmina.png) | bin | 2038 -> 2038 bytes | |||
-rwxr-xr-x | data/desktop/64x64/apps/org.remmina.Remmina.png (renamed from data/desktop/64x64/apps/remmina.png) | bin | 5438 -> 5438 bytes | |||
-rwxr-xr-x | data/desktop/72x72/apps/org.remmina.Remmina.png (renamed from data/desktop/72x72/apps/remmina.png) | bin | 5698 -> 5698 bytes | |||
-rwxr-xr-x | data/desktop/96x96/apps/org.remmina.Remmina.png (renamed from data/desktop/96x96/apps/remmina.png) | bin | 7085 -> 7085 bytes | |||
-rw-r--r-- | data/desktop/CMakeLists.txt | 33 | ||||
-rw-r--r-- | data/desktop/org.remmina.Remmina.appdata.xml (renamed from data/desktop/appdata.xml) | 0 | ||||
-rw-r--r-- | data/desktop/org.remmina.Remmina.desktop.in (renamed from data/desktop/remmina.desktop.in) | 0 | ||||
-rw-r--r-- | data/desktop/remmina-mime.xml | 2 | ||||
-rw-r--r-- | data/desktop/scalable/apps/org.remmina.Remmina.svg (renamed from data/desktop/scalable/apps/remmina.svg) | 0 | ||||
-rw-r--r-- | data/ui/remmina_about.glade | 2 | ||||
-rw-r--r-- | data/ui/remmina_main.glade | 9 | ||||
-rw-r--r-- | flatpak/org.remmina.Remmina.json | 2 | ||||
-rw-r--r-- | snap/snapcraft.yaml | 4 | ||||
-rw-r--r-- | src/remmina.c | 2 |
20 files changed, 32 insertions, 35 deletions
diff --git a/.gitignore b/.gitignore index 8310704f4..2e15f55b1 100644 --- a/.gitignore +++ b/.gitignore @@ -9,9 +9,8 @@ *.so *.swp *.tar.gz -*/po/Makefile.in.in -*/po/POTFILES -*/po/stamp-it +po/POTFILES +po/stamp-it *~ .clang-format .cproject @@ -49,10 +48,10 @@ tags plugins/libvncserver/rfb/rfbconfig.h plugins/telepathy/org.freedesktop.Telepathy.Client.Remmina.service -remmina/desktop/remmina.desktop -remmina/desktop/remmina-file.desktop -remmina/remmina -remmina/src/remmina +data/desktop/remmina.desktop +data/desktop/remmina-file.desktop +src/remmina +src/remmina *.snap parts diff --git a/data/desktop/128x128/apps/remmina.png b/data/desktop/128x128/apps/org.remmina.Remmina.png Binary files differindex 8c48762df..8c48762df 100755 --- a/data/desktop/128x128/apps/remmina.png +++ b/data/desktop/128x128/apps/org.remmina.Remmina.png diff --git a/data/desktop/16x16/apps/remmina.png b/data/desktop/16x16/apps/org.remmina.Remmina.png Binary files differindex dffbd488d..dffbd488d 100644 --- a/data/desktop/16x16/apps/remmina.png +++ b/data/desktop/16x16/apps/org.remmina.Remmina.png diff --git a/data/desktop/22x22/apps/remmina.png b/data/desktop/22x22/apps/org.remmina.Remmina.png Binary files differindex 86a1a1fdf..86a1a1fdf 100644 --- a/data/desktop/22x22/apps/remmina.png +++ b/data/desktop/22x22/apps/org.remmina.Remmina.png diff --git a/data/desktop/24x24/apps/remmina.png b/data/desktop/24x24/apps/org.remmina.Remmina.png Binary files differindex 2725a5278..2725a5278 100644 --- a/data/desktop/24x24/apps/remmina.png +++ b/data/desktop/24x24/apps/org.remmina.Remmina.png diff --git a/data/desktop/32x32/apps/remmina.png b/data/desktop/32x32/apps/org.remmina.Remmina.png Binary files differindex 32fe618cb..32fe618cb 100644 --- a/data/desktop/32x32/apps/remmina.png +++ b/data/desktop/32x32/apps/org.remmina.Remmina.png diff --git a/data/desktop/48x48/apps/remmina.png b/data/desktop/48x48/apps/org.remmina.Remmina.png Binary files differindex ff8fe2881..ff8fe2881 100644 --- a/data/desktop/48x48/apps/remmina.png +++ b/data/desktop/48x48/apps/org.remmina.Remmina.png diff --git a/data/desktop/64x64/apps/remmina.png b/data/desktop/64x64/apps/org.remmina.Remmina.png Binary files differindex 14cca420d..14cca420d 100755 --- a/data/desktop/64x64/apps/remmina.png +++ b/data/desktop/64x64/apps/org.remmina.Remmina.png diff --git a/data/desktop/72x72/apps/remmina.png b/data/desktop/72x72/apps/org.remmina.Remmina.png Binary files differindex dd7ff3eea..dd7ff3eea 100755 --- a/data/desktop/72x72/apps/remmina.png +++ b/data/desktop/72x72/apps/org.remmina.Remmina.png diff --git a/data/desktop/96x96/apps/remmina.png b/data/desktop/96x96/apps/org.remmina.Remmina.png Binary files differindex 0be4005d0..0be4005d0 100755 --- a/data/desktop/96x96/apps/remmina.png +++ b/data/desktop/96x96/apps/org.remmina.Remmina.png diff --git a/data/desktop/CMakeLists.txt b/data/desktop/CMakeLists.txt index 73b426f3c..57a3827ce 100644 --- a/data/desktop/CMakeLists.txt +++ b/data/desktop/CMakeLists.txt @@ -44,22 +44,22 @@ set(ICON96_DIR "${REMMINA_DATADIR}/icons/hicolor/96x96/apps") set(ICON128_DIR "${REMMINA_DATADIR}/icons/hicolor/128x128/apps") set(ICONSVG_DIR "${REMMINA_DATADIR}/icons/hicolor/scalable/apps") -set(ICON16_DATA 16x16/apps/remmina.png) -set(ICON22_DATA 22x22/apps/remmina.png) -set(ICON24_DATA 24x24/apps/remmina.png) +set(ICON16_DATA 16x16/apps/org.remmina.Remmina.png) +set(ICON22_DATA 22x22/apps/org.remmina.Remmina.png) +set(ICON24_DATA 24x24/apps/org.remmina.Remmina.png) set(ICON16_DATA_PANEL 16x16/apps/remmina-panel.png) set(ICON22_DATA_PANEL 22x22/apps/remmina-panel.png) set(ICON24_DATA_PANEL 24x24/apps/remmina-panel.png) set(ICON16_DATA_PANEL_LIGHT 16x16/apps/remmina-panel-inverted.png) set(ICON22_DATA_PANEL_LIGHT 22x22/apps/remmina-panel-inverted.png) set(ICON24_DATA_PANEL_LIGHT 24x24/apps/remmina-panel-inverted.png) -set(ICON32_DATA 32x32/apps/remmina.png) -set(ICON48_DATA 48x48/apps/remmina.png) -set(ICON64_DATA 64x64/apps/remmina.png) -set(ICON72_DATA 72x72/apps/remmina.png) -set(ICON96_DATA 96x96/apps/remmina.png) -set(ICON128_DATA 128x128/apps/remmina.png) -set(ICONSVG_DATA scalable/apps/remmina.svg) +set(ICON32_DATA 32x32/apps/org.remmina.Remmina.png) +set(ICON48_DATA 48x48/apps/org.remmina.Remmina.png) +set(ICON64_DATA 64x64/apps/org.remmina.Remmina.png) +set(ICON72_DATA 72x72/apps/org.remmina.Remmina.png) +set(ICON96_DATA 96x96/apps/org.remmina.Remmina.png) +set(ICON128_DATA 128x128/apps/org.remmina.Remmina.png) +set(ICONSVG_DATA scalable/apps/org.remmina.Remmina.svg) install(FILES ${ICON16_DATA} DESTINATION ${ICON16_DIR}) install(FILES ${ICON22_DATA} DESTINATION ${ICON22_DIR}) @@ -79,19 +79,17 @@ install(FILES ${ICON128_DATA} DESTINATION ${ICON128_DIR}) install(FILES ${ICONSVG_DATA} DESTINATION ${ICONSVG_DIR}) set(REMMINA_BINARY_PATH ${CMAKE_INSTALL_FULL_BINDIR}/remmina) -set(REMMINA_ICON "remmina") +set(REMMINA_ICON "org.remmina.Remmina") -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/remmina.desktop.in - ${CMAKE_CURRENT_BINARY_DIR}/remmina.desktop @ONLY) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/org.remmina.Remmina.desktop.in + ${CMAKE_CURRENT_BINARY_DIR}/org.remmina.Remmina.desktop @ONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/remmina-file.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/remmina-file.desktop @ONLY) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/remmina.desktop - RENAME ${UNIQUE_APPNAME}.desktop +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.remmina.Remmina.desktop DESTINATION "${REMMINA_DATADIR}/applications") install(FILES ${CMAKE_CURRENT_BINARY_DIR}/remmina-file.desktop DESTINATION "${REMMINA_DATADIR}/applications") -install(FILES appdata.xml - RENAME ${UNIQUE_APPNAME}.appdata.xml +install(FILES org.remmina.Remmina.appdata.xml DESTINATION "${REMMINA_DATADIR}/metainfo") # XML mime types set( SHARED_MIME_INFO_MINIMUM_VERSION "0.30" ) @@ -101,4 +99,3 @@ if( SHARED_MIME_INFO_FOUND ) install( FILES remmina-mime.xml DESTINATION ${XDG_MIME_INSTALL_DIR} ) update_xdg_mimetypes( ${XDG_MIME_INSTALL_DIR} ) endif() - diff --git a/data/desktop/appdata.xml b/data/desktop/org.remmina.Remmina.appdata.xml index 7dad37d94..7dad37d94 100644 --- a/data/desktop/appdata.xml +++ b/data/desktop/org.remmina.Remmina.appdata.xml diff --git a/data/desktop/remmina.desktop.in b/data/desktop/org.remmina.Remmina.desktop.in index 10ec94ac8..10ec94ac8 100644 --- a/data/desktop/remmina.desktop.in +++ b/data/desktop/org.remmina.Remmina.desktop.in diff --git a/data/desktop/remmina-mime.xml b/data/desktop/remmina-mime.xml index bbb7a8c54..b47a90582 100644 --- a/data/desktop/remmina-mime.xml +++ b/data/desktop/remmina-mime.xml @@ -7,6 +7,6 @@ <glob pattern="*.rdp"/> <glob pattern="*.rdpx"/> <glob pattern="*.RDP"/> - <icon name="remmina"/> + <icon name="org.remmina.Remmina"/> </mime-type> </mime-info> diff --git a/data/desktop/scalable/apps/remmina.svg b/data/desktop/scalable/apps/org.remmina.Remmina.svg index 733a721d7..733a721d7 100644 --- a/data/desktop/scalable/apps/remmina.svg +++ b/data/desktop/scalable/apps/org.remmina.Remmina.svg diff --git a/data/ui/remmina_about.glade b/data/ui/remmina_about.glade index 551b0ae6a..d22e54b16 100644 --- a/data/ui/remmina_about.glade +++ b/data/ui/remmina_about.glade @@ -154,7 +154,7 @@ Shuhrat Dehkanov <k@efir.uz> theraser <mail@hegerfeld.org> </property> <property name="artists">Martin Lettner <m.lettner@gmail.com></property> - <property name="logo_icon_name">remmina</property> + <property name="logo_icon_name">org.remmina.Remmina</property> <property name="license_type">gpl-2-0</property> <child internal-child="vbox"> <object class="GtkBox" id="aboutdialog-vbox1"> diff --git a/data/ui/remmina_main.glade b/data/ui/remmina_main.glade index db214e88d..6fd885d1d 100644 --- a/data/ui/remmina_main.glade +++ b/data/ui/remmina_main.glade @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.20.4 +<!-- Generated with glade 3.22.1 Remmina - The GTK+ Remmina Remote Desktop Client Copyright (C) Antenore Gatta & Giovanni Panozzo 2014-2018 @@ -230,11 +230,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. </object> <object class="GtkWindow" id="RemminaMain"> <property name="can_focus">False</property> + <property name="icon_name">org.remmina.Remmina</property> <signal name="delete-event" handler="remmina_main_on_delete_event" swapped="no"/> <signal name="destroy" handler="remmina_main_destroy" swapped="no"/> <signal name="drag-data-received" handler="remmina_main_on_drag_data_received" swapped="no"/> <signal name="show" handler="remmina_main_on_show" swapped="no"/> <signal name="window-state-event" handler="remmina_main_on_window_state_event" swapped="no"/> + <child type="titlebar"> + <placeholder/> + </child> <child> <object class="GtkBox" id="box_main"> <property name="visible">True</property> @@ -791,8 +795,5 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. </child> </object> </child> - <child type="titlebar"> - <placeholder/> - </child> </object> </interface> diff --git a/flatpak/org.remmina.Remmina.json b/flatpak/org.remmina.Remmina.json index 2cb2dfa26..701379c63 100644 --- a/flatpak/org.remmina.Remmina.json +++ b/flatpak/org.remmina.Remmina.json @@ -8,7 +8,7 @@ "cxxflags": "-O2 -g" }, "command": "remmina", - "rename-icon": "remmina", + "rename-icon": "org.remmina.Remmina", "cleanup": [ "*.a", "*.la", diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 0734ed3d3..dffc42407 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -2,7 +2,7 @@ name: remmina adopt-info: remmina version: git version-script: cat snap/SNAP_VERSION || echo echo +git$(git rev-parse --short HEAD) -icon: remmina/desktop/scalable/apps/remmina.svg +icon: data/desktop/scalable/apps/org.remmina.Remmina.svg description: | Remmina is a remote desktop client written in GTK+, aiming to be useful for system administrators and travellers, who need to work with lots of remote @@ -91,7 +91,7 @@ parts: # FIXME: this is an ugly workaround for https://pad.lv/1761633 remmina-appdata: plugin: nil - source: remmina/desktop + source: data/desktop prime: [-./*] prepare: | SNAPCRAFT_PART_SRC=$SNAPCRAFT_PART_INSTALL/../src diff --git a/src/remmina.c b/src/remmina.c index a7399bbf2..b21c2709b 100644 --- a/src/remmina.c +++ b/src/remmina.c @@ -213,7 +213,7 @@ static void remmina_on_startup(GApplication *app) remmina_icon_init(); g_set_application_name("Remmina"); - gtk_window_set_default_icon_name("remmina"); + gtk_window_set_default_icon_name("org.remmina.Remmina"); gtk_icon_theme_append_search_path(gtk_icon_theme_get_default(), REMMINA_RUNTIME_DATADIR G_DIR_SEPARATOR_S "icons"); |