Skip to content

Commit

Permalink
Fix deprecation warnings
Browse files Browse the repository at this point in the history 
Unfortunately I couldn't fix the key bindings and the menu item for 'play' jet
  • Loading branch information
@innir
innir committed Jul 9, 2019
1 parent c29dd68 commit 7a9c06d
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 41 deletions.
40 changes: 21 additions & 19 deletions bin/gtranscribe
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ from gettext import gettext as _
import dbus
import gi
gi.require_version('Gtk', '3.0')
from gi.repository import GLib, GObject, Gtk, Gdk, GdkPixbuf
from gi.repository import GLib, Gtk, Gdk, GdkPixbuf
try:
gi.require_version('Gspell', '1')
from gi.repository import Gspell
Expand All @@ -51,7 +51,6 @@ from gtranscribe.helpers import *
from gtranscribe.player import gTranscribePlayer
from gtranscribe.metadata import MetaData, init_db

GObject.threads_init()
locale.setlocale(locale.LC_ALL, '')
gettext.textdomain('gTranscribe')
DBusGMainLoop(set_as_default=True)
Expand Down Expand Up @@ -105,8 +104,10 @@ class gTranscribeWindow:
self.speedscale = builder.get_object('scale_speed')
self.speedscale.set_sensitive(False)

self.play_action = builder.get_object("action_play")
self.play_action = builder.get_object("button_play")
self.play_action.set_sensitive(False)
self.play_menu = builder.get_object('play')
self.play_menu.set_sensitive(False)
self.slider = builder.get_object('scale_position')
self.slider.set_sensitive(False)
self.icon_play = builder.get_object("icon_play")
Expand Down Expand Up @@ -158,19 +159,19 @@ class gTranscribeWindow:
if audiofile:
# Open a file passed as command-line parameter.
# Use idle_add so window is settled.
GObject.idle_add(self.open_file, audiofile)
GLib.idle_add(self.open_file, audiofile)

def _get_update_ui(self):
return self._update_id is not None

