Skip to content

Commit ba26a44

Browse files
committed
Many UI fixes (dark mode related mostly)
1 parent 3fcd256 commit ba26a44

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+2386
-2419
lines changed

Assets.xcassets/SourceBackground.dataset/Contents.json

Lines changed: 0 additions & 12 deletions
This file was deleted.
-5.45 KB
Binary file not shown.
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"images" : [
3+
{
4+
"filename" : "SourceBackground.png",
5+
"idiom" : "mac",
6+
"scale" : "1x"
7+
},
8+
{
9+
"filename" : "SourceBackground-1.png",
10+
"idiom" : "mac",
11+
"scale" : "2x"
12+
}
13+
],
14+
"info" : {
15+
"author" : "xcode",
16+
"version" : 1
17+
},
18+
"properties" : {
19+
"template-rendering-intent" : "template"
20+
}
21+
}
1.65 KB
Loading
1.65 KB
Loading

Sources/WCApplicationController.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1574,12 +1574,12 @@ - (IBAction)crashReports:(id)sender {
15741574

15751575

15761576
- (IBAction)manual:(id)sender {
1577-
[[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"http://wired.read-write.fr/wiki/"]];
1577+
[[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"https://wired.read-write.fr/"]];
15781578
}
15791579

15801580

15811581
- (IBAction)support:(id)sender {
1582-
[[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"https://github.com/nark/WiredClient/issues?milestone=1&state=open"]];
1582+
[[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"https://github.com/nark/WiredClient/issues?state=open"]];
15831583
}
15841584

15851585
@end

Sources/WCBoards.m

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -321,21 +321,25 @@ - (void)_themeDidChange {
321321
NSString *templatePath;
322322
WITemplateBundle *templateBundle;
323323
NSColor *textColor, *URLTextColor, *backgroundColor;
324-
324+
NSFont *font;
325+
325326
theme = [[WCSettings settings] themeWithIdentifier:[[WCSettings settings] objectForKey:WCTheme]];
326327
templateBundle = [[WCSettings settings] templateBundleWithIdentifier:[theme objectForKey:WCThemesTemplate]];
327328
templatePath = [templateBundle bundlePath];
328329

330+
font = WIFontFromString([theme objectForKey:WCThemesBoardsFont]);
329331
textColor = [NSApp darkModeEnabled] ? [NSColor whiteColor] : [NSColor textColor];
330332
backgroundColor = [NSApp darkModeEnabled] ? [NSColor darkGrayColor] : [NSColor whiteColor];
331333
URLTextColor = WIColorFromString([theme objectForKey:WCThemesChatURLsColor]);
332334

335+
[_postTextView setFont:font];
336+
333337
[_threadController setFont:WIFontFromString([theme objectForKey:WCThemesBoardsFont])];
334338
[_threadController setTextColor:textColor];
335339
[_threadController setURLTextColor:URLTextColor];
336340
[_threadController setBackgroundColor:backgroundColor];
337341
[_threadController setTemplatePath:templatePath];
338-
342+
339343
[_threadController reloadTemplate];
340344
}
341345

Sources/WCChatController.m

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1152,13 +1152,13 @@ - (void)themeDidChange:(NSDictionary *)theme {
11521152
eventColor = WIColorFromString([theme objectForKey:WCThemesChatEventsColor]);
11531153

11541154
// Cocoa UI reload
1155-
// if(![[_setTopicTextView font] isEqualTo:font]) {
1156-
// [_chatInputTextView setFont:font];
1157-
// [_setTopicTextView setFont:font];
1158-
//
1159-
// [_chatFont release];
1160-
// _chatFont = [font retain];
1161-
// }
1155+
if(![[_setTopicTextView font] isEqualTo:font]) {
1156+
[_chatInputTextField setFont:font];
1157+
[_setTopicTextView setFont:font];
1158+
1159+
[_chatFont release];
1160+
_chatFont = [font retain];
1161+
}
11621162
//
11631163
// if(![[_chatInputTextView backgroundColor] isEqualTo:backgroundColor]) {
11641164
// [_chatInputTextView setBackgroundColor:backgroundColor];

Sources/WCMessages.m

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -217,16 +217,9 @@ - (void)_themeDidChange {
217217
[_conversationController setURLTextColor:URLTextColor];
218218
[_conversationController setBackgroundColor:backgroundColor];
219219

220-
// [_messageTextField setFont:font];
221-
// [_messageTextField setTextColor:textColor];
222-
// [[_messageTextField.cell fieldEditorForView:_messageTextField] setInsertionPointColor:textColor];
223-
// [_messageTextField setBackgroundColor:backgroundColor];
224-
//
225-
//// [_broadcastTextView setFont:font];
226-
// [_broadcastTextView setTextColor:textColor];
227-
// [_broadcastTextView setInsertionPointColor:textColor];
228-
// [_broadcastTextView setBackgroundColor:backgroundColor];
229-
220+
[_messageTextField setFont:font];
221+
[_broadcastTextView setFont:font];
222+
230223
[_conversationController reloadTemplate];
231224
[_conversationController reloadData];
232225
}

Sources/WCSettings.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -598,7 +598,7 @@ - (NSDictionary *)_defaultTheme {
598598
[NSNumber numberWithBool:YES], WCThemesShowSmileys,
599599
[NSNumber numberWithBool:YES], WCThemesChatTimestampEveryLine,
600600
[NSNumber numberWithInteger:WCThemesUserListIconSizeLarge], WCThemesUserListIconSize,
601-
[NSNumber numberWithBool:NO], WCThemesUserListAlternateRows,
601+
[NSNumber numberWithBool:YES], WCThemesUserListAlternateRows,
602602
[NSNumber numberWithBool:YES], WCThemesFileListAlternateRows,
603603
[NSNumber numberWithInteger:WCThemesFileListIconSizeLarge], WCThemesFileListIconSize,
604604
[NSNumber numberWithBool:YES], WCThemesTransferListShowProgressBar,

0 commit comments

Comments
 (0)