diff --git a/__pycache__/h2inc.cpython-35.pyc b/__pycache__/h2inc.cpython-35.pyc index 6a5035f..516138e 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 index 11f2988..cf7859b 100644 Binary files a/__pycache__/h2inc_gui.cpython-35.pyc and b/__pycache__/h2inc_gui.cpython-35.pyc differ diff --git a/h2inc_gui.py b/h2inc_gui.py index 695d0c3..6566592 100644 --- a/h2inc_gui.py +++ b/h2inc_gui.py @@ -7,7 +7,7 @@ from tkinter import Tk, ttk, Label, Button, LabelFrame from tkinter import filedialog, Entry, Checkbutton -from tkinter import Grid, StringVar +from tkinter import Grid, StringVar, DoubleVar from tkinter import N, E, S, W from tkinter import DISABLED, NORMAL from os import errno @@ -22,6 +22,9 @@ class h2incGUI: self.sourcedir = StringVar() self.destdir = StringVar() self.addinc = StringVar() + self.cfilevar = 0 + self.totalvar = 0 + self.filecnt = 0 self.infofolder = 'Number of folders: 0' self.infofile = 'Number of headers: 0' self.currentfile = 'Current file: ' @@ -94,6 +97,7 @@ class h2incGUI: self.cfileprogress = ttk.Progressbar(self.progressframe, orient='horizontal', mode='determinate') self.cfileprogress.grid(row=7, column=0, columnspan=3, sticky=N+S+E+W, padx=5, pady=5) + self.cfileprogress.config(variable=self.cfilevar, maximum=3) self.totallabel = Label(self.progressframe, text=self.totprogress) self.totallabel.grid(row=8, column=0, sticky=W, padx=5, pady=5) @@ -101,6 +105,7 @@ class h2incGUI: self.totalprogress = ttk.Progressbar(self.progressframe, orient='horizontal', mode='determinate') self.totalprogress.grid(row=9, column=0, columnspan=3, sticky=N+S+E+W, padx=5, pady=5) + self.totalprogress.config(variable=self.totalvar, maximum=self.filecnt) def select_sourcedir(self, sourcedir): root.directory = os.path.abspath(filedialog.askdirectory()) @@ -116,6 +121,7 @@ class h2incGUI: self.destdir_button.config(state=NORMAL) self.infofiles.config(text=tempstr) self.totallabel.config(text=temptot) + self.filecnt = filecnt foldercnt = sourcedir_foldercnt(root.directory) if foldercnt > 0: tempstr = 'Number of folders: '+str(foldercnt) @@ -149,6 +155,8 @@ class h2incGUI: print ('Destination directory: ', destdir.get()) process_files(sourcedir, destdir) + def cfileprogress_update(cnt): + self.cfilevar = cnt root = Tk() root.update()