GCR v2.6.0.0

ragaeeb · May 16, 2014 · 11187c7 · 11187c7
1 parent 1e4cd1d
commit 11187c7
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 20 deletions.
diff --git a/assets/ExportPane.qml b/assets/ExportPane.qml
@@ -62,6 +62,8 @@ NavigationPane
                         persist.showToast( qsTr("No accounts found. Are you sure you gave the app the permissions it needs?"), qsTr("OK"), "asset:///images/dropdown/ic_account.png" );
                     }
 
+                    else if ( persist.tutorialVideo("http://youtu.be/_sSZJPBwlnc") ) {}
+                    else if ( persist.tutorial("tutorialExportTxt", qsTr("These are a list of all the conversations, press-and-hold on one and from the menu choose 'Select More' and then 'Export TXT' to save it. You can also tap on the conversation itself and save only parts of it if you wish."), "asset:///images/menu/ic_export.png" ) ) {}
                     else if ( persist.tutorial("tutorialExportTxt", qsTr("These are a list of all the conversations, press-and-hold on one and from the menu choose 'Select More' and then 'Export TXT' to save it. You can also tap on the conversation itself and save only parts of it if you wish."), "asset:///images/menu/ic_export.png" ) ) {}
                     else if ( persist.tutorial("tutorialSelectAll", qsTr("You can tap the Select All button at the bottom of the screen to quickly export all your conversations!"), "asset:///images/menu/selectAll.png" ) ) {}
                     else if ( persist.tutorial("tutorialDropDown", qsTr("Use the dropdown at the top to switch between your mailboxes."), "asset:///images/dropdown/ic_account.png" ) ) {}

diff --git a/assets/HelpPage.qml b/assets/HelpPage.qml
@@ -24,7 +24,7 @@ Page
         {
             query {
                 mimeType: "text/html"
-                uri: "http://www.youtube.com/watch?v=AbHZLmWSKts"
+                uri: "http://youtu.be/_sSZJPBwlnc"
                 invokeActionId: "bb.action.OPEN"
             }
 

diff --git a/bar-descriptor.xml b/bar-descriptor.xml
@@ -35,7 +35,7 @@
     <!-- A string value of the format <0-999>.<0-999>.<0-999> that represents application version which can be used to check for application upgrade. 
          Values can also be 1-part or 2-part. It is not necessary to have a 3-part value.
          An updated version of application must have a versionNumber value higher than the previous version. Required. -->
-    <versionNumber>2.3.0</versionNumber>
+    <versionNumber>2.6.0</versionNumber>
 
     <!-- Fourth digit segment of the package version. First three segments are taken from the 
          <versionNumber> element.  Must be an integer from 0 to 2^16-1 -->

diff --git a/src/ApplicationUI.cpp b/src/ApplicationUI.cpp
@@ -126,7 +126,7 @@ void ApplicationUI::init()
 
 		m_persistance.saveValueFor("output", sdDirectory, false);
 	}
-/*
+
 	bool permissionOK = PimUtil::validateEmailSMSAccess( tr("Warning: It seems like the app does not have access to your Email/SMS messages Folder. This permission is needed for the app to access the SMS and email services it needs to render and process them so they can be saved. If you leave this permission off, some features may not work properly. Select OK to launch the Application Permissions screen where you can turn these settings on.") );
 
 	if (permissionOK)
@@ -136,7 +136,7 @@ void ApplicationUI::init()
 		if (permissionOK) {
 			PimUtil::validateContactsAccess( tr("Warning: It seems like the app does not have access to your contacts. This permission is needed for the app to access your address book so we can properly display the names of the contacts in the output files. If you leave this permission off, some features may not work properly. Select OK to launch the Application Permissions screen where you can turn these settings on.") );
 		}
-	} */
+	}
 }
 
 

diff --git a/src/PaymentHelper.cpp b/src/PaymentHelper.cpp
@@ -28,6 +28,7 @@ PaymentManager* PaymentHelper::getPaymentManager()
         m_payment = new PaymentManager(this);
         connect( m_payment, SIGNAL( existingPurchasesFinished(bb::platform::ExistingPurchasesReply*) ), this, SLOT( existingPurchasesFinished(bb::platform::ExistingPurchasesReply*) ) );
         connect( m_payment, SIGNAL( purchaseFinished(bb::platform::PurchaseReply*) ), this, SLOT( purchaseFinished(bb::platform::PurchaseReply*) ) );
