Commit ab150dbc authored by Bilal Elmoussaoui's avatar Bilal Elmoussaoui

Dual isntall: use name (Developement) as a prefix

parent 7f13859f
Pipeline #97636 passed with stages
in 7 minutes and 17 seconds
......@@ -10,7 +10,7 @@
"tags": [
"nightly"
],
"desktop-file-name-suffix": " (Devel)",
"desktop-file-name-prefix": "(Development) ",
"finish-args": [
"--share=ipc",
"--socket=x11",
......
......@@ -76,7 +76,7 @@ endif
ui_config = configuration_data()
ui_config.set('app-id', application_id)
ui_config.set('version', meson.project_version() + version_suffix)
ui_config.set('name-suffix', name_suffix)
ui_config.set('name-prefix', name_prefix)
ui_preconfigured_files = files(
'resources/ui/about_dialog.ui.in',
'resources/ui/window.ui.in',
......
......@@ -6,7 +6,7 @@
<property name="can_focus">False</property>
<property name="modal">True</property>
<property name="type_hint">dialog</property>
<property name="program_name">Icon Library</property>
<property name="program_name">@name-prefix@Icon Library</property>
<property name="version">@version@</property>
<property name="website">https://gitlab.gnome.org/bilelmoussaoui/icon-library</property>
<property name="authors">Bilal Elmoussaoui</property>
......
......@@ -8,7 +8,7 @@
<property name="default_width">650</property>
<property name="default_height">500</property>
<property name="icon_name">@app-id@</property>
<property name="title">Icon Library@name-suffix@</property>
<property name="title">@name-prefix@ Icon Library</property>
<child type="titlebar">
<object class="HdyHeaderBar" id="headerbar">
<property name="visible">True</property>
......
......@@ -39,7 +39,7 @@ gettext_package = meson.project_name()
if get_option('profile') == 'development'
profile = 'Devel'
name_suffix = ' (Devel)'
name_prefix = '(Development) '
vcs_tag = run_command('git', 'rev-parse', '--short', 'HEAD').stdout().strip()
if vcs_tag == ''
version_suffix = '-devel'
......@@ -48,7 +48,7 @@ if get_option('profile') == 'development'
endif
else
profile = ''
name_suffix = ''
name_prefix = ''
version_suffix = ''
endif
......
......@@ -15,8 +15,8 @@ impl Application {
let app = gtk::Application::new(Some(config::APP_ID), gio::ApplicationFlags::FLAGS_NONE).unwrap();
let window = Window::new();
glib::set_application_name(&format!("Icon Library{}", config::NAME_SUFFIX));
glib::set_prgname(Some("icons-finder"));
glib::set_application_name(&format!("{}Icon Library", config::NAME_PREFIX));
glib::set_prgname(Some("icon-library"));
let builder = gtk::Builder::new_from_resource("/org/gnome/design/IconLibrary/shortcuts.ui");
let dialog: gtk::ShortcutsWindow = builder.get_object("shortcuts").unwrap();
......@@ -74,7 +74,7 @@ impl Application {
}
pub fn run(&self) {
info!("Icon Library {} ({})", config::NAME_SUFFIX, config::APP_ID);
info!("Icon Library {} ({})", config::NAME_PREFIX, config::APP_ID);
info!("Version: {} ({})", config::VERSION, config::PROFILE);
info!("Datadir: {}", config::PKGDATADIR);
......
pub static APP_ID: &'static str = @APP_ID@;
pub static PKGDATADIR: &'static str = @PKGDATADIR@;
pub static PROFILE: &'static str = @PROFILE@;
pub static NAME_SUFFIX: &'static str = @NAME_SUFFIX@;
pub static NAME_PREFIX: &'static str = @NAME_PREFIX@;
pub static VERSION: &'static str = @VERSION@;
pub static GETTEXT_PACKAGE: &'static str = @GETTEXT_PACKAGE@;
pub static LOCALEDIR: &'static str = @LOCALEDIR@;
......@@ -2,7 +2,7 @@ global_conf = configuration_data()
global_conf.set_quoted('APP_ID', application_id)
global_conf.set_quoted('PKGDATADIR', pkgdatadir)
global_conf.set_quoted('PROFILE', profile)
global_conf.set_quoted('NAME_SUFFIX', name_suffix)
global_conf.set_quoted('NAME_PREFIX', name_prefix)
global_conf.set_quoted('VERSION', version + version_suffix)
global_conf.set_quoted('GETTEXT_PACKAGE', gettext_package)
global_conf.set_quoted('LOCALEDIR', localedir)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment