Textures pane.

Normand Briere

2019-08-08 8294241adc5fe698b70e13ebd6780af46ab83f7e

 ObjEditor.java
..
..
@@ -34,6 +34,7 @@
34
34
         iSendInfo
35
35
 //KeyListener
36
36
 {
37
+    public cToggleButton pinButton;
37
38
         boolean timeline;
38
39
         boolean wasFullScreen;
39
40
 
..
..
@@ -466,6 +467,8 @@
466
467
                 
467
468
         toolboxPanel = new cGridBag().setVertical(true);
468
469
         //toolboxPanel.setName("Toolbox");
470
+        
471
+        skyboxPanel = new cGridBag().setVertical(true);
469
472
         
470
473
         materialPanel = new cGridBag().setVertical(false);
471
474
         //materialPanel.setName("Material");
..
..
@@ -1205,6 +1208,18 @@
1205
1208
         
1206
1209
             namePanel = new cGridBag();
1207
1210
             
1211
+        //if (copy.pinned)
1212
+        {
1213
+            pinButton = GetToggleButton("icons/pin.png", !Grafreed.NIMBUSLAF);
1214
+            pinButton.setSelected(copy.pinned);
1215
+            cGridBag t = new cGridBag();
1216
+            t.preferredWidth = 2;
1217
+            t.add(pinButton);
1218
+            namePanel.add(t);
1219
+            
1220
+            pinButton.addItemListener(this);
1221
+        }
1222
+        
1208
1223
         nameField = AddText(namePanel, copy.GetName());
1209
1224
         namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
1210
1225
         oe.ctrlPanel.add(namePanel);
..
..
@@ -1556,27 +1571,26 @@
1556
1571
         objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1557
1572
         objectPanel.setToolTipTextAt(0, "Material");
1558
1573
     
1574
+        objectPanel.add(toolboxPanel);
1575
+        objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
1576
+        objectPanel.setToolTipTextAt(1, "Objects & textures");
1577
+
1578
+        objectPanel.add(skyboxPanel);
1579
+        objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
1580
+        objectPanel.setToolTipTextAt(2, "Backgrounds");
1581
+        
1559
1582
 //        JPanel north = new JPanel(new BorderLayout());
1560
1583
 //        north.setName("Edit");
1561
1584
 //        north.add(ctrlPanel, BorderLayout.NORTH);
1562
1585
 //        objectPanel.add(north);
1563
1586
         objectPanel.add(editPanel);
1564
-        objectPanel.setIconAt(1, GetIcon("icons/write.png"));
1565
-        objectPanel.setToolTipTextAt(1, "Edit controls");
1566
-        
1567
-        //if (Globals.ADVANCED)
1568
-            objectPanel.add(infoPanel);
1569
-        objectPanel.setIconAt(2, GetIcon("icons/info.png"));
1570
-        objectPanel.setToolTipTextAt(2, "Information");
1587
+        objectPanel.setIconAt(3, GetIcon("icons/write.png"));
1588
+        objectPanel.setToolTipTextAt(3, "Edit controls");
1571
1589
         
1572
1590
         objectPanel.add(XYZPanel);
1573
-        objectPanel.setIconAt(3, GetIcon("icons/XYZ.png"));
1574
-        objectPanel.setToolTipTextAt(3, "XYZ/RGB transform");
1591
+        objectPanel.setIconAt(4, GetIcon("icons/XYZ.png"));
1592
+        objectPanel.setToolTipTextAt(4, "XYZ/RGB transform");
1575
1593
         
1576
-        objectPanel.add(toolboxPanel);
1577
-        objectPanel.setIconAt(4, GetIcon("icons/primitives.png"));
1578
-        objectPanel.setToolTipTextAt(4, "Objects & backgrounds");
1579
-
1580
1594
         /*
1581
1595
         aConstraints.gridx = 0;
1582
1596
         aConstraints.gridwidth = 1;
..
..
@@ -1613,6 +1627,11 @@
1613
1627
 
1614
1628
         scenePanel.add(tabbedPane);
1615
1629
 
1630
+        //if (Globals.ADVANCED)
1631
+            tabbedPane.add(infoPanel);
1632
+        tabbedPane.setIconAt(3, GetIcon("icons/info.png"));
1633
+        tabbedPane.setToolTipTextAt(3, "Information");
1634
+        
1616
1635
         /*
1617
1636
         cTree jTree = new cTree(null);
1618
1637
         ToolTipManager.sharedInstance().registerComponent(jTree);
..
..
@@ -3574,6 +3593,17 @@
3574
3593
     public void itemStateChanged(ItemEvent event)
3575
3594
     {
3576
3595
         //                   System.out.println("Propagate = " + propagate);
3596
+        if (event.getSource() == pinButton)
3597
+        {
3598
+            copy.pinned ^= true;
3599
+            if (!copy.pinned && !copy.editWindow.copy.selection.contains(copy))
3600
+            {
3601
+                ((GroupEditor)copy.editWindow).listUI.remove(copy);
3602
+                copy.CloseUI();
3603
+                //copy.editWindow.refreshContents();
3604
+            }
3605
+        }
3606
+        else
3577
3607
         if (event.getSource() == propagateToggle)
3578
3608
         {
3579
3609
             propagate ^= true;
..
..
@@ -5747,6 +5777,7 @@
5747
5777
     ButtonGroup buttonGroup;
5748
5778
     
5749
5779
     cGridBag toolboxPanel;
5780
+    cGridBag skyboxPanel;
5750
5781
     cGridBag materialPanel;
5751
5782
     cGridBag ctrlPanel;
5752
5783