From a91c206fa729f907ea8afd1cbb7490409aaa4c8d Mon Sep 17 00:00:00 2001 From: lainsce Date: Mon, 12 Feb 2024 14:47:51 -0300 Subject: [PATCH] Update method name --- src/MainWindow.vala | 68 ++++++++++++++++++++++----------------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/src/MainWindow.vala b/src/MainWindow.vala index 12d9e3f..2a680d6 100644 --- a/src/MainWindow.vala +++ b/src/MainWindow.vala @@ -113,8 +113,8 @@ public class Abacus.MainWindow : He.ApplicationWindow { entry.activate.connect (eq_clicked); entry.get_delegate ().insert_text.connect (replace_text); - from_entry.get_entry ().activate.connect (converter_eq_clicked); - from_entry.get_entry ().get_delegate ().insert_text.connect (converter_replace_text); + from_entry.get_internal_entry ().activate.connect (converter_eq_clicked); + from_entry.get_internal_entry ().get_delegate ().insert_text.connect (converter_replace_text); eq.clicked.connect (() => { eq_clicked (); }); eq2.clicked.connect (() => { converter_eq_clicked (); }); @@ -194,10 +194,10 @@ public class Abacus.MainWindow : He.ApplicationWindow { } convertors[convertor_index].show (); - from_entry.get_entry ().set_text (""); - to_entry.get_entry ().set_text (""); + from_entry.get_internal_entry ().set_text (""); + to_entry.get_internal_entry ().set_text (""); - from_entry.get_entry ().grab_focus (); + from_entry.get_internal_entry ().grab_focus (); } private void action_insert (SimpleAction action, Variant? variant) { @@ -221,21 +221,21 @@ public class Abacus.MainWindow : He.ApplicationWindow { private void action_insert_converter (SimpleAction action, Variant? variant) { var token = variant.get_string (); - int new_position = from_entry.get_entry ().get_position (); + int new_position = from_entry.get_internal_entry ().get_position (); int selection_start, selection_end, selection_length; - bool is_text_selected = from_entry.get_entry ().get_selection_bounds (out selection_start, out selection_end); + bool is_text_selected = from_entry.get_internal_entry ().get_selection_bounds (out selection_start, out selection_end); if (is_text_selected) { new_position = selection_end; - from_entry.get_entry ().delete_selection (); + from_entry.get_internal_entry ().delete_selection (); selection_length = selection_end - selection_start; new_position -= selection_length; } - var cursor_position = from_entry.get_entry ().cursor_position; - from_entry.get_entry ().do_insert_text (token, -1, ref cursor_position); + var cursor_position = from_entry.get_internal_entry ().cursor_position; + from_entry.get_internal_entry ().do_insert_text (token, -1, ref cursor_position); new_position += token.char_count (); - from_entry.get_entry ().set_position (new_position); + from_entry.get_internal_entry ().set_position (new_position); } private void eq_clicked () { @@ -265,18 +265,18 @@ public class Abacus.MainWindow : He.ApplicationWindow { } private void converter_eq_clicked () { - converter_position = from_entry.get_entry ().get_position (); - if (from_entry.get_entry ().get_text () != "") { - float convert_value = float.parse (from_entry.get_entry ().get_text ()); + converter_position = from_entry.get_internal_entry ().get_position (); + if (from_entry.get_internal_entry ().get_text () != "") { + float convert_value = float.parse (from_entry.get_internal_entry ().get_text ()); string output = convertors[convertor_index].convert (convert_value); - if (to_entry.get_entry ().get_text () != output) { - to_entry.get_entry ().set_text (output); + if (to_entry.get_internal_entry ().get_text () != output) { + to_entry.get_internal_entry ().set_text (output); position = output.length; } } else { } - to_entry.get_entry ().set_position (position); + to_entry.get_internal_entry ().set_position (position); } private void action_delete () { @@ -305,14 +305,14 @@ public class Abacus.MainWindow : He.ApplicationWindow { } private void action_delete_converter () { - converter_position = from_entry.get_entry ().get_position (); - if (from_entry.get_entry ().get_text ().length > 0) { + converter_position = from_entry.get_internal_entry ().get_position (); + if (from_entry.get_internal_entry ().get_text ().length > 0) { string new_text = ""; int index = 0; unowned unichar c; List news = new List (); - for (int i = 0; from_entry.get_entry ().get_text ().get_next_char (ref index, out c); i++) { + for (int i = 0; from_entry.get_internal_entry ().get_text ().get_next_char (ref index, out c); i++) { if (i + 1 != converter_position) { news.append (c); } @@ -322,10 +322,10 @@ public class Abacus.MainWindow : He.ApplicationWindow { new_text += u.to_string (); } - from_entry.get_entry ().set_text (new_text); + from_entry.get_internal_entry ().set_text (new_text); } - from_entry.get_entry ().set_position (converter_position - 1); + from_entry.get_internal_entry ().set_position (converter_position - 1); } private void action_clear () { @@ -339,11 +339,11 @@ public class Abacus.MainWindow : He.ApplicationWindow { private void action_clear_converter () { converter_position = 0; - from_entry.get_entry ().set_text (""); - to_entry.get_entry ().set_text (""); - set_focus (from_entry.get_entry ()); + from_entry.get_internal_entry ().set_text (""); + to_entry.get_internal_entry ().set_text (""); + set_focus (from_entry.get_internal_entry ()); - from_entry.get_entry ().set_position (converter_position); + from_entry.get_internal_entry ().set_position (converter_position); } private void action_about () { @@ -409,8 +409,8 @@ public class Abacus.MainWindow : He.ApplicationWindow { private void converter_replace_text (string new_text, int new_text_length, ref int position) { if (new_text == "=") { - Signal.stop_emission_by_name ((void*) from_entry.get_entry ().get_delegate (), "insert-text"); - Signal.stop_emission_by_name ((void*) to_entry.get_entry ().get_delegate (), "insert-text"); + Signal.stop_emission_by_name ((void*) from_entry.get_internal_entry ().get_delegate (), "insert-text"); + Signal.stop_emission_by_name ((void*) to_entry.get_internal_entry ().get_delegate (), "insert-text"); converter_eq_clicked (); return; } @@ -418,8 +418,8 @@ public class Abacus.MainWindow : He.ApplicationWindow { for (int i = 0; i < new_text.char_count (); i++) { var chr = new_text.get_char (i); if (!this.allowed_characters.contains (chr)) { - Signal.stop_emission_by_name ((void*) from_entry.get_entry ().get_delegate (), "insert-text"); - Signal.stop_emission_by_name ((void*) to_entry.get_entry ().get_delegate (), "insert-text"); + Signal.stop_emission_by_name ((void*) from_entry.get_internal_entry ().get_delegate (), "insert-text"); + Signal.stop_emission_by_name ((void*) to_entry.get_internal_entry ().get_delegate (), "insert-text"); return; } } @@ -427,10 +427,10 @@ public class Abacus.MainWindow : He.ApplicationWindow { var replacement_text = ""; if (replacement_text != "" && replacement_text != new_text) { - from_entry.get_entry ().do_insert_text (replacement_text, from_entry.get_entry ().cursor_position + replacement_text.char_count (), ref position); - to_entry.get_entry ().do_insert_text (replacement_text, to_entry.get_entry ().cursor_position + replacement_text.char_count (), ref position); - Signal.stop_emission_by_name ((void*) to_entry.get_entry ().get_delegate (), "insert-text"); - Signal.stop_emission_by_name ((void*) from_entry.get_entry ().get_delegate (), "insert-text"); + from_entry.get_internal_entry ().do_insert_text (replacement_text, from_entry.get_internal_entry ().cursor_position + replacement_text.char_count (), ref position); + to_entry.get_internal_entry ().do_insert_text (replacement_text, to_entry.get_internal_entry ().cursor_position + replacement_text.char_count (), ref position); + Signal.stop_emission_by_name ((void*) to_entry.get_internal_entry ().get_delegate (), "insert-text"); + Signal.stop_emission_by_name ((void*) from_entry.get_internal_entry ().get_delegate (), "insert-text"); } } }