rixxc/KeePassDX
1
0
Fork 0
mirror of https://github.com/Kunzisoft/KeePassDX.git synced 2025-12-04 15:49:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Combine strings.

Browse Source
This commit is contained in:
Brian Pellin
2009-10-25 20:12:11 -05:00
parent 9816557186
commit 54f1974936
4 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
res/layout/entry_view.xml
View File

@@ -131,12 +131,25 @@
android:layout_alignLeft="@id/entry_user_name"
android:layout_alignParentRight="true"
android:layout_alignBottom="@id/entry_accessed_label"/>
<!-- Expires -->
<TextView android:id="@+id/entry_expires_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_below="@id/entry_accessed"
android:text="@string/entry_expires" />
<TextView android:id="@+id/entry_expires"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignLeft="@id/entry_user_name"
android:layout_alignParentRight="true"
android:layout_alignBottom="@id/entry_expires_label"/>
<!-- Comment -->
<TextView android:id="@+id/entry_comment_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_below="@id/entry_accessed"
android:layout_below="@id/entry_expires"
android:text="@string/entry_comment" />
<TextView android:id="@+id/entry_comment"
android:layout_width="wrap_content"

3
res/values/strings.xml
View File

@@ -42,6 +42,7 @@
<string name="entry_comment">Comments: </string>
<string name="entry_confpassword">Confirm password:</string>
<string name="entry_created">Created: </string>
<string name="entry_expires">Expires: </string>
<string name="entry_keyfile">Key file (optional)</string>
<string name="entry_modified">Modified: </string>
<string name="entry_password">Password</string>
@@ -90,8 +91,8 @@
<string name="menu_open">Open</string>
<string name="menu_rename">Rename</string>
<string name="menu_search">Search</string>
<string name="menu_show_password">Show Password</string>
<string name="menu_url">Go to URL</string>
<string name="never">Never</string>
<string name="no_keys">No entries in the database or group.</string>
<string name="no_results">No search results</string>
<string name="no_url_handler">No handler for this url.</string>

6
src/com/keepassdroid/EntryActivity.java
View File

@@ -21,6 +21,7 @@ package com.keepassdroid;
import java.text.DateFormat;
import java.util.Calendar;
import java.util.Date;
import java.util.Timer;
import java.util.TimerTask;
import java.util.UUID;
@@ -123,6 +124,7 @@ public class EntryActivity extends LockingActivity {
populateText(R.id.entry_created, df.format(mEntry.tCreation));
populateText(R.id.entry_modified, df.format(mEntry.tLastMod));
populateText(R.id.entry_accessed, df.format(mEntry.tLastAccess));
populateText(R.id.entry_comment, mEntry.additional);
}
@@ -151,7 +153,7 @@ public class EntryActivity extends LockingActivity {
menu.add(0, MENU_DONATE, 0, R.string.menu_donate);
menu.findItem(MENU_DONATE).setIcon(android.R.drawable.ic_menu_share);
menu.add(0, MENU_PASS, 0, R.string.menu_show_password);
menu.add(0, MENU_PASS, 0, R.string.show_password);
menu.findItem(MENU_PASS).setIcon(android.R.drawable.ic_menu_view);
menu.add(0, MENU_GOTO_URL, 0, R.string.menu_url);
menu.findItem(MENU_GOTO_URL).setIcon(android.R.drawable.ic_menu_upload);
@@ -189,7 +191,7 @@ public class EntryActivity extends LockingActivity {
return true;
case MENU_PASS:
if ( mShowPassword ) {
item.setTitle(R.string.menu_show_password);
item.setTitle(R.string.show_password);
mShowPassword = false;
} else {
item.setTitle(R.string.menu_hide_password);

4
src/com/keepassdroid/EntryEditActivity.java
View File

@@ -207,7 +207,7 @@ public class EntryEditActivity extends LockingActivity {
menu.add(0, MENU_DONATE, 0, R.string.menu_donate);
menu.findItem(MENU_DONATE).setIcon(android.R.drawable.ic_menu_share);
menu.add(0, MENU_PASS, 0, R.string.menu_show_password);
menu.add(0, MENU_PASS, 0, R.string.show_password);
menu.findItem(MENU_PASS).setIcon(android.R.drawable.ic_menu_view);
return true;
@@ -229,7 +229,7 @@ public class EntryEditActivity extends LockingActivity {
item.setTitle(R.string.menu_hide_password);
mShowPassword = false;
} else {
item.setTitle(R.string.menu_show_password);
item.setTitle(R.string.show_password);
mShowPassword = true;
}
setPasswordStyle();