Changeset 209

Timestamp:

07/15/10 19:45:31 (8 weeks ago)

Author:

Guillaume Mazoyer <respawneral@…>

branch-nick:

gnome-split

revision id:

respawneral@gmail.com-20100715174531-c39aof7vfx8omvg4

Message:

Force actions' signals to be emitted.

Add few methods to force the actions' signals to
be emitted via the actions manager.

Location:

src/org/gnome/split

Files:

• GnomeSplit.java (modified) (3 diffs)
• gtk/MainWindow.java (modified) (1 diff)
• gtk/action/ActionManager.java (modified) (1 diff)
• gtk/widget/ActionAssistant.java (modified) (3 diffs)
• gtk/widget/AreaStatusIcon.java (modified) (2 diffs)

src/org/gnome/split/GnomeSplit.java

@@ -151 +151 @@
             if (config.ASSISTANT_ON_START) {
                 // Show the assistant on start if requested
-                actions.getAction(ActionId.ASSISTANT).emitActivate();
+                actions.activateAction(ActionId.ASSISTANT);
             }
         }
@@ -181 +181 @@
 
                 // Show the merge widget
-                actions.getRadioAction(ActionId.MERGE).emitActivate();
+                actions.activateRadioAction(ActionId.MERGE);
 
                 break;
@@ -190 +190 @@
 
                 // Show the split widget
-                actions.getRadioAction(ActionId.SPLIT).emitActivate();
+                actions.activateRadioAction(ActionId.SPLIT);
 
                 break;

src/org/gnome/split/gtk/MainWindow.java

@@ -347 +347 @@
         if (view == 1) {
             // Switch the view
-            app.getActionManager().getRadioAction(ActionId.MERGE).emitActivate();
+            app.getActionManager().activateRadioAction(ActionId.MERGE);
         }
     }

src/org/gnome/split/gtk/action/ActionManager.java

@@ -190 +190 @@
 
     /**
+     * Emit the signal connected to the {@link Action} associated the
+     * {@link ActionId}.
+     */
+    public void activateAction(ActionId id) {
+        this.getAction(id).emitActivate();
+    }
+
+    /**
+     * Emit the signal connected to the {@link ToggleAction} associated the
+     * {@link ActionId}.
+     */
+    public void activateToggleAction(ActionId id) {
+        this.getToggleAction(id).emitActivate();
+    }
+
+    /**
+     * Emit the signal connected to the {@link RadioAction} associated the
+     * {@link ActionId}.
+     */
+    public void activateRadioAction(ActionId id) {
+        this.getRadioAction(id).emitActivate();
+    }
+
+    /**
      * List of all action IDs.
      * 

src/org/gnome/split/gtk/widget/ActionAssistant.java

@@ -147 +147 @@
         if (type == 0) {
             // Switch to the split view if needed
-            app.getActionManager().getRadioAction(ActionId.SPLIT).emitActivate();
+            app.getActionManager().activateRadioAction(ActionId.SPLIT);
 
             // Update the widget using the info
@@ -153 +153 @@
         } else {
             // Switch to the merge view if needed
-            app.getActionManager().getRadioAction(ActionId.MERGE).emitActivate();
+            app.getActionManager().activateRadioAction(ActionId.MERGE);
 
             // Update the widget using the filename
@@ -720 +720 @@
 
             // Start the split/merge if requested
-            app.getActionManager().getAction(ActionId.START).emitActivate();
+            app.getActionManager().activateAction(ActionId.START);
 
             // Then hide the assistant

src/org/gnome/split/gtk/widget/AreaStatusIcon.java

@@ -27 +27 @@
 import org.gnome.split.config.Constants;
 import org.gnome.split.gtk.action.ActionManager;
-import org.gnome.split.gtk.action.ToggleAction;
 import org.gnome.split.gtk.action.ActionManager.ActionId;
 
@@ -88 +87 @@
     @Override
     public void onActivate(StatusIcon source) {
-        ToggleAction action = app.getActionManager().getToggleAction(ActionId.TRAY_WINDOW);
-        action.emitActivate();
+        app.getActionManager().activateToggleAction(ActionId.TRAY_WINDOW);
     }