Ticket #2013: patch-2013.patch

modules/org.sophie2.main.layout.mydoggy/src/main/java/org/sophie2/main/layout/mydoggy/mdcustomization/SophieTabTitleBar.java

@@ +1 @@
+package org.sophie2.main.layout.mydoggy.mdcustomization;
+
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+
+import javax.swing.Action;
+
+import org.noos.xing.mydoggy.plaf.ui.ToolWindowContainer;
+import org.noos.xing.mydoggy.plaf.ui.ToolWindowDescriptor;
+import org.noos.xing.mydoggy.plaf.ui.cmp.DefaultTitleBarButtons;
+import org.noos.xing.mydoggy.plaf.ui.cmp.ExtendedTableLayout;
+
+/**
+ * @author dido
+ *              The title bar buttons container at the top of the tab.
+ *
+ */
+public class SophieTabTitleBar extends DefaultTitleBarButtons {
+
+        /**
+         *  Default serial version ID.
+         */
+        private static final long serialVersionUID = 1L;
+
+        /**
+         * The tool tip value for pin on action.
+         */
+        public static final String TOOL_TIP_ON_PROP_ID = "Pin";
+        
+        /**
+         * The tool tip value for pin off action..
+         */
+        public static final String TOOL_TIP_OFF_PROP_ID = "UnPin";
+        
+        /**
+         * The tool tip value for maximize action.
+         */
+        public static final String TOOL_TIP_MAXIMIZE_PROP_ID = "Maximize";
+        
+        /**
+         * The tool tip value for minimize action..
+         */
+        public static final String TOOL_TIP_MINIMIZE_PROP_ID = "Minimize";
+        
+        /**
+         * @param toolWindowDescriptor
+         * @param dockedContainer
+         */
+        public SophieTabTitleBar(ToolWindowDescriptor toolWindowDescriptor,
+                        ToolWindowContainer dockedContainer) {
+                
+                super(toolWindowDescriptor, dockedContainer);
+        }
+        
+        @Override
+        protected void initComponents() {
+
+                this.containerLayout = 
+                        new ExtendedTableLayout(new double[][] {{ 0, 0 }, { 1, 14, 1 } }, false);
+                setLayout(this.containerLayout);
+                setOpaque(false);
+
+                this.focusable = addTitleBarAction(new SophiePinAction());
+                this.focusable = addTitleBarAction(new SophieMaximizeAction());
+                this.focusable = addTitleBarAction(new HideAction());
+        }
+        
+        /**
+         * @author dido
+         *
+         */
+        protected class SophiePinAction extends PinAction {
+
+        /**
+                 *  Default serial version ID
+                 */
+                private static final long serialVersionUID = 1L;
+
+                /**
+         * The constructor for this class. Adds property change listener that sets the correct values for tooltips that comes from Sophie 2 skins.
+         */
+        @SuppressWarnings({ "synthetic-access", "unqualified-field-access" })
+                public SophiePinAction() {
+                putValue(Action.SHORT_DESCRIPTION, TOOL_TIP_OFF_PROP_ID);
+            dockedContainer.addPropertyChangeListener("autoHide", new PropertyChangeListener() {
+                                public void propertyChange(PropertyChangeEvent evt) {
+                                        
+                    boolean newValue = ((Boolean) evt.getNewValue());
+                    
+                    if (newValue) {
+                        putValue(Action.LONG_DESCRIPTION, TOOL_TIP_ON_PROP_ID);
+                        putValue(Action.SHORT_DESCRIPTION, TOOL_TIP_ON_PROP_ID);
+                    } else {
+                        putValue(Action.LONG_DESCRIPTION, TOOL_TIP_OFF_PROP_ID);
+                        putValue(Action.SHORT_DESCRIPTION, TOOL_TIP_OFF_PROP_ID);
+                    }
+                }
+            });
+        }
+    }
+        
+        /**
+         * @author dido
+         *
+         */
+        protected class SophieMaximizeAction extends MaximizeAction {
+
+        /**
+                 *  Default serial version ID
+                 */
+                private static final long serialVersionUID = 1L;
+
+                /**
+         * The constructor for this class. Adds property change listener that sets the correct values for tooltips that comes from Sophie 2 skins.
+         */
+                @SuppressWarnings({ "unqualified-field-access", "synthetic-access" })
+                public SophieMaximizeAction() {
+            
+                        putValue(Action.SHORT_DESCRIPTION, TOOL_TIP_MAXIMIZE_PROP_ID);
+            dockedContainer.addPropertyChangeListener("maximized.before", new PropertyChangeListener() {
+                private boolean flag = false;
+
+                public void propertyChange(PropertyChangeEvent evt) {
+                    if (evt.getSource() != descriptor)
+                        return;
+
+                    if ((Boolean) evt.getNewValue()) {
+                        putValue(Action.LONG_DESCRIPTION, TOOL_TIP_MINIMIZE_PROP_ID);
+                        putValue(Action.SHORT_DESCRIPTION, TOOL_TIP_MINIMIZE_PROP_ID);
+                        flag = true;
+                    } else if (flag) {
+                        putValue(Action.LONG_DESCRIPTION, TOOL_TIP_MAXIMIZE_PROP_ID);
+                        putValue(Action.SHORT_DESCRIPTION, TOOL_TIP_MAXIMIZE_PROP_ID);
+                    }
+                }
+            });
+        }
+        }
+}

modules/org.sophie2.main.layout.mydoggy/src/main/java/org/sophie2/main/layout/mydoggy/mdcustomization/MaximizeTitleBarButton.java

