Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
World
Design Tooling
Icon Library
Commits
ab150dbc
Commit
ab150dbc
authored
Jul 22, 2019
by
Bilal Elmoussaoui
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Dual isntall: use name (Developement) as a prefix
parent
7f13859f
Pipeline
#97636
passed with stages
in 7 minutes and 17 seconds
Changes
8
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
11 additions
and
11 deletions
+11
-11
build-aux/org.gnome.design.IconLibraryDevel.json
build-aux/org.gnome.design.IconLibraryDevel.json
+1
-1
data/meson.build
data/meson.build
+1
-1
data/resources/ui/about_dialog.ui.in
data/resources/ui/about_dialog.ui.in
+1
-1
data/resources/ui/window.ui.in
data/resources/ui/window.ui.in
+1
-1
meson.build
meson.build
+2
-2
src/application.rs
src/application.rs
+3
-3
src/config.rs.in
src/config.rs.in
+1
-1
src/meson.build
src/meson.build
+1
-1
No files found.
build-aux/org.gnome.design.IconLibraryDevel.json
View file @
ab150dbc
...
...
@@ -10,7 +10,7 @@
"tags"
:
[
"nightly"
],
"desktop-file-name-
suf
fix"
:
"
(Devel
)
"
,
"desktop-file-name-
pre
fix"
:
"(Devel
opment)
"
,
"finish-args"
:
[
"--share=ipc"
,
"--socket=x11"
,
...
...
data/meson.build
View file @
ab150dbc
...
...
@@ -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-
suf
fix', name_
suf
fix)
ui_config.set('name-
pre
fix', name_
pre
fix)
ui_preconfigured_files = files(
'resources/ui/about_dialog.ui.in',
'resources/ui/window.ui.in',
...
...
data/resources/ui/about_dialog.ui.in
View file @
ab150dbc
...
...
@@ -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>
...
...
data/resources/ui/window.ui.in
View file @
ab150dbc
...
...
@@ -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>
...
...
meson.build
View file @
ab150dbc
...
...
@@ -39,7 +39,7 @@ gettext_package = meson.project_name()
if get_option('profile') == 'development'
profile = 'Devel'
name_
suf
fix = '
(Devel
)
'
name_
pre
fix = '(Devel
opment)
'
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_
suf
fix = ''
name_
pre
fix = ''
version_suffix = ''
endif
...
...
src/application.rs
View file @
ab150dbc
...
...
@@ -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_
SUF
FIX
));
glib
::
set_prgname
(
Some
(
"icon
s-finder
"
));
glib
::
set_application_name
(
&
format!
(
"
{}
Icon Library"
,
config
::
NAME_
PRE
FIX
));
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_
SUF
FIX
,
config
::
APP_ID
);
info!
(
"Icon Library {} ({})"
,
config
::
NAME_
PRE
FIX
,
config
::
APP_ID
);
info!
(
"Version: {} ({})"
,
config
::
VERSION
,
config
::
PROFILE
);
info!
(
"Datadir: {}"
,
config
::
PKGDATADIR
);
...
...
src/config.rs.in
View file @
ab150dbc
pub static APP_ID: &'static str = @APP_ID@;
pub static PKGDATADIR: &'static str = @PKGDATADIR@;
pub static PROFILE: &'static str = @PROFILE@;
pub static NAME_
SUF
FIX: &'static str = @NAME_
SUF
FIX@;
pub static NAME_
PRE
FIX: &'static str = @NAME_
PRE
FIX@;
pub static VERSION: &'static str = @VERSION@;
pub static GETTEXT_PACKAGE: &'static str = @GETTEXT_PACKAGE@;
pub static LOCALEDIR: &'static str = @LOCALEDIR@;
src/meson.build
View file @
ab150dbc
...
...
@@ -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_
SUF
FIX', name_
suf
fix)
global_conf.set_quoted('NAME_
PRE
FIX', name_
pre
fix)
global_conf.set_quoted('VERSION', version + version_suffix)
global_conf.set_quoted('GETTEXT_PACKAGE', gettext_package)
global_conf.set_quoted('LOCALEDIR', localedir)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment