[Xfce4-commits] Include for P_ZOMBIE & SSLEEP macros definition.
Updating branch refs/heads/master
to e293a72e0f990780e5fb11a1286095ef8119f01c (commit)
from d720c86b87e183e05b5f5158c03d77d97e889c40 (commit)
commit e293a72e0f990780e5fb11a1286095ef8119f01c
Author: Landry Breuil
Date: Thu Jan 9 22:10:09 2014 +0100
Include for P_ZOMBIE & SSLEEP macros definition.
src/task-manager-bsd.c |2 ++
1 file changed, 2 insertions(+)
diff --git a/src/task-manager-bsd.c b/src/task-manager-bsd.c
index 2bdfd70..c34e1ad 100644
--- a/src/task-manager-bsd.c
+++ b/src/task-manager-bsd.c
@@ -31,6 +31,8 @@
#include
/* for getpagesize() */
#include
+/* for P_ZOMBIE & SSLEEP */
+#include
#include "task-manager.h"
char *state_abbrev[] = {
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] updates for 0.4.5 release
Updating branch refs/heads/master to 700a8552263982b6358cca808d9236805dbd01e4 (commit) from 8f13e2b967814f7d41caf39c35d3d29eff9f9134 (commit) commit 700a8552263982b6358cca808d9236805dbd01e4 Author: Landry Breuil Date: Sun Jan 20 21:34:23 2013 +0100 updates for 0.4.5 release NEWS|8 configure.ac.in |2 +- 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/NEWS b/NEWS index 13a929e..75dc2b7 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,11 @@ +0.4.5 : 2013/01/20 += +- Port to libxfce4ui +- Build the plugin as a module +- Fix broken argument handling (bug #8642) +- Save config after destroying the dialog (bug #9523) +- Allow numpad enter to trigger the search too (bug #9663) + 0.4.4 = - Fix compatibility with Xfce 4.7+, fixing bug #6939 and #6940 diff --git a/configure.ac.in b/configure.ac.in index 0db20e8..49f206e 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -1,7 +1,7 @@ dnl Version information m4_define([smartbookmark_version_major], [0]) m4_define([smartbookmark_version_minor], [4]) -m4_define([smartbookmark_version_micro], [4]) +m4_define([smartbookmark_version_micro], [5]) m4_define([smartbookmark_version], [smartbookmark_version_major.smartbookmark_version_minor.smartbookmark_version_micro]) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Creating annotated tag 0.4.5
Updating annotated tag refs/tags/0.4.5 as new annotated tag to 05f2eff71e518e6f55c53f6c113b68dad63b489f (tag) succeeds 0.4.4-31-g8f13e2b tagged by Landry Breuil on 2013-01-20 21:45 +0100 Landry Breuil (1): updates for 0.4.5 release ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Fix style when the entry loses focus (bug #3525)
Updating branch refs/heads/master
to 271221054d21aab631dc7a37c2fa49f2dc19cf19 (commit)
from 3d0844ad0833df6d8f06286e0072e6da2c47 (commit)
commit 271221054d21aab631dc7a37c2fa49f2dc19cf19
Author: Landry Breuil
Date: Sun Jan 20 21:59:13 2013 +0100
Fix style when the entry loses focus (bug #3525)
panel-plugin/verve-plugin.c | 22 +-
1 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/panel-plugin/verve-plugin.c b/panel-plugin/verve-plugin.c
index 194b76c..e61e043 100644
--- a/panel-plugin/verve-plugin.c
+++ b/panel-plugin/verve-plugin.c
@@ -120,7 +120,6 @@ verve_plugin_load_completion (VerveEnv* env, gpointer
user_data)
static gboolean
verve_plugin_focus_timeout (VervePlugin *verve)
{
- GtkStyle *default_style;
GtkStyle *style;
g_return_val_if_fail (verve != NULL, FALSE);
@@ -129,16 +128,13 @@ verve_plugin_focus_timeout (VervePlugin *verve)
/* Determine current entry style */
style = gtk_widget_get_style (verve->input);
- /* Get default style for widgets */
- default_style = gtk_widget_get_default_style ();
-
/* Check whether the entry already is highlighted */
if (gdk_color_equal (&style->base[GTK_STATE_NORMAL],
&style->base[GTK_STATE_SELECTED]))
{
/* Make it look normal again */
- gtk_widget_modify_base (verve->input, GTK_STATE_NORMAL,
&default_style->base[GTK_STATE_NORMAL]);
- gtk_widget_modify_bg (verve->input, GTK_STATE_NORMAL,
&default_style->bg[GTK_STATE_NORMAL]);
- gtk_widget_modify_text (verve->input, GTK_STATE_NORMAL,
&default_style->text[GTK_STATE_NORMAL]);
+ gtk_widget_modify_base (verve->input, GTK_STATE_NORMAL,
&style->base[GTK_STATE_NORMAL]);
+ gtk_widget_modify_bg (verve->input, GTK_STATE_NORMAL,
&style->bg[GTK_STATE_NORMAL]);
+ gtk_widget_modify_text (verve->input, GTK_STATE_NORMAL,
&style->text[GTK_STATE_NORMAL]);
}
else
{
@@ -156,7 +152,7 @@ verve_plugin_focus_timeout (VervePlugin *verve)
static void
verve_plugin_focus_timeout_reset (VervePlugin *verve)
{
- GtkStyle *default_style;
+ GtkStyle *style;
g_return_if_fail (verve != NULL);
g_return_if_fail (verve->input != NULL || GTK_IS_ENTRY (verve->input));
@@ -168,13 +164,13 @@ verve_plugin_focus_timeout_reset (VervePlugin *verve)
verve->focus_timeout = 0;
}
- /* Get default style */
- default_style = gtk_widget_get_default_style ();
+ /* Determine current entry style */
+ style = gtk_widget_get_style (verve->input);
/* Reset entry background */
- gtk_widget_modify_base (verve->input, GTK_STATE_NORMAL,
&default_style->base[GTK_STATE_NORMAL]);
- gtk_widget_modify_bg (verve->input, GTK_STATE_NORMAL,
&default_style->bg[GTK_STATE_NORMAL]);
- gtk_widget_modify_text (verve->input, GTK_STATE_NORMAL,
&default_style->text[GTK_STATE_NORMAL]);
+ gtk_widget_modify_base (verve->input, GTK_STATE_NORMAL,
&style->base[GTK_STATE_NORMAL]);
+ gtk_widget_modify_bg (verve->input, GTK_STATE_NORMAL,
&style->bg[GTK_STATE_NORMAL]);
+ gtk_widget_modify_text (verve->input, GTK_STATE_NORMAL,
&style->text[GTK_STATE_NORMAL]);
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Make sure childs are reaped, instead of leaving zombies behind (bug #9791)
Updating branch refs/heads/master
to a56503f4aba4525c5951d14bb1b4251e8df06f57 (commit)
from 700a8552263982b6358cca808d9236805dbd01e4 (commit)
commit a56503f4aba4525c5951d14bb1b4251e8df06f57
Author: Landry Breuil
Date: Thu Jan 24 10:17:58 2013 +0100
Make sure childs are reaped, instead of leaving zombies behind (bug #9791)
src/smartbookmark.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/smartbookmark.c b/src/smartbookmark.c
index 6f358d3..176bb05 100644
--- a/src/smartbookmark.c
+++ b/src/smartbookmark.c
@@ -84,7 +84,7 @@ static gboolean do_search(const char *url, const char
*keyword)
argv[3] = complete_url;
success = g_spawn_async(NULL, (gchar **)argv, NULL,
-G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD, NULL, NULL, NULL,
&error);
+G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, &error);
if (!success) {
xfce_dialog_show_error(NULL, error, _("Failed to send %s to your
preferred browser"), complete_url);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Merge branch 'master' of git://git.xfce.org/panel-plugins/xfce4-smartbookmark-plugin
Updating branch refs/heads/master to 4fc14cde30b4504a44d7fb0e2de4ff988da8c847 (commit) from a56503f4aba4525c5951d14bb1b4251e8df06f57 (commit) commit 4fc14cde30b4504a44d7fb0e2de4ff988da8c847 Merge: a56503f 9c47bb1 Author: Landry Breuil Date: Thu Jan 24 10:18:38 2013 +0100 Merge branch 'master' of git://git.xfce.org/panel-plugins/xfce4-smartbookmark-plugin commit 9c47bb114df692995078b9c7e85a9725849a6d08 Author: Seong-ho Cho Date: Wed Jan 23 19:19:48 2013 +0100 l10n: Updated Korean (ko) translation to 100% New status: 9 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/ko.po | 22 +++--- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/po/ko.po b/po/ko.po index 9a62e62..a8b2f57 100644 --- a/po/ko.po +++ b/po/ko.po @@ -1,17 +1,16 @@ # Korean translation for xfce4-smartbookmark-plugin package. # Copyright (C) 2006-2012 Emanuele Rocca et al. # This file is distributed under the same license as the xfce4-smartbookmark-plugin package. -# Seong-ho, Cho , 2012. +# Seong-ho Cho , 2012, 2013. # msgid "" msgstr "" "Project-Id-Version: xfce4-smartbookmark-plugin.master\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-03 22:26+0100\n" -"PO-Revision-Date: 2012-02-26 14:37+0900\n" -"Last-Translator: Seong-ho, Cho \n" -"Language-Team: xfce4-users-kr-i18n \n" +"Report-Msgid-Bugs-To: https://bugzilla.xfce.org/enter_bug.cgi?product=xfce4-smartbookmark-plugin\n"; +"POT-Creation-Date: 2013-01-23 13:48+\n" +"PO-Revision-Date: 2013-01-24 03:18+0900\n" +"Last-Translator: Seong-ho Cho \n" +"Language-Team: xfce4-users-kr-i18n \n" "Language: ko\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -24,7 +23,7 @@ msgstr "" #: ../src/smartbookmark.c:90 #, c-format msgid "Failed to send %s to your preferred browser" -msgstr "" +msgstr "%s을(를) 기본 브라우저로 보내는데 실패했습니다" #: ../src/smartbookmark.c:296 msgid "Smartbookmark" @@ -55,9 +54,10 @@ msgid "URL: " msgstr "URL:" #: ../src/smartbookmark.desktop.in.h:1 +msgid "Query websites from the Xfce panel" +msgstr "Xfce 패널에서 웹사이트 요청하기" + +#: ../src/smartbookmark.desktop.in.h:2 msgid "SmartBookmark" msgstr "똑똑한 북마크" -#: ../src/smartbookmark.desktop.in.h:2 -msgid "Query websites from the Xfce panel" -msgstr "Xfce 패널에서 웹사이트 요청하기" ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Port to libxfce4ui. (bug #8064)
Updating branch refs/heads/master to 61eba531ec7daa0e38b3d9b89c1c34a4cbac976f (commit) from 7d11392ef6d626519e5c6ef317b681df61637ca6 (commit) commit 61eba531ec7daa0e38b3d9b89c1c34a4cbac976f Author: Landry Breuil Date: Wed Feb 13 22:30:03 2013 +0100 Port to libxfce4ui. (bug #8064) Joachim Wiedorn sent a very similar patch, thanks too! INSTALL| 53 +++ configure.ac.in| 29 ++--- panel-plugin/Makefile.am |4 +- panel-plugin/datetime-dialog.c |8 +++--- panel-plugin/datetime.c|2 +- 5 files changed, 47 insertions(+), 49 deletions(-) diff --git a/INSTALL b/INSTALL index d3c5b40..23e5f25 100644 --- a/INSTALL +++ b/INSTALL @@ -1,8 +1,8 @@ Installation Instructions * -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, -2006, 2007 Free Software Foundation, Inc. +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free +Software Foundation, Inc. This file is free documentation; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. @@ -10,10 +10,7 @@ unlimited permission to copy, distribute and modify it. Basic Installation == -Briefly, the shell commands `./configure; make; make install' should -configure, build, and install this package. The following -more-detailed instructions are generic; see the `README' file for -instructions specific to this package. +These are generic installation instructions. The `configure' shell script attempts to guess correct values for various system-dependent variables used during compilation. It uses @@ -26,9 +23,9 @@ debugging `configure'). It can also use an optional file (typically called `config.cache' and enabled with `--cache-file=config.cache' or simply `-C') that saves -the results of its tests to speed up reconfiguring. Caching is +the results of its tests to speed up reconfiguring. (Caching is disabled by default to prevent problems with accidental use of stale -cache files. +cache files.) If you need to do unusual things to compile the package, please try to figure out how `configure' could check whether to do them, and mail @@ -38,17 +35,20 @@ some point `config.cache' contains results you don't want to keep, you may remove or edit it. The file `configure.ac' (or `configure.in') is used to create -`configure' by a program called `autoconf'. You need `configure.ac' if -you want to change it or regenerate `configure' using a newer version -of `autoconf'. +`configure' by a program called `autoconf'. You only need +`configure.ac' if you want to change it or regenerate `configure' using +a newer version of `autoconf'. The simplest way to compile this package is: 1. `cd' to the directory containing the package's source code and type - `./configure' to configure the package for your system. + `./configure' to configure the package for your system. If you're + using `csh' on an old version of System V, you might need to type + `sh ./configure' instead to prevent `csh' from trying to execute + `configure' itself. - Running `configure' might take a while. While running, it prints - some messages telling which features it is checking for. + Running `configure' takes awhile. While running, it prints some + messages telling which features it is checking for. 2. Type `make' to compile the package. @@ -67,9 +67,6 @@ The simplest way to compile this package is: all sorts of other programs in order to regenerate files that came with the distribution. - 6. Often, you can also type `make uninstall' to remove the installed - files again. - Compilers and Options = @@ -81,7 +78,7 @@ details on some of the pertinent environment variables. by setting variables in the command line or in the environment. Here is an example: - ./configure CC=c99 CFLAGS=-g LIBS=-lposix + ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix *Note Defining Variables::, for more details. @@ -90,15 +87,17 @@ Compiling For Multiple Architectures You can compile the package for more than one kind of computer at the same time, by placing the object files for each architecture in their -own directory. To do this, you can use GNU `make'. `cd' to the +own directory. To do this, you must use a version of `make' that +supports the `VPATH' variable, such as GNU `make'. `cd' to the directory where you want the object files and executables to go and run the `configure' script. `configure' automatically checks for the source code in the directory that `configure' is in and in
[Xfce4-commits] remove useless pot file
Updating branch refs/heads/master to 25c3c81a01a899577702b9cabdb60a3b7da7483a (commit) from 61eba531ec7daa0e38b3d9b89c1c34a4cbac976f (commit) commit 25c3c81a01a899577702b9cabdb60a3b7da7483a Author: Landry Breuil Date: Wed Feb 13 22:33:07 2013 +0100 remove useless pot file po/xfce4-datetime-plugin.pot | 108 -- 1 files changed, 0 insertions(+), 108 deletions(-) diff --git a/po/xfce4-datetime-plugin.pot b/po/xfce4-datetime-plugin.pot deleted file mode 100644 index 72a099b..000 --- a/po/xfce4-datetime-plugin.pot +++ /dev/null @@ -1,108 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-07-31 13:39-0500\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: ../panel-plugin/datetime.c:82 -msgid "Invalid format" -msgstr "" - -#: ../panel-plugin/datetime.c:87 -msgid "Error" -msgstr "" - -#: ../panel-plugin/datetime-dialog.c:42 -msgid "Date, then time" -msgstr "" - -#: ../panel-plugin/datetime-dialog.c:43 -msgid "Time, then date" -msgstr "" - -#: ../panel-plugin/datetime-dialog.c:44 -msgid "Date only" -msgstr "" - -#: ../panel-plugin/datetime-dialog.c:45 -msgid "Time only" -msgstr "" - -#. placeholder -#: ../panel-plugin/datetime-dialog.c:85 ../panel-plugin/datetime-dialog.c:96 -msgid "Custom..." -msgstr "" - -#: ../panel-plugin/datetime-dialog.c:131 -msgid "Select font" -msgstr "" - -#: ../panel-plugin/datetime-dialog.c:332 -#, c-format -msgid "Unable to open the following url: %s" -msgstr "" - -#: ../panel-plugin/datetime-dialog.c:371 -msgid "Datetime" -msgstr "" - -#. -#. * layout frame -#. -#: ../panel-plugin/datetime-dialog.c:391 -msgid "Layout" -msgstr "" - -#. Format label -#. format label -#: ../panel-plugin/datetime-dialog.c:405 ../panel-plugin/datetime-dialog.c:467 -#: ../panel-plugin/datetime-dialog.c:570 -msgid "Format:" -msgstr "" - -#. -#. * Date frame -#. -#: ../panel-plugin/datetime-dialog.c:425 -msgid "Date" -msgstr "" - -#: ../panel-plugin/datetime-dialog.c:437 -msgid "The date will appear in a tooltip." -msgstr "" - -#. font label -#: ../panel-plugin/datetime-dialog.c:450 ../panel-plugin/datetime-dialog.c:553 -msgid "Font:" -msgstr "" - -#. -#. * time frame -#. -#: ../panel-plugin/datetime-dialog.c:528 -msgid "Time" -msgstr "" - -#: ../panel-plugin/datetime-dialog.c:540 -msgid "The time will appear in a tooltip." -msgstr "" - -#: ../panel-plugin/datetime.desktop.in.in.h:1 -msgid "Date and Time plugin with a simple calendar" -msgstr "" - -#: ../panel-plugin/datetime.desktop.in.in.h:2 -msgid "DateTime" -msgstr "" ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Remove Xfce 4.6 compat files, we now depend on 4.8.
Updating branch refs/heads/master
to cd1bb412779e6240eeffecc717528c8053f0fe1d (commit)
from 25c3c81a01a899577702b9cabdb60a3b7da7483a (commit)
commit cd1bb412779e6240eeffecc717528c8053f0fe1d
Author: Landry Breuil
Date: Wed Feb 13 22:35:04 2013 +0100
Remove Xfce 4.6 compat files, we now depend on 4.8.
panel-plugin/Makefile.am |4 +-
panel-plugin/datetime.c |2 -
panel-plugin/xfce46-compat.c | 193 --
panel-plugin/xfce46-compat.h | 20 -
4 files changed, 1 insertions(+), 218 deletions(-)
diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index 6f0bb00..18bbc7e 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -7,9 +7,7 @@ libdatetime_la_SOURCES =\
datetime.h \
datetime.c \
datetime-dialog.h \
- datetime-dialog.c \
- xfce46-compat.h \
- xfce46-compat.c
+ datetime-dialog.c
libdatetime_la_CFLAGS =\
-I$(top_srcdir) \
diff --git a/panel-plugin/datetime.c b/panel-plugin/datetime.c
index 031166a..0738889 100644
--- a/panel-plugin/datetime.c
+++ b/panel-plugin/datetime.c
@@ -33,8 +33,6 @@
#include
#include
-#include "xfce46-compat.h"
-
#include "datetime.h"
#include "datetime-dialog.h"
diff --git a/panel-plugin/xfce46-compat.c b/panel-plugin/xfce46-compat.c
deleted file mode 100644
index 97f10b1..000
--- a/panel-plugin/xfce46-compat.c
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
- * Code was taken from libxfce4panel (LGPL2 or any later version),
- * distributed here under the GPL.
- *
- * Copyright (c) 2005-2007 Jasper Huijsmans
- *
- * 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.
- *
- * 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.
- */
-
-#ifdef HAVE_CONFIG_H
-# include
-#endif
-
-#ifndef HAVE_LIBXFCE4PANEL_46
-
-#include "xfce46-compat.h"
-
-#include
-#include
-
-/* support macros for debugging */
-#ifndef NDEBUG
-#define _panel_assert(expr) g_assert (expr)
-#define _panel_assert_not_reached() g_assert_not_reached ()
-#define _panel_return_if_fail(expr) g_return_if_fail (expr)
-#define _panel_return_val_if_fail(expr, val) g_return_val_if_fail (expr, (val))
-#else
-#define _panel_assert(expr) G_STMT_START{ (void)0; }G_STMT_END
-#define _panel_assert_not_reached() G_STMT_START{ (void)0; }G_STMT_END
-#define _panel_return_if_fail(expr) G_STMT_START{ (void)0; }G_STMT_END
-#define _panel_return_val_if_fail(expr, val) G_STMT_START{ (void)0; }G_STMT_END
-#endif
-
-/**
- * xfce_panel_plugin_arrow_type:
- * @plugin: an #XfcePanelPlugin
- *
- * Determine the #GtkArrowType for a widget that opens a menu and uses
- * xfce_panel_plugin_position_menu() to position the menu.
- *
- * Returns: The #GtkArrowType to use.
- **/
-GtkArrowType
-xfce_panel_plugin_arrow_type (XfcePanelPlugin *plugin)
-{
-XfceScreenPosition position;
-GdkScreen *screen;
-GdkRectanglegeom;
-gintmon, x, y;
-
-if (!GTK_WIDGET_REALIZED (plugin))
-return GTK_ARROW_UP;
-
-position = xfce_panel_plugin_get_screen_position (plugin);
-switch (position)
-{
-/* top */
-case XFCE_SCREEN_POSITION_NW_H:
-case XFCE_SCREEN_POSITION_N:
-case XFCE_SCREEN_POSITION_NE_H:
-return GTK_ARROW_DOWN;
-
-/* left */
-case XFCE_SCREEN_POSITION_NW_V:
-case XFCE_SCREEN_POSITION_W:
-case XFCE_SCREEN_POSITION_SW_V:
-return GTK_ARROW_RIGHT;
-
-/* right */
-case XFCE_SCREEN_POSITION_NE_V:
-case XFCE_SCREEN_POSITION_E:
-case XFCE_SCREEN_POSITION_SE_V:
-return GTK_ARROW_LEFT;
-
-/* bottom */
-case XFCE_SCREEN_POSITION_SW_H:
-case XFCE_SCREEN_POSITION_S:
-case XFCE_SCREEN_POSITION_SE_H:
-return GTK_ARROW_UP;
-
-/* floating */
-default:
-/* get the screen information */
-screen = gtk_widget_get_screen (GTK_WIDGET (plugin));
-mon = gdk_screen_get_monitor_at_wind
[Xfce4-commits] Update to 2013 xfce standards
Updating branch refs/heads/master
to e55a418bd9d8c284774d7b8ac33aff0356a5a4ab (commit)
from cd1bb412779e6240eeffecc717528c8053f0fe1d (commit)
commit e55a418bd9d8c284774d7b8ac33aff0356a5a4ab
Author: Landry Breuil
Date: Wed Feb 13 22:49:21 2013 +0100
Update to 2013 xfce standards
- rename datetime.desktop.in.in
- use newer xfce4/panel/plugins paths for desktop and module file
- register the module as not internal to the panel
- remove now useless cygwin check
configure.ac.in|1 -
panel-plugin/Makefile.am | 27 ++-
panel-plugin/datetime.c|2 +-
...{datetime.desktop.in.in => datetime.desktop.in} |2 +-
po/POTFILES.in |2 +-
5 files changed, 12 insertions(+), 22 deletions(-)
diff --git a/configure.ac.in b/configure.ac.in
index 98b394a..cdb3536 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -17,7 +17,6 @@ AM_MAINTAINER_MODE()
dnl Check for UNIX variants
AC_AIX
AC_ISC_POSIX
-AM_CONDITIONAL([HAVE_CYGWIN], [test "`uname | grep \"CYGWIN\"`" != ""])
dnl check for basic programs
AC_PROG_CC
diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index 18bbc7e..c6e44df 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -1,4 +1,4 @@
-plugindir = $(libdir)/xfce4/panel-plugins/
+plugindir = $(libdir)/xfce4/panel/plugins/
plugin_LTLIBRARIES = \
libdatetime.la
@@ -19,12 +19,10 @@ libdatetime_la_CFLAGS = \
libdatetime_la_LDFLAGS = \
-avoid-version \
- -module
-
-if HAVE_CYGWIN
-libdatetime_la_LDFLAGS += \
- -no-undefined
-endif
+ -module \
+ -no-undefined \
+ -export-symbols-regex '^xfce_panel_module_(preinit|init|construct)' \
+ $(PLATFORM_LDFLAGS)
libdatetime_la_LIBADD =\
$(GTK_LIBS) \
@@ -32,19 +30,12 @@ libdatetime_la_LIBADD = \
$(LIBXFCE4UI_LIBS) \
$(LIBXFCE4UTIL_LIBS)
-desktopdir = $(datadir)/xfce4/panel-plugins
-desktop_in_in_files = datetime.desktop.in.in
-desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
-%.desktop.in: %.desktop.in.in
- sed -e "s,\@libdir\@,$(libdir),g" < $< > $@
+desktopdir = $(datadir)/xfce4/panel/plugins
+desktop_in_files = datetime.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
-EXTRA_DIST = \
- $(desktop_in_in_files)
-
-DISTCLEANFILES = \
- $(desktop_DATA) \
- $(desktop_in_files)
+EXTRA_DIST = $(desktop_in_files)
+CLEANFILES = $(desktop_DATA)
diff --git a/panel-plugin/datetime.c b/panel-plugin/datetime.c
index 0738889..3350c3a 100644
--- a/panel-plugin/datetime.c
+++ b/panel-plugin/datetime.c
@@ -694,5 +694,5 @@ static void datetime_construct(XfcePanelPlugin *plugin)
}
-XFCE_PANEL_PLUGIN_REGISTER_INTERNAL(datetime_construct);
+XFCE_PANEL_PLUGIN_REGISTER(datetime_construct);
diff --git a/panel-plugin/datetime.desktop.in.in
b/panel-plugin/datetime.desktop.in
similarity index 75%
rename from panel-plugin/datetime.desktop.in.in
rename to panel-plugin/datetime.desktop.in
index e3e3c5d..3c3277a 100644
--- a/panel-plugin/datetime.desktop.in.in
+++ b/panel-plugin/datetime.desktop.in
@@ -4,4 +4,4 @@ _Name=DateTime
_Comment=Date and Time plugin with a simple calendar
Icon=xfce-schedule
X-XFCE-Module=datetime
-X-XFCE-Module-Path=@libdir@/xfce4/panel-plugins
+X-XFCE-Internal=FALSE
diff --git a/po/POTFILES.in b/po/POTFILES.in
index ec27071..971c3a3 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,3 +1,3 @@
panel-plugin/datetime.c
panel-plugin/datetime-dialog.c
-panel-plugin/datetime.desktop.in.in
+panel-plugin/datetime.desktop.in
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Set widgets orientation according to the panel orientation.
Updating branch refs/heads/master
to 34b77702471d93f2d8f19e736d616ea0b01f4664 (commit)
from e55a418bd9d8c284774d7b8ac33aff0356a5a4ab (commit)
commit 34b77702471d93f2d8f19e736d616ea0b01f4664
Author: Harald Judt
Date: Mon May 21 10:54:00 2012 +0200
Set widgets orientation according to the panel orientation.
This makes the plugin rotate its widgets in vertical mode
and introduces support for panel-4.10 features, like the new
deskbar mode.
Signed-off-by: Landry Breuil
panel-plugin/datetime.c | 82 ++
panel-plugin/datetime.h |2 +-
2 files changed, 68 insertions(+), 16 deletions(-)
diff --git a/panel-plugin/datetime.c b/panel-plugin/datetime.c
index 3350c3a..559020e 100644
--- a/panel-plugin/datetime.c
+++ b/panel-plugin/datetime.c
@@ -38,6 +38,13 @@
#define DATETIME_MAX_STRLEN 256
+/* check for new Xfce 4.10 panel features */
+#ifdef LIBXFCE4PANEL_CHECK_VERSION
+#if LIBXFCE4PANEL_CHECK_VERSION (4,9,0)
+#define HAS_PANEL_49
+#endif
+#endif
+
/**
* Convert a GTimeVal to milliseconds.
* Fractions of a millisecond are truncated.
@@ -440,13 +447,13 @@ void datetime_apply_layout(t_datetime *datetime, t_layout
layout)
switch(datetime->layout)
{
case LAYOUT_TIME_DATE:
- gtk_box_reorder_child(GTK_BOX(datetime->vbox), datetime->time_label, 0);
- gtk_box_reorder_child(GTK_BOX(datetime->vbox), datetime->date_label, 1);
+ gtk_box_reorder_child(GTK_BOX(datetime->box), datetime->time_label, 0);
+ gtk_box_reorder_child(GTK_BOX(datetime->box), datetime->date_label, 1);
break;
default:
- gtk_box_reorder_child(GTK_BOX(datetime->vbox), datetime->time_label, 1);
- gtk_box_reorder_child(GTK_BOX(datetime->vbox), datetime->date_label, 0);
+ gtk_box_reorder_child(GTK_BOX(datetime->box), datetime->time_label, 1);
+ gtk_box_reorder_child(GTK_BOX(datetime->box), datetime->date_label, 0);
}
datetime_set_update_interval(datetime);
@@ -585,18 +592,53 @@ void datetime_write_rc_file(XfcePanelPlugin *plugin,
t_datetime *dt)
}
/*
+ * change widgets orientation when the panel orientation changes
+ */
+#ifdef HAS_PANEL_49
+static void datetime_set_mode(XfcePanelPlugin *plugin, XfcePanelPluginMode
mode, t_datetime *datetime)
+{
+ GtkOrientation panel_orientation = xfce_panel_plugin_get_orientation
(plugin);
+ GtkOrientation orientation = (mode == XFCE_PANEL_PLUGIN_MODE_VERTICAL) ?
+GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL;
+#else
+static void datetime_set_orientation(XfcePanelPlugin *plugin, GtkOrientation
orientation, t_datetime *datetime)
+{
+#endif
+ if (orientation == GTK_ORIENTATION_VERTICAL)
+ {
+xfce_hvbox_set_orientation(XFCE_HVBOX(datetime->box),
GTK_ORIENTATION_HORIZONTAL);
+gtk_label_set_angle(GTK_LABEL(datetime->time_label), -90);
+gtk_label_set_angle(GTK_LABEL(datetime->date_label), -90);
+gtk_box_reorder_child(GTK_BOX(datetime->box), datetime->time_label, 0);
+gtk_box_reorder_child(GTK_BOX(datetime->box), datetime->date_label, 1);
+ }
+ else
+ {
+xfce_hvbox_set_orientation(XFCE_HVBOX(datetime->box),
GTK_ORIENTATION_VERTICAL);
+gtk_label_set_angle(GTK_LABEL(datetime->time_label), 0);
+gtk_label_set_angle(GTK_LABEL(datetime->date_label), 0);
+gtk_box_reorder_child(GTK_BOX(datetime->box), datetime->date_label, 0);
+gtk_box_reorder_child(GTK_BOX(datetime->box), datetime->time_label, 1);
+ }
+}
+
+/*
* create the gtk-part of the datetime plugin
*/
static void datetime_create_widget(t_datetime * datetime)
{
+ GtkOrientation orientation;
+ orientation = xfce_panel_plugin_get_orientation(datetime->plugin);
+
/* create button */
datetime->button = xfce_create_panel_toggle_button();
gtk_widget_show(datetime->button);
- /* create vertical box */
- datetime->vbox = gtk_vbox_new(TRUE, 0);
- gtk_widget_show(datetime->vbox);
- gtk_container_add(GTK_CONTAINER(datetime->button), datetime->vbox);
+ /* create a box which can be easily adapted to the panel orientation */
+ datetime->box = xfce_hvbox_new(GTK_ORIENTATION_VERTICAL, TRUE, 0);
+
+ gtk_widget_show(datetime->box);
+ gtk_container_add(GTK_CONTAINER(datetime->button), datetime->box);
/* create time and date lines */
datetime->time_label = gtk_label_new("");
@@ -604,17 +646,22 @@ static void datetime_create_widget(t_datetime * datetime)
gtk_label_set_justify(GTK_LABEL(datetime->time_label), GTK_JUSTIFY_CENTER);
gtk_label_set_justify(GTK_LABEL(datetime->date_label), GTK_JUSTIFY_CENTER);
- /* add time and date lines to the vbox */
- gtk_box_pack_start(GTK_BOX(datetime->vbox),
+ /* add time and date lines to the box */
+ gtk_box_pack_start(GTK_BOX(datetime->box),
datetime->time_label, FALSE, FALSE, 0);
- gtk_box_pack_start(GTK_B
[Xfce4-commits] Remove the #ifdef machinery checking if GtkTooltip is available
Updating branch refs/heads/master
to 1bd3d679d4591dd6689f0f7008e69d5fe8fe177e (commit)
from 34b77702471d93f2d8f19e736d616ea0b01f4664 (commit)
commit 1bd3d679d4591dd6689f0f7008e69d5fe8fe177e
Author: Landry Breuil
Date: Thu Feb 14 21:30:41 2013 +0100
Remove the #ifdef machinery checking if GtkTooltip is available
Gtk 2.15.4 was released 4 years ago and GtkTooltip is here since 2.12...
panel-plugin/datetime-dialog.c | 23 ---
panel-plugin/datetime.c|4
panel-plugin/datetime.h|8
3 files changed, 0 insertions(+), 35 deletions(-)
diff --git a/panel-plugin/datetime-dialog.c b/panel-plugin/datetime-dialog.c
index 4ef3ab8..ede858f 100644
--- a/panel-plugin/datetime-dialog.c
+++ b/panel-plugin/datetime-dialog.c
@@ -170,7 +170,6 @@ datetime_layout_changed(GtkComboBox *cbox, t_datetime *dt)
/* read layout */
layout = gtk_combo_box_get_active(cbox);
-#if USE_GTK_TOOLTIP_API
switch(layout)
{
case LAYOUT_DATE:
@@ -196,24 +195,6 @@ datetime_layout_changed(GtkComboBox *cbox, t_datetime *dt)
gtk_widget_show(dt->time_font_hbox);
gtk_widget_hide(dt->time_tooltip_label);
}
-#else
- switch(layout)
- {
-case LAYOUT_DATE:
- gtk_widget_set_sensitive(dt->date_frame, TRUE);
- gtk_widget_set_sensitive(dt->time_frame, FALSE);
- break;
-
-case LAYOUT_TIME:
- gtk_widget_set_sensitive(dt->date_frame, FALSE);
- gtk_widget_set_sensitive(dt->time_frame, TRUE);
- break;
-
-default:
- gtk_widget_set_sensitive(dt->date_frame, TRUE);
- gtk_widget_set_sensitive(dt->time_frame, TRUE);
- }
-#endif
datetime_apply_layout(dt, layout);
datetime_update(dt);
@@ -431,7 +412,6 @@ datetime_properties_dialog(XfcePanelPlugin *plugin,
t_datetime * datetime)
vbox = gtk_vbox_new(FALSE, 8);
gtk_container_add(GTK_CONTAINER(bin),vbox);
-#if USE_GTK_TOOLTIP_API
/* tooltip label */
str = g_markup_printf_escaped("%s",
_("The date will appear in a tooltip."));
@@ -440,7 +420,6 @@ datetime_properties_dialog(XfcePanelPlugin *plugin,
t_datetime * datetime)
gtk_label_set_use_markup(GTK_LABEL(datetime->date_tooltip_label), TRUE);
gtk_misc_set_alignment(GTK_MISC(datetime->date_tooltip_label), 0.0f, 0.0f);
gtk_box_pack_start(GTK_BOX(vbox), datetime->date_tooltip_label, FALSE,
FALSE, 0);
-#endif
/* hbox */
datetime->date_font_hbox = gtk_hbox_new(FALSE, 2);
@@ -534,7 +513,6 @@ datetime_properties_dialog(XfcePanelPlugin *plugin,
t_datetime * datetime)
vbox = gtk_vbox_new(FALSE, 8);
gtk_container_add(GTK_CONTAINER(bin),vbox);
-#if USE_GTK_TOOLTIP_API
/* tooltip label */
str = g_markup_printf_escaped("%s",
_("The time will appear in a tooltip."));
@@ -543,7 +521,6 @@ datetime_properties_dialog(XfcePanelPlugin *plugin,
t_datetime * datetime)
gtk_label_set_use_markup(GTK_LABEL(datetime->time_tooltip_label), TRUE);
gtk_misc_set_alignment(GTK_MISC(datetime->time_tooltip_label), 0.0f, 0.0f);
gtk_box_pack_start(GTK_BOX(vbox), datetime->time_tooltip_label, FALSE,
FALSE, 0);
-#endif
/* hbox */
datetime->time_font_hbox = gtk_hbox_new(FALSE, 2);
diff --git a/panel-plugin/datetime.c b/panel-plugin/datetime.c
index 559020e..181c273 100644
--- a/panel-plugin/datetime.c
+++ b/panel-plugin/datetime.c
@@ -177,7 +177,6 @@ gboolean datetime_update(t_datetime *datetime)
return TRUE;
}
-#if USE_GTK_TOOLTIP_API
static gboolean datetime_tooltip_timer(t_datetime *datetime)
{
DBG("wake");
@@ -244,7 +243,6 @@ static gboolean datetime_query_tooltip(GtkWidget *widget,
return TRUE;
}
-#endif
static void on_calendar_realized(GtkWidget *widget, t_datetime *datetime)
{
@@ -420,7 +418,6 @@ void datetime_apply_layout(t_datetime *datetime, t_layout
layout)
break;
}
-#if USE_GTK_TOOLTIP_API
/* update tooltip handler */
if (datetime->tooltip_handler_id)
{
@@ -441,7 +438,6 @@ void datetime_apply_layout(t_datetime *datetime, t_layout
layout)
default:
gtk_widget_set_has_tooltip(GTK_WIDGET(datetime->button), FALSE);
}
-#endif
/* set order based on layout-selection */
switch(datetime->layout)
diff --git a/panel-plugin/datetime.h b/panel-plugin/datetime.h
index 73aa4ed..5f09f83 100644
--- a/panel-plugin/datetime.h
+++ b/panel-plugin/datetime.h
@@ -22,8 +22,6 @@
#ifndef DATETIME_H
#define DATETIME_H
-#define USE_GTK_TOOLTIP_API GTK_CHECK_VERSION(2,15,4)
-
/* enums */
enum {
DATE = 0,
@@ -48,10 +46,8 @@ typedef struct {
GtkWidget *time_label;
guint update_interval; /* time between updates in milliseconds */
guint timeout_id;
-#if USE_GTK_TOOLTIP_API
guint tooltip_timeout_id;
gulong tooltip_handler_id;
-#endif
/* settings */
gchar *date_font;
@@ -62,17 +58,13 @@ typedef struct {
/* opt
[Xfce4-commits] Updates for release 0.6.2.
Updating branch refs/heads/master to dd789c65229ae2ee452227619ea95c93381b8604 (commit) from 1bd3d679d4591dd6689f0f7008e69d5fe8fe177e (commit) commit dd789c65229ae2ee452227619ea95c93381b8604 Author: Landry Breuil Date: Thu Feb 14 22:02:44 2013 +0100 Updates for release 0.6.2. Reset maintainer to goodies-dev.. NEWS|8 configure.ac.in |9 + 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/NEWS b/NEWS index 0afc635..787db3d 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,11 @@ +2013-02-14 + +xfce4-datetime-plugin v0.6.2 released + +* port to libxfce4ui (bug #8064) +* set text orientation according to panel mode/orientation (bug #8926) +* update toolchain/makefiles + 2008-11-19 xfce4-datetime-plugin v0.6.1 released diff --git a/configure.ac.in b/configure.ac.in index cdb3536..9113f98 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -1,13 +1,14 @@ dnl Version information m4_define([datetime_version_major], [0]) m4_define([datetime_version_minor], [6]) -m4_define([datetime_version_micro], [1]) +m4_define([datetime_version_micro], [2]) m4_define([datetime_version], [datetime_version_major().datetime_version_minor().datetime_version_micro()]) dnl Initialize autoconf -AC_COPYRIGHT([Copyright (c) 2006 -Remco den Breeje ]) -AC_INIT([xfce4-datetime-plugin], [datetime_version], [ongar...@gmail.com]) +AC_COPYRIGHT([Copyright (c) 2006-2009 +Remco den Breeje +Diego Ongaro ]) +AC_INIT([xfce4-datetime-plugin], [datetime_version], [goodies-...@xfce.org]) dnl Initialize automake AM_INIT_AUTOMAKE([AC_PACKAGE_TARNAME()], [AC_PACKAGE_VERSION()]) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Creating annotated tag datetime-0.6.2
Updating annotated tag refs/tags/datetime-0.6.2 as new annotated tag to 985e825ec4db00ddd0cfe604f5061140e3b4d99c (tag) succeeds datetime-0.6.1-103-g1bd3d67 tagged by Landry Breuil on 2013-02-14 22:04 +0100 Landry Breuil (1): Updates for release 0.6.2. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Remove the GtkEventBox and use an XfceHVBox instead
Updating branch refs/heads/master
to 8c4971e17efdfc207d73089e5803ad1c0f30d76f (commit)
from 98b402b9b7e639c6fae77c572c1ba67324cef538 (commit)
commit 8c4971e17efdfc207d73089e5803ad1c0f30d76f
Author: Landry Breuil
Date: Mon Feb 18 21:47:30 2013 +0100
Remove the GtkEventBox and use an XfceHVBox instead
Pack the box inside the GtkAlignment so that both label
and entry are nicely centered like it was with the ebox.
src/smartbookmark.c | 23 ++-
1 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/src/smartbookmark.c b/src/smartbookmark.c
index 176bb05..01e71fb 100644
--- a/src/smartbookmark.c
+++ b/src/smartbookmark.c
@@ -47,7 +47,7 @@
* Types
*/
typedef struct {
-GtkWidget *ebox;
+GtkWidget *box;
GtkWidget *entry; /* keyword entry */
GtkWidget *label;
@@ -99,10 +99,10 @@ static gboolean do_search(const char *url, const char
*keyword)
/* redraw the plugin */
static void update_search(t_search *search) {
DBG ("Update search");
-gtk_widget_hide(GTK_WIDGET(search->ebox));
+gtk_widget_hide(GTK_WIDGET(search->box));
gtk_widget_hide(search->label);
gtk_label_set_text(GTK_LABEL(search->label), search->label_text);
-gtk_widget_show(GTK_WIDGET(search->ebox));
+gtk_widget_show(GTK_WIDGET(search->box));
if (!search->hide_label) {
gtk_widget_show(search->label);
}
@@ -173,14 +173,13 @@ static void search_read_config(t_search *search, const
gchar* filename);
static t_search *search_new(XfcePanelPlugin *plugin)
{
t_search *search;
-GtkWidget *box, *align;
+GtkWidget *align;
gchar* filename;
search = g_new0(t_search, 1);
-search->ebox = gtk_event_box_new();
+search->box = xfce_hvbox_new(!xfce_panel_plugin_get_orientation(plugin),
FALSE, 0);
align = gtk_alignment_new(0.5, 0.5, 0, 0);
-gtk_container_add(GTK_CONTAINER(search->ebox), align);
-box = gtk_vbox_new(FALSE, 0);
+gtk_container_add(GTK_CONTAINER(align), search->box);
/* default options */
search->url = "http://bugs.debian.org/";;
@@ -191,20 +190,18 @@ static t_search *search_new(XfcePanelPlugin *plugin)
filename = xfce_panel_plugin_save_location(plugin, TRUE);
search_read_config(search, filename);
-gtk_container_add(GTK_CONTAINER(align), box);
search->entry = gtk_entry_new();
gtk_entry_set_width_chars(GTK_ENTRY(search->entry), search->size);
search->label = gtk_label_new(search->label_text);
-gtk_box_pack_start(GTK_BOX(box), search->label, FALSE, FALSE, 0);
-gtk_box_pack_start(GTK_BOX(box), search->entry, FALSE, FALSE, 0);
+gtk_box_pack_start(GTK_BOX(search->box), search->label, FALSE, FALSE, 0);
+gtk_box_pack_start(GTK_BOX(search->box), search->entry, FALSE, FALSE, 0);
// g_signal_connect(command->entry, "activate", G_CALLBACK(runcl),
command);
g_signal_connect(search->entry, "key-press-event",
G_CALLBACK(entry_keypress_cb), search);
g_signal_connect (search->entry, "button-press-event",
G_CALLBACK(entry_buttonpress_cb), plugin);
-gtk_container_add( GTK_CONTAINER(plugin), search->ebox);
-xfce_panel_plugin_add_action_widget(plugin, search->ebox);
-gtk_widget_show_all(search->ebox);
+gtk_container_add( GTK_CONTAINER(plugin), align);
+gtk_widget_show_all(align);
if (search->hide_label) {
gtk_widget_hide(search->label);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] remove commented out code
Updating branch refs/heads/master
to afd8dcba74102be5924bb9d0c8d06614f58c97db (commit)
from 8c4971e17efdfc207d73089e5803ad1c0f30d76f (commit)
commit afd8dcba74102be5924bb9d0c8d06614f58c97db
Author: Landry Breuil
Date: Mon Feb 18 22:14:49 2013 +0100
remove commented out code
src/smartbookmark.c | 35 ---
1 files changed, 0 insertions(+), 35 deletions(-)
diff --git a/src/smartbookmark.c b/src/smartbookmark.c
index 01e71fb..a74d21c 100644
--- a/src/smartbookmark.c
+++ b/src/smartbookmark.c
@@ -207,45 +207,11 @@ static t_search *search_new(XfcePanelPlugin *plugin)
gtk_widget_hide(search->label);
}
-/*
-filename = xfce_panel_plugin_save_location(plugin, TRUE);
-search_read_config(search, filename);
-*/
DBG ("SmartBookMark created");
return (search);
}
-/*
-static gboolean search_control_new(Control * ctrl)
-{
-t_search *search;
-
-search = search_new();
-
-gtk_container_add(GTK_CONTAINER(ctrl->base), search->ebox);
-
-ctrl->data = (gpointer) search;
-ctrl->with_popup = FALSE;
-
-gtk_widget_set_size_request(ctrl->base, -1, -1);
-
-return (TRUE);
-}
-
-static void search_free(Control * ctrl)
-{
-t_search *search;
-
-g_return_if_fail(ctrl != NULL);
-g_return_if_fail(ctrl->data != NULL);
-
-search = (t_search *) ctrl->data;
-
-g_free(search);
-}
-*/
-
static void search_read_config(t_search *search, const gchar* filename)
{
XfceRc* rcfile;
@@ -387,6 +353,5 @@ smartbookmark_construct(XfcePanelPlugin *plugin)
xfce_panel_plugin_menu_show_configure (plugin);
g_signal_connect (plugin, "configure-plugin",
G_CALLBACK (search_create_options), search);
-//cc->read_config = search_read_config;
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Update to use new xfce4-dev-tools semantics.
Updating branch refs/heads/master
to 505fbc09bbcbc8f3685a71eb7c89c26cb5b5b908 (commit)
from 29a5b32bdb7814b013eaf42c8da81930b5d82aae (commit)
commit 505fbc09bbcbc8f3685a71eb7c89c26cb5b5b908
Author: Landry Breuil
Date: Thu Aug 20 22:23:22 2009 +0200
Update to use new xfce4-dev-tools semantics.
autogen.sh | 38 ++
configure.ac.in |4 ++--
po/LINGUAS |2 --
3 files changed, 12 insertions(+), 32 deletions(-)
diff --git a/autogen.sh b/autogen.sh
index 9103976..d3b7588 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,43 +1,25 @@
#!/bin/sh
#
-# $Id: autogen.sh 4312 2005-01-27 10:10:04Z jasper $
-#
-# Copyright (c) 2002-2005
+# Copyright (c) 2002-2009
# The Xfce development team. All rights reserved.
#
-# Written for Xfce by Benedikt Meurer .
+# Written for Xfce by Benedikt Meurer
+# and Brian Tarricone .
#
+export XDT_AUTOGEN_REQUIRED_VERSION="4.7.0"
+
(type xdt-autogen) >/dev/null 2>&1 || {
cat >&2 <http://www.xfce.org/.
EOF
exit 1
}
-# verify that po/LINGUAS is present
-(test -f po/LINGUAS) >/dev/null 2>&1 || {
- cat >&2 < "configure.ac"
-
-exec xdt-autogen $@
+exec xdt-autogen "$@"
# vi:set ts=2 sw=2 et ai:
diff --git a/configure.ac.in b/configure.ac.in
index 4e9ec0e..0d9a292 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -6,8 +6,8 @@ dnl
m4_define([mpc_version_major], [0])
m4_define([mpc_version_minor], [3])
m4_define([mpc_version_micro], [3])
-m4_define([mpc_version_tag], [svn]) # Leave empty for releases
-m4_define([mpc_version_build], [...@revision@])
+m4_define([mpc_version_tag], [git]) # Leave empty for releases
+m4_define([mpc_version_build], [...@revision@])
m4_define([mpc_version],
[mpc_version_major().mpc_version_minor().mpc_version_micro()ifelse(mpc_version_tag(),
[], [], [mpc_version_tag()-mpc_version_build()])])
AC_INIT([xfce4-mpc-plugin], [mpc_version],
diff --git a/po/LINGUAS b/po/LINGUAS
deleted file mode 100644
index e572422..000
--- a/po/LINGUAS
+++ /dev/null
@@ -1,2 +0,0 @@
-# set of available languages (in alphabetic order)
-ar ast ca cs da de en_GB es eu fr gl hu id it ja lv pl pt_BR pt sq sv tr uk ur
ur_PK zh_CN
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Merge branch 'master' of ssh://git.xfce.org/git/panel-plugins/xfce4-mpc-plugin
Updating branch refs/heads/master to 9a642d13078eb2d8423d0c67fcccdff03686c12c (commit) from 505fbc09bbcbc8f3685a71eb7c89c26cb5b5b908 (commit) commit 9a642d13078eb2d8423d0c67fcccdff03686c12c Merge: 505fbc09bbcbc8f3685a71eb7c89c26cb5b5b908 4b6298762f377f8f185f4097630cd4cdc843c868 Author: Landry Breuil Date: Thu Aug 20 22:24:18 2009 +0200 Merge branch 'master' of ssh://git.xfce.org/git/panel-plugins/xfce4-mpc-plugin commit 4b6298762f377f8f185f4097630cd4cdc843c868 Author: Piarres Beobide Date: Tue Aug 18 07:46:19 2009 + l10n: Basque translation update Transmitted-via: Transifex (translations.xfce.org) po/eu.po | 32 +--- 1 files changed, 17 insertions(+), 15 deletions(-) diff --git a/po/eu.po b/po/eu.po index e78e4aa..b4590d6 100644 --- a/po/eu.po +++ b/po/eu.po @@ -1,22 +1,24 @@ +# translation of xfce4-mpc-plugin.master.po to Euskara # Basque translations for xfce package. # Copyright (C) 2006 THE xfce'S COPYRIGHT HOLDER # This file is distributed under the same license as the xfce package. -# pi , 2006. # +# pi , 2006. +# Piarres Beobide , 2009. msgid "" msgstr "" -"Project-Id-Version: xfce 4-mpc-plugin\n" +"Project-Id-Version: xfce4-mpc-plugin.master\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-07-24 18:13+0200\n" -"PO-Revision-Date: 2008-11-09 15:42+0200\n" +"PO-Revision-Date: 2009-08-18 09:45+0200\n" "Last-Translator: Piarres Beobide \n" -"Language-Team: Basque \n" +"Language-Team: Euskara \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: eu\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Pootle 1.2.0\n" +"X-Generator: KBabel 1.11.4\n" #: ../panel-plugin/xfce4-mpc-plugin.c:116 #: ../panel-plugin/xfce4-mpc-plugin.c:192 @@ -45,39 +47,38 @@ msgid "Password : " msgstr "Pasahitza : " #: ../panel-plugin/xfce4-mpc-plugin.c:269 -#, fuzzy msgid "MPD Client : " -msgstr "Bezeroa : " +msgstr "MPD bezeroa : " #: ../panel-plugin/xfce4-mpc-plugin.c:270 msgid "Tooltip Format : " -msgstr "" +msgstr "Argibide formatua : " #: ../panel-plugin/xfce4-mpc-plugin.c:271 msgid "Playlist Format : " -msgstr "" +msgstr "Erreprodukzio-zerrenda formatua:" #: ../panel-plugin/xfce4-mpc-plugin.c:305 msgid "Hostname or IP address" -msgstr "" +msgstr "Ostalari-izen edo IP helbidea" #: ../panel-plugin/xfce4-mpc-plugin.c:306 msgid "Graphical MPD Client to launch in plugin context menu" -msgstr "" +msgstr "MPD bezero grafikoa plugin kontestu menutik abiarazteko" #: ../panel-plugin/xfce4-mpc-plugin.c:307 msgid "Variables : %artist%, %album%, %track% and %title%" -msgstr "" +msgstr "Aldagaiak: %artista%, %albuma%, %pista% eta %izenburua%" #: ../panel-plugin/xfce4-mpc-plugin.c:308 msgid "" "Variables : %vol%, %status%, %newline%, %artist%, %album%, %track% and %title" "%" -msgstr "" +msgstr "Aldagaiak: %bol%, %egoera%, %newline%, %artista%, %albuma%, %pista% eta %izenburua%" #: ../panel-plugin/xfce4-mpc-plugin.c:313 msgid "Show _frame" -msgstr "_Markoa ikusi" +msgstr "Ikusi _markoa" #: ../panel-plugin/xfce4-mpc-plugin.c:382 #: ../panel-plugin/xfce4-mpc-plugin.c:612 @@ -118,4 +119,5 @@ msgstr "MPD (Music Player Daemon) bezeroa" #: ../panel-plugin/xfce4-mpc-plugin.desktop.in.in.h:2 msgid "MPD Client Plugin" -msgstr "MPD Bezero Plugin-a" +msgstr "MPD bezero plugina" + ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Be sure to have libxfcegui4 cflags/libs for xfce_err(), fixes compilation with xfce4-panel 4.7. (Bug #6609) Still needs to be converted to libxfce4ui tho
Updating branch refs/heads/master to 35af6821c13a7d20fe7fc31f964178e9fb369dfb (commit) from a7198453d027f4a6c0ee59e4561ce67bd8e86b64 (commit) commit 35af6821c13a7d20fe7fc31f964178e9fb369dfb Author: Landry Breuil Date: Sun Aug 8 10:44:58 2010 +0200 Be sure to have libxfcegui4 cflags/libs for xfce_err(), fixes compilation with xfce4-panel 4.7. (Bug #6609) Still needs to be converted to libxfce4ui though.. configure.in.in |1 + panel-plugin/Makefile.am |6 -- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/configure.in.in b/configure.in.in index 6ea6bfb..8bbcf55 100644 --- a/configure.in.in +++ b/configure.in.in @@ -52,6 +52,7 @@ dnl *** dnl *** Check for required packages *** dnl *** XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.90]) +XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.3.90]) dnl *** dnl *** Check for debugging support *** diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am index 604e7be..3c6b0f1 100644 --- a/panel-plugin/Makefile.am +++ b/panel-plugin/Makefile.am @@ -22,10 +22,12 @@ xfce4_diskperf_plugin_SOURCES = \ devperf.h xfce4_diskperf_plugin_CFLAGS = \ - $(LIBXFCE4PANEL_CFLAGS) + $(LIBXFCE4PANEL_CFLAGS) \ + $(LIBXFCEGUI4_CFLAGS) xfce4_diskperf_plugin_LDADD= \ - $(LIBXFCE4PANEL_LIBS) + $(LIBXFCE4PANEL_LIBS) \ + $(LIBXFCEGUI4_LIBS) # # Desktop file ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Add libxfcegui4 cflags/libs checks to fix build with xfce4-panel 4.7. Bug #6615.
Updating branch refs/heads/master to d7f5b8bd8e2b1c5d8fc1e9db8e6f4c8364cdb2c4 (commit) from f8e2bf350b828a38c7f914d37a3e78d82c465444 (commit) commit d7f5b8bd8e2b1c5d8fc1e9db8e6f4c8364cdb2c4 Author: Landry Breuil Date: Sun Aug 8 10:58:49 2010 +0200 Add libxfcegui4 cflags/libs checks to fix build with xfce4-panel 4.7. Bug #6615. configure.in.in |1 + panel-plugin/Makefile.am |6 -- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/configure.in.in b/configure.in.in index a61f2ad..c95bac8 100644 --- a/configure.in.in +++ b/configure.in.in @@ -50,6 +50,7 @@ XDT_I18N([...@linguas@]) dnl configure the panel plugin XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.3.20]) XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.20]) +XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.3.20]) XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.6.0]) dnl Check for debugging support diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am index a54e647..5e06216 100644 --- a/panel-plugin/Makefile.am +++ b/panel-plugin/Makefile.am @@ -11,7 +11,8 @@ plugin_PROGRAMS = xfce4-wavelan-plugin # libwavelan.la xfce4_wavelan_plugin_LDFLAGS = \ - @LIBXFCE4PANEL_LIBS@ + @LIBXFCE4PANEL_LIBS@ \ + @LIBXFCEGUI4L_LIBS@ xfce4_wavelan_plugin_SOURCES = \ wavelan.c \ @@ -21,7 +22,8 @@ xfce4_wavelan_plugin_SOURCES = \ wi_linux.c xfce4_wavelan_plugin_CFLAGS = \ - @LIBXFCE4PANEL_CFLAGS@ + @LIBXFCE4PANEL_CFLAGS@ \ + @LIBXFCEGUI4_CFLAGS@ # .desktop file # ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Merge branch 'master' of ssh://git.xfce.org/git/panel-plugins/xfce4-mpc-plugin
Updating branch refs/heads/master
to 2a189d535d93cfba40447bc18b68ecedbc848676 (commit)
from b3a3084ffe72cbd4e576c282c666365c792718b0 (commit)
commit 2a189d535d93cfba40447bc18b68ecedbc848676
Merge: b3a3084ffe72cbd4e576c282c666365c792718b0
c416a387cb3d77d06fd79a5bbdfa30f235cdf222
Author: Landry Breuil
Date: Mon Aug 30 21:19:53 2010 +0200
Merge branch 'master' of
ssh://git.xfce.org/git/panel-plugins/xfce4-mpc-plugin
commit c416a387cb3d77d06fd79a5bbdfa30f235cdf222
Author: Gheyret Kenji
Date: Thu Aug 5 10:00:45 2010 +0200
l10n: Updated Uyghur (ug) translation to 83%
New status: 20 messages complete with 0 fuzzies and 4 untranslated.
Transmitted-via: Transifex (translations.xfce.org).
commit 4b37ccbedff721c932a88e7f8c953d4f853030b7
Author: Gheyret Kenji
Date: Fri Jul 30 04:02:38 2010 +0200
l10n: Uyghur translation
New status: 18 messages complete with 0 fuzzies and 6 untranslated.
Transmitted-via: Transifex (translations.xfce.org).
commit ad7ad2245d396a7a88eb89c42c09ade1b0c01a98
Author: Andres Kovtunos
Date: Tue May 18 14:03:50 2010 +0200
l10n: Updated Russian (ru) translation to 100%
New status: 24 messages complete with 0 fuzzies and 0 untranslated.
Transmitted-via: Transifex (translations.xfce.org).
po/ru.po|8 +-
po/{ja.po => ug.po} | 237 +--
2 files changed, 121 insertions(+), 124 deletions(-)
diff --git a/po/ru.po b/po/ru.po
index 11f2900..3c56a21 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -22,7 +22,7 @@ msgstr "Запустить"
#: ../panel-plugin/xfce4-mpc-plugin.c:247
msgid "Mpd Client Plugin"
-msgstr "Апплет клиента MPD"
+msgstr "Модуль клиента MPD"
#: ../panel-plugin/xfce4-mpc-plugin.c:253
msgid "Properties"
@@ -91,11 +91,11 @@ msgstr "Повтор"
#: ../panel-plugin/xfce4-mpc-plugin.c:697
msgid "Xfce4 Mpc Plugin"
-msgstr "Xfce4 Mpc апплет"
+msgstr "Модуль MPC для Xfce4"
#: ../panel-plugin/xfce4-mpc-plugin.c:698
msgid "A simple panel-plugin client for Music Player Daemon"
-msgstr "Простой апплет клиента MPD для панели Xfce"
+msgstr "Простой модуль клиента MPD для панели Xfce"
#: ../panel-plugin/xfce4-mpc-plugin.c:699
msgid "Copyright (c) 2006-2008 Landry Breuil\n"
@@ -111,4 +111,4 @@ msgstr "Клиент для музыкального сервера MPD"
#: ../panel-plugin/xfce4-mpc-plugin.desktop.in.in.h:2
msgid "MPD Client Plugin"
-msgstr "Апплет клиента MPD"
+msgstr "Модуль клиента MPD"
diff --git a/po/ja.po b/po/ug.po
similarity index 65%
copy from po/ja.po
copy to po/ug.po
index 9b9e928..c80821f 100644
--- a/po/ja.po
+++ b/po/ug.po
@@ -1,120 +1,117 @@
-# Japanese translation of xfce4-mpc-plugin.
-# Copyright (C) 2008 THE xfce4-mpc-plugin'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the xfce4-mpc-plugin
package.
-# Nobuhiro Iwamatsu , 2008.
-#
-# Music Player Daemon(MPD)はそのまま Music Player Daemon としています。
-msgid ""
-msgstr ""
-"Project-Id-Version: xfce4-mpc-plugin\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-27 01:40+0900\n"
-"PO-Revision-Date: 2009-07-26 16:34+0900\n"
-"Last-Translator: Masato Hashimoto \n"
-"Language-Team: Japanese \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: ../panel-plugin/xfce4-mpc-plugin.c:119
-#: ../panel-plugin/xfce4-mpc-plugin.c:195
-#: ../panel-plugin/xfce4-mpc-plugin.c:670
-msgid "Launch"
-msgstr "起動"
-
-#: ../panel-plugin/xfce4-mpc-plugin.c:250
-msgid "Mpd Client Plugin"
-msgstr "Mpd クライアントプラグイン"
-
-#: ../panel-plugin/xfce4-mpc-plugin.c:256
-msgid "Properties"
-msgstr "設定"
-
-#: ../panel-plugin/xfce4-mpc-plugin.c:269
-msgid "Host : "
-msgstr "ホスト : "
-
-#: ../panel-plugin/xfce4-mpc-plugin.c:270
-msgid "Port : "
-msgstr "ポート : "
-
-#: ../panel-plugin/xfce4-mpc-plugin.c:271
-msgid "Password : "
-msgstr "パスワード : "
-
-#: ../panel-plugin/xfce4-mpc-plugin.c:272
-msgid "MPD Client : "
-msgstr "MPD クライアント : "
-
-#: ../panel-plugin/xfce4-mpc-plugin.c:273
-msgid "Tooltip Format : "
-msgstr "ツールチップの形式 : "
-
-#: ../panel-plugin/xfce4-mpc-plugin.c:274
-msgid "Playlist Format : "
-msgstr "プレイリストの形式 : "
-
-#: ../panel-plugin/xfce4-mpc-plugin.c:308
-msgid "Hostname or IP address"
-msgstr "ホスト名または IP アドレス"
-
-#: ../panel-plugin/xfce4-mpc-plugin.c:309
-msgid "Graphical MPD Client to launch in plugin context menu"
-msgstr ""
-"プラグインのコンテキストメニューから起動するグラフィカル MPD クライアント"
-
-#: ../panel-plugin/xfce4-mpc-plu
[Xfce4-commits] Fix build with xfce4-panel 4.7/exo 0.5
Updating branch refs/heads/master to b3a3084ffe72cbd4e576c282c666365c792718b0 (commit) from 9c85bf33aae319a71d50b5c1c1da283fcc12932b (commit) commit b3a3084ffe72cbd4e576c282c666365c792718b0 Author: Landry Breuil Date: Mon Aug 30 21:17:01 2010 +0200 Fix build with xfce4-panel 4.7/exo 0.5 - when exo-0.3 is not found, try to find exo-1 from exo 0.5 package - Also link/detect libxfcegui4 now that xfce4-panel in master doesn't add the corresponding LIBS/CFLAGS From Samuli Suominen in bz #6623, thanks! configure.ac.in |4 +++- panel-plugin/Makefile.am |2 ++ 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/configure.ac.in b/configure.ac.in index 7b9e80e..9261f53 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -35,7 +35,9 @@ AC_HEADER_STDC dnl configure the panel plugin XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.22]) -XDT_CHECK_PACKAGE([EXO], [exo-0.3], [0.3.1.1]) +XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.3.22]) +XDT_CHECK_PACKAGE([EXO], [exo-0.3], [0.3.1.1], [], + [XDT_CHECK_PACKAGE([EXO], [exo-1], [0.5.0])]) dnl check for libmpd presence AC_ARG_WITH(libmpd, diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am index d81a4c9..e233a9b 100644 --- a/panel-plugin/Makefile.am +++ b/panel-plugin/Makefile.am @@ -4,10 +4,12 @@ plugin_PROGRAMS = xfce4-mpc-plugin xfce4_mpc_plugin_CFLAGS = \ -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \ @EXO_CFLAGS@\ + @LIBXFCEGUI4_CFLAGS@\ @LIBXFCE4PANEL_CFLAGS@ xfce4_mpc_plugin_LDADD = \ @EXO_LIBS@ \ + @LIBXFCEGUI4_LIBS@ \ @LIBXFCE4PANEL_LIBS@ ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] update autogen.sh for newer xdt
Updating branch refs/heads/master
to 1691c13adcbb682435271dd5634f9e53d3dcc5ab (commit)
from de1e13e5087d9fa6b43ba0c79bee884f1a85756b (commit)
commit 1691c13adcbb682435271dd5634f9e53d3dcc5ab
Author: Landry Breuil
Date: Sat Jan 23 12:17:52 2010 +0100
update autogen.sh for newer xdt
autogen.sh | 34 --
1 files changed, 12 insertions(+), 22 deletions(-)
diff --git a/autogen.sh b/autogen.sh
index 72c275d..d3b7588 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,35 +1,25 @@
#!/bin/sh
#
-# $Id: autogen.sh 2257 2006-12-19 19:49:00Z nick $
-#
-# Copyright (c) 2002-2007
+# Copyright (c) 2002-2009
# The Xfce development team. All rights reserved.
#
+# Written for Xfce by Benedikt Meurer
+# and Brian Tarricone .
+#
+
+export XDT_AUTOGEN_REQUIRED_VERSION="4.7.0"
(type xdt-autogen) >/dev/null 2>&1 || {
cat >&2 <http://www.xfce.org/.
EOF
exit 1
}
-# verify that po/LINGUAS is present
-(test -f po/LINGUAS) >/dev/null 2>&1 || {
- cat >&2 < "configure.in"
+exec xdt-autogen "$@"
-exec xdt-autogen $@
+# vi:set ts=2 sw=2 et ai:
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Don't disable the input title entry in config dialog when label is not shown
Updating branch refs/heads/master to 27cfb3cdcea2ea0b6bcaf42fa16332abee207ace (commit) from 50b6646f085b5ca14533f5c8428af90ee75c7826 (commit) commit 27cfb3cdcea2ea0b6bcaf42fa16332abee207ace Author: Landry Breuil Date: Sat Jan 23 12:18:33 2010 +0100 Don't disable the input title entry in config dialog when label is not shown Regardless of label being shown or not in the panel, the title appears in plugin tooltip, so it should still be configurable. From bug #6176 panel-plugin/main.c |4 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/panel-plugin/main.c b/panel-plugin/main.c index 1e3c07f..fe6d508 100644 --- a/panel-plugin/main.c +++ b/panel-plugin/main.c @@ -654,8 +654,6 @@ static void ToggleTitle (Widget_t p_w, void *p_pvPlugin) poConf->fTitleDisplayed = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (p_w)); -gtk_widget_set_sensitive (GTK_WIDGET (poGUI->wTF_Title), - poConf->fTitleDisplayed); if (poConf->fTitleDisplayed) gtk_widget_show (GTK_WIDGET (poMonitor->wTitle)); else @@ -947,8 +945,6 @@ static void diskperf_create_options (XfcePanelPlugin *plugin, gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (poGUI->wTB_Title), poConf->fTitleDisplayed); -gtk_widget_set_sensitive (GTK_WIDGET (poGUI->wTF_Title), - poConf->fTitleDisplayed); g_signal_connect (GTK_WIDGET (poGUI->wTB_Title), "toggled", G_CALLBACK (ToggleTitle), poPlugin); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] use git for version_tag
Updating branch refs/heads/master to 50b6646f085b5ca14533f5c8428af90ee75c7826 (commit) from 1691c13adcbb682435271dd5634f9e53d3dcc5ab (commit) commit 50b6646f085b5ca14533f5c8428af90ee75c7826 Author: Landry Breuil Date: Sat Jan 23 12:18:23 2010 +0100 use git for version_tag configure.in.in |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.in.in b/configure.in.in index b74ab97..6ea6bfb 100644 --- a/configure.in.in +++ b/configure.in.in @@ -8,9 +8,9 @@ dnl m4_define([diskperf_version_major], [2]) m4_define([diskperf_version_minor], [2]) m4_define([diskperf_version_micro], [0]) -m4_define([diskperf_version_build], [...@revision@]) -m4_define([diskperf_version_tag], []) # leave empty for releases -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()])]) +m4_define([diskperf_version_build], [...@revision@]) +m4_define([diskperf_version_tag], [git]) # leave empty for releases +m4_define([diskperf_version], [diskperf_version_major().diskperf_version_minor().diskperf_version_micro()ifelse(diskperf_version_tag(), [git], [diskperf_version_tag()-diskperf_version_build()], [diskperf_version_tag()])]) dnl *** dnl *** Initialize autoconf *** ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] drop .pot file
Updating branch refs/heads/master to de1e13e5087d9fa6b43ba0c79bee884f1a85756b (commit) from 6ec6fca2e448739be609c33c8e2cb51fd70b3495 (commit) commit de1e13e5087d9fa6b43ba0c79bee884f1a85756b Author: Landry Breuil Date: Sat Jan 23 12:17:16 2010 +0100 drop .pot file po/xfce4-diskperf-plugin.pot | 263 -- 1 files changed, 0 insertions(+), 263 deletions(-) diff --git a/po/xfce4-diskperf-plugin.pot b/po/xfce4-diskperf-plugin.pot deleted file mode 100644 index 8a9480e..000 --- a/po/xfce4-diskperf-plugin.pot +++ /dev/null @@ -1,263 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-09-10 21:29+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: ../panel-plugin/config_gui.c:108 -msgid "About..." -msgstr "" - -#: ../panel-plugin/config_gui.c:123 -msgid "Disk Performance" -msgstr "" - -#: ../panel-plugin/config_gui.c:136 -msgid "Device" -msgstr "" - -#: ../panel-plugin/config_gui.c:150 -msgid "Input the device name, then press " -msgstr "" - -#: ../panel-plugin/config_gui.c:153 -msgid "/dev/hda1" -msgstr "" - -#: ../panel-plugin/config_gui.c:171 -msgid "Data collection period" -msgstr "" - -#: ../panel-plugin/config_gui.c:174 -msgid "Update interval (s) " -msgstr "" - -#: ../panel-plugin/config_gui.c:182 -msgid "Label" -msgstr "" - -#: ../panel-plugin/config_gui.c:187 -msgid "Tick to display label" -msgstr "" - -#: ../panel-plugin/config_gui.c:196 -msgid "Input the label, then press " -msgstr "" - -#: ../panel-plugin/config_gui.c:198 -msgid "hda1" -msgstr "" - -#: ../panel-plugin/config_gui.c:208 -msgid "Monitor" -msgstr "" - -#: ../panel-plugin/config_gui.c:213 -msgid "I/O transfer" -msgstr "" - -#: ../panel-plugin/config_gui.c:216 -msgid "MB transferred / second" -msgstr "" - -#: ../panel-plugin/config_gui.c:222 -msgid "Busy time" -msgstr "" - -#: ../panel-plugin/config_gui.c:226 -msgid "Percentage of time the device is busy" -msgstr "" - -#: ../panel-plugin/config_gui.c:237 -msgid "Max. I/O rate (MB/s) " -msgstr "" - -#: ../panel-plugin/config_gui.c:248 -msgid "Input the maximum I/O transfer rate of the device, then press " -msgstr "" - -#: ../panel-plugin/config_gui.c:251 -msgid "35" -msgstr "" - -#: ../panel-plugin/config_gui.c:258 -msgid "Combine Read/Write data" -msgstr "" - -#: ../panel-plugin/config_gui.c:263 -msgid "Combine Read/Write data into one single monitor?" -msgstr "" - -#: ../panel-plugin/config_gui.c:270 -msgid "Bar color " -msgstr "" - -#: ../panel-plugin/config_gui.c:284 ../panel-plugin/config_gui.c:349 -#: ../panel-plugin/config_gui.c:357 -msgid "Press to change color" -msgstr "" - -#: ../panel-plugin/config_gui.c:290 -msgid "Read bar color " -msgstr "" - -#: ../panel-plugin/config_gui.c:298 -msgid "Write bar color " -msgstr "" - -#: ../panel-plugin/config_gui.c:306 -msgid "Bar order" -msgstr "" - -#: ../panel-plugin/config_gui.c:321 -msgid "Read-Write" -msgstr "" - -#: ../panel-plugin/config_gui.c:326 -msgid "\"Read\" monitor first" -msgstr "" - -#: ../panel-plugin/config_gui.c:333 -msgid "Write-Read" -msgstr "" - -#: ../panel-plugin/config_gui.c:338 -msgid "\"Write\" monitor first" -msgstr "" - -#: ../panel-plugin/main.c:809 -msgid "Select color" -msgstr "" - -#: ../panel-plugin/main.c:858 -#, c-format -msgid "" -"%s\n" -"%s: %s (%d)\n" -"\n" -"This monitor will not work!\n" -"Please remove it." -msgstr "" - -#: ../panel-plugin/main.c:868 -#, c-format -msgid "" -"%s: No disk extended statistics found!\n" -"Either old kernel (< 2.4.20) or not\n" -"compiled with CONFIG_BLK_STATS turned on.\n" -"\n" -"This monitor will not work!\n" -"Please remove it." -msgstr "" - -#: ../panel-plugin/main.c:
[Xfce4-commits] Apply color settings upon plugin startup.
Updating branch refs/heads/master
to 3e94c2c0f40f81098676c6839b5f6feb357307da (commit)
from 27cfb3cdcea2ea0b6bcaf42fa16332abee207ace (commit)
commit 3e94c2c0f40f81098676c6839b5f6feb357307da
Author: Landry Breuil
Date: Sat Jan 23 12:59:51 2010 +0100
Apply color settings upon plugin startup.
From Launchpad #232123, fwded' by Lionel Le Folgoc, thanks!
panel-plugin/main.c |1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/panel-plugin/main.c b/panel-plugin/main.c
index fe6d508..b43201b 100644
--- a/panel-plugin/main.c
+++ b/panel-plugin/main.c
@@ -553,6 +553,7 @@ static void diskperf_read_config (XfcePanelPlugin *plugin,
if ((value = xfce_rc_read_entry (rc, (CONF_READ_WRITE_COLOR), NULL))) {
gdk_color_parse (value, poConf->aoColor + RW_DATA);
}
+SetMonitorBarColor (poPlugin);
xfce_rc_close (rc);
} /* diskperf_read_config() */
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Update for 0.3.4 release.
Updating branch refs/heads/master to 8776e8dc12bc8649f2756c305501c7138f60d011 (commit) from 7189c143a0e7becec7ebfe4fa21f1a883c196098 (commit) commit 8776e8dc12bc8649f2756c305501c7138f60d011 Author: Landry Breuil Date: Tue Nov 3 21:46:35 2009 +0100 Update for 0.3.4 release. ChangeLog |2 +- README |2 +- TODO|2 -- configure.ac.in |4 ++-- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5aa1f6f..5045601 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -xx-xx-2009 Landry Breuil +03-11-2009 Landry Breuil * release 0.3.4 * add user-configurable markup for playlist and tooltip * properly resize buttons icons diff --git a/README b/README index 7bf74bb..e711ed2 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ Xfce4-Mpc-Plugin -This is a simple Musicpd (http://www.musicpd.org) client plugin for the Xfce 4.4 panel. +This is a simple Musicpd (http://www.musicpd.org) client plugin for the Xfce panel. Features : - next/stop/play/pause/previous buttons - current volume/status/playing track when mouse passes over the plugin diff --git a/TODO b/TODO index c5b3075..5e7af2d 100644 --- a/TODO +++ b/TODO @@ -1,5 +1,3 @@ -- improve playlist management, keep it persistent instead of creating it on each middle-click -- add configurable title display string (with %artist%, %title%, %track%, %album%...) in tooltip and playlist - support multiple outputs enabling/disabling - add volume progressbar/slider ? - fix all strings length checking diff --git a/configure.ac.in b/configure.ac.in index 0d9a292..1c113c4 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -5,8 +5,8 @@ dnl m4_define([mpc_version_major], [0]) m4_define([mpc_version_minor], [3]) -m4_define([mpc_version_micro], [3]) -m4_define([mpc_version_tag], [git]) # Leave empty for releases +m4_define([mpc_version_micro], [4]) +m4_define([mpc_version_tag], []) # Leave empty for releases m4_define([mpc_version_build], [...@revision@]) m4_define([mpc_version], [mpc_version_major().mpc_version_minor().mpc_version_micro()ifelse(mpc_version_tag(), [], [], [mpc_version_tag()-mpc_version_build()])]) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Creating annotated tag xfce4-mpc-plugin-0.3.4
Updating annotated tag refs/tags/xfce4-mpc-plugin-0.3.4 as new annotated tag to 7aa5c590b1c0f90b7981e528b9efb27baea1e292 (tag) succeeds 0.3.3-64-g7189c14 tagged by Landry Breuil on 2009-11-03 20:50 + Landry Breuil (1): Update for 0.3.4 release. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] it costs nothing to reset/drop mo->buffer in this error case.
Updating branch refs/heads/master
to d2f05a30067b53c3155e1af6efd25a12f4ae1dc5 (commit)
from 2a189d535d93cfba40447bc18b68ecedbc848676 (commit)
commit d2f05a30067b53c3155e1af6efd25a12f4ae1dc5
Author: Landry Breuil
Date: Sat Oct 16 12:08:52 2010 +0200
it costs nothing to reset/drop mo->buffer in this error case.
panel-plugin/simple-libmpd.c |2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/panel-plugin/simple-libmpd.c b/panel-plugin/simple-libmpd.c
index 0084358..d035957 100644
--- a/panel-plugin/simple-libmpd.c
+++ b/panel-plugin/simple-libmpd.c
@@ -291,6 +291,8 @@ void send_complex_cmd(MpdObj* mo, char* cmd, void
(*parse_answer_fct)(), void *r
{
mo->error = MPD_ERROR_CONNCLOSED;
DBG("ERROR parsing reply");
+*mo->buffer = '\0';
+mo->buflen = 0;
return;
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Try to be more robust to rogue data in parse_playlistinfo_answer()/parse_outputs_answer()
Updating branch refs/heads/master
to a562cabe0cabec9ea478db8ad9c3579afe2146fc (commit)
from d2f05a30067b53c3155e1af6efd25a12f4ae1dc5 (commit)
commit a562cabe0cabec9ea478db8ad9c3579afe2146fc
Author: Landry Breuil
Date: Sat Oct 16 12:14:55 2010 +0200
Try to be more robust to rogue data in
parse_playlistinfo_answer()/parse_outputs_answer()
while looping on the parsing of an output or a song, check if we
get an ok (which should not happen in normal case). If so, gracefully
exit the parsing.
only increment song/output counter if the parsing was ok.
panel-plugin/simple-libmpd.c | 10 ++
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/panel-plugin/simple-libmpd.c b/panel-plugin/simple-libmpd.c
index d035957..63e1689 100644
--- a/panel-plugin/simple-libmpd.c
+++ b/panel-plugin/simple-libmpd.c
@@ -414,7 +414,7 @@ void parse_playlistinfo_answer(MpdObj *mo, void *param)
ms->id = ms->pos = -1;
DBG("Going to parse song #%d", md->nb);
- while(lines[i] && ms->id < 0)
+ while(lines[i] && strcmp(lines[i],"OK") && ms->id < 0)
{
tokens = g_strsplit(lines[i], ":", 2);
/* remove leading whitespace */
@@ -430,7 +430,8 @@ void parse_playlistinfo_answer(MpdObj *mo, void *param)
i++;
g_strfreev(tokens);
}
- md->nb++;
+ if (lines[i] && strcmp(lines[i],"OK"))
+ md->nb++;
}
g_strfreev(lines);
DBG("Got 'OK', md->nb = %d", md->nb);
@@ -447,7 +448,7 @@ void parse_outputs_answer(MpdObj *mo, void *param)
md->alloutputs[md->nb] = g_new(mpd_Output, 1);
md->alloutputs[md->nb]->enabled = -1;
DBG("Going to parse output #%d", md->nb);
- while(lines[i] && md->alloutputs[md->nb]->enabled < 0)
+ while(lines[i] && strcmp(lines[i],"OK") &&
md->alloutputs[md->nb]->enabled < 0)
{
tokens = g_strsplit(lines[i], ":", 2);
/* remove leading whitespace */
@@ -459,7 +460,8 @@ void parse_outputs_answer(MpdObj *mo, void *param)
i++;
g_strfreev(tokens);
}
- md->nb++;
+ if (lines[i] && strcmp(lines[i],"OK"))
+ md->nb++;
}
g_strfreev(lines);
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] finally, only bail out if a rogue OK is found in read buffer
Updating branch refs/heads/master
to 2a58794661890cc004ee8f07bd4e29cfc44b07c1 (commit)
from 81db0ad8ac76663a9aac1b04813ea24d87bb5ed0 (commit)
commit 2a58794661890cc004ee8f07bd4e29cfc44b07c1
Author: Landry Breuil
Date: Sat Oct 16 12:36:17 2010 +0200
finally, only bail out if a rogue OK is found in read buffer
panel-plugin/simple-libmpd.c |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/panel-plugin/simple-libmpd.c b/panel-plugin/simple-libmpd.c
index d035957..a7b3cb3 100644
--- a/panel-plugin/simple-libmpd.c
+++ b/panel-plugin/simple-libmpd.c
@@ -414,7 +414,7 @@ void parse_playlistinfo_answer(MpdObj *mo, void *param)
ms->id = ms->pos = -1;
DBG("Going to parse song #%d", md->nb);
- while(lines[i] && ms->id < 0)
+ while(lines[i] && strcmp(lines[i],"OK") && ms->id < 0)
{
tokens = g_strsplit(lines[i], ":", 2);
/* remove leading whitespace */
@@ -447,7 +447,7 @@ void parse_outputs_answer(MpdObj *mo, void *param)
md->alloutputs[md->nb] = g_new(mpd_Output, 1);
md->alloutputs[md->nb]->enabled = -1;
DBG("Going to parse output #%d", md->nb);
- while(lines[i] && md->alloutputs[md->nb]->enabled < 0)
+ while(lines[i] && strcmp(lines[i],"OK") &&
md->alloutputs[md->nb]->enabled < 0)
{
tokens = g_strsplit(lines[i], ":", 2);
/* remove leading whitespace */
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] finally backout all previous commit, was wrong
Updating branch refs/heads/master
to 81db0ad8ac76663a9aac1b04813ea24d87bb5ed0 (commit)
from 389a8c83f6430af7e13b378bad4f6841fde45462 (commit)
commit 81db0ad8ac76663a9aac1b04813ea24d87bb5ed0
Author: Landry Breuil
Date: Sat Oct 16 12:31:30 2010 +0200
finally backout all previous commit, was wrong
panel-plugin/simple-libmpd.c |5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/panel-plugin/simple-libmpd.c b/panel-plugin/simple-libmpd.c
index 1913308..d035957 100644
--- a/panel-plugin/simple-libmpd.c
+++ b/panel-plugin/simple-libmpd.c
@@ -447,7 +447,7 @@ void parse_outputs_answer(MpdObj *mo, void *param)
md->alloutputs[md->nb] = g_new(mpd_Output, 1);
md->alloutputs[md->nb]->enabled = -1;
DBG("Going to parse output #%d", md->nb);
- while(lines[i] && strcmp(lines[i],"OK") &&
md->alloutputs[md->nb]->enabled < 0)
+ while(lines[i] && md->alloutputs[md->nb]->enabled < 0)
{
tokens = g_strsplit(lines[i], ":", 2);
/* remove leading whitespace */
@@ -459,8 +459,7 @@ void parse_outputs_answer(MpdObj *mo, void *param)
i++;
g_strfreev(tokens);
}
- if (lines[i] && strcmp(lines[i],"OK"))
- md->nb++;
+ md->nb++;
}
g_strfreev(lines);
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] backout previous in parse_playlistinfo_answer, as we play tricks with fake OKs
Updating branch refs/heads/master
to 389a8c83f6430af7e13b378bad4f6841fde45462 (commit)
from a562cabe0cabec9ea478db8ad9c3579afe2146fc (commit)
commit 389a8c83f6430af7e13b378bad4f6841fde45462
Author: Landry Breuil
Date: Sat Oct 16 12:29:43 2010 +0200
backout previous in parse_playlistinfo_answer, as we play tricks with fake
OKs
panel-plugin/simple-libmpd.c |5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/panel-plugin/simple-libmpd.c b/panel-plugin/simple-libmpd.c
index 63e1689..1913308 100644
--- a/panel-plugin/simple-libmpd.c
+++ b/panel-plugin/simple-libmpd.c
@@ -414,7 +414,7 @@ void parse_playlistinfo_answer(MpdObj *mo, void *param)
ms->id = ms->pos = -1;
DBG("Going to parse song #%d", md->nb);
- while(lines[i] && strcmp(lines[i],"OK") && ms->id < 0)
+ while(lines[i] && ms->id < 0)
{
tokens = g_strsplit(lines[i], ":", 2);
/* remove leading whitespace */
@@ -430,8 +430,7 @@ void parse_playlistinfo_answer(MpdObj *mo, void *param)
i++;
g_strfreev(tokens);
}
- if (lines[i] && strcmp(lines[i],"OK"))
- md->nb++;
+ md->nb++;
}
g_strfreev(lines);
DBG("Got 'OK', md->nb = %d", md->nb);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Merge branch 'master' of ssh://git.xfce.org/git/panel-plugins/xfce4-mpc-plugin
Updating branch refs/heads/master to b8513ea9cc555293641499a7a12a320553b81e7d (commit) from 2a58794661890cc004ee8f07bd4e29cfc44b07c1 (commit) commit b8513ea9cc555293641499a7a12a320553b81e7d Merge: 2a58794661890cc004ee8f07bd4e29cfc44b07c1 5479152c87a41ea7232e10e7be86d2313173b933 Author: Landry Breuil Date: Sat Oct 16 12:36:48 2010 +0200 Merge branch 'master' of ssh://git.xfce.org/git/panel-plugins/xfce4-mpc-plugin commit 5479152c87a41ea7232e10e7be86d2313173b933 Author: Xavier Devlamynck Date: Wed Sep 15 15:51:01 2010 +0200 l10n: Updated French (fr) translation to 100% New status: 24 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/fr.po | 38 +- 1 files changed, 17 insertions(+), 21 deletions(-) diff --git a/po/fr.po b/po/fr.po index eacbef8..56075e4 100644 --- a/po/fr.po +++ b/po/fr.po @@ -2,7 +2,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. -# +# msgid "" msgstr "" "Project-Id-Version: xfce4-mpc-plugin 0.1.0\n" @@ -21,7 +21,7 @@ msgstr "" #: ../panel-plugin/xfce4-mpc-plugin.c:192 #: ../panel-plugin/xfce4-mpc-plugin.c:673 msgid "Launch" -msgstr "" +msgstr "Lancer" #: ../panel-plugin/xfce4-mpc-plugin.c:247 msgid "Mpd Client Plugin" @@ -44,35 +44,32 @@ msgid "Password : " msgstr "Mot de passe :" #: ../panel-plugin/xfce4-mpc-plugin.c:269 -#, fuzzy msgid "MPD Client : " -msgstr "Greffon de client MPD" +msgstr "Client MPD :" #: ../panel-plugin/xfce4-mpc-plugin.c:270 msgid "Tooltip Format : " -msgstr "" +msgstr "Format de l'info-bulle :" #: ../panel-plugin/xfce4-mpc-plugin.c:271 msgid "Playlist Format : " -msgstr "" +msgstr "Format de la liste de lecture :" #: ../panel-plugin/xfce4-mpc-plugin.c:305 msgid "Hostname or IP address" -msgstr "" +msgstr "Nom d'hôte ou adresse IP" #: ../panel-plugin/xfce4-mpc-plugin.c:306 msgid "Graphical MPD Client to launch in plugin context menu" -msgstr "" +msgstr "Client MPD grahique à lancer dans le menu contextuel du plug-in" #: ../panel-plugin/xfce4-mpc-plugin.c:307 msgid "Variables : %artist%, %album%, %track% and %title%" -msgstr "" +msgstr "Variables : %artist%, %album%, %track% and %title%" #: ../panel-plugin/xfce4-mpc-plugin.c:308 -msgid "" -"Variables : %vol%, %status%, %newline%, %artist%, %album%, %track% and %title" -"%" -msgstr "" +msgid "Variables : %vol%, %status%, %newline%, %artist%, %album%, %track% and %title%" +msgstr "Variables : %vol%, %status%, %newline%, %artist%, %album%, %track% and %title%" #: ../panel-plugin/xfce4-mpc-plugin.c:313 msgid "Show _frame" @@ -85,32 +82,31 @@ msgstr "... non connecté ?" #: ../panel-plugin/xfce4-mpc-plugin.c:465 msgid "Mpd playlist" -msgstr "" +msgstr "Liste de lecture Mpd" #: ../panel-plugin/xfce4-mpc-plugin.c:669 msgid "Random" -msgstr "" +msgstr "Aléatoire" #: ../panel-plugin/xfce4-mpc-plugin.c:671 msgid "Repeat" -msgstr "" +msgstr "Répétition" #: ../panel-plugin/xfce4-mpc-plugin.c:697 msgid "Xfce4 Mpc Plugin" -msgstr "" +msgstr "Plugin Mpc pour Xfce4" #: ../panel-plugin/xfce4-mpc-plugin.c:698 -#, fuzzy msgid "A simple panel-plugin client for Music Player Daemon" -msgstr "Un client pour MPD, Music Player Daemon" +msgstr "Un plug-in simple du panneau pour Music Player Daemon" #: ../panel-plugin/xfce4-mpc-plugin.c:699 msgid "Copyright (c) 2006-2008 Landry Breuil\n" -msgstr "" +msgstr "Copyright (c) 2006-2008 Landry Breuil\n" #: ../panel-plugin/xfce4-mpc-plugin.c:701 msgid "Maintainer, Original Author" -msgstr "" +msgstr "Maintainer, Original Author" #: ../panel-plugin/xfce4-mpc-plugin.desktop.in.in.h:1 msgid "A client for MPD, The Music Player Daemon" ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] WIP on OpenBSD support
Updating branch refs/heads/master
to 3acd33040055d460b7c901bd88a6ffc40e9fc827 (commit)
from 1bd6ca0add969e4af7128425431abc0f8fcea43c (commit)
commit 3acd33040055d460b7c901bd88a6ffc40e9fc827
Author: Landry Breuil
Date: Thu May 13 18:36:17 2010 +0200
WIP on OpenBSD support
- update wrt new Task structure
- handle zombie processes
- get full cmdline
rework
src/{taskmanager-bsd.c => task-manager-bsd.c} | 142 -
1 files changed, 91 insertions(+), 51 deletions(-)
diff --git a/src/taskmanager-bsd.c b/src/task-manager-bsd.c
similarity index 51%
rename from src/taskmanager-bsd.c
rename to src/task-manager-bsd.c
index b712c3d..2e94083 100644
--- a/src/taskmanager-bsd.c
+++ b/src/task-manager-bsd.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008 Landry Breuil
+ * Copyright (c) 2008-2010 Landry Breuil
*
* 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
@@ -16,28 +16,30 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#include "taskmanager.h"
+#include
/* for getpwuid() */
#include
#include
/* for sysctl() */
#include
+#include
#include
/* for kill() */
#include
#include
+#include "task-manager.h"
+
char *state_abbrev[] = {
"", "start", "run", "sleep", "stop", "zomb", "dead", "onproc"
};
-GArray *get_task_list(void)
+gboolean get_task_list (GArray *task_list)
{
- GArray *task_list;
int mib[6];
size_t size;
struct kinfo_proc2 *kp;
- struct task t;
+ Task t;
struct passwd *passwdp;
double d;
char **args, **ptr;
@@ -46,7 +48,7 @@ GArray *get_task_list(void)
fixpt_t ccpu; /* The scheduler exponential decay value. */
int fscale; /* The kernel fixed-point scale factor. */
- task_list = g_array_new (FALSE, FALSE, sizeof (struct task));
+// task_list = g_array_new (FALSE, FALSE, sizeof (struct task));
mib[0] = CTL_KERN;
mib[1] = KERN_PROC2;
@@ -66,59 +68,98 @@ GArray *get_task_list(void)
for (i=0 ; i < nproc ; i++)
{
struct kinfo_proc2 p = kp[i];
- t.checked = FALSE;
t.pid = p.p_pid;
t.ppid = p.p_ppid;
t.uid = p.p_uid;
- t.prio = p.p_priority - 22;
- t.vsize = p.p_vm_dsize + p.p_vm_ssize + p.p_vm_tsize;
- t.vsize *= getpagesize();
- t.rss = p.p_vm_rssize;
+ t.prio = p.p_priority - PZERO;
+ t.vsz = p.p_vm_dsize + p.p_vm_ssize + p.p_vm_tsize;
+ t.vsz *= getpagesize();
+ t.rss = p.p_vm_rssize * getpagesize();
g_snprintf(t.state, sizeof t.state, "%s",
state_abbrev[p.p_stat]);
/* shamelessly stolen from top/machine.c */
/* short version: g_strlcpy(t.name, p.p_comm, strlen(p.p_comm)
+ 1); */
- size = 128;
- if ((args = malloc(size)) == NULL)
- errx(1,"failed to allocate memory for argv structures");
- for (;; size *= 2) {
- if ((args = realloc(args, size)) == NULL)
+ if (P_ZOMBIE(&p)) {
+ g_strlcpy(t.name, p.p_comm, strlen(p.p_comm) + 1);
+ } else {
+ size = 128;
+ if ((args = malloc(size)) == NULL)
errx(1,"failed to allocate memory for argv
structures");
- mib[0] = CTL_KERN;
- mib[1] = KERN_PROC_ARGS;
- mib[2] = t.pid;
- mib[3] = KERN_PROC_ARGV;
- if (sysctl(mib, 4, args, &size, NULL, 0) == 0)
- break;
- }
- buf[0] = '\0';
- for (ptr = args; *ptr != NULL; ptr++) {
- if (ptr != args)
- strlcat(buf, " ", sizeof(buf));
- strlcat(buf, *ptr, sizeof(buf));
+ for (;; size *= 2) {
+ if ((args = realloc(args, size)) == NULL)
+ errx(1,"failed to allocate memory for
argv structures of pid %d",t.pid);
+ mib[0] = CTL_KERN;
+ mib[1] = KERN_PROC_ARGS;
+ mib[2] = t.pid;
+ mib[3] = KERN_PROC_ARGV;
+ if (sysctl(mib, 4, args, &size, NULL, 0) == 0)
+ break;
+ }
+ buf[0] = '\0&
[Xfce4-commits] Implement fetching of swap stats
Updating branch refs/heads/master
to 10247249ebb5aec6041876151c53085ce20c6192 (commit)
from e5ad1842bf9721567ad0c93e7081ba5c24496088 (commit)
commit 10247249ebb5aec6041876151c53085ce20c6192
Author: Landry Breuil
Date: Thu May 13 19:56:51 2010 +0200
Implement fetching of swap stats
src/task-manager-bsd.c | 27 ---
1 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/src/task-manager-bsd.c b/src/task-manager-bsd.c
index 1c21974..5c73d91 100644
--- a/src/task-manager-bsd.c
+++ b/src/task-manager-bsd.c
@@ -163,6 +163,8 @@ gboolean get_memory_usage (guint64 *memory_total, guint64
*memory_free, guint64
{
int mib[] = {CTL_VM, VM_METER};
struct vmtotal vmtotal;
+ struct swapent *swdev;
+ int nswap, i;
size_t size;
size = sizeof(vmtotal);
if (sysctl(mib, 2, &vmtotal, &size, NULL, 0) < 0)
@@ -172,9 +174,28 @@ gboolean get_memory_usage (guint64 *memory_total, guint64
*memory_free, guint64
*memory_free = pagetok(vmtotal.t_free);
*memory_cache = 0;
*memory_buffers = pagetok(vmtotal.t_rm - vmtotal.t_arm);
- /* XXX:TODO */
- *swap_total = 0;
- *swap_free = 0;
+
+ /* get swap stats */
+ if ((nswap = swapctl(SWAP_NSWAP, 0, 0)) == 0)
+ errx(1,"failed to get swap device count");
+
+ if ((swdev = calloc(nswap, sizeof(*swdev))) == NULL)
+ errx(1,"failed to allocate memory for swdev structures");
+
+ if (swapctl(SWAP_STATS, swdev, nswap) == -1) {
+ free(swdev);
+ errx(1,"failed to get swap stats");
+ }
+
+ /* Total things up */
+ *swap_total = *swap_free = 0;
+ for (i = 0; i < nswap; i++) {
+ if (swdev[i].se_flags & SWF_ENABLE) {
+ *swap_free += ((swdev[i].se_nblks - swdev[i].se_inuse)
/ (1024 / DEV_BSIZE));
+ *swap_total += (swdev[i].se_nblks / (1024 / DEV_BSIZE));
+ }
+ }
+ free(swdev);
return TRUE;
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Fix missing includes, remove unused variables
Updating branch refs/heads/master
to e5ad1842bf9721567ad0c93e7081ba5c24496088 (commit)
from 3acd33040055d460b7c901bd88a6ffc40e9fc827 (commit)
commit e5ad1842bf9721567ad0c93e7081ba5c24496088
Author: Landry Breuil
Date: Thu May 13 19:56:10 2010 +0200
Fix missing includes, remove unused variables
src/task-manager-bsd.c | 12 ++--
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/task-manager-bsd.c b/src/task-manager-bsd.c
index 2e94083..1c21974 100644
--- a/src/task-manager-bsd.c
+++ b/src/task-manager-bsd.c
@@ -24,10 +24,15 @@
#include
#include
#include
+/* for swapctl() */
+#include
/* for kill() */
#include
#include
-
+/* for strlcpy() */
+#include
+/* for getpagesize() */
+#include
#include "task-manager.h"
char *state_abbrev[] = {
@@ -41,14 +46,9 @@ gboolean get_task_list (GArray *task_list)
struct kinfo_proc2 *kp;
Task t;
struct passwd *passwdp;
- double d;
char **args, **ptr;
char buf[127];
int nproc, i;
- fixpt_t ccpu; /* The scheduler exponential decay value. */
- int fscale; /* The kernel fixed-point scale factor. */
-
-// task_list = g_array_new (FALSE, FALSE, sizeof (struct task));
mib[0] = CTL_KERN;
mib[1] = KERN_PROC2;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] correctly implement set_priority/send_signal_to_pid()
Updating branch refs/heads/master
to 44dc437214888be0b21d25830976a76a88a4bd20 (commit)
from 10247249ebb5aec6041876151c53085ce20c6192 (commit)
commit 44dc437214888be0b21d25830976a76a88a4bd20
Author: Landry Breuil
Date: Thu May 13 19:57:37 2010 +0200
correctly implement set_priority/send_signal_to_pid()
src/task-manager-bsd.c | 36 ++--
1 files changed, 22 insertions(+), 14 deletions(-)
diff --git a/src/task-manager-bsd.c b/src/task-manager-bsd.c
index 5c73d91..a7fd71f 100644
--- a/src/task-manager-bsd.c
+++ b/src/task-manager-bsd.c
@@ -203,27 +203,35 @@ gboolean send_signal_to_pid (guint task_id, gint signal)
{
gint ret = 0;
if(task_id > 0 && signal != 0)
- {
-
ret = kill(task_id, signal);
-/*
- if(ret != 0)
- xfce_err(_("Couldn't send signal %d to the task with ID
%d"), signal, task_id);
-*/ }
- return ret;
+ return (ret == 0) ? TRUE : FALSE;
}
gboolean set_priority_to_pid (guint task_id, gint prio)
{
- if(task_id > 0)
+ gint res;
+ switch (prio)
{
- gchar command[128] = "";
- /* TODO : syscall */
- g_snprintf(command, 128, "renice %d %d > /dev/null", prio,
task_id);
-
- if(system(command) != 0)
- ;//xfce_err(_("Couldn't set priority %d to the task
with ID %d"), prio, task_id);
+ case XTM_PRIORITY_VERY_LOW:
+ prio = 15;
+ break;
+ case XTM_PRIORITY_LOW:
+ prio = 5;
+ break;
+ case XTM_PRIORITY_NORMAL:
+ prio = 0;
+ break;
+ case XTM_PRIORITY_HIGH:
+ prio = -5;
+ break;
+ case XTM_PRIORITY_VERY_HIGH:
+ prio = -15;
+ break;
+ default:
+ return TRUE;
}
+ res = setpriority (PRIO_PROCESS, task_id, prio);
+ return (res == 0) ? TRUE : FALSE;
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Set Task name from p_comm field, and cmdline from KERN_PROC_ARGV
Updating branch refs/heads/master
to a721cda4bef3a7c23d897f2e3c87a6ccc8343afc (commit)
from 44dc437214888be0b21d25830976a76a88a4bd20 (commit)
commit a721cda4bef3a7c23d897f2e3c87a6ccc8343afc
Author: Landry Breuil
Date: Thu May 13 20:07:35 2010 +0200
Set Task name from p_comm field, and cmdline from KERN_PROC_ARGV
src/task-manager-bsd.c | 10 +++---
1 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/src/task-manager-bsd.c b/src/task-manager-bsd.c
index a7fd71f..12114a1 100644
--- a/src/task-manager-bsd.c
+++ b/src/task-manager-bsd.c
@@ -76,11 +76,9 @@ gboolean get_task_list (GArray *task_list)
t.vsz *= getpagesize();
t.rss = p.p_vm_rssize * getpagesize();
g_snprintf(t.state, sizeof t.state, "%s",
state_abbrev[p.p_stat]);
+ g_strlcpy(t.name, p.p_comm, strlen(p.p_comm) + 1);
/* shamelessly stolen from top/machine.c */
- /* short version: g_strlcpy(t.name, p.p_comm, strlen(p.p_comm)
+ 1); */
- if (P_ZOMBIE(&p)) {
- g_strlcpy(t.name, p.p_comm, strlen(p.p_comm) + 1);
- } else {
+ if (!P_ZOMBIE(&p)) {
size = 128;
if ((args = malloc(size)) == NULL)
errx(1,"failed to allocate memory for argv
structures");
@@ -101,9 +99,7 @@ gboolean get_task_list (GArray *task_list)
strlcat(buf, *ptr, sizeof(buf));
}
free(args);
- /* TODO: set difference */
- g_snprintf(t.name, sizeof t.name, "%s", buf);
- g_strlcpy(t.cmdline, t.name, sizeof t.name);
+ g_snprintf(t.cmdline, sizeof t.cmdline, "%s", buf);
}
t.cpu_user = (100.0 * ((double) p.p_pctcpu / FSCALE));
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Add checkitems in rightclick menu to enable/disable mpd outputs
Updating branch refs/heads/master
to 8f2a1057581138457e7a1d29ab279d7002c87b57 (commit)
from d652109b6c91a31285e9fc479f1c7a7ca3106b03 (commit)
commit 8f2a1057581138457e7a1d29ab279d7002c87b57
Author: Landry Breuil
Date: Thu May 13 23:01:45 2010 +0200
Add checkitems in rightclick menu to enable/disable mpd outputs
- add mpc_output_toggled() callback for checkitems to change output device
status on mpd server
- add mpc_update_outputs() called when mouse hovers the plugin :
traverse the list of known output, update their status
if not found, create a new checkitem and add it to rightclick menu
- add corresponding t_mpd_output struct in headers
currently, this requires mpd_server_set_output_device(),
mpd_server_get_output_devices() and mpd_data_get_next(),
so this will only work when built against libmpd.
Equivalent code to come in simple-libmpd.{c,h}...
panel-plugin/xfce4-mpc-plugin.c | 54 +++
panel-plugin/xfce4-mpc-plugin.h |9 ++
2 files changed, 63 insertions(+), 0 deletions(-)
diff --git a/panel-plugin/xfce4-mpc-plugin.c b/panel-plugin/xfce4-mpc-plugin.c
index b073146..37f6f48 100644
--- a/panel-plugin/xfce4-mpc-plugin.c
+++ b/panel-plugin/xfce4-mpc-plugin.c
@@ -347,6 +347,57 @@ mpc_repeat_toggled(GtkWidget *widget, t_mpc* mpc)
mpd_player_set_repeat(mpc->mo,
gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget)));
}
+static void
+mpc_output_toggled(GtkWidget *widget, t_mpc* mpc)
+{
+ DBG("!");
+ int i;
+ /* lookup menuitem */
+ for (i = 0; i < mpc->nb_outputs && mpc->mpd_outputs[i]->menuitem != widget;
i++);
+ if (i != mpc->nb_outputs) /* oops case ? */
+ /* set corresponding mpd output status */
+ mpd_server_set_output_device(mpc->mo, mpc->mpd_outputs[i]->id,
gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget)));
+}
+
+/* get output list from mpd, add a checkbox to rightclick menu for each */
+static void
+mpc_update_outputs(t_mpc* mpc)
+{
+ DBG("!");
+ int i,j=0;
+ MpdData * data = mpd_server_get_output_devices(mpc->mo);
+ do {
+ DBG("got output %d with name %s,
enabled=%d",data->output_dev->id,data->output_dev->name,data->output_dev->enabled);
+ /* check if this output doesn't already exist */
+ for (i = 0; i < mpc->nb_outputs && mpc->mpd_outputs[i]->id !=
data->output_dev->id ; i++);
+
+ if (i == mpc->nb_outputs) {
+ DBG("output not found, adding a new checkitem at pos %d",i);
+ GtkWidget* chkitem = gtk_check_menu_item_new_with_label
(data->output_dev->name);
+ g_signal_connect (G_OBJECT(chkitem), "toggled", G_CALLBACK
(mpc_output_toggled), mpc);
+
xfce_panel_plugin_menu_insert_item(mpc->plugin,GTK_MENU_ITEM(chkitem));
+ gtk_widget_show (chkitem);
+ mpc->mpd_outputs[i] = g_new(t_mpd_output,1);
+ mpc->mpd_outputs[i]->id = data->output_dev->id;
+ mpc->mpd_outputs[i]->menuitem = chkitem;
+ mpc->nb_outputs++;
+ }
+ mpc->mpd_outputs[i]->enabled = data->output_dev->enabled;
+
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(mpc->mpd_outputs[i]->menuitem),
mpc->mpd_outputs[i]->enabled);
+ j++;
+ } while (NULL != (data = mpd_data_get_next (data)));
+ /* something changed, better prune the list and recreate it */
+ /* TODO: test this codepath */
+ if (j != mpc->nb_outputs) {
+ DBG("didnt found same amount of outputs (was %d got %d), resetting
output list", mpc->nb_outputs, j);
+ for (i = 0; i < mpc->nb_outputs ; i++) {
+ gtk_widget_destroy(mpc->mpd_outputs[i]->menuitem);
+ g_free(mpc->mpd_outputs[i]);
+ }
+ mpc->nb_outputs = 0;
+ mpc_update_outputs(mpc);
+ }
+}
void
str_replace(GString *str, gchar* pattern, gchar* replacement)
@@ -418,6 +469,7 @@ enter_cb(GtkWidget *widget, GdkEventCrossing* event, t_mpc*
mpc)
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(mpc->random),
mpd_player_get_random(mpc->mo));
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(mpc->repeat),
mpd_player_get_repeat(mpc->mo));
+ mpc_update_outputs(mpc);
gtk_widget_set_tooltip_text (widget, str->str);
g_string_free(str, TRUE);
@@ -736,6 +788,8 @@ mpc_construct (XfcePanelPlugin * plugin)
mpc->playlist_format = g_strdup("%artist% - %album% -/- (#%track%)
%title%");
mpc->show_frame = TRUE;
mpc->playlist = NULL;
+ mpc->mpd_outputs = g_new(t_mpd_output*,1);
+ mpc->nb_outputs = 0;
mpc_read_config (plugin, mpc);
diff --git a/panel-plugin/xfce4-mpc-plugin.h b/panel-plugin/xfce4-mpc-plugin.h
index 8f8e6e8..c128078 100644
--- a/panel-plugin/xfce4-mpc-plugin.h
+++ b/panel-plugin/xfce4
[Xfce4-commits] Merge branch 'master' of ssh://git.xfce.org/git/panel-plugins/xfce4-mpc-plugin
Updating branch refs/heads/master
to d652109b6c91a31285e9fc479f1c7a7ca3106b03 (commit)
from 77d2f38bb35b6ba7d9e5e06a517ef5cc480bd48c (commit)
commit d652109b6c91a31285e9fc479f1c7a7ca3106b03
Merge: 77d2f38bb35b6ba7d9e5e06a517ef5cc480bd48c
d2d820b382dbf2d8fdd9b6cfdf4408b9f181ba3a
Author: Landry Breuil
Date: Mon May 10 22:17:21 2010 +0200
Merge branch 'master' of
ssh://git.xfce.org/git/panel-plugins/xfce4-mpc-plugin
commit d2d820b382dbf2d8fdd9b6cfdf4408b9f181ba3a
Author: Fabian Nowak
Date: Sat Mar 27 20:11:23 2010 +0100
l10n: Updated German (de) translation to 100%
New status: 24 messages complete with 0 fuzzies and 0 untranslated.
Transmitted-via: Transifex (translations.xfce.org).
commit d77c46f8afc0f81ac3ebaa0f039b67d5fe747ad1
Author: Fabian Nowak
Date: Sat Mar 27 20:09:08 2010 +0100
l10n: Updated German (de) translation to 100%
New status: 24 messages complete with 0 fuzzies and 0 untranslated.
Transmitted-via: Transifex (translations.xfce.org).
commit 78516bc366444298319bbd196cd48447f64cae88
Author: Fabian Nowak
Date: Sat Mar 27 20:07:21 2010 +0100
l10n: Updated German (de) translation to 95%
New status: 23 messages complete with 1 fuzzy and 0 untranslated.
Transmitted-via: Transifex (translations.xfce.org).
commit 39e77746c55fed338237425aa0e4689cff7fe102
Author: Dmitry Nikitin
Date: Wed Mar 17 12:51:25 2010 +0100
l10n: Updated Ukrainian (uk) translation to 100%
New status: 24 messages complete with 0 fuzzies and 0 untranslated.
Transmitted-via: Transifex (translations.xfce.org).
commit d342474db4707c8a30d78340214b733defa72a5b
Author: Dmitrij Smirnov
Date: Tue Mar 9 19:50:07 2010 +0100
l10n: Updated Russian (ru) translation to 100%
New status: 24 messages complete with 0 fuzzies and 0 untranslated.
Transmitted-via: Transifex (translations.xfce.org).
commit 6d4fcf13bf266865836e6e4c461b57d7900f2758
Author: Andres Kovtunos
Date: Tue Mar 9 18:42:26 2010 +0100
l10n: Initial Russian translation.
New status: 24 messages complete with 0 fuzzies and 0 untranslated.
Transmitted-via: Transifex (translations.xfce.org).
commit 7eddcd7088d7b70d22c3889f6d9df49c84096b77
Author: Robert Hartl
Date: Mon Mar 8 10:47:47 2010 +0100
l10n: Updated Slovak (sk) translation to 95%
New status: 23 messages complete with 0 fuzzies and 1 untranslated.
Transmitted-via: Transifex (translations.xfce.org).
commit 66228766267df6a12aaeb0ec2df2816dea1c920a
Author: Paul Seyfert
Date: Sat Feb 27 21:37:14 2010 +0100
l10n: Updated German (de) translation to 87%
New status: 21 messages complete with 1 fuzzy and 2 untranslated.
Transmitted-via: Transifex (translations.xfce.org).
commit 002e0ff37121f66135dd4b0a8a819d43f65d71f0
Author: Michal Várady
Date: Mon Jan 4 17:51:10 2010 +
l10n: Updates to Czech (cs) translation
Transmitted-via: Transifex (translations.xfce.org)
commit b8c969205ed4e397aaf44597aee558930b18c65c
Author: Cristian Marchi
Date: Wed Dec 30 20:05:31 2009 +
l10n: Updates to Italian (it) translation
Transmitted-via: Transifex (translations.xfce.org)
commit 5712671a6951a762181dce4a7d507d3f172de2f4
Author: Cristian Marchi
Date: Wed Dec 30 19:53:17 2009 +
l10n: Updates to Italian (it) translation
Transmitted-via: Transifex (translations.xfce.org)
commit 7293c9fb9b7e9929c6abd3ba949e5e1f68804961
Author: Daniel Nylander
Date: Wed Dec 16 16:28:13 2009 +
l10n: Updates to Swedish (sv) translation
Transmitted-via: Transifex (translations.xfce.org)
commit 06c5bb82e775fb44f64d42d7b7be234b2b761015
Author: Xu Meihong
Date: Mon Nov 9 12:07:21 2009 +
l10n: Updates to Chinese (China) (zh_CN) translation
Transmitted-via: Transifex (translations.xfce.org)
commit 672748208e02fe52e3a793c3f5f7382b06d30b7b
Author: Robert Hartl
Date: Thu Nov 5 16:06:14 2009 +
l10n: Slovak translation
Transmitted-via: Transifex (translations.xfce.org)
po/cs.po| 28 +
po/de.po| 31 +++-
po/it.po| 32 +++-
po/{es.po => ru.po} | 63 +++-
po/{cs.po => sk.po} | 66 +++---
po/sv.po| 22 +++-
po/uk.po| 21 +++-
po/zh_CN.po | 34 +-
8 files changed, 137 insertions(+), 160 deletions(-)
diff --git a/po/cs.po b/po/cs.po
index 87c101a..67ef1c0 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,14 +1,14 @@
# Czech translations for xfce4-mpc-plugin package.
# Copyright (C) 2006 THE xfce4-mpc-plugin'S COPYRIGHT HOLDER
# This file is distributed under the same license as the xfce4-mpc-plugin
package.
-# Michal Várady , 2006-2
[Xfce4-commits] switch back to dev mode
Updating branch refs/heads/master to 77d2f38bb35b6ba7d9e5e06a517ef5cc480bd48c (commit) from 8776e8dc12bc8649f2756c305501c7138f60d011 (commit) commit 77d2f38bb35b6ba7d9e5e06a517ef5cc480bd48c Author: Landry Breuil Date: Tue Nov 3 22:25:11 2009 +0100 switch back to dev mode configure.ac.in |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.ac.in b/configure.ac.in index 1c113c4..29cf8eb 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -6,7 +6,7 @@ dnl m4_define([mpc_version_major], [0]) m4_define([mpc_version_minor], [3]) m4_define([mpc_version_micro], [4]) -m4_define([mpc_version_tag], []) # Leave empty for releases +m4_define([mpc_version_tag], [git]) # Leave empty for releases m4_define([mpc_version_build], [...@revision@]) m4_define([mpc_version], [mpc_version_major().mpc_version_minor().mpc_version_micro()ifelse(mpc_version_tag(), [], [], [mpc_version_tag()-mpc_version_build()])]) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] declare str_replace() and () as static to silence a warning
Updating branch refs/heads/master
to c33b5635fe368f7f38f4568185aa14ff4c7d8198 (commit)
from 43bea1d2dccfc9c124f2bda144d5ae33b1943e4b (commit)
commit c33b5635fe368f7f38f4568185aa14ff4c7d8198
Author: Landry Breuil
Date: Fri May 14 18:30:37 2010 +0200
declare str_replace() and () as static to silence a warning
panel-plugin/xfce4-mpc-plugin.c |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/panel-plugin/xfce4-mpc-plugin.c b/panel-plugin/xfce4-mpc-plugin.c
index 595b04e..5715cfc 100644
--- a/panel-plugin/xfce4-mpc-plugin.c
+++ b/panel-plugin/xfce4-mpc-plugin.c
@@ -399,7 +399,7 @@ mpc_update_outputs(t_mpc* mpc)
}
}
-void
+static void
str_replace(GString *str, gchar* pattern, gchar* replacement)
{
if (!replacement)
@@ -409,7 +409,7 @@ str_replace(GString *str, gchar* pattern, gchar*
replacement)
g_free(nstr);
}
-void
+static void
format_song_display(mpd_Song* song, GString *str, t_mpc* mpc)
{
if (0 == str->len)
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Add add_separator_and_label_with_markup() helper and use it in mpc_create()
Updating branch refs/heads/master
to 7e0dbc4b630506ee65e0428d4a64e0f67e6aa55b (commit)
from 8f2a1057581138457e7a1d29ab279d7002c87b57 (commit)
commit 7e0dbc4b630506ee65e0428d4a64e0f67e6aa55b
Author: Landry Breuil
Date: Fri May 14 18:00:35 2010 +0200
Add add_separator_and_label_with_markup() helper and use it in mpc_create()
Adds a GtkSeparatorMenuItem + a GtkMenuItem set as insensitive and using
markup
This commits adds two new strings for translators..
panel-plugin/xfce4-mpc-plugin.c | 18 ++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/panel-plugin/xfce4-mpc-plugin.c b/panel-plugin/xfce4-mpc-plugin.c
index 37f6f48..595b04e 100644
--- a/panel-plugin/xfce4-mpc-plugin.c
+++ b/panel-plugin/xfce4-mpc-plugin.c
@@ -687,6 +687,21 @@ new_button_with_cbk(XfcePanelPlugin * plugin, GtkWidget
*parent, gpointer cb, gp
return button;
}
+static void
+add_separator_and_label_with_markup(XfcePanelPlugin* plugin, gchar* lbl)
+{
+ GtkWidget *separator, *menuitem, *label;
+ separator = gtk_separator_menu_item_new();
+ menuitem = gtk_menu_item_new_with_label(_(lbl));
+ gtk_widget_set_sensitive(menuitem, FALSE);
+ label = gtk_bin_get_child(GTK_BIN(menuitem));
+ gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
+ xfce_panel_plugin_menu_insert_item(plugin,GTK_MENU_ITEM(separator));
+ xfce_panel_plugin_menu_insert_item(plugin,GTK_MENU_ITEM(menuitem));
+ gtk_widget_show (separator);
+ gtk_widget_show (menuitem);
+}
+
static t_mpc*
mpc_create (XfcePanelPlugin * plugin)
{
@@ -723,9 +738,12 @@ mpc_create (XfcePanelPlugin * plugin)
g_signal_connect (G_OBJECT(mpc->repeat), "toggled", G_CALLBACK
(mpc_repeat_toggled), mpc);
mpc->appl = gtk_menu_item_new_with_label (_("Launch"));
g_signal_connect (G_OBJECT(mpc->appl), "activate", G_CALLBACK
(mpc_launch_client), mpc);
+
+ add_separator_and_label_with_markup(plugin, "Commands");
xfce_panel_plugin_menu_insert_item(plugin,GTK_MENU_ITEM(mpc->random));
xfce_panel_plugin_menu_insert_item(plugin,GTK_MENU_ITEM(mpc->repeat));
xfce_panel_plugin_menu_insert_item(plugin,GTK_MENU_ITEM(mpc->appl));
+ add_separator_and_label_with_markup(plugin, "Outputs");
gtk_widget_show (mpc->repeat);
gtk_widget_show (mpc->random);
gtk_widget_show (mpc->appl);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Implement mpd_server_set_output_device()
Updating branch refs/heads/master
to 6270c18d3ccf0731a86ca9d43a90399a79043d1a (commit)
from 5584c44866f8e46ae9edc2b8301a5051b84124da (commit)
commit 6270c18d3ccf0731a86ca9d43a90399a79043d1a
Author: Landry Breuil
Date: Sat May 15 00:10:16 2010 +0200
Implement mpd_server_set_output_device()
panel-plugin/simple-libmpd.c |5 +
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/panel-plugin/simple-libmpd.c b/panel-plugin/simple-libmpd.c
index e3c95c1..4668962 100644
--- a/panel-plugin/simple-libmpd.c
+++ b/panel-plugin/simple-libmpd.c
@@ -565,6 +565,11 @@ MpdData* mpd_server_get_output_devices(MpdObj* mo)
int mpd_server_set_output_device (MpdObj* mo, int id, int state)
{
+ char outbuf[18];
+ /* write (enable|disable)output 'id' to socket */
+ DBG("!");
+ snprintf(outbuf, sizeof(outbuf), "%soutput %d\n",(state ? "enable" :
"disable"), id);
+ return mpd_send_single_cmd(mo,outbuf);
}
void mpd_status_set_volume(MpdObj* mo, int newvol)
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] wip on MpdData output/song
Updating branch refs/heads/master
to d4c56c062c3918c3ab112d9bb578d2f27ec026e2 (commit)
from c33b5635fe368f7f38f4568185aa14ff4c7d8198 (commit)
commit d4c56c062c3918c3ab112d9bb578d2f27ec026e2
Author: Landry Breuil
Date: Fri May 14 18:39:32 2010 +0200
wip on MpdData output/song
- skeleton for parse_outputs_answer()
- basic implem for mpd_server_get_output_devices() ripped from
mpd_playlist_get_current_song()
- switch on md->type in mpd_data_get_next() to correctly work on output/song
panel-plugin/simple-libmpd.c | 49 --
1 files changed, 42 insertions(+), 7 deletions(-)
diff --git a/panel-plugin/simple-libmpd.c b/panel-plugin/simple-libmpd.c
index 232591e..c597634 100644
--- a/panel-plugin/simple-libmpd.c
+++ b/panel-plugin/simple-libmpd.c
@@ -434,6 +434,12 @@ void parse_playlistinfo_answer(MpdObj *mo, void *param)
DBG("Got 'OK', md->nb = %d", md->nb);
}
+void parse_outputs_answer(MpdObj *mo, void *param)
+{
+ MpdData* md = (MpdData*) param;
+ mpd_Song* ms;
+}
+
mpd_Song* mpd_playlist_get_current_song(MpdObj* mo)
{
DBG("!");
@@ -471,6 +477,7 @@ MpdData* mpd_playlist_get_changes(MpdObj* mo, int
old_playlist_id)
{
MpdData* md = g_new0(MpdData,1);
md->cur = md->nb = 0;
+ md->type = MPD_DATA_TYPE_SONG;
md->allsongs = g_new(mpd_Song, mo->playlistlength);
DBG("!");
send_complex_cmd(mo, "playlistinfo\n", parse_playlistinfo_answer, (void*)
md);
@@ -486,23 +493,51 @@ MpdData* mpd_data_get_next(MpdData* md)
{
for (md->cur--; md->cur; md->cur--)
{
- if (md->allsongs[md->cur].file) free(md->allsongs[md->cur].file);
- if (md->allsongs[md->cur].artist) free(md->allsongs[md->cur].artist);
- if (md->allsongs[md->cur].album) free(md->allsongs[md->cur].album);
- if (md->allsongs[md->cur].title) free(md->allsongs[md->cur].title);
- if (md->allsongs[md->cur].track) free(md->allsongs[md->cur].track);
+ switch (md->type) {
+case MPD_DATA_TYPE_OUTPUT_DEV:
+if (md->alloutputs[md->cur].name)
free(md->alloutputs[md->cur].name);
+break;
+case MPD_DATA_TYPE_SONG:
+if (md->allsongs[md->cur].file) free(md->allsongs[md->cur].file);
+if (md->allsongs[md->cur].artist)
free(md->allsongs[md->cur].artist);
+if (md->allsongs[md->cur].album) free(md->allsongs[md->cur].album);
+if (md->allsongs[md->cur].title) free(md->allsongs[md->cur].title);
+if (md->allsongs[md->cur].track) free(md->allsongs[md->cur].track);
+break;
+ }
+ }
+ switch (md->type) {
+ case MPD_DATA_TYPE_OUTPUT_DEV:
+g_free(md->alloutputs);
+break;
+ case MPD_DATA_TYPE_SONG:
+g_free(md->allsongs);
+break;
}
- g_free(md->allsongs);
g_free(md);
DBG("Free()'d md");
return NULL;
}
- md->song = (&md->allsongs[md->cur]);
+ switch (md->type) {
+ case MPD_DATA_TYPE_OUTPUT_DEV:
+ md->output_dev = (&md->alloutputs[md->cur]);
+ break;
+ case MPD_DATA_TYPE_SONG:
+ md->song = (&md->allsongs[md->cur]);
+ break;
+ }
return md;
}
MpdData* mpd_server_get_output_devices(MpdObj* mo)
{
+ MpdData* md = g_new0(MpdData,1);
+ DBG("!");
+ md->cur = md->nb = 0;
+ md->type = MPD_DATA_TYPE_OUTPUT_DEV;
+ send_complex_cmd(mo, "outputs\n", parse_outputs_answer, (void*) md);
+ md->output_dev = &(md->alloutputs[0]);
+ return ((!mo->error) ? md : NULL);
}
int mpd_server_set_output_device (MpdObj* mo, int id, int state)
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Add skeleton for getting/setting outputs in simple-libmpd
Updating branch refs/heads/master
to 43bea1d2dccfc9c124f2bda144d5ae33b1943e4b (commit)
from 7e0dbc4b630506ee65e0428d4a64e0f67e6aa55b (commit)
commit 43bea1d2dccfc9c124f2bda144d5ae33b1943e4b
Author: Landry Breuil
Date: Fri May 14 18:22:27 2010 +0200
Add skeleton for getting/setting outputs in simple-libmpd
adds mpd_server_get_output_devices(), mpd_server_set_output_device(),
mpd_Output struct and amend MpdData struct to also hold it.
panel-plugin/simple-libmpd.c |8
panel-plugin/simple-libmpd.h | 19 +++
2 files changed, 27 insertions(+), 0 deletions(-)
diff --git a/panel-plugin/simple-libmpd.c b/panel-plugin/simple-libmpd.c
index d62e8ac..232591e 100644
--- a/panel-plugin/simple-libmpd.c
+++ b/panel-plugin/simple-libmpd.c
@@ -501,6 +501,14 @@ MpdData* mpd_data_get_next(MpdData* md)
return md;
}
+MpdData* mpd_server_get_output_devices(MpdObj* mo)
+{
+}
+
+int mpd_server_set_output_device (MpdObj* mo, int id, int state)
+{
+}
+
void mpd_status_set_volume(MpdObj* mo, int newvol)
{
char outbuf[15];
diff --git a/panel-plugin/simple-libmpd.h b/panel-plugin/simple-libmpd.h
index f314bac..1bc7752 100644
--- a/panel-plugin/simple-libmpd.h
+++ b/panel-plugin/simple-libmpd.h
@@ -51,6 +51,12 @@ typedef struct {
} mpd_Song;
typedef struct {
+ int id;
+ char* name;
+ int enabled;
+} mpd_Output;
+
+typedef struct {
gchar* host;
int port;
gchar* pass;
@@ -68,12 +74,23 @@ typedef struct {
int buflen;
} MpdObj;
+typedef enum {
+ MPD_DATA_TYPE_SONG,
+ MPD_DATA_TYPE_OUTPUT_DEV
+} MpdDataType;
+
/* here, i must cheat, too hard to follow libmpd's behaviour */
typedef struct {
+ /* holds type = song or output */
+ MpdDataType type;
/* ptr to current song */
mpd_Song* song;
/* vector of all songs in playlist */
mpd_Song* allsongs;
+ /* ptr to current output */
+ mpd_Output* output_dev;
+ /* vector of all outputs */
+ mpd_Output* alloutputs;
int nb;
int cur;
} MpdData;
@@ -96,6 +113,8 @@ int mpd_player_get_current_song_pos(MpdObj*);
MpdData* mpd_playlist_get_changes(MpdObj*, int);
MpdData* mpd_data_get_next(MpdData*);
mpd_Song* mpd_playlist_get_current_song(MpdObj*);
+MpdData* mpd_server_get_output_devices(MpdObj*);
+int mpd_server_set_output_device (MpdObj*, int, int);
int mpd_playlist_get_playlist_length(MpdObj*);
int mpd_check_error(MpdObj*);
void mpd_set_hostname(MpdObj*, char*);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Implement parse_outputs_answer(), ripped from parse_playlistinfo_answer()
Updating branch refs/heads/master
to 5584c44866f8e46ae9edc2b8301a5051b84124da (commit)
from d4c56c062c3918c3ab112d9bb578d2f27ec026e2 (commit)
commit 5584c44866f8e46ae9edc2b8301a5051b84124da
Author: Landry Breuil
Date: Sat May 15 00:01:49 2010 +0200
Implement parse_outputs_answer(), ripped from parse_playlistinfo_answer()
use an array of ptrs for alloutputs as we don't know how many outputs we
have
panel-plugin/simple-libmpd.c | 31 +++
panel-plugin/simple-libmpd.h |2 +-
2 files changed, 28 insertions(+), 5 deletions(-)
diff --git a/panel-plugin/simple-libmpd.c b/panel-plugin/simple-libmpd.c
index c597634..e3c95c1 100644
--- a/panel-plugin/simple-libmpd.c
+++ b/panel-plugin/simple-libmpd.c
@@ -437,7 +437,29 @@ void parse_playlistinfo_answer(MpdObj *mo, void *param)
void parse_outputs_answer(MpdObj *mo, void *param)
{
MpdData* md = (MpdData*) param;
- mpd_Song* ms;
+ gchar **lines, **tokens;
+ int i = 0;
+ lines = g_strsplit(mo->buffer, "\n", 0);
+ while(lines[i] && strcmp(lines[i],"OK"))
+ {
+ md->alloutputs[md->nb] = g_new(mpd_Output, 1);
+ md->alloutputs[md->nb]->enabled = -1;
+ DBG("Going to parse output #%d", md->nb);
+ while(lines[i] && md->alloutputs[md->nb]->enabled < 0)
+ {
+ tokens = g_strsplit(lines[i], ":", 2);
+ /* remove leading whitespace */
+ tokens[1] = g_strchug(tokens[1]);
+ DBG("key=\"%s\",value=\"%s\"", tokens[0], tokens[1]);
+ if (0 == strcmp("outputid",tokens[0]))
md->alloutputs[md->nb]->id = atoi(tokens[1]);
+ else if (0 == strcmp("outputname",tokens[0]))
md->alloutputs[md->nb]->name = g_strdup(tokens[1]);
+ else if (0 == strcmp("outputenabled",tokens[0]))
md->alloutputs[md->nb]->enabled = atoi(tokens[1]);
+ i++;
+ g_strfreev(tokens);
+ }
+ md->nb++;
+ }
+ g_strfreev(lines);
}
mpd_Song* mpd_playlist_get_current_song(MpdObj* mo)
@@ -495,7 +517,7 @@ MpdData* mpd_data_get_next(MpdData* md)
{
switch (md->type) {
case MPD_DATA_TYPE_OUTPUT_DEV:
-if (md->alloutputs[md->cur].name)
free(md->alloutputs[md->cur].name);
+if (md->alloutputs[md->cur]->name)
free(md->alloutputs[md->cur]->name);
break;
case MPD_DATA_TYPE_SONG:
if (md->allsongs[md->cur].file) free(md->allsongs[md->cur].file);
@@ -520,7 +542,7 @@ MpdData* mpd_data_get_next(MpdData* md)
}
switch (md->type) {
case MPD_DATA_TYPE_OUTPUT_DEV:
- md->output_dev = (&md->alloutputs[md->cur]);
+ md->output_dev = md->alloutputs[md->cur];
break;
case MPD_DATA_TYPE_SONG:
md->song = (&md->allsongs[md->cur]);
@@ -534,9 +556,10 @@ MpdData* mpd_server_get_output_devices(MpdObj* mo)
MpdData* md = g_new0(MpdData,1);
DBG("!");
md->cur = md->nb = 0;
+ md->alloutputs = g_new(mpd_Output*,1);
md->type = MPD_DATA_TYPE_OUTPUT_DEV;
send_complex_cmd(mo, "outputs\n", parse_outputs_answer, (void*) md);
- md->output_dev = &(md->alloutputs[0]);
+ md->output_dev = md->alloutputs[0];
return ((!mo->error) ? md : NULL);
}
diff --git a/panel-plugin/simple-libmpd.h b/panel-plugin/simple-libmpd.h
index 1bc7752..6adfbe4 100644
--- a/panel-plugin/simple-libmpd.h
+++ b/panel-plugin/simple-libmpd.h
@@ -90,7 +90,7 @@ typedef struct {
/* ptr to current output */
mpd_Output* output_dev;
/* vector of all outputs */
- mpd_Output* alloutputs;
+ mpd_Output** alloutputs;
int nb;
int cur;
} MpdData;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] place gettext _() calls where the text actually is
Updating branch refs/heads/master
to c7c6783f05344cf875b3ebce0d488a407bf1b2e4 (commit)
from 6270c18d3ccf0731a86ca9d43a90399a79043d1a (commit)
commit c7c6783f05344cf875b3ebce0d488a407bf1b2e4
Author: Landry Breuil
Date: Sat May 15 09:41:42 2010 +0200
place gettext _() calls where the text actually is
panel-plugin/xfce4-mpc-plugin.c |6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/panel-plugin/xfce4-mpc-plugin.c b/panel-plugin/xfce4-mpc-plugin.c
index 5715cfc..9a40a5b 100644
--- a/panel-plugin/xfce4-mpc-plugin.c
+++ b/panel-plugin/xfce4-mpc-plugin.c
@@ -692,7 +692,7 @@ add_separator_and_label_with_markup(XfcePanelPlugin*
plugin, gchar* lbl)
{
GtkWidget *separator, *menuitem, *label;
separator = gtk_separator_menu_item_new();
- menuitem = gtk_menu_item_new_with_label(_(lbl));
+ menuitem = gtk_menu_item_new_with_label(lbl);
gtk_widget_set_sensitive(menuitem, FALSE);
label = gtk_bin_get_child(GTK_BIN(menuitem));
gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
@@ -739,11 +739,11 @@ mpc_create (XfcePanelPlugin * plugin)
mpc->appl = gtk_menu_item_new_with_label (_("Launch"));
g_signal_connect (G_OBJECT(mpc->appl), "activate", G_CALLBACK
(mpc_launch_client), mpc);
- add_separator_and_label_with_markup(plugin, "Commands");
+ add_separator_and_label_with_markup(plugin, _("Commands"));
xfce_panel_plugin_menu_insert_item(plugin,GTK_MENU_ITEM(mpc->random));
xfce_panel_plugin_menu_insert_item(plugin,GTK_MENU_ITEM(mpc->repeat));
xfce_panel_plugin_menu_insert_item(plugin,GTK_MENU_ITEM(mpc->appl));
- add_separator_and_label_with_markup(plugin, "Outputs");
+ add_separator_and_label_with_markup(plugin, _("Outputs"));
gtk_widget_show (mpc->repeat);
gtk_widget_show (mpc->random);
gtk_widget_show (mpc->appl);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Fix case when connecting to another server and #output changed
Updating branch refs/heads/master
to 1b39937e01d1b978ee05a47f96f4af1a09c36ad4 (commit)
from c7c6783f05344cf875b3ebce0d488a407bf1b2e4 (commit)
commit 1b39937e01d1b978ee05a47f96f4af1a09c36ad4
Author: Landry Breuil
Date: Sun May 16 12:10:50 2010 +0200
Fix case when connecting to another server and #output changed
add a ugly hack to be sure checkitems are always appended
to the menu at the same position,
panel-plugin/xfce4-mpc-plugin.c | 11 +++
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/panel-plugin/xfce4-mpc-plugin.c b/panel-plugin/xfce4-mpc-plugin.c
index 9a40a5b..2dff48a 100644
--- a/panel-plugin/xfce4-mpc-plugin.c
+++ b/panel-plugin/xfce4-mpc-plugin.c
@@ -364,7 +364,8 @@ static void
mpc_update_outputs(t_mpc* mpc)
{
DBG("!");
- int i,j=0;
+ GtkWidget* menu;
+ int i,j=0, old_nb_outputs = mpc->nb_outputs;
MpdData * data = mpd_server_get_output_devices(mpc->mo);
do {
DBG("got output %d with name %s,
enabled=%d",data->output_dev->id,data->output_dev->name,data->output_dev->enabled);
@@ -376,6 +377,9 @@ mpc_update_outputs(t_mpc* mpc)
GtkWidget* chkitem = gtk_check_menu_item_new_with_label
(data->output_dev->name);
g_signal_connect (G_OBJECT(chkitem), "toggled", G_CALLBACK
(mpc_output_toggled), mpc);
xfce_panel_plugin_menu_insert_item(mpc->plugin,GTK_MENU_ITEM(chkitem));
+ /* XXX HACK */
+ menu = g_object_get_data (G_OBJECT (mpc->plugin),
I_("xfce-panel-plugin-menu"));
+ gtk_menu_reorder_child(GTK_MENU(menu),chkitem, 12 + i); /* 12 is
after 'Outputs' menuitem */
gtk_widget_show (chkitem);
mpc->mpd_outputs[i] = g_new(t_mpd_output,1);
mpc->mpd_outputs[i]->id = data->output_dev->id;
@@ -387,9 +391,8 @@ mpc_update_outputs(t_mpc* mpc)
j++;
} while (NULL != (data = mpd_data_get_next (data)));
/* something changed, better prune the list and recreate it */
- /* TODO: test this codepath */
- if (j != mpc->nb_outputs) {
- DBG("didnt found same amount of outputs (was %d got %d), resetting
output list", mpc->nb_outputs, j);
+ if (j != mpc->nb_outputs || (old_nb_outputs && j != old_nb_outputs)) {
+ DBG("didnt found same amount of outputs (was %d got %d), resetting
output list", (old_nb_outputs ? old_nb_outputs : mpc->nb_outputs), j);
for (i = 0; i < mpc->nb_outputs ; i++) {
gtk_widget_destroy(mpc->mpd_outputs[i]->menuitem);
g_free(mpc->mpd_outputs[i]);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Bump copyright years, update README/TODO/Changelog in preparation for 0.3.5
Updating branch refs/heads/master to 22525afe26e1fe730dec2d69486355b7d5967722 (commit) from 1b39937e01d1b978ee05a47f96f4af1a09c36ad4 (commit) commit 22525afe26e1fe730dec2d69486355b7d5967722 Author: Landry Breuil Date: Sun May 16 12:16:18 2010 +0200 Bump copyright years, update README/TODO/Changelog in preparation for 0.3.5 ChangeLog |4 README |2 +- TODO|1 - panel-plugin/simple-libmpd.c|2 +- panel-plugin/simple-libmpd.h|2 +- panel-plugin/xfce4-mpc-plugin.c |2 +- panel-plugin/xfce4-mpc-plugin.h |2 +- 7 files changed, 9 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5045601..e7bb145 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +XX-05-2010 Landry Breuil + * release 0.3.5 + * add enable/disable outputs in rightclick menu + 03-11-2009 Landry Breuil * release 0.3.4 * add user-configurable markup for playlist and tooltip diff --git a/README b/README index e711ed2..c16c23f 100644 --- a/README +++ b/README @@ -7,7 +7,7 @@ Features : - current volume/status/playing track when mouse passes over the plugin - decrease/increase volume with mousewheel - show a simple playlist window upon middle-click, permitting to select a track to play -- toggle random/repeat in right-click menu +- toggle random/repeat/outputs in right-click menu - launch configurable client (gmpc, xterm -e ncmpc,..) through right-click menu - configurable tooltip and playlist formats, using a gmpc-like markup : - playlist accepts %artist%, %title%, %album% and %track% diff --git a/TODO b/TODO index 5e7af2d..5b5afb4 100644 --- a/TODO +++ b/TODO @@ -1,3 +1,2 @@ -- support multiple outputs enabling/disabling - add volume progressbar/slider ? - fix all strings length checking diff --git a/panel-plugin/simple-libmpd.c b/panel-plugin/simple-libmpd.c index 4668962..0084358 100644 --- a/panel-plugin/simple-libmpd.c +++ b/panel-plugin/simple-libmpd.c @@ -1,6 +1,6 @@ /* simple-libmpd.c * - * Copyright (c) 2006-2009 Landry Breuil (landry at fr.homeunix.org / gaston at gcu.info) + * Copyright (c) 2006-2010 Landry Breuil (landry at fr.homeunix.org / gaston at gcu.info) * This code is licenced under a BSD-style licence. * (OpenBSD variant modeled after the ISC licence) * All rights reserved. diff --git a/panel-plugin/simple-libmpd.h b/panel-plugin/simple-libmpd.h index 6adfbe4..405fd40 100644 --- a/panel-plugin/simple-libmpd.h +++ b/panel-plugin/simple-libmpd.h @@ -1,6 +1,6 @@ /* simple-libmpd.h * - * Copyright (c) 2006-2009 Landry Breuil (landry at fr.homeunix.org / gaston at gcu.info) + * Copyright (c) 2006-2010 Landry Breuil (landry at fr.homeunix.org / gaston at gcu.info) * This code is licenced under a BSD-style licence. * (OpenBSD variant modeled after the ISC licence) * All rights reserved. diff --git a/panel-plugin/xfce4-mpc-plugin.c b/panel-plugin/xfce4-mpc-plugin.c index 2dff48a..0fe782a 100644 --- a/panel-plugin/xfce4-mpc-plugin.c +++ b/panel-plugin/xfce4-mpc-plugin.c @@ -1,6 +1,6 @@ /* xfce4-mpc-plugin.c * - * Copyright (c) 2006-2009 Landry Breuil (landry at fr.homeunix.org / gaston at gcu.info) + * Copyright (c) 2006-2010 Landry Breuil (landry at fr.homeunix.org / gaston at gcu.info) * This code is licenced under a BSD-style licence. * (OpenBSD variant modeled after the ISC licence) * All rights reserved. diff --git a/panel-plugin/xfce4-mpc-plugin.h b/panel-plugin/xfce4-mpc-plugin.h index c128078..bd41fdb 100644 --- a/panel-plugin/xfce4-mpc-plugin.h +++ b/panel-plugin/xfce4-mpc-plugin.h @@ -1,6 +1,6 @@ /* xfce4-mpc-plugin.h * - * Copyright (c) 2006-2009 Landry Breuil (landry at fr.homeunix.org / gaston at gcu.info) + * Copyright (c) 2006-2010 Landry Breuil (landry at fr.homeunix.org / gaston at gcu.info) * This code is licenced under a BSD-style licence. * (OpenBSD variant modeled after the ISC licence) * All rights reserved. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Implement pid_is_sleeping() and fix send_signal_to_pid()
Updating branch refs/heads/master
to 00d61079725fad2440e8418b67c6fb370fa02d3b (commit)
from a721cda4bef3a7c23d897f2e3c87a6ccc8343afc (commit)
commit 00d61079725fad2440e8418b67c6fb370fa02d3b
Author: Landry Breuil
Date: Sun May 16 12:53:50 2010 +0200
Implement pid_is_sleeping() and fix send_signal_to_pid()
src/task-manager-bsd.c | 38 +-
1 files changed, 33 insertions(+), 5 deletions(-)
diff --git a/src/task-manager-bsd.c b/src/task-manager-bsd.c
index 12114a1..68c1248 100644
--- a/src/task-manager-bsd.c
+++ b/src/task-manager-bsd.c
@@ -118,7 +118,19 @@ gboolean get_task_list (GArray *task_list)
gboolean
pid_is_sleeping (guint pid)
{
- return FALSE;
+ int mib[6];
+ struct kinfo_proc2 kp;
+ size_t size = sizeof(struct kinfo_proc2);
+
+ mib[0] = CTL_KERN;
+ mib[1] = KERN_PROC2;
+ mib[2] = KERN_PROC_PID;
+ mib[3] = pid;
+ mib[4] = sizeof(struct kinfo_proc2);
+ mib[5] = 1;
+ if (sysctl(mib, 6, &kp, &size, NULL, 0) < 0)
+ errx(1, "could not read kern.proc2 for pid %d", pid);
+ return (kp.p_stat == SSLEEP ? TRUE : FALSE);
}
gboolean get_cpu_usage (gushort *cpu_count, gfloat *cpu_user, gfloat
*cpu_system)
@@ -195,11 +207,27 @@ gboolean get_memory_usage (guint64 *memory_total, guint64
*memory_free, guint64
return TRUE;
}
-gboolean send_signal_to_pid (guint task_id, gint signal)
+gboolean send_signal_to_pid (guint task_id, gint sig)
{
- gint ret = 0;
- if(task_id > 0 && signal != 0)
- ret = kill(task_id, signal);
+ gint ret;
+ switch (sig)
+ {
+ case XTM_SIGNAL_TERMINATE:
+ sig = SIGTERM;
+ break;
+ case XTM_SIGNAL_STOP:
+ sig = SIGSTOP;
+ break;
+ case XTM_SIGNAL_CONTINUE:
+ sig = SIGCONT;
+ break;
+ case XTM_SIGNAL_KILL:
+ sig = SIGKILL;
+ break;
+ default:
+ return TRUE;
+ }
+ ret = kill (task_id, sig);
return (ret == 0) ? TRUE : FALSE;
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Merge branch 'master' of ssh://git.xfce.org/git/apps/xfce4-taskmanager
Updating branch refs/heads/master to ee9bd057fde481b90143a363c5158d39e1610c7b (commit) from 00d61079725fad2440e8418b67c6fb370fa02d3b (commit) commit ee9bd057fde481b90143a363c5158d39e1610c7b Merge: 00d61079725fad2440e8418b67c6fb370fa02d3b 0be1d45507fea8ab4b4937670d643d3fa414e67e Author: Landry Breuil Date: Sun May 16 12:56:06 2010 +0200 Merge branch 'master' of ssh://git.xfce.org/git/apps/xfce4-taskmanager Conflicts: src/task-manager-bsd.c commit 0be1d45507fea8ab4b4937670d643d3fa414e67e Author: Mike Massonnet Date: Sun May 16 12:28:28 2010 +0200 Don't recount CPU count in Linux implementation commit b961822ba4ee1962d23622ea8ace0639f5377397 Author: Mike Massonnet Date: Sun May 16 12:07:17 2010 +0200 Move POSIX code to task-manager.c The functions send_signal_to_pid() and set_priority_to_pid() are using POSIX functions and “should” be safe in task-manager.c. Still keep the enumeration as a bridge between virtual values and real values, there is no benefit removing them (wasting minutes) and it won't make the code look better (or worse). The functions have been removed from the Linux and BSD implementations. commit 8a56b552b5086ce1471de092be78abf7bf8e4aa2 Author: Dmitrij Smirnov Date: Sun May 16 11:40:27 2010 +0200 l10n: Updated Russian (ru) translation to 97% New status: 44 messages complete with 1 fuzzy and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). commit 7acf0503200d38fdca93bd304811b62c668bc7be Author: Gökmen Görgen Date: Sat May 15 18:06:36 2010 +0200 l10n: Updated Turkish (tr) translation to 100% New status: 45 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). commit ec00c4a5f94f74097f87e90ce0765b6138cc6eed Author: Johannes Lips Date: Sat May 15 17:05:33 2010 +0200 l10n: Updated German (de) translation to 44% New status: 20 messages complete with 20 fuzzies and 5 untranslated. Transmitted-via: Transifex (translations.xfce.org). commit 2c3d44e56bdcde1d79f406bd0fef51d9db46a9b5 Author: Johannes Lips Date: Sat May 15 16:48:13 2010 +0200 l10n: Updated German (de) translation to 44% New status: 20 messages complete with 21 fuzzies and 4 untranslated. Transmitted-via: Transifex (translations.xfce.org). commit 772d76074cf7f016a3747140b882d8cc3a3058d0 Author: Sergio Marques Date: Fri May 14 17:27:41 2010 +0200 l10n: Updated Portuguese (pt) translation to 100% New status: 45 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). commit b4a7c271e2865d2b884e97dd095aa07f5233d6a4 Author: Sergio Marques Date: Fri May 14 17:27:22 2010 +0200 l10n: Updated Portuguese (pt) translation to 97% New status: 44 messages complete with 1 fuzzy and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/de.po | 31 ++- po/pt.po | 98 +++ po/ru.po |3 +- po/tr.po | 127 ++ src/task-manager-bsd.c | 56 + src/task-manager-linux.c | 79 ++--- src/task-manager.c | 115 +++-- src/task-manager.h | 16 +++--- 8 files changed, 232 insertions(+), 293 deletions(-) diff --git a/po/de.po b/po/de.po index a1f3345..896bb8c 100644 --- a/po/de.po +++ b/po/de.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: xfce4-taskmanager 0.4.0-rc1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-10 21:04+\n" +"POT-Creation-Date: 2010-05-15 10:07+\n" "PO-Revision-Date: 2008-07-31 01:00+0200\n" "Last-Translator: Fabian Nowak \n" "Language-Team: German \n" @@ -41,9 +41,9 @@ msgid "Memory: %.2f%%" msgstr "Speicher: %.2f%%" #: ../src/process-statusbar.c:135 -#, c-format +#, c-format, fuzzy msgid "Swap: %.2f%%" -msgstr "" +msgstr "Auslagerungsspeicher: %.2f%%" #: ../src/process-statusbar.c:142 #, c-format @@ -110,16 +110,17 @@ msgid "Error sending signal" msgstr "Signal konnte nicht gesendet werden" #: ../src/process-tree-view.c:227 -#, c-format, fuzzy +#, fuzzy, c-format msgid "An error was encountered by sending a signal to the PID %d. It is likely you don't have the required privileges." msgstr "Beim Senden eines Signals an die Anwendung mit der ID %d ist ein Fehler aufgetreten. Möglicherweise haben Sie nicht die notwendigen Rechte." #: ../src/process-tree-view.c:244 +#, fuzzy msgid "Error setting priority" -msgstr "" +msgstr "Feh
[Xfce4-commits] Creating annotated tag xfce4-mpc-plugin-0.3.5
Updating annotated tag refs/tags/xfce4-mpc-plugin-0.3.5 as new annotated tag to ee913593c28043d454707f397b413220787a991f (tag) succeeds xfce4-mpc-plugin-0.3.4 tagged by Landry Breuil on 2010-05-17 19:47 + Andres Kovtunos (1): l10n: Initial Russian translation. Cristian Marchi (2): l10n: Updates to Italian (it) translation l10n: Updates to Italian (it) translation Daniel Nylander (1): l10n: Updates to Swedish (sv) translation Dmitrij Smirnov (1): l10n: Updated Russian (ru) translation to 100% Dmitry Nikitin (1): l10n: Updated Ukrainian (uk) translation to 100% Fabian Nowak (3): l10n: Updated German (de) translation to 95% l10n: Updated German (de) translation to 100% l10n: Updated German (de) translation to 100% Landry Breuil (14): switch back to dev mode Merge branch 'master' of ssh://git.xfce.org/git/panel-plugins/xfce4-mpc-plugin Add checkitems in rightclick menu to enable/disable mpd outputs Add add_separator_and_label_with_markup() helper and use it in mpc_create() Add skeleton for getting/setting outputs in simple-libmpd declare str_replace() and () as static to silence a warning wip on MpdData output/song Implement parse_outputs_answer(), ripped from parse_playlistinfo_answer() Implement mpd_server_set_output_device() place gettext _() calls where the text actually is Fix case when connecting to another server and #output changed Bump copyright years, update README/TODO/Changelog in preparation for 0.3.5 oops, also bump this copyright year Release 0.3.5 Michal Várady (1): l10n: Updates to Czech (cs) translation Paul Seyfert (1): l10n: Updated German (de) translation to 87% Robert Hartl (2): l10n: Slovak translation l10n: Updated Slovak (sk) translation to 95% Xu Meihong (1): l10n: Updates to Chinese (China) (zh_CN) translation ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] oops, also bump this copyright year
Updating branch refs/heads/master
to 007b2b1702679f9a44efcafc85971b42d463a7ec (commit)
from 22525afe26e1fe730dec2d69486355b7d5967722 (commit)
commit 007b2b1702679f9a44efcafc85971b42d463a7ec
Author: Landry Breuil
Date: Sun May 16 12:18:57 2010 +0200
oops, also bump this copyright year
panel-plugin/xfce4-mpc-plugin.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/panel-plugin/xfce4-mpc-plugin.c b/panel-plugin/xfce4-mpc-plugin.c
index 0fe782a..bf0ae2c 100644
--- a/panel-plugin/xfce4-mpc-plugin.c
+++ b/panel-plugin/xfce4-mpc-plugin.c
@@ -768,7 +768,7 @@ mpc_show_about(XfcePanelPlugin *plugin, t_mpc* mpc)
}
ainfo = xfce_about_info_new(_("Xfce4 Mpc Plugin"), PACKAGE_VERSION,
_("A simple panel-plugin client for Music
Player Daemon"),
- _("Copyright (c) 2006-2008 Landry Breuil\n"),
+ _("Copyright (c) 2006-2010 Landry Breuil\n"),
XFCE_LICENSE_BSD);
xfce_about_info_add_credit(ainfo, "Landry Breuil",
"lan...@fr.homeunix.org", _("Maintainer, Original Author"));
xfce_about_info_set_homepage(ainfo,
"http://goodies.xfce.org/projects/panel-plugins/xfce4-mpc-plugin";);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Release 0.3.5
Updating branch refs/heads/master to 9c85bf33aae319a71d50b5c1c1da283fcc12932b (commit) from 007b2b1702679f9a44efcafc85971b42d463a7ec (commit) commit 9c85bf33aae319a71d50b5c1c1da283fcc12932b Author: Landry Breuil Date: Mon May 17 21:46:11 2010 +0200 Release 0.3.5 ChangeLog |2 +- configure.ac.in |4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index e7bb145..d9cdde3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -XX-05-2010 Landry Breuil +17-05-2010 Landry Breuil * release 0.3.5 * add enable/disable outputs in rightclick menu diff --git a/configure.ac.in b/configure.ac.in index 29cf8eb..7b9e80e 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -5,8 +5,8 @@ dnl m4_define([mpc_version_major], [0]) m4_define([mpc_version_minor], [3]) -m4_define([mpc_version_micro], [4]) -m4_define([mpc_version_tag], [git]) # Leave empty for releases +m4_define([mpc_version_micro], [5]) +m4_define([mpc_version_tag], []) # Leave empty for releases m4_define([mpc_version_build], [...@revision@]) m4_define([mpc_version], [mpc_version_major().mpc_version_minor().mpc_version_micro()ifelse(mpc_version_tag(), [], [], [mpc_version_tag()-mpc_version_build()])]) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Add support for FreeBSD (bug #10350)
Updating branch refs/heads/master
to 0faba9adc585a02071b4ab1d8761413b4cc35a9a (commit)
from b1167d15ad443ac1b97a4c1f360e5e345d25747a (commit)
commit 0faba9adc585a02071b4ab1d8761413b4cc35a9a
Author: Danilo Egea
Date: Sat Sep 14 10:13:23 2013 +0200
Add support for FreeBSD (bug #10350)
panel-plugin/devperf.c | 88
panel-plugin/main.c| 17 ++
2 files changed, 98 insertions(+), 7 deletions(-)
diff --git a/panel-plugin/devperf.c b/panel-plugin/devperf.c
index 4f7bbf2..45391d5 100644
--- a/panel-plugin/devperf.c
+++ b/panel-plugin/devperf.c
@@ -225,6 +225,94 @@ int main ()
/** Linux End ***/
+#elif defined(__FreeBSD__)
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#define MAXNAMELEN 256
+
+int DevPerfInit ()
+{
+ return (0);
+}
+
+int DevCheckStatAvailability(char const **strptr)
+{
+ return (0);
+}
+
+int DevGetPerfData (const void *p_pvDevice, struct devperf_t *perf)
+{
+ struct timeval tv;
+ struct timespec ts;
+ struct statinfo stats;
+ struct devinfo dinfo;
+ struct devstat dev;
+ kvm_t *kd = NULL;
+ int i, found = 0;
+ char *check_dev = (char *) p_pvDevice;
+
+ memset(&stats, 0, sizeof(stats));
+ memset(&dinfo, 0, sizeof(dinfo));
+ stats.dinfo = &dinfo;
+
+ if(devstat_getdevs(kd, &stats) == -1) {
+ syslog(0, "DISKPERF: getdevs fail");
+ }
+
+ for(found = 0, i = 0; i < (stats.dinfo)->numdevs; i++) {
+ char dev_name[MAXNAMELEN];
+ dev = (stats.dinfo)->devices[i];
+ snprintf(dev_name, MAXNAMELEN-1, "%s%d",
+ dev.device_name, dev.unit_number);
+ if ((check_dev != NULL) && (strcmp(check_dev, dev_name) != 0))
+ continue;
+ else {
+ found = 1;
+ break;
+ }
+
+ }
+
+ if(check_dev != NULL && found) {
+ perf->wbytes = dev.bytes[DEVSTAT_WRITE];
+ perf->rbytes = dev.bytes[DEVSTAT_READ];
+ gettimeofday (&tv, 0);
+ perf->timestamp_ns = (uint64_t)1000ull * 1000ull * 1000ull *
+ tv.tv_sec + 1000ull * tv.tv_usec;
+ perf->qlen = dev.start_count - dev.end_count;
+ // I'm not sure about rbusy and wbusy calculation
+ bintime2timespec(&dev.busy_time, &ts);
+ perf->rbusy_ns = (uint64_t) ts.tv_nsec;
+ perf->wbusy_ns = perf->rbusy_ns;
+ }
+
+ return (0);
+}
+
+#if 0 /* Standalone test purpose */
+int main ()
+{
+struct devperf_t oPerf;
+DevGetPerfData ((void*)"ada0", &oPerf);
+printf ("%lu\t%lu\n", oPerf.rbytes, oPerf.wbytes);
+return (0);
+}
+#endif
+
+
#elif defined(__NetBSD__)
/**/
diff --git a/panel-plugin/main.c b/panel-plugin/main.c
index 87e4d9c..6d49b28 100644
--- a/panel-plugin/main.c
+++ b/panel-plugin/main.c
@@ -86,7 +86,7 @@ typedef enum monitor_bar_order_t {
typedef struct param_t {
/* Configurable parameters */
characDevice[64];
-#if !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__sun__)
+#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) &&
!defined(__sun__)
dev_t st_rdev;
#endif
int fTitleDisplayed;
@@ -172,7 +172,7 @@ static int DisplayPerf (struct diskperf_t *p_poPlugin)
struct param_t *poConf = &(p_poPlugin->oConf.oParam);
struct monitor_t *poMonitor = &(p_poPlugin->oMonitor);
struct perfbar_t *poPerf = poMonitor->aoPerfBar;
-#if !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__sun__)
+#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) &&
!defined(__sun__)
struct stat oStat;
#endif
uint64_tiInterval_ns, rbytes, wbytes, iRBusy_ns, iWBusy_ns;
@@ -185,7 +185,7 @@ static int DisplayPerf (struct diskperf_t *p_poPlugin)
rbytes = wbytes = iRBusy_ns = iWBusy_ns = -1;
memset (&oPerf, 0, sizeof (oPerf));
oPerf.qlen = -1;
-#if defined (__NetBSD__) || defined(__OpenBSD__) || defined(__sun__)
+#if defined(__FreeBSD__) || defined (__NetBSD__) || defined(__OpenBSD__) ||
defined(__sun__)
status = DevGetPerfData (poConf->acDevice, &oPerf);
#else
if (poConf->st_rdev == 0)
@@ -429,7 +429,7 @@ static diskperf_t *diskperf_create_control (XfcePanelPlugin
*plugin)
struct diskperf_t *poPlugin;
struct param_t *poConf;
struct monitor_t *poMonitor;
-#if !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(__sun__)
+#if !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) &&
!defined(__sun__)
[Xfce4-commits] Added compatibility with xfce4-panel v.4.9.0+
Updating branch refs/heads/master
to 7e9be0f33a4554723889f91e77e4196953c542c7 (commit)
from d77215f604efbfc99578cf32a46daff143705402 (commit)
commit 7e9be0f33a4554723889f91e77e4196953c542c7
Author: Andrzej
Date: Mon May 7 02:09:33 2012 +0900
Added compatibility with xfce4-panel v.4.9.0+
Add support for mode callback and honour nrows.
Signed-off-by: Landry Breuil
panel-plugin/fsguard.c | 93 +++
1 files changed, 77 insertions(+), 16 deletions(-)
diff --git a/panel-plugin/fsguard.c b/panel-plugin/fsguard.c
index 715b1c9..8e32f23 100644
--- a/panel-plugin/fsguard.c
+++ b/panel-plugin/fsguard.c
@@ -61,6 +61,12 @@
#define COLOR_WARNING "#FFE500"
#define COLOR_URGENT"#FF4F00"
+#ifdef LIBXFCE4PANEL_CHECK_VERSION
+#if LIBXFCE4PANEL_CHECK_VERSION (4,9,0)
+#define HAS_PANEL_49
+#endif
+#endif
+
// }}}
// struct {{{
@@ -139,6 +145,10 @@ fsguard_set_icon (FsGuard *fsguard, gint id)
fsguard->icon_id = id;
size = xfce_panel_plugin_get_size (fsguard->plugin);
+#ifdef HAS_PANEL_49
+size /= xfce_panel_plugin_get_nrows (fsguard->plugin);
+#endif
+
size -= 2 + 2 * MAX (fsguard->btn_panel->style->xthickness,
fsguard->btn_panel->style->ythickness);
@@ -387,6 +397,8 @@ static FsGuard *
fsguard_new (XfcePanelPlugin *plugin)
{
FsGuard *fsguard = g_new0(FsGuard, 1);
+GtkWidget *alignment;
+
fsguard->plugin = plugin;
fsguard_read_config (fsguard);
@@ -403,7 +415,9 @@ fsguard_new (XfcePanelPlugin *plugin)
fsguard->lab_name = gtk_label_new (NULL);
fsguard->lab_size = gtk_label_new (NULL);
-fsguard->lab_box = gtk_vbox_new (FALSE, 0);
+fsguard->lab_box = xfce_hvbox_new (GTK_ORIENTATION_VERTICAL, FALSE, 0);
+
+alignment = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
fsguard->btn_panel = xfce_create_panel_button ();
fsguard->icon_panel = gtk_image_new ();
@@ -429,7 +443,8 @@ fsguard_new (XfcePanelPlugin *plugin)
gtk_container_add (GTK_CONTAINER(fsguard->btn_panel), fsguard->icon_panel);
gtk_container_add (GTK_CONTAINER(fsguard->lab_box), fsguard->lab_name);
gtk_container_add (GTK_CONTAINER(fsguard->lab_box), fsguard->lab_size);
-gtk_container_add (GTK_CONTAINER(fsguard->box), fsguard->lab_box);
+gtk_container_add (GTK_CONTAINER(fsguard->box), alignment);
+gtk_container_add (GTK_CONTAINER(alignment), fsguard->lab_box);
gtk_container_add (GTK_CONTAINER(fsguard->box), fsguard->pb_box);
gtk_container_add (GTK_CONTAINER(fsguard->pb_box), fsguard->progress_bar);
@@ -463,25 +478,15 @@ fsguard_free (XfcePanelPlugin *plugin, FsGuard *fsguard)
g_free(fsguard);
}
-static void
-fsguard_set_orientation (XfcePanelPlugin *plugin, GtkOrientation orientation,
FsGuard *fsguard)
-{
-DBG ("Set orientation to `%s'", orientation == GTK_ORIENTATION_HORIZONTAL ?
-"Horizontal" : "Vertical");
-
-xfce_hvbox_set_orientation (XFCE_HVBOX (fsguard->box), orientation);
-xfce_hvbox_set_orientation (XFCE_HVBOX (fsguard->pb_box), orientation);
-gtk_progress_bar_set_orientation (GTK_PROGRESS_BAR(fsguard->progress_bar),
- orientation ==
GTK_ORIENTATION_HORIZONTAL ?
- GTK_PROGRESS_BOTTOM_TO_TOP :
GTK_PROGRESS_LEFT_TO_RIGHT);
-}
-
static gboolean
fsguard_set_size (XfcePanelPlugin *plugin, int size, FsGuard *fsguard)
{
+gint btn_size;
+
DBG ("Set size to `%d'", size);
-gtk_widget_set_size_request (fsguard->btn_panel, size, size);
+btn_size = size / xfce_panel_plugin_get_nrows (plugin);
+gtk_widget_set_size_request (fsguard->btn_panel, btn_size, btn_size);
GtkOrientation orientation = xfce_panel_plugin_get_orientation (plugin);
if (orientation == GTK_ORIENTATION_HORIZONTAL) {
@@ -497,6 +502,55 @@ fsguard_set_size (XfcePanelPlugin *plugin, int size,
FsGuard *fsguard)
return TRUE;
}
+#ifdef HAS_PANEL_49
+static void
+fsguard_set_mode (XfcePanelPlugin *plugin, XfcePanelPluginMode mode, FsGuard
*fsguard)
+{
+GtkOrientation orientation, panel_orientation;
+
+orientation =
+ (mode != XFCE_PANEL_PLUGIN_MODE_VERTICAL) ?
+ GTK_ORIENTATION_HORIZONTAL : GTK_ORIENTATION_VERTICAL;
+panel_orientation =
+ (mode == XFCE_PANEL_PLUGIN_MODE_HORIZONTAL) ?
+ GTK_ORIENTATION_HORIZONTAL : GTK_ORIENTATION_VERTICAL;
+
+DBG ("Set mode to `%s'", mode == XFCE_PANEL_PLUGIN_MODE_HORIZONTAL ?
+ "Horizontal" : (mode == XFCE_PANEL_PLUGIN_MODE_VERTICAL ? "Vertical"
: "Deskbar"));
+
+xfce_hvbox_set_orientation (XFCE_HVBOX (fsguard->box), panel_orientation);
+xfce_hvbox_set_orientat
[Xfce4-commits] resize all widgets, not only the button
Updating branch refs/heads/master
to 7ddfa1ccfa7bd4e869e838c752bf5a8733cf8a61 (commit)
from 7e9be0f33a4554723889f91e77e4196953c542c7 (commit)
commit 7ddfa1ccfa7bd4e869e838c752bf5a8733cf8a61
Author: Landry Breuil
Date: Sun May 6 21:07:25 2012 +0200
resize all widgets, not only the button
panel-plugin/fsguard.c |6 ++
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/panel-plugin/fsguard.c b/panel-plugin/fsguard.c
index 8e32f23..883838c 100644
--- a/panel-plugin/fsguard.c
+++ b/panel-plugin/fsguard.c
@@ -481,12 +481,10 @@ fsguard_free (XfcePanelPlugin *plugin, FsGuard *fsguard)
static gboolean
fsguard_set_size (XfcePanelPlugin *plugin, int size, FsGuard *fsguard)
{
-gint btn_size;
-
DBG ("Set size to `%d'", size);
-btn_size = size / xfce_panel_plugin_get_nrows (plugin);
-gtk_widget_set_size_request (fsguard->btn_panel, btn_size, btn_size);
+size /= xfce_panel_plugin_get_nrows (plugin);
+gtk_widget_set_size_request (fsguard->btn_panel, size, size);
GtkOrientation orientation = xfce_panel_plugin_get_orientation (plugin);
if (orientation == GTK_ORIENTATION_HORIZONTAL) {
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] bump header inclusion sooner so that panel 4.9 detection is correct
Updating branch refs/heads/master to 36d4198c5acd123d04578ceb931409e5315bb816 (commit) from c9b39f33c4bb678b7026e2a1d8d488983233bd24 (commit) commit 36d4198c5acd123d04578ceb931409e5315bb816 Author: Landry Breuil Date: Sun May 6 21:23:30 2012 +0200 bump header inclusion sooner so that panel 4.9 detection is correct panel-plugin/xfce4-mpc-plugin.c |3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/panel-plugin/xfce4-mpc-plugin.c b/panel-plugin/xfce4-mpc-plugin.c index 4c4ea1a..7d82a8c 100644 --- a/panel-plugin/xfce4-mpc-plugin.c +++ b/panel-plugin/xfce4-mpc-plugin.c @@ -28,6 +28,8 @@ #include #include +#include "xfce4-mpc-plugin.h" + #define DEFAULT_MPD_HOST "localhost" #define DEFAULT_MPD_PORT 6600 #define DIALOG_ENTRY_WIDTH 20 @@ -38,7 +40,6 @@ #endif #endif -#include "xfce4-mpc-plugin.h" static void mpc_free (XfcePanelPlugin * plugin, t_mpc * mpc) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Merge branch 'master' of git://git.xfce.org/panel-plugins/xfce4-mpc-plugin
Updating branch refs/heads/master
to afecf95822335a963c687c815bfc2bfb8b5e5d5c (commit)
from 36d4198c5acd123d04578ceb931409e5315bb816 (commit)
commit afecf95822335a963c687c815bfc2bfb8b5e5d5c
Merge: 36d4198 a1452cc
Author: Landry Breuil
Date: Sun May 6 21:48:05 2012 +0200
Merge branch 'master' of git://git.xfce.org/panel-plugins/xfce4-mpc-plugin
commit a1452ccdf800c5f9a9f058ce8953b70b797bddfd
Author: Ivica Kolić
Date: Sat May 5 10:36:59 2012 +0200
l10n: Initial Croatian (hr) translation
New status: 15 messages complete with 0 fuzzies and 9 untranslated.
Transmitted-via: Transifex (translations.xfce.org).
commit 1f3748f52e547438bc1e6e3fe81d226f4a817880
Author: Jeff Bailes
Date: Sat Apr 28 01:46:39 2012 +0200
l10n: Updated English (United Kingdom) (en_GB) translation to 100%
New status: 24 messages complete with 0 fuzzies and 0 untranslated.
Transmitted-via: Transifex (translations.xfce.org).
commit 27ec6d5b0ce931c04bb95d1b91ea1847f7cb58ce
Author: Algimantas Margevičius
Date: Sat Apr 21 13:32:37 2012 +0200
l10n: Added Lithuanian language
New status: 24 messages complete with 0 fuzzies and 0 untranslated.
Transmitted-via: Transifex (translations.xfce.org).
commit 8b057861378ee2812f54cb2e08353d58b048a50e
Author: Gabor Kelemen
Date: Sat Apr 21 05:00:50 2012 +0200
l10n: Updated Hungarian (hu) translation to 100%
New status: 24 messages complete with 0 fuzzies and 0 untranslated.
Transmitted-via: Transifex (translations.xfce.org).
commit 3106297aaea877a0566972fcbf648837df420db2
Author: Chipong Luo
Date: Fri Apr 20 13:54:51 2012 +0200
l10n: Updated Chinese (China) (zh_CN) translation to 100%
New status: 24 messages complete with 0 fuzzies and 0 untranslated.
Transmitted-via: Transifex (translations.xfce.org).
commit 74c8de95a67dff7d6728820ef60cba29eaed814e
Author: Sergio García
Date: Thu Apr 19 07:07:29 2012 +0200
l10n: Updated Spanish (Castilian) (es) translation to 100%
New status: 24 messages complete with 0 fuzzies and 0 untranslated.
Transmitted-via: Transifex (translations.xfce.org).
commit d04d11a9cf13a3869b48e2f165af2405968ef1b2
Author: martinamca
Date: Sun Apr 15 21:37:35 2012 +0200
l10n: Updated Turkish (tr) translation to 58%
New status: 14 messages complete with 8 fuzzies and 2 untranslated.
Transmitted-via: Transifex (translations.xfce.org).
commit 50fd5f6c326034a2da4cada7bdceff416bb7de01
Author: Jakob Kramer
Date: Sat Apr 14 16:06:14 2012 +0200
l10n: Updated German (de) translation to 100%
New status: 24 messages complete with 0 fuzzies and 0 untranslated.
Transmitted-via: Transifex (translations.xfce.org).
commit 6f70de92ba42587d6c991aedc97f22c9592831aa
Author: Leandro Regueiro
Date: Tue Apr 10 12:48:18 2012 +0200
l10n: Updated Galician (gl) translation to 100%
New status: 24 messages complete with 0 fuzzies and 0 untranslated.
Transmitted-via: Transifex (translations.xfce.org).
po/de.po |3 -
po/en_GB.po| 15 ++--
po/es.po | 26 +++-
po/gl.po | 15 ++--
po/{xfce4-mpc-plugin.pot => hr.po} | 54
po/hu.po | 13 ++--
po/lt.po | 124
po/tr.po | 21 --
po/zh_CN.po|4 +-
9 files changed, 197 insertions(+), 78 deletions(-)
diff --git a/po/de.po b/po/de.po
index 866df15..19fa7cb 100644
--- a/po/de.po
+++ b/po/de.po
@@ -98,12 +98,10 @@ msgid "Repeat"
msgstr "Wiederholen"
#: ../panel-plugin/xfce4-mpc-plugin.c:752
-#, fuzzy
msgid "Commands"
msgstr "Befehle"
#: ../panel-plugin/xfce4-mpc-plugin.c:756
-#, fuzzy
msgid "Outputs"
msgstr "Ausgaben"
@@ -112,7 +110,6 @@ msgid "A simple panel-plugin client for Music Player Daemon"
msgstr "Eine einfache Erweiterung für die Leiste für den Music Player Daemon"
#: ../panel-plugin/xfce4-mpc-plugin.c:781
-#, fuzzy
msgid "Copyright (c) 2006-2011 Landry Breuil\n"
msgstr "Copyright © 2006-2011 Landry Breuil\n"
diff --git a/po/en_GB.po b/po/en_GB.po
index 0276b04..7faa1dd 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -2,9 +2,9 @@
# Copyright (C) 2007 THE xfce4-mpc-plugin'S COPYRIGHT HOLDER
# This file is distributed under the same license as the xfce4-mpc-plugin
package.
# Jeff Bailes , 2007.
-# , fuzzy
-#
-#
+#, fuzzy
+#
+#
msgid ""
msgstr ""
"Project-Id-Version: xfce4-mpc-plugin\n"
@@ -13,10 +13,10 @@ msgstr ""
"PO-Revision-Date: 2009-08-30 17:13+1000\n"
"Last-Translator: Jeff Bailes \n"
"Language-Team: English/GB\n
[Xfce4-commits] More panel 4.10 compatibility fixes
Updating branch refs/heads/master
to f71d4edac65ee2e4cb9a8a02ad4577c38c8163da (commit)
from 681140ee84f2c0d7faf78d9795ee78027541bf7b (commit)
commit f71d4edac65ee2e4cb9a8a02ad4577c38c8163da
Author: Andrzej
Date: Mon May 7 11:19:54 2012 +0900
More panel 4.10 compatibility fixes
Signed-off-by: Landry Breuil
panel-plugin/battery.c | 30 +++---
1 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/panel-plugin/battery.c b/panel-plugin/battery.c
index 5c75bdd..47cbc1b 100644
--- a/panel-plugin/battery.c
+++ b/panel-plugin/battery.c
@@ -62,6 +62,12 @@
#define AVERAGING_CYCLE 5
#define PLUGIN_WEBSITE
"http://goodies.xfce.org/projects/panel-plugins/xfce4-battery-plugin";
+#ifdef LIBXFCE4PANEL_CHECK_VERSION
+#if LIBXFCE4PANEL_CHECK_VERSION (4,9,0)
+#define HAS_PANEL_49
+#endif
+#endif
+
typedef struct
{
gbooleandisplay_label;/* Options */
@@ -677,11 +683,14 @@ static void setup_battmon(t_battmon *battmon,
GtkOrientation orientation,
GtkOrientation panel_orientation)
{
-GtkWidget *box,*vbox;
+ GtkWidget *box,*vbox, *alignment;
GdkPixbuf *icon;
gint size;
size = xfce_panel_plugin_get_size (battmon->plugin);
+#ifdef HAS_PANEL_49
+size /= xfce_panel_plugin_get_nrows (battmon->plugin);
+#endif
battmon->battstatus = gtk_progress_bar_new();
if (panel_orientation == GTK_ORIENTATION_HORIZONTAL)
@@ -727,7 +736,9 @@ static void setup_battmon(t_battmon *battmon,
vbox = gtk_hbox_new(FALSE, 0);
/* percent + rtime */
-gtk_box_pack_start(GTK_BOX(box), GTK_WIDGET(vbox), FALSE, FALSE, 0);
+alignment = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
+gtk_container_add (GTK_CONTAINER(alignment), vbox);
+gtk_box_pack_start(GTK_BOX(box), alignment, FALSE, FALSE, 0);
battmon->charge = (GtkLabel *)gtk_label_new("50%%");
if (orientation == GTK_ORIENTATION_HORIZONTAL)
@@ -757,7 +768,9 @@ static void setup_battmon(t_battmon *battmon,
vbox = gtk_hbox_new(FALSE, 0);
/* ac-fan-temp */
-gtk_box_pack_start(GTK_BOX(box), GTK_WIDGET(vbox), FALSE, FALSE, 0);
+alignment = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
+gtk_container_add (GTK_CONTAINER(alignment), vbox);
+gtk_box_pack_start(GTK_BOX(box), alignment, FALSE, FALSE, 0);
battmon->acfan = (GtkLabel *)gtk_label_new("AC FAN");
if (orientation == GTK_ORIENTATION_HORIZONTAL)
@@ -831,7 +844,7 @@ static void setup_battmon(t_battmon *battmon,
gtk_widget_set_size_request(battmon->ebox, -1, -1);
}
-#if defined (LIBXFCE4PANEL_CHECK_VERSION) && LIBXFCE4PANEL_CHECK_VERSION
(4,9,0)
+#ifdef HAS_PANEL_49
static gboolean
battmon_set_mode (XfcePanelPlugin *plugin, XfcePanelPluginMode mode,
t_battmon *battmon)
@@ -874,7 +887,7 @@ battmon_create(XfcePanelPlugin *plugin)
{
t_battmon *battmon;
GtkOrientation panel_orientation;
-#if defined (LIBXFCE4PANEL_CHECK_VERSION) && LIBXFCE4PANEL_CHECK_VERSION
(4,9,0)
+#ifdef HAS_PANEL_49
GtkOrientation orientation;
XfcePanelPluginMode mode;
#endif
@@ -889,7 +902,7 @@ battmon_create(XfcePanelPlugin *plugin)
battmon->ebox = gtk_event_box_new();
gtk_event_box_set_visible_window(GTK_EVENT_BOX(battmon->ebox), FALSE);
-#if defined (LIBXFCE4PANEL_CHECK_VERSION) && LIBXFCE4PANEL_CHECK_VERSION
(4,9,0)
+#ifdef HAS_PANEL_49
mode = xfce_panel_plugin_get_mode (plugin);
orientation =
(mode != XFCE_PANEL_PLUGIN_MODE_VERTICAL) ?
@@ -1071,6 +1084,9 @@ static gboolean
battmon_set_size(XfcePanelPlugin *plugin, int size, t_battmon *battmon)
{
GdkPixbuf *icon;
+#ifdef HAS_PANEL_49
+size /= xfce_panel_plugin_get_nrows (battmon->plugin);
+#endif
DBG("set_size(%d)", size);
if (xfce_panel_plugin_get_orientation (plugin) ==
GTK_ORIENTATION_HORIZONTAL)
@@ -1740,7 +1756,7 @@ battmon_construct (XfcePanelPlugin *plugin)
g_signal_connect (plugin, "size-changed", G_CALLBACK (battmon_set_size),
battmon);
-#if defined (LIBXFCE4PANEL_CHECK_VERSION) && LIBXFCE4PANEL_CHECK_VERSION
(4,9,0)
+#ifdef HAS_PANEL_49
g_signal_connect (plugin, "mode-changed", G_CALLBACK (battmon_set_mode),
battmon);
#else
g_signal_connect (plugin, "orientation-changed", G_CALLBACK
(battmon_set_orientation), battmon);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Merge branch 'master' of git://git.xfce.org/panel-plugins/xfce4-battery-plugin
Updating branch refs/heads/master to 36a61af2e48f63bdb2262fce932e96286dc0a6a3 (commit) from f71d4edac65ee2e4cb9a8a02ad4577c38c8163da (commit) commit 36a61af2e48f63bdb2262fce932e96286dc0a6a3 Merge: f71d4ed 54ce072 Author: Landry Breuil Date: Tue May 8 10:49:33 2012 +0200 Merge branch 'master' of git://git.xfce.org/panel-plugins/xfce4-battery-plugin commit 54ce07219521cbf4acbac0548a6a062fcb2a0d00 Author: Mario Blättermann Date: Mon May 7 00:09:16 2012 +0200 l10n: Updated German (de) translation to 100% New status: 43 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/de.po |5 + 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/po/de.po b/po/de.po index 375cb42..b3f254e 100644 --- a/po/de.po +++ b/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: xfce4-battery-plugin 0.5.1svn-r3672\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-04-25 12:45+\n" +"POT-Creation-Date: 2012-05-06 19:00+\n" "PO-Revision-Date: 2009-02-01 16:15+0100\n" "Last-Translator: Fabian Nowak \n" "Language-Team: German\n" @@ -101,17 +101,14 @@ msgid "On AC:" msgstr "Bei Netzversorgung:" #: ../panel-plugin/battery.c:1461 -#, fuzzy msgid "Battery high:" msgstr "Akkuzustand hoch:" #: ../panel-plugin/battery.c:1478 -#, fuzzy msgid "Battery low:" msgstr "Akkuzustand niedrig:" #: ../panel-plugin/battery.c:1495 -#, fuzzy msgid "Battery critical:" msgstr "Akkuzustand kritisch:" ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Set small property to TRUE so that the plugin fits in a single row.
Updating branch refs/heads/master to b3e07624fb08c891d3d4290bd2a9f418ce73aad5 (commit) from afecf95822335a963c687c815bfc2bfb8b5e5d5c (commit) commit b3e07624fb08c891d3d4290bd2a9f418ce73aad5 Author: Landry Breuil Date: Tue May 8 11:46:29 2012 +0200 Set small property to TRUE so that the plugin fits in a single row. panel-plugin/xfce4-mpc-plugin.c |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/panel-plugin/xfce4-mpc-plugin.c b/panel-plugin/xfce4-mpc-plugin.c index 7d82a8c..4774217 100644 --- a/panel-plugin/xfce4-mpc-plugin.c +++ b/panel-plugin/xfce4-mpc-plugin.c @@ -835,6 +835,7 @@ mpc_construct (XfcePanelPlugin * plugin) g_signal_connect (plugin, "size-changed", G_CALLBACK (mpc_set_size), mpc); #ifdef HAS_PANEL_49 g_signal_connect (plugin, "mode-changed", G_CALLBACK (mpc_set_mode), mpc); + xfce_panel_plugin_set_small (plugin, TRUE); #else g_signal_connect (plugin, "orientation-changed", G_CALLBACK (mpc_set_orientation), mpc); #endif ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Set small property to TRUE so that the plugin fits in a single row.
Updating branch refs/heads/master to b0bf17837ff694d4730a2be19469cd4cff5ddf07 (commit) from 36a61af2e48f63bdb2262fce932e96286dc0a6a3 (commit) commit b0bf17837ff694d4730a2be19469cd4cff5ddf07 Author: Landry Breuil Date: Tue May 8 11:55:00 2012 +0200 Set small property to TRUE so that the plugin fits in a single row. panel-plugin/battery.c |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/panel-plugin/battery.c b/panel-plugin/battery.c index 47cbc1b..4754fdd 100644 --- a/panel-plugin/battery.c +++ b/panel-plugin/battery.c @@ -1758,6 +1758,7 @@ battmon_construct (XfcePanelPlugin *plugin) #ifdef HAS_PANEL_49 g_signal_connect (plugin, "mode-changed", G_CALLBACK (battmon_set_mode), battmon); +xfce_panel_plugin_set_small (plugin, TRUE); #else g_signal_connect (plugin, "orientation-changed", G_CALLBACK (battmon_set_orientation), battmon); #endif ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Set small property to TRUE so that the plugin fits in a single row.
Updating branch refs/heads/master to fa51ed4379ac812733ce85992c66653cf8ef5627 (commit) from 4b5c1d2f12b98c4e3f37d1d76f421ed10301ee8d (commit) commit fa51ed4379ac812733ce85992c66653cf8ef5627 Author: Landry Breuil Date: Tue May 8 11:58:08 2012 +0200 Set small property to TRUE so that the plugin fits in a single row. panel-plugin/main.c |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/panel-plugin/main.c b/panel-plugin/main.c index 66f29b6..3f6ee12 100644 --- a/panel-plugin/main.c +++ b/panel-plugin/main.c @@ -1158,6 +1158,7 @@ static void diskperf_construct (XfcePanelPlugin *plugin) #ifdef HAS_PANEL_49 g_signal_connect (plugin, "mode-changed", G_CALLBACK (diskperf_set_mode), diskperf); +xfce_panel_plugin_set_small (plugin, TRUE); #else g_signal_connect (plugin, "orientation-changed", G_CALLBACK (diskperf_set_orientation), diskperf); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] as its done in launcher plugin, set small to FALSE if we want the title displayed and are in deskbar mode
Updating branch refs/heads/master
to 1bbd0ee93d90f6b7dda5de5006ccdebe4c01fde5 (commit)
from fa51ed4379ac812733ce85992c66653cf8ef5627 (commit)
commit 1bbd0ee93d90f6b7dda5de5006ccdebe4c01fde5
Author: Landry Breuil
Date: Tue May 8 12:37:54 2012 +0200
as its done in launcher plugin, set small to FALSE if we want the title
displayed and are in deskbar mode
panel-plugin/main.c | 23 +++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/panel-plugin/main.c b/panel-plugin/main.c
index 3f6ee12..3672f03 100644
--- a/panel-plugin/main.c
+++ b/panel-plugin/main.c
@@ -538,6 +538,14 @@ static void diskperf_read_config (XfcePanelPlugin *plugin,
else
gtk_widget_hide (GTK_WIDGET (poMonitor->wTitle));
+#ifdef HAS_PANEL_49
+/* unset small if we are in deskbar mode and we want the title */
+if (poConf->fTitleDisplayed &&
xfce_panel_plugin_get_mode(poPlugin->plugin) == XFCE_PANEL_PLUGIN_MODE_DESKBAR)
+ xfce_panel_plugin_set_small (XFCE_PANEL_PLUGIN (poPlugin->plugin),
FALSE);
+else
+ xfce_panel_plugin_set_small (XFCE_PANEL_PLUGIN (poPlugin->plugin), TRUE);
+#endif
+
if ((value = xfce_rc_read_entry (rc, (CONF_LABEL_TEXT), NULL))) {
memset (poConf->acTitle, 0, sizeof (poConf->acTitle));
strncpy (poConf->acTitle, value, sizeof (poConf->acTitle) - 1);
@@ -672,8 +680,17 @@ static void ToggleTitle (Widget_t p_w, void *p_pvPlugin)
gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (p_w));
if (poConf->fTitleDisplayed)
gtk_widget_show (GTK_WIDGET (poMonitor->wTitle));
+
else
gtk_widget_hide (GTK_WIDGET (poMonitor->wTitle));
+
+#ifdef HAS_PANEL_49
+/* unset small if we are in deskbar mode and we want the title */
+if (poConf->fTitleDisplayed &&
xfce_panel_plugin_get_mode(poPlugin->plugin) == XFCE_PANEL_PLUGIN_MODE_DESKBAR)
+ xfce_panel_plugin_set_small (XFCE_PANEL_PLUGIN (poPlugin->plugin),
FALSE);
+else
+ xfce_panel_plugin_set_small (XFCE_PANEL_PLUGIN (poPlugin->plugin), TRUE);
+#endif
} /* ToggleTitle() */
/**/
@@ -1114,6 +1131,12 @@ static void diskperf_set_mode (XfcePanelPlugin *plugin,
gtk_label_set_angle (GTK_LABEL (poMonitor->wTitle),
(p_iMode != XFCE_PANEL_PLUGIN_MODE_VERTICAL) ?
0 : 270);
+/* unset small if we are in deskbar mode and we want the title */
+if (poPlugin->oConf.oParam.fTitleDisplayed && p_iMode ==
XFCE_PANEL_PLUGIN_MODE_DESKBAR)
+ xfce_panel_plugin_set_small (XFCE_PANEL_PLUGIN (plugin), FALSE);
+else
+ xfce_panel_plugin_set_small (XFCE_PANEL_PLUGIN (plugin), TRUE);
+
diskperf_set_size (plugin, xfce_panel_plugin_get_size (plugin), poPlugin);
} /* diskperf_set_orientation() */
#else
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] set small to TRUE only if not in deskbar mode
Updating branch refs/heads/master to 724e541c336a029a2ebc533c0ba07c84762e4e9b (commit) from b3e07624fb08c891d3d4290bd2a9f418ce73aad5 (commit) commit 724e541c336a029a2ebc533c0ba07c84762e4e9b Author: Landry Breuil Date: Tue May 8 12:42:45 2012 +0200 set small to TRUE only if not in deskbar mode panel-plugin/xfce4-mpc-plugin.c |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/panel-plugin/xfce4-mpc-plugin.c b/panel-plugin/xfce4-mpc-plugin.c index 4774217..b113491 100644 --- a/panel-plugin/xfce4-mpc-plugin.c +++ b/panel-plugin/xfce4-mpc-plugin.c @@ -62,6 +62,7 @@ mpc_set_mode (XfcePanelPlugin * plugin, XfcePanelPluginMode mode, t_mpc * mpc) GTK_ORIENTATION_HORIZONTAL : GTK_ORIENTATION_VERTICAL; xfce_hvbox_set_orientation(XFCE_HVBOX(mpc->box), orientation); + xfce_panel_plugin_set_small (plugin, (mode != XFCE_PANEL_PLUGIN_MODE_DESKBAR)); } #else ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Always update the progress bars even when stats are unavailable.
Updating branch refs/heads/master
to 6ab7dbf56c8ce498164a3c6f9eca56dea83d8dc1 (commit)
from 1bbd0ee93d90f6b7dda5de5006ccdebe4c01fde5 (commit)
commit 6ab7dbf56c8ce498164a3c6f9eca56dea83d8dc1
Author: Harald Judt
Date: Mon May 7 12:12:38 2012 +0200
Always update the progress bars even when stats are unavailable.
In case of an error (e.g. a device gets removed or some
misdetection by the kernel), stats may become unavailable,
but the progress bars still show the old values, and the
plugin may seem frozen. Because we don't like it to appear
frozen, always update the bars and set their values to 0
when no stats are available.
Signed-off-by: Landry Breuil
panel-plugin/main.c | 35 +++
1 files changed, 23 insertions(+), 12 deletions(-)
diff --git a/panel-plugin/main.c b/panel-plugin/main.c
index 3672f03..eea4f8a 100644
--- a/panel-plugin/main.c
+++ b/panel-plugin/main.c
@@ -143,6 +143,27 @@ typedef struct diskperf_t {
static int timerNeedsUpdate = 0;
+static void UpdateProgressBars(struct diskperf_t *p_poPlugin, uint64_t rw,
uint64_t r, uint64_t w) {
+ /* Update combined or separate progress bars with actual data */
+struct monitor_t *poMonitor = &(p_poPlugin->oMonitor);
+struct param_t *poConf = &(p_poPlugin->oConf.oParam);
+struct perfbar_t *poPerf = poMonitor->aoPerfBar;
+
+if (poConf->fRW_DataCombined)
+ gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR
+ (*(poPerf[RW_DATA].pwBar)),
+ rw);
+else {
+ gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR
+ (*(poPerf[R_DATA].pwBar)),
+ r);
+ gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR
+ (*(poPerf[W_DATA].pwBar)),
+ w);
+}
+}
+
+
static int DisplayPerf (struct diskperf_t *p_poPlugin)
/* Get the last disk perfomance data, compute the statistics and update
the panel-docked monitor bars */
@@ -179,6 +200,7 @@ static int DisplayPerf (struct diskperf_t *p_poPlugin)
if (status == -1) {
snprintf (acToolTips, sizeof(acToolTips), _("%s: Device statistics
unavailable."),
poConf->acTitle);
+UpdateProgressBars(p_poPlugin, 0, 0, 0);
gtk_tooltips_set_tip (s_poToolTips, GTK_WIDGET (poMonitor->wEventBox),
acToolTips, 0);
return (-1);
@@ -263,18 +285,7 @@ static int DisplayPerf (struct diskperf_t *p_poPlugin)
else if (*pr < 0)
*pr = 0;
}
-if (poConf->fRW_DataCombined)
- gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR
- (*(poPerf[RW_DATA].pwBar)),
- prData[RW_DATA]);
-else {
- gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR
- (*(poPerf[R_DATA].pwBar)),
- prData[R_DATA]);
- gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR
- (*(poPerf[W_DATA].pwBar)),
- prData[W_DATA]);
-}
+UpdateProgressBars(p_poPlugin, prData[RW_DATA], prData[R_DATA],
prData[W_DATA]);
return (0);
} /* DisplayPerf() */
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Rework panel widgets layout to use hvbox instead of loads of boxes
Updating branch refs/heads/master
to 10dd7053297faf08d80148defbd5b7fee685b3f8 (commit)
from b0bf17837ff694d4730a2be19469cd4cff5ddf07 (commit)
commit 10dd7053297faf08d80148defbd5b7fee685b3f8
Author: Landry Breuil
Date: Tue May 8 16:49:35 2012 +0200
Rework panel widgets layout to use hvbox instead of loads of boxes
- drop the eventbox in favor of a global hvbox
- use a pair of hvboxs for labels, with an orientation opposite to the
plugin orientation
- drop alt_rtime, you should only display what fits anyway
- rework mode/orientation callbacks to properly update hvboxs orientation
(instead of destroying/recreating everything)
panel-plugin/battery.c | 232 ++--
1 files changed, 68 insertions(+), 164 deletions(-)
diff --git a/panel-plugin/battery.c b/panel-plugin/battery.c
index 4754fdd..6dc231c 100644
--- a/panel-plugin/battery.c
+++ b/panel-plugin/battery.c
@@ -95,8 +95,7 @@ typedef struct
XfcePanelPlugin *plugin;
GtkTooltips*tips;
-GtkWidget*vbox;/* Widgets */
-GtkWidget*ebox;
+GtkWidget*ebox, *timechargebox, *actempbox;
GtkWidget*battstatus;
inttimeoutid;/* To update apm status */
intmethod;
@@ -107,7 +106,6 @@ typedef struct
GtkLabel*label;
GtkLabel*charge;
GtkLabel*rtime;
-GtkLabel*alt_rtime;
GtkLabel*acfan;
GtkLabel*temp;
GtkWidget*image;
@@ -146,6 +144,8 @@ enum {BM_DO_NOTHING, BM_MESSAGE, BM_COMMAND,
BM_COMMAND_TERM};
enum {BM_BROKEN, BM_USE_ACPI, BM_USE_APM};
enum {BM_MISSING, BM_CRITICAL, BM_CRITICAL_CHARGING, BM_LOW, BM_LOW_CHARGING,
BM_OK, BM_OK_CHARGING, BM_FULL, BM_FULL_CHARGING};
+static gboolean battmon_set_size(XfcePanelPlugin *plugin, int size, t_battmon
*battmon);
+
static void
init_options(t_battmon_options *options)
{
@@ -271,25 +271,6 @@ detect_battery_info(t_battmon *battmon)
}
static gboolean
-battmon_time_labels_fits(t_battmon *battmon)
-{
- int plugin_size, labels_size;
-
-GtkRequisition widget_size;
-gtk_widget_size_request( GTK_WIDGET(battmon->plugin), &widget_size );
-plugin_size = widget_size.height;
-
-labels_size = 0;
-gtk_widget_size_request( GTK_WIDGET(battmon->charge), &widget_size );
-labels_size += widget_size.height;
-gtk_widget_size_request( GTK_WIDGET(battmon->rtime), &widget_size );
-labels_size += widget_size.height;
-DBG("label_fits() : labels_size = %d, plugin_size = %d", labels_size,
plugin_size);
-
-return labels_size <= plugin_size;
-}
-
-static gboolean
update_apm_status(t_battmon *battmon)
{
int charge=0, rate;
@@ -535,22 +516,12 @@ battmon.c:241: for each function it appears in.)
}
if (battmon->options.display_time && time_remaining > 0 &&
!(battmon->options.hide_when_full && acline && charge >= 99 )){
-GtkLabel *active_label;
-if ( battmon_time_labels_fits( battmon ) ) {
-active_label = battmon->rtime;
-gtk_widget_hide(GTK_WIDGET(battmon->alt_rtime));
-} else {
-active_label = battmon->alt_rtime;
-gtk_widget_hide(GTK_WIDGET(battmon->rtime));
-}
-
-gtk_widget_show(GTK_WIDGET(active_label));
+gtk_widget_show(GTK_WIDGET(battmon->rtime));
g_snprintf(buffer, sizeof(buffer),"%02d:%02d
",time_remaining/60,time_remaining%60);
-gtk_label_set_text(active_label,buffer);
+gtk_label_set_text(battmon->rtime,buffer);
} else {
gtk_widget_hide(GTK_WIDGET(battmon->rtime));
-gtk_widget_hide(GTK_WIDGET(battmon->alt_rtime));
}
@@ -679,11 +650,9 @@ do_low_warn:
return TRUE;
}
-static void setup_battmon(t_battmon *battmon,
- GtkOrientation orientation,
- GtkOrientation panel_orientation)
+static void setup_battmon(t_battmon *battmon)
{
- GtkWidget *box,*vbox, *alignment;
+GtkWidget *alignment;
GdkPixbuf *icon;
gint size;
@@ -691,120 +660,54 @@ static void setup_battmon(t_battmon *battmon,
#ifdef HAS_PANEL_49
size /= xfce_panel_plugin_get_nrows (battmon->plugin);
#endif
-battmon->battstatus = gtk_progress_bar_new();
-if (panel_orientation == GTK_ORIENTATION_HORIZONTAL)
-{
- gtk_progress_bar_set_orientation(GTK_PROGRESS_BAR(battmon->battstatus),
- GTK_PROGRESS_BOTTOM_TO_TOP);
- gtk_widget_set_size_request(GTK_WIDGET(battmon->battstatus),
- BORDER, size);
- box=gtk_hbox_new(FALSE, 0);
- battmon->vbox = gtk_hbox_new(FALSE, 0);
- gtk_widget_set_size_request(GTK_WIDGET(battmon->plugin),
- -1, size);
-} else {
- gtk_progress_bar_set_orientation(
[Xfce4-commits] Revert partially to previous layout for deskbar mode
Updating branch refs/heads/master
to 71cd9bccc67f5e68ca40fcac2ec0987c05132b87 (commit)
from 10dd7053297faf08d80148defbd5b7fee685b3f8 (commit)
commit 71cd9bccc67f5e68ca40fcac2ec0987c05132b87
Author: Landry Breuil
Date: Tue May 8 17:44:44 2012 +0200
Revert partially to previous layout for deskbar mode
- set ebox orientation matching panel orientation
- set horizontal progressbar when the panel is vertical
still being worked on..
panel-plugin/battery.c | 13 +++--
1 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/panel-plugin/battery.c b/panel-plugin/battery.c
index 6dc231c..ad81b35 100644
--- a/panel-plugin/battery.c
+++ b/panel-plugin/battery.c
@@ -762,11 +762,11 @@ battmon_set_mode (XfcePanelPlugin *plugin,
XfcePanelPluginMode mode,
orientation =
(mode != XFCE_PANEL_PLUGIN_MODE_VERTICAL) ?
GTK_ORIENTATION_HORIZONTAL : GTK_ORIENTATION_VERTICAL;
-xfce_hvbox_set_orientation(XFCE_HVBOX(battmon->ebox), orientation);
+xfce_hvbox_set_orientation(XFCE_HVBOX(battmon->ebox),
xfce_panel_plugin_get_orientation(plugin));
xfce_hvbox_set_orientation(XFCE_HVBOX(battmon->timechargebox),
!orientation);
xfce_hvbox_set_orientation(XFCE_HVBOX(battmon->actempbox), !orientation);
gtk_progress_bar_set_orientation(GTK_PROGRESS_BAR(battmon->battstatus),
- (orientation == GTK_ORIENTATION_HORIZONTAL ?
GTK_PROGRESS_BOTTOM_TO_TOP : GTK_PROGRESS_LEFT_TO_RIGHT));
+ (xfce_panel_plugin_get_orientation(plugin) ==
GTK_ORIENTATION_HORIZONTAL ? GTK_PROGRESS_BOTTOM_TO_TOP :
GTK_PROGRESS_LEFT_TO_RIGHT));
battmon_set_labels_orientation(battmon, orientation);
battmon_set_size(plugin, xfce_panel_plugin_get_size (plugin), battmon);
update_apm_status( battmon );
@@ -981,18 +981,11 @@ battmon_write_config(XfcePanelPlugin *plugin, t_battmon
*battmon)
static gboolean
battmon_set_size(XfcePanelPlugin *plugin, int size, t_battmon *battmon)
{
-GtkOrientation orientation;
#ifdef HAS_PANEL_49
-XfcePanelPluginMode mode = xfce_panel_plugin_get_mode(plugin);
-orientation =
- (mode != XFCE_PANEL_PLUGIN_MODE_VERTICAL) ?
- GTK_ORIENTATION_HORIZONTAL : GTK_ORIENTATION_VERTICAL;
size /= xfce_panel_plugin_get_nrows (battmon->plugin);
-#else
-orientation = xfce_panel_plugin_get_orientation(plugin);
#endif
DBG("set_size(%d)", size);
-if (orientation == GTK_ORIENTATION_HORIZONTAL)
+if (xfce_panel_plugin_get_orientation(plugin) ==
GTK_ORIENTATION_HORIZONTAL)
{
/* force size of the panel plugin */
gtk_widget_set_size_request(GTK_WIDGET(battmon->plugin),
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] switch from deprecated GtkTooltips api to GtkTooltip
Updating branch refs/heads/master
to 96d431ce25378cb86f73160298fdd8e4ff414236 (commit)
from 71cd9bccc67f5e68ca40fcac2ec0987c05132b87 (commit)
commit 96d431ce25378cb86f73160298fdd8e4ff414236
Author: Landry Breuil
Date: Tue May 8 17:54:31 2012 +0200
switch from deprecated GtkTooltips api to GtkTooltip
panel-plugin/battery.c |9 +
1 files changed, 1 insertions(+), 8 deletions(-)
diff --git a/panel-plugin/battery.c b/panel-plugin/battery.c
index ad81b35..9ea6012 100644
--- a/panel-plugin/battery.c
+++ b/panel-plugin/battery.c
@@ -94,7 +94,6 @@ typedef struct
{
XfcePanelPlugin *plugin;
-GtkTooltips*tips;
GtkWidget*ebox, *timechargebox, *actempbox;
GtkWidget*battstatus;
inttimeoutid;/* To update apm status */
@@ -549,7 +548,7 @@ battmon.c:241: for each function it appears in.)
g_snprintf(buffer, sizeof(buffer), _("AC off-line"));
}
-gtk_tooltips_set_tip (battmon->tips, battmon->ebox, buffer, NULL);
+gtk_widget_set_tooltip_text(GTK_WIDGET(battmon->ebox), buffer);
if(battmon->options.display_power){
gtk_widget_show(GTK_WIDGET(battmon->acfan));
@@ -815,9 +814,6 @@ battmon_create(XfcePanelPlugin *plugin)
battmon->timeoutid = 0;
battmon->flag = FALSE;
-battmon->tips = gtk_tooltips_new ();
-g_object_ref (G_OBJECT (battmon->tips));
-gtk_object_sink (GTK_OBJECT (battmon->tips));
return battmon;
}
@@ -834,9 +830,6 @@ battmon_free(XfcePanelPlugin *plugin, t_battmon *battmon)
g_free (battmon->options.command_on_low);
g_free (battmon->options.command_on_critical);
-/* free tooltip */
-gtk_tooltips_set_tip (battmon->tips, battmon->ebox, NULL, NULL);
-g_object_unref (G_OBJECT (battmon->tips));
gtk_rc_style_unref(battmon->battstatus_style);
g_free(battmon);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Use newer tooltip API (bug #8730).
Updating branch refs/heads/master
to c8d14b580ca2d580984439be9d9eb6180d027376 (commit)
from 6ab7dbf56c8ce498164a3c6f9eca56dea83d8dc1 (commit)
commit c8d14b580ca2d580984439be9d9eb6180d027376
Author: Harald Judt
Date: Sun May 13 21:08:59 2012 +0200
Use newer tooltip API (bug #8730).
This updates the plugin to use the newer tooltip API
(requires >=GTK-2.12) and fixes tooltips not showing for
update intervals smaller then 500ms.
panel-plugin/main.c | 20 +++-
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/panel-plugin/main.c b/panel-plugin/main.c
index eea4f8a..7efbc7e 100644
--- a/panel-plugin/main.c
+++ b/panel-plugin/main.c
@@ -168,8 +168,6 @@ static int DisplayPerf (struct diskperf_t *p_poPlugin)
/* Get the last disk perfomance data, compute the statistics and update
the panel-docked monitor bars */
{
-static GtkTooltips *s_poToolTips = 0;
-
struct devperf_t oPerf;
struct param_t *poConf = &(p_poPlugin->oConf.oParam);
struct monitor_t *poMonitor = &(p_poPlugin->oMonitor);
@@ -184,9 +182,6 @@ static int DisplayPerf (struct diskperf_t *p_poPlugin)
characToolTips[256];
int status, i;
-if (!s_poToolTips)
- s_poToolTips = gtk_tooltips_new ();
-
rbytes = wbytes = iRBusy_ns = iWBusy_ns = -1;
memset (&oPerf, 0, sizeof (oPerf));
oPerf.qlen = -1;
@@ -201,8 +196,8 @@ static int DisplayPerf (struct diskperf_t *p_poPlugin)
snprintf (acToolTips, sizeof(acToolTips), _("%s: Device statistics
unavailable."),
poConf->acTitle);
UpdateProgressBars(p_poPlugin, 0, 0, 0);
-gtk_tooltips_set_tip (s_poToolTips, GTK_WIDGET (poMonitor->wEventBox),
- acToolTips, 0);
+gtk_widget_set_tooltip_text(GTK_WIDGET(poMonitor->wEventBox), acToolTips);
+
return (-1);
}
if (poMonitor->oPrevPerf.timestamp_ns) {
@@ -262,8 +257,7 @@ static int DisplayPerf (struct diskperf_t *p_poPlugin)
(int) round(arBusy[W_DATA]) : -1,
#endif
(oPerf.qlen >= 0) ? (int) round(arBusy[RW_DATA]) : -1);
-gtk_tooltips_set_tip (s_poToolTips, GTK_WIDGET (poMonitor->wEventBox),
- acToolTips, 0);
+gtk_widget_set_tooltip_text(GTK_WIDGET(poMonitor->wEventBox), acToolTips);
switch (poConf->eStatistics) {
case BUSY_TIME:
@@ -307,6 +301,14 @@ static gboolean SetTimer (void *p_pvPlugin)
timerNeedsUpdate = 0;
}
+/* reduce the default tooltip timeout to be smaller than the update
interval otherwise
+ * we won't see tooltips on GTK 2.16 or newer */
+GtkSettings *settings;
+settings = gtk_settings_get_default();
+if (g_object_class_find_property(G_OBJECT_GET_CLASS(settings),
"gtk-tooltip-timeout"))
+g_object_set(settings, "gtk-tooltip-timeout",
+ poConf->iPeriod_ms - 10, NULL);
+
if (!poPlugin->iTimerId)
poPlugin->iTimerId = g_timeout_add (poConf->iPeriod_ms,
(GSourceFunc) SetTimer, poPlugin);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Merge branch 'master' of git://git.xfce.org/panel-plugins/xfce4-diskperf-plugin
Updating branch refs/heads/master to 986fd5f922092a550e006cb05a2907a9a3a3779e (commit) from c8d14b580ca2d580984439be9d9eb6180d027376 (commit) commit 986fd5f922092a550e006cb05a2907a9a3a3779e Merge: c8d14b5 1a0862c Author: Landry Breuil Date: Sun May 13 21:10:33 2012 +0200 Merge branch 'master' of git://git.xfce.org/panel-plugins/xfce4-diskperf-plugin commit 1a0862caab50b9ecee7e41ab492563eafe1ba22f Author: Sergio García Date: Sun May 13 19:45:54 2012 +0200 l10n: Updated Spanish (Castilian) (es) translation to 94% New status: 36 messages complete with 2 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). commit d561e400d28f0f43fcc759986ae9e1ebb1124454 Author: Yarema aka Knedlyk Date: Sun May 13 11:29:15 2012 +0200 l10n: Updated Ukrainian (uk) translation to 100% New status: 38 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). commit 4e613fb03867d4b627afbe4b40ba8aca7105899a Author: Per Kongstad Date: Sat May 12 11:16:56 2012 +0200 l10n: Updated Danish (da) translation to 100% New status: 38 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). commit 0c81911135648fd362a9681c41d8e5a884b71afa Author: Seong-ho Cho Date: Sat May 12 09:08:19 2012 +0200 l10n: Updated Korean (ko) translation to 100% New status: 38 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/da.po | 23 +++ po/es.po | 44 +--- po/ko.po | 25 - po/uk.po | 24 +++- 4 files changed, 71 insertions(+), 45 deletions(-) diff --git a/po/da.po b/po/da.po index b577248..45d364a 100644 --- a/po/da.po +++ b/po/da.po @@ -11,10 +11,10 @@ msgstr "" "PO-Revision-Date: 2009-08-20 14:30+0100\n" "Last-Translator: Per Kongstad \n" "Language-Team: Danish \n" -"Language: da\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: da\n" "X-Poedit-Language: Danish\n" "X-Poedit-SourceCharset: utf-8\n" "X-Poedit-Country: DENMARK\n" @@ -28,9 +28,8 @@ msgid "Input the device name, then press " msgstr "Indtast enhedsnavnet og tryk på " #: ../panel-plugin/config_gui.c:118 -#, fuzzy msgid "/dev/sda1" -msgstr "/dev/hda1" +msgstr "/dev/sda1" #: ../panel-plugin/config_gui.c:136 msgid "Data collection period" @@ -65,9 +64,8 @@ msgid "I/O transfer" msgstr "I/O overførsel" #: ../panel-plugin/config_gui.c:181 -#, fuzzy msgid "MiB transferred / second" -msgstr "MB overført / sekund" +msgstr "MiB overført / sekund" #: ../panel-plugin/config_gui.c:187 msgid "Busy time" @@ -78,9 +76,8 @@ msgid "Percentage of time the device is busy" msgstr "Procentdel af tiden hvor enheden er optaget" #: ../panel-plugin/config_gui.c:202 -#, fuzzy msgid "Max. I/O rate (MiB/s) " -msgstr "Maks. I/O-hastighed (MB/s) " +msgstr "Maks. I/O-hastighed (MiB/s) " #: ../panel-plugin/config_gui.c:213 msgid "Input the maximum I/O transfer rate of the device, then press " @@ -138,7 +135,7 @@ msgstr "\"Skriv\"-overvågning først" #: ../panel-plugin/main.c:180 #, c-format msgid "%s: Device statistics unavailable." -msgstr "" +msgstr "%s: Enhedsstatistik er ikke tilrådighed." #: ../panel-plugin/main.c:219 #, c-format @@ -154,6 +151,16 @@ msgid "" " Write : %3d\n" " Total : %3d" msgstr "" +"%s\n" +"\n" +"I/O(MiB/s)\n" +" Læse :%3.2f\n" +" Skrive :%3.2f\n" +" Ialt :%3.2f\n" +"Tid optaget (%c)\n" +" Læse : %3d\n" +" Skrive : %3d\n" +" Ialt : %3d" #: ../panel-plugin/main.c:823 msgid "Select color" diff --git a/po/es.po b/po/es.po index a3b7ab4..c048da2 100644 --- a/po/es.po +++ b/po/es.po @@ -9,14 +9,15 @@ msgstr "" "Project-Id-Version: xfce 4-diskperf-plugin\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-05-04 16:57+0200\n" -"PO-Revision-Date: 2012-04-18 22:41-0600\n" -"Last-Translator: Sergio \n" -"Language-Team: Spanish\n" +"PO-Revision-Date: 2012-05-13 11:45-0600\n" +"Last-Translator: Sergio García \n" +"Language-Team: Spanish \n" "Language: \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n&q
[Xfce4-commits] updates for 2.5.3
Updating branch refs/heads/master to 39bdecb2b8788b2193acec6fb82ff60597201812 (commit) from 986fd5f922092a550e006cb05a2907a9a3a3779e (commit) commit 39bdecb2b8788b2193acec6fb82ff60597201812 Author: Landry Breuil Date: Sun May 13 21:39:40 2012 +0200 updates for 2.5.3 NEWS|6 ++ configure.ac.in |2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/NEWS b/NEWS index 38cba79..555f390 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,9 @@ +2.5.3 (2012/5/13): +- + * Use newer tooltip API (bug #8730) + * Make tooltip strings translatable and MB->MiB string updates (bug #8828) + * Always update progress bars even if stats are unavailable (bug #8845) + 2.5.2 (2012/4/29): - * Gracefully allow to monitor non-present devices (bug #6749) diff --git a/configure.ac.in b/configure.ac.in index 58dd4ee..221a8db 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -5,7 +5,7 @@ dnl m4_define([diskperf_version_major], [2]) m4_define([diskperf_version_minor], [5]) -m4_define([diskperf_version_micro], [2]) +m4_define([diskperf_version_micro], [3]) m4_define([diskperf_version_build], [@REVISION@]) m4_define([diskperf_version_tag], []) # leave empty for releases m4_define([diskperf_version], [diskperf_version_major().diskperf_version_minor().diskperf_version_micro()ifelse(diskperf_version_tag(), [git], [diskperf_version_tag()-diskperf_version_build()], [diskperf_version_tag()])]) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Creating annotated tag 2.5.3
Updating annotated tag refs/tags/2.5.3 as new annotated tag to 467c4d340c5dd63354a8c8058de2a4e67d8725cf (tag) succeeds 2.5.2-18-g986fd5f tagged by Landry Breuil on 2012-05-13 21:39 +0200 Landry Breuil (1): updates for 2.5.3 ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Readd 2px padding so labels are not 'stuck' on the progressbar
Updating branch refs/heads/master
to 539a0e314c88cbec3f5e29408ce9da5474b140fb (commit)
from 96d431ce25378cb86f73160298fdd8e4ff414236 (commit)
commit 539a0e314c88cbec3f5e29408ce9da5474b140fb
Author: Landry Breuil
Date: Sun May 13 21:27:01 2012 +0200
Readd 2px padding so labels are not 'stuck' on the progressbar
panel-plugin/battery.c |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/panel-plugin/battery.c b/panel-plugin/battery.c
index 9ea6012..5b145bc 100644
--- a/panel-plugin/battery.c
+++ b/panel-plugin/battery.c
@@ -687,10 +687,10 @@ static void setup_battmon(t_battmon *battmon)
gtk_box_pack_start(GTK_BOX(battmon->ebox), alignment, FALSE, FALSE, 0);
battmon->charge = (GtkLabel *)gtk_label_new("50%%");
-
gtk_box_pack_start(GTK_BOX(battmon->timechargebox),GTK_WIDGET(battmon->charge),TRUE,
TRUE, 0);
+
gtk_box_pack_start(GTK_BOX(battmon->timechargebox),GTK_WIDGET(battmon->charge),TRUE,
TRUE, 2);
battmon->rtime = (GtkLabel *)gtk_label_new("01:00");
-
gtk_box_pack_start(GTK_BOX(battmon->timechargebox),GTK_WIDGET(battmon->rtime),TRUE,
TRUE, 0);
+
gtk_box_pack_start(GTK_BOX(battmon->timechargebox),GTK_WIDGET(battmon->rtime),TRUE,
TRUE, 2);
/* ac-fan-temp */
/* create the label hvbox with an orientation opposite to the panel */
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] updates for 1.0.3
Updating branch refs/heads/master to afacc7dae5d01983b8d8ef6df0e7c64f9d3c5194 (commit) from 539a0e314c88cbec3f5e29408ce9da5474b140fb (commit) commit afacc7dae5d01983b8d8ef6df0e7c64f9d3c5194 Author: Landry Breuil Date: Sun May 13 21:31:21 2012 +0200 updates for 1.0.3 NEWS|4 configure.ac.in |2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/NEWS b/NEWS index c939d14..8a1fd4d 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,7 @@ +1.0.3 (2012/05/13): +=== +* Improve plugin UI in vertical/deskbar/multirows panels + 1.0.2 (2012/04/30): === * change icon depending on charge level/ac status (bug #7768) diff --git a/configure.ac.in b/configure.ac.in index 01fbf7d..005bd5f 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -11,7 +11,7 @@ dnl *** Version information *** dnl *** m4_define([battery_version_major], [1]) m4_define([battery_version_minor], [0]) -m4_define([battery_version_micro], [2]) +m4_define([battery_version_micro], [3]) m4_define([battery_version_build], [r@REVISION@]) m4_define([battery_version_tag], []) m4_define([battery_version], [battery_version_major().battery_version_minor().battery_version_micro()ifelse(battery_version_tag(), [svn], [battery_version_tag()-battery_version_build()], [battery_version_tag()])]) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Creating annotated tag 1.0.3
Updating annotated tag refs/tags/1.0.3 as new annotated tag to 6a4d7bb4ac1b6268304b6ed2a655e101637528bc (tag) succeeds 1.0.2-8-g539a0e3 tagged by Landry Breuil on 2012-05-13 21:31 +0200 Landry Breuil (1): updates for 1.0.3 ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] updates for 0.4.3
Updating branch refs/heads/master to 0ca16f7e9b2d9ea313974ea6a1f6227d85bbc977 (commit) from 724e541c336a029a2ebc533c0ba07c84762e4e9b (commit) commit 0ca16f7e9b2d9ea313974ea6a1f6227d85bbc977 Author: Landry Breuil Date: Sun May 13 21:58:02 2012 +0200 updates for 0.4.3 ChangeLog |5 + configure.ac.in |2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index b2a8520..3ad7d41 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +13-05-2012 Landry Breuil + * release 0.4.3 + * set small property (unless in deskbar mode) + * fix panel 4.9 detection + 20-02-2012 Landry Breuil * release 0.4.2 * 0.4.1 was generated with a buggy intltool 0.50.0, regen with 0.50.1 diff --git a/configure.ac.in b/configure.ac.in index 500317f..2967022 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -5,7 +5,7 @@ dnl m4_define([mpc_version_major], [0]) m4_define([mpc_version_minor], [4]) -m4_define([mpc_version_micro], [2]) +m4_define([mpc_version_micro], [3]) m4_define([mpc_version_tag], []) # Leave empty for releases m4_define([mpc_version_build], [@REVISION@]) m4_define([mpc_version], [mpc_version_major().mpc_version_minor().mpc_version_micro()ifelse(mpc_version_tag(), [], [], [mpc_version_tag()-mpc_version_build()])]) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Creating annotated tag xfce4-mpc-plugin-0.4.3
Updating annotated tag refs/tags/xfce4-mpc-plugin-0.4.3 as new annotated tag to 1ebfea183cea0bc381cd9b285a72b02b543b6bed (tag) succeeds xfce4-mpc-plugin-0.4.2-40-g724e541 tagged by Landry Breuil on 2012-05-13 21:58 +0200 Landry Breuil (1): updates for 0.4.3 ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] fix compilation with panel version < 4.9
Updating branch refs/heads/master to 81909487e1a0a373c2e0d4d3cbccd657a20ba29f (commit) from afacc7dae5d01983b8d8ef6df0e7c64f9d3c5194 (commit) commit 81909487e1a0a373c2e0d4d3cbccd657a20ba29f Author: Landry Breuil Date: Mon May 14 10:33:40 2012 +0200 fix compilation with panel version < 4.9 panel-plugin/battery.c |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/panel-plugin/battery.c b/panel-plugin/battery.c index 5b145bc..decd1ba 100644 --- a/panel-plugin/battery.c +++ b/panel-plugin/battery.c @@ -785,9 +785,9 @@ battmon_set_orientation (XfcePanelPlugin *plugin, GtkOrientation orientation, if (battmon->timeoutid) g_source_remove(battmon->timeoutid); xfce_hvbox_set_orientation(XFCE_HVBOX(battmon->ebox), orientation); xfce_hvbox_set_orientation(XFCE_HVBOX(battmon->timechargebox), !orientation); -xfce_hvbox_set_orientation(XFCE_HVBOX(battmon->acfanbox), !orientation); +xfce_hvbox_set_orientation(XFCE_HVBOX(battmon->actempbox), !orientation); gtk_progress_bar_set_orientation(GTK_PROGRESS_BAR(battmon->battstatus), - (orientation == GTK_ORIENTATION_HORIZONTAL ? GTK_PROGRESS_BOTTOM_TO_TOP : GTK_PROGRESS_LEFT_TO_RIGHT)i); + (orientation == GTK_ORIENTATION_HORIZONTAL ? GTK_PROGRESS_BOTTOM_TO_TOP : GTK_PROGRESS_LEFT_TO_RIGHT)); battmon_set_labels_orientation(battmon, orientation); battmon_set_size(plugin, xfce_panel_plugin_get_size (plugin), battmon); update_apm_status( battmon ); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Creating annotated tag 1.0.4
Updating annotated tag refs/tags/1.0.4 as new annotated tag to 1386efd635578dddbe5a57819ebeb68a598f9657 (tag) succeeds 1.0.3-1-g8190948 tagged by Landry Breuil on 2012-05-14 10:34 +0200 Landry Breuil (1): updates for 1.0.4 ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] updates for 1.0.4
Updating branch refs/heads/master to 70b70cdcf267790466064040c523caf04843a778 (commit) from 81909487e1a0a373c2e0d4d3cbccd657a20ba29f (commit) commit 70b70cdcf267790466064040c523caf04843a778 Author: Landry Breuil Date: Mon May 14 10:34:29 2012 +0200 updates for 1.0.4 NEWS|3 +++ configure.ac.in |2 +- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/NEWS b/NEWS index 8a1fd4d..b45a3e7 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,6 @@ +1.0.4 (2012/05/14): +=== +* Fix compilation with panel version < 4.9 1.0.3 (2012/05/13): === * Improve plugin UI in vertical/deskbar/multirows panels diff --git a/configure.ac.in b/configure.ac.in index 005bd5f..7f6b38e 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -11,7 +11,7 @@ dnl *** Version information *** dnl *** m4_define([battery_version_major], [1]) m4_define([battery_version_minor], [0]) -m4_define([battery_version_micro], [3]) +m4_define([battery_version_micro], [4]) m4_define([battery_version_build], [r@REVISION@]) m4_define([battery_version_tag], []) m4_define([battery_version], [battery_version_major().battery_version_minor().battery_version_micro()ifelse(battery_version_tag(), [svn], [battery_version_tag()-battery_version_build()], [battery_version_tag()])]) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Fix background transparency by setting the main evbox hidden (bug #8891).
Updating branch refs/heads/master to 2fe17f0ae322c42a389775288562adab568615eb (commit) from 25a45351d1cb77edf34cd1b4937dc65fd8cd2aba (commit) commit 2fe17f0ae322c42a389775288562adab568615eb Author: Harald Judt Date: Wed May 16 12:36:28 2012 +0200 Fix background transparency by setting the main evbox hidden (bug #8891). The transparency fix in commit e22c9b78384e31720c29e71fc87ba145b21e6cce is incomplete. There is another Gtk.EventBox that needs to be set invisible, otherwise the label background will not be transparent. Signed-off-by: Landry Breuil panel-plugin/systemload.c |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/panel-plugin/systemload.c b/panel-plugin/systemload.c index 50c2aa5..58cc658 100644 --- a/panel-plugin/systemload.c +++ b/panel-plugin/systemload.c @@ -342,6 +342,7 @@ monitor_update_orientation (XfcePanelPlugin *plugin, FALSE, FALSE, 0); gtk_container_add(GTK_CONTAINER(global->ebox), GTK_WIDGET(global->box)); +gtk_event_box_set_visible_window(GTK_EVENT_BOX(global->ebox), FALSE); gtk_widget_show(GTK_WIDGET(global->ebox)); update_monitors (global); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Fix transparency (bug #8892).
Updating branch refs/heads/master to 2062b48a4f93a09210ea51a07a14ecd66ea2eef0 (commit) from 39bdecb2b8788b2193acec6fb82ff60597201812 (commit) commit 2062b48a4f93a09210ea51a07a14ecd66ea2eef0 Author: Harald Judt Date: Wed May 16 13:02:58 2012 +0200 Fix transparency (bug #8892). Set the Gtk.EventBox invisible like other panel plugins do. Signed-off-by: Landry Breuil panel-plugin/main.c |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/panel-plugin/main.c b/panel-plugin/main.c index 7efbc7e..c5f71c1 100644 --- a/panel-plugin/main.c +++ b/panel-plugin/main.c @@ -474,6 +474,7 @@ static diskperf_t *diskperf_create_control (XfcePanelPlugin *plugin) poPlugin->oMonitor.oPrevPerf.timestamp_ns = 0; poMonitor->wEventBox = gtk_event_box_new (); +gtk_event_box_set_visible_window(GTK_EVENT_BOX(poMonitor->wEventBox), FALSE); gtk_widget_show (poMonitor->wEventBox); xfce_panel_plugin_add_action_widget (plugin, poMonitor->wEventBox); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Merge branch 'master' of git://git.xfce.org/panel-plugins/xfce4-diskperf-plugin
Updating branch refs/heads/master to c0e0c4fb14f8db2d08988fb5d50e43a1310645fd (commit) from 2062b48a4f93a09210ea51a07a14ecd66ea2eef0 (commit) commit c0e0c4fb14f8db2d08988fb5d50e43a1310645fd Merge: 2062b48 4792621 Author: Landry Breuil Date: Wed May 16 20:55:02 2012 +0200 Merge branch 'master' of git://git.xfce.org/panel-plugins/xfce4-diskperf-plugin commit 4792621f3593c7cc74ac38564c660889851d084e Author: Sergio Marques Date: Tue May 15 17:08:59 2012 +0200 l10n: Updated Portuguese (pt) translation to 100% New status: 38 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). commit 174330ba7a8a3fd0f96e953c12a7ac3fabb2d62f Author: Tomáš Vadina Date: Tue May 15 16:46:53 2012 +0200 l10n: Updated Slovak (sk) translation to 100% New status: 38 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). commit f6e7766ce5f02e5e8528c9a0ae0065fdec3f68d2 Author: Piarres Beobide Date: Mon May 14 00:53:25 2012 +0200 l10n: Updated Basque (eu) translation to 100% New status: 38 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/eu.po | 19 +-- po/pt.po |3 --- po/sk.po | 28 ++-- 3 files changed, 31 insertions(+), 19 deletions(-) diff --git a/po/eu.po b/po/eu.po index 794f741..691d6eb 100644 --- a/po/eu.po +++ b/po/eu.po @@ -11,10 +11,10 @@ msgstr "" "PO-Revision-Date: 2008-11-09 15:41+0200\n" "Last-Translator: Piarres Beobide \n" "Language-Team: librezale \n" -"Language: eu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: eu\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 1.2.0\n" @@ -27,7 +27,6 @@ msgid "Input the device name, then press " msgstr "Gailu izena idatzi eta sakatu" #: ../panel-plugin/config_gui.c:118 -#, fuzzy msgid "/dev/sda1" msgstr "/dev/hda1" @@ -64,9 +63,8 @@ msgid "I/O transfer" msgstr "S/I transferentzia" #: ../panel-plugin/config_gui.c:181 -#, fuzzy msgid "MiB transferred / second" -msgstr "MB transeferentzia / segundu" +msgstr "MB transefirentzia / segundu" #: ../panel-plugin/config_gui.c:187 msgid "Busy time" @@ -77,7 +75,6 @@ msgid "Percentage of time the device is busy" msgstr "Gailua lanpeturik dagoen denbora ehunekoa" #: ../panel-plugin/config_gui.c:202 -#, fuzzy msgid "Max. I/O rate (MiB/s) " msgstr "Geh. S/I erlazioa (MB/s) " @@ -137,7 +134,7 @@ msgstr "\"Idazkteta\" monitorea lehenengo" #: ../panel-plugin/main.c:180 #, c-format msgid "%s: Device statistics unavailable." -msgstr "" +msgstr "%s: gaitu estatistika eskuraezinak" #: ../panel-plugin/main.c:219 #, c-format @@ -153,6 +150,16 @@ msgid "" " Write : %3d\n" " Total : %3d" msgstr "" +"%s\n" +"\n" +"S/I(MiB/s)\n" +" Iraku :%3.2f\n" +" Idatz :%3.2f\n" +" Guzt :%3.2f\n" +"Lan denb (%c)\n" +" Iraku : %3d\n" +" Idatz : %3d\n" +" Guzt : %3d" #: ../panel-plugin/main.c:823 msgid "Select color" diff --git a/po/pt.po b/po/pt.po index 377fc58..4c2cad9 100644 --- a/po/pt.po +++ b/po/pt.po @@ -25,7 +25,6 @@ msgid "Input the device name, then press " msgstr "Indique o nome do dispositivo e prima " #: ../panel-plugin/config_gui.c:118 -#, fuzzy msgid "/dev/sda1" msgstr "/dev/sda1" @@ -62,7 +61,6 @@ msgid "I/O transfer" msgstr "Transferência E/S" #: ../panel-plugin/config_gui.c:181 -#, fuzzy msgid "MiB transferred / second" msgstr "MB transferidos/segundo" @@ -75,7 +73,6 @@ msgid "Percentage of time the device is busy" msgstr "Percentagem de tempo de ocupação do dispositivo" #: ../panel-plugin/config_gui.c:202 -#, fuzzy msgid "Max. I/O rate (MiB/s) " msgstr "Taxa máxima de I/O (MB/s)" diff --git a/po/sk.po b/po/sk.po index 1a1f726..1488d28 100644 --- a/po/sk.po +++ b/po/sk.po @@ -2,15 +2,16 @@ # Copyright (C) 2006 THE xfce4-diskperf-plugin'S COPYRIGHT HOLDER # This file is distributed under the same license as the xfce4-diskperf-plugin package. # Marek Hlava , 2011. +# Tomáš Vadina , 2012. # msgid "" msgstr "" "Project-Id-Version: xfce4-diskperf-plugin\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-05-04 16:57+0200\n&q
[Xfce4-commits] Fix transparency issues (bug #8893).
Updating branch refs/heads/master to 5ebb0b229a0da1d31f913de20baab4b50aebadfa (commit) from 7f16899a2989714c6892d1eb96d2df7b97b4ff90 (commit) commit 5ebb0b229a0da1d31f913de20baab4b50aebadfa Author: Harald Judt Date: Wed May 16 13:13:39 2012 +0200 Fix transparency issues (bug #8893). Set the Gtk.EventBox invisible. Signed-off-by: Landry Breuil panel-plugin/cpu.c |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/panel-plugin/cpu.c b/panel-plugin/cpu.c index d4adeda..1ea0c03 100644 --- a/panel-plugin/cpu.c +++ b/panel-plugin/cpu.c @@ -101,6 +101,7 @@ static CPUGraph * create_gui( XfcePanelPlugin * plugin ) base->plugin = plugin; ebox = gtk_event_box_new(); + gtk_event_box_set_visible_window(GTK_EVENT_BOX(ebox), FALSE); gtk_container_add( GTK_CONTAINER( plugin ), ebox ); xfce_panel_plugin_add_action_widget( plugin, ebox ); g_signal_connect( ebox, "button-press-event", G_CALLBACK( command_cb ), base ); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Merge branch 'master' of git://git.xfce.org/panel-plugins/xfce4-cpugraph-plugin
Updating branch refs/heads/master
to 0011e3999febae9cc521209d7a9594fa12539e59 (commit)
from 5ebb0b229a0da1d31f913de20baab4b50aebadfa (commit)
commit 0011e3999febae9cc521209d7a9594fa12539e59
Merge: 5ebb0b2 7516159
Author: Landry Breuil
Date: Wed May 16 20:59:18 2012 +0200
Merge branch 'master' of
git://git.xfce.org/panel-plugins/xfce4-cpugraph-plugin
commit 75161594d3135d48c0bb045ffc92801641ddcf1a
Author: Tomáš Vadina
Date: Tue May 15 16:43:13 2012 +0200
l10n: Updated Slovak (sk) translation to 100%
New status: 36 messages complete with 0 fuzzies and 0 untranslated.
Transmitted-via: Transifex (translations.xfce.org).
commit 2052e931e98111bc297a37865c22f620f5e00f68
Author: Andrei Zakharevich
Date: Fri May 4 20:52:56 2012 +0200
l10n: Updated Belarusian (be) translation to 91%
New status: 33 messages complete with 0 fuzzies and 3 untranslated.
Transmitted-via: Transifex (translations.xfce.org).
commit c679a5a6f959c46175c80487fe7b1a91823843e6
Author: Andrei Zakharevich
Date: Fri May 4 20:51:28 2012 +0200
l10n: Updated Belarusian (be) translation to 88%
New status: 32 messages complete with 0 fuzzies and 4 untranslated.
Transmitted-via: Transifex (translations.xfce.org).
commit 7cdec4c1656ecc3cc887edfad9023c3357609698
Author: Seong-ho Cho
Date: Thu May 3 11:45:50 2012 +0200
l10n: Updated Korean (ko) translation to 100%
New status: 36 messages complete with 0 fuzzies and 0 untranslated.
Transmitted-via: Transifex (translations.xfce.org).
commit 3a82ee389bc076c83016af2289880465b7aa3e78
Author: Ivica Kolić
Date: Wed May 2 21:11:15 2012 +0200
l10n: Initial Croatian (hr) translation
New status: 22 messages complete with 0 fuzzies and 14 untranslated.
Transmitted-via: Transifex (translations.xfce.org).
commit 9a13793b4e06ed97c6594701f1853ab7dcae0e64
Author: Piarres Beobide
Date: Mon Apr 30 00:50:43 2012 +0200
l10n: Updated Basque (eu) translation to 100%
New status: 36 messages complete with 0 fuzzies and 0 untranslated.
Transmitted-via: Transifex (translations.xfce.org).
po/be.po| 34 ++
po/eu.po| 20 ++
po/{ur.po => hr.po} | 97 +++---
po/ko.po|2 +-
po/sk.po| 22 +++-
5 files changed, 97 insertions(+), 78 deletions(-)
diff --git a/po/be.po b/po/be.po
index 8c67970..f56d82b 100644
--- a/po/be.po
+++ b/po/be.po
@@ -2,28 +2,36 @@
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR , YEAR.
-#
+#
msgid ""
msgstr ""
"Project-Id-Version: Alexander Nyakhaychyk \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-18 23:23+0200\n"
+"POT-Creation-Date: 2012-05-04 13:30+\n"
"PO-Revision-Date: 2008-11-09 14:04+0200\n"
"Last-Translator: Alexander Nyakhaychyk \n"
"Language-Team: Belarusian \n"
-"Language: be\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: be\n"
+
+#: ../panel-plugin/cpu.c:150 ../panel-plugin/cpugraph.desktop.in.h:2
+msgid "Graphical representation of the CPU load"
+msgstr "Графічнае прадстаўленьне нагрузкі на ЦП"
+
+#: ../panel-plugin/cpu.c:152
+msgid "Copyright (c) 2003-2012\n"
+msgstr "Аўтарскія правы (c) 2003-2012\n"
-#: ../panel-plugin/cpu.c:303
+#: ../panel-plugin/cpu.c:359
#, c-format
msgid "Usage: %u%%"
-msgstr ""
+msgstr "Выкарыстанне: %u%%"
#: ../panel-plugin/properties.c:78
msgid "CPU Graph Properties"
-msgstr ""
+msgstr "Наладкі CPU Graph"
#: ../panel-plugin/properties.c:96
msgid "Use non-linear time-scale"
@@ -35,7 +43,7 @@ msgstr "Паказваць рамку"
#: ../panel-plugin/properties.c:98
msgid "Show border"
-msgstr ""
+msgstr "Паказваць межы"
#: ../panel-plugin/properties.c:99
msgid "Show current usage bar"
@@ -45,11 +53,11 @@ msgstr[1] ""
#: ../panel-plugin/properties.c:101
msgid "Run in terminal"
-msgstr ""
+msgstr "Запусціць у тэрмінале"
#: ../panel-plugin/properties.c:102
msgid "Use startup notification"
-msgstr ""
+msgstr "Паказваць паведамленне пра запусу"
#: ../panel-plugin/properties.c:105
msgid "Color 1:"
@@ -97,7 +105,7 @@ msgstr "Інтэрвал абнаўленьня:"
#: ../panel-plugin/properties.c:208
msgid "All"
-msgstr ""
+msgstr "Усе"
#: ../panel-plugin/properties.c:213
msgid "Tracked Core:"
@@ -129,7 +137,7 @@ msgstr "Б
[Xfce4-commits] Fix transparency (bug #8747).
Updating branch refs/heads/master to 5f802c26355640421f9bb0e476f1460152a66489 (commit) from 32c062eaa5299b9385a15c6b3a74ef9ffd0e32cc (commit) commit 5f802c26355640421f9bb0e476f1460152a66489 Author: Harald Judt Date: Wed May 16 13:37:23 2012 +0200 Fix transparency (bug #8747). Set the Gtk.EventBox invisible like other panel plugins do. Signed-off-by: Landry Breuil panel-plugin/time-out.c |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/panel-plugin/time-out.c b/panel-plugin/time-out.c index cc204b7..2544f01 100644 --- a/panel-plugin/time-out.c +++ b/panel-plugin/time-out.c @@ -189,6 +189,7 @@ time_out_new (XfcePanelPlugin *plugin) /* Create event box to catch user events */ time_out->ebox = gtk_event_box_new (); + gtk_event_box_set_visible_window(GTK_EVENT_BOX(time_out->ebox), FALSE); gtk_widget_show (time_out->ebox); /* Create flexible box which can do both, horizontal and vertical layout */ ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Set the eventbox above its childs, clicks are transferred properly now (bug #7251)
Updating branch refs/heads/master to d2db8a619cfcf2e373b4106826387b163edcd754 (commit) from 0011e3999febae9cc521209d7a9594fa12539e59 (commit) commit d2db8a619cfcf2e373b4106826387b163edcd754 Author: Landry Breuil Date: Wed May 16 21:53:34 2012 +0200 Set the eventbox above its childs, clicks are transferred properly now (bug #7251) panel-plugin/cpu.c |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/panel-plugin/cpu.c b/panel-plugin/cpu.c index 1ea0c03..f72c626 100644 --- a/panel-plugin/cpu.c +++ b/panel-plugin/cpu.c @@ -102,6 +102,7 @@ static CPUGraph * create_gui( XfcePanelPlugin * plugin ) ebox = gtk_event_box_new(); gtk_event_box_set_visible_window(GTK_EVENT_BOX(ebox), FALSE); + gtk_event_box_set_above_child(GTK_EVENT_BOX(ebox), TRUE); gtk_container_add( GTK_CONTAINER( plugin ), ebox ); xfce_panel_plugin_add_action_widget( plugin, ebox ); g_signal_connect( ebox, "button-press-event", G_CALLBACK( command_cb ), base ); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Facilitate bringing up the configuration dialog (bug #8899).
Updating branch refs/heads/master to d663055221aecc5acfed38612b32d7deeb885e12 (commit) from c0e0c4fb14f8db2d08988fb5d50e43a1310645fd (commit) commit d663055221aecc5acfed38612b32d7deeb885e12 Author: Harald Judt Date: Fri May 18 11:07:11 2012 +0200 Facilitate bringing up the configuration dialog (bug #8899). Currently only the labels and the border react to clicks. By setting the event box above its childs, all parts of the plugin will react to mouse clicks, which makes it easier to bring up the context menu and the configuration dialog. panel-plugin/main.c |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/panel-plugin/main.c b/panel-plugin/main.c index c5f71c1..450b471 100644 --- a/panel-plugin/main.c +++ b/panel-plugin/main.c @@ -475,6 +475,7 @@ static diskperf_t *diskperf_create_control (XfcePanelPlugin *plugin) poMonitor->wEventBox = gtk_event_box_new (); gtk_event_box_set_visible_window(GTK_EVENT_BOX(poMonitor->wEventBox), FALSE); +gtk_event_box_set_above_child(GTK_EVENT_BOX(poMonitor->wEventBox), TRUE); gtk_widget_show (poMonitor->wEventBox); xfce_panel_plugin_add_action_widget (plugin, poMonitor->wEventBox); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Merge branch 'master' of git://git.xfce.org/panel-plugins/xfce4-diskperf-plugin
Updating branch refs/heads/master to 907c8ec767c2a2b77a83cd5c6f9bdaa80b8d0218 (commit) from d663055221aecc5acfed38612b32d7deeb885e12 (commit) commit 907c8ec767c2a2b77a83cd5c6f9bdaa80b8d0218 Merge: d663055 1d850ee Author: Landry Breuil Date: Fri May 18 11:08:14 2012 +0200 Merge branch 'master' of git://git.xfce.org/panel-plugins/xfce4-diskperf-plugin commit 1d850ee493041e05ac31bc710e1b6570eb695722 Author: Masato Hashimoto Date: Thu May 17 14:01:41 2012 +0200 l10n: Updated Japanese (ja) translation to 100% New status: 38 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/ja.po | 49 - 1 files changed, 28 insertions(+), 21 deletions(-) diff --git a/po/ja.po b/po/ja.po index e0ac86c..73358e3 100644 --- a/po/ja.po +++ b/po/ja.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: xfce 4-diskperf-plugin 2.1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-04 16:57+0200\n" -"PO-Revision-Date: 2012-04-23 21:09+0900\n" +"POT-Creation-Date: 2012-05-17 20:58+0900\n" +"PO-Revision-Date: 2012-05-17 21:01+0900\n" "Last-Translator: Masato Hashimoto \n" "Language-Team: Japanese \n" "Language: ja\n" @@ -27,9 +27,8 @@ msgid "Input the device name, then press " msgstr "デバイス名を入力してください" #: ../panel-plugin/config_gui.c:118 -#, fuzzy msgid "/dev/sda1" -msgstr "/dev/hda1" +msgstr "/dev/sda1" #: ../panel-plugin/config_gui.c:136 msgid "Data collection period" @@ -64,9 +63,8 @@ msgid "I/O transfer" msgstr "I/O 転送" #: ../panel-plugin/config_gui.c:181 -#, fuzzy msgid "MiB transferred / second" -msgstr "毎秒の転送量をモニタリングします" +msgstr "秒ごとの転送量 (MiB) を監視します" #: ../panel-plugin/config_gui.c:187 msgid "Busy time" @@ -74,12 +72,11 @@ msgstr "使用率" #: ../panel-plugin/config_gui.c:191 msgid "Percentage of time the device is busy" -msgstr "デバイスを使用していた時間の割合 (%) をモニタリングします" +msgstr "デバイスを使用していた時間の割合 (%) を監視します" #: ../panel-plugin/config_gui.c:202 -#, fuzzy msgid "Max. I/O rate (MiB/s) " -msgstr "最大 I/O レート (MB/s) " +msgstr "最大 I/O レート (MiB/s) " #: ../panel-plugin/config_gui.c:213 msgid "Input the maximum I/O transfer rate of the device, then press " @@ -136,12 +133,12 @@ msgstr "書込-読込" msgid "\"Write\" monitor first" msgstr "\"書き込み\" を先に表示します" -#: ../panel-plugin/main.c:180 +#: ../panel-plugin/main.c:196 #, c-format msgid "%s: Device statistics unavailable." -msgstr "" +msgstr "%s: デバイスの統計情報を利用できません。" -#: ../panel-plugin/main.c:219 +#: ../panel-plugin/main.c:236 #, c-format msgid "" "%s\n" @@ -155,12 +152,22 @@ msgid "" " Write : %3d\n" " Total : %3d" msgstr "" - -#: ../panel-plugin/main.c:823 +"%s\n" +"\n" +"I/O(MiB/s)\n" +" 読込 :%3.2f\n" +" 書込 :%3.2f\n" +" 合計 :%3.2f\n" +"ビジー時間 (%c)\n" +" 読込 : %3d\n" +" 書込 : %3d\n" +" 合計 : %3d" + +#: ../panel-plugin/main.c:854 msgid "Select color" msgstr "色を選択してください" -#: ../panel-plugin/main.c:873 +#: ../panel-plugin/main.c:904 #, c-format msgid "" "%s\n" @@ -175,7 +182,7 @@ msgstr "" "このモニターは正しく動作しないでしょう!\n" "削除してください。" -#: ../panel-plugin/main.c:884 +#: ../panel-plugin/main.c:915 #, c-format msgid "" "%s: No disk extended statistics found!\n" @@ -193,7 +200,7 @@ msgstr "" "このモニターは正常に動作しないでしょう!\n" "削除してください。" -#: ../panel-plugin/main.c:892 +#: ../panel-plugin/main.c:923 #, c-format msgid "" "%s: Unknown error\n" @@ -206,17 +213,17 @@ msgstr "" "このモニターは正常に動作しないでしょう!\n" "削除してください。" -#: ../panel-plugin/main.c:914 +#: ../panel-plugin/main.c:945 msgid "" "Diskperf monitor displays instantaneous disk I/O transfer rates and busy " "times" -msgstr "Diskperf はディスクの I/O 転送率とビジー時間を表示します" +msgstr "Diskperf モニターはディスクの I/O 転送率とビジー時間を表示します" -#: ../panel-plugin/main.c:916 +#: ../panel-plugin/main.c:947 msgid "Copyright (c) 2003, 2004 Roger Seguin" msgstr "Copyright (c) 2003, 2004 Roger Seguin" -#: ../panel-plugin/main.c:952 ../panel-plugin/diskperf.desktop.in.h:1 +#: ../panel-plugin/main.c:983 ../panel-plugin/diskperf.desktop.in.h:1 msgid "Disk Performance Monitor" msgstr "ディスクパフォーマンスモニター" ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Facilitate bringing up the configuration dialog (bug #8900).
Updating branch refs/heads/master to 6496dd0a8f90e60bdb953e003d4062a9d87b9434 (commit) from c9d024792d12d78b6bc17c6524a93918e5558e4b (commit) commit 6496dd0a8f90e60bdb953e003d4062a9d87b9434 Author: Harald Judt Date: Thu May 17 09:06:30 2012 +0200 Facilitate bringing up the configuration dialog (bug #8900). Currently only the labels and the border react to clicks. The labels can be hidden, so it can be hard to bring up the configuration dialog. By setting the event box above its childs, all parts of the plugin will react to clicks. Signed-off-by: Landry Breuil panel-plugin/systemload.c |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/panel-plugin/systemload.c b/panel-plugin/systemload.c index 58cc658..a35f1a8 100644 --- a/panel-plugin/systemload.c +++ b/panel-plugin/systemload.c @@ -293,6 +293,7 @@ monitor_update_orientation (XfcePanelPlugin *plugin, GTK_STATE_SELECTED, &global->monitor[count]->options.color); gtk_event_box_set_visible_window(GTK_EVENT_BOX(global->monitor[count]->ebox), FALSE); + gtk_event_box_set_above_child(GTK_EVENT_BOX(global->monitor[count]->ebox), TRUE); gtk_widget_show(GTK_WIDGET(global->monitor[count]->status)); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Fix transparency and put event box above its children (bug #8913).
Updating branch refs/heads/master to 6db9f674f27ea27d6a6baf4881000c29260a66ee (commit) from 50b66a0d2ab28dbbbe854f9fceaf5d7a4737ea7a (commit) commit 6db9f674f27ea27d6a6baf4881000c29260a66ee Author: Harald Judt Date: Fri May 18 19:26:12 2012 +0200 Fix transparency and put event box above its children (bug #8913). Putting the event box above its children allows clicking on the progress bars to bring up the context menu. Signed-off-by: Landry Breuil panel-plugin/wavelan.c |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/panel-plugin/wavelan.c b/panel-plugin/wavelan.c index fc381bf..2652138 100644 --- a/panel-plugin/wavelan.c +++ b/panel-plugin/wavelan.c @@ -316,6 +316,8 @@ wavelan_new(XfcePanelPlugin *plugin) wavelan->ebox = gtk_event_box_new(); gtk_widget_set_has_tooltip(wavelan->ebox, TRUE); + gtk_event_box_set_visible_window(GTK_EVENT_BOX(wavelan->ebox), FALSE); + gtk_event_box_set_above_child(GTK_EVENT_BOX(wavelan->ebox), TRUE); g_signal_connect(wavelan->ebox, "query-tooltip", G_CALLBACK(tooltip_cb), wavelan); xfce_panel_plugin_add_action_widget(plugin, wavelan->ebox); gtk_container_add(GTK_CONTAINER(plugin), wavelan->ebox); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Merge branch 'master' of git://git.xfce.org/panel-plugins/xfce4-wavelan-plugin
Updating branch refs/heads/master to 22ec97923ec81cb4874ff80d2ba7c770d46b59f9 (commit) from 6db9f674f27ea27d6a6baf4881000c29260a66ee (commit) commit 22ec97923ec81cb4874ff80d2ba7c770d46b59f9 Merge: 6db9f67 a0424ed Author: Landry Breuil Date: Fri May 18 21:07:26 2012 +0200 Merge branch 'master' of git://git.xfce.org/panel-plugins/xfce4-wavelan-plugin commit a0424ed9faf83a39a0cda1840bd2f4f631bf9171 Author: Masato Hashimoto Date: Fri May 18 05:16:05 2012 +0200 l10n: Updated Japanese (ja) translation to 100% New status: 12 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). commit c66ae5cddb0f3c310403e3a9ffda481b708db7c9 Author: Masato Hashimoto Date: Thu May 17 19:05:08 2012 +0200 l10n: Updated Japanese (ja) translation to 100% New status: 12 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). commit 4fa040a68a258ae896167d25e5070bf4a6c05fba Author: Ivica Kolić Date: Thu May 10 20:52:20 2012 +0200 l10n: Initial Croatian (hr) translation New status: 9 messages complete with 0 fuzzies and 3 untranslated. Transmitted-via: Transifex (translations.xfce.org). commit b65da94a4d51a86d56c15a09d7c9cea0f3d2f48d Author: Jeff Bailes Date: Sat Apr 28 01:46:13 2012 +0200 l10n: Updated English (United Kingdom) (en_GB) translation to 100% New status: 12 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). commit 0b1a6c4661b772c147ef1b7782437c9d825035b7 Author: Seong-ho Cho Date: Sun Apr 22 20:30:33 2012 +0200 l10n: Updated Korean (ko) translation to 100% New status: 12 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). commit a80acf0d8cf917d47e96ecde312a6064e33627e7 Author: Nuno Miguel Date: Sat Apr 21 17:05:09 2012 +0200 l10n: Updated Portuguese (pt) translation to 100% New status: 12 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). commit d4a80d13da71bf2dc80f6bbefc4f25ef679ffd58 Author: Algimantas Margevičius Date: Sat Apr 21 13:58:12 2012 +0200 l10n: Added Lithuanian language New status: 12 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). commit 66e0bdb326999254cbc6a55aa8f2c84d0eb59835 Author: Gabor Kelemen Date: Sat Apr 21 04:59:50 2012 +0200 l10n: Updated Hungarian (hu) translation to 100% New status: 12 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). commit d867a7bb8aa15116eda9f7f15738232783e3ecef Author: Chipong Luo Date: Fri Apr 20 14:20:25 2012 +0200 l10n: Updated Chinese (China) (zh_CN) translation to 100% New status: 12 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). commit 259d00a1269404eb84aec3eddffd8e60471f7a46 Author: Carles Muñoz Gorriz Date: Thu Apr 19 21:30:31 2012 +0200 l10n: Updated Catalan (Valencian) (ca) translation to 100% New status: 12 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). commit 5f575cfdb05054cc09be24e812aa6b064a15875e Author: Sergio García Date: Thu Apr 19 07:09:51 2012 +0200 l10n: Updated Spanish (Castilian) (es) translation to 100% New status: 12 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). commit 9c66923aadbe1b061a0127b90330827e6525f9bf Author: Bauzhan Muftakhidinov Date: Mon Apr 16 09:24:38 2012 +0200 l10n: Updated Kazakh (kk) translation to 100% New status: 12 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). commit 9c3bb4f3b1d61ce0e22bc3bed581c1a79d74c389 Author: Jakob Kramer Date: Sat Apr 14 15:49:40 2012 +0200 l10n: Updated German (de) translation to 100% New status: 12 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). commit a069376f403c26a3130e8786bd93253397d6f16b Author: Roman K Date: Sat Apr 14 10:17:49 2012 +0200 l10n: Updated Russian (ru) translation to 100% New status: 12 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). commit 9d414ba8934b3f8bd73d07e32bc6f26ac0577a39 Author: Iliyas Jorio Date: Sat Apr 14 01:52:16 2012 +0200 l10n: Updated French (fr) translation to 100% New status: 12 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). commit 2881b225b53ff7c1b5888485c5c3ceac81ffa
[Xfce4-commits] Use double values for progress bars (bug #8882).
Updating branch refs/heads/master
to 315e54ec286da7a982dbd24f5f0b8f41c7e45e98 (commit)
from 907c8ec767c2a2b77a83cd5c6f9bdaa80b8d0218 (commit)
commit 315e54ec286da7a982dbd24f5f0b8f41c7e45e98
Author: Harald Judt
Date: Mon May 21 23:10:08 2012 +0200
Use double values for progress bars (bug #8882).
Otherwise the progress bars don't show anything unless we're over 100%
(100% busy, or exceeding the configured transfer rate). Thanks to
Peter Tribble for spotting this.
Signed-off-by: Landry Breuil
panel-plugin/main.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/panel-plugin/main.c b/panel-plugin/main.c
index 450b471..6a2d154 100644
--- a/panel-plugin/main.c
+++ b/panel-plugin/main.c
@@ -143,7 +143,7 @@ typedef struct diskperf_t {
static int timerNeedsUpdate = 0;
-static void UpdateProgressBars(struct diskperf_t *p_poPlugin, uint64_t rw,
uint64_t r, uint64_t w) {
+static void UpdateProgressBars(struct diskperf_t *p_poPlugin, double rw,
double r, double w) {
/* Update combined or separate progress bars with actual data */
struct monitor_t *poMonitor = &(p_poPlugin->oMonitor);
struct param_t *poConf = &(p_poPlugin->oConf.oParam);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Merge branch 'master' of git://git.xfce.org/panel-plugins/xfce4-diskperf-plugin
Updating branch refs/heads/master to f223428439d5bedfb9950c427b97d759810cfcb5 (commit) from 315e54ec286da7a982dbd24f5f0b8f41c7e45e98 (commit) commit f223428439d5bedfb9950c427b97d759810cfcb5 Merge: 315e54e d09f22e Author: Landry Breuil Date: Tue May 22 09:58:54 2012 +0200 Merge branch 'master' of git://git.xfce.org/panel-plugins/xfce4-diskperf-plugin commit d09f22ee6f0bea705aae82e4db3764481f38294a Author: Efstathios Iosifidis Date: Sun May 20 10:34:53 2012 +0200 l10n: Updated Greek (el) translation to 100% New status: 38 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/el.po | 36 1 files changed, 24 insertions(+), 12 deletions(-) diff --git a/po/el.po b/po/el.po index 2fad32f..1b4721c 100644 --- a/po/el.po +++ b/po/el.po @@ -3,19 +3,22 @@ # This file is distributed under the same license as the PACKAGE package. # # Evaggelos Balaskas , 2008. +# Efstathios Iosifidis , 2012. +# msgid "" msgstr "" "Project-Id-Version: el\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-05-04 16:57+0200\n" -"PO-Revision-Date: 2008-04-28 00:16+0300\n" -"Last-Translator: Evaggelos Balaskas \n" -"Language-Team: Greek \n" +"PO-Revision-Date: 2012-05-20 11:34+0300\n" +"Last-Translator: Efstathios Iosifidis \n" +"Language-Team: Ελληνικά, Σύγχρονα \n" "Language: el\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" +"Content-Transfer-Encoding: 8bits\n" "X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=2; plural=(n!=1);\n" #: ../panel-plugin/config_gui.c:101 msgid "Device" @@ -26,9 +29,8 @@ msgid "Input the device name, then press " msgstr "Εισαγωγή ονόματος συσκευής, μετά πατήστε " #: ../panel-plugin/config_gui.c:118 -#, fuzzy msgid "/dev/sda1" -msgstr "/dev/hda1" +msgstr "/dev/sda1" #: ../panel-plugin/config_gui.c:136 msgid "Data collection period" @@ -63,9 +65,8 @@ msgid "I/O transfer" msgstr "Μετάδοση I/O" #: ../panel-plugin/config_gui.c:181 -#, fuzzy msgid "MiB transferred / second" -msgstr "MB μεταφέρθηκαν / δευτερόλεπτα" +msgstr "MiB μεταφέρθηκαν / δευτερόλεπτο" #: ../panel-plugin/config_gui.c:187 msgid "Busy time" @@ -76,9 +77,8 @@ msgid "Percentage of time the device is busy" msgstr "Ποσοστό του χρόνου που η συσκευή είναι απασχολημένη" #: ../panel-plugin/config_gui.c:202 -#, fuzzy msgid "Max. I/O rate (MiB/s) " -msgstr "Μέγιστο. I/O ρυθμός (MB/s) " +msgstr "Μέγιστος ρυθμίς I/O (MiB/s) " #: ../panel-plugin/config_gui.c:213 msgid "Input the maximum I/O transfer rate of the device, then press " @@ -137,7 +137,7 @@ msgstr "\"Εγγραφή\" οθόνη πρώτα" #: ../panel-plugin/main.c:180 #, c-format msgid "%s: Device statistics unavailable." -msgstr "" +msgstr "%s: Μη διαθέσιμα στατιστικά συσκευής." #: ../panel-plugin/main.c:219 #, c-format @@ -153,6 +153,16 @@ msgid "" " Write : %3d\n" " Total : %3d" msgstr "" +"%s\n" +"\n" +"I/O(MiB/s)\n" +" Ανάγνωση :%3.2f\n" +" Εγγραφή :%3.2f\n" +" Σύνολο :%3.2f\n" +"Χρόνος Απασχόλησης (%c)\n" +" Ανάγνωση : %3d\n" +" Εγγραφή : %3d\n" +" Σύνολο : %3d" #: ../panel-plugin/main.c:823 msgid "Select color" @@ -208,10 +218,12 @@ msgid "" "Diskperf monitor displays instantaneous disk I/O transfer rates and busy " "times" msgstr "" +"Ο επόπτης Diskperf εμφανίζει στιγμιαία ρυθμο μεταφοράς I/O και χρόνους " +"απασχόλησης του δίσκου" #: ../panel-plugin/main.c:916 msgid "Copyright (c) 2003, 2004 Roger Seguin" -msgstr "" +msgstr "Πνευματικά Δικαιώματα (c) 2003, 2004 Roger Seguin" #: ../panel-plugin/main.c:952 ../panel-plugin/diskperf.desktop.in.h:1 msgid "Disk Performance Monitor" ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Set plugin to small in all modes except deskbar modes (bug # 8944).
Updating branch refs/heads/master to 18a7cc8266a7e0c8ca87a19a96388d34d671be4f (commit) from 6496dd0a8f90e60bdb953e003d4062a9d87b9434 (commit) commit 18a7cc8266a7e0c8ca87a19a96388d34d671be4f Author: Harald Judt Date: Thu May 24 20:23:01 2012 +0200 Set plugin to small in all modes except deskbar modes (bug # 8944). Signed-off-by: Landry Breuil panel-plugin/systemload.c |6 ++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/panel-plugin/systemload.c b/panel-plugin/systemload.c index a35f1a8..183d29b 100644 --- a/panel-plugin/systemload.c +++ b/panel-plugin/systemload.c @@ -652,6 +652,12 @@ monitor_set_mode (XfcePanelPlugin *plugin, XfcePanelPluginMode mode, GtkOrientation orientation = (mode == XFCE_PANEL_PLUGIN_MODE_VERTICAL) ? GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL; + /* Set small in all modes except deskbar mode */ + if (mode == XFCE_PANEL_PLUGIN_MODE_DESKBAR) + xfce_panel_plugin_set_small(XFCE_PANEL_PLUGIN(plugin), FALSE); + else + xfce_panel_plugin_set_small(XFCE_PANEL_PLUGIN(plugin), TRUE); + monitor_update_orientation (plugin, panel_orientation, orientation, global); monitor_set_size (plugin, xfce_panel_plugin_get_size (plugin), global); } ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
