BellePoule

Merge lp:~ecx69/bellepoule/linux into lp:bellepoule

  1. linux
  2. Merge into trunk
Proposed by betonniere
Status: Merged
Merged at revision: 144
Proposed branch: lp:~ecx69/bellepoule/linux
Merge into: lp:bellepoule
Diff against target: 430 lines (+37/-50)
11 files modified
Makefile (+20/-6)
resources/glade/checkin.glade (+2/-9)
resources/glade/contest.glade (+3/-7)
resources/glade/general_classification.glade (+1/-2)
resources/glade/pool_allocator.glade (+1/-2)
resources/glade/pool_supervisor.glade (+2/-4)
resources/glade/schedule.glade (+1/-4)
resources/glade/splitting.glade (+3/-5)
resources/glade/table.glade (+1/-6)
resources/glade/tournament.glade (+0/-2)
sources/checkin.cpp (+3/-3)
To merge this branch: bzr merge lp:~ecx69/bellepoule/linux
Reviewer Review Type Date Requested Status
betonniere Approve
Review via email: mp+25415@code.launchpad.net
To post a comment you must log in.
Revision history for this message
betonniere (betonniere) :
review: Approve
lp:~ecx69/bellepoule/linux updated
141. By betonniere <> <>

Impression des feuilles de poules par lots.

142. By betonniere <>

Le remplissage automatique est interdit par défaut sur les nouvelles compétitions.
Lorsqu'une phase est ajoutée, sa politique remplissage automatique est conforme au reste de la compétition.

143. By betonniere <>

