Add "description" column to syntax style editor (#474)

This commit is contained in:
1024jp 2015-11-29 00:59:34 +09:00
parent b7361b1a0e
commit 29875303d5
9 changed files with 126 additions and 20 deletions

View File

@ -21,6 +21,7 @@ develop
- Add option to suppress “not writable document” alert.
- Improve text selection by clicking line numbers view.
- Tweak style of popup menus in toolbar.
- Add “description” field that doesn't affect to highlighting but for commenting for each term to the syntax style and syntax style editor.
- Update Python syntax style:
- Add several commands and variables that are in `__foo__` form.
- Add `pyi` extension.

View File

@ -23,14 +23,14 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnReordering="NO" columnSelection="YES" autosaveColumns="NO" rowSizeStyle="automatic" headerView="uOT-Vg-FZh" viewBased="YES" id="ace-Sg-2RE">
<rect key="frame" x="0.0" y="0.0" width="394" height="157"/>
<rect key="frame" x="0.0" y="0.0" width="397" height="157"/>
<autoresizingMask key="autoresizingMask"/>
<animations/>
<size key="intercellSpacing" width="3" height="2"/>
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
<color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
<tableColumns>
<tableColumn identifier="beginComments" width="220" minWidth="40" maxWidth="1000" id="1an-HZ-pD7">
<tableColumn identifier="beginComments" width="190" minWidth="40" maxWidth="1000" id="1an-HZ-pD7">
<tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Begin String">
<font key="font" metaFont="smallSystem"/>
<color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
@ -45,11 +45,11 @@
<tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
<prototypeCellViews>
<tableCellView id="cLR-ml-bO2">
<rect key="frame" x="1" y="1" width="220" height="17"/>
<rect key="frame" x="1" y="1" width="190" height="17"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="SxV-uo-Z0U">
<rect key="frame" x="0.0" y="0.0" width="220" height="17"/>
<rect key="frame" x="0.0" y="0.0" width="190" height="17"/>
<animations/>
<textFieldCell key="cell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" title="begin" usesSingleLineMode="YES" id="kSc-q8-TSC">
<font key="font" metaFont="system"/>
@ -74,7 +74,7 @@
</tableCellView>
</prototypeCellViews>
</tableColumn>
<tableColumn identifier="endComments" width="108" minWidth="10" maxWidth="1000" id="XJa-sc-hM6">
<tableColumn identifier="endComments" width="100" minWidth="10" maxWidth="1000" id="XJa-sc-hM6">
<tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="End String">
<font key="font" metaFont="smallSystem"/>
<color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
@ -89,11 +89,11 @@
<tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
<prototypeCellViews>
<tableCellView id="rSM-J9-VwA">
<rect key="frame" x="224" y="1" width="108" height="17"/>
<rect key="frame" x="194" y="1" width="100" height="17"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="xfd-UI-asU">
<rect key="frame" x="0.0" y="0.0" width="108" height="17"/>
<rect key="frame" x="0.0" y="0.0" width="100" height="17"/>
<animations/>
<textFieldCell key="cell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" title="end" usesSingleLineMode="YES" id="ike-P3-f5j">
<font key="font" metaFont="system"/>
@ -130,7 +130,7 @@
</buttonCell>
<prototypeCellViews>
<tableCellView id="zGq-eu-YtT">
<rect key="frame" x="341" y="1" width="27" height="17"/>
<rect key="frame" x="297" y="1" width="27" height="17"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<button identifier="regularExpression" translatesAutoresizingMaskIntoConstraints="NO" id="Sp3-PD-epD">
@ -168,7 +168,7 @@
</buttonCell>
<prototypeCellViews>
<tableCellView id="ZG7-d6-16m">
<rect key="frame" x="371" y="1" width="27" height="17"/>
<rect key="frame" x="327" y="1" width="27" height="17"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<button identifier="ignoreCase" translatesAutoresizingMaskIntoConstraints="NO" id="qti-b2-hHN">
@ -194,6 +194,50 @@
</tableCellView>
</prototypeCellViews>
</tableColumn>
<tableColumn identifier="" width="38" minWidth="10" maxWidth="1000" id="Bla-xg-t6E">
<tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Description">
<font key="font" metaFont="smallSystem"/>
<color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</tableHeaderCell>
<textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" alignment="left" title="Text Cell" id="xae-A2-skh">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<sortDescriptor key="sortDescriptorPrototype" selector="caseInsensitiveCompare:" sortKey="description"/>
<tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
<prototypeCellViews>
<tableCellView id="Wgn-aa-28Y">
<rect key="frame" x="357" y="1" width="38" height="17"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="0iQ-u5-KRq">
<rect key="frame" x="0.0" y="0.0" width="38" height="17"/>
<animations/>
<textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="note" id="CWN-H0-LVV">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<connections>
<binding destination="Wgn-aa-28Y" name="value" keyPath="objectValue.description" id="xQY-qp-oTg"/>
</connections>
</textField>
</subviews>
<constraints>
<constraint firstItem="0iQ-u5-KRq" firstAttribute="top" secondItem="Wgn-aa-28Y" secondAttribute="top" id="A2Z-Os-eIy"/>
<constraint firstItem="0iQ-u5-KRq" firstAttribute="leading" secondItem="Wgn-aa-28Y" secondAttribute="leading" constant="2" id="bUD-OT-1rT"/>
<constraint firstAttribute="bottom" secondItem="0iQ-u5-KRq" secondAttribute="bottom" id="be6-0Z-6k3"/>
<constraint firstAttribute="trailing" secondItem="0iQ-u5-KRq" secondAttribute="trailing" constant="2" id="xLO-k1-tUx"/>
</constraints>
<animations/>
<connections>
<outlet property="textField" destination="0iQ-u5-KRq" id="iNB-pI-cr0"/>
</connections>
</tableCellView>
</prototypeCellViews>
</tableColumn>
</tableColumns>
<connections>
<binding destination="SKZ-Xe-n9z" name="content" keyPath="arrangedObjects" id="nI5-bv-ObF"/>
@ -217,7 +261,7 @@
<animations/>
</scroller>
<tableHeaderView key="headerView" id="uOT-Vg-FZh">
<rect key="frame" x="0.0" y="0.0" width="394" height="23"/>
<rect key="frame" x="0.0" y="0.0" width="397" height="17"/>
<autoresizingMask key="autoresizingMask"/>
<animations/>
</tableHeaderView>
@ -402,6 +446,7 @@
<string>endString</string>
<string>regularExpression</string>
<string>ignoreCase</string>
<string>description</string>
</declaredKeys>
<connections>
<binding destination="au5-OB-I1o" name="contentArray" keyPath="selection.comments" id="euC-rA-7iw"/>

View File

@ -24,14 +24,14 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnReordering="NO" columnSelection="YES" autosaveColumns="NO" rowSizeStyle="automatic" headerView="ihI-nZ-eZa" viewBased="YES" id="N7j-We-fF0">
<rect key="frame" x="0.0" y="0.0" width="394" height="264"/>
<rect key="frame" x="0.0" y="0.0" width="397" height="264"/>
<autoresizingMask key="autoresizingMask"/>
<animations/>
<size key="intercellSpacing" width="3" height="2"/>
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
<color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
<tableColumns>
<tableColumn identifier="beginKeywords" width="210" minWidth="40" maxWidth="1000" id="QJ2-Qf-Fyb">
<tableColumn identifier="beginKeywords" width="190" minWidth="40" maxWidth="1000" id="QJ2-Qf-Fyb">
<tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Begin String">
<font key="font" metaFont="smallSystem"/>
<color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
@ -46,11 +46,11 @@
<tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
<prototypeCellViews>
<tableCellView id="Brv-ow-f3z">
<rect key="frame" x="1" y="1" width="210" height="17"/>
<rect key="frame" x="1" y="1" width="190" height="17"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="NTR-iX-m46">
<rect key="frame" x="0.0" y="0.0" width="210" height="17"/>
<rect key="frame" x="0.0" y="0.0" width="190" height="17"/>
<animations/>
<textFieldCell key="cell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" title="begin" usesSingleLineMode="YES" id="Byh-ZD-px4">
<font key="font" metaFont="system"/>
@ -75,7 +75,7 @@
</tableCellView>
</prototypeCellViews>
</tableColumn>
<tableColumn identifier="endKeywords" width="118" minWidth="10" maxWidth="1000" id="i4u-kF-59v">
<tableColumn identifier="endKeywords" width="100" minWidth="10" maxWidth="1000" id="i4u-kF-59v">
<tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="End String">
<font key="font" metaFont="smallSystem"/>
<color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
@ -90,11 +90,11 @@
<tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
<prototypeCellViews>
<tableCellView id="buA-mv-fq0">
<rect key="frame" x="214" y="1" width="118" height="17"/>
<rect key="frame" x="194" y="1" width="100" height="17"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="r8I-3F-SPz">
<rect key="frame" x="0.0" y="0.0" width="118" height="17"/>
<rect key="frame" x="0.0" y="0.0" width="100" height="17"/>
<animations/>
<textFieldCell key="cell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" title="end" usesSingleLineMode="YES" id="9N3-Dg-cCD">
<font key="font" metaFont="system"/>
@ -131,7 +131,7 @@
</buttonCell>
<prototypeCellViews>
<tableCellView id="0kb-dz-bqF">
<rect key="frame" x="335" y="1" width="27" height="17"/>
<rect key="frame" x="297" y="1" width="27" height="17"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<button identifier="regularExpression" translatesAutoresizingMaskIntoConstraints="NO" id="LEd-FP-rGd">
@ -169,7 +169,7 @@
</buttonCell>
<prototypeCellViews>
<tableCellView id="r3l-zQ-NPi">
<rect key="frame" x="365" y="1" width="27" height="17"/>
<rect key="frame" x="327" y="1" width="27" height="17"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<button identifier="ignoreCase" translatesAutoresizingMaskIntoConstraints="NO" id="5zh-Cr-Dts">
@ -195,6 +195,50 @@
</tableCellView>
</prototypeCellViews>
</tableColumn>
<tableColumn identifier="" width="38" minWidth="10" maxWidth="1000" id="0ah-vG-2QL">
<tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Description">
<font key="font" metaFont="smallSystem"/>
<color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
</tableHeaderCell>
<textFieldCell key="dataCell" lineBreakMode="truncatingTail" selectable="YES" editable="YES" alignment="left" title="Text Cell" id="lGo-Dt-HY5">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<sortDescriptor key="sortDescriptorPrototype" selector="caseInsensitiveCompare:" sortKey="description"/>
<tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
<prototypeCellViews>
<tableCellView id="AVy-tY-cBc">
<rect key="frame" x="357" y="1" width="38" height="17"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="l2H-VK-uqw">
<rect key="frame" x="0.0" y="0.0" width="38" height="17"/>
<animations/>
<textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="note" id="7cu-Qy-cgF">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<connections>
<binding destination="AVy-tY-cBc" name="value" keyPath="objectValue.description" id="VTE-3v-l78"/>
</connections>
</textField>
</subviews>
<constraints>
<constraint firstAttribute="bottom" secondItem="l2H-VK-uqw" secondAttribute="bottom" id="ZAl-Ch-zKc"/>
<constraint firstAttribute="trailing" secondItem="l2H-VK-uqw" secondAttribute="trailing" constant="2" id="hzr-a3-m4w"/>
<constraint firstItem="l2H-VK-uqw" firstAttribute="top" secondItem="AVy-tY-cBc" secondAttribute="top" id="qc1-0D-dSE"/>
<constraint firstItem="l2H-VK-uqw" firstAttribute="leading" secondItem="AVy-tY-cBc" secondAttribute="leading" constant="2" id="xnD-N6-Zea"/>
</constraints>
<animations/>
<connections>
<outlet property="textField" destination="l2H-VK-uqw" id="3rZ-hs-V9d"/>
</connections>
</tableCellView>
</prototypeCellViews>
</tableColumn>
</tableColumns>
<connections>
<binding destination="SKZ-Xe-n9z" name="content" keyPath="arrangedObjects" id="517-AZ-dKr"/>
@ -218,7 +262,7 @@
<animations/>
</scroller>
<tableHeaderView key="headerView" id="ihI-nZ-eZa">
<rect key="frame" x="0.0" y="0.0" width="394" height="17"/>
<rect key="frame" x="0.0" y="0.0" width="397" height="17"/>
<autoresizingMask key="autoresizingMask"/>
<animations/>
</tableHeaderView>
@ -273,6 +317,7 @@
<string>endString</string>
<string>regularExpression</string>
<string>ignoreCase</string>
<string>description</string>
</declaredKeys>
</arrayController>
<customObject id="Dlt-nc-ate" customClass="CESyntaxEditTableViewDelegate"/>

View File

@ -62,3 +62,5 @@
/* Class = "NSTableColumn"; headerCell.title = "IC"; ObjectID = "oI5-31-pDw"; */
"oI5-31-pDw.headerCell.title" = "IC"; /* IC */
"oI5-31-pDw.headerToolTip" = "Groß-/Kleinschreibung ignorieren"; /* Ignore Case (case-insensitive) */
/* Class = "NSTableColumn"; headerCell.title = "Description"; ObjectID = "Bla-xg-t6E"; */
"Bla-xg-t6E.headerCell.title" = "Beschreibung";

View File

@ -39,3 +39,6 @@
/* Class = "NSTableColumn"; ObjectID = "qJN-3P-dIu"; */
"qJN-3P-dIu.headerCell.title" = "IC"; /* IC */
"qJN-3P-dIu.headerToolTip" = "Groß-/Kleinschreibung ignorieren"; /* Ignore Case (case-insensitive) */
/* Class = "NSTableColumn"; headerCell.title = "Description"; ObjectID = "0ah-vG-2QL"; */
"0ah-vG-2QL.headerCell.title" = "Beschreibung";

View File

@ -62,3 +62,5 @@
/* Class = "NSTableColumn"; ObjectID = "oI5-31-pDw"; */
"oI5-31-pDw.headerCell.title" = "IC"; /* IC */
"oI5-31-pDw.headerToolTip" = "大文字小文字を無視"; /* Ignore Case (case-insensitive) */
/* Class = "NSTableColumn"; headerCell.title = "Description"; ObjectID = "Bla-xg-t6E"; */
"Bla-xg-t6E.headerCell.title" = "説明";

View File

@ -39,3 +39,6 @@
/* Class = "NSTableColumn"; ObjectID = "qJN-3P-dIu"; */
"qJN-3P-dIu.headerCell.title" = "IC"; /* IC */
"qJN-3P-dIu.headerToolTip" = "大文字小文字を無視"; /* Ignore Case (case-insensitive) */
/* Class = "NSTableColumn"; headerCell.title = "Description"; ObjectID = "0ah-vG-2QL"; */
"0ah-vG-2QL.headerCell.title" = "説明";

View File

@ -63,3 +63,5 @@
/* Class = "NSTableColumn"; ObjectID = "oI5-31-pDw"; */
"oI5-31-pDw.headerCell.title" = "IC"; /* IC */
"oI5-31-pDw.headerToolTip" = "忽略大小写"; /* Ignore Case (case-insensitive) */
/* Class = "NSTableColumn"; headerCell.title = "Description"; ObjectID = "Bla-xg-t6E"; */
"Bla-xg-t6E.headerCell.title" = "描述";

View File

@ -40,3 +40,6 @@
/* Class = "NSTableColumn"; ObjectID = "qJN-3P-dIu"; */
"qJN-3P-dIu.headerCell.title" = "IC"; /* IC */
"qJN-3P-dIu.headerToolTip" = "忽略大小写"; /* Ignore Case (case-insensitive) */
/* Class = "NSTableColumn"; headerCell.title = "Description"; ObjectID = "0ah-vG-2QL"; */
"0ah-vG-2QL.headerCell.title" = "描述";