Merge with dev branch. Added download dependencies. Fixed Axis Indicator

not being drawn in preview window.
dev
sigonasr2 7 years ago
parent 4e03806a4a
commit f86458f226
  1. BIN
      sigIRCv2.jar
  2. 1
      src/sig/modules/Controller/ControlConfigurationWindow.java
  3. 6
      src/sig/sigIRC.java

Binary file not shown.

@ -636,5 +636,6 @@ class PreviewPanel extends JPanel{
public void paintComponent(Graphics g) { public void paintComponent(Graphics g) {
super.paintComponent(g); super.paintComponent(g);
Axis.GetAxisDisplay(g,window.ConstructTemporaryAxis(),0,0,window.axis_width,window.axis_height); Axis.GetAxisDisplay(g,window.ConstructTemporaryAxis(),0,0,window.axis_width,window.axis_height);
Axis.GetAxisIndicatorDisplay(g,window.ConstructTemporaryAxis(),0,0,window.axis_width,window.axis_height);
} }
} }

@ -261,6 +261,10 @@ public class sigIRC{
manager = new FileManager("sigIRC/icon_viewers_count.png"); manager.verifyAndFetchFileFromServer(); manager = new FileManager("sigIRC/icon_viewers_count.png"); manager.verifyAndFetchFileFromServer();
manager = new FileManager("sigIRC/icon_views_count.png"); manager.verifyAndFetchFileFromServer(); manager = new FileManager("sigIRC/icon_views_count.png"); manager.verifyAndFetchFileFromServer();
manager = new FileManager("sigIRC/message_separator.png"); manager.verifyAndFetchFileFromServer(); manager = new FileManager("sigIRC/message_separator.png"); manager.verifyAndFetchFileFromServer();
manager = new FileManager("sigIRC/controller/2-way_axis.png"); manager.verifyAndFetchFileFromServer();
manager = new FileManager("sigIRC/controller/4-way_axis.png"); manager.verifyAndFetchFileFromServer();
manager = new FileManager("sigIRC/controller/controller_overlay.png"); manager.verifyAndFetchFileFromServer();
manager = new FileManager("sigIRC/controller/controller_template.png"); manager.verifyAndFetchFileFromServer();
manager = new FileManager("kill.png"); manager.verifyAndFetchFileFromServer(); manager = new FileManager("kill.png"); manager.verifyAndFetchFileFromServer();
manager = new FileManager("memory"); manager.verifyAndFetchFileFromServer(); manager = new FileManager("memory"); manager.verifyAndFetchFileFromServer();
manager = new FileManager("swap.png"); manager.verifyAndFetchFileFromServer(); manager = new FileManager("swap.png"); manager.verifyAndFetchFileFromServer();
@ -276,6 +280,8 @@ public class sigIRC{
if (autoUpdateProgram) { if (autoUpdateProgram) {
File updatedir = new File(sigIRC.BASEDIR+"sigIRC/updates/"); File updatedir = new File(sigIRC.BASEDIR+"sigIRC/updates/");
updatedir.mkdirs(); updatedir.mkdirs();
File controllerdir = new File(ControllerModule.CONTROLLERPATH);
controllerdir.mkdirs();
File programFile = new File(sigIRC.BASEDIR+"sigIRC/updates/sigIRCv2.jar"); File programFile = new File(sigIRC.BASEDIR+"sigIRC/updates/sigIRCv2.jar");
File currentProgramFile = new File(sigIRC.BASEDIR+"sigIRCv2.jar"); File currentProgramFile = new File(sigIRC.BASEDIR+"sigIRCv2.jar");
System.out.println("File size is "+currentProgramFile.length()); System.out.println("File size is "+currentProgramFile.length());

Loading…
Cancel
Save