Commit 6dce01bd authored by Bilal Elmoussaoui's avatar Bilal Elmoussaoui
Browse files

drop unuseful name prefix

parent 01617ba6
......@@ -10,7 +10,6 @@
"tags": [
"nightly"
],
"desktop-file-name-prefix": "(Development) ",
"finish-args": [
"--share=ipc",
"--socket=fallback-x11",
......
......@@ -76,7 +76,6 @@ 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-prefix', name_prefix)
ui_preconfigured_files = files(
'resources/ui/about_dialog.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" translatable="yes">@name-prefix@Contrast</property>
<property name="program_name" translatable="yes">Contrast</property>
<property name="version">@version@</property>
<property name="website">https://gitlab.gnome.org/World/design/contrast</property>
<property name="authors">Bilal Elmoussaoui
......
......@@ -39,7 +39,6 @@ gettext_package = meson.project_name()
if get_option('profile') == 'development'
profile = 'Devel'
name_prefix = '(Development) '
vcs_tag = run_command('git', 'rev-parse', '--short', 'HEAD').stdout().strip()
if vcs_tag == ''
version_suffix = '-devel'
......@@ -48,7 +47,6 @@ if get_option('profile') == 'development'
endif
else
profile = ''
name_prefix = ''
version_suffix = ''
endif
......
......@@ -91,7 +91,7 @@ glib_wrapper! {
impl Application {
pub fn run() {
info!("{}Contrast ({})", config::NAME_PREFIX, config::APP_ID);
info!("Contrast ({})", config::APP_ID);
info!("Version: {} ({})", config::VERSION, config::PROFILE);
info!("Datadir: {}", config::PKGDATADIR);
......@@ -142,15 +142,14 @@ impl Application {
})
);
let window = self.get_active_window();
// About
action!(
self,
"about",
clone!(@strong window => move |_, _| {
clone!(@strong self as this => move |_, _| {
let builder = gtk::Builder::from_resource("/org/gnome/design/Contrast/about_dialog.ui");
get_widget!(builder, gtk::AboutDialog, about_dialog);
about_dialog.set_transient_for(window.as_ref());
about_dialog.set_transient_for(this.get_active_window().as_ref());
about_dialog.connect_response(|dialog, _| dialog.close());
about_dialog.show();
......
......@@ -58,14 +58,12 @@ pub fn pick_color() -> zbus::Result<gdk::RGBA> {
.map(|c| *c.downcast_ref::<f64>().unwrap())
.collect::<Vec<f64>>();
let rgba = gdk::RGBA {
Ok(gdk::RGBA {
red: color[0],
green: color[1],
blue: color[2],
alpha: 1.0,
};
Ok(rgba)
})
}
pub fn compile_styles(sender: &glib::Sender<Action>, fg: gdk::RGBA, bg: gdk::RGBA) {
......
pub static APP_ID: &str = @APP_ID@;
pub static PKGDATADIR: &str = @PKGDATADIR@;
pub static PROFILE: &str = @PROFILE@;
pub static NAME_PREFIX: &str = @NAME_PREFIX@;
pub static VERSION: &str = @VERSION@;
pub static GETTEXT_PACKAGE: &str = @GETTEXT_PACKAGE@;
pub static LOCALEDIR: &str = @LOCALEDIR@;
......@@ -2,7 +2,6 @@ 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_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