Skip to content

Commit bf79477

Browse files
codingusercodinguser
committed
Merge branch 'develop'
2 parents 79df5af + 06875ff commit bf79477

34 files changed

Lines changed: 1486 additions & 631 deletions

‎CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
Change Log
22
===============================================================================
3+
Version 1.2.6 *(2013-12-06)*
4+
----------------------------
5+
* Feature: Support for QIF export format
6+
* Improved: CREDIT/DEBIT meaning now matches GnuCash desktop. Effect on account balance depends on type of account
7+
38
Version 1.2.5 *(2013-09-17)*
49
----------------------------
510
* Feature: Search accounts by name

‎app/AndroidManifest.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717

1818
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
1919
package="org.gnucash.android"
20-
android:versionCode="16"
21-
android:versionName="1.2.5" >
20+
android:versionCode="21"
21+
android:versionName="1.2.6" >
2222

2323
<uses-sdk android:minSdkVersion="8" android:targetSdkVersion="15"/>
2424

‎app/res/layout/dialog_export_ofx.xml‎

Lines changed: 34 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,38 @@
3838
style="@style/ListItem"
3939
android:layout_marginLeft="@dimen/dialog_padding"
4040
android:layout_marginRight="@dimen/dialog_padding"
41-
android:layout_marginBottom="20dp" />
42-
41+
android:layout_marginBottom="@dimen/dialog_padding" />
42+
43+
<TextView
44+
android:id="@+id/label_export_format"
45+
android:text="Export Format"
46+
android:layout_height="wrap_content"
47+
android:layout_width="wrap_content"
48+
android:layout_marginBottom="-8dip"
49+
android:layout_marginLeft="@dimen/dialog_padding"
50+
style="@style/TextAppearance.EditTransaction_LabelSmall" />
51+
52+
<RadioGroup xmlns:android="http://schemas.android.com/apk/res/android"
53+
android:layout_width="match_parent"
54+
android:layout_height="wrap_content"
55+
android:layout_marginLeft="@dimen/dialog_padding"
56+
android:layout_marginRight="@dimen/dialog_padding"
57+
android:layout_marginBottom="@dimen/dialog_padding"
58+
android:orientation="horizontal">
59+
60+
<RadioButton android:id="@+id/radio_qif_format"
61+
android:layout_width="wrap_content"
62+
android:layout_height="wrap_content"
63+
android:layout_marginRight="20dp"
64+
android:checked="true"
65+
android:text="QIF" />
66+
67+
<RadioButton android:id="@+id/radio_ofx_format"
68+
android:layout_width="wrap_content"
69+
android:layout_height="wrap_content"
70+
android:text="OFX"/>
71+
</RadioGroup>
72+
4373
<CheckBox android:id="@+id/checkbox_export_all"
4474
android:layout_width="wrap_content"
4575
android:layout_height="wrap_content"
@@ -57,8 +87,8 @@
5787
android:layout_marginTop="@dimen/dialog_padding"
5888
android:layout_marginLeft="@dimen/dialog_padding"
5989
android:textAppearance="?android:attr/textAppearanceMedium"
60-
android:text="@string/option_delete_after_export"
61-
/>
90+
android:text="@string/option_delete_after_export"
91+
/>
6292

6393
<TextView android:layout_marginLeft="@dimen/dialog_padding"
6494
android:text="@string/hint_delete_after_export"

‎app/res/menu/account_actions.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
<item android:id="@+id/menu_export"
2525
android:icon="@drawable/content_import_export_holo_light"
26-
android:title="@string/menu_export_ofx"
26+
android:title="@string/menu_export_transactions"
2727
android:showAsAction="never"
2828
android:orderInCategory="3"/>
2929
</menu>

‎app/res/values-de/strings.xml‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<string name="title_selected">%1$d ausgew&#228;hlt</string>
5050
<string name="label_transactions_total">Summe:</string>
5151
<string name="label_export_destination">Exportziel</string>
52-
<string name="title_export_dialog">Export OFX</string>
52+
<string name="title_export_dialog">Buchungen Exportieren</string>
5353
<string name="option_export_all_transactions">Alle Buchungen exportieren</string>
5454
<string name="hint_export_choice">Auswählen, um alle Buchungen zu exportieren. Andernfalls werden nur die neuen Buchungen seit letztem Export exportiert.</string>
5555
<string name="error_exporting">Fehler beim Exportieren der OFX-Datei</string>
@@ -340,6 +340,12 @@
340340
<string name="section_header_transactions">Transactions</string>
341341
<string name="section_header_accounts">Sub-Accounts</string>
342342
<string name="menu_search_accounts">Search</string>
343+
<string name="title_default_export_format">Default Export Format</string>
344+
<string name="summary_default_export_format">File format to use by default when exporting transactions</string>
345+
<string name="menu_export_transactions">Export transactions...</string>
346+
<!-- This should be the same name used by GnuCash desktop for imbalance accounts -->
347+
<string name="imbalance_account_name">Ausgleichskonto</string>
348+
<string name="title_progress_exporting_transactions">Exporting transactions</string>
343349
<plurals name="label_sub_accounts">
344350
<item quantity="one">%d Unterkonto</item>
345351
<item quantity="other">%d Unterkonten</item>
@@ -359,4 +365,8 @@
359365
<item>STOCK</item>
360366
<item>MUTUAL FUND</item>
361367
</string-array>
368+
<string-array name="export_formats">
369+
<item>QIF</item>
370+
<item>OFX</item>
371+
</string-array>
362372
</resources>

