From dff141e8002bb87f5f969220ab957b8a7c07df85 Mon Sep 17 00:00:00 2001
From: Virgil Dupras <hsoft@hardcoded.net>
Date: Thu, 30 Aug 2012 16:08:21 -0400
Subject: [PATCH] Renamed cocoa/base/ResultWindow to ResultWindowBase to avoid
 ambiguities in the result_winodw cocoa UI script.

--HG--
rename : cocoa/base/ResultWindow.h => cocoa/base/ResultWindowBase.h
rename : cocoa/base/ResultWindow.m => cocoa/base/ResultWindowBase.m
---
 cocoa/base/{ResultWindow.h => ResultWindowBase.h} | 0
 cocoa/base/{ResultWindow.m => ResultWindowBase.m} | 4 ++--
 cocoa/base/ui/result_window.py                    | 4 ++--
 cocoa/me/ResultWindow.h                           | 2 +-
 cocoa/pe/ResultWindow.h                           | 2 +-
 cocoa/se/ResultWindow.h                           | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)
 rename cocoa/base/{ResultWindow.h => ResultWindowBase.h} (100%)
 rename cocoa/base/{ResultWindow.m => ResultWindowBase.m} (98%)

diff --git a/cocoa/base/ResultWindow.h b/cocoa/base/ResultWindowBase.h
similarity index 100%
rename from cocoa/base/ResultWindow.h
rename to cocoa/base/ResultWindowBase.h
diff --git a/cocoa/base/ResultWindow.m b/cocoa/base/ResultWindowBase.m
similarity index 98%
rename from cocoa/base/ResultWindow.m
rename to cocoa/base/ResultWindowBase.m
index fbf72c57..7dcac092 100644
--- a/cocoa/base/ResultWindow.m
+++ b/cocoa/base/ResultWindowBase.m
@@ -6,7 +6,7 @@ which should be included with this package. The terms are also available at
 http://www.hardcoded.net/licenses/bsd_license
 */
 
-#import "ResultWindow.h"
+#import "ResultWindowBase.h"
 #import "ResultWindow_UI.h"
 #import "Dialogs.h"
 #import "ProgressController.h"
@@ -29,7 +29,7 @@ http://www.hardcoded.net/licenses/bsd_license
     app = aApp;
     model = [app model];
     [self setWindow:createResultWindow_UI(self)];
-    [[self window] setTitle:fmt(@"%@ Results", [model appName])];
+    [[self window] setTitle:fmt(NSLocalizedString(@"%@ Results", @""), [model appName])];
     /* Put a cute iTunes-like bottom bar */
     [[self window] setContentBorderThickness:28 forEdge:NSMinYEdge];
     table = [[ResultTable alloc] initWithPyRef:[model resultTable] view:matches];
diff --git a/cocoa/base/ui/result_window.py b/cocoa/base/ui/result_window.py
index ff39bf55..dbf82a76 100644
--- a/cocoa/base/ui/result_window.py
+++ b/cocoa/base/ui/result_window.py
@@ -1,5 +1,5 @@
-ownerclass = 'ResultWindow'
-ownerimport = 'ResultWindow.h'
+ownerclass = 'ResultWindowBase'
+ownerimport = 'ResultWindowBase.h'
 
 result = Window(557, 400, "dupeGuru Results")
 toolbar = result.createToolbar('ResultsToolbar')
diff --git a/cocoa/me/ResultWindow.h b/cocoa/me/ResultWindow.h
index 92aaea84..505200b7 100644
--- a/cocoa/me/ResultWindow.h
+++ b/cocoa/me/ResultWindow.h
@@ -7,7 +7,7 @@ http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import <Cocoa/Cocoa.h>
-#import "../base/ResultWindow.h"
+#import "ResultWindowBase.h"
 
 @interface ResultWindow : ResultWindowBase {}
 - (void)removeDeadTracks;
diff --git a/cocoa/pe/ResultWindow.h b/cocoa/pe/ResultWindow.h
index a3015c4e..0530d946 100644
--- a/cocoa/pe/ResultWindow.h
+++ b/cocoa/pe/ResultWindow.h
@@ -7,7 +7,7 @@ http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import <Cocoa/Cocoa.h>
-#import "../base/ResultWindow.h"
+#import "ResultWindowBase.h"
 
 @interface ResultWindow : ResultWindowBase {}
 - (void)clearPictureCache;
diff --git a/cocoa/se/ResultWindow.h b/cocoa/se/ResultWindow.h
index 7888a2e9..0db1ba6c 100644
--- a/cocoa/se/ResultWindow.h
+++ b/cocoa/se/ResultWindow.h
@@ -7,7 +7,7 @@ http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import <Cocoa/Cocoa.h>
-#import "../base/ResultWindow.h"
+#import "ResultWindowBase.h"
 
 @interface ResultWindow : ResultWindowBase {}
 @end