1
0
mirror of https://github.com/Toxblh/MTMR.git synced 2026-01-12 01:48:38 +00:00
Commit Graph

366 Commits

Author SHA1 Message Date
e852ab58f8 change stip icon 2018-05-12 20:25:14 +01:00
Serg
5c7be625b6 fix warnings, switch track of only first player running 2018-05-13 00:11:47 +07:00
Serg
475b66c956 Merge branch 'master' into musicWidget and fix hidden property usage
# Conflicts:
#	MTMR/CustomButtonTouchBarItem.swift
#	MTMR/TouchBarController.swift
2018-05-12 21:47:13 +07:00
Serg
19f7ff0103 Merge branch 'master' into experimental-private-queue
# Conflicts:
#	MTMR/AppleScriptTouchBarItem.swift
2018-05-12 20:30:36 +07:00
Serg
3bc75b54c0 naive backport of compact map to old swift 2018-05-12 20:19:11 +07:00
Serg
b29c74ccca Merge branch 'master' into musicWidget
# Conflicts:
#	MTMR/CustomButtonTouchBarItem.swift
2018-05-12 13:21:25 +07:00
Serg
bbea465500 hide button property, cleanup nasty code 2018-05-12 12:02:45 +07:00
Serg
f7eb49e5de public tap/longtap button action hanglers 2018-05-12 11:41:13 +07:00
Serg
e9c69f6461 experimental: run applescript on separate serial queue 2018-05-12 11:11:53 +07:00
Serg
9e1fcb9a35 incapsulate button image handling 2018-05-12 10:49:16 +07:00
ad
7523605d7a + toggle blacklisted app 2018-05-11 16:31:13 +03:00
ad
852df9d6b6 + toggle Control Strip 2018-05-11 14:40:02 +03:00
57e8af90dd close #10 2018-05-11 13:26:52 +02:00
Serg
55177a7f90 fix currency widget updating 2018-05-11 09:32:42 +07:00
Serg
d46827832e another try to fix button titles and images 2018-05-11 00:29:05 +07:00
33efbbebaa switch hidKeys to obj-c realesation 2018-05-10 09:56:04 +02:00
Anton Palgunov
d048ec851e
Merge pull request #65 from ReDetection/fix-width
Fix width for borderless buttons
2018-05-10 09:18:39 +02:00
Serg
1da4e2795f fix taps for borderless buttons 2018-05-10 09:31:37 +07:00
Serg
21bc525a04 fix setting width for borderless buttons 2018-05-10 09:02:30 +07:00
ad
b9ef3cdc35 + music widget 2018-05-09 21:34:44 +03:00
Anton Palgunov
9a34d5bca0
Merge pull request #62 from ReDetection/fix-non-bordered-button
Fixes for borderless buttons
2018-05-09 12:22:01 +02:00
Serg
a3c7fa7464 replace garbage in the app with garbage in the tests (until apple fix that), enable coverage 2018-05-09 13:34:32 +07:00
Serg
20ed827750 fix that borderless buttons in scrollable area were not centered, fix wrong text color for borderless colored buttons 2018-05-09 12:23:02 +07:00
Serg
85aa2c4f2b original key event type 2018-05-07 09:08:39 +07:00
Serg
b761551384 fix imports 2018-05-07 09:04:33 +07:00
cd75be6c26 v0.14 2018-04-30 22:17:04 +01:00
Anton Palgunov
7646c6e89d
Merge pull request #58 from ReDetection/bordered-parameter
WIP: Bordered parameter, background parameter
2018-04-30 19:20:07 +01:00
9c970aff63 if button have only image, change position to .imageonly 2018-04-30 19:19:33 +01:00
Serg
49d7333d5e implement highlight for buttons with no border 2018-04-30 23:18:59 +07:00
Serg
cd69bc341c fix margin for some buttons 2018-04-30 22:54:15 +07:00
Serg
453895f395 fix wrong title while first execution 2018-04-30 18:53:32 +07:00
Serg
12796d6387 fix for colors in non-bordered buttons 2018-04-30 18:40:26 +07:00
Anton Palgunov
df535b2893
Revert "tapAction and longTapAction in config now have nested values" 2018-04-30 11:29:42 +01:00
ad
4a03ba79ec + background option for button
# Conflicts:
#	MTMR/CustomButtonTouchBarItem.swift
#	MTMR/ItemsParsing.swift
2018-04-30 15:43:55 +07:00
ad
907b79965d + hexColor 2018-04-30 15:26:29 +07:00
Serg
fbec803d47 introduce bordered parameter, restore 0.13 borders 2018-04-30 15:14:27 +07:00
ad
3f9574245a more constants from ev_keymap.h 2018-04-30 10:15:07 +03:00
ad
2bf6b90b04 * fix for brightness 2018-04-30 10:11:22 +03:00
ad
175e9edb8c Merge branch 'nestedActions' 2018-04-30 09:51:26 +03:00
ad
8e58bb179a tap and longTap 2018-04-30 09:50:59 +03:00
ad
6b553c4d0d + deinit inputsource observer 2018-04-30 00:57:32 +03:00
ad
788927edb3 + highlighting button background on press 2018-04-30 00:57:09 +03:00
ad
9013779f71 Merge remote-tracking branch 'upstream/master' 2018-04-29 22:51:34 +03:00
a85507c544 upd Readme, upd Default 2018-04-29 19:44:58 +01:00
Serg
2aa602d77d recreate touchbar to clear it's cache (items survive otherwise, still doing their job) 2018-04-29 23:37:09 +07:00
ad
a1b3f13902 Merge remote-tracking branch 'upstream/master' 2018-04-29 14:59:13 +03:00
Serg
77938340d6 fix compiler warnings 2018-04-29 18:03:30 +07:00
ad
93d2f496d0 * first working 2018-04-29 01:18:05 +03:00
ad
0808f0617a * fix 2018-04-28 02:28:09 +03:00
ad
a648402d04 Merge branch 'master' of https://github.com/ad/MTMR 2018-04-28 02:22:24 +03:00
ad
207af6468e * button highlight on touch 2018-04-28 02:22:05 +03:00
479190d12b fix center line for apple script 2018-04-27 23:38:13 +01:00
ad
5ed1790601 * scrollView baseline fix 2018-04-27 21:53:27 +03:00
b95f5af95f lead position for image in image+title button 2018-04-27 19:13:55 +01:00
ad
c76027ca9d * fix for button.image size 2018-04-27 20:18:22 +03:00
ad
55dc551516 * fix for longAction 2018-04-27 19:17:19 +03:00
ad
cf5d8bf546 * staticButton image size 2018-04-27 19:03:58 +03:00
ad
8031108fc9 * font baseline like in original touchbar, styled battery widget (time showing as superscript) 2018-04-27 18:46:29 +03:00
ad
d1a577868b * button background 2018-04-27 16:17:40 +03:00
ad
5f02bb2962 * font style 2018-04-27 14:32:07 +03:00
ad
cc1332dd02 * button font color 2018-04-27 14:05:13 +03:00
ad
a0dbfca828 * input source widget image size 2018-04-27 12:55:54 +03:00
ad
76bdf12745 * fixed switching input source 2018-04-26 22:50:38 +03:00
ad
e1268d0d65 * NSButtonCell 2018-04-26 22:36:12 +03:00
88cde9256a v0.13.2 2018-04-26 14:54:24 +01:00
4b8ef1cd96 Merge remote-tracking branch 'origin/master' 2018-04-24 22:54:12 +01:00
e65c57dbaa If level a battery less 10% it will be red. 2018-04-24 22:53:56 +01:00
Anton Palgunov
aa95d1a1bd
Merge pull request #46 from ad/master
* trying to terminate app before forceTerminate (to prevent loosing of unsaved data)
2018-04-24 13:36:55 +01:00
ad
3fe6c22068 * trying to terminate app before forceTerminate (to prevent loosing of unsaved data) 2018-04-24 13:19:22 +03:00
5ab19ee27b v0.13.1 2018-04-24 11:14:29 +01:00
ad
1e2043ebda * allow multiple instances of currency and weather widgets (different schedulers for one type widget) 2018-04-24 12:49:36 +03:00
ad
8bccbf3834 * dock widget improvements 2018-04-23 20:09:05 +03:00
1b5ae00493 v0.13 2018-04-23 13:09:48 +01:00
22c315d631 Parse JSON with comments. 2018-04-23 13:08:55 +01:00
ffbbafa9d9 Fixed central sort. Close #33 2018-04-23 00:54:29 +01:00
719a212913 disable parse with comments now, need improve speed loading for JSONC 2018-04-22 23:34:32 +01:00
651d883672 + delete button. Close #37 2018-04-22 23:31:05 +01:00
ad
0f41638d0f * file moved to new location 2018-04-22 19:28:23 +03:00
ad
f6e5b3ca09 Merge branch 'inputSourceWidget' 2018-04-22 19:25:49 +03:00
ad
04b821510b + switch input source by tap 2018-04-22 19:22:45 +03:00
ad
d632bd3ee7 + show input source 2018-04-22 17:55:20 +03:00
aa341b818f reorginize project 2018-04-22 15:20:00 +01:00
ad
683cc4c9f4 Weather and Currency timers replaced with NSBackgroundActivityScheduler (more energy efficiency) 2018-04-22 13:38:16 +03:00
ad
b4f62f6be1 + strip comments in config file 2018-04-22 12:15:04 +03:00
ad
3375308386 + reload if default config changed (write event fired) 2018-04-21 20:50:22 +03:00
ad
051a303f96 + persistent app in dock (press for 0.5 sec), close app (press for 2.0 sec) 2018-04-21 16:40:43 +03:00
ad
bb978f2de5 Background color parameter moved to CustomButtonTouchBarItem for future ability to change from config file 2018-04-21 15:01:09 +03:00
ad
641eb18b89 + longAction (action for long press on widgets, now working only with longUrl). TODO: nested options for action/longAction like for image/sourse/actionAppleScript 2018-04-21 10:20:12 +03:00
ad
d76e16b9e6 * action for battery plugin 2018-04-21 08:27:02 +03:00
4b39b000e0 Upd default. Readme. Fixed reload for central scroller. 2018-04-21 01:43:37 +01:00
7874433d9b Added Native Battery 2018-04-21 00:22:45 +01:00
d4108d848e merge stash 2018-04-20 22:57:51 +01:00
f78f82893a merged master 2018-04-20 22:56:47 +01:00
05eabdbd0a Added Button mute { "type": "mute", "width": 40, "align": "right" }, #23 2018-04-20 22:54:38 +01:00
Anton Palgunov
8513ed0fa3
Merge pull request #28 from Toxblh/openUrl
Open url action
2018-04-20 18:42:23 +01:00
Daniel Apatin
ac234aa4bf
Fix for temperature value with decimals 2018-04-20 16:24:00 +03:00
Daniel Apatin
e6d84888ba
Update TouchBarController.swift 2018-04-20 15:21:30 +03:00
Daniel Apatin
2aecb2ffb3
Update ItemsParsing.swift 2018-04-20 15:20:01 +03:00
Daniel Apatin
3e35e03bfb
+ action for currency, weather, battery
It will allow to process custom action on click by widget
2018-04-20 14:25:31 +03:00
Daniel Apatin
92c4eed4ed
Update WeatherBarItem.swift 2018-04-20 13:35:41 +03:00
Daniel Apatin
94d519cd65
Update CurrencyBarItem.swift 2018-04-20 13:35:21 +03:00
Daniel Apatin
7341136897
Update TouchBarController.swift 2018-04-20 13:34:56 +03:00
Daniel Apatin
7bc8458d8b
Update WeatherBarItem.swift 2018-04-20 11:18:11 +03:00
Daniel Apatin
bfc4dcf22c
Update ItemsParsing.swift 2018-04-20 11:17:29 +03:00
Daniel Apatin
4eb14ea166
Update TouchBarController.swift 2018-04-20 11:16:50 +03:00
33bb3b8d65 Merge remote-tracking branch 'origin/master' into batteryButton 2018-04-19 20:53:41 +01:00
Daniel Apatin
c5a7a3142b
Fixed currency formatting (trailing zero), added colours 2018-04-19 21:54:12 +03:00
Anton Palgunov
0ce6648bf9
Merge pull request #26 from ad/master
fixed deminiaturization and Finder opening
2018-04-19 16:59:36 +01:00
ad
fe3e647b56 Merge remote-tracking branch 'upstream/master' 2018-04-19 18:54:14 +03:00
ad
fe07ea3b46 * fixed deminiaturization and Finder opening 2018-04-19 18:53:29 +03:00
4b22514969 v0.10 - added open preset, better work reload 2018-04-19 16:23:27 +01:00
Anton Palgunov
03bcafd5ff
Merge pull request #25 from ad/openPresetFile
+ open preset from dialog (not replacing default file)
2018-04-19 16:19:45 +01:00
ad
fdd30413c4 * open dialog at default configs directory 2018-04-19 18:18:54 +03:00
ad
3a57269510 + open preset from dialog (not replacing default file) 2018-04-19 18:01:16 +03:00
ad
242e2d3c22 * currency list 2018-04-18 22:14:10 +03:00
ad
42c1ff27c4 + currency widget
{
        "type": "currency",
        "refreshInterval": 600,
        "align": "right",
        "from": "USD",
        "to": "RUB"
    },
