Merge branch 'master' of ssh://free-cad.git.sourceforge.net/gitroot/free-cad/free-cad

This commit is contained in:
Yorik van Havre 2012-01-04 12:10:55 -02:00
commit 2c1265f14f
10 changed files with 52 additions and 398 deletions

View File

@ -7,6 +7,40 @@ nodist_libResources_la_SOURCES=\
qrc_Start.cpp
EXTRA_DIST = \
translations/StartPage_af.qm \
translations/StartPage_af.ts \
translations/StartPage_de.qm \
translations/StartPage_de.ts \
translations/StartPage_es.qm \
translations/StartPage_es.ts \
translations/StartPage_fi.qm \
translations/StartPage_fi.ts \
translations/StartPage_fr.qm \
translations/StartPage_fr.ts \
translations/StartPage_hr.qm \
translations/StartPage_hr.ts \
translations/StartPage_hu.qm \
translations/StartPage_hu.ts \
translations/StartPage_it.qm \
translations/StartPage_it.ts \
translations/StartPage_ja.qm \
translations/StartPage_ja.ts \
translations/StartPage_nl.qm \
translations/StartPage_nl.ts \
translations/StartPage_no.qm \
translations/StartPage_no.ts \
translations/StartPage_pl.qm \
translations/StartPage_pl.ts \
translations/StartPage_pt.qm \
translations/StartPage_pt.ts \
translations/StartPage_ru.qm \
translations/StartPage_ru.ts \
translations/StartPage_se.qm \
translations/StartPage_se.ts \
translations/StartPage_uk.qm \
translations/StartPage_uk.ts \
translations/StartPage_zh.qm \
translations/StartPage_zh.ts \
Start.qrc \
UpdateResources.bat

View File

@ -1,69 +0,0 @@
import os,sys,string
import FCFileTools
i=0
for arg in sys.argv:
i=i+1
if (i < len(sys.argv)):
# this only appears if you use a DOS console or if you use a shell then there is no ui-File in this directory
if (sys.argv[i] == "*.ui"):
sys.stdout.write("Wrong parameter: no ui file found")
sys.exit()
# if this file does not exist check the next argument
if not os.path.isfile(sys.argv[i]):
sys.stdout.write("Cannot find file " + sys.argv[i] + "\n")
continue
# file without ".ui" extension
inputFile = sys.argv[i]
inputFile = inputFile[:-3]
inputFileU = inputFile + ".uic"
inputFileH = inputFile + ".h"
inputFileC = inputFile + ".cpp"
#make a copy of the original file
FCFileTools.cpfile(sys.argv[i],inputFileU)
# input file name
file = open(inputFileU)
# read the file...
lines = file.readlines()
# ... and close it immediately
file.close()
sys.stdout.write("Converting " + inputFileU + "... ")
a=0
for line in lines:
# replace special strings
line2 = line
# if succesful go 3 lines back (this should be the correct line)
if (string.find(line2, '_pref</cstring>') != -1):
line3 = lines[a-3]
if (string.find(line3, '<class>Q') != -1):
lines[a-3] = string.replace(line3,'<class>Q','<class>FC')
line3 = lines[a-3]
if (string.find(line3, '</class>') != -1):
lines[a-3] = string.replace(line3,'</class>','Pref</class>')
a=a+1
# write the changes into the original file
out = open(inputFileU,"w");
for line in lines:
# output
out.write(line)
out.close()
sys.stdout.write("done.\n")
# now run the uic (ui compiler)
sys.stdout.write("Make source/header files... ")
os.popen("uic " + inputFileU + " -o " + inputFileH)
os.popen("uic " + inputFileU + " -impl " + inputFileH + " -o " + inputFileC)
sys.stdout.write("done.\n")
os.remove(inputFileU)

View File

@ -1,31 +1,7 @@
# FreeCAD MakeNewBuildNbr script
# (c) 2003 Werner Mayer
#
# Create a new application
#***************************************************************************
#* (c) Werner Mayer (werner.wm.mayer@gmx.de) 2003 *
#* *
#* This file is part of the FreeCAD CAx development system. *
#* *
#* This program is free software; you can redistribute it and/or modify *
#* it under the terms of the GNU Lirary General Public License (LGPL) *
#* as published by the Free Software Foundation; either version 2 of *
#* the License, or (at your option) any later version. *
#* for detail see the LICENCE text file. *
#* *
#* FreeCAD is distributed in the hope that it will be useful, *
#* but WITHOUT ANY WARRANTY; without even the implied warranty of *
#* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
#* GNU Library General Public License for more details. *
#* *
#* You should have received a copy of the GNU Library General Public *
#* License along with FreeCAD; if not, write to the Free Software *
#* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 *
#* USA *
#* *
#* Werner Mayer 2003 *
#***************************************************************************
#! python
# -*- coding: utf-8 -*-
# (c) 2003 Werner Mayer LGPL
# Create a new application module
import os,sys,string
import FCFileTools

View File

@ -1,31 +1,8 @@
#! python
# -*- coding: utf-8 -*-
# (c) 2006 Werner Mayer LGPL
# FreeCAD report memory leaks script to get provide the log file of Visual Studio in more readable file.
# (c) 2006 Werner Mayer
#
#***************************************************************************
#* Copyright (c) 2006 Werner Mayer <werner.wm.mayer@gmx.de> *
#* *
#* This file is part of the FreeCAD CAx development system. *
#* *
#* This program is free software; you can redistribute it and/or modify *
#* it under the terms of the GNU Library General Public License (LGPL) *
#* as published by the Free Software Foundation; either version 2 of *
#* the License, or (at your option) any later version. *
#* for detail see the LICENCE text file. *
#* *
#* FreeCAD is distributed in the hope that it will be useful, *
#* but WITHOUT ANY WARRANTY; without even the implied warranty of *
#* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
#* GNU Library General Public License for more details. *
#* *
#* You should have received a copy of the GNU Library General Public *
#* License along with FreeCAD; if not, write to the Free Software *
#* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 *
#* USA *
#* *
#***************************************************************************
#!/usr/bin/python
import os,sys,string,re
# Open the memory leak file
@ -51,4 +28,4 @@ for line in l:
line = string.replace(line,'Alloc','Leak')
file.write(line)
file.close()

View File

@ -1,34 +1,13 @@
#! python
# -*- coding: utf-8 -*-
# (c) 2006 Werner Mayer LGPL
#
# FreeCAD RevInfo script to get the revision information from Subversion.
# (c) 2006 Werner Mayer
#
# Under Linux the Subversion tool SubWCRev shipped with TortoiseSVN isn't
# available which is provided by this script.
# 2011/02/05: The script was extended to support also Bazaar
#***************************************************************************
#* Copyright (c) 2006 Werner Mayer <werner.wm.mayer@gmx.de> *
#* *
#* This file is part of the FreeCAD CAx development system. *
#* *
#* This program is free software; you can redistribute it and/or modify *
#* it under the terms of the GNU Library General Public License (LGPL) *
#* as published by the Free Software Foundation; either version 2 of *
#* the License, or (at your option) any later version. *
#* for detail see the LICENCE text file. *
#* *
#* FreeCAD is distributed in the hope that it will be useful, *
#* but WITHOUT ANY WARRANTY; without even the implied warranty of *
#* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
#* GNU Library General Public License for more details. *
#* *
#* You should have received a copy of the GNU Library General Public *
#* License along with FreeCAD; if not, write to the Free Software *
#* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 *
#* USA *
#* *
#***************************************************************************
#!/usr/bin/python
import os,sys,string,re,time,getopt
import xml.sax
import xml.sax.handler

View File

