Merge lp:~markodolar/pantheon-calculator/pantheon-calculator-fixes into lp:~elementary-apps/pantheon-calculator/trunk

[MarkoD]

Ctrl+Q for quitting, remember window position.

Fixes 2 bugs:
- Ctrl+Q shortcut to quit calculator
- Remember main window position (size not needed)

Also renamed 2 confusing variable names.

[Danielle Foré (danrabbit)]

Hey Marko, thanks for your branch! In the future, please split up separate, unrelated fixes into separate branches. This makes the branches much easier to review and helps prevent regressions. It also ensures that one fix doesn't get held up by a "needs fixing" status with another fix.

I can confirm that all of the proposed changes work as expected. Would like a double check on the session code :)

Approving, UX

review: Approve (ux)

[MarkoD (markodolar)]

> Hey Marko, thanks for your branch! In the future, please split up separate,
> unrelated fixes into separate branches. This makes the branches much easier to
> review and helps prevent regressions. It also ensures that one fix doesn't get
> held up by a "needs fixing" status with another fix.
>
> I can confirm that all of the proposed changes work as expected. Would like a
> double check on the session code :)
>
> Approving, UX

Yea, makes sense, will do next time.

=== modified file 'data/org.pantheon.calculator.gschema.xml'
--- data/org.pantheon.calculator.gschema.xml	2015-01-24 15:37:13 +0000
+++ data/org.pantheon.calculator.gschema.xml	2016-11-26 23:10:11 +0000
@@ -16,5 +16,15 @@
             <summary>Saves the decimal places for displayed values.</summary>
             <description>Saves the decimal places for displayed values.</description>
         </key>
+        <key name="window-x" type="i">
+            <default>-100</default>
+            <summary>Window x position.</summary>
+            <description>Saved x position of main calculator window.</description>
+        </key>
+        <key name="window-y" type="i">
+            <default>-100</default>
+            <summary>Window y position.</summary>
+            <description>Saved y position of main calculator window.</description>
+        </key>
     </schema>
 </schemalist>

=== modified file 'src/MainWindow.vala'
--- src/MainWindow.vala	2016-11-01 20:58:04 +0000
+++ src/MainWindow.vala	2016-11-26 23:10:11 +0000
@@ -31,8 +31,8 @@
         private Gtk.Button          button_calc;
         private Gtk.Button          button_history;
         private Gtk.Button          button_ans;
-        private Gtk.Button          button_undo;
         private Gtk.Button          button_del;
+        private Gtk.Button          button_clr;
         private Gtk.ToggleButton    button_extended;
 
         private Gtk.InfoBar infobar;
@@ -59,6 +59,12 @@
             history = new List<History?> ();
             position = 0;
 
+            int x = settings.get_int ("window-x");
+            int y = settings.get_int ("window-y");
+            if (x != -100 && y != -100) {
+                move (x, y);
+            }
+
             build_titlebar ();
             build_ui ();
 
@@ -66,6 +72,11 @@
             settings.bind ("entry-content", entry, "text", SettingsBindFlags.DEFAULT);
 
             this.key_press_event.connect (key_pressed);
+
+            delete_event.connect((event) => {
+                save_state ();
+                return false;
+            });
         }
 
         private void build_titlebar () {
@@ -129,9 +140,9 @@
             button_calc.get_style_context ().add_class (Gtk.STYLE_CLASS_SUGGESTED_ACTION);
             button_ans = new Button ("ANS", _("Add last result"));
             button_ans.sensitive = false;
-            button_undo = new Button ("Del", _("Backspace"));
-            button_del = new Button ("C", _("Clear entry"));
-            button_del.get_style_context ().add_class (Gtk.STYLE_CLASS_DESTRUCTIVE_ACTION);
+            button_del = new Button ("Del", _("Backspace"));
+            button_clr = new Button ("C", _("Clear entry"));
+            button_clr.get_style_context ().add_class (Gtk.STYLE_CLASS_DESTRUCTIVE_ACTION);
 
             var button_add = new Button (" + ", _("Add"));
             button_add.function = "+";
@@ -167,8 +178,8 @@
             basic_grid.valign = Gtk.Align.FILL;
 
             basic_grid.attach (entry, 0, 0, 4, 1);
-            basic_grid.attach (button_del,     0, 1, 1, 1);
-            basic_grid.attach (button_undo,    1, 1, 1, 1);
+            basic_grid.attach (button_clr,     0, 1, 1, 1);
+            basic_grid.attach (button_del,    1, 1, 1, 1);
             basic_grid.attach (button_percent, 2, 1, 1, 1);
             basic_grid.attach (button_div,     3, 1, 1, 1);
 
@@ -199,8 +210,8 @@
             entry.activate.connect (button_calc_clicked);
 
             button_calc.clicked.connect (() => {button_calc_clicked ();});
-            button_undo.clicked.connect (() => {button_undo_clicked ();});
             button_del.clicked.connect (() => {button_del_clicked ();});
+            button_clr.clicked.connect (() => {button_clr_clicked ();});
             button_ans.clicked.connect (() => {button_ans_clicked ();});
             button_add.clicked.connect (() => {regular_button_clicked (button_add.function);});
             button_sub.clicked.connect (() => {regular_button_clicked (button_sub.function);});
@@ -326,7 +337,7 @@
             entry.set_position (position);
         }
 
-        private void button_undo_clicked () {
+        private void button_del_clicked () {
             position = entry.get_position ();
             if (entry.get_text ().length > 0) {
                 string new_text = "";
@@ -350,7 +361,7 @@
             entry.set_position (position - 1);
         }
 
-        private void button_del_clicked () {
+        private void button_clr_clicked () {
             position = 0;
             entry.set_text ("");
             set_focus (entry);
@@ -410,7 +421,7 @@
             bool retval = false;
             switch (key.keyval) {
                 case Gdk.Key.Escape:
-                    button_del_clicked ();
+                    button_clr_clicked ();
                     break;
                 case Gdk.Key.KP_Divide:
                 case Gdk.Key.slash:
@@ -428,5 +439,12 @@
             }
             return retval;
         }
+
+        public void save_state () {
+            int x_pos, y_pos;
+            get_position (out x_pos, out y_pos);
+            settings.set_int ("window-x", x_pos);
+            settings.set_int ("window-y", y_pos);
+        }
     }
 }

=== modified file 'src/PantheonCalculator.vala'
--- src/PantheonCalculator.vala	2016-09-01 06:57:26 +0000
+++ src/PantheonCalculator.vala	2016-11-26 23:10:11 +0000
@@ -16,7 +16,9 @@
 * with Pantheon Calculator. If not, see http://www.gnu.org/licenses/.
 */
 
-namespace PantheonCalculator { 
+namespace PantheonCalculator {
+    PantheonCalculator.MainWindow window = null;
+
     public class PantheonCalculatorApp : Granite.Application {
         construct {
             application_id = "org.pantheon.calculator";
@@ -43,10 +45,20 @@
             about_comments = "";
             about_translators = _("translator-credits");
             about_license_type = Gtk.License.GPL_3_0;
+            
+            SimpleAction quit_action = new SimpleAction ("quit", null);
+            quit_action.activate.connect (() => {
+                if (window != null) {
+                    window.save_state ();
+                    window.destroy ();
+                }
+            });
+            add_action (quit_action);
+            add_accelerator ("<Control>q", "app.quit", null);
         }
 
         public override void activate () {
-            var window = new PantheonCalculator.MainWindow ();
+            window = new PantheonCalculator.MainWindow ();
             this.add_window (window);
         }
     }