@@ -1 +1 @@
 package org.sophie2.main.layout.mydoggy.mdcustomization;
 
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+
+import javax.swing.Action;
+
 import org.noos.xing.mydoggy.plaf.ui.ToolWindowContainer;
 import org.noos.xing.mydoggy.plaf.ui.ToolWindowDescriptor;
 import org.noos.xing.mydoggy.plaf.ui.cmp.DefaultTitleBarButtons;
@@ -15 +20 @@
         private static final long serialVersionUID = 1L;
 
         /**
+         * The tool tip value for maximize action.
+         */
+        public static final String TOOL_TIP_MAXIMIZE_PROP_ID = "Maximize";
+        
+        /**
+         * The tool tip value for minimize action..
+         */
+        public static final String TOOL_TIP_MINIMIZE_PROP_ID = "Minimize";
+        
+        /**
          * Default constructor.
          * 
          * @param toolWindowDescriptor 
@@ -34 +49 @@
                 setLayout(this.containerLayout);
                 setOpaque(false);
 
-                this.focusable = addTitleBarAction(new MaximizeAction());
+                this.focusable = addTitleBarAction(new SophieMaximizeAction());
         }
+        
+        /**
+         * @author dido
+         *
+         */
+        protected class SophieMaximizeAction extends MaximizeAction {
+
+        /**
+                 *  Default serial version ID
+                 */
+                private static final long serialVersionUID = 1L;
+
+                /**
+         * The constructor for this class. Adds property change listener that sets the correct values for tooltips that comes from Sophie 2 skins.
+         */
+                @SuppressWarnings({ "unqualified-field-access", "synthetic-access" })
+                public SophieMaximizeAction() {
+            
+                        putValue(Action.SHORT_DESCRIPTION, TOOL_TIP_MAXIMIZE_PROP_ID);
+            dockedContainer.addPropertyChangeListener("maximized.before", new PropertyChangeListener() {
+                private boolean flag = false;
+
+                public void propertyChange(PropertyChangeEvent evt) {
+                    if (evt.getSource() != descriptor)
+                        return;
+
+                    if ((Boolean) evt.getNewValue()) {
+                        putValue(Action.LONG_DESCRIPTION, TOOL_TIP_MINIMIZE_PROP_ID);
+                        putValue(Action.SHORT_DESCRIPTION, TOOL_TIP_MINIMIZE_PROP_ID);
+                        flag = true;
+                    } else if (flag) {
+                        putValue(Action.LONG_DESCRIPTION, TOOL_TIP_MAXIMIZE_PROP_ID);
+                        putValue(Action.SHORT_DESCRIPTION, TOOL_TIP_MAXIMIZE_PROP_ID);
+                    }
+                }
+            });
+        }
+        }
 }

modules/org.sophie2.main.layout.mydoggy/src/main/java/org/sophie2/main/layout/mydoggy/MDMainWindow.java

@@ -15 +15 @@
 import javax.swing.ScrollPaneConstants;
 import javax.swing.SwingUtilities;
 
+import org.noos.common.context.Context;
+import org.noos.common.object.ObjectCreator;
 import org.noos.xing.mydoggy.Content;
 import org.noos.xing.mydoggy.ContentManager;
 import org.noos.xing.mydoggy.DockedTypeDescriptor;
@@ -22 +24 @@
 import org.noos.xing.mydoggy.ToolWindowAnchor;
 import org.noos.xing.mydoggy.ToolWindowType;
 import org.noos.xing.mydoggy.plaf.MyDoggyToolWindowManager;
+import org.noos.xing.mydoggy.plaf.ui.TitleBarButtons;
+import org.noos.xing.mydoggy.plaf.ui.ToolWindowContainer;
+import org.noos.xing.mydoggy.plaf.ui.ToolWindowDescriptor;
+import org.noos.xing.mydoggy.plaf.ui.look.MyDoggyResourceManager;
 import org.sophie2.base.layout.impl.DefaultMainWindow;
 import org.sophie2.base.layout.impl.DesktopPane;
 import org.sophie2.base.layout.model.DocView;
@@ -50 +56 @@
 import org.sophie2.core.prolib.list.TrackingProList;
 import org.sophie2.core.prolib.util.ResourceListSync;
 import org.sophie2.main.layout.mydoggy.constants.MDColorId;
+import org.sophie2.main.layout.mydoggy.mdcustomization.SophieTabTitleBar;
 import org.sophie2.main.layout.mydoggy.mdcustomization.SophieToolWindowManager;
 
 /**
@@ -272 +279 @@
         public Prop<MyDoggyToolWindowManager> toolWindowManager() {
                 class toolWindowManager extends ResourceProperty<MyDoggyToolWindowManager> {
 
+                        @SuppressWarnings("unchecked")
                         @Override
                         protected MyDoggyToolWindowManager create() {
                                 MyDoggyToolWindowManager toolWindowManager = new SophieToolWindowManager();
                                 toolWindowManager.setAutoscrolls(true);
                                 toolWindowManager.setName(SKIN_ELEMENT_ID + "/root-panel");
+                                
+                                MyDoggyResourceManager myDoggyResourceManager = 
+                                        (MyDoggyResourceManager) toolWindowManager.getResourceManager();
+                                
+                                // Modifying the menu so that it will use custom title bar.
+                                myDoggyResourceManager.putInstanceCreator(TitleBarButtons.class,
+                                                new ObjectCreator() {
+                                        public Object create(Context context) {
+                                                return new SophieTabTitleBar(
+                                                                context.get(ToolWindowDescriptor.class),
+                                                                context.get(ToolWindowContainer.class));
+                                        }
+                                });
 
                                 return toolWindowManager;
                         }