Changeset 5

Show
Ignore:
Timestamp:
12/09/06 17:56:53 (2 years ago)
Author:
mronge2
Message:

Removed Mainbar.h and some of the unnecessary XML code that goes along with it

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/src/Frontend/MainToolbar.h

    r4 r5  
    2626 THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  
    2727 */ 
    28 // 
    29 //  MainToolbar.h 
    30 //  OSXnews 
    31 // 
    32 //  Copyright 2004 Anurodh Pokharel. All rights reserved. 
    33 // 
    3428 
    3529#import <Cocoa/Cocoa.h> 
    …… 
    3933        NSArray *text; 
    4034} 
    41  
    42         - (NSToolbarItem *)toolbar:(NSToolbar *)toolbar itemForItemIdentifier:(NSString *)itemIdentifier willBeInsertedIntoToolbar:(BOOL)flag; 
    43         - (NSArray *)toolbarAllowedItemIdentifiers:(NSToolbar*)toolbar; 
    44         - (NSArray *)toolbarDefaultItemIdentifiers:(NSToolbar*)toolbar; 
    45         -(void) loadText; 
    46  
     35- (NSToolbarItem *)toolbar:(NSToolbar *)toolbar itemForItemIdentifier:(NSString *)itemIdentifier willBeInsertedIntoToolbar:(BOOL)flag; 
     36- (NSArray *)toolbarAllowedItemIdentifiers:(NSToolbar*)toolbar; 
     37- (NSArray *)toolbarDefaultItemIdentifiers:(NSToolbar*)toolbar; 
     38- (void)loadText; 
    4739@end 

  • trunk/src/Frontend/MainWindow.h

    r4 r5  
    4242#import "MainUI.h" 
    4343#import "Preferences.h" 
    44 #import "Menubar.h" 
    4544#import "MySplitView.h" 
    4645 
    …… 
    169168        MainUI* uiStrings;  
    170169        Preferences* prefStrings;  
    171         Menubar* menuStrings; 
     170        NSArray *menuStrings; 
    172171} 
    173172 

  • trunk/src/Frontend/MainWindow.m

    r4 r5  
    528528        [uiStrings loadText]; 
    529529         
    530         menuStrings=[Menubar alloc]; 
    531         //[menuStrings writeText] ;  
    532         [menuStrings loadText]; 
     530        menuStrings=[NSArray arrayWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"Menubar" ofType:@"xml"]]; 
     531        [menuStrings retain]; 
    533532                 
    534533          //assign the sting values for the titles of columns 
    …… 
    599598 
    600599//dock menu 
    601 [newMSg setTitle: [[[menuStrings Text] objectAtIndex:9] objectAtIndex:0] ]; 
    602  
    603 [[OSXnewsMenu itemAtIndex:0] setTitle:[[[menuStrings Text] objectAtIndex:0] objectAtIndex:0] ]; 
    604 //space 
    605 [[OSXnewsMenu itemAtIndex:2] setTitle:[[[menuStrings Text] objectAtIndex:1] objectAtIndex:0] ]; 
    606 [[OSXnewsMenu itemAtIndex:3] setTitle:[[[menuStrings Text] objectAtIndex:2] objectAtIndex:0] ]; 
    607 //space 
    608 [[OSXnewsMenu itemAtIndex:5] setTitle:[[[menuStrings Text] objectAtIndex:3] objectAtIndex:0] ]; 
    609 //space 
    610 [[OSXnewsMenu itemAtIndex:7] setTitle:[[[menuStrings Text] objectAtIndex:4] objectAtIndex:0] ]; 
    611 [[OSXnewsMenu itemAtIndex:8] setTitle:[[[menuStrings Text] objectAtIndex:5] objectAtIndex:0] ]; 
    612 [[OSXnewsMenu itemAtIndex:9] setTitle:[[[menuStrings Text] objectAtIndex:6] objectAtIndex:0] ]; 
    613 //space 
    614 [[OSXnewsMenu itemAtIndex:11] setTitle:[[[menuStrings Text] objectAtIndex:7] objectAtIndex:0] ]; 
    615  
    616  
    617 [fileMenu setTitle: [[[menuStrings Text] objectAtIndex:8] objectAtIndex:0] ];  
    618 [[fileMenu itemAtIndex:0] setTitle:[[[menuStrings Text] objectAtIndex:9] objectAtIndex:0] ]; 
    619 [[fileMenu itemAtIndex:1] setTitle:[[[menuStrings Text] objectAtIndex:10] objectAtIndex:0] ]; 
    620 [[fileMenu itemAtIndex:2] setTitle:[[[menuStrings Text] objectAtIndex:11] objectAtIndex:0] ]; 
    621 [[fileMenu itemAtIndex:3] setTitle:[[[menuStrings Text] objectAtIndex:12] objectAtIndex:0] ]; 
    622 //space 
    623 [[fileMenu itemAtIndex:5] setTitle:[[[menuStrings Text] objectAtIndex:13] objectAtIndex:0] ]; 
    624 [[fileMenu itemAtIndex:6] setTitle:[[[menuStrings Text] objectAtIndex:14] objectAtIndex:0] ]; 
    625 [[fileMenu itemAtIndex:7] setTitle:[[[menuStrings Text] objectAtIndex:15] objectAtIndex:0] ]; 
    626 [[fileMenu itemAtIndex:8] setTitle:[[[menuStrings Text] objectAtIndex:16] objectAtIndex:0] ]; 
    627 //space 
    628 [[fileMenu itemAtIndex:10] setTitle:[[[menuStrings Text] objectAtIndex:17] objectAtIndex:0] ]; 
    629 [[fileMenu itemAtIndex:11] setTitle:[[[menuStrings Text] objectAtIndex:18] objectAtIndex:0] ]; 
    630  
    631 [editMenu setTitle: [[[menuStrings Text] objectAtIndex:19] objectAtIndex:0]]; 
    632 [[editMenu itemAtIndex:0] setTitle:[[[menuStrings Text] objectAtIndex:20] objectAtIndex:0] ]; 
    633 [[editMenu itemAtIndex:1] setTitle:[[[menuStrings Text] objectAtIndex:21] objectAtIndex:0] ]; 
    634 //space 
    635 [[editMenu itemAtIndex:3] setTitle:[[[menuStrings Text] objectAtIndex:22] objectAtIndex:0] ]; 
    636 [[editMenu itemAtIndex:4] setTitle:[[[menuStrings Text] objectAtIndex:23] objectAtIndex:0] ]; 
    637 [[editMenu itemAtIndex:5] setTitle:[[[menuStrings Text] objectAtIndex:24] objectAtIndex:0] ]; 
    638 [[editMenu itemAtIndex:6] setTitle:[[[menuStrings Text] objectAtIndex:25] objectAtIndex:0] ]; 
    639 [[editMenu itemAtIndex:7] setTitle:[[[menuStrings Text] objectAtIndex:26] objectAtIndex:0] ]; 
    640 //space 
    641 [[editMenu itemAtIndex:9] setTitle:[[[menuStrings Text] objectAtIndex:27] objectAtIndex:0] ]; 
    642 [[editMenu itemAtIndex:10] setTitle:[[[menuStrings Text] objectAtIndex:28] objectAtIndex:0] ]; 
    643  
    644 [newsgroupsMenu setTitle: [[[menuStrings Text] objectAtIndex:29] objectAtIndex:0]]; 
    645 [[newsgroupsMenu itemAtIndex:0] setTitle:[[[menuStrings Text] objectAtIndex:30] objectAtIndex:0] ]; 
    646 [[newsgroupsMenu itemAtIndex:1] setTitle:[[[menuStrings Text] objectAtIndex:31] objectAtIndex:0] ]; 
    647 [[newsgroupsMenu itemAtIndex:2] setTitle:[[[menuStrings Text] objectAtIndex:32] objectAtIndex:0] ]; 
    648  
    649  
    650 [messagesMenu setTitle: [[[menuStrings Text] objectAtIndex:33] objectAtIndex:0]]; 
    651 [[messagesMenu itemAtIndex:0] setTitle:[[[menuStrings Text] objectAtIndex:34] objectAtIndex:0] ]; 
    652 //space 
    653 [[messagesMenu itemAtIndex:2] setTitle:[[[menuStrings Text] objectAtIndex:35] objectAtIndex:0] ]; 
    654 [[messagesMenu itemAtIndex:3] setTitle:[[[menuStrings Text] objectAtIndex:36] objectAtIndex:0] ]; 
    655 [[messagesMenu itemAtIndex:4] setTitle:[[[menuStrings Text] objectAtIndex:37] objectAtIndex:0] ]; 
    656 //space 
    657 [[messagesMenu itemAtIndex:6] setTitle:[[[menuStrings Text] objectAtIndex:38] objectAtIndex:0] ]; 
    658 [[messagesMenu itemAtIndex:7] setTitle:[[[menuStrings Text] objectAtIndex:39] objectAtIndex:0] ]; 
    659 [[messagesMenu itemAtIndex:8] setTitle:[[[menuStrings Text] objectAtIndex:40] objectAtIndex:0] ]; 
    660 //space 
    661 [[messagesMenu itemAtIndex:10] setTitle:[[[menuStrings Text] objectAtIndex:41] objectAtIndex:0] ]; 
    662  
    663  
    664 [windowMenu setTitle: [[[menuStrings Text] objectAtIndex:42] objectAtIndex:0]]; 
    665 [[windowMenu itemAtIndex:0] setTitle:[[[menuStrings Text] objectAtIndex:43] objectAtIndex:0] ]; 
    666 [[windowMenu itemAtIndex:1] setTitle:[[[menuStrings Text] objectAtIndex:44] objectAtIndex:0] ]; 
    667 //space 
    668 [[windowMenu itemAtIndex:3] setTitle:[[[menuStrings Text] objectAtIndex:45] objectAtIndex:0] ]; 
    669  
    670 [helpMenu setTitle: [[[menuStrings Text] objectAtIndex:46] objectAtIndex:0] ];  
    671 [[helpMenu itemAtIndex:0] setTitle:[[[menuStrings Text] objectAtIndex:47] objectAtIndex:0] ]; 
     600[newMSg setTitle: [[menuStrings objectAtIndex:9] objectAtIndex:0] ]; 
     601 
     602[[OSXnewsMenu itemAtIndex:0] setTitle:[[menuStrings objectAtIndex:0] objectAtIndex:0] ]; 
     603//space 
     604[[OSXnewsMenu itemAtIndex:2] setTitle:[[menuStrings objectAtIndex:1] objectAtIndex:0] ]; 
     605[[OSXnewsMenu itemAtIndex:3] setTitle:[[menuStrings objectAtIndex:2] objectAtIndex:0] ]; 
     606//space 
     607[[OSXnewsMenu itemAtIndex:5] setTitle:[[menuStrings objectAtIndex:3] objectAtIndex:0] ]; 
     608//space 
     609[[OSXnewsMenu itemAtIndex:7] setTitle:[[menuStrings objectAtIndex:4] objectAtIndex:0] ]; 
     610[[OSXnewsMenu itemAtIndex:8] setTitle:[[menuStrings objectAtIndex:5] objectAtIndex:0] ]; 
     611[[OSXnewsMenu itemAtIndex:9] setTitle:[[menuStrings objectAtIndex:6] objectAtIndex:0] ]; 
     612//space 
     613[[OSXnewsMenu itemAtIndex:11] setTitle:[[menuStrings objectAtIndex:7] objectAtIndex:0] ]; 
     614 
     615 
     616[fileMenu setTitle: [[menuStrings objectAtIndex:8] objectAtIndex:0] ];  
     617[[fileMenu itemAtIndex:0] setTitle:[[menuStrings objectAtIndex:9] objectAtIndex:0] ]; 
     618[[fileMenu itemAtIndex:1] setTitle:[[menuStrings objectAtIndex:10] objectAtIndex:0] ]; 
     619[[fileMenu itemAtIndex:2] setTitle:[[menuStrings objectAtIndex:11] objectAtIndex:0] ]; 
     620[[fileMenu itemAtIndex:3] setTitle:[[menuStrings objectAtIndex:12] objectAtIndex:0] ]; 
     621//space 
     622[[fileMenu itemAtIndex:5] setTitle:[[menuStrings objectAtIndex:13] objectAtIndex:0] ]; 
     623[[fileMenu itemAtIndex:6] setTitle:[[menuStrings objectAtIndex:14] objectAtIndex:0] ]; 
     624[[fileMenu itemAtIndex:7] setTitle:[[menuStrings objectAtIndex:15] objectAtIndex:0] ]; 
     625[[fileMenu itemAtIndex:8] setTitle:[[menuStrings objectAtIndex:16] objectAtIndex:0] ]; 
     626//space 
     627[[fileMenu itemAtIndex:10] setTitle:[[menuStrings objectAtIndex:17] objectAtIndex:0] ]; 
     628[[fileMenu itemAtIndex:11] setTitle:[[menuStrings objectAtIndex:18] objectAtIndex:0] ]; 
     629 
     630[editMenu setTitle: [[menuStrings objectAtIndex:19] objectAtIndex:0]]; 
     631[[editMenu itemAtIndex:0] setTitle:[[menuStrings objectAtIndex:20] objectAtIndex:0] ]; 
     632[[editMenu itemAtIndex:1] setTitle:[[menuStrings objectAtIndex:21] objectAtIndex:0] ]; 
     633//space 
     634[[editMenu itemAtIndex:3] setTitle:[[menuStrings objectAtIndex:22] objectAtIndex:0] ]; 
     635[[editMenu itemAtIndex:4] setTitle:[[menuStrings objectAtIndex:23] objectAtIndex:0] ]; 
     636[[editMenu itemAtIndex:5] setTitle:[[menuStrings objectAtIndex:24] objectAtIndex:0] ]; 
     637[[editMenu itemAtIndex:6] setTitle:[[menuStrings objectAtIndex:25] objectAtIndex:0] ]; 
     638[[editMenu itemAtIndex:7] setTitle:[[menuStrings objectAtIndex:26] objectAtIndex:0] ]; 
     639//space 
     640[[editMenu itemAtIndex:9] setTitle:[[menuStrings objectAtIndex:27] objectAtIndex:0] ]; 
     641[[editMenu itemAtIndex:10] setTitle:[[menuStrings objectAtIndex:28] objectAtIndex:0] ]; 
     642 
     643[newsgroupsMenu setTitle: [[menuStrings objectAtIndex:29] objectAtIndex:0]]; 
     644[[newsgroupsMenu itemAtIndex:0] setTitle:[[menuStrings objectAtIndex:30] objectAtIndex:0] ]; 
     645[[newsgroupsMenu itemAtIndex:1] setTitle:[[menuStrings objectAtIndex:31] objectAtIndex:0] ]; 
     646[[newsgroupsMenu itemAtIndex:2] setTitle:[[menuStrings objectAtIndex:32] objectAtIndex:0] ]; 
     647 
     648 
     649[messagesMenu setTitle: [[menuStrings objectAtIndex:33] objectAtIndex:0]]; 
     650[[messagesMenu itemAtIndex:0] setTitle:[[menuStrings objectAtIndex:34] objectAtIndex:0] ]; 
     651//space 
     652[[messagesMenu itemAtIndex:2] setTitle:[[menuStrings objectAtIndex:35] objectAtIndex:0] ]; 
     653[[messagesMenu itemAtIndex:3] setTitle:[[menuStrings objectAtIndex:36] objectAtIndex:0] ]; 
     654[[messagesMenu itemAtIndex:4] setTitle:[[menuStrings objectAtIndex:37] objectAtIndex:0] ]; 
     655//space 
     656[[messagesMenu itemAtIndex:6] setTitle:[[menuStrings objectAtIndex:38] objectAtIndex:0] ]; 
     657[[messagesMenu itemAtIndex:7] setTitle:[[menuStrings objectAtIndex:39] objectAtIndex:0] ]; 
     658[[messagesMenu itemAtIndex:8] setTitle:[[menuStrings objectAtIndex:40] objectAtIndex:0] ]; 
     659//space 
     660[[messagesMenu itemAtIndex:10] setTitle:[[menuStrings objectAtIndex:41] objectAtIndex:0] ]; 
     661 
     662 
     663[windowMenu setTitle: [[menuStrings objectAtIndex:42] objectAtIndex:0]]; 
     664[[windowMenu itemAtIndex:0] setTitle:[[menuStrings objectAtIndex:43] objectAtIndex:0] ]; 
     665[[windowMenu itemAtIndex:1] setTitle:[[menuStrings objectAtIndex:44] objectAtIndex:0] ]; 
     666//space 
     667[[windowMenu itemAtIndex:3] setTitle:[[menuStrings objectAtIndex:45] objectAtIndex:0] ]; 
     668 
     669[helpMenu setTitle: [[menuStrings objectAtIndex:46] objectAtIndex:0] ];  
     670[[helpMenu itemAtIndex:0] setTitle:[[menuStrings objectAtIndex:47] objectAtIndex:0] ]; 
    672671 
    673672 

  • trunk/src/Frontend/MyDocument.h

    r4 r5  
    6262        Messages* mess;  
    6363        Compose* UIStrings; 
    64                MainUI* MainuiStrings;  
     64        MainUI* MainuiStrings;  
    6565         
    6666}