GNOME.org
 

[gnome-subtitles/gtk3] Using styles in WidgetStyles

commit e2e3df0d0e576a256821f6433d32f5d01aed6169
Author: Pedro Castro <pedro gnomesubtitles org>
Date:   Tue Jan 30 19:10:19 2018 +0000

    Using styles in WidgetStyles

 gnome-subtitles.csproj                             |    2 +-
 src/GnomeSubtitles/Core/EventHandlers.cs           |    2 +-
 src/GnomeSubtitles/Dialog/EncodingsDialog.cs       |    6 +++---
 .../{HeadersDialog.cs => FileHeadersDialog.cs}     |   12 ++++++------
 src/GnomeSubtitles/Dialog/FileOpenDialog.cs        |    5 +++--
 src/GnomeSubtitles/Dialog/FilePropertiesDialog.cs  |    7 ++++---
 src/GnomeSubtitles/Dialog/FileSaveDialog.cs        |    7 ++++---
 src/GnomeSubtitles/Dialog/SetLanguagesDialog.cs    |    6 +++---
 src/GnomeSubtitles/Ui/WidgetStyles.cs              |   15 +++++++++++++++
 9 files changed, 40 insertions(+), 22 deletions(-)
---
diff --git a/gnome-subtitles.csproj b/gnome-subtitles.csproj
index d0d49a7..c1ab31e 100644
--- a/gnome-subtitles.csproj
+++ b/gnome-subtitles.csproj
@@ -157,7 +157,6 @@
     <Compile Include="src\GnomeSubtitles\Dialog\EncodingsDialog.cs" />
     <Compile Include="src\GnomeSubtitles\Dialog\FilePropertiesDialog.cs" />
     <Compile Include="src\GnomeSubtitles\Dialog\FileTranslationOpenDialog.cs" />
-    <Compile Include="src\GnomeSubtitles\Dialog\HeadersDialog.cs" />
     <Compile Include="src\GnomeSubtitles\Dialog\MessageDialog.cs" />
     <Compile Include="src\GnomeSubtitles\Dialog\PreferencesDialog.cs" />
     <Compile Include="src\GnomeSubtitles\Dialog\SearchDialog.cs" />
@@ -284,6 +283,7 @@
     <Compile Include="src\SubLib\Util\Logger.cs" />
     <Compile Include="src\GnomeSubtitles\Dialog\SetLanguagesDialog.cs" />
     <Compile Include="src\GnomeSubtitles\Ui\WidgetStyles.cs" />
