Skip to content
This repository was archived by the owner on May 8, 2018. It is now read-only.

Commit 172f670

Browse files
author
Eun
committed
* Fixed language issues
1 parent 6444296 commit 172f670

File tree

7 files changed

+71
-44
lines changed

7 files changed

+71
-44
lines changed

‎DisableMonitor.xcodeproj/project.pbxproj‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
592CED7E18FEB66E00FDDF65 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 592CED7D18FEB66E00FDDF65 /* IOKit.framework */; };
1212
592CED8118FEBDB300FDDF65 /* GLFW.m in Sources */ = {isa = PBXBuildFile; fileRef = 592CED8018FEBDB300FDDF65 /* GLFW.m */; };
1313
592CED8718FEC42800FDDF65 /* status_icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 592CED8618FEC42800FDDF65 /* status_icon.png */; };
14+
598E9892193DC99B005DEB10 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 598E9891193DC99B005DEB10 /* MainMenu.xib */; };
1415
59B5766718FFDC6700B57E77 /* icon.icns in Resources */ = {isa = PBXBuildFile; fileRef = 59B5766618FFDC6700B57E77 /* icon.icns */; };
1516
8D11072B0486CEB800E47090 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* Localizable.strings */; };
1617
8D11072D0486CEB800E47090 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; settings = {ATTRIBUTES = (); }; };
@@ -30,7 +31,8 @@
3031
592CED7D18FEB66E00FDDF65 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/System/Library/Frameworks/IOKit.framework; sourceTree = DEVELOPER_DIR; };
3132
592CED8018FEBDB300FDDF65 /* GLFW.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GLFW.m; sourceTree = "<group>"; };
3233
592CED8618FEC42800FDDF65 /* status_icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = status_icon.png; sourceTree = "<group>"; };
33-
595F6F28193DC2ED00B7323D /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Localizable.strings; sourceTree = "<group>"; };
34+
598E9891193DC99B005DEB10 /* MainMenu.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MainMenu.xib; sourceTree = "<group>"; };
35+
598E9893193DC9DD005DEB10 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Localizable.strings; sourceTree = "<group>"; };
3436
59B5766618FFDC6700B57E77 /* icon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = icon.icns; sourceTree = "<group>"; };
3537
8D1107310486CEB800E47090 /* DisableMonitor-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "DisableMonitor-Info.plist"; sourceTree = "<group>"; };
3638
8D1107320486CEB800E47090 /* DisableMonitor.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = DisableMonitor.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -88,6 +90,7 @@
8890
29B97314FDCFA39411CA2CEA /* DisableMonitor */ = {
8991
isa = PBXGroup;
9092
children = (
93+
598E9891193DC99B005DEB10 /* MainMenu.xib */,
9194
59B5766618FFDC6700B57E77 /* icon.icns */,
9295
080E96DDFE201D6D7F000001 /* Classes */,
9396
29B97315FDCFA39411CA2CEA /* Other Sources */,
@@ -181,6 +184,7 @@
181184
8D11072B0486CEB800E47090 /* Localizable.strings in Resources */,
182185
59B5766718FFDC6700B57E77 /* icon.icns in Resources */,
183186
592CED8718FEC42800FDDF65 /* status_icon.png in Resources */,
187+
598E9892193DC99B005DEB10 /* MainMenu.xib in Resources */,
184188
);
185189
runOnlyForDeploymentPostprocessing = 0;
186190
};
@@ -204,7 +208,7 @@
204208
isa = PBXVariantGroup;
205209
children = (
206210
089C165DFE840E0CC02AAC07 /* English */,
207-
595F6F28193DC2ED00B7323D /* de */,
211+
598E9893193DC9DD005DEB10 /* de */,
208212
);
209213
name = Localizable.strings;
210214
sourceTree = "<group>";

‎DisableMonitor.xcodeproj/project.xcworkspace/xcuserdata/salzmann.xcuserdatad/UserInterfaceState.xcuserstate‎

-35.3 KB
Binary file not shown.

