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

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: IGRSoft/LockMeNow
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1.2.0
Choose a base ref
...
head repository: IGRSoft/LockMeNow
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Loading
Showing with 2,784 additions and 1,683 deletions.
  1. +4 −2 .gitignore
  2. +3 −0 .gitmodules
  3. +0 −18 ASLHelper/ASLHelper-Info.plist
  4. +0 −149 ASLHelper/ASLHelper.c
  5. +72 −0 Changelog.txt
  6. +8 −5 English.lproj/Credits.rtf
  7. +167 −165 English.lproj/MainMenu.xib
  8. +1 −1 External/ImageSnap
  9. +1 −0 External/Sparkle
  10. +1 −1 External/peertalk
  11. +1 −1 External/shortcutrecorder
  12. +31 −3 LaunchHelper/LaunchHelper.xcodeproj/project.pbxproj
  13. +5 −5 LaunchHelper/LaunchHelper/Info.plist
  14. +1 −1 LaunchHelper/LaunchHelperTests/Info.plist
  15. +0 −18 LaunchServices/ASLHelper/ASLHelper-Info.plist
  16. +0 −149 LaunchServices/ASLHelper/ASLHelper.c
  17. BIN LockMeNow.applescript
  18. +754 −219 LockMeNow.xcodeproj/project.pbxproj
  19. +7 −0 LockMeNow.xcodeproj/project.xcworkspace/contents.xcworkspacedata
  20. +0 −18 LockMeNow/Images.xcassets/comingsoon.imageset/Contents.json
  21. BIN LockMeNow/Images.xcassets/comingsoon.imageset/comingsoon.png
  22. BIN LockMeNow/Images.xcassets/comingsoon.imageset/comingsoon@2x.png
  23. +0 −18 LockMeNow/Images.xcassets/russianapple.imageset/Contents.json
  24. BIN LockMeNow/Images.xcassets/russianapple.imageset/russianapple.png
  25. BIN LockMeNow/Images.xcassets/russianapple.imageset/russianapple@2x.png
  26. +26 −15 README.md
  27. BIN Resources/DMG Artwork/dmgBackground.tiff
  28. 0 {LockMeNow → Resources}/Images.xcassets/AppIcon.appiconset/Contents.json
  29. BIN {LockMeNow → Resources}/Images.xcassets/AppIcon.appiconset/icon_128x128.png
  30. BIN {LockMeNow → Resources}/Images.xcassets/AppIcon.appiconset/icon_128x128@2x.png
  31. BIN {LockMeNow → Resources}/Images.xcassets/AppIcon.appiconset/icon_16x16.png
  32. BIN {LockMeNow → Resources}/Images.xcassets/AppIcon.appiconset/icon_16x16@2x.png
  33. BIN {LockMeNow → Resources}/Images.xcassets/AppIcon.appiconset/icon_256x256.png
  34. BIN {LockMeNow → Resources}/Images.xcassets/AppIcon.appiconset/icon_256x256@2x.png
  35. BIN {LockMeNow → Resources}/Images.xcassets/AppIcon.appiconset/icon_32x32.png
  36. BIN {LockMeNow → Resources}/Images.xcassets/AppIcon.appiconset/icon_32x32@2x.png
  37. BIN {LockMeNow → Resources}/Images.xcassets/AppIcon.appiconset/icon_512x512.png
  38. BIN {LockMeNow → Resources}/Images.xcassets/AppIcon.appiconset/icon_512x512@2x.png
  39. +6 −0 Resources/Images.xcassets/Contents.json
  40. 0 {LockMeNow → Resources}/Images.xcassets/lock.imageset/Contents.json
  41. BIN {LockMeNow → Resources}/Images.xcassets/lock.imageset/lock.png
  42. BIN {LockMeNow → Resources}/Images.xcassets/lock.imageset/lock@2x.png
  43. 0 {LockMeNow → Resources}/Images.xcassets/off.imageset/Contents.json
  44. BIN {LockMeNow → Resources}/Images.xcassets/off.imageset/off.png
  45. BIN {LockMeNow → Resources}/Images.xcassets/off.imageset/off@2x.png
  46. 0 {LockMeNow → Resources}/Images.xcassets/on.imageset/Contents.json
  47. BIN {LockMeNow → Resources}/Images.xcassets/on.imageset/on.png
  48. BIN {LockMeNow → Resources}/Images.xcassets/on.imageset/on@2x.png
  49. +12 −8 Resources/Info.plist
  50. BIN Resources/Scripts/startCurrentScreensaver.scpt
  51. +12 −0 Sandbox/XPCLoger.entitlements
  52. +2 −7 LaunchServices/ASLHelper/ASLHelper-Launchd.plist → Sandbox/XPCPower.entitlements
  53. +12 −0 Sandbox/XPCPreferences.entitlements
  54. +2 −7 ASLHelper/ASLHelper-Launchd.plist → Sandbox/XPCScreen.entitlements
  55. +16 −0 Sandbox/XPCScripting.entitlements
  56. +15 −0 Sandbox/XPCScriptingBridge.entitlements
  57. +30 −0 Sandbox/lockmenow.entitlements
  58. +18 −2 Source/IGRUserDefaults.h
  59. +20 −7 Source/IGRUserDefaults.m
  60. +8 −10 Source/{LockMeNowAppDelegate.h → LMNLockMeNowApp.h}
  61. +198 −197 Source/{LockMeNowAppDelegate.m → LMNLockMeNowApp.m}
  62. +0 −28 Source/Listeners/BluetoothListener.h
  63. +26 −0 Source/Listeners/LMNBluetoothListener.h
  64. +33 −18 Source/Listeners/{BluetoothListener.m → LMNBluetoothListener.m}
  65. +3 −3 Source/Listeners/{KeyListener.h → LMNKeyListener.h}
  66. +5 −7 Source/Listeners/{KeyListener.m → LMNKeyListener.m}
  67. +36 −0 Source/Listeners/LMNListenerManager.h
  68. +15 −8 Source/Listeners/{ListenerManager.m → LMNListenerManager.m}
  69. +6 −6 Source/Listeners/{USBListener.h → LMNUSBListener.h}
  70. +51 −36 Source/Listeners/{USBListener.m → LMNUSBListener.m}
  71. +0 −30 Source/Listeners/ListenerManager.h
  72. +0 −16 Source/LockManager/BlockViewLock.h
  73. +0 −96 Source/LockManager/BlockViewLock.m
  74. +0 −13 Source/LockManager/JustLock.h
  75. +0 −37 Source/LockManager/JustLock.m
  76. +13 −0 Source/LockManager/LMNJustLock.h
  77. +76 −0 Source/LockManager/LMNJustLock.m
  78. +8 −6 Source/LockManager/{LockManager.h → LMNLockManager.h}
  79. +262 −0 Source/LockManager/LMNLockManager.m
  80. +13 −0 Source/LockManager/LMNLoginWindowsLock.h
  81. +5 −6 Source/LockManager/{LoginWindowsLock.m → LMNLoginWindowsLock.m}
  82. +0 −204 Source/LockManager/LockManager.m
  83. +0 −13 Source/LockManager/LoginWindowsLock.h
  84. +4 −2 Source/Prefix.pch
  85. +1 −1 XPC/XPCLoger/Info.plist
  86. +27 −14 XPC/XPCLoger/XPCLoger.m
  87. +2 −2 XPC/XPCLoger/XPCLogerProtocol.h
  88. +31 −0 XPC/XPCPower/Info.plist
  89. +21 −0 XPC/XPCPower/XPCPower.h
  90. +104 −0 XPC/XPCPower/XPCPower.m
  91. +19 −0 XPC/XPCPower/XPCPowerProtocol.h
  92. +49 −0 XPC/XPCPower/main.m
  93. +31 −0 XPC/XPCPreferences/Info.plist
  94. +14 −0 XPC/XPCPreferences/XPCPreferences.h
  95. +54 −0 XPC/XPCPreferences/XPCPreferences.m
  96. +31 −0 XPC/XPCPreferences/XPCPreferencesProtocol.h
  97. +49 −0 XPC/XPCPreferences/main.m
  98. +1 −1 XPC/XPCScreen/Info.plist
  99. +3 −3 XPC/XPCScreen/XPCScreen.m
  100. +1 −1 XPC/XPCScreen/XPCScreenProtocol.h
  101. +1 −1 XPC/XPCScripting/Info.plist
  102. +22 −51 XPC/XPCScripting/XPCScripting.m
  103. +4 −5 XPC/XPCScripting/XPCScriptingProtocol.h
  104. +1 −1 XPC/XPCScriptingBridge/Info.plist
  105. +25 −16 XPC/XPCScriptingBridge/XPCScriptingBridge.m
  106. +4 −4 XPC/XPCScriptingBridge/XPCScriptingBridgeProtocol.h
  107. BIN img/menu.png
  108. BIN img/prefs_bluetooth.png
  109. BIN img/prefs_main.png
  110. BIN img/prefs_security.png
  111. BIN img/prefs_usb.png
  112. +12 −0 keys/dsa_pub.pem
  113. +37 −0 keys/generate_info.command
  114. +15 −0 keys/generate_keys.rb
  115. +18 −0 keys/info_122.html
  116. +19 −0 keys/info_130.html
  117. +17 −0 keys/info_131.html
  118. +17 −0 keys/info_132.html
  119. +23 −0 keys/info_133.html
  120. +26 −0 keys/info_134.html
  121. +24 −0 keys/info_140.html
  122. +22 −0 keys/info_141.html
  123. +7 −0 keys/sign_update.rb
  124. +63 −0 keys/update.xml
  125. +0 −28 lockmenow.entitlements