+    <Compile Include="src\GnomeSubtitles\Dialog\FileHeadersDialog.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
diff --git a/src/GnomeSubtitles/Core/EventHandlers.cs b/src/GnomeSubtitles/Core/EventHandlers.cs
index 46d3e24..4ce31c8 100644
--- a/src/GnomeSubtitles/Core/EventHandlers.cs
+++ b/src/GnomeSubtitles/Core/EventHandlers.cs
@@ -86,7 +86,7 @@ public class EventHandlers {
        }
 
        public void OnFileHeaders (object o, EventArgs args) {
-               Base.Dialogs.Get(typeof(HeadersDialog)).Show();
+               Base.Dialogs.Get(typeof(FileHeadersDialog)).Show();
        }
 
        public void OnFileProperties (object o, EventArgs args) {
diff --git a/src/GnomeSubtitles/Dialog/EncodingsDialog.cs b/src/GnomeSubtitles/Dialog/EncodingsDialog.cs
index 3325e8e..e311ddf 100644
--- a/src/GnomeSubtitles/Dialog/EncodingsDialog.cs
+++ b/src/GnomeSubtitles/Dialog/EncodingsDialog.cs
@@ -60,9 +60,9 @@ public class EncodingsDialog : BaseDialog {
                dialog.DefaultHeight = WidgetStyles.DialogHeightMedium;
 
                Grid grid = new Grid();
-               grid.RowSpacing = 6;
-               grid.ColumnSpacing = 12;
-               grid.BorderWidth = 6;
+               grid.RowSpacing = WidgetStyles.RowSpacingMedium;
+               grid.ColumnSpacing = WidgetStyles.ColumnSpacingLarge;
+               grid.BorderWidth = WidgetStyles.BorderWidthMedium;
                grid.ColumnHomogeneous = true;
 
                /* Left part: Available VBox */
diff --git a/src/GnomeSubtitles/Dialog/HeadersDialog.cs b/src/GnomeSubtitles/Dialog/FileHeadersDialog.cs
similarity index 97%
rename from src/GnomeSubtitles/Dialog/HeadersDialog.cs
rename to src/GnomeSubtitles/Dialog/FileHeadersDialog.cs
index 6e6a87a..daec0c8 100644
--- a/src/GnomeSubtitles/Dialog/HeadersDialog.cs
+++ b/src/GnomeSubtitles/Dialog/FileHeadersDialog.cs
@@ -28,7 +28,7 @@ using System.Reflection;
 
 namespace GnomeSubtitles.Dialog {
 
-public class HeadersDialog : BaseDialog {
+public class FileHeadersDialog : BaseDialog {
 
        private Headers headers;
 
@@ -36,7 +36,7 @@ public class HeadersDialog : BaseDialog {
        private delegate void PropertyChangedHandler (object sender, string property, object newValue);
        private event PropertyChangedHandler PropertyChanged;
 
-       public HeadersDialog () : base() {
+       public FileHeadersDialog () : base() {
                headers = (Headers)Base.Document.Subtitles.Properties.Headers.Clone();
 
                base.Init(BuildDialog());
@@ -56,7 +56,7 @@ public class HeadersDialog : BaseDialog {
                Notebook notebook = new Notebook();
                notebook.Expand = true;
                notebook.TabPos = PositionType.Left;
-               notebook.BorderWidth = 6;
+               notebook.BorderWidth = WidgetStyles.BorderWidthMedium;
 
                Grid grid;
 
@@ -184,9 +184,9 @@ public class HeadersDialog : BaseDialog {
                ScrolledWindow window = new ScrolledWindow();
 
                Grid grid = new Grid();
-               grid.BorderWidth = 8;
-               grid.ColumnSpacing = 6;
-               grid.RowSpacing = 10;
+               grid.BorderWidth = WidgetStyles.BorderWidthLarge;
+               grid.ColumnSpacing = WidgetStyles.ColumnSpacingMedium;
+               grid.RowSpacing = WidgetStyles.RowSpacingLarge;
                window.Add(grid);
 
                notebook.AppendPage(window, new Label(tabLabel));
diff --git a/src/GnomeSubtitles/Dialog/FileOpenDialog.cs b/src/GnomeSubtitles/Dialog/FileOpenDialog.cs
index 0e3e568..693d7bb 100644
--- a/src/GnomeSubtitles/Dialog/FileOpenDialog.cs
+++ b/src/GnomeSubtitles/Dialog/FileOpenDialog.cs
@@ -18,6 +18,7 @@
  */
 
 using GnomeSubtitles.Core;
+using GnomeSubtitles.Ui;
 using GnomeSubtitles.Ui.Component;
 using GnomeSubtitles.Ui.VideoPreview;
 using Gtk;
@@ -104,8 +105,8 @@ public class FileOpenDialog : BaseDialog {
 
                //Build content area
 
-               Box box = new Box(Orientation.Horizontal, 6);
-               box.BorderWidth = 6;
+               Box box = new Box(Orientation.Horizontal, WidgetStyles.BoxSpacingMedium);
+               box.BorderWidth = WidgetStyles.BorderWidthMedium;
 
                videoLabel = new Label(Catalog.GetString("Video To Open:"));
                box.Add(videoLabel);
diff --git a/src/GnomeSubtitles/Dialog/FilePropertiesDialog.cs 
b/src/GnomeSubtitles/Dialog/FilePropertiesDialog.cs
index 31e639c..863b281 100644
--- a/src/GnomeSubtitles/Dialog/FilePropertiesDialog.cs
+++ b/src/GnomeSubtitles/Dialog/FilePropertiesDialog.cs
@@ -18,6 +18,7 @@
  */
 
 using GnomeSubtitles.Core;
+using GnomeSubtitles.Ui;
 using Gtk;
 using Mono.Unix;
 using SubLib.Core.Domain;
@@ -41,9 +42,9 @@ public class FilePropertiesDialog : BaseDialog {
                Gtk.Dialog dialog = new Gtk.Dialog(Catalog.GetString("File Properties"), Base.Ui.Window, 
DialogFlags.Modal | DialogFlagsUseHeaderBar);
 
                Grid grid = new Grid();
-               grid.BorderWidth = 15;
-               grid.ColumnSpacing = 15;
-               grid.RowSpacing = 15;
+               grid.BorderWidth = WidgetStyles.BorderWidthLarge;
+               grid.ColumnSpacing = WidgetStyles.ColumnSpacingLarge;
+               grid.RowSpacing = WidgetStyles.RowSpacingLarge;
 
                grid.Attach(CreateFieldLabel(Catalog.GetString("File Name")), 0, 0, 1, 1);
                grid.Attach(CreateValueLabel(properties.Filename), 1, 0, 1, 1);
diff --git a/src/GnomeSubtitles/Dialog/FileSaveDialog.cs b/src/GnomeSubtitles/Dialog/FileSaveDialog.cs
index acc4ce5..61e5f19 100644
--- a/src/GnomeSubtitles/Dialog/FileSaveDialog.cs
+++ b/src/GnomeSubtitles/Dialog/FileSaveDialog.cs
@@ -18,6 +18,7 @@
  */
 
 using GnomeSubtitles.Core;
+using GnomeSubtitles.Ui;
 using GnomeSubtitles.Ui.Component;
 using Gtk;
 using Mono.Unix;
@@ -93,9 +94,9 @@ public class FileSaveDialog : BaseDialog {
                //Build content area
 
                Grid grid = new Grid();
-               grid.RowSpacing = 6;
-               grid.ColumnSpacing = 6;
-               grid.BorderWidth = 6;
+               grid.RowSpacing = WidgetStyles.RowSpacingMedium;
+               grid.ColumnSpacing = WidgetStyles.ColumnSpacingMedium;
+               grid.BorderWidth = WidgetStyles.BorderWidthMedium;
 
                Label formatLabel = new Label(Catalog.GetString("Subtitle Format:"));
                formatLabel.Xalign = 0;
diff --git a/src/GnomeSubtitles/Dialog/SetLanguagesDialog.cs b/src/GnomeSubtitles/Dialog/SetLanguagesDialog.cs
index ebf6900..08c9704 100644
--- a/src/GnomeSubtitles/Dialog/SetLanguagesDialog.cs
+++ b/src/GnomeSubtitles/Dialog/SetLanguagesDialog.cs
@@ -46,9 +46,9 @@ public class SetLanguagesDialog : BaseDialog {
                dialog.DefaultHeight = WidgetStyles.DialogHeightMedium;
 
                Grid grid = new Grid();
-               grid.RowSpacing = 6;
-               grid.ColumnSpacing = 12;
-               grid.BorderWidth = 6;
+               grid.RowSpacing = WidgetStyles.RowSpacingMedium;
+               grid.ColumnSpacing = WidgetStyles.ColumnSpacingLarge;
+               grid.BorderWidth = WidgetStyles.BorderWidthMedium;
                grid.ColumnHomogeneous = true;
 
                /* Left part: Text Language */
diff --git a/src/GnomeSubtitles/Ui/WidgetStyles.cs b/src/GnomeSubtitles/Ui/WidgetStyles.cs
index 31cbdc3..d26a6d4 100644
--- a/src/GnomeSubtitles/Ui/WidgetStyles.cs
+++ b/src/GnomeSubtitles/Ui/WidgetStyles.cs
@@ -22,6 +22,7 @@ namespace GnomeSubtitles.Ui {
 public class WidgetStyles {
 
        /* Dialogs */
+
        public const int DialogWidthSmall = 450;
        public const int DialogWidthMedium = 600;
        public const int DialogWidthLarge = 750;
@@ -30,6 +31,20 @@ public class WidgetStyles {
        public const int DialogHeightMedium = 400;
        public const int DialogHeightLarge = 550;
 
+
+       /* Spacing */
+
+       public const int RowSpacingMedium = 6;
+       public const int RowSpacingLarge = 12;
+
+       public const int ColumnSpacingMedium = 6;
+       public const int ColumnSpacingLarge = 12;
+
+       public const int BorderWidthMedium = 6;
+       public const int BorderWidthLarge = 12;
+
+       public const int BoxSpacingMedium = 6;
+
 }
 
 }
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]