Commit d27f6a32 authored by ludwig's avatar ludwig

-> fixed ant built

-> fixed umlaut stuff

git-svn-id: https://www2.in.tum.de/repos/ttt/trunk@71 0463f305-d864-43cb-8a47-61cf597d4139
parent f5b8084b
......@@ -56,13 +56,13 @@
source="6" debug="on" encoding="Cp1252" >
<classpath refid="libraries"/>
</javac>
<copy todir="${classes}/ttt/resources"><fileset dir="${java}/ttt/resources"></fileset></copy>
</target>
<!-- Packs the classes into single .jar files -->
<target name="pack" depends="classes">
<jar jarfile="${dist}/ttt.jar" basedir="${classes}">
<fileset dir="${classes}/ttt/resources"/>
<jar jarfile="${dist}/ttt.jar" basedir="${classes}">
<fileset dir="${java}/resources"/>
<manifest>
<attribute name="Main-Class" value="ttt/TTT" />
<attribute name="Class-Path" value="itext-1.4.8.jar jsch-0.1.32-patched.jar swing-layout-1.0.2.jar jmf-2.1.1e.jar mp3plugin.jar lti-civil.jar v4l4j.jar" />
......@@ -70,6 +70,7 @@
</jar>
<copy todir="${dist}"><fileset dir="${lib}"></fileset></copy>
<copy todir="${dist}"><fileset dir="${native}"></fileset></copy>
<copy todir="${dist}"><fileset dir="${java}/resources"></fileset></copy>
<copy todir="${dist}" file="run.sh" />
<zip destfile="./ttt.zip" basedir="${dist}" update="true"/>
</target>
......
......@@ -1086,7 +1086,7 @@ public class TTT extends JFrame {
setSize(width, height);
setExtendedState(MAXIMIZED_BOTH);
setIconImage(new ImageIcon(getClass().getResource("../resources/ttt16.png")).getImage());
setIconImage(getIcon("ttt16.png").getImage());
setVisible(true);
getContentPane().setBackground(Color.WHITE);
......@@ -1437,8 +1437,12 @@ public class TTT extends JFrame {
return enabledNativeLookAndFeel;
}
public static ImageIcon getIcon(String filename) {
return new ImageIcon( TTT.class.getResource("../resources/" + filename));
public static ImageIcon getIcon(String filename) {
System.out.println("TTT.class.getResource(Constants.class): " + TTT.class.getResource("Constants.class").toString());
String workaround = TTT.class.getResource("Constants.class").toString().replaceFirst("ttt/Constants.class", "resources/");
System.out.println(workaround + filename);
return new ImageIcon( workaround + filename);
}
}
......@@ -47,7 +47,7 @@ public class EditorDisplayPanel extends JPanel {
new MarkerDisplayComponent(markers, playbackController);
tabbedPane.add("Marker", markerDisplay);
tabbedPane.setToolTipTextAt(3, "View/edit file processing divisions");
tabbedPane.setBackgroundAt(3, Color.LIGHT_GRAY);
tabbedPane.setBackgroundAt(3, Color.RED);
setLayout(new BorderLayout());
add(tabbedPane, BorderLayout.CENTER);
......
......@@ -47,16 +47,16 @@ public class SimpleSearch {
if (Character.isLetterOrDigit(ch)) {
if (umlaut_reduction) {
switch (ch) {
case '' :
case 'ä' :
stringBuffer.append("ae");
break;
case '' :
case 'ö' :
stringBuffer.append("oe");
break;
case '' :
case 'ü' :
stringBuffer.append("ue");
break;
case '' :
case 'ß' :
stringBuffer.append("ss");
break;
default :
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment