Commit 95b085f3 authored by Bilal Elmoussaoui's avatar Bilal Elmoussaoui
Browse files

Rename to Contrast

parent 86f9ecb4
......@@ -4,16 +4,16 @@ stages:
- review
variables:
BUNDLE: "colour-contrast-nightly.flatpak"
BUNDLE: "contrast-nightly.flatpak"
flatpak:
image: "registry.gitlab.gnome.org/gnome/gnome-runtime-images/rust_bundle:master"
stage: "test"
variables:
MANIFEST_PATH: "build-aux/org.gnome.design.ColourContrastDevel.json"
FLATPAK_MODULE: "colour-contrast"
MANIFEST_PATH: "build-aux/org.gnome.design.ContrastDevel.json"
FLATPAK_MODULE: "contrast"
MESON_ARGS: "-Dprofile=development"
APP_ID: "org.gnome.design.ColourContrastDevel"
APP_ID: "org.gnome.design.ContrastDevel"
script:
- flatpak-builder --stop-at=${FLATPAK_MODULE} app ${MANIFEST_PATH}
......
......@@ -77,7 +77,7 @@ version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "colour-contrast"
name = "contrast"
version = "0.0.1"
dependencies = [
"colorsys 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
......
[package]
name = "colour-contrast"
name = "contrast"
version = "0.0.1"
authors = ["Bilal Elmoussaoui <bilal.elmoussaoui@gnome.org>"]
edition = "2018"
......
<a href="https://flathub.org/apps/details/org.gnome.design.ColourContrast">
<a href="https://flathub.org/apps/details/org.gnome.design.Contrast">
<img src="https://flathub.org/assets/badges/flathub-badge-i-en.png" width="190px" />
</a>
# Colour Contrast
# Contrast
<img src="https://gitlab.gnome.org/World/design/colour-contrast/raw/master/data/icons/org.gnome.design.ColourContrast.svg" width="128" height="128" />
<img src="https://gitlab.gnome.org/World/design/contrast/raw/master/data/icons/org.gnome.design.Contrast.svg" width="128" height="128" />
<p>Find the right icon to use on your GNOME application.</p>
## Screenshots
......@@ -13,8 +13,8 @@
![screenshot](data/resources/screenshots/screenshot1.png)
</div>
## Hack on Colour Contrast
To build the development version of Colour Contrast and hack on the code
## Hack on Contrast
To build the development version of Contrast and hack on the code
see the [general guide](https://wiki.gnome.org/Newcomers/BuildProject)
for building GNOME apps with Flatpak and GNOME Builder.
......
......@@ -10,10 +10,10 @@ then
echo "DEBUG MODE"
cargo build --manifest-path \
"$MESON_SOURCE_ROOT"/Cargo.toml --verbose && \
cp "$CARGO_TARGET_DIR"/debug/colour-contrast $3
cp "$CARGO_TARGET_DIR"/debug/contrast $3
else
echo "RELEASE MODE"
cargo build --manifest-path \
"$MESON_SOURCE_ROOT"/Cargo.toml --release && \
cp "$CARGO_TARGET_DIR"/release/colour-contrast $3
cp "$CARGO_TARGET_DIR"/release/contrast $3
fi
{
"app-id": "org.gnome.design.ColourContrastDevel",
"app-id": "org.gnome.design.ContrastDevel",
"runtime": "org.gnome.Platform",
"runtime-version": "master",
"sdk": "org.gnome.Sdk",
"sdk-extensions": [
"org.freedesktop.Sdk.Extension.rust-stable"
],
"command": "colour-contrast",
"command": "contrast",
"tags": [
"nightly"
],
......@@ -28,9 +28,9 @@
],
"env": {
"RUSTFLAGS": "--remap-path-prefix =../ --error-format=human",
"CARGO_HOME": "/run/build/colour-contrast/cargo",
"CARGO_HOME": "/run/build/contrast/cargo",
"RUST_BACKTRACE": "1",
"RUST_LOG": "colour-contrast=debug"
"RUST_LOG": "contrast=debug"
}
},
"modules": [{
......@@ -54,14 +54,14 @@
}]
},
{
"name": "colour-contrast",
"name": "contrast",
"buildsystem": "meson",
"config-opts": [
"-Dprofile=development"
],
"sources": [{
"type": "git",
"url": "https://gitlab.gnome.org/World/design/colour-contrast.git"
"url": "https://gitlab.gnome.org/World/design/contrast.git"
}]
}
]
......
......@@ -5,14 +5,14 @@
xmlns:foaf="http://xmlns.com/foaf/0.1/"
xmlns:gnome="http://api.gnome.org/doap-extensions#"
xmlns="http://usefulinc.com/ns/doap#">
<name xml:lang="en">Colour Contrast</name>
<name xml:lang="en">Contrast</name>
<shortdesc xml:lang="en">
Colour Contrast
Contrast
</shortdesc>
<description xml:lang="en">
Check the contrast between a foreground and background colour
</description>
<bug-database rdf:resource="https://gitlab.gnome.org/World/design/colour-contrast" />
<bug-database rdf:resource="https://gitlab.gnome.org/World/design/contrast" />
<category rdf:resource="http://api.gnome.org/doap-extensions#apps" />
<programming-language>Rust</programming-language>
<maintainer>
......
install_data(
'org.gnome.design.ColourContrast.svg',
'org.gnome.design.Contrast.svg',
install_dir: iconsdir / 'hicolor' / 'scalable' / 'apps',
rename: '@0@.svg'.format(application_id)
)
install_data(
'org.gnome.design.ColourContrast-symbolic.svg',
'org.gnome.design.Contrast-symbolic.svg',
install_dir: iconsdir / 'hicolor' / 'symbolic' / 'apps',
rename: '@0@-symbolic.svg'.format(application_id)
)
......@@ -5,7 +5,7 @@ desktop_conf.set('icon', application_id)
desktop_file = i18n.merge_file (
type: 'desktop',
input: configure_file(
input: 'org.gnome.design.ColourContrast.desktop.in.in',
input: 'org.gnome.design.Contrast.desktop.in.in',
output: '@BASENAME@',
configuration: desktop_conf
),
......@@ -31,7 +31,7 @@ appdata_conf.set('app-id', application_id)
appdata_conf.set('gettext-package', gettext_package)
appdata_file = i18n.merge_file (
input: configure_file(
input: 'org.gnome.design.ColourContrast.appdata.xml.in.in',
input: 'org.gnome.design.Contrast.appdata.xml.in.in',
output: '@BASENAME@',
configuration: appdata_conf
),
......@@ -55,7 +55,7 @@ gschema_conf = configuration_data()
gschema_conf.set('app-id', application_id)
gschema_conf.set('gettext-package', gettext_package)
configure_file(
input: 'org.gnome.design.ColourContrast.gschema.xml.in',
input: 'org.gnome.design.Contrast.gschema.xml.in',
output: '@0@.gschema.xml'.format(application_id),
configuration: gschema_conf,
install: true,
......
......@@ -4,19 +4,19 @@
<id>@app-id@</id>
<metadata_license>CC0</metadata_license>
<project_license>GPL-3.0+</project_license>
<name>Colour Contrast</name>
<name>Contrast</name>
<summary>Find Adwaita icons</summary>
<description>
<p>Find the right icon to use on your GNOME application.</p>
</description>
<screenshots>
<screenshot type="default">
<image>https://gitlab.gnome.org/World/design/colour-contrast/raw/master/data/resources/screenshots/screenshot1.png</image>
<image>https://gitlab.gnome.org/World/design/contrast/raw/master/data/resources/screenshots/screenshot1.png</image>
<caption>Main Window</caption>
</screenshot>
</screenshots>
<url type="homepage">https://gitlab.gnome.org/World/design/colour-contrast</url>
<url type="bugtracker">https://gitlab.gnome.org/World/design/colour-contrast/issues</url>
<url type="homepage">https://gitlab.gnome.org/World/design/contrast</url>
<url type="bugtracker">https://gitlab.gnome.org/World/design/contrast/issues</url>
<url type="donation">https://liberapay.com/bielmoussaoui</url>
<content_rating type="oars-1.0" />
<kudos>
......
[Desktop Entry]
Name=Colour Contrast
GenericName=Colour Contrast
Name=Contrast
GenericName=Contrast
Comment=Find the right icon to use on your GNOME application
Type=Application
Exec=colour-contrast
Exec=contrast
Terminal=false
Categories=Utility;GNOME;GTK;
Keywords=Colour;Contrast;Gnome;GTK;
......
<?xml version="1.0" encoding="utf-8"?>
<schemalist>
<schema path="/org/gnome/design/ColourContrast/" id="@app-id@" gettext-domain="@gettext-package@">
<schema path="/org/gnome/design/Contrast/" id="@app-id@" gettext-domain="@gettext-package@">
<key name="window-x" type="i">
<default>-1</default>
<summary>Left position of the last opened window</summary>
......
<?xml version="1.0" encoding="UTF-8"?>
<gresources>
<gresource prefix="/org/gnome/design/ColourContrast/">
<gresource prefix="/org/gnome/design/Contrast/">
<file compressed="true" preprocess="xml-stripblanks">about_dialog.ui</file>
<file compressed="true" preprocess="xml-stripblanks" alias="shortcuts.ui">resources/ui/shortcuts.ui</file>
<file compressed="true" preprocess="xml-stripblanks" alias="menu.ui">resources/ui/menu.ui</file>
......
......@@ -50,26 +50,6 @@
.chart-bar-marker separator {
background-color: @foreground_color;
}
/* ColorPopover */
.colour-popover {
padding: 10px;
background: mix(darker(@background_color), @background_color, 0.7);
border: 1px solid darker(@background_color);
}
.colour-popover label {
color: @foreground_color;
}
.colour-popover button,
.colour-popover button:active,
.colour-popover button:focus,
.colour-popover button:backdrop {
color: @foreground_color;
background: lighter(@background_color);
border: 1px solid darker(@background_color);
box-shadow: 0 0; /* FIXME: Use a better shadow instead */
}
/*Hackish way to remove extra left spacing */
.colour-popover colorchooser overlay grid{
margin-left:-30px;
......
......@@ -6,9 +6,9 @@
<property name="can_focus">False</property>
<property name="modal">True</property>
<property name="type_hint">dialog</property>
<property name="program_name">@name-prefix@Colour Contrast</property>
<property name="program_name">@name-prefix@Contrast</property>
<property name="version">@version@</property>
<property name="website">https://gitlab.gnome.org/World/design/colour-contrast</property>
<property name="website">https://gitlab.gnome.org/World/design/contrast</property>
<property name="authors">Bilal Elmoussaoui</property>
<property name="translator_credits" translatable="yes">translator-credits</property>
<property name="artists">Tobias Bernard</property>
......
......@@ -7,7 +7,7 @@
<attribute name="action">win.show-help-overlay</attribute>
</item>
<item>
<attribute name="label" translatable="yes">_About Colour Contrast</attribute>
<attribute name="label" translatable="yes">_About Contrast</attribute>
<attribute name="action">app.about</attribute>
</item>
</menu>
......
......@@ -4,7 +4,7 @@
<requires lib="gtk+" version="3.20"/>
<object class="GtkApplicationWindow" id="window">
<property name="can_focus">False</property>
<property name="title">@name-prefix@ Colour Contrast</property>
<property name="title">@name-prefix@ Contrast</property>
<property name="default_width">650</property>
<property name="default_height">500</property>
<property name="icon_name">@app-id@</property>
......@@ -12,7 +12,7 @@
<object class="HdyHeaderBar" id="headerbar">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="title" translatable="yes">@name-prefix@Colour Contrast</property>
<property name="title" translatable="yes">@name-prefix@Contrast</property>
<property name="show_close_button">True</property>
<property name="centering_policy">HDY_CENTERING_POLICY_LOOSE</property>
<child>
......
project('colour-contrast',
project('contrast',
'rust',
version: '0.0.1',
license: 'GPL3')
......@@ -52,7 +52,7 @@ else
version_suffix = ''
endif
application_id = 'org.gnome.design.ColourContrast@0@'.format(profile)
application_id = 'org.gnome.design.Contrast@0@'.format(profile)
subdir('po')
subdir('data')
......
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