blame | history | patch | commit | commitdiff
Normand Briere
2019-06-27 1807e7752960ac229cddd34b100e92cadbac9459 
 ObjEditor.java
....@@ -4,6 +4,7 @@
44 
55 import java.awt.*;
66 import java.awt.event.*;
7
+import java.awt.image.BufferedImage;
78 import javax.swing.*;
89 import javax.swing.event.*;
910 import javax.swing.text.*;
....@@ -13,6 +14,9 @@
1314 import javax.swing.plaf.metal.MetalLookAndFeel;
1415 //import javax.swing.plaf.ColorUIResource;
1516 //import javax.swing.plaf.metal.DefaultMetalTheme;
17
+
18
+import javax.swing.plaf.basic.BasicSplitPaneDivider;
19
+import javax.swing.plaf.basic.BasicSplitPaneUI;
1620 
1721 //import javax.media.opengl.GLCanvas;
1822 
....@@ -35,6 +39,67 @@
3539 
3640     GroupEditor callee;
3741     JFrame frame;
42
+    
43
+    static ObjEditor theFrame;
44
+    
45
+    cButton GetButton(String name, boolean border)
46
+    {
47
+        try
48
+        {
49
+            ImageIcon icon = GetIcon(name);
50
+            return new cButton(icon, border);
51
+        }
52
+        catch (Exception e)
53
+        {
54
+            return new cButton(name, border);
55
+        }
56
+    }
57
+
58
+    cToggleButton GetToggleButton(String name, boolean border)
59
+    {
60
+        try
61
+        {
62
+            ImageIcon icon = GetIcon(name);
63
+            return new cToggleButton(icon, border);
64
+        }
65
+        catch (Exception e)
66
+        {
67
+            return new cToggleButton(name, border);
68
+        }
69
+    }
70
+
71
+    cCheckBox GetCheckBox(String name, boolean border)
72
+    {
73
+        try
74
+        {
75
+            ImageIcon icon = GetIcon(name);
76
+            return new cCheckBox(icon, border);
77
+        }
78
+        catch (Exception e)
79
+        {
80
+            return new cCheckBox(name, border);
81
+        }
82
+    }
83
+
84
+    private ImageIcon GetIcon(String name) throws IOException
85
+    {
86
+        BufferedImage image = javax.imageio.ImageIO.read(getClass().getClassLoader().getResourceAsStream(name));
87
+        
88
+        if (image.getWidth() != 24 && image.getHeight() != 24)
89
+        {
90
+            BufferedImage resized = new BufferedImage(24, 24, image.getType());
91
+            Graphics2D g = resized.createGraphics();
92
+            g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
93
+            //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
94
+            g.drawImage(image, 0, 0, 24, 24, 0, 0, image.getWidth(), image.getHeight(), null);
95
+            g.dispose();
96
+            
97
+            image = resized;
98
+        }
99
+        
100
+        javax.swing.ImageIcon icon = new javax.swing.ImageIcon(image);
101
+        return icon;
102
+    }
38103     
39104     // SCRIPT
40105     
....@@ -145,7 +210,7 @@
145210         
146211         objEditor.ctrlPanel.remove(namePanel);
147212         
148
-        if (!GroupEditor.allparams)
213
+        if (!allparams)
149214             return;
150215         
151216 //        objEditor.ctrlPanel.remove(liveCB);
....@@ -169,7 +234,7 @@
169234         
170235         objEditor.ctrlPanel.remove(setupPanel);
171236         objEditor.ctrlPanel.remove(setupPanel2);
172
-        objEditor.ctrlPanel.remove(commandsPanel);
237
+        objEditor.ctrlPanel.remove(objectCommandsPanel);
173238         objEditor.ctrlPanel.remove(pushPanel);
174239         //objEditor.ctrlPanel.remove(fillPanel);
175240         
....@@ -244,6 +309,7 @@
244309         //localCopy.parent = null;
245310 
246311         frame = new JFrame();
312
+                frame.setUndecorated(true);
247313         objEditor = this;
248314         this.callee = callee;
249315 
....@@ -273,6 +339,11 @@
273339     {
274340         return frame.action(event, obj);
275341     }
342
+
343
+    // Cannot work without static
344
+    static boolean allparams = true;
345
+
346
+    static java.util.Vector<Object3D> listUI = new java.util.Vector<Object3D>();
276347 
277348     void SetupMenu()
278349     {
....@@ -320,14 +391,52 @@
320391         closeItem.addActionListener(this);
321392 
322393         objectPanel = new JTabbedPane();
394
+        
395
+        ChangeListener changeListener = new ChangeListener()
396
+        {
397
+            public void stateChanged(ChangeEvent changeEvent)
398
+            {
399
+//                if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Material") && !materialFlushed)
400
+//                {
401
+//                    if (latestObject != null)
402
+//                    {
403
+//                        refreshContents(true);
404
+//                        SetMaterial(latestObject);
405
+//                    }
406
+//                    
407
+//                    materialFlushed = true;
408
+//                }
409
+//                if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Edit"))
410
+//                {
411
+//                    if (listUI.size() == 0)
412
+//                        EditSelection(false);
413
+//                }
414
+
415
+                refreshContents(false); // To refresh Info tab
416
+            }
417
+        };
418
+        objectPanel.addChangeListener(changeListener);
419
+    
323420         toolbarPanel = new JPanel();
324421         toolbarPanel.setName("Toolbar");
325422         treePanel = new cGridBag();
326423         treePanel.setName("Tree");
424
+        
425
+        editPanel = new cGridBag().setVertical(true);
426
+        editPanel.setName("Edit");
427
+        
327428         ctrlPanel = new cGridBag().setVertical(false); // new GridBagLayout());
328
-        ctrlPanel.setName("Edit");
429
+        
430
+        editCommandsPanel = new cGridBag();
431
+        editPanel.add(editCommandsPanel);
432
+        editPanel.add(ctrlPanel);
433
+                
434
+        toolboxPanel = new cGridBag().setVertical(false);
435
+        toolboxPanel.setName("Toolbox");
436
+        
329437         materialPanel = new cGridBag().setVertical(true);
330438         materialPanel.setName("Material");
439
+        
331440         /*JTextPane*/
332441         infoarea = createTextPane();
333442         doc = infoarea.getStyledDocument();
....@@ -352,7 +461,14 @@
352461         mainPanel.setDividerSize(9);
353462         mainPanel.setDividerLocation(0.5); //1.0);
354463         mainPanel.setResizeWeight(0.5);
355
-
464
+        
465
+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
466
+    BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
467
+    divider.setDividerSize(15);
468
+    divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));    
469
+    
470
+    mainPanel.setUI(new BasicSplitPaneUI());
471
+    
356472         //ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
357473         //mainPanel.setLayout(new GridBagLayout());
358474         toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
....@@ -583,20 +699,92 @@
583699         }
584700     }
585701 
702
+static GraphicsDevice device = GraphicsEnvironment
703
+        .getLocalGraphicsEnvironment().getScreenDevices()[0];
704
+
705
+    Rectangle keeprect;
706
+        cRadio radio;
707
+        
708
+cButton keepButton;
709
+	cButton twoButton; // Full 3D
710
+	cButton sixButton;
711
+	cButton threeButton;
712
+	cButton sevenButton;
713
+	cButton fourButton; // full panel
714
+	cButton oneButton; // full XYZ
715
+        //cButton currentLayout;
716
+        
717
+        boolean maximized;
718
+    
719
+        cButton fullscreenLayout;
720
+
721
+        void Minimize()
722
+        {
723
+            frame.setState(Frame.ICONIFIED);
724
+        }
725
+        
726
+        void Maximize()
727
+        {
728
+            if (maximized)
729
+            {
730
+                frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
731
+            }
732
+            else
733
+            {
734
+                keeprect = frame.getBounds();
735
+                Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
736
+                Dimension rect2 = frame.getToolkit().getScreenSize();
737
+                frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
738
+//                frame.setState(Frame.MAXIMIZED_BOTH);
739
+            }
740
+            
741
+            maximized ^= true;
742
+        }
743
+        
586744         void ToggleFullScreen()
587745         {
588
-                if (CameraPane.FULLSCREEN)
746
+                cameraView.ToggleFullScreen();
747
+                
748
+                if (!CameraPane.FULLSCREEN)
589749                 {
590
-                    frame.getContentPane().remove(/*"Center",*/bigThree);
591
-                    framePanel.add(bigThree);
592
-                    frame.getContentPane().add(/*"Center",*/framePanel);
750
+                    device.setFullScreenWindow(null);
751
+                    //frame.setVisible(false);
752
+//                frame.removeNotify();
753
+//                frame.setUndecorated(false);
754
+//                frame.addNotify();
755
+                //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
756
+                    
757
+// X                   frame.getContentPane().remove(/*"Center",*/bigThree);
758
+// X                   framePanel.add(bigThree);
759
+// X                   frame.getContentPane().add(/*"Center",*/framePanel);
760
+                    framePanel.setDividerLocation(1);
761
+                    
762
+                    //frame.setVisible(true);
763
+                    radio.layout = keepButton;
764
+                    //theFrame = null;
765
+                    keepButton = null;
766
+                    radio.layout.doClick();
767
+                    
593768                 } else
594769                 {
595
-                    frame.getContentPane().remove(/*"Center",*/framePanel);
596
-                    framePanel.remove(bigThree);
597
-                    frame.getContentPane().add(/*"Center",*/bigThree);
770
+                    keepButton = radio.layout;
771
+                    //keeprect = frame.getBounds();
772
+//                frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
773
+//                        frame.getToolkit().getScreenSize().height);
774
+                    //frame.setVisible(false);
775
+                    device.setFullScreenWindow(frame);
776
+//                frame.removeNotify();
777
+//                frame.setUndecorated(true);
778
+//                frame.addNotify();
779
+// X                   frame.getContentPane().remove(/*"Center",*/framePanel);
780
+// X                   framePanel.remove(bigThree);
781
+// X                   frame.getContentPane().add(/*"Center",*/bigThree);
782
+                    framePanel.setDividerLocation(0);
783
+
784
+                    radio.layout = fullscreenLayout;
785
+                    radio.layout.doClick();
786
+                    //frame.setVisible(true);
598787                 }
599
-                cameraView.ToggleFullScreen();
600788         }
601789 
602790     private JTextPane createTextPane()
....@@ -737,7 +925,12 @@
737925     JCheckBox speedupCB;
738926     JCheckBox rewindCB;
739927     JCheckBox flipVCB;
928
+    
929
+    cCheckBox toggleTextureCB;
930
+    cCheckBox toggleSwitchCB;
931
+        
740932     JComboBox texresMenu;
933
+    
741934     JButton resetButton;
742935     JButton stepButton;
743936     JButton stepAllButton;
....@@ -746,10 +939,13 @@
746939     JButton fasterButton;
747940     JButton remarkButton;
748941     
942
+    cGridBag editPanel;
943
+    cGridBag editCommandsPanel;
944
+    
749945     cGridBag namePanel;
750946     cGridBag setupPanel;
751947     cGridBag setupPanel2;
752
-    cGridBag commandsPanel;
948
+    cGridBag objectCommandsPanel;
753949     cGridBag pushPanel;
754950     cGridBag fillPanel;
755951 
....@@ -926,7 +1122,7 @@
9261122         
9271123         oe.ctrlPanel.Return();
9281124         
929
-        if (!GroupEditor.allparams)
1125
+        if (!allparams)
9301126             return;
9311127 
9321128             setupPanel = new cGridBag().setVertical(false);
....@@ -939,7 +1135,7 @@
9391135         hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
9401136                 hideCB.setToolTipText("Hide object");
9411137         markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
942
-        markCB.setToolTipText("Set the animation target transform");
1138
+        markCB.setToolTipText("As animation target transform");
9431139         
9441140             setupPanel2 = new cGridBag().setVertical(false);
9451141             
....@@ -947,7 +1143,7 @@
9471143         rewindCB.setToolTipText("Rewind animation");
9481144         
9491145         randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
950
-        randomCB.setToolTipText("Rewind or Go back and forth randomly");
1146
+        randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
9511147 
9521148         if (Globals.ADVANCED)
9531149         {
....@@ -962,23 +1158,23 @@
9621158         oe.ctrlPanel.add(setupPanel2);
9631159         oe.ctrlPanel.Return();
9641160         
965
-            commandsPanel = new cGridBag().setVertical(false);
1161
+            objectCommandsPanel = new cGridBag().setVertical(false);
9661162         
967
-        resetButton = AddButton(commandsPanel, "Reset");
1163
+        resetButton = AddButton(objectCommandsPanel, "Reset");
9681164         resetButton.setToolTipText("Jump to frame zero");
969
-        stepButton = AddButton(commandsPanel, "Step");
1165
+        stepButton = AddButton(objectCommandsPanel, "Step");
9701166         stepButton.setToolTipText("Step one frame");
9711167 //            resetAllButton = AddButton(oe, "Reset All");
9721168 //            stepAllButton = AddButton(oe, "Step All");
9731169 //            Return();
974
-        slowerButton = AddButton(commandsPanel, "Slow");
1170
+        slowerButton = AddButton(objectCommandsPanel, "Slow");
9751171         slowerButton.setToolTipText("Decrease animation speed");
976
-        fasterButton = AddButton(commandsPanel, "Fast");
1172
+        fasterButton = AddButton(objectCommandsPanel, "Fast");
9771173         fasterButton.setToolTipText("Increase animation speed");
978
-        remarkButton = AddButton(commandsPanel, "Remark");
1174
+        remarkButton = AddButton(objectCommandsPanel, "Remark");
9791175         remarkButton.setToolTipText("Set the current transform as the target");
9801176 
981
-        oe.ctrlPanel.add(commandsPanel);
1177
+        oe.ctrlPanel.add(objectCommandsPanel);
9821178         oe.ctrlPanel.Return();
9831179 
9841180     pushPanel = AddSlider(oe.ctrlPanel, "Push", -1, 1, copy.NORMALPUSH, 1.1); // To have the buttons
....@@ -1184,8 +1380,11 @@
11841380         //worldPanel.setName("World");
11851381 	centralPanel = new cGridBag();
11861382         centralPanel.preferredWidth = 20;
1187
-	timelinePanel = new JPanel(new BorderLayout());
1188
-        timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1383
+        
1384
+        if (Globals.ADVANCED)
1385
+        {
1386
+            timelinePanel = new JPanel(new BorderLayout());
1387
+            timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
11891388 
11901389         cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
11911390         cameraPanel.setContinuousLayout(true);
....@@ -1194,7 +1393,10 @@
11941393 //        cameraPanel.setDividerSize(9);
11951394         cameraPanel.setResizeWeight(1.0);
11961395         
1396
+        }
1397
+        
11971398         centralPanel.add(cameraView);
1399
+        centralPanel.setFocusable(true);
11981400         //frame.setJMenuBar(timelineMenubar);
11991401         //centralPanel.add(timelinePanel);
12001402         
....@@ -1261,8 +1463,9 @@
12611463 //        north.setName("Edit");
12621464 //        north.add(ctrlPanel, BorderLayout.NORTH);
12631465 //        objectPanel.add(north);
1264
-        objectPanel.add(ctrlPanel);
1466
+        objectPanel.add(editPanel);
12651467         objectPanel.add(infoPanel);
1468
+        objectPanel.add(toolboxPanel);
12661469 
12671470         /*
12681471         aConstraints.gridx = 0;
....@@ -1271,7 +1474,7 @@
12711474         aConstraints.gridy += 1;
12721475         aConstraints.gridwidth = 1;
12731476         mainPanel.add(objectPanel, aConstraints);
1274
-         */
1477
+        */
12751478 
12761479         scrollpane = new JScrollPane(mainPanel, ScrollPaneConstants.// VERTICAL_SCROLLBAR_ALWAYS,
12771480                 VERTICAL_SCROLLBAR_AS_NEEDED,
....@@ -1288,9 +1491,7 @@
12881491         JTabbedPane tabbedPane = new JTabbedPane();
12891492         tabbedPane.add(scrollpane);
12901493 
1291
-        tabbedPane.add(FSPane = new cFileSystemPane(this));
1292
-
1293
-        optionsPanel = new cGridBag().setVertical(true);
1494
+        optionsPanel = new cGridBag().setVertical(false);
12941495 
12951496         optionsPanel.setName("Options");
12961497         
....@@ -1298,6 +1499,8 @@
12981499         
12991500         tabbedPane.add(optionsPanel);
13001501         
1502
+        tabbedPane.add(FSPane = new cFileSystemPane(this));
1503
+
13011504         scenePanel.add(tabbedPane);
13021505 
13031506         /*
....@@ -1390,8 +1593,12 @@
13901593 //            aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
13911594 
13921595         frame.setSize(1280, 860);
1596
+        
1597
+        frame.validate();
13931598         frame.setVisible(true);
13941599 
1600
+                    cameraView.requestFocusInWindow();
1601
+                    
13951602         gridPanel.setDividerLocation(1.0);
13961603 
13971604         frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
....@@ -2707,6 +2914,8 @@
27072914 
27082915     void SetMaterial(Object3D object)
27092916     {
2917
+        latestObject = object;
2918
+        
27102919         cMaterial mat = object.material;
27112920 
27122921         if (mat == null)
....@@ -2818,12 +3027,17 @@
28183027 //                }
28193028 
28203029         /**/
2821
-        if (deselect)
3030
+        if (deselect || child == null)
28223031         {
28233032             //group.deselectAll();
28243033             //freeze = true;
28253034             GetTree().clearSelection();
28263035             //freeze = false;
3036
+            
3037
+            if (child == null)
3038
+            {
3039
+                return;
3040
+            }
28273041         }
28283042 
28293043         //group.addSelectee(child);
....@@ -2892,7 +3106,7 @@
28923106             cameraView.ToggleDL();
28933107             cameraView.repaint();
28943108             return;
2895
-        } else if (event.getSource() == toggleTextureItem)
3109
+        } else if (event.getSource() == toggleTextureItem || event.getSource() == toggleTextureCB)
28963110         {
28973111             cameraView.ToggleTexture();
28983112             // june 2013           copy.HardTouch();
....@@ -2931,7 +3145,7 @@
29313145             frame.validate();
29323146 
29333147             return;
2934
-        } else if (event.getSource() == toggleSwitchItem)
3148
+        } else if (event.getSource() == toggleSwitchItem || event.getSource() == toggleSwitchCB)
29353149         {
29363150             cameraView.ToggleSwitch();
29373151             cameraView.repaint();
....@@ -3315,6 +3529,8 @@
33153529     
33163530     public void Save()
33173531     {
3532
+        System.err.println("Save");
3533
+        
33183534         cRadio tab = GetCurrentTab();
33193535         
33203536         boolean temp = CameraPane.SWITCH;
....@@ -3336,6 +3552,8 @@
33363552             tab.graphs[i] = null;
33373553         }
33383554 
3555
+        SetUndoStates();
3556
+        
33393557         // test save
33403558         if (false)
33413559         {
....@@ -3358,6 +3576,8 @@
33583576 
33593577     void CopyChanged(Object3D obj)
33603578     {
3579
+        SetUndoStates();
3580
+        
33613581         boolean temp = CameraPane.SWITCH;
33623582         CameraPane.SWITCH = false;
33633583         
....@@ -3397,8 +3617,21 @@
33973617         refreshContents();
33983618     }
33993619     
3620
+    cButton undoButton;
3621
+    cButton redoButton;
3622
+        
3623
+    void SetUndoStates()
3624
+    {
3625
+        cRadio tab = GetCurrentTab();
3626
+        
3627
+        undoButton.setEnabled(tab.undoindex > 0);
3628
+        redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
3629
+    }
3630
+    
34003631     public void Undo()
34013632     {
3633
+        System.err.println("Undo");
3634
+        
34023635         cRadio tab = GetCurrentTab();
34033636         
34043637         if (tab.undoindex == 0)
....@@ -3582,7 +3815,7 @@
35823815         assert false;
35833816     }
35843817 
3585
-    void EditSelection()
3818
+    void EditSelection(boolean newWindow)
35863819     {
35873820     }
35883821 
....@@ -4077,7 +4310,8 @@
40774310 
40784311     void makeSomething(Object3D thing, boolean resetmodel) // deselect)
40794312     {
4080
-        Save();
4313
+        if (Globals.SAVEONMAKE) // && resetmodel)
4314
+            Save();
40814315         //Tween.set(thing, 0).target(1).start(tweenManager);
40824316         //Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
40834317 //            if (thing instanceof GenericJointDemo)
....@@ -4164,6 +4398,12 @@
41644398         {
41654399             ResetModel();
41664400             Select(thing.GetTreePath(), true, false); // unselect... false);
4401
+            
4402
+        if (thing.Size() == 0)
4403
+        {
4404
+            //EditSelection(false);
4405
+        }
4406
+        
41674407             refreshContents();
41684408         }
41694409 
....@@ -4386,6 +4626,7 @@
43864626         
43874627         if (readobj != null)
43884628         {
4629
+        if (Globals.SAVEONMAKE)
43894630             Save();
43904631             try
43914632             {
....@@ -4564,6 +4805,8 @@
45644805             String filename = browser.getFile();
45654806             if (filename != null && filename.length() > 0)
45664807             {
4808
+                if (!filename.endsWith(".gfd"))
4809
+                    filename += ".gfd";
45674810                 lastname = browser.getDirectory() + filename;
45684811                 save();
45694812             }
....@@ -4757,18 +5000,31 @@
47575000     CheckboxMenuItem togglePaintItem;
47585001     JSplitPane mainPanel;
47595002     JScrollPane scrollpane;
5003
+    
47605004     JPanel toolbarPanel;
5005
+    
47615006     cGridBag treePanel;
5007
+    
47625008     JPanel radioPanel;
47635009     ButtonGroup buttonGroup;
4764
-    cGridBag ctrlPanel;
5010
+    
5011
+    cGridBag toolboxPanel;
47655012     cGridBag materialPanel;
5013
+    cGridBag ctrlPanel;
5014
+    
47665015     JScrollPane infoPanel;
5016
+    
47675017     cGridBag optionsPanel;
5018
+    
47685019     JTabbedPane objectPanel;
5020
+    boolean materialFlushed;
5021
+    Object3D latestObject;
5022
+    
47695023     cGridBag XYZPanel;
5024
+    
47705025     JSplitPane gridPanel;
47715026     JSplitPane bigPanel;
5027
+    
47725028     cGridBag bigThree;
47735029     cGridBag scenePanel;
47745030     cGridBag centralPanel;
....@@ -4883,7 +5139,7 @@
48835139     cNumberSlider fogField;
48845140     JLabel opacityPowerLabel;
48855141     cNumberSlider opacityPowerField;
4886
-    JTree jTree;
5142
+    cTree jTree;
48875143     //ObjectUI parent;
48885144     
48895145     cNumberSlider normalpushField;