GNOME.org
 

[nanny] Rename glade files to ui files

commit cca48ad6160c5cc3a29d7d8cfd1d11cbe7901d84
Author: Roberto Majadas <roberto majadas openshine com>
Date:   Wed Feb 10 01:50:40 2010 +0100

    Rename glade files to ui files

 client/common/src/Utils.py                         |    4 ++--
 client/gnome/admin/data/Makefile.am                |    2 +-
 client/gnome/admin/data/glade/Makefile.am          |    8 --------
 client/gnome/admin/data/ui/Makefile.am             |    8 ++++++++
 .../nac_wcf_dialog.glade => ui/nac_wcf_dialog.ui}  |    0
 .../nac_wcf_edit_dialog.ui}                        |    0
 .../nanny_admin_console.ui}                        |    0
 .../nbm_pbl_dialog.glade => ui/nbm_pbl_dialog.ui}  |    0
 .../nbm_pbl_edit_dialog.ui}                        |    0
 client/gnome/admin/src/AdminConsole.py             |    4 ++--
 client/gnome/admin/src/BlacklistManager.py         |    8 ++++----
 client/gnome/admin/src/ConfigureProxyDialog.py     |    8 ++++----
 client/gnome/admin/src/__init__.py.in              |    2 +-
 configure.ac                                       |    2 +-
 po/POTFILES.in                                     |   11 ++++++-----
 15 files changed, 29 insertions(+), 28 deletions(-)
---
diff --git a/client/common/src/Utils.py b/client/common/src/Utils.py
index e426562..600ea34 100644
--- a/client/common/src/Utils.py
+++ b/client/common/src/Utils.py
@@ -26,8 +26,8 @@
 import os
 import gtk
 
-def glade_magic(object, glade_file, prefix):
-    main_ui_filename = glade_file
+def ui_magic(object, ui_file, prefix):
+    main_ui_filename = ui_file
     object.xml = gtk.Builder ()
     object.xml.add_from_file (main_ui_filename)
     objects = object.xml.get_objects()
diff --git a/client/gnome/admin/data/Makefile.am b/client/gnome/admin/data/Makefile.am
index ff86665..e7305d5 100644
--- a/client/gnome/admin/data/Makefile.am
+++ b/client/gnome/admin/data/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS=glade icons
+SUBDIRS=ui icons
 
 desktopdir = $(datadir)/applications/
 desktop_in_files = nanny-admin-console.desktop.in nanny-blacklist-manager.desktop.in 
diff --git a/client/gnome/admin/data/ui/Makefile.am b/client/gnome/admin/data/ui/Makefile.am
new file mode 100644
index 0000000..2d00f97
--- /dev/null
+++ b/client/gnome/admin/data/ui/Makefile.am
@@ -0,0 +1,8 @@
+uidir = $(datadir)/nanny/client/gnome/admin/ui
+ui_DATA = nanny_admin_console.ui \
+	     nac_wcf_edit_dialog.ui \
+	     nac_wcf_dialog.ui \
+	     nbm_pbl_dialog.ui \
+	     nbm_pbl_edit_dialog.ui
+
+EXTRA_DIST=$(ui_DATA)
diff --git a/client/gnome/admin/data/glade/nac_wcf_dialog.glade b/client/gnome/admin/data/ui/nac_wcf_dialog.ui
similarity index 100%
rename from client/gnome/admin/data/glade/nac_wcf_dialog.glade
rename to client/gnome/admin/data/ui/nac_wcf_dialog.ui
diff --git a/client/gnome/admin/data/glade/nac_wcf_edit_dialog.glade b/client/gnome/admin/data/ui/nac_wcf_edit_dialog.ui
similarity index 100%
rename from client/gnome/admin/data/glade/nac_wcf_edit_dialog.glade
rename to client/gnome/admin/data/ui/nac_wcf_edit_dialog.ui
diff --git a/client/gnome/admin/data/glade/nanny_admin_console.glade b/client/gnome/admin/data/ui/nanny_admin_console.ui
similarity index 100%
rename from client/gnome/admin/data/glade/nanny_admin_console.glade
rename to client/gnome/admin/data/ui/nanny_admin_console.ui
diff --git a/client/gnome/admin/data/glade/nbm_pbl_dialog.glade b/client/gnome/admin/data/ui/nbm_pbl_dialog.ui
similarity index 100%
rename from client/gnome/admin/data/glade/nbm_pbl_dialog.glade
rename to client/gnome/admin/data/ui/nbm_pbl_dialog.ui
diff --git a/client/gnome/admin/data/glade/nbm_pbl_edit_dialog.glade b/client/gnome/admin/data/ui/nbm_pbl_edit_dialog.ui
similarity index 100%
rename from client/gnome/admin/data/glade/nbm_pbl_edit_dialog.glade
rename to client/gnome/admin/data/ui/nbm_pbl_edit_dialog.ui
diff --git a/client/gnome/admin/src/AdminConsole.py b/client/gnome/admin/src/AdminConsole.py
index 78d8c7b..deb0300 100644
--- a/client/gnome/admin/src/AdminConsole.py
+++ b/client/gnome/admin/src/AdminConsole.py
@@ -48,8 +48,8 @@ class AdminConsole:
             d.destroy()
             raise Exception ('DBus not initialized')
 
