summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDennis Kasprzyk <onestone@beryl-project.org>2007-06-05 20:05:00 +0200
committerDennis Kasprzyk <onestone@beryl-project.org>2007-06-05 20:05:00 +0200
commite9761659c0c4369de3e11a1b02d0b0f892595120 (patch)
tree27ab126b3c54927ea6c90ac52e867b67c7208d19
parent9c760c4f0650f9f73215be632372f720b86b2b62 (diff)
downloadccs-settings-e9761659c0c4369de3e11a1b02d0b0f892595120.tar.gz
ccs-settings-e9761659c0c4369de3e11a1b02d0b0f892595120.tar.bz2
Trevinho's beryl -> ccs rename patch
-rw-r--r--README6
-rw-r--r--VERSION2
-rw-r--r--configure.ac2
-rw-r--r--doc/Makefile.am2
-rw-r--r--doc/beryl-settings.113
-rw-r--r--doc/ccs-settings.113
-rwxr-xr-xmakepos8
-rw-r--r--misc/Makefile.am4
-rw-r--r--misc/beryl-settings.desktop9
-rw-r--r--misc/ccs-settings.desktop9
-rw-r--r--pixmaps/Makefile.am64
-rw-r--r--pixmaps/ccs-settings-section-_.svg (renamed from pixmaps/beryl-settings-section-_.svg)0
-rw-r--r--pixmaps/ccs-settings-section-animation.svg (renamed from pixmaps/beryl-settings-section-animation.svg)0
-rw-r--r--pixmaps/ccs-settings-section-bench.svg (renamed from pixmaps/beryl-settings-section-bench.svg)0
-rw-r--r--pixmaps/ccs-settings-section-blur.svg (renamed from pixmaps/beryl-settings-section-blur.svg)0
-rw-r--r--pixmaps/ccs-settings-section-blurfx.svg (renamed from pixmaps/beryl-settings-section-blurfx.svg)0
-rw-r--r--pixmaps/ccs-settings-section-bs.svg (renamed from pixmaps/beryl-settings-section-bs.svg)0
-rw-r--r--pixmaps/ccs-settings-section-capture.svg (renamed from pixmaps/beryl-settings-section-capture.svg)0
-rw-r--r--pixmaps/ccs-settings-section-crashhandler.svg (renamed from pixmaps/beryl-settings-section-crashhandler.svg)0
-rw-r--r--pixmaps/ccs-settings-section-cube.svg (renamed from pixmaps/beryl-settings-section-cube.svg)0
-rw-r--r--pixmaps/ccs-settings-section-dbus.svg (renamed from pixmaps/beryl-settings-section-dbus.svg)4
-rw-r--r--pixmaps/ccs-settings-section-decoration.svg (renamed from pixmaps/beryl-settings-section-decoration.svg)4
-rw-r--r--pixmaps/ccs-settings-section-fade.svg (renamed from pixmaps/beryl-settings-section-fade.svg)0
-rw-r--r--pixmaps/ccs-settings-section-minimize.svg (renamed from pixmaps/beryl-settings-section-minimize.svg)0
-rw-r--r--pixmaps/ccs-settings-section-move.svg (renamed from pixmaps/beryl-settings-section-move.svg)0
-rw-r--r--pixmaps/ccs-settings-section-neg.svg (renamed from pixmaps/beryl-settings-section-neg.svg)0
-rw-r--r--pixmaps/ccs-settings-section-place.svg (renamed from pixmaps/beryl-settings-section-place.svg)0
-rw-r--r--pixmaps/ccs-settings-section-plane.svg (renamed from pixmaps/beryl-settings-section-plane.svg)0
-rw-r--r--pixmaps/ccs-settings-section-put.svg (renamed from pixmaps/beryl-settings-section-put.svg)0
-rw-r--r--pixmaps/ccs-settings-section-reflex.svg (renamed from pixmaps/beryl-settings-section-reflex.svg)0
-rw-r--r--pixmaps/ccs-settings-section-resize.svg (renamed from pixmaps/beryl-settings-section-resize.svg)0
-rw-r--r--pixmaps/ccs-settings-section-rotate.svg (renamed from pixmaps/beryl-settings-section-rotate.svg)0
-rw-r--r--pixmaps/ccs-settings-section-scale.svg (renamed from pixmaps/beryl-settings-section-scale.svg)0
-rw-r--r--pixmaps/ccs-settings-section-screenshot.svg (renamed from pixmaps/beryl-settings-section-screenshot.svg)0
-rw-r--r--pixmaps/ccs-settings-section-showdesktop.svg (renamed from pixmaps/beryl-settings-section-showdesktop.svg)0
-rw-r--r--pixmaps/ccs-settings-section-splash.svg (renamed from pixmaps/beryl-settings-section-splash.svg)4
-rw-r--r--pixmaps/ccs-settings-section-state.svg (renamed from pixmaps/beryl-settings-section-state.svg)0
-rw-r--r--pixmaps/ccs-settings-section-switcher.svg (renamed from pixmaps/beryl-settings-section-switcher.svg)0
-rw-r--r--pixmaps/ccs-settings-section-trailfocus.svg (renamed from pixmaps/beryl-settings-section-trailfocus.svg)0
-rw-r--r--pixmaps/ccs-settings-section-water.svg (renamed from pixmaps/beryl-settings-section-water.svg)0
-rw-r--r--pixmaps/ccs-settings-section-wobbly.svg (renamed from pixmaps/beryl-settings-section-wobbly.svg)0
-rw-r--r--pixmaps/ccs-settings-section-zoom.svg (renamed from pixmaps/beryl-settings-section-zoom.svg)0
-rw-r--r--pixmaps/ccs-settings.svg (renamed from pixmaps/beryl-settings.svg)0
-rw-r--r--po/Makevars4
-rw-r--r--po/POTFILES.in24
-rw-r--r--po/ccs-settings.pot (renamed from po/beryl-settings.pot)8
-rw-r--r--po/fr_FR.po34
-rw-r--r--po/it_IT.po22
-rw-r--r--po/ko_KR.po20
-rw-r--r--po/pt_BR.po28
-rw-r--r--po/pt_PT.po30
-rw-r--r--po/sv_FI.po32
-rw-r--r--po/sv_SE.po32
-rw-r--r--po/zh_CN.po28
-rw-r--r--po/zh_HK.po28
-rw-r--r--po/zh_TW.po28
-rw-r--r--src/main.c363
57 files changed, 245 insertions, 580 deletions
diff --git a/README b/README
index 0c4f980..5a1682d 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
-This is the settings package for beryl. It requires beryl-core
-and beryl-plugins so you can configure Beryl.
+This is the settings package for ccs. It requires libccs
+and compiz-plugins so you can configure Compiz.
-You can use beryl-settings to activate, deactivate or change
+You can use ccs-settings to activate, deactivate or change
plugin settings.
Enjoy!
diff --git a/VERSION b/VERSION
index f7f469a..5256d31 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-#beryl version header
+#ccs-settings version header
VERSION=0.1.2
diff --git a/configure.ac b/configure.ac
index 78ed064..7443cf5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,7 @@ AC_HEADER_STDC
IT_PROG_INTLTOOL([0.35.0])
AC_SUBST(ALL_LINGUAS)
AM_GLIB_GNU_GETTEXT
-GETTEXT_PACKAGE=beryl-settings
+GETTEXT_PACKAGE=ccs-settings
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.])
AC_SUBST(GETTEXT_PACKAGE)
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 3bb879b..d3d9654 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,3 +1,3 @@
## Process this file with automake to produce Makefile.in
-man_MANS=beryl-settings.1
+man_MANS=ccs-settings.1
EXTRA_DIST=$(man_MANS)
diff --git a/doc/beryl-settings.1 b/doc/beryl-settings.1
deleted file mode 100644
index 73138c9..0000000
--- a/doc/beryl-settings.1
+++ /dev/null
@@ -1,13 +0,0 @@
-.TH beryl-settings 1 2006-08-24 Beryl "Beryl Settings Manager"
-.SH NAME
-beryl-settings - beryl settings manager
-.SH SYNOPSIS
-.B beryl-settings
-.SH DESCRIPTION
-.I beryl-settings
-is a plugin and composite configuration tool you can use to activate, deactivate, change plugin settings and the Beryl composite manager properties.
-\.
-.SH AUTHORS
-- Quinn Storm (livinglatexkali@gmail.com)
-.SH "SEE ALSO"
-.BR beryl "(1)
diff --git a/doc/ccs-settings.1 b/doc/ccs-settings.1
new file mode 100644
index 0000000..7bc3d0f
--- /dev/null
+++ b/doc/ccs-settings.1
@@ -0,0 +1,13 @@
+.TH ccs-settings 1 2006-08-24 ccs "ccs Settings Manager"
+.SH NAME
+ccs-settings - ccs settings manager
+.SH SYNOPSIS
+.B ccs-settings
+.SH DESCRIPTION
+.I ccs-settings
+is a plugin and composite configuration tool you can use to activate, deactivate, change plugin settings and the Compiz composite manager properties.
+\.
+.SH AUTHORS
+- Quinn Storm (livinglatexkali@gmail.com)
+.SH "SEE ALSO"
+.BR ccs "(1)
diff --git a/makepos b/makepos
index 0f00ffc..89a5ddc 100755
--- a/makepos
+++ b/makepos
@@ -1,8 +1,8 @@
#!/bin/bash
POHEADER='
-# Beryl-Manager intl file.
+# ccs-settings intl file.
# Copyright (C) 2006
-# This file is distributed under the same license as the beryl-manager package.
+# This file is distributed under the same license as the ccs-settings package.
# cyberorg , 2006.
# Steveway (DE translation)
msgid ""
@@ -12,7 +12,7 @@ msgstr ""
"POT-Creation-Date: 2006-09-25 22:07+0530\n"
"PO-Revision-Date: 2006-09-25 17:15+0530\n"
"Last-Translator: Melvil/Steveway\n"
-"Language-Team: beryl-project \n"
+"Language-Team: OpenCompositing \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -87,7 +87,7 @@ then
fi
if [ "$2" = "" ]
then
- SETDIR="/usr/share/beryl/"
+ SETDIR="/usr/share/ccs/"
else
SETDIR=$2
fi
diff --git a/misc/Makefile.am b/misc/Makefile.am
index b58e039..0fa2d7f 100644
--- a/misc/Makefile.am
+++ b/misc/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with automake to produce Makefile.in
desktopdir = $(datadir)/applications/
-desktop_DATA = beryl-settings.desktop
+desktop_DATA = ccs-settings.desktop
-hintsdir = $(datadir)/beryl/
+hintsdir = $(datadir)/ccs/
hints_DATA = hints
EXTRA_DIST = $(desktop_DATA) $(hints_DATA)
diff --git a/misc/beryl-settings.desktop b/misc/beryl-settings.desktop
deleted file mode 100644
index 1546a89..0000000
--- a/misc/beryl-settings.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Beryl Settings Manager
-Comment=Configure beryl
-Icon=/usr/share/pixmaps/beryl-settings.svg
-Exec=beryl-settings
-Terminal=false
-Type=Application
-Categories=Settings;
diff --git a/misc/ccs-settings.desktop b/misc/ccs-settings.desktop
new file mode 100644
index 0000000..1feeac5
--- /dev/null
+++ b/misc/ccs-settings.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=CCS Settings Manager
+Comment=Configure Compiz
+Icon=/usr/share/pixmaps/ccs-settings.svg
+Exec=ccs-settings
+Terminal=false
+Type=Application
+Categories=Settings;
diff --git a/pixmaps/Makefile.am b/pixmaps/Makefile.am
index 7b2abf9..fc785ea 100644
--- a/pixmaps/Makefile.am
+++ b/pixmaps/Makefile.am
@@ -1,37 +1,37 @@
## Process this file with automake to produce Makefile.in
pixmapsdir = $(datadir)/pixmaps
pixmaps_DATA = \
- beryl-settings.svg \
- beryl-settings-section-_.svg \
- beryl-settings-section-animation.svg \
- beryl-settings-section-bench.svg \
- beryl-settings-section-blurfx.svg \
- beryl-settings-section-blur.svg \
- beryl-settings-section-bs.svg \
- beryl-settings-section-capture.svg \
- beryl-settings-section-crashhandler.svg \
- beryl-settings-section-cube.svg \
- beryl-settings-section-dbus.svg \
- beryl-settings-section-decoration.svg \
- beryl-settings-section-fade.svg \
- beryl-settings-section-minimize.svg \
- beryl-settings-section-move.svg \
- beryl-settings-section-neg.svg \
- beryl-settings-section-place.svg \
- beryl-settings-section-plane.svg \
- beryl-settings-section-put.svg \
- beryl-settings-section-reflex.svg \
- beryl-settings-section-resize.svg \
- beryl-settings-section-rotate.svg \
- beryl-settings-section-scale.svg \
- beryl-settings-section-screenshot.svg \
- beryl-settings-section-showdesktop.svg \
- beryl-settings-section-splash.svg \
- beryl-settings-section-state.svg \
- beryl-settings-section-switcher.svg \
- beryl-settings-section-trailfocus.svg \
- beryl-settings-section-water.svg \
- beryl-settings-section-wobbly.svg \
- beryl-settings-section-zoom.svg
+ ccs-settings.svg \
+ ccs-settings-section-_.svg \
+ ccs-settings-section-animation.svg \
+ ccs-settings-section-bench.svg \
+ ccs-settings-section-blurfx.svg \
+ ccs-settings-section-blur.svg \
+ ccs-settings-section-bs.svg \
+ ccs-settings-section-capture.svg \
+ ccs-settings-section-crashhandler.svg \
+ ccs-settings-section-cube.svg \
+ ccs-settings-section-dbus.svg \
+ ccs-settings-section-decoration.svg \
+ ccs-settings-section-fade.svg \
+ ccs-settings-section-minimize.svg \
+ ccs-settings-section-move.svg \
+ ccs-settings-section-neg.svg \
+ ccs-settings-section-place.svg \
+ ccs-settings-section-plane.svg \
+ ccs-settings-section-put.svg \
+ ccs-settings-section-reflex.svg \
+ ccs-settings-section-resize.svg \
+ ccs-settings-section-rotate.svg \
+ ccs-settings-section-scale.svg \
+ ccs-settings-section-screenshot.svg \
+ ccs-settings-section-showdesktop.svg \
+ ccs-settings-section-splash.svg \
+ ccs-settings-section-state.svg \
+ ccs-settings-section-switcher.svg \
+ ccs-settings-section-trailfocus.svg \
+ ccs-settings-section-water.svg \
+ ccs-settings-section-wobbly.svg \
+ ccs-settings-section-zoom.svg
EXTRA_DIST = $(pixmaps_DATA)
diff --git a/pixmaps/beryl-settings-section-_.svg b/pixmaps/ccs-settings-section-_.svg
index f94f32a..f94f32a 100644
--- a/pixmaps/beryl-settings-section-_.svg
+++ b/pixmaps/ccs-settings-section-_.svg
diff --git a/pixmaps/beryl-settings-section-animation.svg b/pixmaps/ccs-settings-section-animation.svg
index 4706964..4706964 100644
--- a/pixmaps/beryl-settings-section-animation.svg
+++ b/pixmaps/ccs-settings-section-animation.svg
diff --git a/pixmaps/beryl-settings-section-bench.svg b/pixmaps/ccs-settings-section-bench.svg
index 087b36d..087b36d 100644
--- a/pixmaps/beryl-settings-section-bench.svg
+++ b/pixmaps/ccs-settings-section-bench.svg
diff --git a/pixmaps/beryl-settings-section-blur.svg b/pixmaps/ccs-settings-section-blur.svg
index 302d419..302d419 100644
--- a/pixmaps/beryl-settings-section-blur.svg
+++ b/pixmaps/ccs-settings-section-blur.svg
diff --git a/pixmaps/beryl-settings-section-blurfx.svg b/pixmaps/ccs-settings-section-blurfx.svg
index e35ba4b..e35ba4b 100644
--- a/pixmaps/beryl-settings-section-blurfx.svg
+++ b/pixmaps/ccs-settings-section-blurfx.svg
diff --git a/pixmaps/beryl-settings-section-bs.svg b/pixmaps/ccs-settings-section-bs.svg
index a640f40..a640f40 100644
--- a/pixmaps/beryl-settings-section-bs.svg
+++ b/pixmaps/ccs-settings-section-bs.svg
diff --git a/pixmaps/beryl-settings-section-capture.svg b/pixmaps/ccs-settings-section-capture.svg
index e4bdd62..e4bdd62 100644
--- a/pixmaps/beryl-settings-section-capture.svg
+++ b/pixmaps/ccs-settings-section-capture.svg
diff --git a/pixmaps/beryl-settings-section-crashhandler.svg b/pixmaps/ccs-settings-section-crashhandler.svg
index 1b9b56c..1b9b56c 100644
--- a/pixmaps/beryl-settings-section-crashhandler.svg
+++ b/pixmaps/ccs-settings-section-crashhandler.svg
diff --git a/pixmaps/beryl-settings-section-cube.svg b/pixmaps/ccs-settings-section-cube.svg
index 203af41..203af41 100644
--- a/pixmaps/beryl-settings-section-cube.svg
+++ b/pixmaps/ccs-settings-section-cube.svg
diff --git a/pixmaps/beryl-settings-section-dbus.svg b/pixmaps/ccs-settings-section-dbus.svg
index 5cb7454..53cb94b 100644
--- a/pixmaps/beryl-settings-section-dbus.svg
+++ b/pixmaps/ccs-settings-section-dbus.svg
@@ -13,9 +13,7 @@
height="48px"
id="svg1306"
sodipodi:version="0.32"
- inkscape:version="0.44"
- sodipodi:docbase="/home/andrew/Desktop"
- sodipodi:docname="beryl-section-Dbus.svg">
+ inkscape:version="0.44">
<defs
id="defs1308">
<linearGradient
diff --git a/pixmaps/beryl-settings-section-decoration.svg b/pixmaps/ccs-settings-section-decoration.svg
index 3b6e3d5..f6d4dc0 100644
--- a/pixmaps/beryl-settings-section-decoration.svg
+++ b/pixmaps/ccs-settings-section-decoration.svg
@@ -13,9 +13,7 @@
height="48px"
id="svg6009"
sodipodi:version="0.32"
- inkscape:version="0.44"
- sodipodi:docbase="/home/andrew/Desktop"
- sodipodi:docname="beryl-section-window_decorator.svg">
+ inkscape:version="0.44">
<defs
id="defs6011">
<linearGradient
diff --git a/pixmaps/beryl-settings-section-fade.svg b/pixmaps/ccs-settings-section-fade.svg
index 943d073..943d073 100644
--- a/pixmaps/beryl-settings-section-fade.svg
+++ b/pixmaps/ccs-settings-section-fade.svg
diff --git a/pixmaps/beryl-settings-section-minimize.svg b/pixmaps/ccs-settings-section-minimize.svg
index 9cd8cc2..9cd8cc2 100644
--- a/pixmaps/beryl-settings-section-minimize.svg
+++ b/pixmaps/ccs-settings-section-minimize.svg
diff --git a/pixmaps/beryl-settings-section-move.svg b/pixmaps/ccs-settings-section-move.svg
index ed139a9..ed139a9 100644
--- a/pixmaps/beryl-settings-section-move.svg
+++ b/pixmaps/ccs-settings-section-move.svg
diff --git a/pixmaps/beryl-settings-section-neg.svg b/pixmaps/ccs-settings-section-neg.svg
index f03843e..f03843e 100644
--- a/pixmaps/beryl-settings-section-neg.svg
+++ b/pixmaps/ccs-settings-section-neg.svg
diff --git a/pixmaps/beryl-settings-section-place.svg b/pixmaps/ccs-settings-section-place.svg
index 7544b7b..7544b7b 100644
--- a/pixmaps/beryl-settings-section-place.svg
+++ b/pixmaps/ccs-settings-section-place.svg
diff --git a/pixmaps/beryl-settings-section-plane.svg b/pixmaps/ccs-settings-section-plane.svg
index 04f1e96..04f1e96 100644
--- a/pixmaps/beryl-settings-section-plane.svg
+++ b/pixmaps/ccs-settings-section-plane.svg
diff --git a/pixmaps/beryl-settings-section-put.svg b/pixmaps/ccs-settings-section-put.svg
index 5cad617..5cad617 100644
--- a/pixmaps/beryl-settings-section-put.svg
+++ b/pixmaps/ccs-settings-section-put.svg
diff --git a/pixmaps/beryl-settings-section-reflex.svg b/pixmaps/ccs-settings-section-reflex.svg
index 7a93e57..7a93e57 100644
--- a/pixmaps/beryl-settings-section-reflex.svg
+++ b/pixmaps/ccs-settings-section-reflex.svg
diff --git a/pixmaps/beryl-settings-section-resize.svg b/pixmaps/ccs-settings-section-resize.svg
index 3e6af08..3e6af08 100644
--- a/pixmaps/beryl-settings-section-resize.svg
+++ b/pixmaps/ccs-settings-section-resize.svg
diff --git a/pixmaps/beryl-settings-section-rotate.svg b/pixmaps/ccs-settings-section-rotate.svg
index 66c2c96..66c2c96 100644
--- a/pixmaps/beryl-settings-section-rotate.svg
+++ b/pixmaps/ccs-settings-section-rotate.svg
diff --git a/pixmaps/beryl-settings-section-scale.svg b/pixmaps/ccs-settings-section-scale.svg
index 3362abe..3362abe 100644
--- a/pixmaps/beryl-settings-section-scale.svg
+++ b/pixmaps/ccs-settings-section-scale.svg
diff --git a/pixmaps/beryl-settings-section-screenshot.svg b/pixmaps/ccs-settings-section-screenshot.svg
index 9f64a9b..9f64a9b 100644
--- a/pixmaps/beryl-settings-section-screenshot.svg
+++ b/pixmaps/ccs-settings-section-screenshot.svg
diff --git a/pixmaps/beryl-settings-section-showdesktop.svg b/pixmaps/ccs-settings-section-showdesktop.svg
index 2ce11ae..2ce11ae 100644
--- a/pixmaps/beryl-settings-section-showdesktop.svg
+++ b/pixmaps/ccs-settings-section-showdesktop.svg
diff --git a/pixmaps/beryl-settings-section-splash.svg b/pixmaps/ccs-settings-section-splash.svg
index d2be800..67ed79e 100644
--- a/pixmaps/beryl-settings-section-splash.svg
+++ b/pixmaps/ccs-settings-section-splash.svg
@@ -13,9 +13,7 @@
height="48px"
id="svg1872"
sodipodi:version="0.32"
- inkscape:version="0.44"
- sodipodi:docbase="/home/andrew/Desktop"
- sodipodi:docname="beryl-section-splash.svg">
+ inkscape:version="0.44">
<defs
id="defs1874">
<linearGradient
diff --git a/pixmaps/beryl-settings-section-state.svg b/pixmaps/ccs-settings-section-state.svg
index 10acd88..10acd88 100644
--- a/pixmaps/beryl-settings-section-state.svg
+++ b/pixmaps/ccs-settings-section-state.svg
diff --git a/pixmaps/beryl-settings-section-switcher.svg b/pixmaps/ccs-settings-section-switcher.svg
index bcb51e2..bcb51e2 100644
--- a/pixmaps/beryl-settings-section-switcher.svg
+++ b/pixmaps/ccs-settings-section-switcher.svg
diff --git a/pixmaps/beryl-settings-section-trailfocus.svg b/pixmaps/ccs-settings-section-trailfocus.svg
index 653260b..653260b 100644
--- a/pixmaps/beryl-settings-section-trailfocus.svg
+++ b/pixmaps/ccs-settings-section-trailfocus.svg
diff --git a/pixmaps/beryl-settings-section-water.svg b/pixmaps/ccs-settings-section-water.svg
index 73ec636..73ec636 100644
--- a/pixmaps/beryl-settings-section-water.svg
+++ b/pixmaps/ccs-settings-section-water.svg
diff --git a/pixmaps/beryl-settings-section-wobbly.svg b/pixmaps/ccs-settings-section-wobbly.svg
index 7687771..7687771 100644
--- a/pixmaps/beryl-settings-section-wobbly.svg
+++ b/pixmaps/ccs-settings-section-wobbly.svg
diff --git a/pixmaps/beryl-settings-section-zoom.svg b/pixmaps/ccs-settings-section-zoom.svg
index 6957221..6957221 100644
--- a/pixmaps/beryl-settings-section-zoom.svg
+++ b/pixmaps/ccs-settings-section-zoom.svg
diff --git a/pixmaps/beryl-settings.svg b/pixmaps/ccs-settings.svg
index f94f32a..f94f32a 100644
--- a/pixmaps/beryl-settings.svg
+++ b/pixmaps/ccs-settings.svg
diff --git a/po/Makevars b/po/Makevars
index 6421c4e..22b4b52 100644
--- a/po/Makevars
+++ b/po/Makevars
@@ -1,7 +1,7 @@
# Makefile variables for PO directory in any package using GNU gettext.
# Usually the message domain is the same as the package name.
-DOMAIN = beryl-settings
+DOMAIN = ccs-settings
# These two variables depend on the location of this directory.
subdir = po
@@ -18,7 +18,7 @@ XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --no-location
# or entity, or to disclaim their copyright. The empty string stands for
# the public domain; in this case the translators are expected to disclaim
# their copyright.
-COPYRIGHT_HOLDER = beryl-project.org.
+COPYRIGHT_HOLDER = opencompositing.org.
# This is the email address or URL to which the translators shall report
# bugs in the untranslated strings:
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 29f4143..e723152 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,25 +1 @@
-../../beryl-plugins/src/animation.c
-../../beryl-plugins/src/neg.c
-../../beryl-plugins/src/showdesktop.c
-../../beryl-plugins/src/bench.c
-../../beryl-plugins/src/blurfx.c
-../../beryl-plugins/src/bs.c
-../../beryl-plugins/src/crashhandler.c
-../../beryl-plugins/src/put.c
-../../beryl-plugins/src/screenshot.c
-../../beryl-plugins/src/state.c
-../../beryl-plugins/src/settings.c
-../../beryl-plugins/src/trailfocus.c
-../../beryl-plugins/src/cube.c
-../../beryl-plugins/src/decoration.c
-../../beryl-plugins/src/fade.c
-../../beryl-plugins/src/move.c
-../../beryl-plugins/src/place.c
-../../beryl-plugins/src/resize.c
-../../beryl-plugins/src/rotate.c
-../../beryl-plugins/src/scale.c
-../../beryl-plugins/src/switcher.c
-../../beryl-plugins/src/water.c
-../../beryl-plugins/src/wobbly.c
-../../beryl-plugins/src/zoom.c
src/main.c
diff --git a/po/beryl-settings.pot b/po/ccs-settings.pot
index 2e41c74..9778e8e 100644
--- a/po/beryl-settings.pot
+++ b/po/ccs-settings.pot
@@ -1608,7 +1608,7 @@ msgstr ""
msgid "Browse for "
msgstr ""
-msgid "Beryl Image Types (PNG,SVG)"
+msgid "Compiz Image Types (PNG,SVG)"
msgstr ""
msgid "update-preview"
@@ -1674,7 +1674,7 @@ msgid ""
"to provide <i>%s</i> for <i>%s</i>"
msgstr ""
-msgid "Beryl Settings - Resolve Dependancy"
+msgid "Compiz Settings - Resolve Dependancy"
msgstr ""
msgid "Profile Imported"
@@ -1692,13 +1692,13 @@ msgstr ""
msgid "Import Profiles: Overwrites the Selected Profile..."
msgstr ""
-msgid "Beryl Settings Profiles"
+msgid "Compiz Settings Profiles"
msgstr ""
msgid "General Options"
msgstr ""
-msgid "Options for Beryl as a whole"
+msgid "Options for Compiz as a whole"
msgstr ""
msgid "Hide"
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 05ae5bf..9f16a7e 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -1,4 +1,4 @@
-# Beryl-Settings
+# CCS-Settings
# Copyright (C) 2006
# This file is distributed under the same license as the PACKAGE package.
# cyberorg <cyberorg@cyberorg.info>, 2006.
@@ -6,18 +6,18 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: beryl-settings 0.1\n"
-"Report-Msgid-Bugs-To: http://bugs.beryl-project.org/\n"
+"Project-Id-Version: ccs-settings 0.1\n"
+"Report-Msgid-Bugs-To: http://bugs.compiz-project.org/\n"
"POT-Creation-Date: 2006-09-27 19:54+0530\n"
"PO-Revision-Date: 2006-10-16 23:47+0200\n"
-"Last-Translator: reggaemanu <reggaemanu@beryl-project.org>\n"
-"Language-Team: Beryl-Project <cyberorg@cyberorg.info>\n"
+"Last-Translator: reggaemanu <reggaemanu@compiz-project.org>\n"
+"Language-Team: OpenCompositing <cyberorg@cyberorg.info>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit"
#: main.c:1356
-msgid "Beryl Image Types (PNG,SVG)"
+msgid "Compiz Image Types (PNG,SVG)"
msgstr "Images supportés (PNG,SVG)"
#: main.c:1522 main.c:1859
@@ -93,8 +93,8 @@ msgid "General Options"
msgstr "Options générales"
#: main.c:2286
-msgid "Options for Beryl as a whole"
-msgstr "Options générales de Beryl"
+msgid "Options for Compiz as a whole"
+msgstr "Options générales de Compiz"
msgid "Animations"
msgstr "Animations"
@@ -445,7 +445,7 @@ msgid "Benchmark"
msgstr "Benchmark"
msgid "A simple benchmark plugin"
-msgstr "Performances de Beryl en temps réel"
+msgstr "Performances de Compiz en temps réel"
msgid "Initiate"
msgstr "Initialisation"
@@ -456,8 +456,8 @@ msgstr "Raccourci clavier permettant d'activer le benchmark"
msgid "Disable limiter"
msgstr "Désactiver le limiteur"
-msgid "Disable beryl integrated FPS limiter"
-msgstr "Désactive le limiteur de fréquence de rafraîchissement intégré à Beryl"
+msgid "Disable compiz integrated FPS limiter"
+msgstr "Désactive le limiteur de fréquence de rafraîchissement intégré à Compiz"
msgid "Position x"
msgstr "Position x"
@@ -717,8 +717,8 @@ msgstr "Nombres de pourcentages de luminosité différents disponibles"
msgid "Crash handler"
msgstr "Gestion des Crashs"
-msgid "Beryl crash handler plugin"
-msgstr "Permet de gérer les crashs de Beryl"
+msgid "Compiz crash handler plugin"
+msgstr "Permet de gérer les crashs de Compiz"
msgid "Enabled"
msgstr "Activé"
@@ -736,7 +736,7 @@ msgid "Window manager command line"
msgstr "Commande pour le gestionnaire de fenêtre de secours"
msgid "Window manager command line. DO NOT ENTER COMPIZ HERE!!!"
-msgstr "Commande utilisée pour lancer le gestionnaire de fenêtre de secours. (NE SURTOUT PAS UTILISER BERYL ICI)"
+msgstr "Commande utilisée pour lancer le gestionnaire de fenêtre de secours. (NE SURTOUT PAS UTILISER COMPIZ ICI)"
msgid "Desktop Cube"
msgstr "Bureau en Cube"
@@ -865,7 +865,7 @@ msgid "Dbus"
msgstr "Dbus"
msgid "Dbus Control Backend"
-msgstr "Permet d'utiliser dbus pour contrôler beryl"
+msgstr "Permet d'utiliser dbus pour contrôler compiz"
msgid "Window Decoration"
msgstr "Décorations"
@@ -2197,8 +2197,8 @@ msgstr "Ne rafraichir l'écran que lors du rafraichissement vertical"
msgid "Slowness Fix"
msgstr "Contourner d'éventuels problèmes de lenteur"
-msgid "Toggle this option if beryl is slow or choppy. On some cards, enabling it makes beryl smoother, and on others, disabling makes beryl smoother."
-msgstr "Activez cette option si Beryl est lent ou saccadé. Sur certaines cartes graphique, activer cette option rend Beryl plus fluide. Et sur d'autres, la désactiver le rend plus fluide."
+msgid "Toggle this option if compiz is slow or choppy. On some cards, enabling it makes compiz smoother, and on others, disabling makes compiz smoother."
+msgstr "Activez cette option si Compiz est lent ou saccadé. Sur certaines cartes graphique, activer cette option rend Compiz plus fluide. Et sur d'autres, la désactiver le rend plus fluide."
msgid "Vertical Virtual Size"
msgstr "Taille virtuelle verticale"
diff --git a/po/it_IT.po b/po/it_IT.po
index 31c6f3b..82cf6aa 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -1,5 +1,5 @@
-# translation of beryl-settings.po to ITALIAN
-# Beryl-Settings
+# translation of ccs-settings.po to ITALIAN
+# CCS-Settings
# Copyright (C) 2006
# This file is distributed under the same license as the PACKAGE package.
#
@@ -7,8 +7,8 @@
# Matteo Azzali <kaioth@tiscalinet.it>, 2006.
msgid ""
msgstr ""
-"Project-Id-Version: beryl-settings\n"
-"Report-Msgid-Bugs-To: http://bugs.beryl-project.org/\n"
+"Project-Id-Version: ccs-settings\n"
+"Report-Msgid-Bugs-To: http://bugs.compiz-project.org/\n"
"POT-Creation-Date: 2006-09-27 19:54+0530\n"
"PO-Revision-Date: 2006-10-01 16:41+0200\n"
"Last-Translator: Matteo Azzali <kaioth@tiscalinet.it>\n"
@@ -20,8 +20,8 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: main.c:1356
-msgid "Beryl Image Types (PNG,SVG)"
-msgstr "Tipi Immagine Beryl (PNG,SVG)"
+msgid "Compiz Image Types (PNG,SVG)"
+msgstr "Tipi Immagine Compiz (PNG,SVG)"
#: main.c:1522 main.c:1859
msgid "Browse"
@@ -367,8 +367,8 @@ msgstr "Avvia benchmark"
msgid "Disable limiter"
msgstr "Togli limitatore"
-msgid "Disable beryl integrated FPS limiter"
-msgstr "Togli il limitatore di FPS integrato di beryl"
+msgid "Disable compiz integrated FPS limiter"
+msgstr "Togli il limitatore di FPS integrato di compiz"
msgid "Position x"
msgstr "Psizione x"
@@ -625,7 +625,7 @@ msgstr "Passo incremento luminosita'"
msgid "Crash handler"
msgstr "Gestore dei Crash"
-msgid "Beryl crash handler plugin"
+msgid "Compiz crash handler plugin"
msgstr "Plugin gestore dei crash di beeryl"
msgid "Enabled"
@@ -2074,8 +2074,8 @@ msgstr "Effettua aggiornamenti schermo solo durante il tempo di rientro vertical
msgid "Slowness Fix"
msgstr "Fix Lentezza"
-msgid "Toggle this option if beryl is slow or choppy. On some cards, enabling it makes beryl smoother, and on others, disabling makes beryl smoother."
-msgstr "Commuta questa opzione se beryl e' lento o scattoso. Su alcune schede video rende beryl piu'veloce, su altre lo rende piu'lento"
+msgid "Toggle this option if compiz is slow or choppy. On some cards, enabling it makes compiz smoother, and on others, disabling makes compiz smoother."
+msgstr "Commuta questa opzione se compiz e' lento o scattoso. Su alcune schede video rende compiz piu'veloce, su altre lo rende piu'lento"
msgid "Vertical Virtual Size"
msgstr "Dimensione Virtuale Verticale"
diff --git a/po/ko_KR.po b/po/ko_KR.po
index ba45ec3..6f93667 100644
--- a/po/ko_KR.po
+++ b/po/ko_KR.po
@@ -1,4 +1,4 @@
-# Beryl-Settings
+# CCS-Settings
# Copyright (C) 2006
# This file is distributed under the same license as the PACKAGE package.
# cyberorg <cyberorg@cyberorg.info>, 2006.
@@ -6,18 +6,18 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: beryl-settings 0.1\n"
-"Report-Msgid-Bugs-To: http://bugs.beryl-project.org/\n"
+"Project-Id-Version: ccs-settings 0.1\n"
+"Report-Msgid-Bugs-To: http://bugs.compiz-project.org/\n"
"POT-Creation-Date: 2006-09-27 19:54+0530\n"
"PO-Revision-Date: 2006-10-09 02:28-0500\n"
"Last-Translator: atie H. <atie.at.matrix@gmail.com>\n"
-"Language-Team: Beryl-Project <cyberorg@cyberorg.info>\n"
+"Language-Team: OpenCompositing <cyberorg@cyberorg.info>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit"
#: main.c:1356
-msgid "Beryl Image Types (PNG,SVG)"
+msgid "Compiz Image Types (PNG,SVG)"
msgstr "베릴 그림 종류 (PNG,SVG)"
#: main.c:1522 main.c:1859
@@ -93,7 +93,7 @@ msgid "General Options"
msgstr "일반 설정"
#: main.c:2286
-msgid "Options for Beryl as a whole"
+msgid "Options for Compiz as a whole"
msgstr "베릴 전체를 위한 설정"
msgid "Animations"
@@ -459,7 +459,7 @@ msgstr "벤치마크 시작"
msgid "Disable limiter"
msgstr "속도제한 하지 않기"
-msgid "Disable beryl integrated FPS limiter"
+msgid "Disable compiz integrated FPS limiter"
msgstr "베릴에 통합된 FPS 속도제한을 사용하지 않습니다."
msgid "Position x"
@@ -721,7 +721,7 @@ msgstr "명도 변경 간격"
msgid "Crash handler"
msgstr "비정상 종료 관리자"
-msgid "Beryl crash handler plugin"
+msgid "Compiz crash handler plugin"
msgstr "베릴 비정상 종료 관리자 플러그인"
msgid "Enabled"
@@ -2225,8 +2225,8 @@ msgid "Slowness Fix"
msgstr "느림 고침"
msgid ""
-"Toggle this option if beryl is slow or choppy. On some cards, enabling it "
-"makes beryl smoother, and on others, disabling makes beryl smoother."
+"Toggle this option if compiz is slow or choppy. On some cards, enabling it "
+"makes compiz smoother, and on others, disabling makes compiz smoother."
msgstr ""
"만약 베릴이 느리거나 끊어지면 이 선택사항을 토글합니다. 몇 몇의 그래픽카드에"
"서는, 이것이 베릴을 자연스럽게 만들지만, 다른 것에서는 이것을 사용하지 않는 "
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 44c0de7..ede8253 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1,4 +1,4 @@
-# Beryl-Settings
+# CCS-Settings
# Copyright (C) 2006
# This file is distributed under the same license as the PACKAGE package.
# cyberorg <cyberorg@cyberorg.info>, 2006.
@@ -6,19 +6,19 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: beryl-settings 0.1\n"
-"Report-Msgid-Bugs-To: http://bugs.beryl-project.org/\n"
+"Project-Id-Version: ccs-settings 0.1\n"
+"Report-Msgid-Bugs-To: http://bugs.compiz-project.org/\n"
"POT-Creation-Date: 2006-09-27 19:54+0530\n"
"PO-Revision-Date: 2006-10-20 19:54+0530\n"
"Last-Translator: DuD@ Ariede <duda@ariede.com.br>\n"
-"Language-Team: Beryl-Project <cyberorg@cyberorg.info>\n"
+"Language-Team: OpenCompositing <cyberorg@cyberorg.info>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: main.c:1356
-msgid "Beryl Image Types (PNG,SVG)"
-msgstr "Tipos de Imagens do Beryl (PNG,SVG)"
+msgid "Compiz Image Types (PNG,SVG)"
+msgstr "Tipos de Imagens do Compiz (PNG,SVG)"
#: main.c:1522 main.c:1859
msgid "Browse"
@@ -364,8 +364,8 @@ msgstr "Inicia/Pâra benchmark"
msgid "Disable limiter"
msgstr "Desabiliar limitador"
-msgid "Disable beryl integrated FPS limiter"
-msgstr "Desabilitar o limitador integrado beryl de FPS"
+msgid "Disable compiz integrated FPS limiter"
+msgstr "Desabilitar o limitador integrado compiz de FPS"
msgid "Position x"
msgstr "Posiçao X"
@@ -622,8 +622,8 @@ msgstr "Altera o passo do brilho"
msgid "Crash handler"
msgstr "Gerenciador de Trava"
-msgid "Beryl crash handler plugin"
-msgstr "Plugin gerenciador de travamento do Beryl"
+msgid "Compiz crash handler plugin"
+msgstr "Plugin gerenciador de travamento do Compiz"
msgid "Enabled"
msgstr "Habilitado"
@@ -635,13 +635,13 @@ msgid "Start Window Manager"
msgstr "Iniciar Gerenciador de Janelas"
msgid "Start other window manager on crash"
-msgstr "Inicia outro gerenciador de janelas quando o Beryl travar"
+msgstr "Inicia outro gerenciador de janelas quando o Compiz travar"
msgid "Window manager command line"
msgstr "Comando para carregar o gerenciador de janelas"
msgid "Window manager command line. DO NOT ENTER COMPIZ HERE!!!"
-msgstr "Comando para carregar o gerenciador de janelas. NÃO UTILIZE O COMANDO DO BERYL AQUI"
+msgstr "Comando para carregar o gerenciador de janelas. NÃO UTILIZE O COMANDO DO COMPIZ AQUI"
msgid "Desktop Cube"
msgstr "Área de Trabalho em Cubo"
@@ -2071,8 +2071,8 @@ msgstr "Executa somente atualização da tela durante o período atualização v
msgid "Slowness Fix"
msgstr "Fixa Lentidão"
-msgid "Toggle this option if beryl is slow or choppy. On some cards, enabling it makes beryl smoother, and on others, disabling makes beryl smoother."
-msgstr "Ative esta opção se o beryl estiver lento ou travando. Em algumas placas, habilitá-lo faz o beryl travar, e em outros casos, desbilitar faz o beryl travar"
+msgid "Toggle this option if compiz is slow or choppy. On some cards, enabling it makes compiz smoother, and on others, disabling makes compiz smoother."
+msgstr "Ative esta opção se o compiz estiver lento ou travando. Em algumas placas, habilitá-lo faz o compiz travar, e em outros casos, desbilitar faz o compiz travar"
msgid "Vertical Virtual Size"
msgstr "Tamanho Vertical Virtual"
diff --git a/po/pt_PT.po b/po/pt_PT.po
index b87ecff..1ef20e8 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -1,23 +1,23 @@
-# Beryl-Settings
+# CCS-Settings
# Copyright (C) 2006
# This file is distributed under the same license as the PACKAGE package.
# cyberorg <cyberorg@cyberorg.info>, 2006.
#
msgid ""
msgstr ""
-"Project-Id-Version: beryl-settings 0.1\n"
-"Report-Msgid-Bugs-To: http://bugs.beryl-project.org/\n"
+"Project-Id-Version: ccs-settings 0.1\n"
+"Report-Msgid-Bugs-To: http://bugs.compiz-project.org/\n"
"POT-Creation-Date: 2006-09-27 19:54+0530\n"
"PO-Revision-Date: 2006-10-25 09:58+0100\n"
-"Last-Translator: xplode_me <xplode_me@beryl-project.org>\n"
-"Language-Team: Beryl-Project <cyberorg@cyberorg.info>\n"
+"Last-Translator: xplode_me <xplode_me@compiz-project.org>\n"
+"Language-Team: OpenCompositing <cyberorg@cyberorg.info>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: main.c:1356
-msgid "Beryl Image Types (PNG,SVG)"
-msgstr "Tipos de Imagens do Beryl (PNG,SVG)"
+msgid "Compiz Image Types (PNG,SVG)"
+msgstr "Tipos de Imagens do Compiz (PNG,SVG)"
#: main.c:1522
#: main.c:1859
@@ -364,8 +364,8 @@ msgstr "Inicia/Pâra benchmark"
msgid "Disable limiter"
msgstr "Desactivar limitador"
-msgid "Disable beryl integrated FPS limiter"
-msgstr "Desactivar o limitador integrado beryl de FPS"
+msgid "Disable compiz integrated FPS limiter"
+msgstr "Desactivar o limitador integrado compiz de FPS"
msgid "Position x"
msgstr "Posição X"
@@ -622,8 +622,8 @@ msgstr "Altera o passo do brilho"
msgid "Crash handler"
msgstr "Gerenciador de Trava"
-msgid "Beryl crash handler plugin"
-msgstr "Plugin gerenciador de travamento do Beryl"
+msgid "Compiz crash handler plugin"
+msgstr "Plugin gerenciador de travamento do Compiz"
msgid "Enabled"
msgstr "Habilitado"
@@ -635,13 +635,13 @@ msgid "Start Window Manager"
msgstr "Iniciar Gerenciador de Janelas"
msgid "Start other window manager on crash"
-msgstr "Inicia outro gerenciador de janelas quando o Beryl travar"
+msgstr "Inicia outro gerenciador de janelas quando o Compiz travar"
msgid "Window manager command line"
msgstr "Comando para carregar o gerenciador de janelas"
msgid "Window manager command line. DO NOT ENTER COMPIZ HERE!!!"
-msgstr "Comando para carregar o gerenciador de janelas. NÃO UTILIZE O COMANDO DO BERYL AQUI"
+msgstr "Comando para carregar o gerenciador de janelas. NÃO UTILIZE O COMANDO DO COMPIZ AQUI"
msgid "Desktop Cube"
msgstr "Área de Trabalho em Cubo"
@@ -2071,8 +2071,8 @@ msgstr "Executa somente actualização do ecrã durante o período de actualiza
msgid "Slowness Fix"
msgstr "Fixa Lentidão"
-msgid "Toggle this option if beryl is slow or choppy. On some cards, enabling it makes beryl smoother, and on others, disabling makes beryl smoother."
-msgstr "Ative esta opção se o beryl estiver lento ou travando. Em algumas placas, habilitá-lo faz o beryl travar, e em outros casos, desbilitar faz o beryl travar"
+msgid "Toggle this option if compiz is slow or choppy. On some cards, enabling it makes compiz smoother, and on others, disabling makes compiz smoother."
+msgstr "Ative esta opção se o compiz estiver lento ou travando. Em algumas placas, habilitá-lo faz o compiz travar, e em outros casos, desbilitar faz o compiz travar"
msgid "Vertical Virtual Size"
msgstr "Tamanho Vertical Virtual"
diff --git a/po/sv_FI.po b/po/sv_FI.po
index c245720..013682a 100644
--- a/po/sv_FI.po
+++ b/po/sv_FI.po
@@ -1,24 +1,24 @@
-# Beryl-Settings
+# CCS-Settings
# Copyright (C) 2006
-# This file is distributed under the same license as the beryl-settings package.
+# This file is distributed under the same license as the ccs-settings package.
# cyberorg <cyberorg@cyberorg.info>, 2006.
#
# , fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: beryl-settings 0.1\n"
-"Report-Msgid-Bugs-To: http://bugs.beryl-project.org/\n"
+"Project-Id-Version: ccs-settings 0.1\n"
+"Report-Msgid-Bugs-To: http://bugs.compiz-project.org/\n"
"POT-Creation-Date: 2006-09-27 19:54+0530\n"
"PO-Revision-Date: 2006-10-19 19:32+0200\n"
"Last-Translator: Fass <ns.fass@gmail.com>\n"
-"Language-Team: Beryl-Project <cyberorg@cyberorg.info>\n"
+"Language-Team: OpenCompositing <cyberorg@cyberorg.info>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit"
#: main.c:1356
-msgid "Beryl Image Types (PNG,SVG)"
-msgstr "Beryl-bildtyper (PNG,SVG)"
+msgid "Compiz Image Types (PNG,SVG)"
+msgstr "Compiz-bildtyper (PNG,SVG)"
#: main.c:1522 main.c:1859
msgid "Browse"
@@ -93,8 +93,8 @@ msgid "General Options"
msgstr "Allmänna inställningar"
#: main.c:2286
-msgid "Options for Beryl as a whole"
-msgstr "Inställningar för hela Beryl"
+msgid "Options for Compiz as a whole"
+msgstr "Inställningar för hela Compiz"
msgid "Animations"
msgstr "Animationer"
@@ -456,8 +456,8 @@ msgstr "Starta benchmark"
msgid "Disable limiter"
msgstr "Stäng av begränsare"
-msgid "Disable beryl integrated FPS limiter"
-msgstr "Stäng av beryls integrerade FPS-begränsare"
+msgid "Disable compiz integrated FPS limiter"
+msgstr "Stäng av compizs integrerade FPS-begränsare"
msgid "Position x"
msgstr "Position x"
@@ -714,8 +714,8 @@ msgstr "Ljusstyrkeändringsinkrement"
msgid "Crash handler"
msgstr "Kraschhanterare"
-msgid "Beryl crash handler plugin"
-msgstr "Beryls instickmodul för kraschhantering"
+msgid "Compiz crash handler plugin"
+msgstr "Compizs instickmodul för kraschhantering"
msgid "Enabled"
msgstr "Aktiverad"
@@ -733,7 +733,7 @@ msgid "Window manager command line"
msgstr "Fönsterhanterarens kommandorad"
msgid "Window manager command line. DO NOT ENTER COMPIZ HERE!!!"
-msgstr "Fönsterhanterarens kommandorad. ANGE INTE BERYL HÄR!!!"
+msgstr "Fönsterhanterarens kommandorad. ANGE INTE COMPIZ HÄR!!!"
msgid "Desktop Cube"
msgstr "Skrivbordskub"
@@ -2181,8 +2181,8 @@ msgstr "Utför skärmuppdateringar endast under vertikal blankningsperiod"
msgid "Slowness Fix"
msgstr "Långsamhetsfix"
-msgid "Toggle this option if beryl is slow or choppy. On some cards, enabling it makes beryl smoother, and on others, disabling makes beryl smoother."
-msgstr "Sätt på eller stäng av detta alternativ om beryl är långsamt eller hackar. På vissa kort blir beryl snabbare om det är på, och på andra blir beryl snabbare om det är av."
+msgid "Toggle this option if compiz is slow or choppy. On some cards, enabling it makes compiz smoother, and on others, disabling makes compiz smoother."
+msgstr "Sätt på eller stäng av detta alternativ om compiz är långsamt eller hackar. På vissa kort blir compiz snabbare om det är på, och på andra blir compiz snabbare om det är av."
msgid "Vertical Virtual Size"
msgstr "Vertikal virtuell storlek"
diff --git a/po/sv_SE.po b/po/sv_SE.po
index c245720..013682a 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -1,24 +1,24 @@
-# Beryl-Settings
+# CCS-Settings
# Copyright (C) 2006
-# This file is distributed under the same license as the beryl-settings package.
+# This file is distributed under the same license as the ccs-settings package.
# cyberorg <cyberorg@cyberorg.info>, 2006.
#
# , fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: beryl-settings 0.1\n"
-"Report-Msgid-Bugs-To: http://bugs.beryl-project.org/\n"
+"Project-Id-Version: ccs-settings 0.1\n"
+"Report-Msgid-Bugs-To: http://bugs.compiz-project.org/\n"
"POT-Creation-Date: 2006-09-27 19:54+0530\n"
"PO-Revision-Date: 2006-10-19 19:32+0200\n"
"Last-Translator: Fass <ns.fass@gmail.com>\n"
-"Language-Team: Beryl-Project <cyberorg@cyberorg.info>\n"
+"Language-Team: OpenCompositing <cyberorg@cyberorg.info>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit"
#: main.c:1356
-msgid "Beryl Image Types (PNG,SVG)"
-msgstr "Beryl-bildtyper (PNG,SVG)"
+msgid "Compiz Image Types (PNG,SVG)"
+msgstr "Compiz-bildtyper (PNG,SVG)"
#: main.c:1522 main.c:1859
msgid "Browse"
@@ -93,8 +93,8 @@ msgid "General Options"
msgstr "Allmänna inställningar"
#: main.c:2286
-msgid "Options for Beryl as a whole"
-msgstr "Inställningar för hela Beryl"
+msgid "Options for Compiz as a whole"
+msgstr "Inställningar för hela Compiz"
msgid "Animations"
msgstr "Animationer"
@@ -456,8 +456,8 @@ msgstr "Starta benchmark"
msgid "Disable limiter"
msgstr "Stäng av begränsare"
-msgid "Disable beryl integrated FPS limiter"
-msgstr "Stäng av beryls integrerade FPS-begränsare"
+msgid "Disable compiz integrated FPS limiter"
+msgstr "Stäng av compizs integrerade FPS-begränsare"
msgid "Position x"
msgstr "Position x"
@@ -714,8 +714,8 @@ msgstr "Ljusstyrkeändringsinkrement"
msgid "Crash handler"
msgstr "Kraschhanterare"
-msgid "Beryl crash handler plugin"
-msgstr "Beryls instickmodul för kraschhantering"
+msgid "Compiz crash handler plugin"
+msgstr "Compizs instickmodul för kraschhantering"
msgid "Enabled"
msgstr "Aktiverad"
@@ -733,7 +733,7 @@ msgid "Window manager command line"
msgstr "Fönsterhanterarens kommandorad"
msgid "Window manager command line. DO NOT ENTER COMPIZ HERE!!!"
-msgstr "Fönsterhanterarens kommandorad. ANGE INTE BERYL HÄR!!!"
+msgstr "Fönsterhanterarens kommandorad. ANGE INTE COMPIZ HÄR!!!"
msgid "Desktop Cube"
msgstr "Skrivbordskub"
@@ -2181,8 +2181,8 @@ msgstr "Utför skärmuppdateringar endast under vertikal blankningsperiod"
msgid "Slowness Fix"
msgstr "Långsamhetsfix"
-msgid "Toggle this option if beryl is slow or choppy. On some cards, enabling it makes beryl smoother, and on others, disabling makes beryl smoother."
-msgstr "Sätt på eller stäng av detta alternativ om beryl är långsamt eller hackar. På vissa kort blir beryl snabbare om det är på, och på andra blir beryl snabbare om det är av."
+msgid "Toggle this option if compiz is slow or choppy. On some cards, enabling it makes compiz smoother, and on others, disabling makes compiz smoother."
+msgstr "Sätt på eller stäng av detta alternativ om compiz är långsamt eller hackar. På vissa kort blir compiz snabbare om det är på, och på andra blir compiz snabbare om det är av."
msgid "Vertical Virtual Size"
msgstr "Vertikal virtuell storlek"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 1422c96..0de9b64 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,4 +1,4 @@
-# Beryl-Settings
+# CCS-Settings
# Copyright (C) 2006
# This file is distributed under the same license as the PACKAGE package.
# cyberorg <cyberorg@cyberorg.info>, 2006.
@@ -6,19 +6,19 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: beryl-settings 0.1\n"
-"Report-Msgid-Bugs-To: http://bugs.beryl-project.org/\n"
+"Project-Id-Version: ccs-settings 0.1\n"
+"Report-Msgid-Bugs-To: http://bugs.compiz-project.org/\n"
"POT-Creation-Date: 2006-09-27 19:54+0530\n"
"PO-Revision-Date: 2006-10-09 05:58+0200\n"
"Last-Translator: Thruth Wang <gubotruth@gmail.org>\n"
-"Language-Team: Beryl-Project <cyberorg@cyberorg.info>\n"
+"Language-Team: OpenCompositing <cyberorg@cyberorg.info>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit"
#: main.c:1356
-msgid "Beryl Image Types (PNG,SVG)"
-msgstr "Beryl 图像类型 (PNG,SVG)"
+msgid "Compiz Image Types (PNG,SVG)"
+msgstr "Compiz 图像类型 (PNG,SVG)"
#: main.c:1522 main.c:1859
msgid "Browse"
@@ -93,8 +93,8 @@ msgid "General Options"
msgstr "全局选项"
#: main.c:2286
-msgid "Options for Beryl as a whole"
-msgstr "Beryl 全局选项"
+msgid "Options for Compiz as a whole"
+msgstr "Compiz 全局选项"
msgid "Animations"
msgstr "动画效果"
@@ -456,8 +456,8 @@ msgstr "开始测试"
msgid "Disable limiter"
msgstr "取消限制"
-msgid "Disable beryl integrated FPS limiter"
-msgstr "禁用 beryl 内置 FPS 限制"
+msgid "Disable compiz integrated FPS limiter"
+msgstr "禁用 compiz 内置 FPS 限制"
msgid "Position x"
msgstr "X 座标"
@@ -714,8 +714,8 @@ msgstr "亮度每步改变量"
msgid "Crash handler"
msgstr "崩溃处理"
-msgid "Beryl crash handler plugin"
-msgstr "Beryl 崩溃处理插件"
+msgid "Compiz crash handler plugin"
+msgstr "Compiz 崩溃处理插件"
msgid "Enabled"
msgstr "启用"
@@ -2181,8 +2181,8 @@ msgstr "仅在垂直消隐期间刷新屏幕"
msgid "Slowness Fix"
msgstr "加速"
-msgid "Toggle this option if beryl is slow or choppy. On some cards, enabling it makes beryl smoother, and on others, disabling makes beryl smoother."
-msgstr "仅在 beryl 运行缓慢断续时开启这个选项。有些显卡上启用这个选项会使 beryl 运行更平滑,其它的则是不开更好。"
+msgid "Toggle this option if compiz is slow or choppy. On some cards, enabling it makes compiz smoother, and on others, disabling makes compiz smoother."
+msgstr "仅在 compiz 运行缓慢断续时开启这个选项。有些显卡上启用这个选项会使 compiz 运行更平滑,其它的则是不开更好。"
msgid "Vertical Virtual Size"
msgstr "垂直大小"
diff --git a/po/zh_HK.po b/po/zh_HK.po
index d485def..5f88e44 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -1,4 +1,4 @@
-# Beryl-Settings
+# CCS-Settings
# Copyright (C) 2006
# This file is distributed under the same license as the PACKAGE package.
# cyberorg <cyberorg@cyberorg.info>, 2006.
@@ -6,19 +6,19 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: beryl-settings 0.1\n"
-"Report-Msgid-Bugs-To: http://bugs.beryl-project.org/\n"
+"Project-Id-Version: ccs-settings 0.1\n"
+"Report-Msgid-Bugs-To: http://bugs.compiz-project.org/\n"
"POT-Creation-Date: 2006-09-27 19:54+0530\n"
"PO-Revision-Date: 2006-10-09 05:58+0200\n"
"Last-Translator: Thruth Wang <gubotruth@gmail.org>\n"
-"Language-Team: Beryl-Project <cyberorg@cyberorg.info>\n"
+"Language-Team: OpenCompositing <cyberorg@cyberorg.info>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit"
#: main.c:1356
-msgid "Beryl Image Types (PNG,SVG)"
-msgstr "Beryl 圖像類型 (PNG,SVG)"
+msgid "Compiz Image Types (PNG,SVG)"
+msgstr "Compiz 圖像類型 (PNG,SVG)"
#: main.c:1522 main.c:1859
msgid "Browse"
@@ -93,8 +93,8 @@ msgid "General Options"
msgstr "全局選項"
#: main.c:2286
-msgid "Options for Beryl as a whole"
-msgstr "Beryl 全局選項"
+msgid "Options for Compiz as a whole"
+msgstr "Compiz 全局選項"
msgid "Animations"
msgstr "動畫效果"
@@ -456,8 +456,8 @@ msgstr "開始測試"
msgid "Disable limiter"
msgstr "取消限制"
-msgid "Disable beryl integrated FPS limiter"
-msgstr "禁用 beryl 內置 FPS 限制"
+msgid "Disable compiz integrated FPS limiter"
+msgstr "禁用 compiz 內置 FPS 限制"
msgid "Position x"
msgstr "X 座標"
@@ -714,8 +714,8 @@ msgstr "亮度每步改變數"
msgid "Crash handler"
msgstr "崩潰處理"
-msgid "Beryl crash handler plugin"
-msgstr "Beryl 崩潰處理外掛程式"
+msgid "Compiz crash handler plugin"
+msgstr "Compiz 崩潰處理外掛程式"
msgid "Enabled"
msgstr "啟用"
@@ -2181,8 +2181,8 @@ msgstr "僅在垂直消隱期間刷新屏幕"
msgid "Slowness Fix"
msgstr "加速"
-msgid "Toggle this option if beryl is slow or choppy. On some cards, enabling it makes beryl smoother, and on others, disabling makes beryl smoother."
-msgstr "僅在 beryl 運行緩慢斷續時開啟這個選項。有些顯示卡上啟用這個選項會使 beryl 運行更平滑,其它的則是不開更好。"
+msgid "Toggle this option if compiz is slow or choppy. On some cards, enabling it makes compiz smoother, and on others, disabling makes compiz smoother."
+msgstr "僅在 compiz 運行緩慢斷續時開啟這個選項。有些顯示卡上啟用這個選項會使 compiz 運行更平滑,其它的則是不開更好。"
msgid "Vertical Virtual Size"
msgstr "垂直大小"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index d485def..5f88e44 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -1,4 +1,4 @@
-# Beryl-Settings
+# CCS-Settings
# Copyright (C) 2006
# This file is distributed under the same license as the PACKAGE package.
# cyberorg <cyberorg@cyberorg.info>, 2006.
@@ -6,19 +6,19 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: beryl-settings 0.1\n"
-"Report-Msgid-Bugs-To: http://bugs.beryl-project.org/\n"
+"Project-Id-Version: ccs-settings 0.1\n"
+"Report-Msgid-Bugs-To: http://bugs.compiz-project.org/\n"
"POT-Creation-Date: 2006-09-27 19:54+0530\n"
"PO-Revision-Date: 2006-10-09 05:58+0200\n"
"Last-Translator: Thruth Wang <gubotruth@gmail.org>\n"
-"Language-Team: Beryl-Project <cyberorg@cyberorg.info>\n"
+"Language-Team: OpenCompositing <cyberorg@cyberorg.info>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit"
#: main.c:1356
-msgid "Beryl Image Types (PNG,SVG)"
-msgstr "Beryl 圖像類型 (PNG,SVG)"
+msgid "Compiz Image Types (PNG,SVG)"
+msgstr "Compiz 圖像類型 (PNG,SVG)"
#: main.c:1522 main.c:1859
msgid "Browse"
@@ -93,8 +93,8 @@ msgid "General Options"
msgstr "全局選項"
#: main.c:2286
-msgid "Options for Beryl as a whole"
-msgstr "Beryl 全局選項"
+msgid "Options for Compiz as a whole"
+msgstr "Compiz 全局選項"
msgid "Animations"
msgstr "動畫效果"
@@ -456,8 +456,8 @@ msgstr "開始測試"
msgid "Disable limiter"
msgstr "取消限制"
-msgid "Disable beryl integrated FPS limiter"
-msgstr "禁用 beryl 內置 FPS 限制"
+msgid "Disable compiz integrated FPS limiter"
+msgstr "禁用 compiz 內置 FPS 限制"
msgid "Position x"
msgstr "X 座標"
@@ -714,8 +714,8 @@ msgstr "亮度每步改變數"
msgid "Crash handler"
msgstr "崩潰處理"
-msgid "Beryl crash handler plugin"
-msgstr "Beryl 崩潰處理外掛程式"
+msgid "Compiz crash handler plugin"
+msgstr "Compiz 崩潰處理外掛程式"
msgid "Enabled"
msgstr "啟用"
@@ -2181,8 +2181,8 @@ msgstr "僅在垂直消隱期間刷新屏幕"
msgid "Slowness Fix"
msgstr "加速"
-msgid "Toggle this option if beryl is slow or choppy. On some cards, enabling it makes beryl smoother, and on others, disabling makes beryl smoother."
-msgstr "僅在 beryl 運行緩慢斷續時開啟這個選項。有些顯示卡上啟用這個選項會使 beryl 運行更平滑,其它的則是不開更好。"
+msgid "Toggle this option if compiz is slow or choppy. On some cards, enabling it makes compiz smoother, and on others, disabling makes compiz smoother."
+msgstr "僅在 compiz 運行緩慢斷續時開啟這個選項。有些顯示卡上啟用這個選項會使 compiz 運行更平滑,其它的則是不開更好。"
msgid "Vertical Virtual Size"
msgstr "垂直大小"
diff --git a/src/main.c b/src/main.c
index 5edb50a..0b0603d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -45,13 +45,6 @@ CCSContext * context;
gchar * fnprofile;
gchar * profilefile;
gchar * profilefilecontent;
-gchar * profiles [] = {
- ".beryl/settings1.Profile",
- ".beryl/settings2.Profile",
- ".beryl/settings3.Profile",
- ".beryl/settings4.Profile",
- ".beryl/settings5.Profile"
-};
GtkWidget * EntryBox;
typedef struct _SETNumericWidgets
@@ -502,35 +495,6 @@ Bool set_plugin_active(gchar * plugin,gboolean active)
}
-gboolean doing_active_plugins(CCSSetting * o, gboolean reset)
-{
- /*
- if (strcmp(o->name,"active_plugins")==0 && !o->parent->name)
- {
- //initialize to inactive
- if (reset)
- {
- GSList * pl;
- for (pl=Plugins;pl;pl=pl->next)
- {
- SETPlugin * p=pl->data;
- set_plugin_active(p->plugin->name,FALSE);
- }
- }
- //o is of type list[string]
- GSList * p;
- beryl_setting_value_get_value_list(&o->value,&p);
- for(;p;p=p->next)
- {
- //set the plugins active
- //by first finding them...
- set_plugin_active(((BerylSettingValue *)p->data)->value.as_string,TRUE);
- }
- return TRUE;
- }
- */
- return FALSE;
-}
void set_widgets_for_setting(CCSSetting * s)
{
suspend_signals=TRUE;
@@ -821,7 +785,7 @@ void cb_browse(GtkWidget * w, CCSSetting * o)
}
else
{
- gtk_file_filter_set_name(f,_("Beryl Image Types (PNG,SVG)"));
+ gtk_file_filter_set_name(f,_("Compiz Image Types (PNG,SVG)"));
gtk_file_filter_add_mime_type(f,"image/svg");
gtk_file_filter_add_pattern(f,"*.svg");
gtk_file_filter_add_pattern(f,"*.SVG");
@@ -1528,23 +1492,6 @@ gboolean get_plugin_active(gchar * plugin)
}
return b;
}
-void godoing_active_plugins(CCSSetting * o, gpointer p)
-{
- doing_active_plugins(o,FALSE);
-}
-void do_active_plugins()
-{
- /*
- BSSettingList * s = ccsFindPlugin(context,"core")->settings;
- while (s)
- {
- (*func)(s->data,&z);
- s = s->next;
- }
- GSList * settings=beryl_settings_plugin_get_settings(beryl_settings_context_find_plugin(context,NULL));
- g_slist_foreach(settings,(GFunc)godoing_active_plugins,NULL);
- */
-}
void cb_showpage(GtkWidget * w, GtkWidget * p)
{
gint i;
@@ -1576,254 +1523,7 @@ void cb_showpage(GtkWidget * w, GtkWidget * p)
}
g_free(nam);
}
-void beryl_settings_deactivate_plugin(gchar * plugin);
-void beryl_settings_activate_plugin(gchar * plugin);
-
-void check_deps_satisfied(SETPlugin * p)
-{
- /*
- //check that all features are provide'd, and that all require's are loaded
- //if not, call beryl_settings_deactivate_plugin
- GSList * r;
- for (r=p->plugin->requires;r;r=r->next)
- {
- GSList * pl;
- gboolean found=FALSE;
- for (pl=Plugins;pl;pl=pl->next)
- {
- SETPlugin * q = pl->data;
- GSList * s;
- if (q->active)
- {
- for(s=q->plugin->provides;s;s=s->next)
- {
- if (!g_strcasecmp(s->data,r->data))
- {
- found=TRUE;
- break;
- }
- }
- }
- if (found)
- break;
- }
- if (!found)
- {
- beryl_settings_deactivate_plugin(p->plugin->name);
- return;
- }
- }
- */
-}
-
-void beryl_settings_deactivate_plugin(gchar * plugin)
-{
- GSList * pl;
- set_plugin_active(plugin,FALSE);
- for (pl=Plugins;pl;pl=pl->next)
- {
- if (((SETPlugin*)pl->data)->active)
- check_deps_satisfied(pl->data);
- }
-}
-int query_which_activate(SETPlugin * p, gchar * feature, SETPlugin ** prov, int nprov)
-{
- GtkWidget * w;
- GtkWidget * vbox;
- GtkWidget * combobox;
- GtkWidget * l;
- gchar * s;
- gint i;
- s=g_markup_printf_escaped(_("Plugin <i>%s</i> needs feature <i>%s</i>.\n"
- "This feature is provided by multiple plugins.\n"
- "Please select which plugin to activate\n"
- "to provide <i>%s</i> for <i>%s</i>"),p->plugin->shortDesc?p->plugin->shortDesc:p->plugin->name
- ,feature,feature,p->plugin->shortDesc?p->plugin->shortDesc:p->plugin->name);
- w=gtk_dialog_new_with_buttons(_("Beryl Settings - Resolve Dependancy"),
- GTK_WINDOW(mainWindow),GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
- GTK_STOCK_OK,GTK_RESPONSE_ACCEPT,GTK_STOCK_CANCEL,GTK_RESPONSE_REJECT,NULL);
- vbox = GTK_DIALOG(w)->vbox;
- l=gtk_label_new("");
- gtk_label_set_markup(GTK_LABEL(l),s);
- gtk_box_pack_start(GTK_BOX(vbox),l,FALSE,FALSE,0);
- combobox=gtk_combo_box_new_text();
- for(i=0;i<nprov;i++)
- gtk_combo_box_append_text(
- GTK_COMBO_BOX(combobox),prov[i]->plugin->shortDesc?prov[i]->plugin->shortDesc:prov[i]->plugin->name);
- gtk_combo_box_set_active(GTK_COMBO_BOX(combobox),0);
- gtk_box_pack_start(GTK_BOX(vbox),combobox,FALSE,FALSE,0);
- gtk_widget_show_all(vbox);
- if (gtk_dialog_run(GTK_DIALOG(w))==GTK_RESPONSE_ACCEPT)
- {
- i=gtk_combo_box_get_active(GTK_COMBO_BOX(combobox));
- gtk_widget_destroy(w);
- return i;
- }
- else
- {
- gtk_widget_destroy(w);
- }
- return -1;
-}
-gboolean find_feature_provider(SETPlugin * p, gchar * feature)
-{
- /*
- GSList * pl;
- int nprov=0;
- SETPlugin ** prov=NULL;
- for (pl=Plugins;pl;pl=pl->next)
- {
- if (check_contains(((SETPlugin *)pl->data)->plugin->provides,feature))
- {
- nprov++;
- prov=realloc(prov,sizeof(SETPlugin)*nprov);
- prov[nprov-1]=pl->data;
- }
- }
- if (nprov==1)
- {
- beryl_settings_activate_plugin(prov[0]->plugin->name);
- free(prov);
- return TRUE;
- }
- else if (nprov)
- {
- //here's where the magic happens
- int r = query_which_activate(p,feature,prov,nprov);
- if (r!=-1)
- {
- beryl_settings_activate_plugin(prov[r]->plugin->name);
- }
- free(prov);
- return (r!=-1);
- }
- else
- return FALSE;
- */
- return TRUE;
-}
-gboolean fulfill_plugin_deps(SETPlugin * p)
-{
- /*
- GSList * pl;
- GSList * s;
- for(s=p->plugin->requires;s;s=s->next)
- {
- gboolean found=FALSE;
- for(pl=Plugins;pl;pl=pl->next)
- {
- if (check_contains(((SETPlugin *)pl->data)->plugin->provides,s->data) &&
- ((SETPlugin *)pl->data)->active)
- {
- found=TRUE;
- break;
- }
- }
- if (!found)
- {
- if (!find_feature_provider(p,s->data))
- return FALSE;
- }
- }
- */
- return TRUE;
-}
-void clear_conflicts(SETPlugin * p)
-{
- /*
- GSList * pl;
- for (pl=Plugins;pl;pl=pl->next)
- {
- SETPlugin * q = pl->data;
- if (q==p)
- continue;
- if (q->active && check_intersects(p->plugin->provides,q->plugin->provides))
- beryl_settings_deactivate_plugin(q->plugin->name);
- }
- */
-}
-void beryl_settings_activate_plugin(gchar * plugin)
-{
- //check plugin deps first
- SETPlugin * p=NULL;
- GSList * pl=NULL;
- set_plugin_active(plugin,TRUE); // makes other plugins' deps work right
- for(pl=Plugins;pl;pl=pl->next)
- if (!g_strcasecmp(((SETPlugin *)pl->data)->plugin->name?
- ((SETPlugin *)pl->data)->plugin->name:"_",plugin))
- break;
- if (pl)
- p=pl->data;
- if (!p)
- return;
- clear_conflicts(p);
- if (!fulfill_plugin_deps(p))
- beryl_settings_deactivate_plugin(plugin);
-}
-void compile_plugin_order_list()
-{
- /*
- SETPlugin * p;
- static gchar * prepend[]={"settings","crashhandler"};
- static const int nPrepend=sizeof(prepend)/sizeof(gchar *);
- gboolean preFound[]={FALSE};
- static gchar * append[]={"blurfx","bench"};
- static const int nAppend=sizeof(append)/sizeof(gchar *);
- gboolean appFound[]={FALSE,FALSE};
- Plugins=NULL;
- gint i;
- for (i=0;i<nPages;i++)
- {
- GSList * pl;
- gboolean found=FALSE;
- gint j;
- if (!strcmp("_",SETOptionPages[i].name))
- continue; // skip _ section
- for (j=0;j<nPrepend;j++)
- if(!strcmp(prepend[j],SETOptionPages[i].name))
- {
- preFound[j]=TRUE;
- found=TRUE;
- break;
- }
- for (j=0;j<nAppend;j++)
- if(!strcmp(append[j],SETOptionPages[i].name))
- {
- appFound[j]=TRUE;
- found=TRUE;
- break;
- }
- if (found)
- continue; // skip plugins with a fixed position
- p=malloc(sizeof(SETPlugin));
- memset(p,0,sizeof(SETPlugin));
- p->plugin=beryl_settings_context_find_plugin(context,SETOptionPages[i].name);
- p->active=FALSE;
- Plugins=g_slist_append(Plugins,p);
- }
- for (i=0;i<nAppend;i++)
- {
- if (!appFound[i])
- continue;
- p=malloc(sizeof(SETPlugin));
- memset(p,0,sizeof(SETPlugin));
- p->plugin=beryl_settings_context_find_plugin(context,append[i]);
- p->active=FALSE;
- Plugins=g_slist_append(Plugins,p);
- }
- for (i=nPrepend;i>0;i--)
- {
- if (!preFound[i-1])
- continue;
- p=malloc(sizeof(SETPlugin));
- memset(p,0,sizeof(SETPlugin));
- p->plugin=beryl_settings_context_find_plugin(context,prepend[i-1]);
- p->active=FALSE;
- Plugins=g_slist_prepend(Plugins,p);
- }
- */
-}
void cb_toggled(GtkCellRendererToggle * t, gchar * path, gpointer d)
{
GtkTreeIter it;
@@ -1871,30 +1571,30 @@ void reloadsig()
}
queue_option_changed();
}
-void resettodefaults()
-{
- gchar *resetdefbackup=g_strconcat(g_get_home_dir(),"/.beryl/settings.old",NULL);
- g_rename(profilefile,resetdefbackup);
- g_free(resetdefbackup);
-}
-void undoresettodefaults()
-{
- gchar *resetdefbackup=g_strconcat(g_get_home_dir(),"/.beryl/settings.old",NULL);
- g_rename(resetdefbackup,profilefile);
- g_free(resetdefbackup);
-}
-void onResetChanged(GtkWidget *resetbutton, gpointer user_data)
-{
- {
- gint idx=gtk_combo_box_get_active(GTK_COMBO_BOX(resetbutton));
- if (idx == 1)
- resettodefaults();
- else if (idx == 2)
- undoresettodefaults();
- }
- gtk_combo_box_set_active(GTK_COMBO_BOX(resetbutton),0);
- reloadsig();
-}
+// void resettodefaults()
+// {
+// gchar *resetdefbackup=g_strconcat(g_get_home_dir(),"/.ccs/settings.old",NULL);
+// g_rename(profilefile,resetdefbackup);
+// g_free(resetdefbackup);
+// }
+// void undoresettodefaults()
+// {
+// gchar *resetdefbackup=g_strconcat(g_get_home_dir(),"/.ccs/settings.old",NULL);
+// g_rename(resetdefbackup,profilefile);
+// g_free(resetdefbackup);
+// }
+// void onResetChanged(GtkWidget *resetbutton, gpointer user_data)
+// {
+// {
+// gint idx=gtk_combo_box_get_active(GTK_COMBO_BOX(resetbutton));
+// if (idx == 1)
+// resettodefaults();
+// else if (idx == 2)
+// undoresettodefaults();
+// }
+// gtk_combo_box_set_active(GTK_COMBO_BOX(resetbutton),0);
+// reloadsig();
+// }
void onProfileChanged(GtkWidget *profilebutton, gpointer user_data)
{
gint profileidx=gtk_combo_box_get_active(GTK_COMBO_BOX(profilebutton));
@@ -2094,17 +1794,17 @@ void layout_main_window()
CCSPlugin * plugin = plugins->data;
const gchar * plugname = plugin->name;
if (!plugname) plugname="_";
- p = gdk_pixbuf_new_from_file(g_strconcat(PIXMAPS_DIR,"/beryl-settings-section-",
+ p = gdk_pixbuf_new_from_file(g_strconcat(PIXMAPS_DIR,"/ccs-settings-section-",
plugname,".png",NULL),NULL);
if (!p)
{
gint w,h;
gtk_icon_size_lookup(GTK_ICON_SIZE_LARGE_TOOLBAR,&w,&h);
- p = gdk_pixbuf_new_from_file_at_size(g_strconcat(PIXMAPS_DIR,"/beryl-settings-section-",
+ p = gdk_pixbuf_new_from_file_at_size(g_strconcat(PIXMAPS_DIR,"/ccs-settings-section-",
plugname,".svg",NULL),
w,h,NULL);
if (!p)
- p = gdk_pixbuf_new_from_file_at_size(DATADIR "/beryl/icon.png",w,h,NULL);
+ p = gdk_pixbuf_new_from_file_at_size(DATADIR "/compiz/icon.png",w,h,NULL);
}
//look up short & long desc in file
//if its 'general', provide defaults
@@ -2148,7 +1848,6 @@ void layout_main_window()
page++;
plugins=plugins->next;
}
- compile_plugin_order_list();
gtk_box_pack_start(box,GTK_WIDGET(win),FALSE,FALSE,0);
gtk_box_pack_start(box,gtk_vseparator_new(),FALSE,FALSE,0);
pluginContainer = gtk_alignment_new(0,0,1,1);
@@ -2182,7 +1881,6 @@ void layout_main_window()
//gtk_widget_set_size_request(GTK_LABEL(infoLabel),200,-1);
//gtk_label_set_max_width_chars(GTK_LABEL(infoLabel),50);
}
- do_active_plugins();
g_signal_connect(rend,"toggled",G_CALLBACK(cb_toggled),NULL);
g_signal_connect(gtk_tree_view_get_selection(SETPluginList),"changed",
G_CALLBACK(cb_showpage),pluginContainer);
@@ -2268,7 +1966,7 @@ void setup_main_window()
gtk_window_set_title(GTK_WINDOW(mainWindow),"Compiz configuration system management tool" VERSION);
gtk_window_set_resizable(GTK_WINDOW(mainWindow),TRUE);
gtk_window_set_default_size(GTK_WINDOW(mainWindow),780,500);
- gtk_window_set_default_icon_from_file(PIXMAPS_DIR "/beryl-settings.svg",NULL);
+ gtk_window_set_default_icon_from_file(PIXMAPS_DIR "/ccs-settings.svg",NULL);
gtk_container_set_border_width(GTK_CONTAINER(mainWindow),5);
layout_main_window();
g_signal_connect(G_OBJECT (mainWindow), "destroy", G_CALLBACK(cb_main_destroy), NULL);
@@ -2299,9 +1997,6 @@ int main(int argc, char ** argv)
bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
textdomain (GETTEXT_PACKAGE);
-// fnprofile=g_strconcat(g_get_home_dir(),"/.beryl/settings.profile",NULL);
-// g_file_get_contents(fnprofile,&profilefilecontent,NULL,NULL);
-// profilefile=g_strconcat(g_get_home_dir(),"/",profilefilecontent,NULL);
gdkdisplay = gdk_display_get_default();
xdisplay = gdk_x11_display_get_xdisplay(gdkdisplay);