Fully integrate history with programmer mode

Author: SubhadeepJasu

data/ui/calculus_display.blp

@@ -60,7 +60,6 @@ template $PebblesCalculusDisplay: $PebblesDisplay {
     ScrolledWindow viewport {
         propagate-natural-height: false;
         vexpand: true;
-        window-placement: bottom_left;
         min-content-height: 100;
 
         layout {

data/ui/programmer_display.blp

@@ -223,7 +223,6 @@ template $PebblesProgrammerDisplay: $PebblesDisplay {
                 propagate-natural-height: false;
                 vexpand: true;
                 hexpand: true;
-                window-placement: bottom_left;
                 min-content-height: 100;
 
                 layout {
@@ -240,9 +239,9 @@ template $PebblesProgrammerDisplay: $PebblesDisplay {
                     $PebblesHistoryDisplay history_display {
                         context: bind template.context;
                         viewport: viewport;
-                        visible: false;
-                        // inserted => $insert_from_history();
-                        // recalled => $recall_history();
+
+                        inserted => $insert_from_history();
+                        recalled => $recall_history();
                     }
 
                     Label main_label {

data/ui/programmer_view.blp

@@ -501,7 +501,7 @@ template $PebblesProgrammerView: $PebblesView {
               column: 4;
             }
 
-            // clicked => $on_click_eval();
+            clicked => $on_click_eval();
           }
         }
       };
@@ -876,7 +876,7 @@ template $PebblesProgrammerView: $PebblesView {
               column: 2;
             }
 
-            // clicked => $on_click_eval();
+            clicked => $on_click_eval();
           }
 
           $PebblesButton collapse_fx_button {

data/ui/scientific_display.blp

@@ -60,7 +60,6 @@ template $PebblesScientificDisplay: $PebblesDisplay {
     ScrolledWindow viewport {
         propagate-natural-height: false;
         vexpand: true;
-        window-placement: bottom_left;
         min-content-height: 100;
 
         layout {

data/ui/statistics_display.blp

@@ -128,7 +128,6 @@ template $PebblesStatisticsDisplay: $PebblesDisplay {
             has-frame: false;
             hexpand: true;
             vexpand: true;
-            window-placement: bottom_left;
             min-content-height: 100;
             width-request: 140;
 

src/core/programmer_calculator.py

@@ -40,6 +40,7 @@ def __init__(self, memory: ContextualMemory):
         self.stored_tokens: list[_ProgToken] = [
             _ProgToken("0", ProgrammersCalculator.TOKEN_TYPE_OPERAND, Pebbles.NumberSystem.DECIMAL)
         ]
+        self.input_exp = ''
 
 
     def get_last_token(self):
@@ -67,6 +68,7 @@ def set_last_token(self, arr:list[bool], wrd_length:Pebbles.GlobalWordLength, nu
 
     def populate_token_array(self, exp: str, number_system:Pebbles.NumberSystem):
         _stored_tokens = Tokenizer.get_token_array (exp, number_system)
+        self.input_exp = exp
         self.stored_tokens = [_ProgToken(x['token'], x['type'], x['numberSystem']) for x in _stored_tokens]
 
 
@@ -78,6 +80,7 @@ def set_number_system(self,
                          ) -> str:
         # Tokenize the current expression regardless of the stored tokens.
         token_structure = Tokenizer.get_token_array(exp, number_system)
+        self.input_exp = exp
 
         # For every token in stored_tokens, if it is an operand and its current number system
         # is different from the required number system, perform conversion.
@@ -598,11 +601,10 @@ def evaluate(self, number_system: Pebbles.NumberSystem, wrd_length: Pebbles.Glob
 
             if gen_hist:
                 token_list = [token.token for token in self.stored_tokens]
-                expression = " ".join(token_list)
                 self.memory.push_history(
                     self.MODE,
-                    expression,
-                    formatted_answer,
+                    self.input_exp,
+                    Utils.remove_leading_zeroes(formatted_answer),
                     {
                         'metadata_1': number_system,
                         'metadata_2': wrd_length

src/shell/MainWindow.vala

@@ -753,6 +753,9 @@ namespace Pebbles {
                 case Context.CALCULUS:
                     calculus_view.show_history (_history);
                     break;
+                case Context.PROGRAMMER:
+                    programmer_view.show_history (_history);
+                    break;
             }
         }
 

src/shell/main_window.py

@@ -151,14 +151,21 @@ def _history_view_cb(self, _, context:str):
                     format_func=ScientificCalculator.format,
                     context=context
                 ), context)
+        elif context == Pebbles.Context.PROGRAMMER:
+            self.show_history(self._memory.get_views(
+                    format_func=None,
+                    context=context
+                ), context)
 
 
     def _history_insert_cb(self, _, item_id:int):
         item = self._memory.get_history_by_id(item_id)
         context = item.get_context()
         result = item.get_result()
-        if context in [Pebbles.Context.SCIENTIFIC, Pebbles.Context.STATISTICS]:
+        if context in [Pebbles.Context.SCIENTIFIC, Pebbles.Context.STATISTICS, Pebbles.Context.CALCULUS]:
             return ScientificCalculator.format(result)
+        elif context == Pebbles.Context.PROGRAMMER:
+            return result
         return ''
 
 

src/shell/views/ProgrammerView.vala

@@ -128,6 +128,10 @@ namespace Pebbles {
             display.show_result (result);
         }
 
+        public void show_history (HistoryModel[] history) {
+            display.show_history (history);
+        }
+
         // Updated set_keypad_mode to use hex keypad button references
         private void set_keypad_mode (int mode) {
             seven_button.set_sensitive (true);
@@ -194,6 +198,11 @@ namespace Pebbles {
             display.write (shift_button.active ? btn.name.up () : btn.name);
         }
 
+        [GtkCallback]
+        public void on_click_eval () {
+            display.input ();
+        }
+
         public void open_bit_grid () {
             programmer_stack.set_visible_child (bit_grid);
         }

src/shell/widgets/displays/CalculusDisplay.vala

@@ -134,8 +134,7 @@ namespace Pebbles {
 
         [GtkCallback]
         protected void insert_from_history (string? text) {
-            focused_entry.set_text (focused_entry.get_text () + text);
-            focused_entry.set_position ((int) focused_entry.text_length);
+            write (text);
         }
 
         [GtkCallback]