[chronojump] Better gui

From: Xavier de Blas <xaviblas src gnome org>
To: commits-list gnome org
Cc:
Subject: [chronojump] Better gui
Date: Mon, 14 Jan 2013 17:10:34 +0000 (UTC)
commit cdfbc942e56f0c42fc7c3719a967d283c0c3ab4c
Author: Xavier de Blas <xaviblas gmail com>
Date:   Mon Jan 14 18:09:41 2013 +0100

    Better gui

 glade/chronojump.glade |  146 ++++++++++++++++++++++++++----------------------
 src/gui/encoder.cs     |    8 +-
 2 files changed, 83 insertions(+), 71 deletions(-)
---
diff --git a/glade/chronojump.glade b/glade/chronojump.glade
index d286c6f..6781290 100644
--- a/glade/chronojump.glade
+++ b/glade/chronojump.glade
@@ -31132,31 +31132,22 @@ times</property>
     <property name="window_position">center-always</property>
     <property name="type_hint">splashscreen</property>
     <child>
-      <widget class="GtkVBox" id="vbox120">
+      <widget class="GtkAlignment" id="alignment1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="top_padding">6</property>
+        <property name="bottom_padding">6</property>
+        <property name="left_padding">6</property>
+        <property name="right_padding">6</property>
         <child>
-          <widget class="GtkImage" id="image_logo">
+          <widget class="GtkVBox" id="vbox120">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-          </widget>
-          <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkHBox" id="hbox306">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="spacing">8</property>
+            <property name="spacing">4</property>
             <child>
-              <widget class="GtkLabel" id="myLabel">
+              <widget class="GtkImage" id="image_logo">
                 <property name="visible">True</property>
-                <property name="sensitive">False</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Loading Chronojump...</property>
               </widget>
               <packing>
                 <property name="expand">True</property>
@@ -31165,64 +31156,85 @@ times</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkButton" id="button_cancel">
-                <property name="label">gtk-cancel</property>
+              <widget class="GtkHBox" id="hbox306">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="tooltip" translatable="yes">Cancel connection with server</property>
-                <property name="use_action_appearance">False</property>
-                <property name="use_stock">True</property>
-                <signal name="clicked" handler="on_button_cancel_clicked" swapped="no"/>
+                <property name="can_focus">False</property>
+                <child>
+                  <widget class="GtkLabel" id="myLabel">
+                    <property name="visible">True</property>
+                    <property name="sensitive">False</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">Loading Chronojump...</property>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <widget class="GtkButton" id="button_cancel">
+                    <property name="label">gtk-cancel</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <property name="has_tooltip">True</property>
+                    <property name="tooltip" translatable="yes">Cancel connection with server</property>
+                    <property name="use_action_appearance">False</property>
+                    <property name="use_stock">True</property>
+                    <signal name="clicked" handler="on_button_cancel_clicked" swapped="no"/>
+                  </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="pack_type">end</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
               </widget>
               <packing>
                 <property name="expand">False</property>
-                <property name="fill">False</property>
+                <property name="fill">True</property>
                 <property name="position">1</property>
               </packing>
             </child>
+            <child>
+              <widget class="GtkProgressBar" id="progressbarVersion">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="pulse_step">0.10000000149</property>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkProgressBar" id="progressbarRate">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="pulse_step">0.10000000149</property>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">3</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkProgressBar" id="progressbarSubRate">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="pulse_step">0.10000000149</property>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">4</property>
+              </packing>
+            </child>
           </widget>
-          <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkProgressBar" id="progressbarVersion">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="pulse_step">0.10000000149</property>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="position">2</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkProgressBar" id="progressbarRate">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="pulse_step">0.10000000149</property>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="position">3</property>
-          </packing>
-        </child>
-        <child>
-          <widget class="GtkProgressBar" id="progressbarSubRate">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="pulse_step">0.10000000149</property>
-          </widget>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="position">4</property>
-          </packing>
         </child>
       </widget>
     </child>
diff --git a/src/gui/encoder.cs b/src/gui/encoder.cs
index 579f297..f10ca93 100644
--- a/src/gui/encoder.cs
+++ b/src/gui/encoder.cs
@@ -1707,8 +1707,8 @@ public partial class ChronoJumpWindow
 	private void encoderThreadStart(encoderModes mode) {
 		if(mode == encoderModes.CAPTURE || mode == encoderModes.RECALCULATE_OR_LOAD) {
 			//image is inside (is smaller than) viewport
-			image_encoder_width = UtilGtk.WidgetWidth(viewport_image_encoder_capture)-3; 
-			image_encoder_height = UtilGtk.WidgetHeight(viewport_image_encoder_capture)-3;
+			image_encoder_width = UtilGtk.WidgetWidth(viewport_image_encoder_capture)-5; 
+			image_encoder_height = UtilGtk.WidgetHeight(viewport_image_encoder_capture)-5;
 
 			encoder_pulsebar_capture.Text = Catalog.GetString("Please, wait.");
 			treeview_encoder_curves.Sensitive = false;
@@ -1719,8 +1719,8 @@ public partial class ChronoJumpWindow
 				GLib.Idle.Add (new GLib.IdleHandler (pulseGTKEncoderRecalculateOrLoad));
 		} else { //encoderModes.ANALYZE
 			//the -3 is because image is inside (is smaller than) viewport
-			image_encoder_width = UtilGtk.WidgetWidth(viewport_image_encoder_analyze)-3; 
-			image_encoder_height = UtilGtk.WidgetHeight(viewport_image_encoder_analyze)-3;
+			image_encoder_width = UtilGtk.WidgetWidth(viewport_image_encoder_analyze)-5; 
+			image_encoder_height = UtilGtk.WidgetHeight(viewport_image_encoder_analyze)-5;
 
 			encoder_pulsebar_analyze.Text = Catalog.GetString("Please, wait.");
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]