commit 0b10e4309173b0d178e030b740cdb3cf69929d85
Author: Xavier de Blas <xaviblas gmail com>
Date: Thu May 21 10:31:42 2015 +0200
On raspberry run maximized
glade/chronojump.glade | 73 ++++++++++++++++++++++++++++++++++++++----------
src/gui/networks.cs | 11 ++----
2 files changed, 62 insertions(+), 22 deletions(-)
---
diff --git a/glade/chronojump.glade b/glade/chronojump.glade
index 71f2e0c..f5ed8bd 100644
--- a/glade/chronojump.glade
+++ b/glade/chronojump.glade
@@ -7890,6 +7890,9 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
@@ -8812,6 +8815,9 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
<child>
@@ -9986,6 +9992,9 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="position">2</property>
@@ -10801,6 +10810,9 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="position">4</property>
@@ -14828,20 +14840,6 @@ on current Chronojump version.</property>
</packing>
</child>
<child>
- <widget class="GtkButton" id="button_encoder_maximize">
- <property name="label">gtk-zoom-fit</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">True</property>
- <signal name="clicked"
handler="on_button_encoder_maximize_clicked" swapped="no"/>
- </widget>
- <packing>
- <property name="expand">True</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
<widget class="GtkHBox" id="hbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -15009,7 +15007,7 @@ on current Chronojump version.</property>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="pack_type">end</property>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
</widget>
@@ -21672,6 +21670,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -22395,6 +22396,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -23610,6 +23614,9 @@ by you</property>
<placeholder/>
</child>
<child>
+ <placeholder/>
+ </child>
+ <child>
<widget class="GtkButton" id="button_video_url">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -23882,6 +23889,9 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
@@ -34170,6 +34180,24 @@ options</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -36273,6 +36301,9 @@ To differentiate between male and female, use the values 1/0, or m/f, or M/F on
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -37034,6 +37065,9 @@ To differentiate between male and female, use the values 1/0, or m/f, or M/F on
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -39761,6 +39795,9 @@ show elevation as:</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="left_attach">2</property>
@@ -40148,6 +40185,9 @@ show elevation as:</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -40550,6 +40590,9 @@ show elevation as:</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
diff --git a/src/gui/networks.cs b/src/gui/networks.cs
index 7ab5421..607ff5d 100644
--- a/src/gui/networks.cs
+++ b/src/gui/networks.cs
@@ -31,7 +31,6 @@ using System.Collections.Generic; //List
public partial class ChronoJumpWindow
{
//RFID
- [Widget] Gtk.Button button_encoder_maximize;
[Widget] Gtk.Box hbox_rfid;
[Widget] Gtk.Label label_rfid;
@@ -60,8 +59,6 @@ public partial class ChronoJumpWindow
if(linuxType == linuxTypeEnum.RASPBERRY || linuxType == linuxTypeEnum.NETWORKS) {
alignment_video_encoder.Visible = false;
//TODO: put the no connect video here.
-
- button_encoder_maximize.Visible = true;
}
if(linuxType == linuxTypeEnum.NETWORKS) {
@@ -86,10 +83,10 @@ public partial class ChronoJumpWindow
}
//si es rapsberry o si es networks cal desactivar camera
- }
-
- void on_button_encoder_maximize_clicked (object o, EventArgs args) {
- app1.Maximize();
+
+ //maximize now, at the end of tweaks
+ if(linuxType == linuxTypeEnum.RASPBERRY || linuxType == linuxTypeEnum.NETWORKS)
+ app1.Maximize();
}
//rfid