‎app/res/values-el/strings.xml‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
<string name="title_selected">%1$d επιλέχθηκε</string>
5151
<string name="label_transactions_total">Συνολικό άρθροισμα:</string>
5252
<string name="label_export_destination">Προορισμός Εξαγωγής</string>
53-
<string name="title_export_dialog">Εξαγωγή OFX</string>
53+
<string name="title_export_dialog">Export transactions</string>
5454
<string name="option_export_all_transactions">Εξαγωγή όλων των συναλλαγών</string>
5555
<string name="hint_export_choice">Προεπιλεγμένα, μόνο οι νέες συναλλαγές από τη τελευταία εξαγωγή θα εξαχθούν. Ενεργοποίησε αυτή την επιλογή για την εξαγωγή όλων των συναλλαγών</string>
5656
<string name="error_exporting">Σφάλμα εξαγωγής δεδομένων OFX</string>
@@ -354,6 +354,12 @@
354354
<string name="section_header_transactions">Transactions</string>
355355
<string name="section_header_accounts">Sub-Accounts</string>
356356
<string name="menu_search_accounts">Search</string>
357+
<string name="title_default_export_format">Default Export Format</string>
358+
<string name="summary_default_export_format">File format to use by default when exporting transactions</string>
359+
<string name="menu_export_transactions">Export transactions...</string>
360+
<!-- This should be the same name used by GnuCash desktop for imbalance accounts -->
361+
<string name="imbalance_account_name">Imbalance</string>
362+
<string name="title_progress_exporting_transactions">Exporting transactions</string>
357363
<plurals name="label_sub_accounts">
358364
<item quantity="one">%d υπο-λογαριασμός</item>
359365
<item quantity="other">%d υπο-λογαριασμοί</item>
@@ -373,4 +379,8 @@
373379
<item>ΜΕΤΟΧΗ</item>
374380
<item>ΑΜΟΙΒΑΙΟ ΚΕΦΑΛΑΙΟ</item>
375381
</string-array>
382+
<string-array name="export_formats">
383+
<item>QIF</item>
384+
<item>OFX</item>
385+
</string-array>
376386
</resources>

‎app/res/values-es-rMX/strings.xml‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
<string name="title_selected">%1$d seleccionado</string>
5151
<string name="label_transactions_total">Total:</string>
5252
<string name="label_export_destination">Exportar Destino</string>
53-
<string name="title_export_dialog">Exportar OFX</string>
53+
<string name="title_export_dialog">Export Transactions</string>
5454
<string name="option_export_all_transactions">Exportar todas las transacciones</string>
5555
<string name="hint_export_choice">Por omisi&#243;n, s&#243;lo las trasacciones nuevas ser&#225;n exportadas. Selecione esta opci&#243;n para exportar todas las transacciones</string>
5656
<string name="error_exporting">Error al exportar los datos OFX</string>
@@ -338,6 +338,12 @@
338338
<string name="section_header_transactions">Transactions</string>
339339
<string name="section_header_accounts">Sub-Accounts</string>
340340
<string name="menu_search_accounts">Search</string>
341+
<string name="title_default_export_format">Default Export Format</string>
342+
<string name="summary_default_export_format">File format to use by default when exporting transactions</string>
343+
<string name="menu_export_transactions">Export transactions...</string>
344+
<!-- This should be the same name used by GnuCash desktop for imbalance accounts -->
345+
<string name="imbalance_account_name">Imbalance</string>
346+
<string name="title_progress_exporting_transactions">Exporting transactions</string>
341347
<plurals name="label_sub_accounts">
342348
<item quantity="one">%d subcuenta</item>
343349
<item quantity="other">%d subcuentas</item>
@@ -357,4 +363,8 @@
357363
<item>ACCIONES</item>
358364
<item>FONDOS</item>
359365
</string-array>
366+
<string-array name="export_formats">
367+
<item>QIF</item>
368+
<item>OFX</item>
369+
</string-array>
360370
</resources>

