GNOME.org
 

[meld] Move icons and glade/UIManager files to data/

commit 31aa536daedebb7c71ff0f26a35ddccf864860ec
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sun Jul 5 14:58:34 2009 +1000

    Move icons and glade/UIManager files to data/

 GNUmakefile                                        |   21 ++++++++++---------
 {glade2/pixmaps => data/icons}/16x16/meld.png      |  Bin 799 -> 799 bytes
 {glade2/pixmaps => data/icons}/16x16/meld.xcf      |  Bin 3823 -> 3823 bytes
 {glade2/pixmaps => data/icons}/22x22/meld.png      |  Bin 1366 -> 1366 bytes
 {glade2/pixmaps => data/icons}/22x22/meld.xcf      |  Bin 6846 -> 6846 bytes
 {glade2/pixmaps => data/icons}/32x32/meld.png      |  Bin 2344 -> 2344 bytes
 {glade2/pixmaps => data/icons}/32x32/meld.svg      |    0
 {glade2/pixmaps => data/icons}/48x48/meld.png      |  Bin 3633 -> 3633 bytes
 {glade2/pixmaps => data/icons}/48x48/meld.svg      |    0
 {glade2/pixmaps => data/icons}/button_apply0.xpm   |    0
 {glade2/pixmaps => data/icons}/button_apply1.xpm   |    0
 {glade2/pixmaps => data/icons}/button_copy0.xpm    |    0
 {glade2/pixmaps => data/icons}/button_copy1.xpm    |    0
 {glade2/pixmaps => data/icons}/button_delete.xpm   |    0
 .../pixmaps => data/icons}/filter-ignored-24.png   |  Bin 749 -> 749 bytes
 .../pixmaps => data/icons}/filter-modified-24.png  |  Bin 952 -> 952 bytes
 {glade2/pixmaps => data/icons}/filter-nonvc-24.png |  Bin 1048 -> 1048 bytes
 .../pixmaps => data/icons}/filter-normal-24.png    |  Bin 1059 -> 1059 bytes
 {glade2/pixmaps => data/icons}/icon.png            |  Bin 3633 -> 3633 bytes
 .../pixmaps => data/icons}/tree-file-changed.png   |  Bin 2244 -> 2244 bytes
 .../pixmaps => data/icons}/tree-file-missing.png   |  Bin 2191 -> 2191 bytes
 {glade2/pixmaps => data/icons}/tree-file-new.png   |  Bin 2258 -> 2258 bytes
 {glade2/pixmaps => data/icons}/tree-file-newer.png |  Bin 2412 -> 2412 bytes
 .../pixmaps => data/icons}/tree-file-normal.png    |  Bin 2250 -> 2250 bytes
 .../pixmaps => data/icons}/tree-folder-changed.png |  Bin 840 -> 840 bytes
 .../pixmaps => data/icons}/tree-folder-missing.png |  Bin 1095 -> 1095 bytes
 {glade2/pixmaps => data/icons}/tree-folder-new.png |  Bin 840 -> 840 bytes
 .../pixmaps => data/icons}/tree-folder-normal.png  |  Bin 840 -> 840 bytes
 {glade2/pixmaps => data/icons}/vc-add-24.png       |  Bin 755 -> 755 bytes
 {glade2/pixmaps => data/icons}/vc-checkout-24.png  |  Bin 749 -> 749 bytes
 {glade2/pixmaps => data/icons}/vc-commit-24.png    |  Bin 792 -> 792 bytes
 {glade2/pixmaps => data/icons}/vc-icon.png         |  Bin 2067 -> 2067 bytes
 {glade2/pixmaps => data/icons}/vc-remove-24.png    |  Bin 644 -> 644 bytes
 {glade2/pixmaps => data/icons}/vc-resolve-24.png   |  Bin 736 -> 736 bytes
 {glade2/pixmaps => data/icons}/vc-update-24.png    |  Bin 797 -> 797 bytes
 {glade2 => data/ui}/dirdiff-ui.xml                 |    0
 {glade2 => data/ui}/dirdiff.glade                  |    0
 {glade2 => data/ui}/dirdiff.gladep                 |    0
 {glade2 => data/ui}/filediff-ui.xml                |    0
 {glade2 => data/ui}/filediff.glade                 |    1 -
 {glade2 => data/ui}/filediff.gladep                |    0
 {glade2 => data/ui}/findbar.glade                  |    0
 {glade2 => data/ui}/meldapp-ui.xml                 |    2 +-
 {glade2 => data/ui}/meldapp.glade                  |    8 +++---
 {glade2 => data/ui}/meldapp.gladep                 |    0
 {glade2 => data/ui}/vcview-ui.xml                  |    0
 {glade2 => data/ui}/vcview.glade                   |    0
 {glade2 => data/ui}/vcview.gladep                  |    0
 paths.py                                           |   10 +++++++-
 tools/check_release                                |    6 ++--
 50 files changed, 27 insertions(+), 21 deletions(-)
