[Thaw-dev] r10291 - in trunk/apps/Thaw/src/thaw: core fcp plugins/index

[jfle...@freenetproject.org]

Author: jflesch
Date: 2006-08-29 11:05:05 +0000 (Tue, 29 Aug 2006)
New Revision: 10291

Modified:
   trunk/apps/Thaw/src/thaw/core/PluginConfigPanel.java
   trunk/apps/Thaw/src/thaw/core/SplashScreen.java
   trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java
   trunk/apps/Thaw/src/thaw/plugins/index/FileTable.java
Log:
Trying to fix splash screen on Windows

Modified: trunk/apps/Thaw/src/thaw/core/PluginConfigPanel.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/PluginConfigPanel.java        2006-08-27 
20:43:47 UTC (rev 10290)
+++ trunk/apps/Thaw/src/thaw/core/PluginConfigPanel.java        2006-08-29 
11:05:05 UTC (rev 10291)
@@ -55,6 +55,7 @@
                // List is leave empty until windows is displayed (see update())

                pluginToAdd = new JTextField("", 30);
+               pluginToAdd.addActionListener(this);

                buttonPanel = new JPanel();

@@ -125,7 +126,7 @@
        }

        public void actionPerformed(ActionEvent e) {
-               if(e.getSource() == addButton) {
+               if(e.getSource() == addButton || e.getSource() == pluginToAdd) {
                        
if(core.getPluginManager().loadPlugin(pluginToAdd.getText())
                           && 
core.getPluginManager().runPlugin(pluginToAdd.getText())) {


Modified: trunk/apps/Thaw/src/thaw/core/SplashScreen.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/SplashScreen.java     2006-08-27 20:43:47 UTC 
(rev 10290)
+++ trunk/apps/Thaw/src/thaw/core/SplashScreen.java     2006-08-29 11:05:05 UTC 
(rev 10291)
@@ -24,25 +24,28 @@
        }

        public void display() {
+               JPanel panel = new JPanel();
                splashScreen = new JDialog();

                splashScreen.setUndecorated(true);
                splashScreen.setResizable(false);
-               splashScreen.getContentPane().setLayout(new BorderLayout(10, 
10));

+               panel.setLayout(new BorderLayout(10, 10));
+               

                JLabel thawLabel = new JLabel("   Thaw");
+               
                thawLabel.setFont(new Font("Dialog", Font.BOLD, 30));

-               splashScreen.getContentPane().add(thawLabel, 
BorderLayout.CENTER);
+               panel.add(thawLabel, BorderLayout.CENTER);

                progressBar = new JProgressBar(0, 100);
                progressBar.setStringPainted(true);
                progressBar.setString("Wake up Neo ...");

-               splashScreen.getContentPane().add(progressBar, 
BorderLayout.SOUTH);
+               panel.add(progressBar, BorderLayout.SOUTH);

-               splashScreen.pack();
+               splashScreen.getContentPane().add(panel);

                splashScreen.setSize(SIZE_X, SIZE_Y);

@@ -56,7 +59,6 @@


                splashScreen.setVisible(true);
-               splashScreen.pack();

                splashScreen.setSize(SIZE_X, SIZE_Y);


Modified: trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java      2006-08-27 20:43:47 UTC 
(rev 10290)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java      2006-08-29 11:05:05 UTC 
(rev 10291)
@@ -357,11 +357,12 @@

                if(getCHKOnly) {
                        msg.setValue("GetCHKOnly", "true");
-                       msg.setValue("Verbosity", "0");
+                       //msg.setValue("Verbosity", "0");
                } else {
                        msg.setValue("GetCHKOnly", "false");
-                       msg.setValue("Verbosity", "512");
+                       //msg.setValue("Verbosity", "512");
                }
+               msg.setValue("Verbosity", "512");

                if(global)
                        msg.setValue("Global", "true");

Modified: trunk/apps/Thaw/src/thaw/plugins/index/FileTable.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/FileTable.java       2006-08-27 
20:43:47 UTC (rev 10290)
+++ trunk/apps/Thaw/src/thaw/plugins/index/FileTable.java       2006-08-29 
11:05:05 UTC (rev 10291)
@@ -216,7 +216,7 @@

                                FCPClientPut insertion = new FCPClientPut(new 
java.io.File(file.getLocalPath()), 0, 0, null,
                                                                          null, 
4,
-                                                                         true, 
2, true); /* getCHKOnly */
+                                                                         true, 
2, false); /* getCHKOnly */
                                insertion.start(queueManager);

                                file.setTransfer(insertion);