gnome-subtitles r1101 - in trunk: . src/GnomeSubtitles/Ui/SubtitleView src/GnomeSubtitles/Ui/View

[pcastro svn gnome org]

Author: pcastro
Date: Sun Dec 14 22:30:19 2008
New Revision: 1101
URL: http://svn.gnome.org/viewvc/gnome-subtitles?rev=1101&view=rev

Log:
Got rid of CellRendererCenteredText, as the CellRendererText now has (since Gtk 2.10) an Alignment property that allows to center text.

Removed:
   trunk/src/GnomeSubtitles/Ui/SubtitleView/CellRendererCenteredText.cs
Modified:
   trunk/gnome-subtitles.mdp
   trunk/src/GnomeSubtitles/Ui/View/CellRendererCenteredText.cs
   trunk/src/GnomeSubtitles/Ui/View/SubtitleView.cs

Modified: trunk/gnome-subtitles.mdp
==============================================================================
--- trunk/gnome-subtitles.mdp	(original)
+++ trunk/gnome-subtitles.mdp	Sun Dec 14 22:30:19 2008
@@ -118,7 +118,6 @@
     <File name="src/GnomeSubtitles/Ui/VideoPreview/Video.cs" subtype="Code" buildaction="Compile" />
     <File name="src/GnomeSubtitles/Ui/VideoPreview/VideoFiles.cs" subtype="Code" buildaction="Compile" />
     <File name="src/GnomeSubtitles/Ui/VideoPreview/VideoPosition.cs" subtype="Code" buildaction="Compile" />
-    <File name="src/GnomeSubtitles/Ui/View/CellRendererCenteredText.cs" subtype="Code" buildaction="Compile" />
     <File name="src/GnomeSubtitles/Ui/View/SelectionIntended.cs" subtype="Code" buildaction="Compile" />
     <File name="src/GnomeSubtitles/Ui/View/SelectionType.cs" subtype="Code" buildaction="Compile" />
     <File name="src/GnomeSubtitles/Ui/View/Subtitles.cs" subtype="Code" buildaction="Compile" />

Modified: trunk/src/GnomeSubtitles/Ui/View/CellRendererCenteredText.cs
==============================================================================
--- trunk/src/GnomeSubtitles/Ui/View/CellRendererCenteredText.cs	(original)
+++ trunk/src/GnomeSubtitles/Ui/View/CellRendererCenteredText.cs	Sun Dec 14 22:30:19 2008
@@ -24,9 +24,13 @@
 
 /// <summary>Provides a cell renderer that centers text with multiple lines.</summary>
 //TODO It looks like the Alignment property can now be used. It requires GTK# 2.10.
-public class CellRendererCenteredText : CellRendererText {
+public class CellRendererCenteredText2 : CellRendererText {
 
-	protected override void Render (Drawable window, Widget widget, Rectangle backgroundArea,
+	public CellRendererCenteredText2 () : base() {
+		//this.Alignment = Pango.Alignment.Center;	
+	}
+
+	/*protected override void Render (Drawable window, Widget widget, Rectangle backgroundArea,
 			Rectangle cellArea, Rectangle exposeArea, CellRendererState flags) {
 
 		int xOffset, yOffset, width, height;
@@ -57,7 +61,7 @@
 		Gtk.Style.PaintLayout(widget.Style, window, state, true, cellArea, widget,
 			"cellrenderertext", cellArea.X + xOffset, cellArea.Y + yOffset, layout);
 			
-	}
+	}*/
 
 }
 

Modified: trunk/src/GnomeSubtitles/Ui/View/SubtitleView.cs
==============================================================================
--- trunk/src/GnomeSubtitles/Ui/View/SubtitleView.cs	(original)
+++ trunk/src/GnomeSubtitles/Ui/View/SubtitleView.cs	Sun Dec 14 22:30:19 2008
@@ -222,16 +222,25 @@
     }
 	
     private void CreateColumns() {
+    	/* Number column */
     	numberCol = CreateColumn(Catalog.GetString("No."), ColumnWidth("000"), new CellRendererText(), RenderNumberCell);
-    		
+    	
+    	/* Start, end and duration columns */
     	int timeWidth = ColumnWidth("00:00:00.000");
     	startCol = CreateColumn(Catalog.GetString("From"), timeWidth, new CellRendererText(), RenderStartCell);
     	endCol = CreateColumn(Catalog.GetString("To"), timeWidth, new CellRendererText(), RenderEndCell);
     	durationCol = CreateColumn(Catalog.GetString("During"), timeWidth, new CellRendererText(), RenderDurationCell);
     	
+    	/* Text column */
     	int textWidth = ColumnWidth("0123456789012345678901234567890123456789");
-    	textCol = CreateColumn(Catalog.GetString("Text"), textWidth, new CellRendererCenteredText(), RenderTextCell);
-    	translationCol = CreateColumn(Catalog.GetString("Translation"), textWidth, new CellRendererCenteredText(), RenderTranslationCell);
+    	CellRendererText textCellRenderer = new CellRendererText();
+    	textCellRenderer.Alignment = Pango.Alignment.Center;
+    	textCol = CreateColumn(Catalog.GetString("Text"), textWidth, textCellRenderer, RenderTextCell);
+    	
+    	/* Translation column */
+    	CellRendererText translationCellRenderer = new CellRendererText();
+    	translationCellRenderer.Alignment = Pango.Alignment.Center;
+    	translationCol = CreateColumn(Catalog.GetString("Translation"), textWidth, translationCellRenderer, RenderTranslationCell);
     	SetTranslationVisible(false);
 
     	tree.AppendColumn(numberCol);