---
diff --git a/GNUmakefile b/GNUmakefile
index 61f23f4..b56d02c 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -29,7 +29,7 @@ all: $(addsuffix .install,$(SPECIALS)) meld.desktop
 
 .PHONY:clean
 clean: 
-	-rm -f *.pyc vc/*.pyc *.install meld.desktop *.bak glade2/*.bak
+	-rm -f *.pyc vc/*.pyc *.install meld.desktop *.bak data/ui/*.bak
 	$(MAKE) -C po clean
 	$(MAKE) -C help clean
 
@@ -39,7 +39,8 @@ install: $(addsuffix .install,$(SPECIALS)) meld.desktop
 		$(DESTDIR)$(bindir) \
 		$(DESTDIR)$(libdir_) \
 		$(DESTDIR)$(libdir_)/vc \
-		$(DESTDIR)$(sharedir_)/glade2/pixmaps \
+		$(DESTDIR)$(sharedir_)/ui \
+		$(DESTDIR)$(sharedir_)/icons \
 		$(DESTDIR)$(docdir_) \
 		$(DESTDIR)$(sharedir)/applications \
 		$(DESTDIR)$(sharedir)/pixmaps \
@@ -57,16 +58,16 @@ install: $(addsuffix .install,$(SPECIALS)) meld.desktop
 	$(PYTHON)    -c 'import compileall; compileall.compile_dir("$(DESTDIR)$(libdir_)",10,"$(libdir_)")'
 	$(PYTHON) -O -c 'import compileall; compileall.compile_dir("$(DESTDIR)$(libdir_)",10,"$(libdir_)")'
 	install -m 644 \
-		glade2/*.glade \
-		$(DESTDIR)$(sharedir_)/glade2
+		data/ui/*.glade \
+		$(DESTDIR)$(sharedir_)/ui
 	install -m 644 \
-		glade2/*.xml \
-		$(DESTDIR)$(sharedir_)/glade2
+		data/ui/*.xml \
+		$(DESTDIR)$(sharedir_)/ui
 	install -m 644 \
-		glade2/pixmaps/*.xpm \
-		glade2/pixmaps/*.png \
-		$(DESTDIR)$(sharedir_)/glade2/pixmaps
-	install -m 644 glade2/pixmaps/icon.png \
+		data/icons/*.xpm \
+		data/icons/*.png \
+		$(DESTDIR)$(sharedir_)/icons
+	install -m 644 data/icons/icon.png \
 		$(DESTDIR)$(sharedir)/pixmaps/meld.png
 	$(MAKE) -C po install
 	$(MAKE) -C help install
diff --git a/glade2/pixmaps/16x16/meld.png b/data/icons/16x16/meld.png
similarity index 100%
rename from glade2/pixmaps/16x16/meld.png
rename to data/icons/16x16/meld.png
diff --git a/glade2/pixmaps/16x16/meld.xcf b/data/icons/16x16/meld.xcf
similarity index 100%
rename from glade2/pixmaps/16x16/meld.xcf
rename to data/icons/16x16/meld.xcf
diff --git a/glade2/pixmaps/22x22/meld.png b/data/icons/22x22/meld.png
similarity index 100%
rename from glade2/pixmaps/22x22/meld.png
rename to data/icons/22x22/meld.png
diff --git a/glade2/pixmaps/22x22/meld.xcf b/data/icons/22x22/meld.xcf
similarity index 100%
rename from glade2/pixmaps/22x22/meld.xcf
rename to data/icons/22x22/meld.xcf
diff --git a/glade2/pixmaps/32x32/meld.png b/data/icons/32x32/meld.png
similarity index 100%
rename from glade2/pixmaps/32x32/meld.png
rename to data/icons/32x32/meld.png
diff --git a/glade2/pixmaps/32x32/meld.svg b/data/icons/32x32/meld.svg
similarity index 100%
rename from glade2/pixmaps/32x32/meld.svg
rename to data/icons/32x32/meld.svg
diff --git a/glade2/pixmaps/48x48/meld.png b/data/icons/48x48/meld.png
similarity index 100%
rename from glade2/pixmaps/48x48/meld.png
rename to data/icons/48x48/meld.png
diff --git a/glade2/pixmaps/48x48/meld.svg b/data/icons/48x48/meld.svg
similarity index 100%
rename from glade2/pixmaps/48x48/meld.svg
rename to data/icons/48x48/meld.svg
diff --git a/glade2/pixmaps/button_apply0.xpm b/data/icons/button_apply0.xpm
similarity index 100%
rename from glade2/pixmaps/button_apply0.xpm
rename to data/icons/button_apply0.xpm
diff --git a/glade2/pixmaps/button_apply1.xpm b/data/icons/button_apply1.xpm
similarity index 100%
rename from glade2/pixmaps/button_apply1.xpm
rename to data/icons/button_apply1.xpm
diff --git a/glade2/pixmaps/button_copy0.xpm b/data/icons/button_copy0.xpm
similarity index 100%
rename from glade2/pixmaps/button_copy0.xpm
rename to data/icons/button_copy0.xpm
diff --git a/glade2/pixmaps/button_copy1.xpm b/data/icons/button_copy1.xpm
similarity index 100%
rename from glade2/pixmaps/button_copy1.xpm
rename to data/icons/button_copy1.xpm
diff --git a/glade2/pixmaps/button_delete.xpm b/data/icons/button_delete.xpm
similarity index 100%
rename from glade2/pixmaps/button_delete.xpm
rename to data/icons/button_delete.xpm
diff --git a/glade2/pixmaps/filter-ignored-24.png b/data/icons/filter-ignored-24.png
similarity index 100%
rename from glade2/pixmaps/filter-ignored-24.png
rename to data/icons/filter-ignored-24.png
diff --git a/glade2/pixmaps/filter-modified-24.png b/data/icons/filter-modified-24.png
similarity index 100%
rename from glade2/pixmaps/filter-modified-24.png
rename to data/icons/filter-modified-24.png
diff --git a/glade2/pixmaps/filter-nonvc-24.png b/data/icons/filter-nonvc-24.png
similarity index 100%
rename from glade2/pixmaps/filter-nonvc-24.png
rename to data/icons/filter-nonvc-24.png
diff --git a/glade2/pixmaps/filter-normal-24.png b/data/icons/filter-normal-24.png
similarity index 100%
rename from glade2/pixmaps/filter-normal-24.png
rename to data/icons/filter-normal-24.png
diff --git a/glade2/pixmaps/icon.png b/data/icons/icon.png
similarity index 100%
rename from glade2/pixmaps/icon.png
rename to data/icons/icon.png
diff --git a/glade2/pixmaps/tree-file-changed.png b/data/icons/tree-file-changed.png
similarity index 100%
rename from glade2/pixmaps/tree-file-changed.png
rename to data/icons/tree-file-changed.png
diff --git a/glade2/pixmaps/tree-file-missing.png b/data/icons/tree-file-missing.png
similarity index 100%
rename from glade2/pixmaps/tree-file-missing.png
rename to data/icons/tree-file-missing.png
diff --git a/glade2/pixmaps/tree-file-new.png b/data/icons/tree-file-new.png
similarity index 100%
rename from glade2/pixmaps/tree-file-new.png
rename to data/icons/tree-file-new.png
diff --git a/glade2/pixmaps/tree-file-newer.png b/data/icons/tree-file-newer.png
similarity index 100%
rename from glade2/pixmaps/tree-file-newer.png
rename to data/icons/tree-file-newer.png
diff --git a/glade2/pixmaps/tree-file-normal.png b/data/icons/tree-file-normal.png
similarity index 100%
rename from glade2/pixmaps/tree-file-normal.png
rename to data/icons/tree-file-normal.png
diff --git a/glade2/pixmaps/tree-folder-changed.png b/data/icons/tree-folder-changed.png
similarity index 100%
rename from glade2/pixmaps/tree-folder-changed.png
rename to data/icons/tree-folder-changed.png
diff --git a/glade2/pixmaps/tree-folder-missing.png b/data/icons/tree-folder-missing.png
similarity index 100%
rename from glade2/pixmaps/tree-folder-missing.png
rename to data/icons/tree-folder-missing.png
diff --git a/glade2/pixmaps/tree-folder-new.png b/data/icons/tree-folder-new.png
similarity index 100%
rename from glade2/pixmaps/tree-folder-new.png
rename to data/icons/tree-folder-new.png
diff --git a/glade2/pixmaps/tree-folder-normal.png b/data/icons/tree-folder-normal.png
similarity index 100%
rename from glade2/pixmaps/tree-folder-normal.png
rename to data/icons/tree-folder-normal.png
diff --git a/glade2/pixmaps/vc-add-24.png b/data/icons/vc-add-24.png
similarity index 100%
rename from glade2/pixmaps/vc-add-24.png
rename to data/icons/vc-add-24.png
diff --git a/glade2/pixmaps/vc-checkout-24.png b/data/icons/vc-checkout-24.png
similarity index 100%
rename from glade2/pixmaps/vc-checkout-24.png
rename to data/icons/vc-checkout-24.png
diff --git a/glade2/pixmaps/vc-commit-24.png b/data/icons/vc-commit-24.png
similarity index 100%
rename from glade2/pixmaps/vc-commit-24.png
rename to data/icons/vc-commit-24.png
diff --git a/glade2/pixmaps/vc-icon.png b/data/icons/vc-icon.png
similarity index 100%
rename from glade2/pixmaps/vc-icon.png
rename to data/icons/vc-icon.png
diff --git a/glade2/pixmaps/vc-remove-24.png b/data/icons/vc-remove-24.png
similarity index 100%
rename from glade2/pixmaps/vc-remove-24.png
rename to data/icons/vc-remove-24.png
diff --git a/glade2/pixmaps/vc-resolve-24.png b/data/icons/vc-resolve-24.png
similarity index 100%
rename from glade2/pixmaps/vc-resolve-24.png
rename to data/icons/vc-resolve-24.png
diff --git a/glade2/pixmaps/vc-update-24.png b/data/icons/vc-update-24.png
similarity index 100%
rename from glade2/pixmaps/vc-update-24.png
rename to data/icons/vc-update-24.png
diff --git a/glade2/dirdiff-ui.xml b/data/ui/dirdiff-ui.xml
similarity index 100%
rename from glade2/dirdiff-ui.xml
rename to data/ui/dirdiff-ui.xml
diff --git a/glade2/dirdiff.glade b/data/ui/dirdiff.glade
similarity index 100%
rename from glade2/dirdiff.glade
rename to data/ui/dirdiff.glade
diff --git a/glade2/dirdiff.gladep b/data/ui/dirdiff.gladep
similarity index 100%
rename from glade2/dirdiff.gladep
rename to data/ui/dirdiff.gladep
diff --git a/glade2/filediff-ui.xml b/data/ui/filediff-ui.xml
similarity index 100%
rename from glade2/filediff-ui.xml
rename to data/ui/filediff-ui.xml
diff --git a/glade2/filediff.glade b/data/ui/filediff.glade
similarity index 99%
rename from glade2/filediff.glade
rename to data/ui/filediff.glade
index 0dbffc5..78b0e6e 100644
--- a/glade2/filediff.glade
+++ b/data/ui/filediff.glade
@@ -323,7 +323,6 @@
   <widget class="GtkDialog" id="closedialog">
     <property name="title" translatable="yes">Save modified files?</property>
     <property name="resizable">False</property>
-    <property name="icon">pixmaps/icon.png</property>
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <property name="has_separator">False</property>
     <child internal-child="vbox">
diff --git a/glade2/filediff.gladep b/data/ui/filediff.gladep
similarity index 100%
rename from glade2/filediff.gladep
rename to data/ui/filediff.gladep
diff --git a/glade2/findbar.glade b/data/ui/findbar.glade
similarity index 100%
rename from glade2/findbar.glade
rename to data/ui/findbar.glade
diff --git a/glade2/meldapp-ui.xml b/data/ui/meldapp-ui.xml
similarity index 99%
rename from glade2/meldapp-ui.xml
rename to data/ui/meldapp-ui.xml
index 00f6c6c..68d7638 100644
--- a/glade2/meldapp-ui.xml
+++ b/data/ui/meldapp-ui.xml
@@ -45,7 +45,7 @@
       <menuitem action="About" />
     </menu>
   </menubar>
-  
+
   <toolbar action="Toolbar">
     <toolitem action="New"/>
     <placeholder name="GeneralActions" />
diff --git a/glade2/meldapp.glade b/data/ui/meldapp.glade
similarity index 99%
rename from glade2/meldapp.glade
rename to data/ui/meldapp.glade
index dd377dd..73731d9 100644
--- a/glade2/meldapp.glade
+++ b/data/ui/meldapp.glade
@@ -5,7 +5,7 @@
   <widget class="GtkWindow" id="meldapp">
     <property name="height_request">400</property>
     <property name="title" translatable="yes">Meld</property>
-    <property name="icon">pixmaps/icon.png</property>
+    <property name="icon">../icons/icon.png</property>
     <signal name="size_allocate" handler="on_size_allocate"/>
     <signal name="delete_event" handler="on_delete_event"/>
         <child>
@@ -73,7 +73,7 @@
     <property name="visible">True</property>
     <property name="border_width">5</property>
     <property name="destroy_with_parent">True</property>
-    <property name="icon">pixmaps/icon.png</property>
+    <property name="icon">../icons/icon.png</property>
     <property name="program-name">Meld</property>
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <property name="copyright" translatable="yes">Copyright © 2002-2009 Stephen Kennedy</property>
@@ -94,13 +94,13 @@ Changwoo Ryu (ko)
 Benoît Dejean (fr)
 Gareth Owen (en_GB)
 Adam Weinberger (en_CA)</property>
-    <property name="logo">pixmaps/icon.png</property>
+    <property name="logo">../icons/icon.png</property>
   </widget>
   <widget class="GtkDialog" id="newdialog">
     <property name="visible">True</property>
     <property name="title" translatable="yes">Choose Files</property>
     <property name="default_width">600</property>
-    <property name="icon">pixmaps/icon.png</property>
+    <property name="icon">../icons/icon.png</property>
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <signal name="response" handler="on_response"/>
     <child internal-child="vbox">
diff --git a/glade2/meldapp.gladep b/data/ui/meldapp.gladep
similarity index 100%
rename from glade2/meldapp.gladep
rename to data/ui/meldapp.gladep
diff --git a/glade2/vcview-ui.xml b/data/ui/vcview-ui.xml
similarity index 100%
rename from glade2/vcview-ui.xml
rename to data/ui/vcview-ui.xml
diff --git a/glade2/vcview.glade b/data/ui/vcview.glade
similarity index 100%
rename from glade2/vcview.glade
rename to data/ui/vcview.glade
diff --git a/glade2/vcview.gladep b/data/ui/vcview.gladep
similarity index 100%
rename from glade2/vcview.gladep
rename to data/ui/vcview.gladep
diff --git a/paths.py b/paths.py
index fe6f78d..278cb5a 100644
--- a/paths.py
+++ b/paths.py
@@ -36,8 +36,14 @@ def help_dir(*args): # help
     return os.path.join(_help_dir, *args)
 
 def ui_dir(*args):
-    return os.path.join(_share_dir, "glade2", *args)
+    if os.path.exists(os.path.join(_share_dir, "data")):
+        return os.path.join(_share_dir, "data", "ui", *args)
+    else:
+        return os.path.join(_share_dir, "ui", *args)
 
 def icon_dir(*args):
-    return os.path.join(_share_dir, "glade2", "pixmaps", *args)
+    if os.path.exists(os.path.join(_share_dir, "data")):
+        return os.path.join(_share_dir, "data", "icons", *args)
+    else:
+        return os.path.join(_share_dir, "icons", *args)
 
diff --git a/tools/check_release b/tools/check_release
index 4dbc65b..83fbee6 100755
--- a/tools/check_release
+++ b/tools/check_release
@@ -29,19 +29,19 @@ for file in ["meld"] + glob.glob("*.py") + glob.glob("vc/*.py"):
 		print "%s:%i:Tabs detected" % (file, line)
 		sys.exit(1)
 
-# fix glade files - glade strips directory names from pixmaps :-(
+# fix glade files - glade strips directory names from icons :-(
 def add_pixmap_dir(matchobj):
 	ret = matchobj.group(1)
 	ico = matchobj.group(2)
 	if ico.find("/") == -1:
 		print "Changed", ico, "to",
-		newico = "pixmaps/"+ico
+		newico = "../icons/"+ico
 		ret = ret.replace(ico, newico)
 		print newico
 	return ret
 
 icon_re = re.compile(r'(<property name="(?:icon|logo|pixbuf)">([^<]+)</property>)')
-for file in glob.glob("glade2/*.glade"):
+for file in glob.glob("data/ui/*.glade"):
 	txt = open(file).read()
 	newtxt = icon_re.sub(add_pixmap_dir, txt)
 	if txt != newtxt:
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]