Changeset 114 for trunk

Timestamp:

02/07/08 00:50:10 (2 years ago)

Author:

mike

Message:

[new] QPopUpButtonCell

Location:

trunk

Files:

• English.lproj/QDocument.nib/keyedobjects.nib (modified) (previous)
• Q.xcodeproj/project.pbxproj (modified) (4 diffs)
• QDocument/QDocument.m (modified) (2 diffs)
• QDocument/QDocumentOpenGLView.m (modified) (1 diff)
• QShared/QPopUpButtonCell.h (added)
• QShared/QPopUpButtonCell.m (added)

trunk/Q.xcodeproj/project.pbxproj

@@ -53 +53 @@
                 275DFE170D42015300889562 /* q_button_n.png in Resources */ = {isa = PBXBuildFile; fileRef = 275DFE140D42015300889562 /* q_button_n.png */; };
                 275DFE180D42015300889562 /* q_button_p.png in Resources */ = {isa = PBXBuildFile; fileRef = 275DFE150D42015300889562 /* q_button_p.png */; };
+                27626CC70D5A6E6F0081F814 /* QPopUpButtonCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 27626CC60D5A6E6F0081F814 /* QPopUpButtonCell.m */; };
                 277009760D40250500E00BB9 /* q_prefs_bg.png in Resources */ = {isa = PBXBuildFile; fileRef = 277009750D40250500E00BB9 /* q_prefs_bg.png */; };
                 2788E6FB0D3CB8AD00BC6EBC /* q_d_cd_drop.png in Resources */ = {isa = PBXBuildFile; fileRef = 2788E6F00D3CB8AD00BC6EBC /* q_d_cd_drop.png */; };
@@ -153 +154 @@
                 275DFE140D42015300889562 /* q_button_n.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = q_button_n.png; path = Resources/q_button_n.png; sourceTree = "<group>"; };
                 275DFE150D42015300889562 /* q_button_p.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = q_button_p.png; path = Resources/q_button_p.png; sourceTree = "<group>"; };
+                27626CC50D5A6E6F0081F814 /* QPopUpButtonCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = QPopUpButtonCell.h; path = QShared/QPopUpButtonCell.h; sourceTree = "<group>"; };
+                27626CC60D5A6E6F0081F814 /* QPopUpButtonCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = QPopUpButtonCell.m; path = QShared/QPopUpButtonCell.m; sourceTree = "<group>"; };
                 277009750D40250500E00BB9 /* q_prefs_bg.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = q_prefs_bg.png; path = Resources/q_prefs_bg.png; sourceTree = "<group>"; };
                 2788E6F00D3CB8AD00BC6EBC /* q_d_cd_drop.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = q_d_cd_drop.png; path = Resources/q_d_cd_drop.png; sourceTree = "<group>"; };
@@ -283 +286 @@
                         isa = PBXGroup;
                         children = (
+                                275D5ECF0D411D3B0061152C /* QButtonCell.h */,
+                                275D5ED00D411D3B0061152C /* QButtonCell.m */,
+                                27626CC50D5A6E6F0081F814 /* QPopUpButtonCell.h */,
+                                27626CC60D5A6E6F0081F814 /* QPopUpButtonCell.m */,
+                                27A2546B0D45F26D006BDDD5 /* QQvmManager.h */,
+                                27A2546C0D45F26D006BDDD5 /* QQvmManager.m */,
                                 279547B20D3B866000CB2BE3 /* QWindow.h */,
                                 279547B30D3B866000CB2BE3 /* QWindow.m */,
-                                275D5ECF0D411D3B0061152C /* QButtonCell.h */,
-                                275D5ED00D411D3B0061152C /* QButtonCell.m */,
-                                27A2546B0D45F26D006BDDD5 /* QQvmManager.h */,
-                                27A2546C0D45F26D006BDDD5 /* QQvmManager.m */,
                         );
                         name = QShared;
@@ -520 +525 @@
                                 27A258D00D479EA1006BDDD5 /* QDocumentEditVMController.m in Sources */,
                                 27210CC70D51A0310067EBF6 /* QDocumentOpenGLView.m in Sources */,
+                                27626CC70D5A6E6F0081F814 /* QPopUpButtonCell.m in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;

trunk/QDocument/QDocument.m

@@ -26 +26 @@
 #import "QDocumentOpenGLView.h"
 #import "../QShared/QButtonCell.h"
+#import "../QShared/QPopUpButtonCell.h"
 #import "../QShared/QQvmManager.h"
 
@@ -184 +185 @@
         // Tiger compatible custom butoonCell
         [buttonEdit setCell:[[[QButtonCell alloc] initImageCell:[[buttonEdit cell] image] buttonType:QButtonCellAlone target:[[buttonEdit cell] target] action:[[buttonEdit cell] action]] autorelease]];
-        [buttonFloppy setCell:[[[QButtonCell alloc] initImageCell:[[buttonFloppy cell] image] buttonType:QButtonCellLeft target:[[buttonFloppy cell] target] action:[[buttonFloppy cell] action]] autorelease]];
-        [buttonCDROM setCell:[[[QButtonCell alloc] initImageCell:[[buttonCDROM cell] image] buttonType:QButtonCellRight target:[[buttonCDROM cell] target] action:[[buttonCDROM cell] action]] autorelease]];
+
+        [buttonFloppy setCell:[[[QPopUpButtonCell alloc] initTextCell:@"" buttonType:QButtonCellLeft pullsDown:[[buttonFloppy cell] pullsDown] menu:[[buttonFloppy cell] menu] image:[NSImage imageNamed:@"q_d_disk_drop"]] autorelease]];
+        [buttonCDROM setCell:[[[QPopUpButtonCell alloc] initTextCell:@"" buttonType:QButtonCellRight pullsDown:[[buttonCDROM cell] pullsDown] menu:[[buttonCDROM cell] menu] image:[NSImage imageNamed:@"q_d_cd_drop"]] autorelease]];
+
         [buttonToggleFullscreen setCell:[[[QButtonCell alloc] initImageCell:[[buttonToggleFullscreen cell] image] buttonType:QButtonCellLeft target:[[buttonToggleFullscreen cell] target] action:[[buttonToggleFullscreen cell] action]] autorelease]];
         [buttonTakeScreenshot setCell:[[[QButtonCell alloc] initImageCell:[[buttonTakeScreenshot cell] image] buttonType:QButtonCellRight target:[[buttonTakeScreenshot cell] target] action:[[buttonTakeScreenshot cell] action]] autorelease]];

trunk/QDocument/QDocumentOpenGLView.m

@@ -246 +246 @@
     // disabnle drag'n'drop
     [self unregisterDraggedTypes];
-/* TODO: freezes Q up to several minutes (Lock on screenBuffer?)
+
+/* TODO: freezes Q up to several minutes (looks like it keeps a tap on the file)
     if (screenProperties.screenBufferSize > 0) {
                 if (munmap(screenBuffer, screenProperties.screenBufferSize) == -1) {
                         int errsv = errno;
                         NSLog(@"QDocumentOpenGLView: dealloc: could not munmap:  errno(%D) - %s", errsv, strerror(errsv));
-                        screenProperties.screenBufferSize;
                 }
         }