‎DisableMonitor.xcodeproj/xcuserdata/salzmann.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
ignoreCount = "0"
1111
continueAfterRunningActions = "No"
1212
filePath = "DisableMonitorAppDelegate.m"
13-
timestampString = "423477482.288443"
13+
timestampString = "423479947.018587"
1414
startingColumnNumber = "9223372036854775807"
1515
endingColumnNumber = "9223372036854775807"
16-
startingLineNumber = "256"
17-
endingLineNumber = "256"
16+
startingLineNumber = "257"
17+
endingLineNumber = "257"
1818
landmarkName = "-DetectMonitors:"
1919
landmarkType = "5">
2020
</BreakpointContent>
@@ -26,11 +26,11 @@
2626
ignoreCount = "0"
2727
continueAfterRunningActions = "No"
2828
filePath = "DisableMonitorAppDelegate.m"
29-
timestampString = "423477482.288443"
29+
timestampString = "423479947.018587"
3030
startingColumnNumber = "9223372036854775807"
3131
endingColumnNumber = "9223372036854775807"
32-
startingLineNumber = "302"
33-
endingLineNumber = "302"
32+
startingLineNumber = "304"
33+
endingLineNumber = "304"
3434
landmarkName = "-menuNeedsUpdate:"
3535
landmarkType = "5">
3636
</BreakpointContent>
@@ -42,11 +42,11 @@
4242
ignoreCount = "0"
4343
continueAfterRunningActions = "No"
4444
filePath = "DisableMonitorAppDelegate.m"
45-
timestampString = "423477200.485748"
45+
timestampString = "423479947.018587"
4646
startingColumnNumber = "9223372036854775807"
4747
endingColumnNumber = "9223372036854775807"
48-
startingLineNumber = "234"
49-
endingLineNumber = "234"
48+
startingLineNumber = "235"
49+
endingLineNumber = "235"
5050
landmarkName = "-MonitorResolution:"
5151
landmarkType = "5">
5252
</BreakpointContent>
@@ -58,11 +58,11 @@
5858
ignoreCount = "0"
5959
continueAfterRunningActions = "No"
6060
filePath = "DisableMonitorAppDelegate.m"
61-
timestampString = "423477482.288443"
61+
timestampString = "423479947.018587"
6262
startingColumnNumber = "9223372036854775807"
6363
endingColumnNumber = "9223372036854775807"
64-
startingLineNumber = "295"
65-
endingLineNumber = "295"
64+
startingLineNumber = "297"
65+
endingLineNumber = "297"
6666
landmarkName = "-menuNeedsUpdate:"
6767
landmarkType = "5">
6868
</BreakpointContent>
@@ -74,11 +74,11 @@
7474
ignoreCount = "0"
7575
continueAfterRunningActions = "No"
7676
filePath = "DisableMonitorAppDelegate.m"
77-
timestampString = "423477482.288443"
77+
timestampString = "423479947.018587"
7878
startingColumnNumber = "9223372036854775807"
7979
endingColumnNumber = "9223372036854775807"
80-
startingLineNumber = "298"
81-
endingLineNumber = "298"
80+
startingLineNumber = "300"
81+
endingLineNumber = "300"
8282
landmarkName = "-menuNeedsUpdate:"
8383
landmarkType = "5">
8484
</BreakpointContent>
@@ -90,11 +90,11 @@
9090
ignoreCount = "0"
9191
continueAfterRunningActions = "No"
9292
filePath = "DisableMonitorAppDelegate.m"
93-
timestampString = "423477482.288443"
93+
timestampString = "423479947.018587"
9494
startingColumnNumber = "9223372036854775807"
9595
endingColumnNumber = "9223372036854775807"
96-
startingLineNumber = "296"
97-
endingLineNumber = "296"
96+
startingLineNumber = "298"
97+
endingLineNumber = "298"
9898
landmarkName = "-menuNeedsUpdate:"
9999
landmarkType = "5">
100100
</BreakpointContent>
@@ -106,11 +106,11 @@
106106
ignoreCount = "0"
107107
continueAfterRunningActions = "No"
108108
filePath = "DisableMonitorAppDelegate.m"
109-
timestampString = "423477482.288443"
109+
timestampString = "423479947.018587"
110110
startingColumnNumber = "9223372036854775807"
111111
endingColumnNumber = "9223372036854775807"
112-
startingLineNumber = "321"
113-
endingLineNumber = "321"
112+
startingLineNumber = "323"
113+
endingLineNumber = "323"
114114
landmarkName = "-menuNeedsUpdate:"
115115
landmarkType = "5">
116116
</BreakpointContent>
@@ -122,11 +122,11 @@
122122
ignoreCount = "0"
123123
continueAfterRunningActions = "No"
124124
filePath = "DisableMonitorAppDelegate.m"
125-
timestampString = "423477482.288443"
125+
timestampString = "423479947.018587"
126126
startingColumnNumber = "9223372036854775807"
127127
endingColumnNumber = "9223372036854775807"
128-
startingLineNumber = "375"
129-
endingLineNumber = "375"
128+
startingLineNumber = "377"
129+
endingLineNumber = "377"
130130
landmarkName = "-menuNeedsUpdate:"
131131
landmarkType = "5">
132132
</BreakpointContent>
@@ -138,11 +138,11 @@
138138
ignoreCount = "0"
139139
continueAfterRunningActions = "No"
140140
filePath = "DisableMonitorAppDelegate.m"
141-
timestampString = "423477482.288443"
141+
timestampString = "423479947.018587"
142142
startingColumnNumber = "9223372036854775807"
143143
endingColumnNumber = "9223372036854775807"
144-
startingLineNumber = "392"
145-
endingLineNumber = "392"
144+
startingLineNumber = "394"
145+
endingLineNumber = "394"
146146
landmarkName = "-menuNeedsUpdate:"
147147
landmarkType = "5">
148148
</BreakpointContent>
@@ -154,11 +154,11 @@
154154
ignoreCount = "0"
155155
continueAfterRunningActions = "No"
156156
filePath = "DisableMonitorAppDelegate.m"
157-
timestampString = "423477482.288443"
157+
timestampString = "423479947.018587"
158158
startingColumnNumber = "9223372036854775807"
159159
endingColumnNumber = "9223372036854775807"
160-
startingLineNumber = "386"
161-
endingLineNumber = "386"
160+
startingLineNumber = "388"
161+
endingLineNumber = "388"
162162
landmarkName = "-menuNeedsUpdate:"
163163
landmarkType = "5">
164164
</BreakpointContent>
@@ -170,11 +170,11 @@
170170
ignoreCount = "0"
171171
continueAfterRunningActions = "No"
172172
filePath = "DisableMonitorAppDelegate.m"
173-
timestampString = "423477482.288443"
173+
timestampString = "423479947.018587"
174174
startingColumnNumber = "9223372036854775807"
175175
endingColumnNumber = "9223372036854775807"
176-
startingLineNumber = "387"
177-
endingLineNumber = "387"
176+
startingLineNumber = "389"
177+
endingLineNumber = "389"
178178
landmarkName = "-menuNeedsUpdate:"
179179
landmarkType = "5">
180180
</BreakpointContent>
@@ -186,11 +186,11 @@
186186
ignoreCount = "0"
187187
continueAfterRunningActions = "No"
188188
filePath = "DisableMonitorAppDelegate.m"
189-
timestampString = "423477200.485748"
189+
timestampString = "423479947.018587"
190190
startingColumnNumber = "9223372036854775807"
191191
endingColumnNumber = "9223372036854775807"
192-
startingLineNumber = "84"
193-
endingLineNumber = "84"
192+
startingLineNumber = "85"
193+
endingLineNumber = "85"
194194
landmarkName = "-ToggleMonitor:enabled:"
195195
landmarkType = "5">
196196
</BreakpointContent>
@@ -202,11 +202,11 @@
202202
ignoreCount = "0"
203203
continueAfterRunningActions = "No"
204204
filePath = "DisableMonitorAppDelegate.m"
205-
timestampString = "423477200.485748"
205+
timestampString = "423479947.018587"
206206
startingColumnNumber = "9223372036854775807"
207207
endingColumnNumber = "9223372036854775807"
208-
startingLineNumber = "48"
209-
endingLineNumber = "48"
208+
startingLineNumber = "49"
209+
endingLineNumber = "49"
210210
landmarkName = "screenNameForDisplay()"
211211
landmarkType = "7">
212212
</BreakpointContent>

