[Goodies-commits] r2396 - in xfce4-diskperf-plugin/trunk: . panel-plugin po
Nick Schermer
nick at xfce.org
Wed Jan 17 18:43:59 CET 2007
Author: nick
Date: 2007-01-17 17:43:59 +0000 (Wed, 17 Jan 2007)
New Revision: 2396
Added:
xfce4-diskperf-plugin/trunk/configure.in.in
xfce4-diskperf-plugin/trunk/po/LINGUAS
Removed:
xfce4-diskperf-plugin/trunk/configure.ac
Modified:
xfce4-diskperf-plugin/trunk/ChangeLog
xfce4-diskperf-plugin/trunk/Makefile.am
xfce4-diskperf-plugin/trunk/autogen.sh
xfce4-diskperf-plugin/trunk/panel-plugin/Makefile.am
xfce4-diskperf-plugin/trunk/panel-plugin/config_gui.c
xfce4-diskperf-plugin/trunk/panel-plugin/config_gui.h
xfce4-diskperf-plugin/trunk/panel-plugin/devperf.c
xfce4-diskperf-plugin/trunk/panel-plugin/devperf.h
xfce4-diskperf-plugin/trunk/panel-plugin/diskperf.desktop.in.in
xfce4-diskperf-plugin/trunk/panel-plugin/main.c
Log:
* Improve Makefile.am and configure.in.in files.
* Add LINGUAS support.
* Change icon in desktop file.
* Use new titled dialog.
* Fix panel resizing.
* Color buttons are now 25px height, so you can actually click them.
* Set default harddisk to sda (common with current kernels)
* Bump version for release.
Modified: xfce4-diskperf-plugin/trunk/ChangeLog
===================================================================
--- xfce4-diskperf-plugin/trunk/ChangeLog 2007-01-17 17:42:53 UTC (rev 2395)
+++ xfce4-diskperf-plugin/trunk/ChangeLog 2007-01-17 17:43:59 UTC (rev 2396)
@@ -1,3 +1,13 @@
+2007-01-17 Nick Schermer
+ * Improve Makefile.am and configure.in.in files.
+ * Add LINGUAS support.
+ * Change icon in desktop file.
+ * Use new titled dialog.
+ * Fix panel resizing.
+ * Color buttons are now 25px height, so you can actually click them.
+ * Set default harddisk to sda (common with current kernels)
+ * Bump version for release.
+
2006-01-09 Nick Schermer
* Apply patch from bug 1842
Modified: xfce4-diskperf-plugin/trunk/Makefile.am
===================================================================
--- xfce4-diskperf-plugin/trunk/Makefile.am 2007-01-17 17:42:53 UTC (rev 2395)
+++ xfce4-diskperf-plugin/trunk/Makefile.am 2007-01-17 17:43:59 UTC (rev 2396)
@@ -1,16 +1,16 @@
- at SET_MAKE@
+# $Id$
-SUBDIRS = panel-plugin po
+SUBDIRS = \
+ panel-plugin \
+ po
distclean-local:
rm -rf *.cache *~
-dist-bz2: dist
- zcat $(PACKAGE)-$(VERSION).tar.gz | bzip2 --best -c > $(PACKAGE)-$(VERSION).tar.bz2
+rpm: dist
+ rpmbuild -ta $(PACKAGE)-$(VERSION).tar.gz
+ @rm -f $(PACKAGE)-$(VERSION).tar.gz
-distcheck-bz2: distcheck
- zcat $(PACKAGE)-$(VERSION).tar.gz | bzip2 --best -c > $(PACKAGE)-$(VERSION).tar.bz2
-
EXTRA_DIST = \
README \
intltool-extract.in \
@@ -22,3 +22,5 @@
intltool-merge \
intltool-update
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
+
Property changes on: xfce4-diskperf-plugin/trunk/Makefile.am
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: xfce4-diskperf-plugin/trunk/autogen.sh
===================================================================
--- xfce4-diskperf-plugin/trunk/autogen.sh 2007-01-17 17:42:53 UTC (rev 2395)
+++ xfce4-diskperf-plugin/trunk/autogen.sh 2007-01-17 17:43:59 UTC (rev 2396)
@@ -1,12 +1,10 @@
#!/bin/sh
#
-# $Id: autogen.sh 13265 2005-03-12 04:15:08Z brian $
+# $Id: autogen.sh 2257 2006-12-19 19:49:00Z nick $
#
-# Copyright (c) 2002-2005
+# Copyright (c) 2002-2007
# The Xfce development team. All rights reserved.
#
-# Written for Xfce by Benedikt Meurer <benny at xfce.org>.
-#
(type xdt-autogen) >/dev/null 2>&1 || {
cat >&2 <<EOF
@@ -18,6 +16,20 @@
exit 1
}
+# verify that po/LINGUAS is present
+(test -f po/LINGUAS) >/dev/null 2>&1 || {
+ cat >&2 <<EOF
+autogen.sh: The file po/LINGUAS could not be found. Please check your snapshot
+ or try to checkout again.
+EOF
+ exit 1
+}
+
+# substitute revision and linguas
+linguas=`sed -e '/^#/d' po/LINGUAS`
+revision=`LC_ALL=C svn info $0 | awk '/^Revision: / {printf "%04d\n", $2}'`
+sed -e "s/@LINGUAS@/${linguas}/g" \
+ -e "s/@REVISION@/${revision}/g" \
+ < "configure.in.in" > "configure.in"
+
exec xdt-autogen $@
-
-# vi:set ts=2 sw=2 et ai:
\ No newline at end of file
Deleted: xfce4-diskperf-plugin/trunk/configure.ac
Copied: xfce4-diskperf-plugin/trunk/configure.in.in (from rev 2345, xfce4-diskperf-plugin/trunk/configure.ac)
===================================================================
--- xfce4-diskperf-plugin/trunk/configure.in.in (rev 0)
+++ xfce4-diskperf-plugin/trunk/configure.in.in 2007-01-17 17:43:59 UTC (rev 2396)
@@ -0,0 +1,64 @@
+dnl $Id$
+dnl
+dnl xfce4-diskperf-plugin - Disk performance plugin for xfce4-panel
+dnl
+dnl 2003, 2004 Roger Seguin <roger_seguin at msn.com>
+dnl
+
+m4_define([diskperf_version_major], [0])
+m4_define([diskperf_version_minor], [2])
+m4_define([diskperf_version_micro], [1])
+m4_define([diskperf_version_build], [r at REVISION@])
+m4_define([diskperf_version_tag], [])
+m4_define([diskperf_version], [diskperf_version_major().diskperf_version_minor().diskperf_version_micro()ifelse(diskperf_version_tag(), [svn], [diskperf_version_tag()-diskperf_version_build()], [diskperf_version_tag()])])
+
+dnl ***************************
+dnl *** Initialize autoconf ***
+dnl ***************************
+AC_COPYRIGHT([Copyright (c) 2006-2007
+ The Xfce development team. All rights reserved.])
+AC_INIT([xfce4-diskperf-plugin], [diskperf_version()], [http://bugzilla.xfce.org/], [xfce4-diskperf-plugin])
+AC_PREREQ([2.50])
+AC_CANONICAL_TARGET()
+AC_REVISION([$Id])
+
+dnl ***************************
+dnl *** Initialize automake ***
+dnl ***************************
+AM_INIT_AUTOMAKE([1.8 dist-bzip2 tar-ustar])
+AM_CONFIG_HEADER([config.h])
+AM_MAINTAINER_MODE()
+
+dnl ********************************
+dnl *** Check for basic programs ***
+dnl ********************************
+AC_PROG_CC()
+AC_PROG_LD()
+AC_PROG_INSTALL()
+AC_PROG_INTLTOOL()
+
+dnl **********************************
+dnl *** Check for standard headers ***
+dnl **********************************
+AC_HEADER_STDC()
+
+dnl ******************************
+dnl *** Check for i18n support ***
+dnl ******************************
+XDT_I18N([@LINGUAS@])
+
+dnl ***********************************
+dnl *** Check for required packages ***
+dnl ***********************************
+XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.90])
+
+dnl ***********************************
+dnl *** Check for debugging support ***
+dnl ***********************************
+XDT_FEATURE_DEBUG()
+
+AC_OUTPUT([
+Makefile
+panel-plugin/Makefile
+po/Makefile.in
+])
Property changes on: xfce4-diskperf-plugin/trunk/configure.in.in
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: xfce4-diskperf-plugin/trunk/panel-plugin/Makefile.am
===================================================================
--- xfce4-diskperf-plugin/trunk/panel-plugin/Makefile.am 2007-01-17 17:42:53 UTC (rev 2395)
+++ xfce4-diskperf-plugin/trunk/panel-plugin/Makefile.am 2007-01-17 17:43:59 UTC (rev 2396)
@@ -1,42 +1,54 @@
-plugindir = $(libexecdir)/xfce4/panel-plugins
-plugin_PROGRAMS = xfce4-diskperf-plugin
+# $Id$
+INCLUDES = \
+ -I$(top_srcdir) \
+ -DG_LOG_DOMAIN=\"xfce4-diskperf-plugin\" \
+ -DPACKAGE_LOCALE_DIR=\"$(localedir)\"
+
+#
+# Diskpef Plugin
+#
+plugindir = \
+ $(libexecdir)/xfce4/panel-plugins
+
+plugin_PROGRAMS = \
+ xfce4-diskperf-plugin
+
+xfce4_diskperf_plugin_SOURCES = \
+ main.c \
+ config_gui.c \
+ config_gui.h \
+ devperf.c \
+ devperf.h
+
xfce4_diskperf_plugin_CFLAGS = \
- -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
- @LIBXFCE4PANEL_CFLAGS@
+ $(LIBXFCE4PANEL_CFLAGS)
xfce4_diskperf_plugin_LDADD= \
- @LIBXFCE4PANEL_LIBS@
+ $(LIBXFCE4PANEL_LIBS)
-xfce4_diskperf_plugin_SOURCES = \
- main.c \
- config_gui.c \
- config_gui.h \
- devperf.c \
- devperf.h
-
-# .desktop file
#
-# Some automake trickery here. Because we cannot use $(libexecdir) in the
-# automake stage, we'll use sed to get the full path into the .desktop file.
-# We also need to let intltool merge the translated fields, so we add an
-# additional level of indirection: a <name>.desktop.in.in file.
-#
+# Desktop file
+#
+desktopdir = $(datadir)/xfce4/panel-plugins
desktop_in_in_files = diskperf.desktop.in.in
-desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
-
-desktopdir = $(datadir)/xfce4/panel-plugins
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+
+desktop_in_files = \
+ $(desktop_in_in_files:.desktop.in.in=.desktop.in)
+
+%.desktop.in: %.desktop.in.in
+ sed -e "s,\@libexecdir\@,$(libexecdir),g" < $< > $@
+
+desktop_DATA = \
+ $(desktop_in_files:.desktop.in=.desktop)
+
@INTLTOOL_DESKTOP_RULE@
-EXTRA_DIST = \
+EXTRA_DIST = \
$(desktop_in_in_files)
-DISTCLEANFILES = \
- $(desktop_DATA) $(desktop_in_files)
-
-# get full path into .desktop file
-%.desktop.in: %.desktop.in.in
- sed -e "s^@PLUGIN_PATH@^$(libexecdir)/xfce4/panel-plugins^" \
- $< > $@
+DISTCLEANFILES = \
+ $(desktop_DATA) \
+ $(desktop_in_files)
+# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
Property changes on: xfce4-diskperf-plugin/trunk/panel-plugin/Makefile.am
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: xfce4-diskperf-plugin/trunk/panel-plugin/config_gui.c
===================================================================
--- xfce4-diskperf-plugin/trunk/panel-plugin/config_gui.c 2007-01-17 17:42:53 UTC (rev 2395)
+++ xfce4-diskperf-plugin/trunk/panel-plugin/config_gui.c 2007-01-17 17:43:59 UTC (rev 2396)
@@ -1,4 +1,5 @@
-/*
+/* $Id$
+ *
* Copyright (c) 2003, 2004 Roger Seguin <roger_seguin at msn.com>
*
* Redistribution and use in source and binary forms, with or without
@@ -57,12 +58,6 @@
int CreateConfigGUI (GtkWidget * vbox1, struct gui_t *p_poGUI)
{
- GtkWidget *wPB_About;
- GtkWidget *alignment2;
- GtkWidget *hbox3;
- GtkWidget *image1;
- GtkWidget *label10;
- GtkWidget *hseparator9;
GtkWidget *table1;
GtkWidget *label1;
GtkWidget *wTF_Device;
@@ -101,37 +96,9 @@
tooltips = gtk_tooltips_new ();
- wPB_About = gtk_button_new ();
- gtk_widget_show (wPB_About);
- gtk_box_pack_start (GTK_BOX (vbox1), wPB_About, FALSE, FALSE, 0);
- GTK_WIDGET_UNSET_FLAGS (wPB_About, GTK_CAN_FOCUS);
- gtk_tooltips_set_tip (tooltips, wPB_About, _("About..."), NULL);
- gtk_button_set_relief (GTK_BUTTON (wPB_About), GTK_RELIEF_NONE);
-
- alignment2 = gtk_alignment_new (0.5, 0.5, 0, 0);
- gtk_widget_show (alignment2);
- gtk_container_add (GTK_CONTAINER (wPB_About), alignment2);
-
- hbox3 = gtk_hbox_new (FALSE, 2);
- gtk_widget_show (hbox3);
- gtk_container_add (GTK_CONTAINER (alignment2), hbox3);
-
- image1 = gtk_image_new_from_stock ("gtk-cdrom", GTK_ICON_SIZE_BUTTON);
- gtk_widget_show (image1);
- gtk_box_pack_start (GTK_BOX (hbox3), image1, FALSE, FALSE, 0);
-
- label10 = gtk_label_new_with_mnemonic (_("Disk Performance"));
- gtk_widget_show (label10);
- gtk_box_pack_start (GTK_BOX (hbox3), label10, FALSE, FALSE, 0);
- gtk_label_set_justify (GTK_LABEL (label10), GTK_JUSTIFY_LEFT);
-
- hseparator9 = gtk_hseparator_new ();
- gtk_widget_show (hseparator9);
- gtk_box_pack_start (GTK_BOX (vbox1), hseparator9, TRUE, TRUE, 0);
-
table1 = gtk_table_new (3, 2, FALSE);
gtk_widget_show (table1);
- gtk_box_pack_start (GTK_BOX (vbox1), table1, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox1), table1, FALSE, FALSE, 0);
label1 = gtk_label_new (_("Device"));
gtk_widget_show (label1);
@@ -252,7 +219,7 @@
hseparator8 = gtk_hseparator_new ();
gtk_widget_show (hseparator8);
- gtk_box_pack_start (GTK_BOX (vbox1), hseparator8, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox1), hseparator8, FALSE, FALSE, 0);
wTB_RWcombined =
gtk_check_button_new_with_mnemonic (_("Combine Read/Write data"));
@@ -265,7 +232,7 @@
wTa_SingleBar = gtk_table_new (1, 2, FALSE);
gtk_widget_show (wTa_SingleBar);
- gtk_box_pack_start (GTK_BOX (vbox1), wTa_SingleBar, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox1), wTa_SingleBar, FALSE, FALSE, 0);
label7 = gtk_label_new (_("Bar color "));
gtk_widget_show (label7);
@@ -277,15 +244,16 @@
wPB_RWcolor = gtk_button_new_with_mnemonic ("");
gtk_widget_show (wPB_RWcolor);
+ gtk_widget_set_size_request (wPB_RWcolor, -1, 25);
gtk_table_attach (GTK_TABLE (wTa_SingleBar), wPB_RWcolor, 1, 2, 0, 1,
- (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
- (GtkAttachOptions) (GTK_EXPAND), 0, 0);
+ (GtkAttachOptions) (GTK_FILL | GTK_EXPAND),
+ (GtkAttachOptions) (GTK_FILL), 0, 0);
gtk_tooltips_set_tip (tooltips, wPB_RWcolor,
_("Press to change color"), NULL);
wTa_DualBars = gtk_table_new (3, 2, FALSE);
gtk_widget_show (wTa_DualBars);
- gtk_box_pack_start (GTK_BOX (vbox1), wTa_DualBars, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox1), wTa_DualBars, FALSE, FALSE, 0);
label5 = gtk_label_new (_("Read bar color "));
gtk_widget_show (label5);
@@ -343,22 +311,23 @@
wPB_Rcolor = gtk_button_new_with_mnemonic ("");
gtk_widget_show (wPB_Rcolor);
+ gtk_widget_set_size_request (wPB_Rcolor, -1, 25);
gtk_table_attach (GTK_TABLE (wTa_DualBars), wPB_Rcolor, 1, 2, 1, 2,
- (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
- (GtkAttachOptions) (GTK_EXPAND), 0, 0);
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (GTK_FILL), 0, 0);
gtk_tooltips_set_tip (tooltips, wPB_Rcolor, _("Press to change color"),
NULL);
wPB_Wcolor = gtk_button_new_with_mnemonic ("");
gtk_widget_show (wPB_Wcolor);
+ gtk_widget_set_size_request (wPB_Wcolor, -1, 25);
gtk_table_attach (GTK_TABLE (wTa_DualBars), wPB_Wcolor, 1, 2, 2, 3,
- (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
- (GtkAttachOptions) (GTK_EXPAND), 0, 0);
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (GTK_FILL), 0, 0);
gtk_tooltips_set_tip (tooltips, wPB_Wcolor, _("Press to change color"),
NULL);
if (p_poGUI) {
- COPYVAL (p_poGUI, wPB_About);
COPYVAL (p_poGUI, wTF_Device);
COPYVAL (p_poGUI, wSc_Period);
COPYVAL (p_poGUI, wTB_Title);
@@ -378,35 +347,3 @@
}
return (0);
} /* CreateConfigGUI() */
-
-
-/*
-$Log: config_gui.c,v $
-Revision 1.3 2004/08/25 10:08:40 rogerms
-DiskPerf 1.5
-
-Revision 1.6 2004/08/25 08:50:18 RogerSeguin
-Added About... dialog box
-
-Revision 1.2 2003/11/04 10:26:13 rogerms
-DiskPerf 1.3
-
-Revision 1.5 2003/11/04 09:42:15 RogerSeguin
-Added busy time statistics
-
-Revision 1.1.1.1 2003/10/07 03:39:21 rogerms
-Initial release - v1.0
-
-Revision 1.4 2003/09/25 09:32:52 RogerSeguin
-Added color configuration
-
-Revision 1.3 2003/09/24 10:56:24 RogerSeguin
-Now swapping the monitor bars is possible
-
-Revision 1.2 2003/09/23 11:21:11 RogerSeguin
-Slight change
-
-Revision 1.1 2003/09/22 02:25:31 RogerSeguin
-Initial revision
-
-*/
Property changes on: xfce4-diskperf-plugin/trunk/panel-plugin/config_gui.c
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: xfce4-diskperf-plugin/trunk/panel-plugin/config_gui.h
===================================================================
--- xfce4-diskperf-plugin/trunk/panel-plugin/config_gui.h 2007-01-17 17:42:53 UTC (rev 2395)
+++ xfce4-diskperf-plugin/trunk/panel-plugin/config_gui.h 2007-01-17 17:43:59 UTC (rev 2396)
@@ -1,26 +1,20 @@
-/*
- * Copyright (c) 2003, 2004 Roger Seguin <roger_seguin at msn.com>
+/* $Id$
+ *
+ * Copyright (c) 2003-2004 Roger Seguin <roger_seguin at msn.com>
*
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
*
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef _config_gui_h
#define _config_gui_h
@@ -37,7 +31,6 @@
typedef struct gui_t {
/* Configuration GUI widgets */
- GtkWidget *wPB_About;
GtkWidget *wTF_Device;
GtkWidget *wTB_Title;
GtkWidget *wTF_Title;
@@ -69,31 +62,5 @@
#ifdef __cplusplus
} /* extern "C" */
#endif
-/*
-$Log: config_gui.h,v $
-Revision 1.3 2004/08/25 10:08:40 rogerms
-DiskPerf 1.5
-Revision 1.5 2004/08/25 08:50:08 RogerSeguin
-Added About... dialog box
-
-Revision 1.2 2003/11/04 10:26:13 rogerms
-DiskPerf 1.3
-
-Revision 1.4 2003/11/04 09:42:07 RogerSeguin
-Added busy time statistics
-
-Revision 1.1.1.1 2003/10/07 03:39:22 rogerms
-Initial release - v1.0
-
-Revision 1.3 2003/09/25 09:32:35 RogerSeguin
-Added color configuration
-
-Revision 1.2 2003/09/24 10:56:14 RogerSeguin
-Now swapping the monitor bars is possible
-
-Revision 1.1 2003/09/22 02:25:32 RogerSeguin
-Initial revision
-
-*/
#endif /* _config_gui_h */
Property changes on: xfce4-diskperf-plugin/trunk/panel-plugin/config_gui.h
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: xfce4-diskperf-plugin/trunk/panel-plugin/devperf.c
===================================================================
--- xfce4-diskperf-plugin/trunk/panel-plugin/devperf.c 2007-01-17 17:42:53 UTC (rev 2395)
+++ xfce4-diskperf-plugin/trunk/panel-plugin/devperf.c 2007-01-17 17:43:59 UTC (rev 2396)
@@ -1,27 +1,21 @@
-/*
+/* $Id$
+ *
* Copyright (c) 2003 RogerSeguin <roger_seguin at msn.com>
* Copyright (c) 2003 Benedikt Meurer <benedikt.meurer at unix-ag.uni-siegen.de>
*
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
*
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
@@ -317,62 +311,3 @@
/**************************************************************/
#error "Your plattform is not yet supported"
#endif
-
-
- /**************************************************************/
-
-/*
-$Log: devperf.c,v $
-Revision 1.8 2003/11/30 10:58:54 rogerms
-Release DiskPerf 1.4.1 - Just a bug fix for Linux-2.6 systems
-Thanks to Ivan Todoroski who found a bug introduced with release 1.3
-
-Revision 1.7 2003/11/17 09:24:14 benny
-NetBSD < 1.6K does not have separate read/write statistics. Thanks to martti.
-
-Revision 1.6 2003/11/10 23:00:41 benny
-Added "busy time" support for NetBSD.
-
-Revision 1.5 2003/11/04 10:26:13 rogerms
-DiskPerf 1.3
-
-Revision 1.9 2003/11/04 09:43:09 RogerSeguin
-Now retrieve both read and write busy times for Linux
-
-Revision 1.4 2003/11/02 06:57:50 rogerms
-Release 1.2
-
-Revision 1.8 2003/11/02 06:17:30 RogerSeguin
-Safer processing for Linux 2.6 - Added busy time (and queue length) for Linux 2.4 and 2.6
-
-Revision 1.3 2003/10/18 23:02:58 rogerms
-DiskPerf release 1.1
-
-Revision 1.7 2003/10/18 06:56:41 RogerSeguin
-Integration of Benedikt Meurer's work on NetBSD port
-
-Revision 1.6 2003/10/17 20:15:05 RogerSeguin
-Minor change related to Linux kernel 2.6
-
-Revision 1.5 2003/10/16 13:08:18 RogerSeguin
-Kernel 2.6 support
-
-Revision 1.2 2003/10/16 18:48:39 benny
-Added support for NetBSD.
-
-Revision 1.1.1.1 2003/10/07 03:39:22 rogerms
-Initial release - v1.0
-
-Revision 1.4 2003/10/04 06:05:08 RogerSeguin
-Fixed a possibility of 32-bit integer overflow introcduced by previous release
-
-Revision 1.3 2003/10/02 04:15:06 RogerSeguin
-Compute using rbytes/wbytes instead of rsect/wsect
-
-Revision 1.2 2003/09/25 12:25:09 RogerSeguin
-Implemented some error processing
-
-Revision 1.1 2003/09/22 02:25:34 RogerSeguin
-Initial revision
-
-*/
Property changes on: xfce4-diskperf-plugin/trunk/panel-plugin/devperf.c
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: xfce4-diskperf-plugin/trunk/panel-plugin/devperf.h
===================================================================
--- xfce4-diskperf-plugin/trunk/panel-plugin/devperf.h 2007-01-17 17:42:53 UTC (rev 2395)
+++ xfce4-diskperf-plugin/trunk/panel-plugin/devperf.h 2007-01-17 17:43:59 UTC (rev 2396)
@@ -1,26 +1,20 @@
-/*
- * Copyright (c) 2003 RogerSeguin <roger_seguin at msn.com>
+/* $Id$
+ *
+ * Copyright (c) 2003-2004 Roger Seguin <roger_seguin at msn.com>
*
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
*
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef _devperf_h
#define _devperf_h
@@ -71,43 +65,5 @@
#ifdef __cplusplus
} /* extern "C" */
#endif
-/*
-$Log: devperf.h,v $
-Revision 1.5 2003/11/04 10:26:13 rogerms
-DiskPerf 1.3
-Revision 1.7 2003/11/04 09:42:32 RogerSeguin
-Now retrieve both read and write busy times for Linux
-
-Revision 1.4 2003/11/02 06:57:50 rogerms
-Release 1.2
-
-Revision 1.6 2003/11/02 06:17:03 RogerSeguin
-Added busy time (and queue length)
-
-Revision 1.3 2003/10/18 23:02:58 rogerms
-DiskPerf release 1.1
-
-Revision 1.5 2003/10/18 06:56:32 RogerSeguin
-Integration of Benedikt Meurer's work on NetBSD port
-
-Revision 1.2 2003/10/16 18:48:39 benny
-Added support for NetBSD.
-
-Revision 1.4 2003/10/16 13:09:14 RogerSeguin
-Kernel 2.6 support
-
-Revision 1.1.1.1 2003/10/07 03:39:23 rogerms
-Initial release - v1.0
-
-Revision 1.3 2003/10/02 04:14:41 RogerSeguin
-Compute using rbytes/wbytes instead of rsect/wsect
-
-Revision 1.2 2003/09/25 12:24:46 RogerSeguin
-Implemented some error processing
-
-Revision 1.1 2003/09/22 02:25:35 RogerSeguin
-Initial revision
-
-*/
#endif /* _devperf_h */
Property changes on: xfce4-diskperf-plugin/trunk/panel-plugin/devperf.h
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: xfce4-diskperf-plugin/trunk/panel-plugin/diskperf.desktop.in.in
===================================================================
--- xfce4-diskperf-plugin/trunk/panel-plugin/diskperf.desktop.in.in 2007-01-17 17:42:53 UTC (rev 2395)
+++ xfce4-diskperf-plugin/trunk/panel-plugin/diskperf.desktop.in.in 2007-01-17 17:43:59 UTC (rev 2396)
@@ -3,6 +3,6 @@
Encoding=UTF-8
_Name=Disk Performance Monitor
_Comment=Show disk performance
-Icon=xfce-mouse
-X-XFCE-Exec=@PLUGIN_PATH@/xfce4-diskperf-plugin
+Icon=gtk-harddisk
+X-XFCE-Exec=@libexecdir@/xfce4/panel-plugins/xfce4-diskperf-plugin
Property changes on: xfce4-diskperf-plugin/trunk/panel-plugin/diskperf.desktop.in.in
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: xfce4-diskperf-plugin/trunk/panel-plugin/main.c
===================================================================
--- xfce4-diskperf-plugin/trunk/panel-plugin/main.c 2007-01-17 17:42:53 UTC (rev 2395)
+++ xfce4-diskperf-plugin/trunk/panel-plugin/main.c 2007-01-17 17:43:59 UTC (rev 2396)
@@ -1,26 +1,20 @@
-/*
- * Copyright (c) 2003, 2004 Roger Seguin <roger_seguin at msn.com>
+/* $Id$
+ *
+ * Copyright (c) 2003-2004 Roger Seguin <roger_seguin at msn.com>
*
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
*
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#include "config_gui.h"
@@ -422,10 +416,10 @@
strcpy (poConf->acDevice, "wd0");
strcpy (poConf->acTitle, "wd0");
#else
- strcpy (poConf->acDevice, "/dev/hda");
+ strcpy (poConf->acDevice, "/dev/sda");
status = stat (poConf->acDevice, &oStat);
poConf->st_rdev = (status == -1 ? 0 : oStat.st_rdev);
- strcpy (poConf->acTitle, "hda");
+ strcpy (poConf->acTitle, "sda");
#endif
poConf->fTitleDisplayed = 1;
@@ -918,7 +912,7 @@
/* Plugin API */
/* Create/pop up the configuration/options GUI */
{
- GtkWidget *dlg, *header, *vbox;
+ GtkWidget *dlg, *vbox;
struct param_t *poConf = &(poPlugin->oConf.oParam);
struct gui_t *poGUI = &(poPlugin->oConf.oGUI);
char acBuffer[16];
@@ -932,25 +926,18 @@
xfce_panel_plugin_block_menu (plugin);
- dlg = gtk_dialog_new_with_buttons (_("Configuration"),
- GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (plugin))),
- GTK_DIALOG_DESTROY_WITH_PARENT |
- GTK_DIALOG_NO_SEPARATOR,
- GTK_STOCK_CLOSE, GTK_RESPONSE_OK,
- NULL);
+ dlg = xfce_titled_dialog_new_with_buttons (_("Disk Performance Monitor"),
+ GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (plugin))),
+ GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR,
+ GTK_STOCK_CLOSE, GTK_RESPONSE_OK,
+ NULL);
- g_signal_connect (dlg, "response", G_CALLBACK (diskperf_dialog_response),
- poPlugin);
+ g_signal_connect (G_OBJECT (dlg), "response",
+ G_CALLBACK (diskperf_dialog_response), poPlugin);
- gtk_container_set_border_width (GTK_CONTAINER (dlg), 2);
+ gtk_window_set_position (GTK_WINDOW (dlg), GTK_WIN_POS_CENTER);
+ gtk_window_set_icon_name (GTK_WINDOW (dlg), "xfce4-settings");
- header = xfce_create_header (NULL, _("Disk Performance Monitor"));
- gtk_widget_set_size_request (GTK_BIN (header)->child, -1, 32);
- gtk_container_set_border_width (GTK_CONTAINER (header), BORDER - 2);
- gtk_widget_show (header);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), header,
- FALSE, TRUE, 0);
-
vbox = gtk_vbox_new(FALSE, BORDER);
gtk_container_set_border_width (GTK_CONTAINER (vbox), BORDER - 2);
gtk_widget_show(vbox);
@@ -959,7 +946,7 @@
poPlugin->oConf.wTopLevel = dlg;
- (void) CreateConfigGUI (vbox, poGUI);
+ CreateConfigGUI (vbox, poGUI);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (poGUI->wTB_Title),
poConf->fTitleDisplayed);
@@ -1042,11 +1029,7 @@
g_signal_connect (GTK_WIDGET (*(apwColorPB[i])), "clicked",
G_CALLBACK (ChooseColor), poPlugin);
}
-
- g_signal_connect (GTK_WIDGET (poGUI->wPB_About), "clicked",
- G_CALLBACK (About), 0);
-
gtk_widget_show (dlg);
} /* diskperf_create_options() */
@@ -1064,11 +1047,13 @@
if (xfce_panel_plugin_get_orientation (plugin) ==
GTK_ORIENTATION_HORIZONTAL) {
size1 = BORDER;
- size2 = p_size - 4;
+ size2 = -1;
+ gtk_widget_set_size_request (GTK_WIDGET (plugin), -1, p_size);
}
else {
- size1 = p_size - 4;
+ size1 = -1;
size2 = BORDER;
+ gtk_widget_set_size_request (GTK_WIDGET (plugin), p_size, -1);
}
for (i = 0; i < 2; i++) {
pwBar = poPlugin->oMonitor.awProgressBar + i;
@@ -1135,72 +1120,3 @@
}
XFCE_PANEL_PLUGIN_REGISTER_EXTERNAL (diskperf_construct);
-
-
- /**************************************************************/
-/*
-$Log: main.c,v $
-Revision 1.7 2004/08/25 10:08:40 rogerms
-DiskPerf 1.5
-
-Revision 1.14 2004/08/25 08:51:02 RogerSeguin
-MT support and About... dialog box added
-
-Revision 1.6 2003/11/11 12:40:34 rogerms
-Release 1.4
-
-Revision 1.13 2003/11/11 12:12:42 RogerSeguin
-Force to single "total busy time" monitor when platform doesn't provide separate read and write data (e.g. NetBSD)
-
-Revision 1.5 2003/11/04 10:26:13 rogerms
-DiskPerf 1.3
-
-Revision 1.12 2003/11/04 10:16:36 RogerSeguin
-Got rid of Microsoft ^M
-
-Revision 1.11 2003/11/04 09:43:36 RogerSeguin
-Added busy time monitoring for Linux
-
-Revision 1.4 2003/11/02 06:57:50 rogerms
-Release 1.2
-
-Revision 1.10 2003/11/02 06:18:33 RogerSeguin
-Added busy time in tooltips for Linux 2.4 and 2.6
-
-Revision 1.9 2003/10/24 11:16:20 RogerSeguin
-Different scalable fonts with Mandrake 9.2 ==> diffent tooltips string spacing
-
-Revision 1.3 2003/10/18 23:02:58 rogerms
-DiskPerf release 1.1
-
-Revision 1.8 2003/10/18 06:56:50 RogerSeguin
-Integration of Benedikt Meurer's work on NetBSD port
-
-Revision 1.7 2003/10/16 13:07:42 RogerSeguin
-Kernel 2.6 support
-
-Revision 1.2 2003/10/16 18:48:39 benny
-Added support for NetBSD.
-
-Revision 1.1.1.1 2003/10/07 03:39:25 rogerms
-Initial release - v1.0
-
-Revision 1.6 2003/10/02 04:16:07 RogerSeguin
-Compute using rbytes/wbytes instead of rsect/wsect
-
-Revision 1.5 2003/09/25 12:24:11 RogerSeguin
-Implemented some error processing
-
-Revision 1.4 2003/09/25 09:32:13 RogerSeguin
-Added color configuration
-
-Revision 1.3 2003/09/24 10:56:36 RogerSeguin
-Now swapping the monitor bars is possible
-
-Revision 1.2 2003/09/23 15:17:01 RogerSeguin
-Now supports panel orientation
-
-Revision 1.1 2003/09/22 02:25:35 RogerSeguin
-Initial revision
-
-*/
Property changes on: xfce4-diskperf-plugin/trunk/panel-plugin/main.c
___________________________________________________________________
Name: svn:keywords
+ Id
Added: xfce4-diskperf-plugin/trunk/po/LINGUAS
===================================================================
--- xfce4-diskperf-plugin/trunk/po/LINGUAS (rev 0)
+++ xfce4-diskperf-plugin/trunk/po/LINGUAS 2007-01-17 17:43:59 UTC (rev 2396)
@@ -0,0 +1,2 @@
+# set of available languages (in alphabetic order)
+ca cs eu fr pl
More information about the Goodies-commits
mailing list