Skip to content

Commit ee0d2de

Browse files
Merge pull request #119 from SubhadeepJasu/v3.1
All fixes and improvements for V3.1
2 parents b2b7b6f + c0ede57 commit ee0d2de

26 files changed

Lines changed: 375 additions & 127 deletions

.github/workflows/lint.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212

1313
steps:
1414
- name: Checkout
15-
uses: actions/checkout@v2
15+
uses: actions/checkout@v6
1616

1717
- name: Lint
1818
run: io.elementary.vala-lint -d .
@@ -24,7 +24,7 @@ jobs:
2424
matrix:
2525
python-version: ["3.12"]
2626
steps:
27-
- uses: actions/checkout@v4
27+
- uses: actions/checkout@v6
2828
- name: Set up Python ${{ matrix.python-version }}
2929
uses: actions/setup-python@v3
3030
with:

data/com.github.subhadeepjasu.pebbles.gschema.xml.in

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,11 @@
5151
<summary>Result Flow</summary>
5252
<description>Whether result action would replace input with result</description>
5353
</key>
54+
<key name="delete-all-clear" type="b">
55+
<default>false</default>
56+
<summary>All Clear using Delete</summary>
57+
<description>Whether to clear all values when delete is pressed</description>
58+
</key>
5459
<key name="constant-key-value1" enum="@SCHEMA_ID@.constant-key-index">
5560
<default>"euler"</default>
5661
<summary>Choose Constant 1</summary>

data/meson.build

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,6 @@ foreach b : blueprint_files
4545
bfs += meson.current_source_dir () / b
4646
endforeach
4747

48-
run_command ('blueprint-compiler', 'batch-compile', meson.project_build_root () / 'data/ui', meson.current_source_dir () / 'ui', bfs, check: true)
49-
5048
blueprints = custom_target ('blueprints',
5149
input: files (blueprint_files),
5250
output: '.',

data/style.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ $LCD_FG_COLOR: #272863bb;
6363
0 0 0 1px #0006,
6464
inset 0 1px 0 #fff4,
6565
inset 0 -1px 0 #fff2,
66-
0 12px 24px #545e5473;
66+
0 12px 24px #aec3ae73;
6767

6868
color: $LCD_FG_COLOR;
6969
padding-top: 8px;

data/ui/calculus_view.blp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ template $PebblesCalculusView: $PebblesView {
5252
$PebblesButton all_clear_button {
5353
label_text: _("AC");
5454
tooltip_desc: _("All Clear");
55-
accel_markup: "<Shift>BackSpace";
55+
accel_markup: bind template.all_clear_key;
5656
focus-on-click: false;
57-
key: "<Shift>BackSpace";
57+
key: bind template.all_clear_key;
5858

5959
styles [
6060
"destructive-action",

data/ui/converter_view.blp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,9 @@ template $PebblesConverterView: $PebblesView {
109109
$PebblesButton all_clear_button {
110110
label_text: _("AC");
111111
tooltip_desc: _("All Clear");
112-
accel_markup: "<Shift>BackSpace";
112+
accel_markup: bind template.all_clear_key;
113113
focus-on-click: false;
114-
key: "<Shift>BackSpace";
114+
key: bind template.all_clear_key;
115115

116116
styles [
117117
"destructive-action",

data/ui/graphing_view.blp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ template $PebblesGraphingView: $PebblesView {
4949
$PebblesButton all_clear_button {
5050
label_text: _("AC");
5151
tooltip_desc: _("All Clear");
52-
accel_markup: "Delete";
52+
accel_markup: bind template.all_clear_key;
5353
focus-on-click: false;
54-
key: "delete";
54+
key: bind template.all_clear_key;
5555

5656
styles [
5757
"destructive-action",

data/ui/preferences_dialog.blp

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,15 @@ template $PebblesPreferencesDialog: Adw.PreferencesDialog {
1818
notify::active => $load_session_notify_active_cb();
1919
}
2020

21+
Adw.SwitchRow {
22+
title: _("All Clear On [Delete] Key");
23+
subtitle: _("Clear all values when delete is pressed");
24+
focus-on-click: false;
25+
focusable: false;
26+
active: bind template.settings as <$PebblesSettings>.delete_all_clear;
27+
notify::active => $delete_all_clear_notify_active_cb();
28+
}
29+
2130
Adw.ActionRow decimal_places {
2231
title: _("Decimal Places");
2332
subtitle: _("Number of decimal places after radix symbol");

data/ui/programmer_view.blp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@ template $PebblesProgrammerView: $PebblesView {
5757
$PebblesButton all_clear_button {
5858
label_text: _("AC");
5959
tooltip_desc: _("All Clear");
60-
accel_markup: "<Shift>BackSpace";
60+
accel_markup: bind template.all_clear_key;
6161
focus-on-click: false;
62-
key: "<Shift>BackSpace";
62+
key: bind template.all_clear_key;
6363

6464
styles [
6565
"destructive-action",

data/ui/scientific_view.blp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ template $PebblesScientificView: $PebblesView {
5252
$PebblesButton all_clear_button {
5353
label_text: _("AC");
5454
tooltip_desc: _("All Clear");
55-
accel_markup: "<Shift>BackSpace";
55+
accel_markup: bind template.all_clear_key;
5656
focus-on-click: false;
57-
key: "<Shift>BackSpace";
57+
key: bind template.all_clear_key;
5858

5959
styles [
6060
"destructive-action",

0 commit comments

Comments
 (0)