-        nanny.client.common.Utils.glade_magic (self,
-                                    glade_file = os.path.join (nanny.client.gnome.admin.glade_files_dir, "nanny_admin_console.glade"),
+        nanny.client.common.Utils.ui_magic (self,
+                                    ui_file = os.path.join (nanny.client.gnome.admin.ui_files_dir, "nanny_admin_console.ui"),
                                     prefix = "nac")
 
         self.window.connect ('delete-event', self.__on_close_event)
diff --git a/client/gnome/admin/src/BlacklistManager.py b/client/gnome/admin/src/BlacklistManager.py
index 34ed45b..38c961a 100644
--- a/client/gnome/admin/src/BlacklistManager.py
+++ b/client/gnome/admin/src/BlacklistManager.py
@@ -36,8 +36,8 @@ class BlacklistManager:
     def __init__ (self):
         self.dialog = gtk.Dialog (title=_("Blacklist Filter Configuration"), buttons=(gtk.STOCK_CLOSE, gtk.RESPONSE_CLOSE))
 
-        nanny.client.common.Utils.glade_magic (self,
-                glade_file = os.path.join (nanny.client.gnome.admin.glade_files_dir, "nbm_pbl_dialog.glade"),
+        nanny.client.common.Utils.ui_magic (self,
+                ui_file = os.path.join (nanny.client.gnome.admin.ui_files_dir, "nbm_pbl_dialog.ui"),
                 prefix = "nbm")
 
         self.dialog.set_property("icon-name", "nanny")
@@ -132,8 +132,8 @@ class BlacklistManager:
                 buttons=(gtk.STOCK_CANCEL, gtk.RESPONSE_REJECT,
                     gtk.STOCK_OK, gtk.RESPONSE_ACCEPT))
 
-        nanny.client.common.Utils.glade_magic (edit_dialog,
-                                  glade_file = os.path.join (nanny.client.gnome.admin.glade_files_dir, "nbm_pbl_edit_dialog.glade"),
+        nanny.client.common.Utils.ui_magic (edit_dialog,
+                                  ui_file = os.path.join (nanny.client.gnome.admin.ui_files_dir, "nbm_pbl_edit_dialog.ui"),
                                   prefix = "nbm")
 
         edit_dialog.main_alignment.unparent()
diff --git a/client/gnome/admin/src/ConfigureProxyDialog.py b/client/gnome/admin/src/ConfigureProxyDialog.py
index b3b6163..272c80e 100644
--- a/client/gnome/admin/src/ConfigureProxyDialog.py
+++ b/client/gnome/admin/src/ConfigureProxyDialog.py
@@ -36,8 +36,8 @@ class ConfigureProxyDialog (gtk.Dialog):
     def __init__ (self, selected_user_id):
         gtk.Dialog.__init__ (self, title=_("Web Content Filter Configuration"), buttons=(gtk.STOCK_CLOSE, gtk.RESPONSE_CLOSE))
 
-        nanny.client.common.Utils.glade_magic (self,
-                glade_file = os.path.join (nanny.client.gnome.admin.glade_files_dir, "nac_wcf_dialog.glade"),
+        nanny.client.common.Utils.ui_magic (self,
+                ui_file = os.path.join (nanny.client.gnome.admin.ui_files_dir, "nac_wcf_dialog.ui"),
                 prefix = "wcfd")
 
         self.set_property("icon-name", "nanny")
@@ -475,9 +475,9 @@ class ConfigureProxyDialog (gtk.Dialog):
             active_categories.append (category_name)
 
     def __load_dialog (self):
-        glade_file = os.path.join (nanny.client.gnome.admin.glade_files_dir, "nac_wcf_edit_dialog.glade")
+        ui_file = os.path.join (nanny.client.gnome.admin.ui_files_dir, "nac_wcf_edit_dialog.ui")
         xml = gtk.Builder ()
-        xml.add_from_file (glade_file)
+        xml.add_from_file (ui_file)
 
         return xml
 
diff --git a/client/gnome/admin/src/__init__.py.in b/client/gnome/admin/src/__init__.py.in
index 3329984..62a04e8 100644
--- a/client/gnome/admin/src/__init__.py.in
+++ b/client/gnome/admin/src/__init__.py.in
@@ -34,7 +34,7 @@ from ScheduleCalendar import ScheduleCalendar
 from BlacklistManager import BlacklistManager
 
 share_files_dir= os.path.join("@prefix@","share/","nanny/client/gnome/admin/")
-glade_files_dir= os.path.join(share_files_dir,"glade/")
+ui_files_dir= os.path.join(share_files_dir,"ui/")
 icons_files_dir= os.path.join(share_files_dir,"icons/")
 
 GETTEXT_DOMAIN = 'nanny'
diff --git a/configure.ac b/configure.ac
index f1259d6..a863e65 100644
--- a/configure.ac
+++ b/configure.ac
@@ -205,7 +205,7 @@ client/gnome/systray/src/__init__.py
 client/gnome/systray/data/Makefile
 client/gnome/admin/Makefile
 client/gnome/admin/data/Makefile
-client/gnome/admin/data/glade/Makefile
+client/gnome/admin/data/ui/Makefile
 client/gnome/admin/data/icons/Makefile
 client/gnome/admin/src/Makefile
 client/gnome/admin/src/__init__.py
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 32d55ab..e4b473a 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,3 +1,4 @@
+[encoding: UTF-8]
 client/common/src/Categories.py
 client/common/src/Utils.py
 client/common/src/Singleton.py
@@ -5,11 +6,11 @@ client/common/src/DBusClient.py
 client/common/src/__init__.py
 client/gnome/admin/data/nanny-admin-console.desktop.in
 client/gnome/admin/data/nanny-blacklist-manager.desktop.in
-client/gnome/admin/data/glade/nanny_admin_console.glade
-client/gnome/admin/data/glade/nac_wcf_edit_dialog.glade
-client/gnome/admin/data/glade/nac_wcf_dialog.glade
-client/gnome/admin/data/glade/nbm_pbl_dialog.glade
-client/gnome/admin/data/glade/nbm_pbl_edit_dialog.glade
+[type: gettext/glade]client/gnome/admin/data/ui/nanny_admin_console.ui
+[type: gettext/glade]client/gnome/admin/data/ui/nac_wcf_edit_dialog.ui
+[type: gettext/glade]client/gnome/admin/data/ui/nac_wcf_dialog.ui
+[type: gettext/glade]client/gnome/admin/data/ui/nbm_pbl_dialog.ui
+[type: gettext/glade]client/gnome/admin/data/ui/nbm_pbl_edit_dialog.ui
 client/gnome/admin/src/__init__.py.in
 client/gnome/admin/src/ScheduleCalendar.py
 client/gnome/admin/src/ConfigureProxyDialog.py
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]