Modify ↓
#23189 closed enhancement (fixed)
be able to reduce the width of the "resolve conflicts" window
Reported by: | leni | Owned by: | team |
---|---|---|---|
Priority: | normal | Milestone: | 23.11 |
Component: | Core | Version: | |
Keywords: | template_report, conflict | Cc: |
Description
What steps will reproduce the problem?
- The window to "resolve conflicts" takes up the entire width of the screen.
- I can reduce the width of the key or value columns,
What is the expected result?
I would like to reduce the window by seeing the three states as shown in https://josm.openstreetmap.de/wiki/Help/Dialog/Conflict
What happens instead?
but I cannot reduce the width of the "my version", "merged version" or "their version" sets,their version column disappears (screenshot)
Please provide any additional information below. Attach a screenshot if possible.
Could there be a parameter in "Advanced Preferences" allowing me to do this?
Relative:URL: ^/trunk Repository:UUID: 0c6e7542-c601-0410-84e7-c038aed88b3b Last:Changed Date: 2023-08-29 13:38:40 +0200 (Tue, 29 Aug 2023) Revision:18822 Build-Date:2023-08-30 01:30:57 URL:https://josm.openstreetmap.de/svn/trunk Identification: JOSM/1.5 (18822 fr) Windows 10 64-Bit OS Build number: Windows 10 Home 2009 (19045) Memory Usage: 360 MB / 1970 MB (96 MB allocated, but free) Java version: 17.0.7+7-LTS, Azul Systems, Inc., OpenJDK 64-Bit Server VM Look and Feel: com.sun.java.swing.plaf.windows.WindowsLookAndFeel Screen: \Display0 1920×1080 (scaling 1.25×1.25) Maximum Screen Size: 1920×1080 Best cursor sizes: 16×16→32×32, 32×32→32×32 System property file.encoding: Cp1252 System property sun.jnu.encoding: Cp1252 Locale info: fr_FR Numbers with default locale: 1234567890 -> 1234567890 VM arguments: [-Dicedtea-web.bin.location=%UserProfile%\AppData\Local\Programs\OpenWebStart\javaws, -Djava.util.Arrays.useLegacyMergeSort=true, --add-exports=jdk.deploy/com.sun.deploy.config=ALL-UNNAMED, --add-opens=java.desktop/javax.swing.text.html=ALL-UNNAMED, --add-reads=java.naming=ALL-UNNAMED,java.desktop, --add-exports=java.base/sun.security.action=ALL-UNNAMED,java.desktop, --add-reads=java.base=ALL-UNNAMED,java.desktop, --add-exports=java.naming/com.sun.jndi.toolkit.url=ALL-UNNAMED,java.desktop, --add-opens=java.base/jdk.internal.loader=ALL-UNNAMED, --add-exports=java.desktop/com.apple.eawt=ALL-UNNAMED, --add-exports=java.desktop/sun.awt=ALL-UNNAMED,java.desktop, --add-opens=java.base/jdk.internal.ref=ALL-UNNAMED, --add-exports=java.base/sun.security.validator=ALL-UNNAMED,java.desktop, --add-exports=java.desktop/com.sun.imageio.plugins.jpeg=ALL-UNNAMED, --add-exports=java.base/sun.net.www.protocol.jar=ALL-UNNAMED,java.desktop, --add-exports=java.base/jdk.internal.util.jar=ALL-UNNAMED,java.desktop, --add-opens=java.prefs/java.util.prefs=ALL-UNNAMED, --add-exports=java.base/com.sun.net.ssl.internal.ssl=ALL-UNNAMED,java.desktop, --add-exports=javafx.graphics/com.sun.javafx.application=ALL-UNNAMED, --add-modules=java.scripting,java.sql,javafx.controls,javafx.media,javafx.swing,javafx.web, --add-exports=java.desktop/sun.awt.X11=ALL-UNNAMED,java.desktop, --add-exports=java.desktop/sun.applet=ALL-UNNAMED,java.desktop,jdk.jsobject, --add-exports=java.base/sun.net.www.protocol.http=ALL-UNNAMED,java.desktop, --add-opens=java.base/java.lang=ALL-UNNAMED, --add-exports=java.base/sun.security.util=ALL-UNNAMED,java.desktop, --add-exports=java.desktop/com.sun.imageio.spi=ALL-UNNAMED, --add-reads=java.desktop=ALL-UNNAMED,java.naming, --add-opens=java.base/java.nio=ALL-UNNAMED, --add-exports=java.base/sun.security.x509=ALL-UNNAMED,java.desktop, --add-opens=java.desktop/javax.imageio.spi=ALL-UNNAMED, --add-exports=java.desktop/javax.jnlp=ALL-UNNAMED,java.desktop, --add-exports=java.base/sun.security.provider=ALL-UNNAMED,java.desktop] Dataset consistency test: No problems found Plugins: + DirectUpload (36126) + HouseNumberTaggingTool (36126) + MapRoulette (21) + PicLayer (1.0.2) + apache-commons (36034) + auto_tools (81) + buildings_tools (36134) + conflation (0.6.11) + ejml (35924) + flatlaf (36128) + geotools (36068) + graphview (36126) + indoorhelper (1.2.2) + jackson (36034) + jaxb (36118) + jts (36004) + opendata (36126) + tagging-preset-tester (36126) + todo (133) + utilsplugin2 (36134) Tagging presets: + https://github.com/Jungle-Bus/josm-presets/raw/gh-pages/jungle-stops/Preset_Jungle-Bus.zip + https://josm.openstreetmap.de/josmfile?page=Presets/ParkingLanes&zip=1 Map paint styles: + <josm.pref>\plugins\indoorhelper\resources\sit.mapcss - <josm.pref>\plugins\indoorhelper\resources\sit.mapcss Last errors/warnings: - 00000.431 W: extended font config - overriding 'filename.Myanmar_Text=mmrtext.ttf' with 'MMRTEXT.TTF' - 00000.434 W: extended font config - overriding 'filename.Mongolian_Baiti=monbaiti.ttf' with 'MONBAITI.TTF' - 00005.071 W: Impossible de supprimer le plugin périmé "<josm.pref>\plugins\flatlaf.jar". - 00005.090 W: Impossible dʼinstaller le greffon 'flatlaf' déjà téléchargé. Abandon de lʼinstallation. JOSM va charger lʼancienne version du greffon. - 00333.804 E: Error header: Version mismatch: Provided 1, server had: 2 of Way 1107928026 - 00333.993 E: Conflits détectés - <html>L’envoi <strong>a échoué</strong> car le serveur possède une version plus récente<br>d’un nœud, chemin ou relation.<br>Le conflit a pour origine le <strong>chemin</strong> avec l’identifiant <strong>1 107 928 026</strong>,<br>le serveur possède la version 2, votre version est 1.<br><br>Cliquez sur <strong>Synchroniser seulement les chemins 1 107 928 026</strong> pour synchroniser uniquement l’objet en conflit.<br>Cliquez sur <strong>Synchroniser tout le jeu de données</strong> pour synchroniser tout le jeu de données.<br>Cliquez sur <strong>Annuler</strong> pour annuler et continuer.<br></html> - 00340.724 W: Conflits détectés - <html>1 conflit a été détecté.</html>
Attachments (2)
Change History (6)
by , 19 months ago
Attachment: | conflictsWithSmallKeyColumn.png added |
---|
comment:2 by , 19 months ago
Keywords: | conflict added |
---|---|
Milestone: | → 23.09 |
Note:
See TracTickets
for help on using tickets.
Conflits wihe small key column at left