Changeset 3237

Timestamp:

05/31/06 01:38:53 (2 years ago)

Author:

timothy

Message:

Patch and icons submitted by Sine Otter to finish the room founder and administrator code. Thanks!

Files:

• trunk/Colloquy.xcodeproj/project.pbxproj (modified) (4 diffs)
• trunk/Panels/JVChatRoomMember.m (modified) (2 diffs)
• trunk/Resources/founder-idle.png (added)
• trunk/Resources/founder.png (added)
• trunk/Resources/super-op-idle.png (added)
• trunk/Resources/super-op.png (added)

trunk/Colloquy.xcodeproj/project.pbxproj

@@ -224 +224 @@
-                1CBC634905489BEE009E59E1 /* JVGeneralPreferences.nib in Resources */ = {isa = PBXBuildFile; fileRef = 1CBC634705489BEE009E59E1 /* JVGeneralPreferences.nib */; };
-                1CC1AE630A2987E20000A797 /* sqlite3.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1CC1AE400A2987230000A797 /* sqlite3.a */; };
+                1CC1B76F0A2D70DF0000A797 /* super-op.png in Resources */ = {isa = PBXBuildFile; fileRef = 1CC1B76D0A2D70DF0000A797 /* super-op.png */; };
+                1CC1B77D0A2D70FB0000A797 /* founder.png in Resources */ = {isa = PBXBuildFile; fileRef = 1CC1B77B0A2D70FB0000A797 /* founder.png */; };
-                1CC5650708F0CFEE00B8E333 /* Colloquy.r in Rez */ = {isa = PBXBuildFile; fileRef = 1C7C77DF07DBD49F00FB5F83 /* Colloquy.r */; };
-                1CC6FC530549FCD80075807C /* JVAppearancePreferences.m in Sources */ = {isa = PBXBuildFile; fileRef = 1CC6FC510549FCD70075807C /* JVAppearancePreferences.m */; };
@@ -661 +663 @@
-                1CBECE5D050A8D21000001C8 /* chooseStyle.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = chooseStyle.png; path = "Resources/Toolbar Icons/chooseStyle.png"; sourceTree = SOURCE_ROOT; };
-                1CC1AE400A2987230000A797 /* sqlite3.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = sqlite3.a; path = Frameworks/sqlite3.a; sourceTree = "<group>"; };
+                1CC1B76C0A2D70DF0000A797 /* super-op-idle.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "super-op-idle.png"; path = "Resources/super-op-idle.png"; sourceTree = "<group>"; };
+                1CC1B76D0A2D70DF0000A797 /* super-op.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "super-op.png"; path = "Resources/super-op.png"; sourceTree = "<group>"; };
+                1CC1B77A0A2D70FB0000A797 /* founder-idle.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "founder-idle.png"; path = "Resources/founder-idle.png"; sourceTree = "<group>"; };
+                1CC1B77B0A2D70FB0000A797 /* founder.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = founder.png; path = Resources/founder.png; sourceTree = "<group>"; };
-                1CC6FC500549FCD70075807C /* JVAppearancePreferences.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = JVAppearancePreferences.h; path = Preferences/JVAppearancePreferences.h; sourceTree = "<group>"; };
-                1CC6FC510549FCD70075807C /* JVAppearancePreferences.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = JVAppearancePreferences.m; path = Preferences/JVAppearancePreferences.m; sourceTree = "<group>"; };
@@ -1729 +1735 @@
-                                F5BEC20D01F1EF1901EE70DE /* admin.png */,
-                                F5BEC20E01F1EF1901EE70DE /* admin-idle.png */,
+                                1CC1B76D0A2D70DF0000A797 /* super-op.png */,
+                                1CC1B76C0A2D70DF0000A797 /* super-op-idle.png */,
+                                1CC1B77B0A2D70FB0000A797 /* founder.png */,
+                                1CC1B77A0A2D70FB0000A797 /* founder-idle.png */,
-                                F544999E018E46CB01EE70DE /* person.png */,
-                                F5BEC20701F13A8601EE70DE /* person-idle.png */,
@@ -2167 +2177 @@
-                                1C710C5009F323F8007B4515 /* splitviewDividerBackground.png in Resources */,
-                                1CEC004F0A20EF99004C2B86 /* transcriptSchema.sql in Resources */,
+                                1CC1B76F0A2D70DF0000A797 /* super-op.png in Resources */,
+                                1CC1B77D0A2D70FB0000A797 /* founder.png in Resources */,
-                        );
-                        runOnlyForDeploymentPostprocessing = 0;

trunk/Panels/JVChatRoomMember.m

@@ -231 +231 @@
-        NSString *class = nil;
-        if( [self serverOperator] ) class = @"server operator";
-
+
+
-        else if( [self operator] ) class = @"operator";
-        else if( [self halfOperator] ) class = @"half operator";
@@ -259 +260 @@
-
-        if( [[self user] isServerOperator] ) icon = [NSImage imageNamed:@"admin"];
+        else if( modes & MVChatRoomMemberFounderMode ) icon = [NSImage imageNamed:@"founder"];
+        else if( modes & MVChatRoomMemberAdministratorMode ) icon = [NSImage imageNamed:@"super-op"];
-        else if( modes & MVChatRoomMemberOperatorMode ) icon = [NSImage imageNamed:@"op"];
-        else if( modes & MVChatRoomMemberHalfOperatorMode ) icon = [NSImage imageNamed:@"half-op"];