Skip to content

Commit 6e76a31

Browse files
committed
Remove themes popup button for Edit Bookmark panel
1 parent 3ff4dc9 commit 6e76a31

File tree

5 files changed

+248
-346
lines changed

5 files changed

+248
-346
lines changed

Sources/WCServerBookmarkController.m

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -42,23 +42,23 @@ - (void)_savePasswordForBookmark:(NSArray *)arguments {
4242
#pragma mark -
4343

4444
- (void)_reloadThemes {
45-
NSEnumerator *enumerator;
46-
NSDictionary *theme;
47-
NSMenuItem *item;
48-
NSInteger index;
49-
50-
while((index = [_bookmarksThemePopUpButton indexOfItemWithTag:0]) != -1)
51-
[_bookmarksThemePopUpButton removeItemAtIndex:index];
52-
53-
enumerator = [[[WCSettings settings] objectForKey:WCThemes] objectEnumerator];
54-
55-
while((theme = [enumerator nextObject])) {
56-
item = [NSMenuItem itemWithTitle:[theme objectForKey:WCThemesName]];
57-
[item setRepresentedObject:[theme objectForKey:WCThemesIdentifier]];
58-
[item setImage:[[WCPreferences preferences] imageForTheme:theme size:NSMakeSize(16.0, 12.0)]];
59-
60-
[[_bookmarksThemePopUpButton menu] addItem:item];
61-
}
45+
// NSEnumerator *enumerator;
46+
// NSDictionary *theme;
47+
// NSMenuItem *item;
48+
// NSInteger index;
49+
//
50+
// while((index = [_bookmarksThemePopUpButton indexOfItemWithTag:0]) != -1)
51+
// [_bookmarksThemePopUpButton removeItemAtIndex:index];
52+
//
53+
// enumerator = [[[WCSettings settings] objectForKey:WCThemes] objectEnumerator];
54+
//
55+
// while((theme = [enumerator nextObject])) {
56+
// item = [NSMenuItem itemWithTitle:[theme objectForKey:WCThemesName]];
57+
// [item setRepresentedObject:[theme objectForKey:WCThemesIdentifier]];
58+
// [item setImage:[[WCPreferences preferences] imageForTheme:theme size:NSMakeSize(16.0, 12.0)]];
59+
//
60+
// [[_bookmarksThemePopUpButton menu] addItem:item];
61+
// }
6262
}
6363

6464

@@ -87,12 +87,12 @@ - (void)load {
8787
else
8888
[_bookmarksPasswordTextField setStringValue:@""];
8989

90-
theme = [_bookmark objectForKey:WCBookmarksTheme];
91-
92-
if(theme && (index = [_bookmarksThemePopUpButton indexOfItemWithRepresentedObject:theme]) != -1)
93-
[_bookmarksThemePopUpButton selectItemAtIndex:index];
94-
else
95-
[_bookmarksThemePopUpButton selectItemAtIndex:0];
90+
// theme = [_bookmark objectForKey:WCBookmarksTheme];
91+
//
92+
// if(theme && (index = [_bookmarksThemePopUpButton indexOfItemWithRepresentedObject:theme]) != -1)
93+
// [_bookmarksThemePopUpButton selectItemAtIndex:index];
94+
// else
95+
// [_bookmarksThemePopUpButton selectItemAtIndex:0];
9696

9797
[_bookmarksAutoConnectButton setState:[_bookmark boolForKey:WCBookmarksAutoConnect]];
9898
[_bookmarksAutoReconnectButton setState:[_bookmark boolForKey:WCBookmarksAutoReconnect]];
@@ -123,10 +123,10 @@ - (void)save {
123123
[_bookmark setObject:[_bookmarksAddressTextField stringValue] forKey:WCBookmarksAddress];
124124
[_bookmark setObject:[_bookmarksLoginTextField stringValue] forKey:WCBookmarksLogin];
125125

126-
if([_bookmarksThemePopUpButton representedObjectOfSelectedItem])
127-
[_bookmark setObject:[_bookmarksThemePopUpButton representedObjectOfSelectedItem] forKey:WCBookmarksTheme];
128-
else
129-
[_bookmark removeObjectForKey:WCBookmarksTheme];
126+
// if([_bookmarksThemePopUpButton representedObjectOfSelectedItem])
127+
// [_bookmark setObject:[_bookmarksThemePopUpButton representedObjectOfSelectedItem] forKey:WCBookmarksTheme];
128+
// else
129+
// [_bookmark removeObjectForKey:WCBookmarksTheme];
130130

131131
[_bookmark setBool:[_bookmarksAutoConnectButton state] forKey:WCBookmarksAutoConnect];
132132
[_bookmark setBool:[_bookmarksAutoReconnectButton state] forKey:WCBookmarksAutoReconnect];
@@ -167,10 +167,10 @@ - (void)save {
167167
[_bookmark setObject:[_bookmarksAddressTextField stringValue] forKey:WCBookmarksAddress];
168168
[_bookmark setObject:[_bookmarksLoginTextField stringValue] forKey:WCBookmarksLogin];
169169

170-
if([_bookmarksThemePopUpButton representedObjectOfSelectedItem])
171-
[_bookmark setObject:[_bookmarksThemePopUpButton representedObjectOfSelectedItem] forKey:WCBookmarksTheme];
172-
else
173-
[_bookmark removeObjectForKey:WCBookmarksTheme];
170+
// if([_bookmarksThemePopUpButton representedObjectOfSelectedItem])
171+
// [_bookmark setObject:[_bookmarksThemePopUpButton representedObjectOfSelectedItem] forKey:WCBookmarksTheme];
172+
// else
173+
// [_bookmark removeObjectForKey:WCBookmarksTheme];
174174

175175
[_bookmark setBool:[_bookmarksAutoConnectButton state] forKey:WCBookmarksAutoConnect];
176176
[_bookmark setBool:[_bookmarksAutoReconnectButton state] forKey:WCBookmarksAutoReconnect];

0 commit comments

Comments
 (0)