Index: src/attach.c ================================================================== --- src/attach.c +++ src/attach.c @@ -270,25 +270,25 @@ db_end_transaction(0); cgi_redirect(zFrom); } style_header("Add Attachment"); @

Add Attachment To %s(zTargetType)

- @
+ @
@ File to Attach: - @
+ @
@ Description:
- @
+ @
if( zTkt ){ - @ - }else{ - @ - } - @ - @ - @ - @ + @ + }else{ + @ + } + @ + @ + @ + @
style_footer(); } /* @@ -349,21 +349,21 @@ manifest_crosslink(rid, &manifest); db_end_transaction(0); cgi_redirect(zFrom); } style_header("Delete Attachment"); - @
+ @
@

Confirm that you want to delete the attachment named @ "%h(zFile)" on %s(zTkt?"ticket":"wiki page") %h(zTarget):
if( zTkt ){ - @ - }else{ - @ - } - @ - @ - @ - @ - @

+ @ + }else{ + @ + } + @ + @ + @ + @ + @
style_footer(); } Index: src/cgi.c ================================================================== --- src/cgi.c +++ src/cgi.c @@ -42,10 +42,13 @@ #endif #include #include #include #include +#if defined (__POCC__) +# undef INTERFACE +#endif #include "cgi.h" #if INTERFACE /* ** Shortcuts for cgi_parameter. P("x") returns the value of query parameter Index: src/config.h ================================================================== --- src/config.h +++ src/config.h @@ -36,12 +36,12 @@ #include #include #include #include #include -#if defined( __MINGW32__) || defined(__DMC__) || defined(_MSC_VER) -# if defined(__DMC__) || defined(_MSC_VER) +#if defined( __MINGW32__) || defined(__DMC__) || defined(_MSC_VER) || defined(__POCC__) +# if defined(__DMC__) || defined(_MSC_VER) || defined(__POCC__) typedef int socklen_t; # endif # ifndef _WIN32 # define _WIN32 # endif Index: src/info.c ================================================================== --- src/info.c +++ src/info.c @@ -1306,12 +1306,14 @@ { "#d0c0ff", "#d0c0ff" }, { "#ffc0ff", "#ffc0ff" }, { "#ffc0d0", "#ffc0d0" }, { "#fff0c0", "#fff0c0" }, { "#c0c0c0", "#c0c0c0" }, + { "custom", "##" }, }; - int nColor = sizeof(aColor)/sizeof(aColor[0]); + int nColor = sizeof(aColor)/sizeof(aColor[0])-1; + int stdClrFound; int i; login_check_credentials(); if( !g.okWrite ){ login_needed(); return; } rid = name_to_rid(P("r")); @@ -1332,10 +1334,12 @@ if( zDate==0 ) fossil_redirect_home(); zNewDate = PD("dt",zDate); zColor = db_text("", "SELECT bgcolor" " FROM event WHERE objid=%d", rid); zNewColor = PD("clr",zColor); + if (strcmp(zNewColor,aColor[nColor].zColor)==0) + zNewColor = P("clrcust"); fPropagateColor = P("pclr")!=0; zNewTagFlag = P("newtag") ? " checked" : ""; zNewTag = PD("tagname",""); zNewBrFlag = P("newbr") ? " checked" : ""; zNewBranch = PD("brname",""); @@ -1474,66 +1478,81 @@ @
blob_reset(&suffix); } @

Make changes to attributes of check-in @ [%s(zUuid)]:

- @
+ @
login_insert_csrf_secret(); - @ + @ @ @ @ @ @ @ @ @ @ @ @ @ @ if( is_a_leaf(rid) && !db_exists("SELECT 1 FROM tagxref " " WHERE tagid=%d AND rid=%d AND tagtype>0", TAG_CLOSED, rid) ){ @ @ } @ @
User: - @ + @ @
Comment: @ @
Check-in Time: - @ + @ @
Background Color: - @ + @
@ + @ Propagate color to descendants @ - for(i=0; i }else{ @ + @ %h(aColor[i].zCName) if( (i%6)==5 && i+1 } } + @ + if (stdClrFound){ + @ @ @
if( fPropagateColor ){ - @ + @ }else{ - @ + @ } - @ Propagate color to descendants
} if( strcmp(zNewColor, aColor[i].zColor)==0 ){ - @ + @ + stdClrFound=1; }else{ - @ + @ } - @ %h(aColor[i].zCName)
+ @ + }else{ + @ + @ + } + @ %h(aColor[i].zCName)  + @ + @
@
Tags: - @ + @ @ Add the following new tag name to this check-in: - @ + @ db_prepare(&q, "SELECT tag.tagid, tagname FROM tagxref, tag" " WHERE tagxref.rid=%d AND tagtype>0 AND tagxref.tagid=tag.tagid" " ORDER BY CASE WHEN tagname GLOB 'sym-*' THEN substr(tagname,5)" " ELSE tagname END", @@ -1543,13 +1562,13 @@ int tagid = db_column_int(&q, 0); const char *zTagName = db_column_text(&q, 1); char zLabel[30]; sprintf(zLabel, "c%d", tagid); if( P(zLabel) ){ - @
+ @
}else{ - @
+ @
} if( strncmp(zTagName, "sym-", 4)==0 ){ @ Cancel tag %h(&zTagName[4]) }else{ @ Cancel special tag %h(zTagName) @@ -1558,33 +1577,33 @@ db_finalize(&q); @
Branching: - @ + @ @ Make this check-in the start of a new branch named: - @ + @ @
Leaf Closure: - @ + @ @ Mark this leaf as "closed" so that it no longer appears on the @ "leaves" page and is no longer labeled as a "Leaf". @
- @ - @ - @ + @ + @ + @ @
- @ + @
style_footer(); } Index: src/report.c ================================================================== --- src/report.c +++ src/report.c @@ -328,11 +328,11 @@ zTitle = db_text(0, "SELECT title FROM reportfmt " "WHERE rn=%d", rn); if( zTitle==0 ) cgi_redirect("reportlist"); style_header("Are You Sure?"); - @
+ @ @

You are about to delete all traces of the report @ %h(zTitle) from @ the database. This is an irreversible operation. All records @ related to this report will be removed and cannot be recovered.

@ @@ -399,24 +399,24 @@ } style_header(rn>0 ? "Edit Report Format":"Create New Report Format"); if( zErr ){ @
%h(zErr)
} - @ - @ + @
+ @ @

Report Title:
- @

+ @

@

Enter a complete SQL query statement against the "TICKET" table:
@ @

login_insert_csrf_secret(); if( g.okAdmin ){ @

Report owner: - @ + @ @

} else { - @ + @ } @

Enter an optional color key in the following box. (If blank, no @ color key is displayed.) Each line contains the text for a single @ entry in the key. The first token of each line is the background @ color for that line.
@@ -428,15 +428,15 @@ @

report_format_hints(); style_footer(); return; } - @ + @ if( rn>0 ){ - @ + @ } - @ + @
report_format_hints(); style_footer(); } /* @@ -478,17 +478,17 @@ @

In this example, the first column in the result set is named @ "bgcolor". The value of this column is not displayed. Instead, it @ selects the background color of each row based on the TICKET.STATUS @ field of the database. The color key at the right shows the various @ color codes.

- @ - @ - @ - @ - @ - @ - @ + @
new or active
review
fixed
tested
defer
closed
+ @ + @ + @ + @ + @ + @ @
new or active
review
fixed
tested
defer
closed
@
   @ SELECT
   @   CASE WHEN status IN ('new','active') THEN '#f2dcdc'
   @        WHEN status='review' THEN '#e8e8bd'
@@ -510,16 +510,16 @@
   @ FROM ticket
   @ 
@

To base the background color on the TICKET.PRIORITY or @ TICKET.SEVERITY fields, substitute the following code for the @ first column of the query:

- @ - @ - @ - @ - @ - @ + @
1
2
3
4
5
+ @ + @ + @ + @ + @ @
1
2
3
4
5
@
   @ SELECT
   @   CASE priority WHEN 1 THEN '#f2dcdc'
   @        WHEN 2 THEN '#e8e8bd'

Index: src/skins.c
==================================================================
--- src/skins.c
+++ src/skins.c
@@ -830,11 +830,11 @@
     const char *zN = db_column_text(&q, 0);
     const char *zV = db_column_text(&q, 1);
     if( strcmp(zV, zCurrent)==0 ){
       @ 
  • %h(zN).   Currently In Use

    }else{ - @
  • + @
  • @ %h(zN).   @ @ @ @
  • Index: src/style.c ================================================================== --- src/style.c +++ src/style.c @@ -649,10 +649,36 @@ { "span.tktError", "format for ticket error messages", @ color: red; @ font-weight: bold; }, + { "table.rpteditex", + "format for example tables on the report edit page", + @ float: right; + @ margin: 0; + @ padding: 0; + @ width: 125px; + @ text-align: center; + @ border-collapse: collapse; + @ border-spacing: 0; + }, + { "td.rpteditex", + "format for example table cells on the report edit page", + @ border-width: thin; + @ border-color: #000000; + @ border-style: solid; + }, + { "input.checkinUserColor", + "format for user color input on checkin edit page", + @ # no special definitions, class defined, to enable color pickers, f.e.: + @ # add the color picker found at http:jscolor.com as java script include + @ # to the header and configure the java script file with + @ # 1. use as bindClass :checkinUserColor + @ # 2. change the default hash adding behaviour to ON + @ # or change the class defition of element identified by id="clrcust" + @ # to a standard jscolor definition with java script in the footer. + }, { 0, 0, 0 } }; Index: src/wiki.c ================================================================== --- src/wiki.c +++ src/wiki.c @@ -533,22 +533,22 @@ wiki_convert(&preview, 0, 0); @
    blob_reset(&preview); } zUser = PD("u", g.zLogin); - @
    + @ login_insert_csrf_secret(); - @ + @ @ Your Name: - @
    + @
    @ Comment to append:
    @ @
    - @ - @ - @ + @ + @ + @ @
    style_footer(); } /* ADDED win/Makefile.PellesCGMake Index: win/Makefile.PellesCGMake ================================================================== --- /dev/null +++ win/Makefile.PellesCGMake @@ -0,0 +1,118 @@ +# ########################################################################### +# +# HowTo +# ----- +# +# This is a Makefile to compile fossil with PellesC from +# http://www.smorgasbordet.com/pellesc/index.htm +# In addition to the Compiler envrionment, you need +# gmake from http://sourceforge.net/projects/unxutils/, Pelles make version +# couldn't handle the complex dependencies in this build +# zlib sources +# Then you do +# 1. create a directory PellesC in the project root directory +# 2. Change the variables PellesCDir/ZLIBSRCDIR to the path of your installation +# 3. open a dos prompt window and change working directory into PellesC (step 1) +# 4. run gmake -f ..\win\Makefile.PellesCGMake +# +# this file is tested with +# PellesC 5.00.13 +# gmake 3.80 +# zlib sources 1.2.5 +# Windows XP SP 2 +# +# ########################################################################### + +# +PellesCDir=c:\Programme\PellesC + +B=.. +SRCDIR=$(B)/src/ +WINDIR=$(B)/win/ +ZLIBSRCDIR=E:/Profile/Ratte/data/organize/fossil-w32/zlib/ + +LINK=$(PellesCDir)/bin/polink.exe +LIB=$(PellesCDir)\Lib\Win;$(PellesCDir)\Lib +LINKFLAGS=-machine:ix86 -subsystem:console /LIBPATH:$(PellesCDir)\lib /LIBPATH:$(PellesCDir)\lib\win kernel32.lib advapi32.lib delayimp.lib Wsock32.lib Crtmt.lib + +CC=$(PellesCDir)\bin\pocc.exe +DEFINES=-DFOSSIL_I18N=0 -Dstrncasecmp=memicmp -Dstrcasecmp=stricmp +CCFLAGS=-Tx86-coff -Ot -W1 -Gd -Go /Ze $(DEFINES) +INCLUDE=/I $(PellesCDir)\Include\Win /I $(PellesCDir)\Include /I $(ZLIBSRCDIR) /I $(SRCDIR) + +UTILS=translate.exe mkindex.exe makeheaders.exe +UTILS_OBJ=$(UTILS:.exe=.obj) + +SRC=add.c allrepo.c attach.c bag.c blob.c branch.c browse.c captcha.c cgi.c checkin.c checkout.c clearsign.c clone.c comformat.c configure.c content.c db.c delta.c deltacmd.c descendants.c diff.c diffcmd.c doc.c encode.c file.c finfo.c graph.c http.c http_socket.c http_ssl.c http_transport.c info.c login.c main.c manifest.c md5.c merge.c merge3.c name.c pivot.c popen.c pqueue.c printf.c rebuild.c report.c rss.c schema.c search.c setup.c sha1.c shun.c skins.c stat.c style.c sync.c tag.c th_main.c timeline.c tkt.c tktsetup.c undo.c update.c url.c user.c verify.c vfile.c wiki.c wikiformat.c winhttp.c xfer.c zip.c +ORIGSRC=$(foreach sf,$(SRC),$(SRCDIR)$(sf)) +TRANSLATEDSRC=$(SRC:.c=_.c) +TRANSLATEDOBJ=$(TRANSLATEDSRC:.c=.obj) + +SQLITESRC=sqlite3.c +ORIGSQLITESRC=$(foreach sf,$(SQLITESRC),$(SRCDIR)$(sf)) +SQLITEOBJ=$(foreach sf,$(SQLITESRC),$(sf:.c=.obj)) +SQLITEDEFINES=-DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 + +THSRC=th.c th_lang.c +ORIGTHSRC=$(foreach sf,$(THSRC),$(SRCDIR)$(sf)) +THOBJ=$(foreach sf,$(THSRC),$(sf:.c=.obj)) + +ZLIBSRC=adler32.c compress.c crc32.c deflate.c gzclose.c gzlib.c gzread.c gzwrite.c infback.c inffast.c inflate.c inftrees.c trees.c uncompr.c zutil.c +ORIGZLIBSRC=$(foreach sf,$(ZLIBSRC),$(ZLIBSRCDIR)$(sf)) +ZLIBOBJ=$(foreach sf,$(ZLIBSRC),$(sf:.c=.obj)) + +APPLICATION=fossil.exe + +.PHONY: default +default: headers $(APPLICATION) + +$(UTILS): %.exe: %.obj + $(LINK) $(LINKFLAGS) -out:"$@" $< + +$(UTILS_OBJ): %.obj: $(SRCDIR)%.c + $(CC) $(CCFLAGS) $(INCLUDE) "$<" -Fo"$@" + +$(TRANSLATEDSRC): %_.c: $(SRCDIR)%.c translate.exe + translate.exe $< >$@ + +page_index.h: $(TRANSLATEDSRC) mkindex.exe + mkindex.exe $(TRANSLATEDSRC) >$@ + +version.exe: version.obj + $(LINK) $(LINKFLAGS) -out:"$@" $< + +version.obj: $(WINDIR)version.c + $(CC) $(CCFLAGS) $(INCLUDE) "$<" -Fo"$@" + +VERSION.h: version.exe ..\manifest.uuid ..\manifest + version.exe ..\manifest.uuid ..\manifest > $@ + +headers: makeheaders.exe page_index.h VERSION.h ../src/sqlite3.h ../src/th.h VERSION.h + makeheaders.exe $(foreach ts,$(TRANSLATEDSRC),$(ts):$(ts:_.c=.h)) ../src/sqlite3.h ../src/th.h VERSION.h + echo Done >$@ + +$(TRANSLATEDOBJ): %_.obj: %_.c %.h + $(CC) $(CCFLAGS) $(INCLUDE) "$<" -Fo"$@" + +$(SQLITEOBJ): %.obj: $(SRCDIR)%.c $(SRCDIR)%.h + $(CC) $(CCFLAGS) $(SQLITEDEFINES) $(INCLUDE) "$<" -Fo"$@" + +$(THOBJ): %.obj: $(SRCDIR)%.c $(SRCDIR)th.h + $(CC) $(CCFLAGS) $(INCLUDE) "$<" -Fo"$@" + +$(ZLIBOBJ): %.obj: $(ZLIBSRCDIR)%.c + $(CC) $(CCFLAGS) $(INCLUDE) "$<" -Fo"$@" + +$(APPLICATION): $(TRANSLATEDOBJ) $(SQLITEOBJ) $(THOBJ) $(ZLIBOBJ) headers + $(LINK) $(LINKFLAGS) -out:"$@" $(TRANSLATEDOBJ) $(SQLITEOBJ) $(THOBJ) $(ZLIBOBJ) + +.PHONY: clean +clean: + del /F *.obj + del /F *.c + del /F *.h headers + +.PHONY: clobber +clobber: clean + del /F *.exe +