From 1490258b3e25c05769dc1dfd1a1a6c7179fb88cf Mon Sep 17 00:00:00 2001 From: Sven Weidauer Date: Thu, 20 Jan 2011 13:22:39 +0000 Subject: Renamed 'spinning' property to 'isProcessing' so that the tab bar picks it up and displays a spinner. svn path=/trunk/netsurf/; revision=11420 --- cocoa/BrowserViewController.h | 4 ++-- cocoa/BrowserViewController.m | 2 +- cocoa/gui.m | 4 ++-- cocoa/res/BrowserWindow.xib | 41 ++++++++++++++++++++--------------------- 4 files changed, 25 insertions(+), 26 deletions(-) diff --git a/cocoa/BrowserViewController.h b/cocoa/BrowserViewController.h index cfae8c810..e01b34089 100644 --- a/cocoa/BrowserViewController.h +++ b/cocoa/BrowserViewController.h @@ -30,7 +30,7 @@ struct browser_window; BrowserWindowController *windowController; NSString *title; NSString *status; - BOOL spinning; + BOOL isProcessing; } @property (readwrite, assign, nonatomic) struct browser_window *browser; @@ -39,7 +39,7 @@ struct browser_window; @property (readwrite, retain, nonatomic) BrowserWindowController *windowController; @property (readwrite, copy, nonatomic) NSString *title; @property (readwrite, copy, nonatomic) NSString *status; -@property (readwrite, assign, nonatomic) BOOL spinning; +@property (readwrite, assign, nonatomic) BOOL isProcessing; - initWithBrowser: (struct browser_window *) bw; diff --git a/cocoa/BrowserViewController.m b/cocoa/BrowserViewController.m index 654d6e80b..026bacf24 100644 --- a/cocoa/BrowserViewController.m +++ b/cocoa/BrowserViewController.m @@ -36,7 +36,7 @@ @synthesize windowController; @synthesize title; @synthesize status; -@synthesize spinning; +@synthesize isProcessing; - (void) dealloc; { diff --git a/cocoa/gui.m b/cocoa/gui.m index 991772df7..2841849e2 100644 --- a/cocoa/gui.m +++ b/cocoa/gui.m @@ -223,12 +223,12 @@ void gui_window_set_url(struct gui_window *g, const char *url) void gui_window_start_throbber(struct gui_window *g) { - [(BrowserViewController *)g setSpinning: YES]; + [(BrowserViewController *)g setIsProcessing: YES]; } void gui_window_stop_throbber(struct gui_window *g) { - [(BrowserViewController *)g setSpinning: NO]; + [(BrowserViewController *)g setIsProcessing: NO]; } void gui_window_set_icon(struct gui_window *g, hlcache_handle *icon) diff --git a/cocoa/res/BrowserWindow.xib b/cocoa/res/BrowserWindow.xib index 9bb667d6f..d4a653244 100644 --- a/cocoa/res/BrowserWindow.xib +++ b/cocoa/res/BrowserWindow.xib @@ -12,7 +12,6 @@ YES - YES @@ -326,7 +325,7 @@ {1.79769e+308, 1.79769e+308} {273, 43} - + 256 YES @@ -394,7 +393,6 @@ {774, 554} - {{0, 0}, {1680, 1028}} {273, 104} @@ -408,8 +406,9 @@ URL url status - spinning + processing title + isProcessing BrowserViewController YES @@ -547,22 +546,6 @@ 65 - - - animate: selection.spinning - - - - - - animate: selection.spinning - animate - selection.spinning - 2 - - - 66 - title: selection.title @@ -587,6 +570,22 @@ 68 + + + animate: selection.isProcessing + + + + + + animate: selection.isProcessing + animate + selection.isProcessing + 2 + + + 69 + @@ -844,7 +843,7 @@ - 68 + 69 -- cgit v1.2.3