Removed 'Logs' tab.

This commit is contained in:
dev
2011-07-31 08:21:28 +00:00
parent ddc3518c72
commit c3b61418d2
3 changed files with 26 additions and 25 deletions

View File

@ -99,7 +99,7 @@ public class Main {
// Popup Main window.
WindowHandler.toggleFrames();
//testStuff(); // Delete Me
testStuff(); // Delete Me
}
@SuppressWarnings("static-access")
@ -266,9 +266,8 @@ public class Main {
} catch (InvalidParametersException e) {
System.out.println("Bad parameters sent..");
}
*/
// Test reading all router info
System.out.println("\nGetRouterInfo");
try {
@ -284,6 +283,7 @@ public class Main {
System.out.println("Connection failed..");
e.printStackTrace();
}
// Test restart - worked at one point :) Possibly now as well.
/*

View File

@ -214,24 +214,29 @@ public class ConfigurationTab extends TabLogoPanel {
}
private void populateSettings(){
try {
EnumMap<NETWORK_SETTING, Object> em = GetNetworkSetting.execute(NETWORK_SETTING.TCP_PORT, NETWORK_SETTING.UDP_PORT,
NETWORK_SETTING.UPNP, NETWORK_SETTING.BW_IN, NETWORK_SETTING.BW_OUT, NETWORK_SETTING.BW_SHARE);
txtTCPPort.setText((String) em.get(NETWORK_SETTING.TCP_PORT));
txtUDPPort.setText((String) em.get(NETWORK_SETTING.UDP_PORT));
boolean upnpValue = Boolean.parseBoolean((String) em.get(NETWORK_SETTING.UPNP));
chkbxUPNP.setSelected(upnpValue);
txtDownload.setText((String) em.get(NETWORK_SETTING.BW_IN));
txtUpload.setText((String) em.get(NETWORK_SETTING.BW_OUT));
txtShare.setText((String) em.get(NETWORK_SETTING.BW_SHARE));
StatusHandler.setStatus(SETTINGS_READ);
} catch (InvalidPasswordException e) {
StatusHandler.setDefaultStatus(DEFAULT_STATUS.INVALID_PASSWORD);
} catch (JSONRPC2SessionException e) {
StatusHandler.setDefaultStatus(DEFAULT_STATUS.NOT_CONNECTED);
}
SwingUtilities.invokeLater(new Runnable(){
@Override
public void run(){
try {
EnumMap<NETWORK_SETTING, Object> em = GetNetworkSetting.execute(NETWORK_SETTING.TCP_PORT, NETWORK_SETTING.UDP_PORT,
NETWORK_SETTING.UPNP, NETWORK_SETTING.BW_IN, NETWORK_SETTING.BW_OUT, NETWORK_SETTING.BW_SHARE);
txtTCPPort.setText((String) em.get(NETWORK_SETTING.TCP_PORT));
txtUDPPort.setText((String) em.get(NETWORK_SETTING.UDP_PORT));
boolean upnpValue = Boolean.parseBoolean((String) em.get(NETWORK_SETTING.UPNP));
chkbxUPNP.setSelected(upnpValue);
txtDownload.setText((String) em.get(NETWORK_SETTING.BW_IN));
txtUpload.setText((String) em.get(NETWORK_SETTING.BW_OUT));
txtShare.setText((String) em.get(NETWORK_SETTING.BW_SHARE));
StatusHandler.setStatus(SETTINGS_READ);
} catch (InvalidPasswordException e) {
StatusHandler.setDefaultStatus(DEFAULT_STATUS.INVALID_PASSWORD);
} catch (JSONRPC2SessionException e) {
StatusHandler.setDefaultStatus(DEFAULT_STATUS.NOT_CONNECTED);
}
}
});
}
/**

View File

@ -90,10 +90,6 @@ public class Main {
TabLogoPanel configTab = new ConfigurationTab("itoopie-opaque12");
tabbedPane.addTab(Transl._("Configuration"), null, configTab, null);
tabbedPane.addChangeListener(new TabChangeListener(configTab));
JPanel logPanel = new LogoPanel("itoopie-opaque12");
tabbedPane.addTab(Transl._("Logs"), null, logPanel, null);
TabLogoPanel aboutTab = new AboutTab("itoopie-opaque12");