Skip to content

Commit f18fcf4

Browse files
ranfdevranfdev
committed
v1.0.12
1 parent 3574d45 commit f18fcf4

File tree

12 files changed

+58
-53
lines changed

12 files changed

+58
-53
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ target/*
44
_build/
55
.aider*
66
.env
7+
src/config.rs

‎data/com.ranfdev.DistroShelf.metainfo.xml.in‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,13 @@
7171
</screenshots>
7272

7373
<releases>
74+
<release version="1.0.12" date="2025-07-01">
75+
<description translate="no">
76+
<ul>
77+
<li>Improve about dialog</li>
78+
</ul>
79+
</description>
80+
</release>
7481
<release version="1.0.11" date="2025-07-01">
7582
<description translate="no">
7683
<ul>

‎src/distroshelf.gresource.xml‎ renamed to ‎data/distroshelf.gresource.xml‎

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,34 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<gresources>
33
<gresource prefix="/com/ranfdev/DistroShelf">
4-
<file preprocess="xml-stripblanks">window.ui</file>
4+
<file preprocess="xml-stripblanks">gtk/window.ui</file>
55
<file preprocess="xml-stripblanks">gtk/help-overlay.ui</file>
6+
<file compressed="true" preprocess="xml-stripblanks" alias="metainfo.xml">com.ranfdev.DistroShelf.metainfo.xml</file>
67
</gresource>
78
<gresource prefix="/com/ranfdev/DistroShelf/icons/scalable/actions/">
8-
<file preprocess="xml-stripblanks" alias="terminal-symbolic.svg">../data/icons/terminal-symbolic.svg</file>
9-
<file preprocess="xml-stripblanks" alias="package-symbolic.svg">../data/icons/package-symbolic.svg</file>
9+
<file preprocess="xml-stripblanks" alias="terminal-symbolic.svg">icons/terminal-symbolic.svg</file>
10+
<file preprocess="xml-stripblanks" alias="package-symbolic.svg">icons/package-symbolic.svg</file>
1011

11-
<file preprocess="xml-stripblanks" alias="alma-symbolic.svg">../data/icons/alma.svg</file>
12-
<file preprocess="xml-stripblanks" alias="arch-symbolic.svg">../data/icons/arch.svg</file>
13-
<file preprocess="xml-stripblanks" alias="coreos-symbolic.svg">../data/icons/coreos.svg</file>
14-
<file preprocess="xml-stripblanks" alias="crystal-symbolic.svg">../data/icons/crystal.svg</file>
15-
<file preprocess="xml-stripblanks" alias="gentoo-symbolic.svg">../data/icons/gentoo.svg</file>
16-
<file preprocess="xml-stripblanks" alias="fedora-symbolic.svg">../data/icons/fedora.svg</file>
17-
<file preprocess="xml-stripblanks" alias="ubuntu-symbolic.svg">../data/icons/ubuntu.svg</file>
18-
<file preprocess="xml-stripblanks" alias="alpine-symbolic.svg">../data/icons/alpine.svg</file>
19-
<file preprocess="xml-stripblanks" alias="mint-symbolic.svg">../data/icons/mint.svg</file>
20-
<file preprocess="xml-stripblanks" alias="nixos-symbolic.svg">../data/icons/nixos.svg</file>
21-
<file preprocess="xml-stripblanks" alias="debian-symbolic.svg">../data/icons/debian.svg</file>
22-
<file preprocess="xml-stripblanks" alias="centos-symbolic.svg">../data/icons/centos.svg</file>
23-
<file preprocess="xml-stripblanks" alias="kali-symbolic.svg">../data/icons/kali.svg</file>
24-
<file preprocess="xml-stripblanks" alias="opensuse-symbolic.svg">../data/icons/opensuse.svg</file>
25-
<file preprocess="xml-stripblanks" alias="neon-symbolic.svg">../data/icons/neon.svg</file>
26-
<file preprocess="xml-stripblanks" alias="slackware-symbolic.svg">../data/icons/slackware.svg</file>
27-
<file preprocess="xml-stripblanks" alias="rocky-symbolic.svg">../data/icons/rocky.svg</file>
28-
<file preprocess="xml-stripblanks" alias="deepin-symbolic.svg">../data/icons/deepin.svg</file>
29-
<file preprocess="xml-stripblanks" alias="vanilla-symbolic.svg">../data/icons/vanilla.svg</file>
30-
<file preprocess="xml-stripblanks" alias="void-symbolic.svg">../data/icons/void.svg</file>
31-
<file preprocess="xml-stripblanks" alias="tux-symbolic.svg">../data/icons/tux.svg</file>
12+
<file preprocess="xml-stripblanks" alias="alma-symbolic.svg">icons/alma.svg</file>
13+
<file preprocess="xml-stripblanks" alias="arch-symbolic.svg">icons/arch.svg</file>
14+
<file preprocess="xml-stripblanks" alias="coreos-symbolic.svg">icons/coreos.svg</file>
15+
<file preprocess="xml-stripblanks" alias="crystal-symbolic.svg">icons/crystal.svg</file>
16+
<file preprocess="xml-stripblanks" alias="gentoo-symbolic.svg">icons/gentoo.svg</file>
17+
<file preprocess="xml-stripblanks" alias="fedora-symbolic.svg">icons/fedora.svg</file>
18+
<file preprocess="xml-stripblanks" alias="ubuntu-symbolic.svg">icons/ubuntu.svg</file>
19+
<file preprocess="xml-stripblanks" alias="alpine-symbolic.svg">icons/alpine.svg</file>
20+
<file preprocess="xml-stripblanks" alias="mint-symbolic.svg">icons/mint.svg</file>
21+
<file preprocess="xml-stripblanks" alias="nixos-symbolic.svg">icons/nixos.svg</file>
22+
<file preprocess="xml-stripblanks" alias="debian-symbolic.svg">icons/debian.svg</file>
23+
<file preprocess="xml-stripblanks" alias="centos-symbolic.svg">icons/centos.svg</file>
24+
<file preprocess="xml-stripblanks" alias="kali-symbolic.svg">icons/kali.svg</file>
25+
<file preprocess="xml-stripblanks" alias="opensuse-symbolic.svg">icons/opensuse.svg</file>
26+
<file preprocess="xml-stripblanks" alias="neon-symbolic.svg">icons/neon.svg</file>
27+
<file preprocess="xml-stripblanks" alias="slackware-symbolic.svg">icons/slackware.svg</file>
28+
<file preprocess="xml-stripblanks" alias="rocky-symbolic.svg">icons/rocky.svg</file>
29+
<file preprocess="xml-stripblanks" alias="deepin-symbolic.svg">icons/deepin.svg</file>
30+
<file preprocess="xml-stripblanks" alias="vanilla-symbolic.svg">icons/vanilla.svg</file>
31+
<file preprocess="xml-stripblanks" alias="void-symbolic.svg">icons/void.svg</file>
32+
<file preprocess="xml-stripblanks" alias="tux-symbolic.svg">icons/tux.svg</file>
3233
</gresource>
3334
</gresources>

‎src/gtk/help-overlay.ui‎ renamed to ‎data/gtk/help-overlay.ui‎

File renamed without changes.

‎src/window.ui‎ renamed to ‎data/gtk/window.ui‎

File renamed without changes.

‎data/meson.build‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
gnome = import('gnome')
2+
13
desktop_file = i18n.merge_file(
24
input: 'com.ranfdev.DistroShelf.desktop.in',
35
output: 'com.ranfdev.DistroShelf.desktop',
@@ -20,6 +22,15 @@ appstream_file = i18n.merge_file(
2022
install_dir: get_option('datadir') / 'metainfo'
2123
)
2224

25+
gnome.compile_resources('distroshelf',
26+
'distroshelf.gresource.xml',
27+
source_dir: join_paths(meson.project_build_root(), 'data'),
28+
gresource_bundle: true,
29+
install: true,
30+
install_dir: pkgdatadir,
31+
dependencies: appstream_file
32+
)
33+
2334
appstreamcli = find_program('appstreamcli', required: false, disabler: true)
2435
test('Validate appstream file', appstreamcli,
2536
args: ['validate', '--no-net', '--explain', appstream_file])

‎meson.build‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
project('distroshelf', 'rust',
2-
version: '1.0.11',
2+
version: '1.0.12',
33
meson_version: '>= 1.0.0',
44
default_options: [ 'warning_level=2', 'werror=false', ],
55
)
@@ -15,6 +15,8 @@ meson.add_dist_script(
1515
meson.project_source_root()
1616
)
1717

18+
pkgdatadir = get_option('prefix') / get_option('datadir') / meson.project_name()
19+
1820
subdir('data')
1921
subdir('src')
2022
subdir('po')

‎src/application.rs‎

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ use adw::subclass::prelude::*;
2626
use gettextrs::gettext;
2727
use gtk::{gio, glib};
2828

29-
use crate::config::VERSION;
29+
use crate::config::{self, VERSION};
3030
use crate::distrobox::{Distrobox, DistroboxCommandRunnerResponse, FlatpakCommandRunner};
3131
use crate::fakers::{CommandRunner, RealCommandRunner};
3232
use crate::root_store::RootStore;
@@ -251,18 +251,13 @@ impl DistroShelfApplication {
251251

252252
fn show_about(&self) {
253253
let window = self.active_window().unwrap();
254-
let about = adw::AboutDialog::builder()
255-
.application_name("distroshelf")
256-
.application_icon("com.ranfdev.DistroShelf")
257-
.developer_name("Lorenzo Miglietta")
258-
.version(VERSION)
259-
.developers(vec!["Lorenzo Miglietta"])
260-
// Translators: Replace "translator-credits" with your name/username, and optionally an email or URL.
261-
.translator_credits(gettext("translator-credits"))
262-
.copyright("© 2024 Lorenzo Miglietta.\nAll brand icons are trademarks of their respective owners")
263-
.comments(gettext("A distrobox management application."))
264-
.build();
265-
254+
let about =
255+
adw::AboutDialog::from_appdata(&format!("{}/metainfo.xml", config::PATH_ID), None);
256+
about.set_developers(&["Lorenzo Miglietta"]);
257+
about.set_copyright(
258+
"© 2024 Lorenzo Miglietta.\nAll brand icons are trademarks of their respective owners",
259+
);
260+
about.add_link("Donate", "https://github.com/sponsors/ranfdev");
266261
about.present(Some(&window));
267262
}
268263
}

‎src/config.rs‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎src/config.rs.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
pub static VERSION: &str = @VERSION@;
2+
pub static PATH_ID: &str = @PATH_ID@;
23
pub static GETTEXT_PACKAGE: &str = @GETTEXT_PACKAGE@;
34
pub static LOCALEDIR: &str = @LOCALEDIR@;
45
pub static PKGDATADIR: &str = @PKGDATADIR@;

0 commit comments

Comments
 (0)