Changeset 20146

Timestamp:

05/06/07 17:46:19 (2 years ago)

Author:

patrick

Message:

Eliminated the need for the class VrjApplicationController?. Now, the actions
for menu items go to the NSApplication delegate. This makes things a lot
simpler and should allow for some improved design options.

Files:

• juggler/trunk/modules/vrjuggler/data/bundle/MainMenu.nib/classes.nib (modified) (1 diff)
• juggler/trunk/modules/vrjuggler/data/bundle/MainMenu.nib/info.nib (modified) (1 diff)
• juggler/trunk/modules/vrjuggler/data/bundle/MainMenu.nib/keyedobjects.nib (modified) (previous)
• juggler/trunk/modules/vrjuggler/vrj/Kernel/CocoaWrapper.mm (modified) (7 diffs)

juggler/trunk/modules/vrjuggler/data/bundle/MainMenu.nib/classes.nib

@@ -1 +1 @@
-{
-
-
-
-
-
-
-
-
-
+
-    IBVersion = 1; 
-}

juggler/trunk/modules/vrjuggler/data/bundle/MainMenu.nib/info.nib

@@ -19 +19 @@
-        </array>
-        <key>IBSystem Version</key>
-L127
+P135
-</dict>
-</plist>

juggler/trunk/modules/vrjuggler/vrj/Kernel/CocoaWrapper.mm

