Improve app structure #83
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| # EditorConfig <https://EditorConfig.org> | ||
| root = true | ||
|
|
||
| # elementary defaults | ||
| [*] | ||
| charset = utf-8 | ||
| end_of_line = lf | ||
| indent_size = tab | ||
| indent_style = space | ||
| insert_final_newline = true | ||
| max_line_length = 80 | ||
| tab_width = 4 | ||
|
|
||
| # Markup files | ||
| [{*.html,*.xml,*.xml.in,*.yml}] | ||
| tab_width = 2 | ||
| tab_width = 2 |
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,6 @@ | ||
| [Contractor Entry] | ||
| Name=Resize images | ||
| Description=Resize images | ||
| MimeType=image | ||
| Icon=com.github.peteruithoven.resizer | ||
| Exec=com.github.peteruithoven.resizer %F |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,12 @@ | ||
| <schemalist> | ||
| <schema id="com.github.peteruithoven.resizer" path="/com/github/peteruithoven/resizer/" gettext-domain="com.github.peteruithoven.resizer"> | ||
| <key name="width" type="i"> | ||
| <range min="1" max="10000" /> | ||
| <default>1000</default> | ||
| </key> | ||
| <key name="height" type="i"> | ||
| <range min="1" max="10000" /> | ||
| <default>1000</default> | ||
| </key> | ||
| </schema> | ||
| </schemalist> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,36 +1,40 @@ | ||
| # Install icons | ||
| icon_sizes = ['16', '24', '32', '48', '64', '128'] | ||
|
|
||
| foreach i : icon_sizes | ||
| install_data ( | ||
| join_paths ('icons', i + '.svg'), | ||
| install_dir: join_paths (get_option ('datadir'), 'icons', 'hicolor', i + 'x' + i, 'apps'), | ||
| rename : meson.project_name () + '.svg' | ||
| ) | ||
| install_data ( | ||
| join_paths ('icons', i + '.svg'), | ||
| install_dir: join_paths (get_option ('datadir'), 'icons', 'hicolor', i + 'x' + i + '@2', 'apps'), | ||
| rename : meson.project_name () + '.svg' | ||
| ) | ||
| endforeach | ||
|
|
||
| # Translate and install our .desktop file so the Applications Menu will see it | ||
| i18n.merge_file ( | ||
| input: meson.project_name () + '.desktop.in', | ||
| output: meson.project_name () + '.desktop', | ||
| po_dir: join_paths (meson.source_root (), 'po', 'extra'), | ||
| type: 'desktop', | ||
| install: true, | ||
| install_dir: join_paths (get_option ('datadir'), 'applications') | ||
| ) | ||
|
|
||
| # Translate and install our .appdata.xml file so AppCenter will see it | ||
| i18n.merge_file ( | ||
| input: meson.project_name () + '.appdata.xml.in', | ||
| output: meson.project_name () + '.appdata.xml', | ||
| po_dir: join_paths (meson.source_root (), 'po', 'extra'), | ||
| install: true, | ||
| install_dir: join_paths (get_option ('datadir'), 'metainfo') | ||
| ) | ||
|
|
||
| # Install gschema | ||
| install_data ( | ||
| meson.project_name () + '.gschema.xml', | ||
| install_dir: join_paths (get_option ('datadir'), 'glib-2.0', 'schemas') | ||
| ) | ||
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,46 +1,49 @@ | ||
| # Project name, programming language and version | ||
| project ( | ||
| 'com.github.peteruithoven.resizer', | ||
|
Owner
There was a problem hiding this comment. Why not define the min. required meson? There was a problem hiding this comment. It definitely should be defined! Meson can refuse to run on older versions, while printing an informative error message telling you that your version of Meson is too old. Additionally, it also prints informative warnings when you use features too new for the minimum required version to handle.
Contributor
Author
There was a problem hiding this comment. I can add it back but even elementary apps does not include this. I assume developers should check that their development tools are up to date before trying to build the app. But I can add it back if you prefer. There was a problem hiding this comment. Why make life harder, when you could make life easier instead? :) |
||
| 'c', 'vala', | ||
| version: '1.0.1' | ||
|
Owner
There was a problem hiding this comment. I'd like to limit the amount of places where the version is defined, to ideally nowhere but the tag. Is this really useful?
Contributor
Author
There was a problem hiding this comment. I don't really know but elementary does in their app as well as many other developers so. |
||
| ) | ||
|
|
||
| # Translation module | ||
| i18n = import ('i18n') | ||
|
|
||
| # Project arguments | ||
| add_project_arguments ( | ||
| '-DGETTEXT_PACKAGE="@0@"'.format (meson.project_name ()), | ||
| language: 'c' | ||
| ) | ||
|
|
||
| # Config file | ||
| conf_data = configuration_data () | ||
|
|
||
| conf_data.set_quoted ('PROJECT_NAME', meson.project_name ()) | ||
|
|
||
| config_file = configure_file ( | ||
| input : 'src/Config.vala.in', | ||
| output : 'Config.vala', | ||
| configuration : conf_data | ||
| ) | ||
|
|
||
| # Listing dependencies | ||
| dependencies = [ | ||
| dependency ('gtk+-3.0'), | ||
| dependency ('granite'), | ||
| dependency ('libhandy-1') | ||
| ] | ||
|
|
||
| subdir ('src') | ||
|
|
||
| # Defining executable | ||
| executable ( | ||
| meson.project_name (), | ||
| sources, | ||
| config_file, | ||
| dependencies: dependencies, | ||
| install: true | ||
| ) | ||
|
|
||
| subdir('data') | ||
| subdir('po') | ||
|
|
||
| meson.add_install_script('meson/post_install.py') | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why remove the contract install logic but keep the contract file?
I know the contract file will no longer work: elementary/contractor#34. Maybe we should just remove all the contract logic in a separate PR?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You're right. I'll add it back so it can be removed in another PR