merge of '96728e07a35ecae37f739925252232161ec47483'
and 'a5512874bd35743a25296acf85babd4e45cc2c1b'
This commit is contained in:
dev
@ -99,7 +99,10 @@
|
||||
|
||||
|
||||
<target name="installer" depends="jar" >
|
||||
<copy file="${resources}/images/itoopie-256.png" tofile="${dist}/logo.png"/>
|
||||
<mkdir dir="${build}/images" />
|
||||
<copy file="${resources}/images/itoopie-256.png" tofile="${dist}/images/logo.png"/>
|
||||
<copy file="${resources}/images/itoopie-128.ico" tofile="${dist}/images/logo.ico"/>
|
||||
<copy file="${resources}/images/thrash-128.ico" tofile="${dist}/images/thrash.ico"/>
|
||||
<copy file="LICENSE" tofile="${dist}/license.txt"/>
|
||||
<copy file="history.txt" tofile="${dist}/history.txt"/>
|
||||
|
||||
|
||||
BIN
resources/images/itoopie-128.ico
Normal file
BIN
resources/images/itoopie-128.ico
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 81 KiB |
BIN
resources/images/thrash-128.ico
Normal file
BIN
resources/images/thrash-128.ico
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 81 KiB |
BIN
resources/images/thrash-128.png
Normal file
BIN
resources/images/thrash-128.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 33 KiB |
BIN
resources/images/thrash-256.png
Normal file
BIN
resources/images/thrash-256.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 92 KiB |
@ -95,7 +95,7 @@ public class ConfigurationTab extends TabLogoPanel {
|
||||
|
||||
final JButton btnApply = new JButton(Transl._("Apply"));
|
||||
add(btnApply);
|
||||
btnApply.setBounds(442, 272, 82, 24);
|
||||
btnApply.setBounds(442, 269, 82, 24);
|
||||
btnApply.addActionListener(new ActionListener(){
|
||||
@Override
|
||||
public void actionPerformed(ActionEvent arg0) {
|
||||
|
||||
@ -10,6 +10,7 @@ import javax.swing.plaf.InsetsUIResource;
|
||||
public class GUIHelper {
|
||||
public final static Color VERY_LIGHT = new Color(230,230,230);
|
||||
public final static Color LIGHT = new Color(215,215,215);
|
||||
public final static Color MEDIUM_LIGHT_LIGHT = new Color(205,205,205);
|
||||
public final static Color MEDIUM_LIGHT = new Color(195,195,195);
|
||||
public final static Color MEDIUM = new Color (175,175,175);
|
||||
public final static Color DARK = new Color(145,145,145);
|
||||
|
||||
@ -35,7 +35,7 @@ public class Main {
|
||||
private static JTabbedPane tabbedPane;
|
||||
public final static int FRAME_WIDTH = 550;
|
||||
public final static int FRAME_HEIGHT = 400;
|
||||
public final static int TABBED_PANE_HEIGHT = FRAME_HEIGHT -58;
|
||||
public final static int TABBED_PANE_HEIGHT = FRAME_HEIGHT -61;
|
||||
|
||||
/**
|
||||
* Launch the application.
|
||||
@ -97,7 +97,7 @@ public class Main {
|
||||
|
||||
JPanel statusPanel = new JPanel();
|
||||
root.add(statusPanel);
|
||||
statusPanel.setBounds(5, TABBED_PANE_HEIGHT + 3, FRAME_WIDTH-5, 28);
|
||||
statusPanel.setBounds(5, TABBED_PANE_HEIGHT + 3, FRAME_WIDTH-5, 30);
|
||||
statusPanel.setLayout(new BorderLayout(0, 0));
|
||||
statusPanel.setOpaque(false);
|
||||
|
||||
|
||||
@ -15,7 +15,7 @@ public class GradientPanel extends JPanel {
|
||||
public final static int DIAGONAL_RIGHT = 3;
|
||||
|
||||
private Color startColor = Color.WHITE;
|
||||
private Color endColor = GUIHelper.MEDIUM_LIGHT;
|
||||
private Color endColor = GUIHelper.MEDIUM_LIGHT_LIGHT;
|
||||
private int direndColortion;
|
||||
private boolean cyclic;
|
||||
private int maxLength;
|
||||
|
||||
@ -6,7 +6,7 @@ header, footer, article, section, hgroup, nav, figure {
|
||||
display: block;
|
||||
}
|
||||
body {
|
||||
background-color: #DDDDDD;
|
||||
background-color: #E6E6E6;
|
||||
color: #666666;
|
||||
font-family: Arial,Helvetica,sans-serif;
|
||||
font-size: 0.825em;
|
||||
@ -85,7 +85,7 @@ nav ul li a, nav ul li a:visited {
|
||||
color: #565656;
|
||||
display: block;
|
||||
float: left;
|
||||
font-size: 1.25em;
|
||||
font-size: 0.9em;
|
||||
font-weight: bold;
|
||||
margin: 5px 2px;
|
||||
padding: 7px 10px 4px;
|
||||
@ -109,7 +109,7 @@ article {
|
||||
border: 1px solid #AAAAAA;
|
||||
margin: 3em 0;
|
||||
padding: 20px;
|
||||
text-shadow: 0 2px 0 white;
|
||||
text-shadow: 0 1px 0 white;
|
||||
}
|
||||
figure {
|
||||
border: 3px solid #E0E0E0;
|
||||
|
||||
@ -18,9 +18,11 @@
|
||||
<ul>
|
||||
<li><a href="#news">News</a></li>
|
||||
<li><a href="#about">About</a></li>
|
||||
<li><a href="#changelog">Changelog</a></li>
|
||||
<li><a href="#download">Download</a></li>
|
||||
<li><a href="#installation">Installation</a></li>
|
||||
<li><a href="#changlog">Changelog</a></li>
|
||||
<li><a href="#technical">Technical</a></li>
|
||||
<li><a href="#troubleshoot">Troubleshoot</a></li>
|
||||
</ul>
|
||||
</nav>
|
||||
</header>
|
||||
@ -66,6 +68,29 @@ I'd like to thank Jan-Erik Fiske and Peter Sunde for actively helping privacy an
|
||||
</div>
|
||||
</article>
|
||||
|
||||
<div class="line"></div>
|
||||
|
||||
<article id="changelog">
|
||||
<h2>Changelog</h2>
|
||||
|
||||
<div class="line"></div>
|
||||
|
||||
<div class="articleBody clear">
|
||||
<figure style="width:450px; height:260px;">
|
||||
<img src="images/itoopie-settings.png">
|
||||
</figure>
|
||||
<!--
|
||||
<p>Version 0.0.2</p>
|
||||
<tt> * Support for monitoring netdb status and initiating a reseed if needed.</tt><br>
|
||||
<tt> * Added support for changing which IP addresses I2PControl accepts. 127.0.0.1 is default, 0.0.0.0 is an option.</tt><br>
|
||||
<tt> * Improved looks by realigning components and adding gradients to panels.</tt><br>
|
||||
-->
|
||||
<p>Version 0.0.1</p>
|
||||
<tt> * Added graphs.</tt><br>
|
||||
<tt> * Added support for changing the port of I2PControl</tt>
|
||||
</div>
|
||||
</article>
|
||||
|
||||
<div class="line"></div>
|
||||
|
||||
<article id="download">
|
||||
@ -79,14 +104,8 @@ I'd like to thank Jan-Erik Fiske and Peter Sunde for actively helping privacy an
|
||||
<p>Before running itoopie, <b>I2PControl needs to be installed</b>. Instruction can be found <a href="#installation">below</a>.</p>
|
||||
<p>itoopie can be downloaded from here, <a href="files/itoopieinstall.exe">itoopieinstall.exe</a>, <a href="files/itoopieinstall.exe.sha512">checksum</a>.</p>
|
||||
<p>The installer can be run by opening <tt>itoopieinstall.exe</tt> or running <tt>java -jar itoopieinstall.exe</tt> (yes, really).</p>
|
||||
<p>The default port for I2PControl is <tt>7650</tt>, the default password is <tt>itoopie</tt>.
|
||||
These settings can easily be restored by shutting down <a href="http://i2p2.de">I2P</a> and deleting a file called I2PControl.conf.
|
||||
<br><br>
|
||||
On Windows the file can be found in <br><tt>C:\Users\**username**\AppData\Roaming\I2P\plugins\I2PControl\</tt>
|
||||
<br>
|
||||
On Unix (Linux, Mac OSX and *BSD) the file will be found in <br><tt>~/.i2p/plugins/I2PControl/</tt>
|
||||
<br>
|
||||
After <a href="http://i2p2.de">I2P</a> has been started again settings will be restored to their defaults.</p>
|
||||
<p>If you're having issues starting itoopie or connecting to the <a href="http://i2p2.de">I2P</a> node, have a look at the <a href="#troubleshoot">Troubleshoot</a>-section.</p>
|
||||
|
||||
</div>
|
||||
</article>
|
||||
|
||||
@ -102,21 +121,17 @@ After <a href="http://i2p2.de">I2P</a> has been started again settings will be r
|
||||
</figure>
|
||||
|
||||
<p>itoopie requires I2PControl to be installed on the <a href="http://i2p2.de">I2P</a> node you whish to connect to. The installation steps required are as follows.</p>
|
||||
<p>Install I2PControl by visiting <a href="http://localhost:7657/configclients">http://localhost:7657/configclients</a> and
|
||||
entering <tt>http://itoopie.i2p/files/I2PControl.xpi2p</tt> in the 'Plugin Installation' field. Click 'Install Plugin' and wait for the plugin to be downloaded, installed and started (usually less than 1 minute).</p>
|
||||
<p>Install I2PControl by visiting <a href="http://localhost:7657/configclients">http://localhost:7657/configclients</a> and entering <tt>http://itoopie.i2p/files/I2PControl.xpi2p</tt> in the 'Plugin Installation' field. Click 'Install Plugin' and wait for the plugin to be downloaded, installed and started (usually less than 1 minute).</p>
|
||||
|
||||
<p>When I2PControl has been installed itoopie is ready to be installed, instructions can be found <a href="#download">above</a>.</p>
|
||||
</div>
|
||||
</article>
|
||||
|
||||
<!-- Article 2 end -->
|
||||
|
||||
<!-- Article 3 start -->
|
||||
|
||||
<div class="line"></div>
|
||||
|
||||
<article id="changlog">
|
||||
<h2>Changelog</h2>
|
||||
<article id="technical">
|
||||
<h2>Technical</h2>
|
||||
|
||||
<div class="line"></div>
|
||||
|
||||
@ -124,10 +139,35 @@ entering <tt>http://itoopie.i2p/files/I2PControl.xpi2p</tt> in the 'Plugin Insta
|
||||
<figure style="width:450px; height:260px;">
|
||||
<img src="images/itoopie-settings.png">
|
||||
</figure>
|
||||
|
||||
<!--
|
||||
<p>Version 0.0.2</p>
|
||||
<tt> * Support for monitoring netdb status and initiating a reseed if needed.</tt><br>
|
||||
<tt> * Added support for changing which IP addresses I2PControl accepts. 127.0.0.1 is default, 0.0.0.0 is an option.</tt><br>
|
||||
<tt> * Improved looks by realigning components and adding gradients to panels.</tt><br>
|
||||
-->
|
||||
<p>Version 0.0.1</p>
|
||||
<tt>Added graphs.</tt>
|
||||
<tt>Added support for changing the port of I2PControl</tt>
|
||||
<tt> * Added graphs.</tt><br>
|
||||
<tt> * Added support for changing the port of I2PControl</tt>
|
||||
</div>
|
||||
</article>
|
||||
|
||||
|
||||
<div class="line"></div>
|
||||
|
||||
<article id="troubleshoot">
|
||||
<h2>Troubleshoot</h2>
|
||||
|
||||
<div class="line"></div>
|
||||
|
||||
<div class="articleBody clear">
|
||||
<figure style="width:450px; height:260px;">
|
||||
<img src="images/itoopie-settings.png">
|
||||
</figure>
|
||||
<p>If you're having issues establishing the connection between itoopie and <a hred="http://i2p2.de">I2P</a>, try restoring default settings by following the instructions below.</a>
|
||||
<p>The default port for I2PControl is <tt>7650</tt>, the default password is <tt>itoopie</tt>. These settings can easily be restored by shutting down <a href="http://i2p2.de">I2P</a> and deleting a file called I2PControl.conf.</p>
|
||||
<br><p>On Windows the file can be found in <br><tt>C:\Users\**username**\AppData\Roaming\I2P\plugins\I2PControl\</tt></p>
|
||||
<p>On Unix (Linux, Mac OSX and *BSD) the file will be found in <br><tt>~/.i2p/plugins/I2PControl/</tt></p>
|
||||
<p>After <a href="http://i2p2.de">I2P</a> has been started again settings will be restored to their defaults.</p>
|
||||
</div>
|
||||
</article>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user