Author: fredkiefer
Date: Mon Mar 16 00:31:43 2015
New Revision: 38408
URL: http://svn.gna.org/viewcvs/gnustep?rev=38408&view=rev
Log:
* Images/NSRemoveTemplate.tiff: Add file.
* Images/GNUmakefile: Handle new file.
* Source/GSXibLoader.m: Better error reporting for wrong
application class.
* Source/NSOutline.m (-drawRow:clipRect:): Don't set the value
for the edited cell.
Added:
libs/gui/trunk/Images/NSRemoveTemplate.tiff (with props)
Modified:
libs/gui/trunk/ChangeLog
libs/gui/trunk/Images/GNUmakefile
libs/gui/trunk/Source/GSXibLoader.m
libs/gui/trunk/Source/NSOutlineView.m
Modified: libs/gui/trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/trunk/ChangeLog?rev=38408&r1=38407&r2=38408&view=diff
==============================================================================
--- libs/gui/trunk/ChangeLog (original)
+++ libs/gui/trunk/ChangeLog Mon Mar 16 00:31:43 2015
@@ -1,3 +1,12 @@
+2015-03-16 Fred Kiefer <[email protected]>
+
+ * Images/NSRemoveTemplate.tiff: Add file.
+ * Images/GNUmakefile: Handle new file.
+ * Source/GSXibLoader.m: Better error reporting for wrong
+ application class.
+ * Source/NSOutline.m (-drawRow:clipRect:): Don't set the value for
+ the edited cell.
+
2015-03-12 Fred Kiefer <[email protected]>
* Source/NSCollectionView.m (-newItemForRepresentedObject:): Don't
Modified: libs/gui/trunk/Images/GNUmakefile
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/trunk/Images/GNUmakefile?rev=38408&r1=38407&r2=38408&view=diff
==============================================================================
--- libs/gui/trunk/Images/GNUmakefile (original)
+++ libs/gui/trunk/Images/GNUmakefile Mon Mar 16 00:31:43 2015
@@ -41,6 +41,7 @@
NSAddTemplate.tiff\
NSComboArrow.tiff \
NSRatingLevelIndicator.tiff \
+ NSRemoveTemplate.tiff\
common_2DCheckMark.tiff \
common_2DDash.tiff \
common_3DArrowDown.tiff \
Added: libs/gui/trunk/Images/NSRemoveTemplate.tiff
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/trunk/Images/NSRemoveTemplate.tiff?rev=38408&view=auto
==============================================================================
Binary file - no diff available.
Propchange: libs/gui/trunk/Images/NSRemoveTemplate.tiff
------------------------------------------------------------------------------
svn:mime-type = image/tiff
Modified: libs/gui/trunk/Source/GSXibLoader.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/trunk/Source/GSXibLoader.m?rev=38408&r1=38407&r2=38408&view=diff
==============================================================================
--- libs/gui/trunk/Source/GSXibLoader.m (original)
+++ libs/gui/trunk/Source/GSXibLoader.m Mon Mar 16 00:31:43 2015
@@ -926,7 +926,7 @@
}
else
{
- NSLog(@"%s:NSApplication missing\n", __PRETTY_FUNCTION__);
+ NSLog(@"%s:NSApplication missing '%@'\n", __PRETTY_FUNCTION__,
className);
}
// Use the owner as first root object
Modified: libs/gui/trunk/Source/NSOutlineView.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/gui/trunk/Source/NSOutlineView.m?rev=38408&r1=38407&r2=38408&view=diff
==============================================================================
--- libs/gui/trunk/Source/NSOutlineView.m (original)
+++ libs/gui/trunk/Source/NSOutlineView.m Mon Mar 16 00:31:43 2015
@@ -963,17 +963,20 @@
NSTableColumn *tb = [_tableColumns objectAtIndex: i];
NSCell *cell = [self preparedCellAtColumn: i row: rowIndex];
- if (i == _editedColumn && rowIndex == _editedRow)
- {
- [cell _setInEditing: YES];
- [cell setShowsFirstResponder: YES];
- }
[self _willDisplayCell: cell
forTableColumn: tb
row: rowIndex];
- [cell setObjectValue: [_dataSource outlineView: self
- objectValueForTableColumn: tb
- byItem: item]];
+ if (i == _editedColumn && rowIndex == _editedRow)
+ {
+ [cell _setInEditing: YES];
+ [cell setShowsFirstResponder: YES];
+ }
+ else
+ {
+ [cell setObjectValue: [_dataSource outlineView: self
+ objectValueForTableColumn: tb
+ byItem: item]];
+ }
drawingRect = [self frameOfCellAtColumn: i
row: rowIndex];
@@ -1544,8 +1547,6 @@
NSTableColumn *tb;
NSRect drawingRect;
unsigned length = 0;
- int level = 0;
- float indentationFactor = 0.0;
// We refuse to edit cells if the delegate can not accept results
// of editing.
@@ -1554,15 +1555,21 @@
flag = YES;
}
+ if (rowIndex != _selectedRow)
+ {
+ [NSException raise:NSInvalidArgumentException
+ format:@"Attempted to edit unselected row"];
+ }
+
+ if (rowIndex < 0 || rowIndex >= _numberOfRows
+ || columnIndex < 0 || columnIndex >= _numberOfColumns)
+ {
+ [NSException raise: NSInvalidArgumentException
+ format: @"Row/column out of index in edit"];
+ }
+
[self scrollRowToVisible: rowIndex];
[self scrollColumnToVisible: columnIndex];
-
- if (rowIndex < 0 || rowIndex >= _numberOfRows
- || columnIndex < 0 || columnIndex >= _numberOfColumns)
- {
- [NSException raise: NSInvalidArgumentException
- format: @"Row/column out of index in edit"];
- }
if (_textObject != nil)
{
@@ -1627,6 +1634,8 @@
NSImage *image = nil;
NSCell *imageCell = nil;
NSRect imageRect;
+ int level = 0;
+ float indentationFactor = 0.0;
item = [self itemAtRow: rowIndex];
// determine which image to use...
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
