Removed 'Logs' tab.
This commit is contained in:
@ -99,7 +99,7 @@ public class Main {
|
|||||||
// Popup Main window.
|
// Popup Main window.
|
||||||
WindowHandler.toggleFrames();
|
WindowHandler.toggleFrames();
|
||||||
|
|
||||||
//testStuff(); // Delete Me
|
testStuff(); // Delete Me
|
||||||
}
|
}
|
||||||
|
|
||||||
@SuppressWarnings("static-access")
|
@SuppressWarnings("static-access")
|
||||||
@ -266,9 +266,8 @@ public class Main {
|
|||||||
} catch (InvalidParametersException e) {
|
} catch (InvalidParametersException e) {
|
||||||
System.out.println("Bad parameters sent..");
|
System.out.println("Bad parameters sent..");
|
||||||
}
|
}
|
||||||
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
// Test reading all router info
|
// Test reading all router info
|
||||||
System.out.println("\nGetRouterInfo");
|
System.out.println("\nGetRouterInfo");
|
||||||
try {
|
try {
|
||||||
@ -284,6 +283,7 @@ public class Main {
|
|||||||
System.out.println("Connection failed..");
|
System.out.println("Connection failed..");
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Test restart - worked at one point :) Possibly now as well.
|
// Test restart - worked at one point :) Possibly now as well.
|
||||||
/*
|
/*
|
||||||
|
@ -214,24 +214,29 @@ public class ConfigurationTab extends TabLogoPanel {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void populateSettings(){
|
private void populateSettings(){
|
||||||
try {
|
SwingUtilities.invokeLater(new Runnable(){
|
||||||
EnumMap<NETWORK_SETTING, Object> em = GetNetworkSetting.execute(NETWORK_SETTING.TCP_PORT, NETWORK_SETTING.UDP_PORT,
|
@Override
|
||||||
NETWORK_SETTING.UPNP, NETWORK_SETTING.BW_IN, NETWORK_SETTING.BW_OUT, NETWORK_SETTING.BW_SHARE);
|
public void run(){
|
||||||
|
try {
|
||||||
txtTCPPort.setText((String) em.get(NETWORK_SETTING.TCP_PORT));
|
EnumMap<NETWORK_SETTING, Object> em = GetNetworkSetting.execute(NETWORK_SETTING.TCP_PORT, NETWORK_SETTING.UDP_PORT,
|
||||||
txtUDPPort.setText((String) em.get(NETWORK_SETTING.UDP_PORT));
|
NETWORK_SETTING.UPNP, NETWORK_SETTING.BW_IN, NETWORK_SETTING.BW_OUT, NETWORK_SETTING.BW_SHARE);
|
||||||
boolean upnpValue = Boolean.parseBoolean((String) em.get(NETWORK_SETTING.UPNP));
|
|
||||||
chkbxUPNP.setSelected(upnpValue);
|
txtTCPPort.setText((String) em.get(NETWORK_SETTING.TCP_PORT));
|
||||||
txtDownload.setText((String) em.get(NETWORK_SETTING.BW_IN));
|
txtUDPPort.setText((String) em.get(NETWORK_SETTING.UDP_PORT));
|
||||||
txtUpload.setText((String) em.get(NETWORK_SETTING.BW_OUT));
|
boolean upnpValue = Boolean.parseBoolean((String) em.get(NETWORK_SETTING.UPNP));
|
||||||
txtShare.setText((String) em.get(NETWORK_SETTING.BW_SHARE));
|
chkbxUPNP.setSelected(upnpValue);
|
||||||
StatusHandler.setStatus(SETTINGS_READ);
|
txtDownload.setText((String) em.get(NETWORK_SETTING.BW_IN));
|
||||||
|
txtUpload.setText((String) em.get(NETWORK_SETTING.BW_OUT));
|
||||||
} catch (InvalidPasswordException e) {
|
txtShare.setText((String) em.get(NETWORK_SETTING.BW_SHARE));
|
||||||
StatusHandler.setDefaultStatus(DEFAULT_STATUS.INVALID_PASSWORD);
|
StatusHandler.setStatus(SETTINGS_READ);
|
||||||
} catch (JSONRPC2SessionException e) {
|
|
||||||
StatusHandler.setDefaultStatus(DEFAULT_STATUS.NOT_CONNECTED);
|
} catch (InvalidPasswordException e) {
|
||||||
}
|
StatusHandler.setDefaultStatus(DEFAULT_STATUS.INVALID_PASSWORD);
|
||||||
|
} catch (JSONRPC2SessionException e) {
|
||||||
|
StatusHandler.setDefaultStatus(DEFAULT_STATUS.NOT_CONNECTED);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -90,10 +90,6 @@ public class Main {
|
|||||||
TabLogoPanel configTab = new ConfigurationTab("itoopie-opaque12");
|
TabLogoPanel configTab = new ConfigurationTab("itoopie-opaque12");
|
||||||
tabbedPane.addTab(Transl._("Configuration"), null, configTab, null);
|
tabbedPane.addTab(Transl._("Configuration"), null, configTab, null);
|
||||||
tabbedPane.addChangeListener(new TabChangeListener(configTab));
|
tabbedPane.addChangeListener(new TabChangeListener(configTab));
|
||||||
|
|
||||||
|
|
||||||
JPanel logPanel = new LogoPanel("itoopie-opaque12");
|
|
||||||
tabbedPane.addTab(Transl._("Logs"), null, logPanel, null);
|
|
||||||
|
|
||||||
|
|
||||||
TabLogoPanel aboutTab = new AboutTab("itoopie-opaque12");
|
TabLogoPanel aboutTab = new AboutTab("itoopie-opaque12");
|
||||||
|
Reference in New Issue
Block a user