encuentro

Merge lp:~gaitan/encuentro/bugfixing into lp:encuentro

  1. bugfixing
  2. Merge into trunk
Proposed by martin gaitan
Status: Merged
Merge reported by: Facundo Batista
Merged at revision: not available
Proposed branch: lp:~gaitan/encuentro/bugfixing
Merge into: lp:encuentro
Diff against target: 73 lines (+43/-13)
1 file modified
encuentro/ui/preferences.glade (+43/-13)
To merge this branch: bzr merge lp:~gaitan/encuentro/bugfixing
Reviewer Review Type Date Requested Status
Facundo Batista Pending
Review via email: mp+113861@code.launchpad.net

Description of the change

dialogo preferencias

To post a comment you must log in.
Revision history for this message
Facundo Batista (facundo) wrote :

Muchas gracias!!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'encuentro/ui/preferences.glade'
2--- encuentro/ui/preferences.glade 2012-05-05 21:47:10 +0000
3+++ encuentro/ui/preferences.glade 2012-07-08 14:44:18 +0000
4@@ -169,19 +169,6 @@
5 </packing>
6 </child>
7 <child>
8- <object class="GtkLabel" id="label5">
9- <property name="visible">True</property>
10- <property name="can_focus">False</property>
11- <property name="xalign">0</property>
12- <property name="yalign">0</property>
13- <property name="ypad">6</property>
14- <property name="label" translatable="yes">Ingrese los datos de registración del Canal Encuentro:</property>
15- </object>
16- <packing>
17- <property name="right_attach">2</property>
18- </packing>
19- </child>
20- <child>
21 <object class="GtkCheckButton" id="checkbutton_autorefresh">
22 <property name="label" translatable="yes">Recargar automáticamente la lista de episodios al iniciar</property>
23 <property name="visible">True</property>
24@@ -212,6 +199,49 @@
25 <property name="bottom_attach">7</property>
26 </packing>
27 </child>
28+ <child>
29+ <object class="GtkHBox" id="hbox1">
30+ <property name="visible">True</property>
31+ <property name="can_focus">False</property>
32+ <child>
33+ <object class="GtkLabel" id="label5">
34+ <property name="visible">True</property>
35+ <property name="can_focus">False</property>
36+ <property name="xalign">0</property>
37+ <property name="yalign">0</property>
38+ <property name="ypad">6</property>
39+ <property name="label" translatable="yes">Ingrese sus datos del portal Conectate:</property>
40+ </object>
41+ <packing>
42+ <property name="expand">True</property>
43+ <property name="fill">True</property>
44+ <property name="position">0</property>
45+ </packing>
46+ </child>
47+ <child>
48+ <object class="GtkLinkButton" id="linkbutton1">
49+ <property name="label" translatable="yes">Regístrese aquí</property>
50+ <property name="visible">True</property>
51+ <property name="can_focus">False</property>
52+ <property name="receives_default">True</property>
53+ <property name="use_action_appearance">False</property>
54+ <property name="relief">none</property>
55+ <property name="use_underline">True</property>
56+ <property name="xalign">1</property>
57+ <property name="yalign">0.61000001430511475</property>
58+ <property name="uri">http://registro.educ.ar/cuentas/registro/index?servicio=conectate</property>
59+ </object>
60+ <packing>
61+ <property name="expand">False</property>
62+ <property name="fill">False</property>
63+ <property name="position">1</property>
64+ </packing>
65+ </child>
66+ </object>
67+ <packing>
68+ <property name="right_attach">2</property>
69+ </packing>
70+ </child>
71 </object>
72 <packing>
73 <property name="expand">False</property>

Subscribers

People subscribed via source and target branches

to all changes: