Skip to content

Build Fix and Improvements #305

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bitigchi wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Build Fix and Improvements #305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
715e94f
Fix formatting
bitigchi Jul 13, 2023
bda9b7c
Apply i18n to remaining percent values
bitigchi Jul 13, 2023
f4f3033
Increase minimum target to 10.13 and use String Catalogs
bitigchi Jul 13, 2023
5c44f1f
Fix build
bitigchi Jul 13, 2023
9232764
Use new .xcstrings files instead of .strings
bitigchi Jul 13, 2023
464a1b7
Apply i18n to temperature values
bitigchi Dec 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 31 additions & 20 deletions MenuExtras/MenuMeterCPU/MenuMeterCPUExtra.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ - (void)getCPULoadForCPU:(uint32_t)processor
#define kOpenProcessViewerTitle @"Open Process Viewer"
#define kOpenConsoleTitle @"Open Console"
#define kNoInfoErrorMessage @"No info available"
#define kCPUPowerLimitStatusTitle @"CPU power limit:"
#define kCPUPowerLimitStatusTitle @"CPU power limit:"

///////////////////////////////////////////////////////////////
//
Expand Down Expand Up @@ -326,7 +326,7 @@ - (NSMenu *)menu {
if (ndx < processes.count) {
NSString*name=processes[ndx][kProcessListItemProcessNameKey];
float percent=[processes[ndx][kProcessListItemCPUKey] floatValue];
title = [NSString stringWithFormat:@"%@ (%.1f%%)", name,percent ];
title = [NSString localizedStringWithFormat:NSLocalizedString(@"%@ (%.1f%%)", "Process name and load percentage"), name, percent];
NSMenuItem*mi=[extraMenu itemAtIndex: kCPUProcessMenuIndex + ndx];
mi.title=title;
mi.hidden=title.length==0;
Expand Down Expand Up @@ -435,7 +435,7 @@ -(NSAttributedString*)percentStringForLoad:(float)load andColor:(NSColor*)color
NSForegroundColorAttributeName,
nil];
NSAttributedString *cacheText = [[NSAttributedString alloc]
initWithString:[NSString stringWithFormat:@"%d%%", (int)roundf(load * 100.0f)]
initWithString:[NSString localizedStringWithFormat:NSLocalizedString(@"%d%%", "Percentage value"), (int)roundf(load * 100.0f)]
attributes:textAttributes];
return cacheText;
}
Expand Down Expand Up @@ -490,33 +490,44 @@ -(NSAttributedString*)renderTemperatureStringForString:(NSString*)temperatureStr
}
- (void)renderSingleTemperatureAtOffset:(float)offset {
float_t celsius = [cpuInfo cpuProximityTemperature];
float_t fahrenheit=celsius*1.8+32;
NSString*temperatureString=@"";
switch([ourPrefs cpuTemperatureUnit]){
float_t fahrenheit = celsius * 1.8 + 32;
NSString *temperatureString = @"";

NSNumberFormatter *temperatureFormatter = [[NSNumberFormatter alloc] init];
temperatureFormatter.numberStyle = NSNumberFormatterDecimalStyle;
temperatureFormatter.minimumFractionDigits = 1;
temperatureFormatter.maximumFractionDigits = 1;

switch ([ourPrefs cpuTemperatureUnit]) {
case kCPUTemperatureUnitCelsius:
temperatureString=[NSString stringWithFormat:@"%.1f℃", celsius];
if(celsius<-100){
temperatureString=@"??℃";
temperatureString = [NSString stringWithFormat:@"%@℃",
[temperatureFormatter stringFromNumber:@(celsius)]];
if (celsius < -100) {
temperatureString = @"??℃";
}
break;
case kCPUTemperatureUnitFahrenheit:
if(fahrenheit>=100){
temperatureString=[NSString stringWithFormat:@"%d℉", (int)fahrenheit];
}else{
temperatureString=[NSString stringWithFormat:@"%.1f℉", fahrenheit];
if (fahrenheit >= 100) {
temperatureString = [NSString stringWithFormat:@"%@℉",
[temperatureFormatter stringFromNumber:@((int)fahrenheit)]];
} else {
temperatureString = [NSString stringWithFormat:@"%@℉",
[temperatureFormatter stringFromNumber:@(fahrenheit)]];
}
if(celsius<-100){
temperatureString=@"??℉";
if (celsius < -100) {
temperatureString = @"??℉";
}
break;
default:
temperatureString=@"???";
temperatureString = @"???";
}
NSAttributedString *renderTemperatureString =[self renderTemperatureStringForString:temperatureString];

NSAttributedString *renderTemperatureString = [self renderTemperatureStringForString:temperatureString];

[renderTemperatureString drawAtPoint:NSMakePoint(
cpuTemperatureDisplayWidth - (float)round([renderTemperatureString size].width) - 1,
(float)((self.imageHeight-[renderTemperatureString size].height) / 2+self.baselineOffset)
)];
cpuTemperatureDisplayWidth - (float)round([renderTemperatureString size].width) - 1,
(float)((self.imageHeight - [renderTemperatureString size].height) / 2 + self.baselineOffset)
)];
} // renderSingleTemperatureIntoImage:atOffset:


Expand Down
2 changes: 1 addition & 1 deletion MenuExtras/MenuMeterCPU/MenuMeterCPUStats.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ - (UInt32)clockFrequency;
#define kNoInfoErrorMessage @"No info available"
#define kHyperThreadsPerCoreFormat @" (%@ hyperthreads per core)"
#define kPhysicalCoresFormat @"%@%@ physical cores"
#define kCPUPowerLimitStatusFormat @"speed %@%%, scheduler %@%%"
#define kCPUPowerLimitStatusFormat @"speed %@%%, scheduler %@%%"

///////////////////////////////////////////////////////////////
//
Expand Down
4 changes: 2 additions & 2 deletions MenuExtras/MenuMeterMem/MenuMeterMemExtra.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ - (void)configFromPrefs:(NSNotification *)notification;
#define kUsageTitle @"Memory Usage:"
#define kPageStatsTitle @"Memory Pages:"
#define kVMStatsTitle @"VM Statistics:"
#define kMemPressureTitle @"Memory Pressure:"
#define kMemPressureFormat @"%@%%\t(level %@)"
#define kMemPressureTitle @"Memory Pressure:"
#define kMemPressureFormat @"%@%%\t(level %@)"
#define kSwapStatsTitle @"Swap Files:"
#define kUsageFormat @"%@ used, %@ free, %@ total"
#define kActiveWiredFormat @"%@ active, %@ wired"
Expand Down
Loading