soss-develop Mailing List for SOSS - a chess pairing program
Brought to you by:
chrisan,
rasmusmyklebust
Menu
▾
▴
soss-develop — development information, cvs commits etc
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
(6) |
May
|
Jun
(6) |
Jul
|
Aug
(3) |
Sep
(4) |
Oct
(8) |
Nov
(26) |
Dec
(59) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(6) |
Feb
(35) |
Mar
(48) |
Apr
|
May
(47) |
Jun
(46) |
Jul
(1) |
Aug
|
Sep
|
Oct
(5) |
Nov
(24) |
Dec
(1) |
| 2005 |
Jan
(3) |
Feb
(30) |
Mar
(42) |
Apr
(4) |
May
|
Jun
|
Jul
|
Aug
|
Sep
(5) |
Oct
(34) |
Nov
(30) |
Dec
(13) |
| 2006 |
Jan
(14) |
Feb
(19) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2008 |
Jan
(2) |
Feb
(2) |
Mar
(6) |
Apr
(6) |
May
|
Jun
|
Jul
(2) |
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2009 |
Jan
(29) |
Feb
(60) |
Mar
(52) |
Apr
|
May
(3) |
Jun
|
Jul
|
Aug
(27) |
Sep
(26) |
Oct
(27) |
Nov
(50) |
Dec
(27) |
| 2010 |
Jan
(17) |
Feb
(14) |
Mar
(2) |
Apr
(3) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(13) |
Dec
(16) |
| 2011 |
Jan
(14) |
Feb
(2) |
Mar
(2) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
(1) |
| 2014 |
Jan
|
Feb
|
Mar
|
Apr
(2) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Rasmus M. <ras...@us...> - 2014-04-05 15:55:20
|
Update of /cvsroot/soss/soss/src/print In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv19582/src/print Modified Files: print_list_foot.c Log Message: fixes #49: number on teamlist Index: print_list_foot.c =================================================================== RCS file: /cvsroot/soss/soss/src/print/print_list_foot.c,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** print_list_foot.c 25 Dec 2010 19:13:08 -0000 1.10 --- print_list_foot.c 5 Apr 2014 15:55:17 -0000 1.11 *************** *** 189,193 **** } if (TcoIsChess4Rules(tco)) { ! x = MAX(TeamGetNrInList(team),TcoGetBreakPoint(tco)); if (x != 0) { sum = (int)(TcoGetFactor(tco) * sum / x / 2.0 + 0.5) * 2; --- 189,193 ---- } if (TcoIsChess4Rules(tco)) { ! x = MAX(TeamGetNrInList(team)?TeamGetNrInList(team):BelGetNrOfPersons(TeamGetBel(team)),TcoGetBreakPoint(tco)); if (x != 0) { sum = (int)(TcoGetFactor(tco) * sum / x / 2.0 + 0.5) * 2; |
|
From: Rasmus M. <ras...@us...> - 2014-04-05 15:12:23
|
Update of /cvsroot/soss/soss/src In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv17353/src Modified Files: person_dlg.c Log Message: fixes #48: sorting of belonings in player dialog Index: person_dlg.c =================================================================== RCS file: /cvsroot/soss/soss/src/person_dlg.c,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** person_dlg.c 12 Aug 2009 19:14:05 -0000 1.19 --- person_dlg.c 5 Apr 2014 15:12:21 -0000 1.20 *************** *** 178,181 **** --- 178,182 ---- /* Current belonging index for each of the belonging types in the tour (number of belts is guaranteed to be fixed thoughout the dialog) */ int *belsel; + ARRTYPE(t_bel) **sortedbels; /* Pointer to the sub-dialog for the bookings */ *************** *** 258,261 **** --- 259,263 ---- AddressFree(&persdlg->address); Release(persdlg->belsel); + Release(persdlg->sortedbels); Release(persdlg->grwr); Release(persdlg); *************** *** 332,336 **** for (belt=TourGetFirstBelt(t); belt; belt=TourGetNextBelt(t)) { bel = PersonGetBel(persdlg->p, belt); ! newbel = BeltGetBelAtIndex(belt, persdlg->belsel[i] - 1); if (newbel != bel) { if (bel) { --- 334,338 ---- for (belt=TourGetFirstBelt(t); belt; belt=TourGetNextBelt(t)) { bel = PersonGetBel(persdlg->p, belt); ! newbel = ArrayGetAt(persdlg->sortedbels[i], persdlg->belsel[i] - 1,t_bel); if (newbel != bel) { if (bel) { *************** *** 550,557 **** static void LPBelList(const void *list, int i, char *s) { ! const t_belt *belt=list; if (i>0) { ! strcpy(s, BelGetName(BeltGetBelAtIndex(belt, i-1))); } else { strcpy(s, txt[NONE]); --- 552,559 ---- static void LPBelList(const void *list, int i, char *s) { ! const ARRTYPE(t_bel) *bels=list; if (i>0) { ! strcpy(s, BelGetName(ArrayGetAt((ARRTYPE(t_bel)*)bels, i-1,t_bel))); } else { strcpy(s, txt[NONE]); *************** *** 641,645 **** i = 0; for (belt=TourGetFirstBelt(t); belt; belt=TourGetNextBelt(t)) { ! AddDropDown(DOWNLEFT|ALIGNRIGHT, 200, BeltGetSname(belt), &persdlg->belsel[i], belt, BeltGetNrOfBels(belt)+1, LPBelList); i++; } --- 643,647 ---- i = 0; for (belt=TourGetFirstBelt(t); belt; belt=TourGetNextBelt(t)) { ! AddDropDown(DOWNLEFT|ALIGNRIGHT, 200, BeltGetSname(belt), &persdlg->belsel[i], persdlg->sortedbels[i], BeltGetNrOfBels(belt)+1, LPBelList); i++; } *************** *** 1028,1035 **** if (nbelts > 0) { persdlg->belsel = GetMem0(int, nbelts); } i = 0; for (belt=TourGetFirstBelt(t); belt; belt=TourGetNextBelt(t)) { ! persdlg->belsel[i] = BeltGetIndexOfBel(belt, PersonGetBel(p, belt)) + 1; i++; } --- 1030,1039 ---- if (nbelts > 0) { persdlg->belsel = GetMem0(int, nbelts); + persdlg->sortedbels = GetMem0(ARRTYPE(t_bel)*,nbelts); } i = 0; for (belt=TourGetFirstBelt(t); belt; belt=TourGetNextBelt(t)) { ! persdlg->sortedbels[i] = BeltGetSortedBelArray(belt,BEL_SORT_CASE_INSENSITIVE_NAME); ! persdlg->belsel[i] = ArrayGetIndexOf(persdlg->sortedbels[i], PersonGetBel(p, belt),t_bel) + 1; i++; } |
|
From: Rasmus M. <ras...@us...> - 2012-12-15 12:27:40
|
Update of /cvsroot/soss/soss/resource In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv18524/resource Modified Files: s4-48x48.pcx x.pcx Log Message: Added printout options for tiebrakes in #2955657 Index: s4-48x48.pcx =================================================================== RCS file: /cvsroot/soss/soss/resource/s4-48x48.pcx,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvszMqiCR and /tmp/cvsivVPza differ Index: x.pcx =================================================================== RCS file: /cvsroot/soss/soss/resource/x.pcx,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 Binary files /tmp/cvs0seP6T and /tmp/cvshCIH5c differ |
|
From: Rasmus M. <ras...@us...> - 2012-10-12 02:18:15
|
Update of /cvsroot/soss/soss/src
In directory vz-cvs-3.sog:/tmp/cvs-serv11275
Modified Files:
belt.c importpl.c
Log Message:
Fixed bug when importing multiple belongings
Index: belt.c
===================================================================
RCS file: /cvsroot/soss/soss/src/belt.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** belt.c 25 Dec 2010 19:13:08 -0000 1.17
--- belt.c 12 Oct 2012 02:18:12 -0000 1.18
***************
*** 1010,1014 ****
unsigned beltindex;
! if (!TcoIsSumAllPlayers(tco)) {
t = BeltGetTour(belt);
beltindex = TourGetIndexOfBelt(t, belt);
--- 1010,1014 ----
unsigned beltindex;
! if (tco && !TcoIsSumAllPlayers(tco)) {
t = BeltGetTour(belt);
beltindex = TourGetIndexOfBelt(t, belt);
Index: importpl.c
===================================================================
RCS file: /cvsroot/soss/soss/src/importpl.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** importpl.c 1 Aug 2009 16:37:05 -0000 1.31
--- importpl.c 12 Oct 2012 02:18:12 -0000 1.32
***************
*** 644,648 ****
for (i=0,beltwrap=impdia->beltwrap; i<nbelts; beltwrap++,i++) {
! belt = impdia->beltwrap->belt;
if (briefbeltext[i] || beltext[i]) {
bel = NULL;
--- 644,648 ----
for (i=0,beltwrap=impdia->beltwrap; i<nbelts; beltwrap++,i++) {
! belt = beltwrap->belt;
if (briefbeltext[i] || beltext[i]) {
bel = NULL;
|
|
From: SourceForge.net <no...@so...> - 2011-10-15 06:58:32
|
Bugs item #3424055, was opened at 2011-10-15 08:58 Message generated for change (Tracker Item Submitted) made by rasmusmyklebust You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=540164&aid=3424055&group_id=74183 Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: Platform independet Group: None Status: Open Resolution: None Priority: 5 Private: No Submitted By: Rasmus Myklebust (rasmusmyklebust) Assigned to: Nobody/Anonymous (nobody) Summary: Crosstables not always good Initial Comment: When printing a crosstable and not tiebraking everyone, the crosstable will have more of one number. There is a need in the crosstable to print a unique number for each player (ie the current order of the list). ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=540164&aid=3424055&group_id=74183 |
|
From: SourceForge.net <no...@so...> - 2011-03-25 11:18:31
|
Bugs item #3243277, was opened at 2011-03-25 09:29 Message generated for change (Comment added) made by chrisan You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=540164&aid=3243277&group_id=74183 Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: None Group: None Status: Open Resolution: None Priority: 5 Private: No Submitted By: Rasmus Myklebust (rasmusmyklebust) Assigned to: Nobody/Anonymous (nobody) Summary: Team results not always sorted Initial Comment: When printing teamresults (Lagställning stor text), the list is sometimes not sorted. Printing again gives a sorted list. ---------------------------------------------------------------------- >Comment By: Christer Sandberg (chrisan) Date: 2011-03-25 11:18 Message: Is there a test case where this error can be reproduced by printing immediately after program restart? ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=540164&aid=3243277&group_id=74183 |
|
From: SourceForge.net <no...@so...> - 2011-03-25 09:29:44
|
Bugs item #3243277, was opened at 2011-03-25 10:29 Message generated for change (Tracker Item Submitted) made by rasmusmyklebust You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=540164&aid=3243277&group_id=74183 Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: None Group: None Status: Open Resolution: None Priority: 5 Private: No Submitted By: Rasmus Myklebust (rasmusmyklebust) Assigned to: Nobody/Anonymous (nobody) Summary: Team results not always sorted Initial Comment: When printing teamresults (Lagställning stor text), the list is sometimes not sorted. Printing again gives a sorted list. ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=540164&aid=3243277&group_id=74183 |
|
From: SourceForge.net <no...@so...> - 2011-02-17 22:15:54
|
Bugs item #3185247, was opened at 2011-02-17 23:15 Message generated for change (Settings changed) made by rasmusmyklebust You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=540164&aid=3185247&group_id=74183 Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: Platform independet Group: None >Status: Closed >Resolution: Fixed Priority: 5 Private: No Submitted By: Rasmus Myklebust (rasmusmyklebust) Assigned to: Rasmus Myklebust (rasmusmyklebust) Summary: Beloningtypes submenu does not apear Initial Comment: The submenu for belongingtypes does not apear ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=540164&aid=3185247&group_id=74183 |
|
From: SourceForge.net <no...@so...> - 2011-02-17 22:15:30
|
Bugs item #3185247, was opened at 2011-02-17 23:15 Message generated for change (Tracker Item Submitted) made by rasmusmyklebust You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=540164&aid=3185247&group_id=74183 Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: Platform independet Group: None Status: Open Resolution: None Priority: 5 Private: No Submitted By: Rasmus Myklebust (rasmusmyklebust) Assigned to: Rasmus Myklebust (rasmusmyklebust) Summary: Beloningtypes submenu does not apear Initial Comment: The submenu for belongingtypes does not apear ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=540164&aid=3185247&group_id=74183 |
|
From: SourceForge.net <no...@so...> - 2011-01-23 19:41:08
|
Bugs item #3164376, was opened at 2011-01-23 19:41 Message generated for change (Tracker Item Submitted) made by chrisan You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=540164&aid=3164376&group_id=74183 Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: Platform independet Group: v7.0.3 Status: Open Resolution: None Priority: 5 Private: No Submitted By: Christer Sandberg (chrisan) Assigned to: Christer Sandberg (chrisan) Summary: Two-sequence entering of result does not work Initial Comment: The optional entering mode "Two times in sequences" does not work - the second sequence is never requested and if automatic pairing is chosen, the group will be immediately paired after the first sequence. ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=540164&aid=3164376&group_id=74183 |
|
From: SourceForge.net <no...@so...> - 2011-01-23 19:27:34
|
Bugs item #3164370, was opened at 2011-01-23 19:24 Message generated for change (Settings changed) made by chrisan You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=540164&aid=3164370&group_id=74183 Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: Platform independet Group: v7.0.3 >Status: Closed >Resolution: Fixed Priority: 5 Private: No Submitted By: Christer Sandberg (chrisan) Assigned to: Christer Sandberg (chrisan) Summary: Pairing menu item blocked Initial Comment: The menu item "Pairing" in the context menu of groups in group lists is unnecessarily blocked (greyed out) after the first round has been paired. This makes it impossible to use that selection for pairing when not using automatic pairing (instead the pairing button has to be visible and used). ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=540164&aid=3164370&group_id=74183 |
|
From: Christer S. <ch...@us...> - 2011-01-23 19:25:46
|
Update of /cvsroot/soss/soss/docs In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv18973/docs Modified Files: changes._tx Log Message: Fixed bug 3164370 Index: changes._tx =================================================================== RCS file: /cvsroot/soss/soss/docs/changes._tx,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** changes._tx 22 Jan 2011 21:43:25 -0000 1.17 --- changes._tx 23 Jan 2011 19:25:38 -0000 1.18 *************** *** 46,49 **** --- 46,51 ---- <ul> <li> + Fixed bug 3164370 + <li> Added feature 2672459 <li> |
|
From: Christer S. <ch...@us...> - 2011-01-23 19:25:46
|
Update of /cvsroot/soss/soss/src In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv18973/src Modified Files: group.c group.h lst_groups.c Log Message: Fixed bug 3164370 Index: group.h =================================================================== RCS file: /cvsroot/soss/soss/src/group.h,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** group.h 26 Dec 2010 17:16:38 -0000 1.27 --- group.h 23 Jan 2011 19:25:38 -0000 1.28 *************** *** 271,275 **** extern void SetLatePlayersNumber(t_group *gr, struct t_card *card); extern int GroupMoveCardToPassivePlayers(t_group *gr, struct t_card *card); ! extern void PairAGroup(t_group *gr); extern int PairAllGroups(struct t_tour *t); extern struct t_card *GroupGetCardFromViewNumber(t_group *gr, int number); --- 271,275 ---- extern void SetLatePlayersNumber(t_group *gr, struct t_card *card); extern int GroupMoveCardToPassivePlayers(t_group *gr, struct t_card *card); ! extern void GroupPairNextRound(t_group *gr); extern int PairAllGroups(struct t_tour *t); extern struct t_card *GroupGetCardFromViewNumber(t_group *gr, int number); *************** *** 376,383 **** /** Returns true if all active players has got their results reprorted for the current round, else false. If the pairing system is "round robin" then any player without opponent is counted as a reported result ! regardless of if the card is actually checked as "reported"· If there are no active players (i.e. GroupGetNrOfCheckedIn() is 0) then the returned value is also false. */ extern int GroupIsAllResultsReported(t_group *gr); extern int GroupIsAllCardsCheckedin(t_group *gr); extern int GroupIsMixed(t_group *gr); --- 376,390 ---- /** Returns true if all active players has got their results reprorted for the current round, else false. If the pairing system is "round robin" then any player without opponent is counted as a reported result ! regardless of if the card is actually checked as "reported". If there are no active players (i.e. GroupGetNrOfCheckedIn() is 0) then the returned value is also false. */ extern int GroupIsAllResultsReported(t_group *gr); + /** Returns true if this group is expected to be paired. Normally + this is only the case before the game starts, but in case there + is some option set that prevents the automatic pairing to start + immediately it may be the case that it returns true after game + started. */ + extern int GroupIsExpectedToBePaired(t_group *gr); + extern int GroupIsAllCardsCheckedin(t_group *gr); extern int GroupIsMixed(t_group *gr); Index: lst_groups.c =================================================================== RCS file: /cvsroot/soss/soss/src/lst_groups.c,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** lst_groups.c 26 Dec 2010 17:16:38 -0000 1.20 --- lst_groups.c 23 Jan 2011 19:25:38 -0000 1.21 *************** *** 369,373 **** { t_grwrap *grwrap=data; ! PairAGroup(grwrap->gr); ConditionalRefresh(NULL, UPD_PERSON); } --- 369,373 ---- { t_grwrap *grwrap=data; ! GroupPairNextRound(grwrap->gr); ConditionalRefresh(NULL, UPD_PERSON); } *************** *** 519,523 **** id = MkMenuItem(0, buf, "", PairGroupWrapper, grwrap); Release(buf); ! if (gr->cur_round >= 0 || GroupHasLendCards(gr)) { DeActivate(id); } --- 519,523 ---- id = MkMenuItem(0, buf, "", PairGroupWrapper, grwrap); Release(buf); ! if (!GroupIsExpectedToBePaired(gr)) { DeActivate(id); } *************** *** 539,542 **** --- 539,543 ---- DeActivate(id); } + id = MkMenuItem(0, txt[UNDO_MIXED_GROUPS], "", UndoMixedGroups, grwrap); if (!GroupIsMixed(gr)) { Index: group.c =================================================================== RCS file: /cvsroot/soss/soss/src/group.c,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** group.c 26 Dec 2010 17:16:38 -0000 1.43 --- group.c 23 Jan 2011 19:25:38 -0000 1.44 *************** *** 358,362 **** } ! extern void PairAGroup(t_group *gr) { if (gr->partition->is_parent) { --- 358,362 ---- } ! extern void GroupPairNextRound(t_group *gr) { if (gr->partition->is_parent) { *************** *** 368,376 **** return; } ! PairFirstRound(gr); PrintoutsLaunchAutoPrintouts(gr, PD_GROUP, AU_NOTLAST, gr->t); ! if (!TourIsStarted(gr->t)) StartBarCodeReading(gr->t); ! TourSetStarted(gr->t); StoreGroup(gr); TourStore(gr->t); --- 368,381 ---- return; } ! if (gr->cur_round < 0) { ! PairFirstRound(gr); ! } else { ! PairNextRound(gr); ! } PrintoutsLaunchAutoPrintouts(gr, PD_GROUP, AU_NOTLAST, gr->t); ! if (!TourIsStarted(gr->t)) { StartBarCodeReading(gr->t); ! TourSetStarted(gr->t); ! } StoreGroup(gr); TourStore(gr->t); *************** *** 1072,1075 **** --- 1077,1086 ---- } + extern int GroupIsExpectedToBePaired(t_group *gr) + { + return (gr->cur_round < 0 || (GroupIsAllResultsReported(gr) && gr->cur_round != gr->nrounds-1)) && + !GroupHasLendCards(gr) && !GroupIsPartitionableGroup(gr); + } + extern int GroupIsAllResultsReported(t_group *gr) { |
|
From: SourceForge.net <no...@so...> - 2011-01-23 19:24:46
|
Bugs item #3164370, was opened at 2011-01-23 19:24 Message generated for change (Tracker Item Submitted) made by chrisan You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=540164&aid=3164370&group_id=74183 Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: Platform independet Group: v7.0.3 Status: Open Resolution: None Priority: 5 Private: No Submitted By: Christer Sandberg (chrisan) Assigned to: Christer Sandberg (chrisan) Summary: Pairing menu item blocked Initial Comment: The menu item "Pairing" in the context menu of groups in group lists is unnecessarily blocked (greyed out) after the first round has been paired. This makes it impossible to use that selection for pairing when not using automatic pairing (instead the pairing button has to be visible and used). ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=540164&aid=3164370&group_id=74183 |
|
From: SourceForge.net <no...@so...> - 2011-01-23 09:23:52
|
Feature Requests item #912111, was opened at 2004-03-08 17:38 Message generated for change (Comment added) made by chrisan You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=540167&aid=912111&group_id=74183 Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: None Group: 7.0 >Status: Closed >Resolution: Fixed Priority: 5 Private: No Submitted By: Nobody/Anonymous (nobody) >Assigned to: Christer Sandberg (chrisan) Summary: Confirmation before pairing Initial Comment: When entering results maually (i.e. not bar code reader) one often want to check the entered results before pairing next round. As now being one has to postpone the last report, then check and finally enter the last report. A simple confirmation request (or maybe an configurable option to never pair next?) in combination with a button "pair next round" that gets activated when the current round has been reported would solve this. ---------------------------------------------------------------------- >Comment By: Christer Sandberg (chrisan) Date: 2011-01-23 09:23 Message: This has been fixed since long time ago ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=540167&aid=912111&group_id=74183 |
|
From: SourceForge.net <no...@so...> - 2011-01-23 09:18:15
|
Feature Requests item #2672459, was opened at 2009-03-08 15:13 Message generated for change (Settings changed) made by chrisan You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=540167&aid=2672459&group_id=74183 Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: None Group: 7.0 >Status: Closed >Resolution: Fixed Priority: 5 Private: No Submitted By: Christer Sandberg (chrisan) >Assigned to: Christer Sandberg (chrisan) Summary: Improved menus Initial Comment: The menus in SOSS may be hard to learn for beginners. The following change is suggested: - Move "Print all" from "Tools" to "File" menu. - "Print" in the menu bar is removed (it has the same content as the above). - A new alternative "Advanced" is added to the menu bar - "Belonging types" is moved from "File" to "Advanced" - "Player data base", "GP-tournament", "Edit templates" are moved from "Tools" to "Advanced" - "Bar codes" is moved from "Adapt" to "Tools" - The alternatives under "Help" that is grayed-out should be removed. ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=540167&aid=2672459&group_id=74183 |
Update of /cvsroot/soss/soss/src In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv10963/src Modified Files: gpcalc.c labels_en.t labels_se.t lst_bels.c lst_pers_bel.c lst_pers_group.c lst_result_report.c menu_config.c menu_file.c menu_print.c menu_print.h menu_tools.c menu_tools.h tour_dlg.c winallpl.c winmain.c winmain.h Added Files: menu_advanced.c menu_advanced.h menu_help.c menu_help.h Log Message: Added feature 2672459 --- NEW FILE: menu_help.c --- /* Copyright (C) 2003 Christer Sandberg, see LICENSE.TXT for details ___ ____ ___ ___ / _ \ / __ \ / _ \ / _ \ ( ( \/ / / \ \ ( ( \/ ( ( \/ \ \ | | | | \ \ \ \ \ \ | | | | \ \ \ \ | | | | | | | | | | /\_/ / \ \__/ / /\_/ / /\_/ / \___/ \____/ \___/ \___/ $Id: menu_help.c,v 1.1 2011/01/22 21:43:25 chrisan Exp $ menu_help.c by Christer Sandberg Contains the menu help function */ #include "session.h" #include "winmain.h" #include "winmain_settings_dlg.h" #include "sosstext.h" #include <allegro.h> #include "labels_en.h" #include "labels_se.h" #include <cgui.h> #include <cpri.h> #include <ccom.h> #include <cbar.h> #include <cgui/mem.h> #define SOSS_VERSION_MAJOR 7 #define SOSS_VERSION_MINOR 0 #define SOSS_VERSION_PATCH 4 #define SOSS_VERSION_STRING "7.0.4" #define SOSS_DATE 20091206 /* yyyymmdd */ #define SOSS_DATE_STRING "Dec 06, 2009" #define GPL_LICENCE_FILE_NAME "LICENSE.TXT" #define CHESS4_DOCS "schack4.txt" #define SOSS_DOCS "soss-se.txt" static void ReOpenStartMessage(void *data) { t_winmain *winmain = data; OpenStartMessage(winmain); } static void ShowText(t_session *session, const char *file) { char *text_full_path; MkDialogue(ADAPTIVE, txt[HELP_S4], 0); text_full_path = SessionAppendToWorkDirPath(session, file); AddTextBox(DOWNLEFT, text_full_path, 480, 39, TB_TEXTFILE|TB_PREFORMAT|TB_FRAMESINK); AddButton(DOWNLEFT, txt[CLOSE], CloseWin, NULL); Release(text_full_path); DisplayWin(); } static void ShowChess4Help(void *session) { ShowText(session, CHESS4_DOCS); } static void ShowHelp(void *session) { ShowText(session, SOSS_DOCS); } static void ViewFullLicence(void *data) { t_session *session = data; char *licence_text_full_path; MkDialogue(ADAPTIVE, txt[GPL_LICENSE], 0); licence_text_full_path = SessionAppendToWorkDirPath(session, GPL_LICENCE_FILE_NAME); AddTextBox(DOWNLEFT, licence_text_full_path, 480, 39, TB_TEXTFILE|TB_PREFORMAT|TB_FRAMESINK); AddButton(DOWNLEFT, txt[CLOSE], CloseWin, NULL); Release(licence_text_full_path); DisplayWin(); } static void GPLInfo(void *data) { t_session *session = data; MkDialogue(ADAPTIVE, txt[GPL_LICENSE], 0); AddTextBox(DOWNLEFT, txt[GPL_LICENSE_SHORT_VERSION], 400, 0, TB_FRAMESINK|TB_LINEFEED_); AddButton(DOWNLEFT, txt[CLOSE], CloseWin, NULL); AddButton(RIGHT, txt[GPL_SHOW_FULL_LICENCE_TEXT], ViewFullLicence, session); DisplayWin(); } static void SOSSInfo(void *data) { char s[100]; (void)data; MkDialogue(ADAPTIVE, txt[ABOUT_SOSS], 0); AddTag(TOPLEFT, "SOSS"); AddTag(RIGHT, SOSS_VERSION_STRING); AddTag(RIGHT, txt[IS_BUILT]); AddTag(RIGHT, SOSS_DATE_STRING); sprintf(s, txt[USING_PACKAGE], "CPRI"); AddTag(DOWNLEFT, s); AddTag(RIGHT, CPRI_VERSION_STRING); AddTag(RIGHT, txt[IS_BUILT]); AddTag(RIGHT, CPRI_DATE_STRING); sprintf(s, txt[USING_PACKAGE], "CBAR"); AddTag(DOWNLEFT, s); AddTag(RIGHT, CbarVersionString()); AddTag(RIGHT, txt[IS_BUILT]); AddTag(RIGHT, CbarDateString()); sprintf(s, txt[USING_PACKAGE], "CCOM"); AddTag(DOWNLEFT, s); AddTag(RIGHT, CCOM_VERSION_STRING); AddTag(RIGHT, txt[IS_BUILT]); AddTag(RIGHT, CCOM_DATE_STRING); sprintf(s, txt[USING_PACKAGE], "CGUI"); AddTag(DOWNLEFT, s); AddTag(RIGHT, CGUI_VERSION_STRING); AddTag(RIGHT, txt[IS_BUILT]); AddTag(RIGHT, CGUI_DATE_STRING); sprintf(s, txt[USING_PACKAGE], "Allegro"); AddTag(DOWNLEFT, s); AddTag(RIGHT, ALLEGRO_VERSION_STR); AddTag(RIGHT, txt[IS_BUILT]); sprintf(s, "%d-%d-%d", ALLEGRO_DATE/10000, (ALLEGRO_DATE/100)%100, ALLEGRO_DATE%100); AddTag(RIGHT, s); AddTag(DOWNLEFT, txt[SOSS_EXPLANATION]); AddTextBox(DOWNLEFT, txt[SOSS_BRIEF_INFO], 310, 0, TB_FRAMESINK|TB_LINEFEED_); AddButton(DOWNLEFT, txt[CLOSE], CloseWin, NULL); DisplayWin(); } extern void MenuHelp(t_session *session, t_winmain *winmain) { int id; MkMenuItem(0, txt[HELP], "", ShowHelp, session); if (GetConfiguredForChess4()) { id = MkMenuItem(0, txt[HELP_S4], "", ShowChess4Help, session); } if (*txt[HELP_S4_START] && GetConfiguredForChess4()) { id = MkMenuItem(0, txt[HELP_S4_START], "", ReOpenStartMessage, winmain); if (WinMainIsStartMessageOpen(winmain)) { DeActivate(id); } } MkMenuItem(0, txt[GPL_LICENSE], "", GPLInfo, session); MkMenuItem(0, txt[ABOUT_SOSS], "", SOSSInfo, NULL); } Index: lst_bels.c =================================================================== RCS file: /cvsroot/soss/soss/src/lst_bels.c,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** lst_bels.c 25 Dec 2010 19:13:08 -0000 1.25 --- lst_bels.c 22 Jan 2011 21:43:25 -0000 1.26 *************** *** 1269,1273 **** Refresh(id); } else { ! /* We need to use BrowseTo(). This involves a problem due taking the focus from other list-boxes (in addition to the problem of possibly confusing the user): in case the event reason is e.g. "remove player" the redrawing in the player list because of the "unfocusing" will try to use data that has not yet been updated. --- 1269,1273 ---- Refresh(id); } else { ! /* We need to use BrowseTo(). This involves a problem due taking the focus from other list-boxes (in addition to the problem of possibly confusing the user): in case the event reason is e.g. "remove player" the redrawing in the player list because of the "unfocusing" will try to use data that has not yet been updated. *************** *** 1479,1483 **** { t_lst_bels *lst_bels=data; ! PrintMenu(SessionGetPrintoutList(lst_bels->session), SessionGetCurrentTour(lst_bels->session), lst_bels->belt, NULL, lst_bels->belt, PD_BEL_LIST); } --- 1479,1483 ---- { t_lst_bels *lst_bels=data; ! FilteredPrintMenu(SessionGetPrintoutList(lst_bels->session), SessionGetCurrentTour(lst_bels->session), lst_bels->belt, NULL, lst_bels->belt, PD_BEL_LIST); } --- NEW FILE: menu_help.h --- #ifndef MENU_HELP_H #define MENU_HELP_H /* Copyright (C) 2003 Christer Sandberg, see LICENSE.TXT for details ___ ____ ___ ___ / _ \ / __ \ / _ \ / _ \ ( ( \/ / / \ \ ( ( \/ ( ( \/ \ \ | | | | \ \ \ \ \ \ | | | | \ \ \ \ | | | | | | | | | | /\_/ / \ \__/ / /\_/ / /\_/ / \___/ \____/ \___/ \___/ $Id: menu_help.h,v 1.1 2011/01/22 21:43:25 chrisan Exp $ menu_help.h by Christer Sandberg */ struct t_session; struct t_winmain; extern void MenuHelp(struct t_session *session, struct t_winmain *winmain); #endif Index: lst_result_report.c =================================================================== RCS file: /cvsroot/soss/soss/src/lst_result_report.c,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** lst_result_report.c 26 Sep 2009 10:35:35 -0000 1.20 --- lst_result_report.c 22 Jan 2011 21:43:25 -0000 1.21 *************** *** 971,975 **** gr = papl->gr; if (gr) ! PrintMenu(SessionGetPrintoutList(TourGetSession(gr->t)), gr->t, gr, NULL, NULL, PD_GROUP); } --- 971,975 ---- gr = papl->gr; if (gr) ! FilteredPrintMenu(SessionGetPrintoutList(TourGetSession(gr->t)), gr->t, gr, NULL, NULL, PD_GROUP); } Index: winmain.c =================================================================== RCS file: /cvsroot/soss/soss/src/winmain.c,v retrieving revision 1.60 retrieving revision 1.61 diff -C2 -d -r1.60 -r1.61 *** winmain.c 6 Dec 2009 19:45:18 -0000 1.60 --- winmain.c 22 Jan 2011 21:43:25 -0000 1.61 *************** *** 16,20 **** #include "winmain.h" - #include "menu_config.h" #include "session.h" #include "array.h" --- 16,19 ---- *************** *** 31,44 **** #include "person_dlg_add.h" #include "bel_dlg_add.h" - #include "menu_print.h" #include "group_dlg.h" #include "importpl.h" #include "sosstext.h" #include "refresh.h" - #include "menu_file.h" #include "lst_groups.h" #include "tab_main_bels.h" #include "tab_main_group.h" #include "menu_tools.h" #include "main.h" #include "winmain_settings_dlg.h" --- 30,46 ---- #include "person_dlg_add.h" #include "bel_dlg_add.h" #include "group_dlg.h" #include "importpl.h" #include "sosstext.h" #include "refresh.h" #include "lst_groups.h" #include "tab_main_bels.h" #include "tab_main_group.h" + #include "menu_print.h" + #include "menu_file.h" + #include "menu_config.h" #include "menu_tools.h" + #include "menu_advanced.h" + #include "menu_help.h" #include "main.h" #include "winmain_settings_dlg.h" *************** *** 53,71 **** #include <stdio.h> #include <cgui.h> - #include <cpri.h> - #include <ccom.h> - #include <cbar.h> #include <cgui/mem.h> - #define SOSS_VERSION_MAJOR 7 - #define SOSS_VERSION_MINOR 0 - #define SOSS_VERSION_PATCH 4 - #define SOSS_VERSION_STRING "7.0.4" - #define SOSS_DATE 20091206 /* yyyymmdd */ - #define SOSS_DATE_STRING "Dec 06, 2009" - #define START_MESSAGE_FILE_NAME "startmsg.txt" - #define GPL_LICENCE_FILE_NAME "LICENSE.TXT" - #define CHESS4_DOCS "schack4.txt" typedef struct t_tab t_tab; --- 55,61 ---- *************** *** 276,280 **** { t_winmain *winmain=data; - Archive(winmain->session); } --- 266,269 ---- *************** *** 283,360 **** { t_winmain *winmain=data; ! ! Tools(winmain->session); ! } ! ! static void ViewFullLicence(void *data) ! { ! t_winmain *winmain = data; ! char *licence_text_full_path; ! ! MkDialogue(ADAPTIVE, txt[GPL_LICENSE], 0); ! licence_text_full_path = SessionAppendToWorkDirPath(winmain->session, GPL_LICENCE_FILE_NAME); ! AddTextBox(DOWNLEFT, licence_text_full_path, 480, 39, TB_TEXTFILE|TB_PREFORMAT|TB_FRAMESINK); ! AddButton(DOWNLEFT, txt[CLOSE], CloseWin, NULL); ! Release(licence_text_full_path); ! DisplayWin(); ! } ! ! static void GPLInfo(void *data) ! { ! t_winmain *winmain = data; ! ! MkDialogue(ADAPTIVE, txt[GPL_LICENSE], 0); ! AddTextBox(DOWNLEFT, txt[GPL_LICENSE_SHORT_VERSION], 400, 0, TB_FRAMESINK|TB_LINEFEED_); ! AddButton(DOWNLEFT, txt[CLOSE], CloseWin, NULL); ! AddButton(RIGHT, txt[GPL_SHOW_FULL_LICENCE_TEXT], ViewFullLicence, winmain); ! DisplayWin(); ! } ! ! static void SOSSInfo(void *data) ! { ! char s[100]; ! (void)data; ! ! MkDialogue(ADAPTIVE, txt[ABOUT_SOSS], 0); ! AddTag(TOPLEFT, "SOSS"); ! AddTag(RIGHT, SOSS_VERSION_STRING); ! AddTag(RIGHT, txt[IS_BUILT]); ! AddTag(RIGHT, SOSS_DATE_STRING); ! ! sprintf(s, txt[USING_PACKAGE], "CPRI"); ! AddTag(DOWNLEFT, s); ! AddTag(RIGHT, CPRI_VERSION_STRING); ! AddTag(RIGHT, txt[IS_BUILT]); ! AddTag(RIGHT, CPRI_DATE_STRING); ! ! sprintf(s, txt[USING_PACKAGE], "CBAR"); ! AddTag(DOWNLEFT, s); ! AddTag(RIGHT, CbarVersionString()); ! AddTag(RIGHT, txt[IS_BUILT]); ! AddTag(RIGHT, CbarDateString()); ! ! sprintf(s, txt[USING_PACKAGE], "CCOM"); ! AddTag(DOWNLEFT, s); ! AddTag(RIGHT, CCOM_VERSION_STRING); ! AddTag(RIGHT, txt[IS_BUILT]); ! AddTag(RIGHT, CCOM_DATE_STRING); ! ! sprintf(s, txt[USING_PACKAGE], "CGUI"); ! AddTag(DOWNLEFT, s); ! AddTag(RIGHT, CGUI_VERSION_STRING); ! AddTag(RIGHT, txt[IS_BUILT]); ! AddTag(RIGHT, CGUI_DATE_STRING); ! ! sprintf(s, txt[USING_PACKAGE], "Allegro"); ! AddTag(DOWNLEFT, s); ! AddTag(RIGHT, ALLEGRO_VERSION_STR); ! AddTag(RIGHT, txt[IS_BUILT]); ! sprintf(s, "%d-%d-%d", ALLEGRO_DATE/10000, (ALLEGRO_DATE/100)%100, ALLEGRO_DATE%100); ! AddTag(RIGHT, s); ! ! AddTag(DOWNLEFT, txt[SOSS_EXPLANATION]); ! AddTextBox(DOWNLEFT, txt[SOSS_BRIEF_INFO], 310, 0, TB_FRAMESINK|TB_LINEFEED_); ! AddButton(DOWNLEFT, txt[CLOSE], CloseWin, NULL); ! DisplayWin(); } --- 272,276 ---- { t_winmain *winmain=data; ! MenuTools(winmain->session); } *************** *** 366,370 **** } ! static void OpenStartMessage(t_winmain *winmain) { char *start_msg_full_path; --- 282,286 ---- } ! extern void OpenStartMessage(t_winmain *winmain) { char *start_msg_full_path; *************** *** 388,432 **** } - static void ReOpenStartMessage(void *data) - { - t_winmain *winmain = data; - OpenStartMessage(winmain); - } - - static void ShowChess4Help(void *data) - { - t_winmain *winmain = data; - char *chess4_help_full_path; - - MkDialogue(ADAPTIVE, txt[HELP_S4], 0); - chess4_help_full_path = SessionAppendToWorkDirPath(winmain->session, CHESS4_DOCS); - AddTextBox(DOWNLEFT, chess4_help_full_path, 480, 39, TB_TEXTFILE|TB_PREFORMAT|TB_FRAMESINK); - AddButton(DOWNLEFT, txt[CLOSE], CloseWin, NULL); - Release(chess4_help_full_path); - DisplayWin(); - } - - static void MainWinHelpMenu(void *data) - { - t_winmain *winmain = data; - int id; - - id = MkMenuItem(0, txt[INDEX], "", NULL, NULL); - DeActivate(id); - id = MkMenuItem(0, txt[HELP], "", NULL, NULL); - DeActivate(id); - if (GetConfiguredForChess4()) { - id = MkMenuItem(0, txt[HELP_S4], "", ShowChess4Help, winmain); - } - if (*txt[HELP_S4_START] && GetConfiguredForChess4()) { - id = MkMenuItem(0, txt[HELP_S4_START], "", ReOpenStartMessage, winmain); - if (winmain->start_message_is_open) { - DeActivate(id); - } - } - MkMenuItem(0, txt[GPL_LICENSE], "", GPLInfo, winmain); - MkMenuItem(0, txt[ABOUT_SOSS], "", SOSSInfo, NULL); - } - extern void InitLanguage(t_session *session) { --- 304,307 ---- *************** *** 446,459 **** } ! static void MainWinPrintoutsMenuWrapper(void *data) { t_winmain *winmain=data; ! MainWinPrintoutsMenu(SessionGetPrintoutList(winmain->session), SessionGetCurrentTour(winmain->session)); } ! void MenuAdaptSossWrapper(void *data) { t_winmain *winmain=data; ! MenuAdaptSoss(winmain->adapt_soss); } --- 321,340 ---- } ! static void MenuAdaptSossWrapper(void *data) { t_winmain *winmain=data; ! MenuAdaptSoss(winmain->adapt_soss); } ! static void AdvancedMenuWrapper(void *data) { t_winmain *winmain=data; ! MenuAdvanced(winmain->session); ! } ! ! static void HelpMenuWrapper(void *data) ! { ! t_winmain *winmain=data; ! MenuHelp(winmain->session, winmain); } *************** *** 463,469 **** MkMenu(txt[ARCHIVE], ArchiveWrap, winmain); MkMenu(txt[TOOLS], ToolsWrap, winmain); ! MkMenu(txt[PRINT_OUTS], MainWinPrintoutsMenuWrapper, winmain); MkMenu(txt[ADAPT_MAIN_WINDOW], MenuAdaptSossWrapper, winmain); ! MkMenu(txt[HELP], MainWinHelpMenu, winmain); EndMenuBar(); } --- 344,350 ---- MkMenu(txt[ARCHIVE], ArchiveWrap, winmain); MkMenu(txt[TOOLS], ToolsWrap, winmain); ! MkMenu(txt[ADVANCED], AdvancedMenuWrapper, winmain); MkMenu(txt[ADAPT_MAIN_WINDOW], MenuAdaptSossWrapper, winmain); ! MkMenu(txt[HELP], HelpMenuWrapper, winmain); EndMenuBar(); } *************** *** 522,525 **** --- 403,411 ---- } + extern int WinMainIsStartMessageOpen(t_winmain *winmain) + { + return winmain->start_message_is_open; + } + extern void WinMainChangeLanguage(t_winmain *winmain) { Index: menu_tools.h =================================================================== RCS file: /cvsroot/soss/soss/src/menu_tools.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** menu_tools.h 13 Oct 2009 18:19:19 -0000 1.4 --- menu_tools.h 22 Jan 2011 21:43:25 -0000 1.5 *************** *** 18,34 **** /** Performs the partitioning into groups (for partitionable groups) as well as the initial pairing ! of all groups and if bar code reading is set also starts the bar code reading. Stores the updated data to disk. Refreshes the screen to reflect new data and new state. Prompts the user if obstacles occur. */ extern void TournamentStartRequest(struct t_tour *t); - /** Prompts the user to select an existing db. - \param t A pointer to the current tournament. - \return A pointer to the selected db, possibly an empty string. Memory belongs to the caller. */ - extern char *SelectDb(struct t_tour *t); - /** Creates the "tools menu". \param session A pointer to this session. */ ! extern void Tools(struct t_session *session); #endif --- 18,29 ---- /** Performs the partitioning into groups (for partitionable groups) as well as the initial pairing ! of all groups and if bar code reading is set also starts the bar code reading. Stores the updated data to disk. Refreshes the screen to reflect new data and new state. Prompts the user if obstacles occur. */ extern void TournamentStartRequest(struct t_tour *t); /** Creates the "tools menu". \param session A pointer to this session. */ ! extern void MenuTools(struct t_session *session); #endif Index: menu_config.c =================================================================== RCS file: /cvsroot/soss/soss/src/menu_config.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** menu_config.c 13 Oct 2009 18:19:19 -0000 1.4 --- menu_config.c 22 Jan 2011 21:43:25 -0000 1.5 *************** *** 16,25 **** #include "winmain.h" #include "sosstext.h" - #include "barhandl.h" #include "tour.h" #include "session.h" #include "winmain_settings_dlg.h" #include <cgui.h> - #include <cbar.h> #include <cpri.h> #include <cgui/mem.h> --- 16,23 ---- *************** *** 65,80 **** #define NR_LANG_SUPPORTED 2 - static void BarCodesDialogWrapper(void *data) - { - t_session *session = data; - t_tour *t; - int n; - - t = SessionGetCurrentTour(session); - if (CbarSettingsDialogue(0, 0, 1, 1, 1, &n)) - if (n > 0 && t && TourIsStarted(t)) - StartBarCodeReading(t); - } - #ifdef ALLEGRO_DOS static void PrinterDialogWrapper(void *data) --- 63,66 ---- *************** *** 183,186 **** MkMenuItem(0, txt[INSTALLED_PRINTERS], "", PrinterDialogWrapper, adapt_soss->session); #endif - MkMenuItem(0, txt[BAR_CODES], "", BarCodesDialogWrapper, adapt_soss->session); } --- 169,171 ---- Index: menu_tools.c =================================================================== RCS file: /cvsroot/soss/soss/src/menu_tools.c,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** menu_tools.c 5 Feb 2010 20:35:12 -0000 1.9 --- menu_tools.c 22 Jan 2011 21:43:25 -0000 1.10 *************** *** 18,24 **** #include <string.h> #include <allegro.h> #include "menu_tools.h" ! #include "menu_print.h" #include "session.h" #include "tour.h" --- 18,25 ---- #include <string.h> #include <allegro.h> + #include <cbar.h> #include "menu_tools.h" ! #include "barhandl.h" #include "session.h" #include "tour.h" *************** *** 27,44 **** #include "person.h" #include "group.h" - #include "playerdb.h" - #include "dbview.h" - #include "gpcalc.h" - #include "gpconfig.h" #include "loadgr.h" #include "importpl.h" #include "sosstext.h" - #include "barhandl.h" #include "refresh.h" - #include "templ_dlg.h" #include "backup_dlg.h" #include "area_dlg.h" #include "winallpl.h" - #include "tour_dlg_db.h" #include "pos_dlg.h" --- 28,38 ---- *************** *** 144,412 **** } ! static void TemplateListWrapper(void *data) ! { ! t_session *session=data; ! ! TemplDlg(session); ! } ! ! static void UpdateDbWithResults(void *data) ! { ! t_tour *t=data; ! TourUpdateDbWithAllResults(t); ! } ! ! extern char *SelectDb(t_tour *t) ! { ! const char *full_path; ! const char *pdb_file_name; ! ! if (!MakeSenseToChangeDb(t)) { ! if (!Request("", 0, 400, txt[UNUSUAL_MEASURE_DATA_MY_BE_MIXED_UP_CANCEL_OK], TourGetName(t))) ! return MkString(""); ! } ! full_path = FileSelect("*.pdb", SessionGetWorkDirPath(TourGetSession(t)), ! FS_SHOW_DIR_TREE|FS_DISABLE_EDIT_DAT|FS_NO_DRAG_DROP|FS_REQUIRE_EXISTING_FILE, txt[SELECT_DB], txt[OPEN_DB]); ! pdb_file_name = get_filename(full_path); ! return MkString(pdb_file_name); ! } ! ! static void ChangeDb(void *data) ! { ! char *pdb_file_name; ! t_tour *t=data; ! ! if (t) { ! pdb_file_name = SelectDb(t); ! if (*pdb_file_name) { ! if (!TourChangePdb(t, pdb_file_name)) { ! Req("", txt[INVALID_DATABASE]); ! } ! /* Might affect the entire tournament */ ! ConditionalRefresh(NULL, UPD_TOUR); ! } ! } ! } ! ! static void CreateNewDbSelected(void *data) { ! t_tour *t=data; ! t_session *session; ! char *pdb_file_name; ! ! session = TourGetSession(t); ! if (t) { ! if (Request("", 0, 0, txt[THIS_WILL_CLOSE_THE_CURRENT_EVENT_CANCEL_OK], TourGetName(t))) { ! SessionCloseTour(session); ! pdb_file_name = TourDialogPromptUserForNewDatabase(session); ! if (*pdb_file_name) ! SessionCreateNewPdb(session, pdb_file_name); ! Release(pdb_file_name); ! /* Might affect the entire tournament */ ! ConditionalRefresh(NULL, UPD_TOUR); ! } ! } ! } ! ! typedef struct t_tkpair { t_tour *t; - t_pdb_key dbkey; - struct t_tkpairh *tkpairh; - } t_tkpair; - - typedef struct t_tkpairh { int n; - t_tkpair *tkpair; - } t_tkpairh; - - static void DestroyTkPairHead(t_tkpairh *tkpairh) - { - Release(tkpairh->tkpair); - Release(tkpairh); - } - - static void CalculateGpSelected(void *data) - { - t_tkpair *tkpair = data; - DialogueCalculateGp(tkpair->dbkey, tkpair->t); - DestroyTkPairHead(tkpair->tkpairh); - } - - static void EditGpSelected(void *data) - { - t_tkpair *tkpair = data; - DialogueGp(tkpair->dbkey, tkpair->t); - DestroyTkPairHead(tkpair->tkpairh); - } - - static void DeleteGpSelected(void *data) - { - t_tkpair *tkpair = data; - DialogueDeleteGp(tkpair->dbkey); - DestroyTkPairHead(tkpair->tkpairh); - } - - static void CommonGpSubMenu(t_tour *t, void (*Selected)(void*)) - { - t_pdb_key dbkey; - char *name; - t_tkpairh *tkpairh; - t_tkpair *tkpair; - int n=0; - - for (dbkey=pdb_getFirstGp(); dbkey!=PDB_NOKEY; dbkey=pdb_getNextGp()) - n++; - if (n) { - tkpairh = GetMem0(t_tkpairh, 1); - tkpairh->n = n; - tkpairh->tkpair = tkpair = GetMem0(t_tkpair, tkpairh->n); - for (dbkey=pdb_getFirstGp(); dbkey!=PDB_NOKEY; dbkey=pdb_getNextGp(), tkpair++) { - pdb_getGp(dbkey, &name, NULL, NULL, NULL, NULL,NULL,NULL); - tkpair->t = t; - tkpair->dbkey = dbkey; - tkpair->tkpairh = tkpairh; - MkMenuItem(0, name, "", Selected, tkpair); - Release(name); - } - } - } - - static void DeleteGpSubmenu(void *data) - { - t_tour *t=data; - CommonGpSubMenu(t, DeleteGpSelected); - } - - static void EditGpSubmenu(void *data) - { - t_tour *t=data; - CommonGpSubMenu(t, EditGpSelected); - } - - static void CalculateGpSubmenu(void *data) - { - t_tour *t=data; - CommonGpSubMenu(t, CalculateGpSelected); - } - - static void AdminInstructionsGp(void *data) - { - char *s; - const char *fmttext; - (void)data; - - fmttext = txt[GP_INFO_ADMIN]; - s = GetMem(char, strlen(fmttext) + 2*strlen(txt[TOOLS]) + - 2*strlen(txt[GP_TOURNAMENT]) + - strlen(txt[GP_TOURNAMENT_NEW]) + - strlen(txt[GP_TOURNAMENT_EDIT]) + 1); - sprintf(s, fmttext, txt[TOOLS], txt[GP_TOURNAMENT], txt[GP_TOURNAMENT_NEW], txt[TOOLS], txt[GP_TOURNAMENT], txt[GP_TOURNAMENT_EDIT]); - MkDialogue(ADAPTIVE, txt[GP_INSTRUCTIONS_ADMIN], W_FLOATING); - AddTextBox(DOWNLEFT, s, 600, 0, TB_FRAMESINK|TB_LINEFEED_); - AddButton(DOWNLEFT, txt[CLOSE], CloseWin, NULL); - DisplayWin(); - Release(s); - } - - static void UserInstructionsGp(void *data) - { - char *s, *s2; - const char *fmttext, *fmttext2; - (void)data; - - fmttext2 = txt[UPDATE_DB_WITH_RESULTS]; - s2 = GetMem(char, strlen(fmttext2) + strlen(txt[CURRENT_DATA_BASE]) + 1); - fmttext = txt[GP_INFO_USER]; - sprintf(s2, fmttext2, txt[CURRENT_DATA_BASE]); - s = GetMem(char, strlen(fmttext) + - strlen(txt[TOOLS]) + - strlen(txt[PLAYERDB]) + - strlen(txt[CHANGE_DB]) + - strlen(txt[OPEN_DB]) + - strlen(txt[CHOOSE_GP_OF_GROUP]) + - strlen(s2) + - strlen(txt[TOOLS]) + - strlen(txt[PLAYERDB]) + - strlen(txt[TOOLS]) + - strlen(txt[GP_TOURNAMENT]) + - strlen(txt[GP_CALCULATE]) + 1); - sprintf(s, fmttext, - txt[TOOLS], - txt[PLAYERDB], - txt[CHANGE_DB], - txt[OPEN_DB], - txt[CHOOSE_GP_OF_GROUP], - s2, - txt[TOOLS], - txt[PLAYERDB], - txt[TOOLS], - txt[GP_TOURNAMENT], - txt[GP_CALCULATE]); - MkDialogue(ADAPTIVE, txt[GP_INSTRUCTIONS_USER], W_FLOATING); - AddTextBox(DOWNLEFT, s, 600, 0, TB_FRAMESINK|TB_LINEFEED_); - AddButton(DOWNLEFT, txt[CLOSE], CloseWin, NULL); - DisplayWin(); - Release(s); - Release(s2); - } - - static void InstructionsGpSubmenu(void *data) - { - t_tour *t=data; - MkMenuItem(0, txt[GP_INSTRUCTIONS_USER], "", UserInstructionsGp, t); - MkMenuItem(0, txt[GP_INSTRUCTIONS_ADMIN], "", AdminInstructionsGp, t); - } - - static void NewGpSelected(void *data) - { - t_tour *t=data; - - AddGp(t); - } - - #ifdef _SOSS_DEVELOPING - static void DataBaseInspect(void *data) - { - (void)data; - DbView(); - } - #endif - - static void PlayerDbSubMenu(void *data) - { - t_session *session=data; - t_tour *t; - char *s; - char *pdb_full_path; - int id; t = SessionGetCurrentTour(session); ! pdb_full_path = SessionGetFullPathOfLatestPdb(session); ! s = msprintf(txt[UPDATE_DB_WITH_RESULTS], get_filename(pdb_full_path)); ! Release(pdb_full_path); ! id = MkMenuItem(0, s, "", UpdateDbWithResults, t); ! if (t==NULL) ! DeActivate(id); ! Release(s); ! id = MkMenuItem(0, txt[CHANGE_DB], "", ChangeDb, t); ! if (t==NULL) ! DeActivate(id); ! id = MkMenuItem(0, txt[CREATE_NEW_DB], "", CreateNewDbSelected, t); ! if (t==NULL) ! DeActivate(id); ! #ifdef _SOSS_DEVELOPING ! MkMenuItem(0, txt[DATA_BASE_INSPECT], "", DataBaseInspect, NULL); ! #endif ! } ! ! static void GpSubMenu(void *data) ! { ! t_tour *t=data; ! ! MkMenuItem(0, txt[GP_TOURNAMENT_NEW], "", NewGpSelected, t); ! MkMenuItem(1, txt[GP_TOURNAMENT_EDIT], "", EditGpSubmenu, t); ! MkMenuItem(1, txt[GP_TOURNAMENT_DELETE], "", DeleteGpSubmenu, t); ! MkMenuItem(1, txt[GP_CALCULATE], "", CalculateGpSubmenu, t); ! MkMenuItem(1, txt[GP_INSTRUCTIONS], "", InstructionsGpSubmenu, t); } --- 138,151 ---- } ! static void BarCodesDialogWrapper(void *data) { ! t_session *session = data; t_tour *t; int n; t = SessionGetCurrentTour(session); ! if (CbarSettingsDialogue(0, 0, 1, 1, 1, &n)) ! if (n > 0 && t && TourIsStarted(t)) ! StartBarCodeReading(t); } *************** *** 414,418 **** { t_belt *belt=data; - AreaDlg(belt); } --- 153,156 ---- *************** *** 434,443 **** } - static void MainPrintoutsMenuWrapper(void *data) - { - t_session *session=data; - MainWinPrintoutsMenu(SessionGetPrintoutList(session), SessionGetCurrentTour(session)); - } - static void PrintoutsDialogWrapper(void *data) { --- 172,175 ---- *************** *** 446,450 **** } ! extern void Tools(t_session *session) { int id, nrbelts; --- 178,182 ---- } ! extern void MenuTools(t_session *session) { int id, nrbelts; *************** *** 456,469 **** if (t==NULL) DeActivate(id); MkMenuItem(0, txt[ALL_PRINT_OUT_TYPES], "", PrintoutsDialogWrapper, session); - MkMenuItem(1, txt[PRINT_ALL], "", MainPrintoutsMenuWrapper, session); id = MkMenuItem(0, txt[SHOW_ALL_PLAYERS], "", WindowAllPlayers, t); if (t==NULL) DeActivate(id); - MkGroove(); - id = MkMenuItem(1, txt[PLAYERDB], "", PlayerDbSubMenu, session); - id = MkMenuItem(1, txt[GP_TOURNAMENT], "", GpSubMenu, t); - if (t==NULL) - DeActivate(id); if (t==NULL) { id = MkMenuItem(1, txt[AREAS], "", AreaSubMenu, t); --- 188,196 ---- if (t==NULL) DeActivate(id); + MkMenuItem(0, txt[BAR_CODES], "", BarCodesDialogWrapper, session); MkMenuItem(0, txt[ALL_PRINT_OUT_TYPES], "", PrintoutsDialogWrapper, session); id = MkMenuItem(0, txt[SHOW_ALL_PLAYERS], "", WindowAllPlayers, t); if (t==NULL) DeActivate(id); if (t==NULL) { id = MkMenuItem(1, txt[AREAS], "", AreaSubMenu, t); *************** *** 486,491 **** DeActivate(id); - MkGroove(); - MkMenuItem(0, txt[EDIT_TEMPLATES], "", TemplateListWrapper, session); id = MkMenuItem(0, txt[ALL_BACKUPS], "", BackupDlgWrapper, session); if (t==NULL) --- 213,216 ---- Index: winmain.h =================================================================== RCS file: /cvsroot/soss/soss/src/winmain.h,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** winmain.h 13 Oct 2009 18:19:19 -0000 1.12 --- winmain.h 22 Jan 2011 21:43:25 -0000 1.13 *************** *** 25,28 **** --- 25,30 ---- extern void InitLanguage(struct t_session *session); extern void WinMainChangeLanguage(t_winmain *winmain); + extern void OpenStartMessage(t_winmain *winmain); + extern int WinMainIsStartMessageOpen(t_winmain *winmain); #endif Index: gpcalc.c =================================================================== RCS file: /cvsroot/soss/soss/src/gpcalc.c,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** gpcalc.c 12 Aug 2009 19:14:05 -0000 1.18 --- gpcalc.c 22 Jan 2011 21:43:25 -0000 1.19 *************** *** 140,144 **** { t_gphead *gphead = data; ! PrintMenu(SessionGetPrintoutList(TourGetSession(gphead->t)), gphead->t, gphead, NULL, NULL, PD_GRAND_PRIX_TEAM); } --- 140,144 ---- { t_gphead *gphead = data; ! FilteredPrintMenu(SessionGetPrintoutList(TourGetSession(gphead->t)), gphead->t, gphead, NULL, NULL, PD_GRAND_PRIX_TEAM); } *************** *** 310,314 **** { t_gphead *gphead=data; ! PrintMenu(SessionGetPrintoutList(TourGetSession(gphead->t)), gphead->t, gphead, NULL, NULL, PD_GRAND_PRIX); } --- 310,314 ---- { t_gphead *gphead=data; ! FilteredPrintMenu(SessionGetPrintoutList(TourGetSession(gphead->t)), gphead->t, gphead, NULL, NULL, PD_GRAND_PRIX); } Index: labels_en.t =================================================================== RCS file: /cvsroot/soss/soss/src/labels_en.t,v retrieving revision 1.57 retrieving revision 1.58 diff -C2 -d -r1.57 -r1.58 *** labels_en.t 26 Dec 2010 17:16:38 -0000 1.57 --- labels_en.t 22 Jan 2011 21:43:25 -0000 1.58 *************** *** 1397,1401 **** CONFIGURATIONS "~Options" TOOLS "~Tools" ! PRINT_OUTS "~Printouts" ADAPT_MAIN_WINDOW "~Adapt windows" HELP "~Help" --- 1397,1401 ---- CONFIGURATIONS "~Options" TOOLS "~Tools" ! ADVANCED "Advan~ced" ADAPT_MAIN_WINDOW "~Adapt windows" HELP "~Help" Index: lst_pers_group.c =================================================================== RCS file: /cvsroot/soss/soss/src/lst_pers_group.c,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** lst_pers_group.c 24 Nov 2010 20:28:25 -0000 1.14 --- lst_pers_group.c 22 Jan 2011 21:43:25 -0000 1.15 *************** *** 159,163 **** gr = GroupTabGetCurrentSelectedGroup(lst_pers_group->group_tab); if (gr) ! PrintMenu(SessionGetPrintoutList(TourGetSession(gr->t)), gr->t, gr, GenericPlayerListGetPlayers(lst_pers_group->genpl), NULL, PD_GROUP); } --- 159,163 ---- gr = GroupTabGetCurrentSelectedGroup(lst_pers_group->group_tab); if (gr) ! FilteredPrintMenu(SessionGetPrintoutList(TourGetSession(gr->t)), gr->t, gr, GenericPlayerListGetPlayers(lst_pers_group->genpl), NULL, PD_GROUP); } --- NEW FILE: menu_advanced.c --- /* Copyright (C) 2003 Christer Sandberg, see LICENSE.TXT for details ___ ____ ___ ___ / _ \ / __ \ / _ \ / _ \ ( ( \/ / / \ \ ( ( \/ ( ( \/ \ \ | | | | \ \ \ \ \ \ | | | | \ \ \ \ | | | | | | | | | | /\_/ / \ \__/ / /\_/ / /\_/ / \___/ \____/ \___/ \___/ $Id: menu_advanced.c,v 1.1 2011/01/22 21:43:25 chrisan Exp $ menu_advanced.c by Christer Sandberg Contains the advanced-menu */ #include <cgui.h> #include <cgui/mem.h> #include <cgui/clipwin.h> #include <string.h> #include <allegro.h> #include "menu_advanced.h" #include "session.h" #include "tour.h" #include "belt.h" #include "belt_dlg_add.h" #include "bel.h" #include "person.h" #include "group.h" #include "playerdb.h" #include "dbview.h" #include "gpcalc.h" #include "gpconfig.h" #include "sosstext.h" #include "refresh.h" #include "templ_dlg.h" #include "tour_dlg_db.h" static void TemplateListWrapper(void *data) { t_session *session=data; TemplDlg(session); } static void UpdateDbWithResults(void *data) { t_tour *t=data; TourUpdateDbWithAllResults(t); } extern char *SelectDb(t_tour *t) { const char *full_path; const char *pdb_file_name; if (!MakeSenseToChangeDb(t)) { if (!Request("", 0, 400, txt[UNUSUAL_MEASURE_DATA_MY_BE_MIXED_UP_CANCEL_OK], TourGetName(t))) return MkString(""); } full_path = FileSelect("*.pdb", SessionGetWorkDirPath(TourGetSession(t)), FS_SHOW_DIR_TREE|FS_DISABLE_EDIT_DAT|FS_NO_DRAG_DROP|FS_REQUIRE_EXISTING_FILE, txt[SELECT_DB], txt[OPEN_DB]); pdb_file_name = get_filename(full_path); return MkString(pdb_file_name); } static void ChangeDb(void *data) { char *pdb_file_name; t_tour *t=data; if (t) { pdb_file_name = SelectDb(t); if (*pdb_file_name) { if (!TourChangePdb(t, pdb_file_name)) { Req("", txt[INVALID_DATABASE]); } /* Might affect the entire tournament */ ConditionalRefresh(NULL, UPD_TOUR); } } } static void CreateNewDbSelected(void *data) { t_tour *t=data; t_session *session; char *pdb_file_name; session = TourGetSession(t); if (t) { if (Request("", 0, 0, txt[THIS_WILL_CLOSE_THE_CURRENT_EVENT_CANCEL_OK], TourGetName(t))) { SessionCloseTour(session); pdb_file_name = TourDialogPromptUserForNewDatabase(session); if (*pdb_file_name) SessionCreateNewPdb(session, pdb_file_name); Release(pdb_file_name); /* Might affect the entire tournament */ ConditionalRefresh(NULL, UPD_TOUR); } } } typedef struct t_tkpair { t_tour *t; t_pdb_key dbkey; struct t_tkpairh *tkpairh; } t_tkpair; typedef struct t_tkpairh { int n; t_tkpair *tkpair; } t_tkpairh; static void DestroyTkPairHead(t_tkpairh *tkpairh) { Release(tkpairh->tkpair); Release(tkpairh); } static void CalculateGpSelected(void *data) { t_tkpair *tkpair = data; DialogueCalculateGp(tkpair->dbkey, tkpair->t); DestroyTkPairHead(tkpair->tkpairh); } static void EditGpSelected(void *data) { t_tkpair *tkpair = data; DialogueGp(tkpair->dbkey, tkpair->t); DestroyTkPairHead(tkpair->tkpairh); } static void DeleteGpSelected(void *data) { t_tkpair *tkpair = data; DialogueDeleteGp(tkpair->dbkey); DestroyTkPairHead(tkpair->tkpairh); } static void CommonGpSubMenu(t_tour *t, void (*Selected)(void*)) { t_pdb_key dbkey; char *name; t_tkpairh *tkpairh; t_tkpair *tkpair; int n=0; for (dbkey=pdb_getFirstGp(); dbkey!=PDB_NOKEY; dbkey=pdb_getNextGp()) n++; if (n) { tkpairh = GetMem0(t_tkpairh, 1); tkpairh->n = n; tkpairh->tkpair = tkpair = GetMem0(t_tkpair, tkpairh->n); for (dbkey=pdb_getFirstGp(); dbkey!=PDB_NOKEY; dbkey=pdb_getNextGp(), tkpair++) { pdb_getGp(dbkey, &name, NULL, NULL, NULL, NULL,NULL,NULL); tkpair->t = t; tkpair->dbkey = dbkey; tkpair->tkpairh = tkpairh; MkMenuItem(0, name, "", Selected, tkpair); Release(name); } } } static void DeleteGpSubmenu(void *data) { t_tour *t=data; CommonGpSubMenu(t, DeleteGpSelected); } static void EditGpSubmenu(void *data) { t_tour *t=data; CommonGpSubMenu(t, EditGpSelected); } static void CalculateGpSubmenu(void *data) { t_tour *t=data; CommonGpSubMenu(t, CalculateGpSelected); } static void AdminInstructionsGp(void *data) { char *s; const char *fmttext; (void)data; fmttext = txt[GP_INFO_ADMIN]; s = GetMem(char, strlen(fmttext) + 2*strlen(txt[TOOLS]) + 2*strlen(txt[GP_TOURNAMENT]) + strlen(txt[GP_TOURNAMENT_NEW]) + strlen(txt[GP_TOURNAMENT_EDIT]) + 1); sprintf(s, fmttext, txt[TOOLS], txt[GP_TOURNAMENT], txt[GP_TOURNAMENT_NEW], txt[TOOLS], txt[GP_TOURNAMENT], txt[GP_TOURNAMENT_EDIT]); MkDialogue(ADAPTIVE, txt[GP_INSTRUCTIONS_ADMIN], W_FLOATING); AddTextBox(DOWNLEFT, s, 600, 0, TB_FRAMESINK|TB_LINEFEED_); AddButton(DOWNLEFT, txt[CLOSE], CloseWin, NULL); DisplayWin(); Release(s); } static void UserInstructionsGp(void *data) { char *s, *s2; const char *fmttext, *fmttext2; (void)data; fmttext2 = txt[UPDATE_DB_WITH_RESULTS]; s2 = GetMem(char, strlen(fmttext2) + strlen(txt[CURRENT_DATA_BASE]) + 1); fmttext = txt[GP_INFO_USER]; sprintf(s2, fmttext2, txt[CURRENT_DATA_BASE]); s = GetMem(char, strlen(fmttext) + strlen(txt[TOOLS]) + strlen(txt[PLAYERDB]) + strlen(txt[CHANGE_DB]) + strlen(txt[OPEN_DB]) + strlen(txt[CHOOSE_GP_OF_GROUP]) + strlen(s2) + strlen(txt[TOOLS]) + strlen(txt[PLAYERDB]) + strlen(txt[TOOLS]) + strlen(txt[GP_TOURNAMENT]) + strlen(txt[GP_CALCULATE]) + 1); sprintf(s, fmttext, txt[TOOLS], txt[PLAYERDB], txt[CHANGE_DB], txt[OPEN_DB], txt[CHOOSE_GP_OF_GROUP], s2, txt[TOOLS], txt[PLAYERDB], txt[TOOLS], txt[GP_TOURNAMENT], txt[GP_CALCULATE]); MkDialogue(ADAPTIVE, txt[GP_INSTRUCTIONS_USER], W_FLOATING); AddTextBox(DOWNLEFT, s, 600, 0, TB_FRAMESINK|TB_LINEFEED_); AddButton(DOWNLEFT, txt[CLOSE], CloseWin, NULL); DisplayWin(); Release(s); Release(s2); } static void InstructionsGpSubmenu(void *data) { t_tour *t=data; MkMenuItem(0, txt[GP_INSTRUCTIONS_USER], "", UserInstructionsGp, t); MkMenuItem(0, txt[GP_INSTRUCTIONS_ADMIN], "", AdminInstructionsGp, t); } static void NewGpSelected(void *data) { t_tour *t=data; AddGp(t); } #ifdef _SOSS_DEVELOPING static void DataBaseInspect(void *data) { (void)data; DbView(); } #endif static void PlayerDbSubMenu(void *data) { t_session *session=data; t_tour *t; char *s; char *pdb_full_path; int id; t = SessionGetCurrentTour(session); pdb_full_path = SessionGetFullPathOfLatestPdb(session); s = msprintf(txt[UPDATE_DB_WITH_RESULTS], get_filename(pdb_full_path)); Release(pdb_full_path); id = MkMenuItem(0, s, "", UpdateDbWithResults, t); if (t==NULL) DeActivate(id); Release(s); id = MkMenuItem(0, txt[CHANGE_DB], "", ChangeDb, t); if (t==NULL) DeActivate(id); id = MkMenuItem(0, txt[CREATE_NEW_DB], "", CreateNewDbSelected, t); if (t==NULL) DeActivate(id); #ifdef _SOSS_DEVELOPING MkMenuItem(0, txt[DATA_BASE_INSPECT], "", DataBaseInspect, NULL); #endif } static void GpSubMenu(void *data) { t_tour *t=data; MkMenuItem(0, txt[GP_TOURNAMENT_NEW], "", NewGpSelected, t); MkMenuItem(1, txt[GP_TOURNAMENT_EDIT], "", EditGpSubmenu, t); MkMenuItem(1, txt[GP_TOURNAMENT_DELETE], "", DeleteGpSubmenu, t); MkMenuItem(1, txt[GP_CALCULATE], "", CalculateGpSubmenu, t); MkMenuItem(1, txt[GP_INSTRUCTIONS], "", InstructionsGpSubmenu, t); } static void BelongTypeWrapper(void *data) { t_session *session=data; BeltDlgAddMenu(session); } extern void MenuAdvanced(t_session *session) { int id; t_tour *t; t = SessionGetCurrentTour(session); MkMenuItem(1, txt[PLAYERDB], "", PlayerDbSubMenu, session); id = MkMenuItem(1, txt[GP_TOURNAMENT], "", GpSubMenu, t); if (t==NULL) DeActivate(id); MkMenuItem(0, txt[EDIT_TEMPLATES], "", TemplateListWrapper, session); MkMenuItem(0, txt[BELONGING_TYPES], "", BelongTypeWrapper, session); } --- NEW FILE: menu_advanced.h --- #ifndef MENU_ADVANCED_H #define MENU_ADVANCED_H /* Copyright (C) 2003 Christer Sandberg, see LICENSE.TXT for details ___ ____ ___ ___ / _ \ / __ \ / _ \ / _ \ ( ( \/ / / \ \ ( ( \/ ( ( \/ \ \ | | | | \ \ \ \ \ \ | | | | \ \ \ \ | | | | | | | | | | /\_/ / \ \__/ / /\_/ / /\_/ / \___/ \____/ \___/ \___/ $Id: menu_advanced.h,v 1.1 2011/01/22 21:43:25 chrisan Exp $ menu_advanced.h by Christer Sandberg */ struct t_tour; struct t_session; /** Prompts the user to select an existing db. \param t A pointer to the current tournament. \return A pointer to the selected db, possibly an empty string. Memory belongs to the caller. */ extern char *SelectDb(struct t_tour *t); /** Creates a menu providing "advanced" functions. \param session A pointer to this session. */ extern void MenuAdvanced(struct t_session *session); #endif Index: tour_dlg.c =================================================================== RCS file: /cvsroot/soss/soss/src/tour_dlg.c,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** tour_dlg.c 30 Nov 2010 20:50:22 -0000 1.15 --- tour_dlg.c 22 Jan 2011 21:43:25 -0000 1.16 *************** *** 37,40 **** --- 37,41 ---- #include "menu_file.h" #include "menu_tools.h" + #include "menu_advanced.h" #include "winmain.h" #include "tour.h" Index: lst_pers_bel.c =================================================================== RCS file: /cvsroot/soss/soss/src/lst_pers_bel.c,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** lst_pers_bel.c 24 Nov 2010 20:28:25 -0000 1.14 --- lst_pers_bel.c 22 Jan 2011 21:43:25 -0000 1.15 *************** *** 147,151 **** bel = BeltTabGetCurrentSelectedBel(lst_pers_bel->belt_tab); if (bel) { ! PrintMenu(SessionGetPrintoutList(TourGetSession(lst_pers_bel->t)), lst_pers_bel->t, bel, GenericPlayerListGetPlayers(lst_pers_bel->genpl), lst_pers_bel->belt, PD_BEL); } --- 147,151 ---- bel = BeltTabGetCurrentSelectedBel(lst_pers_bel->belt_tab); if (bel) { ! FilteredPrintMenu(SessionGetPrintoutList(TourGetSession(lst_pers_bel->t)), lst_pers_bel->t, bel, GenericPlayerListGetPlayers(lst_pers_bel->genpl), lst_pers_bel->belt, PD_BEL); } Index: winallpl.c =================================================================== RCS file: /cvsroot/soss/soss/src/winallpl.c,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** winallpl.c 1 Aug 2009 16:37:05 -0000 1.17 --- winallpl.c 22 Jan 2011 21:43:25 -0000 1.18 *************** *** 59,63 **** sps = GenericPlayerListGetPlayers(allwr->genpl); if (sps) { ! PrintMenu(SessionGetPrintoutList(TourGetSession(allwr->t)), allwr->t, allwr->t, sps, NULL, PD_ALLPLAYERS); } } --- 59,63 ---- sps = GenericPlayerListGetPlayers(allwr->genpl); if (sps) { ! FilteredPrintMenu(SessionGetPrintoutList(TourGetSession(allwr->t)), allwr->t, allwr->t, sps, NULL, PD_ALLPLAYERS); } } Index: menu_print.h =================================================================== RCS file: /cvsroot/soss/soss/src/menu_print.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** menu_print.h 6 Mar 2005 19:21:11 -0000 1.6 --- menu_print.h 22 Jan 2011 21:43:25 -0000 1.7 *************** *** 29,34 **** extern int GetBelsCommonRound(struct t_belt *belt); extern void DoPrintMain(struct t_po *po, struct t_tour *t, struct t_belt *belt, int round); ! extern void MainWinPrintoutsMenu(struct t_pos *printouts, struct t_tour *t); ! extern void PrintMenu(struct t_pos *printouts, struct t_tour *t, void *data, ARRTYPE(t_sortpl)*sps, struct t_belt *belt, int category); #endif --- 29,50 ---- extern int GetBelsCommonRound(struct t_belt *belt); extern void DoPrintMain(struct t_po *po, struct t_tour *t, struct t_belt *belt, int round); ! ! /** Creates a menu for a specified category of printout types. A specific object is ! the source data of the printout. The object type must match the requested print-out category. ! : data, sps (optional), belt (optional). More precislu the parameter 'belt' is meaningful only ! for printouts directly depending on the belong type, i.e. PD_BEL_LIST, and it can be NULL in case of other categories. ! \param printouts A pointer to the various prinout types ! \param t A pointer to the current tournament. ! \param data A pointer to the data to be used in the print-out. ! \param sps A list of players (optional - only used if the printout concerns players). ! \param belt A belonging type (optional - only used if the printout is depending on the belonging type. ! \param category The print-out type code. */ ! extern void FilteredPrintMenu(struct t_pos *printouts, struct t_tour *t, void *data, ARRTYPE(t_sortpl)*sps, struct t_belt *belt, int category); ! ! /** Creates a print menu. Provides menu items to select printings not related to any specific object, but ! rather print all objects concerning the entire tournament. ! \param printouts A pointer to the various prinout types ! \param t A pointer to the current tournament. */ ! extern void PrintMenu(struct t_pos *printouts, struct t_tour *t); #endif Index: labels_se.t =================================================================== RCS file: /cvsroot/soss/soss/src/labels_se.t,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -d -r1.59 -r1.60 *** labels_se.t 26 Dec 2010 17:16:38 -0000 1.59 --- labels_se.t 22 Jan 2011 21:43:25 -0000 1.60 *************** *** 1409,1413 **** CONFIGURATIONS "~Inställningar" TOOLS "~Verktyg" ! PRINT_OUTS "~Skriv ut" ADAPT_MAIN_WINDOW "A~npassa" HELP "~Hjälp" --- 1409,1413 ---- CONFIGURATIONS "~Inställningar" TOOLS "~Verktyg" ! ADVANCED "Avan~cerat" ADAPT_MAIN_WINDOW "A~npassa" HELP "~Hjälp" Index: menu_print.c =================================================================== RCS file: /cvsroot/soss/soss/src/menu_print.c,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** menu_print.c 20 Jan 2010 19:16:54 -0000 1.23 --- menu_print.c 22 Jan 2011 21:43:25 -0000 1.24 *************** *** 527,534 **** } ! /* This is the menu for a specified category of printout types. As opposed to the main window case a specific data object that is ! the source of the printout is known: data, sps (optional), belt (optional). More precislu the parameter 'belt' is meaningful only ! for printouts directly depending on the belong type, i.e. PD_BEL_LIST, and it can be NULL in case of other categories. */ ! extern void PrintMenu(t_pos *printouts, t_tour *t, void *data, ARRTYPE(t_sortpl) *sps, struct t_belt *belt, int category) { int round; --- 527,531 ---- } ! extern void FilteredPrintMenu(t_pos *printouts, t_tour *t, void *data, ARRTYPE(t_sortpl) *sps, struct t_belt *belt, int category) { int round; *************** *** 545,551 **** } ! /* This is the print menu in the menu bar of the main window. Here the user can select to print things not related to any specific object, but ! rather print all objects concerning the tour. */ ! extern void MainWinPrintoutsMenu(t_pos *printouts, t_tour *t) { char *buf; --- 542,546 ---- } ! extern void PrintMenu(t_pos *printouts, t_tour *t) { char *buf; Index: menu_file.c =================================================================== RCS file: /cvsroot/soss/soss/src/menu_file.c,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** menu_file.c 13 Oct 2009 18:19:19 -0000 1.12 --- menu_file.c 22 Jan 2011 21:43:25 -0000 1.13 *************** *** 40,43 **** --- 40,44 ---- #include "tour_dlg.h" #include "menu_tools.h" + #include "menu_print.h" typedef struct t_tour_wrapper { *************** *** 150,158 **** } ! static void BelongTypeWrapper(void *data) { ! struct t_session *session=data; ! ! BeltDlgAddMenu(session); } --- 151,158 ---- } ! static void CreatePrintSubMenu(void *data) { ! t_session *session=data; ! PrintMenu(SessionGetPrintoutList(session), SessionGetCurrentTour(session)); } *************** *** 272,276 **** DeActivate(id); ! id = MkMenuItem(1, txt[BELONGING_TYPES], "", BelongTypeWrapper, session); MkMenuItem(0, txt[EXIT], "", ExitSoss, session); --- 272,276 ---- DeActivate(id); ! MkMenuItem(1, txt[PRINT_ALL], "", CreatePrintSubMenu, session); MkMenuItem(0, txt[EXIT], "", ExitSoss, session); |
|
From: Christer S. <ch...@us...> - 2011-01-22 21:43:33
|
Update of /cvsroot/soss/soss/misc In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv10963/misc Modified Files: makefile.all Log Message: Added feature 2672459 Index: makefile.all =================================================================== RCS file: /cvsroot/soss/soss/misc/makefile.all,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** makefile.all 11 Nov 2009 08:09:22 -0000 1.38 --- makefile.all 22 Jan 2011 21:43:25 -0000 1.39 *************** *** 97,102 **** --- 97,104 ---- lst_settings.c \ main.c \ + menu_advanced.c \ menu_config.c \ menu_file.c \ + menu_help.c \ menu_print.c \ menu_tools.c \ |
|
From: Christer S. <ch...@us...> - 2011-01-22 21:43:33
|
Update of /cvsroot/soss/soss/docs In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv10963/docs Modified Files: changes._tx soss-en._tx soss-se._tx Log Message: Added feature 2672459 Index: soss-en._tx =================================================================== RCS file: /cvsroot/soss/soss/docs/soss-en._tx,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** soss-en._tx 6 Dec 2009 19:45:17 -0000 1.9 --- soss-en._tx 22 Jan 2011 21:43:25 -0000 1.10 *************** *** 28,32 **** <center><b>SOSS - a chess pairing program</b></center> <center>by Christer Sandberg</center> ! <center>E-mail: <email>chr...@md...</a></center> <center>Homepage: <a href="http://soss.sourceforge.net/">http://soss.sourceforge.net/</a></center> <center><b> --- 28,32 ---- <center><b>SOSS - a chess pairing program</b></center> <center>by Christer Sandberg</center> ! <center>E-mail: <email>rya...@gm...</a></center> <center>Homepage: <a href="http://soss.sourceforge.net/">http://soss.sourceforge.net/</a></center> <center><b> Index: changes._tx =================================================================== RCS file: /cvsroot/soss/soss/docs/changes._tx,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** changes._tx 8 Jan 2011 17:08:33 -0000 1.16 --- changes._tx 22 Jan 2011 21:43:25 -0000 1.17 *************** *** 46,49 **** --- 46,51 ---- <ul> <li> + Added feature 2672459 + <li> Fixed bug 3145372 <li> Index: soss-se._tx =================================================================== RCS file: /cvsroot/soss/soss/docs/soss-se._tx,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** soss-se._tx 6 Dec 2009 19:45:17 -0000 1.9 --- soss-se._tx 22 Jan 2011 21:43:25 -0000 1.10 *************** *** 28,32 **** <center><b>SOSS - Ett schacklottningsprogram</b></center> <center>av Christer Sandberg</center> ! <center>E-post: <email>chr...@md...</a></center> <center>Hemsida: <a href="http://soss.sourceforge.net/">http://soss.sourceforge.net/</a></center> <center><b> --- 28,32 ---- <center><b>SOSS - Ett schacklottningsprogram</b></center> <center>av Christer Sandberg</center> ! <center>E-post: <email>rya...@gm...</a></center> <center>Hemsida: <a href="http://soss.sourceforge.net/">http://soss.sourceforge.net/</a></center> <center><b> |
|
From: SourceForge.net <no...@so...> - 2011-01-08 17:11:10
|
Bugs item #3153378, was opened at 2011-01-08 17:07 Message generated for change (Settings changed) made by chrisan You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=540164&aid=3153378&group_id=74183 Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: Platform independet Group: None >Status: Closed >Resolution: Fixed Priority: 5 Private: No Submitted By: Christer Sandberg (chrisan) Assigned to: Christer Sandberg (chrisan) Summary: Confusing warning when switching to a copied tournament Initial Comment: When switching to a copied tournament a warning is issued that another session may have the tournament open (same warning that appear after a crash). ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=540164&aid=3153378&group_id=74183 |
|
From: Christer S. <ch...@us...> - 2011-01-08 17:08:44
|
Update of /cvsroot/soss/soss/src In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv5767/src Modified Files: tour.c Log Message: Fixed bug 3153378 Index: tour.c =================================================================== RCS file: /cvsroot/soss/soss/src/tour.c,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** tour.c 26 Dec 2010 20:19:18 -0000 1.26 --- tour.c 8 Jan 2011 17:08:34 -0000 1.27 *************** *** 874,881 **** --- 874,883 ---- current_name = MkString(TourGetName(t)); TourSetName(t, dest_tour_name); + t->is_in_progress = 0; TourStore(t); mangled_dir_name = TourDoDuplicateToDisk(t, SessionGetWorkDirPath(t->session), dest_tour_name); Release(mangled_dir_name); TourSetName(t, current_name); + t->is_in_progress = 1; Release(current_name); TourStore(t); |
|
From: Christer S. <ch...@us...> - 2011-01-08 17:08:44
|
Update of /cvsroot/soss/soss/docs In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv5767/docs Modified Files: changes._tx Log Message: Fixed bug 3153378 Index: changes._tx =================================================================== RCS file: /cvsroot/soss/soss/docs/changes._tx,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** changes._tx 26 Dec 2010 20:19:17 -0000 1.15 --- changes._tx 8 Jan 2011 17:08:33 -0000 1.16 *************** *** 61,64 **** --- 61,66 ---- <ul> <li> + Fixed bug 3153378 + <li> Fixed bug 2909737 <li> |
|
From: SourceForge.net <no...@so...> - 2011-01-08 17:07:22
|
Bugs item #3153378, was opened at 2011-01-08 17:07 Message generated for change (Tracker Item Submitted) made by chrisan You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=540164&aid=3153378&group_id=74183 Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: Platform independet Group: None Status: Open Resolution: None Priority: 5 Private: No Submitted By: Christer Sandberg (chrisan) Assigned to: Christer Sandberg (chrisan) Summary: Confusing warning when switching to a copied tournament Initial Comment: When switching to a copied tournament a warning is issued that another session may have the tournament open (same warning that appear after a crash). ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=540164&aid=3153378&group_id=74183 |
|
From: SourceForge.net <no...@so...> - 2010-12-26 20:40:22
|
Bugs item #2599330, was opened at 2009-02-14 11:41 Message generated for change (Comment added) made by chrisan You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=540164&aid=2599330&group_id=74183 Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: Platform independet Group: v7.0 Status: Open Resolution: None Priority: 5 Private: No Submitted By: Rasmus Myklebust (rasmusmyklebust) >Assigned to: Rasmus Myklebust (rasmusmyklebust) Summary: Disable automatic pairing doesn't work when using barcodes Initial Comment: When using a barcode reader to input the last result of a group, the next round is automaticly paired even if automatic pairing is switch off. If the last result is entered with the mouse, the pairing is not automatic. If a confirmation is required for pairing, it is showed but the round is pared even if cancel is selected. ---------------------------------------------------------------------- >Comment By: Christer Sandberg (chrisan) Date: 2010-12-26 20:40 Message: Can you confirm closing this one too? Code reading indicates that it works. ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=540164&aid=2599330&group_id=74183 |
|
From: SourceForge.net <no...@so...> - 2010-12-26 20:25:54
|
Bugs item #715412, was opened at 2003-04-04 17:15 Message generated for change (Comment added) made by chrisan You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=540164&aid=715412&group_id=74183 Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: Platform independet Group: v7.0 Status: Open Resolution: None Priority: 3 Private: No Submitted By: Rasmus Myklebust (rasmusmyklebust) >Assigned to: Rasmus Myklebust (rasmusmyklebust) Summary: Teampoint not immedatley updated Initial Comment: Lag pongen uppdateras inte omedelbart vid inlsning av resultat med streckkod. ---------------------------------------------------------------------- >Comment By: Christer Sandberg (chrisan) Date: 2010-12-26 20:25 Message: Can you confirm if this can be closed? I have a feeling that it has been working for a while. ---------------------------------------------------------------------- Comment By: Christer Sandberg (chrisan) Date: 2009-02-15 17:57 Message: Seems to always show a 0. ---------------------------------------------------------------------- Comment By: Christer Sandberg (chrisan) Date: 2003-04-12 11:20 Message: Logged In: YES user_id=713645 Gller ocks antalet inrapporterade (statusfltet) ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=540164&aid=715412&group_id=74183 |
