← Back to branch summary

~ubuntu-branches/ubuntu/trusty/freeguide/trusty

« back to all changes in this revision

Viewing changes to freeguide-background-04.diff

  • Committer: Bazaar Package Importer
  • Author(s): Shaun Jackman
  • Date: 2007-09-11 16:52:59 UTC
  • mfrom: (1.2.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20070911165259-4r32oke21i1ezbmv
Tags: 0.10.5-1
http://bugs.debian.org/441762
* New upstream release.
* Update the watch file.
* Change Debian policy to version 3.7.2.2. No changes necessary.
* Add ant-optional to build dependencies. Closes: #441762.

Show diffs side-by-side

added added

removed removed

Lines of Context:
freeguide-background-04.diff
 
1
Index: src/freeguide/plugins/program/freeguide/viewer/MainFrame.java
 
2
===================================================================
 
3
--- src/freeguide/plugins/program/freeguide/viewer/MainFrame.java       (revision 1615)
 
4
+++ src/freeguide/plugins/program/freeguide/viewer/MainFrame.java       (working copy)
 
5
@@ -577,11 +577,11 @@
 
6
      *
 
7
      * @return javax.swing.JButton
 
8
      */
 
9
-    public JButton getForegroundButton(  )
 
10
+    public JButton getForegroundButton(  ) 
 
11
     {
 
12
         if( foregroundButton == null )
 
13
         {
 
14
-            foregroundButton = new JButton( 
 
15
+            foregroundButton = new JButton(
 
16
                     Application.getInstance(  )
 
17
                                .getLocalizedMessage( "foreground" ) );
 
18
             foregroundButton.setFont( new java.awt.Font( "Dialog", 0, 10 ) );
 
19
Index: src/freeguide/plugins/program/freeguide/lib/fgspecific/GrabberController.java
 
20
===================================================================
 
21
--- src/freeguide/plugins/program/freeguide/lib/fgspecific/GrabberController.java       (revision 1615)
 
22
+++ src/freeguide/plugins/program/freeguide/lib/fgspecific/GrabberController.java       (working copy)
 
23
@@ -17,11 +17,10 @@
 
24
 import java.util.Iterator;
 
25
 import java.util.logging.Level;
 
26
 
 
27
-import javax.swing.JButton;
 
28
-import javax.swing.JButton;
 
29
 import javax.swing.JDialog;
 
30
 import javax.swing.JFrame;
 
31
 import javax.swing.JProgressBar;
 
32
+import javax.swing.JButton;
 
33
 
 
34
 /**
 
35
  * Class for run specified grabber and display progress dialog.
 
36
@@ -251,6 +250,7 @@
 
37
                         Application.getInstance(  )
 
38
                                    .getLocalizedMessage( 
 
39
                             "ExecutionDialog.Finish.Error" ) );
 
40
+                    progressDialog.setVisible( true );
 
41
                     progressDialog.showDetails(  );
 
42
                 }
 
43
             }
 
44
Index: src/freeguide/common/gui/ExecutorDialog.java
 
45
===================================================================
 
46
--- src/freeguide/common/gui/ExecutorDialog.java        (revision 1615)
 
47
+++ src/freeguide/common/gui/ExecutorDialog.java        (working copy)
 
48
@@ -62,9 +62,9 @@
 
49
      * @param owner DOCUMENT ME!
 
50
      * @param secondProgressBar DOCUMENT ME!
 
51
      */
 
52
-    public ExecutorDialog( 
 
53
-        JFrame owner, final JProgressBar secondProgressBar,
 
54
-        final JButton foregroundButton )
 
55
+    public ExecutorDialog(
 
56
+            JFrame owner, final JProgressBar secondProgressBar,
 
57
+            final JButton foregroundButton )
 
58
     {
 
59
         super( owner, true ); //TODO FreeGuide.prefs.screen.getBoolean( "executor_modal", true ) );
 
60
         this.secondProgressBar = secondProgressBar;
 
61
@@ -75,7 +75,7 @@
 
62
             {
 
63
                 public void windowClosing( WindowEvent e )
 
64
                 {
 
65
-                    backgroundDialog(  );
 
66
+                    sendToBackground(  );
 
67
                 }
 
68
             } );
 
69
 
 
70
@@ -114,7 +114,7 @@
 
71
             {
 
72
                 public void actionPerformed( java.awt.event.ActionEvent evt )
 
73
                 {
 
74
-                    backgroundDialog(  );
 
75
+                    sendToBackground(  );
 
76
                 }
 
77
             } );
 
78
         gridBagConstraints = new java.awt.GridBagConstraints(  );
 
79
@@ -125,12 +125,12 @@
 
80
         gridBagConstraints.insets = new java.awt.Insets( 5, 5, 5, 5 );
 
81
         getContentPane(  ).add( butBackground, gridBagConstraints );
 
82
 
 
83
-        foregroundButton.addActionListener( 
 
84
+        foregroundButton.addActionListener(
 
85
             new ActionListener(  )
 
86
             {
 
87
                 public void actionPerformed( ActionEvent evt )
 
88
                 {
 
89
-                    butForegroundActionPerformed( evt );
 
90
+                    bringToForeground(  );
 
91
                 }
 
92
             } );
 
93
 
 
94
@@ -237,7 +237,7 @@
 
95
     /**
 
96
      * Description of the Method
 
97
      */
 
98
-    private void backgroundDialog(  )
 
99
+    public void sendToBackground(  )
 
100
     {
 
101
         butBackground.setEnabled( false );
 
102
         foregroundButton.setVisible( true );
 
103
@@ -255,13 +255,12 @@
 
104
      *
 
105
      * @param evt Description of the Parameter
 
106
      */
 
107
-    private void butForegroundActionPerformed( java.awt.event.ActionEvent evt )
 
108
+    public void bringToForeground(  )
 
109
     {
 
110
         butBackground.setEnabled( true );
 
111
         foregroundButton.setVisible( false );
 
112
         secondProgressBar.setVisible( false );
 
113
     }
 
114
-
 
115
     // -----------------------------------------------------------------------
 
116
     /**
 
117
      * Show details panel.
 
118
@@ -380,10 +379,10 @@
 
119
                     {
 
120
                         String localizedMessage =
 
121
                             Application.getInstance(  )
 
122
-                                       .getLocalizedMessage( 
 
123
+                                       .getLocalizedMessage(
 
124
                                 "comma_please_wait_template", messageArguments );
 
125
 
 
126
-                        labPleaseWait.setText( localizedMessage );
 
127
+                        labPleaseWait.setText( localizedMessage ); 
 
128
                         secondProgressBar.setString( localizedMessage );
 
129
                         secondProgressBar.revalidate(  );
 
130
                     }