Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: juanger/lucecita
base: 9cc7b960bc
...
head fork: juanger/lucecita
compare: 51b903f6b6
Checking mergeability… Don't worry, you can still create the pull request.
  • 5 commits
  • 12 files changed
  • 0 commit comments
  • 1 contributor
View
16 Lucecita.xcodeproj/project.pbxproj
@@ -9,8 +9,8 @@
/* Begin PBXBuildFile section */
21432E7613CE764C0057A8B6 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 21432E7813CE764C0057A8B6 /* Localizable.strings */; };
21432E7C13CE7ADF0057A8B6 /* Kernel+Localization.rb in Resources */ = {isa = PBXBuildFile; fileRef = 21432E7B13CE7ADF0057A8B6 /* Kernel+Localization.rb */; };
+ 21512DD71426FB7C00D6B97B /* Lucecita-Off.png in Resources */ = {isa = PBXBuildFile; fileRef = 21512DD61426FB7C00D6B97B /* Lucecita-Off.png */; };
21CFD83C13CB98E8004838D9 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 21CFD83B13CB98E8004838D9 /* Cocoa.framework */; settings = {ATTRIBUTES = (Required, ); }; };
- 21CFD83E13CB98E8004838D9 /* MacRuby.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 21CFD83D13CB98E8004838D9 /* MacRuby.framework */; };
21CFD84513CB98E8004838D9 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 21CFD84313CB98E8004838D9 /* InfoPlist.strings */; };
21CFD84813CB98E8004838D9 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 21CFD84713CB98E8004838D9 /* main.m */; };
21CFD84C13CB98E8004838D9 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 21CFD84A13CB98E8004838D9 /* MainMenu.xib */; };
@@ -20,6 +20,7 @@
21CFD85E13CB9D99004838D9 /* LightView.rb in Resources */ = {isa = PBXBuildFile; fileRef = 21CFD85D13CB9D99004838D9 /* LightView.rb */; };
21CFD86013CB9E2C004838D9 /* LightController.rb in Resources */ = {isa = PBXBuildFile; fileRef = 21CFD85F13CB9E2C004838D9 /* LightController.rb */; };
21CFD86213CBA2F9004838D9 /* Lucecita.png in Resources */ = {isa = PBXBuildFile; fileRef = 21CFD86113CBA2F9004838D9 /* Lucecita.png */; };
+ 21E1F56713EB14080076D8C2 /* MacRuby.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 21E1F56613EB14080076D8C2 /* MacRuby.framework */; };
21E2E51C13CD397E00CAEC47 /* MLHotkeyControl.rb in Resources */ = {isa = PBXBuildFile; fileRef = 21E2E51B13CD397E00CAEC47 /* MLHotkeyControl.rb */; };
/* End PBXBuildFile section */
@@ -28,9 +29,9 @@
21432E7913CE76620057A8B6 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/Localizable.strings; sourceTree = "<group>"; };
21432E7A13CE77490057A8B6 /* es */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = es; path = es.lproj/MainMenu.xib; sourceTree = "<group>"; };
21432E7B13CE7ADF0057A8B6 /* Kernel+Localization.rb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.ruby; path = "Kernel+Localization.rb"; sourceTree = "<group>"; };
+ 21512DD61426FB7C00D6B97B /* Lucecita-Off.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Lucecita-Off.png"; sourceTree = "<group>"; };
21CFD83713CB98E8004838D9 /* Lucecita.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Lucecita.app; sourceTree = BUILT_PRODUCTS_DIR; };
21CFD83B13CB98E8004838D9 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
- 21CFD83D13CB98E8004838D9 /* MacRuby.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MacRuby.framework; path = System/Library/Frameworks/MacRuby.framework; sourceTree = SDKROOT; };
21CFD84213CB98E8004838D9 /* Lucecita-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Lucecita-Info.plist"; sourceTree = "<group>"; };
21CFD84413CB98E8004838D9 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
21CFD84613CB98E8004838D9 /* Lucecita-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Lucecita-Prefix.pch"; sourceTree = "<group>"; };
@@ -44,6 +45,7 @@
21CFD86113CBA2F9004838D9 /* Lucecita.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Lucecita.png; sourceTree = "<group>"; };
21DF013713CFE63D009DC0A4 /* LICENSE */ = {isa = PBXFileReference; lastKnownFileType = text; path = LICENSE; sourceTree = SOURCE_ROOT; };
21DF013813CFE63D009DC0A4 /* README */ = {isa = PBXFileReference; lastKnownFileType = text; path = README; sourceTree = SOURCE_ROOT; };
+ 21E1F56613EB14080076D8C2 /* MacRuby.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MacRuby.framework; path = Library/Frameworks/MacRuby.framework; sourceTree = SDKROOT; };
21E2E51B13CD397E00CAEC47 /* MLHotkeyControl.rb */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.ruby; path = MLHotkeyControl.rb; sourceTree = "<group>"; };
/* End PBXFileReference section */
@@ -52,8 +54,8 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
+ 21E1F56713EB14080076D8C2 /* MacRuby.framework in Frameworks */,
21CFD83C13CB98E8004838D9 /* Cocoa.framework in Frameworks */,
- 21CFD83E13CB98E8004838D9 /* MacRuby.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -80,8 +82,8 @@
21CFD83A13CB98E8004838D9 /* Frameworks */ = {
isa = PBXGroup;
children = (
+ 21E1F56613EB14080076D8C2 /* MacRuby.framework */,
21CFD83B13CB98E8004838D9 /* Cocoa.framework */,
- 21CFD83D13CB98E8004838D9 /* MacRuby.framework */,
);
name = Frameworks;
sourceTree = "<group>";
@@ -115,6 +117,7 @@
children = (
21CFD84A13CB98E8004838D9 /* MainMenu.xib */,
21CFD86113CBA2F9004838D9 /* Lucecita.png */,
+ 21512DD61426FB7C00D6B97B /* Lucecita-Off.png */,
21432E7813CE764C0057A8B6 /* Localizable.strings */,
);
name = Resources;
@@ -146,7 +149,7 @@
/* Begin PBXLegacyTarget section */
21CFD83F13CB98E8004838D9 /* Deployment */ = {
isa = PBXLegacyTarget;
- buildArgumentsString = "--compile --embed --no-stdlib --bs";
+ buildArgumentsString = "--compile --embed --no-stdlib";
buildConfigurationList = 21CFD85713CB98E8004838D9 /* Build configuration list for PBXLegacyTarget "Deployment" */;
buildPhases = (
);
@@ -222,6 +225,7 @@
21E2E51C13CD397E00CAEC47 /* MLHotkeyControl.rb in Resources */,
21432E7613CE764C0057A8B6 /* Localizable.strings in Resources */,
21432E7C13CE7ADF0057A8B6 /* Kernel+Localization.rb in Resources */,
+ 21512DD71426FB7C00D6B97B /* Lucecita-Off.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -283,6 +287,7 @@
MACOSX_DEPLOYMENT_TARGET = 10.6;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
+ VALID_ARCHS = x86_64;
};
name = Debug;
};
@@ -297,6 +302,7 @@
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.6;
SDKROOT = macosx;
+ VALID_ARCHS = x86_64;
};
name = Release;
};
View
26 Lucecita/AppDelegate.rb
@@ -10,7 +10,31 @@ class AppDelegate
attr_accessor :lightController
def applicationDidFinishLaunching(a_notification)
- # Insert code here to initialize your application
+ if !AXAPIEnabled()
+ # Ask user to enable assistive devices
+ alert = NSAlert.alertWithMessageText("Assistive devices",
+ defaultButton:nil,
+ alternateButton:nil,
+ otherButton:nil,
+ informativeTextWithFormat:"In order to use a global key shortcut you must enable access for assistive devices in the universal access preference pane.\n\nOpen Lucecita after setting it.")
+
+ script = NSAppleScript.alloc.initWithSource("tell application \"System Preferences\" to activate\n" +
+ "tell application \"System Preferences\" to set the current pane to pane id \"com.apple.preference.universalaccess\"\n" +
+ "tell application \"Lucecita\" to quit")
+ script.compileAndReturnError nil
+ if (alert.runModal)
+ script.executeAndReturnError nil
+ end
+ end
+
+ NSScreen.screens.each do |s|
+ # DarkWindow.alloc.initWithContentRect
+ end
+
+ end
+
+ def applicationWillTerminate(a_notification)
+ lightController.applicationWillTerminate
end
end
View
16 Lucecita/DarkWindow.rb
@@ -3,7 +3,7 @@
# Lucecita
#
# Created by Juan Germán Castañeda Echevarría on 7/19/08.
-# Copyright (c) 2008-2010 UNAM. All rights reserved.
+# Copyright (c) 2008-2010 MonsterLabs. All rights reserved.
#
class DarkWindow < NSWindow
@@ -24,5 +24,17 @@ def initWithContentRect(contentRect, styleMask:aStyle, backing:bufferingType, de
result
end
-
+
+ def constrainFrameRect(frameRect, toScreen:screen)
+ #return the unaltered frame, or do some other interesting things
+ return frameRect
+ end
+
+ private
+
+ def allScreensRect
+ NSScreen.screens.inject(NSMakeRect(0,0,0,0)) do |r,s|
+ r = NSUnionRect(r, s.frame)
+ end
+ end
end
View
2  Lucecita/Kernel+Localization.rb
@@ -3,7 +3,7 @@
# Lucecita
#
# Created by Juan Germán Castañeda Echevarría on 7/13/11.
-# Copyright 2011 UNAM. All rights reserved.
+# Copyright 2011 MonsterLabs. All rights reserved.
#
module Kernel
private
View
62 Lucecita/LightController.rb
@@ -3,12 +3,12 @@
# Lucecita
#
# Created by Juan Germán Castañeda Echevarría on 7/21/08.
-# Copyright (c) 2008-2010 UNAM. All rights reserved.
+# Copyright (c) 2008-2011 MonsterLabs. All rights reserved.
#
class LightController
- attr_writer :light_view
+ attr_writer :light_view, :window
attr_writer :menu, :enabled
attr_accessor :alpha, :alpha_lbl
attr_accessor :size, :size_lbl
@@ -16,17 +16,29 @@ class LightController
attr_accessor :hotkeyControl
def awakeFromNib
+ @on_icon = NSImage.alloc.initWithContentsOfFile("#{NSBundle.mainBundle.resourcePath}/Lucecita.png")
+ @off_icon = NSImage.alloc.initWithContentsOfFile("#{NSBundle.mainBundle.resourcePath}/Lucecita-Off.png")
+
+ getUserDefaults()
activateStatusMenu()
updateHotkeys()
@callback = lambda do |p,t,e,r|
# Activate it with hotkey
if (t == KCGEventKeyDown && eventIsHotKey?(e))
toggle(self)
+ location = @window.mouseLocationOutsideOfEventStream
+ @light_view.center = location
return nil
else
+ if (t == KCGEventTapDisabledByTimeout)
+ CGEventTapEnable(@eventTap, true)
+ return e
+ end
if @light_view.enabled
# Only redraw the light with a little margin, not all the screen
# because it is very slow
+ location = @window.mouseLocationOutsideOfEventStream
+ @light_view.center = location
@light_view.setNeedsDisplayInRect @light_view.light_bounds
# all the screen would be done with:
# @light_view.setNeedsDisplay true
@@ -63,20 +75,37 @@ def toggle(sender)
@light_view.enabled = !@light_view.enabled
@enabled.setTitle(@light_view.enabled ? NSLocalizedString("DISABLE") : NSLocalizedString("ENABLE"))
@light_view.setNeedsDisplay true
+ icon = nil
+ if @light_view.enabled
+ @statusItem.setImage @on_icon
+ else
+ @statusItem.setImage @off_icon
+ end
end
def activateStatusMenu()
- statusItem = NSStatusBar.systemStatusBar.statusItemWithLength(NSVariableStatusItemLength)
- icon = NSImage.alloc.initWithContentsOfFile("#{NSBundle.mainBundle.resourcePath}/Lucecita.png")
- statusItem.setImage icon
- statusItem.setHighlightMode true
- statusItem.setMenu @menu
+ @statusItem = NSStatusBar.systemStatusBar.statusItemWithLength(NSVariableStatusItemLength)
+ @statusItem.setImage @off_icon
+ @statusItem.setHighlightMode true
+ @statusItem.setMenu @menu
+ end
+
+ def getUserDefaults()
+ userDefaults = NSUserDefaults.standardUserDefaults
+
+ @size.setFloatValue(userDefaults.objectForKey("Size") || 70)
+ @alpha.setFloatValue(userDefaults.objectForKey("Alpha") || 0.5)
+ @blur.setFloatValue(userDefaults.objectForKey("Blur") || 20)
+
+ @light_view.radius = @size.floatValue();
+ @light_view.transparency = @alpha.floatValue();
+ @light_view.blur = @blur.floatValue();
end
def updateHotkeys
userDefaults = NSUserDefaults.standardUserDefaults;
- @code = userDefaults.integerForKey("hotkey-code");
+ @code = userDefaults.objectForKey("hotkey-code");
@flags = userDefaults.integerForKey("hotkey-flags");
hotkeyControl.setValueWithCode(@code, flags:@flags)
end
@@ -99,16 +128,19 @@ def start_tapping
(1 << KCGEventOtherMouseDragged) +
(1 << KCGEventKeyDown)
- eventTap = CGEventTapCreate(KCGSessionEventTap, KCGHeadInsertEventTap,
+ @eventTap = CGEventTapCreate(KCGSessionEventTap, KCGHeadInsertEventTap,
0, eventMask, @callback, nil)
- eventSrc = CFMachPortCreateRunLoopSource(nil, eventTap, 0)
- CFRelease(eventTap)
- CFRunLoopAddSource(CFRunLoopGetCurrent(), eventSrc, KCFRunLoopCommonModes)
- CFRelease(eventSrc)
+ @eventSrc = CFMachPortCreateRunLoopSource(nil, @eventTap, 0)
+ CGEventTapEnable(@eventTap, true);
+ CFRunLoopAddSource(CFRunLoopGetCurrent(), @eventSrc, KCFRunLoopCommonModes)
end
- def applicationShouldTerminate
- CFRunLoopRemoveSource(CFRunLoopGetCurrent(), mEventSrc, KCFRunLoopCommonModes)
+ def applicationWillTerminate
+ CFRunLoopRemoveSource(CFRunLoopGetCurrent(), @eventSrc, KCFRunLoopCommonModes)
+ userDefaults = NSUserDefaults.standardUserDefaults
+ userDefaults.setFloat(@alpha.floatValue, forKey:"Alpha")
+ userDefaults.setFloat(@size.floatValue, forKey:"Size")
+ userDefaults.setFloat(@blur.floatValue, forKey:"Blur")
end
end
View
16 Lucecita/LightView.rb
@@ -3,7 +3,7 @@
# Lucecita
#
# Created by Juan Germán Castañeda Echevarría on 7/19/08.
-# Copyright (c) 2008-2010 UNAM. All rights reserved.
+# Copyright (c) 2008-2011 MonsterLabs. All rights reserved.
#
class LightView < NSView
@@ -13,10 +13,8 @@ class LightView < NSView
OFFSET = 25.0
def awakeFromNib
- @radius = 70
- @transparency = 0.5
- @blur = 20
@enabled = false
+ @center = NSEvent.mouseLocation
end
def drawRect(rect)
@@ -26,10 +24,12 @@ def drawRect(rect)
CGContextFillRect(context, rect)
CGContextSetBlendMode(context, KCGBlendModeSourceOut)
- @center = NSEvent.mouseLocation
# Get the area where the light will be drawn
- @rect = NSMakeRect(@center.x - @radius, @center.y - @radius, @radius*2, @radius*2)
- drawLight
+ rect = NSMakeRect(@center.x - @radius, @center.y - @radius, @radius*2, @radius*2)
+ if NSIntersectsRect(rect, self.frame)
+ @rect = rect
+ drawLight
+ end
end
end
@@ -51,6 +51,8 @@ def drawLight
CGContextRestoreGState(context)
end
+ # This is the rect where the ellipse is drawn, although
+ # only its whadow is shown to the user
def fake_rect
rect = @rect.clone
rect.origin.y += @radius*2 + OFFSET*4
View
BIN  Lucecita/Lucecita-Off.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
17 Lucecita/MLHotkeyControl.rb
@@ -3,7 +3,7 @@
# Lucecita
#
# Created by Juan Germán Castañeda Echevarría on 7/12/11.
-# Copyright 2011 UNAM. All rights reserved.
+# Copyright 2011 MonsterLabs. All rights reserved.
#
class MLHotkeyControl < NSControl
@@ -27,7 +27,7 @@ class MLHotkeyControl < NSControl
def awakeFromNib
userDefaults = NSUserDefaults.standardUserDefaults;
- code = userDefaults.integerForKey("hotkey-code");
+ code = userDefaults.objectForKey("hotkey-code");
flags = userDefaults.integerForKey("hotkey-flags");
setValueWithCode(code, flags:flags)
end
@@ -52,16 +52,27 @@ def acceptsFirstMouse(theEvent)
return true;
end
+ def becomeFirstResponder
+ @label.setStringValue(NSLocalizedString("TYPE_SHORTCUT"))
+ @delegate.hotkeyControlDidChangeWithCode(nil, flags:nil) if @delegate
+ return true;
+ end
+
def setValueWithCode(theCode, flags:theFlags)
if theCode
@label.setStringValue(modifierCharacters(theFlags) + KEYCODES[theCode])
else
- @label.setStringValue("")
+ @label.setStringValue(NSLocalizedString("CLICK_TO_CHANGE"))
end
@delegate.hotkeyControlDidChangeWithCode(theCode, flags:theFlags) if @delegate
end
+ def deleteShortcut(sender)
+ @label.setStringValue(NSLocalizedString("TYPE_SHORTCUT"))
+ @delegate.hotkeyControlDidChangeWithCode(nil, flags:nil) if @delegate
+ end
+
private
def modifierCharacters(flags)
View
4 Lucecita/en.lproj/Localizable.strings
@@ -6,4 +6,6 @@
Copyright 2011 UNAM. All rights reserved.
*/
"DISABLE" = "Disable";
-"ENABLE" = "Enable";
+"ENABLE" = "Enable";
+"CLICK_TO_CHANGE" = "Click to change";
+"TYPE_SHORTCUT" = "Type shortcut";
View
229 Lucecita/en.lproj/MainMenu.xib
@@ -2,7 +2,7 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">1060</int>
- <string key="IBDocument.SystemVersion">10K540</string>
+ <string key="IBDocument.SystemVersion">10K549</string>
<string key="IBDocument.InterfaceBuilderVersion">1305</string>
<string key="IBDocument.AppKitVersion">1038.36</string>
<string key="IBDocument.HIToolboxVersion">461.00</string>
@@ -12,16 +12,18 @@
</object>
<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
- <string>NSView</string>
- <string>NSMenu</string>
- <string>NSWindowTemplate</string>
<string>NSMenuItem</string>
- <string>NSTextField</string>
+ <string>NSMenu</string>
<string>NSTextFieldCell</string>
+ <string>NSButtonCell</string>
+ <string>NSButton</string>
+ <string>NSSlider</string>
<string>NSSliderCell</string>
<string>NSCustomView</string>
- <string>NSSlider</string>
<string>NSCustomObject</string>
+ <string>NSWindowTemplate</string>
+ <string>NSView</string>
+ <string>NSTextField</string>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -59,7 +61,6 @@
<string key="NSFrame">{{7, 11}, {267, 229}}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1280, 778}}</string>
<string key="NSMaxSize">{1e+13, 1e+13}</string>
@@ -229,7 +230,6 @@
<string key="NSFrame">{{-3, 0}, {36, 17}}</string>
<reference key="NSSuperview" ref="198168797"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="949822125">
<int key="NSCellFlags">68288064</int>
@@ -284,7 +284,7 @@
<object class="NSTextFieldCell" key="NSCell" id="759617223">
<int key="NSCellFlags">68288064</int>
<int key="NSCellFlags2">138675200</int>
- <string key="NSContents">50 px</string>
+ <string key="NSContents">70 px</string>
<reference key="NSSupport" ref="22"/>
<reference key="NSControlView" ref="1024050997"/>
<reference key="NSBackgroundColor" ref="807209"/>
@@ -297,7 +297,6 @@
<string key="NSFrame">{{233, 6}, {36, 17}}</string>
<reference key="NSSuperview" ref="788916408"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="931658975">
<int key="NSCellFlags">68288064</int>
@@ -365,7 +364,7 @@
<reference key="NSControlView" ref="786717466"/>
<double key="NSMaxValue">100</double>
<double key="NSMinValue">30</double>
- <double key="NSValue">50</double>
+ <double key="NSValue">70</double>
<double key="NSAltIncValue">0.0</double>
<int key="NSNumberOfTickMarks">0</int>
<int key="NSTickMarkPosition">1</int>
@@ -405,23 +404,50 @@
<string key="NSClassName">NSView</string>
</object>
<object class="NSCustomView" id="34692850">
- <reference key="NSNextResponder"/>
+ <nil key="NSNextResponder"/>
<int key="NSvFlags">268</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSButton" id="578723725">
+ <reference key="NSNextResponder" ref="34692850"/>
+ <int key="NSvFlags">268</int>
+ <string key="NSFrame">{{143, 2}, {14, 19}}</string>
+ <reference key="NSSuperview" ref="34692850"/>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSButtonCell" key="NSCell" id="27390997">
+ <int key="NSCellFlags">-2080244224</int>
+ <int key="NSCellFlags2">0</int>
+ <string key="NSContents"/>
+ <object class="NSFont" key="NSSupport">
+ <string key="NSName">LucidaGrande</string>
+ <double key="NSSize">12</double>
+ <int key="NSfFlags">16</int>
+ </object>
+ <reference key="NSControlView" ref="578723725"/>
+ <int key="NSButtonFlags">104612095</int>
+ <int key="NSButtonFlags2">164</int>
+ <object class="NSCustomResource" key="NSNormalImage">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">NSStopProgressFreestandingTemplate</string>
+ </object>
+ <string key="NSAlternateContents"/>
+ <string key="NSKeyEquivalent"/>
+ <int key="NSPeriodicDelay">200</int>
+ <int key="NSPeriodicInterval">25</int>
+ </object>
+ </object>
<object class="NSTextField" id="257230240">
<reference key="NSNextResponder" ref="34692850"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{-3, 4}, {169, 17}}</string>
<reference key="NSSuperview" ref="34692850"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView"/>
+ <reference key="NSNextKeyView" ref="578723725"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="734523628">
<int key="NSCellFlags">68288064</int>
<int key="NSCellFlags2">138413056</int>
- <string key="NSContents">Label</string>
- <object class="NSFont" key="NSSupport">
+ <string key="NSContents">Click to change</string>
+ <object class="NSFont" key="NSSupport" id="851642800">
<string key="NSName">LucidaGrande</string>
<double key="NSSize">13</double>
<int key="NSfFlags">1044</int>
@@ -433,11 +459,55 @@
</object>
</object>
<string key="NSFrameSize">{163, 24}</string>
- <reference key="NSSuperview"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="257230240"/>
<string key="NSClassName">MLHotkeyControl</string>
</object>
+ <object class="NSButton" id="738599654">
+ <nil key="NSNextResponder"/>
+ <int key="NSvFlags">268</int>
+ <string key="NSFrameSize">{29, 19}</string>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSButtonCell" key="NSCell" id="206693771">
+ <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags2">134217728</int>
+ <string key="NSContents"/>
+ <object class="NSFont" key="NSSupport">
+ <string key="NSName">LucidaGrande-Bold</string>
+ <double key="NSSize">12</double>
+ <int key="NSfFlags">16</int>
+ </object>
+ <reference key="NSControlView" ref="738599654"/>
+ <int key="NSButtonFlags">-1228652289</int>
+ <int key="NSButtonFlags2">173</int>
+ <object class="NSCustomResource" key="NSNormalImage">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">NSStopProgressTemplate</string>
+ </object>
+ <string key="NSAlternateContents"/>
+ <string key="NSKeyEquivalent"/>
+ <int key="NSPeriodicDelay">200</int>
+ <int key="NSPeriodicInterval">25</int>
+ </object>
+ </object>
+ <object class="NSButton" id="568509089">
+ <nil key="NSNextResponder"/>
+ <int key="NSvFlags">268</int>
+ <string key="NSFrameSize">{13, 13}</string>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSButtonCell" key="NSCell" id="2288214">
+ <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags2">0</int>
+ <string key="NSContents"/>
+ <reference key="NSSupport" ref="851642800"/>
+ <reference key="NSControlView" ref="568509089"/>
+ <int key="NSButtonFlags">-1198767873</int>
+ <int key="NSButtonFlags2">133</int>
+ <string key="NSAlternateContents"/>
+ <string key="NSKeyEquivalent"/>
+ <int key="NSPeriodicDelay">200</int>
+ <int key="NSPeriodicInterval">25</int>
+ </object>
+ </object>
</object>
<object class="IBObjectContainer" key="IBDocument.Objects">
<object class="NSMutableArray" key="connectionRecords">
@@ -626,6 +696,22 @@
</object>
<int key="connectionID">613</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">deleteShortcut:</string>
+ <reference key="source" ref="34692850"/>
+ <reference key="destination" ref="578723725"/>
+ </object>
+ <int key="connectionID">624</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">window</string>
+ <reference key="source" ref="879440164"/>
+ <reference key="destination" ref="972006081"/>
+ </object>
+ <int key="connectionID">625</int>
+ </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -655,20 +741,6 @@
<string key="objectName">Application</string>
</object>
<object class="IBObjectRecord">
- <int key="objectID">371</int>
- <reference key="object" ref="972006081"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="439893737"/>
- </object>
- <reference key="parent" ref="0"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">372</int>
- <reference key="object" ref="439893737"/>
- <reference key="parent" ref="972006081"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">420</int>
<reference key="object" ref="755631768"/>
<reference key="parent" ref="0"/>
@@ -932,6 +1004,7 @@
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="257230240"/>
+ <reference ref="578723725"/>
</object>
<reference key="parent" ref="0"/>
</object>
@@ -949,6 +1022,62 @@
<reference key="object" ref="734523628"/>
<reference key="parent" ref="257230240"/>
</object>
+ <object class="IBObjectRecord">
+ <int key="objectID">614</int>
+ <reference key="object" ref="738599654"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="206693771"/>
+ </object>
+ <reference key="parent" ref="0"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">615</int>
+ <reference key="object" ref="206693771"/>
+ <reference key="parent" ref="738599654"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">616</int>
+ <reference key="object" ref="568509089"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="2288214"/>
+ </object>
+ <reference key="parent" ref="0"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">617</int>
+ <reference key="object" ref="2288214"/>
+ <reference key="parent" ref="568509089"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">620</int>
+ <reference key="object" ref="578723725"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="27390997"/>
+ </object>
+ <reference key="parent" ref="34692850"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">621</int>
+ <reference key="object" ref="27390997"/>
+ <reference key="parent" ref="578723725"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">371</int>
+ <reference key="object" ref="972006081"/>
+ <object class="NSMutableArray" key="children">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <reference ref="439893737"/>
+ </object>
+ <reference key="parent" ref="0"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">372</int>
+ <reference key="object" ref="439893737"/>
+ <reference key="parent" ref="972006081"/>
+ </object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
@@ -1007,6 +1136,12 @@
<string>606.IBPluginDependency</string>
<string>608.IBPluginDependency</string>
<string>609.IBPluginDependency</string>
+ <string>614.IBPluginDependency</string>
+ <string>615.IBPluginDependency</string>
+ <string>616.IBPluginDependency</string>
+ <string>617.IBPluginDependency</string>
+ <string>620.IBPluginDependency</string>
+ <string>621.IBPluginDependency</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -1062,6 +1197,12 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
</object>
</object>
<object class="NSMutableDictionary" key="unlocalizedProperties">
@@ -1076,7 +1217,7 @@
<reference key="dict.values" ref="0"/>
</object>
<nil key="sourceID"/>
- <int key="maxID">613</int>
+ <int key="maxID">625</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -1171,6 +1312,7 @@
<string>menu</string>
<string>size</string>
<string>size_lbl</string>
+ <string>window</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -1184,6 +1326,7 @@
<string>id</string>
<string>id</string>
<string>id</string>
+ <string>id</string>
</object>
</object>
<object class="NSMutableDictionary" key="toOneOutletInfosByName">
@@ -1200,6 +1343,7 @@
<string>menu</string>
<string>size</string>
<string>size_lbl</string>
+ <string>window</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -1243,6 +1387,10 @@
<string key="name">size_lbl</string>
<string key="candidateClassName">id</string>
</object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">window</string>
+ <string key="candidateClassName">id</string>
+ </object>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -1321,6 +1469,17 @@
<object class="IBPartialClassDescription">
<string key="className">MLHotkeyControl</string>
<string key="superclassName">NSControl</string>
+ <object class="NSMutableDictionary" key="actions">
+ <string key="NS.key.0">deleteShortcut:</string>
+ <string key="NS.object.0">id</string>
+ </object>
+ <object class="NSMutableDictionary" key="actionInfosByName">
+ <string key="NS.key.0">deleteShortcut:</string>
+ <object class="IBActionInfo" key="NS.object.0">
+ <string key="name">deleteShortcut:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ </object>
<object class="NSMutableDictionary" key="outlets">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
@@ -1378,11 +1537,15 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<string>NSMenuCheckmark</string>
<string>NSMenuMixedState</string>
+ <string>NSStopProgressFreestandingTemplate</string>
+ <string>NSStopProgressTemplate</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>{9, 8}</string>
<string>{7, 2}</string>
+ <string>{83, 83}</string>
+ <string>{11, 11}</string>
</object>
</object>
</data>
View
4 Lucecita/es.lproj/Localizable.strings
@@ -6,4 +6,6 @@
Copyright 2011 UNAM. All rights reserved.
*/
"DISABLE" = "Desactivar";
-"ENABLE" = "Activar";
+"ENABLE" = "Activar";
+"CLICK_TO_CHANGE" = "Da click para cambiar";
+"TYPE_SHORTCUT" = "Escribe el atajo";
View
101 Lucecita/es.lproj/MainMenu.xib
@@ -59,7 +59,6 @@
<string key="NSFrame">{{7, 11}, {267, 229}}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1280, 778}}</string>
<string key="NSMaxSize">{1e+13, 1e+13}</string>
@@ -229,7 +228,6 @@
<string key="NSFrame">{{-3, 0}, {36, 17}}</string>
<reference key="NSSuperview" ref="198168797"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="949822125">
<int key="NSCellFlags">68288064</int>
@@ -297,7 +295,6 @@
<string key="NSFrame">{{263, 6}, {36, 17}}</string>
<reference key="NSSuperview" ref="788916408"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="931658975">
<int key="NSCellFlags">68288064</int>
@@ -415,12 +412,11 @@
<string key="NSFrame">{{-3, 4}, {169, 17}}</string>
<reference key="NSSuperview" ref="34692850"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="734523628">
<int key="NSCellFlags">68288064</int>
<int key="NSCellFlags2">138413056</int>
- <string key="NSContents">Label</string>
+ <string key="NSContents">Haz click para cambiar</string>
<object class="NSFont" key="NSSupport">
<string key="NSName">LucidaGrande</string>
<double key="NSSize">13</double>
@@ -1082,6 +1078,33 @@
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBPartialClassDescription">
+ <string key="className">AppDelegate</string>
+ <string key="superclassName">NSObject</string>
+ <object class="NSMutableDictionary" key="outlets">
+ <string key="NS.key.0">lightController</string>
+ <string key="NS.object.0">id</string>
+ </object>
+ <object class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <string key="NS.key.0">lightController</string>
+ <object class="IBToOneOutletInfo" key="NS.object.0">
+ <string key="name">lightController</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ </object>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">./Classes/AppDelegate.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">DarkWindow</string>
+ <string key="superclassName">NSWindow</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">./Classes/DarkWindow.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
<string key="className">LightController</string>
<string key="superclassName">NSObject</string>
<object class="NSMutableDictionary" key="actions">
@@ -1224,6 +1247,74 @@
</object>
</object>
<object class="IBPartialClassDescription">
+ <string key="className">LightView</string>
+ <string key="superclassName">NSView</string>
+ <object class="NSMutableDictionary" key="outlets">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>blur</string>
+ <string>center</string>
+ <string>enabled</string>
+ <string>radius</string>
+ <string>rect</string>
+ <string>transparency</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>blur</string>
+ <string>center</string>
+ <string>enabled</string>
+ <string>radius</string>
+ <string>rect</string>
+ <string>transparency</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBToOneOutletInfo">
+ <string key="name">blur</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">center</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">enabled</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">radius</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">rect</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">transparency</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ </object>
+ </object>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">./Classes/LightView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
<string key="className">MLHotkeyControl</string>
<string key="superclassName">NSControl</string>
<object class="NSMutableDictionary" key="outlets">

No commit comments for this range

Something went wrong with that request. Please try again.