Fix a problem with initial turning on the packet logging and update some config string resources.

16 years ago · 3e261e181d
parent 04401c32b6
commit 3e261e181d
3 changed files with 11 additions and 7 deletions
--- a/resources/languages/resources.properties
+++ b/resources/languages/resources.properties
@ -1097,10 +1097,10 @@ plugin.provisioning.URI=URI

 # packet logging service
 impl.packetlogging.PACKET_LOGGING_CONFIG=Packet Logging
-impl.packetlogging.ENABLE_DISABLE=Enable Packet Logging
+impl.packetlogging.ENABLE_DISABLE=Enable packet logging
 impl.packetlogging.PACKET_LOGGING_RTP=RTP
-impl.packetlogging.PACKET_LOGGING_RTP_DESCRIPTION=Will save only few initial packets and one on every 5000.  
-impl.packetlogging.PACKET_LOGGING_DESCRIPTION=<html>Prints debug packets of various protocols in the <br>log folder using pcap format (tcpdump/wireshark).</html>
+impl.packetlogging.PACKET_LOGGING_RTP_DESCRIPTION=(stores 1 packet out of every 5000)
+impl.packetlogging.PACKET_LOGGING_DESCRIPTION=<html>Logs debug packets of various protocols in the <br>log folder using pcap format (tcpdump/wireshark).</html>
 impl.packetlogging.PACKET_LOGGING_FILE_COUNT=Number of log files
 impl.packetlogging.PACKET_LOGGING_FILE_SIZE=Maximum file size (in KB)

--- a/src/net/java/sip/communicator/impl/packetlogging/PacketLoggingActivator.java
+++ b/src/net/java/sip/communicator/impl/packetlogging/PacketLoggingActivator.java
@ -317,6 +317,8 @@ static void setGlobalLoggingEnabled(boolean enabled)
            jabberLoggingEnabled = false;
            rtpLoggingEnabled = false;
        }
+
+        globalLoggingEnabled = enabled;
    }

    /**
--- a/src/net/java/sip/communicator/impl/packetlogging/PacketLoggingConfigForm.java
+++ b/src/net/java/sip/communicator/impl/packetlogging/PacketLoggingConfigForm.java
@ -94,11 +94,13 @@ private void init()
            resources.getI18NString("plugin.jabberaccregwizz.PROTOCOL_NAME"));
        jabberProtocolCheckBox.addActionListener(this);

+        String rtpDescription = resources.getI18NString(
+            "impl.packetlogging.PACKET_LOGGING_RTP_DESCRIPTION");
        rtpProtocolCheckBox = new JCheckBox(
-            resources.getI18NString("impl.packetlogging.PACKET_LOGGING_RTP"));
+            resources.getI18NString("impl.packetlogging.PACKET_LOGGING_RTP")
+            + " " + rtpDescription);
        rtpProtocolCheckBox.addActionListener(this);
-        rtpProtocolCheckBox.setToolTipText(resources.getI18NString(
-                "impl.packetlogging.PACKET_LOGGING_RTP_DESCRIPTION"));
+        rtpProtocolCheckBox.setToolTipText(rtpDescription);

        JPanel mainPanel = new TransparentPanel();

@ -124,7 +126,7 @@ private void init()
        descriptionLabel.setForeground(Color.GRAY);
        descriptionLabel.setFont(descriptionLabel.getFont().deriveFont(8));
        c.gridy = 1;
-        c.insets = new Insets(0, 40, 10, 0);
+        c.insets = new Insets(0, 25, 10, 0);
        mainPanel.add(descriptionLabel, c);

        final JPanel loggersButtonPanel