[mistelix] Update GtkUtils references
- From: Jordi Mas <jmas src gnome org>
- To: svn-commits-list gnome org
- Subject: [mistelix] Update GtkUtils references
- Date: Sun, 26 Jul 2009 11:08:53 +0000 (UTC)
commit c9a71574060ab39157f75e3347d7462a17218cf6
Author: Jordi Mas <jmas softcatala org>
Date: Sun Jul 26 13:08:42 2009 +0200
Update GtkUtils references
src/Core/DvdMenu.cs | 2 +-
src/Dialogs/ProjectPropertiesDialog.cs | 20 ++++++++++----------
src/Widgets/AuthoringPaneView.cs | 2 +-
src/Widgets/FileView.cs | 2 +-
src/Widgets/SlideShowImageView.cs | 2 +-
src/Widgets/Utils.cs | 5 ++---
6 files changed, 16 insertions(+), 17 deletions(-)
---
diff --git a/src/Core/DvdMenu.cs b/src/Core/DvdMenu.cs
index cffda20..5c4c1fe 100644
--- a/src/Core/DvdMenu.cs
+++ b/src/Core/DvdMenu.cs
@@ -172,7 +172,7 @@ namespace Mistelix.Core
if (DrawButton (cr, button) == true)
fire_thread = true;
- GtkUtils.DrawSelectionBox (cr, moving_button.X, moving_button.Y, button.DrawingBoxWidth, button.DrawingBoxHeight);
+ Utils.DrawSelectionBox (cr, moving_button.X, moving_button.Y, button.DrawingBoxWidth, button.DrawingBoxHeight);
}
else {
if (DrawButton (cr, button) == true)
diff --git a/src/Dialogs/ProjectPropertiesDialog.cs b/src/Dialogs/ProjectPropertiesDialog.cs
index 8e1044b..7c8f0fd 100644
--- a/src/Dialogs/ProjectPropertiesDialog.cs
+++ b/src/Dialogs/ProjectPropertiesDialog.cs
@@ -95,8 +95,8 @@ namespace Mistelix.Dialogs
foreslides_button.Alpha = (ushort) (project.Details.SlideshowsForeColor.A * 65535);
backslides_button.Alpha = (ushort) (project.Details.SlideshowsBackColor.A * 65535);
- foreslides_button.Color = GtkUtils.CairoToGdkColor (project.Details.SlideshowsForeColor);
- backslides_button.Color = GtkUtils.CairoToGdkColor (project.Details.SlideshowsBackColor);
+ foreslides_button.Color = Utils.CairoToGdkColor (project.Details.SlideshowsForeColor);
+ backslides_button.Color = Utils.CairoToGdkColor (project.Details.SlideshowsBackColor);
if (dvd_project == true) // DVD tab
{
@@ -108,8 +108,8 @@ namespace Mistelix.Dialogs
forebuttons_button.Alpha = (ushort) (project.Details.ButtonsForeColor.A * 65535);
backbuttons_button.Alpha = (ushort) (project.Details.ButtonsBackColor.A * 65535);
- forebuttons_button.Color = GtkUtils.CairoToGdkColor (project.Details.ButtonsForeColor);
- backbuttons_button.Color = GtkUtils.CairoToGdkColor (project.Details.ButtonsBackColor);
+ forebuttons_button.Color = Utils.CairoToGdkColor (project.Details.ButtonsForeColor);
+ backbuttons_button.Color = Utils.CairoToGdkColor (project.Details.ButtonsBackColor);
pal_radio.Active = project.Details.Format == VideoFormat.PAL;
ntsc_radio.Active = project.Details.Format == VideoFormat.NTSC;
@@ -212,13 +212,13 @@ namespace Mistelix.Dialogs
needs_repaint = true;
}
- if (project.Details.ButtonsForeColor.Equals (GtkUtils.GdkToCairoColor (forebuttons_button.Color, forebuttons_button.Alpha)) == false) {
- project.Details.ButtonsForeColor = GtkUtils.GdkToCairoColor (forebuttons_button.Color, forebuttons_button.Alpha);
+ if (project.Details.ButtonsForeColor.Equals (Utils.GdkToCairoColor (forebuttons_button.Color, forebuttons_button.Alpha)) == false) {
+ project.Details.ButtonsForeColor = Utils.GdkToCairoColor (forebuttons_button.Color, forebuttons_button.Alpha);
needs_repaint = true;
}
- if (project.Details.ButtonsBackColor.Equals (GtkUtils.GdkToCairoColor (backbuttons_button.Color, backbuttons_button.Alpha)) == false) {
- project.Details.ButtonsBackColor = GtkUtils.GdkToCairoColor (backbuttons_button.Color, backbuttons_button.Alpha);
+ if (project.Details.ButtonsBackColor.Equals (Utils.GdkToCairoColor (backbuttons_button.Color, backbuttons_button.Alpha)) == false) {
+ project.Details.ButtonsBackColor = Utils.GdkToCairoColor (backbuttons_button.Color, backbuttons_button.Alpha);
needs_repaint = true;
}
@@ -256,8 +256,8 @@ namespace Mistelix.Dialogs
}
project.Details.SlideshowsFontName = fontslides_button.FontName;
- project.Details.SlideshowsForeColor = GtkUtils.GdkToCairoColor (foreslides_button.Color, foreslides_button.Alpha);
- project.Details.SlideshowsBackColor = GtkUtils.GdkToCairoColor (backslides_button.Color, backslides_button.Alpha);
+ project.Details.SlideshowsForeColor = Utils.GdkToCairoColor (foreslides_button.Color, foreslides_button.Alpha);
+ project.Details.SlideshowsBackColor = Utils.GdkToCairoColor (backslides_button.Color, backslides_button.Alpha);
}
diff --git a/src/Widgets/AuthoringPaneView.cs b/src/Widgets/AuthoringPaneView.cs
index 8449819..d2c96cb 100644
--- a/src/Widgets/AuthoringPaneView.cs
+++ b/src/Widgets/AuthoringPaneView.cs
@@ -199,7 +199,7 @@ namespace Mistelix.Widgets
double w_area = project.Details.Width * 0.05;
double h_area = project.Details.Height * 0.05;
- GtkUtils.DrawSelectionBox (cr, w_area / 2, h_area /2 , project.Details.Width - w_area,
+ Utils.DrawSelectionBox (cr, w_area / 2, h_area /2 , project.Details.Width - w_area,
project.Details.Height - h_area);
}
diff --git a/src/Widgets/FileView.cs b/src/Widgets/FileView.cs
index 5f1e65a..a10c416 100644
--- a/src/Widgets/FileView.cs
+++ b/src/Widgets/FileView.cs
@@ -159,7 +159,7 @@ namespace Mistelix.Widgets
const int channels = 4;
Cairo.ImageSurface image;
- image = GtkUtils.CreateNoPreviewImage (thumbnail_width, thumbnail_height);
+ image = Utils.CreateNoPreviewImage (thumbnail_width, thumbnail_height);
byte[] data = DataImageSurface.FromCairo32ToPixBuf (image.Data, thumbnail_width, thumbnail_height, channels);
def_image = new Pixbuf (data, true, 8, thumbnail_width, thumbnail_height, thumbnail_width * channels, null);
image.Destroy ();
diff --git a/src/Widgets/SlideShowImageView.cs b/src/Widgets/SlideShowImageView.cs
index 7c9276f..50ba46f 100644
--- a/src/Widgets/SlideShowImageView.cs
+++ b/src/Widgets/SlideShowImageView.cs
@@ -110,7 +110,7 @@ namespace Mistelix.Widgets
ButtonPressEvent += new ButtonPressEventHandler (OnButtonPressed);
KeyPressEvent += OnKeyPressed;
- def_image = GtkUtils.CreateNoPreviewImage (thumbnail_width, thumbnail_height);
+ def_image = Utils.CreateNoPreviewImage (thumbnail_width, thumbnail_height);
}
~SlideShowImageView ()
diff --git a/src/Widgets/Utils.cs b/src/Widgets/Utils.cs
index 4bbda61..ab05fbd 100644
--- a/src/Widgets/Utils.cs
+++ b/src/Widgets/Utils.cs
@@ -28,9 +28,8 @@ using Mono.Unix;
namespace Mistelix.Widgets
{
- // General GTK toolbox class
- // TODO: Rename it to WidgetsUtils
- public static class GtkUtils
+ // General widgets utils class
+ public static class Utils
{
static public void DrawSelectionBox (Cairo.Context cr, double x, double y, double width, double height)
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]