+
 #if !defined(QT_NO_DEBUG)
         m_payment->setConnectionMode(PaymentConnectionMode::Test);
 #endif

diff --git a/translations/Exporter.ts b/translations/Exporter.ts
@@ -79,7 +79,7 @@ Use the Range Selector if the message gets truncated.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../assets/ExportPane.qml" line="283"/>
+        <location filename="../assets/ExportPane.qml" line="285"/>
         <source>There are no messages found for that specific mailbox.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -89,70 +89,71 @@ Use the Range Selector if the message gets truncated.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../assets/ExportPane.qml" line="90"/>
+        <location filename="../assets/ExportPane.qml" line="92"/>
         <source>This is a purchasable feature. You can buy it for just $0.99!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../assets/ExportPane.qml" line="62"/>
-        <location filename="../assets/ExportPane.qml" line="90"/>
+        <location filename="../assets/ExportPane.qml" line="92"/>
         <source>OK</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../assets/ExportPane.qml" line="65"/>
+        <location filename="../assets/ExportPane.qml" line="66"/>
+        <location filename="../assets/ExportPane.qml" line="67"/>
         <source>These are a list of all the conversations, press-and-hold on one and from the menu choose &apos;Select More&apos; and then &apos;Export TXT&apos; to save it. You can also tap on the conversation itself and save only parts of it if you wish.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../assets/ExportPane.qml" line="66"/>
+        <location filename="../assets/ExportPane.qml" line="68"/>
         <source>You can tap the Select All button at the bottom of the screen to quickly export all your conversations!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../assets/ExportPane.qml" line="67"/>
+        <location filename="../assets/ExportPane.qml" line="69"/>
         <source>Use the dropdown at the top to switch between your mailboxes.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../assets/ExportPane.qml" line="68"/>
+        <location filename="../assets/ExportPane.qml" line="70"/>
         <source>There are many customizations you can make to the way the messages are exported. You can do this from the Settings. To access the app settings, swipe-down from the top-bezel and choose &apos;Settings&apos; from the application menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../assets/ExportPane.qml" line="91"/>
+        <location filename="../assets/ExportPane.qml" line="93"/>
         <source>CSV Export</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../assets/ExportPane.qml" line="169"/>
+        <location filename="../assets/ExportPane.qml" line="171"/>
         <source>%1 messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../assets/ExportPane.qml" line="173"/>
-        <location filename="../assets/ExportPane.qml" line="231"/>
+        <location filename="../assets/ExportPane.qml" line="175"/>
+        <location filename="../assets/ExportPane.qml" line="233"/>
         <source>Export TXT</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../assets/ExportPane.qml" line="182"/>
-        <location filename="../assets/ExportPane.qml" line="242"/>
+        <location filename="../assets/ExportPane.qml" line="184"/>
+        <location filename="../assets/ExportPane.qml" line="244"/>
         <source>Export CSV</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../assets/ExportPane.qml" line="207"/>
+        <location filename="../assets/ExportPane.qml" line="209"/>
         <source>Select Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../assets/ExportPane.qml" line="257"/>
+        <location filename="../assets/ExportPane.qml" line="259"/>
         <source>None selected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../assets/ExportPane.qml" line="266"/>
+        <location filename="../assets/ExportPane.qml" line="268"/>
         <source>%1 conversations selected</source>
         <translation type="unfinished"></translation>
     </message>
@@ -427,6 +428,21 @@ Tap the first message, then tap the last message and all of the ones in between
 %2: %3</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../src/ApplicationUI.cpp" line="130"/>
+        <source>Warning: It seems like the app does not have access to your Email/SMS messages Folder. This permission is needed for the app to access the SMS and email services it needs to render and process them so they can be saved. If you leave this permission off, some features may not work properly. Select OK to launch the Application Permissions screen where you can turn these settings on.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/ApplicationUI.cpp" line="134"/>
+        <source>Warning: It seems like the app does not have access to your Shared Folder. This permission is needed for the app to access the file system so that it can save the text messages as files. If you leave this permission off, some features may not work properly.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/ApplicationUI.cpp" line="137"/>
+        <source>Warning: It seems like the app does not have access to your contacts. This permission is needed for the app to access your address book so we can properly display the names of the contacts in the output files. If you leave this permission off, some features may not work properly. Select OK to launch the Application Permissions screen where you can turn these settings on.</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../src/ApplicationUI.cpp" line="177"/>
         <source>Loading...</source>