[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH]: GWorkspace Icon Themability
|
From: |
Alex Perez |
|
Subject: |
[PATCH]: GWorkspace Icon Themability |
|
Date: |
Sat, 30 Oct 2004 06:40:44 -0700 |
|
User-agent: |
Mozilla Thunderbird 0.8 (X11/20040913) |
Enrico,
I wanted to discuss this patch with you before comitting anything at
all. It requires the most recent GNUstep CVS (the
_standardImageWithName: NSImage method got moved here and improved upon
from being a private method in NSWorkspace that did much the same thing.
This patch enables icon themability. Users can put their own folder/etc
icons, like Tile.tiff or Folder.tiff, in ~/Library/Images or
$GNUSTEP_USER_ROOT/Images and they will be used over the
common_Folder.tiff files.
diff -uar gworkspace-preimagenamechange/ClipBook/ClipBookWindow.m
gworkspace/ClipBook/ClipBookWindow.m
--- gworkspace-preimagenamechange/ClipBook/ClipBookWindow.m 2004-10-30
05:55:35.000000000 -0700
+++ gworkspace/ClipBook/ClipBookWindow.m 2004-10-30 06:04:17.000000000
-0700
@@ -92,9 +92,9 @@
if (hideContents) {
[viewersBox removeFromSuperview];
- [showHideButt setImage: [NSImage imageNamed:
@"common_3DArrowRight.tiff"]];
+ [showHideButt setImage: [NSImage _standardImageWithName:
@"3DArrowRight.tiff"]];
} else {
- [showHideButt setImage: [NSImage imageNamed:
@"common_3DArrowDown.tiff"]];
+ [showHideButt setImage: [NSImage _standardImageWithName:
@"3DArrowDown.tiff"]];
}
viewer = [PBViewer new];
@@ -451,13 +451,13 @@
r.size.height += VWRHEIGHT;
[win setFrame: r display: NO];
[[win contentView] addSubview: viewersBox];
- [showHideButt setImage: [NSImage imageNamed: @"common_3DArrowDown.tiff"]];
+ [showHideButt setImage: [NSImage _standardImageWithName:
@"3DArrowDown.tiff"]];
hideContents = NO;
} else {
r.size.height -= VWRHEIGHT;
[viewersBox removeFromSuperview];
[win setFrame: r display: NO];
- [showHideButt setImage: [NSImage imageNamed: @"common_3DArrowRight.tiff"]];
+ [showHideButt setImage: [NSImage _standardImageWithName:
@"3DArrowRight.tiff"]];
hideContents = YES;
}
}
Only in gworkspace/ClipBook: ClipBookWindow.m~
diff -uar
gworkspace-preimagenamechange/GWNet/Viewers/Common/AsyncBrowser/Icon.m
gworkspace/GWNet/Viewers/Common/AsyncBrowser/Icon.m
--- gworkspace-preimagenamechange/GWNet/Viewers/Common/AsyncBrowser/Icon.m
2004-10-30 05:55:36.000000000 -0700
+++ gworkspace/GWNet/Viewers/Common/AsyncBrowser/Icon.m 2004-10-30
06:05:00.000000000 -0700
@@ -62,7 +62,7 @@
ASSIGN (remoteHostName, hname);
ASSIGN (highlight, [NSImage imageNamed: @"CellHighlight.tiff"]);
- ASSIGN (arrow, [NSImage imageNamed: @"common_3DArrowRight.tiff"]);
+ ASSIGN (arrow, [NSImage _standardImageWithName: @"3DArrowRight.tiff"]);
namelabel = [[IconLabel alloc] initForIcon: self];
[namelabel setFont: [NSFont systemFontOfSize: 12]];
Only in gworkspace/GWNet/Viewers/Common/AsyncBrowser: Icon.m~
diff -uar gworkspace-preimagenamechange/GWNet/Viewers/FTPViewer/FTPViewer.m
gworkspace/GWNet/Viewers/FTPViewer/FTPViewer.m
--- gworkspace-preimagenamechange/GWNet/Viewers/FTPViewer/FTPViewer.m
2004-10-30 05:55:36.000000000 -0700
+++ gworkspace/GWNet/Viewers/FTPViewer/FTPViewer.m 2004-10-30
06:10:32.000000000 -0700
@@ -266,10 +266,10 @@
- (void)createIcons
{
- ASSIGN (hostIcon, [NSImage imageNamed: @"common_Root_PC.tiff"]);
- ASSIGN (folderIcon, [NSImage imageNamed: @"folder.tiff"]);
- ASSIGN (toolIcon, [NSImage imageNamed: @"tool.tiff"]);
- ASSIGN (unknownIcon, [NSImage imageNamed: @"unknown.tiff"]);
+ ASSIGN (hostIcon, [NSImage _standardImageWithName: @"Root_PC.tiff"]);
+ ASSIGN (folderIcon, [NSImage imageNamed: @"folder.tiff"]);
+ ASSIGN (toolIcon, [NSImage imageNamed: @"tool.tiff"]);
+ ASSIGN (unknownIcon, [NSImage imageNamed @"unknown.tiff"]);
}
- (void)activate
Only in gworkspace/GWNet/Viewers/FTPViewer: FTPViewer.m~
diff -uar gworkspace-preimagenamechange/GWNet/Viewers/SMBViewer/SMBViewer.m
gworkspace/GWNet/Viewers/SMBViewer/SMBViewer.m
--- gworkspace-preimagenamechange/GWNet/Viewers/SMBViewer/SMBViewer.m
2004-10-30 05:55:36.000000000 -0700
+++ gworkspace/GWNet/Viewers/SMBViewer/SMBViewer.m 2004-10-30
06:17:32.000000000 -0700
@@ -263,7 +263,7 @@
- (void)createIcons
{
- ASSIGN (hostIcon, [NSImage imageNamed: @"common_Root_PC.tiff"]);
+ ASSIGN (hostIcon, [NSImage _standardImageWithName: @"Root_PC.tiff"]);
ASSIGN (folderIcon, [NSImage imageNamed: @"folder.tiff"]);
ASSIGN (toolIcon, [NSImage imageNamed: @"tool.tiff"]);
ASSIGN (unknownIcon, [NSImage imageNamed: @"unknown.tiff"]);
Only in gworkspace/GWNet/Viewers/SMBViewer: SMBViewer.m~
diff -uar gworkspace-preimagenamechange/GWRemote/GWRemote/GWRemote.m
gworkspace/GWRemote/GWRemote/GWRemote.m
--- gworkspace-preimagenamechange/GWRemote/GWRemote/GWRemote.m 2004-10-30
05:55:36.000000000 -0700
+++ gworkspace/GWRemote/GWRemote/GWRemote.m 2004-10-30 06:19:27.000000000
-0700
@@ -1247,8 +1247,7 @@
static NSImage *image = nil;
if (image == nil) {
- image = RETAIN ([self getImageWithName: @"Folder.tiff"
- alternate:
@"common_Folder.tiff"]);
+ image = RETAIN ([NSImage _standardImageWithName: @"Folder.tiff"]);
}
return image;
@@ -1259,8 +1258,7 @@
static NSImage *image = nil;
if (image == nil) {
- image = RETAIN([self getImageWithName: @"Unknown.tiff"
- alternate:
@"common_Unknown.tiff"]);
+ image = RETAIN([NSImage _standardImageWithName: @"Unknown.tiff"]);
}
return image;
Only in gworkspace/GWRemote/GWRemote: GWRemote.m~
diff -uar gworkspace-preimagenamechange/GWRemote/GWRemote/Viewer/Icon.m
gworkspace/GWRemote/GWRemote/Viewer/Icon.m
--- gworkspace-preimagenamechange/GWRemote/GWRemote/Viewer/Icon.m
2004-10-30 05:55:36.000000000 -0700
+++ gworkspace/GWRemote/GWRemote/Viewer/Icon.m 2004-10-30 06:11:32.000000000
-0700
@@ -65,7 +65,7 @@
fm = [NSFileManager defaultManager];
ASSIGN (highlight, [NSImage imageNamed: @"CellHighlight.tiff"]);
- ASSIGN (arrow, [NSImage imageNamed: @"common_3DArrowRight.tiff"]);
+ ASSIGN (arrow, [NSImage _standardImageWithName: @"3DArrowRight.tiff"]);
namelabel = [[IconLabel alloc] initForIcon: self];
[namelabel setFont: [NSFont systemFontOfSize: 12]];
Only in gworkspace/GWRemote/GWRemote/Viewer: Icon.m~
diff -uar gworkspace-preimagenamechange/GWorkspace/Fiend/Fiend.m
gworkspace/GWorkspace/Fiend/Fiend.m
--- gworkspace-preimagenamechange/GWorkspace/Fiend/Fiend.m 2004-10-30
05:55:36.000000000 -0700
+++ gworkspace/GWorkspace/Fiend/Fiend.m 2004-10-30 06:12:46.000000000 -0700
@@ -146,7 +146,7 @@
[rewButt setAction: @selector(switchLayer:)];
[self addSubview: rewButt];
- ASSIGN (tile, [NSImage imageNamed: @"common_Tile.tiff"]);
+ ASSIGN (tile, [NSImage _standardImageWithName: @"Tile.tiff"]);
[self registerForDraggedTypes: [NSArray arrayWithObjects:
NSFilenamesPboardType, nil]];
[self findFreePositions];
Only in gworkspace/GWorkspace/Fiend: Fiend.m~
diff -uar gworkspace-preimagenamechange/GWorkspace/Fiend/FiendLeaf.m
gworkspace/GWorkspace/Fiend/FiendLeaf.m
--- gworkspace-preimagenamechange/GWorkspace/Fiend/FiendLeaf.m 2004-10-30
05:55:36.000000000 -0700
+++ gworkspace/GWorkspace/Fiend/FiendLeaf.m 2004-10-30 06:14:38.000000000
-0700
@@ -140,10 +140,10 @@
icon = nil;
}
- ASSIGN (tile, [NSImage imageNamed: @"common_Tile.tiff"]);
+ ASSIGN (tile, [NSImage _getImageWithName: @"Tile.tiff"]);
if (ghostimage == nil) {
- tile = [NSImage imageNamed: @"common_Tile.tiff"];
+ tile = [NSImage _getImageWithName: @"Tile.tiff"];
fiend = afiend;
isGhost = NO;
} else {
Only in gworkspace/GWorkspace/Fiend: FiendLeaf.m~
diff -uar
gworkspace-preimagenamechange/GWorkspace/Preferences/HiddenFilesPref.m
gworkspace/GWorkspace/Preferences/HiddenFilesPref.m
--- gworkspace-preimagenamechange/GWorkspace/Preferences/HiddenFilesPref.m
2004-10-30 05:55:36.000000000 -0700
+++ gworkspace/GWorkspace/Preferences/HiddenFilesPref.m 2004-10-30
06:16:38.000000000 -0700
@@ -106,8 +106,8 @@
leftMatrix = nil;
rightMatrix = nil;
- [addButt setImage: [NSImage imageNamed:
@"common_ArrowLeftH.tiff"]];
- [removeButt setImage: [NSImage imageNamed:
@"common_ArrowRightH.tiff"]];
+ [addButt setImage: [NSImage _standardImageWithName:
@"ArrowLeftH.tiff"]];
+ [removeButt setImage: [NSImage _standardImageWithName:
@"ArrowRightH.tiff"]];
[setButt setEnabled: NO];
Only in gworkspace/GWorkspace/Preferences: HiddenFilesPref.m~
diff -uar
gworkspace-preimagenamechange/Inspector/ContentViewers/FolderViewer/FolderViewer.m
gworkspace/Inspector/ContentViewers/FolderViewer/FolderViewer.m
---
gworkspace-preimagenamechange/Inspector/ContentViewers/FolderViewer/FolderViewer.m
2004-10-30 05:55:36.000000000 -0700
+++ gworkspace/Inspector/ContentViewers/FolderViewer/FolderViewer.m
2004-10-30 06:20:32.000000000 -0700
@@ -111,7 +111,7 @@
okButt = [[NSButton alloc] initWithFrame: NSMakeRect(141, 10, 115,
25)];
[okButt setButtonType: NSMomentaryLight];
- [okButt setImage: [NSImage imageNamed: @"common_ret.tiff"]];
+ [okButt setImage: [NSImage _standardImageWithName: @"ret.tiff"]];
[okButt setImagePosition: NSImageRight];
[okButt setTitle: NSLocalizedString(@"Ok", @"")];
[okButt setTarget: self];
Only in gworkspace/Inspector/ContentViewers/FolderViewer: FolderViewer.m~
diff -uar
gworkspace-preimagenamechange/Inspector/ContentViewers/ImageViewer/ImageViewer.m
gworkspace/Inspector/ContentViewers/ImageViewer/ImageViewer.m
---
gworkspace-preimagenamechange/Inspector/ContentViewers/ImageViewer/ImageViewer.m
2004-10-30 05:55:36.000000000 -0700
+++ gworkspace/Inspector/ContentViewers/ImageViewer/ImageViewer.m
2004-10-30 06:20:57.000000000 -0700
@@ -115,7 +115,7 @@
r.size.height = 25;
editButt = [[NSButton alloc] initWithFrame: r];
[editButt setButtonType: NSMomentaryLight];
- [editButt setImage: [NSImage imageNamed: @"common_ret.tiff"]];
+ [editButt setImage: [NSImage _standardImageWithName: @"ret.tiff"]];
[editButt setImagePosition: NSImageRight];
[editButt setTitle: NSLocalizedString(@"Edit", @"")];
[editButt setTarget: self];
Only in gworkspace/Inspector/ContentViewers/ImageViewer: ImageViewer.m~
diff -uar
gworkspace-preimagenamechange/Inspector/ContentViewers/PdfViewer/PdfViewer.m
gworkspace/Inspector/ContentViewers/PdfViewer/PdfViewer.m
---
gworkspace-preimagenamechange/Inspector/ContentViewers/PdfViewer/PdfViewer.m
2004-10-30 05:55:36.000000000 -0700
+++ gworkspace/Inspector/ContentViewers/PdfViewer/PdfViewer.m 2004-10-30
06:21:33.000000000 -0700
@@ -67,7 +67,7 @@
backButt = [[NSButton alloc] initWithFrame: vr];
[backButt setButtonType: NSMomentaryLight];
[backButt setImagePosition: NSImageOnly];
- [backButt setImage: [NSImage imageNamed:
@"common_ArrowUp.tiff"]];
+ [backButt setImage: [NSImage _standardImageWithName:
@"ArrowUp.tiff"]];
[backButt setTarget: self];
[backButt setAction: @selector(previousPage:)];
[self addSubview: backButt];
@@ -76,7 +76,7 @@
nextButt = [[NSButton alloc] initWithFrame: vr];
[nextButt setButtonType: NSMomentaryLight];
[nextButt setImagePosition: NSImageOnly];
- [nextButt setImage: [NSImage imageNamed:
@"common_ArrowDown.tiff"]];
+ [nextButt setImage: [NSImage _standardImageWithName:
@"ArrowDown.tiff"]];
[nextButt setTarget: self];
[nextButt setAction: @selector(nextPage:)];
[self addSubview: nextButt];
@@ -136,7 +136,7 @@
vr.size.height = 25;
editButt = [[NSButton alloc] initWithFrame: vr];
[editButt setButtonType: NSMomentaryLight];
- [editButt setImage: [NSImage imageNamed: @"common_ret.tiff"]];
+ [editButt setImage: [NSImage _standardImageWithName: @"ret.tiff"]];
[editButt setImagePosition: NSImageRight];
[editButt setTitle: NSLocalizedString(@"Edit", @"")];
[editButt setTarget: self];
Only in gworkspace/Inspector/ContentViewers/PdfViewer: PdfViewer.m~
diff -uar
gworkspace-preimagenamechange/Inspector/ContentViewers/RtfViewer/RtfViewer.m
gworkspace/Inspector/ContentViewers/RtfViewer/RtfViewer.m
---
gworkspace-preimagenamechange/Inspector/ContentViewers/RtfViewer/RtfViewer.m
2004-10-30 05:55:36.000000000 -0700
+++ gworkspace/Inspector/ContentViewers/RtfViewer/RtfViewer.m 2004-10-30
06:22:32.000000000 -0700
@@ -103,7 +103,7 @@
r.size.height = 25;
editButt = [[NSButton alloc] initWithFrame: r];
[editButt setButtonType: NSMomentaryLight];
- [editButt setImage: [NSImage imageNamed: @"common_ret.tiff"]];
+ [editButt setImage: [NSImage _standardImageWithName: @"ret.tiff"]];
[editButt setImagePosition: NSImageRight];
[editButt setTitle: NSLocalizedString(@"Edit", @"")];
[editButt setTarget: self];
Only in gworkspace/Inspector/ContentViewers/RtfViewer: RtfViewer.m~
diff -uar
gworkspace-preimagenamechange/Inspector/ContentViewers/SoundViewer/SoundViewer.m
gworkspace/Inspector/ContentViewers/SoundViewer/SoundViewer.m
---
gworkspace-preimagenamechange/Inspector/ContentViewers/SoundViewer/SoundViewer.m
2004-10-30 05:55:36.000000000 -0700
+++ gworkspace/Inspector/ContentViewers/SoundViewer/SoundViewer.m
2004-10-30 06:22:57.000000000 -0700
@@ -102,7 +102,7 @@
editButt = [[NSButton alloc] initWithFrame: NSMakeRect(141, 10, 115, 25)];
[editButt setButtonType: NSMomentaryLight];
- [editButt setImage: [NSImage imageNamed: @"common_ret.tiff"]];
+ [editButt setImage: [NSImage _standardImageWithName: @"ret.tiff"]];
[editButt setImagePosition: NSImageRight];
[editButt setTitle: NSLocalizedString(@"Edit", @"")];
[editButt setTarget: self];
Only in gworkspace/Inspector/ContentViewers/SoundViewer: SoundViewer.m~
diff -uar gworkspace-preimagenamechange/Recycler/RecyclerView.m
gworkspace/Recycler/RecyclerView.m
--- gworkspace-preimagenamechange/Recycler/RecyclerView.m 2004-10-30
05:55:36.000000000 -0700
+++ gworkspace/Recycler/RecyclerView.m 2004-10-30 06:23:16.000000000 -0700
@@ -110,7 +110,7 @@
[self addSubview: icon];
RELEASE (icon);
- ASSIGN (tile, [NSImage imageNamed: @"common_Tile.tiff"]);
+ ASSIGN (tile, [NSImage _standardImageWithName: @"Tile.tiff"]);
}
return self;
Only in gworkspace/Recycler: RecyclerView.m~
- [PATCH]: GWorkspace Icon Themability,
Alex Perez <=