Changeset 113

Timestamp:

02/06/08 22:06:34 (1 year ago)

Author:

mike

Message:

[fix] QDocumentOpenGLView draw black bg if no savedImage
[fix] remove of dead code

Files:

• trunk/QControl/QControlTableView.m (modified) (1 diff)
• trunk/QControl/QControlTableViewController.m (modified) (1 diff)
• trunk/QDocument/QDocument.m (modified) (2 diffs)
• trunk/QDocument/QDocumentOpenGLView.m (modified) (8 diffs)
• trunk/QDocument/QDocumentWindowController.m (modified) (2 diffs)
• trunk/QShared/QWindow.m (modified) (11 diffs)
• trunk/Q_Prefix.pch (modified) (1 diff)

trunk/QControl/QControlTableView.m

@@ -94 +94 @@
-    else {
-        pointClicked = NSZeroPoint;
-        
+               
-    }
-}

trunk/QControl/QControlTableViewController.m

@@ -79 +79 @@
-- (id) tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(int)rowIndex
-{
-"
+: objectValueForTableColumn: row:%D", rowIndex
-
-    id VM;

trunk/QDocument/QDocument.m

@@ -62 +62 @@
-                        NSLog(@"QEditVM.nib not loaded!");
-                }
-                //[[editPC editPCPanel] center];
-        
-        // Todo, define some globals
-        // set allowed filetypes
-MutableArray arrayWithObjects:@"qcow2", @"qcow", @"raw", @"cow", @"vmdk", @"cloop", @"img", @"iso", @"dsk", @"dmg", @"cdr", @"toast", @"flp", @"fs", nil] retain
+Array alloc] initWithArrayOfAllowedFileTypes
-
-    }
@@ -467 +466 @@
-                        [self setVMState:QDocumentSaving];
-            [distributedObject setCommand:'Z' arg1:0 arg2:0 arg3:0 arg4:0];
-[[screenView screenshot:NSMakeSize(0,0)] representations] objectAtIndex:0
+NSBitmapImageRep imageRepWithData:[[screenView screenshot:NSMakeSize(0.0, 0.0)] TIFFRepresentation]
-                        data =[bitmapImageRep representationUsingType: NSPNGFileType properties: nil];
-                        fileManager = [NSFileManager defaultManager];

trunk/QDocument/QDocumentOpenGLView.m

@@ -246 +246 @@
-    // disabnle drag'n'drop
-    [self unregisterDraggedTypes];
-
+
-    if (screenProperties.screenBufferSize > 0) {
-                if (munmap(screenBuffer, screenProperties.screenBufferSize) == -1) {
@@ -254 +254 @@
-                }
-        }
-
+
-    [super dealloc];
-}
@@ -277 +277 @@
-        screenProperties.screenBufferSize = 0;
-        
+        displayProperties.x = 0.0;
+        displayProperties.y = ICON_BAR_HEIGHT;
+        displayProperties.width = 640;
+        displayProperties.height = 480;
-        displayProperties.zoom = 1.0;
-        
@@ -290 +294 @@
-    mouseGrabed = FALSE; // we start non grabbed
-    is_graphic_console = TRUE; // we start in grafic mode
+
-}
-
@@ -313 +318 @@
-    onePixel[0] = 2.0 / displayProperties.width;
-    onePixel[1] = 2.0 / displayProperties.height;
-
-aved
+
+hutdown
-
-                glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-
+
+
+
+
+
+
-
-                // draw saved image
@@ -535 +545 @@
-                glGetTexLevelParameteriv( GL_TEXTURE_RECTANGLE_ARB, 0, GL_TEXTURE_HEIGHT, (GLint*)&screenProperties.height );   
-        }
-
+ 
-}
-
@@ -542 +552 @@
-        Q_DEBUG(@"screenshot NSSize(%f,  %f)", size.width, size.height);
-
-fullsize shot */ 
- || !size.height == 
+a fullsize shot
+.0 || size.height == 0.
-                size = [self bounds].size;
-
@@ -657 +667 @@
-                displayProperties.width = rect.size.width;
-                displayProperties.height = rect.size.height;
-//rect.origin.x;//([self bounds].size.width - cw) / 2.0;
-//([self bounds].size.height - ch) / 2.0;
+
+
-        }
-

trunk/QDocument/QDocumentWindowController.m

@@ -28 +28 @@
-#import "QDocumentOpenGLView.h"
-
-
+
-
-@implementation QDocumentWindowController
@@ -68 +68 @@
-    if ([document VMPauseWhileInactive])
-        [document VMUnpause:self];
-
-}
-

trunk/QShared/QWindow.m

@@ -49 +49 @@
-#define FOOTER_INACTIVE NSMakeRect(3 * (IMG_WIDTH + 2) + 1, 0, IMG_WIDTH, BG_BOTTOM)
-
-
+
-
-@implementation QWindow
@@ -56 +56 @@
-- (id)initWithContentRect:(NSRect)contentRect styleMask:(unsigned int)styleMask backing:(NSBackingStoreType)bufferingType defer:(BOOL)flag
-{
- 
+
-    
-    // Conditionally add textured window flag to stylemask
@@ -91 +91 @@
-- (void)dealloc
-{
- 
+
-    
-    [[NSNotificationCenter defaultCenter] removeObserver:self name:NSWindowDidResizeNotification object:self];
@@ -105 +105 @@
-- (void) setYellow:(id)sender
-{
- 
+
-
-        yellow = [[NSUserDefaults standardUserDefaults] boolForKey:@"yellow"];
@@ -115 +115 @@
-- (void)setToolbar:(NSToolbar *)toolbar
-{
- 
+
-    
-    // Only actually call this if we respond to it on this machine
@@ -128 +128 @@
--(void)awakeFromNib
-{
- 
+
-
-    [self setBackgroundColor:[self sizedPolishedBackground]];
@@ -136 +136 @@
-- (void)windowNeedsUpdate:(NSNotification *)aNotification
-{
- 
+
-
-    [self setBackgroundColor:[self sizedPolishedBackground]];
@@ -146 +146 @@
-- (void)setMinSize:(NSSize)aSize
-{
- 
+
-    
-    [super setMinSize:NSMakeSize(MAX(aSize.width, 128.0), MAX(aSize.height, 128.0))];
@@ -153 +153 @@
-- (void)setFrame:(NSRect)frameRect display:(BOOL)displayFlag animate:(BOOL)animationFlag
-{
- setFrame"
+setFrame NSRect(%f, %f, %f, %f) display:%D animate:%D", frameRect.origin.x, frameRect.origin.y, frameRect.size.width, frameRect.size.height, displayFlag, animationFlag
-
-    forceDisplay = YES;
@@ -162 +162 @@
-- (NSColor *)sizedPolishedBackground
-{
- 
+
-    
-    NSImage *bg = [[NSImage alloc] initWithSize:[self frame].size];
@@ -189 +189 @@
-                footer = FOOTER_INACTIVE;
-        }
-
-
-
-
-
-
-
-
-
-
-
+
-    // header
-    [template

trunk/Q_Prefix.pch

@@ -16 +16 @@
-
-#define cgrect(nsrect) (*(CGRect *)&(nsrect))
+
+#define initWithArrayOfAllowedFileTypes initWithObjects:@"qcow2", @"qcow", @"raw", @"cow", @"vmdk", @"cloop", @"img", @"iso", @"dsk", @"dmg", @"cdr", @"toast", @"flp", @"fs", nil