Skip to content

Commit

Permalink
Adjust color and texts
Browse files Browse the repository at this point in the history
  • Loading branch information
@sdercolin
sdercolin committed Apr 6, 2024
1 parent 42e5dab commit 9c2f915
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 48 deletions.
2 changes: 1 addition & 1 deletion src/jvmMain/kotlin/com/sdercolin/vlabeler/model/AppConf.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ data class AppConf(
const val DEFAULT_MIN_DISPLAY_CORR = 0.0f
const val DEFAULT_MAX_DISPLAY_CORR = 0.5f
const val DEFAULT_DRAW_REFERENCE_LINE = true
const val DEFAULT_COLOR = "#FFF2F200"
const val DEFAULT_COLOR = "#FFFFC500"
const val DEFAULT_REFERENCE_LINE_COLOR = "#FF555555"
const val DEFAULT_BACKGROUND_COLOR = "#00000000"
}
Expand Down
5 changes: 0 additions & 5 deletions src/jvmMain/kotlin/com/sdercolin/vlabeler/ui/string/Strings.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -342,11 +342,6 @@ enum class Strings {
PreferencesChartsFundamentalSemitoneSampleNum,
PreferencesChartsFundamentalMaxHarmonicFrequency,
PreferencesChartsFundamentalMaxHarmonicFrequencyInvalid,
PreferencesChartsFundamentalErbsStep,
PreferencesChartsFundamentalMinDisplayCorr,
PreferencesChartsFundamentalMinDisplayCorrInvalid,
PreferencesChartsFundamentalMaxDisplayCorr,
PreferencesChartsFundamentalMaxDisplayCorrInvalid,
PreferencesChartsFundamentalDrawReferenceLine,
PreferencesChartsFundamentalColor,
PreferencesChartsFundamentalReferenceLineColor,
Expand Down
17 changes: 6 additions & 11 deletions src/jvmMain/kotlin/com/sdercolin/vlabeler/ui/string/StringsChineseSimplified.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -354,19 +354,14 @@ fun Strings.zhHans(): String? = when (this) {
PreferencesChartsFundamentalEnabled -> "启用基频图"
PreferencesChartsFundamentalHeight -> "相对于波形图的高度（%%）"
PreferencesChartsFundamentalSemitoneResolution -> "图像中每个半音的分辨率"
PreferencesChartsFundamentalMinFundamental -> "最小基频（Hz）"
PreferencesChartsFundamentalMinFundamentalInvalid -> "最小基频必须小于最大基频。"
PreferencesChartsFundamentalMaxFundamental -> "最大基频（Hz）"
PreferencesChartsFundamentalMaxFundamentalInvalid -> "最大基频必须大于最小基频。"
PreferencesChartsFundamentalMinFundamental -> "最小频率（Hz）"
PreferencesChartsFundamentalMinFundamentalInvalid -> "最小频率必须小于最大频率。"
PreferencesChartsFundamentalMaxFundamental -> "最大频率（Hz）"
PreferencesChartsFundamentalMaxFundamentalInvalid -> "最大频率必须大于最小频率。"
PreferencesChartsFundamentalSemitoneSampleNum -> "每个半音的采样数"
PreferencesChartsFundamentalMaxHarmonicFrequency -> "最大谐波频率（Hz）"
PreferencesChartsFundamentalMaxHarmonicFrequencyInvalid -> "最大谐波频率必须大于最大基频。"
PreferencesChartsFundamentalErbsStep -> "ERBs采样间隔"
PreferencesChartsFundamentalMinDisplayCorr -> "最小显示相关度"
PreferencesChartsFundamentalMinDisplayCorrInvalid -> "最小显示相关度必须小于最大显示相关度。"
PreferencesChartsFundamentalMaxDisplayCorr -> "最大显示相关度"
PreferencesChartsFundamentalMaxDisplayCorrInvalid -> "最大显示相关度必须大于最小显示相关度。"
PreferencesChartsFundamentalDrawReferenceLine -> "绘制参考线（C）"
PreferencesChartsFundamentalMaxHarmonicFrequencyInvalid -> "最大谐波频率必须大于最大频率。"
PreferencesChartsFundamentalDrawReferenceLine -> "绘制C音阶参考线"
PreferencesChartsFundamentalColor -> "前景色"
PreferencesChartsFundamentalReferenceLineColor -> "参考线颜色"
PreferencesChartsFundamentalBackgroundColor -> "背景色"
Expand Down
25 changes: 9 additions & 16 deletions src/jvmMain/kotlin/com/sdercolin/vlabeler/ui/string/StringsEnglish.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -384,27 +384,20 @@ fun Strings.en(): String = when (this) {
PreferencesChartsPowerIntensityAccuracy -> "Bitmap height (px)"
PreferencesChartsPowerColor -> "Color"
PreferencesChartsPowerBackgroundColor -> "Background color"
PreferencesChartsFundamental -> "Fundamental"
PreferencesChartsFundamentalDescription -> "Customize the fundamental chart."
PreferencesChartsFundamentalEnabled -> "Show fundamental chart"
PreferencesChartsFundamental -> "F0"
PreferencesChartsFundamentalDescription -> "Customize the F0 chart."
PreferencesChartsFundamentalEnabled -> "Show F0 chart"
PreferencesChartsFundamentalHeight -> "Height relative to waveforms (%%)"
PreferencesChartsFundamentalSemitoneResolution -> "Semitone resolution in image"
PreferencesChartsFundamentalMinFundamental -> "Min fundamental frequency (Hz)"
PreferencesChartsFundamentalMinFundamentalInvalid -> "Min fundamental must be less than max fundamental."
PreferencesChartsFundamentalMaxFundamental -> "Max fundamental frequency (Hz)"
PreferencesChartsFundamentalMaxFundamentalInvalid -> "Max fundamental must be greater than min fundamental."
PreferencesChartsFundamentalMinFundamental -> "Min displayed frequency (Hz)"
PreferencesChartsFundamentalMinFundamentalInvalid -> "Min frequency must be less than max frequency."
PreferencesChartsFundamentalMaxFundamental -> "Max displayed frequency (Hz)"
PreferencesChartsFundamentalMaxFundamentalInvalid -> "Max frequency must be greater than min frequency."
PreferencesChartsFundamentalSemitoneSampleNum -> "Sample number for each semitone"
PreferencesChartsFundamentalMaxHarmonicFrequency -> "Max harmonic frequency (Hz)"
PreferencesChartsFundamentalMaxHarmonicFrequencyInvalid ->
"Max harmonic frequency must be greater than min fundamental."
PreferencesChartsFundamentalErbsStep -> "Sample interval for ERB scale"
PreferencesChartsFundamentalMinDisplayCorr -> "Min display correlation"
PreferencesChartsFundamentalMinDisplayCorrInvalid ->
"Min display correlation must be less than max display correlation."
PreferencesChartsFundamentalMaxDisplayCorr -> "Max display correlation"
PreferencesChartsFundamentalMaxDisplayCorrInvalid ->
"Max display correlation must be greater than min display correlation."
PreferencesChartsFundamentalDrawReferenceLine -> "Draw reference lines (C)"
"Max harmonic frequency must be greater than max frequency."
PreferencesChartsFundamentalDrawReferenceLine -> "Draw reference lines on C keys"
PreferencesChartsFundamentalColor -> "Color"
PreferencesChartsFundamentalReferenceLineColor -> "Reference line color"
PreferencesChartsFundamentalBackgroundColor -> "Background color"
Expand Down
25 changes: 10 additions & 15 deletions src/jvmMain/kotlin/com/sdercolin/vlabeler/ui/string/StringsJapanese.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -370,25 +370,20 @@ fun Strings.ja(): String? = when (this) {
PreferencesChartsPowerIntensityAccuracy -> "パワーの高さ（ピクセル）"
PreferencesChartsPowerColor -> "パワーの色"
PreferencesChartsPowerBackgroundColor -> "背景の色"
PreferencesChartsFundamental -> "基本周波数"
PreferencesChartsFundamentalDescription -> "基本周波数の描画設定をカスタマイズします。"
PreferencesChartsFundamentalEnabled -> "基本周波数を表示"
PreferencesChartsFundamental -> "F0"
PreferencesChartsFundamentalDescription -> "F0の描画設定をカスタマイズします。"
PreferencesChartsFundamentalEnabled -> "F0を表示"
PreferencesChartsFundamentalHeight -> "波形グラフの高さに対する高さの割合（%%）"
PreferencesChartsFundamentalSemitoneResolution -> "画像中に半音ごとの解像度"
PreferencesChartsFundamentalMinFundamental -> "最小基本周波数（Hz）"
PreferencesChartsFundamentalMinFundamentalInvalid -> "最小基本周波数は最大基本周波数より小さくなければなりません。"
PreferencesChartsFundamentalMaxFundamental -> "最大基本周波数（Hz）"
PreferencesChartsFundamentalMaxFundamentalInvalid -> "最大基本周波数は最小基本周波数より大きくなければなりません。"
PreferencesChartsFundamentalMinFundamental -> "最小周波数（Hz）"
PreferencesChartsFundamentalMinFundamentalInvalid -> "最小周波数は最大周波数より小さくなければなりません。"
PreferencesChartsFundamentalMaxFundamental -> "最大周波数（Hz）"
PreferencesChartsFundamentalMaxFundamentalInvalid -> "最大周波数は最小周波数より大きくなければなりません。"
PreferencesChartsFundamentalSemitoneSampleNum -> "半音ごとのサンプリング数"
PreferencesChartsFundamentalMaxHarmonicFrequency -> "最大調波周波数（Hz）"
PreferencesChartsFundamentalMaxHarmonicFrequencyInvalid -> "最大調波周波数は最小基本周波数より大きくなければなりません。"
PreferencesChartsFundamentalErbsStep -> "ERBsのサンプリング間隔"
PreferencesChartsFundamentalMinDisplayCorr -> "最小表示相関度"
PreferencesChartsFundamentalMinDisplayCorrInvalid -> "最小表示相関度は最大表示相関度より小さくなければなりません。"
PreferencesChartsFundamentalMaxDisplayCorr -> "最大表示相関度"
PreferencesChartsFundamentalMaxDisplayCorrInvalid -> "最大表示相関度は最小表示相関度より大きくなければなりません。"
PreferencesChartsFundamentalDrawReferenceLine -> "基本周波数の参照線（C）を描画"
PreferencesChartsFundamentalColor -> "基本周波数の色"
PreferencesChartsFundamentalMaxHarmonicFrequencyInvalid -> "最大調波周波数は最大周波数より大きくなければなりません。"
PreferencesChartsFundamentalDrawReferenceLine -> "Cの音で参照線を描画"
PreferencesChartsFundamentalColor -> "F0の色"
PreferencesChartsFundamentalReferenceLineColor -> "参照線の色"
PreferencesChartsFundamentalBackgroundColor -> "背景の色"
PreferencesChartsConversion -> "オーディオフォーマットのサポート"
Expand Down

0 comments on commit 9c2f915

Please sign in to comment.