From f17021bd76038c3800420f908a4e25c42b677931 Mon Sep 17 00:00:00 2001 From: kozlek Date: Tue, 8 Oct 2013 01:03:51 +0300 Subject: [PATCH] Minor UI tweaks --- HWMonitor.xcodeproj/project.pbxproj | 26 +++- HWMonitor/AppController.xib | 20 +-- HWMonitor/GraphsController.xib | 6 +- HWMonitor/JLNFadingScrollView.m | 50 +++++-- HWMonitor/OverlapingScrollView.h | 11 -- HWMonitor/OverlapingScrollView.m | 26 ---- HWMonitor/PopupController.xib | 12 +- .../RFOverlayScrollView/RFOverlayScrollView.h | 23 +++ .../RFOverlayScrollView/RFOverlayScrollView.m | 77 ++++++++++ .../RFOverlayScrollView/RFOverlayScroller.h | 25 ++++ .../RFOverlayScrollView/RFOverlayScroller.m | 141 ++++++++++++++++++ HWMonitor/en.lproj/Credits.rtf | 5 +- README.txt | 3 +- 13 files changed, 346 insertions(+), 79 deletions(-) delete mode 100644 HWMonitor/OverlapingScrollView.h delete mode 100644 HWMonitor/OverlapingScrollView.m create mode 100755 HWMonitor/RFOverlayScrollView/RFOverlayScrollView.h create mode 100755 HWMonitor/RFOverlayScrollView/RFOverlayScrollView.m create mode 100755 HWMonitor/RFOverlayScrollView/RFOverlayScroller.h create mode 100755 HWMonitor/RFOverlayScrollView/RFOverlayScroller.m diff --git a/HWMonitor.xcodeproj/project.pbxproj b/HWMonitor.xcodeproj/project.pbxproj index a003c153..a9915baf 100644 --- a/HWMonitor.xcodeproj/project.pbxproj +++ b/HWMonitor.xcodeproj/project.pbxproj @@ -7,6 +7,8 @@ objects = { /* Begin PBXBuildFile section */ + 7E0200B118035D3700520CF7 /* RFOverlayScroller.m in Sources */ = {isa = PBXBuildFile; fileRef = 7E0200AE18035D3700520CF7 /* RFOverlayScroller.m */; }; + 7E0200B218035D3700520CF7 /* RFOverlayScrollView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7E0200B018035D3700520CF7 /* RFOverlayScrollView.m */; }; 7E0648F016DF3B7D00ACB851 /* LaunchAtLoginController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7E0648EE16DF3B7D00ACB851 /* LaunchAtLoginController.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; 7E0648F116DF3B7D00ACB851 /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = 7E0648EF16DF3B7D00ACB851 /* README.md */; }; 7E10343616EFAE490089DE7B /* GenericBatteryDevice.m in Sources */ = {isa = PBXBuildFile; fileRef = 7E10343516EFAE490089DE7B /* GenericBatteryDevice.m */; }; @@ -15,7 +17,6 @@ 7E16893616EA106D00BBF6FC /* ArrowlessScroller.m in Sources */ = {isa = PBXBuildFile; fileRef = 7E16893516EA106D00BBF6FC /* ArrowlessScroller.m */; }; 7E16FD87170648BF00FB253E /* HWMonitorProfiles.m in Sources */ = {isa = PBXBuildFile; fileRef = 7E16FD86170648BF00FB253E /* HWMonitorProfiles.m */; }; 7E16FD8A1706BB3000FB253E /* TransparentSplitView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7E16FD891706BB3000FB253E /* TransparentSplitView.m */; }; - 7E170740170569700019173D /* OverlapingScrollView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7E17073F170569700019173D /* OverlapingScrollView.m */; }; 7E17953616EE705B00145082 /* BatteryCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 7E17953516EE705B00145082 /* BatteryCell.m */; }; 7E19000117005652008F40F1 /* SensorsTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7E19000017005652008F40F1 /* SensorsTableView.m */; }; 7E19000717006727008F40F1 /* PrefsSensorCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 7E19000617006727008F40F1 /* PrefsSensorCell.m */; }; @@ -132,6 +133,10 @@ /* Begin PBXFileReference section */ 7E00C2481708B827001570E4 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/Localizable.strings; sourceTree = ""; }; + 7E0200AD18035D3700520CF7 /* RFOverlayScroller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RFOverlayScroller.h; sourceTree = ""; }; + 7E0200AE18035D3700520CF7 /* RFOverlayScroller.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RFOverlayScroller.m; sourceTree = ""; }; + 7E0200AF18035D3700520CF7 /* RFOverlayScrollView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RFOverlayScrollView.h; sourceTree = ""; }; + 7E0200B018035D3700520CF7 /* RFOverlayScrollView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RFOverlayScrollView.m; sourceTree = ""; }; 7E0648ED16DF3B7D00ACB851 /* LaunchAtLoginController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LaunchAtLoginController.h; sourceTree = ""; }; 7E0648EE16DF3B7D00ACB851 /* LaunchAtLoginController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LaunchAtLoginController.m; sourceTree = ""; }; 7E0648EF16DF3B7D00ACB851 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README.md; sourceTree = ""; }; @@ -146,8 +151,6 @@ 7E16FD86170648BF00FB253E /* HWMonitorProfiles.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HWMonitorProfiles.m; sourceTree = ""; }; 7E16FD881706BB3000FB253E /* TransparentSplitView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TransparentSplitView.h; sourceTree = ""; }; 7E16FD891706BB3000FB253E /* TransparentSplitView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TransparentSplitView.m; sourceTree = ""; }; - 7E17073E1705696F0019173D /* OverlapingScrollView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OverlapingScrollView.h; sourceTree = ""; }; - 7E17073F170569700019173D /* OverlapingScrollView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OverlapingScrollView.m; sourceTree = ""; }; 7E17953416EE705B00145082 /* BatteryCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BatteryCell.h; sourceTree = ""; }; 7E17953516EE705B00145082 /* BatteryCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BatteryCell.m; sourceTree = ""; }; 7E19000017005652008F40F1 /* SensorsTableView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SensorsTableView.m; sourceTree = ""; }; @@ -307,6 +310,17 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 7E0200AC18035D3700520CF7 /* RFOverlayScrollView */ = { + isa = PBXGroup; + children = ( + 7E0200AD18035D3700520CF7 /* RFOverlayScroller.h */, + 7E0200AE18035D3700520CF7 /* RFOverlayScroller.m */, + 7E0200AF18035D3700520CF7 /* RFOverlayScrollView.h */, + 7E0200B018035D3700520CF7 /* RFOverlayScrollView.m */, + ); + path = RFOverlayScrollView; + sourceTree = ""; + }; 7E0648F216DF3B8300ACB851 /* LaunchAtLoginController */ = { isa = PBXGroup; children = ( @@ -538,6 +552,7 @@ isa = PBXGroup; children = ( 7E39415716DBEA13005A685D /* Cells */, + 7E0200AC18035D3700520CF7 /* RFOverlayScrollView */, 7E9A17D117E45ACA003DB018 /* NSString+Size.h */, 7E9A17D217E45ACA003DB018 /* NSString+Size.m */, 7E9A17CE17E45938003DB018 /* NSPopover+Message.h */, @@ -550,8 +565,6 @@ 7E7B9B3E1786A732003ACB61 /* OBMenuBarWindow.m */, 7E16893416EA106D00BBF6FC /* ArrowlessScroller.h */, 7E16893516EA106D00BBF6FC /* ArrowlessScroller.m */, - 7E17073E1705696F0019173D /* OverlapingScrollView.h */, - 7E17073F170569700019173D /* OverlapingScrollView.m */, 7E16FD881706BB3000FB253E /* TransparentSplitView.h */, 7E16FD891706BB3000FB253E /* TransparentSplitView.m */, 7E19FFFF17005652008F40F1 /* SensorsTableView.h */, @@ -807,6 +820,7 @@ 7EA2494216D8EA95002231B2 /* HWMonitorEngine.m in Sources */, 7EA2494316D8EA95002231B2 /* HWMonitorSensor.m in Sources */, 7EA2494416D8EA95002231B2 /* smc.c in Sources */, + 7E0200B218035D3700520CF7 /* RFOverlayScrollView.m in Sources */, 7EA2494D16D8EB2D002231B2 /* StatusItemView.m in Sources */, 7EA2495416D8EE45002231B2 /* HWMonitorGroup.m in Sources */, 7EA2495516D8EE45002231B2 /* HWMonitorItem.m in Sources */, @@ -826,9 +840,9 @@ 7EDDC87316FA5DA50072B15B /* Localizer.m in Sources */, 7E19000117005652008F40F1 /* SensorsTableView.m in Sources */, 7E19000717006727008F40F1 /* PrefsSensorCell.m in Sources */, + 7E0200B118035D3700520CF7 /* RFOverlayScroller.m in Sources */, 7E19000A170070F3008F40F1 /* GraphsSensorCell.m in Sources */, 7E7D61FB1704453B00F7222F /* FadingButton.m in Sources */, - 7E170740170569700019173D /* OverlapingScrollView.m in Sources */, 7E16FD87170648BF00FB253E /* HWMonitorProfiles.m in Sources */, 7E16FD8A1706BB3000FB253E /* TransparentSplitView.m in Sources */, 7E44D95E1710433A00D06387 /* WindowFilter.m in Sources */, diff --git a/HWMonitor/AppController.xib b/HWMonitor/AppController.xib index 92c1e7f5..0c772df4 100644 --- a/HWMonitor/AppController.xib +++ b/HWMonitor/AppController.xib @@ -338,10 +338,10 @@ - + - + @@ -488,23 +488,23 @@ - - + - + - + @@ -665,12 +665,12 @@ - diff --git a/HWMonitor/GraphsController.xib b/HWMonitor/GraphsController.xib index f685b9e3..07961218 100644 --- a/HWMonitor/GraphsController.xib +++ b/HWMonitor/GraphsController.xib @@ -73,7 +73,7 @@ - + @@ -486,11 +486,11 @@ - -