From 9f0eadc340eb742063c73e454c3a39a4cba788f9 Mon Sep 17 00:00:00 2001 From: Honfika Date: Thu, 2 Jan 2014 22:52:16 +0100 Subject: [PATCH] font preview dialog sample texts moved to resource file --- .../flash/gui/FontPreviewDialog.form | 16 ++--------- .../flash/gui/FontPreviewDialog.java | 28 ++++++++++++++++++- .../flash/tags/font/font_preview_samples.txt | 10 +++++++ 3 files changed, 39 insertions(+), 15 deletions(-) create mode 100644 trunk/src/com/jpexs/decompiler/flash/tags/font/font_preview_samples.txt diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/FontPreviewDialog.form b/trunk/src/com/jpexs/decompiler/flash/gui/FontPreviewDialog.form index a9dca8ca0..2b9db9db4 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/FontPreviewDialog.form +++ b/trunk/src/com/jpexs/decompiler/flash/gui/FontPreviewDialog.form @@ -238,20 +238,8 @@ - - - - - - - - - - - - - - + + diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/FontPreviewDialog.java b/trunk/src/com/jpexs/decompiler/flash/gui/FontPreviewDialog.java index 726df101b..f475ced52 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/FontPreviewDialog.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/FontPreviewDialog.java @@ -17,7 +17,19 @@ package com.jpexs.decompiler.flash.gui; import com.jpexs.decompiler.flash.configuration.Configuration; +import com.jpexs.decompiler.flash.tags.base.FontTag; +import com.jpexs.helpers.utf8.Utf8Helper; import java.awt.Font; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStreamReader; +import java.nio.charset.Charset; +import java.util.ArrayList; +import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; +import javax.swing.ComboBoxModel; +import javax.swing.DefaultComboBoxModel; /** * @@ -64,6 +76,20 @@ public class FontPreviewDialog extends AppDialog { labelSample72.setText(text); } + private ComboBoxModel getModel() { + List sampleTexts = new ArrayList<>(); + BufferedReader br = new BufferedReader(new InputStreamReader(FontPreviewDialog.class.getResourceAsStream("/com/jpexs/decompiler/flash/tags/font/font_preview_samples.txt"), Utf8Helper.charset)); + String s; + try { + while ((s = br.readLine()) != null) { + sampleTexts.add(s); + } + } catch (IOException ex) { + Logger.getLogger(FontPreviewDialog.class.getName()).log(Level.SEVERE, "Cannot read font preview dialog sample texts", ex); + } + return new DefaultComboBoxModel<>(sampleTexts.toArray(new String[0])); + } + /** * This method is called from within the constructor to initialize the form. * WARNING: Do NOT modify this code. The content of this method is always @@ -200,7 +226,7 @@ public class FontPreviewDialog extends AppDialog { jScrollPane1.setViewportView(jPanel1); - comboBoxSampleTexts.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "The quick brown fox jumps over the lazy dog.", "Victor jagt zwölf Boxkämpfer quer über den großen Sylter Deich", "Nechť již hříšné saxofony ďáblů rozzvučí síň úděsnými tóny waltzu, tanga a quickstepu.", "Egy hűtlen vejét fülöncsípő, dühös mexikói úr ázik Quitóban.", "Mężny bądź, chroń pułk twój i sześć flag", "Pijamalı hasta yağız şoföre çabucak güvendi", "Любя, съешь щипцы, — вздохнёт мэр, — кайф жгуч", "Ξεσκεπάζω την ψυχοφθόρα βδελυγμία.", "עטלף אבק נס דרך מזגן שהתפוצץ כי חם.‎", " いろはにほへと ちりぬるを わかよたれそ つねならむ うゐのおくやま けふこえて あさきゆめみし ゑひもせすん", " " })); + comboBoxSampleTexts.setModel(getModel()); comboBoxSampleTexts.addItemListener(new java.awt.event.ItemListener() { public void itemStateChanged(java.awt.event.ItemEvent evt) { comboBoxSampleTextsItemStateChanged(evt); diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/font/font_preview_samples.txt b/trunk/src/com/jpexs/decompiler/flash/tags/font/font_preview_samples.txt new file mode 100644 index 000000000..2bf0abd93 --- /dev/null +++ b/trunk/src/com/jpexs/decompiler/flash/tags/font/font_preview_samples.txt @@ -0,0 +1,10 @@ +The quick brown fox jumps over the lazy dog. +Victor jagt zwölf Boxkämpfer quer über den großen Sylter Deich +Nechť již hříšné saxofony ďáblů rozzvučí síň úděsnými tóny waltzu, tanga a quickstepu. +Egy hűtlen vejét fülöncsípő, dühös mexikói úr ázik Quitóban. +Mężny bądź, chroń pułk twój i sześć flag +Pijamalı hasta yağız şoföre çabucak güvendi +Любя, съешь щипцы, — вздохнёт мэр, — кайф жгуч +Ξεσκεπάζω την ψυχοφθόρα βδελυγμία. +עטלף אבק נס דרך מזגן שהתפוצץ כי חם. +いろはにほへと ちりぬるを わかよたれそ つねならむ うゐのおくやま けふこえて あさきゆめみし ゑひもせすん