Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add subtitles in preferences #560

Merged
merged 2 commits into from
Oct 30, 2023
Merged

Add subtitles in preferences #560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e5fd9b
Add subtitles in preferences
sstendahl Oct 30, 2023
bc616c4
Update se.sjoerd.Graphs.gschema.xml
sstendahl Oct 30, 2023
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
4 changes: 2 additions & 2 deletions data/se.sjoerd.Graphs.gschema.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<schemalist gettext-domain="graphs">
<enum id="se.sjoerd.Graphs.general.center-values">
<value nick="Center at maximum Y value" value="0"/>
<value nick="Center at middle coordinate" value="1"/>
<value nick="Center at middle X value" value="1"/>
</enum>

<enum id="se.sjoerd.Graphs.general.handle-duplicates-values">
Expand Down Expand Up @@ -62,7 +62,7 @@

<schema id="se.sjoerd.Graphs.general">
<key name="center" enum="se.sjoerd.Graphs.general.center-values">
<default>"Center at middle coordinate"</default>
<default>"Center at middle X value"</default>
</key>
<key name="handle-duplicates" enum="se.sjoerd.Graphs.general.handle-duplicates-values">
<default>"Auto-rename duplicates"</default>
Expand Down
4 changes: 3 additions & 1 deletion data/ui/preferences.blp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,15 @@ template $GraphsPreferencesWindow : Adw.PreferencesWindow {

Adw.ComboRow center {
title: _("Center Action Behaviour");
subtitle: _("Which value to center on when performing a center action");
model: StringList{
strings [_("Center at maximum Y value"), _("Center at middle coordinate")]
strings [_("Center at maximum Y value"), _("Center at middle X value")]
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changing this we also need to update the key in the gschema as well as add logic in migration.py to handle the changed name

Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The main reason for this is that "Center at middle coordinate" is just long enough that it cuts off the last part of the sentence, usign "X value" instead is consistent with the other option and is a bit shorter. But I think you are correct that this logic should applied in the gschema and migration.py as well. Should be a bit careful of adding too much overhead to the migration.py and not change strings when not needed, so I'm open to keeping this string as-is for now and re-evaluate all strings later in a seperate PR before next release.

In this specific case, I just checked, and it seems to work fine without any new logic in migration.py. When I set it to "center at max Y" in Graphs 1.6, it is still at "center at max Y" in this commit. And when I set it to "center at middle X" in graphs 1.6, it is still at "center at middle X" in this latest commit.

This could be because "enum 0" (center at max Y) is unchanged in string, so that setting will be nicely copied over. And "enum 1" (center at middle X) is the default. So when reverting to this default value with this changing key, it still ends up correctly. I maybe need to think about it to be sure, but I think in this specific case new migration logic would not be necessary.

};
}

Adw.ComboRow handle_duplicates {
title: _("Handle Duplicate Items");
subtitle: _("How to treat imported files with identical filenames");
model: StringList{
strings [_("Auto-rename duplicates"), _("Ignore duplicates"), _("Add duplicates"), _("Override existing items")]
};
Expand Down