Make java dir text field text clearer

This commit is contained in:
huangyuhui 2017-02-23 13:31:18 +08:00
parent d1c4dee7f7
commit a6768c361f
3 changed files with 2 additions and 15 deletions

View File

@ -6,19 +6,6 @@ branches:
- master - master
before_install: before_install:
- chmod +x gradlew - chmod +x gradlew
before_deploy:
- git config --global user.email ${GITHUB_EMAIL}
- git config --global user.name ${GITHUB_NAME}
- git tag ${TRAVIS_BUILD_NUMBER}
- git push -q ${REPO} --tags
deploy:
skip_cleanup: true
provider: releases
api_key:
secure: KxGIpE83MsgSdWNwCyqgIKJevZgLAef3hpBEVZjqZ09mA3JjQzWCbVFEfWpv8yRqe8ue7YF0aH7YoWuqOiE9q93Qsvv3GRtVcnZqZiGZbCZer1ShtqcjSseMvsw66dtHNcdK6onHna+OrCh2TQjxE2tKMf3CPCP9K2RI6dYOTyYUWmiOmiYQfcd2MEGSRXdnCGi8nf5oBZOYfHforRH3QYJXA7AxI+I9xaEWimFKs1c73sE1pypIGw5rlc+tiKuG8f5QoMeEOy+D30Qe3Vlre13RTi73r6GVt1ZoRpAwlNLEgjD393V1mxGd9wYNBMRKIZ/dfvIAN4m/jltVpgSyuCiUj3sjNs39HV8Jk0ki6RoSoAsjIyWHWfag946sk5wuBjnIZajlQhpGoc94ml8ujxOqP0npQT8azm3CwkAmBx0cxQ09Td9WPREk9BL4bWZrp5t50PsB9SZHPV2ET98QQH6+ArldONYWDTNZMJ2Lc0s6rFZoInq2px1srbR7Cxq2rNsVRp15UFvQp5xueONXz68/wFet6Gbm2ob8TGKm1bQOh5MRO/fq+fkrIIjoD6ztlRaO3xtePXlyEbnJmyxXOdA+Rd9WFXsT9gzjKtlxQjdHZNnI0YiEjR2qvHIWguAQtuV4pydWi8VtlBQ2gT37CpF4ApfC6jTfMsEwqZZ29YM=
file: HMCL/build/libs
on:
repo: huanghongxun/HMCL
script: "bash ./gradlew clean build --stacktrace" script: "bash ./gradlew clean build --stacktrace"
before_cache: before_cache:
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock

View File

@ -26,7 +26,7 @@
<Group type="102" attributes="0"> <Group type="102" attributes="0">
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0"> <Group type="103" groupAlignment="0" attributes="0">
<Component id="tabVersionEdit" alignment="1" pref="766" max="32767" attributes="0"/> <Component id="tabVersionEdit" alignment="1" max="32767" attributes="0"/>
<Group type="102" alignment="1" attributes="0"> <Group type="102" alignment="1" attributes="0">
<EmptySpace min="0" pref="0" max="32767" attributes="0"/> <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
<Component id="btnMakeLaunchScript" min="-2" max="-2" attributes="0"/> <Component id="btnMakeLaunchScript" min="-2" max="-2" attributes="0"/>

View File

@ -1147,7 +1147,7 @@ public final class GameSettingsPanel extends RepaintPage implements DropTargetLi
if (idx != -1) { if (idx != -1) {
Java j = Java.JAVA.get(idx); Java j = Java.JAVA.get(idx);
txtJavaDir.setText(j.getHome() == null ? Settings.getLastProfile().getSelectedVersionSetting().getSettingsJavaDir() : j.getJava()); txtJavaDir.setText(j.getHome() == null ? Settings.getLastProfile().getSelectedVersionSetting().getSettingsJavaDir() : j.getJava());
txtJavaDir.setEnabled(idx == 1); txtJavaDir.setEditable(idx == 1);
if (!isLoading) if (!isLoading)
Settings.getLastProfile().getSelectedVersionSetting().setJava(j); Settings.getLastProfile().getSelectedVersionSetting().setJava(j);
} }