@@ -50 +50 @@
-
-
-static NSMenu* getRecentFilesMenu()
-{
-   NSMenu* files_menu = nil;
-   NSApplication* app = [NSApplication sharedApplication];
-   NSMenuItem* item = [[app mainMenu] itemWithTitle:@"File"];
-
-   if ( item )
-   {
-      item = [[item submenu] itemWithTitle:@"Open Recent"];
-
-      if ( item )
-      {
-         files_menu = [item submenu];
-      }
-   }
-
-   return files_menu;
-}
-
-static NSMenuItem* insertCfgFileItem(NSMenu* menu, NSString* title,
-                                     NSString* accel, const int index)
-{
-/*
-   NSMenuItem* item = [[NSMenuItem alloc] init];
-   [item setTitle:title];
-   [item setAction:@selector(loadConfigFile:)];
-   [item setKeyEquivalent:accel];
-   [menu insertItem:item
-            atIndex:index];
-*/
-   NSMenuItem* item = [menu insertItemWithTitle:title
-                                         action:@selector(loadConfigFile:)
-                                  keyEquivalent:accel
-                                        atIndex:index];
-/*
-   NSMenuItem* item = [menu addItemWithTitle:title
-                                      action:@selector(loadConfigFile:)
-                               keyEquivalent:accel];
-*/
-   [item setKeyEquivalentModifierMask:NSCommandKeyMask];
-   NSLog(@"Inserted item %@ at index %d in menu %@\n", item, index, menu);
-
-   return item;
-}
-
-@interface VrjMainController : NSObject
-{
-   BOOL      mLoadConfigs;
-   NSString* mRecentCfgFileName;
+   NSString* mLastDir;
-}
-
@@ -111 +67 @@
-   -(BOOL) application:(NSApplication*) theApplication
-             openFiles:(NSArray*) files;
+
+   /**
+    * Loads the named VR Juggler configuration file using
+    * vrj::Kernel::loadConfigFile().
+    */
-   -(IBAction) loadConfigFile:(id) sender;
+
+   /**
+    * Loads the named VR Juggler configuration file using
+    * vrj::Kernel::loadConfigFile().
+    */
+   -(void) kernelLoadConfigFile:(NSString*) fileName;
+
+   /**
+    * Returns a pointer to the NSMenu object that is the submenu listing the
+    * recently loaded configuration files or nil if no such submenu exists.
+    * In other words, this returns the File -> Open Recent submenu object.
+    * This is a convenice method.
+    */
+   -(NSMenu*) getRecentFilesMenu;
+
+   -(NSMenuItem*) insertCfgFileItem:(NSString*) title
+                              accel:(NSString*) accel
+                              index:(int) index;
-@end
-
@@ -161 +140 @@
-      }
-
-getRecentFilesMenu()
+[self getRecentFilesMenu]
-
-      if ( file_menu )
@@ -174 +153 @@
-               for ( unsigned int i = 0; i < [cfg_files count]; ++i )
-               {
-NSString* fname = [cfg_files objectAtIndex:i];;
-NSString* accel = [NSString stringWithFormat:@"%d", i];
-insertCfgFileItem(file_menu, fname, accel, i)
+[self insertCfgFileItem:[cfg_files objectAtIndex:i]
+                  accel:[NSString stringWithFormat:@"%d", i]
+                  index:i]
-               }
-            }
@@ -197 +176 @@
-   -(void) applicationWillTerminate:(NSNotification*) aNotification
-   {
-getRecentFilesMenu()
+[self getRecentFilesMenu]
-
-      if ( menu && mRecentCfgFileName )
@@ -251 +230 @@
-         for ( int i = 0; i < count; ++i )
-         {
+            [self kernelLoadConfigFile:[files objectAtIndex:i]];
+         }
+      }
+
+      return YES;
+   }
+
+   -(IBAction) loadConfigFile:(id) sender
+   {
+      [self kernelLoadConfigFile:[sender title]];
+   }
+
+   -(void) kernelLoadConfigFile:(NSString*) fileName
+   {
+      // Load the configuration file.
+      vrj::Kernel::instance()->loadConfigFile([fileName UTF8String]);
+
+      // Update the submenu listing the recently opened configuration files
+      // to include fileName.
+      NSMenu* files_menu = [self getRecentFilesMenu];
+
+      // NOTE: The 12 accounts for the separator item and the "Clear Menu"
+      // item after the separator.
+      if ( files_menu && [files_menu numberOfItems] > 12 )
+      {
+         [files_menu removeItemAtIndex:0];
+
+         for ( int i = 0; i < 9; ++i )
+         {
+            NSMenuItem* item = [files_menu itemAtIndex:i];
+            [item setKeyEquivalent:[NSString stringWithFormat:@"%d", i]];
+         }
+      }
+
+      if ( files_menu )
+      {
+         const int index = [files_menu indexOfItemWithTitle:fileName];
+
+         if ( index == NSNotFound )
+         {
+            int insert_index(0);
+            const int count = [files_menu numberOfItems];
+
+            for ( int i = 0; i < count; ++i )
+            {
+               NSMenuItem* item = [files_menu itemAtIndex:i];
+
+               if ( [item isSeparatorItem] )
+               {
+                  insert_index = i - 1;
+                  break;
+               }
+            }
+
+            [self insertCfgFileItem:fileName
+                              accel:[NSString stringWithFormat:@"%d", 0]
+                              index:insert_index];
+         }
+      }
+   }
+
+   /**
+    * Receives the message sent by the File -> Open menu item. An NSOpenPanel
+    * is displayed, and if the user clicks the OK button, the selected .jconf
+    * file(s) is (are) loaded.
+    *
+    * @post If the user clicks the OK button, \c mLastDir has the name of the
+    *       directory where the opened panel was when it was closed.
+    *
+    * @see -kernelLoadConfigFile:
+    */
+   -(IBAction) openDocument:(id) sender
+   {
+      NSArray* file_types = [NSArray arrayWithObject:@"jconf"];
+      NSOpenPanel* panel = [NSOpenPanel openPanel];
+
+      [panel setAllowsMultipleSelection:YES];
+
+      if ( ! mLastDir )
+      {
+         mLastDir = NSHomeDirectory();
+         [mLastDir retain];
+      }
+
+      const int result = [panel runModalForDirectory:mLastDir
+                                                file:nil
+                                               types:file_types];
+
+      if ( result == NSOKButton )
+      {
+         [mLastDir release];
+         mLastDir = [panel directory];
+         [mLastDir retain];
+
+         NSArray* files = [panel filenames];
+         const unsigned int count = [files count];
+
+         for ( unsigned int i = 0; i < count; ++i )
+         {
-            NSString* file = [files objectAtIndex:i];
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-   }
-@end
@@ -273 +405 @@
-   {
-      /* Do nothing. */ ;
-   }
-@end
-
-@interface VrjApplicationController : NSObject
-{
-   NSString* mLastDir;
-}
-
-   -(IBAction) openConfiguration:(id) sender;
-   -(IBAction) clearRecentDocuments:(id) sender;
-@end
-
-@implementation VrjApplicationController
-   -(IBAction) openConfiguration:(id) sender
-   {
-      NSArray* file_types = [NSArray arrayWithObject:@"jconf"];
-      NSOpenPanel* panel = [NSOpenPanel openPanel];
-
-      [panel setAllowsMultipleSelection:YES];
-
-      if ( ! mLastDir )
-      {
-         mLastDir = NSHomeDirectory();
-         [mLastDir retain];
-      }
-
-      const int result = [panel runModalForDirectory:mLastDir
-                                                file:nil
-                                               types:file_types];
-
-      if ( result == NSOKButton )
-      {
-         [mLastDir release];
-         mLastDir = [panel directory];
-         [mLastDir retain];
-
-         NSMenu* files_menu = getRecentFilesMenu();
-
-         NSArray* files = [panel filenames];
-         int count = [files count];
-         for ( int i = 0; i < count; ++i )
-         {
-            NSString* file = [files objectAtIndex:i];
-            vrj::Kernel::instance()->loadConfigFile([file UTF8String]);
-
-            // TODO: Make this limit controlled by user preferences.
-            // NOTE: The value 12 accounts for the separator item and the
-            // "Clear Menu" item after the separator.
-            if ( files_menu && [files_menu numberOfItems] > 12 )
-            {
-               [files_menu removeItemAtIndex:0];
-
-               for ( int i = 0; i < 9; ++i )
-               {
-                  NSMenuItem* item = [files_menu itemAtIndex:i];
-                  NSString* equiv = [NSString stringWithFormat:@"%d", i];
-                  [item setKeyEquivalent:equiv];
-               }
-            }
-
-            if ( files_menu )
-            {
-               const int index = [files_menu indexOfItemWithTitle:file];
-
-               if ( index == -1 )
-               {
-                  int insert_index(0);
-
-                  for ( int i = 0; i < [files_menu numberOfItems]; ++i )
-                  {
-                     NSMenuItem* item = [files_menu itemAtIndex:i];
-
-                     if ( [item isSeparatorItem] )
-                     {
-                        insert_index = i - 1;
-                        break;
-                     }
-                  }
-
-                  NSString* equiv =
-                     [NSString stringWithFormat:@"%d", insert_index];
-                  insertCfgFileItem(files_menu, file, equiv, insert_index);
-               }
-            }
-         }
-      }
-   }
-
-   -(IBAction) clearRecentDocuments:(id) sender
-   {
-      NSMenu* menu = [sender menu];
-      const int init_size = [menu numberOfItems];
-
-      for ( int i = 0; i < init_size; ++i )
-      {
-         NSMenuItem* item = [menu itemAtIndex:0];
-
-         if ( [item isSeparatorItem] )
-         {
-            break;
-         }
-         else
-         {
-            [menu removeItem:item];
-         }
-      }
-   }
-@end