diff --git a/__pycache__/h2inc.cpython-35.pyc b/__pycache__/h2inc.cpython-35.pyc index 7f60d3d..df2ba25 100644 Binary files a/__pycache__/h2inc.cpython-35.pyc and b/__pycache__/h2inc.cpython-35.pyc differ diff --git a/__pycache__/h2inc_gui.cpython-35.pyc b/__pycache__/h2inc_gui.cpython-35.pyc new file mode 100644 index 0000000..ddb1a91 Binary files /dev/null and b/__pycache__/h2inc_gui.cpython-35.pyc differ diff --git a/__pycache__/h2inc_parser.cpython-35.pyc b/__pycache__/h2inc_parser.cpython-35.pyc index 9ea7503..cc5137d 100644 Binary files a/__pycache__/h2inc_parser.cpython-35.pyc and b/__pycache__/h2inc_parser.cpython-35.pyc differ diff --git a/h2inc.py b/h2inc.py index 13372b1..62fca37 100644 --- a/h2inc.py +++ b/h2inc.py @@ -10,6 +10,10 @@ import sys from h2inc_parser import parseline, parseparsed import h2inc_gui +tupline = [] +preproc = () +outfile = '' +folders = [] cnt = 0 def sourcedir_filecnt(sourcedir): @@ -24,6 +28,7 @@ def sourcedir_filecnt(sourcedir): def sourcedir_foldercnt(sourcedir): ### Return the number of folders, if it contains '*.h' files, in sourcedir - including subdirectories ### global cnt + global folders for folderName, subfolders, files in os.walk(sourcedir): if subfolders: for subfolder in subfolders: @@ -32,4 +37,17 @@ def sourcedir_foldercnt(sourcedir): if tempf: cnt = cnt+1 print(folderName) - return cnt \ No newline at end of file + folders += [folderName] + print(folders) + return cnt + +def process_files(sourcedir, destdir): + WorkPath = os.path.dirname(sourcedir) + print(WorkPath) + incpath = destdir + print(incpath) + if not os.path.exists(incpath): + os.makedirs(incpath) + pattern = '.h' + inputfile = 'gtkaboutdialog.h' + filehandle = open(WorkPath+'/'+inputfile, 'r') \ No newline at end of file diff --git a/h2inc_gui.py b/h2inc_gui.py index 2c438a3..8cdafef 100644 --- a/h2inc_gui.py +++ b/h2inc_gui.py @@ -80,7 +80,7 @@ class h2incGUI: self.infofiles.grid(row=1, column=0, sticky=W, padx=5, pady=5) self.infofiles.config(state=DISABLED) - self.translate_button = Button(self.transframe, text="Translate!", command= lambda: self.translate(self.destdir, self.addinc)) + self.translate_button = Button(self.transframe, text="Translate!", command= lambda: self.translate(self.destdir, self.sourcedir, self.addinc)) self.translate_button.grid(row=3, column=0, sticky=W, padx=5, pady=5) self.translate_button.config(state=DISABLED) @@ -133,7 +133,7 @@ class h2incGUI: self.cfilelabel.config(state=NORMAL) self.totallabel.config(state=NORMAL) - def translate(self, destdir, addinc): + def translate(self, destdir, sourcedir, addinc): doinc = addinc.get() dest = destdir.get() if doinc == 'yes': diff --git a/h2inc_parser.py b/h2inc_parser.py index 7cca453..c6fc246 100644 --- a/h2inc_parser.py +++ b/h2inc_parser.py @@ -11,7 +11,7 @@ import string #Creates a list of elements per line in file, #then adding this list as a single element in a global tuple def parseline(lines): - tupline = []; + tupline = [] word = [w for w in lines.split()] for w in word: if w in hdr_keywords: @@ -22,7 +22,7 @@ def parseline(lines): def parseparsed(tup): global multilinecomment - parsedline = ''; + parsedline = '' if len(tup)>0: if tup[0] == ELEMENT_TYPE_COMMENT_START: if tup[-1] == ELEMENT_TYPE_COMMENT_END: