summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile.am15
-rw-r--r--common/Makefile.am10
-rw-r--r--common/all-stock-icons.data113
-rw-r--r--configure.in4
-rw-r--r--cursor-themes/Makefile.am2
-rw-r--r--desktop-themes/Makefile.am55
-rw-r--r--desktop-themes/TraditionalOk/Makefile.am (renamed from desktop-themes/Clearlooks/Makefile.am)2
-rw-r--r--desktop-themes/TraditionalOk/index.theme.in (renamed from desktop-themes/Clearlooks/index.theme.in)6
-rw-r--r--desktop-themes/TraditionalOkTest/Makefile.am (renamed from desktop-themes/ClearlooksTest/Makefile.am)2
-rw-r--r--desktop-themes/TraditionalOkTest/index.theme.in (renamed from desktop-themes/ClearlooksTest/index.theme.in)6
-rw-r--r--gtk-themes/ClearlooksClassic/Makefile.am5
-rw-r--r--gtk-themes/ClearlooksTest/Makefile.am5
-rw-r--r--gtk-themes/Makefile.am6
-rw-r--r--gtk-themes/TraditionalOkClassic/Makefile.am5
-rw-r--r--gtk-themes/TraditionalOkClassic/gtkrc (renamed from gtk-themes/ClearlooksClassic/gtkrc)0
-rw-r--r--gtk-themes/TraditionalOkTest/Makefile.am5
-rw-r--r--gtk-themes/TraditionalOkTest/gtkrc (renamed from gtk-themes/ClearlooksTest/gtkrc)0
-rw-r--r--marco-themes/Makefile.am4
-rw-r--r--marco-themes/TraditionalOk/metacity-theme-1.xml (renamed from marco-themes/Clearlooks/metacity-theme-1.xml)4
-rw-r--r--marco-themes/TraditionalOkClassic/metacity-theme-1.xml (renamed from marco-themes/ClearlooksClassic/metacity-theme-1.xml)4
20 files changed, 128 insertions, 125 deletions
diff --git a/Makefile.am b/Makefile.am
index ef0c1369..93175459 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,10 +1,11 @@
-SUBDIRS= gtk-themes \
- marco-themes \
- icon-themes \
- desktop-themes \
- cursor-themes \
- common \
- po
+SUBDIRS = \
+ gtk-themes \
+ marco-themes \
+ icon-themes \
+ desktop-themes \
+ cursor-themes \
+ common \
+ po
EXTRA_DIST = \
mate-themes.spec \
diff --git a/common/Makefile.am b/common/Makefile.am
index 3c5704d8..bfb48e48 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -1,5 +1,5 @@
-EXTRA_DIST = all-stock-icons.data \
- gtk-stock-icons.rc \
- media-stock-icons.rc \
- panel-stock-icons.rc \
- mkiconlinks.sh
+EXTRA_DIST = all-stock-icons.data \
+ gtk-stock-icons.rc \
+ media-stock-icons.rc \
+ panel-stock-icons.rc \
+ mkiconlinks.sh
diff --git a/common/all-stock-icons.data b/common/all-stock-icons.data
index 3405fff6..205d0a0c 100644
--- a/common/all-stock-icons.data
+++ b/common/all-stock-icons.data
@@ -1,59 +1,60 @@
NULL=
-pixmap_DATA= stock_about.png stock_add.png stock_apply.png \
- stock_attach.png stock_bold.png stock_book.png \
- stock_cancel.png stock_cdrom.png stock_clear.png \
- stock_close.png stock_connect.png stock_convert.png \
- stock_copy.png stock_cut.png stock_delete.png \
- stock_dialog_error.png stock_dialog_info.png \
- stock_dialog_question.png stock_dialog_warning.png \
- stock_disconnect.png stock_edit.png stock_empty.png \
- stock_execute.png stock_export.png \
- stock_find-and-replace.png stock_find.png \
- stock_floppy.png stock_go-back.png \
- stock_go-down.png stock_go-forward.png \
- stock_go-up.png stock_goto-bottom.png \
- stock_goto-first.png stock_goto-last.png \
- stock_goto-top.png stock_help.png stock_home.png \
- stock_import.png stock_index.png \
- stock_insert-image.png stock_insert-object.png \
- stock_insert-table.png stock_italic.png \
- stock_jump-to.png stock_justify-center.png \
- stock_justify-fill.png stock_justify-left.png \
- stock_justify-right.png stock_line-in.png \
- stock_mic.png stock_missing-image.png stock_new.png \
- stock_ok.png stock_open.png stock_paste.png \
- stock_preferences.png stock_print-preview.png \
- stock_print.png stock_properties.png stock_quit.png \
- stock_redo.png stock_refresh.png stock_remove.png \
- stock_revert-to-saved.png stock_save-as.png \
- stock_save.png stock_select-color.png \
- stock_select-font.png stock_sort-ascending.png \
- stock_sort-descending.png stock_spell-check.png \
- stock_stop.png stock_strikethrough.png \
- stock_undelete.png stock_underline.png \
- stock_undo.png stock_volume.png stock_zoom-100.png \
- stock_zoom-fit.png stock_zoom-in.png \
- stock_zoom-out.png stock_yes.png stock_no.png \
- stock_dnd.png stock_dnd_multiple.png \
- stock_run.png stock_searchtool.png stock_lockscreen.png \
- stock_logout.png stock_mate-logo.png stock_cde-menu.png \
- stock_internet.png stock_mate-util.png \
- stock_launcher-program.png stock_multimedia.png \
- stock_drawer.png stock_screenshot.png \
- stock_amusements.png stock_accessories.png \
- stock_commandline-browser.xpm stock_commandline-history.xpm\
- media-prev.png media-next.png \
- media-stop.png media-eject.png \
- media-play.png media-pause.png media-record.png \
- media-backward.png media-forward.png \
- volume-mute.png volume-zero.png \
- volume-min.png volume-medium.png volume-max.png \
- double-click-on.png double-click-off.png double-click-maybe.png \
- printer-default.png printer-broken.png printer-inkjet.png \
- printer-personal-laser.png printer-workgroup-laser.png \
- marco-minimize.png marco-maximize.png \
- marco-delete.png \
- stock_info.png stock_harddisk.png \
- $(NULL)
+pixmap_DATA = \
+ stock_about.png stock_add.png stock_apply.png \
+ stock_attach.png stock_bold.png stock_book.png \
+ stock_cancel.png stock_cdrom.png stock_clear.png \
+ stock_close.png stock_connect.png stock_convert.png \
+ stock_copy.png stock_cut.png stock_delete.png \
+ stock_dialog_error.png stock_dialog_info.png \
+ stock_dialog_question.png stock_dialog_warning.png \
+ stock_disconnect.png stock_edit.png stock_empty.png \
+ stock_execute.png stock_export.png \
+ stock_find-and-replace.png stock_find.png \
+ stock_floppy.png stock_go-back.png \
+ stock_go-down.png stock_go-forward.png \
+ stock_go-up.png stock_goto-bottom.png \
+ stock_goto-first.png stock_goto-last.png \
+ stock_goto-top.png stock_help.png stock_home.png \
+ stock_import.png stock_index.png \
+ stock_insert-image.png stock_insert-object.png \
+ stock_insert-table.png stock_italic.png \
+ stock_jump-to.png stock_justify-center.png \
+ stock_justify-fill.png stock_justify-left.png \
+ stock_justify-right.png stock_line-in.png \
+ stock_mic.png stock_missing-image.png stock_new.png \
+ stock_ok.png stock_open.png stock_paste.png \
+ stock_preferences.png stock_print-preview.png \
+ stock_print.png stock_properties.png stock_quit.png \
+ stock_redo.png stock_refresh.png stock_remove.png \
+ stock_revert-to-saved.png stock_save-as.png \
+ stock_save.png stock_select-color.png \
+ stock_select-font.png stock_sort-ascending.png \
+ stock_sort-descending.png stock_spell-check.png \
+ stock_stop.png stock_strikethrough.png \
+ stock_undelete.png stock_underline.png \
+ stock_undo.png stock_volume.png stock_zoom-100.png \
+ stock_zoom-fit.png stock_zoom-in.png \
+ stock_zoom-out.png stock_yes.png stock_no.png \
+ stock_dnd.png stock_dnd_multiple.png \
+ stock_run.png stock_searchtool.png stock_lockscreen.png \
+ stock_logout.png stock_mate-logo.png stock_cde-menu.png \
+ stock_internet.png stock_mate-util.png \
+ stock_launcher-program.png stock_multimedia.png \
+ stock_drawer.png stock_screenshot.png \
+ stock_amusements.png stock_accessories.png \
+ stock_commandline-browser.xpm stock_commandline-history.xpm\
+ media-prev.png media-next.png \
+ media-stop.png media-eject.png \
+ media-play.png media-pause.png media-record.png \
+ media-backward.png media-forward.png \
+ volume-mute.png volume-zero.png \
+ volume-min.png volume-medium.png volume-max.png \
+ double-click-on.png double-click-off.png double-click-maybe.png \
+ printer-default.png printer-broken.png printer-inkjet.png \
+ printer-personal-laser.png printer-workgroup-laser.png \
+ marco-minimize.png marco-maximize.png \
+ marco-delete.png \
+ stock_info.png stock_harddisk.png \
+ $(NULL)
diff --git a/configure.in b/configure.in
index b09a8239..2a77ebc4 100644
--- a/configure.in
+++ b/configure.in
@@ -346,13 +346,13 @@ dnl ==========================================================================
echo "
mate-themes-$VERSION:
- Installation prefix: ${prefix}
+ Installation prefix: ${prefix}
Enable placeholders: ${enable_placeholders}
Enable legacy icons: ${enable_mapping}
Enable all themes: ${enable_all_themes}
Enable test themes: ${enable_test_themes}
- LargePrint cursor theme: ${LARGEPRINT_CURSOR_THEME}
+ LargePrint cursor theme: ${LARGEPRINT_CURSOR_THEME}
HC LargePrint cursor theme: ${LARGEPRINT_HC_CURSOR_THEME}
HCI LargePrint cursor theme: ${LARGEPRINT_HCI_CURSOR_THEME}
diff --git a/cursor-themes/Makefile.am b/cursor-themes/Makefile.am
index 2e2652ae..18b15eb0 100644
--- a/cursor-themes/Makefile.am
+++ b/cursor-themes/Makefile.am
@@ -1,6 +1,6 @@
cursordir = $(datadir)/icons/mate/cursors
-cursor_DATA =\
+cursor_DATA = \
08e8e1c95fe2fc01f976f1e063a24ccd \
double_arrow \
left_ptr_watch \
diff --git a/desktop-themes/Makefile.am b/desktop-themes/Makefile.am
index 749b4ab4..64948925 100644
--- a/desktop-themes/Makefile.am
+++ b/desktop-themes/Makefile.am
@@ -1,31 +1,32 @@
-SUBDIRS= \
- Aldabra \
- Crux \
- Clearlooks \
- Glider \
- Glossy \
- HighContrast \
- HighContrastInverse \
- HighContrastLargePrint \
+SUBDIRS = \
+ Aldabra \
+ Crux \
+ TraditionalOk \
+ Glider \
+ Glossy \
+ HighContrast \
+ HighContrastInverse \
+ HighContrastLargePrint \
HighContrastLargePrintInverse \
- LargePrint \
- LowContrast \
- LowContrastLargePrint \
- Mist \
+ LargePrint \
+ LowContrast \
+ LowContrastLargePrint \
+ Mist \
$(TEST_THEMES)
-DIST_SUBDIRS= \
- Aldabra \
- Crux \
- Clearlooks \
- Glider \
- Glossy \
- HighContrast \
- HighContrastInverse \
- HighContrastLargePrint \
+DIST_SUBDIRS = \
+ Aldabra \
+ Crux \
+ TraditionalOk \
+ Glider \
+ Glossy \
+ HighContrast \
+ HighContrastInverse \
+ HighContrastLargePrint \
HighContrastLargePrintInverse \
- LargePrint \
- LowContrast \
- LowContrastLargePrint \
- Mist \
- ClearlooksTest
+ LargePrint \
+ LowContrast \
+ LowContrastLargePrint \
+ Mist \
+ TraditionalOkTest
+
diff --git a/desktop-themes/Clearlooks/Makefile.am b/desktop-themes/TraditionalOk/Makefile.am
index dd391938..93281ca7 100644
--- a/desktop-themes/Clearlooks/Makefile.am
+++ b/desktop-themes/TraditionalOk/Makefile.am
@@ -1,4 +1,4 @@
-THEME_NAME=Clearlooks
+THEME_NAME=TraditionalOk
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
diff --git a/desktop-themes/Clearlooks/index.theme.in b/desktop-themes/TraditionalOk/index.theme.in
index 89f17176..8b7e4108 100644
--- a/desktop-themes/Clearlooks/index.theme.in
+++ b/desktop-themes/TraditionalOk/index.theme.in
@@ -1,8 +1,8 @@
[X-GNOME-Metatheme]
-_Name=Clearlooks
+_Name=TraditionalOk
Type=X-GNOME-Metatheme
_Comment=Attractive Usability
Encoding=UTF-8
-GtkTheme=Clearlooks
-MetacityTheme=Clearlooks
+GtkTheme=TraditionalOk
+MetacityTheme=TraditionalOk
IconTheme=mate
diff --git a/desktop-themes/ClearlooksTest/Makefile.am b/desktop-themes/TraditionalOkTest/Makefile.am
index e06b5b7a..acd1e912 100644
--- a/desktop-themes/ClearlooksTest/Makefile.am
+++ b/desktop-themes/TraditionalOkTest/Makefile.am
@@ -1,4 +1,4 @@
-THEME_NAME=ClearlooksTest
+THEME_NAME=TraditionalOkTest
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
diff --git a/desktop-themes/ClearlooksTest/index.theme.in b/desktop-themes/TraditionalOkTest/index.theme.in
index ad912be8..c58fd5ae 100644
--- a/desktop-themes/ClearlooksTest/index.theme.in
+++ b/desktop-themes/TraditionalOkTest/index.theme.in
@@ -1,8 +1,8 @@
[X-GNOME-Metatheme]
-_Name=Clearlooks Test Theme
+_Name=TraditionalOk Test Theme
Type=X-GNOME-Metatheme
_Comment=Theme with a different colorscheme to find problems in applications.
Encoding=UTF-8
-GtkTheme=ClearlooksTest
-MetacityTheme=Clearlooks
+GtkTheme=TraditionalOkTest
+MetacityTheme=TraditionalOk
IconTheme=mate
diff --git a/gtk-themes/ClearlooksClassic/Makefile.am b/gtk-themes/ClearlooksClassic/Makefile.am
deleted file mode 100644
index c33cde2b..00000000
--- a/gtk-themes/ClearlooksClassic/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-themedir = $(datadir)/themes/ClearlooksClassic/gtk-2.0
-
-theme_DATA = gtkrc
-
-EXTRA_DIST = $(theme_DATA)
diff --git a/gtk-themes/ClearlooksTest/Makefile.am b/gtk-themes/ClearlooksTest/Makefile.am
deleted file mode 100644
index 1ee4a907..00000000
--- a/gtk-themes/ClearlooksTest/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-themedir = $(datadir)/themes/ClearlooksTest/gtk-2.0
-
-theme_DATA = gtkrc
-
-EXTRA_DIST = $(theme_DATA)
diff --git a/gtk-themes/Makefile.am b/gtk-themes/Makefile.am
index 7f64204e..4e55ab1e 100644
--- a/gtk-themes/Makefile.am
+++ b/gtk-themes/Makefile.am
@@ -1,7 +1,7 @@
SUBDIRS= \
Glider \
Glossy \
- ClearlooksClassic \
+ TraditionalOkClassic \
Simple \
HighContrast \
HighContrastInverse \
@@ -16,7 +16,7 @@ SUBDIRS= \
DIST_SUBDIRS= \
Glider \
Glossy \
- ClearlooksClassic \
+ TraditionalOkClassic \
Simple \
HighContrast \
HighContrastInverse \
@@ -26,4 +26,4 @@ DIST_SUBDIRS= \
LowContrast \
LowContrastLargePrint \
LargePrint \
- ClearlooksTest
+ TraditionalOkTest
diff --git a/gtk-themes/TraditionalOkClassic/Makefile.am b/gtk-themes/TraditionalOkClassic/Makefile.am
new file mode 100644
index 00000000..fd244b5e
--- /dev/null
+++ b/gtk-themes/TraditionalOkClassic/Makefile.am
@@ -0,0 +1,5 @@
+themedir = $(datadir)/themes/TraditionalOkClassic/gtk-2.0
+
+theme_DATA = gtkrc
+
+EXTRA_DIST = $(theme_DATA)
diff --git a/gtk-themes/ClearlooksClassic/gtkrc b/gtk-themes/TraditionalOkClassic/gtkrc
index ae9397f5..ae9397f5 100644
--- a/gtk-themes/ClearlooksClassic/gtkrc
+++ b/gtk-themes/TraditionalOkClassic/gtkrc
diff --git a/gtk-themes/TraditionalOkTest/Makefile.am b/gtk-themes/TraditionalOkTest/Makefile.am
new file mode 100644
index 00000000..a42b0454
--- /dev/null
+++ b/gtk-themes/TraditionalOkTest/Makefile.am
@@ -0,0 +1,5 @@
+themedir = $(datadir)/themes/TraditionalOkTest/gtk-2.0
+
+theme_DATA = gtkrc
+
+EXTRA_DIST = $(theme_DATA)
diff --git a/gtk-themes/ClearlooksTest/gtkrc b/gtk-themes/TraditionalOkTest/gtkrc
index 0edcdc1d..0edcdc1d 100644
--- a/gtk-themes/ClearlooksTest/gtkrc
+++ b/gtk-themes/TraditionalOkTest/gtkrc
diff --git a/marco-themes/Makefile.am b/marco-themes/Makefile.am
index 3dcf94a5..7a38ba10 100644
--- a/marco-themes/Makefile.am
+++ b/marco-themes/Makefile.am
@@ -1,6 +1,6 @@
THEMES= \
- Clearlooks \
- ClearlooksClassic \
+ TraditionalOk \
+ TraditionalOkClassic \
Glider \
Glossy \
Inverted \
diff --git a/marco-themes/Clearlooks/metacity-theme-1.xml b/marco-themes/TraditionalOk/metacity-theme-1.xml
index efefe580..855526a4 100644
--- a/marco-themes/Clearlooks/metacity-theme-1.xml
+++ b/marco-themes/TraditionalOk/metacity-theme-1.xml
@@ -2,11 +2,11 @@
<!-- $Id$ -->
<marco_theme>
<info>
- <name>Clearlooks</name>
+ <name>TraditionalOk</name>
<author>Daniel Borgmann &lt;[email protected]&gt;, Andrea Cimitan &lt;[email protected]&gt;</author>
<copyright>&#194; 2005-2007 Daniel Borgmann, Andrea Cimitan</copyright>
<date>Apr, 2007</date>
- <description>The Clearlooks "Gummy" Marco Theme</description>
+ <description>The TraditionalOk "Gummy" Marco Theme</description>
</info>
<!-- ::: GEOMETRY ::: -->
diff --git a/marco-themes/ClearlooksClassic/metacity-theme-1.xml b/marco-themes/TraditionalOkClassic/metacity-theme-1.xml
index 9afd9dc0..dc766e21 100644
--- a/marco-themes/ClearlooksClassic/metacity-theme-1.xml
+++ b/marco-themes/TraditionalOkClassic/metacity-theme-1.xml
@@ -2,11 +2,11 @@
<!-- $Id: marco-theme-1.xml 1295 2007-06-19 23:39:37Z acimitan $ -->
<marco_theme>
<info>
- <name>ClearlooksClassic</name>
+ <name>TraditionalOkClassic</name>
<author>Daniel Borgmann &lt;[email protected]&gt;, Andrea Cimitan &lt;[email protected]&gt;</author>
<copyright>&#194; 2005-2007 Daniel Borgmann, Andrea Cimitan</copyright>
<date>Apr, 2007</date>
- <description>The Clearlooks "Classic" Marco Theme</description>
+ <description>The TraditionalOk "Classic" Marco Theme</description>
</info>
<!-- ::: GEOMETRY ::: -->
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-03 02:35:23 +0000