Changeset 3580
- Timestamp:
- 02/07/07 21:48:25 (2 years ago)
- Files:
-
- trunk/Chat Core/MVIRCChatConnection.m (modified) (1 diff)
- trunk/Panels/JVChatRoomMember.m (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/Chat Core/MVIRCChatConnection.m
r3555 r3580 2119 2119 unsigned long mode = ( value & ~enabledHighBit ); 2120 2120 2121 if( mode == MVChatRoomMember OperatorMode || mode == MVChatRoomMemberHalfOperatorMode || mode == MVChatRoomMemberVoicedMode ) {2121 if( mode == MVChatRoomMemberFounderMode || mode == MVChatRoomMemberAdministratorMode || mode == MVChatRoomMemberOperatorMode || mode == MVChatRoomMemberHalfOperatorMode || mode == MVChatRoomMemberVoicedMode ) { 2122 2122 MVChatUser *member = [self chatUserWithUniqueIdentifier:param]; 2123 2123 if( enabled ) [room _setMode:mode forMemberUser:member]; trunk/Panels/JVChatRoomMember.m
r3579 r3580 420 420 } 421 421 422 if( ( ( localUserIsAdministrator || localUserIsFounder ) && ( localUserIsAdministrator && ! [self roomFounder]) ) && ( [features containsObject:MVChatRoomMemberAdministratorFeature] ) ) {422 if( ( ( localUserIsAdministrator || localUserIsFounder ) && ( (localUserIsAdministrator && ! [self roomFounder]) || localUserIsFounder ) ) && ( [features containsObject:MVChatRoomMemberAdministratorFeature] ) ) { 423 423 item = [[NSMenuItem alloc] initWithTitle:NSLocalizedString( @"Administrator", "administrator contextual menu - admin only") action:@selector( toggleAdministratorStatus: ) keyEquivalent:@""]; 424 424 [item setTarget:self]; … … 427 427 } 428 428 429 if( ( localUserIsOperator || localUserIsAdministrator || localUserIsFounder ) && ( (localUserIsOperator && ! ([self roomAdministrator] || [self roomFounder])) || (localUserIsAdministrator && ! [self roomFounder]) ) ) {429 if( ( localUserIsOperator || localUserIsAdministrator || localUserIsFounder ) && ( (localUserIsOperator && ! ([self roomAdministrator] || [self roomFounder])) || (localUserIsAdministrator && ! [self roomFounder]) || localUserIsFounder ) ) { 430 430 if( [features containsObject:MVChatRoomMemberOperatorFeature] ) { 431 431 item = [[NSMenuItem alloc] initWithTitle:NSLocalizedString( @"Operator", "operator contextual menu - admin only") action:@selector( toggleOperatorStatus: ) keyEquivalent:@""]; … … 444 444 445 445 if( localUserIsHalfOperator || localUserIsOperator || localUserIsAdministrator || localUserIsFounder ) { 446 if( [features containsObject:MVChatRoomMemberVoicedFeature] && ( (localUserIsHalfOperator && ! ([self operator] || [self roomAdministrator] || [self roomFounder]) ) || (localUserIsOperator && ! ([self roomAdministrator] || [self roomFounder])) || (localUserIsAdministrator && ! [self roomFounder]) ) ) {446 if( [features containsObject:MVChatRoomMemberVoicedFeature] && ( (localUserIsHalfOperator && ! ([self operator] || [self roomAdministrator] || [self roomFounder]) ) || (localUserIsOperator && ! ([self roomAdministrator] || [self roomFounder])) || (localUserIsAdministrator && ! [self roomFounder]) || localUserIsFounder ) ) { 447 447 item = [[NSMenuItem alloc] initWithTitle:NSLocalizedString( @"Voice", "voice contextual menu - admin only") action:@selector( toggleVoiceStatus: ) keyEquivalent:@""]; 448 448 [item setTarget:self]; … … 491 491 [menuItem setState:NSOffState]; 492 492 } 493 } else if( [menuItem action] == @selector( toggleAdministratorStatus: ) ) { 494 if( [self roomAdministrator] ) { 495 [menuItem setState:NSOnState]; 496 } else { 497 [menuItem setState:NSOffState]; 498 } 499 } else if( [menuItem action] == @selector( toggleFounderStatus: ) ) { 500 if( [self roomFounder] ) { 501 [menuItem setState:NSOnState]; 502 } else { 503 [menuItem setState:NSOffState]; 504 } 493 505 } 494 506 return YES; … … 533 545 534 546 - (IBAction) toggleFounderStatus:(id) sender { 535 if( [self founder] ) [[_room target] removeMode:MVChatRoomMemberFounderMode forMemberUser:_user];547 if( [self roomFounder] ) [[_room target] removeMode:MVChatRoomMemberFounderMode forMemberUser:_user]; 536 548 else [[_room target] setMode:MVChatRoomMemberFounderMode forMemberUser:_user]; 537 549 } 538 550 539 551 - (IBAction) toggleAdministratorStatus:(id) sender { 540 if( [self administrator] ) [[_room target] removeMode:MVChatRoomMemberAdministratorMode forMemberUser:_user];552 if( [self roomAdministrator] ) [[_room target] removeMode:MVChatRoomMemberAdministratorMode forMemberUser:_user]; 541 553 else [[_room target] setMode:MVChatRoomMemberAdministratorMode forMemberUser:_user]; 542 554 }
