Skip to content

Commit

Permalink
Merge pull request #55 from misakuo/develop
Browse files Browse the repository at this point in the history 
Release v1.8.3
  • Loading branch information
@misakuo
misakuo authored Nov 11, 2020
2 parents f8ed39f + e709a45 commit 141c7a9
Show file tree
Hide file tree
Showing 7 changed files with 46 additions and 30 deletions.
16 changes: 12 additions & 4 deletions build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//http://www.jetbrains.org/intellij/sdk/docs/tutorials/build_system.html

buildscript {
ext.kotlin_version = '1.2.21'
ext.kotlin_version = '1.3.72'
repositories {
maven {
url 'http://maven.aliyun.com/nexus/content/repositories/releases/'
Expand All @@ -14,7 +14,7 @@ buildscript {
}

plugins {
id "org.jetbrains.intellij" version "0.4.17"
id "org.jetbrains.intellij" version "0.6.3"
}

apply plugin: 'idea'
Expand All @@ -31,7 +31,9 @@ repositories {

intellij {
intellij.updateSinceUntilBuild false
version 'IC-2016.3'
version '201.8743.12'
type 'IC'
plugins = ['com.intellij.java','android', 'java']
}

sourceSets {
Expand All @@ -56,5 +58,11 @@ dependencies {

testCompile 'junit:junit:4.12'
testCompile 'org.hamcrest:hamcrest-library:1.3'
compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version"
compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
}

runIde {
// Absolute path to installed target 3.5 Android Studio to use as IDE Development Instance
// The "Contents" directory is macOS specific.
ideDirectory '/Applications/Android Studio.app/Contents'
}
11 changes: 8 additions & 3 deletions resources/META-INF/plugin.xml
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<idea-plugin version="2">
<id>com.moxun.plugin.s2v</id>
<name>SVG2VectorDrawable</name>
<version>1.8.2</version>
<vcode>20</vcode>
<version>1.8.3</version>
<vcode>21</vcode>
<vendor email="[email protected]">moxun</vendor>

<description><![CDATA[
Expand All @@ -14,6 +14,9 @@
]]></description>

<change-notes><![CDATA[
<b>1.8.3</b><br>
Fix compatible issue with Android Studio 4.1. (#51,#54)<br>
New icon. (#52)<br>
<b>1.8.2</b><br>
Fix compatible issue with Android Studio 3.6+. (#47,#48)<br>
Fix incorrect output name when source file name with numbers. (#46)<br>
Expand Down Expand Up @@ -73,6 +76,8 @@
<!-- uncomment to enable plugin in all products
<depends>com.intellij.modules.lang</depends>
-->
<depends>org.jetbrains.android</depends>
<depends>com.intellij.modules.java</depends>

<extensions defaultExtensionNs="com.intellij">
<!-- Add your extensions here -->
Expand All @@ -92,7 +97,7 @@
<actions>
<!-- Add your actions here -->
<action class="com.moxun.s2v.S2V" id="moxun.s2v" text="SVG to VectorDrawable"
description="Tool for transforming SVG to VectorDrawable" icon="/icons/icon.png">
description="Tool for transforming SVG to VectorDrawable" icon="/icons/s2v_icon_16.svg">
<add-to-group group-id="MainToolBar" anchor="last"/>
</action>

Expand Down
Binary file added resources/icons/menu-open.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
0 resources/icons/icon.png → resources/icons/s2v_icon.png
View file
File renamed without changes
1 change: 1 addition & 0 deletions resources/icons/s2v_icon.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions resources/icons/s2v_icon_16.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
47 changes: 24 additions & 23 deletions src/com/moxun/s2v/GUI.form
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,18 @@
<grid id="27dc6" binding="rootPanel" layout-manager="GridLayoutManager" row-count="3" column-count="4" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
<margin top="10" left="10" bottom="10" right="10"/>
<constraints>
<xy x="188" y="450" width="710" height="400"/>
<xy x="188" y="710" width="710" height="140"/>
</constraints>
<properties>
<preferredSize width="580" height="180"/>
<preferredSize width="580" height="120"/>
</properties>
<border type="none"/>
<children>
<component id="71544" class="javax.swing.JTextField" binding="svgPath">
<constraints>
<grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
<grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0" use-parent-layout="false">
<preferred-size width="150" height="-1"/>
</grid>
</constraints>
<properties>
<background color="-1579033"/>
Expand All @@ -22,51 +24,48 @@
</component>
<component id="961ad" class="javax.swing.JLabel">
<constraints>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text value="SVG Path"/>
<text value="Path of svg:"/>
</properties>
</component>
<component id="3d5bf" class="javax.swing.JLabel">
<constraints>
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text value="XML To"/>
<text value="Module to gen:"/>
</properties>
</component>
<component id="babd5" class="javax.swing.JButton" binding="svgSelectBtn">
<constraints>
<grid row="0" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false">
<minimum-size width="20" height="20"/>
<preferred-size width="25" height="25"/>
<maximum-size width="25" height="25"/>
<grid row="0" column="2" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="1" indent="0" use-parent-layout="false">
<minimum-size width="24" height="24"/>
<preferred-size width="24" height="24"/>
<maximum-size width="24" height="24"/>
</grid>
</constraints>
<properties>
<actionCommand value="···"/>
<alignmentY value="0.0"/>
<text value="···"/>
<verticalAlignment value="0"/>
<actionCommand value=""/>
<icon value="icons/menu-open.png"/>
<text value=""/>
</properties>
</component>
<component id="29dea" class="javax.swing.JComboBox" binding="moduleChooser">
<constraints>
<grid row="1" column="1" row-span="1" col-span="2" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0" use-parent-layout="false">
<preferred-size width="184" height="27"/>
</grid>
<grid row="1" column="1" row-span="1" col-span="2" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<model/>
</properties>
</component>
<component id="e5369" class="javax.swing.JLabel">
<constraints>
<grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
<grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="4" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text value="XML Name"/>
<text value="Name of xml:"/>
</properties>
</component>
<component id="20693" class="javax.swing.JTextField" binding="xmlName">
Expand All @@ -81,15 +80,15 @@
</component>
<component id="f4c65" class="javax.swing.JCheckBox" binding="batch">
<constraints>
<grid row="0" column="3" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
<grid row="0" column="3" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text value="Batch"/>
</properties>
</component>
<component id="22a9e" class="javax.swing.JComboBox" binding="dpiChooser">
<constraints>
<grid row="1" column="3" row-span="1" col-span="1" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
<grid row="1" column="3" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<model>
Expand All @@ -105,9 +104,11 @@
</component>
<component id="78277" class="javax.swing.JButton" binding="generateButton" default-binding="true">
<constraints>
<grid row="2" column="3" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
<grid row="2" column="3" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="0" fill="1" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<enabled value="true"/>
<hideActionText value="false"/>
<text value="Generate"/>
</properties>
</component>
Expand Down

0 comments on commit 141c7a9

Please sign in to comment.