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

use native select folder dialog

Browse source
This commit is contained in:
j 2019-01-23 13:37:03 +05:30
parent 1d52413618
commit b2368b9053
6 changed files with 94 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
oml/api.py
View file

@ -35,6 +35,8 @@ def selectFolder(data):
cmd = ['./ctl', 'ui', 'folder']
if sys.platform == 'win32':
cmd = win32_ui('folder')
if 'base' in data:
cmd += [data['base']]
p = subprocess.Popen(cmd, stdout=subprocess.PIPE, close_fds=True)
stdout, stderr = p.communicate()
path = stdout.decode('utf-8').strip()
@ -53,6 +55,8 @@ def selectFile(data):
cmd = ['./ctl', 'ui', 'file']
if sys.platform == 'win32':
cmd = win32_ui('file')
if 'base' in data:
cmd += [data['base']]
p = subprocess.Popen(cmd, stdout=subprocess.PIPE)
stdout, stderr = p.communicate()
path = stdout.decode('utf-8').strip()

46
oml/ui.py
View file

@ -3,8 +3,9 @@
import sys
import os
try:
import gi
gi.require_version('Gtk', '3.0')
from gi.repository import Gtk, GObject
GObject.threads_init()
use_Gtk = True
except:
from tkinter import Tk, PhotoImage
@ -13,13 +14,19 @@ except:
DEBUG = False
def short_home(path):
home = os.path.expanduser('~')
if path and path.startswith(home):
path = path.replace(home, '~')
return path
class GtkUI:
def selectFolder(self, data):
dialog = Gtk.FileChooserDialog(data.get("title", "Select Folder"),
None,
Gtk.FileChooserAction.SELECT_FOLDER,
(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL,
Gtk.STOCK_OPEN, Gtk.ResponseType.OK))
dialog = Gtk.FileChooserDialog(title=data.get("title", "Select Folder"),
action=Gtk.FileChooserAction.SELECT_FOLDER)
dialog.add_buttons(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL,
Gtk.STOCK_OPEN, Gtk.ResponseType.OK)
dialog.set_default_response(Gtk.ResponseType.OK)
response = dialog.run()
@ -36,14 +43,13 @@ class GtkUI:
Gtk.main_iteration()
if DEBUG:
print("done")
return filename
return short_home(filename)
def selectFile(self, data):
dialog = Gtk.FileChooserDialog(data.get("title", "Select File"),
None,
Gtk.FileChooserAction.OPEN,
(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL,
Gtk.STOCK_OPEN, Gtk.ResponseType.OK))
dialog = Gtk.FileChooserDialog(title=data.get("title", "Select File"),
action=Gtk.FileChooserAction.OPEN)
dialog.add_buttons(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL,
Gtk.STOCK_OPEN, Gtk.ResponseType.OK)
dialog.set_default_response(Gtk.ResponseType.OK)
response = dialog.run()
@ -60,7 +66,7 @@ class GtkUI:
Gtk.main_iteration()
if DEBUG:
print("done")
return filename
return short_home(filename)
class TkUI:
@ -77,10 +83,12 @@ class TkUI:
self.root.after_idle(self.root.call, 'wm', 'attributes', '.', '-topmost', False)
def selectFolder(self, data):
return tkinter.filedialog.askdirectory(parent=self.root, title=data.get("title", "Select Folder"))
folder = tkinter.filedialog.askdirectory(parent=self.root, title=data.get("title", "Select Folder"))
return short_home(folder)
def selectFile(self, data):
return tkinter.filedialog.askopenfilename(parent=self.root, title=data.get("title", "Select File"))
filename = tkinter.filedialog.askopenfilename(parent=self.root, title=data.get("title", "Select File"))
return short_home(filename)
if use_Gtk:
@ -89,8 +97,12 @@ else:
ui = TkUI()
if __name__ == '__main__':
import sys
if len(sys.argv) == 2 and sys.argv[1] == 'folder':
base = '~'
if len(sys.argv) >= 3:
base = sys.argv[2]
base = os.path.expanduser(base)
os.chdir(base)
if len(sys.argv) >= 2 and sys.argv[1] == 'folder':
print(ui.selectFolder({}))
else:
print(ui.selectFile({}))

