Fixed multiple things and integrated programmer mode with history module

SubhadeepJasu · SubhadeepJasu · commit 771dd6fa6ce6 · 2025-08-24T19:29:29.000+05:30
diff --git a/data/ui/calculus_view.blp b/data/ui/calculus_view.blp
@@ -52,9 +52,9 @@ template $PebblesCalculusView: $PebblesView {
         $PebblesButton all_clear_button {
           label_text: _("AC");
           tooltip_desc: _("All Clear");
-          accel_markup: "Delete";
+          accel_markup: "<Shift>BackSpace";
           focus-on-click: false;
-          key: "delete";
+          key: "<Shift>BackSpace";
 
           styles [
             "destructive-action",
diff --git a/data/ui/programmer_display.blp b/data/ui/programmer_display.blp
@@ -246,6 +246,8 @@ template $PebblesProgrammerDisplay: $PebblesDisplay {
                     }
 
                     Label main_label {
+                        label: "0";
+
                         styles [
                             "lcd-label"
                         ]
diff --git a/data/ui/programmer_view.blp b/data/ui/programmer_view.blp
@@ -57,9 +57,9 @@ template $PebblesProgrammerView: $PebblesView {
           $PebblesButton all_clear_button {
             label_text: _("AC");
             tooltip_desc: _("All Clear");
-            accel_markup: "Delete";
+            accel_markup: "<Shift>BackSpace";
             focus-on-click: false;
-            key: "delete";
+            key: "<Shift>BackSpace";
 
             styles [
               "destructive-action",
@@ -85,7 +85,7 @@ template $PebblesProgrammerView: $PebblesView {
               column: 1;
             }
 
-            // clicked => $on_backspace();
+            clicked => $on_backspace();
           }
 
           $PebblesButton lsh_rsh_button {
diff --git a/data/ui/scientific_view.blp b/data/ui/scientific_view.blp
@@ -52,9 +52,9 @@ template $PebblesScientificView: $PebblesView {
         $PebblesButton all_clear_button {
           label_text: _("AC");
           tooltip_desc: _("All Clear");
-          accel_markup: "Delete";
+          accel_markup: "<Shift>BackSpace";
           focus-on-click: false;
-          key: "delete";
+          key: "<Shift>BackSpace";
 
           styles [
             "destructive-action",
diff --git a/data/ui/statistics_view.blp b/data/ui/statistics_view.blp
@@ -52,9 +52,9 @@ template $PebblesStatisticsView: $PebblesView {
         $PebblesButton all_clear_button {
           label_text: _("AC");
           tooltip_desc: _("All Clear");
-          accel_markup: "Delete";
+          accel_markup: "<Shift>BackSpace";
           focus-on-click: false;
-          key: "delete";
+          key: "<Shift>BackSpace";
 
           styles [
             "destructive-action",
diff --git a/src/ControlsScheme.vala b/src/ControlsScheme.vala
@@ -39,7 +39,7 @@ namespace Pebbles {
                     _("Close Dialog"), "Escape"
                 },
                 {
-                    _("All Clear"), "Delete"
+                    _("All Clear"), "<Shift>BackSpace"
                 },
                 {
                     _("Copy Result"), "<Ctrl>C"
diff --git a/src/core/memory.py b/src/core/memory.py
@@ -247,8 +247,12 @@ def get_views(self, format_func:callable, context=Pebbles.Context.SCIENTIFIC):
         cursor = conn.cursor()
         cursor.execute(ContextualMemory.HISTORY_VIEW_QUERY, (context,))
         history_entries = cursor.fetchall()
-        views = [Pebbles.HistoryModel.new_for_view(id, context, inp, format_func(res))
-                 for id, inp, res in history_entries]
+        if format_func is not None:
+            views = [Pebbles.HistoryModel.new_for_view(id, context, inp, format_func(res))
+                     for id, inp, res in history_entries]
+        else:
+            views = [Pebbles.HistoryModel.new_for_view(id, context, inp, res)
+                     for id, inp, res in history_entries]
         conn.close()
         return views
 
diff --git a/src/core/programmer_calculator.py b/src/core/programmer_calculator.py
@@ -197,7 +197,7 @@ def represent_binary_by_word_length (self,
                 required_bit_length = 64
 
         if len(binary_value) > required_bit_length:
-            new_binary = binary_value[- (required_bit_length + 1) :]
+            new_binary = binary_value[-required_bit_length:]
         else:
             pre_zeros = "0" * (required_bit_length - len(binary_value))
             new_binary = pre_zeros + binary_value
@@ -597,12 +597,15 @@ def evaluate(self, number_system: Pebbles.NumberSystem, wrd_length: Pebbles.Glob
             formatted_answer = self.bool_array_to_string(answer, wrd_length, number_system)
 
             if gen_hist:
+                token_list = [token.token for token in self.stored_tokens]
+                expression = " ".join(token_list)
                 self.memory.push_history(
                     self.MODE,
-                    self.input_dict['input'],
-                    str(answer.token),
-                    {'metadata_1': number_system,
-                     'metadata_2': wrd_length
+                    expression,
+                    formatted_answer,
+                    {
+                        'metadata_1': number_system,
+                        'metadata_2': wrd_length
                     }
                 )
             result_json = json.dumps({'mode': self.MODE, 'result': formatted_answer})
@@ -668,7 +671,6 @@ def operand_pop():
         return operand_pop()
 
 
-
 class _ProgToken:
     def __init__(self, token:str, token_type:int, number_system:Pebbles.NumberSystem):
         self.token = token
diff --git a/src/core/scientific_calculator.py b/src/core/scientific_calculator.py
@@ -169,8 +169,10 @@ def _handle_special_variables (self, token, operand_stack):
             operand_stack.append(self.substitutions['M'])
         else:
             operand_stack.append(float(token))
+
+
     @staticmethod
-    def format(result: any):
+    def format(result: any) -> str:
         """
         Format scientific result.
         """
diff --git a/src/shell/MainWindow.vala b/src/shell/MainWindow.vala
@@ -127,6 +127,7 @@ namespace Pebbles {
 
         public signal bool on_key_down (string? context, uint keyval);
         public signal void on_key_up (string? context, uint keyval);
+        public signal void on_all_clear (string? context);
         public signal void on_history_view (string context);
         public signal string on_history_copy (int id);
         public signal string on_history_insert (int id);
@@ -539,6 +540,10 @@ namespace Pebbles {
                     set_shift_on (!lock_on);
                 }
 
+                if (keyval == Gdk.Key.BackSpace && (modifier & Gdk.ModifierType.SHIFT_MASK) != 0) {
+                    on_all_clear (view_stack.visible_child_name);
+                }
+
                 if ((
                     modifier &
                     (
diff --git a/src/shell/main_window.py b/src/shell/main_window.py
@@ -105,7 +105,12 @@ def _evaluation_thread(self, data: str):
             ), Pebbles.Context.CALCULUS)
         elif data_dict['context'] == Pebbles.Context.PROGRAMMER:
             result_data, result = self.programmer_calc.evaluate(
-                data_dict['numberSystem'], data_dict['wordLength'], False)
+                data_dict['numberSystem'], data_dict['wordLength'], True)
+            self._commit_to_memory(result, Pebbles.Context.PROGRAMMER, data_dict['memoryOp'])
+            self.show_history(self._memory.get_views(
+                format_func=None,
+                context=Pebbles.Context.PROGRAMMER
+            ), Pebbles.Context.PROGRAMMER)
         else:
             return
 
diff --git a/src/shell/views/ProgrammerView.vala b/src/shell/views/ProgrammerView.vala
@@ -130,72 +130,48 @@ namespace Pebbles {
 
         // Updated set_keypad_mode to use hex keypad button references
         private void set_keypad_mode (int mode) {
-            switch (mode) {
-                case 0:
-                    seven_button.set_sensitive (true);
-                    eight_button.set_sensitive (true);
-                    nine_button.set_sensitive (true);
-                    hex_a_button.set_sensitive (true);
-                    hex_d_button.set_sensitive (true);
-                    four_button.set_sensitive (true);
-                    five_button.set_sensitive (true);
-                    six_button.set_sensitive (true);
-                    hex_b_button.set_sensitive (true);
-                    hex_e_button.set_sensitive (true);
-                    two_button.set_sensitive (true);
-                    three_button.set_sensitive (true);
-                    hex_c_button.set_sensitive (true);
-                    hex_f_button.set_sensitive (true);
-                    break;
-                case 1:
-                    seven_button.set_sensitive (true);
-                    eight_button.set_sensitive (true);
-                    nine_button.set_sensitive (true);
-                    hex_a_button.set_sensitive (false);
-                    hex_d_button.set_sensitive (false);
-                    four_button.set_sensitive (true);
-                    five_button.set_sensitive (true);
-                    six_button.set_sensitive (true);
-                    hex_b_button.set_sensitive (false);
-                    hex_e_button.set_sensitive (false);
-                    two_button.set_sensitive (true);
-                    three_button.set_sensitive (true);
-                    hex_c_button.set_sensitive (false);
-                    hex_f_button.set_sensitive (false);
-                    break;
-                case 2:
-                    seven_button.set_sensitive (true);
-                    eight_button.set_sensitive (false);
-                    nine_button.set_sensitive (false);
-                    hex_a_button.set_sensitive (false);
-                    hex_d_button.set_sensitive (false);
-                    four_button.set_sensitive (true);
-                    five_button.set_sensitive (true);
-                    six_button.set_sensitive (true);
-                    hex_b_button.set_sensitive (false);
-                    hex_e_button.set_sensitive (false);
-                    two_button.set_sensitive (true);
-                    three_button.set_sensitive (true);
-                    hex_c_button.set_sensitive (false);
-                    hex_f_button.set_sensitive (false);
-                    break;
-                case 3:
-                    seven_button.set_sensitive (false);
-                    eight_button.set_sensitive (false);
-                    nine_button.set_sensitive (false);
-                    hex_a_button.set_sensitive (false);
-                    hex_d_button.set_sensitive (false);
-                    four_button.set_sensitive (false);
-                    five_button.set_sensitive (false);
-                    six_button.set_sensitive (false);
-                    hex_b_button.set_sensitive (false);
-                    hex_e_button.set_sensitive (false);
-                    two_button.set_sensitive (false);
-                    three_button.set_sensitive (false);
-                    hex_c_button.set_sensitive (false);
-                    hex_f_button.set_sensitive (false);
-                    break;
-            }
+            seven_button.set_sensitive (true);
+            eight_button.set_sensitive (true);
+            nine_button.set_sensitive (true);
+            hex_a_button.set_sensitive (true);
+            hex_d_button.set_sensitive (true);
+            four_button.set_sensitive (true);
+            five_button.set_sensitive (true);
+            six_button.set_sensitive (true);
+            hex_b_button.set_sensitive (true);
+            hex_e_button.set_sensitive (true);
+            two_button.set_sensitive (true);
+            three_button.set_sensitive (true);
+            hex_c_button.set_sensitive (true);
+            hex_f_button.set_sensitive (true);
+
+            if (mode == 0)
+                return;
+
+            hex_a_button.set_sensitive (false);
+            hex_d_button.set_sensitive (false);
+            hex_b_button.set_sensitive (false);
+            hex_e_button.set_sensitive (false);
+            hex_c_button.set_sensitive (false);
+            hex_f_button.set_sensitive (false);
+
+            if (mode == 1)
+                return;
+
+            eight_button.set_sensitive (false);
+            nine_button.set_sensitive (false);
+
+            if (mode == 2)
+                return;
+
+            seven_button.set_sensitive (false);
+            eight_button.set_sensitive (false);
+            nine_button.set_sensitive (false);
+            four_button.set_sensitive (false);
+            five_button.set_sensitive (false);
+            six_button.set_sensitive (false);
+            two_button.set_sensitive (false);
+            three_button.set_sensitive (false);
         }
 
         [GtkCallback]
@@ -292,6 +268,11 @@ namespace Pebbles {
             display.all_clear ();
         }
 
+        [GtkCallback]
+        public void on_backspace () {
+            display.backspace ();
+        }
+
         [GtkCallback]
         protected void set_bits_from_grid (Gtk.Widget _, bool[] arr) {
             display.set_last_token_from_bit_grid (arr);
diff --git a/src/shell/widgets/displays/CalculusDisplay.vala b/src/shell/widgets/displays/CalculusDisplay.vala
@@ -65,6 +65,12 @@ namespace Pebbles {
                         focused_entry.grab_focus_without_selecting ();
                     }
                 });
+
+                window.on_all_clear.connect ((ctx) => {
+                    if (ctx == context) {
+                        all_clear ();
+                    }
+                });
             });
 
             set_angle_unit (settings.global_angle_unit);
diff --git a/src/shell/widgets/displays/ProgrammerDisplay.vala b/src/shell/widgets/displays/ProgrammerDisplay.vala
@@ -147,6 +147,12 @@ namespace Pebbles {
 
             realize.connect (() => {
                 window = (MainWindow) get_ancestor (typeof (MainWindow));
+
+                window.on_all_clear.connect ((ctx) => {
+                    if (ctx == context) {
+                        all_clear ();
+                    }
+                });
             });
 
             entry_formatter = new EntryFormatter (main_entry, ReplacementMode.PROGRAMMER);
@@ -187,6 +193,22 @@ namespace Pebbles {
             main_entry.set_position (1);
         }
 
+        public void backspace () {
+            int start, end;
+            main_entry.get_selection_bounds (out start, out end);
+
+            if (start == end) {
+                int pos = main_entry.get_position ();
+                if (pos > 0) {
+                    main_entry.delete_text (pos - 1, pos);
+                    main_entry.set_position (pos - 1);
+                }
+            } else {
+                main_entry.delete_text (start, end);
+                main_entry.set_position (start);
+            }
+        }
+
         public void set_last_token_from_bit_grid (bool[] arr) {
             main_entry.set_text (window.on_programmer_set_last_token (
                 arr, settings.global_word_length, settings.number_system));
@@ -285,7 +307,7 @@ namespace Pebbles {
                 }
             }
 
-            if (input_char.length > 0 && full_expression.chug () != "") {
+            if (full_expression.chug () != "") {
                 window.on_programmer_populate_token_array (full_expression, number_system);
             }
 
diff --git a/src/shell/widgets/displays/ScientificDisplay.vala b/src/shell/widgets/displays/ScientificDisplay.vala
@@ -70,6 +70,12 @@ namespace Pebbles {
                         main_entry.grab_focus_without_selecting ();
                     }
                 });
+
+                window.on_all_clear.connect ((ctx) => {
+                    if (ctx == context) {
+                        all_clear ();
+                    }
+                });
             });
 
             set_angle_unit (settings.global_angle_unit);

Original file line number	Diff line number	Diff line change
`@@ -246,6 +246,8 @@ template $PebblesProgrammerDisplay: $PebblesDisplay {`
`246`	`246`	`}`
`247`	`247`
`248`	`248`	`Label main_label {`
	`249`	`+ label: "0";`
	`250`	`+`
`249`	`251`	`styles [`
`250`	`252`	`"lcd-label"`
`251`	`253`	`]`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ namespace Pebbles {`
`39`	`39`	`_("Close Dialog"), "Escape"`
`40`	`40`	`},`
`41`	`41`	`{`
`42`		`- _("All Clear"), "Delete"`
	`42`	`+ _("All Clear"), "<Shift>BackSpace"`
`43`	`43`	`},`
`44`	`44`	`{`
`45`	`45`	`_("Copy Result"), "<Ctrl>C"`