def _set_update_ui(self, update):
if update:
self._update_id = GObject.timeout_add(50, self.play_loop)
self._update_id = GLib.timeout_add(50, self.play_loop)
else:
# run play_loop one more time to make sure UI is up to date.
self.play_loop()
try:
GObject.source_remove(self._update_id)
GLib.source_remove(self._update_id)
except TypeError:
# source no longer available, do nothing
pass
Expand All @@ -183,8 +184,8 @@ class gTranscribeWindow:
about_dialog.set_transient_for(self.window)
about_dialog.set_modal(True)
about_dialog.set_name("gTranscribe")
about_dialog.set_version("0.7.1")
about_dialog.set_copyright("Copyright \u00A9 2013-2016 Philip Rinn\n"
about_dialog.set_version("0.8")
about_dialog.set_copyright("Copyright \u00A9 2013-2018 Philip Rinn\n"
"Copyright \u00A9 2010 Frederik Elwert")
about_dialog.set_comments(_("gTranscribe is a software focussed "
"on easy transcription of spoken words."))
Expand All @@ -210,7 +211,7 @@ class gTranscribeWindow:

def on_file_ready(self, signal, audiofile):
logger.debug('received signal "ready"')
GObject.idle_add(self.update_file, audiofile)
GLib.idle_add(self.update_file, audiofile)

def update_file(self, audiofile):
self.position = 0
Expand Down Expand Up @@ -240,6 +241,7 @@ class gTranscribeWindow:
self.slider.set_sensitive(True)
self.rewind_button.set_sensitive(True)
self.forward_button.set_sensitive(True)
self.play_menu.set_sensitive(True)
self.rewind_menu.set_sensitive(True)
self.forward_menu.set_sensitive(True)
self.jump_menu.set_sensitive(True)
Expand Down Expand Up @@ -272,20 +274,20 @@ class gTranscribeWindow:
def play(self, action):
logger.debug('play action triggered')
if action.get_active():
self.icon_play.set_from_stock(Gtk.STOCK_MEDIA_PAUSE, 2)
self.icon_play.set_from_icon_name(Gtk.STOCK_MEDIA_PAUSE, 2)
# It's not resuming at the correct position if we don't set the
# position explicitly
self.player.position = self.position
self.player.play()
self.window.update_ui = True
self._set_update_ui(True)
else:
self.icon_play.set_from_stock(Gtk.STOCK_MEDIA_PLAY, 2)
self.icon_play.set_from_icon_name(Gtk.STOCK_MEDIA_PLAY, 2)
self.window.update_ui = False
self._set_update_ui(False)
self.player.pause()
self.player.move_position(-time_to_ns(self.JUMP_BACK_INTERVAL))
GObject.idle_add(self.play_loop, True)
GLib.idle_add(self.play_loop, True)
if hasattr(self, 'md5'):
fileinfo = MetaData(self.player.filename, self.md5)
fileinfo.position = self.position
Expand Down Expand Up @@ -324,11 +326,11 @@ class gTranscribeWindow:

def forward(self, action=None, user_data=None):
self.player.move_position(time_to_ns(self.SEEK_INTERVAL))
GObject.idle_add(self.play_loop, True)
GLib.idle_add(self.play_loop, True)

def rewind(self, action=None, user_data=None):
self.player.move_position(-time_to_ns(self.SEEK_INTERVAL))
GObject.idle_add(self.play_loop, True)
GLib.idle_add(self.play_loop, True)

def jump(self, action):
# Only do this if an audio file is already loaded
Expand All @@ -352,13 +354,13 @@ class gTranscribeWindow:
if pos_tag.match(pos):
self.player.position = time_to_ns(
datetime.datetime.strptime(pos, "%M:%S.%f"))
GObject.idle_add(self.play_loop, True)
GLib.idle_add(self.play_loop, True)
self.text_buffer.place_cursor(
self.text_buffer.get_iter_at_offset(line_start))
logger.debug('Set position')

def on_scale_speed_format_value(self, widget, value, data=None):
return u'%s\xd7' % locale.format('%.1f', value)
return u'%s\xd7' % locale.format_string('%.1f', value)

def on_scale_speed_value_changed(self, range):
value = range.get_value()
Expand All @@ -376,7 +378,7 @@ class gTranscribeWindow:
new_position = self.player.duration * (value / max_value)
self.player.position = new_position
# Update only position label
GObject.idle_add(self.play_loop, True, False)
GLib.idle_add(self.play_loop, True, False)

def on_scale_position_button_press_event(self, widget, event):
logger.debug('Begin seeking')
Expand Down Expand Up @@ -442,15 +444,15 @@ class gTranscribeWindow:
time_str = "%M:%S.%f"
self.player.position = time_to_ns(
datetime.datetime.strptime(pos, time_str))
GObject.idle_add(self.play_loop, True)
GLib.idle_add(self.play_loop, True)
logger.debug('Set position on load to %s', pos)
# disable the text view while loading the buffer with the text
self.text_view.set_sensitive(False)
self.text_buffer.set_text(text)
self.text_buffer.set_modified(False)
self.text_view.set_sensitive(True)
self.text_view.grab_focus()
GObject.idle_add(self.text_view.scroll_mark_onscreen,
GLib.idle_add(self.text_view.scroll_mark_onscreen,
self.text_buffer.get_insert())

# Called when the user clicks the 'Save' menu. We need to allow the user to
Expand Down
16 changes: 7 additions & 9 deletions data/ui/gTranscribe.glade
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.20.0 -->
<!-- Generated with glade 3.22.1 -->
<interface>
<requires lib="gtk+" version="3.0"/>
<object class="GtkToggleAction" id="action_play">
<signal name="toggled" handler="play" swapped="no"/>
</object>
<requires lib="gtk+" version="3.12"/>
<object class="GtkAdjustment" id="adjustment_seek">
<property name="upper">1</property>
<property name="step_increment">0.10000000000000001</property>
Expand Down Expand Up @@ -39,6 +36,9 @@
<property name="default_height">550</property>
<signal name="delete-event" handler="quit" swapped="no"/>
<signal name="destroy" handler="quit" swapped="no"/>
<child>
<placeholder/>
</child>
<child>
<object class="GtkBox" id="window">
<property name="visible">True</property>
Expand Down Expand Up @@ -127,12 +127,11 @@
<child>
<object class="GtkImageMenuItem" id="play">
<property name="label">gtk-media-play</property>
<property name="use_action_appearance">False</property>
<property name="related_action">action_play</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<signal name="activate" handler="play" object="button_play" swapped="no"/>
<accelerator key="space" signal="activate" modifiers="GDK_CONTROL_MASK"/>
</object>
</child>
Expand Down Expand Up @@ -333,12 +332,11 @@
<property name="spacing">4</property>
<child>
<object class="GtkToggleButton" id="button_play">
<property name="use_action_appearance">False</property>
<property name="related_action">action_play</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="relief">none</property>
<signal name="toggled" handler="play" swapped="no"/>
<child>
<object class="GtkImage" id="icon_play">
<property name="visible">True</property>
Expand Down
1 change: 0 additions & 1 deletion gtranscribe/player.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
gi.require_version('Gst', '1.0')
from gi.repository import Gst, GObject
logger = logging.getLogger('player')
GObject.threads_init()
Gst.init(None)


Expand Down
20 changes: 10 additions & 10 deletions org.innir.gtranscribe.appdata.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,17 @@
<binary>gtranscribe</binary>
</provides>
<releases>
<release version="0.1" date="2013-04-08" />
<release version="0.2" date="2013-07-14" />
<release version="0.3" date="2016-02-24" />
<release version="0.4" date="2016-02-27" />
<release version="0.5" date="2016-02-28" />
<release version="0.5.1" date="2016-07-03" />
<release version="0.5.2" date="2016-07-06" />
<release version="0.6" date="2016-12-04" />
<release version="0.7" date="2016-12-28" />
<release version="0.7.1" date="2016-12-30" />
<release version="0.8" date="2018-09-16" />
<release version="0.7.1" date="2016-12-30" />
<release version="0.7" date="2016-12-28" />
<release version="0.6" date="2016-12-04" />
<release version="0.5.2" date="2016-07-06" />
<release version="0.5.1" date="2016-07-03" />
<release version="0.5" date="2016-02-28" />
<release version="0.4" date="2016-02-27" />
<release version="0.3" date="2016-02-24" />
<release version="0.2" date="2013-07-14" />
<release version="0.1" date="2013-04-08" />
</releases>
<url type="homepage">https://github.com/innir/gtranscribe</url>
<url type="bugtracker">https://github.com/innir/gtranscribe/issues</url>
Expand Down
2 changes: 0 additions & 2 deletions setup.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@
# along with this program. If not, see <https://www.gnu.org/licenses/>.

import DistUtilsExtra.auto
assert DistUtilsExtra.auto.__version__ >= '2.22', 'gTranscribe needs '\
'DistUtilsExtra.auto >= 2.22'

DistUtilsExtra.auto.setup(
name='gTranscribe',
Expand Down

0 comments on commit 7a9c06d

Please sign in to comment.