@ -1,30 +1,8 @@
#! python
# -*- coding: utf-8 -*-
# (c) 2010 Werner Mayer LGPL
# FreeCAD Python script to work with the FCStd file format.
# (c) 2010 Werner Mayer
#
#***************************************************************************
#* *
#* This file is part of the FreeCAD CAx development system. *
#* *
#* This program is free software; you can redistribute it and/or modify *
#* it under the terms of the GNU General Public License (GPL) *
#* as published by the Free Software Foundation; either version 2 of *
#* the License, or (at your option) any later version. *
#* for detail see the LICENCE text file. *
#* *
#* FreeCAD is distributed in the hope that it will be useful, *
#* but WITHOUT ANY WARRANTY; without even the implied warranty of *
#* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
#* GNU Library General Public License for more details. *
#* *
#* You should have received a copy of the GNU Library General Public *
#* License along with FreeCAD; if not, write to the Free Software *
#* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 *
#* USA *
#* *
#***************************************************************************
#!/usr/bin/python
import os,sys,string
import xml.sax
import xml.sax.handler

View File

@ -1,16 +0,0 @@
import os,sys,string
import FCFileTools
file = sys.argv[1]
input = open(file)
input.close
lines = input.readlines()
output = open(file,"w")
for line in lines:
if (string.find(line, ' if ( strcmp(KParts::DockMainWindow::className(), "KParts::DockMainWindow") != 0 )') != -1):
line = string.replace(line, line, ' if ( strcmp(DockMainWindow::className(), "DockMainWindow") != 0 )\n')
output.write(line)
output.close

View File

@ -1,28 +1,7 @@
#! python
# -*- coding: utf-8 -*-
# (c) 2007 Werner Mayer LGPL
# Create HTML documentation from FreeCAD's Python modules and classes.
# (c) 2007 Werner Mayer
#
#***************************************************************************
#* Copyright (c) 2007 Werner Mayer <werner.wm.mayer@gmx.de> *
#* *
#* This file is part of the FreeCAD CAx development system. *
#* *
#* This program is free software; you can redistribute it and/or modify *
#* it under the terms of the GNU Library General Public License (LGPL) *
#* as published by the Free Software Foundation; either version 2 of *
#* the License, or (at your option) any later version. *
#* for detail see the LICENCE text file. *
#* *
#* FreeCAD is distributed in the hope that it will be useful, *
#* but WITHOUT ANY WARRANTY; without even the implied warranty of *
#* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
#* GNU Library General Public License for more details. *
#* *
#* You should have received a copy of the GNU Library General Public *
#* License along with FreeCAD; if not, write to the Free Software *
#* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 *
#* USA *
#* *
#***************************************************************************
import pydoc, pkgutil, sys, os, dircache, zipfile

View File

