[Xfce4-commits] l10n: Updated Chinese (China) (zh_CN) translation to 100%
Updating branch refs/heads/master to 6e7c093a7838a19afab73608c375290867122c39 (commit) from caaed80c77cffda27596754d27368fafe606dcfd (commit) commit 6e7c093a7838a19afab73608c375290867122c39 Author: Hunt Xu Date: Sun Mar 3 09:06:31 2013 +0100 l10n: Updated Chinese (China) (zh_CN) translation to 100% New status: 4 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/zh_CN.po |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index c380476..d790e43 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -3,7 +3,7 @@ # This file is distributed under the same license as # the xfce4-eyes-plugin package. # Chipong Luo , 2011, 2012. -# +# msgid "" msgstr "" "Project-Id-Version: xfce4-eyes-plugin\n" @@ -12,10 +12,10 @@ msgstr "" "PO-Revision-Date: 2008-12-06 05:00+0800\n" "Last-Translator: Chipong Luo \n" "Language-Team: Chinese (Simplified) \n" -"Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: zh_CN\n" "Plural-Forms: nplurals=1; plural=0;\n" #: ../panel-plugin/eyes.c:324 ../panel-plugin/eyes.desktop.in.h:1 @@ -28,7 +28,7 @@ msgstr "选择主题(_S)：" #: ../panel-plugin/eyes.c:377 msgid "Use single _row in multi-row panel" -msgstr "" +msgstr "在多行面板中使用单行(_R)" #: ../panel-plugin/eyes.desktop.in.h:2 msgid "Eyes that spy on you" ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Implement eye position calculations in 3D coords (bug #9036).
Updating branch refs/heads/master
to 88c2ec822210f0efa7ee2b6c99bc4747bf3fd71d (commit)
from 6e7c093a7838a19afab73608c375290867122c39 (commit)
commit 88c2ec822210f0efa7ee2b6c99bc4747bf3fd71d
Author: Andrzej
Date: Sun Mar 3 09:45:03 2013 +0100
Implement eye position calculations in 3D coords (bug #9036).
Current behavior is better but it still feels unnatural. This is mostly
because the eye balls are in the same x-y plane as the mouse pointer.
The attached patch calculates 3D angles of the eye sight as if the eye ball
was slightly behind the screen (at the moment the distance is hardcoded to
3x eyeball radius). Smaller z distance makes the eyeballs more independent,
larger - increases the (x-y) tracking distance (the eyes remain in their
center position longer).
panel-plugin/eyes.c | 51 ++-
1 files changed, 26 insertions(+), 25 deletions(-)
diff --git a/panel-plugin/eyes.c b/panel-plugin/eyes.c
index d1a28fb..aa3cf48 100644
--- a/panel-plugin/eyes.c
+++ b/panel-plugin/eyes.c
@@ -68,11 +68,10 @@ calculate_pupil_xy (EyesPlugin *eyes_applet,
gint *pupil_y,
GtkWidget *widget)
{
- double sina;
- double cosa;
- double h;
- double temp;
double nx, ny;
+ double distance;
+ double angle, angle_z;
+ double radius_x, radius_y;
gfloat xalign, yalign;
gint width, height;
@@ -81,32 +80,34 @@ calculate_pupil_xy (EyesPlugin *eyes_applet,
height = GTK_WIDGET(widget)->allocation.height;
gtk_misc_get_alignment(GTK_MISC(widget), &xalign, &yalign);
+/* calculate x,y pointer offsets wrt to eye center */
nx = x - MAX(width - eyes_applet->eye_width, 0) * xalign
- eyes_applet->eye_width / 2 - GTK_WIDGET(widget)->allocation.x;
ny = y - MAX(height - eyes_applet->eye_height, 0) * yalign
- eyes_applet->eye_height / 2 -
GTK_WIDGET(widget)->allocation.y;
- h = hypot (nx, ny);
- if (h < 0.5 ||
- abs (h) < (abs (hypot (eyes_applet->eye_height / 2,
-
eyes_applet->eye_width / 2))
- - eyes_applet->wall_thickness
- - eyes_applet->pupil_height))
- {
- *pupil_x = nx + eyes_applet->eye_width / 2;
- *pupil_y = ny + eyes_applet->eye_height / 2;
- return;
- }
+ /* calculate eye sizes */
+ radius_x = (eyes_applet->eye_width -
+ eyes_applet->wall_thickness -
+ eyes_applet->pupil_width) / 2.0;
+ radius_y = (eyes_applet->eye_height -
+ eyes_applet->wall_thickness -
+ eyes_applet->pupil_height) / 2.0;
+
+ /* by default assume the z-axis distance of 3 radius_x */
+ distance = 3 * radius_x;
- sina = nx / h;
- cosa = ny / h;
+ /* correction factor for aspect ratio of the eye */
+ if (radius_y != 0)
+ ny *= radius_x / radius_y;
- temp = hypot ((eyes_applet->eye_width / 2) * sina,
(eyes_applet->eye_height / 2) * cosa);
- temp -= hypot ((eyes_applet->pupil_width / 2) * sina,
(eyes_applet->pupil_height / 2) * cosa);
- temp -= hypot ((eyes_applet->wall_thickness / 2) * sina,
(eyes_applet->wall_thickness / 2) * cosa);
+ /* calculate 3D rotation angles */
+ angle_z = atan2 (ny, nx);
+ angle = atan2 (hypot (nx, ny), distance);
- *pupil_x = temp * sina + (eyes_applet->eye_width / 2);
- *pupil_y = temp * cosa + (eyes_applet->eye_height / 2);
+ /* perform 3D rotation of a vector [0,0,1] (z=1) */
+ *pupil_x = radius_x * sin (angle) * cos (angle_z) +
eyes_applet->eye_width / 2;
+ *pupil_y = radius_y * sin (angle) * sin (angle_z) +
eyes_applet->eye_height / 2;
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Optimize check in timer callback a bit.
Updating branch refs/heads/master
to 9463e7a9416d3f293f7f0e72669a4ce27884ebd2 (commit)
from 88c2ec822210f0efa7ee2b6c99bc4747bf3fd71d (commit)
commit 9463e7a9416d3f293f7f0e72669a4ce27884ebd2
Author: Harald Judt
Date: Sun Mar 3 09:55:26 2013 +0100
Optimize check in timer callback a bit.
It won't help much because there are not that many eyes, but then
it also won't hurt, so stop checking when we know the pointer has
not been moved.
panel-plugin/eyes.c |7 ++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/panel-plugin/eyes.c b/panel-plugin/eyes.c
index aa3cf48..c9780dc 100644
--- a/panel-plugin/eyes.c
+++ b/panel-plugin/eyes.c
@@ -162,13 +162,18 @@ timer_cb(EyesPlugin *eyes)
if ((x != eyes->pointer_last_x[i]) || (y !=
eyes->pointer_last_y[i]))
{
-
calculate_pupil_xy (eyes, x, y, &pupil_x, &pupil_y,
eyes->eyes[i]);
draw_eye (eyes, i, pupil_x, pupil_y);
eyes->pointer_last_x[i] = x;
eyes->pointer_last_y[i] = y;
}
+else
+{
+/* pointer position did not change since last poll, so
+ why would it be different for the remaining eyes? */
+break;
+}
}
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Decrease update timeout.
Updating branch refs/heads/master to 0a89042c7b5dbac29f1d01471d759610ebb3ade6 (commit) from 9463e7a9416d3f293f7f0e72669a4ce27884ebd2 (commit) commit 0a89042c7b5dbac29f1d01471d759610ebb3ade6 Author: Harald Judt Date: Sun Mar 3 09:57:34 2013 +0100 Decrease update timeout. I found that with the 100ms interval, animation is not quite as smooth as I want it to be, so decrease it to 50ms. CPU load is mostly affected by the drawing operations, not by the polling, and those happen only on pointer movement. panel-plugin/eyes.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/panel-plugin/eyes.c b/panel-plugin/eyes.c index c9780dc..53ecbdf 100644 --- a/panel-plugin/eyes.c +++ b/panel-plugin/eyes.c @@ -43,7 +43,7 @@ /* for xml: */ #define EYES_ROOT "Eyes" #define DEFAULTTHEME "Tango" -#define UPDATE_TIMEOUT 100 +#define UPDATE_TIMEOUT 50 /*** ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Added a timezone property to the clock plugin.
Updating branch refs/heads/master
to 6a34f8151ea55dc732ddb857d5c708cd96de2a10 (commit)
from a5ff28b467a93a263b7459d894c3f81584d45657 (commit)
commit 6a34f8151ea55dc732ddb857d5c708cd96de2a10
Author: Andrzej
Date: Tue Feb 12 02:00:20 2013 +
Added a timezone property to the clock plugin.
At the moment it can only be set via xfconf-query, e.g.:
xfconf-query -c xfce4-panel -p /plugins/plugin-38/timezone -n -t string -s
"Asia/Tokyo"
If timezone is unset or set to "", the plugin defaults to a system's
local time.
plugins/clock/clock.c | 46 +-
1 files changed, 45 insertions(+), 1 deletions(-)
diff --git a/plugins/clock/clock.c b/plugins/clock/clock.c
index 1022910..10993d5 100644
--- a/plugins/clock/clock.c
+++ b/plugins/clock/clock.c
@@ -46,6 +46,7 @@
#include "clock-dialog_ui.h"
#define DEFAULT_TOOLTIP_FORMAT "%A %d %B %Y"
+#define DEFAULT_TIMEZONE ""
@@ -87,6 +88,7 @@ static gboolean clock_plugin_tooltip
(gpointer u
static gboolean clock_plugin_timeout_running (gpointer
user_data);
static void clock_plugin_timeout_destroyed (gpointer
user_data);
static gboolean clock_plugin_timeout_sync (gpointer
user_data);
+static void clock_plugin_set_timezone (ClockPlugin
*plugin);
@@ -96,7 +98,8 @@ enum
PROP_MODE,
PROP_TOOLTIP_FORMAT,
PROP_COMMAND,
- PROP_ROTATE_VERTICALLY
+ PROP_ROTATE_VERTICALLY,
+ PROP_TIMEZONE
};
typedef enum
@@ -135,6 +138,8 @@ struct _ClockPlugin
gchar *tooltip_format;
ClockPluginTimeout *tooltip_timeout;
+
+ gchar *timezone;
};
struct _ClockPluginTimeout
@@ -236,6 +241,13 @@ clock_plugin_class_init (ClockPluginClass *klass)
g_param_spec_string ("command",
NULL, NULL, NULL,
EXO_PARAM_READWRITE));
+
+ g_object_class_install_property (gobject_class,
+ PROP_TIMEZONE,
+ g_param_spec_string ("timezone",
+NULL, NULL,
+DEFAULT_TIMEZONE,
+EXO_PARAM_READWRITE));
}
@@ -249,6 +261,9 @@ clock_plugin_init (ClockPlugin *plugin)
plugin->tooltip_timeout = NULL;
plugin->command = NULL;
plugin->rotate_vertically = TRUE;
+ plugin->timezone = g_strdup (DEFAULT_TIMEZONE);
+
+ clock_plugin_set_timezone (plugin);
plugin->button = xfce_panel_create_toggle_button ();
/* xfce_panel_plugin_add_action_widget (XFCE_PANEL_PLUGIN (plugin),
plugin->button); */
@@ -294,6 +309,10 @@ clock_plugin_get_property (GObject*object,
g_value_set_boolean (value, plugin->rotate_vertically);
break;
+case PROP_TIMEZONE:
+ g_value_set_string (value, plugin->timezone);
+ break;
+
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@@ -345,6 +364,12 @@ clock_plugin_set_property (GObject *object,
}
break;
+case PROP_TIMEZONE:
+ g_free (plugin->timezone);
+ plugin->timezone = g_value_dup_string (value);
+ clock_plugin_set_timezone (plugin);
+ break;
+
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@@ -353,6 +378,24 @@ clock_plugin_set_property (GObject *object,
+static void
+clock_plugin_set_timezone (ClockPlugin *plugin)
+{
+ if (plugin->timezone == NULL || g_strcmp0 (plugin->timezone, "") == 0)
+g_unsetenv ("TZ");
+ else
+g_setenv ("TZ", plugin->timezone, TRUE);
+
+ tzset();
+
+ /* rather expensive way of notifying the clock widget of timezone change */
+ if (plugin->clock != NULL)
+clock_plugin_set_mode (plugin);
+}
+
+
+
+
static gboolean
clock_plugin_leave_notify_event (GtkWidget*widget,
GdkEventCrossing *event,
@@ -443,6 +486,7 @@ clock_plugin_construct (XfcePanelPlugin *panel_plugin)
{ "tooltip-format", G_TYPE_STRING },
{ "command", G_TYPE_STRING },
{ "rotate-vertically", G_TYPE_BOOLEAN },
+{ "timezone", G_TYPE_STRING },
{ NULL }
};
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Clock plugin: added a simple timezone selection UI.
Updating branch refs/heads/master to d9c3b0763fe46f164acd9f445c18a3eae262a91a (commit) from 1e4d05c8ad33e2a03d95d9215df576bcf5b2cb06 (commit) commit d9c3b0763fe46f164acd9f445c18a3eae262a91a Author: Andrzej Date: Sat Feb 23 23:13:29 2013 + Clock plugin: added a simple timezone selection UI. plugins/clock/clock-dialog.glade | 268 ++ plugins/clock/clock.c|4 + 2 files changed, 219 insertions(+), 53 deletions(-) diff --git a/plugins/clock/clock-dialog.glade b/plugins/clock/clock-dialog.glade index ea9c5a4..f200e47 100644 --- a/plugins/clock/clock-dialog.glade +++ b/plugins/clock/clock-dialog.glade @@ -1,42 +1,179 @@ - + - -3 -1 -1 -1 - +False Clock gtk-properties normal -False True -vertical +False 2 + + +True +False +end + + +gtk-close +True +True +True +False +True + + +False +False +0 + + + + +gtk-help +True +True +True +False +True + + +False +False +1 +True + + + + +False +True +end +0 + + True +False 6 -vertical 6 + +True +False +0 +none + + +True +False +12 + + +True +False +6 +2 +2 +12 +6 + + +True +False +0 +Time_zone: +True +timezone-name + + +1 +2 + + + + +True +True +Name of the timezone matching the system's timezone database. Leave empty to revert to the local time. +False +False +True +True + + +1 +2 +1 +2 + + + + +True +False +0 +Time: + + + + +True +False +To change the system time and the default timezone use a Time and Date configuration tool provided with your system. +0 +System time + + + + + +1 +2 + + + + + + + + +True +False +Time Settings + + + + + + + +False +True +0 + + + True +False 0 none True +False 12 True +False
[Xfce4-commits] Clock: fixed the month in the calendar popup.
Updating branch refs/heads/master to 27ce25acc51153f3f8d3c70fb1018b9b1ad14e8a (commit) from d9c3b0763fe46f164acd9f445c18a3eae262a91a (commit) commit 27ce25acc51153f3f8d3c70fb1018b9b1ad14e8a Author: Andrzej Date: Sun Feb 24 00:35:47 2013 + Clock: fixed the month in the calendar popup. plugins/clock/clock.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/plugins/clock/clock.c b/plugins/clock/clock.c index da54b8b..6ebc791 100644 --- a/plugins/clock/clock.c +++ b/plugins/clock/clock.c @@ -934,7 +934,7 @@ clock_plugin_calendar_show_event (GtkWidget *calendar_window, clock_plugin_reposition_calendar (plugin); time = clock_time_get_time (plugin->time); - gtk_calendar_select_month (GTK_CALENDAR (plugin->calendar), g_date_time_get_month (time), + gtk_calendar_select_month (GTK_CALENDAR (plugin->calendar), g_date_time_get_month (time) - 1, g_date_time_get_year (time)); gtk_calendar_select_day (GTK_CALENDAR (plugin->calendar), g_date_time_get_day_of_month (time)); g_date_time_unref (time); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Clock plugin: a fix to the previous commit
Updating branch refs/heads/master
to 592668fb4cdfb57ab92a3aa68b42ece502c0c4fe (commit)
from 7d6203b69bd776304825afcdc859f115c911d7cf (commit)
commit 592668fb4cdfb57ab92a3aa68b42ece502c0c4fe
Author: Andrzej
Date: Mon Feb 25 01:58:06 2013 +
Clock plugin: a fix to the previous commit
The new property was not bound properly.
plugins/clock/clock.c |4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/plugins/clock/clock.c b/plugins/clock/clock.c
index e6ba940..43f5dc3 100644
--- a/plugins/clock/clock.c
+++ b/plugins/clock/clock.c
@@ -231,7 +231,8 @@ clock_plugin_class_init (ClockPluginClass *klass)
g_object_class_install_property (gobject_class,
PROP_TIME_CONFIG_TOOL,
g_param_spec_string ("time-config-tool",
-NULL, NULL, NULL,
+NULL, NULL,
+
DEFAULT_TIME_CONFIG_TOOL,
EXO_PARAM_READWRITE));
}
@@ -452,6 +453,7 @@ clock_plugin_construct (XfcePanelPlugin *panel_plugin)
{ "tooltip-format", G_TYPE_STRING },
{ "command", G_TYPE_STRING },
{ "rotate-vertically", G_TYPE_BOOLEAN },
+{ "time-config-tool", G_TYPE_STRING },
{ NULL }
};
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Clock plugin: added a function to call a system clock config tool
Updating branch refs/heads/master
to 7d6203b69bd776304825afcdc859f115c911d7cf (commit)
from 27ce25acc51153f3f8d3c70fb1018b9b1ad14e8a (commit)
commit 7d6203b69bd776304825afcdc859f115c911d7cf
Author: Andrzej
Date: Mon Feb 25 01:40:30 2013 +
Clock plugin: added a function to call a system clock config tool
plugins/clock/clock-dialog.glade | 15 +--
plugins/clock/clock.c| 48 +-
2 files changed, 54 insertions(+), 9 deletions(-)
diff --git a/plugins/clock/clock-dialog.glade b/plugins/clock/clock-dialog.glade
index f200e47..301cb56 100644
--- a/plugins/clock/clock-dialog.glade
+++ b/plugins/clock/clock-dialog.glade
@@ -123,15 +123,14 @@
-
+
+_Run
configuration tool
True
-False
-To change the system time and the default timezone use a
Time and Date configuration tool provided with your system.
-0
-System
time
-
-
-
+True
+True
+Alternatively, use a "date" utility to set your system
time.
+False
+True
1
diff --git a/plugins/clock/clock.c b/plugins/clock/clock.c
index 6ebc791..e6ba940 100644
--- a/plugins/clock/clock.c
+++ b/plugins/clock/clock.c
@@ -44,6 +44,8 @@
#include "clock-dialog_ui.h"
#define DEFAULT_TOOLTIP_FORMAT "%A %d %B %Y"
+/* Please adjust the following command to match your distribution */
+#define DEFAULT_TIME_CONFIG_TOOL "time-admin"
static void clock_plugin_get_property (GObject
*object,
@@ -90,7 +92,8 @@ enum
PROP_MODE,
PROP_TOOLTIP_FORMAT,
PROP_COMMAND,
- PROP_ROTATE_VERTICALLY
+ PROP_ROTATE_VERTICALLY,
+ PROP_TIME_CONFIG_TOOL
};
typedef enum
@@ -130,6 +133,7 @@ struct _ClockPlugin
gchar *tooltip_format;
ClockTimeTimeout *tooltip_timeout;
+ gchar *time_config_tool;
ClockTime *time;
};
@@ -223,6 +227,12 @@ clock_plugin_class_init (ClockPluginClass *klass)
g_param_spec_string ("command",
NULL, NULL, NULL,
EXO_PARAM_READWRITE));
+
+ g_object_class_install_property (gobject_class,
+ PROP_TIME_CONFIG_TOOL,
+ g_param_spec_string ("time-config-tool",
+NULL, NULL, NULL,
+EXO_PARAM_READWRITE));
}
@@ -235,6 +245,7 @@ clock_plugin_init (ClockPlugin *plugin)
plugin->tooltip_format = g_strdup (DEFAULT_TOOLTIP_FORMAT);
plugin->tooltip_timeout = NULL;
plugin->command = NULL;
+ plugin->time_config_tool = g_strdup (DEFAULT_TIME_CONFIG_TOOL);
plugin->rotate_vertically = TRUE;
plugin->time = clock_time_new ();
@@ -278,6 +289,10 @@ clock_plugin_get_property (GObject*object,
g_value_set_string (value, plugin->command);
break;
+case PROP_TIME_CONFIG_TOOL:
+ g_value_set_string (value, plugin->time_config_tool);
+ break;
+
case PROP_ROTATE_VERTICALLY:
g_value_set_boolean (value, plugin->rotate_vertically);
break;
@@ -324,6 +339,11 @@ clock_plugin_set_property (GObject *object,
clock_plugin_hide_calendar (plugin);
break;
+case PROP_TIME_CONFIG_TOOL:
+ g_free (plugin->time_config_tool);
+ plugin->time_config_tool = g_value_dup_string (value);
+ break;
+
case PROP_ROTATE_VERTICALLY:
rotate_vertically = g_value_get_boolean (value);
if (plugin->rotate_vertically != rotate_vertically)
@@ -777,6 +797,26 @@ clock_plugin_configure_plugin_free (gpointer user_data)
static void
+clock_plugin_configure_run_config_tool (GtkWidget *button,
+ClockPlugin *plugin)
+{
+ GError *error = NULL;
+
+ panel_return_if_fail (XFCE_IS_CLOCK_PLUGIN (plugin));
+
+ if (!xfce_spawn_command_line_on_screen (gtk_widget_get_screen (button),
+ plugin->time_config_tool,
+ FALSE, FALSE, &error))
+{
+ xfce_dialog_show_error
+(NULL, error, _("Failed to execute command \"%s\"."),
plugin->time_config_tool);
+ g_error_free (error);
+}
+}
+
+
+
+static void
clock_plugin_configure_plugin (XfcePanelPlugin *panel_plugin)
{
ClockPlugin *
[Xfce4-commits] Clock plugin: changed the tooltip text.
Updating branch refs/heads/master to 9eb22de2489a039b50e7227a0e41aaa62fd9696f (commit) from 769e1a41581c5e8bf99d8da34c20565b719d4892 (commit) commit 9eb22de2489a039b50e7227a0e41aaa62fd9696f Author: Andrzej Date: Tue Feb 26 22:34:59 2013 + Clock plugin: changed the tooltip text. plugins/clock/clock-dialog.glade |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/plugins/clock/clock-dialog.glade b/plugins/clock/clock-dialog.glade index 37e0398..abf0bef 100644 --- a/plugins/clock/clock-dialog.glade +++ b/plugins/clock/clock-dialog.glade @@ -128,7 +128,7 @@ True True True -Alternatively, use a "date" utility to set your system time. +Start a tool for setting the system time and date. If the button is grayed out, check the "Help" page to see how to configure it correctly. False True ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Clock plugin, an attempt to fix random crashes.
Updating branch refs/heads/master
to c09730c9ccafacdd916b7ec1514d7159eb672e04 (commit)
from 9eb22de2489a039b50e7227a0e41aaa62fd9696f (commit)
commit c09730c9ccafacdd916b7ec1514d7159eb672e04
Author: Andrzej
Date: Tue Feb 26 22:38:33 2013 +
Clock plugin, an attempt to fix random crashes.
Reports of random segfaults when adding/removing the plugin.
Can't be reproduced here.
plugins/clock/clock-time.c |6 --
plugins/clock/clock-time.h |4
plugins/clock/clock.c |1 +
3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/plugins/clock/clock-time.c b/plugins/clock/clock-time.c
index df7cd6b..16b0f89 100644
--- a/plugins/clock/clock-time.c
+++ b/plugins/clock/clock-time.c
@@ -74,7 +74,7 @@ enum
static guint clock_time_signals[LAST_SIGNAL] = { 0, };
-G_DEFINE_TYPE (ClockTime, clock_time, G_TYPE_OBJECT)
+XFCE_PANEL_DEFINE_TYPE (ClockTime, clock_time, G_TYPE_OBJECT)
@@ -347,11 +347,13 @@ clock_time_timeout_set_interval (ClockTimeTimeout
*timeout,
{
GDateTime *time;
guint next_interval;
- gboolean restart = timeout->restart;
+ gboolean restart;
panel_return_if_fail (timeout != NULL);
panel_return_if_fail (interval > 0);
+ restart = timeout->restart;
+
/* leave if nothing changed and we're not restarting */
if (!restart && timeout->interval == interval)
return;
diff --git a/plugins/clock/clock-time.h b/plugins/clock/clock-time.h
index 83745d1..dd0fe2c 100644
--- a/plugins/clock/clock-time.h
+++ b/plugins/clock/clock-time.h
@@ -20,6 +20,8 @@
#define __CLOCK_TIME_H__
#include
+#include
+#include
G_BEGIN_DECLS
@@ -41,6 +43,8 @@ typedef struct _ClockTimeTimeout ClockTimeTimeout;
GType clock_time_get_type (void) G_GNUC_CONST;
+voidclock_time_register_type (XfcePanelTypeModule
*type_module);
+
ClockTime *clock_time_new(void);
ClockTimeTimeout *clock_time_timeout_new(guint
interval,
diff --git a/plugins/clock/clock.c b/plugins/clock/clock.c
index a09d562..f7161db 100644
--- a/plugins/clock/clock.c
+++ b/plugins/clock/clock.c
@@ -174,6 +174,7 @@ enum
/* define the plugin */
XFCE_PANEL_DEFINE_PLUGIN (ClockPlugin, clock_plugin,
+ clock_time_register_type,
xfce_clock_analog_register_type,
xfce_clock_binary_register_type,
xfce_clock_digital_register_type,
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Clock plugin: adjusted defaults.
Updating branch refs/heads/master
to 769e1a41581c5e8bf99d8da34c20565b719d4892 (commit)
from 592668fb4cdfb57ab92a3aa68b42ece502c0c4fe (commit)
commit 769e1a41581c5e8bf99d8da34c20565b719d4892
Author: Andrzej
Date: Mon Feb 25 23:38:04 2013 +
Clock plugin: adjusted defaults.
- A simpler label for the configuration button.
- An empty string for the time configuration command
- the button is grayed out when the config command is empty
plugins/clock/clock-dialog.glade |2 +-
plugins/clock/clock.c| 26 +-
2 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/plugins/clock/clock-dialog.glade b/plugins/clock/clock-dialog.glade
index 301cb56..37e0398 100644
--- a/plugins/clock/clock-dialog.glade
+++ b/plugins/clock/clock-dialog.glade
@@ -124,7 +124,7 @@
-_Run
configuration tool
+_Set
True
True
True
diff --git a/plugins/clock/clock.c b/plugins/clock/clock.c
index 43f5dc3..a09d562 100644
--- a/plugins/clock/clock.c
+++ b/plugins/clock/clock.c
@@ -45,7 +45,8 @@
#define DEFAULT_TOOLTIP_FORMAT "%A %d %B %Y"
/* Please adjust the following command to match your distribution */
-#define DEFAULT_TIME_CONFIG_TOOL "time-admin"
+/* e.g. "time-admin" */
+#define DEFAULT_TIME_CONFIG_TOOL ""
static void clock_plugin_get_property (GObject
*object,
@@ -799,6 +800,25 @@ clock_plugin_configure_plugin_free (gpointer user_data)
static void
+clock_plugin_configure_config_tool_changed (ClockPluginDialog *dialog)
+{
+ GObject *object;
+
+ panel_return_if_fail (GTK_IS_BUILDER (dialog->builder));
+ panel_return_if_fail (XFCE_IS_CLOCK_PLUGIN (dialog->plugin));
+
+ object = gtk_builder_get_object (dialog->builder, "run-time-config-tool");
+ panel_return_if_fail (GTK_IS_BUTTON (object));
+
+ gtk_widget_set_sensitive
+(GTK_WIDGET (object),
+ dialog->plugin->time_config_tool != NULL &&
+ g_strcmp0 (dialog->plugin->time_config_tool, "") != 0);
+}
+
+
+
+static void
clock_plugin_configure_run_config_tool (GtkWidget *button,
ClockPlugin *plugin)
{
@@ -843,6 +863,10 @@ clock_plugin_configure_plugin (XfcePanelPlugin
*panel_plugin)
object = gtk_builder_get_object (builder, "run-time-config-tool");
panel_return_if_fail (GTK_IS_BUTTON (object));
+ g_signal_connect_swapped (G_OBJECT (plugin), "notify::time-config-tool",
+G_CALLBACK
(clock_plugin_configure_config_tool_changed),
+dialog);
+ clock_plugin_configure_config_tool_changed (dialog);
g_signal_connect (G_OBJECT (object), "clicked",
G_CALLBACK (clock_plugin_configure_run_config_tool), plugin);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Clock plugin: removed frame widget from calendar popup.
Updating branch refs/heads/master
to 7ae9b8817a10b151665a9d0e69de7058eb29c4d1 (commit)
from c09730c9ccafacdd916b7ec1514d7159eb672e04 (commit)
commit 7ae9b8817a10b151665a9d0e69de7058eb29c4d1
Author: Andrzej
Date: Tue Feb 26 23:42:43 2013 +
Clock plugin: removed frame widget from calendar popup.
(Three devs considered the popup looking better without the frame.)
plugins/clock/clock.c |9 +
1 files changed, 1 insertions(+), 8 deletions(-)
diff --git a/plugins/clock/clock.c b/plugins/clock/clock.c
index f7161db..52705bc 100644
--- a/plugins/clock/clock.c
+++ b/plugins/clock/clock.c
@@ -1034,8 +1034,6 @@ clock_plugin_calendar_key_press_event (GtkWidget
*calendar_window,
static void
clock_plugin_popup_calendar (ClockPlugin *plugin)
{
- GtkWidget *calendar_frame;
-
if (plugin->calendar_window == NULL)
{
plugin->calendar_window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
@@ -1048,11 +1046,6 @@ clock_plugin_popup_calendar (ClockPlugin *plugin)
gtk_window_set_keep_above (GTK_WINDOW (plugin->calendar_window), TRUE);
gtk_window_stick (GTK_WINDOW (plugin->calendar_window));
- calendar_frame = gtk_frame_new (NULL);
- gtk_frame_set_shadow_type (GTK_FRAME (calendar_frame), GTK_SHADOW_OUT);
- gtk_container_add (GTK_CONTAINER (plugin->calendar_window),
calendar_frame);
- gtk_widget_show (calendar_frame);
-
plugin->calendar = gtk_calendar_new ();
gtk_calendar_set_display_options (GTK_CALENDAR (plugin->calendar),
GTK_CALENDAR_SHOW_HEADING
@@ -1062,7 +1055,7 @@ clock_plugin_popup_calendar (ClockPlugin *plugin)
G_CALLBACK (clock_plugin_calendar_show_event), plugin);
g_signal_connect (G_OBJECT (plugin->calendar_window), "key-press-event",
G_CALLBACK (clock_plugin_calendar_key_press_event),
plugin);
- gtk_container_add (GTK_CONTAINER (calendar_frame), plugin->calendar);
+ gtk_container_add (GTK_CONTAINER (plugin->calendar_window),
plugin->calendar);
gtk_widget_show (plugin->calendar);
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Clock plugin, updated information in tooltips.
Updating branch refs/heads/master to d05695e54ee7048d233bf858ecb1ba5abf6f30dc (commit) from 7ae9b8817a10b151665a9d0e69de7058eb29c4d1 (commit) commit d05695e54ee7048d233bf858ecb1ba5abf6f30dc Author: Andrzej Date: Wed Feb 27 00:14:52 2013 + Clock plugin, updated information in tooltips. plugins/clock/clock-dialog.glade |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/clock/clock-dialog.glade b/plugins/clock/clock-dialog.glade index abf0bef..ac35769 100644 --- a/plugins/clock/clock-dialog.glade +++ b/plugins/clock/clock-dialog.glade @@ -244,7 +244,7 @@ True True -The format describes the date and time parts to insert into the panel. For example, %Y will be substituted with the year, %m with the month and %d with the day. See the documentation of the date utility for additional information. +The format describes the date and time parts to insert into the panel. For example, %Y will be substituted with the year, %m with the month and %d with the day. Similarly, tags will make the text bold. See the "Help" page for additional information. False False True @@ -424,7 +424,7 @@ True True -The format describes the date and time parts to insert into the panel. For example, %Y will be substituted with the year, %m with the month and %d with the day. See the documentation of the date utility for additional information. +The format describes the date and time parts to insert into the panel. For example, %Y will be substituted with the year, %m with the month and %d with the day. Similarly, tags will make the text bold. See the "Help" page for additional information. False False True ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Clock plugin: fix double-click behavior when a command is set.
Updating branch refs/heads/master to 1438d76490266786b0524615e283779b7511cb42 (commit) from d05695e54ee7048d233bf858ecb1ba5abf6f30dc (commit) commit 1438d76490266786b0524615e283779b7511cb42 Author: Andrzej Date: Wed Feb 27 21:55:20 2013 + Clock plugin: fix double-click behavior when a command is set. plugins/clock/clock.c |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/plugins/clock/clock.c b/plugins/clock/clock.c index 52705bc..65767f4 100644 --- a/plugins/clock/clock.c +++ b/plugins/clock/clock.c @@ -437,6 +437,7 @@ clock_plugin_button_press_event (GtkWidget *widget, return TRUE; } + return TRUE; } /* bypass GTK_TOGGLE_BUTTON's handler and go directly to the plugin's one */ ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Clock plugin: make the calendar popup modal again.
Updating branch refs/heads/master
to 68825fb99cade800a90cdf28cb76ad9a1d377336 (commit)
from 1438d76490266786b0524615e283779b7511cb42 (commit)
commit 68825fb99cade800a90cdf28cb76ad9a1d377336
Author: Andrzej
Date: Wed Feb 27 21:57:56 2013 +
Clock plugin: make the calendar popup modal again.
To force a non-modal popup behavior, use a middle mouse button
or Ctrl+Btn1.
plugins/clock/clock.c | 128 +++--
1 files changed, 124 insertions(+), 4 deletions(-)
diff --git a/plugins/clock/clock.c b/plugins/clock/clock.c
index 65767f4..ed9f3c4 100644
--- a/plugins/clock/clock.c
+++ b/plugins/clock/clock.c
@@ -78,10 +78,22 @@ static void clock_plugin_screen_position_changed
(XfcePanelPlugin *p
static void clock_plugin_configure_plugin (XfcePanelPlugin
*panel_plugin);
static void clock_plugin_set_mode (ClockPlugin
*plugin);
static void clock_plugin_reposition_calendar (ClockPlugin
*plugin);
+static gboolean clock_plugin_pointer_grab (ClockPlugin
*plugin,
+GtkWidget
*widget,
+gboolean
keep);
+static void clock_plugin_pointer_ungrab(ClockPlugin
*plugin,
+GtkWidget
*widget);
+static gboolean clock_plugin_calendar_pointed (GtkWidget
*calendar_window,
+gdouble
x_root,
+gdouble
y_root);
+static gboolean clock_plugin_calendar_button_press_event (GtkWidget
*calendar_window,
+ GdkEventButton
*event,
+ ClockPlugin
*plugin);
static gboolean clock_plugin_calendar_key_press_event (GtkWidget
*calendar_window,
GdkEventKey
*event,
ClockPlugin
*plugin);
-static void clock_plugin_popup_calendar(ClockPlugin
*plugin);
+static void clock_plugin_popup_calendar(ClockPlugin
*plugin,
+gboolean
modal);
static void clock_plugin_hide_calendar (ClockPlugin
*plugin);
static gboolean clock_plugin_tooltip (gpointer
user_data);
@@ -134,6 +146,9 @@ struct _ClockPlugin
gchar *tooltip_format;
ClockTimeTimeout *tooltip_timeout;
+ GdkGrabStatus grab_pointer;
+ GdkGrabStatus grab_keyboard;
+
gchar *time_config_tool;
ClockTime *time;
};
@@ -408,7 +423,7 @@ clock_plugin_button_press_event (GtkWidget *widget,
{
GError *error = NULL;
- if (event->button == 1)
+ if (event->button == 1 || event->button == 2)
{
if (event->type == GDK_BUTTON_PRESS &&
exo_str_is_empty (plugin->command))
@@ -416,7 +431,8 @@ clock_plugin_button_press_event (GtkWidget *widget,
/* toggle calendar window visibility */
if (plugin->calendar_window == NULL
|| !gtk_widget_get_visible (GTK_WIDGET
(plugin->calendar_window)))
-clock_plugin_popup_calendar (plugin);
+clock_plugin_popup_calendar
+ (plugin, event->button == 1 && !(event->state &
GDK_CONTROL_MASK));
else
clock_plugin_hide_calendar (plugin);
@@ -1016,6 +1032,104 @@ clock_plugin_calendar_show_event (GtkWidget
*calendar_window,
+static void
+clock_plugin_pointer_ungrab (ClockPlugin *plugin,
+ GtkWidget *widget)
+{
+ if (plugin->grab_pointer == GDK_GRAB_SUCCESS)
+gdk_pointer_ungrab (GDK_CURRENT_TIME);
+ if (plugin->grab_keyboard == GDK_GRAB_SUCCESS)
+gdk_keyboard_ungrab (GDK_CURRENT_TIME);
+}
+
+
+
+static gboolean
+clock_plugin_pointer_grab (ClockPlugin *plugin,
+ GtkWidget *widget,
+ gboolean keep)
+{
+ GdkWindow *window;
+ gboolean grab_succeed = FALSE;
+ guint i;
+ GdkEventMask pointer_mask = GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+| GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK
+| GDK_POINTER_MOTION_MASK;
+
+ window = widget->window;
+
+ /* don't try to get the grab for longer then 1/4 second */
+ for (i = 0; i < (G_USEC_PER_SEC / 100 / 4); i++)
+{
+ plugin->grab_keyboard = gdk_keyboard_grab (window, TRUE,
GDK_CURRENT_TIME);
+ if (plugin->grab
[Xfce4-commits] Deleting branch andrzejr/clock-timezone
Deleting branch refs/heads/andrzejr/clock-timezone ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Updated Serbian (sr) translation to 100%
Updating branch refs/heads/master to 4ea3c523f2a54ca56f46ab291767ed4e791b23db (commit) from 0f52109c68876f33a2deef4131789cf5f03f870e (commit) commit 4ea3c523f2a54ca56f46ab291767ed4e791b23db Author: Саша Петровић Date: Sun Mar 3 14:41:36 2013 +0100 l10n: Updated Serbian (sr) translation to 100% New status: 225 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/sr.po | 168 -- 1 files changed, 109 insertions(+), 59 deletions(-) diff --git a/po/sr.po b/po/sr.po index 95799ea..55d03a5 100644 --- a/po/sr.po +++ b/po/sr.po @@ -2,21 +2,22 @@ # Copyright (C) 2012 # This file is distributed under the same license as the parole package. # salepetronije , 2012. -# Саша Петровић , 2012. -# +# Саша Петровић , 2012, 2013. +# msgid "" msgstr "" "Project-Id-Version: parole.master\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-23 16:03+\n" -"PO-Revision-Date: 2012-09-30 16:20+0200\n" +"POT-Creation-Date: 2013-03-02 18:54+\n" +"PO-Revision-Date: 2013-03-03 14:39+0100\n" "Last-Translator: Саша Петровић \n" -"Language-Team: српски \n" +"Language-Team: српски <>\n" +"Language: sr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: sr\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2) \n" "X-Generator: Gtranslator 2.91.5\n" #: ../data/interfaces/parole.ui.h:1 @@ -68,7 +69,7 @@ msgstr "Самостално" msgid "Buffering (0%)" msgstr "Смештам у међумеморију (0%)" -#: ../data/interfaces/parole.ui.h:12 ../src/parole-player.c:740 +#: ../data/interfaces/parole.ui.h:12 ../src/parole-player.c:750 msgid "Empty" msgstr "Празно" @@ -105,12 +106,13 @@ msgstr "Отвори скорашње" msgid "Open _Location" msgstr "Отвори _место" -#: ../data/interfaces/parole.ui.h:21 ../src/parole-about.c:68 +#: ../data/interfaces/parole.ui.h:21 ../data/desktop/parole.desktop.in.in.h:2 +#: ../src/parole-about.c:68 msgid "Parole Media Player" msgstr "Програм за пуштање звука и видеа Часноречац" -#: ../data/interfaces/parole.ui.h:22 ../src/parole-player.c:1398 -#: ../src/parole-player.c:1432 +#: ../data/interfaces/parole.ui.h:22 ../src/parole-player.c:1414 +#: ../src/parole-player.c:1448 msgid "Play" msgstr "Изведи" @@ -226,37 +228,42 @@ msgstr "Списак нумера диска" msgid "Play opened files" msgstr "Пусти отворене датотеке" -#: ../data/interfaces/playlist.ui.h:10 ../src/parole-medialist.c:784 -#: ../src/parole-player.c:3033 +#: ../data/interfaces/playlist.ui.h:10 ../src/parole-medialist.c:805 +#: ../src/parole-player.c:3074 msgid "Playlist" msgstr "Списак нумера" -#: ../data/interfaces/playlist.ui.h:11 +#: ../data/interfaces/playlist.ui.h:11 ../src/parole-medialist.c:993 +#: ../src/parole-medialist.c:1137 +msgid "Playlist empty" +msgstr "Списка нумера је празан" + +#: ../data/interfaces/playlist.ui.h:12 msgid "Playlist options" msgstr "Могућности списка нумера" -#: ../data/interfaces/playlist.ui.h:12 +#: ../data/interfaces/playlist.ui.h:13 #: ../data/interfaces/parole-settings.ui.h:17 msgid "Remember playlist" msgstr "Запамти списак нумера" -#: ../data/interfaces/playlist.ui.h:13 +#: ../data/interfaces/playlist.ui.h:14 msgid "Remove" msgstr "Уклони" -#: ../data/interfaces/playlist.ui.h:14 +#: ../data/interfaces/playlist.ui.h:15 msgid "Repeat" msgstr "Понови" -#: ../data/interfaces/playlist.ui.h:15 +#: ../data/interfaces/playlist.ui.h:16 msgid "Replace playlist when opening files" msgstr "Замени списак нумера приликом отварања датотека" -#: ../data/interfaces/playlist.ui.h:16 +#: ../data/interfaces/playlist.ui.h:17 msgid "Shuffle" msgstr "Насумично" -#: ../data/interfaces/playlist.ui.h:17 +#: ../data/interfaces/playlist.ui.h:18 msgid "Title Menu" msgstr "Изборник поглавља" @@ -405,8 +412,20 @@ msgid "Open Network Location" msgstr "Отвори место на мрежи" #: ../data/desktop/parole.desktop.in.in.h:1 -msgid "Parole" -msgstr "Часноречац" +msgid "Next Track" +msgstr "Следећи запис" + +#: ../data/desktop/parole.desktop.in.in.h:3 +msgid "Play your media" +msgstr "Изведи садржај" + +#: ../data/desktop/parole.desktop.in.in.h:4 +msgid "Play/Pause" +msgstr "Изведи/застани" + +#: ../data/desktop/parole.desktop.in.in.h:5 +msgid "Previous Track" +msgstr "Претходна ставка" #: ../src/common/parole-common.c:67 msgid "Message" @@ -416,7 +435,7 @@ msgstr "Порука" msgid "Error" msgstr "Грeшкa" -#: ../src/gst/parole-gst.c:1370 ../src/parole-medialist.c:356 +#: ../src/gst/parole-gst.c:1370 ../src/parole-medialist.c:377 #, c-format msgid "Track %i" msgstr "Звучна нумера #%d" @@ -458,12 +477,12 @@ msgid "" msgstr "" "Не могу да учитам видео прикључак Гстримера, проверите инсталацију
[Xfce4-commits] l10n: Updated Serbian (sr) translation to 99%
Updating branch refs/heads/master to 26436355562e7df6cef1364917e242fd26b5222f (commit) from 68825fb99cade800a90cdf28cb76ad9a1d377336 (commit) commit 26436355562e7df6cef1364917e242fd26b5222f Author: Саша Петровић Date: Sun Mar 3 14:49:43 2013 +0100 l10n: Updated Serbian (sr) translation to 99% New status: 392 messages complete with 0 fuzzies and 1 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/sr.po | 179 +++--- 1 files changed, 102 insertions(+), 77 deletions(-) diff --git a/po/sr.po b/po/sr.po index af58685..2dea6d9 100644 --- a/po/sr.po +++ b/po/sr.po @@ -3,16 +3,15 @@ msgid "" msgstr "" "Project-Id-Version: xfce4-panel 4.8.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-20 04:48+\n" +"POT-Creation-Date: 2013-03-03 13:18+\n" "PO-Revision-Date: 2012-06-20 11:16+0200\n" "Last-Translator: salepetronije \n" "Language-Team: српски \n" -"Language: sr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" -"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Language: sr\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #: ../panel-desktop-handler.desktop.in.h:1 msgid "" @@ -208,7 +207,7 @@ msgstr[0] "Направи нови покретач из %d датотеке р msgstr[1] "Направи нови покретач из %d датотеке радне површи" msgstr[2] "Направи нови покретач из %d датотека радне површи" -#: ../panel/panel-application.c:1719 +#: ../panel/panel-application.c:1725 msgid "" "You have started X without session manager. Clicking Quit will close the X " "server." @@ -216,11 +215,11 @@ msgstr "" "Покренули сте Икс без управника сесије. Клик на „Изађи“ ће затворити Икс " "сервер." -#: ../panel/panel-application.c:1720 +#: ../panel/panel-application.c:1726 msgid "Are you sure you want to quit the panel?" msgstr "Да ли сте сигурни да желите да затворите панел?" -#: ../panel/panel-application.c:1728 +#: ../panel/panel-application.c:1734 #, c-format msgid "Failed to execute command \"%s\"" msgstr "Нисам успео да извршим наредбу „%s“" @@ -229,8 +228,8 @@ msgstr "Нисам успео да извршим наредбу „%s“" msgid "" "Invalid plugin event syntax specified. Use PLUGIN-NAME:NAME[:TYPE:VALUE]." msgstr "" -"Наведен је неисправан садржај догађаја прикључка. Употребите " -"НАЗИВ-ПРИКЉУЧКА:НАЗИВ[:ВРСТА:ВРЕДНОСТ]." +"Наведен је неисправан садржај догађаја прикључка. Употребите НАЗИВ-ПРИКЉУЧКА:" +"НАЗИВ[:ВРСТА:ВРЕДНОСТ]." #: ../panel/panel-dbus-client.c:244 #, c-format @@ -432,8 +431,7 @@ msgstr "Уредите тренутно изабрану ставку" msgid "" "Enable compositing in the window manager for opacity settings in the panel." msgstr "" -"Укључите копозитност у управнику прозора за подешавања провидности на " -"панелу." +"Укључите копозитност у управнику прозора за подешавања провидности на панелу." #: ../panel/panel-preferences-dialog.glade.h:15 #: ../plugins/actions/actions-dialog.glade.h:4 @@ -941,7 +939,7 @@ msgstr "Изаберите иконицу" #: ../plugins/applicationsmenu/applicationsmenu.c:603 #: ../plugins/applicationsmenu/applicationsmenu.c:844 -#: ../plugins/launcher/launcher.c:2308 +#: ../plugins/clock/clock.c:852 ../plugins/launcher/launcher.c:2308 #, c-format msgid "Failed to execute command \"%s\"." msgstr "Нисам успео да извршим наредбу „%s“." @@ -988,15 +986,15 @@ msgstr "Искачући изборник на тренутном положај msgid "Show help options" msgstr "Прикажи могућности помоћи" -#: ../plugins/clock/clock.c:146 +#: ../plugins/clock/clock.c:167 msgid "Week %V" msgstr "Седмица %V" -#: ../plugins/clock/clock.c:407 +#: ../plugins/clock/clock.c:450 msgid "Failed to execute clock command" msgstr "Нисам успео да извршим наредбу сата" -#: ../plugins/clock/clock.c:729 +#: ../plugins/clock/clock.c:797 msgid "Custom Format" msgstr "Прилагођени формат" @@ -1052,13 +1050,14 @@ msgid "LCD" msgstr "ТКД" #: ../plugins/clock/clock-dialog.glade.h:15 -msgid "Sho_w AM/PM" -msgstr "Прикаж_и ПрП/ПоП" +msgid "" +"Name of the timezone matching the system's timezone database. Leave empty to " +"revert to the local time." +msgstr "Назив временске области која одговара врменској области система. Оставите празно за враћање на мсно време." #: ../plugins/clock/clock-dialog.glade.h:16 -#: ../plugins/systray/systray-dialog.glade.h:5 -msgid "Show _frame" -msgstr "Прикажи _оквир" +msgid "Sho_w AM/PM" +msgstr "Прикаж_и ПрП/ПоП" #: ../plugins/clock/clock-dialog.glade.h:17 msgid "Show _inactive dots" @@ -1068,254 +1067,276 @@ msgstr "Прикажи _неактивне тачке" msgid "Show gri_d" msgstr "Прикажи решетк_у" -#: ../plugins/clock/clock-dialog.glade.h:20 +#: ../plugins/clock/clock-dialog.glade.h:19 +msgid "" +"Start a tool for setting the system time and date. If the button is grayed " +"out, check the
[Xfce4-commits] l10n: Updated Serbian (sr) translation to 100%
Updating branch refs/heads/master to 0ed19c84ecd2209b72dbef3e9b0a96d5c08d6e89 (commit) from 26436355562e7df6cef1364917e242fd26b5222f (commit) commit 0ed19c84ecd2209b72dbef3e9b0a96d5c08d6e89 Author: Саша Петровић Date: Sun Mar 3 14:51:42 2013 +0100 l10n: Updated Serbian (sr) translation to 100% New status: 393 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/sr.po |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/sr.po b/po/sr.po index 2dea6d9..c18ec27 100644 --- a/po/sr.po +++ b/po/sr.po @@ -1071,7 +1071,7 @@ msgstr "Прикажи решетк_у" msgid "" "Start a tool for setting the system time and date. If the button is grayed " "out, check the \"Help\" page to see how to configure it correctly." -msgstr "" +msgstr "Покрени алатку за подешавање времена и датума система. Ако је дугме осенчано, проверите на страници „Помоћ“ како да га подесите исправно." #: ../plugins/clock/clock-dialog.glade.h:21 #, no-c-format ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] Fix warnings and add workspace-changed signal
Updating branch refs/heads/eric/wallpaper-and-settings-improvements to d51fb8ba1ca31f1f66f2855c4e514b80b88b15de (commit) from 59921a68c40f8115460553ae69bde5bda3bc7d76 (commit) commit d51fb8ba1ca31f1f66f2855c4e514b80b88b15de Author: Eric Koegel Date: Sun Mar 3 16:53:06 2013 +0300 Fix warnings and add workspace-changed signal Removed the code attempting to bind to the brightness setting since that functionality was removed. In xfdesktop-settings connect to the workspace-changed signal to properly update the image_iconview. settings/main.c |4 src/xfce-workspace.c |5 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/settings/main.c b/settings/main.c index d0d7996..239eab1 100644 --- a/settings/main.c +++ b/settings/main.c @@ -1158,8 +1158,12 @@ xfdesktop_settings_dialog_setup_tabs(GtkBuilder *main_gxml, if(wnck_window == NULL) wnck_window = wnck_screen_get_active_window(wnck_screen); +/* These callbacks are for updating the image_iconview when the window + * moves to another monitor or workspace */ g_signal_connect(wnck_window, "geometry-changed", G_CALLBACK(cb_update_background_tab), panel); +g_signal_connect(wnck_window, "workspace-changed", + G_CALLBACK(cb_update_background_tab), panel); /* send invalid numbers so that the update_background_tab will update everything */ panel->monitor = -1; diff --git a/src/xfce-workspace.c b/src/xfce-workspace.c index 1775fe9..eeb131b 100644 --- a/src/xfce-workspace.c +++ b/src/xfce-workspace.c @@ -364,11 +364,6 @@ xfce_workspace_connect_backdrop_settings(XfceWorkspace *workspace, G_OBJECT(backdrop), "image-style"); buf[pp_len] = 0; -g_strlcat(buf, "brightness", sizeof(buf)); -xfconf_g_property_bind(channel, buf, G_TYPE_INT, - G_OBJECT(backdrop), "brightness"); - -buf[pp_len] = 0; g_strlcat(buf, "backdrop-cycle-enable", sizeof(buf)); xfconf_g_property_bind(channel, buf, G_TYPE_BOOLEAN, G_OBJECT(backdrop), "backdrop-cycle-enable"); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Updated Dutch (Flemish) (nl) translation to 100%
Updating branch refs/heads/master to ebe0af48f83e2ebe3970bf8e0b347993cdabd0e3 (commit) from 0ed19c84ecd2209b72dbef3e9b0a96d5c08d6e89 (commit) commit ebe0af48f83e2ebe3970bf8e0b347993cdabd0e3 Author: Pjotr vertaalt Date: Sun Mar 3 15:18:00 2013 +0100 l10n: Updated Dutch (Flemish) (nl) translation to 100% New status: 393 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/nl.po | 175 -- 1 files changed, 101 insertions(+), 74 deletions(-) diff --git a/po/nl.po b/po/nl.po index b737c6c..f25409f 100644 --- a/po/nl.po +++ b/po/nl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: xfce4-panel\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-04-16 17:12+\n" +"POT-Creation-Date: 2013-03-03 13:18+\n" "PO-Revision-Date: 2011-09-24 20:43+0200\n" "Last-Translator: Pjotr\n" "Language-Team: Dutch (Flemish)\n" @@ -191,15 +191,15 @@ msgstr "" msgid "No running instance of %s was found" msgstr "Geen actieve instantie van %s gevonden" -#: ../panel/panel-application.c:212 +#: ../panel/panel-application.c:216 msgid "Failed to launch the migration application" msgstr "Kon de migratietoepassing niet openen" -#: ../panel/panel-application.c:936 +#: ../panel/panel-application.c:982 msgid "Create _Launcher" msgstr "Maak starter" -#: ../panel/panel-application.c:937 +#: ../panel/panel-application.c:983 msgid "" "This will create a new launcher plugin on the panel and inserts the dropped " "files as menu items." @@ -207,14 +207,14 @@ msgstr "" "Dit zal een nieuwe starter toevoegen aan de werkbalk en voegt de geplaatste " "bestanden in als menu-onderdelen." -#: ../panel/panel-application.c:939 +#: ../panel/panel-application.c:985 #, c-format msgid "Create new launcher from %d desktop file" msgid_plural "Create new launcher from %d desktop files" msgstr[0] "Maak een nieuwe starter van %d bureaubladbestand" msgstr[1] "Maak een nieuwe starter van %d bureaubladbestanden" -#: ../panel/panel-application.c:1673 +#: ../panel/panel-application.c:1725 msgid "" "You have started X without session manager. Clicking Quit will close the X " "server." @@ -222,11 +222,11 @@ msgstr "" "U hebt X (de grafische omgeving) gestart zonder sessiebeheerder. Wanneer u " "op sluiten klikt, dan zal dat de grafische omgeving afsluiten." -#: ../panel/panel-application.c:1674 +#: ../panel/panel-application.c:1726 msgid "Are you sure you want to quit the panel?" msgstr "Weet u zeker dat u de werkbalk wil afsluiten?" -#: ../panel/panel-application.c:1682 +#: ../panel/panel-application.c:1734 #, c-format msgid "Failed to execute command \"%s\"" msgstr "Kon de opdracht '%s' niet uitvoeren" @@ -952,7 +952,7 @@ msgstr "Selecteer een pictogram" #: ../plugins/applicationsmenu/applicationsmenu.c:603 #: ../plugins/applicationsmenu/applicationsmenu.c:844 -#: ../plugins/launcher/launcher.c:2308 +#: ../plugins/clock/clock.c:852 ../plugins/launcher/launcher.c:2308 #, c-format msgid "Failed to execute command \"%s\"." msgstr "Kon opdracht '%s' niet uitvoeren." @@ -999,15 +999,15 @@ msgstr "Opduikmenu gebruiken bij de huidige muispositie" msgid "Show help options" msgstr "Toon hulpopties" -#: ../plugins/clock/clock.c:146 +#: ../plugins/clock/clock.c:167 msgid "Week %V" msgstr "Week %V" -#: ../plugins/clock/clock.c:407 +#: ../plugins/clock/clock.c:450 msgid "Failed to execute clock command" msgstr "Kon de klokopdracht niet uitvoeren" -#: ../plugins/clock/clock.c:729 +#: ../plugins/clock/clock.c:797 msgid "Custom Format" msgstr "Aangepaste bestandopmaak" @@ -1063,13 +1063,14 @@ msgid "LCD" msgstr "LCD" #: ../plugins/clock/clock-dialog.glade.h:15 -msgid "Sho_w AM/PM" -msgstr "AM/PM t_onen" +msgid "" +"Name of the timezone matching the system's timezone database. Leave empty to " +"revert to the local time." +msgstr "Naam van de tijdzone, in overeenstemming met de tijdzone-gegevensbank van het systeem. Laat leeg om terug te vallen op de plaatselijke tijd." #: ../plugins/clock/clock-dialog.glade.h:16 -#: ../plugins/systray/systray-dialog.glade.h:5 -msgid "Show _frame" -msgstr "Omlijsting tonen" +msgid "Sho_w AM/PM" +msgstr "AM/PM t_onen" #: ../plugins/clock/clock-dialog.glade.h:17 msgid "Show _inactive dots" @@ -1079,255 +1080,277 @@ msgstr "_Inactieve punten weergeven" msgid "Show gri_d" msgstr "_Raster weergeven" -#: ../plugins/clock/clock-dialog.glade.h:20 +#: ../plugins/clock/clock-dialog.glade.h:19 +msgid "" +"Start a tool for setting the system time and date. If the button is grayed " +"out, check the \"Help\" page to see how to configure it correctly." +msgstr "Start een gereedschapje om de tijd en datum van het systeem in te stellen. Indien de knop is uitgegrijsd, kunt u de 'Hulp'-pagina oproepen om te zien hoe u het correct kunt instellen." + +#: ../plugins/clock/clock-dialog.glade.h:21 #, no-c-format msgid
[Xfce4-commits] l10n: Updated Portuguese (pt) translation to 100%
Updating branch refs/heads/master to d8ebf3090bc98bda7a3e91792bc29cae639f566b (commit) from 0a89042c7b5dbac29f1d01471d759610ebb3ade6 (commit) commit d8ebf3090bc98bda7a3e91792bc29cae639f566b Author: Sergio Marques Date: Sun Mar 3 20:47:31 2013 +0100 l10n: Updated Portuguese (pt) translation to 100% New status: 4 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/pt.po |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/po/pt.po b/po/pt.po index c0bdba1..9a850b0 100644 --- a/po/pt.po +++ b/po/pt.po @@ -3,7 +3,7 @@ # This file is distributed under the same license as the xfce4-eyes package. # Nuno Donato , 2004. # Nuno Miguel , 2007. -# +# msgid "" msgstr "" "Project-Id-Version: xfce4-eyes 4.3.0\n" @@ -12,10 +12,10 @@ msgstr "" "PO-Revision-Date: 2007-06-14 23:31+0100\n" "Last-Translator: Nuno Miguel \n" "Language-Team: Portuguese \n" -"Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: pt\n" #: ../panel-plugin/eyes.c:324 ../panel-plugin/eyes.desktop.in.h:1 msgid "Eyes" @@ -27,7 +27,7 @@ msgstr "_Selecione um tema:" #: ../panel-plugin/eyes.c:377 msgid "Use single _row in multi-row panel" -msgstr "" +msgstr "Utiliza_r uma linha no painel multi-linha" #: ../panel-plugin/eyes.desktop.in.h:2 msgid "Eyes that spy on you" ___ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] l10n: Updated Portuguese (pt) translation to 100%
Updating branch refs/heads/master to ccb6dd6ec4c981eb6cb63423e190216522630569 (commit) from 4a9642142e9655f5d1e703f6b4042ad011f60b2e (commit) commit ccb6dd6ec4c981eb6cb63423e190216522630569 Author: Sergio Marques Date: Sun Mar 3 20:55:25 2013 +0100 l10n: Updated Portuguese (pt) translation to 100% New status: 682 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/pt.po | 141 -- 1 files changed, 73 insertions(+), 68 deletions(-) diff --git a/po/pt.po b/po/pt.po index 8a83797..19784b7 100644 --- a/po/pt.po +++ b/po/pt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: midori\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-02-27 15:48+\n" +"POT-Creation-Date: 2013-03-03 16:06+\n" "PO-Revision-Date: \n" "Last-Translator: Sérgio Marques \n" "Language-Team: Portuguese\n" @@ -29,7 +29,7 @@ msgstr "Internet;WWW;Explorador" #: ../data/midori.desktop.in.h:3 ../midori/main.c:162 #: ../midori/midori-app.c:1443 ../midori/midori-websettings.c:201 -#: ../midori/midori-view.c:3775 +#: ../midori/midori-view.c:3777 msgid "Midori" msgstr "Midori" @@ -61,7 +61,7 @@ msgstr "Midori (Navegação privada)" msgid "Open a new private browsing window" msgstr "Abrir nova janela de navegação privada" -#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4079 +#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4081 msgid "Private Browsing" msgstr "Navegação privada" @@ -400,8 +400,8 @@ msgstr "Abrir todos em _separadores" msgid "Open in New _Tab" msgstr "Abrir em novo _separador" -#: ../midori/midori-browser.c:4217 ../midori/midori-view.c:2684 -#: ../midori/midori-view.c:4554 ../panels/midori-bookmarks.c:843 +#: ../midori/midori-browser.c:4217 ../midori/midori-view.c:2686 +#: ../midori/midori-view.c:4556 ../panels/midori-bookmarks.c:843 #: ../panels/midori-history.c:801 ../extensions/feed-panel/feed-panel.c:515 msgid "Open in New _Window" msgstr "Abrir em nova _janela" @@ -1110,269 +1110,269 @@ msgstr "O valor de configuração \"%s\" é inválido " msgid "Failed to inject stylesheet: %s" msgstr "Falha ao injetar a folha de estilo: %s" -#: ../midori/midori-view.c:726 ../midori/midori-view.c:870 +#: ../midori/midori-view.c:728 ../midori/midori-view.c:872 msgid "Trust this website" msgstr "Confiar neste sítio web" -#: ../midori/midori-view.c:868 +#: ../midori/midori-view.c:870 msgid "Security unknown" msgstr "Segurança desconhecida" -#: ../midori/midori-view.c:1171 +#: ../midori/midori-view.c:1173 #, c-format msgid "%s wants to save an HTML5 database." msgstr "%s pretende gravar uma base de dados HTML5." -#: ../midori/midori-view.c:1175 ../midori/midori-view.c:1207 +#: ../midori/midori-view.c:1177 ../midori/midori-view.c:1209 msgid "_Deny" msgstr "_Rejeitar" -#: ../midori/midori-view.c:1175 ../midori/midori-view.c:1207 +#: ../midori/midori-view.c:1177 ../midori/midori-view.c:1209 msgid "_Allow" msgstr "_Permitir" -#: ../midori/midori-view.c:1203 +#: ../midori/midori-view.c:1205 #, c-format msgid "%s wants to know your location." msgstr "%s pretende saber a sua localização." -#: ../midori/midori-view.c:1334 +#: ../midori/midori-view.c:1336 #, c-format msgid "Error - %s" msgstr "Erro - %s" -#: ../midori/midori-view.c:1335 +#: ../midori/midori-view.c:1337 #, c-format msgid "The page '%s' couldn't be loaded." msgstr "A página \"%s\" não foi carregada." -#: ../midori/midori-view.c:1337 +#: ../midori/midori-view.c:1339 msgid "Try again" msgstr "Tente novamente" -#: ../midori/midori-view.c:1539 ../midori/midori-view.c:2625 +#: ../midori/midori-view.c:1541 ../midori/midori-view.c:2627 #, c-format msgid "Send a message to %s" msgstr "Enviar mensagem a %s" -#: ../midori/midori-view.c:2413 +#: ../midori/midori-view.c:2415 msgid "Add _search engine..." msgstr "Adicionar motor de pe_squisa" -#: ../midori/midori-view.c:2456 ../midori/midori-view.c:2760 +#: ../midori/midori-view.c:2458 ../midori/midori-view.c:2762 msgid "Inspect _Element" msgstr "Inspecionar _elementos" -#: ../midori/midori-view.c:2508 +#: ../midori/midori-view.c:2510 msgid "Open Link in New _Tab" msgstr "_Abrir ligação em novo separador" -#: ../midori/midori-view.c:2512 +#: ../midori/midori-view.c:2514 msgid "Open Link in _Foreground Tab" msgstr "Abrir ligação no _separador principal" -#: ../midori/midori-view.c:2513 +#: ../midori/midori-view.c:2515 msgid "Open Link in _Background Tab" msgstr "Abrir _ligação no separador secundário" -#: ../midori/midori-view.c:2516 +#: ../midori/midori-view.c:2518 msgid "Open Link in New _Window" msgstr "Abrir ligação em _nova janela" -#: ../midori/midori-view.c:2519 +#: ../midori/midori-view.c:2521 msgid "Open Link as Web A_pplication" msgstr "Abrir ligação como a_plicação web" -#: ../midori/midori-view.c:2524 +#: ../midori/midori-view.c:252
