summaryrefslogtreecommitdiff
path: root/cocoa
diff options
context:
space:
mode:
authorSven Weidauer <sven.weidauer@gmail.com>2011-01-20 13:22:39 +0000
committerSven Weidauer <sven.weidauer@gmail.com>2011-01-20 13:22:39 +0000
commit1490258b3e25c05769dc1dfd1a1a6c7179fb88cf (patch)
tree15a54cf259626ec14b8914fbe81dfddfe228cd6f /cocoa
parentc46072be857033c963dabce747be26ace83bd7f2 (diff)
downloadnetsurf-1490258b3e25c05769dc1dfd1a1a6c7179fb88cf.tar.gz
netsurf-1490258b3e25c05769dc1dfd1a1a6c7179fb88cf.tar.bz2
Renamed 'spinning' property to 'isProcessing' so that the tab bar picks it up and displays a spinner.
svn path=/trunk/netsurf/; revision=11420
Diffstat (limited to 'cocoa')
-rw-r--r--cocoa/BrowserViewController.h4
-rw-r--r--cocoa/BrowserViewController.m2
-rw-r--r--cocoa/gui.m4
-rw-r--r--cocoa/res/BrowserWindow.xib41
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 @@
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="1"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -326,7 +325,7 @@
<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
<string key="NSWindowContentMinSize">{273, 43}</string>
<object class="NSView" key="NSWindowView" id="1006">
- <reference key="NSNextResponder"/>
+ <nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -394,7 +393,6 @@
</object>
</object>
<string key="NSFrameSize">{774, 554}</string>
- <reference key="NSSuperview"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
<string key="NSMinSize">{273, 104}</string>
@@ -408,8 +406,9 @@
<string>URL</string>
<string>url</string>
<string>status</string>
- <string>spinning</string>
+ <string>processing</string>
<string>title</string>
+ <string>isProcessing</string>
</object>
<string key="NSObjectClassName">BrowserViewController</string>
<bool key="NSEditable">YES</bool>
@@ -549,22 +548,6 @@
</object>
<object class="IBConnectionRecord">
<object class="IBBindingConnection" key="connection">
- <string key="label">animate: selection.spinning</string>
- <reference key="source" ref="528651909"/>
- <reference key="destination" ref="177599630"/>
- <object class="NSNibBindingConnector" key="connector">
- <reference key="NSSource" ref="528651909"/>
- <reference key="NSDestination" ref="177599630"/>
- <string key="NSLabel">animate: selection.spinning</string>
- <string key="NSBinding">animate</string>
- <string key="NSKeyPath">selection.spinning</string>
- <int key="NSNibBindingConnectorVersion">2</int>
- </object>
- </object>
- <int key="connectionID">66</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBBindingConnection" key="connection">
<string key="label">title: selection.title</string>
<reference key="source" ref="1005"/>
<reference key="destination" ref="177599630"/>
@@ -587,6 +570,22 @@
</object>
<int key="connectionID">68</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBBindingConnection" key="connection">
+ <string key="label">animate: selection.isProcessing</string>
+ <reference key="source" ref="528651909"/>
+ <reference key="destination" ref="177599630"/>
+ <object class="NSNibBindingConnector" key="connector">
+ <reference key="NSSource" ref="528651909"/>
+ <reference key="NSDestination" ref="177599630"/>
+ <string key="NSLabel">animate: selection.isProcessing</string>
+ <string key="NSBinding">animate</string>
+ <string key="NSKeyPath">selection.isProcessing</string>
+ <int key="NSNibBindingConnectorVersion">2</int>
+ </object>
+ </object>
+ <int key="connectionID">69</int>
+ </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -844,7 +843,7 @@
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">68</int>
+ <int key="maxID">69</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">