1
0
mirror of https://github.com/Toxblh/MTMR.git synced 2026-01-10 17:08:39 +00:00
Commit Graph

349 Commits

Author SHA1 Message Date
Anton Palgunov
3c171b449a
Merge pull request #39 from ad/stripComments
+ strip comments in config file
2018-04-22 10:17:34 +01:00
ad
b4f62f6be1 + strip comments in config file 2018-04-22 12:15:04 +03:00
Anton Palgunov
8a9b40a030
Merge pull request #38 from ad/master
+ persistent app in dock (press for 0.5 sec), close app (press for 2.0 sec). Reload view if default config changed (write event fired)
2018-04-21 20:16:59 +01:00
ad
3375308386 + reload if default config changed (write event fired) 2018-04-21 20:50:22 +03:00
ad
2fc9dbccd8 Merge remote-tracking branch 'upstream/master' 2018-04-21 17:22:19 +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
Anton Palgunov
41a859aea3
Merge pull request #32 from ad/master
Background color parameter moved to CustomButtonTouchBarItem
2018-04-21 13:16:36 +01: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
Anton Palgunov
9bf42dfb79
Merge pull request #31 from ad/master
Action for battery plugin
2018-04-21 12:08:01 +01: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
ad
9abb17ee76 Merge remote-tracking branch 'upstream/master' 2018-04-21 08:19:44 +03:00
4b39b000e0 Upd default. Readme. Fixed reload for central scroller. 2018-04-21 01:43:37 +01:00
9b86ed1dee update Readme 2018-04-21 00:23:48 +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
4109f6efd4 delete .DS_Store 2018-04-20 22:50:36 +01:00
ad
bbbbf5b5a4 Merge remote-tracking branch 'upstream/master' 2018-04-20 21:01:42 +03:00
Anton Palgunov
8513ed0fa3
Merge pull request #28 from Toxblh/openUrl
Open url action
2018-04-20 18:42:23 +01:00
ad
0e2a958b5c Merge remote-tracking branch 'upstream/master' 2018-04-20 16:26:28 +03: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
ad
cd8b595552 - 2018-04-20 14:42:36 +03:00
ad
76934e6ff0 + action for currency, weather, battery
It will allow to process custom action on click by widget
2018-04-20 14:26:26 +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
ad
6f3425f4c3 Merge branch 'master' into actionURL 2018-04-20 14:20:24 +03:00
ad
0c007b7940 + action openURL 2018-04-20 13:53:25 +03:00
ad
a7060b74e4 * weather and currency now is CustomButtonTouchBarItem 2018-04-20 13:42:08 +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
4459a95691
Merge pull request #27 from Toxblh/ad-patch-weather
+ text and image sets for weather condition  ad committed
2018-04-20 11:19:52 +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
ad
c15488b61f + text and image sets for weather condition 2018-04-20 11:13:03 +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
ad
5b08861dec * fixed formatting (trailing zero), added colours 2018-04-19 21:50:06 +03:00
ad
82f192a5c0 Merge branch 'weatherWidget' 2018-04-19 19:01:22 +03:00
ad
9230b1c3e6 Merge branch 'currencyWidget' 2018-04-19 19:01:14 +03:00
ad
647e0accea Merge branch 'openPresetFile' 2018-04-19 19:01:04 +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