From b24b1b46190dc47ce5d072bf96c3f16c8c78795d Mon Sep 17 00:00:00 2001 From: rusefi Date: Sun, 14 Jul 2019 09:24:12 -0400 Subject: [PATCH] too much usability? Show Device Manager icon --- .../ui/resources/com/rusefi/DeviceManager.png | Bin 0 -> 1793 bytes java_console/ui/src/com/rusefi/Launcher.java | 2 +- .../ui/src/com/rusefi/StartupFrame.java | 29 +++++++++++++++--- .../com/rusefi/maintenance/DriverInstall.java | 2 +- .../com/rusefi/maintenance/ExecHelper.java | 5 +++ 5 files changed, 32 insertions(+), 6 deletions(-) create mode 100644 java_console/ui/resources/com/rusefi/DeviceManager.png diff --git a/java_console/ui/resources/com/rusefi/DeviceManager.png b/java_console/ui/resources/com/rusefi/DeviceManager.png new file mode 100644 index 0000000000000000000000000000000000000000..caf60d4e3ecda5f04c33f8f313eb733721ca5bbb GIT binary patch literal 1793 zcmV+c2mbhpP)bF02y>e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00wDEL_t(o!=;yNZyZ+{$A9O{ zZD+^pdu_)~$}Neg2$4!@;#5@;yg^896+!th2%&s{itkb(A-@77)IeXiYH1Rj)bTx8 zXJ>Y2XXkP*yqNL2Y1YDVR$9%@X!bn6=l|T!5owy*D2h1m#~4GBB=iRZRHg7dk5<^K zuR%Z%1V|}Q{lELN2IC|lj$^bolx0Dh4oQa@{Ul+Krc_mh5Q28QP1tIolmb8-&Gl>7 zxO(-<`2luzcR4sXL@9;Vdi+&N;W!Qp3-e&>cl-T5!z^WHdYY=LD2tL$@7{eifW?Ic z=4NLbqZ*|us;WXMg_M#9|J_6g@I8I5#4T=e3XNLsi~>+hagQ;l71i8b@5ye z*L4ZQ7Ov|er6i6Mgn+>JiQ|~EEXQ!xT7(b?AmKuWy z(HL$pgg8!*a{@@gaG0^Sw#GrS$G~hMgPf?{rYwrF3daV;@vjC(2*D(RGXof{k&Xmw z`R#kZqjT^!@BZjEi?1!#-i}F6ygyce2FMt5{v41}VvWIC%gV|Mx0gP|7>mVHi`y7# zycINFi*G%f(2(Rybv8ibr_@>KNCVArJSgM5CU!V`E$TF z{xk@6D2y2=VqK~d&+|?oPPzaBfg_!>DKN}3;z3FjhIFC`$C2Fo`fD~eHdtO>=JMss z%*@QPy1I(%Ivf{)6oSC_$HPiVHSU6lz%Uze(0#`KQIDb0c%Fx~mNH8@I@sqg zpM1j2^>yN5#$Pu!c(l2R?+4tubLS)kQsO!ef!65nOiUpJW&(gn)6{BXx%YSvJfA{q zDy^|vV~pl-Ym0yW>n`FNW!Y}4)adD86xmeD9hwBFjYjLH(cO}zN#8lWO%`$qu7-0=!X^GJ& zr>rWlmOLNPi+dpItbf`|Xh#u8M_pD|S0@9s+iesu%7!Fy4>vvH$tYv#;_F~7!=j|B z3d*8DDUHzztu)4h@465K2rS8PNZe0wn+;18MTG5;d-w0t@AtX2zCIbi7>m>LkdDLh z;v&X1Fg=G-6}nQCRnc@mgEfYu-ECTdPi`bxQDKw@EQ2(q6|@M$u#UG7@=S5V@zF|K@iaE#oWAcgWrGj(J2aOjmis*HYh7G;WS!06!{2MDXOZX zDod)WhL{ZlR53&tLtZJ$qM$R~!F3%Rx6Xb~im_^c`r{vX>t}D`IHz>NEX`0tVoY8C z;o=1-^-$SI-78 zY4;N+eRlTtdGvUPuO2+4`z&t8uo=sL46wR(ktk||fXkQGcyImZO#PpOuXvf$v9*?7 zoUpUI$D^%nKL5{s4xV(ewgy8W2Hwjy - * 2/14/14 + *

+ * 2/14/14 * @see SimulatorHelper * @see FirmwareFlasher */ @@ -106,6 +108,7 @@ public class StartupFrame { connectPanel.add(comboSpeeds); final JButton connect = new JButton("Connect"); + connect.setBackground(new Color(0xff7d03)); // custom orange setToolTip(connect, "Connect to real hardware"); connectPanel.add(connect); connect.addActionListener(new ActionListener() { @@ -120,8 +123,12 @@ public class StartupFrame { leftPanel.add(realHardwarePanel); leftPanel.add(miscPanel); - if (FileLog.isWindows()) - realHardwarePanel.add(DriverInstall.createButton()); + if (FileLog.isWindows()) { + JPanel topButtons = new JPanel(new FlowLayout(FlowLayout.CENTER, 5, 0)); + topButtons.add(createShowDeviceManagerButton()); + topButtons.add(DriverInstall.createButton()); + realHardwarePanel.add(topButtons); + } realHardwarePanel.add(connectPanel); realHardwarePanel.add(noPortsMessage); installMessage(noPortsMessage, "Check you cables. Check your drivers. Do you want to start simulator maybe?"); @@ -177,6 +184,20 @@ public class StartupFrame { UiUtils.centerWindow(frame); } + private Component createShowDeviceManagerButton() { + JButton showDeviceManager = new JButton(UiUtils.loadIcon("DeviceManager.png")); + showDeviceManager.setMargin(new Insets(0, 0, 0, 0)); + showDeviceManager.setToolTipText("Show Device Manager"); + showDeviceManager.addActionListener(event -> { + try { + Runtime.getRuntime().exec(ExecHelper.getBatchCommand("devmgmt.msc")); + } catch (IOException ex) { + throw new IllegalStateException(ex); + } + }); + return showDeviceManager; + } + private void installMessage(JComponent component, String s) { component.setToolTipText(s); } diff --git a/java_console/ui/src/com/rusefi/maintenance/DriverInstall.java b/java_console/ui/src/com/rusefi/maintenance/DriverInstall.java index 6077474fc4..b4d9c3fbc2 100644 --- a/java_console/ui/src/com/rusefi/maintenance/DriverInstall.java +++ b/java_console/ui/src/com/rusefi/maintenance/DriverInstall.java @@ -58,7 +58,7 @@ public class DriverInstall { wnd); String batch = isWindows7orBelow() ? WINDOWS7_BATCH : WINDOWS8_BATCH; - ExecHelper.executeCommand(UNPACKED_FOLDER, "cmd /c start " + batch, batch, wnd); + ExecHelper.executeCommand(UNPACKED_FOLDER, ExecHelper.getBatchCommand(batch), batch, wnd); } private static boolean isWindows7orBelow() { diff --git a/java_console/ui/src/com/rusefi/maintenance/ExecHelper.java b/java_console/ui/src/com/rusefi/maintenance/ExecHelper.java index 0537b76c81..0e76b8063b 100644 --- a/java_console/ui/src/com/rusefi/maintenance/ExecHelper.java +++ b/java_console/ui/src/com/rusefi/maintenance/ExecHelper.java @@ -73,4 +73,9 @@ public class ExecHelper { thread.setDaemon(true); thread.start(); } + + @NotNull + public static String getBatchCommand(String batch) { + return "cmd /c start " + batch; + } }