From 1af7d3700724834e40ad8636bc9a56cdc3b19b15 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Sat, 27 Jul 2019 11:52:38 -0400
Subject: [PATCH] New layout icons
---
ObjEditor.java | 2 +-
icons/viewcontrols.png | 0
GroupEditor.java | 26 +++++++++++++-------------
icons/cube450.png | 0
icons/doublewindow24.png | 0
icons/controls-horizontal.png | 0
icons/doublewindow.png | 0
icons/controls-horizontal-settings-adjust-fader-slider-adjustment-128.png | 0
icons/controlsview.png | 0
icons/screen_512x512.png | 0
icons/cube.png | 0
11 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/GroupEditor.java b/GroupEditor.java
index f4c7c39..84ef59f 100644
--- a/GroupEditor.java
+++ b/GroupEditor.java
@@ -688,25 +688,25 @@
oe.toolbarPanel.add(snapobjectButton = new cButton("O+", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
snapobjectButton.addActionListener(this);
snapobjectButton.setToolTipText("Snap Object");
+
+ oe.toolbarPanel.add(fourButton = GetButton("icons/controls-horizontal.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
+ fourButton.addActionListener(this);
+ fourButton.setToolTipText("Show control panel only");
}
//oe.toolbarPanel.add(new JSeparator(SwingConstants.VERTICAL));
- oe.toolbarPanel.add(fourButton = new cButton("-||", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
- fourButton.addActionListener(this);
- fourButton.setToolTipText("Show left panel only");
-
- oe.toolbarPanel.add(twoButton = new cButton("|-|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
- twoButton.setToolTipText("Show right view only");
+ oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
+ twoButton.setToolTipText("Show 3D view only");
twoButton.addActionListener(this);
this.fullscreenLayout = twoButton;
- oe.toolbarPanel.add(sixButton = new cButton("-|-|", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
- sixButton.setToolTipText("Show left and right");
+ oe.toolbarPanel.add(threeButton = GetButton("icons/controlsview.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
+ threeButton.setToolTipText("Show controls and 3D view");
+ threeButton.addActionListener(this);
+ oe.toolbarPanel.add(sixButton = GetButton("icons/viewcontrols.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
+ sixButton.setToolTipText("Show 3D view and controls");
sixButton.addActionListener(this);
-// oe.toolbarPanel.add(threeButton = new cButton("|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
-// threeButton.setToolTipText("2-column layout right");
-// threeButton.addActionListener(this);
// oe.toolbarPanel.add(sevenButton = new cButton("-|-|-", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
// sevenButton.setToolTipText("3-column layout");
// sevenButton.addActionListener(this);
@@ -3300,8 +3300,8 @@
// centralPanel.setVisible(true);
// XYZPanel.setVisible(true);
bigThree.ClearUI();
+ bigThree.add(scenePanel);
bigThree.add(centralPanel);
- bigThree.add(XYZPanel);
bigThree.FlushUI();
cameraView.requestFocusInWindow();
@@ -3381,8 +3381,8 @@
// centralPanel.setVisible(true);
// XYZPanel.setVisible(false);
bigThree.ClearUI();
- bigThree.add(scenePanel);
bigThree.add(centralPanel);
+ bigThree.add(scenePanel);
bigThree.FlushUI();
cameraView.requestFocusInWindow();
diff --git a/ObjEditor.java b/ObjEditor.java
index 5b42da9..cd7eaf9 100644
--- a/ObjEditor.java
+++ b/ObjEditor.java
@@ -1632,8 +1632,8 @@
/**/
bigThree = new cGridBag();
- bigThree.addComponent(scenePanel);
bigThree.addComponent(centralPanel);
+ bigThree.addComponent(scenePanel);
//bigThree.addComponent(XYZPanel);
// // SIDE EFFECT!!!
diff --git a/icons/controls-horizontal-settings-adjust-fader-slider-adjustment-128.png b/icons/controls-horizontal-settings-adjust-fader-slider-adjustment-128.png
new file mode 100644
index 0000000..ebf05e3
--- /dev/null
+++ b/icons/controls-horizontal-settings-adjust-fader-slider-adjustment-128.png
Binary files differ
diff --git a/icons/controls-horizontal.png b/icons/controls-horizontal.png
new file mode 100644
index 0000000..0f162a8
--- /dev/null
+++ b/icons/controls-horizontal.png
Binary files differ
diff --git a/icons/controlsview.png b/icons/controlsview.png
new file mode 100644
index 0000000..90496b4
--- /dev/null
+++ b/icons/controlsview.png
Binary files differ
diff --git a/icons/cube.png b/icons/cube.png
new file mode 100644
index 0000000..a893585
--- /dev/null
+++ b/icons/cube.png
Binary files differ
diff --git a/icons/cube450.png b/icons/cube450.png
new file mode 100644
index 0000000..522b5e0
--- /dev/null
+++ b/icons/cube450.png
Binary files differ
diff --git a/icons/doublewindow.png b/icons/doublewindow.png
new file mode 100644
index 0000000..f175c56
--- /dev/null
+++ b/icons/doublewindow.png
Binary files differ
diff --git a/icons/doublewindow24.png b/icons/doublewindow24.png
new file mode 100644
index 0000000..84467b0
--- /dev/null
+++ b/icons/doublewindow24.png
Binary files differ
diff --git a/icons/screen_512x512.png b/icons/screen_512x512.png
new file mode 100644
index 0000000..3833209
--- /dev/null
+++ b/icons/screen_512x512.png
Binary files differ
diff --git a/icons/viewcontrols.png b/icons/viewcontrols.png
new file mode 100644
index 0000000..2ac5247
--- /dev/null
+++ b/icons/viewcontrols.png
Binary files differ
--
Gitblit v1.6.2