[ease] [api] No need for anything in ease to be public.
- From: Nate Stedman <natesm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ease] [api] No need for anything in ease to be public.
- Date: Thu, 29 Jul 2010 07:51:36 +0000 (UTC)
commit 2cffa0cee66a4e68481f94d0f495b9569f4ad1de
Author: Nate Stedman <natesm gmail com>
Date: Thu Jul 29 03:50:55 2010 -0400
[api] No need for anything in ease to be public.
All public members of "ease" (src/*.vala) are now internal.
Makefile.am | 1 +
ease-core/ease-core-0.1.vapi | 747 -------------------------------
ease-core/ease-core-0.3.vapi | 729 ------------------------------
src/ease-about-dialog.vala | 24 +-
src/ease-close-confirm-dialog.vala | 4 +-
src/ease-editor-embed.vala | 36 +-
src/ease-editor-window.vala | 74 ++--
src/ease-handle.vala | 12 +-
src/ease-inspector-pane.vala | 8 +-
src/ease-inspector-slide-pane.vala | 4 +-
src/ease-inspector-transition-pane.vala | 8 +-
src/ease-inspector.vala | 6 +-
src/ease-main.vala | 16 +-
src/ease-player.vala | 26 +-
src/ease-scrollable-embed.vala | 16 +-
src/ease-selection-rectangle.vala | 4 +-
src/ease-slide-actor.vala | 46 +-
src/ease-slide-button-panel.vala | 6 +-
src/ease-slide-sorter.vala | 8 +-
src/ease-welcome-actor.vala | 18 +-
src/ease-welcome-window.vala | 8 +-
21 files changed, 163 insertions(+), 1638 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index b9a0aa3..8926b89 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,6 +30,7 @@ ease_SOURCES = \
ease_VALAFLAGS = \
--pkg ease-core-0.3 \
--pkg flutter-0.3 \
+ --disable-warnings \
$(EASE_PACKAGES) \
--vapidir vapi \
--thread \
diff --git a/src/ease-about-dialog.vala b/src/ease-about-dialog.vala
index 98003ef..34348fb 100644
--- a/src/ease-about-dialog.vala
+++ b/src/ease-about-dialog.vala
@@ -19,7 +19,7 @@
* A Gtk.AboutDialog subclass for Ease
*/
-public class Ease.AboutDialog : Gtk.AboutDialog
+internal class Ease.AboutDialog : Gtk.AboutDialog
{
const string[] AUTHORS = { "Nate Stedman <natesm gmail com>",
"Stéphane Maniaci <stephane maniaci gmail com>",
@@ -29,7 +29,7 @@ public class Ease.AboutDialog : Gtk.AboutDialog
/**
* Creates and runs an "about" dialog.
*/
- public static void show_about(Gtk.Widget sender)
+ internal static void show_about(Gtk.Widget sender)
{
var about = new AboutDialog();
about.run();
@@ -41,7 +41,7 @@ public class Ease.AboutDialog : Gtk.AboutDialog
* Creates the "About Ease" dialog, with all fields filled out. This
* constructor does not actually run the dialog.
*/
- public AboutDialog()
+ internal AboutDialog()
{
program_name = "Ease";
@@ -158,7 +158,7 @@ permission, would make you directly or secondarily liable for
infringement under applicable copyright law, except executing it on a
computer or modifying a private copy. Propagation includes copying,
distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
+internal, and in some countries other activities as well.
To "convey" a work means any kind of propagation that enables other
parties to make or receive copies. Mere interaction with a user through
@@ -189,7 +189,7 @@ than the work as a whole, that (a) is included in the normal form of
packaging a Major Component, but which is not part of that Major
Component, and (b) serves only to enable use of the work with that
Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form. A
+implementation is available to the internal in source code form. A
"Major Component", in this context, means a major essential component
(kernel, window system, and so on) of the specific operating system
(if any) on which the executable work runs, or a compiler used to
@@ -351,7 +351,7 @@ in one of these ways:
e) Convey the object code using peer-to-peer transmission, provided
you inform other peers where the object code and Corresponding
- Source of the work are being offered to the general public at no
+ Source of the work are being offered to the general internal at no
charge under subsection 6d.
A separable portion of the object code, whose source code is excluded
@@ -399,8 +399,8 @@ adversely affects the operation of the network or violates the rules and
protocols for communication across the network.
Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
+in accord with this section must be in a format that is internally
+documented (and with an implementation available to the internal in
source code form), and must require no special password or key for
unpacking, reading or copying.
@@ -437,7 +437,7 @@ that material) supplement the terms of this License with terms:
requiring that modified versions of such material be marked in
reasonable ways as different from the original version; or
- d) Limiting the use for publicity purposes of names of licensors or
+ d) Limiting the use for internality purposes of names of licensors or
authors of the material; or
e) Declining to grant rights under trademark law for use of some
@@ -563,7 +563,7 @@ patent against the party.
If you convey a covered work, knowingly relying on a patent license,
and the Corresponding Source of the work is not available for anyone
to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
+internally available network server or other readily accessible means,
then you must either (1) cause the Corresponding Source to be so
available, or (2) arrange to deprive yourself of the benefit of the
patent license for this particular work, or (3) arrange, in a manner
@@ -642,7 +642,7 @@ by the Free Software Foundation.
If the Program specifies that a proxy can decide which future
versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
+internal statement of acceptance of a version permanently authorizes you
to choose that version for the Program.
Later license versions may give you additional or different
@@ -687,7 +687,7 @@ copy of the Program in return for a fee.
How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
+possible use to the internal, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.
To do so, attach the following notices to the program. It is safest
diff --git a/src/ease-close-confirm-dialog.vala b/src/ease-close-confirm-dialog.vala
index f9de9ea..6221976 100644
--- a/src/ease-close-confirm-dialog.vala
+++ b/src/ease-close-confirm-dialog.vala
@@ -18,7 +18,7 @@
/**
* A "do you save before closing" dialog.
*/
-public class Ease.CloseConfirmDialog : Gtk.Dialog
+internal class Ease.CloseConfirmDialog : Gtk.Dialog
{
/**
* Format string for the upper, main label on the dialog.
@@ -33,7 +33,7 @@ public class Ease.CloseConfirmDialog : Gtk.Dialog
* @param seconds The number of seconds since the document was last saved
* (or was created, if it has not been saved).
*/
- public CloseConfirmDialog(string filename, int seconds)
+ internal CloseConfirmDialog(string filename, int seconds)
{
title = _("Save before closing?");
has_separator = false;
diff --git a/src/ease-editor-embed.vala b/src/ease-editor-embed.vala
index 11dfbd1..fc4036f 100644
--- a/src/ease-editor-embed.vala
+++ b/src/ease-editor-embed.vala
@@ -27,7 +27,7 @@
* EditorEmbed is a subclass of { link ScrollableEmbed}, and has both
* horizontal and vertical scrollbars.
*/
-public class Ease.EditorEmbed : ScrollableEmbed, UndoSource
+internal class Ease.EditorEmbed : ScrollableEmbed, UndoSource
{
/**
* The { link EditorWindow} that owns this EditorEmbed.
@@ -47,12 +47,12 @@ public class Ease.EditorEmbed : ScrollableEmbed, UndoSource
/**
* The current slide's actor.
*/
- public SlideActor slide_actor;
+ internal SlideActor slide_actor;
/**
* The currently selected { link Actor}.
*/
- public Actor selected { get; private set; }
+ internal Actor selected { get; private set; }
/**
* If the selected { link Actor} is being edited.
@@ -140,8 +140,8 @@ public class Ease.EditorEmbed : ScrollableEmbed, UndoSource
*/
private Document document;
- public signal void element_selected(Element selected);
- public signal void element_deselected(Element? deselected);
+ internal signal void element_selected(Element selected);
+ internal signal void element_deselected(Element? deselected);
/**
* The zoom level of the slide displayed by this EditorEmbed.
@@ -154,7 +154,7 @@ public class Ease.EditorEmbed : ScrollableEmbed, UndoSource
* course, possible, but values below 0.1 or so are unlikely to produce
* desirable results.
*/
- public float zoom
+ internal float zoom
{
get
{
@@ -189,7 +189,7 @@ public class Ease.EditorEmbed : ScrollableEmbed, UndoSource
* @param d The { link Document} this EditorEmbed represents.
* @param w The { link EditorWindow} this EditorEmbed is part of.
*/
- public EditorEmbed(Document d, EditorWindow w)
+ internal EditorEmbed(Document d, EditorWindow w)
{
base(true, true);
win = w;
@@ -249,7 +249,7 @@ public class Ease.EditorEmbed : ScrollableEmbed, UndoSource
*
* @param node The initial XML node to begin with.
*/
- public void set_slide(Slide slide)
+ internal void set_slide(Slide slide)
{
if (slide == null) return;
@@ -334,7 +334,7 @@ public class Ease.EditorEmbed : ScrollableEmbed, UndoSource
* Call this function after changing the zoom level, document size, or
* any other properties that could place the slide off center.
*/
- public void reposition_group()
+ internal void reposition_group()
{
if (slide_actor == null)
{
@@ -382,7 +382,7 @@ public class Ease.EditorEmbed : ScrollableEmbed, UndoSource
/**
* Recreates the current SlideActor.
*/
- public void recreate_slide()
+ internal void recreate_slide()
{
set_slide(slide_actor.slide);
}
@@ -392,7 +392,7 @@ public class Ease.EditorEmbed : ScrollableEmbed, UndoSource
*
* @param e The element to search for.
*/
- public void select_element(Element e)
+ internal void select_element(Element e)
{
foreach (var a in slide_actor.contents)
{
@@ -692,7 +692,7 @@ public class Ease.EditorEmbed : ScrollableEmbed, UndoSource
* If no element is selected, or the selected element does not have a
* "color" property, this property is ignored.
*/
- public void set_element_color(Clutter.Color color)
+ internal void set_element_color(Clutter.Color color)
{
if (selected == null) return;
if (!selected.element.set_color(color)) return;
@@ -702,7 +702,7 @@ public class Ease.EditorEmbed : ScrollableEmbed, UndoSource
* Handles actor removal events. Deselects the current
* { link Actor} if necessary, and disconnects handlers.
*/
- public void on_ease_actor_removed(Actor actor)
+ internal void on_ease_actor_removed(Actor actor)
{
if (selected == actor) deselect_actor();
actor.button_press_event.disconnect(actor_clicked);
@@ -713,7 +713,7 @@ public class Ease.EditorEmbed : ScrollableEmbed, UndoSource
/**
* Handles new actor events. Connects handlers.
*/
- public void on_ease_actor_added(Actor actor)
+ internal void on_ease_actor_added(Actor actor)
{
actor.button_press_event.connect(actor_clicked);
actor.button_release_event.connect(actor_released);
@@ -723,7 +723,7 @@ public class Ease.EditorEmbed : ScrollableEmbed, UndoSource
/**
* Handles keypresses within the embed.
*/
- public bool on_key_press_event(Gtk.Widget self, Gdk.EventKey event)
+ internal bool on_key_press_event(Gtk.Widget self, Gdk.EventKey event)
{
if (event.type == Gdk.EventType.KEY_RELEASE) return false;
@@ -793,7 +793,7 @@ public class Ease.EditorEmbed : ScrollableEmbed, UndoSource
/**
* Handles { link Slide.element_removed}.
*/
- public void on_element_removed(Slide slide, Element element, int index)
+ internal void on_element_removed(Slide slide, Element element, int index)
{
if (slide != slide_actor.slide) return;
if (selected == null) element_deselected(element);
@@ -802,7 +802,7 @@ public class Ease.EditorEmbed : ScrollableEmbed, UndoSource
/**
* Connects the key event handlers.
*/
- public void connect_keys()
+ internal void connect_keys()
{
if (keys_connected) return;
keys_connected = true;
@@ -812,7 +812,7 @@ public class Ease.EditorEmbed : ScrollableEmbed, UndoSource
/**
* Disconnects the key event handlers.
*/
- public void disconnect_keys()
+ internal void disconnect_keys()
{
if (!keys_connected) return;
keys_connected = false;
diff --git a/src/ease-editor-window.vala b/src/ease-editor-window.vala
index d43b199..f37f7d2 100644
--- a/src/ease-editor-window.vala
+++ b/src/ease-editor-window.vala
@@ -23,23 +23,23 @@
* controls. The window is linked to a { link Document}, and all changes
* are made directly to that object.
*/
-public class Ease.EditorWindow : Gtk.Window
+internal class Ease.EditorWindow : Gtk.Window
{
/**
* The { link EditorEmbed} associated with this EditorWindow.
*/
- public EditorEmbed embed;
+ internal EditorEmbed embed;
/**
* The { link SlideButtonPanel} of this EditorWindow.
*/
- public SlideButtonPanel slide_button_panel;
+ internal SlideButtonPanel slide_button_panel;
/**
* A { link ZoomSlider} at the bottom of the window, controlling the zoom
* level of the { link EditorEmbed}.
*/
- public ZoomSlider zoom_slider;
+ internal ZoomSlider zoom_slider;
/**
* A { link Player} for the { link Document} displayed in this window.
@@ -49,12 +49,12 @@ public class Ease.EditorWindow : Gtk.Window
/**
* The { link Document} associated with this EditorWindow.
*/
- public Document document;
+ internal Document document;
/**
* The currently selected and displayed { link Slide}.
*/
- public Slide slide;
+ internal Slide slide;
/**
* The { link Inspector} for this window.
@@ -99,7 +99,7 @@ public class Ease.EditorWindow : Gtk.Window
/**
* If the { link SlideButtonPanel} is visible.
*/
- public bool slides_shown { get; set; }
+ internal bool slides_shown { get; set; }
/**
* The color selection dialog for this window.
@@ -146,7 +146,7 @@ public class Ease.EditorWindow : Gtk.Window
*
* @param node The initial XML node to begin with.
*/
- public EditorWindow(Document doc)
+ internal EditorWindow(Document doc)
{
title = "Ease";
set_default_size(1024, 768);
@@ -255,7 +255,7 @@ public class Ease.EditorWindow : Gtk.Window
*
* @param filename The index of the slide.
*/
- public void set_slide(int index)
+ internal void set_slide(int index)
{
slide = document.get_slide(index);
@@ -269,7 +269,7 @@ public class Ease.EditorWindow : Gtk.Window
*
* @param action The new { link UndoItem}.
*/
- public void add_undo_action(UndoItem action)
+ internal void add_undo_action(UndoItem action)
{
undo.add_action(action);
undo.clear_redo();
@@ -294,13 +294,13 @@ public class Ease.EditorWindow : Gtk.Window
// signal handlers
[CCode (instance_pos = -1)]
- public void on_quit(Gtk.Widget sender)
+ internal void on_quit(Gtk.Widget sender)
{
Gtk.main_quit ();
}
[CCode (instance_pos = -1)]
- public void on_delete(Gtk.Widget sender)
+ internal void on_delete(Gtk.Widget sender)
{
if (embed.selected == null) return;
@@ -309,7 +309,7 @@ public class Ease.EditorWindow : Gtk.Window
}
[CCode (instance_pos = -1)]
- public void new_slide_handler(Gtk.Widget? sender)
+ internal void new_slide_handler(Gtk.Widget? sender)
{
var s = document.theme.create_slide(document.DEFAULT_SLIDE,
slide.width,
@@ -321,7 +321,7 @@ public class Ease.EditorWindow : Gtk.Window
}
[CCode (instance_pos = -1)]
- public void on_new_slide_menu(Gtk.Widget? sender)
+ internal void on_new_slide_menu(Gtk.Widget? sender)
{
var item = sender as Gtk.MenuItem;
var s = document.theme.create_slide(
@@ -334,7 +334,7 @@ public class Ease.EditorWindow : Gtk.Window
}
[CCode (instance_pos = -1)]
- public void remove_slide(Gtk.Widget? sender)
+ internal void remove_slide(Gtk.Widget? sender)
{
// don't remove the last slide in a document
if (document.length < 2) return;
@@ -352,7 +352,7 @@ public class Ease.EditorWindow : Gtk.Window
}
[CCode (instance_pos = -1)]
- public void play_handler(Gtk.Widget sender)
+ internal void play_handler(Gtk.Widget sender)
{
hide();
@@ -366,7 +366,7 @@ public class Ease.EditorWindow : Gtk.Window
}
[CCode (instance_pos = -1)]
- public void undo_handler(Gtk.Widget sender)
+ internal void undo_handler(Gtk.Widget sender)
{
undo.undo();
update_undo();
@@ -375,7 +375,7 @@ public class Ease.EditorWindow : Gtk.Window
}
[CCode (instance_pos = -1)]
- public void redo_handler(Gtk.Widget sender)
+ internal void redo_handler(Gtk.Widget sender)
{
undo.redo();
update_undo();
@@ -384,7 +384,7 @@ public class Ease.EditorWindow : Gtk.Window
}
[CCode (instance_pos = -1)]
- public void insert_text(Gtk.Widget sender)
+ internal void insert_text(Gtk.Widget sender)
{
var text = document.theme.create_custom_text();
text.x = slide.width / 2 - text.width / 2;
@@ -394,7 +394,7 @@ public class Ease.EditorWindow : Gtk.Window
}
[CCode (instance_pos = -1)]
- public void insert_image(Gtk.Widget sender)
+ internal void insert_image(Gtk.Widget sender)
{
var dialog = new Gtk.FileChooserDialog(_("Insert Image"),
null,
@@ -438,7 +438,7 @@ public class Ease.EditorWindow : Gtk.Window
}
[CCode (instance_pos = -1)]
- public void on_insert_rectangle(Gtk.Widget sender)
+ internal void on_insert_rectangle(Gtk.Widget sender)
{
var rect = new ShapeElement(ShapeType.RECTANGLE);
rect.width = 400;
@@ -450,7 +450,7 @@ public class Ease.EditorWindow : Gtk.Window
}
[CCode (instance_pos = -1)]
- public void on_insert_oval(Gtk.Widget sender)
+ internal void on_insert_oval(Gtk.Widget sender)
{
var oval = new ShapeElement(ShapeType.OVAL);
oval.width = 300;
@@ -462,13 +462,13 @@ public class Ease.EditorWindow : Gtk.Window
}
[CCode (instance_pos = -1)]
- public void insert_video(Gtk.Widget sender)
+ internal void insert_video(Gtk.Widget sender)
{
}
[CCode (instance_pos = -1)]
- public void set_view(Gtk.Widget sender)
+ internal void set_view(Gtk.Widget sender)
{
if (show_editor == sender)
{
@@ -494,19 +494,19 @@ public class Ease.EditorWindow : Gtk.Window
}
[CCode (instance_pos = -1)]
- public void zoom_in(Gtk.Widget sender)
+ internal void zoom_in(Gtk.Widget sender)
{
zoom_slider.zoom_in();
}
[CCode (instance_pos = -1)]
- public void zoom_out(Gtk.Widget sender)
+ internal void zoom_out(Gtk.Widget sender)
{
zoom_slider.zoom_out();
}
[CCode (instance_pos = -1)]
- public bool save_document(Gtk.Widget? sender)
+ internal bool save_document(Gtk.Widget? sender)
{
if (document.filename == null)
{
@@ -550,53 +550,53 @@ public class Ease.EditorWindow : Gtk.Window
// export menu
[CCode (instance_pos = -1)]
- public void export_as_pdf(Gtk.Widget sender)
+ internal void export_as_pdf(Gtk.Widget sender)
{
document.export_as_pdf(this);
}
[CCode (instance_pos = -1)]
- public void export_as_postscript(Gtk.Widget sender)
+ internal void export_as_postscript(Gtk.Widget sender)
{
document.export_as_postscript(this);
}
[CCode (instance_pos = -1)]
- public void export_as_html(Gtk.Widget sender)
+ internal void export_as_html(Gtk.Widget sender)
{
document.export_as_html(this);
}
[CCode (instance_pos = -1)]
- public void on_lower(Gtk.Widget sender)
+ internal void on_lower(Gtk.Widget sender)
{
if (embed.selected == null) return;
slide.lower(embed.selected.element);
}
[CCode (instance_pos = -1)]
- public void on_raise(Gtk.Widget sender)
+ internal void on_raise(Gtk.Widget sender)
{
if (embed.selected == null) return;
slide.raise(embed.selected.element);
}
[CCode (instance_pos = -1)]
- public void on_lower_bottom(Gtk.Widget sender)
+ internal void on_lower_bottom(Gtk.Widget sender)
{
if (embed.selected == null) return;
slide.lower_bottom(embed.selected.element);
}
[CCode (instance_pos = -1)]
- public void on_raise_top(Gtk.Widget sender)
+ internal void on_raise_top(Gtk.Widget sender)
{
if (embed.selected == null) return;
slide.raise_top(embed.selected.element);
}
[CCode (instance_pos = -1)]
- public void inspector_clicked_handler(Gtk.Widget? sender)
+ internal void inspector_clicked_handler(Gtk.Widget? sender)
{
if (inspector.visible)
{
@@ -609,7 +609,7 @@ public class Ease.EditorWindow : Gtk.Window
}
[CCode (instance_pos = -1)]
- public void show_color_dialog(Gtk.Widget sender)
+ internal void show_color_dialog(Gtk.Widget sender)
{
// if nothing is selected, don't display the dialog
if (embed.selected == null) return;
@@ -692,7 +692,7 @@ public class Ease.EditorWindow : Gtk.Window
}
[CCode (instance_pos = -1)]
- public void select_font(Gtk.Widget? sender)
+ internal void select_font(Gtk.Widget? sender)
{
// create a font selection dialog
var font_selection = new Gtk.FontSelectionDialog(_("Select Font"));
diff --git a/src/ease-handle.vala b/src/ease-handle.vala
index 2452ffc..c45fbc1 100644
--- a/src/ease-handle.vala
+++ b/src/ease-handle.vala
@@ -18,7 +18,7 @@
/**
* Interface element for manipulating the size of { link Actor}s.
*/
-public class Ease.Handle : Clutter.CairoTexture
+internal class Ease.Handle : Clutter.CairoTexture
{
/**
* The position of this handle relative to the selection rectangle.
@@ -42,7 +42,7 @@ public class Ease.Handle : Clutter.CairoTexture
* @param pos The position of this handle relative to the selection
* rectangle.
*/
- public Handle(HandlePosition pos)
+ internal Handle(HandlePosition pos)
{
// set the handle's size
width = height = surface_width = surface_height = SIZE;
@@ -69,7 +69,7 @@ public class Ease.Handle : Clutter.CairoTexture
* @param target The actor to update.
* @param prop If any scaling should be proportional, if possible.
*/
- public void drag(float change_x, float change_y, Actor target, bool prop)
+ internal void drag(float change_x, float change_y, Actor target, bool prop)
{
switch (position)
{
@@ -121,7 +121,7 @@ public class Ease.Handle : Clutter.CairoTexture
* @param target The actor to update.
* @param prop If any scaling should be proportional, if possible.
*/
- public void drag_from_center(float change_x, float change_y, Actor target,
+ internal void drag_from_center(float change_x, float change_y, Actor target,
bool prop)
{
switch (position)
@@ -174,7 +174,7 @@ public class Ease.Handle : Clutter.CairoTexture
*
* @param selection The selection rectangle to position the Handle around.
*/
- public void reposition(Clutter.Actor selection)
+ internal void reposition(Clutter.Actor selection)
{
switch (position)
{
@@ -223,7 +223,7 @@ public class Ease.Handle : Clutter.CairoTexture
/**
* Flips the colors of the handle.
*/
- public void flip(bool f)
+ internal void flip(bool f)
{
flipped = f;
redraw();
diff --git a/src/ease-inspector-pane.vala b/src/ease-inspector-pane.vala
index b23e51a..3792f00 100644
--- a/src/ease-inspector-pane.vala
+++ b/src/ease-inspector-pane.vala
@@ -18,12 +18,12 @@
/**
* Base class for inspector panes
*/
-public abstract class Ease.InspectorPane : Gtk.VBox
+internal abstract class Ease.InspectorPane : Gtk.VBox
{
- public Slide slide { get; set; }
- public Document document { get; set; }
+ internal Slide slide { get; set; }
+ internal Document document { get; set; }
- public InspectorPane(Document d)
+ internal InspectorPane(Document d)
{
document = d;
homogeneous = false;
diff --git a/src/ease-inspector-slide-pane.vala b/src/ease-inspector-slide-pane.vala
index ba515d4..c4ee004 100644
--- a/src/ease-inspector-slide-pane.vala
+++ b/src/ease-inspector-slide-pane.vala
@@ -18,14 +18,14 @@
/**
* The inspector pane concerning slides.
*/
-public class Ease.InspectorSlidePane : InspectorPane
+internal class Ease.InspectorSlidePane : InspectorPane
{
private const string UI_FILE_PATH = "inspector-slide.ui";
private BackgroundWidget bg_widget;
private Gtk.Box box;
- public InspectorSlidePane(Document d)
+ internal InspectorSlidePane(Document d)
{
base(d);
diff --git a/src/ease-inspector-transition-pane.vala b/src/ease-inspector-transition-pane.vala
index 0e01cd4..299f14c 100644
--- a/src/ease-inspector-transition-pane.vala
+++ b/src/ease-inspector-transition-pane.vala
@@ -19,11 +19,11 @@
/**
* The inspector pane for changing transitions
*/
-public class Ease.InspectorTransitionPane : InspectorPane
+internal class Ease.InspectorTransitionPane : InspectorPane
{
- public Gtk.ComboBox effect;
+ internal Gtk.ComboBox effect;
private Gtk.SpinButton transition_time;
- public Gtk.ComboBox variant;
+ internal Gtk.ComboBox variant;
private Gtk.Alignment variant_align;
private Gtk.ComboBox start_transition;
private Gtk.SpinButton delay;
@@ -46,7 +46,7 @@ public class Ease.InspectorTransitionPane : InspectorPane
// silence undo if needed
private bool silence_undo;
- public InspectorTransitionPane(Document d)
+ internal InspectorTransitionPane(Document d)
{
base(d);
diff --git a/src/ease-inspector.vala b/src/ease-inspector.vala
index 53fd475..7b65d6e 100644
--- a/src/ease-inspector.vala
+++ b/src/ease-inspector.vala
@@ -18,7 +18,7 @@
/**
* Inspector widget for editing slide properties
*/
-public class Ease.Inspector : Gtk.Notebook
+internal class Ease.Inspector : Gtk.Notebook
{
private InspectorTransitionPane transition_pane;
private InspectorSlidePane slide_pane;
@@ -33,7 +33,7 @@ public class Ease.Inspector : Gtk.Notebook
/**
* The { link Slide} that this Inspector is currently affecting.
*/
- public Slide slide
+ internal Slide slide
{
get { return slide_priv; }
set {
@@ -43,7 +43,7 @@ public class Ease.Inspector : Gtk.Notebook
}
}
- public Inspector(Document document)
+ internal Inspector(Document document)
{
set_size_request(REQUEST_WIDTH, REQUEST_HEIGHT);
diff --git a/src/ease-main.vala b/src/ease-main.vala
index 892fbdd..7cf1163 100644
--- a/src/ease-main.vala
+++ b/src/ease-main.vala
@@ -15,7 +15,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-public class Ease.Main : GLib.Object
+internal class Ease.Main : GLib.Object
{
private static Gee.ArrayList<EditorWindow> windows;
private static WelcomeWindow welcome;
@@ -23,7 +23,7 @@ public class Ease.Main : GLib.Object
// options
static string play_filename;
static string[] filenames;
- public static bool presentation_windowed = false;
+ internal static bool presentation_windowed = false;
private static bool debug_undo = false;
private const OptionEntry[] options = {
@@ -47,7 +47,7 @@ public class Ease.Main : GLib.Object
*
* @param args Program arguments.
*/
- public static int main(string[] args)
+ internal static int main(string[] args)
{
// parse command line options
var context = new OptionContext(_(" - a presentation editor"));
@@ -137,7 +137,7 @@ public class Ease.Main : GLib.Object
*
* @param path The filename
*/
- public static void open_file(string path)
+ internal static void open_file(string path)
{
foreach (var w in windows)
{
@@ -171,7 +171,7 @@ public class Ease.Main : GLib.Object
*
* @param win The { link EditorWindow}.
*/
- public static void remove_window(EditorWindow win)
+ internal static void remove_window(EditorWindow win)
{
windows.remove(win);
if (windows.size == 0 && welcome == null)
@@ -189,7 +189,7 @@ public class Ease.Main : GLib.Object
*
* @param win The { link EditorWindow}.
*/
- public static void add_window(EditorWindow win)
+ internal static void add_window(EditorWindow win)
{
windows.add(win);
}
@@ -201,7 +201,7 @@ public class Ease.Main : GLib.Object
* already displayed.
*
*/
- public static void show_welcome()
+ internal static void show_welcome()
{
if (welcome == null)
{
@@ -222,7 +222,7 @@ public class Ease.Main : GLib.Object
* When the { link WelcomeWindow} is shown via show_welcome, this function
* is automatically added in that window's hide signal handler.
*/
- public static void remove_welcome()
+ internal static void remove_welcome()
{
welcome.hide_all();
welcome = null;
diff --git a/src/ease-player.vala b/src/ease-player.vala
index ff7d03d..f917181 100644
--- a/src/ease-player.vala
+++ b/src/ease-player.vala
@@ -21,11 +21,11 @@
* The Ease Player uses ClutterGtk to create a stage floated in the center
* of a fullscreen Gtk.Window.
*/
-public class Ease.Player : GLib.Object
+internal class Ease.Player : GLib.Object
{
- public Document document { get; set; }
- public int slide_index { get; set; }
- public Clutter.Stage stage { get; set; }
+ internal Document document { get; set; }
+ internal int slide_index { get; set; }
+ internal Clutter.Stage stage { get; set; }
private bool can_animate { get; set; }
private bool dragging = false;
@@ -53,9 +53,9 @@ public class Ease.Player : GLib.Object
private Clutter.Rectangle shader_left;
private Clutter.Rectangle shader_right;
- public signal void complete();
+ internal signal void complete();
- public Player(Document doc)
+ internal Player(Document doc)
{
document = doc;
slide_index = -1;
@@ -119,8 +119,8 @@ public class Ease.Player : GLib.Object
/* The following function is broken at the moment in the Clutter
bindings. Replace the
- public void add (...); by
- public void add (Clutter.Actor first_actor, ...); */
+ internal void add (...); by
+ internal void add (Clutter.Actor first_actor, ...); */
shader.add (shader_top,
shader_right,
shader_bottom,
@@ -143,7 +143,7 @@ public class Ease.Player : GLib.Object
advance();
}
- public void on_motion (Clutter.MotionEvent event)
+ internal void on_motion (Clutter.MotionEvent event)
{
if (dragging) {
// FIXME : duplicate code
@@ -162,7 +162,7 @@ public class Ease.Player : GLib.Object
}
}
- public void on_button_release (Clutter.ButtonEvent event)
+ internal void on_button_release (Clutter.ButtonEvent event)
{
dragging = false;
// FIXME : should the focus fade time be a constant ?
@@ -170,7 +170,7 @@ public class Ease.Player : GLib.Object
"opacity", 0);
}
- public void on_button_press (Clutter.ButtonEvent event)
+ internal void on_button_press (Clutter.ButtonEvent event)
{
dragging = true;
debug ("Got a mouse click at %f, %f", event.x, event.y);
@@ -188,7 +188,7 @@ public class Ease.Player : GLib.Object
"opacity", FOCUS_OPACITY);
}
- public void on_key_press (Clutter.KeyEvent event)
+ internal void on_key_press (Clutter.KeyEvent event)
{
/* Coded with /usr/include/clutter-1.0/clutter/clutter-keysyms.h */
/* Ask developers about the use of that file and the lack of doc */
@@ -215,7 +215,7 @@ public class Ease.Player : GLib.Object
}
}
- public void advance()
+ internal void advance()
{
// only advance when transitions are complete
if (!can_animate)
diff --git a/src/ease-scrollable-embed.vala b/src/ease-scrollable-embed.vala
index e1e4ff1..9692c8f 100644
--- a/src/ease-scrollable-embed.vala
+++ b/src/ease-scrollable-embed.vala
@@ -21,13 +21,13 @@
* A ScollableEmbed contains a { link GtkClutter.Viewport} within a
* { link GtkClutter.Embed}. The horizontal scrollbar is optional.
*/
-public class Ease.ScrollableEmbed : Gtk.HBox
+internal class Ease.ScrollableEmbed : Gtk.HBox
{
// actors
private GtkClutter.Embed embed;
private GtkClutter.Viewport viewport;
private Clutter.Stage stage;
- public Clutter.Group contents { get; private set; }
+ internal Clutter.Group contents { get; private set; }
// scrolling
private Gtk.HScrollbar h_scrollbar;
@@ -41,17 +41,17 @@ public class Ease.ScrollableEmbed : Gtk.HBox
// constants
private const int FRAME_PADDING = 2;
- public bool has_horizontal { get; private set; }
+ internal bool has_horizontal { get; private set; }
/**
* The width of this ScrollableEmbed's Stage.
*/
- public float width { get{ return stage.width; } }
+ internal float width { get{ return stage.width; } }
/**
* The height of this ScrollableEmbed's Stage.
*/
- public float height { get { return stage.height; } }
+ internal float height { get { return stage.height; } }
/**
* Instantiate a ScollableEmbed with an optional vertical sidebar.
@@ -63,7 +63,7 @@ public class Ease.ScrollableEmbed : Gtk.HBox
* scrollbar in addition to the vertical scrollbar.
* @param has_frame If the EditorEmbed should have a frame around its stage.
*/
- public ScrollableEmbed(bool horizontal, bool has_frame)
+ internal ScrollableEmbed(bool horizontal, bool has_frame)
{
has_horizontal = horizontal;
// create children
@@ -173,7 +173,7 @@ public class Ease.ScrollableEmbed : Gtk.HBox
* Returns the stage of this ScrollableEmbed. Use with caution. Most
* actors should be placed onto the "contents" ClutterGroup.
*/
- public Clutter.Stage get_stage()
+ internal Clutter.Stage get_stage()
{
return (Clutter.Stage)(embed.get_stage());
}
@@ -193,7 +193,7 @@ public class Ease.ScrollableEmbed : Gtk.HBox
/**
* When grabbing focus, grab it on the embed.
*/
- public override void grab_focus()
+ internal override void grab_focus()
{
embed.grab_focus();
}
diff --git a/src/ease-selection-rectangle.vala b/src/ease-selection-rectangle.vala
index b3a2ea7..0aad6b4 100644
--- a/src/ease-selection-rectangle.vala
+++ b/src/ease-selection-rectangle.vala
@@ -18,7 +18,7 @@
/**
* Rectangle displayed around the border of selected { link Actor}s.
*/
-public class Ease.SelectionRectangle : Clutter.Group
+internal class Ease.SelectionRectangle : Clutter.Group
{
private Clutter.Rectangle top;
private Clutter.Rectangle bottom;
@@ -30,7 +30,7 @@ public class Ease.SelectionRectangle : Clutter.Group
private const int HEIGHT = 6;
private const int BORDER = 2;
- public SelectionRectangle()
+ internal SelectionRectangle()
{
make(out top);
make(out bottom);
diff --git a/src/ease-slide-actor.vala b/src/ease-slide-actor.vala
index ac4de7b..d3b5063 100644
--- a/src/ease-slide-actor.vala
+++ b/src/ease-slide-actor.vala
@@ -22,27 +22,27 @@
* SlideActor is a subclass of Clutter.Group. It is used in both the
* editor and player, as well as assorted other preview screens.
*/
-public class Ease.SlideActor : Clutter.Group
+internal class Ease.SlideActor : Clutter.Group
{
/**
* The { link Slide} represented by this SlideActor.
*/
- public weak Slide slide { get; set; }
+ internal weak Slide slide { get; set; }
/**
* The actor for the slide's background.
*/
- public Clutter.CairoTexture background;
+ internal Clutter.CairoTexture background;
/**
* The group for the slide's contents.
*/
- public Flutter.Group contents;
+ internal Flutter.Group contents;
/**
* The context of the actor (presentation, etc.)
*/
- public ActorContext context;
+ internal ActorContext context;
/**
* The SlideActor's width (note that this may differ from the actual width
@@ -59,7 +59,7 @@ public class Ease.SlideActor : Clutter.Group
/**
* The ClutterTimeline for a transition animation.
*/
- public Clutter.Timeline animation_time { get; set; }
+ internal Clutter.Timeline animation_time { get; set; }
private Clutter.Alpha animation_alpha { get; set; }
private Clutter.Timeline time1;
private Clutter.Timeline time2;
@@ -69,27 +69,27 @@ public class Ease.SlideActor : Clutter.Group
/**
* The easing mode for the Slide transition.
*/
- public const int EASE_SLIDE = Clutter.AnimationMode.EASE_IN_OUT_SINE;
+ internal const int EASE_SLIDE = Clutter.AnimationMode.EASE_IN_OUT_SINE;
/**
* The easing mode for the Drop transition.
*/
- public const int EASE_DROP = Clutter.AnimationMode.EASE_OUT_BOUNCE;
+ internal const int EASE_DROP = Clutter.AnimationMode.EASE_OUT_BOUNCE;
/**
* The easing mode for the Pivot transition.
*/
- public const int EASE_PIVOT = Clutter.AnimationMode.EASE_OUT_SINE;
+ internal const int EASE_PIVOT = Clutter.AnimationMode.EASE_OUT_SINE;
/**
* The depth of the Flip transition.
*/
- public const float FLIP_DEPTH = -400;
+ internal const float FLIP_DEPTH = -400;
/**
* The scale of slides in the Panel transition.
*/
- public const float PANEL_SCALE = 0.75f;
+ internal const float PANEL_SCALE = 0.75f;
/**
* The depth at which a new slide in the Open Door transition
@@ -132,12 +132,12 @@ public class Ease.SlideActor : Clutter.Group
/**
* Emitted when a subactor of this SlideActor is removed.
*/
- public signal void ease_actor_removed(Actor actor);
+ internal signal void ease_actor_removed(Actor actor);
/**
* Emitted when a subactor is added to this SlideActor.
*/
- public signal void ease_actor_added(Actor actor);
+ internal signal void ease_actor_added(Actor actor);
/**
* Creates a SlideActor from a { link Slide} and a { link Document}.
@@ -150,7 +150,7 @@ public class Ease.SlideActor : Clutter.Group
* dimensions.
* @param ctx The { link ActorContext} for this SlideActor.
*/
- public SlideActor.from_slide(Document document, Slide s, bool clip,
+ internal SlideActor.from_slide(Document document, Slide s, bool clip,
ActorContext ctx)
{
with_dimensions(document.width, document.height, s, clip, ctx);
@@ -166,7 +166,7 @@ public class Ease.SlideActor : Clutter.Group
* dimensions.
* @param ctx The { link ActorContext} for this SlideActor.
*/
- public SlideActor.with_dimensions(float w, float h, Slide s, bool clip,
+ internal SlideActor.with_dimensions(float w, float h, Slide s, bool clip,
ActorContext ctx)
{
slide = s;
@@ -209,7 +209,7 @@ public class Ease.SlideActor : Clutter.Group
* the proper size.
* @param color The background color.
*/
- public SlideActor.blank(Document document, Clutter.Color color)
+ internal SlideActor.blank(Document document, Clutter.Color color)
{
// create the background
background = new Clutter.CairoTexture(document.width, document.height);
@@ -225,7 +225,7 @@ public class Ease.SlideActor : Clutter.Group
/**
* Handles { link Slide.element_added}.
*/
- public void on_element_added(Slide slide, Element element, int index)
+ internal void on_element_added(Slide slide, Element element, int index)
{
var actor = element.actor(context);
contents.add_actor(actor);
@@ -240,7 +240,7 @@ public class Ease.SlideActor : Clutter.Group
/**
* Handles { link Slide.element_removed}.
*/
- public void on_element_removed(Slide slide, Element element, int index)
+ internal void on_element_removed(Slide slide, Element element, int index)
{
foreach (var a in contents)
{
@@ -256,7 +256,7 @@ public class Ease.SlideActor : Clutter.Group
/**
* Resets all transformations on this SlideActor.
*/
- public void reset(Clutter.Group container)
+ internal void reset(Clutter.Group container)
{
reset_actor(this);
reset_actor(background);
@@ -286,7 +286,7 @@ public class Ease.SlideActor : Clutter.Group
* Lays out this SlideActor, replacing the background and rearranging
* child actors if necessary.
*/
- public void relayout()
+ internal void relayout()
{
set_background();
@@ -360,7 +360,7 @@ public class Ease.SlideActor : Clutter.Group
* @param container The container that holds the SlideActor and unstacked
* elements.
*/
- public void stack(Clutter.Actor container)
+ internal void stack(Clutter.Actor container)
{
if (background.get_parent() != this)
{
@@ -394,7 +394,7 @@ public class Ease.SlideActor : Clutter.Group
* @param container The container that holds the SlideActor and unstacked
* elements.
*/
- public void unstack(SlideActor other, Clutter.Actor container)
+ internal void unstack(SlideActor other, Clutter.Actor container)
{
if (other.background.get_parent() != container)
{
@@ -453,7 +453,7 @@ public class Ease.SlideActor : Clutter.Group
* @param new_slide The new SlideActor.
* @param container The container that holds the displayed SlideActors.
*/
- public void transition(SlideActor new_slide,
+ internal void transition(SlideActor new_slide,
Clutter.Group container)
{
uint length = (uint)dmax(1, slide.transition_time * 1000);
diff --git a/src/ease-slide-button-panel.vala b/src/ease-slide-button-panel.vala
index 380ea15..f58bd45 100644
--- a/src/ease-slide-button-panel.vala
+++ b/src/ease-slide-button-panel.vala
@@ -21,7 +21,7 @@
* SlideButtonPanel contains a Gtk.TreeView with displays slides as pixbufs,
* rendered with Cairo.
*/
-public class Ease.SlideButtonPanel : Gtk.ScrolledWindow
+internal class Ease.SlideButtonPanel : Gtk.ScrolledWindow
{
private Document document;
private EditorWindow owner;
@@ -60,7 +60,7 @@ public class Ease.SlideButtonPanel : Gtk.ScrolledWindow
* @param win The { link EditorWindow} that this SlideButtonPanel is
* part of.
*/
- public SlideButtonPanel(Document d, EditorWindow win)
+ internal SlideButtonPanel(Document d, EditorWindow win)
{
document = d;
owner = win;
@@ -138,7 +138,7 @@ public class Ease.SlideButtonPanel : Gtk.ScrolledWindow
*
* @param s The slide to select.
*/
- public void select_slide(Slide slide)
+ internal void select_slide(Slide slide)
{
Gtk.TreeIter itr;
Slide s = new Slide();
diff --git a/src/ease-slide-sorter.vala b/src/ease-slide-sorter.vala
index 30404ed..c8865d9 100644
--- a/src/ease-slide-sorter.vala
+++ b/src/ease-slide-sorter.vala
@@ -18,16 +18,16 @@
/**
* A widget displaying an icon view the user can use to sort and delete slides.
*/
-public class Ease.SlideSorter : Gtk.ScrolledWindow
+internal class Ease.SlideSorter : Gtk.ScrolledWindow
{
private Gtk.IconView view;
private Document document;
private const int WIDTH = 100;
- public signal void display_slide(Slide s);
+ internal signal void display_slide(Slide s);
- public SlideSorter(Document doc)
+ internal SlideSorter(Document doc)
{
document = doc;
view = new Gtk.IconView.with_model(document.slides);
@@ -50,7 +50,7 @@ public class Ease.SlideSorter : Gtk.ScrolledWindow
});
}
- public Slide? delete_slide()
+ internal Slide? delete_slide()
{
Slide slide = null, ret_slide = null;
GLib.List<Slide> slides_to_remove = null;
diff --git a/src/ease-welcome-actor.vala b/src/ease-welcome-actor.vala
index a2ccfef..42d0ead 100644
--- a/src/ease-welcome-actor.vala
+++ b/src/ease-welcome-actor.vala
@@ -21,7 +21,7 @@
* Each WelcomeActor is a preview of a { link Theme}. The user can
* click on these to create a new { link Document} with that { link Theme}.
*/
-public class Ease.WelcomeActor : Clutter.Group
+internal class Ease.WelcomeActor : Clutter.Group
{
/**
* If this WelcomeActor is currently selected.
@@ -49,7 +49,7 @@ public class Ease.WelcomeActor : Clutter.Group
/**
* The theme previewed by this WelcomeActor.
*/
- public Theme theme { get; set; }
+ internal Theme theme { get; set; }
// display the name of the theme
private const string FONT_NAME = "Sans 8";
@@ -79,19 +79,19 @@ public class Ease.WelcomeActor : Clutter.Group
/**
* Triggered when the slide preview is selected (single click).
*/
- public signal void selected(WelcomeActor sender);
+ internal signal void selected(WelcomeActor sender);
/**
* Triggered when the slide preview is double clicked.
*/
- public signal void double_click(WelcomeActor sender);
+ internal signal void double_click(WelcomeActor sender);
/**
* Instantiates a WelcomeActor.
*
* @param t The theme that this WelcomeActor will display.
*/
- public WelcomeActor(Theme t)
+ internal WelcomeActor(Theme t)
{
theme = t;
reactive = true;
@@ -147,7 +147,7 @@ public class Ease.WelcomeActor : Clutter.Group
* @param w The width of the slide.
* @param h The height of the slide.
*/
- public void set_slide_size(int w, int h)
+ internal void set_slide_size(int w, int h)
{
// set the surface size
slide_actor.set_surface_size((uint)w, (uint)h);
@@ -172,7 +172,7 @@ public class Ease.WelcomeActor : Clutter.Group
* @param w The width of the actor.
* @param h The height of the actor.
*/
- public void set_actor_size(float w, float h)
+ internal void set_actor_size(float w, float h)
{
rect.width = roundd(w) + RECT_B_W * 2;
rect.height = roundd(h) + RECT_B_W * 2;
@@ -193,7 +193,7 @@ public class Ease.WelcomeActor : Clutter.Group
/**
* Brings the preview to full brightness.
*/
- public void fade()
+ internal void fade()
{
is_selected = false;
slide_actor.animate(FADE_EASE, FADE_TIME, "opacity", FADE_OPACITY);
@@ -203,7 +203,7 @@ public class Ease.WelcomeActor : Clutter.Group
/**
* Dims the preview.
*/
- public void unfade()
+ internal void unfade()
{
is_selected = true;
slide_actor.animate(FADE_EASE, FADE_TIME, "opacity", 255);
diff --git a/src/ease-welcome-window.vala b/src/ease-welcome-window.vala
index 546c8b2..bd9e148 100644
--- a/src/ease-welcome-window.vala
+++ b/src/ease-welcome-window.vala
@@ -23,7 +23,7 @@
* window, the user can either create a new { link Document} or open
* an existing one.
*/
-public class Ease.WelcomeWindow : Gtk.Window
+internal class Ease.WelcomeWindow : Gtk.Window
{
// main buttons
private Gtk.Button new_pres_button;
@@ -83,7 +83,7 @@ public class Ease.WelcomeWindow : Gtk.Window
private const string PREVIEW_ID = Theme.TITLE;
- public WelcomeWindow()
+ internal WelcomeWindow()
{
assert(RESOLUTIONS_X.length == RESOLUTIONS_Y.length);
@@ -267,13 +267,13 @@ public class Ease.WelcomeWindow : Gtk.Window
}
[CCode (instance_pos = -1)]
- public void on_open_pres_button_clicked (Gtk.Widget sender)
+ internal void on_open_pres_button_clicked (Gtk.Widget sender)
{
OpenDialog.run();
}
[CCode (instance_pos = -1)]
- public void create_new_document(Gtk.Widget? sender)
+ internal void create_new_document(Gtk.Widget? sender)
{
try
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