‎app/res/values-es/strings.xml‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
<string name="title_selected">%1$d seleccionado</string>
5151
<string name="label_transactions_total">Total:</string>
5252
<string name="label_export_destination">Destino de la exportaci&#243;n</string>
53-
<string name="title_export_dialog">Exportar OFX</string>
53+
<string name="title_export_dialog">Export Transactions</string>
5454
<string name="option_export_all_transactions">Exportar todas las transacciones</string>
5555
<string name="hint_export_choice">Por defecto solo las nuevas transacciones desde la &#250;ltima exportaci&#243;n ser&#225;n exportadas. Seleccione esta opci&#243;n para exportar todas las transacciones</string>
5656
<string name="error_exporting">Error exportando datos OFX</string>
@@ -338,6 +338,12 @@
338338
<string name="section_header_transactions">Transactions</string>
339339
<string name="section_header_accounts">Sub-Accounts</string>
340340
<string name="menu_search_accounts">Search</string>
341+
<string name="title_default_export_format">Default Export Format</string>
342+
<string name="summary_default_export_format">File format to use by default when exporting transactions</string>
343+
<string name="menu_export_transactions">Export transactions...</string>
344+
<!-- This should be the same name used by GnuCash desktop for imbalance accounts -->
345+
<string name="imbalance_account_name">Imbalance</string>
346+
<string name="title_progress_exporting_transactions">Exporting transactions</string>
341347
<plurals name="label_sub_accounts">
342348
<item quantity="one">%d sub-cuenta</item>
343349
<item quantity="other">%d sub-cuentas</item>
@@ -357,4 +363,8 @@
357363
<item>ACCIONES</item>
358364
<item>FONDOS</item>
359365
</string-array>
366+
<string-array name="export_formats">
367+
<item>QIF</item>
368+
<item>OFX</item>
369+
</string-array>
360370
</resources>

‎app/res/values-fr/strings.xml‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
<string name="title_selected">%1$d s&#233;lectionner</string>
5151
<string name="label_transactions_total">Total:</string>
5252
<string name="label_export_destination">Destination d\'export</string>
53-
<string name="title_export_dialog">Exporter en OFX</string>
53+
<string name="title_export_dialog">Exporter les Transactions</string>
5454
<string name="option_export_all_transactions">Exporter toutes les transactions</string>
5555
<string name="hint_export_choice">Par d&#233;faut, seul les nouvelles transactions depuis le dernier export seront exporter. Cochez cette option pour exporter toutes les transactions</string>
5656
<string name="error_exporting">Erreur lors de l\'export des donn&#233;es en OFX</string>
@@ -336,6 +336,12 @@
336336
<string name="section_header_transactions">Transactions</string>
337337
<string name="section_header_accounts">Sub-Accounts</string>
338338
<string name="menu_search_accounts">Search</string>
339+
<string name="title_default_export_format">Default Export Format</string>
340+
<string name="summary_default_export_format">File format to use by default when exporting transactions</string>
341+
<string name="menu_export_transactions">Export transactions...</string>
342+
<!-- This should be the same name used by GnuCash desktop for imbalance accounts -->
343+
<string name="imbalance_account_name">Imbalance</string>
344+
<string name="title_progress_exporting_transactions">Exporting transactions</string>
339345
<plurals name="label_sub_accounts">
340346
<item quantity="one">%d sous-compte</item>
341347
<item quantity="other">%d sous-comptes</item>
@@ -355,4 +361,8 @@
355361
<item>ACTIONS</item>
356362
<item>FONDS COMMUNS</item>
357363
</string-array>
364+
<string-array name="export_formats">
365+
<item>QIF</item>
366+
<item>OFX</item>
367+
</string-array>
358368
</resources>

‎app/res/values-hu/strings.xml‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<string name="title_selected">%1$d selected</string>
5050
<string name="label_transactions_total">Total sum:</string>
5151
<string name="label_export_destination">Export Destination</string>
52-
<string name="title_export_dialog">Export OFX</string>
52+
<string name="title_export_dialog">Export Transactions</string>
5353
<string name="option_export_all_transactions">Export all transactions</string>
5454
<string name="hint_export_choice">By default, only new transactions since last export will be exported. Check this option to export all transactions</string>
5555
<string name="error_exporting">Error exporting OFX data</string>
@@ -339,6 +339,12 @@
339339
<string name="section_header_transactions">Transactions</string>
340340
<string name="section_header_accounts">Sub-Accounts</string>
341341
<string name="menu_search_accounts">Search</string>
342+
<string name="title_default_export_format">Default Export Format</string>
343+
<string name="summary_default_export_format">File format to use by default when exporting transactions</string>
344+
<string name="menu_export_transactions">Export transactions...</string>
345+
<!-- This should be the same name used by GnuCash desktop for imbalance accounts -->
346+
<string name="imbalance_account_name">Imbalance</string>
347+
<string name="title_progress_exporting_transactions">Exporting transactions</string>
342348
<plurals name="label_sub_accounts">
343349
<item quantity="one">%d sub-account</item>
344350
<item quantity="other">%d sub-accounts</item>
@@ -358,4 +364,8 @@
358364
<item>STOCK</item>
359365
<item>MUTUAL FUND</item>
360366
</string-array>
367+
<string-array name="export_formats">
368+
<item>QIF</item>
369+
<item>OFX</item>
370+
</string-array>
361371
</resources>

0 commit comments

Comments
 (0)