Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
uses: flatpak/flatpak-github-actions/flatpak-builder@v6
with:
bundle: cherrypick.flatpak
manifest-path: io.github.elly_code.cherrypick.yml
manifest-path: io.github.ellie_commons.cherrypick.yml
run-tests: true
repository-name: appcenter
repository-url: https://flatpak.elementary.io/repo.flatpakrepo
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@
<img alt="An icon of an eyedropper with a rainbow circle in the background" src="data/icons/png/128.png">
<h1>Cherrypick</h1>
<h3>Cherry-pick colors on your screen</h3>
<span align="center"> <img class="center" src="https://github.com/elly-code/cherrypick/blob/main/data/screenshots/window-light.png" alt="A screenshot of a window with a side displaying options and the other a single solid color"></span>
<span align="center"> <img class="center" src="https://github.com/ellie-commons/cherrypick/blob/main/data/screenshots/window-light.png" alt="A screenshot of a window with a side displaying options and the other a single solid color"></span>
</div>

<a href="https://elementary.io">
<img src="https://elly-code.github.io/community-badge.svg" alt="Made for elementary OS">
<img src="https://ellie-commons.github.io/community-badge.svg" alt="Made for elementary OS">
</a>

## Installation

Cherrypick is designed and developed primarily for [elementary OS]. The latest stable release is available via AppCenter.

