summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Moreau <oreaus@gmail.com>2010-02-22 08:45:04 -0700
committerScott Moreau <oreaus@gmail.com>2010-02-22 11:06:09 -0700
commitdb87069dab2edec369a1c347e4b9f382c26289ec (patch)
tree566d8732729e0d6869dcad781d9a722936593257
parent37332a37b4ee93c23e10be06af73b36c18ceb396 (diff)
downloadcompiz-core-doc-db87069dab2edec369a1c347e4b9f382c26289ec.tar.gz
compiz-core-doc-db87069dab2edec369a1c347e4b9f382c26289ec.tar.bz2
General reorganization and cleanup.
-rw-r--r--plugins/annotate/annotate.xml.in3
-rw-r--r--plugins/annotate/src/annotate.cpp12
-rw-r--r--plugins/annotate/src/annotate.h32
3 files changed, 24 insertions, 23 deletions
diff --git a/plugins/annotate/annotate.xml.in b/plugins/annotate/annotate.xml.in
index 11f932e..9f8948e 100644
--- a/plugins/annotate/annotate.xml.in
+++ b/plugins/annotate/annotate.xml.in
@@ -35,7 +35,7 @@
<allowed/>
</option>
<option name="erase_button" type="button">
- <_short>Initiate erase</_short>
+ <_short>Initiate Erase</_short>
<_long>Initiate annotate erasing</_long>
<default>&lt;Super&gt;&lt;Alt&gt;Button3</default>
</option>
@@ -58,6 +58,7 @@
<_long>Fill color for annotations</_long>
<default>
<red>0xffff</red>
+ <alpha>0x8888</alpha>
</default>
</option>
<option name="stroke_color" type="color">
diff --git a/plugins/annotate/src/annotate.cpp b/plugins/annotate/src/annotate.cpp
index 05fd6b9..ecbc888 100644
--- a/plugins/annotate/src/annotate.cpp
+++ b/plugins/annotate/src/annotate.cpp
@@ -435,7 +435,7 @@ AnnoScreen::terminate (CompAction *action,
}
bool
-AnnoScreen::eraseInitiate (CompAction *action,
+AnnoScreen::initiateErase (CompAction *action,
CompAction::State state,
CompOption::Vector& options)
{
@@ -516,7 +516,7 @@ AnnoScreen::initiateLine (CompAction *action,
}
bool
-AnnoScreen::rectangleInitiate (CompAction *action,
+AnnoScreen::initiateRectangle (CompAction *action,
CompAction::State state,
CompOption::Vector& options)
{
@@ -545,7 +545,7 @@ AnnoScreen::rectangleInitiate (CompAction *action,
}
bool
-AnnoScreen::ellipseInitiate (CompAction *action,
+AnnoScreen::initiateEllipse (CompAction *action,
CompAction::State state,
CompOption::Vector& options)
{
@@ -889,7 +889,7 @@ AnnoScreen::AnnoScreen (CompScreen *screen) :
optionSetDrawInitiate
(boost::bind (&AnnoScreen::draw, this, _1, _2, _3));
optionSetEraseButtonInitiate
- (boost::bind (&AnnoScreen::eraseInitiate, this, _1, _2, _3));
+ (boost::bind (&AnnoScreen::initiateErase, this, _1, _2, _3));
optionSetEraseButtonTerminate
(boost::bind (&AnnoScreen::terminate, this, _1, _2, _3));
optionSetInitiateFreeDrawButtonInitiate
@@ -901,11 +901,11 @@ AnnoScreen::AnnoScreen (CompScreen *screen) :
optionSetInitiateLineButtonTerminate
(boost::bind (&AnnoScreen::terminate, this, _1, _2, _3));
optionSetInitiateRectangleButtonInitiate
- (boost::bind (&AnnoScreen::rectangleInitiate, this, _1, _2, _3));
+ (boost::bind (&AnnoScreen::initiateRectangle, this, _1, _2, _3));
optionSetInitiateRectangleButtonTerminate
(boost::bind (&AnnoScreen::terminate, this, _1, _2, _3));
optionSetInitiateEllipseButtonInitiate
- (boost::bind (&AnnoScreen::ellipseInitiate, this, _1, _2, _3));
+ (boost::bind (&AnnoScreen::initiateEllipse, this, _1, _2, _3));
optionSetInitiateEllipseButtonTerminate
(boost::bind (&AnnoScreen::terminate, this, _1, _2, _3));
optionSetClearKeyInitiate
diff --git a/plugins/annotate/src/annotate.h b/plugins/annotate/src/annotate.h
index 43d4e65..1f6af17 100644
--- a/plugins/annotate/src/annotate.h
+++ b/plugins/annotate/src/annotate.h
@@ -100,13 +100,12 @@ class AnnoScreen :
unsigned short *color);
void
- drawEllipse (double xc,
- double yc,
- double radiusX,
- double radiusY,
- unsigned short *fillColor,
- unsigned short *strokeColor,
- double strokeWidth);
+ drawLine (double x1,
+ double y1,
+ double x2,
+ double y2,
+ double width,
+ unsigned short *color);
void
drawRectangle (double x,
@@ -118,12 +117,13 @@ class AnnoScreen :
double strokeWidth);
void
- drawLine (double x1,
- double y1,
- double x2,
- double y2,
- double width,
- unsigned short *color);
+ drawEllipse (double xc,
+ double yc,
+ double radiusX,
+ double radiusY,
+ unsigned short *fillColor,
+ unsigned short *strokeColor,
+ double strokeWidth);
void
drawText (double x,
@@ -150,7 +150,7 @@ class AnnoScreen :
CompOption::Vector& options);
bool
- eraseInitiate (CompAction *action,
+ initiateErase (CompAction *action,
CompAction::State state,
CompOption::Vector& options);
@@ -165,12 +165,12 @@ class AnnoScreen :
CompOption::Vector& options);
bool
- rectangleInitiate (CompAction *action,
+ initiateRectangle (CompAction *action,
CompAction::State state,
CompOption::Vector& options);
bool
- ellipseInitiate (CompAction *action,
+ initiateEllipse (CompAction *action,
CompAction::State state,
CompOption::Vector& options);