added 'Add all' and 'Remove all' button and display number of available devices

Author: Drumber

openrgb-plugin/dependency-reduced-pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <artifactId>OpenRGB-Plugin</artifactId>
     <groupId>de.lars</groupId>
-    <version>1.1</version>
+    <version>1.2</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>openrgb-plugin</artifactId>

openrgb-plugin/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <artifactId>OpenRGB-Plugin</artifactId>
         <groupId>de.lars</groupId>
-        <version>1.1</version>
+        <version>1.2</version>
     </parent>
 
     <artifactId>openrgb-plugin</artifactId>

openrgb-plugin/src/main/java/de/lars/openrgbplugin/OpenRgbPlugin.java

@@ -254,7 +254,6 @@ public boolean isVirtualOutputUsed(String outputId) {
      */
     public OutputHandler getHandlerByVirtualOutput(String outputId) {
         for(OutputHandler handler : setHandler) {
-            System.out.println("Handler output: " + handler.getVirtualOutput().getId() + " output: " + outputId + " equals: " + handler.getVirtualOutput().getId().equals(outputId));
             if(handler.getVirtualOutput().getId().equals(outputId))
                 return handler;
         }

openrgb-plugin/src/main/java/de/lars/openrgbplugin/ui/SetupPanel.java

@@ -106,6 +106,39 @@ private void initSettingsPanel() {
         });
         panelSettings.add(UserInterfaceUtil.createSettingBgr(lblDeviceId, fieldDeviceId, btnAddDeviceId));
 
+        if(instance.getOpenRGB().isConnected()) {
+            // show info label, remove all and add all button
+            int deviceCount = instance.getOpenRGB().getControllerCount();
+
+            JLabel lblCountInfo = new JLabel("There are " + deviceCount + " devices available.");
+            lblCountInfo.setForeground(Style.textColor);
+
+            JButton btnAddAll = new JButton("Add all");
+            UiUtils.configureButton(btnAddAll);
+            btnAddAll.addActionListener(e -> {
+                for(int i = 0; i < deviceCount; i++) {
+                    if(!listDevices.contains(i))
+                        listDevices.add(i);
+                }
+                updateDeviceListPanel();
+            });
+
+            JButton btnRemoveAll = new JButton("Remove all");
+            UiUtils.configureButton(btnRemoveAll);
+            btnRemoveAll.addActionListener(e -> {
+                listDevices.clear();
+                updateDeviceListPanel();
+            });
+
+            // add components to panel
+            panelSettings.add(UserInterfaceUtil.createSettingBgr(lblCountInfo, btnAddAll, btnRemoveAll));
+        } else {
+            // show hint message
+            JLabel lblHint = new JLabel("(i) Go back and connect the client to receive live data from the SDK server.");
+            lblHint.setForeground(Style.textColorDarker);
+            panelSettings.add(UserInterfaceUtil.createSettingBgr(lblHint));
+        }
+
         panelDeviceList = new JPanel();
         panelDeviceList.setBackground(Style.panelDarkBackground);
         panelDeviceList.setLayout(new BoxLayout(panelDeviceList, BoxLayout.Y_AXIS));
@@ -191,9 +224,11 @@ private void updateDeviceListPanel() {
         boolean isConnected = instance.getOpenRGB().isConnected();
         int controllerCount = isConnected ? instance.getOpenRGB().getControllerCount() : -1;
 
-        for(int deviceId : listDevices) {
+        for(int i = 0; i < listDevices.size(); i++) {
+            final int deviceId = listDevices.get(i);
             ListElement el = new ListElement(40);
             panelDeviceList.add(el);
+            panelDeviceList.add(Box.createVerticalStrut(5));
 
             JLabel lblDeviceId = new JLabel("Device #" + deviceId);
             lblDeviceId.setForeground(Style.textColor);
@@ -219,20 +254,67 @@ private void updateDeviceListPanel() {
                 }
             }
 
+            el.add(Box.createHorizontalGlue());
+
+            // move device up
+            JButton btnUp = new JButton("\u25B2");
+            configurePanelButton(btnUp);
+            btnUp.setToolTipText("Move up");
+            btnUp.addActionListener(e -> {
+                int index = listDevices.indexOf(deviceId);
+                if(index > 0) {
+                    // move element up in list
+                    listDevices.remove(index);
+                    listDevices.add(index - 1, deviceId);
+                }
+                updateDeviceListPanel();
+            });
+            el.add(btnUp);
+            el.add(Box.createHorizontalStrut(5));
+
+            // move device down
+            JButton btnDown = new JButton("\u25BC");
+            configurePanelButton(btnDown);
+            btnDown.setToolTipText("Move down");
+            btnDown.addActionListener(e -> {
+                int index = listDevices.indexOf(deviceId);
+                if(index < listDevices.size() - 1) {
+                    // move element down in list
+                    listDevices.remove(index);
+                    listDevices.add(index + 1, deviceId);
+                }
+                updateDeviceListPanel();
+            });
+            el.add(btnDown);
+            el.add(Box.createHorizontalStrut(5));
+
+            // check to disable move up/down buttons
+            if(i == 0)
+                btnUp.setEnabled(false);
+            if(i == listDevices.size() - 1)
+                btnDown.setEnabled(false);
+
             // remove device button
-            JButton btnRemove = new JButton("X");
-            UiUtils.configureButton(btnRemove);
+            JButton btnRemove = new JButton("\u2715");
+            configurePanelButton(btnRemove);
             btnRemove.setToolTipText("Remove device from list");
             btnRemove.addActionListener(e -> {
                 listDevices.remove((Integer) deviceId);
                 updateDeviceListPanel();
             });
-            el.add(Box.createHorizontalGlue());
             el.add(btnRemove);
         }
         panelDeviceList.updateUI();
     }
 
+    private void configurePanelButton(JButton btn) {
+        UiUtils.configureButton(btn);
+        btn.setContentAreaFilled(false);
+        btn.setBorder(null);
+        btn.setCursor(new Cursor(Cursor.HAND_CURSOR));
+        btn.setFont(new Font(Font.DIALOG, Font.PLAIN, 13));
+    }
+
     @Override
     public void onBack() {
         // update devices panel

openrgb-plugin/src/main/resources/plugin.properties

@@ -2,6 +2,6 @@ main=de.lars.openrgbplugin.OpenRgbPlugin
 name=OpenRGB-Plugin
 displayname=OpenRGB Plugin
 author=Lars (~Drumber)
-version=1.1
+version=1.2
 scope=swing
 minVersion=v0.2.4-rc2

openrgb-wrapper/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <artifactId>OpenRGB-Plugin</artifactId>
         <groupId>de.lars</groupId>
-        <version>1.1</version>
+        <version>1.2</version>
     </parent>
 
     <artifactId>openrgb-wrapper</artifactId>

pom.xml

@@ -7,7 +7,7 @@
     <groupId>de.lars</groupId>
     <artifactId>OpenRGB-Plugin</artifactId>
     <packaging>pom</packaging>
-    <version>1.1</version>
+    <version>1.2</version>
 
     <modules>
         <module>openrgb-wrapper</module>