[![Get it on AppCenter](https://appcenter.elementary.io/badge.svg?new)](https://appcenter.elementary.io/io.github.elly_code.cherrypick)
[![Get it on AppCenter](https://appcenter.elementary.io/badge.svg?new)](https://appcenter.elementary.io/io.github.ellie_commons.cherrypick)

[<img src="https://flathub.org/assets/badges/flathub-badge-en.svg" width="160" alt="Download on Flathub">](https://flathub.org/apps/io.github.elly_code.cherrypick)
[<img src="https://flathub.org/assets/badges/flathub-badge-en.svg" width="160" alt="Download on Flathub">](https://flathub.org/apps/io.github.ellie_commons.cherrypick)



Expand All @@ -35,7 +35,7 @@ and run the following command:
### On elementary OS or with its appcenter remote installed

```bash
flatpak-builder --force-clean --user --install-deps-from=appcenter --install builddir ./io.github.elly_code.cherrypick.yml
flatpak-builder --force-clean --user --install-deps-from=appcenter --install builddir ./io.github.ellie_commons.cherrypick.yml
```

### On other systems:
Expand Down
6 changes: 3 additions & 3 deletions data/cherrypick.desktop.in
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ GenericName=Color Picker
Comment=Pick colors on your screen
Categories=Graphics;Utility;

Icon=io.github.elly_code.cherrypick
Exec=io.github.elly_code.cherrypick
Icon=io.github.ellie_commons.cherrypick
Exec=io.github.ellie_commons.cherrypick
SingleMainWindow=true
Terminal=false
Keywords=Color;Pick;Eyedropper;Picker;
Expand All @@ -16,4 +16,4 @@ Actions=ImmediatelyPick;
[Desktop Action ImmediatelyPick]
Name=Pick a color
Icon=color-picker
Exec=io.github.elly_code.cherrypick --immediately-pick
Exec=io.github.ellie_commons.cherrypick --immediately-pick
2 changes: 1 addition & 1 deletion data/cherrypick.gresource.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<gresources>
<gresource prefix="/io/github/elly_code/cherrypick">
<gresource prefix="/io/github/ellie_commons/cherrypick">
<file alias="Application.css">Application.css</file>
</gresource>
</gresources>
6 changes: 3 additions & 3 deletions data/cherrypick.gschema.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<schemalist>
<enum id="io.github.elly_code.cherrypick.format">
<enum id="io.github.ellie_commons.cherrypick.format">
<value value="0" nick="hex"/>
<value value="1" nick="rgb"/>
<value value="2" nick="rgba"/>
Expand All @@ -9,7 +9,7 @@
<value value="5" nick="hsla"/>
</enum>

<schema path="/io/github/elly_code/cherrypick/" id="io.github.elly_code.cherrypick">
<schema path="/io/github/ellie_commons/cherrypick/" id="io.github.ellie_commons.cherrypick">
<key name="color-history" type="as">
<!-- Setting default to some of the colors from elementary palette -->
<default>["rgba(237, 83, 83, 1)", "rgba(243, 115, 41, 1)", "rgba(249, 196, 64, 1)", "rgba(155, 219, 77, 1)", "rgba(165, 109, 226, 1)"]</default>
Expand All @@ -22,7 +22,7 @@
<summary>Color history</summary>
<description>The rgba values for saved snapshot</description>
</key>
<key name="color-format" enum="io.github.elly_code.cherrypick.format">
<key name="color-format" enum="io.github.ellie_commons.cherrypick.format">
<default>"rgba"</default>
<summary>Color format</summary>
<description>Last selected color format</description>
Expand Down
32 changes: 16 additions & 16 deletions data/cherrypick.metainfo.xml.in
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<component type="desktop-application">
<id>io.github.elly_code.cherrypick</id>
<id>io.github.ellie_commons.cherrypick</id>
<name>Cherrypick</name>
<summary>Pick colors on your screen</summary>
<launchable type="desktop-id">io.github.elly_code.cherrypick.desktop</launchable>
<launchable type="desktop-id">io.github.ellie_commons.cherrypick.desktop</launchable>
<metadata_license>CC-BY-4.0</metadata_license>
<project_license>GPL-3.0-or-later</project_license>

Expand All @@ -20,41 +20,41 @@
</description>

<provides>
<id>io.github.ellie_commons.cherrypick</id>
<binary>io.github.ellie_commons.cherrypick</binary>
<id>io.github.elly_code.cherrypick</id>
<binary>io.github.elly_code.cherrypick</binary>
</provides>
<replaces>
<id>io.github.ellie_commons.cherrypick</id>
<id>io.github.elly_code.cherrypick</id>
</replaces>

<content_rating type="oars-1.1"/>
<translation type="gettext" source_locale="en_GB">io.github.elly_code.cherrypick</translation>
<translation type="gettext" source_locale="en_GB">io.github.ellie_commons.cherrypick</translation>
<recommends>
<control>pointing</control>
<control>touch</control>
</recommends>

<developer id="io.github.elly-code">
<developer id="io.github.ellie-commons">
<name>PhoneyBadger + Stella and Charlie</name>
</developer>
<project_group>elly-code</project_group>
<url type="homepage">https://github.com/elly-code/cherrypick</url>
<url type="bugtracker">https://github.com/elly-code/cherrypick/issues</url>
<url type="help">https://github.com/elly-code/cherrypick/issues</url>
<project_group>ellie-commons</project_group>
<url type="homepage">https://github.com/ellie-commons/cherrypick</url>
<url type="bugtracker">https://github.com/ellie-commons/cherrypick/issues</url>
<url type="help">https://github.com/ellie-commons/cherrypick/issues</url>
<url type="donation">https://ko-fi.com/teamcons</url>
<url type="vcs-browser">https://github.com/elly-code/cherrypick</url>
<url type="vcs-browser">https://github.com/ellie-commons/cherrypick</url>

<screenshots>
<screenshot type="default">
<caption>Cherrypick's main window</caption>
<image>
https://github.com/elly-code/cherrypick/blob/main/data/screenshots/window-light.png?raw=true
https://github.com/ellie-commons/cherrypick/blob/main/data/screenshots/window-light.png?raw=true
</image>
</screenshot>
<screenshot>
<caption>Main window with dark theme</caption>
<image>
https://github.com/elly-code/cherrypick/blob/main/data/screenshots/window-dark.png?raw=true
https://github.com/ellie-commons/cherrypick/blob/main/data/screenshots/window-dark.png?raw=true
</image>
</screenshot>
</screenshots>
Expand Down Expand Up @@ -89,7 +89,7 @@
</ul>
</description>
<issues>
<issue url="https://github.com/elly-code/cherrypick/issues/21">Fix alpha not being restored properly</issue>
<issue url="https://github.com/ellie-commons/cherrypick/issues/21">Fix alpha not being restored properly</issue>
</issues>
</release>
<release date="2025-09-13" version="2.1.2">
Expand All @@ -114,7 +114,7 @@
<li>App now works on ARM thanks to @ryonakano!</li>
<li>Add the ability to immediately pick and copy to clipboard</li>
<li>You can right-click on app icon and choose "Immediately pick"</li>
<li>Or set a keybind to "flatpak run io.elly_code.cherrypick --immediately-pick"</li>
<li>Or set a keybind to "flatpak run io.ellie_commons.cherrypick --immediately-pick"</li>
<li>Updated deprecated widgets</li>
<li>Minute tweaks by @ryonakano thanks again!</li>
</ul>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
id: io.github.elly_code.cherrypick
id: io.github.ellie_commons.cherrypick
# elementary SDK is not available on Flathub, so use the elementary BaseApp instead
base: io.elementary.BaseApp
base-version: 'circe-25.08'
runtime: org.gnome.Platform
runtime-version: '49'
sdk: org.gnome.Sdk
command: io.github.elly_code.cherrypick
command: io.github.ellie_commons.cherrypick

finish-args:
- '--share=ipc'
Expand All @@ -30,7 +30,7 @@ modules:
buildsystem: meson
sources:
- type: git
url: https://github.com/elly-code/cherrypick.git
url: https://github.com/ellie-commons/cherrypick.git
tag: 2.3.0
commit: ed215bda8d53d2475597317fb44844a3c35ed325
x-checker-data:
Expand Down
31 changes: 0 additions & 31 deletions io.github.elly_code.cherrypick.yml

This file was deleted.

2 changes: 1 addition & 1 deletion meson.build
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
project('io.github.elly_code.cherrypick',
project('io.github.ellie_commons.cherrypick',
'c', 'vala',
version: '2.3.0')

Expand Down
2 changes: 1 addition & 1 deletion po/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## First Things First

* Clone this repository by opening the terminal in a folder of your choice and typing ```git clone https://github.com/elly_code/cherrypick```
* Clone this repository by opening the terminal in a folder of your choice and typing ```git clone https://github.com/ellie_commons/cherrypick```

## Basics

Expand Down
2 changes: 1 addition & 1 deletion po/de.po
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ msgstr ""
"PO-Revision-Date: 2022-05-29 02:15+0530\n"
"POT-Creation-Date: 2025-12-26 17:04+0100\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"Project-Id-Version: io.github.elly_code.cherrypick\n"
"Project-Id-Version: io.github.ellie_commons.cherrypick\n"
"Report-Msgid-Bugs-To: \n"

#. /TRANSLATORS: Do not translate app name
Expand Down
2 changes: 1 addition & 1 deletion po/es.po
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ msgstr ""
"PO-Revision-Date: 2022-05-29 02:15+0530\n"
"POT-Creation-Date: 2025-12-26 17:04+0100\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"Project-Id-Version: io.github.elly_code.cherrypick\n"
"Project-Id-Version: io.github.ellie_commons.cherrypick\n"
"Report-Msgid-Bugs-To: \n"

#. /TRANSLATORS: Do not translate app name
Expand Down
6 changes: 3 additions & 3 deletions po/extra/de.po
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ msgstr ""
"PO-Revision-Date: 2022-05-29 02:15+0530\n"
"POT-Creation-Date: 2025-12-26 17:04+0100\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"Project-Id-Version: io.github.elly_code.cherrypick\n"
"Project-Id-Version: io.github.ellie_commons.cherrypick\n"
"Report-Msgid-Bugs-To: \n"

#: data/cherrypick.desktop.in:5
Expand Down Expand Up @@ -111,8 +111,8 @@ msgid "You can right-click on app icon and choose \"Immediately pick\""
msgstr "Sie können mit der rechten Maustaste auf das App-Symbol klicken und \"Sofort auswählen\" wählen."

#: data/cherrypick.metainfo.xml.in:92
msgid "Or set a keybind to \"flatpak run io.elly_code.cherrypick --immediately-pick\""
msgstr "Oder setzen Sie eine Schlüsselbindung auf \"flatpak run io.elly_code.cherrypick --immediately-pick\""
msgid "Or set a keybind to \"flatpak run io.ellie_commons.cherrypick --immediately-pick\""
msgstr "Oder setzen Sie eine Schlüsselbindung auf \"flatpak run io.ellie_commons.cherrypick --immediately-pick\""

#: data/cherrypick.metainfo.xml.in:93
msgid "Updated deprecated widgets"
Expand Down
6 changes: 3 additions & 3 deletions po/extra/es.po
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ msgstr ""
"PO-Revision-Date: 2022-05-29 02:15+0530\n"
"POT-Creation-Date: 2025-12-26 17:04+0100\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"Project-Id-Version: io.github.elly_code.cherrypick\n"
"Project-Id-Version: io.github.ellie_commons.cherrypick\n"
"Report-Msgid-Bugs-To: \n"

#: data/cherrypick.desktop.in:5
Expand Down Expand Up @@ -113,8 +113,8 @@ msgid "You can right-click on app icon and choose \"Immediately pick\""
msgstr "Puedes hacer clic con el botón derecho en el icono de la aplicación y elegir \"Elegir inmediatamente\"."

#: data/cherrypick.metainfo.xml.in:92
msgid "Or set a keybind to \"flatpak run io.elly_code.cherrypick --immediately-pick\""
msgstr "O establece un keybind a \"flatpak run io.elly_code.cherrypick --immediately-pick\""
msgid "Or set a keybind to \"flatpak run io.ellie_commons.cherrypick --immediately-pick\""
msgstr "O establece un keybind a \"flatpak run io.ellie_commons.cherrypick --immediately-pick\""

#: data/cherrypick.metainfo.xml.in:93
msgid "Updated deprecated widgets"
Expand Down
2 changes: 1 addition & 1 deletion po/extra/extra.pot
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ msgstr ""

#: data/cherrypick.metainfo.xml.in:92
msgid ""
"Or set a keybind to \"flatpak run io.elly_code.cherrypick --immediately-"
"Or set a keybind to \"flatpak run io.ellie_commons.cherrypick --immediately-"
"pick\""
msgstr ""

Expand Down
6 changes: 3 additions & 3 deletions po/extra/fr.po
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ msgstr ""
"PO-Revision-Date: 2022-05-29 02:15+0530\n"
"POT-Creation-Date: 2025-12-26 17:04+0100\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
"Project-Id-Version: io.github.elly_code.cherrypick\n"
"Project-Id-Version: io.github.ellie_commons.cherrypick\n"
"Report-Msgid-Bugs-To: \n"

#: data/cherrypick.desktop.in:5
Expand Down Expand Up @@ -111,8 +111,8 @@ msgid "You can right-click on app icon and choose \"Immediately pick\""
msgstr "Vous pouvez cliquer avec le bouton droit de la souris sur l'icône de l'application et choisir \"Récupérer immédiatement\""

#: data/cherrypick.metainfo.xml.in:92
msgid "Or set a keybind to \"flatpak run io.elly_code.cherrypick --immediately-pick\""
msgstr "Ou mettre un keybind à \"flatpak run io.elly_code.cherrypick --immediately-pick\""
msgid "Or set a keybind to \"flatpak run io.ellie_commons.cherrypick --immediately-pick\""
msgstr "Ou mettre un keybind à \"flatpak run io.ellie_commons.cherrypick --immediately-pick\""

#: data/cherrypick.metainfo.xml.in:93
msgid "Updated deprecated widgets"
Expand Down
4 changes: 2 additions & 2 deletions po/extra/it.po
Original file line number Diff line number Diff line change
Expand Up @@ -118,10 +118,10 @@ msgstr "Puoi fare clic con il tasto destro sull'icona dell'app e scegliere \"Sel

#: data/cherrypick.metainfo.xml.in:92
msgid ""
"Or set a keybind to \"flatpak run io.elly_code.cherrypick --immediately-"
"Or set a keybind to \"flatpak run io.ellie_commons.cherrypick --immediately-"
"pick\""
msgstr ""
"Oppure imposta un tasto di scelta rapida a \"flatpak run io.elly_code.cherrypick --immediately-pick\""
"Oppure imposta un tasto di scelta rapida a \"flatpak run io.ellie_commons.cherrypick --immediately-pick\""

#: data/cherrypick.metainfo.xml.in:93
msgid "Updated deprecated widgets"
Expand Down
6 changes: 3 additions & 3 deletions po/extra/ru.po
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
msgid ""
msgstr ""
"Project-Id-Version: io.github.elly_code.cherrypick\n"
"Project-Id-Version: io.github.ellie_commons.cherrypick\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2025-12-26 17:04+0100\n"
"PO-Revision-Date: 2022-09-27 20:44+0900\n"
Expand Down Expand Up @@ -126,10 +126,10 @@ msgstr ""

#: data/cherrypick.metainfo.xml.in:92
msgid ""
"Or set a keybind to \"flatpak run io.elly_code.cherrypick --immediately-"
"Or set a keybind to \"flatpak run io.ellie_commons.cherrypick --immediately-"
"pick\""
msgstr ""
"Или установите привязку клавиш на \"flatpak run io.elly_code.cherrypick "
"Или установите привязку клавиш на \"flatpak run io.ellie_commons.cherrypick "
"--immediately-pick\"."

#: data/cherrypick.metainfo.xml.in:93
Expand Down
2 changes: 1 addition & 1 deletion po/fr.po
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ msgstr ""
"PO-Revision-Date: 2022-05-29 02:15+0530\n"
"POT-Creation-Date: 2025-12-26 17:04+0100\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
"Project-Id-Version: io.github.elly_code.cherrypick\n"
"Project-Id-Version: io.github.ellie_commons.cherrypick\n"
"Report-Msgid-Bugs-To: \n"

#. /TRANSLATORS: Do not translate app name
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the io.github.elly_code.cherrypick package.
# This file is distributed under the same license as the io.github.ellie_commons.cherrypick package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: io.github.elly_code.cherrypick\n"
"Project-Id-Version: io.github.ellie_commons.cherrypick\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2025-12-26 17:04+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
Expand Down
Loading
Loading