[ease] [general] Dialogs namespace -> Dialog
- From: Nate Stedman <natesm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ease] [general] Dialogs namespace -> Dialog
- Date: Sun, 8 Aug 2010 06:01:52 +0000 (UTC)
commit a593666af7b3dd9604d727ff12885f585586702e
Author: Nate Stedman <natesm gmail com>
Date: Sun Aug 8 02:01:31 2010 -0400
[general] Dialogs namespace -> Dialog
ease-core/ease-archiver.vala | 6 +++---
ease-core/ease-dialog-progress.vala | 2 +-
ease-core/ease-dialogs.vala | 2 +-
ease-core/ease-document.vala | 4 ++--
ease-core/ease-html-exporter.vala | 2 +-
ease/ease-editor-window.vala | 8 ++++----
ease/ease-welcome-window.vala | 2 +-
7 files changed, 13 insertions(+), 13 deletions(-)
---
diff --git a/ease-core/ease-archiver.vala b/ease-core/ease-archiver.vala
index dace243..156acd6 100644
--- a/ease-core/ease-archiver.vala
+++ b/ease-core/ease-archiver.vala
@@ -19,7 +19,7 @@ internal class Ease.Archiver : GLib.Object
{
private string temp_path;
private string filename;
- private Dialogs.Progress dialog;
+ private Dialog.Progress dialog;
private unowned Thread thread;
private bool async = true;
private int total_size = 0;
@@ -36,7 +36,7 @@ internal class Ease.Archiver : GLib.Object
private const int ASYNC_SIZE = 1024 * 1024 * 5;
internal Archiver(string temp, string fname, Gee.LinkedList<string> files,
- Dialogs.Progress dlog)
+ Dialog.Progress dlog)
{
temp_path = temp;
filename = fname;
@@ -172,7 +172,7 @@ namespace Ease
Gtk.Window? win) throws Error
{
// create a progress dialog
- var dialog = new Dialogs.Progress(title, false, 1, win);
+ var dialog = new Dialog.Progress(title, false, 1, win);
// archive away!
var arc = new Archiver(temp_path, filename, files, dialog);
diff --git a/ease-core/ease-dialog-progress.vala b/ease-core/ease-dialog-progress.vala
index 57755af..498983c 100644
--- a/ease-core/ease-dialog-progress.vala
+++ b/ease-core/ease-dialog-progress.vala
@@ -21,7 +21,7 @@
*
* Note that this class is not a subclass of Gtk.Dialog.
*/
-public class Ease.Dialogs.Progress : GLib.Object
+public class Ease.Dialog.Progress : GLib.Object
{
private const string UI_FILE = "progress-dialog.ui";
diff --git a/ease-core/ease-dialogs.vala b/ease-core/ease-dialogs.vala
index 072394d..e344647 100644
--- a/ease-core/ease-dialogs.vala
+++ b/ease-core/ease-dialogs.vala
@@ -18,7 +18,7 @@
/**
* Common dialog windows used in Ease.
*/
-namespace Ease.Dialogs
+namespace Ease.Dialog
{
/**
* Displays an "Open" dialog with the specified title. Returns null if
diff --git a/ease-core/ease-document.vala b/ease-core/ease-document.vala
index 04483c8..9a9d398 100644
--- a/ease-core/ease-document.vala
+++ b/ease-core/ease-document.vala
@@ -471,7 +471,7 @@ public class Ease.Document : GLib.Object, UndoSource
*/
public void export_as_pdf(Gtk.Window? win)
{
- string path = Dialogs.save(_("Export as PDF"), win);
+ string path = Dialog.save(_("Export as PDF"), win);
if (path == null) return;
try
@@ -492,7 +492,7 @@ public class Ease.Document : GLib.Object, UndoSource
*/
public void export_as_postscript(Gtk.Window? win)
{
- string path = Dialogs.save(_("Export as PostScript"), win);
+ string path = Dialog.save(_("Export as PostScript"), win);
if (path == null) return;
try
diff --git a/ease-core/ease-html-exporter.vala b/ease-core/ease-html-exporter.vala
index 88f6a37..5175cf3 100644
--- a/ease-core/ease-html-exporter.vala
+++ b/ease-core/ease-html-exporter.vala
@@ -66,7 +66,7 @@ public class Ease.HTMLExporter : GLib.Object
*/
public bool request_path(Gtk.Window win)
{
- path = Dialogs.save(_("Export to HTML"), win);
+ path = Dialog.save(_("Export to HTML"), win);
if (path != null)
{
diff --git a/ease/ease-editor-window.vala b/ease/ease-editor-window.vala
index 900632c..9d7ec96 100644
--- a/ease/ease-editor-window.vala
+++ b/ease/ease-editor-window.vala
@@ -315,7 +315,7 @@ internal class Ease.EditorWindow : Gtk.Window
[CCode (instance_pos = -1)]
internal void on_open(Gtk.Widget sender)
{
- var filename = Dialogs.open(_("Open Document"), this);
+ var filename = Dialog.open(_("Open Document"), this);
if (filename != null) Main.open_file(filename);
}
@@ -415,7 +415,7 @@ internal class Ease.EditorWindow : Gtk.Window
[CCode (instance_pos = -1)]
internal void insert_image(Gtk.Widget sender)
{
- var filename = Dialogs.open(_("Insert Image"), this);
+ var filename = Dialog.open(_("Insert Image"), this);
if (filename != null)
{
@@ -452,7 +452,7 @@ internal class Ease.EditorWindow : Gtk.Window
[CCode (instance_pos = -1)]
internal void insert_video(Gtk.Widget sender)
{
- var filename = Dialogs.open(_("Insert Video"), this);
+ var filename = Dialog.open(_("Insert Video"), this);
if (filename != null)
{
@@ -549,7 +549,7 @@ internal class Ease.EditorWindow : Gtk.Window
{
if (document.filename == null)
{
- var filename = Dialogs.save(_("Save Document"), this);
+ var filename = Dialog.save(_("Save Document"), this);
if (filename != null)
{
diff --git a/ease/ease-welcome-window.vala b/ease/ease-welcome-window.vala
index ad13991..6787cfb 100644
--- a/ease/ease-welcome-window.vala
+++ b/ease/ease-welcome-window.vala
@@ -269,7 +269,7 @@ internal class Ease.WelcomeWindow : Gtk.Window
[CCode (instance_pos = -1)]
internal void on_open_pres_button_clicked (Gtk.Widget sender)
{
- var filename = Dialogs.open(_("Open Document"), this);
+ var filename = Dialog.open(_("Open Document"), this);
if (filename != null) Main.open_file(filename);
hide();
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]