gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-23 07:00:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge Source/NSPrintPanel.m Source/NSPrinter.m Source/NSProgressIndicator.m

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/branches/gnustep_testplant_branch@38738 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Marcian Lytwyn 2015-07-02 00:51:10 +00:00
parent 392e6ceb1a
commit 2ec1378144
3 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Source/NSPrintPanel.m
View file

@ -49,6 +49,7 @@
#import "AppKit/NSView.h"
#import "GSGuiPrivate.h"
#import "GNUstepGUI/GSPrinting.h"
#import "GNUstepGUI/GSTheme.h"
static NSPrintPanel *shared_instance = nil;
@ -85,12 +86,11 @@ static NSPrintPanel *shared_instance = nil;
//
/** Load the appropriate bundle for the PrintPanel
and alloc the class from that in our place
(eg: GSLPRPrintPanel, GSCUPSPrintPanel).
*/
+ (id) allocWithZone: (NSZone*) zone
{
Class principalClass;
principalClass = [[GSPrinting printingBundle] principalClass];
if (principalClass == nil)
@ -462,9 +462,9 @@ static NSPrintPanel *shared_instance = nil;
else
{
NSString *str;
str = [NSString stringWithFormat: @"%d", _pages.location];
str = [NSString stringWithFormat: @"%lu", (unsigned long) _pages.location];
[[fromRangeForm cellAtIndex: 0] setStringValue: str];
str = [NSString stringWithFormat: @"%d", NSMaxRange(_pages)-1];
str = [NSString stringWithFormat: @"%lu", (unsigned long) NSMaxRange(_pages)-1];
[[toRangeForm cellAtIndex: 0] setStringValue: str];
}
}

5
Source/NSPrinter.m
View file

@ -1069,6 +1069,11 @@ static NSMutableDictionary* printerCache;
withScanner: ppdData
withPPDPath: ppdPath];
}
// Skip any other data that don't conform with the specification.
[ppdData scanUpToCharactersFromSet: newlineSet
intoString: NULL];
}
}

5
Source/NSProgressIndicator.m
View file

@ -161,6 +161,7 @@
}
_isRunning = NO;
// Testplant-MAL-2015-07-01: Keeping testplant branch code...
_count = 0;
[self setNeedsDisplay: YES];
}
@ -170,6 +171,7 @@
return _usesThreadedAnimation;
}
// Testplant-MAL-2015-07-01: Keeping testplant branch code...
- (BOOL)isHidden
{
if ((_isRunning == NO) && (_isDisplayedWhenStopped == NO))
@ -305,6 +307,7 @@
_style = style;
_count = 0;
[self setDisplayedWhenStopped:(style == NSProgressIndicatorBarStyle)];
// Testplant-MAL-2015-07-01: Keeping testplant branch code...
[self setBezeled:(style == NSProgressIndicatorBarStyle)];
[self sizeToFit];
[self setNeedsDisplay: YES];
@ -341,6 +344,7 @@
- (void) drawRect: (NSRect)rect
{
double val;
// Testplant-MAL-2015-07-01: omitting main branch code...
if (_doubleValue < _minValue)
val = 0.0;
else if (_doubleValue > _maxValue)
@ -425,6 +429,7 @@
if ([aDecoder allowsKeyedCoding])
{
// Testplant-MAL-2015-07-01: Keeping testplant branch code...
// things which Gorm encodes, but IB doesn't care about.
// process Gorm encodings that IB doesn't care about first
// otherwise we overwrite settings read in from XIB...