← Back to team overview

ubuntu-touch-coreapps-reviewers team mailing list archive

[Merge] lp:~gang65/ubuntu-calculator-app/reboot-fix-loosing-textfield-focus-during-using-keyboard into lp:ubuntu-calculator-app/reboot

 

Bartosz Kosiorek has proposed merging lp:~gang65/ubuntu-calculator-app/reboot-fix-loosing-textfield-focus-during-using-keyboard into lp:ubuntu-calculator-app/reboot.

Commit message:
Fix loosing focus of the TextField during using keyboard, and fix disapearing cursor.

Requested reviews:
  Ubuntu Calculator Developers (ubuntu-calculator-dev)
Related bugs:
  Bug #1431548 in Ubuntu Calculator App: "Unable to press keys on desktops' keyboard after start calculator"
  https://bugs.launchpad.net/ubuntu-calculator-app/+bug/1431548

For more details, see:
https://code.launchpad.net/~gang65/ubuntu-calculator-app/reboot-fix-loosing-textfield-focus-during-using-keyboard/+merge/255135

Fix loosing focus of the TextField during using keyboard, and fix disapearing cursor.
-- 
Your team Ubuntu Calculator Developers is requested to review the proposed merge of lp:~gang65/ubuntu-calculator-app/reboot-fix-loosing-textfield-focus-during-using-keyboard into lp:ubuntu-calculator-app/reboot.
=== modified file 'app/ui/KeyboardButton.qml'
--- app/ui/KeyboardButton.qml	2015-03-26 11:35:40 +0000
+++ app/ui/KeyboardButton.qml	2015-04-02 19:40:22 +0000
@@ -22,7 +22,6 @@
 AbstractButton {
     id: buttonRect
     objectName: modelname + "Button"
-    activeFocusOnPress: true
 
     property real baseSize: 1
     property alias text: buttonText.text
@@ -36,7 +35,6 @@
     onKbdPressedChanged: {
         if (!kbdPressed) {
             buttonRect.clicked();
-            buttonRect.forceActiveFocus();
         }
     }
 

=== modified file 'po/com.ubuntu.calculator.pot'
--- po/com.ubuntu.calculator.pot	2015-03-26 21:16:14 +0000
+++ po/com.ubuntu.calculator.pot	2015-04-02 19:40:22 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-26 22:15+0100\n"
+"POT-Creation-Date: 2015-04-02 21:33+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -21,35 +21,35 @@
 msgid "NaN"
 msgstr ""
 
-#: ../app/ubuntu-calculator-app.qml:212 ../app/ubuntu-calculator-app.qml:217
+#: ../app/ubuntu-calculator-app.qml:220 ../app/ubuntu-calculator-app.qml:225
 msgid "Favorite"
 msgstr ""
 
-#: ../app/ubuntu-calculator-app.qml:268
+#: ../app/ubuntu-calculator-app.qml:278
 msgid "Cancel"
 msgstr ""
 
-#: ../app/ubuntu-calculator-app.qml:282
+#: ../app/ubuntu-calculator-app.qml:292
 msgid "Select All"
 msgstr ""
 
-#: ../app/ubuntu-calculator-app.qml:282
+#: ../app/ubuntu-calculator-app.qml:292
 msgid "Select None"
 msgstr ""
 
-#: ../app/ubuntu-calculator-app.qml:289 ../app/ubuntu-calculator-app.qml:360
+#: ../app/ubuntu-calculator-app.qml:299 ../app/ubuntu-calculator-app.qml:370
 msgid "Copy"
 msgstr ""
 
-#: ../app/ubuntu-calculator-app.qml:297 ../app/ubuntu-calculator-app.qml:412
+#: ../app/ubuntu-calculator-app.qml:307 ../app/ubuntu-calculator-app.qml:422
 msgid "Delete"
 msgstr ""
 
-#: ../app/ubuntu-calculator-app.qml:373
+#: ../app/ubuntu-calculator-app.qml:383
 msgid "Edit"
 msgstr ""
 
-#: ../app/ubuntu-calculator-app.qml:389
+#: ../app/ubuntu-calculator-app.qml:399
 msgid "Add to favorites"
 msgstr ""
 
@@ -59,7 +59,7 @@
 #. TRANSLATORS: this is a time formatting string, see
 #. http://qt-project.org/doc/qt-5/qml-qtqml-date.html#details for valid
 #. expressions
-#: ../app/ubuntu-calculator-app.qml:542 ../app/ui/FavouritePage.qml:89
+#: ../app/ubuntu-calculator-app.qml:552 ../app/ui/FavouritePage.qml:89
 #: ../app/ui/Screen.qml:50
 msgid "dd MMM yyyy"
 msgstr ""
@@ -101,14 +101,14 @@
 msgid "Yesterday"
 msgstr ""
 
-#: /tmp/tmp.d9b6OuAiba/po/ubuntu-calculator-app.desktop.in.in.h:1
+#: /tmp/tmp.xAbH3PGieN/po/ubuntu-calculator-app.desktop.in.in.h:1
 msgid "Calculator"
 msgstr ""
 
-#: /tmp/tmp.d9b6OuAiba/po/ubuntu-calculator-app.desktop.in.in.h:2
+#: /tmp/tmp.xAbH3PGieN/po/ubuntu-calculator-app.desktop.in.in.h:2
 msgid "A calculator for Ubuntu."
 msgstr ""
 
-#: /tmp/tmp.d9b6OuAiba/po/ubuntu-calculator-app.desktop.in.in.h:3
+#: /tmp/tmp.xAbH3PGieN/po/ubuntu-calculator-app.desktop.in.in.h:3
 msgid "math;addition;subtraction;multiplication;division;"
 msgstr ""


Follow ups