0x2620/openmedialibrary
1
0
Fork 0
Code Issues 131 Pull requests Releases Wiki Activity

port to python3

Browse source
This commit is contained in:
j 2014-09-03 00:32:44 +02:00
commit 8e27b9f76e
51 changed files with 272 additions and 248 deletions
Download patch file Download diff file Expand all files Collapse all files

24
oml/ui.py
View file

@ -6,8 +6,8 @@ try:
GObject.threads_init()
use_Gtk = True
except:
from Tkinter import Tk
import tkFileDialog
from tkinter import Tk
import tkinter.filedialog
use_Gtk = False
class GtkUI:
@ -23,16 +23,16 @@ class GtkUI:
if response == Gtk.ResponseType.OK:
filename = dialog.get_filename()
if DEBUG:
print filename, 'selected'
print(filename, 'selected')
elif response == Gtk.ResponseType.CANCEL:
if DEBUG:
print 'Closed, no files selected'
print('Closed, no files selected')
filename = None
dialog.destroy()
while Gtk.events_pending():
Gtk.main_iteration()
if DEBUG:
print "done"
print("done")
return filename
def selectFile(self, data):
@ -47,16 +47,16 @@ class GtkUI:
if response == Gtk.ResponseType.OK:
filename = dialog.get_filename()
if DEBUG:
print filename, 'selected'
print(filename, 'selected')
elif response == Gtk.ResponseType.CANCEL:
if DEBUG:
print 'Closed, no files selected'
print('Closed, no files selected')
filename = None
dialog.destroy()
while Gtk.events_pending():
Gtk.main_iteration()
if DEBUG:
print "done"
print("done")
return filename
class TkUI:
@ -64,10 +64,10 @@ class TkUI:
self.root = Tk()
self.root.withdraw() #hiding tkinter window
def selectFolder(self, data):
return tkFileDialog.askdirectory(title=data.get("title", "Select Folder"))
return tkinter.filedialog.askdirectory(title=data.get("title", "Select Folder"))
def selectFile(self, data):
return tkFileDialog.askopenfilename(title=data.get("title", "Select File"))
return tkinter.filedialog.askopenfilename(title=data.get("title", "Select File"))
if use_Gtk:
ui = GtkUI()
@ -77,6 +77,6 @@ else:
if __name__ == '__main__':
import sys
if len(sys.argv) == 2 and sys.argv[1] == 'folder':
print ui.selectFolder({})
print(ui.selectFolder({}))
else:
print ui.selectFile({})
print(ui.selectFile({}))