Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--art/Makefile.am2
-rw-r--r--art/icon-theme/24x24/Makefile.am12
-rw-r--r--art/icon-theme/24x24/back.pngbin0 -> 3653 bytes
-rw-r--r--art/icon-theme/24x24/expand.pngbin0 -> 3445 bytes
-rw-r--r--art/icon-theme/24x24/forward.pngbin0 -> 3647 bytes
-rw-r--r--art/icon-theme/24x24/reload.pngbin0 -> 4028 bytes
-rw-r--r--art/icon-theme/24x24/unexpand.pngbin0 -> 3115 bytes
-rw-r--r--art/icon-theme/32x32/Makefile.am12
-rw-r--r--art/icon-theme/32x32/back.pngbin0 -> 3953 bytes
-rw-r--r--art/icon-theme/32x32/expand.pngbin0 -> 3701 bytes
-rw-r--r--art/icon-theme/32x32/forward.pngbin0 -> 3944 bytes
-rw-r--r--art/icon-theme/32x32/reload.pngbin0 -> 4694 bytes
-rw-r--r--art/icon-theme/32x32/unexpand.pngbin0 -> 3265 bytes
-rw-r--r--art/icon-theme/48x48/Makefile.am12
-rw-r--r--art/icon-theme/48x48/back.pngbin0 -> 4494 bytes
-rw-r--r--art/icon-theme/48x48/expand.pngbin0 -> 3840 bytes
-rw-r--r--art/icon-theme/48x48/forward.pngbin0 -> 4455 bytes
-rw-r--r--art/icon-theme/48x48/reload.pngbin0 -> 4906 bytes
-rw-r--r--art/icon-theme/48x48/unexpand.pngbin0 -> 3291 bytes
-rw-r--r--art/icon-theme/Makefile.am14
-rwxr-xr-xart/icon-theme/index.theme.in20
-rwxr-xr-xautogen.sh2
-rw-r--r--configure.in6
-rw-r--r--gtkrc2-default2
-rw-r--r--po/POTFILES.in0
25 files changed, 80 insertions, 2 deletions
diff --git a/art/Makefile.am b/art/Makefile.am
index cacd1ba..133435d 100644
--- a/art/Makefile.am
+++ b/art/Makefile.am
@@ -1 +1 @@
-SUBDIRS = cursor
+SUBDIRS = cursor icon-theme
diff --git a/art/icon-theme/24x24/Makefile.am b/art/icon-theme/24x24/Makefile.am
new file mode 100644
index 0000000..2ca07a3
--- /dev/null
+++ b/art/icon-theme/24x24/Makefile.am
@@ -0,0 +1,12 @@
+iconsize=24x24
+category=stock
+icondir = $(datadir)/icons/olpc/$(iconsize)/$(category)
+
+icon_DATA = \
+ back.png \
+ forward.png \
+ reload.png \
+ expand.png \
+ unexpand.png
+
+EXTRA_DIST = $(icon_DATA)
diff --git a/art/icon-theme/24x24/back.png b/art/icon-theme/24x24/back.png
new file mode 100644
index 0000000..cd32ecf
--- /dev/null
+++ b/art/icon-theme/24x24/back.png
Binary files differ
diff --git a/art/icon-theme/24x24/expand.png b/art/icon-theme/24x24/expand.png
new file mode 100644
index 0000000..5af5daf
--- /dev/null
+++ b/art/icon-theme/24x24/expand.png
Binary files differ
diff --git a/art/icon-theme/24x24/forward.png b/art/icon-theme/24x24/forward.png
new file mode 100644
index 0000000..1d32073
--- /dev/null
+++ b/art/icon-theme/24x24/forward.png
Binary files differ
diff --git a/art/icon-theme/24x24/reload.png b/art/icon-theme/24x24/reload.png
new file mode 100644
index 0000000..81e8d34
--- /dev/null
+++ b/art/icon-theme/24x24/reload.png
Binary files differ
diff --git a/art/icon-theme/24x24/unexpand.png b/art/icon-theme/24x24/unexpand.png
new file mode 100644
index 0000000..4b85220
--- /dev/null
+++ b/art/icon-theme/24x24/unexpand.png
Binary files differ
diff --git a/art/icon-theme/32x32/Makefile.am b/art/icon-theme/32x32/Makefile.am
new file mode 100644
index 0000000..62ae7a0
--- /dev/null
+++ b/art/icon-theme/32x32/Makefile.am
@@ -0,0 +1,12 @@
+iconsize=32x32
+category=stock
+icondir = $(datadir)/icons/olpc/$(iconsize)/$(category)
+
+icon_DATA = \
+ back.png \
+ forward.png \
+ reload.png \
+ expand.png \
+ unexpand.png
+
+EXTRA_DIST = $(icon_DATA)
diff --git a/art/icon-theme/32x32/back.png b/art/icon-theme/32x32/back.png
new file mode 100644
index 0000000..4521fa0
--- /dev/null
+++ b/art/icon-theme/32x32/back.png
Binary files differ
diff --git a/art/icon-theme/32x32/expand.png b/art/icon-theme/32x32/expand.png
new file mode 100644
index 0000000..744bf52
--- /dev/null
+++ b/art/icon-theme/32x32/expand.png
Binary files differ
diff --git a/art/icon-theme/32x32/forward.png b/art/icon-theme/32x32/forward.png
new file mode 100644
index 0000000..36c2c88
--- /dev/null
+++ b/art/icon-theme/32x32/forward.png
Binary files differ
diff --git a/art/icon-theme/32x32/reload.png b/art/icon-theme/32x32/reload.png
new file mode 100644
index 0000000..1935a44
--- /dev/null
+++ b/art/icon-theme/32x32/reload.png
Binary files differ
diff --git a/art/icon-theme/32x32/unexpand.png b/art/icon-theme/32x32/unexpand.png
new file mode 100644
index 0000000..1327bf6
--- /dev/null
+++ b/art/icon-theme/32x32/unexpand.png
Binary files differ
diff --git a/art/icon-theme/48x48/Makefile.am b/art/icon-theme/48x48/Makefile.am
new file mode 100644
index 0000000..e3bc42c
--- /dev/null
+++ b/art/icon-theme/48x48/Makefile.am
@@ -0,0 +1,12 @@
+iconsize=48x48
+category=stock
+icondir = $(datadir)/icons/olpc/$(iconsize)/$(category)
+
+icon_DATA = \
+ back.png \
+ forward.png \
+ reload.png \
+ expand.png \
+ unexpand.png
+
+EXTRA_DIST = $(icon_DATA)
diff --git a/art/icon-theme/48x48/back.png b/art/icon-theme/48x48/back.png
new file mode 100644
index 0000000..3603492
--- /dev/null
+++ b/art/icon-theme/48x48/back.png
Binary files differ
diff --git a/art/icon-theme/48x48/expand.png b/art/icon-theme/48x48/expand.png
new file mode 100644
index 0000000..dd0e5c1
--- /dev/null
+++ b/art/icon-theme/48x48/expand.png
Binary files differ
diff --git a/art/icon-theme/48x48/forward.png b/art/icon-theme/48x48/forward.png
new file mode 100644
index 0000000..2fc6768
--- /dev/null
+++ b/art/icon-theme/48x48/forward.png
Binary files differ
diff --git a/art/icon-theme/48x48/reload.png b/art/icon-theme/48x48/reload.png
new file mode 100644
index 0000000..b109cbc
--- /dev/null
+++ b/art/icon-theme/48x48/reload.png
Binary files differ
diff --git a/art/icon-theme/48x48/unexpand.png b/art/icon-theme/48x48/unexpand.png
new file mode 100644
index 0000000..c8cb278
--- /dev/null
+++ b/art/icon-theme/48x48/unexpand.png
Binary files differ
diff --git a/art/icon-theme/Makefile.am b/art/icon-theme/Makefile.am
new file mode 100644
index 0000000..cba4ca9
--- /dev/null
+++ b/art/icon-theme/Makefile.am
@@ -0,0 +1,14 @@
+SUBDIRS = 24x24 32x32 48x48
+
+THEME_IN_FILES = index.theme.in
+
+%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
+
+themedir = ${datadir}/icons/olpc
+theme_DATA = index.theme
+
+EXTRA_DIST= \
+ index.theme.in
+
+CLEANFILES = \
+ index.theme
diff --git a/art/icon-theme/index.theme.in b/art/icon-theme/index.theme.in
new file mode 100755
index 0000000..d5a79e5
--- /dev/null
+++ b/art/icon-theme/index.theme.in
@@ -0,0 +1,20 @@
+[Icon Theme]
+_Name=OLPC
+_Comment=Default OLPC Theme
+
+Directories=24x24/stock,32x32/stock,48x48/stock
+
+[24x24/stock]
+Size=24
+Context=Stock
+Type=Fixed
+
+[32x32/stock]
+Size=32
+Context=Stock
+Type=Fixed
+
+[48x48/stock]
+Size=48
+Context=Stock
+Type=Fixed
diff --git a/autogen.sh b/autogen.sh
index 471d05b..476ccdd 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -61,6 +61,8 @@ $AUTOMAKE -a $am_opt
autoconf || echo "autoconf failed - version 2.5x is probably required"
+intltoolize --force --copy --automake
+
cd $ORIGDIR
$srcdir/configure --enable-maintainer-mode "$@"
diff --git a/configure.in b/configure.in
index 2d801f8..0bdf505 100644
--- a/configure.in
+++ b/configure.in
@@ -14,6 +14,8 @@ AM_DISABLE_STATIC
AC_PROG_CC
AC_HEADER_STDC
+AC_PROG_INTLTOOL
+
PKG_CHECK_MODULES(GTK2, gtk+-2.0 >= 2.0.0,,
AC_MSG_ERROR([GTK+-2.0 is required to compile redhat-artwork]))
@@ -28,4 +30,8 @@ art/Makefile
art/cursor/Makefile
art/cursor/cursorthemegen/Makefile
art/cursor/Bluecurve/Makefile
+art/icon-theme/Makefile
+art/icon-theme/24x24/Makefile
+art/icon-theme/32x32/Makefile
+art/icon-theme/48x48/Makefile
])
diff --git a/gtkrc2-default b/gtkrc2-default
index e7e3318..9148b93 100644
--- a/gtkrc2-default
+++ b/gtkrc2-default
@@ -1,3 +1,3 @@
gtk-theme-name = "Clearlooks"
-gtk-icon-theme-name = "gnome"
+gtk-icon-theme-name = "olpc"
gtk-cursor-theme-name = "Bluecurve"
diff --git a/po/POTFILES.in b/po/POTFILES.in
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/po/POTFILES.in