Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Updated xibs again (Show/Hide Warp HUD).

Warp prefpane now shows the proper version after first upgrade.
Warp prefpane will restart the daemon if the version of the daemon doesn't match the prefpane.
  • Loading branch information...
commit 8451a15c689c49acdd181d599049d48ac351b2be 1 parent 6c3b95d
@ksuther authored
View
14 English.lproj/WarpPreferences.xib
@@ -174,7 +174,7 @@
<object class="NSTextField" id="213512001">
<reference key="NSNextResponder" ref="467419391"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{71, 197}, {174, 17}}</string>
+ <string key="NSFrame">{{17, 197}, {228, 17}}</string>
<reference key="NSSuperview" ref="467419391"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="261511866">
@@ -311,7 +311,7 @@
<object class="NSTextField" id="467098237">
<reference key="NSNextResponder" ref="467419391"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{71, 220}, {174, 17}}</string>
+ <string key="NSFrame">{{17, 220}, {228, 17}}</string>
<reference key="NSSuperview" ref="467419391"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="245577796">
@@ -349,7 +349,7 @@
<object class="NSTextField" id="975498033">
<reference key="NSNextResponder" ref="467419391"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{71, 22}, {174, 17}}</string>
+ <string key="NSFrame">{{17, 22}, {228, 17}}</string>
<reference key="NSSuperview" ref="467419391"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="523616487">
@@ -720,7 +720,7 @@
<object class="NSTextField" id="280089189">
<reference key="NSNextResponder" ref="467419391"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{71, 160}, {174, 17}}</string>
+ <string key="NSFrame">{{17, 160}, {228, 17}}</string>
<reference key="NSSuperview" ref="467419391"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="777052035">
@@ -736,13 +736,13 @@
<object class="NSTextField" id="651949475">
<reference key="NSNextResponder" ref="467419391"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{71, 62}, {174, 17}}</string>
+ <string key="NSFrame">{{17, 62}, {228, 17}}</string>
<reference key="NSSuperview" ref="467419391"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="11730813">
<int key="NSCellFlags">67239488</int>
<int key="NSCellFlags2">71304192</int>
- <string key="NSContents">Show/Hide Pager:</string>
+ <string key="NSContents">Show/Hide Warp HUD:</string>
<reference key="NSSupport" ref="656096860"/>
<reference key="NSControlView" ref="651949475"/>
<reference key="NSBackgroundColor" ref="857161946"/>
@@ -1289,11 +1289,11 @@
<reference ref="35144583"/>
<reference ref="102970564"/>
<reference ref="689890346"/>
- <reference ref="280089189"/>
<reference ref="1063899480"/>
<reference ref="1007520276"/>
<reference ref="36590326"/>
<reference ref="651949475"/>
+ <reference ref="280089189"/>
</object>
<reference key="parent" ref="863286287"/>
</object>
View
BIN  French.lproj/WarpPreferences-fr.strings
Binary file not shown
View
60 French.lproj/WarpPreferences.xib
@@ -52,7 +52,7 @@
<object class="NSButton" id="176134577">
<reference key="NSNextResponder" ref="467419391"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{444, 13}, {150, 28}}</string>
+ <string key="NSFrame">{{444, 13}, {86, 28}}</string>
<reference key="NSSuperview" ref="467419391"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="374609226">
@@ -175,7 +175,7 @@
<object class="NSTextField" id="213512001">
<reference key="NSNextResponder" ref="467419391"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{71, 197}, {174, 17}}</string>
+ <string key="NSFrame">{{17, 197}, {228, 17}}</string>
<reference key="NSSuperview" ref="467419391"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="261511866">
@@ -183,7 +183,6 @@
<int key="NSCellFlags2">71304192</int>
<string key="NSContents">Modificateurs :</string>
<reference key="NSSupport" ref="656096860"/>
- <string key="NSPlaceholderString"/>
<reference key="NSControlView" ref="213512001"/>
<object class="NSColor" key="NSBackgroundColor" id="857161946">
<int key="NSColorSpace">6</int>
@@ -305,7 +304,6 @@
<bool key="NS.localized">YES</bool>
<bool key="NS.allowsfloats">YES</bool>
</object>
- <string key="NSPlaceholderString"/>
<reference key="NSControlView" ref="818036138"/>
<reference key="NSBackgroundColor" ref="857161946"/>
<reference key="NSTextColor" ref="853967857"/>
@@ -314,7 +312,7 @@
<object class="NSTextField" id="467098237">
<reference key="NSNextResponder" ref="467419391"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{71, 220}, {174, 17}}</string>
+ <string key="NSFrame">{{17, 220}, {228, 17}}</string>
<reference key="NSSuperview" ref="467419391"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="245577796">
@@ -322,7 +320,6 @@
<int key="NSCellFlags2">71304192</int>
<string type="base64-UTF8" key="NSContents">RMOpbGFpIGQnYWN0aXZhdGlvbiA6A</string>
<reference key="NSSupport" ref="656096860"/>
- <string key="NSPlaceholderString"/>
<reference key="NSControlView" ref="467098237"/>
<reference key="NSBackgroundColor" ref="857161946"/>
<reference key="NSTextColor" ref="853967857"/>
@@ -353,7 +350,7 @@
<object class="NSTextField" id="975498033">
<reference key="NSNextResponder" ref="467419391"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{71, 22}, {174, 17}}</string>
+ <string key="NSFrame">{{17, 22}, {228, 17}}</string>
<reference key="NSSuperview" ref="467419391"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="523616487">
@@ -361,7 +358,6 @@
<int key="NSCellFlags2">71304192</int>
<string type="base64-UTF8" key="NSContents">TWlzZXMgw6Agam91csKgOg</string>
<reference key="NSSupport" ref="656096860"/>
- <string key="NSPlaceholderString"/>
<reference key="NSControlView" ref="975498033"/>
<reference key="NSBackgroundColor" ref="857161946"/>
<reference key="NSTextColor" ref="853967857"/>
@@ -673,7 +669,6 @@
<int key="NSCellFlags2">71435264</int>
<string key="NSContents">-</string>
<reference key="NSSupport" ref="26"/>
- <string key="NSPlaceholderString"/>
<reference key="NSControlView" ref="35144583"/>
<reference key="NSBackgroundColor" ref="857161946"/>
<reference key="NSTextColor" ref="853967857"/>
@@ -726,7 +721,7 @@
<object class="NSTextField" id="280089189">
<reference key="NSNextResponder" ref="467419391"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{71, 160}, {174, 17}}</string>
+ <string key="NSFrame">{{17, 160}, {228, 17}}</string>
<reference key="NSSuperview" ref="467419391"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="777052035">
@@ -734,7 +729,6 @@
<int key="NSCellFlags2">71304192</int>
<string key="NSContents">Options :</string>
<reference key="NSSupport" ref="656096860"/>
- <string key="NSPlaceholderString"/>
<reference key="NSControlView" ref="280089189"/>
<reference key="NSBackgroundColor" ref="857161946"/>
<reference key="NSTextColor" ref="853967857"/>
@@ -743,13 +737,13 @@
<object class="NSTextField" id="651949475">
<reference key="NSNextResponder" ref="467419391"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{71, 62}, {174, 17}}</string>
+ <string key="NSFrame">{{17, 62}, {228, 17}}</string>
<reference key="NSSuperview" ref="467419391"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="11730813">
<int key="NSCellFlags">67239488</int>
<int key="NSCellFlags2">71304192</int>
- <string key="NSContents">Show/Hide Pager:</string>
+ <string key="NSContents">Show/Hide Warp HUD :</string>
<reference key="NSSupport" ref="656096860"/>
<reference key="NSControlView" ref="651949475"/>
<reference key="NSBackgroundColor" ref="857161946"/>
@@ -759,7 +753,7 @@
<object class="NSButton" id="1063899480">
<reference key="NSNextResponder" ref="467419391"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{248, 119}, {370, 18}}</string>
+ <string key="NSFrame">{{248, 119}, {402, 18}}</string>
<reference key="NSSuperview" ref="467419391"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="415958515">
@@ -767,7 +761,11 @@
<int key="NSCellFlags2">0</int>
<string type="base64-UTF8" key="NSContents">TmUgcGFzIHNlIGTDqXBsYWNlciBhdXggYm9yZHMgYXZlYyBsYSBiYXJyZSBkZXMgbWVudXMgZXQgbGUg
RG9jaw</string>
- <reference key="NSSupport" ref="656096860"/>
+ <object class="NSFont" key="NSSupport">
+ <string key="NSName">LucidaGrande</string>
+ <double key="NSSize">1.200000e+01</double>
+ <int key="NSfFlags">16</int>
+ </object>
<reference key="NSControlView" ref="1063899480"/>
<int key="NSButtonFlags">1211912703</int>
<int key="NSButtonFlags2">2</int>
@@ -1297,11 +1295,11 @@ RG9jaw</string>
<reference ref="35144583"/>
<reference ref="102970564"/>
<reference ref="689890346"/>
- <reference ref="280089189"/>
<reference ref="1063899480"/>
- <reference ref="1007520276"/>
<reference ref="36590326"/>
<reference ref="651949475"/>
+ <reference ref="280089189"/>
+ <reference ref="1007520276"/>
</object>
<reference key="parent" ref="863286287"/>
</object>
@@ -1593,20 +1591,6 @@ RG9jaw</string>
<reference key="parent" ref="1063899480"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">251</int>
- <reference key="object" ref="1007520276"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="325766846"/>
- </object>
- <reference key="parent" ref="467419391"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">252</int>
- <reference key="object" ref="325766846"/>
- <reference key="parent" ref="1007520276"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">255</int>
<reference key="object" ref="36590326"/>
<reference key="parent" ref="467419391"/>
@@ -1625,6 +1609,20 @@ RG9jaw</string>
<reference key="object" ref="11730813"/>
<reference key="parent" ref="651949475"/>
</object>
+ <object class="IBObjectRecord">
+ <int key="objectID">251</int>
+ <reference key="object" ref="1007520276"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="325766846"/>
+ </object>
+ <reference key="parent" ref="467419391"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">252</int>
+ <reference key="object" ref="325766846"/>
+ <reference key="parent" ref="1007520276"/>
+ </object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
View
BIN  German.lproj/WarpPreferences-de.strings
Binary file not shown
View
20 German.lproj/WarpPreferences.xib
@@ -175,7 +175,7 @@
<object class="NSTextField" id="213512001">
<reference key="NSNextResponder" ref="467419391"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{71, 197}, {174, 17}}</string>
+ <string key="NSFrame">{{17, 197}, {228, 17}}</string>
<reference key="NSSuperview" ref="467419391"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="261511866">
@@ -183,7 +183,6 @@
<int key="NSCellFlags2">71304192</int>
<string key="NSContents">Modifikatoren:</string>
<reference key="NSSupport" ref="656096860"/>
- <string key="NSPlaceholderString"/>
<reference key="NSControlView" ref="213512001"/>
<object class="NSColor" key="NSBackgroundColor" id="857161946">
<int key="NSColorSpace">6</int>
@@ -305,7 +304,6 @@
<bool key="NS.localized">YES</bool>
<bool key="NS.allowsfloats">YES</bool>
</object>
- <string key="NSPlaceholderString"/>
<reference key="NSControlView" ref="818036138"/>
<reference key="NSBackgroundColor" ref="857161946"/>
<reference key="NSTextColor" ref="853967857"/>
@@ -314,7 +312,7 @@
<object class="NSTextField" id="467098237">
<reference key="NSNextResponder" ref="467419391"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{71, 220}, {174, 17}}</string>
+ <string key="NSFrame">{{17, 220}, {228, 17}}</string>
<reference key="NSSuperview" ref="467419391"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="245577796">
@@ -322,7 +320,6 @@
<int key="NSCellFlags2">71304192</int>
<string type="base64-UTF8" key="NSContents">VmVyesO2Z2VydW5nOg</string>
<reference key="NSSupport" ref="656096860"/>
- <string key="NSPlaceholderString"/>
<reference key="NSControlView" ref="467098237"/>
<reference key="NSBackgroundColor" ref="857161946"/>
<reference key="NSTextColor" ref="853967857"/>
@@ -353,7 +350,7 @@
<object class="NSTextField" id="975498033">
<reference key="NSNextResponder" ref="467419391"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{71, 22}, {174, 17}}</string>
+ <string key="NSFrame">{{17, 22}, {228, 17}}</string>
<reference key="NSSuperview" ref="467419391"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="523616487">
@@ -361,7 +358,6 @@
<int key="NSCellFlags2">71304192</int>
<string key="NSContents">Aktualisierungen:</string>
<reference key="NSSupport" ref="656096860"/>
- <string key="NSPlaceholderString"/>
<reference key="NSControlView" ref="975498033"/>
<reference key="NSBackgroundColor" ref="857161946"/>
<reference key="NSTextColor" ref="853967857"/>
@@ -673,7 +669,6 @@
<int key="NSCellFlags2">71435264</int>
<string key="NSContents">-</string>
<reference key="NSSupport" ref="26"/>
- <string key="NSPlaceholderString"/>
<reference key="NSControlView" ref="35144583"/>
<reference key="NSBackgroundColor" ref="857161946"/>
<reference key="NSTextColor" ref="853967857"/>
@@ -726,7 +721,7 @@
<object class="NSTextField" id="280089189">
<reference key="NSNextResponder" ref="467419391"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{71, 160}, {174, 17}}</string>
+ <string key="NSFrame">{{17, 160}, {228, 17}}</string>
<reference key="NSSuperview" ref="467419391"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="777052035">
@@ -734,7 +729,6 @@
<int key="NSCellFlags2">71304192</int>
<string key="NSContents">Optionen:</string>
<reference key="NSSupport" ref="656096860"/>
- <string key="NSPlaceholderString"/>
<reference key="NSControlView" ref="280089189"/>
<reference key="NSBackgroundColor" ref="857161946"/>
<reference key="NSTextColor" ref="853967857"/>
@@ -743,13 +737,13 @@
<object class="NSTextField" id="651949475">
<reference key="NSNextResponder" ref="467419391"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{71, 62}, {174, 17}}</string>
+ <string key="NSFrame">{{17, 62}, {228, 17}}</string>
<reference key="NSSuperview" ref="467419391"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="11730813">
<int key="NSCellFlags">67239488</int>
<int key="NSCellFlags2">71304192</int>
- <string key="NSContents">Show/Hide Pager:</string>
+ <string key="NSContents">Show/Hide Warp HUD:</string>
<reference key="NSSupport" ref="656096860"/>
<reference key="NSControlView" ref="651949475"/>
<reference key="NSBackgroundColor" ref="857161946"/>
@@ -1296,11 +1290,11 @@
<reference ref="35144583"/>
<reference ref="102970564"/>
<reference ref="689890346"/>
- <reference ref="280089189"/>
<reference ref="1063899480"/>
<reference ref="1007520276"/>
<reference ref="36590326"/>
<reference ref="651949475"/>
+ <reference ref="280089189"/>
</object>
<reference key="parent" ref="863286287"/>
</object>
View
BIN  Italian.lproj/WarpPreferences-it.strings
Binary file not shown
View
28 Italian.lproj/WarpPreferences.xib
@@ -52,7 +52,7 @@
<object class="NSButton" id="176134577">
<reference key="NSNextResponder" ref="467419391"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{387, 13}, {96, 28}}</string>
+ <string key="NSFrame">{{425, 13}, {96, 28}}</string>
<reference key="NSSuperview" ref="467419391"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="374609226">
@@ -175,7 +175,7 @@
<object class="NSTextField" id="213512001">
<reference key="NSNextResponder" ref="467419391"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{71, 197}, {174, 17}}</string>
+ <string key="NSFrame">{{17, 197}, {228, 17}}</string>
<reference key="NSSuperview" ref="467419391"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="261511866">
@@ -183,7 +183,6 @@
<int key="NSCellFlags2">71304192</int>
<string key="NSContents">Modificatori:</string>
<reference key="NSSupport" ref="656096860"/>
- <string key="NSPlaceholderString"/>
<reference key="NSControlView" ref="213512001"/>
<object class="NSColor" key="NSBackgroundColor" id="857161946">
<int key="NSColorSpace">6</int>
@@ -305,7 +304,6 @@
<bool key="NS.localized">YES</bool>
<bool key="NS.allowsfloats">YES</bool>
</object>
- <string key="NSPlaceholderString"/>
<reference key="NSControlView" ref="818036138"/>
<reference key="NSBackgroundColor" ref="857161946"/>
<reference key="NSTextColor" ref="853967857"/>
@@ -314,7 +312,7 @@
<object class="NSTextField" id="467098237">
<reference key="NSNextResponder" ref="467419391"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{71, 220}, {174, 17}}</string>
+ <string key="NSFrame">{{17, 220}, {228, 17}}</string>
<reference key="NSSuperview" ref="467419391"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="245577796">
@@ -322,7 +320,6 @@
<int key="NSCellFlags2">71304192</int>
<string key="NSContents">Ritardo di attivazione:</string>
<reference key="NSSupport" ref="656096860"/>
- <string key="NSPlaceholderString"/>
<reference key="NSControlView" ref="467098237"/>
<reference key="NSBackgroundColor" ref="857161946"/>
<reference key="NSTextColor" ref="853967857"/>
@@ -353,7 +350,7 @@
<object class="NSTextField" id="975498033">
<reference key="NSNextResponder" ref="467419391"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{71, 22}, {174, 17}}</string>
+ <string key="NSFrame">{{17, 22}, {228, 17}}</string>
<reference key="NSSuperview" ref="467419391"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="523616487">
@@ -361,7 +358,6 @@
<int key="NSCellFlags2">71304192</int>
<string key="NSContents">Aggiornamenti:</string>
<reference key="NSSupport" ref="656096860"/>
- <string key="NSPlaceholderString"/>
<reference key="NSControlView" ref="975498033"/>
<reference key="NSBackgroundColor" ref="857161946"/>
<reference key="NSTextColor" ref="853967857"/>
@@ -370,7 +366,7 @@
<object class="NSButton" id="209614181">
<reference key="NSNextResponder" ref="467419391"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{248, 20}, {138, 18}}</string>
+ <string key="NSFrame">{{248, 20}, {176, 18}}</string>
<reference key="NSSuperview" ref="467419391"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="8361894">
@@ -673,7 +669,6 @@
<int key="NSCellFlags2">71435264</int>
<string key="NSContents">-</string>
<reference key="NSSupport" ref="26"/>
- <string key="NSPlaceholderString"/>
<reference key="NSControlView" ref="35144583"/>
<reference key="NSBackgroundColor" ref="857161946"/>
<reference key="NSTextColor" ref="853967857"/>
@@ -726,7 +721,7 @@
<object class="NSTextField" id="280089189">
<reference key="NSNextResponder" ref="467419391"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{71, 160}, {174, 17}}</string>
+ <string key="NSFrame">{{17, 160}, {228, 17}}</string>
<reference key="NSSuperview" ref="467419391"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="777052035">
@@ -734,7 +729,6 @@
<int key="NSCellFlags2">71304192</int>
<string key="NSContents">Opzioni:</string>
<reference key="NSSupport" ref="656096860"/>
- <string key="NSPlaceholderString"/>
<reference key="NSControlView" ref="280089189"/>
<reference key="NSBackgroundColor" ref="857161946"/>
<reference key="NSTextColor" ref="853967857"/>
@@ -743,13 +737,13 @@
<object class="NSTextField" id="651949475">
<reference key="NSNextResponder" ref="467419391"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{71, 62}, {174, 17}}</string>
+ <string key="NSFrame">{{17, 62}, {228, 17}}</string>
<reference key="NSSuperview" ref="467419391"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="11730813">
<int key="NSCellFlags">67239488</int>
<int key="NSCellFlags2">71304192</int>
- <string key="NSContents">Show/Hide Pager:</string>
+ <string key="NSContents">Show/Hide Warp HUD:</string>
<reference key="NSSupport" ref="656096860"/>
<reference key="NSControlView" ref="651949475"/>
<reference key="NSBackgroundColor" ref="857161946"/>
@@ -1296,11 +1290,11 @@
<reference ref="35144583"/>
<reference ref="102970564"/>
<reference ref="689890346"/>
- <reference ref="280089189"/>
<reference ref="1063899480"/>
<reference ref="1007520276"/>
<reference ref="36590326"/>
<reference ref="651949475"/>
+ <reference ref="280089189"/>
</object>
<reference key="parent" ref="863286287"/>
</object>
@@ -1722,9 +1716,9 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{39, 511}, {668, 311}}</string>
+ <string>{{0, 534}, {668, 311}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{39, 511}, {668, 311}}</string>
+ <string>{{0, 534}, {668, 311}}</string>
<integer value="0"/>
<string>{{231, 678}, {668, 267}}</string>
<boolean value="NO"/>
View
BIN  Japanese.lproj/WarpPreferences-jp.strings
Binary file not shown
View
32 Japanese.lproj/WarpPreferences.xib
@@ -52,7 +52,7 @@
<object class="NSButton" id="176134577">
<reference key="NSNextResponder" ref="467419391"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{387, 13}, {86, 28}}</string>
+ <string key="NSFrame">{{388, 13}, {86, 28}}</string>
<reference key="NSSuperview" ref="467419391"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="374609226">
@@ -77,7 +77,7 @@
<object class="NSButton" id="764642906">
<reference key="NSNextResponder" ref="467419391"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{282, 255}, {104, 18}}</string>
+ <string key="NSFrame">{{282, 255}, {126, 18}}</string>
<reference key="NSSuperview" ref="467419391"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="412644022">
@@ -175,7 +175,7 @@
<object class="NSTextField" id="213512001">
<reference key="NSNextResponder" ref="467419391"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{71, 197}, {174, 17}}</string>
+ <string key="NSFrame">{{17, 197}, {228, 17}}</string>
<reference key="NSSuperview" ref="467419391"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="261511866">
@@ -233,7 +233,7 @@
<object class="NSTextField" id="818036138">
<reference key="NSNextResponder" ref="467419391"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{506, 220}, {38, 14}}</string>
+ <string key="NSFrame">{{506, 220}, {45, 14}}</string>
<reference key="NSSuperview" ref="467419391"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="181470512">
@@ -312,7 +312,7 @@
<object class="NSTextField" id="467098237">
<reference key="NSNextResponder" ref="467419391"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{71, 220}, {174, 17}}</string>
+ <string key="NSFrame">{{17, 220}, {228, 17}}</string>
<reference key="NSSuperview" ref="467419391"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="245577796">
@@ -350,7 +350,7 @@
<object class="NSTextField" id="975498033">
<reference key="NSNextResponder" ref="467419391"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{71, 22}, {174, 17}}</string>
+ <string key="NSFrame">{{17, 22}, {228, 17}}</string>
<reference key="NSSuperview" ref="467419391"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="523616487">
@@ -366,7 +366,7 @@
<object class="NSButton" id="209614181">
<reference key="NSNextResponder" ref="467419391"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{248, 20}, {138, 18}}</string>
+ <string key="NSFrame">{{248, 20}, {139, 18}}</string>
<reference key="NSSuperview" ref="467419391"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="8361894">
@@ -388,7 +388,7 @@
<object class="NSButton" id="376171710">
<reference key="NSNextResponder" ref="467419391"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{282, 275}, {100, 18}}</string>
+ <string key="NSFrame">{{282, 275}, {132, 18}}</string>
<reference key="NSSuperview" ref="467419391"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="102470126">
@@ -677,7 +677,7 @@
<object class="NSButton" id="102970564">
<reference key="NSNextResponder" ref="467419391"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{248, 159}, {249, 18}}</string>
+ <string key="NSFrame">{{248, 159}, {273, 18}}</string>
<reference key="NSSuperview" ref="467419391"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="400601930">
@@ -699,7 +699,7 @@
<object class="NSButton" id="689890346">
<reference key="NSNextResponder" ref="467419391"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{248, 139}, {248, 18}}</string>
+ <string key="NSFrame">{{248, 139}, {171, 18}}</string>
<reference key="NSSuperview" ref="467419391"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="1044903716">
@@ -721,7 +721,7 @@
<object class="NSTextField" id="280089189">
<reference key="NSNextResponder" ref="467419391"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{71, 160}, {174, 17}}</string>
+ <string key="NSFrame">{{17, 160}, {228, 17}}</string>
<reference key="NSSuperview" ref="467419391"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="777052035">
@@ -737,13 +737,13 @@
<object class="NSTextField" id="651949475">
<reference key="NSNextResponder" ref="467419391"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{71, 62}, {174, 17}}</string>
+ <string key="NSFrame">{{17, 62}, {228, 17}}</string>
<reference key="NSSuperview" ref="467419391"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="11730813">
<int key="NSCellFlags">67239488</int>
<int key="NSCellFlags2">71304192</int>
- <string key="NSContents">Show/Hide Pager:</string>
+ <string key="NSContents">Show/Hide Warp HUD:</string>
<reference key="NSSupport" ref="656096860"/>
<reference key="NSControlView" ref="651949475"/>
<reference key="NSBackgroundColor" ref="857161946"/>
@@ -753,7 +753,7 @@
<object class="NSButton" id="1063899480">
<reference key="NSNextResponder" ref="467419391"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{248, 119}, {350, 18}}</string>
+ <string key="NSFrame">{{248, 119}, {346, 18}}</string>
<reference key="NSSuperview" ref="467419391"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="415958515">
@@ -776,7 +776,7 @@ gavjgZnjgos</string>
<object class="NSButton" id="1007520276">
<reference key="NSNextResponder" ref="467419391"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{248, 99}, {186, 18}}</string>
+ <string key="NSFrame">{{248, 99}, {288, 18}}</string>
<reference key="NSSuperview" ref="467419391"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="325766846">
@@ -1291,11 +1291,11 @@ gavjgZnjgos</string>
<reference ref="35144583"/>
<reference ref="102970564"/>
<reference ref="689890346"/>
- <reference ref="280089189"/>
<reference ref="1063899480"/>
<reference ref="1007520276"/>
<reference ref="36590326"/>
<reference ref="651949475"/>
+ <reference ref="280089189"/>
</object>
<reference key="parent" ref="863286287"/>
</object>
View
2  MainController.h
@@ -40,6 +40,8 @@ enum {
unsigned int _activeModifiers;
PagerController *_pagerController;
+
+ NSString *_cachedVersion;
}
+ (NSInteger)numberOfSpacesRows;
View
9 MainController.m
@@ -488,6 +488,7 @@ - (id)init
- (void)dealloc
{
[_pagerController release];
+ [_cachedVersion release];
[super dealloc];
}
@@ -503,6 +504,7 @@ - (void)applicationDidFinishLaunching:(NSNotification *)note
CGSRegisterConnectionNotifyProc(_CGSDefaultConnection(), spacesChangedCallback, CGSWorkspaceConfigurationDisabledEvent, (void *)self);
[[NSDistributedNotificationCenter defaultCenter] addObserver:NSApp selector:@selector(terminate:) name:@"TerminateWarpNotification" object:nil];
+ [[NSDistributedNotificationCenter defaultCenter] addObserver:self selector:@selector(versionRequested:) name:@"WarpVersionRequest" object:nil];
[[NSDistributedNotificationCenter defaultCenter] addObserver:self selector:@selector(defaultsChanged:) name:@"WarpDefaultsChanged" object:nil];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(screenParametersChanged:) name:NSApplicationDidChangeScreenParametersNotification object:nil];
@@ -511,6 +513,8 @@ - (void)applicationDidFinishLaunching:(NSNotification *)note
[[NSDistributedNotificationCenter defaultCenter] addObserver:self selector:@selector(timeMachineNotification:) name:@"com.apple.backup.BackupTargetActivatedNotification" object:nil];
[[NSDistributedNotificationCenter defaultCenter] addObserver:self selector:@selector(timeMachineNotification:) name:@"com.apple.backup.BackupDismissedNotification" object:nil];
+
+ _cachedVersion = [[[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleVersion"] copy];
}
- (void)applicationWillTerminate:(NSNotification *)note
@@ -527,6 +531,11 @@ - (void)timeMachineNotification:(NSNotification *)note
_timeMachineActive = [[note name] isEqualToString:@"com.apple.backup.BackupTargetActivatedNotification"];
}
+- (void)versionRequested:(NSNotification *)note
+{
+ [[NSDistributedNotificationCenter defaultCenter] postNotificationName:@"WarpVersionResponse" object:_cachedVersion];
+}
+
- (void)defaultsChanged:(NSNotification *)note
{
NSUserDefaults *df = [NSUserDefaults standardUserDefaults];
View
1  PagerController.m
@@ -119,6 +119,7 @@ - (void)toggleVisibility
NSArray *animations = [NSArray arrayWithObject:dictionary];
NSViewAnimation *animation = [[[NSViewAnimation alloc] initWithViewAnimations:animations] autorelease];
+ [animation setDuration:0.25];
[animation startAnimation];
_pagerVisible = !_pagerVisible;
View
2  WarpPreferences.h
@@ -22,11 +22,13 @@ extern NSString *WarpBundleIdentifier;
NSMutableData *_updateResponseData;
BOOL _notifyForUpdates;
+ BOOL _receivedDaemonVersion;
}
@property BOOL warpEnabled;
@property BOOL launchAtLogin;
+- (NSString *)CFBundleVersion;
- (BOOL)isWarpDaemonRunning;
- (IBAction)checkForUpdatesNow:(id)sender;
View
37 WarpPreferences.m
@@ -60,6 +60,11 @@ - (void)willSelect
[[[NSWorkspace sharedWorkspace] notificationCenter] addObserver:self selector:@selector(workspaceNotificationReceived:) name:NSWorkspaceDidLaunchApplicationNotification object:nil];
[[[NSWorkspace sharedWorkspace] notificationCenter] addObserver:self selector:@selector(workspaceNotificationReceived:) name:NSWorkspaceDidTerminateApplicationNotification object:nil];
+ //Ensure the running daemon matches the version of the prefpane
+ [[NSDistributedNotificationCenter defaultCenter] addObserver:self selector:@selector(versionResponse:) name:@"WarpVersionResponse" object:nil];
+ [[NSDistributedNotificationCenter defaultCenter] postNotificationName:@"WarpVersionRequest" object:nil];
+ [self performSelector:@selector(versionRequestTimeout) withObject:nil afterDelay:2.0];
+
//Set about string
NSDictionary *linkAttributes = [NSDictionary dictionaryWithObjectsAndKeys:[NSURL URLWithString:@"http://www.ksuther.com/warp/"], NSLinkAttributeName, [NSCursor pointingHandCursor], NSCursorAttributeName, nil];
[[_aboutTextView textStorage] addAttributes:linkAttributes range:NSMakeRange(0, [[_aboutTextView textStorage] length])];
@@ -117,9 +122,39 @@ - (void)willUnselect
[[[NSWorkspace sharedWorkspace] notificationCenter] removeObserver:self name:nil object:nil];
}
+- (NSString *)CFBundleVersion
+{
+ NSString *plistPath = [[[self bundle] bundlePath] stringByAppendingPathComponent:@"Contents/Info.plist"];
+
+ return [[NSDictionary dictionaryWithContentsOfFile:plistPath] objectForKey:@"CFBundleVersion"];
+}
+
- (NSString *)versionString
{
- return [NSString stringWithFormat:@"%@ -", [[self bundle] objectForInfoDictionaryKey:@"CFBundleVersion"]];
+ return [NSString stringWithFormat:@"%@ -", [self CFBundleVersion]];
+}
+
+- (void)launchDaemon
+{
+ [self setWarpEnabled:YES];
+}
+
+- (void)versionRequestTimeout
+{
+ if (!_receivedDaemonVersion && [self isWarpDaemonRunning]) {
+ [self setWarpEnabled:NO];
+ [self performSelector:@selector(launchDaemon) withObject:nil afterDelay:1.0];
+ }
+}
+
+- (void)versionResponse:(NSNotification *)note
+{
+ _receivedDaemonVersion = YES;
+
+ if (![[self CFBundleVersion] isEqualToString:[note object]]) {
+ [self setWarpEnabled:NO];
+ [self performSelector:@selector(launchDaemon) withObject:nil afterDelay:1.0];
+ }
}
- (void)workspaceNotificationReceived:(NSNotification *)note
View
BIN  zh_TW.lproj/WarpPreferences-zh_TW.strings
Binary file not shown
View
34 zh_TW.lproj/WarpPreferences.xib
@@ -77,7 +77,7 @@
<object class="NSButton" id="764642906">
<reference key="NSNextResponder" ref="467419391"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{282, 255}, {104, 18}}</string>
+ <string key="NSFrame">{{282, 255}, {87, 18}}</string>
<reference key="NSSuperview" ref="467419391"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="412644022">
@@ -175,7 +175,7 @@
<object class="NSTextField" id="213512001">
<reference key="NSNextResponder" ref="467419391"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{71, 197}, {174, 17}}</string>
+ <string key="NSFrame">{{17, 197}, {228, 17}}</string>
<reference key="NSSuperview" ref="467419391"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="261511866">
@@ -183,7 +183,6 @@
<int key="NSCellFlags2">71304192</int>
<string type="base64-UTF8" key="NSContents">6K6K5pu06Y2177yaA</string>
<reference key="NSSupport" ref="656096860"/>
- <string key="NSPlaceholderString"/>
<reference key="NSControlView" ref="213512001"/>
<object class="NSColor" key="NSBackgroundColor" id="857161946">
<int key="NSColorSpace">6</int>
@@ -305,7 +304,6 @@
<bool key="NS.localized">YES</bool>
<bool key="NS.allowsfloats">YES</bool>
</object>
- <string key="NSPlaceholderString"/>
<reference key="NSControlView" ref="818036138"/>
<reference key="NSBackgroundColor" ref="857161946"/>
<reference key="NSTextColor" ref="853967857"/>
@@ -314,15 +312,14 @@
<object class="NSTextField" id="467098237">
<reference key="NSNextResponder" ref="467419391"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{71, 220}, {174, 17}}</string>
+ <string key="NSFrame">{{17, 220}, {228, 17}}</string>
<reference key="NSSuperview" ref="467419391"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="245577796">
<int key="NSCellFlags">67239488</int>
<int key="NSCellFlags2">71304192</int>
- <string key="NSContents">Activation delay:</string>
+ <string key="NSContents">Activation delay :</string>
<reference key="NSSupport" ref="656096860"/>
- <string key="NSPlaceholderString"/>
<reference key="NSControlView" ref="467098237"/>
<reference key="NSBackgroundColor" ref="857161946"/>
<reference key="NSTextColor" ref="853967857"/>
@@ -353,7 +350,7 @@
<object class="NSTextField" id="975498033">
<reference key="NSNextResponder" ref="467419391"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{71, 22}, {174, 17}}</string>
+ <string key="NSFrame">{{17, 22}, {228, 17}}</string>
<reference key="NSSuperview" ref="467419391"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="523616487">
@@ -361,7 +358,6 @@
<int key="NSCellFlags2">71304192</int>
<string type="base64-UTF8" key="NSContents">5pu05paw77yaA</string>
<reference key="NSSupport" ref="656096860"/>
- <string key="NSPlaceholderString"/>
<reference key="NSControlView" ref="975498033"/>
<reference key="NSBackgroundColor" ref="857161946"/>
<reference key="NSTextColor" ref="853967857"/>
@@ -392,7 +388,7 @@
<object class="NSButton" id="376171710">
<reference key="NSNextResponder" ref="467419391"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{282, 275}, {100, 18}}</string>
+ <string key="NSFrame">{{282, 275}, {84, 18}}</string>
<reference key="NSSuperview" ref="467419391"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="102470126">
@@ -673,7 +669,6 @@
<int key="NSCellFlags2">71435264</int>
<string key="NSContents">-</string>
<reference key="NSSupport" ref="26"/>
- <string key="NSPlaceholderString"/>
<reference key="NSControlView" ref="35144583"/>
<reference key="NSBackgroundColor" ref="857161946"/>
<reference key="NSTextColor" ref="853967857"/>
@@ -682,7 +677,7 @@
<object class="NSButton" id="102970564">
<reference key="NSNextResponder" ref="467419391"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{248, 159}, {249, 18}}</string>
+ <string key="NSFrame">{{248, 159}, {165, 18}}</string>
<reference key="NSSuperview" ref="467419391"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="400601930">
@@ -726,7 +721,7 @@
<object class="NSTextField" id="280089189">
<reference key="NSNextResponder" ref="467419391"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{71, 160}, {174, 17}}</string>
+ <string key="NSFrame">{{17, 160}, {228, 17}}</string>
<reference key="NSSuperview" ref="467419391"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="777052035">
@@ -734,7 +729,6 @@
<int key="NSCellFlags2">71304192</int>
<string type="base64-UTF8" key="NSContents">6YG46aCF77yaA</string>
<reference key="NSSupport" ref="656096860"/>
- <string key="NSPlaceholderString"/>
<reference key="NSControlView" ref="280089189"/>
<reference key="NSBackgroundColor" ref="857161946"/>
<reference key="NSTextColor" ref="853967857"/>
@@ -743,13 +737,13 @@
<object class="NSTextField" id="651949475">
<reference key="NSNextResponder" ref="467419391"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{71, 62}, {174, 17}}</string>
+ <string key="NSFrame">{{17, 62}, {228, 17}}</string>
<reference key="NSSuperview" ref="467419391"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="11730813">
<int key="NSCellFlags">67239488</int>
<int key="NSCellFlags2">71304192</int>
- <string key="NSContents">Show/Hide Pager:</string>
+ <string key="NSContents">Show/Hide Warp HUD :</string>
<reference key="NSSupport" ref="656096860"/>
<reference key="NSControlView" ref="651949475"/>
<reference key="NSBackgroundColor" ref="857161946"/>
@@ -759,7 +753,7 @@
<object class="NSButton" id="1063899480">
<reference key="NSNextResponder" ref="467419391"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{248, 119}, {350, 18}}</string>
+ <string key="NSFrame">{{248, 119}, {271, 18}}</string>
<reference key="NSSuperview" ref="467419391"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="415958515">
@@ -781,7 +775,7 @@
<object class="NSButton" id="1007520276">
<reference key="NSNextResponder" ref="467419391"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{248, 99}, {186, 18}}</string>
+ <string key="NSFrame">{{248, 99}, {165, 18}}</string>
<reference key="NSSuperview" ref="467419391"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="325766846">
@@ -811,7 +805,7 @@
<string key="NSFrameSize">{668, 311}</string>
<reference key="NSSuperview"/>
</object>
- <string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
+ <string key="NSScreenRect">{{0, 0}, {1600, 1178}}</string>
<string key="NSMinSize">{668, 22}</string>
<string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
</object>
@@ -1296,11 +1290,11 @@
<reference ref="35144583"/>
<reference ref="102970564"/>
<reference ref="689890346"/>
- <reference ref="280089189"/>
<reference ref="1063899480"/>
<reference ref="1007520276"/>
<reference ref="36590326"/>
<reference ref="651949475"/>
+ <reference ref="280089189"/>
</object>
<reference key="parent" ref="863286287"/>
</object>
Please sign in to comment.
Something went wrong with that request. Please try again.