adium 4698:1621c1611d64: lock-locked.png is also used for the OT...
commits at adium.im
commits at adium.im
Sun Feb 26 09:38:21 UTC 2012
details: http://hg.adium.im/adium/rev/1621c1611d64
revision: 4698:1621c1611d64
branch: (none)
author: Robert Vehse
date: Sun Feb 26 10:37:38 2012 +0100
lock-locked.png is also used for the OTR preferences.
diffs (93 lines):
diff -r 8990ebd1b56a -r 1621c1611d64 Adium.xcodeproj/project.pbxproj
--- a/Adium.xcodeproj/project.pbxproj Sun Feb 26 10:19:46 2012 +0100
+++ b/Adium.xcodeproj/project.pbxproj Sun Feb 26 10:37:38 2012 +0100
@@ -259,8 +259,8 @@
3419DE780A81042F00C3FC68 /* emoticon32.png in Resources */ = {isa = PBXBuildFile; fileRef = 3428B33E0815E1FB00C0D3DC /* emoticon32.png */; };
3419DE790A81042F00C3FC68 /* emoticon32_transparent.png in Resources */ = {isa = PBXBuildFile; fileRef = 345F590608199746001F733C /* emoticon32_transparent.png */; };
3419DE7A0A81042F00C3FC68 /* FontPanelAccessoryView.nib in Resources */ = {isa = PBXBuildFile; fileRef = 34B995D9092A832700E31E91 /* FontPanelAccessoryView.nib */; };
- 3419DE7C0A81042F00C3FC68 /* msg-lock-locked.png in Resources */ = {isa = PBXBuildFile; fileRef = 34DFF53007A62EB100B92233 /* msg-lock-locked.png */; };
- 3419DE7D0A81042F00C3FC68 /* msg-lock-unlocked.png in Resources */ = {isa = PBXBuildFile; fileRef = 34DFF52607A62EB000B92233 /* msg-lock-unlocked.png */; };
+ 3419DE7C0A81042F00C3FC68 /* lock-locked.png in Resources */ = {isa = PBXBuildFile; fileRef = 34DFF53007A62EB100B92233 /* lock-locked.png */; };
+ 3419DE7D0A81042F00C3FC68 /* lock-unlocked.png in Resources */ = {isa = PBXBuildFile; fileRef = 34DFF52607A62EB000B92233 /* lock-unlocked.png */; };
3419DE7E0A81042F00C3FC68 /* remove.png in Resources */ = {isa = PBXBuildFile; fileRef = 347E787507CA975900350507 /* remove.png */; };
3419DE7F0A81042F00C3FC68 /* msg-send-file.png in Resources */ = {isa = PBXBuildFile; fileRef = 34D8326307CBD598006466F2 /* msg-send-file.png */; };
3419DE820A81042F00C3FC68 /* ToolbarPrefs.plist in Resources */ = {isa = PBXBuildFile; fileRef = 34D8327607CBD5B3006466F2 /* ToolbarPrefs.plist */; };
@@ -3648,8 +3648,8 @@
34DC84280A7EA012003E1636 /* nl */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = nl; path = Resources/nl.lproj/ESFileTransferProgressView.nib; sourceTree = "<group>"; };
34DFF46007A5EABF00B92233 /* ESSecureMessagingPlugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ESSecureMessagingPlugin.h; path = "Plugins/Secure Messaging/ESSecureMessagingPlugin.h"; sourceTree = "<group>"; };
34DFF46107A5EABF00B92233 /* ESSecureMessagingPlugin.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ESSecureMessagingPlugin.m; path = "Plugins/Secure Messaging/ESSecureMessagingPlugin.m"; sourceTree = "<group>"; };
- 34DFF52607A62EB000B92233 /* msg-lock-unlocked.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "msg-lock-unlocked.png"; path = "Plugins/Secure Messaging/msg-lock-unlocked.png"; sourceTree = "<group>"; };
- 34DFF53007A62EB100B92233 /* msg-lock-locked.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "msg-lock-locked.png"; path = "Plugins/Secure Messaging/msg-lock-locked.png"; sourceTree = "<group>"; };
+ 34DFF52607A62EB000B92233 /* lock-unlocked.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "lock-unlocked.png"; path = "Plugins/Secure Messaging/lock-unlocked.png"; sourceTree = "<group>"; };
+ 34DFF53007A62EB100B92233 /* lock-locked.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "lock-locked.png"; path = "Plugins/Secure Messaging/lock-locked.png"; sourceTree = "<group>"; };
34E00F7407B92B2E000DF265 /* ESTextAndButtonsWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ESTextAndButtonsWindowController.h; path = "Frameworks/Adium Framework/Source/ESTextAndButtonsWindowController.h"; sourceTree = "<group>"; };
34E00F7507B92B2F000DF265 /* ESTextAndButtonsWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ESTextAndButtonsWindowController.m; path = "Frameworks/Adium Framework/Source/ESTextAndButtonsWindowController.m"; sourceTree = "<group>"; };
34E00F8607B92B88000DF265 /* TextAndButtonsWindow.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = TextAndButtonsWindow.nib; path = "Frameworks/Adium Framework/Resources/TextAndButtonsWindow.nib"; sourceTree = "<group>"; };
@@ -6538,8 +6538,8 @@
3428B33E0815E1FB00C0D3DC /* emoticon32.png */,
345F590608199746001F733C /* emoticon32_transparent.png */,
34B995D9092A832700E31E91 /* FontPanelAccessoryView.nib */,
- 34DFF53007A62EB100B92233 /* msg-lock-locked.png */,
- 34DFF52607A62EB000B92233 /* msg-lock-unlocked.png */,
+ 34DFF53007A62EB100B92233 /* lock-locked.png */,
+ 34DFF52607A62EB000B92233 /* lock-unlocked.png */,
347E787507CA975900350507 /* remove.png */,
34D8326307CBD598006466F2 /* msg-send-file.png */,
4BB2EB200D88D76100CA7A7D /* timestamp32.png */,
@@ -9851,8 +9851,8 @@
3419DE780A81042F00C3FC68 /* emoticon32.png in Resources */,
3419DE790A81042F00C3FC68 /* emoticon32_transparent.png in Resources */,
3419DE7A0A81042F00C3FC68 /* FontPanelAccessoryView.nib in Resources */,
- 3419DE7C0A81042F00C3FC68 /* msg-lock-locked.png in Resources */,
- 3419DE7D0A81042F00C3FC68 /* msg-lock-unlocked.png in Resources */,
+ 3419DE7C0A81042F00C3FC68 /* lock-locked.png in Resources */,
+ 3419DE7D0A81042F00C3FC68 /* lock-unlocked.png in Resources */,
3419DE7E0A81042F00C3FC68 /* remove.png in Resources */,
3419DE7F0A81042F00C3FC68 /* msg-send-file.png in Resources */,
3419DE820A81042F00C3FC68 /* ToolbarPrefs.plist in Resources */,
diff -r 8990ebd1b56a -r 1621c1611d64 Plugins/Secure Messaging/ESSecureMessagingPlugin.m
--- a/Plugins/Secure Messaging/ESSecureMessagingPlugin.m Sun Feb 26 10:19:46 2012 +0100
+++ b/Plugins/Secure Messaging/ESSecureMessagingPlugin.m Sun Feb 26 10:37:38 2012 +0100
@@ -67,8 +67,8 @@
[adium.contentController setEncryptor:[[[AdiumOTREncryption alloc] init] autorelease]];
_secureMessagingMenu = nil;
- lockImage_Locked = [[NSImage imageNamed:@"msg-lock-locked" forClass:[self class]] retain];
- lockImage_Unlocked = [[NSImage imageNamed:@"msg-lock-unlocked" forClass:[self class]] retain];
+ lockImage_Locked = [[NSImage imageNamed:@"lock-locked" forClass:[self class]] retain];
+ lockImage_Unlocked = [[NSImage imageNamed:@"lock-unlocked" forClass:[self class]] retain];
[self registerToolbarItem];
[self configureMenuItems];
diff -r 8990ebd1b56a -r 1621c1611d64 Plugins/Secure Messaging/lock-locked.png
Binary file Plugins/Secure Messaging/lock-locked.png has changed
diff -r 8990ebd1b56a -r 1621c1611d64 Plugins/Secure Messaging/lock-unlocked.png
Binary file Plugins/Secure Messaging/lock-unlocked.png has changed
diff -r 8990ebd1b56a -r 1621c1611d64 Plugins/Secure Messaging/msg-lock-locked.png
Binary file Plugins/Secure Messaging/msg-lock-locked.png has changed
diff -r 8990ebd1b56a -r 1621c1611d64 Plugins/Secure Messaging/msg-lock-unlocked.png
Binary file Plugins/Secure Messaging/msg-lock-unlocked.png has changed
diff -r 8990ebd1b56a -r 1621c1611d64 Source/ESOTRFingerprintDetailsWindowController.m
--- a/Source/ESOTRFingerprintDetailsWindowController.m Sun Feb 26 10:19:46 2012 +0100
+++ b/Source/ESOTRFingerprintDetailsWindowController.m Sun Feb 26 10:37:38 2012 +0100
@@ -91,7 +91,7 @@
- (void)windowDidLoad
{
- [imageView_lock setImage:[NSImage imageNamed:@"msg-lock-locked" forClass:[adium class]]];
+ [imageView_lock setImage:[NSImage imageNamed:@"lock-locked" forClass:[adium class]]];
[[self window] setTitle:AILocalizedString(@"OTR Fingerprint",nil)];
[button_OK setLocalizedString:AILocalizedString(@"OK",nil)];
diff -r 8990ebd1b56a -r 1621c1611d64 Source/ESOTRPreferences.m
--- a/Source/ESOTRPreferences.m Sun Feb 26 10:19:46 2012 +0100
+++ b/Source/ESOTRPreferences.m Sun Feb 26 10:37:38 2012 +0100
@@ -45,7 +45,7 @@
}
- (NSImage *)image
{
- return [NSImage imageNamed:@"msg-lock-locked" forClass:[adium class]];
+ return [NSImage imageNamed:@"lock-locked" forClass:[adium class]];
}
- (void)viewDidLoad
More information about the commits
mailing list