@@ -165,8 +165,7 @@ def make_github(self):
165165
166166 def rename (self ):
167167 self .disable_buttons ()
168- prefix = dvcurator .rename .last_name_prefix (self .citation )
169- t = threading .Thread (target = dvcurator .rename .basic_rename , args = (self .subfolder_path , prefix ))
168+ t = threading .Thread (target = dvcurator .rename .basic_rename , args = (self .subfolder_path , self .citation ))
170169 t .start ()
171170 self .schedule_check (t )
172171
@@ -178,7 +177,7 @@ def convert(self):
178177
179178 def set_metadata (self ):
180179 self .disable_buttons ()
181- t = threading .Thread (target = dvcurator .pdf_metadata .standard_metadata , args = (self .subfolder_path , self .citation [ 'author' ][ 0 ][ 'authorName' ][ 'value' ] ))
180+ t = threading .Thread (target = dvcurator .pdf_metadata .standard_metadata , args = (self .subfolder_path , self .citation ))
182181 t .start ()
183182 self .schedule_check (t )
184183
@@ -201,21 +200,22 @@ def __init__(self, parent, *args, **kwargs):
201200 self .filemenu = tk .Menu (self .menubar , tearoff = False )
202201 self .filemenu .add_command (label = "Open config" , command = self .load_config )
203202 self .filemenu .add_command (label = "Save current config" , command = self .save_config )
204- self .filemenu .add_command (label = "Select project subfolder manually" , command = self .set_subfolder )
205203 self .filemenu .add_command (label = "Exit dvcurator" , command = parent .destroy )
206204 self .menubar .add_cascade (label = "File" , menu = self .filemenu )
207205
208206 self .editmenu = tk .Menu (self .menubar , tearoff = False )
209- self .editmenu .add_command (label = "Open Dropbox subfolder" , command = self .open_explorer )
210207 self .editmenu .add_command (label = "Basic file rename" , command = self .rename )
211208 self .editmenu .add_command (label = "Convert docx to pdf" , command = self .convert )
212209 self .editmenu .add_command (label = "Set PDF metadata" , command = self .set_metadata )
210+ self .editmenu .add_separator ()
211+ self .editmenu .add_command (label = "Open Dropbox subfolder" , command = self .open_explorer )
212+ self .editmenu .add_command (label = "Select project subfolder manually" , command = self .set_subfolder )
213213 self .menubar .add_cascade (label = "Edit" , menu = self .editmenu )
214214 self .menubar .entryconfig ("Edit" , state = tk .DISABLED )
215215 parent .config (menu = self .menubar )
216216
217217 # Checklist of tickets included in the .md files
218- checklist = tk .Frame (self )
218+ checklist = tk .LabelFrame (self , text = "Project issues:" )
219219 if getattr (sys , 'frozen' , False ) and hasattr (sys , '_MEIPASS' ):
220220 self .issues = os .listdir (os .path .join (sys ._MEIPASS , "issues" ))
221221 else :
@@ -230,17 +230,7 @@ def __init__(self, parent, *args, **kwargs):
230230
231231 # Settings
232232 settings = tk .Frame (self )
233- #config_file=tk.StringVar()
234- #config_label = tk.Label(settings, text="Config file: ")
235- #config_options = tk.Frame(settings)
236- #config_entry = tk.Button(config_options, text="Open", command=self.load_config)
237- #config_save = tk.Button(config_options, text="Save", command=self.save_config)
238233
239- #config_label.grid(column=1, row=1)
240- #config_entry.grid(column=1, row=1)
241- #config_save.grid(column=2, row=1)
242- #config_options.grid(column=2, row=1)
243-
244234 self .doi = tk .StringVar ()
245235 doi_label = tk .Label (settings , text = "Persistent ID (DOI): " )
246236 self .doi_entry = tk .Entry (settings , textvariable = self .doi )
@@ -289,7 +279,7 @@ def __init__(self, parent, *args, **kwargs):
289279 self .reset_button .pack ()
290280
291281 settings .grid (column = 1 , row = 1 )
292- checklist .grid (column = 2 , row = 2 )
282+ checklist .grid (column = 2 , row = 2 , padx = 10 )
293283 process .grid (column = 2 , row = 1 )
294284
295285 from tkinter import scrolledtext
@@ -299,15 +289,10 @@ def __init__(self, parent, *args, **kwargs):
299289 sys .stderr = redir
300290 self .out .grid (column = 1 , row = 2 )
301291
302-
303-
304-
305292def main ():
306293 root = tk .Tk ()
307294 root .title ("dvcurator " + dvcurator .version .version )
308295 MainApp (root ).pack (side = "top" , fill = "both" , expand = True )
309-
310-
311296 root .mainloop ()
312297
313298if __name__ == "__main__" :
0 commit comments