Skip to content

Commit

Permalink
Added new font and fixed password generator
Browse files Browse the repository at this point in the history
  • Loading branch information
John Flanagan committed Mar 1, 2012
1 parent deae15c commit cb3090e
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 12 deletions.
Binary file added Andale Mono.ttf
View file
Binary file not shown.
12 changes: 7 additions & 5 deletions MiniKeePass.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,13 @@
/* Begin PBXBuildFile section */
5235D58314F8160900B0C991 /* splash.png in Resources */ = {isa = PBXBuildFile; fileRef = 5235D58214F8160900B0C991 /* splash.png */; };
5235D58514F8176300B0C991 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 5235D58414F8176300B0C991 /* [email protected] */; };
523DCF2114E8E35F004A4C4F /* Monaco.dfont in Resources */ = {isa = PBXBuildFile; fileRef = 523DCF2014E8E35F004A4C4F /* Monaco.dfont */; };
52491D0C14D8F3FB00F8CBC8 /* de-createdb.html in Resources */ = {isa = PBXBuildFile; fileRef = 52491D0714D8F3FB00F8CBC8 /* de-createdb.html */; };
52491D0D14D8F3FB00F8CBC8 /* de-dropbox.html in Resources */ = {isa = PBXBuildFile; fileRef = 52491D0814D8F3FB00F8CBC8 /* de-dropbox.html */; };
52491D0E14D8F3FB00F8CBC8 /* de-itunes.html in Resources */ = {isa = PBXBuildFile; fileRef = 52491D0914D8F3FB00F8CBC8 /* de-itunes.html */; };
52491D0F14D8F3FB00F8CBC8 /* de-keyfiles.html in Resources */ = {isa = PBXBuildFile; fileRef = 52491D0A14D8F3FB00F8CBC8 /* de-keyfiles.html */; };
52491D1014D8F3FB00F8CBC8 /* de-safariemail.html in Resources */ = {isa = PBXBuildFile; fileRef = 52491D0B14D8F3FB00F8CBC8 /* de-safariemail.html */; };
529708AE14FEEFD3003547FB /* Andale Mono.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 529708AD14FEEFD3003547FB /* Andale Mono.ttf */; };
529708B014FEF149003547FB /* Andale Mono.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 529708AD14FEEFD3003547FB /* Andale Mono.ttf */; };
52A177BC13EB698E00CEEFCE /* createdb.html in Resources */ = {isa = PBXBuildFile; fileRef = 52A177BB13EB698E00CEEFCE /* createdb.html */; };
52A7E1A914EDF1CB0041F950 /* LockScreenController.m in Sources */ = {isa = PBXBuildFile; fileRef = 52A7E1A814EDF1CB0041F950 /* LockScreenController.m */; };
6802F9C614EC9C1D00ACD4C1 /* wrench.png in Resources */ = {isa = PBXBuildFile; fileRef = 6802F9C314EC9C1D00ACD4C1 /* wrench.png */; };
Expand Down Expand Up @@ -322,16 +323,16 @@
/* Begin PBXFileReference section */
5235D58214F8160900B0C991 /* splash.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = splash.png; sourceTree = "<group>"; };
5235D58414F8176300B0C991 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
523DCF2014E8E35F004A4C4F /* Monaco.dfont */ = {isa = PBXFileReference; lastKnownFileType = file; path = Monaco.dfont; sourceTree = "<group>"; };
52491D0714D8F3FB00F8CBC8 /* de-createdb.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = "de-createdb.html"; sourceTree = "<group>"; };
52491D0814D8F3FB00F8CBC8 /* de-dropbox.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = "de-dropbox.html"; sourceTree = "<group>"; };
52491D0914D8F3FB00F8CBC8 /* de-itunes.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = "de-itunes.html"; sourceTree = "<group>"; };
52491D0A14D8F3FB00F8CBC8 /* de-keyfiles.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = "de-keyfiles.html"; sourceTree = "<group>"; };
52491D0B14D8F3FB00F8CBC8 /* de-safariemail.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = "de-safariemail.html"; sourceTree = "<group>"; };
529708AD14FEEFD3003547FB /* Andale Mono.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Andale Mono.ttf"; sourceTree = "<group>"; };
529BED9E14D7CD8600618250 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/InfoPlist.strings; sourceTree = "<group>"; };
529BED9F14D7CD9700618250 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Localizable.strings; sourceTree = "<group>"; };
52A177BB13EB698E00CEEFCE /* createdb.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = createdb.html; sourceTree = "<group>"; };
52A7E1A714EDF1CB0041F950 /* LockScreenController.h */ = {isa = PBXFileReference; fileEncoding = 4; path = LockScreenController.h; sourceTree = "<group>"; };
52A7E1A714EDF1CB0041F950 /* LockScreenController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LockScreenController.h; sourceTree = "<group>"; };
52A7E1A814EDF1CB0041F950 /* LockScreenController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LockScreenController.m; sourceTree = "<group>"; };
6802F9C314EC9C1D00ACD4C1 /* wrench.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = wrench.png; sourceTree = "<group>"; };
6802F9C414EC9C1D00ACD4C1 /* wrench.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = wrench.svg; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1118,7 +1119,7 @@
689D041413A42B85005EBD36 /* Resources */ = {
isa = PBXGroup;
children = (
523DCF2014E8E35F004A4C4F /* Monaco.dfont */,
529708AD14FEEFD3003547FB /* Andale Mono.ttf */,
689D021313A42B63005EBD36 /* help */,
689D021A13A42B63005EBD36 /* images */,
689D021113A42B63005EBD36 /* Default.svg */,
Expand Down Expand Up @@ -1379,6 +1380,7 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
529708B014FEF149003547FB /* Andale Mono.ttf in Resources */,
689D032C13A42B63005EBD36 /* Default.png in Resources */,
689D032E13A42B63005EBD36 /* [email protected] in Resources */,
689D033213A42B63005EBD36 /* icon.png in Resources */,
Expand Down Expand Up @@ -1542,7 +1544,6 @@
52491D0E14D8F3FB00F8CBC8 /* de-itunes.html in Resources */,
52491D0F14D8F3FB00F8CBC8 /* de-keyfiles.html in Resources */,
52491D1014D8F3FB00F8CBC8 /* de-safariemail.html in Resources */,
523DCF2114E8E35F004A4C4F /* Monaco.dfont in Resources */,
6802F9C614EC9C1D00ACD4C1 /* wrench.png in Resources */,
6802F9C814EC9C1D00ACD4C1 /* [email protected] in Resources */,
68B0A70314ECBC1E005CFE31 /* reload.png in Resources */,
Expand All @@ -1559,6 +1560,7 @@
689DFFFE13A42740005EBD36 /* InfoPlist.strings in Resources */,
68E0831D146F2D50001C4EDF /* InfoPlist.strings in Resources */,
68E0831E146F2D56001C4EDF /* Localizable.strings in Resources */,
529708AE14FEEFD3003547FB /* Andale Mono.ttf in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
7 changes: 3 additions & 4 deletions MiniKeePass/MiniKeePass-Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,17 +61,16 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.1.4</string>
<string>1.2</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1.1.4</string>
<string>1.2</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>UIAppFonts</key>
<array>
<string>Menlo.ttc</string>
<string>Monaco.dfont</string>
<string>Andale Mono.ttf</string>
</array>
<key>UIFileSharingEnabled</key>
<true/>
Expand Down
2 changes: 1 addition & 1 deletion MiniKeePass/PasswordFieldCell.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reus
// Initialization code
NSUserDefaults* userDefaults = [NSUserDefaults standardUserDefaults];
textField.secureTextEntry = [userDefaults boolForKey:@"hidePasswords"];
textField.font = [UIFont fontWithName:@"Monaco" size:16];
textField.font = [UIFont fontWithName:@"Andale Mono" size:16];

UIImage *image = [UIImage imageNamed:@"wrench"];

Expand Down
7 changes: 5 additions & 2 deletions MiniKeePass/PasswordGeneratorViewController.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#define CHARSET_MINUS @"-"
#define CHARSET_UNDERLINE @"_"
#define CHARSET_SPACE @" "
#define CHARSET_SPECIAL @"!@#$%^&*_-+=?"
#define CHARSET_SPECIAL @"!\"#$%&'*+,./:;=?@\\^`"
#define CHARSET_BRACKETS @"(){}[]<>"

enum {
Expand Down Expand Up @@ -79,7 +79,7 @@ - (id)init {

passwordCell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:nil];
passwordCell.textLabel.text = @" ";
passwordCell.textLabel.font = [UIFont fontWithName:@"Monaco" size:16];
passwordCell.textLabel.font = [UIFont fontWithName:@"Andale Mono" size:16];
passwordCell.accessoryView = regenerateButton;
passwordCell.selectionStyle = UITableViewCellSelectionStyleNone;
}
Expand Down Expand Up @@ -146,6 +146,9 @@ - (void)generatePassword {
if (charSets & CHARACTER_SET_SPECIAL) {
[charSet appendString:CHARSET_SPECIAL];
}
if (charSets & CHARACTER_SET_BRACKETS) {
[charSet appendString:CHARSET_BRACKETS];
}

if ([charSet length] == 0) {
passwordCell.textLabel.text = @"";
Expand Down
Binary file removed Monaco.dfont
View file
Binary file not shown.

0 comments on commit cb3090e

Please sign in to comment.