19
static/js/importExportDialog.js
View file

@ -217,14 +217,7 @@ oml.ui.importExportDialog = function() {
var $element = Ox.Element(),
$form = Ox.Form({
items: selected == 'import' ? [
Ox.Input({
autocomplete: function(value, callback) {
oml.api.autocompleteFolder({path: value}, function(result) {
callback(result.data.items);
});
},
autocompleteSelect: true,
changeOnKeypress: true,
oml.ui.selectFolder({
id: 'path',
label: 'Source Path',
labelWidth: 128,
@ -256,14 +249,7 @@ oml.ui.importExportDialog = function() {
width: 480
})
] : [
Ox.Input({
autocomplete: function(value, callback) {
oml.api.autocompleteFolder({path: value}, function(result) {
callback(result.data.items);
});
},
autocompleteSelect: true,
changeOnKeypress: true,
oml.ui.selectFolder({
id: 'path',
label: 'Destination Path',
labelWidth: 128,
@ -296,6 +282,7 @@ oml.ui.importExportDialog = function() {
.bindEvent({
change: function(data) {
var values = $form.values();
console.log(values)
$activityButton[selected].options({
disabled: !values.path
});

24
static/js/preferencesPanel.js
View file

@ -25,24 +25,14 @@ oml.ui.preferencesPanel = function() {
{
id: 'libraryPath',
title: 'Library Path',
autocomplete: function(value, callback) {
oml.api.autocompleteFolder({path: value}, function(result) {
callback(result.data.items);
});
},
autocompleteSelect: true,
type: 'selectfolder',
value: preferences.libraryPath,
help: 'The directory in which your "Books" folder is located. This is where your media files are stored. It can be on your local machine, but just as well on an external drive or networked volume.'
},
{
id: 'importPath',
title: 'Import Path',
autocomplete: function(value, callback) {
oml.api.autocompleteFolder({path: value}, function(result) {
callback(result.data.items);
});
},
autocompleteSelect: true,
type: 'selectfolder',
value: preferences.importPath,
help: 'Any media files that you put in this folder will be added to your library. Once added, they will be removed from this folder.'
}
@ -347,6 +337,15 @@ oml.ui.preferencesPanel = function() {
value: item.value,
width: 384
})
: item.type == 'selectfolder'
? oml.ui.selectFolder({
label: Ox._(item.title),
labelWidth: 128,
placeholder: item.placeholder || '',
style: 'squared',
title: oml.user.preferences[item.id] || item.value || '',
width: 384 - !!item.unit * 48
})
: Ox.Input({
autocomplete: item.autocomplete || null,
autocompleteSelect: item.autocompleteSelect || false,
@ -357,7 +356,6 @@ oml.ui.preferencesPanel = function() {
value: oml.user.preferences[item.id] || item.value || '',
width: 384 - !!item.unit * 48
})
].concat(item.unit ? [
Ox.Label({
overlap: 'left',

46
static/js/selectFolder.js Normal file
View file

@ -0,0 +1,46 @@
'use strict';
oml.ui.selectFolder = function(options, self) {
options.width = options.width - options.labelWidth
options = Ox.extend({
title: '...',
textAlign: 'left'
}, options);
var $button = Ox.Button(options, self).bindEvent({
click: function(event) {
oml.api.selectFolder({
base: $button.value()
}, function(result) {
if (result.data.path) {
$button.value(result.data.path);
$button.options({
title: result.data.path
});
$button.triggerEvent('change', result.data.path);
}
})
}
}),
that = Ox.FormElementGroup({
id: options.id,
elements: [
Ox.Label({
style: options.style,
textAlign: 'right',
overlap: 'right',
title: options.label,
width: options.labelWidth
}),
$button
],
}, self);
that.value = function() {
return $button.value()
}
if (options.title && options.title != '...') {
$button.value(options.title)
}
return that;
}

1
static/json/js.json
View file

@ -58,6 +58,7 @@
"rightPanel.js",
"sectionButtons.js",
"sectionbar.js",
"selectFolder.js",
"sortElement.js",
"statusIcon.js",
"statusbar.js",