Changeset 31268 in osm for applications/editors/josm/plugins/mapillary/src

Timestamp:

2015-06-15T19:08:47+02:00 (9 years ago)

Author:

nokutu

Message:

Code cleaned and some minor enhances

Location:

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary

Files:

• MapillaryPlugin.java (modified) (1 diff)
• gui/MapillaryToggleDialog.java (modified) (5 diffs)

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryPlugin.java

@@ -76 +76 @@
                                 false);
                 ZOOM_MENU = MainMenu.add(Main.main.menu.viewMenu, zoomAction,
-                                false);
+                                false, 15);
 
                 EXPORT_MENU.setEnabled(false);

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryToggleDialog.java

@@ -95 +95 @@
 
                 mode = NORMAL_MODE;
-                this.setLayout(new BorderLayout());
-                top = new JPanel();
-                top.setLayout(new BorderLayout());
-                top.add(titleBar, BorderLayout.NORTH);
+                /*
+                 * this.setLayout(new BorderLayout()); top = new JPanel();
+                 * top.setLayout(new BorderLayout()); top.add(titleBar,
+                 * BorderLayout.NORTH);
+                 */
                 createLayout(mapillaryImageDisplay, normalMode,
                                 Main.pref.getBoolean("mapillary.reverse-buttons"));
+                disableAllButtons();
         }
 
@@ -153 +155 @@
                         if (this.image == null) {
                                 mapillaryImageDisplay.setImage(null);
-                                titleBar.setTitle(BASE_TITLE);
+                                titleBar.setTitle(tr(BASE_TITLE));
                                 disableAllButtons();
                                 return;
                         }
                         if (image instanceof MapillaryImage) {
+                                mapillaryImageDisplay.hyperlink.setVisible(true);
                                 MapillaryImage mapillaryImage = (MapillaryImage) this.image;
-                                String title = BASE_TITLE;
+                                String title = tr(BASE_TITLE);
                                 if (mapillaryImage.getUser() != null)
                                         title += " -- " + mapillaryImage.getUser();
@@ -214 +217 @@
                                 imageCache.submit(this, false);
                         } else if (image instanceof MapillaryImportedImage) {
+                                mapillaryImageDisplay.hyperlink.setVisible(false);
                                 this.nextButton.setEnabled(false);
                                 this.previousButton.setEnabled(false);
@@ -234 +238 @@
                 nextSignalButton.setEnabled(false);
                 previousSignalButton.setEnabled(false);
+                mapillaryImageDisplay.hyperlink.setVisible(false);
         }
 
@@ -385 +390 @@
         public void createLayout(Component data, List<SideButton> buttons,
                         boolean reverse) {
-                add(data, BorderLayout.CENTER);
-                if (!buttons.isEmpty() && buttons.get(0) != null) {
+                JPanel panel = new JPanel();
+                panel.setLayout(new BorderLayout());
+                panel.add(data, BorderLayout.CENTER);
+                if (reverse) {
                         buttonsPanel = new JPanel(new GridLayout(1, 1));
-                        final JPanel buttonRowPanel = new JPanel(Main.pref.getBoolean(
-                                        "dialog.align.left", false) ? new FlowLayout(
-                                        FlowLayout.LEFT) : new GridLayout(1, buttons.size()));
-                        buttonsPanel.add(buttonRowPanel);
-                        for (SideButton button : buttons)
-                                buttonRowPanel.add(button);
-                        if (reverse)
-                                top.add(buttonsPanel, BorderLayout.SOUTH);
-                        else
-                                add(buttonsPanel, BorderLayout.SOUTH);
-                }
-                add(top, BorderLayout.NORTH);
+                        if (!buttons.isEmpty() && buttons.get(0) != null) {
+                                final JPanel buttonRowPanel = new JPanel(Main.pref.getBoolean(
+                                                "dialog.align.left", false) ? new FlowLayout(
+                                                FlowLayout.LEFT) : new GridLayout(1, buttons.size()));
+                                buttonsPanel.add(buttonRowPanel);
+                                for (SideButton button : buttons)
+                                        buttonRowPanel.add(button);
+                        }
+                        panel.add(buttonsPanel, BorderLayout.NORTH);
+                        createLayout(panel, true, null);
+                } else
+                        createLayout(panel, true, buttons);
         }