Commit 66cb1322 authored by angermue's avatar angermue

The revision includes several smaller changes:

- PostProcessorPanel: new title "Dozentenvideo" for camCheckBox
- PostProcessorPanel: camCheckBox is only enabled if there is a pjpg file
- PostProcessorPanel: is resizeable now so that buttons are accessible when using a lower screen resolution
- TTT.addInternalFrameCenter: correct centering of frames
- usage of the ttt icon
 

git-svn-id: https://www2.in.tum.de/repos/ttt/trunk@40 0463f305-d864-43cb-8a47-61cf597d4139
parent 3083cfe8
......@@ -93,7 +93,7 @@
<Component id="resolutionField" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="titleField" alignment="0" min="-2" pref="433" max="-2" attributes="0"/>
</Group>
<EmptySpace pref="112" max="32767" attributes="0"/>
<EmptySpace pref="177" max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
......@@ -257,25 +257,21 @@
<Component id="mp4CheckBox" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="camCheckBox" alignment="0" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
<EmptySpace min="-2" pref="28" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="ocrStatusField" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="thumbnailsStatusField" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="htmlStatusField" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="pdfStatusField" alignment="0" min="-2" max="-2" attributes="0"/>
<Group type="102" attributes="0">
<Group type="103" groupAlignment="0" attributes="0">
<Component id="thumbnailsStatusField" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="htmlStatusField" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="mp3StatusField" min="-2" max="-2" attributes="0"/>
<Component id="flashStatusField" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="mp4StatusField" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="camStatusField" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace pref="435" max="32767" attributes="0"/>
<Group type="103" groupAlignment="1" attributes="0">
<Component id="createHelpButton" linkSize="4" min="-2" max="-2" attributes="1"/>
<Component id="createButton" linkSize="4" alignment="1" min="-2" max="-2" attributes="1"/>
</Group>
</Group>
<Component id="ocrStatusField" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="mp3StatusField" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="flashStatusField" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="mp4StatusField" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="camStatusField" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace pref="405" max="32767" attributes="0"/>
<Group type="103" groupAlignment="1" attributes="0">
<Component id="createHelpButton" linkSize="4" min="-2" max="-2" attributes="1"/>
<Component id="createButton" linkSize="4" alignment="1" min="-2" max="-2" attributes="1"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
</Group>
......@@ -330,7 +326,7 @@
<Component id="camCheckBox" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="camStatusField" alignment="3" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace pref="22" max="32767" attributes="0"/>
<EmptySpace pref="24" max="32767" attributes="0"/>
</Group>
<Group type="102" alignment="1" attributes="0">
<EmptySpace max="-2" attributes="0"/>
......@@ -352,7 +348,6 @@
<EmptyBorder bottom="0" left="0" right="0" top="0"/>
</Border>
</Property>
<Property name="opaque" type="boolean" value="false"/>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="htmlCheckBox">
......@@ -364,7 +359,6 @@
<EmptyBorder bottom="0" left="0" right="0" top="0"/>
</Border>
</Property>
<Property name="opaque" type="boolean" value="false"/>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="pdfCheckBox">
......@@ -376,7 +370,6 @@
<EmptyBorder bottom="0" left="0" right="0" top="0"/>
</Border>
</Property>
<Property name="opaque" type="boolean" value="false"/>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="ocrCheckBox">
......@@ -388,7 +381,6 @@
<EmptyBorder bottom="0" left="0" right="0" top="0"/>
</Border>
</Property>
<Property name="opaque" type="boolean" value="false"/>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="flashCheckBox">
......@@ -400,7 +392,6 @@
<EmptyBorder bottom="0" left="0" right="0" top="0"/>
</Border>
</Property>
<Property name="opaque" type="boolean" value="false"/>
</Properties>
</Component>
<Component class="javax.swing.JButton" name="createButton">
......@@ -459,7 +450,6 @@
<EmptyBorder bottom="0" left="0" right="0" top="0"/>
</Border>
</Property>
<Property name="opaque" type="boolean" value="false"/>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="mp3StatusField">
......@@ -476,7 +466,6 @@
<EmptyBorder bottom="0" left="0" right="0" top="0"/>
</Border>
</Property>
<Property name="opaque" type="boolean" value="false"/>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="mp4StatusField">
......@@ -487,13 +476,12 @@
<Component class="javax.swing.JCheckBox" name="camCheckBox">
<Properties>
<Property name="selected" type="boolean" value="true"/>
<Property name="text" type="java.lang.String" value="Cam"/>
<Property name="text" type="java.lang.String" value="Dozentenvideo"/>
<Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
<Border info="org.netbeans.modules.form.compat2.border.EmptyBorderInfo">
<EmptyBorder bottom="0" left="0" right="0" top="0"/>
</Border>
</Property>
<Property name="opaque" type="boolean" value="false"/>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="camStatusField">
......@@ -532,7 +520,7 @@
</Group>
<EmptySpace max="-2" attributes="0"/>
<Component id="openSearchbaseFileDialogButton" min="-2" max="-2" attributes="0"/>
<EmptySpace pref="117" max="32767" attributes="0"/>
<EmptySpace pref="150" max="32767" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="importSearchbaseButton" linkSize="5" alignment="1" min="-2" max="-2" attributes="0"/>
<Component id="searchHelpButton" linkSize="5" alignment="1" min="-2" max="-2" attributes="0"/>
......@@ -668,12 +656,12 @@
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
<Component id="userField" linkSize="6" min="-2" max="-2" attributes="0"/>
<EmptySpace pref="295" max="32767" attributes="0"/>
<EmptySpace pref="322" max="32767" attributes="0"/>
<Component id="publishHelpButton" linkSize="7" min="-2" max="-2" attributes="0"/>
</Group>
<Group type="102" alignment="0" attributes="0">
<Component id="pathField" linkSize="6" min="-2" max="-2" attributes="0"/>
<EmptySpace pref="295" max="32767" attributes="0"/>
<EmptySpace pref="322" max="32767" attributes="0"/>
<Component id="publishButton" linkSize="7" min="-2" max="-2" attributes="0"/>
</Group>
<Component id="serverField" linkSize="6" alignment="0" min="-2" pref="238" max="-2" attributes="0"/>
......
This diff is collapsed.
......@@ -46,6 +46,7 @@ import java.awt.event.MouseEvent;
import java.awt.event.MouseMotionListener;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
import java.awt.image.BufferedImage;
import java.beans.PropertyVetoException;
import java.io.File;
import java.io.IOException;
......@@ -498,8 +499,8 @@ public class TTT extends JFrame {
// internal frame
frame.setContentPane(new PostProcessorPanel(recording));
frame.pack();
frame.setVisible(true);
frame.setResizable(true);
// post processing
TTT ttt = getInstance();
ttt.showTTT();
......@@ -1039,7 +1040,7 @@ public class TTT extends JFrame {
setSize(width, height);
setExtendedState(MAXIMIZED_BOTH);
setIconImage(Toolkit.getDefaultToolkit().getImage(ttt.getClass().getResource("resources/ttt16.png")));
setVisible(true);
getContentPane().setBackground(Color.WHITE);
showMemoryMonitor(false);
......@@ -1091,9 +1092,12 @@ public class TTT extends JFrame {
private int position;
void addInternalFrameCentered(JInternalFrame frame) {
frame.pack();
frame.pack();
frame.setFrameIcon(new ImageIcon(getClass().getResource("resources/ttt16.png")));
frame.setVisible(true);
Rectangle rect = TTT.getInstance().getBounds();
Rectangle rect = TTT.getInstance().desktop.getBounds();
TTT.getInstance().addInternalFrame(frame, rect.width / 2 - frame.getWidth() / 2,
rect.height / 2 - frame.getHeight() / 2, 10);
// TODO: think about layering
......@@ -1118,7 +1122,7 @@ public class TTT extends JFrame {
height = ttt.desktop.getHeight() - y;
if (width != internalFrame.getWidth() || height != internalFrame.getHeight())
internalFrame.setSize(width, height);
internalFrame.setFrameIcon(new ImageIcon(getClass().getResource("resources/ttt16.png")));
ttt.desktop.add(internalFrame);
try {
internalFrame.setSelected(true);
......
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