Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe

Commits:

15 changed files:

Changes:

  • client-core/src/main/java/fr/ird/observe/client/main/ObserveMainUI.jaxx
    ... ... @@ -18,7 +18,7 @@
    18 18 
       #L%
    19 19 
       -->
    20 20
    21 
    -<JFrame id='mainFrame' preferredSize="{new Dimension(1280,1024)}" onWindowClosing='CloseApplicationAction.run(this, CloseApplicationAction.class)'>
    21 
    +<JFrame id='mainFrame' preferredSize="{new Dimension(1680, 1050)}" minimumSize="{new Dimension(1366, 768)}" onWindowClosing='CloseApplicationAction.run(this, CloseApplicationAction.class)'>
    22 22
    23 23 
       <import>
    24 24 
         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
    81 81 
     observe.data.ll.landing.TripLonglineLanding.action.reopen.tip
    82 82 
     observe.data.ll.landing.TripLonglineLanding.action.reopenSelected
    83 83 
     observe.data.ll.landing.TripLonglineLanding.action.reopenSelected.tip
    84 
    -observe.data.ll.landing.TripLonglineLanding.comment
    85 84 
     observe.data.ll.landing.TripLonglineLanding.list
    86 85 
     observe.data.ll.landing.TripLonglineLanding.list.message.none
    87 86 
     observe.data.ll.landing.TripLonglineLanding.titles
    ... ... @@ -218,7 +217,6 @@ observe.data.ll.logbook.TripSampleList.action.goToSelected.tip
    218 217 
     observe.data.ll.logbook.TripSampleList.action.reopen.tip
    219 218 
     observe.data.ll.logbook.TripSampleList.action.reopenSelected
    220 219 
     observe.data.ll.logbook.TripSampleList.action.reopenSelected.tip
    221 
    -observe.data.ll.logbook.TripSampleList.comment
    222 220 
     observe.data.ll.logbook.TripSampleList.list
    223 221 
     observe.data.ll.logbook.TripSampleList.list.message.none
    224 222 
     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 @@
    237 237 
             </JPanel>
    238 238 
           </tab>
    239 239 
           <tab id='observationsTab' i18nProperty="">
    240 
    +        <JScrollPane id="observationsTabScrollPane">
    240 241 
             <Table fill="both">
    241 242
    242 243 
               <!-- observationMethod -->
    ... ... @@ -286,9 +287,11 @@
    286 287 
                 </cell>
    287 288 
               </row>
    288 289 
             </Table>
    290 
    +        </JScrollPane>
    289 291 
           </tab>
    290 292
    291 293 
           <tab id='logbookTab' i18nProperty="">
    294 
    +        <JScrollPane id="logbookTabScrollPane">
    292 295 
             <Table fill="both">
    293 296
    294 297 
               <!-- logbookDataEntryOperator -->
    ... ... @@ -318,6 +321,7 @@
    318 321 
                 </cell>
    319 322 
               </row>
    320 323 
             </Table>
    324 
    +        </JScrollPane>
    321 325 
           </tab>
    322 326 
           <tab id="mapTab" i18nProperty="">
    323 327 
             <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 @@
    70 70 
               <JTabbedPane id='mainTabbedPane'>
    71 71
    72 72 
                 <tab id='caracteristicsTab' i18nProperty="">
    73 
    -
    74 
    -              <JPanel layout='{new BorderLayout()}'>
    75 
    -                <Table fill='both' constraints='BorderLayout.NORTH' insets="0">
    73 
    +              <JScrollPane id="caracteristicsTabScrollPane">
    74 
    +                <Table fill='both' insets="0">
    76 75
    77 76 
                       <!-- dataSource -->
    78 77 
                       <row>
    ... ... @@ -152,7 +151,7 @@
    152 151 
                         </cell>
    153 152 
                       </row>
    154 153 
                     </Table>
    155 
    -              </JPanel>
    154 
    +              </JScrollPane>
    156 155 
                 </tab>
    157 156
    158 157 
                 <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 @@
    44 44 
      _tab:{"landingPartTab"};
    45 45 
     }
    46 46
    47 
    -#comment {
    48 
    -  title:"observe.data.ll.landing.TripLonglineLanding.comment";
    49 
    -}
    50 
    -
    51 47 
     #open {
    52 48 
       _toolTipText:{t("observe.data.ll.landing.TripLonglineLanding.action.reopen.tip")};
    53 49 
     }

  • client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/ActivitySampleUI.jcss
    ... ... @@ -29,10 +29,6 @@
    29 29 
       visible:{!model.isReadingMode()};
    30 30 
     }
    31 31
    32 
    -#comment {
    33 
    -  title:"observe.data.ll.logbook.TripSampleList.comment";
    34 
    -}
    35 
    -
    36 32 
     #move {
    37 33 
       enabled:{model.isUpdatingMode() && !model.isModified()};
    38 34 
     }

  • client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/SetGlobalCompositionUI.jaxx
    ... ... @@ -104,7 +104,7 @@
    104 104
    105 105 
                   <!-- mitigationType -->
    106 106 
                   <JPanel layout='{new BorderLayout()}'>
    107 
    -                <Table fill='both' constraints='BorderLayout.NORTH'>
    107 
    +                <Table fill='both' constraints='BorderLayout.CENTER'>
    108 108 
                       <row>
    109 109 
                         <cell weighty="1" weightx="1">
    110 110 
                           <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 @@
    84 84
    85 85 
         <Table insets="0" fill="both" constraints='BorderLayout.CENTER'>
    86 86 
           <row>
    87 
    -        <cell anchor="north">
    87 
    +        <cell anchor="north" weighty="1">
    88 88 
               <JTabbedPane id='mainTabbedPane'>
    89 89 
                 <tab id='settingTab' i18nProperty="">
    90 
    -              <JPanel layout='{new BorderLayout()}'>
    90 
    +              <JScrollPane id="settingTabScrollPane">
    91 
    +                <JPanel layout='{new BorderLayout()}'>
    91 92 
                     <Table fill='both' constraints='BorderLayout.NORTH'>
    92 93
    93 94 
                       <!-- homeId -->
    ... ... @@ -151,11 +152,12 @@
    151 152 
                         </cell>
    152 153 
                       </row>
    153 154 
                     </Table>
    154 
    -              </JPanel>
    155 
    -
    155 
    +                </JPanel>
    156 
    +              </JScrollPane>
    156 157 
                 </tab>
    157 158
    158 159 
                 <tab id='settingCaracteristicsTab' i18nProperty="">
    160 
    +              <JScrollPane id="settingCaracteristicsTabScrollPane">
    159 161 
                   <Table fill='both'>
    160 162
    161 163 
                     <!-- setting vessel speed -->
    ... ... @@ -310,10 +312,12 @@
    310 312 
                       </cell>
    311 313 
                     </row>
    312 314 
                   </Table>
    315 
    +              </JScrollPane>
    313 316 
                 </tab>
    314 317
    315 318 
                 <tab id='lightsticksTab' i18nProperty="">
    316 
    -              <JPanel layout='{new BorderLayout()}'>
    319 
    +              <JScrollPane id="lightsticksTabScrollPane">
    320 
    +                <JPanel layout='{new BorderLayout()}'>
    317 321 
                     <Table fill='both' constraints='BorderLayout.NORTH'>
    318 322 
                       <!-- lightsticksUsed -->
    319 323 
                       <row>
    ... ... @@ -349,12 +353,13 @@
    349 353 
                         </cell>
    350 354 
                       </row>
    351 355 
                     </Table>
    352 
    -              </JPanel>
    356 
    +                </JPanel>
    357 
    +              </JScrollPane>
    353 358 
                 </tab>
    354 359
    355 360 
                 <tab id='haulingTab' i18nProperty="">
    356 
    -
    357 
    -              <JPanel layout='{new BorderLayout()}'>
    361 
    +              <JScrollPane id="haulingTabScrollPane">
    362 
    +                <JPanel layout='{new BorderLayout()}'>
    358 363 
                     <Table fill='both' constraints='BorderLayout.NORTH'>
    359 364
    360 365 
                       <!-- hauling same direction as setting -->
    ... ... @@ -405,14 +410,15 @@
    405 410 
                         </cell>
    406 411 
                       </row>
    407 412 
                     </Table>
    408 
    -              </JPanel>
    413 
    +                </JPanel>
    414 
    +              </JScrollPane>
    409 415 
                 </tab>
    410 416 
               </JTabbedPane>
    411 417 
             </cell>
    412 418 
           </row>
    413 419
    414 420 
           <row>
    415 
    -        <cell fill="both" weighty="1" weightx="1">
    421 
    +        <cell fill="both" weightx="1">
    416 422 
               <BigTextEditor id="comment"/>
    417 423 
             </cell>
    418 424 
           </row>

  • client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/TripSampleUI.jaxx
    ... ... @@ -70,9 +70,8 @@
    70 70 
               <JTabbedPane id='mainTabbedPane'>
    71 71
    72 72 
                 <tab id='caracteristicsTab' i18nProperty="">
    73 
    -
    74 
    -              <JPanel layout='{new BorderLayout()}'>
    75 
    -                <Table fill='both' constraints='BorderLayout.NORTH' insets="0">
    73 
    +              <JScrollPane id="caracteristicsTabScrollPane">
    74 
    +                <Table fill='both' insets="0">
    76 75
    77 76 
                       <!-- timeStamp -->
    78 77 
                       <row>
    ... ... @@ -93,7 +92,7 @@
    93 92 
                         </cell>
    94 93 
                       </row>
    95 94 
                     </Table>
    96 
    -              </JPanel>
    95 
    +              </JScrollPane>
    97 96 
                 </tab>
    98 97
    99 98 
                 <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 @@
    48 48 
      _tab:{"samplePartTab"};
    49 49 
     }
    50 50
    51 
    -#comment {
    52 
    -  title:"observe.data.ll.logbook.TripSampleList.comment";
    53 
    -}
    54 
    -
    55 51 
     #open {
    56 52 
       _toolTipText:{t("observe.data.ll.logbook.TripSampleList.action.reopen.tip")};
    57 53 
     }

  • client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/ActivityUI.jaxx
    ... ... @@ -72,7 +72,8 @@
    72 72
    73 73 
       <!-- formulaire -->
    74 74 
       <JPanel id="body">
    75 
    -    <Table fill='both' constraints="BorderLayout.CENTER">
    75 
    +    <JScrollPane id="bodyScrollPane" constraints="BorderLayout.CENTER">
    76 
    +    <Table fill='both'>
    76 77
    77 78 
           <!-- date - time -->
    78 79 
           <row>
    ... ... @@ -135,6 +136,7 @@
    135 136 
             </cell>
    136 137 
           </row>
    137 138 
         </Table>
    139 
    +    </JScrollPane>
    138 140 
       </JPanel>
    139 141
    140 142 
       <!-- 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); }
    69 69
    70 70 
         <Table insets="0" fill="both" constraints='BorderLayout.CENTER'>
    71 71 
           <row>
    72 
    -        <cell anchor="north" weightx="1">
    72 
    +        <cell anchor="north" weightx="1" weighty="1">
    73 73 
               <JTabbedPane id='subTabbedPane'>
    74 74
    75 75 
                 <tab id='generalTab' i18nProperty="">
    76 
    -              <JPanel layout='{new BorderLayout()}'>
    77 
    -                <Table fill="both" constraints='BorderLayout.CENTER'>
    76 
    +               <JScrollPane id="generalTabScrollPane">
    77 
    +
    78 
    +                <Table fill="both">
    78 79
    79 80 
                       <!-- topType -->
    80 81 
                       <row>
    ... ... @@ -156,12 +157,13 @@ public void edit(BranchlineDto branchline) { getHandler().edit(branchline); }
    156 157 
                       </row>
    157 158
    158 159 
                     </Table>
    159 
    -              </JPanel>
    160 
    +               </JScrollPane>
    160 161 
                 </tab>
    161 162
    162 163 
                 <tab id='hookAndBaitTab' i18nProperty="">
    163 
    -              <JPanel layout='{new BorderLayout()}'>
    164 
    -                <Table fill="both" constraints='BorderLayout.CENTER'>
    164 
    +    <JScrollPane id="hookAndBaitTabScrollPane">
    165 
    +      <JPanel layout='{new BorderLayout()}'>
    166 
    +      <Table fill="both" constraints='BorderLayout.CENTER'>
    165 167
    166 168 
                       <!-- HookType -->
    167 169 
                       <row>
    ... ... @@ -224,13 +226,14 @@ public void edit(BranchlineDto branchline) { getHandler().edit(branchline); }
    224 226 
                       </row>
    225 227
    226 228 
                     </Table>
    227 
    -              </JPanel>
    229 
    +      </JPanel>
    230 
    +    </JScrollPane>
    228 231 
                 </tab>
    229 232 
               </JTabbedPane>
    230 233 
             </cell>
    231 234 
           </row>
    232 235 
           <row>
    233 
    -        <cell weighty="1">
    236 
    +        <cell>
    234 237 
               <BigTextEditor id="comment"/>
    235 238 
             </cell>
    236 239 
           </row>

  • client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/SetGlobalCompositionUI.jaxx
    ... ... @@ -106,7 +106,7 @@
    106 106
    107 107 
                   <!-- mitigationType -->
    108 108 
                   <JPanel layout='{new BorderLayout()}'>
    109 
    -                <Table fill='both' constraints='BorderLayout.NORTH'>
    109 
    +                <Table fill='both' constraints='BorderLayout.CENTER'>
    110 110 
                       <row>
    111 111 
                         <cell weighty="1" weightx="1">
    112 112 
                           <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 @@
    83 83
    84 84 
         <Table insets="0" fill="both" constraints='BorderLayout.CENTER'>
    85 85 
           <row>
    86 
    -        <cell anchor="north">
    86 
    +        <cell anchor="north" weighty="1" fill="both">
    87 87 
               <JTabbedPane id='mainTabbedPane'>
    88 88 
                 <tab id='settingTab' i18nProperty="">
    89 
    -              <JPanel layout='{new BorderLayout()}'>
    89 
    +              <JScrollPane id="settingTabScrollPane">
    90 
    +                <JPanel layout='{new BorderLayout()}'>
    90 91 
                     <Table fill='both' constraints='BorderLayout.NORTH'>
    91 92
    92 93 
                       <!-- homeId -->
    ... ... @@ -141,13 +142,14 @@
    141 142 
                           </Table>
    142 143 
                         </cell>
    143 144 
                       </row>
    144 
    -
    145 145 
                     </Table>
    146 
    -              </JPanel>
    146 
    +                </JPanel>
    147 
    +              </JScrollPane>
    147 148
    148 149 
                 </tab>
    149 150
    150 151 
                 <tab id='settingCaracteristicsTab' i18nProperty="">
    152 
    +              <JScrollPane id="settingCaracteristicTabScrollPane">
    151 153 
                   <Table fill='both'>
    152 154
    153 155 
                     <!-- setting shape -->
    ... ... @@ -310,11 +312,12 @@
    310 312 
                       </cell>
    311 313 
                     </row>
    312 314 
                   </Table>
    315 
    +              </JScrollPane>
    313 316 
                 </tab>
    314 317
    315 318 
                 <tab id='haulingTab' i18nProperty="">
    316 
    -
    317 
    -              <JPanel layout='{new BorderLayout()}'>
    319 
    +              <JScrollPane id="haulingTabScrollPane">
    320 
    +                <JPanel layout='{new BorderLayout()}'>
    318 321 
                     <Table fill='both' constraints='BorderLayout.NORTH'>
    319 322
    320 323 
                       <!-- hauling same direction as setting -->
    ... ... @@ -365,14 +368,15 @@
    365 368 
                         </cell>
    366 369 
                       </row>
    367 370 
                     </Table>
    368 
    -              </JPanel>
    371 
    +                </JPanel>
    372 
    +              </JScrollPane>
    369 373 
                 </tab>
    370 374 
               </JTabbedPane>
    371 375 
             </cell>
    372 376 
           </row>
    373 377
    374 378 
           <row>
    375 
    -        <cell fill="both" weighty="1" weightx="1">
    379 
    +        <cell fill="both" weightx="1">
    376 380 
               <BigTextEditor id="comment"/>
    377 381 
             </cell>
    378 382 
           </row>

  • client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/TdrUI.jaxx
    ... ... @@ -354,7 +354,7 @@
    354 354
    355 355 
                 <!-- species -->
    356 356 
                 <JPanel layout='{new BorderLayout()}'>
    357 
    -              <Table fill='both' constraints='BorderLayout.NORTH'>
    357 
    +              <Table fill='both' constraints='BorderLayout.CENTER'>
    358 358 
                     <row>
    359 359 
                       <cell weighty="1" weightx="1">
    360 360 
                         <FilterableDoubleList id='species' genericType='SpeciesReference'/>

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.