‎DisableMonitorAppDelegate.m‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ @implementation DisableMonitorAppDelegate
2626

2727
extern io_service_t IOServicePortFromCGDisplayID(CGDirectDisplayID displayID);
2828
extern CGError CGSConfigureDisplayEnabled(CGDisplayConfigRef, CGDirectDisplayID, bool);
29+
extern CGDisplayErr CGSGetDisplayList(CGDisplayCount maxDisplays, CGDirectDisplayID * onlineDspys, CGDisplayCount * dspyCnt);
2930

3031

3132
NSMutableArray *monitorConfigs;
@@ -253,8 +254,9 @@ -(void)DetectMonitors:(id) sender
253254
{
254255
CGDirectDisplayID displays[0x10];
255256
CGDisplayCount dspCount = 0;
257+
CGDisplayErr err = CGSGetDisplayList(0x10, displays, &dspCount);
256258

257-
if (CGSGetDisplayList(0x10, displays, &dspCount) == noErr)
259+
if (err == 0)
258260
{
259261
for(int i = 0; i < dspCount; i++)
260262
{

‎English.lproj/Localizable.strings‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/* Localized versions of Info.plist keys */
21
"MENU_DISABLE" = "Disable";
32
"MENU_ENABLE" = "Enable";
43
"MENU_DETECT" = "Detect Monitors";

‎MainMenu.xib‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2+
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="5053" systemVersion="13C64" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
3+
<dependencies>
4+
<deployment defaultVersion="1090" identifier="macosx"/>
5+
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="5053"/>
6+
</dependencies>
7+
<objects>
8+
<customObject id="-2" userLabel="File's Owner" customClass="NSApplication">
9+
<connections>
10+
<outlet property="delegate" destination="494" id="495"/>
11+
</connections>
12+
</customObject>
13+
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
14+
<customObject id="-3" userLabel="Application"/>
15+
<menu id="533" customClass="NSMenu"/>
16+
<customObject id="494" customClass="DisableMonitorAppDelegate">
17+
<connections>
18+
<outlet property="statusMenu" destination="533" id="537"/>
19+
</connections>
20+
</customObject>
21+
<customObject id="420" customClass="NSFontManager"/>
22+
</objects>
23+
</document>

‎de.lproj/Localizable.strings‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/* Localized versions of Info.plist keys */
21
"MENU_DISABLE" = "Deaktivieren";
32
"MENU_ENABLE" = "Aktivieren";
43
"MENU_DETECT" = "Monitore erkennen";

0 commit comments

Comments
 (0)