diff --git a/apps/desktopgui/desktopgui/resources/logo/logo_green.jpg b/apps/desktopgui/desktopgui/resources/logo/logo_green.jpg
index 9a29b6d1c..d558efcea 100644
Binary files a/apps/desktopgui/desktopgui/resources/logo/logo_green.jpg and b/apps/desktopgui/desktopgui/resources/logo/logo_green.jpg differ
diff --git a/apps/desktopgui/desktopgui/resources/logo/logo_orange.jpg b/apps/desktopgui/desktopgui/resources/logo/logo_orange.jpg
index 137a25e7a..d131f21b6 100644
Binary files a/apps/desktopgui/desktopgui/resources/logo/logo_orange.jpg and b/apps/desktopgui/desktopgui/resources/logo/logo_orange.jpg differ
diff --git a/apps/desktopgui/desktopgui/resources/logo/logo_red.jpg b/apps/desktopgui/desktopgui/resources/logo/logo_red.jpg
index 1da898381..c1a60b8bb 100644
Binary files a/apps/desktopgui/desktopgui/resources/logo/logo_red.jpg and b/apps/desktopgui/desktopgui/resources/logo/logo_red.jpg differ
diff --git a/apps/desktopgui/src/desktopgui/GUIVersion.java b/apps/desktopgui/src/desktopgui/GUIVersion.java
index e882a2b73..7bde544de 100644
--- a/apps/desktopgui/src/desktopgui/GUIVersion.java
+++ b/apps/desktopgui/src/desktopgui/GUIVersion.java
@@ -10,5 +10,5 @@ package desktopgui;
* @author mathias
*/
public class GUIVersion {
- public static final String VERSION = "0.0.1";
+ public static final String VERSION = "0.0.1.1";
}
diff --git a/apps/desktopgui/src/gui/GeneralConfiguration.form b/apps/desktopgui/src/gui/GeneralConfiguration.form
index 5d48a84a3..df02e3d96 100644
--- a/apps/desktopgui/src/gui/GeneralConfiguration.form
+++ b/apps/desktopgui/src/gui/GeneralConfiguration.form
@@ -23,13 +23,16 @@
-
+
+
+
+
-
+
@@ -46,7 +49,7 @@
-
+
@@ -280,15 +283,16 @@
-
-
-
-
-
+
-
-
-
+
+
+
+
+
+
+
+
@@ -302,7 +306,7 @@
-
+
@@ -311,20 +315,20 @@
-
+
-
+
-
+
-
+
@@ -391,15 +395,71 @@
-
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -416,12 +476,12 @@
-
+
-
+
@@ -441,12 +501,12 @@
-
+
-
+
diff --git a/apps/desktopgui/src/gui/GeneralConfiguration.java b/apps/desktopgui/src/gui/GeneralConfiguration.java
index ea621213a..912026bf1 100644
--- a/apps/desktopgui/src/gui/GeneralConfiguration.java
+++ b/apps/desktopgui/src/gui/GeneralConfiguration.java
@@ -55,6 +55,11 @@ public class GeneralConfiguration extends javax.swing.JFrame {
jToggleButton2 = new javax.swing.JToggleButton();
jToggleButton3 = new javax.swing.JToggleButton();
jPanel4 = new javax.swing.JPanel();
+ jScrollPane1 = new javax.swing.JScrollPane();
+ jScrollPane2 = new javax.swing.JScrollPane();
+ jLabel9 = new javax.swing.JLabel();
+ jLabel10 = new javax.swing.JLabel();
+ jLabel11 = new javax.swing.JLabel();
jPanel5 = new javax.swing.JPanel();
jPanel6 = new javax.swing.JPanel();
@@ -75,7 +80,7 @@ public class GeneralConfiguration extends javax.swing.JFrame {
jPanel1Layout.setHorizontalGroup(
jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel1Layout.createSequentialGroup()
- .addContainerGap(461, Short.MAX_VALUE)
+ .addContainerGap(475, Short.MAX_VALUE)
.addComponent(ok)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(cancel)
@@ -193,12 +198,12 @@ public class GeneralConfiguration extends javax.swing.JFrame {
.addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(jPanel3Layout.createSequentialGroup()
.addGap(20, 20, 20)
- .addComponent(jLabel8))
- .addGroup(jPanel3Layout.createSequentialGroup()
- .addGap(20, 20, 20)
- .addComponent(jToggleButton1)
- .addGap(18, 18, 18)
- .addComponent(jToggleButton2))
+ .addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(jLabel8)
+ .addGroup(jPanel3Layout.createSequentialGroup()
+ .addComponent(jToggleButton1)
+ .addGap(18, 18, 18)
+ .addComponent(jToggleButton2))))
.addGroup(jPanel3Layout.createSequentialGroup()
.addGap(40, 40, 40)
.addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@@ -207,26 +212,26 @@ public class GeneralConfiguration extends javax.swing.JFrame {
.addComponent(jRadioButton3))))
.addGap(9, 9, 9))
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel3Layout.createSequentialGroup()
- .addContainerGap(337, Short.MAX_VALUE)
+ .addContainerGap(339, Short.MAX_VALUE)
.addComponent(jToggleButton3)
.addContainerGap())
);
jPanel3Layout.setVerticalGroup(
jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(jPanel3Layout.createSequentialGroup()
- .addGap(20, 20, 20)
+ .addContainerGap()
.addComponent(jLabel8)
- .addGap(5, 5, 5)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(jRadioButton1)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(jRadioButton2)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(jRadioButton3)
- .addGap(40, 40, 40)
+ .addGap(18, 18, 18)
.addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(jToggleButton1)
.addComponent(jToggleButton2))
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 48, Short.MAX_VALUE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 181, Short.MAX_VALUE)
.addComponent(jToggleButton3)
.addContainerGap())
);
@@ -235,15 +240,47 @@ public class GeneralConfiguration extends javax.swing.JFrame {
jPanel4.setName("jPanel4"); // NOI18N
+ jScrollPane1.setName("jScrollPane1"); // NOI18N
+
+ jScrollPane2.setName("jScrollPane2"); // NOI18N
+
+ jLabel9.setText(resourceMap.getString("jLabel9.text")); // NOI18N
+ jLabel9.setName("jLabel9"); // NOI18N
+
+ jLabel10.setText(resourceMap.getString("jLabel10.text")); // NOI18N
+ jLabel10.setName("jLabel10"); // NOI18N
+
+ jLabel11.setText(resourceMap.getString("jLabel11.text")); // NOI18N
+ jLabel11.setName("jLabel11"); // NOI18N
+
javax.swing.GroupLayout jPanel4Layout = new javax.swing.GroupLayout(jPanel4);
jPanel4.setLayout(jPanel4Layout);
jPanel4Layout.setHorizontalGroup(
jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGap(0, 560, Short.MAX_VALUE)
+ .addGroup(jPanel4Layout.createSequentialGroup()
+ .addContainerGap()
+ .addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(jScrollPane2, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 538, Short.MAX_VALUE)
+ .addComponent(jLabel9, javax.swing.GroupLayout.DEFAULT_SIZE, 538, Short.MAX_VALUE)
+ .addComponent(jLabel10)
+ .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 538, Short.MAX_VALUE)
+ .addComponent(jLabel11))
+ .addContainerGap())
);
jPanel4Layout.setVerticalGroup(
jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGap(0, 278, Short.MAX_VALUE)
+ .addGroup(jPanel4Layout.createSequentialGroup()
+ .addContainerGap()
+ .addComponent(jLabel10)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 119, Short.MAX_VALUE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(jLabel11)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(jScrollPane2, javax.swing.GroupLayout.DEFAULT_SIZE, 122, Short.MAX_VALUE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(jLabel9, javax.swing.GroupLayout.PREFERRED_SIZE, 65, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addContainerGap())
);
jTabbedPane1.addTab(resourceMap.getString("jPanel4.TabConstraints.tabTitle"), jPanel4); // NOI18N
@@ -254,11 +291,11 @@ public class GeneralConfiguration extends javax.swing.JFrame {
jPanel5.setLayout(jPanel5Layout);
jPanel5Layout.setHorizontalGroup(
jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGap(0, 560, Short.MAX_VALUE)
+ .addGap(0, 562, Short.MAX_VALUE)
);
jPanel5Layout.setVerticalGroup(
jPanel5Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGap(0, 278, Short.MAX_VALUE)
+ .addGap(0, 388, Short.MAX_VALUE)
);
jTabbedPane1.addTab(resourceMap.getString("jPanel5.TabConstraints.tabTitle"), jPanel5); // NOI18N
@@ -269,11 +306,11 @@ public class GeneralConfiguration extends javax.swing.JFrame {
jPanel6.setLayout(jPanel6Layout);
jPanel6Layout.setHorizontalGroup(
jPanel6Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGap(0, 560, Short.MAX_VALUE)
+ .addGap(0, 562, Short.MAX_VALUE)
);
jPanel6Layout.setVerticalGroup(
jPanel6Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGap(0, 278, Short.MAX_VALUE)
+ .addGap(0, 388, Short.MAX_VALUE)
);
jTabbedPane1.addTab(resourceMap.getString("jPanel6.TabConstraints.tabTitle"), jPanel6); // NOI18N
@@ -283,12 +320,14 @@ public class GeneralConfiguration extends javax.swing.JFrame {
layout.setHorizontalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(jPanel1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .addComponent(jTabbedPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 564, Short.MAX_VALUE)
+ .addGroup(layout.createSequentialGroup()
+ .addGap(12, 12, 12)
+ .addComponent(jTabbedPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 566, Short.MAX_VALUE))
);
layout.setVerticalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
- .addComponent(jTabbedPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 309, Short.MAX_VALUE)
+ .addComponent(jTabbedPane1)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(jPanel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
);
@@ -302,6 +341,8 @@ public class GeneralConfiguration extends javax.swing.JFrame {
private javax.swing.JComboBox jComboBox1;
private javax.swing.JComboBox jComboBox2;
private javax.swing.JLabel jLabel1;
+ private javax.swing.JLabel jLabel10;
+ private javax.swing.JLabel jLabel11;
private javax.swing.JLabel jLabel2;
private javax.swing.JLabel jLabel3;
private javax.swing.JLabel jLabel4;
@@ -309,6 +350,7 @@ public class GeneralConfiguration extends javax.swing.JFrame {
private javax.swing.JLabel jLabel6;
private javax.swing.JLabel jLabel7;
private javax.swing.JLabel jLabel8;
+ private javax.swing.JLabel jLabel9;
private javax.swing.JPanel jPanel1;
private javax.swing.JPanel jPanel2;
private javax.swing.JPanel jPanel3;
@@ -318,6 +360,8 @@ public class GeneralConfiguration extends javax.swing.JFrame {
private javax.swing.JRadioButton jRadioButton1;
private javax.swing.JRadioButton jRadioButton2;
private javax.swing.JRadioButton jRadioButton3;
+ private javax.swing.JScrollPane jScrollPane1;
+ private javax.swing.JScrollPane jScrollPane2;
private javax.swing.JTabbedPane jTabbedPane1;
private javax.swing.JTextField jTextField1;
private javax.swing.JTextField jTextField2;
diff --git a/apps/desktopgui/src/gui/Tray.java b/apps/desktopgui/src/gui/Tray.java
index 09cf47c2a..7c95cd6eb 100644
--- a/apps/desktopgui/src/gui/Tray.java
+++ b/apps/desktopgui/src/gui/Tray.java
@@ -185,11 +185,18 @@ public class Tray {
//Add tray icon
trayIcon = new JPopupTrayIcon(image, "I2P: the anonymous network", popup);
+
+ try {
+ tray.add(trayIcon);
+ } catch (AWTException ex) {
+ Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex);
+ }
+
PeerHelper.addReachabilityListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent arg0) {
- trayIcon.setToolTip("I2P Network status: " + PeerHelper.getReachability());
+ updateTooltip();
}
});
@@ -197,6 +204,7 @@ public class Tray {
@Override
public void actionPerformed(ActionEvent arg0) {
+ updateTooltip();
int activePeers = PeerHelper.getActivePeers();
if(activePeers == 0)
trayIcon.setImage(Toolkit.getDefaultToolkit().getImage("desktopgui/resources/logo/logo_red.jpg"));
@@ -208,12 +216,10 @@ public class Tray {
}
});
-
- try {
- tray.add(trayIcon);
- } catch (AWTException ex) {
- Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex);
- }
+ }
+
+ public void updateTooltip() {
+ trayIcon.setToolTip("I2P Network status: " + PeerHelper.getReachability() + " / " + "Active Peers: " + PeerHelper.getActivePeers());
}
private SystemTray tray = null;
diff --git a/apps/desktopgui/src/gui/resources/GeneralConfiguration.properties b/apps/desktopgui/src/gui/resources/GeneralConfiguration.properties
index 32a74183c..3dc629a97 100644
--- a/apps/desktopgui/src/gui/resources/GeneralConfiguration.properties
+++ b/apps/desktopgui/src/gui/resources/GeneralConfiguration.properties
@@ -24,3 +24,6 @@ jRadioButton3.text=Download, verify and restart
jToggleButton1.text=Check for updates now
jToggleButton2.text=Update available: update now
jToggleButton3.text=Advanced update configuration
+jLabel9.text=Tunnel explanation
+jLabel10.text=Client tunnels:
+jLabel11.text=Server tunnels:
diff --git a/apps/desktopgui/src/router/configuration/PeerHelper.java b/apps/desktopgui/src/router/configuration/PeerHelper.java
index 2272456f8..f59309705 100644
--- a/apps/desktopgui/src/router/configuration/PeerHelper.java
+++ b/apps/desktopgui/src/router/configuration/PeerHelper.java
@@ -94,7 +94,7 @@ public class PeerHelper {
}
}
};
- activePeerTimer.schedule(t, 60*1000);
+ activePeerTimer.schedule(t, 0, 60*1000);
}
}
}
@@ -134,7 +134,7 @@ public class PeerHelper {
}
};
- reachabilityTimer.schedule(t, 60*1000);
+ reachabilityTimer.schedule(t, 0, 60*1000);
}
}
}
diff --git a/history.txt b/history.txt
index a6bac8ef1..5c2ecea36 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,9 @@
+2009-04-13 Mathiasdm
+ * Bugfix on tray icon updating
+ * Some more work on the general configuration menu
+ (currently not added to the tray icon menu yet, needs more work)
+ * Tweaked the desktopgui logo
+
2009-04-13 Mathiasdm
* Added I2P version and GUI version to desktopgui
* Tweaks to the tray icon menu