@ -1,140 +0,0 @@
# FreeCAD qembed script to embed arbitrary text into an executable
# (c) 2006 Werner Mayer
#
# Creates a C++ header file of arbitrary text files that gets compiled into
# an executable. It's a reimplementation of Qt's qembed tool in Python
#***************************************************************************
#* Copyright (c) 2006 Werner Mayer <werner.wm.mayer@gmx.de> *
#* *
#* This file is part of the FreeCAD CAx development system. *
#* *
#* This program is free software; you can redistribute it and/or modify *
#* it under the terms of the GNU Library General Public License (LGPL) *
#* as published by the Free Software Foundation; either version 2 of *
#* the License, or (at your option) any later version. *
#* for detail see the LICENCE text file. *
#* *
#* FreeCAD is distributed in the hope that it will be useful, *
#* but WITHOUT ANY WARRANTY; without even the implied warranty of *
#* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
#* GNU Library General Public License for more details. *
#* *
#* You should have received a copy of the GNU Library General Public *
#* License along with FreeCAD; if not, write to the Free Software *
#* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 *
#* USA *
#* *
#***************************************************************************
#!/usr/bin/python
import os,sys,string
def convertFileNameToCIdentifier(s):
r = ''
t = s
if (len(t) > 0):
if (t[0].isalpha()==False):
r='_'
t=t[1:]
for i in t:
if (i.isalnum()==False):
i='_'
r=r+i
return r
def embedData(input, output):
i = 0
nbytes=len(input)
s=''
while(i<nbytes):
if (i%14==0):
s=s+"\n "
output.write(s)
s=''
v=ord(input[i])
a=(v >> 4) & 15
b=v&15
s=s+"0x"
s=s+(hex(a))[2]
s=s+(hex(b))[2]
if (i<nbytes-1):
s=s+','
i=i+1
if (len(s)>0):
output.write(s)
if(len(sys.argv) > 4 or len(sys.argv) < 2):
sys.stderr.write("Wrong Parameter\n Usage:\n qembed Infile [Outfile][Identifier]\n")
sys.exit()
file = open(sys.argv[1])
if(len(sys.argv) > 2):
out = open(sys.argv[2],"w");
else:
out = sys.stdout
# Filenamw without path separators
if (len(sys.argv) > 3):
filenm = sys.argv[3]+"_h"
else:
filenm = file.name
p=string.rfind(filenm,'\\')
filenm=filenm[p+1:]
p=string.rfind(filenm,'/')
filenm=filenm[p+1:]
basenm = convertFileNameToCIdentifier(filenm)
define = basenm.upper()
input=file.read()
out.write("#ifndef _"+define+"_\n")
out.write("#define _"+define+"_\n")
out.write("static const unsigned int "+basenm+"_len = "+str(len(input))+";\n")
out.write("static const unsigned char "+basenm+"_data[] = {")
embedData(input,out)
out.write("\n};\n\n")
"""
out.write(
"/* Generated by qembed */\n"
"#include <qcstring.h>\n"
"#include <qdict.h>\n"
"static struct Embed {\n"
" unsigned int size;\n"
" const unsigned char *data;\n"
" const char *name;\n"
"} embed_vec[] = {\n"
" { 74029, "+basenm+"_data, \""+filenm+"\" },\n"
" { 0, 0, 0 }\n"
"};\n"
"\n"
"static const QByteArray& qembed_findData( const char* name )\n"
"{\n"
" static QDict<QByteArray> dict;\n"
" QByteArray* ba = dict.find( name );\n"
" if ( !ba ) {\n"
" for ( int i = 0; embed_vec[i].data; i++ ) {\n"
" if ( strcmp(embed_vec[i].name, name) == 0 ) {\n"
" ba = new QByteArray;\n"
" ba->setRawData( (char*)embed_vec[i].data,\n"
" embed_vec[i].size );\n"
" dict.insert( name, ba );\n"
" break;\n"
" }\n"
" }\n"
" if ( !ba ) {\n"
" static QByteArray dummy;\n"
" return dummy;\n"
" }\n"
" }\n"
" return *ba;\n"
"}\n"
"\n")
"""
out.write("#endif // _"+define+"_\n")

View File

@ -1,44 +0,0 @@
#!/usr/bin/python
import os,sys,string
if(len(sys.argv) < 2):
sys.stdout.write("Convert translation files to source code.\n")
sys.exit()
if(len(sys.argv) > 4):
sys.stderr.write("Wrong Parameter\n Usage:\n tstocpp Infile.ts Outfile Var_name\n")
sys.exit()
file = open(sys.argv[1])
if(len(sys.argv) > 2):
out = open(sys.argv[2],"w");
else:
out = sys.stdout
if(len(sys.argv) > 3):
name = sys.argv[3]
else:
name = "input"
lines = file.readlines()
out.write("\nstd::vector<const char*> " + name + ";\n")
out.write("\nconst std::vector<const char*>& Get" + name + "()\n{\n")
for line in lines:
# remove new line
line2 = string.rstrip(line)
# replace special chars
line2 = string.replace(line2,'\\','\\\\')
line2 = string.replace(line2,'\"','\\\"')
line2 = string.replace(line2,"\'","\\\'")
# output
#out.write(line)
out.write( ' ' + name + '.push_back(\"' + line2 + '\\n\");\n')
out.write(" return " + name + ";\n}\n")