Skip to content

Commit

Permalink
GCR 1.8.5.0:
Browse files Browse the repository at this point in the history
1) New setting allowing you to sort conversations from most-recent to
least-recent. 2) Auto-refresh conversation view upon setting changed. 3)
Progress indicator on startup and better progress indicator on export.
4) Performance improvements: Asynchronous image loading, ignore
duplicate setting values. 5) Precompiled headers.
  • Loading branch information
ragaeeb committed May 19, 2013
1 parent 2bdb31e commit d60560d
Show file tree
Hide file tree
Showing 23 changed files with 286 additions and 185 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
arm/Makefile
arm/Makefile.Debug
arm/Makefile.Release
6 changes: 6 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
QMAKE_TARGET = Exporter
PROJECT_DIR := $(dir $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST)))
I18N_DIR := $(PROJECT_DIR)/translations

include mk/cs-base.mk

Binary file added arm/o.le-v7/Exporter-1_8_5_0.bar
Binary file not shown.
2 changes: 0 additions & 2 deletions assets/.gitignore

This file was deleted.

6 changes: 3 additions & 3 deletions assets/BasePage.qml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Page {
attachedObjects: [
ImagePaintDefinition {
id: back
imageSource: "asset:///images/background.amd"
imageSource: "images/background.amd"
}
]

Expand All @@ -23,7 +23,7 @@ Page {
verticalAlignment: VerticalAlignment.Top

ImageView {
imageSource: "asset:///images/title_bg.amd"
imageSource: "images/title_bg.amd"
topMargin: 0
leftMargin: 0
rightMargin: 0
Expand Down Expand Up @@ -56,7 +56,7 @@ Page {
leftPadding: 45; bottomPadding: 20

ImageView {
imageSource: "asset:///images/logo.png"
imageSource: "images/logo.png"
topMargin: 0
leftMargin: 0
rightMargin: 0
Expand Down
36 changes: 21 additions & 15 deletions assets/ConversationView.qml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,20 @@ BasePage
property variant contact

onContactChanged: {
label.text = qsTr("Conversation with %1").arg(contact.name)
var messages = app.getMessagesFor(contact.conversationId)
theDataModel.clear()
theDataModel.append(messages)
label.text = qsTr("Conversation with %1").arg(contact.name);
var messages = app.getMessagesFor(contact.conversationId);
theDataModel.clear();
theDataModel.append(messages);
}

function onSettingChanged(key) {
if (key == "latestFirst" || key == "timeFormat" || key == "userName") {
contactChanged(contact);
}
}

onCreationCompleted: {
persist.settingChanged.connect(onSettingChanged);
}

function concatenate()
Expand All @@ -34,7 +44,7 @@ BasePage

actions: [
ActionItem {
imageSource: "asset:///images/selectAll.png"
imageSource: "images/selectAll.png"
ActionBar.placement: ActionBarPlacement.OnBar
title: qsTr("Select All") + Retranslate.onLanguageChanged

Expand All @@ -46,7 +56,7 @@ BasePage
ActionItem {
id: copyAction
title: qsTr("Copy") + Retranslate.onLanguageChanged
imageSource: "asset:///images/ic_copy.png"
imageSource: "images/ic_copy.png"
ActionBar.placement: ActionBarPlacement.OnBar
enabled: false

Expand Down Expand Up @@ -83,7 +93,7 @@ BasePage
listView.first = listView.last = undefined
listView.rangeSelect = true
}
}
}
]

contentContainer: Container
Expand All @@ -99,7 +109,6 @@ BasePage
horizontalAlignment: HorizontalAlignment.Fill
verticalAlignment: VerticalAlignment.Fill
textStyle.textAlign: TextAlign.Center
bottomMargin: 65

animations: [
FadeTransition {
Expand All @@ -117,11 +126,8 @@ BasePage
}
}

Container
{
horizontalAlignment: HorizontalAlignment.Fill
preferredHeight: 1
background: Color.LightGray
Divider {
bottomMargin: 0; topMargin: 0;
}

ListView {
Expand All @@ -136,7 +142,7 @@ BasePage
attachedObjects: [
ImagePaintDefinition {
id: back
imageSource: "asset:///images/listitem.amd"
imageSource: "images/listitem.amd"
}
]

Expand Down Expand Up @@ -221,7 +227,7 @@ BasePage
ActionSet {
ActionItem {
title: qsTr("Copy") + Retranslate.onLanguageChanged
imageSource: "asset:///images/ic_copy.png"
imageSource: "images/ic_copy.png"

onTriggered: {
listItemRoot.ListItem.view.copyToClipboard(ListItemData)
Expand Down
4 changes: 2 additions & 2 deletions assets/Cover.qml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ Container
attachedObjects: [
ImagePaintDefinition {
id: back
imageSource: "asset:///images/title_bg.png"
imageSource: "images/title_bg.png"
}
]

ImageView {
imageSource: "asset:///images/logo.png"
imageSource: "images/logo.png"
horizontalAlignment: HorizontalAlignment.Center
verticalAlignment: VerticalAlignment.Center
}
Expand Down
57 changes: 37 additions & 20 deletions assets/SettingsPage.qml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ BasePage {
persist.saveValueFor("animations", checked ? 1 : 0)

if (checked) {
infoText.text = qsTr("Controls will be animated whenever they are loaded.")
} else {
infoText.text = qsTr("Controls will be snapped into position without animations.")
}
infoText.text = qsTr("Controls will be animated whenever they are loaded.") + Retranslate.onLanguageChanged;
} else {
infoText.text = qsTr("Controls will be snapped into position without animations.") + Retranslate.onLanguageChanged;
}
}
}

Expand Down Expand Up @@ -75,18 +75,18 @@ BasePage {
persist.saveValueFor("timeFormat", selectedIndex);

if (selectedIndex == 2) {
infoText.text = qsTr("The time will not be appended to the messages.")
} else if (selectedIndex == 0) {
infoText.text = qsTr("The time will will be appended in front of the messages with a format like Jan 4/13 10:15:03.")
} else {
infoText.text = qsTr("The time will will be appended in front of the messages with a format like 10:15:03.")
}
infoText.text = qsTr("The time will not be appended to the messages.") + Retranslate.onLanguageChanged;
} else if (selectedIndex == 0) {
infoText.text = qsTr("The time will will be appended in front of the messages with a format like Jan 4/13 10:15:03.") + Retranslate.onLanguageChanged;
} else {
infoText.text = qsTr("The time will will be appended in front of the messages with a format like 10:15:03.") + Retranslate.onLanguageChanged;
}
}
}

Label {
text: qsTr("Your name shows up as:");
textStyle.fontSize: FontSize.XSmall
text: qsTr("Your name shows up as:") + Retranslate.onLanguageChanged;
textStyle.fontSize: FontSize.XSmall
textStyle.textAlign: TextAlign.Center
}

Expand All @@ -95,8 +95,8 @@ BasePage {

onTextChanged: {
persist.saveValueFor("userName", text);
infoText.text = qsTr("In the output, messages you sent will be prefixed by: %1").arg(text)
}
infoText.text = qsTr("In the output, messages you sent will be prefixed by: %1").arg(text) + Retranslate.onLanguageChanged
}

text: persist.getValueFor("userName")

Expand All @@ -107,21 +107,38 @@ BasePage {
{
topPadding: 20

title: qsTr("Double-space")
title: qsTr("Double-space") + Retranslate.onLanguageChanged
toggle.checked: persist.getValueFor("doubleSpace") == 1

toggle.onCheckedChanged: {
persist.saveValueFor("doubleSpace", checked ? 1 : 0)

if (checked) {
infoText.text = qsTr("Each message will be double-spaced for better readability.")
infoText.text = qsTr("Each message will be double-spaced for better readability.") + Retranslate.onLanguageChanged
} else {
infoText.text = qsTr("Each message will be single-spaced.")
infoText.text = qsTr("Each message will be single-spaced.") + Retranslate.onLanguageChanged
}
}
}

Label {
}

SettingPair {
topPadding: 20

title: qsTr("Latest Message First") + Retranslate.onLanguageChanged;
toggle.checked: persist.getValueFor("latestFirst") == 1

toggle.onCheckedChanged: {
persist.saveValueFor("latestFirst", checked ? 1 : 0)

if (checked) {
infoText.text = qsTr("Messages will be ordered from most recent to least recent.");
} else {
infoText.text = qsTr("Messages will be ordered from oldest to newest .");
}
}
}

Label {
topMargin: 40
id: infoText
multiline: true
Expand Down
Binary file modified assets/images/title_bg.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 4 additions & 8 deletions assets/main.qml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ NavigationPane
{
actions: [
ActionItem {
imageSource: "asset:///images/selectAll.png"
imageSource: "images/selectAll.png"
ActionBar.placement: ActionBarPlacement.OnBar
title: qsTr("Select All") + Retranslate.onLanguageChanged

Expand All @@ -77,7 +77,6 @@ NavigationPane
horizontalAlignment: HorizontalAlignment.Fill
verticalAlignment: VerticalAlignment.Fill
textStyle.textAlign: TextAlign.Center
bottomMargin: 65

animations: [
FadeTransition {
Expand All @@ -95,11 +94,8 @@ NavigationPane
}
}

Container
{
horizontalAlignment: HorizontalAlignment.Fill
preferredHeight: 1
background: Color.LightGray
Divider {
bottomMargin: 0; topMargin: 0;
}

ListView {
Expand Down Expand Up @@ -207,7 +203,7 @@ NavigationPane

onSelectionChanged: {
var n = selectionList().length
multiSelectHandler.status = qsTr("%1 elements selected").arg(n)
multiSelectHandler.status = qsTr("%1 conversations selected").arg(n)
multiExportAction.enabled = n > 0
}

Expand Down
4 changes: 2 additions & 2 deletions bar-descriptor.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@
<!-- 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>1.7.0</versionNumber>
<versionNumber>1.8.5</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 -->
<buildId>5</buildId>
<buildId>0</buildId>

<!-- A string value (such as "v1", "2.5", or "Alpha 1") that represents the version of the application, as it should be shown to users. Optional. -->
<!-- <versionLabel></versionLabel> -->
Expand Down
23 changes: 21 additions & 2 deletions precompiled.h
Original file line number Diff line number Diff line change
@@ -1,2 +1,21 @@
// This file is used to store precompiled headers.
// It is intentionally left blank. It is up to you to decide which headers should be included here.
#include <QFile>
#include <QSettings>
#include <QThreadPool>

#include <bb/cascades/AbstractPane>
#include <bb/cascades/Application>
#include <bb/cascades/Control>
#include <bb/cascades/QmlDocument>
#include <bb/cascades/SceneCover>

#include <bb/pim/contacts/ContactService>

#include <bb/cascades/pickers/FilePicker>

#include <bb/pim/account/AccountService>
#include <bb/pim/message/MessageFilter>
#include <bb/pim/message/MessageService>

#include <bb/system/Clipboard>
#include <bb/system/SystemProgressDialog>
#include <bb/system/SystemToast>
Loading

0 comments on commit d60560d

Please sign in to comment.