6 changes: 4 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -9,10 +9,12 @@ build/
!default.mode2v3
*.perspectivev3
!default.perspectivev3
*.xcworkspace
!default.xcworkspace
xcuserdata
profile
*.moved-aside
DerivedData
.idea/
.idea/
dsa_priv.pem
*.swp
*.xcscmblueprint
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -7,3 +7,6 @@
[submodule "External/ImageSnap"]
path = External/ImageSnap
url = https://github.com/IGRSoft/ImageSnap.git
[submodule "External/Sparkle"]
path = External/Sparkle
url = https://github.com/sparkle-project/Sparkle.git
18 changes: 0 additions & 18 deletions ASLHelper/ASLHelper-Info.plist

This file was deleted.

149 changes: 0 additions & 149 deletions ASLHelper/ASLHelper.c

This file was deleted.

72 changes: 72 additions & 0 deletions Changelog.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
v 1.3.1:
- http -> https.

v 1.3.0:
- Added Alert on Unplug MagSafe;
- Fixed send photo via Email;
- Updated a list of USB devices.

v 1.2.2:
- Added photo quality option.
- Added Updater.

v 1.2.0:
- Added Security actions on wrong password,
- Make photo / Сделать фото,
- Send photo via mail,
- Send location via mail.
- Minor fixes.

