Changeset 1102 for trunk/src/org/apollo/widgets/SearchRecorder.java

Timestamp:

05/10/18 16:04:51 (6 years ago)

Author:

davidb

Message:

Reworking of the code-base to separate logic from graphics. This version of Expeditee now supports a JFX graphics as an alternative to SWING

File:

• trunk/src/org/apollo/widgets/SearchRecorder.java (modified) (5 diffs)

trunk/src/org/apollo/widgets/SearchRecorder.java

@@ -30 +30 @@
 import org.apollo.util.ApolloSystemLog;
 import org.expeditee.actions.Actions;
-import org.expeditee.gui.DisplayIO;
+import org.expeditee.gio.swing.SwingMiscManager;
+import org.expeditee.gui.DisplayController;
 import org.expeditee.gui.Frame;
 import org.expeditee.items.ItemParentStateChangedEvent;
 import org.expeditee.items.Text;
-import org.expeditee.items.widgets.InteractiveWidget;
-
-public class SearchRecorder extends InteractiveWidget 
+import org.expeditee.items.widgets.SwingWidget;
+
+public class SearchRecorder extends SwingWidget 
         implements ActionListener, Observer {
         
@@ -68 +69 @@
                 // Create gui layout
                 recordButton = new JButton();
-                recordButton.setIcon(IconRepository.getIcon("searchmel.png"));
+                SwingMiscManager.setJButtonIcon(recordButton, IconRepository.getIcon("searchmel.png"));
                 recordButton.setToolTipText("Search for audio from live recording");
                 recordButton.addActionListener(this);
@@ -74 +75 @@
 
                 commitButton = new JButton();
-                commitButton.setIcon(IconRepository.getIcon("commitquery.png"));
+                SwingMiscManager.setJButtonIcon(commitButton, IconRepository.getIcon("commitquery.png"));
                 commitButton.addActionListener(this);
                 commitButton.setToolTipText("GO!");
@@ -82 +83 @@
                 cancelButton = new JButton();
                 cancelButton.setToolTipText("Cancel");
-                cancelButton.setIcon(IconRepository.getIcon("cancel.png"));
+                SwingMiscManager.setJButtonIcon(cancelButton, IconRepository.getIcon("cancel.png"));
                 cancelButton.addActionListener(this);
                 cancelButton.setPreferredSize(new Dimension(BUTTON_SIZE, BUTTON_SIZE));
@@ -384 +385 @@
                         if (hasExplicityStopped) {
                                 
-                                Frame sourceFrame = DisplayIO.getCurrentFrame();
+                                Frame sourceFrame = DisplayController.getCurrentFrame();
                                 
                                  if (sourceFrame != null &&