codex-storage
/
deluge
mirror of https://github.com/codex-storage/deluge.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove gtkui specific func from path_chooser_common

This commit is contained in:
Calum Lind 2014-09-19 13:20:09 +01:00
parent 6e0e01225e
commit 09c6e0cb5c
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
deluge/path_chooser_common.py
View File

@ -11,11 +11,6 @@
import os
def get_resource(filename):
import deluge
return deluge.common.resource_filename("deluge.ui.gtkui", os.path.join("glade", filename))
def is_hidden(filepath):
def has_hidden_attribute(filepath):
import win32api

7
deluge/ui/gtkui/path_combo_chooser.py
View File

@ -16,7 +16,8 @@ import gobject
import gtk
from gtk import gdk, keysyms
from deluge.path_chooser_common import get_completion_paths, get_resource
from deluge.common import resource_filename
from deluge.path_chooser_common import get_completion_paths
def is_ascii_value(keyval, ascii_key):
@ -1036,7 +1037,9 @@ class PathChooserComboBox(gtk.HBox, StoredValuesPopup, gobject.GObject):
self.setting_accelerator_key = False
self.builder = gtk.Builder()
self.popup_buttonbox = self.builder.get_object("buttonbox")
self.builder.add_from_file(get_resource("path_combo_chooser.ui"))
self.builder.add_from_file(resource_filename(
"deluge.ui.gtkui", os.path.join("glade", "path_combo_chooser.ui")
))
self.button_toggle = self.builder.get_object("button_toggle_dropdown")
self.text_entry = self.builder.get_object("entry_text")
self.open_filechooser_dialog_button = self.builder.get_object("button_open_dialog")