Bläddra i källkod

CL-2022.3 <TheoryOfNekomata@VALHALLA Merge branch 'master'

Conflicts:
	ui.lnf.xml
master
TheoryOfNekomata 1 år sedan
förälder
incheckning
06131d75f3
11 ändrade filer med 31 tillägg och 12 borttagningar
  1. +1
    -0
      NewUIInfoService.xml
  2. +2
    -0
      a-file-icons.xml
  3. +1
    -1
      colors/_@user_Darcula.icls
  4. +1
    -1
      csv-editor.xml
  5. +0
    -2
      editor-font.xml
  6. +1
    -1
      filetypes.xml
  7. +4
    -0
      ide.general.xml
  8. +13
    -0
      keymapFlags.xml
  9. +2
    -1
      material_theme.xml
  10. +5
    -0
      ocRefactoring.xml
  11. +1
    -6
      ui.lnf.xml

+ 1
- 0
NewUIInfoService.xml Visa fil

@@ -1,5 +1,6 @@
<application>
<component name="NewUIInfoState"><![CDATA[{
"numberNotificationShowed": 1,
"enableNewUIDate": "2022-12-11T16:28:30.876810500"
}]]></component>
</application>

+ 2
- 0
a-file-icons.xml Visa fil

@@ -7,5 +7,7 @@
<option name="isEnabledUIIcons" value="false" />
<option name="monochromeColor" value="546e7a" />
<option name="isUseHollowFolders" value="false" />
<option name="accentColor" value="589df6" />
<option name="themedColor" value="bbbbbb" />
</component>
</application>

+ 1
- 1
colors/_@user_Darcula.icls Visa fil

@@ -3,7 +3,7 @@
<property name="created">2022-12-11T15:56:44</property>
<property name="ide">WebStorm</property>
<property name="ideVersion">2022.3.0.0</property>
<property name="modified">2022-12-11T15:59:52</property>
<property name="modified">2023-01-19T17:11:26</property>
<property name="originalScheme">Darcula</property>
</metaInfo>
<colors>


+ 1
- 1
csv-editor.xml Visa fil

@@ -1,5 +1,5 @@
<application>
<component name="CsvEditorSettings">
<option name="CURRENT_PLUGIN_VERSION" value="3.0.1-223" />
<option name="CURRENT_PLUGIN_VERSION" value="3.0.2-223" />
</component>
</application>

+ 0
- 2
editor-font.xml Visa fil

@@ -4,8 +4,6 @@
<option name="FONT_SIZE" value="12" />
<option name="FONT_SIZE_2D" value="12.0" />
<option name="FONT_FAMILY" value="MonoLisa" />
<option name="FONT_REGULAR_SUB_FAMILY" value="Regular" />
<option name="FONT_BOLD_SUB_FAMILY" value="Bold" />
<option name="LINE_SPACING" value="0.85" />
</component>
</application>

+ 1
- 1
filetypes.xml Visa fil

@@ -3,7 +3,6 @@
<extensionMap>
<mapping pattern="cucumber-js" type="AUTO_DETECTED" />
<mapping ext="babelrc" type="JSON" />
<mapping ext="sequelizerc" type="JavaScript" />
<mapping pattern=".gitmessage" type="PLAIN_TEXT" />
<mapping pattern="LICENSE" type="PLAIN_TEXT" />
<mapping pattern=".nvmrc" type="PLAIN_TEXT" />
@@ -21,6 +20,7 @@
<removed_mapping pattern=".sequelizerc" approved="true" type="JSON" />
<mapping ext="gradle.kts" type="Kotlin" />
<mapping ext="main.kts" type="Kotlin" />
<mapping ext="sequelizerc" type="JavaScript" />
</extensionMap>
</component>
</application>

+ 4
- 0
ide.general.xml Visa fil

@@ -7,6 +7,10 @@
<entry key="ide.balloon.shadow.size" value="0" />
<entry key="ide.experimental.ui" value="true" />
<entry key="debugger.new.tool.window.layout" value="true" />
<entry key="ide.editor.tab.selection.animation" value="true" />
<entry key="ide.new.editor.tabs.vertical.borders" value="true" />
<entry key="editor.focus.mode.color.light" value="444444" />
<entry key="editor.focus.mode.color.dark" value="444444" />
</component>
<component name="StatusBar">
<option name="widgets">


+ 13
- 0
keymapFlags.xml Visa fil

@@ -0,0 +1,13 @@
<application>
<component name="KeymapFlagsStorage">
<option name="keymapToDescriptor">
<map>
<entry key="Windows Proper Redo">
<value>
<list />
</value>
</entry>
</map>
</option>
</component>
</application>

+ 2
- 1
material_theme.xml Visa fil

@@ -1,6 +1,7 @@
<application>
<component name="MaterialThemeConfig">
<option name="customTreeIndentEnabled" value="true" />
<option name="allowDataCollection" value="true" />
<option name="autoResetColorScheme" value="true" />
<option name="compactSidebar" value="true" />
<option name="isCustomTreeIndentEnabled" value="true" />
@@ -15,6 +16,6 @@
<option name="accentColor" value="eeca3f" />
<option name="selectedTheme" value="CUSTOM" />
<option name="userId" value="7a11f371:1686d9b67db:-8000" />
<option name="version" value="8.3.2" />
<option name="version" value="8.4.0" />
</component>
</application>

+ 5
- 0
ocRefactoring.xml Visa fil

@@ -0,0 +1,5 @@
<application>
<component name="OCRefactoringSettings">
<option name="RENAME_ASSOCIATED_FILES" value="false" />
</component>
</application>

+ 1
- 6
ui.lnf.xml Visa fil

@@ -1,11 +1,6 @@
<application>
<component name="UISettings">
<option name="compactTreeIndents" value="true" />
<option name="LEFT_HORIZONTAL_SPLIT" value="true" />
<option name="MARK_MODIFIED_TABS_WITH_ASTERISK" value="true" />
<option name="OPEN_IN_PREVIEW_TAB_IF_POSSIBLE" value="true" />
<option name="OVERRIDE_NONIDEA_LAF_FONTS" value="true" />
<option name="RIGHT_HORIZONTAL_SPLIT" value="true" />
<option name="SHOW_NAVIGATION_BAR" value="false" />
<option name="showTreeIndentGuides" value="true" />
</component>
</application>

Laddar…
Avbryt
Spara