Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: f8948144 by tchemit at 2020-04-11T10:08:44+02:00 [V8] Problèmes d'affichage de formulaires - Closes #1420 - - - - - 15 changed files: - client-core/src/main/java/fr/ird/observe/client/main/ObserveMainUI.jaxx - client-datasource-editor-ll/src/main/i18n/getters/jaxx.getter - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/common/TripUI.jaxx - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/landing/LandingUI.jaxx - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/landing/LandingUI.jcss - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/ActivitySampleUI.jcss - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/SetGlobalCompositionUI.jaxx - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/SetUI.jaxx - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/TripSampleUI.jaxx - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/TripSampleUI.jcss - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/ActivityUI.jaxx - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/BranchlineUI.jaxx - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/SetGlobalCompositionUI.jaxx - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/SetUI.jaxx - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/TdrUI.jaxx Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/main/ObserveMainUI.jaxx ===================================== @@ -18,7 +18,7 @@ #L% --> -<JFrame id='mainFrame' preferredSize="{new Dimension(1280,1024)}" onWindowClosing='CloseApplicationAction.run(this, CloseApplicationAction.class)'> +<JFrame id='mainFrame' preferredSize="{new Dimension(1680, 1050)}" minimumSize="{new Dimension(1366, 768)}" onWindowClosing='CloseApplicationAction.run(this, CloseApplicationAction.class)'> <import> fr.ird.observe.client.util.JMenuWithAccelerator ===================================== client-datasource-editor-ll/src/main/i18n/getters/jaxx.getter ===================================== @@ -81,7 +81,6 @@ observe.data.ll.landing.TripLonglineLanding.action.goToSelected.tip observe.data.ll.landing.TripLonglineLanding.action.reopen.tip observe.data.ll.landing.TripLonglineLanding.action.reopenSelected observe.data.ll.landing.TripLonglineLanding.action.reopenSelected.tip -observe.data.ll.landing.TripLonglineLanding.comment observe.data.ll.landing.TripLonglineLanding.list observe.data.ll.landing.TripLonglineLanding.list.message.none observe.data.ll.landing.TripLonglineLanding.titles @@ -218,7 +217,6 @@ observe.data.ll.logbook.TripSampleList.action.goToSelected.tip observe.data.ll.logbook.TripSampleList.action.reopen.tip observe.data.ll.logbook.TripSampleList.action.reopenSelected observe.data.ll.logbook.TripSampleList.action.reopenSelected.tip -observe.data.ll.logbook.TripSampleList.comment observe.data.ll.logbook.TripSampleList.list observe.data.ll.logbook.TripSampleList.list.message.none observe.data.ll.logbook.TripSampleList.titles ===================================== client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/common/TripUI.jaxx ===================================== @@ -237,6 +237,7 @@ </JPanel> </tab> <tab id='observationsTab' i18nProperty=""> + <JScrollPane id="observationsTabScrollPane"> <Table fill="both"> <!-- observationMethod --> @@ -286,9 +287,11 @@ </cell> </row> </Table> + </JScrollPane> </tab> <tab id='logbookTab' i18nProperty=""> + <JScrollPane id="logbookTabScrollPane"> <Table fill="both"> <!-- logbookDataEntryOperator --> @@ -318,6 +321,7 @@ </cell> </row> </Table> + </JScrollPane> </tab> <tab id="mapTab" i18nProperty=""> <TripMapUI id="tripMap"/> ===================================== client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/landing/LandingUI.jaxx ===================================== @@ -70,9 +70,8 @@ <JTabbedPane id='mainTabbedPane'> <tab id='caracteristicsTab' i18nProperty=""> - - <JPanel layout='{new BorderLayout()}'> - <Table fill='both' constraints='BorderLayout.NORTH' insets="0"> + <JScrollPane id="caracteristicsTabScrollPane"> + <Table fill='both' insets="0"> <!-- dataSource --> <row> @@ -152,7 +151,7 @@ </cell> </row> </Table> - </JPanel> + </JScrollPane> </tab> <tab id='landingPartTab' i18nProperty=""> ===================================== client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/landing/LandingUI.jcss ===================================== @@ -44,10 +44,6 @@ _tab:{"landingPartTab"}; } -#comment { - title:"observe.data.ll.landing.TripLonglineLanding.comment"; -} - #open { _toolTipText:{t("observe.data.ll.landing.TripLonglineLanding.action.reopen.tip")}; } ===================================== client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/ActivitySampleUI.jcss ===================================== @@ -29,10 +29,6 @@ visible:{!model.isReadingMode()}; } -#comment { - title:"observe.data.ll.logbook.TripSampleList.comment"; -} - #move { enabled:{model.isUpdatingMode() && !model.isModified()}; } ===================================== client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/SetGlobalCompositionUI.jaxx ===================================== @@ -104,7 +104,7 @@ <!-- mitigationType --> <JPanel layout='{new BorderLayout()}'> - <Table fill='both' constraints='BorderLayout.NORTH'> + <Table fill='both' constraints='BorderLayout.CENTER'> <row> <cell weighty="1" weightx="1"> <FilterableDoubleList id='mitigationType' genericType='MitigationTypeReference'/> ===================================== client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/SetUI.jaxx ===================================== @@ -84,10 +84,11 @@ <Table insets="0" fill="both" constraints='BorderLayout.CENTER'> <row> - <cell anchor="north"> + <cell anchor="north" weighty="1"> <JTabbedPane id='mainTabbedPane'> <tab id='settingTab' i18nProperty=""> - <JPanel layout='{new BorderLayout()}'> + <JScrollPane id="settingTabScrollPane"> + <JPanel layout='{new BorderLayout()}'> <Table fill='both' constraints='BorderLayout.NORTH'> <!-- homeId --> @@ -151,11 +152,12 @@ </cell> </row> </Table> - </JPanel> - + </JPanel> + </JScrollPane> </tab> <tab id='settingCaracteristicsTab' i18nProperty=""> + <JScrollPane id="settingCaracteristicsTabScrollPane"> <Table fill='both'> <!-- setting vessel speed --> @@ -310,10 +312,12 @@ </cell> </row> </Table> + </JScrollPane> </tab> <tab id='lightsticksTab' i18nProperty=""> - <JPanel layout='{new BorderLayout()}'> + <JScrollPane id="lightsticksTabScrollPane"> + <JPanel layout='{new BorderLayout()}'> <Table fill='both' constraints='BorderLayout.NORTH'> <!-- lightsticksUsed --> <row> @@ -349,12 +353,13 @@ </cell> </row> </Table> - </JPanel> + </JPanel> + </JScrollPane> </tab> <tab id='haulingTab' i18nProperty=""> - - <JPanel layout='{new BorderLayout()}'> + <JScrollPane id="haulingTabScrollPane"> + <JPanel layout='{new BorderLayout()}'> <Table fill='both' constraints='BorderLayout.NORTH'> <!-- hauling same direction as setting --> @@ -405,14 +410,15 @@ </cell> </row> </Table> - </JPanel> + </JPanel> + </JScrollPane> </tab> </JTabbedPane> </cell> </row> <row> - <cell fill="both" weighty="1" weightx="1"> + <cell fill="both" weightx="1"> <BigTextEditor id="comment"/> </cell> </row> ===================================== client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/TripSampleUI.jaxx ===================================== @@ -70,9 +70,8 @@ <JTabbedPane id='mainTabbedPane'> <tab id='caracteristicsTab' i18nProperty=""> - - <JPanel layout='{new BorderLayout()}'> - <Table fill='both' constraints='BorderLayout.NORTH' insets="0"> + <JScrollPane id="caracteristicsTabScrollPane"> + <Table fill='both' insets="0"> <!-- timeStamp --> <row> @@ -93,7 +92,7 @@ </cell> </row> </Table> - </JPanel> + </JScrollPane> </tab> <tab id='samplePartTab' i18nProperty=""> ===================================== client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/TripSampleUI.jcss ===================================== @@ -48,10 +48,6 @@ _tab:{"samplePartTab"}; } -#comment { - title:"observe.data.ll.logbook.TripSampleList.comment"; -} - #open { _toolTipText:{t("observe.data.ll.logbook.TripSampleList.action.reopen.tip")}; } ===================================== client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/ActivityUI.jaxx ===================================== @@ -72,7 +72,8 @@ <!-- formulaire --> <JPanel id="body"> - <Table fill='both' constraints="BorderLayout.CENTER"> + <JScrollPane id="bodyScrollPane" constraints="BorderLayout.CENTER"> + <Table fill='both'> <!-- date - time --> <row> @@ -135,6 +136,7 @@ </cell> </row> </Table> + </JScrollPane> </JPanel> <!-- surcharge des actions (pour appliquer la css specifique) --> ===================================== client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/BranchlineUI.jaxx ===================================== @@ -69,12 +69,13 @@ public void edit(BranchlineDto branchline) { getHandler().edit(branchline); } <Table insets="0" fill="both" constraints='BorderLayout.CENTER'> <row> - <cell anchor="north" weightx="1"> + <cell anchor="north" weightx="1" weighty="1"> <JTabbedPane id='subTabbedPane'> <tab id='generalTab' i18nProperty=""> - <JPanel layout='{new BorderLayout()}'> - <Table fill="both" constraints='BorderLayout.CENTER'> + <JScrollPane id="generalTabScrollPane"> + + <Table fill="both"> <!-- topType --> <row> @@ -156,12 +157,13 @@ public void edit(BranchlineDto branchline) { getHandler().edit(branchline); } </row> </Table> - </JPanel> + </JScrollPane> </tab> <tab id='hookAndBaitTab' i18nProperty=""> - <JPanel layout='{new BorderLayout()}'> - <Table fill="both" constraints='BorderLayout.CENTER'> + <JScrollPane id="hookAndBaitTabScrollPane"> + <JPanel layout='{new BorderLayout()}'> + <Table fill="both" constraints='BorderLayout.CENTER'> <!-- HookType --> <row> @@ -224,13 +226,14 @@ public void edit(BranchlineDto branchline) { getHandler().edit(branchline); } </row> </Table> - </JPanel> + </JPanel> + </JScrollPane> </tab> </JTabbedPane> </cell> </row> <row> - <cell weighty="1"> + <cell> <BigTextEditor id="comment"/> </cell> </row> ===================================== client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/SetGlobalCompositionUI.jaxx ===================================== @@ -106,7 +106,7 @@ <!-- mitigationType --> <JPanel layout='{new BorderLayout()}'> - <Table fill='both' constraints='BorderLayout.NORTH'> + <Table fill='both' constraints='BorderLayout.CENTER'> <row> <cell weighty="1" weightx="1"> <FilterableDoubleList id='mitigationType' genericType='MitigationTypeReference'/> ===================================== client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/SetUI.jaxx ===================================== @@ -83,10 +83,11 @@ <Table insets="0" fill="both" constraints='BorderLayout.CENTER'> <row> - <cell anchor="north"> + <cell anchor="north" weighty="1" fill="both"> <JTabbedPane id='mainTabbedPane'> <tab id='settingTab' i18nProperty=""> - <JPanel layout='{new BorderLayout()}'> + <JScrollPane id="settingTabScrollPane"> + <JPanel layout='{new BorderLayout()}'> <Table fill='both' constraints='BorderLayout.NORTH'> <!-- homeId --> @@ -141,13 +142,14 @@ </Table> </cell> </row> - </Table> - </JPanel> + </JPanel> + </JScrollPane> </tab> <tab id='settingCaracteristicsTab' i18nProperty=""> + <JScrollPane id="settingCaracteristicTabScrollPane"> <Table fill='both'> <!-- setting shape --> @@ -310,11 +312,12 @@ </cell> </row> </Table> + </JScrollPane> </tab> <tab id='haulingTab' i18nProperty=""> - - <JPanel layout='{new BorderLayout()}'> + <JScrollPane id="haulingTabScrollPane"> + <JPanel layout='{new BorderLayout()}'> <Table fill='both' constraints='BorderLayout.NORTH'> <!-- hauling same direction as setting --> @@ -365,14 +368,15 @@ </cell> </row> </Table> - </JPanel> + </JPanel> + </JScrollPane> </tab> </JTabbedPane> </cell> </row> <row> - <cell fill="both" weighty="1" weightx="1"> + <cell fill="both" weightx="1"> <BigTextEditor id="comment"/> </cell> </row> ===================================== client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/TdrUI.jaxx ===================================== @@ -354,7 +354,7 @@ <!-- species --> <JPanel layout='{new BorderLayout()}'> - <Table fill='both' constraints='BorderLayout.NORTH'> + <Table fill='both' constraints='BorderLayout.CENTER'> <row> <cell weighty="1" weightx="1"> <FilterableDoubleList id='species' genericType='SpeciesReference'/> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/f8948144066823a14eac387288... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/f8948144066823a14eac387288... You're receiving this email because of your account on gitlab.com.