v 1.1.4:
- Fixed Auto start on login,
- Fixed icon for Dark Theme,
- Refactoring.

v 1.1.3:
- Recodesigned,
- Optimised for OS X 10.10.

v 1.1.2:
- Minor fixes.

v 1.1.1:
- Fixed resources for Retina Display.

v 1.1.0:
- Added Lock via Bluetooth device,
- Added Lock via USB connected device,
- Added options to run default Screensaver for "Just Lock".

v 1.0.0:
- Add Retina Display support,
- Now work in Sandbox mode,
- Fix iTunes control,
- Minor fixes.

v 0.8.1:
- Fixed iTunes launch if option "Pause iTunes Music" is turned on,
- Added Screensaver settings,
- Minor fixes.

v 0.7:
- Added a Simple lock,
- Added option "Pause iTunes Music".

v 0.5:
- Improved HotKeys actions,
- Adjusted app for 10.6, 10.7,
- Added option "Icon on Main menu",
- Set open app preferences on repeat launch.

v 0.4:
- Fixed autolaunch Mac OS.

v 0.3:
- Added HotKeys customization.

v 0.2
- Improved HotKeys actions,
- Minor fixes

v 0.1
- First release
13 changes: 8 additions & 5 deletions English.lproj/Credits.rtf
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf340
{\rtf1\ansi\ansicpg1252\cocoartf1404\cocoasubrtf340
{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
{\colortbl;\red255\green255\blue255;}
\paperw11900\paperh16840\vieww9600\viewh8400\viewkind0
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0

\f0\fs24 \cf0 Lock your screen from the menu bar or by shortcut\
For more info, please, visit my site http://IGRSoft.com\
For more info, please, visit my site https://igrsoft.com\
And bymaster's site - http://bymaster.ru
\b \
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\partightenfactor0
\cf0 \
Engineering:
\b0 \
@@ -32,4 +32,7 @@ Engineering:

\b Additional Frameworks:
\b0 \
ShortcutRecorder.}
ShortcutRecorder,\
ImageSnap,\
peertalk.\
}
Loading