[Goodies-commits] r6745 - in xfce4-screenshooter/trunk: . docs/manual/ja docs/manual/ja/images panel-plugin
Jerome Guelfucci
jeromeg at xfce.org
Sun Feb 22 09:57:56 CET 2009
Author: jeromeg
Date: 2009-02-22 08:57:56 +0000 (Sun, 22 Feb 2009)
New Revision: 6745
Modified:
xfce4-screenshooter/trunk/ChangeLog
xfce4-screenshooter/trunk/TODO
xfce4-screenshooter/trunk/docs/manual/ja/Makefile
xfce4-screenshooter/trunk/docs/manual/ja/images/Makefile
xfce4-screenshooter/trunk/docs/manual/ja/xfce4-screenshooter.xml
xfce4-screenshooter/trunk/panel-plugin/screenshooter-plugin.c
Log:
Add some debugging information for the plugin.
Modified: xfce4-screenshooter/trunk/ChangeLog
===================================================================
--- xfce4-screenshooter/trunk/ChangeLog 2009-02-22 08:36:52 UTC (rev 6744)
+++ xfce4-screenshooter/trunk/ChangeLog 2009-02-22 08:57:56 UTC (rev 6745)
@@ -1,3 +1,7 @@
+2009-02-22 jeromeg
+
+ * panel-plugin/: add some debugging information for the plugin.
+
2009-02-15 jeromeg
* docs/, po-docs/, po/: add Japanese documentation and update the
Modified: xfce4-screenshooter/trunk/TODO
===================================================================
--- xfce4-screenshooter/trunk/TODO 2009-02-22 08:36:52 UTC (rev 6744)
+++ xfce4-screenshooter/trunk/TODO 2009-02-22 08:57:56 UTC (rev 6745)
@@ -2,7 +2,8 @@
as in thunar and xfdesktop.
* When selecting a region, Escape should cancel everything.
* Check for leaks using valgrind.
-* Use the po mecanism for the documentation.
+* Capture the mouse.
+* Use Xshape to have a transparent background in the generated screenshots.
Rewritte generate_filename_for_uri or remove it. Jannis suggestion:
You can use GDir for reading the contents of a directory and you can use
Modified: xfce4-screenshooter/trunk/docs/manual/ja/Makefile
===================================================================
--- xfce4-screenshooter/trunk/docs/manual/ja/Makefile 2009-02-22 08:36:52 UTC (rev 6744)
+++ xfce4-screenshooter/trunk/docs/manual/ja/Makefile 2009-02-22 08:57:56 UTC (rev 6745)
@@ -75,7 +75,7 @@
AUTOCONF = ${SHELL} /home/jerome/Développement/xfce4-screenshooter/missing --run autoconf
AUTOHEADER = ${SHELL} /home/jerome/Développement/xfce4-screenshooter/missing --run autoheader
AUTOMAKE = ${SHELL} /home/jerome/Développement/xfce4-screenshooter/missing --run automake-1.10
-AWK = gawk
+AWK = mawk
CATALOGS = ar.gmo bg.gmo ca.gmo cs.gmo da.gmo de.gmo el.gmo en_GB.gmo es.gmo et.gmo eu.gmo fi.gmo fr.gmo gl.gmo hr.gmo hu.gmo id.gmo it.gmo ja.gmo lv.gmo nb_NO.gmo nl.gmo pl.gmo pt_BR.gmo pt_PT.gmo sq.gmo sv.gmo tr.gmo uk.gmo ur.gmo zh_CN.gmo zh_TW.gmo
CATOBJEXT = .gmo
CC = gcc
@@ -176,9 +176,9 @@
PACKAGE = xfce4-screenshooter
PACKAGE_BUGREPORT = http://bugzilla.xfce.org/
PACKAGE_NAME = xfce4-screenshooter
-PACKAGE_STRING = xfce4-screenshooter 1.5.0.1svn-r06658
+PACKAGE_STRING = xfce4-screenshooter 1.5.0.1svn-r06743
PACKAGE_TARNAME = xfce4-screenshooter
-PACKAGE_VERSION = 1.5.0.1svn-r06658
+PACKAGE_VERSION = 1.5.0.1svn-r06743
PATH_SEPARATOR = :
PKG_CONFIG = /usr/bin/pkg-config
POFILES = ar.po bg.po ca.po cs.po da.po de.po el.po en_GB.po es.po et.po eu.po fi.po fr.po gl.po hr.po hu.po id.po it.po ja.po lv.po nb_NO.po nl.po pl.po pt_BR.po pt_PT.po sq.po sv.po tr.po uk.po ur.po zh_CN.po zh_TW.po
@@ -191,11 +191,11 @@
SHELL = /bin/bash
STRIP = strip
USE_NLS = yes
-VERSION = 1.5.0.1svn-r06658
+VERSION = 1.5.0.1svn-r06743
XGETTEXT = /usr/bin/xgettext
XGETTEXT_ARGS = --keyword=Q_ --from-code=UTF-8
-XML2PO = /usr/bin/xml2po
-XSLTPROC = /usr/bin/xsltproc
+XML2PO =
+XSLTPROC =
abs_builddir = /home/jerome/Développement/xfce4-screenshooter/docs/manual/ja
abs_srcdir = /home/jerome/Développement/xfce4-screenshooter/docs/manual/ja
abs_top_builddir = /home/jerome/Développement/xfce4-screenshooter
@@ -592,8 +592,8 @@
tags tags-recursive uninstall uninstall-am uninstall-docDATA
-xfce4-screenshooter.html: $(srcdir)/xfce4-screenshooter.xml
- $(XSLTPROC) $(top_srcdir)/docs/manual/xfce-nochunk.xsl $(srcdir)/xfce4-screenshooter.xml
+#xfce4-screenshooter.html: $(srcdir)/xfce4-screenshooter.xml
+# $(XSLTPROC) $(top_srcdir)/docs/manual/xfce-nochunk.xsl $(srcdir)/xfce4-screenshooter.xml
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
Modified: xfce4-screenshooter/trunk/docs/manual/ja/images/Makefile
===================================================================
--- xfce4-screenshooter/trunk/docs/manual/ja/images/Makefile 2009-02-22 08:36:52 UTC (rev 6744)
+++ xfce4-screenshooter/trunk/docs/manual/ja/images/Makefile 2009-02-22 08:57:56 UTC (rev 6745)
@@ -60,7 +60,7 @@
AUTOCONF = ${SHELL} /home/jerome/Développement/xfce4-screenshooter/missing --run autoconf
AUTOHEADER = ${SHELL} /home/jerome/Développement/xfce4-screenshooter/missing --run autoheader
AUTOMAKE = ${SHELL} /home/jerome/Développement/xfce4-screenshooter/missing --run automake-1.10
-AWK = gawk
+AWK = mawk
CATALOGS = ar.gmo bg.gmo ca.gmo cs.gmo da.gmo de.gmo el.gmo en_GB.gmo es.gmo et.gmo eu.gmo fi.gmo fr.gmo gl.gmo hr.gmo hu.gmo id.gmo it.gmo ja.gmo lv.gmo nb_NO.gmo nl.gmo pl.gmo pt_BR.gmo pt_PT.gmo sq.gmo sv.gmo tr.gmo uk.gmo ur.gmo zh_CN.gmo zh_TW.gmo
CATOBJEXT = .gmo
CC = gcc
@@ -161,9 +161,9 @@
PACKAGE = xfce4-screenshooter
PACKAGE_BUGREPORT = http://bugzilla.xfce.org/
PACKAGE_NAME = xfce4-screenshooter
-PACKAGE_STRING = xfce4-screenshooter 1.5.0.1svn-r06658
+PACKAGE_STRING = xfce4-screenshooter 1.5.0.1svn-r06743
PACKAGE_TARNAME = xfce4-screenshooter
-PACKAGE_VERSION = 1.5.0.1svn-r06658
+PACKAGE_VERSION = 1.5.0.1svn-r06743
PATH_SEPARATOR = :
PKG_CONFIG = /usr/bin/pkg-config
POFILES = ar.po bg.po ca.po cs.po da.po de.po el.po en_GB.po es.po et.po eu.po fi.po fr.po gl.po hr.po hu.po id.po it.po ja.po lv.po nb_NO.po nl.po pl.po pt_BR.po pt_PT.po sq.po sv.po tr.po uk.po ur.po zh_CN.po zh_TW.po
@@ -176,11 +176,11 @@
SHELL = /bin/bash
STRIP = strip
USE_NLS = yes
-VERSION = 1.5.0.1svn-r06658
+VERSION = 1.5.0.1svn-r06743
XGETTEXT = /usr/bin/xgettext
XGETTEXT_ARGS = --keyword=Q_ --from-code=UTF-8
-XML2PO = /usr/bin/xml2po
-XSLTPROC = /usr/bin/xsltproc
+XML2PO =
+XSLTPROC =
abs_builddir = /home/jerome/Développement/xfce4-screenshooter/docs/manual/ja/images
abs_srcdir = /home/jerome/Développement/xfce4-screenshooter/docs/manual/ja/images
abs_top_builddir = /home/jerome/Développement/xfce4-screenshooter
Modified: xfce4-screenshooter/trunk/docs/manual/ja/xfce4-screenshooter.xml
===================================================================
--- xfce4-screenshooter/trunk/docs/manual/ja/xfce4-screenshooter.xml 2009-02-22 08:36:52 UTC (rev 6744)
+++ xfce4-screenshooter/trunk/docs/manual/ja/xfce4-screenshooter.xml 2009-02-22 08:57:56 UTC (rev 6745)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
<!ENTITY date "February 2009">
-<!ENTITY version "1.5.0.1svn-r06658">
+<!ENTITY version "1.5.0.1svn-r06743">
<!ENTITY application "xfce4-screenshooter">
]>
<article id="xfce4-screenshooter" lang="ja">
@@ -32,7 +32,7 @@
</author>
</authorgroup>
- <releaseinfo>この説明書は xfce4-screenshooter バージョン 1.5.0.1svn-r06658 について書かれています。</releaseinfo>
+ <releaseinfo>この説明書は xfce4-screenshooter バージョン 1.5.0.1svn-r06743 について書かれています。</releaseinfo>
</articleinfo>
<sect1 id="intro">
Modified: xfce4-screenshooter/trunk/panel-plugin/screenshooter-plugin.c
===================================================================
--- xfce4-screenshooter/trunk/panel-plugin/screenshooter-plugin.c 2009-02-22 08:36:52 UTC (rev 6744)
+++ xfce4-screenshooter/trunk/panel-plugin/screenshooter-plugin.c 2009-02-22 08:57:56 UTC (rev 6745)
@@ -113,12 +113,22 @@
cb_set_size (XfcePanelPlugin *plugin, int size, PluginData *pd)
{
GdkPixbuf *pb;
+
int width = size - 2 - 2 * MAX (pd->button->style->xthickness,
pd->button->style->ythickness);
+ DBG ("Get the icon from the theme");
+
pb = xfce_themed_icon_load (SCREENSHOT_ICON_NAME, width);
+
+ DBG ("Set the new icon");
+
gtk_image_set_from_pixbuf (GTK_IMAGE (pd->image), pb);
+
g_object_unref (pb);
+
+ DBG ("Request size for the plugin");
+
gtk_widget_set_size_request (GTK_WIDGET (plugin), size, size);
return TRUE;
@@ -158,6 +168,8 @@
another screenshot is in progress */
gtk_widget_set_sensitive (GTK_WIDGET (button), FALSE);
+ DBG ("Start taking the screenshot");
+
screenshooter_take_and_output_screenshot (pd->sd);
/* Make the panel button clickable */
@@ -273,12 +285,19 @@
cb_properties_dialog (XfcePanelPlugin *plugin, PluginData *pd)
{
GtkWidget *dlg;
+
+ DBG ("Create the dialog");
dlg = screenshooter_dialog_new (pd->sd, TRUE);
/* Block the menu to prevent the user from launching several dialogs at
the same time */
+
+ DBG ("Block the menu");
+
xfce_panel_plugin_block_menu (plugin);
+
+ DBG ("Run the dialog");
g_object_set_data (G_OBJECT (plugin), "dialog", dlg);
@@ -299,15 +318,21 @@
ScreenshotData *sd = g_new0 (ScreenshotData, 1);
pd->sd = sd;
+
+ DBG ("Initialize the text domain");
xfce_textdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR, "UTF-8");
pd->plugin = plugin;
/* Read the options */
+ DBG ("Read the preferences file");
+
screenshooter_plugin_read_rc_file (plugin, pd);
/* Create the panel button */
+ DBG ("Create the panel button");
+
pd->button = xfce_create_panel_button ();
pd->image = gtk_image_new ();
@@ -316,6 +341,9 @@
/* Set the tooltips if available */
#if GTK_CHECK_VERSION(2,12,0)
+ DBG ("Set the default tooltip");
+
+
if (pd->sd->region == FULLSCREEN)
{
gtk_widget_set_tooltip_text (GTK_WIDGET (pd->button),
@@ -334,27 +362,42 @@
"other corner of the region, and releasing the mouse button."));
}
#endif
-
+
+ DBG ("Add the button to the panel");
+
gtk_widget_show_all (pd->button);
gtk_container_add (GTK_CONTAINER (plugin), pd->button);
+
xfce_panel_plugin_add_action_widget (plugin, pd->button);
/* Set the callbacks */
+
+ DBG ("Set the clicked callback");
+
g_signal_connect (pd->button, "clicked",
G_CALLBACK (cb_button_clicked), pd);
+ DBG ("Set the free data callback");
+
g_signal_connect (plugin, "free-data",
G_CALLBACK (cb_free_data), pd);
+ DBG ("Set the size changed callback");
+
g_signal_connect (plugin, "size-changed",
G_CALLBACK (cb_set_size), pd);
+ DBG ("Set the style set callback");
+
pd->style_id =
g_signal_connect (plugin, "style-set",
G_CALLBACK (cb_style_set), pd);
+ DBG ("Set the configuration menu");
+
xfce_panel_plugin_menu_show_configure (plugin);
+
g_signal_connect (plugin, "configure-plugin",
G_CALLBACK (cb_properties_dialog), pd);
}
More information about the Goodies-commits
mailing list