From kmorin@users.forge.codelutin.com Fri Mar 29 17:30:41 2013
From: kmorin@users.forge.codelutin.com
To: tutti-commits@list.forge.codelutin.com
Subject: [Tutti-commits] r713 - in
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing: content/cruise
content/operation util
Date: Fri, 29 Mar 2013 17:30:41 +0100
Message-ID: <20130329163041.6CD4B15BE2@nuiton.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6405718853161013247=="
--===============6405718853161013247==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Author: kmorin
Date: 2013-03-29 17:30:41 +0100 (Fri, 29 Mar 2013)
New Revision: 713
Url: http://forge.codelutin.com/projects/tutti/repository/revisions/713
Log:
use a scrollpane when the ui can be too high
Modified:
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruis=
e/EditCruiseUI.css
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruis=
e/EditCruiseUI.jaxx
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/opera=
tion/EditFishingOperationUI.css
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/opera=
tion/EditFishingOperationUI.jaxx
trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/Abstract=
TuttiUIHandler.java
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/conten=
t/cruise/EditCruiseUI.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/crui=
se/EditCruiseUI.css 2013-03-29 15:01:19 UTC (rev 712)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/crui=
se/EditCruiseUI.css 2013-03-29 16:30:41 UTC (rev 713)
@@ -54,6 +54,10 @@
_help: {"tutti.editCruise.help"};
}
=20
+#cruiseScrollPane {
+ _onlyVerticalScrollable: true;
+}
+
#nameLabel {
text: "tutti.editCruise.field.name";
labelFor: {nameField};
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/conten=
t/cruise/EditCruiseUI.jaxx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/crui=
se/EditCruiseUI.jaxx 2013-03-29 15:01:19 UTC (rev 712)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/crui=
se/EditCruiseUI.jaxx 2013-03-29 16:30:41 UTC (rev 713)
@@ -92,157 +92,156 @@
constructorParams=3D'getHandler().getContext(), getMod=
el()'/>
=20
-
+
+
=20
-
-
- |
-
- |
-
-
- |
-
-
- |
-
-
- |
-
+
+
+ |
+
+ |
+
+
+ |
+
+
+ |
+
+
+ |
+
=20
-
-
- |
-
- |
-
-
- |
-
-
- |
-
-
+ |
+
=20
-
-
- |
-
- |
-
-
- |
-
-
- |
-
-
+
+ |
+
+
+ |
+
+
+ |
+
+
- |
-
-
- |
-
+
+
+ |
+
+ |
+
+
+ |
+
+
+ |
+
=20
-
-
- |
-
- |
-
-
- |
-
-
- |
-
+
+
+ |
+
+ |
+
+
+ |
+
+
+ |
+
=20
-
-
- |
-
- |
-
-
- |
-
-
-
-
-
-
- |
-
-
- |
-
- |
-
-
+
+
+ |
+
+ |
+
+
+ |
+
+
+
+
+
+
+ |
+
+
+ |
+
+ |
+
+
=20
- |
-
-
- |
-
- |
-
+ |
+
+
+ |
+
+ |
+
=20
-
-
- |
-
-
-
-
- |
-
+
+
+ |
+
+
+
+
+ |
+
=20
-
-
- |
-
- |
-
+
+
+ |
+
+ |
+
=20
-
-
- |
-
-
-
-
- |
-
-
+
+
=20
+
+
+
+
+
+
\ No newline at end of file
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/conten=
t/operation/EditFishingOperationUI.css
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/oper=
ation/EditFishingOperationUI.css 2013-03-29 15:01:19 UTC (rev 712)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/oper=
ation/EditFishingOperationUI.css 2013-03-29 16:30:41 UTC (rev 713)
@@ -70,6 +70,10 @@
borderPainted: false;
}
=20
+#fishingOperationTabScrollPane {
+ _onlyVerticalScrollable: true;
+}
+
#fishingOperationAttachmentsButton {
enabled: {model.getId() !=3D null};
toolTipText: "tutti.editFishingOperation.action.attachments.tip";
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/conten=
t/operation/EditFishingOperationUI.jaxx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/oper=
ation/EditFishingOperationUI.jaxx 2013-03-29 15:01:19 UTC (rev 712)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/oper=
ation/EditFishingOperationUI.jaxx 2013-03-29 16:30:41 UTC (rev 713)
@@ -158,344 +158,344 @@
-
-
+
-
=20
Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/A=
bstractTuttiUIHandler.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/Abstrac=
tTuttiUIHandler.java 2013-03-29 15:01:19 UTC (rev 712)
+++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/Abstrac=
tTuttiUIHandler.java 2013-03-29 16:30:41 UTC (rev 713)
@@ -63,29 +63,9 @@
import org.nuiton.util.decorator.JXPathDecorator;
import org.nuiton.validator.bean.simple.SimpleBeanValidator;
=20
-import javax.swing.AbstractAction;
-import javax.swing.AbstractButton;
-import javax.swing.Action;
-import javax.swing.DefaultComboBoxModel;
-import javax.swing.JComboBox;
-import javax.swing.JComponent;
-import javax.swing.JDialog;
-import javax.swing.JLabel;
-import javax.swing.JList;
-import javax.swing.JOptionPane;
-import javax.swing.JPopupMenu;
-import javax.swing.JRootPane;
-import javax.swing.JSpinner;
-import javax.swing.JTable;
-import javax.swing.JTextField;
-import javax.swing.KeyStroke;
-import javax.swing.ListCellRenderer;
-import javax.swing.ListSelectionModel;
-import javax.swing.SwingUtilities;
+import javax.swing.*;
import javax.swing.border.LineBorder;
-import javax.swing.event.ListSelectionEvent;
-import javax.swing.event.TableModelEvent;
-import javax.swing.event.TableModelListener;
+import javax.swing.event.*;
import javax.swing.table.TableCellEditor;
import javax.swing.table.TableCellRenderer;
import javax.swing.table.TableColumnModel;
@@ -405,6 +385,9 @@
} else if (component instanceof AbstractButton) {
=20
initButton((AbstractButton) component);
+ } else if (component instanceof JScrollPane) {
+
+ initScrollPane((JScrollPane) component);
}
}
}
@@ -594,6 +577,24 @@
}
}
=20
+ protected void initScrollPane(JScrollPane scrollPane) {
+ Boolean onlyVerticalScrollable =3D (Boolean) scrollPane.getClientPro=
perty("onlyVerticalScrollable");
+ if (onlyVerticalScrollable !=3D null && onlyVerticalScrollable) {
+ scrollPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORI=
ZONTAL_SCROLLBAR_NEVER);
+ scrollPane.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTIC=
AL_SCROLLBAR_AS_NEEDED);
+
+ final JViewport viewport =3D scrollPane.getViewport();
+ viewport.addChangeListener(new ChangeListener() {
+ @Override
+ public void stateChanged(ChangeEvent e) {
+ Dimension newDimension =3D new Dimension(viewport.getExt=
entSize().width,
+ viewport.getViewSize().height);
+ viewport.setViewSize(newDimension);
+ }
+ });
+ }
+ }
+
protected boolean isAutoSelectOnFocus(JComponent comp) {
Object selectOnFocus =3D comp.getClientProperty("selectOnFocus");
return selectOnFocus !=3D null && Boolean.valueOf(selectOnFocus.toSt=
ring());
@@ -955,4 +956,5 @@
}
}
}
+
}
--===============6405718853161013247==--