Renommage des widgets liés à l'heure.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile'
2--- Makefile 2010-04-27 21:41:09 +0000
3+++ Makefile 2010-05-17 08:58:24 +0000
4@@ -1,19 +1,31 @@
5 CC=g++
6 SRCDIR=sources
7 OBJDIR=obj
8-#LIBS=$(shell pkg-config --libs pkg-config gtk+-2.0 gmodule-2.0 libxml-2.0 goocanvas)
9-#goocanvasmm-1.0 gtkmm-2.4 libglade-2.0 goocanvas
10+BINDIR=bin
11+DBGDIR=$(BINDIR)/Debug
12+RLSDIR=$(BINDIR)/Release
13+
14+# Lancer les commandes suivantes dans un terminal pour voir les bibliothèques et options par défaut
15 LIBS=`pkg-config --libs gtk+-2.0 gmodule-2.0 libxml-2.0 goocanvas`
16-#CFLAGS=$(shell pkg-config --cflags pkg-config gtk+-2.0 gmodule-2.0 libxml-2.0 goocanvas)
17 CFLAGS=`pkg-config --cflags gtk+-2.0 gmodule-2.0 libxml-2.0 goocanvas`
18-#OPTS=-Wall -Wno-write-strings -g -export-dynamic -Wl,--export-dynamic
19-OPTS=-Wl,--export-dynamic -Wall -Wno-write-strings -g
20+
21+# Options de compilation, l'option -Wno-write-strings est utilisé car beaucoup de warnings
22+# sur la conversion de chaines constantes en *gchar
23+OPTS=-Wall -Wno-write-strings
24+OPTSDBG=$(OPTS) -g
25+
26+# Fichiers source à compiler et à linker, ATTENTION à mettre à jour la liste à chaque nouvelle version
27 SRCS=attribute.cpp canvas.cpp canvas_module.cpp checkin.cpp classification.cpp contest.cpp data.cpp filter.cpp general_classification.cpp glade.cpp main.cpp match.cpp module.cpp object.cpp player.cpp players_list.cpp pool_allocator.cpp pool.cpp pool_match_order.cpp pool_supervisor.cpp schedule.cpp score_collector.cpp score.cpp sensitivity_trigger.cpp splitting.cpp stage.cpp table.cpp tournament.cpp
28 OBJS=$(SRCS:.cpp=.o)
29+
30+# Nom du fichier exécutable à générer dans $(DBGDIR) et $(RLSDIR)
31 PROG=BellePoule
32
33 main: $(OBJS)
34- @cd $(OBJDIR) && $(CC) $(OBJS) $(LIBS) $(OPTS) -o ../$(PROG)
35+ @mkdir -p $(DBGDIR)
36+ @mkdir -p $(RLSDIR)
37+ @cd $(OBJDIR) && $(CC) $(OBJS) $(LIBS) $(OPTSDBG) -o ../$(DBGDIR)/$(PROG)
38+ @cd $(OBJDIR) && $(CC) $(OBJS) $(LIBS) $(OPTS) -o ../$(RLSDIR)/$(PROG)
39
40 %.o: $(SRCDIR)/%.cpp
41 @mkdir -p $(OBJDIR)
42@@ -25,4 +37,6 @@
43 cd $(OBJDIR) && rm -f $(OBJS)
44 cd $(SRCDIR) && rm -f *~
45 rm -f $(PROG)
46+ rm -f $(DBGDIR)/$(PROG)
47+ rm -f $(RLSDIR)/$(PROG)
48
49
50=== modified file 'resources/glade/checkin.glade'
51--- resources/glade/checkin.glade 2010-04-28 08:45:35 +0000
52+++ resources/glade/checkin.glade 2010-05-17 08:58:24 +0000
53@@ -6,7 +6,6 @@
54 <child>
55 <object class="GtkVBox" id="root">
56 <property name="visible">True</property>
57- <property name="orientation">vertical</property>
58 <child>
59 <object class="GtkHBox" id="hbox1">
60 <property name="visible">True</property>
61@@ -191,15 +190,13 @@
62 <child internal-child="vbox">
63 <object class="GtkVBox" id="dialog-vbox3">
64 <property name="visible">True</property>
65- <property name="orientation">vertical</property>
66 <property name="spacing">2</property>
67 <child>
68- <object class="GtkHBox" id="hbox1">
69+ <object class="GtkHBox" id="hbox2">
70 <property name="visible">True</property>
71 <child>
72 <object class="GtkVBox" id="check_vbox">
73 <property name="visible">True</property>
74- <property name="orientation">vertical</property>
75 <child>
76 <placeholder/>
77 </child>
78@@ -211,7 +208,6 @@
79 <child>
80 <object class="GtkVBox" id="title_vbox">
81 <property name="visible">True</property>
82- <property name="orientation">vertical</property>
83 <child>
84 <placeholder/>
85 </child>
86@@ -223,7 +219,6 @@
87 <child>
88 <object class="GtkVBox" id="value_vbox">
89 <property name="visible">True</property>
90- <property name="orientation">vertical</property>
91 <child>
92 <placeholder/>
93 </child>
94@@ -290,7 +285,6 @@
95 <child internal-child="vbox">
96 <object class="GtkVBox" id="print_dialog-vbox">
97 <property name="visible">True</property>
98- <property name="orientation">vertical</property>
99 <property name="spacing">2</property>
100 <child>
101 <object class="GtkAspectFrame" id="aspectframe1">
102@@ -301,7 +295,6 @@
103 <child>
104 <object class="GtkVBox" id="vbox1">
105 <property name="visible">True</property>
106- <property name="orientation">vertical</property>
107 <child>
108 <object class="GtkCheckButton" id="attending_checkbutton">
109 <property name="label" translatable="yes">Tous les pr&#xE9;sents</property>
110@@ -340,7 +333,7 @@
111 </packing>
112 </child>
113 <child internal-child="action_area">
114- <object class="GtkHButtonBox" id="dialog-action_area3">
115+ <object class="GtkHButtonBox" id="dialog-action_area4">
116 <property name="visible">True</property>
117 <property name="layout_style">end</property>
118 <child>
119
120=== modified file 'resources/glade/contest.glade'
121--- resources/glade/contest.glade 2010-04-07 12:19:49 +0000
122+++ resources/glade/contest.glade 2010-05-17 08:58:24 +0000
123@@ -10,7 +10,6 @@
124 <child>
125 <object class="GtkVBox" id="root">
126 <property name="visible">True</property>
127- <property name="orientation">vertical</property>
128 <child>
129 <object class="GtkToolbar" id="contest_toolbar">
130 <property name="visible">True</property>
131@@ -88,7 +87,6 @@
132 <child>
133 <object class="GtkVBox" id="vbox1">
134 <property name="visible">True</property>
135- <property name="orientation">vertical</property>
136 <child>
137 <object class="GtkLabel" id="contest_name_label">
138 <property name="visible">True</property>
139@@ -192,7 +190,6 @@
140 <child internal-child="vbox">
141 <object class="GtkVBox" id="properties_dialog-vbox">
142 <property name="visible">True</property>
143- <property name="orientation">vertical</property>
144 <property name="spacing">2</property>
145 <child>
146 <object class="GtkTable" id="table1">
147@@ -486,7 +483,7 @@
148 </packing>
149 </child>
150 <child>
151- <object class="GtkHBox" id="hbox1">
152+ <object class="GtkHBox" id="hbox4">
153 <property name="visible">True</property>
154 <child>
155 <object class="GtkSpinButton" id="spinbutton1">
156@@ -694,7 +691,6 @@
157 <child>
158 <object class="GtkVBox" id="vbox2">
159 <property name="visible">True</property>
160- <property name="orientation">vertical</property>
161 <child>
162 <object class="GtkRadioButton" id="allow_radiobutton">
163 <property name="label" translatable="yes">Autoriser</property>
164@@ -702,7 +698,7 @@
165 <property name="can_focus">True</property>
166 <property name="receives_default">False</property>
167 <property name="tooltip_text" translatable="yes">Rend actif le bouton de remplissage automatique des scores. Ca peut &#xE9;viter des saisies longues et laborieuses lors des s&#xE9;ances de prise en main de BellePoule.</property>
168- <property name="image">image1</property>
169+ <property name="image">image2</property>
170 <property name="image_position">right</property>
171 <property name="draw_indicator">True</property>
172 <property name="group">radiobutton2</property>
173@@ -850,7 +846,7 @@
174 <property name="step_increment">1</property>
175 <property name="page_increment">5</property>
176 </object>
177- <object class="GtkImage" id="image1">
178+ <object class="GtkImage" id="image2">
179 <property name="visible">True</property>
180 <property name="stock">gtk-dialog-warning</property>
181 </object>
182
183=== modified file 'resources/glade/general_classification.glade'
184--- resources/glade/general_classification.glade 2010-04-21 19:58:46 +0000
185+++ resources/glade/general_classification.glade 2010-05-17 08:58:24 +0000
186@@ -6,14 +6,13 @@
187 <child>
188 <object class="GtkVBox" id="root">
189 <property name="visible">True</property>
190- <property name="orientation">vertical</property>
191 <child>
192 <object class="GtkToolbar" id="toolbar6">
193 <property name="visible">True</property>
194 <child>
195 <object class="GtkToolButton" id="general_classification_filter_button">
196 <property name="visible">True</property>
197- <property name="label" translatable="yes">Données</property>
198+ <property name="label" translatable="yes">Donn&#xE9;es</property>
199 <property name="stock_id">gtk-index</property>
200 <signal name="clicked" handler="on_general_classification_filter_button_clicked"/>
201 </object>
202
203=== modified file 'resources/glade/pool_allocator.glade'
204--- resources/glade/pool_allocator.glade 2010-04-21 19:58:46 +0000
205+++ resources/glade/pool_allocator.glade 2010-05-17 08:58:24 +0000
206@@ -6,7 +6,6 @@
207 <child>
208 <object class="GtkVBox" id="root">
209 <property name="visible">True</property>
210- <property name="orientation">vertical</property>
211 <property name="spacing">8</property>
212 <child>
213 <object class="GtkToolbar" id="toolbar2">
214@@ -15,7 +14,7 @@
215 <object class="GtkToolButton" id="filter_button">
216 <property name="visible">True</property>
217 <property name="tooltip_text" translatable="yes">Permet d'afficher et de masquer certaines donn&#xE9;es ainsi que de red&#xE9;finir leur ordre d'affichage.</property>
218- <property name="label" translatable="yes">Données</property>
219+ <property name="label" translatable="yes">Donn&#xE9;es</property>
220 <property name="stock_id">gtk-index</property>
221 <signal name="clicked" handler="on_filter_button_clicked"/>
222 </object>
223
224=== modified file 'resources/glade/pool_supervisor.glade'
225--- resources/glade/pool_supervisor.glade 2010-04-21 19:58:46 +0000
226+++ resources/glade/pool_supervisor.glade 2010-05-17 08:58:24 +0000
227@@ -6,7 +6,6 @@
228 <child>
229 <object class="GtkVBox" id="root">
230 <property name="visible">True</property>
231- <property name="orientation">vertical</property>
232 <child>
233 <object class="GtkHBox" id="hbox1">
234 <property name="visible">True</property>
235@@ -52,7 +51,7 @@
236 <child>
237 <object class="GtkToolButton" id="pool_filter_toolbutton">
238 <property name="visible">True</property>
239- <property name="label" translatable="yes">Données</property>
240+ <property name="label" translatable="yes">Donn&#xE9;es</property>
241 <property name="stock_id">gtk-index</property>
242 <signal name="clicked" handler="on_pool_filter_toolbutton_clicked"/>
243 </object>
244@@ -167,7 +166,6 @@
245 <child>
246 <object class="GtkVBox" id="vbox1">
247 <property name="visible">True</property>
248- <property name="orientation">vertical</property>
249 <child>
250 <object class="GtkHBox" id="hbox3">
251 <property name="visible">True</property>
252@@ -197,7 +195,7 @@
253 </packing>
254 </child>
255 <child>
256- <object class="GtkHBox" id="hbox1">
257+ <object class="GtkHBox" id="hbox4">
258 <property name="visible">True</property>
259 <child>
260 <object class="GtkLabel" id="label2">
261
262=== modified file 'resources/glade/schedule.glade'
263--- resources/glade/schedule.glade 2010-03-11 13:27:23 +0000
264+++ resources/glade/schedule.glade 2010-05-17 08:58:24 +0000
265@@ -6,7 +6,6 @@
266 <child>
267 <object class="GtkVBox" id="vbox1">
268 <property name="visible">True</property>
269- <property name="orientation">vertical</property>
270 <child>
271 <object class="GtkToolbar" id="toolbar2">
272 <property name="visible">True</property>
273@@ -98,12 +97,10 @@
274 <child internal-child="vbox">
275 <object class="GtkVBox" id="dialog-vbox">
276 <property name="visible">True</property>
277- <property name="orientation">vertical</property>
278 <property name="spacing">2</property>
279 <child>
280- <object class="GtkVBox" id="vbox1">
281+ <object class="GtkVBox" id="vbox2">
282 <property name="visible">True</property>
283- <property name="orientation">vertical</property>
284 <child>
285 <object class="GtkToolbar" id="toolbar1">
286 <property name="visible">True</property>
287
288=== modified file 'resources/glade/splitting.glade'
289--- resources/glade/splitting.glade 2010-04-21 19:58:46 +0000
290+++ resources/glade/splitting.glade 2010-05-17 08:58:24 +0000
291@@ -6,14 +6,13 @@
292 <child>
293 <object class="GtkVBox" id="root">
294 <property name="visible">True</property>
295- <property name="orientation">vertical</property>
296 <child>
297 <object class="GtkToolbar" id="toolbar3">
298 <property name="visible">True</property>
299 <child>
300 <object class="GtkToolButton" id="splitting_filter_toolbutton">
301 <property name="visible">True</property>
302- <property name="label" translatable="yes">Données</property>
303+ <property name="label" translatable="yes">Donn&#xE9;es</property>
304 <property name="stock_id">gtk-index</property>
305 <signal name="clicked" handler="on_splitting_filter_toolbutton_clicked"/>
306 </object>
307@@ -72,7 +71,6 @@
308 <child>
309 <object class="GtkVBox" id="vbox1">
310 <property name="visible">True</property>
311- <property name="orientation">vertical</property>
312 <child>
313 <object class="GtkHBox" id="hbox3">
314 <property name="visible">True</property>
315@@ -139,14 +137,14 @@
316 </object>
317 <object class="GtkSizeGroup" id="value_sizegroup">
318 <widgets>
319+ <widget name="name_entry"/>
320 <widget name="new_title_entry"/>
321- <widget name="name_entry"/>
322 </widgets>
323 </object>
324 <object class="GtkSizeGroup" id="label_sizegroup">
325 <widgets>
326+ <widget name="label4"/>
327 <widget name="label2"/>
328- <widget name="label4"/>
329 </widgets>
330 </object>
331 <object class="GtkTextBuffer" id="textbuffer1">
332
333=== modified file 'resources/glade/table.glade'
334--- resources/glade/table.glade 2010-04-28 08:45:35 +0000
335+++ resources/glade/table.glade 2010-05-17 08:58:24 +0000
336@@ -6,7 +6,6 @@
337 <child>
338 <object class="GtkVBox" id="root">
339 <property name="visible">True</property>
340- <property name="orientation">vertical</property>
341 <child>
342 <object class="GtkHBox" id="hbox1">
343 <property name="visible">True</property>
344@@ -17,7 +16,6 @@
345 <child>
346 <object class="GtkVBox" id="from_vbox">
347 <property name="visible">True</property>
348- <property name="orientation">vertical</property>
349 <child>
350 <object class="GtkLabel" id="label1">
351 <property name="visible">True</property>
352@@ -403,10 +401,9 @@
353 <child internal-child="vbox">
354 <object class="GtkVBox" id="print_table_dialog-vbox">
355 <property name="visible">True</property>
356- <property name="orientation">vertical</property>
357 <property name="spacing">2</property>
358 <child>
359- <object class="GtkAspectFrame" id="aspectframe1">
360+ <object class="GtkAspectFrame" id="aspectframe3">
361 <property name="visible">True</property>
362 <property name="label_xalign">0</property>
363 <property name="shadow_type">none</property>
364@@ -414,7 +411,6 @@
365 <child>
366 <object class="GtkVBox" id="vbox1">
367 <property name="visible">True</property>
368- <property name="orientation">vertical</property>
369 <child>
370 <object class="GtkRadioButton" id="radiobutton1">
371 <property name="label" translatable="yes">Le tableau</property>
372@@ -431,7 +427,6 @@
373 <child>
374 <object class="GtkVBox" id="vbox2">
375 <property name="visible">True</property>
376- <property name="orientation">vertical</property>
377 <child>
378 <object class="GtkRadioButton" id="radiobutton2">
379 <property name="label" translatable="yes">Les feuilles de match en attentes</property>
380
381=== modified file 'resources/glade/tournament.glade'
382--- resources/glade/tournament.glade 2010-04-26 15:25:19 +0000
383+++ resources/glade/tournament.glade 2010-05-17 08:58:24 +0000
384@@ -11,7 +11,6 @@
385 <child>
386 <object class="GtkVBox" id="vbox1">
387 <property name="visible">True</property>
388- <property name="orientation">vertical</property>
389 <child>
390 <object class="GtkMenuBar" id="menubar1">
391 <property name="visible">True</property>
392@@ -865,7 +864,6 @@
393 <child internal-child="vbox">
394 <object class="GtkVBox" id="dialog-vbox1">
395 <property name="visible">True</property>
396- <property name="orientation">vertical</property>
397 <property name="spacing">2</property>
398 <child>
399 <placeholder/>
400
401=== modified file 'sources/checkin.cpp'
402--- sources/checkin.cpp 2010-04-26 15:25:19 +0000
403+++ sources/checkin.cpp 2010-05-17 08:58:24 +0000
404@@ -121,7 +121,7 @@
405 GtkWidget *value_w;
406
407 {
408- GtkWidget *box = GetWidget ("value_vbox");
409+ GtkWidget *box = _glade->GetWidget ("value_vbox");
410
411 if (attr_desc->_type == G_TYPE_BOOLEAN)
412 {
413@@ -727,7 +727,7 @@
414 void Checkin::on_add_button_clicked ()
415 {
416 Player *player = new Player;
417- GList *children = gtk_container_get_children (GTK_CONTAINER (GetWidget ("value_vbox")));
418+ GList *children = gtk_container_get_children (GTK_CONTAINER (_glade->GetWidget ("value_vbox")));
419
420 {
421 Player::AttributeId attr_id ("ref");
422@@ -904,7 +904,7 @@
423 gtk_widget_show_all (w);
424
425 {
426- GList *children = gtk_container_get_children (GTK_CONTAINER (GetWidget ("value_vbox")));
427+ GList *children = gtk_container_get_children (GTK_CONTAINER (_glade->GetWidget ("value_vbox")));
428
429 gtk_widget_grab_focus ((GtkWidget *) g_list_nth_data (children,
430 0));

Subscribers

People subscribed via source and target branches

to all changes: