Skip to content

Labels for groups in bookmark view #15107

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

Draft
wants to merge 8 commits into
base: master
Choose a base branch
from
Draft

Labels for groups in bookmark view #15107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
cb9bccd
Implement outline view for bookmarks.
dkocher Aug 4, 2020
031c23b
Set bookmark view to outline.
dkocher Aug 13, 2023
fb69670
Fix implementation of menuForEvent to use outline view delgate.
dkocher Aug 13, 2023
6913088
Fix index as first row is group.
dkocher Aug 14, 2023
6a58ff0
Persist expanded items.
dkocher Aug 14, 2023
4b14216
Remove default override.
dkocher Sep 9, 2023
da3dc7b
Add new constants for default toolbar items.
dkocher Sep 13, 2023
0ac2bfe
Add constant for full size content view mask.
dkocher Sep 13, 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
2 changes: 1 addition & 1 deletion binding/src/main/java/ch/cyberduck/binding/AbstractTableDelegate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ public boolean selectionShouldChangeInTableView(final NSTableView view) {
/**
* @see NSOutlineView.DataSource
*/
public boolean selectionShouldChangeInOutlineView(final NSTableView view) {
public boolean selectionShouldChangeInOutlineView(final NSOutlineView view) {
return this.selectionShouldChange();
}

Expand Down
2 changes: 2 additions & 0 deletions binding/src/main/java/ch/cyberduck/binding/application/NSToolbarItem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ public abstract class NSToolbarItem extends NSObject implements NSCopying, NSVal
public static final String NSToolbarPrintItemIdentifier = "NSToolbarPrintItem";
public static final String NSToolbarToggleSidebarItemIdentifier = "NSToolbarToggleSidebarItem";
public static final String NSToolbarCloudSharingItemIdentifier = "NSToolbarCloudSharingItem";
public static final String NSToolbarInspectorTrackingSeparatorItemIdentifier = "NSToolbarInspectorTrackingSeparatorItem";
public static final String NSToolbarToggleInspectorItemIdentifier = "NSToolbarToggleInspectorItem";

public static final int VisibilityPriorityStandard = 0;
public static final int VisibilityPriorityLow = -1000;
Expand Down
9 changes: 8 additions & 1 deletion binding/src/main/java/ch/cyberduck/binding/application/NSWindow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,13 @@ public abstract class NSWindow extends NSResponder {
* <i>native declaration : line 48</i>
*/
public static final int NSUnifiedTitleAndToolbarWindowMask = 1 << 12;
/**
* When set, the window’s contentView consumes the full size of the window. Although you can combine this
* constant with other window style masks, it is respected only for windows with a title bar. Note that using
* this mask opts in to layer-backing. Use the contentLayoutRect or the contentLayoutGuide to lay out views
* underneath the title bar–toolbar area.
*/
public static final int NSWindowStyleMaskFullSizeContentView = 1 << 15;
/**
* used with NSRunLoop's performSelector:target:argument:order:modes:<br>
* <i>native declaration : line 55</i>
Expand Down Expand Up @@ -275,7 +282,7 @@ public interface _Class extends ObjCClass {

public static void setAllowsAutomaticWindowTabbing(boolean automatic) {
if(Rococoa.cast(CLASS, NSObject.class).respondsToSelector(
Foundation.selector("setAllowsAutomaticWindowTabbing:"))) {
Foundation.selector("setAllowsAutomaticWindowTabbing:"))) {
CLASS.setAllowsAutomaticWindowTabbing(automatic);
}
}
Expand Down
10 changes: 0 additions & 10 deletions bonjour/src/main/java/ch/cyberduck/core/bonjour/RendezvousCollection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,16 +112,6 @@ public Host lookup(final String uuid) {
return null;
}

@Override
public Spliterator<Host> spliterator() {
throw new UnsupportedOperationException();
}

@Override
public Stream<Host> stream() {
throw new UnsupportedOperationException();
}

@Override
public boolean allowsAdd() {
return false;
Expand Down
4 changes: 4 additions & 0 deletions core/src/main/java/ch/cyberduck/core/DeserializerFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@ public DeserializerFactory() {
super("factory.deserializer.class");
}

public DeserializerFactory(final Class<? extends Deserializer<T>> clazz) {
super(clazz);
}

public Deserializer<T> create(final T dict) {
try {
final Constructor<? extends Deserializer<T>> constructor = ConstructorUtils.getMatchingAccessibleConstructor(clazz, dict.getClass());
Expand Down
4 changes: 4 additions & 0 deletions core/src/main/java/ch/cyberduck/core/SerializerFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@ public SerializerFactory() {
super("factory.serializer.class");
}

public SerializerFactory(final Class<? extends Serializer<T>> clazz) {
super(clazz);
}

public static <T> Serializer<T> get() {
return new SerializerFactory<T>().create();
}
Expand Down
42 changes: 21 additions & 21 deletions i18n/src/main/resources/ar.lproj/Browser.xib
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21507" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21701" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21701"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
Expand Down Expand Up @@ -58,7 +58,7 @@
<rect key="frame" x="-1" y="0.0" width="603" height="34"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<view key="contentView" id="dgO-pC-QOS">
<rect key="frame" x="3" y="3" width="597" height="28"/>
<rect key="frame" x="4" y="5" width="595" height="26"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="9">
Expand Down Expand Up @@ -95,7 +95,7 @@
<rect key="frame" x="1" y="1" width="601" height="363"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<tableView focusRingType="none" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="sequential" columnSelection="YES" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" rowHeight="45" id="17" customClass="CDListView">
<tableView focusRingType="none" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="sequential" columnSelection="YES" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" rowHeight="45" id="17" customClass="CDOutlineView">
<rect key="frame" x="0.0" y="0.0" width="601" height="363"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<size key="intercellSpacing" width="3" height="2"/>
Expand All @@ -107,11 +107,11 @@
</tableView>
</subviews>
</clipView>
<scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" controlSize="small" horizontal="YES" id="18">
<scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" controlSize="small" horizontal="YES" id="18">
<rect key="frame" x="-100" y="-100" width="255" height="11"/>
<autoresizingMask key="autoresizingMask"/>
</scroller>
<scroller key="verticalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="19">
<scroller key="verticalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="NO" id="19">
<rect key="frame" x="-22" y="1" width="15" height="431"/>
<autoresizingMask key="autoresizingMask"/>
</scroller>
Expand All @@ -132,11 +132,11 @@
<rect key="frame" x="-2" y="0.0" width="604" height="397"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<clipView key="contentView" id="t14-pG-1DQ">
<rect key="frame" x="1" y="1" width="602" height="395"/>
<rect key="frame" x="1" y="1" width="587" height="395"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<tableView focusRingType="none" verticalHuggingPriority="750" allowsExpansionToolTips="YES" alternatingRowBackgroundColors="YES" columnSelection="YES" autosaveName="ListBrowserView" headerView="36" id="33" customClass="CDListView">
<rect key="frame" x="0.0" y="0.0" width="602" height="378"/>
<rect key="frame" x="0.0" y="0.0" width="587" height="378"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<size key="intercellSpacing" width="3" height="2"/>
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
Expand All @@ -147,16 +147,16 @@
</tableView>
</subviews>
</clipView>
<scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="34">
<scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="34">
<rect key="frame" x="-100" y="-100" width="582" height="15"/>
<autoresizingMask key="autoresizingMask"/>
</scroller>
<scroller key="verticalScroller" wantsLayer="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="NO" id="35">
<rect key="frame" x="587" y="18" width="16" height="378"/>
<scroller key="verticalScroller" verticalHuggingPriority="750" doubleValue="1" horizontal="NO" id="35">
<rect key="frame" x="588" y="18" width="15" height="378"/>
<autoresizingMask key="autoresizingMask"/>
</scroller>
<tableHeaderView key="headerView" id="36">
<rect key="frame" x="0.0" y="0.0" width="602" height="17"/>
<rect key="frame" x="0.0" y="0.0" width="587" height="17"/>
<autoresizingMask key="autoresizingMask"/>
</tableHeaderView>
</scrollView>
Expand All @@ -172,11 +172,11 @@
<rect key="frame" x="-2" y="0.0" width="604" height="397"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<clipView key="contentView" id="KUj-N5-PnR">
<rect key="frame" x="1" y="1" width="602" height="395"/>
<rect key="frame" x="1" y="1" width="587" height="395"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<tableView focusRingType="none" verticalHuggingPriority="750" allowsExpansionToolTips="YES" alternatingRowBackgroundColors="YES" columnSelection="YES" autosaveName="OutlineBrowserView" headerView="44" id="41" customClass="CDOutlineView">
<rect key="frame" x="0.0" y="0.0" width="602" height="378"/>
<rect key="frame" x="0.0" y="0.0" width="587" height="378"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<size key="intercellSpacing" width="3" height="2"/>
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
Expand All @@ -188,16 +188,16 @@
</tableView>
</subviews>
</clipView>
<scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="42">
<scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" horizontal="YES" id="42">
<rect key="frame" x="-100" y="-100" width="582" height="15"/>
<autoresizingMask key="autoresizingMask"/>
</scroller>
<scroller key="verticalScroller" wantsLayer="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="NO" id="43">
<rect key="frame" x="587" y="18" width="16" height="378"/>
<scroller key="verticalScroller" verticalHuggingPriority="750" doubleValue="1" horizontal="NO" id="43">
<rect key="frame" x="588" y="18" width="15" height="378"/>
<autoresizingMask key="autoresizingMask"/>
</scroller>
<tableHeaderView key="headerView" id="44">
<rect key="frame" x="0.0" y="0.0" width="602" height="17"/>
<rect key="frame" x="0.0" y="0.0" width="587" height="17"/>
<autoresizingMask key="autoresizingMask"/>
</tableHeaderView>
</scrollView>
Expand Down Expand Up @@ -547,9 +547,9 @@ DQ
</segmentedControl>
</objects>
<resources>
<image name="NSAddTemplate" width="15" height="13"/>
<image name="NSQuickLookTemplate" width="20" height="13"/>
<image name="NSRemoveTemplate" width="15" height="4"/>
<image name="NSAddTemplate" width="18" height="16"/>
<image name="NSQuickLookTemplate" width="27" height="16"/>
<image name="NSRemoveTemplate" width="18" height="4"/>
<image name="buttonCell:48:image" width="1" height="1">
<mutableData key="keyedArchiveRepresentation">
YnBsaXN0MDDUAQIDBAUGBwpYJHZlcnNpb25ZJGFyY2hpdmVyVCR0b3BYJG9iamVjdHMSAAGGoF8QD05T
Expand Down
Loading