[accerciser] accerciser.spec.in
- From: Eitan Isaacson <eitani src gnome org>
- To: svn-commits-list gnome org
- Subject: [accerciser] accerciser.spec.in
- Date: Mon, 13 Jul 2009 02:26:09 +0000 (UTC)
commit 50c5d909e9ea4cbc743d71fd3807c8c4dc47b375
Author: Eitan Isaacson <eitan ascender com>
Date: Sun Jul 12 19:24:29 2009 -0700
accerciser.spec.in
macaroon/pyreqs.py
plugins/event_monitor.py
plugins/interface_view.py
plugins/script_recorder.py
plugins/validate.py
po/he.po
pyreqs.py
src/lib/accerciser/accerciser.py
src/lib/accerciser/i18n.py.in: Removed all mentions of glade. Explicitly add translation domain to gtk.Builder instances.
accerciser.spec.in | 1 -
macaroon/pyreqs.py | 2 +-
plugins/event_monitor.py | 3 +-
plugins/interface_view.py | 3 +-
plugins/script_recorder.py | 3 +-
plugins/validate.py | 3 +-
po/he.po | 158 +++++++++++++++++++-------------------
pyreqs.py | 2 +-
src/lib/accerciser/accerciser.py | 6 --
src/lib/accerciser/i18n.py.in | 4 +-
10 files changed, 90 insertions(+), 95 deletions(-)
---
diff --git a/accerciser.spec.in b/accerciser.spec.in
index 216e0be..3b68243 100644
--- a/accerciser.spec.in
+++ b/accerciser.spec.in
@@ -21,7 +21,6 @@ Requires: gnome-python2-gconf >= 2.12
Requires: gnome-python2-libwnck >= 2.14
Requires: pygtk2 >= 2.8
Requires: python >= 2.4
-Requires: pygtk2-libglade >= 2.8
Requires: at-spi >= 1.7
Requires: gnome-python2 >= 2.12
Requires: glib2 >= 2.10
diff --git a/macaroon/pyreqs.py b/macaroon/pyreqs.py
index e63e47b..238d4e2 100644
--- a/macaroon/pyreqs.py
+++ b/macaroon/pyreqs.py
@@ -24,7 +24,7 @@ except KeyError:
pass
# test for python modules
-modules = ['pygtk', 'gtk', 'gtk.glade', 'gtk.gdk', 'wnck']
+modules = ['pygtk', 'gtk', 'gtk.gdk', 'wnck']
for name in modules:
try:
m = __import__(name)
diff --git a/plugins/event_monitor.py b/plugins/event_monitor.py
index fa45893..82d66c0 100644
--- a/plugins/event_monitor.py
+++ b/plugins/event_monitor.py
@@ -16,7 +16,7 @@ import gobject
import os.path
import gettext, os, sys, locale
from accerciser.plugin import ViewportPlugin
-from accerciser.i18n import _, N_
+from accerciser.i18n import _, N_, DOMAIN
import pango
from gtk import keysyms, gdk
@@ -69,6 +69,7 @@ class EventMonitor(ViewportPlugin):
keysyms.t, gdk.MOD1_MASK | gdk.CONTROL_MASK)]
self.source_filter = None
self.main_xml = gtk.Builder()
+ self.main_xml.set_translation_domain(DOMAIN)
self.main_xml.add_from_file(UI_FILE)
vpaned = self.main_xml.get_object('monitor_vpaned')
self.plugin_area.add(vpaned)
diff --git a/plugins/interface_view.py b/plugins/interface_view.py
index a246ca2..43b4271 100644
--- a/plugins/interface_view.py
+++ b/plugins/interface_view.py
@@ -18,7 +18,7 @@ import pango
from gobject import markup_escape_text
from accerciser.plugin import ViewportPlugin
from accerciser.icons import getIcon
-from accerciser.i18n import _, N_
+from accerciser.i18n import _, N_, DOMAIN
from xml.dom import minidom
UI_FILE = os.path.join(os.path.dirname(__file__),
@@ -51,6 +51,7 @@ class InterfaceViewer(ViewportPlugin):
del dom
ui_xml = gtk.Builder()
+ ui_xml.set_translation_domain(DOMAIN)
ui_xml.add_from_file(UI_FILE)
frame = ui_xml.get_object('iface_view_frame')
self.label_role = ui_xml.get_object('label_role')
diff --git a/plugins/script_recorder.py b/plugins/script_recorder.py
index 2c56cff..9b3e96e 100644
--- a/plugins/script_recorder.py
+++ b/plugins/script_recorder.py
@@ -6,7 +6,7 @@ from gtk import keysyms
import gtksourceview2
import threading
import wnck
-from accerciser.i18n import N_, _
+from accerciser.i18n import N_, _, DOMAIN
from Queue import Queue
UI_FILE = os.path.join(os.path.dirname(__file__),
@@ -190,6 +190,7 @@ class ScriptRecorder(ViewportPlugin):
self.text_view.set_editable(True)
self.text_view.set_cursor_visible(True)
xml = gtk.Builder()
+ xml.set_translation_domain(DOMAIN)
xml.add_from_file(UI_FILE)
vbox = xml.get_object('main_vbox')
sw = xml.get_object('textview_sw')
diff --git a/plugins/validate.py b/plugins/validate.py
index cf6865c..b600639 100644
--- a/plugins/validate.py
+++ b/plugins/validate.py
@@ -19,7 +19,7 @@ import glob
import imp
import webbrowser
from accerciser.plugin import ViewportPlugin
-from accerciser.i18n import _, N_
+from accerciser.i18n import _, N_, DOMAIN
import pyatspi
UI_FILE = os.path.join(os.path.dirname(__file__), 'validate.ui')
@@ -170,6 +170,7 @@ class ValidatorViewport(ViewportPlugin):
self.url = None
self.main_xml = gtk.Builder()
+ self.main_xml.set_translation_domain(DOMAIN)
self.main_xml.add_from_file(UI_FILE)
frame = self.main_xml.get_object('main vbox')
self.plugin_area.add(frame)
diff --git a/po/he.po b/po/he.po
index 0cdcfb9..2ce9096 100644
--- a/po/he.po
+++ b/po/he.po
@@ -66,31 +66,31 @@ msgstr "×?ס×?×£ IPython"
msgid "Interactive console for manipulating currently selected accessible"
msgstr "×?ס×?×£ ×?×?× ×?רק×?×?×?×? ×?×?×?פשר ×?×?ש×? ×?× ×?×?ש ×?× ×?×?ר"
-#: ../plugins/event_monitor.glade.h:1
+#: ../plugins/event_monitor.ui.h:1
msgid "<b>Event monitor</b>"
msgstr "<b>צ×? ×?×?ר×?×¢×?×?</b>"
-#: ../plugins/event_monitor.glade.h:2
+#: ../plugins/event_monitor.ui.h:2
msgid "C_lear Selection"
msgstr "_ר×?ק×? ×?×?×?ר×?"
-#: ../plugins/event_monitor.glade.h:3
+#: ../plugins/event_monitor.ui.h:3
msgid "Everything"
msgstr "×?×?×?"
-#: ../plugins/event_monitor.glade.h:4
+#: ../plugins/event_monitor.ui.h:4
msgid "Selected accessible"
msgstr "× ×?×?ש × ×?×?ר"
-#: ../plugins/event_monitor.glade.h:5
+#: ../plugins/event_monitor.ui.h:5
msgid "Selected application"
msgstr "×?×?ש×?×? × ×?×?ר"
-#: ../plugins/event_monitor.glade.h:6
+#: ../plugins/event_monitor.ui.h:6
msgid "Source"
msgstr "×?ק×?ר"
-#: ../plugins/event_monitor.glade.h:7
+#: ../plugins/event_monitor.ui.h:7
msgid "_Monitor Events"
msgstr "_×?צ×? ×?×?ר×?×¢×?×?"
@@ -126,273 +126,273 @@ msgstr "ש×?"
msgid "Full name"
msgstr "ש×? ×?×?×?"
-#: ../plugins/interface_view.glade.h:1
+#: ../plugins/interface_view.ui.h:1
msgid "0"
msgstr "0"
#. Component
#. size
-#: ../plugins/interface_view.glade.h:4
+#: ../plugins/interface_view.ui.h:4
msgid "0, 0"
msgstr "0, 0"
-#: ../plugins/interface_view.glade.h:5
+#: ../plugins/interface_view.ui.h:5
msgid "<b>Attributes</b>"
msgstr "<b>×?×?פ×?×?× ×?×?</b>"
-#: ../plugins/interface_view.glade.h:6
+#: ../plugins/interface_view.ui.h:6
msgid "<b>Child count</b>"
msgstr "<b>×?ספר ×?×?×?×?×?</b>"
-#: ../plugins/interface_view.glade.h:7
+#: ../plugins/interface_view.ui.h:7
msgid "<b>Description</b>"
msgstr "<b>ת×?×?×?ר</b>"
-#: ../plugins/interface_view.glade.h:8
+#: ../plugins/interface_view.ui.h:8
msgid "<b>Relations</b>"
msgstr "<b>קשר×?×?</b>"
-#: ../plugins/interface_view.glade.h:9
+#: ../plugins/interface_view.ui.h:9
msgid "<b>Selected Cell</b>"
msgstr "<b>ת×? × ×?×?ר</b>"
-#: ../plugins/interface_view.glade.h:10
+#: ../plugins/interface_view.ui.h:10
msgid "<b>States</b>"
msgstr "<b>×?צ×?×?×?</b>"
-#: ../plugins/interface_view.glade.h:11
+#: ../plugins/interface_view.ui.h:11
msgid "<b>Table Information</b>"
msgstr "<b>× ×ª×?× ×? ×?×?×?×?</b>"
-#: ../plugins/interface_view.glade.h:12
+#: ../plugins/interface_view.ui.h:12
msgid "<b>Text</b>"
msgstr "<b>×?קס×?</b>"
-#: ../plugins/interface_view.glade.h:13
+#: ../plugins/interface_view.ui.h:13
msgid "<b>unknown</b>"
msgstr "<b>×?×? ×?×?×?×¢</b>"
-#: ../plugins/interface_view.glade.h:14 ../plugins/interface_view.py:321
+#: ../plugins/interface_view.ui.h:14 ../plugins/interface_view.py:321
#: ../plugins/interface_view.py:860
msgid "<i>(no description)</i>"
msgstr "(×?×?×? ת×?×?×?ר)"
-#: ../plugins/interface_view.glade.h:15
+#: ../plugins/interface_view.ui.h:15
msgid "<i>Caption:</i>"
msgstr "<i>×?ת×? ×?ס×?ר:</i>"
#. End chaacter
#. offset of text attributes span
-#: ../plugins/interface_view.glade.h:18
+#: ../plugins/interface_view.ui.h:18
msgid "<i>End: 0</i>"
msgstr "<i>ס×?×£:·0</i>"
#. Start character offset of text attributes span
-#: ../plugins/interface_view.glade.h:20
+#: ../plugins/interface_view.ui.h:20
msgid "<i>Start: 0</i>"
msgstr "<i>ת×?×?×?×?:·0</i>"
-#: ../plugins/interface_view.glade.h:21
+#: ../plugins/interface_view.ui.h:21
msgid "<i>Summary:</i>"
msgstr "<i>ס×?×?×?×?:</i>"
-#: ../plugins/interface_view.glade.h:22
+#: ../plugins/interface_view.ui.h:22
msgid "<no description>"
msgstr "<×?×?×? ת×?×?×?ר>"
-#: ../plugins/interface_view.glade.h:23
+#: ../plugins/interface_view.ui.h:23
msgid "Absolute position"
msgstr "×?×?ק×?×? ×?×?×?×?×?"
-#: ../plugins/interface_view.glade.h:24
+#: ../plugins/interface_view.ui.h:24
msgid "Acti_on"
msgstr "_פע×?×?×?"
-#: ../plugins/interface_view.glade.h:25
+#: ../plugins/interface_view.ui.h:25
msgid "Alpha"
msgstr "×?×?פ×?"
-#: ../plugins/interface_view.glade.h:26
+#: ../plugins/interface_view.ui.h:26
msgid "Ap_plication"
msgstr "â??_×?×?ש×?×?×?×?"
-#: ../plugins/interface_view.glade.h:27
+#: ../plugins/interface_view.ui.h:27
msgid "Co_mponent"
msgstr "_ר×?×?×?"
-#: ../plugins/interface_view.glade.h:28
+#: ../plugins/interface_view.ui.h:28
msgid "Col_lection"
msgstr "_×?×?סף"
-#: ../plugins/interface_view.glade.h:29
+#: ../plugins/interface_view.ui.h:29
msgid "Column"
msgstr "×?×?ר"
-#: ../plugins/interface_view.glade.h:30
+#: ../plugins/interface_view.ui.h:30
msgid "Columns"
msgstr "×¢×?×?×?×?ת"
-#: ../plugins/interface_view.glade.h:31
+#: ../plugins/interface_view.ui.h:31
msgid "Current value"
msgstr "ער×? × ×?×?×?×?"
-#: ../plugins/interface_view.glade.h:32
+#: ../plugins/interface_view.ui.h:32
msgid "Des_ktop"
msgstr "_ש×?×?×?×? ×¢×?×?×?×?"
#. add description to buffer
-#: ../plugins/interface_view.glade.h:33 ../plugins/interface_view.py:458
+#: ../plugins/interface_view.ui.h:33 ../plugins/interface_view.py:458
#: ../plugins/validate.py:212 ../plugins/validate.py:275
msgid "Description"
msgstr "ת×?×?×?ר"
#. How many columns the cell spans.
-#: ../plugins/interface_view.glade.h:35
+#: ../plugins/interface_view.ui.h:35
msgid "Extents:"
msgstr "×?×?×?×?ת:"
-#: ../plugins/interface_view.glade.h:36
+#: ../plugins/interface_view.ui.h:36
msgid "H_ypertext"
msgstr "_ק×?ש×?ר×?×?ת"
-#: ../plugins/interface_view.glade.h:37
+#: ../plugins/interface_view.ui.h:37
msgid "Header:"
msgstr "×?×?תרת ×¢×?×?×?× ×?:"
#. add url role to buffer
-#: ../plugins/interface_view.glade.h:38 ../plugins/validate.py:281
+#: ../plugins/interface_view.ui.h:38 ../plugins/validate.py:281
msgid "Hyperlink"
msgstr "ק×?ש×?ר×?ת"
-#: ../plugins/interface_view.glade.h:39
+#: ../plugins/interface_view.ui.h:39
msgid "ID"
msgstr "×?ספר ×?×?×?×?×?"
-#: ../plugins/interface_view.glade.h:40
+#: ../plugins/interface_view.ui.h:40
msgid "Include defaults"
msgstr "×?×?×?×? ×?×?פ×?×?× ×? ×?×?×?×?"
-#: ../plugins/interface_view.glade.h:41
+#: ../plugins/interface_view.ui.h:41
msgid "Layer"
msgstr "×?×?×?×?×?"
-#: ../plugins/interface_view.glade.h:42
+#: ../plugins/interface_view.ui.h:42
msgid "Lo_gin Helper"
msgstr "_×¢×?ר ×?ת×?×?ר×?ת"
-#: ../plugins/interface_view.glade.h:43
+#: ../plugins/interface_view.ui.h:43
msgid "Locale"
msgstr "×?×?×?ר"
-#: ../plugins/interface_view.glade.h:44
+#: ../plugins/interface_view.ui.h:44
msgid "Locale:"
msgstr "×?×?×?ר"
-#: ../plugins/interface_view.glade.h:45
+#: ../plugins/interface_view.ui.h:45
msgid "MDI-Z-order"
msgstr "MDI-Z-order"
-#: ../plugins/interface_view.glade.h:46
+#: ../plugins/interface_view.ui.h:46
msgid "Maximum value"
msgstr "ער×? ×?קס×?×?×?×?"
-#: ../plugins/interface_view.glade.h:47
+#: ../plugins/interface_view.ui.h:47
msgid "Minimum increment"
msgstr "×?×?×?×?×? ×?×?× ×?×?×?×?"
-#: ../plugins/interface_view.glade.h:48
+#: ../plugins/interface_view.ui.h:48
msgid "Minimum value"
msgstr "ער×? ×?×?× ×?×?×?×?"
-#: ../plugins/interface_view.glade.h:49
+#: ../plugins/interface_view.ui.h:49
msgid "Offset"
msgstr "ק×?×?×?×?"
-#: ../plugins/interface_view.glade.h:50
+#: ../plugins/interface_view.ui.h:50
msgid "Perform action"
msgstr "×?צע פע×?×?×?"
-#: ../plugins/interface_view.glade.h:51
+#: ../plugins/interface_view.ui.h:51
msgid "Position"
msgstr "×?×?ק×?×?"
-#: ../plugins/interface_view.glade.h:52
+#: ../plugins/interface_view.ui.h:52
msgid "Relative position"
msgstr "×?×?ק×?×? ×?×?ס×?"
-#: ../plugins/interface_view.glade.h:53
+#: ../plugins/interface_view.ui.h:53
msgid "Row"
msgstr "ש×?ר×?"
-#: ../plugins/interface_view.glade.h:54
+#: ../plugins/interface_view.ui.h:54
msgid "Rows"
msgstr "ש×?ר×?ת"
-#: ../plugins/interface_view.glade.h:55
+#: ../plugins/interface_view.ui.h:55
msgid "Select All"
msgstr "×?×?ר ×?×?×?"
-#: ../plugins/interface_view.glade.h:56
+#: ../plugins/interface_view.ui.h:56
msgid "Selected columns"
msgstr "×¢×?×?×?×?ת × ×?×?ר×?ת"
-#: ../plugins/interface_view.glade.h:57
+#: ../plugins/interface_view.ui.h:57
msgid "Selected rows"
msgstr "ש×?ר×?ת × ×?×?ר×?ת"
-#: ../plugins/interface_view.glade.h:58
+#: ../plugins/interface_view.ui.h:58
msgid "Show"
msgstr "_×?צ×?"
-#: ../plugins/interface_view.glade.h:59
+#: ../plugins/interface_view.ui.h:59
msgid "Size"
msgstr "×?×?×?×?"
-#: ../plugins/interface_view.glade.h:60
+#: ../plugins/interface_view.ui.h:60
msgid "St_reamable Content"
msgstr "ת×?×?×? _×?×?×?ר×?"
-#: ../plugins/interface_view.glade.h:61
+#: ../plugins/interface_view.ui.h:61
msgid "Te_xt"
msgstr "_×?קס×?"
-#: ../plugins/interface_view.glade.h:62
+#: ../plugins/interface_view.ui.h:62
msgid "Toolkit"
msgstr "ער×?ת ×?×?×?×?"
-#: ../plugins/interface_view.glade.h:63
+#: ../plugins/interface_view.ui.h:63
msgid "Val_ue"
msgstr "ער×?"
-#: ../plugins/interface_view.glade.h:64
+#: ../plugins/interface_view.ui.h:64
msgid "Version"
msgstr "×?×?רס×?"
-#: ../plugins/interface_view.glade.h:65
+#: ../plugins/interface_view.ui.h:65
msgid "WIDGET"
msgstr "פר×?×? ×?ר×?פ×?"
-#: ../plugins/interface_view.glade.h:66
+#: ../plugins/interface_view.ui.h:66
msgid "_Accessible"
msgstr "_× ×?×?ש"
-#: ../plugins/interface_view.glade.h:67
+#: ../plugins/interface_view.ui.h:67
msgid "_Document"
msgstr "_×?ס×?×?"
-#: ../plugins/interface_view.glade.h:68
+#: ../plugins/interface_view.ui.h:68
msgid "_Image"
msgstr "_ת×?×?× ×?"
-#: ../plugins/interface_view.glade.h:69
+#: ../plugins/interface_view.ui.h:69
msgid "_Selection"
msgstr "_×?×?×?ר×?"
-#: ../plugins/interface_view.glade.h:70
+#: ../plugins/interface_view.ui.h:70
msgid "_Table"
msgstr "_×?×?×?×?"
-#: ../plugins/interface_view.glade.h:71
+#: ../plugins/interface_view.ui.h:71
msgid "name (x,y)"
msgstr "ש×?·(x,y)"
@@ -456,21 +456,21 @@ msgid "Inspect accessible under mouse"
msgstr "×?×?×? × ×?×?ש ש×?ת×?ת ×?×¢×?×?ר"
#. A Dogtail (http://people.redhat.com/zcerza/dogtail) format script.
-#: ../plugins/script_recorder.glade.h:2
+#: ../plugins/script_recorder.ui.h:2
msgid "Dogtail"
msgstr "Dogtail"
#. An LDTP format script (http://ldtp.freedesktop.org/wiki)
-#: ../plugins/script_recorder.glade.h:4
+#: ../plugins/script_recorder.ui.h:4
msgid "LDTP"
msgstr "LDTP"
#. A native script format.
-#: ../plugins/script_recorder.glade.h:6
+#: ../plugins/script_recorder.ui.h:6
msgid "Native"
msgstr "×?ק×?ר×?"
-#: ../plugins/script_recorder.glade.h:7
+#: ../plugins/script_recorder.ui.h:7
msgid "Script Type"
msgstr "ס×?×? תסר×?×?×?×?"
@@ -490,16 +490,16 @@ msgstr "×?תסר×?×? ×?× ×?×?×?×? ×?×?×?×?ק."
msgid "Confirm clear"
msgstr "×?שר × ×?ק×?×?"
-#: ../plugins/validate.glade.h:1 ../plugins/validate.py:358
+#: ../plugins/validate.ui.h:1 ../plugins/validate.py:358
#: ../plugins/validate.py:410
msgid "Idle"
msgstr ""
-#: ../plugins/validate.glade.h:2
+#: ../plugins/validate.ui.h:2
msgid "Sche_ma:"
msgstr "_ס×?×?×?×?:"
-#: ../plugins/validate.glade.h:3
+#: ../plugins/validate.ui.h:3
msgid "V_alidate"
msgstr "_×?×?×?ק"
diff --git a/pyreqs.py b/pyreqs.py
index 3535555..747064a 100644
--- a/pyreqs.py
+++ b/pyreqs.py
@@ -25,7 +25,7 @@ except KeyError:
pass
# test for python modules
-modules = ['pygtk', 'gtk', 'gtk.glade', 'gtk.gdk', 'wnck', 'pyatspi']
+modules = ['pygtk', 'gtk', 'gtk.gdk', 'wnck', 'pyatspi']
for name in modules:
try:
m = __import__(name)
diff --git a/src/lib/accerciser/accerciser.py b/src/lib/accerciser/accerciser.py
index 633bbf3..4b060e7 100644
--- a/src/lib/accerciser/accerciser.py
+++ b/src/lib/accerciser/accerciser.py
@@ -17,7 +17,6 @@ import pygtk
pygtk.require('2.0')
import gtk
import gobject
-import gtk.glade
import gtk.gdk
import os, sys, locale
from icons import getIcon
@@ -41,11 +40,6 @@ from prefs_dialog import AccerciserPreferencesDialog
from main_window import AccerciserMainWindow
import ui_manager
-GLADE_FILENAME = os.path.join(sys.prefix, 'share', 'accerciser', 'glade',
- 'accerciser.glade')
-if not os.path.exists(GLADE_FILENAME):
- GLADE_FILENAME = os.path.join(os.getcwd(), 'accerciser.glade')
-
GCONF_GENERAL = '/apps/accerciser/general'
class Main(Tools):
diff --git a/src/lib/accerciser/i18n.py.in b/src/lib/accerciser/i18n.py.in
index 3240db8..0cb9033 100644
--- a/src/lib/accerciser/i18n.py.in
+++ b/src/lib/accerciser/i18n.py.in
@@ -23,7 +23,7 @@ available under the terms of the BSD license which accompanies
this distribution, and is available at
U{http://www.opensource.org/licenses/bsd-license.php}
'''
-import sys, locale, gettext, os.path, gtk.glade
+import sys, locale, gettext, os.path
from gettext import gettext as translate_func
def bind(domain, locale_dir):
@@ -44,8 +44,6 @@ def bind(domain, locale_dir):
@return: Bound method ugettext on the translation object
@rtype: callable
'''
- gtk.glade.bindtextdomain(domain, locale_dir)
- gtk.glade.textdomain(domain)
try:
t = gettext.translation(domain, locale_dir)
return t.ugettext
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]