2018-04-18 19:50:23 +03:00
ad
4c16321a4a + weather widget 2018-04-18 18:27:28 +03:00
ad
adaed36fbd Merge remote-tracking branch 'upstream/master' 2018-04-18 16:20:36 +03:00
f724a0d355 Draft. Has issues 2018-04-18 09:51:22 +01:00
4663eb9b27 v0.9 dock plugin 2018-04-17 09:35:24 +01:00
ad
7774b1fa5e * add shadow to app scrubber 2018-04-17 10:55:21 +03:00
ad
20699e9de7 * removed unused code 2018-04-16 23:42:44 +03:00
ad
893e9f6982 * removed local changes 2018-04-16 23:07:15 +03:00
ad
7a3c4811ac * finally 2018-04-16 22:53:34 +03:00
ad
0ce5a49172 * removed buggy "recent apps" 2018-04-16 22:43:06 +03:00
ad
9db9df5641 * code cleanup 2018-04-16 22:37:53 +03:00
ad
69b3f9d238 * removed animation 2018-04-16 15:56:04 +03:00
ad
3d7bcd2d47 * 2018-04-16 15:36:15 +03:00
ad
a37bc94588 Merge remote-tracking branch 'upstream/master' 2018-04-16 11:27:16 +03:00
ee49e94c73 up version 2018-04-16 00:58:14 +01:00
2f796cc07a Update default preset, now it's more useful and like a demo version. 2018-04-16 00:55:41 +01:00
b2b495b551 A bit better for icon only button, will render without title "Button" 2018-04-16 00:54:21 +01:00
818c32b0ed Reload preset from menu 2018-04-16 00:53:40 +01:00
d15764d41d A bit better Slider UI 2018-04-16 00:53:03 +01:00
9d343a31d3 rotate function for images 2018-04-15 23:17:53 +01:00
0956b4ebcd move CustomSlider to file 2018-04-15 21:52:36 +01:00
9ff68a6948 fix error with uncatching nil, when created slider without image 2018-04-15 21:11:12 +01:00
ad
ac8a05d2e5 + show running apps (like dock) 2018-04-15 22:55:20 +03:00
ad
8760185ae7 * prevent crash on return from sleep (removed lockFocus/unlockFocus) 2018-04-15 12:38:07 +03:00
ad
37c2e8523c * image can be set for slider 2018-04-14 13:04:46 +03:00
78509fb84d Less spacing in scroll 2018-04-14 02:17:01 +01:00
877c4268fd removed all warnings 2018-04-14 00:02:19 +01:00
7100a6e6b8 New version. Layouts 2018-04-13 21:20:45 +01:00
d72fb0ef7a Update my preset to actual. Fix xcode error 2018-04-13 21:15:02 +01:00
Serg
ccc3a2269b Merge branch 'master' into align 2018-04-14 03:00:58 +07:00
Serg
6d6048c49c build quickfix 2018-04-14 03:00:38 +07:00
Serg
055c5d77ef Merge remote-tracking branch 'ad/master' 2018-04-14 02:54:03 +07:00
ad
ca2ae30873 + configurable refresh interval for brightness 2018-04-13 22:42:53 +03:00
ad
f09b9155c4 + listener for changes of brightness (timer 0.5 sec)
Can't find any listener
2018-04-13 22:17:12 +03:00
Serg
9ef185d214 remove flexSpace 2018-04-14 02:09:34 +07:00
Serg
12f9220e34 implement scrolling view at the center 2018-04-14 01:58:07 +07:00
Serg
ba753ff331 Merge branch 'master' into align
# Conflicts:
#	MTMR/ItemsParsing.swift
2018-04-14 01:46:44 +07:00
Serg
aba1aea334
Merge pull request #12 from ad/master
+ listener for changes of sytem volume
2018-04-14 01:42:39 +07:00
ad
849b5b6db0 * fixed bug with mute at 0.0 2018-04-13 21:40:34 +03:00
ad
621cb3242b + listener for changes of sytem volume
known bug: sound not mutes at value 0.0
2018-04-13 21:27:59 +03:00
Serg
dd0ecf047d additional parameters as dictionary for easier mapping 2018-04-14 00:53:22 +07:00
Serg
bbc3d9dcfe filter center items, prepare for scrollView 2018-04-14 00:32:12 +07:00
Serg
85785018f4 create all items in advance 2018-04-14 00:23:47 +07:00
Serg
7b9f894bf3 parse align 2018-04-14 00:23:19 +07:00
3a57293206 add brightness icons like original Touch Bar 2018-04-13 17:21:51 +01:00
Serg
9afa9d7470 Merge branch 'tries/button-image'
# Conflicts:
#	MTMR.xcodeproj/project.pbxproj
2018-04-13 22:31:07 +07:00
5013262740 v0.6.1 2018-04-13 14:46:38 +01:00
ad
115ea1372c + volume and brightness sliders 2018-04-13 16:25:25 +03:00
e131f92fb5 del trim() in parser 2018-04-13 09:25:55 +01:00
69a8d81bce del trim() for aScript 2018-04-13 09:22:03 +01:00
6c331619d0 Added 2 Support function (trim and resize). Image and title close forever :) resize input image to good size 2018-04-13 01:15:11 +01:00
4b480dddc3 del the quote 2018-04-12 18:57:02 +01:00
a6f27a1fef open preset for editing then you click by Preferences in menu. 2018-04-12 18:55:54 +01:00
Serg
79eba1a281 image as generic parameter 2018-04-13 00:00:33 +07:00
eee33ee645 v0.6 2018-04-12 07:57:18 +01:00
Serg
4b7788fff7 some cleanup 2018-04-12 08:58:24 +07:00
Serg
ea5fbf0ee8 action has unified source too 2018-04-12 08:48:24 +07:00
Serg
d0cfa45b5d hacky solution to autohide if title is empty 2018-04-11 23:46:05 +07:00
ed14f34a2d conflict resolved 2018-04-11 17:09:34 +01:00
98d5a6eb0e add staticImageButton for buttons with custom image 2018-04-11 17:03:38 +01:00
Serg
b492b89d2f unified source for scripts (and image data in future) 2018-04-11 22:37:46 +07:00
Serg
ff58329691 displaysleep item 2018-04-11 13:47:09 +07:00
f08ce7a381 add FlexSpace. A bit refactor structure. Correct loading scripts from preset 2018-04-11 01:07:58 +01:00
Serg
11c8d167c0 custom width 2018-04-11 00:56:14 +07:00
Serg
0ba5984217 shell scripts and sleep implemented 2018-04-10 23:37:20 +07:00
Serg
1584cf979c cleanup extra code 2018-04-10 23:21:38 +07:00
753cfd8a31 add buttons: battery and time with format 2018-04-10 14:07:52 +01:00
34b51b2dd8 a bit fix json lint 2018-04-10 13:23:12 +01:00
Serg
5bda77d0d5 Merge remote-tracking branch 'upstream/master' into preset
# Conflicts:
#	README.md
2018-04-10 19:02:59 +07:00
Serg
2bc8912add weather – example on bundled scripts 2018-04-10 19:01:41 +07:00
Serg
2750d00317 media keys implemented 2018-04-10 18:41:25 +07:00
Serg
4fb7cb9b99 cleaner custom actions, potentially able to register from the outside 2018-04-10 18:16:28 +07:00
Serg
651ddbef5c escape button implemented 2018-04-10 17:57:51 +07:00
Serg
fe5705627f missing changes :( 2018-04-10 17:51:21 +07:00
Serg
c0401ce83d exit touchbar implemented 2018-04-10 17:50:34 +07:00
Serg
1c45ca13a3 generic actions sketched 2018-04-10 17:39:07 +07:00
Serg
970fb99e33 interval for apple script 2018-04-10 16:58:52 +07:00
Serg
46f35f4737 preset working 2018-04-10 16:50:41 +07:00
713f4dffc7 added StatusMenu. Del from Dock. 2018-04-10 09:16:05 +01:00
Serg
d0efdef8c2 initial json parsing 2018-04-10 14:13:20 +07:00
4a84532c56 upd roadmap 2018-04-09 23:00:39 +01:00
435439ecd2 Added Haptic feddback on click all buttons 2018-04-09 22:59:02 +01:00
Serg
c022018ec4 workaround for NSAppleScript not being thread safe :( 2018-04-09 23:23:06 +07:00
Serg
17e2362ebf async apple script; fix for those who have no helper apps 2018-04-09 22:07:15 +07:00
285fb1fb85 added sleep button 2018-04-09 15:26:04 +01:00