diff options
Diffstat (limited to 'TurtleArt/tautils.py')
| -rw-r--r-- | TurtleArt/tautils.py | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/TurtleArt/tautils.py b/TurtleArt/tautils.py index a47c063..cea1dac 100644 --- a/TurtleArt/tautils.py +++ b/TurtleArt/tautils.py @@ -19,7 +19,7 @@ #OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN #THE SOFTWARE. -import gtk +from util.gtkcompat import Gtk import pickle import subprocess import os.path @@ -169,19 +169,19 @@ def json_dump(data): def get_load_name(suffix, load_save_folder): """ Open a load file dialog. """ - _dialog = gtk.FileChooserDialog(_('Load...'), None, - gtk.FILE_CHOOSER_ACTION_OPEN, (gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, - gtk.STOCK_OPEN, gtk.RESPONSE_OK)) - _dialog.set_default_response(gtk.RESPONSE_OK) + _dialog = Gtk.FileChooserDialog(_('Load...'), None, + Gtk.FileChooserAction.OPEN, (Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL, + Gtk.STOCK_OPEN, Gtk.ResponseType.OK)) + _dialog.set_default_response(Gtk.ResponseType.OK) return do_dialog(_dialog, suffix, load_save_folder) def get_save_name(suffix, load_save_folder, save_file_name): """ Open a save file dialog. """ - _dialog = gtk.FileChooserDialog(_('Save...'), None, - gtk.FILE_CHOOSER_ACTION_SAVE, (gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, - gtk.STOCK_SAVE, gtk.RESPONSE_OK)) - _dialog.set_default_response(gtk.RESPONSE_OK) + _dialog = Gtk.FileChooserDialog(_('Save...'), None, + Gtk.FileChooserAction.SAVE, (Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL, + Gtk.STOCK_SAVE, Gtk.ResponseType.OK)) + _dialog.set_default_response(Gtk.ResponseType.OK) if save_file_name is not None: _dialog.set_current_name(save_file_name + suffix) return do_dialog(_dialog, suffix, load_save_folder) @@ -196,11 +196,11 @@ def chooser(parent_window, filter, action): _chooser = ObjectChooser(parent=parent_window, what_filter=filter) except TypeError: _chooser = ObjectChooser(None, parent_window, - gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT) + Gtk.DialogFlags.MODAL | Gtk.DialogFlags.DESTROY_WITH_PARENT) if _chooser is not None: try: result = _chooser.run() - if result == gtk.RESPONSE_ACCEPT: + if result == Gtk.ResponseType.ACCEPT: dsobject = _chooser.get_selected_object() action(dsobject) dsobject.destroy() @@ -247,13 +247,13 @@ def data_to_string(data): def do_dialog(dialog, suffix, load_save_folder): """ Open a file dialog. """ _result = None - file_filter = gtk.FileFilter() + file_filter = Gtk.FileFilter() file_filter.add_pattern('*' + suffix) file_filter.set_name("Turtle Art") dialog.add_filter(file_filter) dialog.set_current_folder(load_save_folder) _response = dialog.run() - if _response == gtk.RESPONSE_OK: + if _response == Gtk.ResponseType.OK: _result = dialog.get_filename() load_save_folder = dialog.get_current_folder() dialog.destroy() @@ -262,7 +262,7 @@ def do_dialog(dialog, suffix, load_save_folder): def save_picture(canvas, file_name=''): """ Save the canvas to a file. """ - _pixbuf = gtk.gdk.Pixbuf(gtk.gdk.COLORSPACE_RGB, False, 8, canvas.width, + _pixbuf = GdkPixbuf.Pixbuf(GdkPixbuf.Colorspace.RGB, False, 8, canvas.width, canvas.height) _pixbuf.get_from_drawable(canvas.canvas.images[0], canvas.canvas.images[0].get_colormap(), @@ -282,12 +282,12 @@ def save_svg(string, file_name): def get_pixbuf_from_journal(dsobject, w, h): """ Load a pixbuf from a Journal object. """ try: - _pixbuf = gtk.gdk.pixbuf_new_from_file_at_size(dsobject.file_path, + _pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size(dsobject.file_path, int(w), int(h)) except: try: _pixbufloader = \ - gtk.gdk.pixbuf_loader_new_with_mime_type('image/png') + GdkPixbuf.Pixbuf.loader_new_with_mime_type('image/png') _pixbufloader.set_size(min(300, int(w)), min(225, int(h))) _pixbufloader.write(dsobject.metadata['preview']) _pixbufloader.close() |