[Xfce4-commits] xfce4-settings:master Make the display settings dialog pluggable (Bug #6524).
Updating branch refs/heads/master
to e062536bd06ad2d7f0258030c528845ce74d4bc9 (commit)
from 03ab97102f8b277739e7d13ad35943ef734deb7f (commit)
commit e062536bd06ad2d7f0258030c528845ce74d4bc9
Author: Jérôme Guelfucci jero...@xfce.org
Date: Sun Aug 29 11:59:07 2010 +0200
Make the display settings dialog pluggable (Bug #6524).
dialogs/display-settings/display-dialog.glade | 11 +-
dialogs/display-settings/main.c| 39 ++--
.../xfce-display-settings.desktop.in |1 +
3 files changed, 39 insertions(+), 12 deletions(-)
diff --git a/dialogs/display-settings/display-dialog.glade
b/dialogs/display-settings/display-dialog.glade
index e0ddf8c..dcc0af4 100644
--- a/dialogs/display-settings/display-dialog.glade
+++ b/dialogs/display-settings/display-dialog.glade
@@ -18,7 +18,7 @@
property name=orientationvertical/property
property name=spacing2/property
child
- object class=GtkHBox id=hbox1
+ object class=GtkHBox id=plug-child
property name=visibleTrue/property
property name=border_width12/property
property name=spacing12/property
@@ -52,8 +52,14 @@
child
object class=GtkCheckButton id=output-on
property name=label translatable=yes_Use this
output/property
+property name=can_focusFalse/property
+property name=receives_defaultFalse/property
property name=use_underlineTrue/property
+property name=draw_indicatorFalse/property
/object
+ packing
+property name=position0/property
+ /packing
/child
child
object class=GtkTable id=table1
@@ -169,6 +175,9 @@
/packing
/child
/object
+ packing
+property name=position1/property
+ /packing
/child
/object
packing
diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
index 42ad2cd..06efeb8 100644
--- a/dialogs/display-settings/main.c
+++ b/dialogs/display-settings/main.c
@@ -94,16 +94,14 @@ typedef struct
/* Option entries */
+static GdkNativeWindow opt_socket_id = 0;
static gboolean opt_version = FALSE;
static gboolean minimal = FALSE;
static GOptionEntry option_entries[] =
{
+{ socket-id, 's', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_INT,
opt_socket_id, N_(Settings manager socket), N_(SOCKET ID) },
{ version, 'v', 0, G_OPTION_ARG_NONE, opt_version, N_(Version
information), NULL },
-{
-minimal, 'm', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, minimal,
-N_(Minimal interface to set up an external output),
-NULL
-},
+{ minimal, 'm', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_NONE, minimal,
N_(Minimal interface to set up an external output), NULL},
{ NULL }
};
@@ -1020,10 +1018,12 @@ display_settings_minimal_dialog_response (GtkDialog
*dialog,
gint
main (gint argc, gchar **argv)
{
-GtkWidget *dialog;
GtkBuilder *builder;
-GError *error = NULL;
GdkDisplay *display;
+GtkWidget *dialog;
+GtkWidget *plug;
+GObject *plug_child;
+GError *error = NULL;
gboolean succeeded = TRUE;
gint event_base, error_base;
guintfirst, second;
@@ -1151,8 +1151,6 @@ main (gint argc, gchar **argv)
{
/* Build the dialog */
dialog = display_settings_dialog_new (builder);
-g_signal_connect (G_OBJECT (dialog), response, G_CALLBACK
(display_settings_dialog_response), builder);
-
XFCE_RANDR_EVENT_BASE (xfce_randr) = event_base;
/* Set up notifications */
XRRSelectInput (gdk_x11_display_get_xdisplay (display),
@@ -1163,14 +1161,33 @@ main (gint argc, gchar **argv)
RRNotify + 1);
gdk_window_add_filter (gdk_get_default_root_window (),
screen_on_event, builder);
-/* Show the dialog */
-gtk_widget_show (dialog);
+if (G_UNLIKELY (opt_socket_id == 0))
+{
+g_signal_connect (G_OBJECT (dialog), response,
G_CALLBACK (display_settings_dialog_response), builder);
+
+/* Show the dialog */
+gtk_widget_show (dialog);
+}
+else
+{
+/* Create plug widget */
+plug = gtk_plug_new (opt_socket_id);
+g_signal_connect (plug, delete-event, G_CALLBACK
(gtk_main_quit), NULL);
+gtk_widget_show (plug);
+
+/* Get plug child widget */
+plug_child =
[Xfce4-commits] xfce4-settings:master Remove trailing white spaces and tabs.
Updating branch refs/heads/master
to d238878571ce1798aeba7ae5fa50c5cf4215dd8d (commit)
from e062536bd06ad2d7f0258030c528845ce74d4bc9 (commit)
commit d238878571ce1798aeba7ae5fa50c5cf4215dd8d
Author: Jérôme Guelfucci jero...@xfce.org
Date: Sun Aug 29 12:16:20 2010 +0200
Remove trailing white spaces and tabs.
xfsettingsd/main.c |4 +-
xfsettingsd/registry.c | 155
2 files changed, 79 insertions(+), 80 deletions(-)
diff --git a/xfsettingsd/main.c b/xfsettingsd/main.c
index 6bcd091..23a4e5f 100644
--- a/xfsettingsd/main.c
+++ b/xfsettingsd/main.c
@@ -179,7 +179,7 @@ main(int argc, char **argv)
GDK_DISPLAY_XDISPLAY(gdpy),
screen);
registries = g_list_append(registries, registry);
-
+
xsettings_registry_load(registry, debug);
xsettings_registry_notify(registry);
@@ -200,7 +200,7 @@ main(int argc, char **argv)
if(!fork())
{
gtk_main();
-
+
xfconf_shutdown();
}
}
diff --git a/xfsettingsd/registry.c b/xfsettingsd/registry.c
index 89dc3fd..5364491 100644
--- a/xfsettingsd/registry.c
+++ b/xfsettingsd/registry.c
@@ -196,7 +196,7 @@ xsettings_registry_process_event (XSettingsRegistry
*registry, XEvent *xevent)
}
enum {
- XSETTINGS_REGISTRY_PROPERTY_CHANNEL = 1,
+XSETTINGS_REGISTRY_PROPERTY_CHANNEL = 1,
XSETTINGS_REGISTRY_PROPERTY_DISPLAY,
XSETTINGS_REGISTRY_PROPERTY_SCREEN,
XSETTINGS_REGISTRY_PROPERTY_XSETTINGS_ATOM,
@@ -207,29 +207,29 @@ enum {
void
xsettings_registry_class_init(XSettingsRegistryClass *reg_class)
{
- GObjectClass *object_class = G_OBJECT_CLASS(reg_class);
- GParamSpec *pspec;
+ GObjectClass *object_class = G_OBJECT_CLASS(reg_class);
+ GParamSpec *pspec;
- object_class-set_property = xsettings_registry_set_property;
- object_class-get_property = xsettings_registry_get_property;
+ object_class-set_property = xsettings_registry_set_property;
+ object_class-get_property = xsettings_registry_get_property;
- pspec = g_param_spec_object(channel, NULL, NULL, XFCONF_TYPE_CHANNEL,
XSETTINGS_PARAM_FLAGS);
- g_object_class_install_property(object_class,
XSETTINGS_REGISTRY_PROPERTY_CHANNEL, pspec);
+ pspec = g_param_spec_object(channel, NULL, NULL, XFCONF_TYPE_CHANNEL,
XSETTINGS_PARAM_FLAGS);
+ g_object_class_install_property(object_class,
XSETTINGS_REGISTRY_PROPERTY_CHANNEL, pspec);
- pspec = g_param_spec_int(screen, NULL, NULL, -1, 65535, -1,
XSETTINGS_PARAM_FLAGS);
- g_object_class_install_property(object_class,
XSETTINGS_REGISTRY_PROPERTY_SCREEN, pspec);
+ pspec = g_param_spec_int(screen, NULL, NULL, -1, 65535, -1,
XSETTINGS_PARAM_FLAGS);
+ g_object_class_install_property(object_class,
XSETTINGS_REGISTRY_PROPERTY_SCREEN, pspec);
- pspec = g_param_spec_pointer(display, NULL, NULL,
XSETTINGS_PARAM_FLAGS);
- g_object_class_install_property(object_class,
XSETTINGS_REGISTRY_PROPERTY_DISPLAY, pspec);
+ pspec = g_param_spec_pointer(display, NULL, NULL, XSETTINGS_PARAM_FLAGS);
+ g_object_class_install_property(object_class,
XSETTINGS_REGISTRY_PROPERTY_DISPLAY, pspec);
- pspec = g_param_spec_long(xsettings-atom, NULL, NULL, G_MINLONG,
G_MAXLONG, 0, XSETTINGS_PARAM_FLAGS);
- g_object_class_install_property(object_class,
XSETTINGS_REGISTRY_PROPERTY_XSETTINGS_ATOM, pspec);
+ pspec = g_param_spec_long(xsettings-atom, NULL, NULL, G_MINLONG,
G_MAXLONG, 0, XSETTINGS_PARAM_FLAGS);
+ g_object_class_install_property(object_class,
XSETTINGS_REGISTRY_PROPERTY_XSETTINGS_ATOM, pspec);
- pspec = g_param_spec_long(selection-atom, NULL, NULL, G_MINLONG,
G_MAXLONG, 0, XSETTINGS_PARAM_FLAGS);
- g_object_class_install_property(object_class,
XSETTINGS_REGISTRY_PROPERTY_SELECTION_ATOM, pspec);
+ pspec = g_param_spec_long(selection-atom, NULL, NULL, G_MINLONG,
G_MAXLONG, 0, XSETTINGS_PARAM_FLAGS);
+ g_object_class_install_property(object_class,
XSETTINGS_REGISTRY_PROPERTY_SELECTION_ATOM, pspec);
- pspec = g_param_spec_long(window, NULL, NULL, G_MINLONG, G_MAXLONG,
0, XSETTINGS_PARAM_FLAGS);
- g_object_class_install_property(object_class,
XSETTINGS_REGISTRY_PROPERTY_WINDOW, pspec);
+ pspec = g_param_spec_long(window, NULL, NULL, G_MINLONG, G_MAXLONG, 0,
XSETTINGS_PARAM_FLAGS);
+ g_object_class_install_property(object_class,
XSETTINGS_REGISTRY_PROPERTY_WINDOW, pspec);
}
/**
@@ -319,7 +319,7 @@ xsettings_registry_store_xrdb(XSettingsRegistry *registry)
{
/* create file contents */
const gchar *xft_rgba = g_value_get_string
(properties[XSETTING_ENTRY_XFT_RGBA].value);
-
+
string = g_string_sized_new (80);
g_string_append_printf (string, Xft.antialias: %d\n
Xft.hinting: %d\n
@@ -327,12 +327,12 @@
[Xfce4-commits] tumbler:master Link plugins against libtumbler-1. Should fix builds with --as-needed.
Updating branch refs/heads/master to c6f35999bd4be21ae431325180410fa481f83533 (commit) from 6a0db26c79637a053b85b1bc10f4b45dd52a3c6d (commit) commit c6f35999bd4be21ae431325180410fa481f83533 Author: Jannis Pohlmann jan...@xfce.org Date: Sun Aug 29 12:55:23 2010 +0200 Link plugins against libtumbler-1. Should fix builds with --as-needed. plugins/ffmpeg-thumbnailer/Makefile.am |6 +- plugins/font-thumbnailer/Makefile.am|6 +- plugins/jpeg-thumbnailer/Makefile.am|6 +- plugins/pixbuf-thumbnailer/Makefile.am |4 plugins/poppler-thumbnailer/Makefile.am |4 plugins/xdg-cache/Makefile.am |4 6 files changed, 27 insertions(+), 3 deletions(-) diff --git a/plugins/ffmpeg-thumbnailer/Makefile.am b/plugins/ffmpeg-thumbnailer/Makefile.am index 1aae717..de3e567 100644 --- a/plugins/ffmpeg-thumbnailer/Makefile.am +++ b/plugins/ffmpeg-thumbnailer/Makefile.am @@ -1,6 +1,6 @@ # vi:set ts=8 sw=8 noet ai nocindent: # - -# Copyright (c) 2009 Jannis Pohlmann jan...@xfce.org +# Copyright (c) 2009-2010 Jannis Pohlmann jan...@xfce.org # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License as @@ -50,9 +50,13 @@ tumbler_ffmpeg_thumbnailer_la_LDFLAGS = \ $(PLATFORM_LDFLAGS) tumbler_ffmpeg_thumbnailer_la_LIBADD = \ + $(top_builddir)/tumbler/libtumbler-$(TUMBLER_VERSION_API).la\ $(GDK_PIXBUF_LIBS) \ $(GIO_LIBS) \ $(GLIB_LIBS)\ $(FFMPEGTHUMBNAILER_LIBS) +tumbler_ffmpeg_thumbnailer_la_DEPENDENCIES = \ + $(top_builddir)/tumbler/libtumbler-$(TUMBLER_VERSION_API).la + endif diff --git a/plugins/font-thumbnailer/Makefile.am b/plugins/font-thumbnailer/Makefile.am index a56c0ea..495b61b 100644 --- a/plugins/font-thumbnailer/Makefile.am +++ b/plugins/font-thumbnailer/Makefile.am @@ -1,6 +1,6 @@ # vi:set ts=8 sw=8 noet ai nocindent: # - -# Copyright (c) 2009 Jannis Pohlmann jan...@xfce.org +# Copyright (c) 2009-2010 Jannis Pohlmann jan...@xfce.org # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License as @@ -50,9 +50,13 @@ tumbler_font_thumbnailer_la_LDFLAGS = \ $(PLATFORM_LDFLAGS) tumbler_font_thumbnailer_la_LIBADD = \ + $(top_builddir)/tumbler/libtumbler-$(TUMBLER_VERSION_API).la\ $(GDK_PIXBUF_LIBS) \ $(GIO_LIBS) \ $(GLIB_LIBS)\ $(FREETYPE_LIBS) +tumbler_font_thumbnailer_la_DEPENDENCIES = \ + $(top_builddir)/tumbler/libtumbler-$(TUMBLER_VERSION_API).la + endif diff --git a/plugins/jpeg-thumbnailer/Makefile.am b/plugins/jpeg-thumbnailer/Makefile.am index d4d88a5..a47ea08 100644 --- a/plugins/jpeg-thumbnailer/Makefile.am +++ b/plugins/jpeg-thumbnailer/Makefile.am @@ -1,6 +1,6 @@ # vi:set ts=8 sw=8 noet ai nocindent: # - -# Copyright (c) 2009 Jannis Pohlmann jan...@xfce.org +# Copyright (c) 2009-2010 Jannis Pohlmann jan...@xfce.org # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License as @@ -50,9 +50,13 @@ tumbler_jpeg_thumbnailer_la_LDFLAGS = \ $(PLATFORM_LDFLAGS) tumbler_jpeg_thumbnailer_la_LIBADD = \ + $(top_builddir)/tumbler/libtumbler-$(TUMBLER_VERSION_API).la\ $(GDK_PIXBUF_LIBS) \ $(GIO_LIBS) \ $(GLIB_LIBS)\ $(LIBJPEG_LIBS) +tumbler_jpeg_thumbnailer_la_DEPENDENCIES = \ + $(top_builddir)/tumbler/libtumbler-$(TUMBLER_VERSION_API).la + endif diff --git a/plugins/pixbuf-thumbnailer/Makefile.am b/plugins/pixbuf-thumbnailer/Makefile.am index 57d08ab..691f3d1 100644 --- a/plugins/pixbuf-thumbnailer/Makefile.am +++ b/plugins/pixbuf-thumbnailer/Makefile.am @@ -49,8 +49,12 @@ tumbler_pixbuf_thumbnailer_la_LDFLAGS = \ $(PLATFORM_LDFLAGS) tumbler_pixbuf_thumbnailer_la_LIBADD = \ + $(top_builddir)/tumbler/libtumbler-$(TUMBLER_VERSION_API).la\ $(GDK_PIXBUF_LIBS) \ $(GIO_LIBS) \ $(GLIB_LIBS)
[Xfce4-commits] xfce4-settings:master Fix layout of the display settingz dialog.
Updating branch refs/heads/master to b3949e6e0643f7b12ce07b7db020116245086983 (commit) from d238878571ce1798aeba7ae5fa50c5cf4215dd8d (commit) commit b3949e6e0643f7b12ce07b7db020116245086983 Author: Jérôme Guelfucci jero...@xfce.org Date: Sun Aug 29 13:22:05 2010 +0200 Fix layout of the display settingz dialog. Thanks glade for adding cool stuff automatically. dialogs/display-settings/display-dialog.glade |9 - 1 files changed, 0 insertions(+), 9 deletions(-) diff --git a/dialogs/display-settings/display-dialog.glade b/dialogs/display-settings/display-dialog.glade index dcc0af4..0c45e83 100644 --- a/dialogs/display-settings/display-dialog.glade +++ b/dialogs/display-settings/display-dialog.glade @@ -40,9 +40,6 @@ /object /child /object - packing -property name=position0/property - /packing /child child object class=GtkVBox id=vbox1 @@ -52,10 +49,7 @@ child object class=GtkCheckButton id=output-on property name=label translatable=yes_Use this output/property -property name=can_focusFalse/property -property name=receives_defaultFalse/property property name=use_underlineTrue/property -property name=draw_indicatorFalse/property /object packing property name=position0/property @@ -170,9 +164,6 @@ /packing /child /object - packing -property name=position1/property - /packing /child /object packing ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-sensors-plugin:master updated desktop entry file thanks to bugreport 6668 by cjsthomp...@gmail.com
Updating branch refs/heads/master to 5b14f5dc10d3ffc93337d0d6c5e7b440002ff5ad (commit) from 5e4fa620452a71bf302d68e9b6f43509f240 (commit) commit 5b14f5dc10d3ffc93337d0d6c5e7b440002ff5ad Author: Fabian Nowak timyst...@arcor.de Date: Sun Aug 29 14:43:22 2010 +0200 updated desktop entry file thanks to bugreport 6668 by cjsthomp...@gmail.com src/xfce4-sensors.desktop.in |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/xfce4-sensors.desktop.in b/src/xfce4-sensors.desktop.in index 42e9ab6..2aedcd7 100644 --- a/src/xfce4-sensors.desktop.in +++ b/src/xfce4-sensors.desktop.in @@ -1,12 +1,12 @@ [Desktop Entry] -Encoding=UTF-8 Version=1.0 _Name=Sensor Viewer _Comment=Show sensor values. -_GenericName=Sensors Values Viewer +_GenericName=Sensor Values Viewer Icon=xfce-sensors Exec=xfce4-sensors Terminal=false Type=Application Categories=X-XFCE;Utility;Monitor; +StartupNotify=true ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar-volman:master l10n: Updated Portuguese (pt) translation to 79%
Updating branch refs/heads/master to 3d779bf7dbdac8b1ee42214a03d5a4c008832b05 (commit) from 77158663a9d8c5bb0a310922eb09f22efa1a3ff0 (commit) commit 3d779bf7dbdac8b1ee42214a03d5a4c008832b05 Author: Sergio Marques smarque...@gmail.com Date: Sun Aug 29 16:52:26 2010 +0200 l10n: Updated Portuguese (pt) translation to 79% New status: 92 messages complete with 9 fuzzies and 15 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/pt.po | 91 - 1 files changed, 36 insertions(+), 55 deletions(-) diff --git a/po/pt.po b/po/pt.po index e333c45..682cabe 100644 --- a/po/pt.po +++ b/po/pt.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. # Nuno Miguel nu...@netcabo.pt, 2007-2009. -# +# msgid msgstr Project-Id-Version: thunar-volman 0.3.80\n @@ -11,10 +11,10 @@ msgstr PO-Revision-Date: 2009-08-27 19:42+0100\n Last-Translator: \n Language-Team: \n -Language: \n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n +Language: \n #: ../thunar-volman/main.c:59 #, fuzzy @@ -38,7 +38,7 @@ msgstr Thunar Volume Manager #: ../thunar-volman/main.c:133 msgid All rights reserved. -msgstr +msgstr Todos os direitos reservados. #: ../thunar-volman/main.c:134 #, c-format @@ -48,12 +48,12 @@ msgstr Reporte bugs para %s. #: ../thunar-volman/main.c:188 #, c-format msgid There is no device with the sysfs path \%s\ -msgstr +msgstr Não existe qualquer dispositivo no caminho \%s\ do sysfs #: ../thunar-volman/main.c:200 -#, fuzzy, c-format +#, c-format msgid Must specify the sysfs path of new devices with --device-added -msgstr Tem de especificar o novo UDI HAL de dispositivo com --device-added +msgstr Tem de especificar o caminho sysfs do novo dispositivo com --device-added #. ...so we need to prompt what to do #: ../thunar-volman/tvm-block-device.c:204 @@ -61,9 +61,8 @@ msgid Photos and Music msgstr Fotos e Música #: ../thunar-volman/tvm-block-device.c:205 -#, fuzzy msgid Photos were found on your portable music player -msgstr Fotos encontradas no leitor de música portátil. +msgstr Foram encontradas fotos no leitor de música portátil #: ../thunar-volman/tvm-block-device.c:206 msgid Would you like to import the photos or manage the music? @@ -94,14 +93,11 @@ msgid Photo Import msgstr Importar Foto #: ../thunar-volman/tvm-block-device.c:274 -#, fuzzy msgid A photo card has been detected -msgstr Cartão de fotos detectado. +msgstr Foi detectado um cartão de fotos #: ../thunar-volman/tvm-block-device.c:275 -msgid -There are photos on the card. Would you like to add these photos to your -album? +msgid There are photos on the card. Would you like to add these photos to your album? msgstr Existem fotos no cartão. Deseja adicionar ao álbum? #. prompt the user to execute the file @@ -147,43 +143,43 @@ msgstr _Abrir #: ../thunar-volman/tvm-block-device.c:616 msgid CD mounted -msgstr +msgstr CD montado #: ../thunar-volman/tvm-block-device.c:616 msgid DVD mounted -msgstr +msgstr DVD montado #: ../thunar-volman/tvm-block-device.c:618 msgid The CD was mounted automatically -msgstr +msgstr O CD foi montado automaticamente #: ../thunar-volman/tvm-block-device.c:619 msgid The DVD was mounted automatically -msgstr +msgstr O DVD foi montado automaticamente #: ../thunar-volman/tvm-block-device.c:629 msgid Volume mounted -msgstr +msgstr Dispositivo montado #: ../thunar-volman/tvm-block-device.c:632 #, c-format msgid The volume \%s\ was mounted automatically -msgstr +msgstr O dispositivo \%s\ foi montado automaticamente #: ../thunar-volman/tvm-block-device.c:637 #, c-format msgid The inserted volume was mounted automatically -msgstr +msgstr O dispositivo inserido foi montado automaticamente #: ../thunar-volman/tvm-block-device.c:691 #, c-format msgid Unable to locate mount point -msgstr +msgstr Incapaz de localizar o ponto de montagem #: ../thunar-volman/tvm-block-device.c:737 #, c-format msgid Unable to mount the device -msgstr +msgstr Incapaz de montar o dispositivo #: ../thunar-volman/tvm-block-device.c:746 #, c-format @@ -191,9 +187,8 @@ msgid Could not detect the volume corresponding to the device msgstr #: ../thunar-volman/tvm-block-device.c:821 -#, fuzzy msgid Audio/Data CD -msgstr Áudio / CD Dados +msgstr CD de Áudio/Dados #: ../thunar-volman/tvm-block-device.c:822 #, fuzzy @@ -290,7 +285,7 @@ msgstr Que deseja fazer? #: ../thunar-volman/tvm-run.c:193 msgid Burn _DVD -msgstr +msgstr Gravar _DVD #: ../thunar-volman/tvm-run.c:200 #, fuzzy @@ -303,14 +298,12 @@ msgid You have inserted a blank CD. msgstr Inseriu um disco em branco. #: ../thunar-volman/tvm-run.c:204 -#, fuzzy msgid Burn _Data CD -msgstr Criar CD de _Dados +msgstr Gravar CD de _Dados #:
[Xfce4-commits] xfdesktop:master l10n: Updated Portuguese (pt) translation to 100%
Updating branch refs/heads/master to d5541e825e7b65d61e7875bfdc9b41e3884ab4a4 (commit) from f3b3042f9eadccb96dd9bad8c9f9b64a859142d2 (commit) commit d5541e825e7b65d61e7875bfdc9b41e3884ab4a4 Author: Sergio Marques smarque...@gmail.com Date: Sun Aug 29 18:56:27 2010 +0200 l10n: Updated Portuguese (pt) translation to 100% New status: 166 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/pt.po | 108 +++-- 1 files changed, 34 insertions(+), 74 deletions(-) diff --git a/po/pt.po b/po/pt.po index be4b919..5c1a0f5 100644 --- a/po/pt.po +++ b/po/pt.po @@ -3,19 +3,19 @@ # This file is distributed under the same license as the xfdesktop package. # Nuno Donato nunodon...@gmail.com, 2004. # Nuno Miguel nu...@netcabo.pt, 2007, 2008, 2009. -# +# msgid msgstr Project-Id-Version: xfdesktop 4.6.0\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2010-08-28 16:27+0200\n +POT-Creation-Date: 2010-08-29 16:06+\n PO-Revision-Date: 2010-01-04 11:47-\n Last-Translator: Sergio Marques smarque...@gmail.com\n Language-Team: \n -Language: \n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n +Language: \n X-Poedit-Language: Portuguese\n X-Poedit-Country: PORTUGAL\n @@ -65,11 +65,8 @@ msgstr Criar/Carregar Lista de Fundos #: ../settings/main.c:511 #, c-format -msgid -File \%s\ is not a valid backdrop list file. Do you wish to overwrite it? -msgstr -O ficheiro \%s\ não é um ficheiro de lista de fundos válido. Deseja -sobrescrevê-lo? +msgid File \%s\ is not a valid backdrop list file. Do you wish to overwrite it? +msgstr O ficheiro \%s\ não é um ficheiro de lista de fundos válido. Deseja sobrescrevê-lo? #: ../settings/main.c:516 msgid Invalid List File @@ -286,13 +283,12 @@ msgid Desktop Error msgstr Erro no Ambiente de Trabalho #: ../src/xfdesktop-app-menu-item.c:234 -#, fuzzy msgid Needs terminal -msgstr Terminal +msgstr Precisa do terminal #: ../src/xfdesktop-app-menu-item.c:235 msgid Whether or not the command needs a terminal to execute -msgstr +msgstr Se o comando necessita ou não do terminal para ser executado #: ../src/xfdesktop-app-menu-item.c:241 msgid Command @@ -300,41 +296,39 @@ msgstr Comando #: ../src/xfdesktop-app-menu-item.c:242 msgid The command to run when the item is clicked -msgstr +msgstr O comando a executar ao clicar no item #: ../src/xfdesktop-app-menu-item.c:248 -#, fuzzy msgid Icon name -msgstr Designer de ícones +msgstr Nome do ícone #: ../src/xfdesktop-app-menu-item.c:249 msgid The name of the themed icon to display next to the item -msgstr +msgstr O nome do ícone a exibir junto ao item #: ../src/xfdesktop-app-menu-item.c:255 msgid Label -msgstr +msgstr Texto #: ../src/xfdesktop-app-menu-item.c:256 msgid The label displayed in the item -msgstr +msgstr O texto exibido no item #: ../src/xfdesktop-app-menu-item.c:262 -#, fuzzy msgid Startup notification -msgstr Usar _notificação de arranque +msgstr Notificação de arranque #: ../src/xfdesktop-app-menu-item.c:263 msgid Whether or not the app supports startup notification -msgstr +msgstr Se a aplicação suporta ou não a notificação de arranque #: ../src/xfdesktop-app-menu-item.c:269 msgid Use underline -msgstr +msgstr Utilizar texto sublinhado #: ../src/xfdesktop-app-menu-item.c:270 msgid Whether or not to use an underscore in the label as a keyboard mnemonic -msgstr +msgstr Se deve ser utilizado ou não \underscore\ no texto como mnemónica de teclado #. printf is to be translator-friendly #: ../src/xfdesktop-file-icon.c:141 ../src/xfdesktop-file-icon-manager.c:922 @@ -356,11 +350,8 @@ msgstr A aplicação associada não foi encontrada ou executada. #: ../src/xfdesktop-file-icon-manager.c:479 #, c-format -msgid -Xfdesktop was unable to create the folder \%s\ to store desktop items: -msgstr -Xfdesktop foi incapaz de criar a pasta \%s\ para armazenar os itens do -ambiente de trabalho: +msgid Xfdesktop was unable to create the folder \%s\ to store desktop items: +msgstr Xfdesktop foi incapaz de criar a pasta \%s\ para armazenar os itens do ambiente de trabalho: #: ../src/xfdesktop-file-icon-manager.c:481 #: ../src/xfdesktop-file-icon-manager.c:492 @@ -370,12 +361,8 @@ msgstr Falhou a Criação de Pasta #: ../src/xfdesktop-file-icon-manager.c:490 #, c-format -msgid -Xfdesktop is unable to use \%s\ to hold desktop items because it is not a -folder. -msgstr -Xfdesktop é incapaz de usar \%s\ para lidar com itens do ambiente de -trabalho por não ser uma pasta. +msgid Xfdesktop is unable to use \%s\ to hold desktop items because it is not a folder. +msgstr Xfdesktop é incapaz de usar \%s\ para lidar com itens do ambiente de trabalho por não ser uma pasta. #: ../src/xfdesktop-file-icon-manager.c:494 msgid Please delete or rename the file. @@ -425,12
[Xfce4-commits] xfce4-settings:master l10n: Updated Portuguese (pt) translation to 96%
Updating branch refs/heads/master to 259f8ad349386d4bd263c9cedb8bcaa02260629e (commit) from b3949e6e0643f7b12ce07b7db020116245086983 (commit) commit 259f8ad349386d4bd263c9cedb8bcaa02260629e Author: Sergio Marques smarque...@gmail.com Date: Sun Aug 29 19:01:25 2010 +0200 l10n: Updated Portuguese (pt) translation to 96% New status: 257 messages complete with 0 fuzzies and 10 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/pt.po | 331 ++ 1 files changed, 96 insertions(+), 235 deletions(-) diff --git a/po/pt.po b/po/pt.po index 1e95641..9568104 100644 --- a/po/pt.po +++ b/po/pt.po @@ -2,20 +2,19 @@ # Copyright (C) 2008 THE xfce'S COPYRIGHT HOLDER # This file is distributed under the same license as the xfce4_settings package. # Nuno Miguel nu...@netcabo.pt, 2008, 2009. -# -#: ../xfsettingsd/main.c:127 +# msgid msgstr Project-Id-Version: xfce4-settings\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2010-08-28 23:05+0200\n +POT-Creation-Date: 2010-08-29 16:06+\n PO-Revision-Date: 2010-01-20 19:38+0100\n Last-Translator: Nuno Miguel nu...@netcabo.pt\n Language-Team: \n -Language: \n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n +Language: \n Plural-Forms: nplurals=2; plural=(n != 1);\n X-Poedit-Language: Portuguese\n X-Poedit-Country: PORTUGAL\n @@ -82,12 +81,8 @@ msgid The amount of time, in milliseconds, required between keystrokes msgstr O tempo, em milissegundos, necessário entre pressões de teclas #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:16 -msgid -The amount of time, in milliseconds, that must elapse before a keystroke -will be accepted -msgstr -O tempo, em milissegundos, que deve ocorrer antes que uma pressão de tecla -seja aceite +msgid The amount of time, in milliseconds, that must elapse before a keystroke will be accepted +msgstr O tempo, em milissegundos, que deve ocorrer antes que uma pressão de tecla seja aceite #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:17 msgid The maximum pointer speed after acceleration @@ -102,33 +97,20 @@ msgid The time, in milliseconds, between repeated motion events msgstr O tempo, em milissegundos, entre eventos de movimento repetido #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:20 -msgid -The time, in milliseconds, between the initial key press and first repeated -motion event -msgstr -O tempo, em milissegundos, entre o pressionar inicial da tecla e o primeiro -movimento repetido +msgid The time, in milliseconds, between the initial key press and first repeated motion event +msgstr O tempo, em milissegundos, entre o pressionar inicial da tecla e o primeiro movimento repetido #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:21 msgid The time, in milliseconds, to get to maximum speed msgstr O tempo, em milissegundos, para alcançar a velocidade máxima #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:22 -msgid -To help prevent accidental keystrokes, slow keys requires that a key is held -for a certain minimum amount of time before the keystroke will be accepted -msgstr -Para ajudar a prevenir o pressionar acidental de teclas, teclas lentas -necessitam que uma tecla seja pressionada por um tempo mínimo antes da -pressão de tecla ser aceite +msgid To help prevent accidental keystrokes, slow keys requires that a key is held for a certain minimum amount of time before the keystroke will be accepted +msgstr Para ajudar a prevenir o pressionar acidental de teclas, teclas lentas necessitam que uma tecla seja pressionada por um tempo mínimo antes da pressão de tecla ser aceite #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:23 -msgid -To help prevent accidental multiple keystrokes, bounce keys imposes a -minimum delay between keystrokes -msgstr -Para ajudar a prevenir o pressionar acidental de múltiplas teclas, as teclas -saltitantes impõem um tempo mínimo entre pressões +msgid To help prevent accidental multiple keystrokes, bounce keys imposes a minimum delay between keystrokes +msgstr Para ajudar a prevenir o pressionar acidental de múltiplas teclas, as teclas saltitantes impõem um tempo mínimo entre pressões #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:24 msgid Use _bounce keys @@ -143,40 +125,20 @@ msgid Use slow _keys msgstr Usar teclas _lentas #: ../dialogs/accessibility-settings/accessibility-dialog.glade.h:27 -msgid -When selected, modifier keys (such as Control, Alt, and Shift) do not need -to be held down (they can be pressed and then released) when multiple keys -would normally need to be pressed at the same time -msgstr -Quando seleccionado, teclas modificadoras (como Control, Alt e Shift) não -precisam de ser mantidas pressionadas (podem ser pressionadas e então -soltas)
[Xfce4-commits] thunar:master Add CopyTo, CopyInto, MoveInto, LinkInto, UnlinkFiles D-Bus methods.
Updating branch refs/heads/master
to 6371d5d886dcb5b92eab532c0852a57a96da1fb1 (commit)
from c1f67c1b39af1c03ac3d31e95a35744670ecf354 (commit)
commit 6371d5d886dcb5b92eab532c0852a57a96da1fb1
Author: Jannis Pohlmann jan...@xfce.org
Date: Sun Aug 29 19:36:04 2010 +0200
Add CopyTo, CopyInto, MoveInto, LinkInto, UnlinkFiles D-Bus methods.
The groundwork for this was done by Daniel Morales. I refactored the
code a little bit, fixed a few bugs and added a working directory
parameter to all functions. The startup id parameter is unused at
the moment but this may change in the future.
The methods have been added to the org.xfce.FileManager D-Bus interface.
thunar/thunar-application.c | 14 +-
thunar/thunar-application.h |3 +-
thunar/thunar-dbus-service-infos.xml | 108 ++
thunar/thunar-dbus-service.c | 364 ++
thunar/thunar-standard-view.c|2 +-
thunar/thunar-tree-view.c|2 +-
6 files changed, 486 insertions(+), 7 deletions(-)
diff --git a/thunar/thunar-application.c b/thunar/thunar-application.c
index 96186d6..cbc1f2d 100644
--- a/thunar/thunar-application.c
+++ b/thunar/thunar-application.c
@@ -1404,6 +1404,9 @@ unlink_stub (GList *source_path_list,
* @application : a #ThunarApplication.
* @parent : a #GdkScreen, a #GtkWidget or %NULL.
* @file_list : the list of #ThunarFile!s that should be deleted.
+ * @permanently : whether to unlink the files permanently. Even if this is set
to
+ *FALSE, the files may be erased permanently if the SHIFT key
+ *is pressed at the time the function is called.
*
* Deletes all files in the @file_list and takes care of all user interaction.
*
@@ -1414,13 +1417,13 @@ unlink_stub (GList *source_path_list,
void
thunar_application_unlink_files (ThunarApplication *application,
gpointer parent,
- GList *file_list)
+ GList *file_list,
+ gboolean permanently)
{
GdkModifierType state;
GtkWidget *dialog;
GtkWindow *window;
GdkScreen *screen;
- gbooleanpermanently;
GList *path_list = NULL;
GList *lp;
gchar *message;
@@ -1430,8 +1433,11 @@ thunar_application_unlink_files (ThunarApplication
*application,
_thunar_return_if_fail (parent == NULL || GDK_IS_SCREEN (parent) ||
GTK_IS_WIDGET (parent));
_thunar_return_if_fail (THUNAR_IS_APPLICATION (application));
- /* check if we should permanently delete the files (user holds shift) */
- permanently = (gtk_get_current_event_state (state) (state
GDK_SHIFT_MASK) != 0);
+ if (!permanently)
+{
+ /* check if we should permanently delete the files (user holds shift) */
+ permanently = (gtk_get_current_event_state (state) (state
GDK_SHIFT_MASK) != 0);
+}
/* determine the paths for the files */
for (lp = g_list_last (file_list); lp != NULL; lp = lp-prev, ++n_path_list)
diff --git a/thunar/thunar-application.h b/thunar/thunar-application.h
index 8fdf401..53e3e3e 100644
--- a/thunar/thunar-application.h
+++ b/thunar/thunar-application.h
@@ -101,7 +101,8 @@ void thunar_application_move_into
(ThunarApplication *ap
void thunar_application_unlink_files(ThunarApplication
*application,
gpointer
parent,
- GList
*file_list);
+ GList
*file_list,
+ gboolean
permanently);
void thunar_application_trash (ThunarApplication
*application,
gpointer
parent,
diff --git a/thunar/thunar-dbus-service-infos.xml
b/thunar/thunar-dbus-service-infos.xml
index c2c01c7..ca7c0c4 100644
--- a/thunar/thunar-dbus-service-infos.xml
+++ b/thunar/thunar-dbus-service-infos.xml
@@ -124,6 +124,114 @@
method name=DisplayPreferencesDialog
arg direction=in name=display type=s /
/method
+
+
+!--
+ CopyTo (working-directory : STRING, source-filenames : ARRAY OF STRING,
target-filenames : ARRAY OF STRING, display : STRING, startup-id : STRING) :
VOID
+
+ working-directory : working directory used to resolve relative filenames.
+ source-filenames : an array of file names to copy. The file names may
+ be either file:-URIs, absolute paths or paths
relative
+ to the working-directory.
+ target-filenames : the target filenames.
+ display : the screen on which to
[Xfce4-commits] thunar:master Update the copyright information.
Updating branch refs/heads/master to 930d944f86d5b2f9ea48dc8dff577e6a98f0b219 (commit) from 6371d5d886dcb5b92eab532c0852a57a96da1fb1 (commit) commit 930d944f86d5b2f9ea48dc8dff577e6a98f0b219 Author: Jannis Pohlmann jan...@xfce.org Date: Sun Aug 29 19:39:51 2010 +0200 Update the copyright information. thunar/thunar-dbus-service.c |5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/thunar/thunar-dbus-service.c b/thunar/thunar-dbus-service.c index 1854379..93bb34e 100644 --- a/thunar/thunar-dbus-service.c +++ b/thunar/thunar-dbus-service.c @@ -1,7 +1,8 @@ /* $Id$ */ /*- - * Copyright (c) 2006 Benedikt Meurer be...@xfce.org - * Copyright (c) 2009 Jannis Pohlmann jan...@xfce.org + * Copyright (c) 2006 Benedikt Meurer be...@xfce.org + * Copyright (c) 2009-2010 Jannis Pohlmann jan...@xfce.org + * Copyright (c) 2010 Daniel Morales dan...@daniel.com.uy * * 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 ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfdesktop:danielm/port-to-gio Deleting branch danielm/port-to-gio
Deleting branch refs/heads/danielm/port-to-gio ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfdesktop:danielm/port-to-gio Creating branch danielm/port-to-gio
Updating branch refs/heads/danielm/port-to-gio as new branch to 799c8d32b6052846234c32524b49f13da97e4297 (commit) Branches are created implicitly by pushing. This mail only exists to let you know that there was code pushed to refs/heads/danielm/port-to-gio for the first time. Mails for the commits that lead to the creation of the branch will follow after this mail. ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfdesktop:danielm/port-to-gio - src/xfdesktop-file-icon.c: - src/xfdesktop-file-icon.h: * Droped peek_info(), added GFile and GFileInfo members to class, this will make the things a
Updating branch refs/heads/danielm/port-to-gio
to 5b8b29e890b0041ed7182b2cab4dac075a50bfa6 (commit)
from ca5252f0adf83357e0676aaf00da40fdc29c9598 (commit)
commit 5b8b29e890b0041ed7182b2cab4dac075a50bfa6
Author: Daniel Morales dan...@daniel.com.uy
Date: Tue Feb 16 12:45:19 2010 -0200
- src/xfdesktop-file-icon.c:
- src/xfdesktop-file-icon.h:
* Droped peek_info(), added GFile and GFileInfo members to class,
this will make the things a bit easier.
- src/xfdesktop-file-utils.c:
- src/xfdesktop-file-utils.h:
* Ported all functions.
* Added some usefull functions to use later:
- xfdesktop_file_utils_get_file_info()
- xfdesktop_file_utils_get_file_size()
- xfdesktop_file_utils_get_file_date()
- xfdesktop_file_utils_is_directory()
- xfdesktop_file_utils_is_symlink()
- xfdesktop_file_utils_is_executable()
- xfdesktop_file_utils_is_writable()
- xfdesktop_file_utils_is_readable()
- xfdesktop_file_utils_is_desktop_file()
- xfdesktop_file_utils_can_rename()
- xfdesktop_file_utils_can_delete()
- xfdesktop_file_utils_is_hidden()
- xfdesktop_file_utils_is_root()
* Some functions changed some args (dropping ThunarVFS Info):
- xfdesktop_file_utils_handle_fileop_error()
- xfdesktop_file_utils_launch_fallback()
- xfdesktop_file_utils_open_folder()
* Implemented thunarx-2 changes:
- Dropped: xfdesktop_thunarx_file_info_get_vfs_info()
- New functions:
* xfdesktop_thunarx_file_info_get_file_info()
* xfdesktop_thunarx_file_info_get_filesystem_info()
* xfdesktop_thunarx_file_info_get_location()
src/xfdesktop-file-icon.c | 107 +--
src/xfdesktop-file-icon.h | 20 +-
src/xfdesktop-file-utils.c | 474 +---
src/xfdesktop-file-utils.h | 49 -
4 files changed, 454 insertions(+), 196 deletions(-)
diff --git a/src/xfdesktop-file-icon.c b/src/xfdesktop-file-icon.c
index 4c97463..536fb54 100644
--- a/src/xfdesktop-file-icon.c
+++ b/src/xfdesktop-file-icon.c
@@ -24,10 +24,13 @@
#include glib-object.h
+#include gio/gio.h
+
#include libxfce4ui/libxfce4ui.h
#include xfdesktop-file-utils.h
#include xfdesktop-file-icon.h
+#include xfdesktop-job.h
struct _XfdesktopFileIconPrivate
{
@@ -67,14 +70,20 @@ static void
xfdesktop_file_icon_finalize(GObject *obj)
{
XfdesktopFileIcon *icon = XFDESKTOP_FILE_ICON(obj);
-
+
+if(icon-info)
+g_object_unref(icon-info);
+
+if(icon-gfile)
+g_object_unref(icon-gfile);
+
if(icon-priv-active_jobs) {
GList *l;
-ThunarVfsJob *job;
+XfdesktopJob *job;
GCallback cb;
for(l = icon-priv-active_jobs; l; l = l-next) {
-job = THUNAR_VFS_JOB(l-data);
+job = XFDESKTOP_JOB(l-data);
cb = g_object_get_data(G_OBJECT(job),
--xfdesktop-file-icon-callback);
if(cb) {
@@ -86,7 +95,7 @@ xfdesktop_file_icon_finalize(GObject *obj)
g_object_set_data(G_OBJECT(job),
--xfdesktop-file-icon-callback, NULL);
}
-thunar_vfs_job_cancel(job);
+xfdesktop_job_cancel(job);
g_object_unref(G_OBJECT(job));
}
g_list_free(icon-priv-active_jobs);
@@ -99,88 +108,72 @@ static gboolean
xfdesktop_file_icon_activated(XfdesktopIcon *icon)
{
XfdesktopFileIcon *file_icon = XFDESKTOP_FILE_ICON(icon);
-const ThunarVfsInfo *info = xfdesktop_file_icon_peek_info(file_icon);
GtkWidget *icon_view, *toplevel;
GdkScreen *gscreen;
gboolean success = FALSE;
TRACE(entering);
-
-if(!info)
-return FALSE;
+
+g_return_val_if_fail(G_IS_FILE(file_icon-gfile), FALSE);
+g_return_val_if_fail(G_IS_FILE_INFO(file_icon-gfile), FALSE);
icon_view = xfdesktop_icon_peek_icon_view(icon);
toplevel = gtk_widget_get_toplevel(icon_view);
gscreen = gtk_widget_get_screen(icon_view);
-
-if(info-type == THUNAR_VFS_FILE_TYPE_DIRECTORY) {
-xfdesktop_file_utils_open_folder(info, gscreen, GTK_WINDOW(toplevel));
+
+if(xfdesktop_file_utils_is_directory(file_icon)) {
+xfdesktop_file_utils_open_folder(file_icon, gscreen,
GTK_WINDOW(toplevel));
success = TRUE;
} else {
-if(info-flags THUNAR_VFS_FILE_FLAGS_EXECUTABLE) {
+
+if(xfdesktop_file_utils_is_executable(file_icon)) {
+#if 0
success = thunar_vfs_info_execute(info, gscreen, NULL,
[Xfce4-commits] xfdesktop:danielm/port-to-gio - configure.ac.in: * Droped ThunarVFS checks * file-icons: Now requires libexo. (We'll use stuff like ExoJob and ExoSimpleJob) * volume-monitoring: New
Updating branch refs/heads/danielm/port-to-gio to 4a3ee615dd7a3972cb0c8d8c69d8d462d4a4f1df (commit) from d5541e825e7b65d61e7875bfdc9b41e3884ab4a4 (commit) commit 4a3ee615dd7a3972cb0c8d8c69d8d462d4a4f1df Author: Daniel Morales dan...@daniel.com.uy Date: Mon Feb 15 23:20:54 2010 -0200 - configure.ac.in: * Droped ThunarVFS checks * file-icons: Now requires libexo. (We'll use stuff like ExoJob and ExoSimpleJob) * volume-monitoring: New arg option. This will check if GUDEV is available to enable Volume monitoring. * Droped desktop-menu-dir-monitor. Garcon will handle it and this is no longer necesary. * Bump some glib/thunarx versions. - panel-plugin/Makefile.am: - panel-plugin/desktop-menu-plugin.c: - src/Makefile.am: - src/main.c: * Droped some basic ThunarVFS stuff * Added GUDEV flags/libs to src/Makefile.am if volume monitoring is enabled. configure.ac.in | 86 -- src/Makefile.am | 13 +++- src/main.c |9 -- 3 files changed, 62 insertions(+), 46 deletions(-) diff --git a/configure.ac.in b/configure.ac.in index 5e1c9af..714bdf4 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -19,12 +19,13 @@ m4_define([libxfce4util_minimum_version], [4.6.0]) m4_define([libxfce4ui_minimum_version], [4.7.0]) m4_define([xfce_minimum_version], [4.6.0]) m4_define([garcon_minimum_version], [0.1.1]) -m4_define([exo_minimum_version], [0.3.100]) -m4_define([thunar_minimum_version], [1.0.0]) +m4_define([exo_minimum_version], [0.5.1]) +m4_define([thunar_minimum_version], [1.1.1]) dnl TODO this needs to be set to 1.1.2 before the next release m4_define([dbus_minimum_version], [0.34]) m4_define([wnck_minimum_version], [2.12]) m4_define([intltool_minimum_version], [0.31]) m4_define([xfconf_minimum_version], [4.6.0]) +m4_define([gudev_minimum_version], [145]) dnl init autoconf AC_INIT([xfdesktop], [xfdesktop_version], [http://bugzilla.xfce.org/]) @@ -69,6 +70,7 @@ dnl required XDT_CHECK_PACKAGE([GMODULE], [gmodule-2.0], [glib_minimum_version]) XDT_CHECK_PACKAGE([GOBJECT], [gobject-2.0], [glib_minimum_version]) XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [glib_minimum_version]) +XDT_CHECK_PACKAGE([GIO], [gio-2.0], [glib_minimum_version]) XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [gtk_minimum_version]) XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [libxfce4util_minimum_version]) @@ -105,9 +107,9 @@ fi if test x$enable_desktop_icons = xyes -a x$enable_file_icons = xyes; then dnl here i shall abuse the XDT_CHECK_PACKAGE macro -XDT_CHECK_PACKAGE([THUNAR_VFS], [thunar-vfs-1], - [thunar_minimum_version], [], [ -echo *** Optional package thunar-vfs-1 was either not found on your system +XDT_CHECK_PACKAGE([LIBEXO], [exo-1], + [exo_minimum_version], [], [ +echo *** Optional package exo-1 was either not found on your system echo *** or is too old. Please install or upgrade to at least version echo *** thunar_minimum_version, or adjust the PKG_CONFIG_PATH environment variable echo *** if you installed the new version of the package in a nonstandard @@ -121,8 +123,8 @@ echo *** if you installed the new version of the package in a nonstandard echo *** prefix. File/launcher icons will be disabled. ]) enable_file_icons=no -if test x$THUNAR_VFS_VERSION != x; then -already_have_thunar_vfs=yes +if test x$LIBEXO_VERSION != x; then +already_have_libexo=yes if test x$DBUS_VERSION != x; then enable_file_icons=yes @@ -134,16 +136,54 @@ fi AM_CONDITIONAL([ENABLE_FILE_ICONS], [test x$enable_file_icons = xyes]) +dnl if we want desktop icons, do we also want volume monitoring? +AC_ARG_ENABLE([volume-monitoring], +[AC_HELP_STRING([--disable-volume-monitoring], +[Do not compile in support for Volume monitoring (default=enabled)])], +[ac_cv_enable_volume_monitoring=$enableval], +[ac_cv_enable_volume_monitoring=yes]) +if test x$ac_cv_enable_volume_monitoring = xno -o x$enable_desktop_icons != xyes; then +enable_volume_monitoring=no +else +enable_volume_monitoring=yes +fi + +if test x$enable_desktop_icons = xyes -a x$enable_volume_monitoring = xyes; then +XDT_CHECK_PACKAGE([GUDEV], [gudev-1.0], + [gudev_minimum_version], [], [ +echo *** Optional package gudev-1.0 was either not found on your system +echo *** or is too old. Please install or upgrade to at least version +echo *** thunar_minimum_version, or adjust the PKG_CONFIG_PATH environment variable +echo *** if you installed the new version of the package in a nonstandard +echo *** prefix. Volume monitoring will be disabled. +]) +enable_volume_monitoring=no +if test x$GUDEV_VERSION != x; then +
[Xfce4-commits] xfdesktop:danielm/port-to-gio - src/Makefile.am: - src/xfdesktop-file-jobs.c: - src/xfdesktop-file-jobs.h: - src/xfdesktop-job.c: - src/xfdesktop-job.h: * New files to handle file jo
Updating branch refs/heads/danielm/port-to-gio
to ca5252f0adf83357e0676aaf00da40fdc29c9598 (commit)
from 4a3ee615dd7a3972cb0c8d8c69d8d462d4a4f1df (commit)
commit ca5252f0adf83357e0676aaf00da40fdc29c9598
Author: Daniel Morales dan...@daniel.com.uy
Date: Mon Feb 15 23:28:05 2010 -0200
- src/Makefile.am:
- src/xfdesktop-file-jobs.c:
- src/xfdesktop-file-jobs.h:
- src/xfdesktop-job.c:
- src/xfdesktop-job.h:
* New files to handle file jobs. As replacement of ThunarVFS-Job
src/Makefile.am |6 +++-
src/xfdesktop-file-jobs.c | 55 +++
src/xfdesktop-file-jobs.h | 42 +++
src/xfdesktop-job.c | 70 +
src/xfdesktop-job.h | 69
5 files changed, 241 insertions(+), 1 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index a140a66..72d1159 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -51,7 +51,11 @@ desktop_file_icon_sources = \
xfdesktop-special-file-icon.c \
xfdesktop-special-file-icon.h \
xfdesktop-volume-icon.c \
- xfdesktop-volume-icon.h
+ xfdesktop-volume-icon.h \
+ xfdesktop-job.c \
+ xfdesktop-job.h \
+ xfdesktop-file-jobs.c \
+ xfdesktop-file-jobs.h
xfdesktop_CFLAGS = \
-I$(top_srcdir) \
diff --git a/src/xfdesktop-file-jobs.c b/src/xfdesktop-file-jobs.c
new file mode 100644
index 000..129f349
--- /dev/null
+++ b/src/xfdesktop-file-jobs.c
@@ -0,0 +1,55 @@
+/*-
+ * Copyright (c) 2010 Daniel Morales dan...@daniel.com.uy
+ *
+ * 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
+ * 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., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include config.h
+#endif
+
+#include gio/gio.h
+
+#include xfdesktop-job.h
+#include xfdesktop-file-jobs.h
+
+XfdesktopJob *
+xfdesktop_file_jobs_link_file(GFile *src,
+ GFile *dest)
+{
+return NULL;
+}
+
+XfdesktopJob *
+xfdesktop_file_jobs_move_file(GFile *src,
+ GFile *dest)
+{
+return NULL;
+}
+
+XfdesktopJob *
+xfdesktop_file_jobs_copy_file(GFile *src,
+ GFile *dest)
+{
+return NULL;
+}
+
+XfdesktopJob *
+xfdesktop_file_jobs_unlink_file(GFile *src)
+{
+return NULL;
+}
+
diff --git a/src/xfdesktop-file-jobs.h b/src/xfdesktop-file-jobs.h
new file mode 100644
index 000..b3cf81a
--- /dev/null
+++ b/src/xfdesktop-file-jobs.h
@@ -0,0 +1,42 @@
+/*-
+ * Copyright (c) 2010 Daniel Morales dan...@daniel.com.uy
+ *
+ * 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
+ * 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., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef __XDESKTOP_FILE_JOBS_H__
+#define __XDESKTOP_FILE_JOBS_H__
+
+#include gio/gio.h
+
+#include xfdesktop-job.h
+
+G_BEGIN_DECLS
+
+XfdesktopJob *xfdesktop_file_jobs_link_file(GFile *src,
+GFile *dest);
+
+XfdesktopJob *xfdesktop_file_jobs_move_file(GFile *src,
+GFile *dest);
+
+XfdesktopJob *xfdesktop_file_jobs_copy_file(GFile *src,
+GFile *dest);
+
+XfdesktopJob *xfdesktop_file_jobs_unlink_file(GFile *src);
+
+G_END_DECLS
+
+#endif /* !__XDESKTOP_IO_JOBS_H__ */
diff --git a/src/xfdesktop-job.c b/src/xfdesktop-job.c
new file mode 100644
index 000..b12c67c
--- /dev/null
+++ b/src/xfdesktop-job.c
@@ -0,0 +1,70 @@
+/*-
+ * Copyright (c) 2010 Daniel Morales dan...@daniel.com.uy
+ *
+ * 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
[Xfce4-commits] xfdesktop:danielm/port-to-gio - src/xfdesktop-regular-file-icon.c: - src/xfdesktop-regular-file-icon.h: * Porting Regular File Icon. (GIO and thunarx-2 stuff) - TODO.gio: * A TODO fi
Updating branch refs/heads/danielm/port-to-gio
to 014a1b5a038a10fa92212564d144a30a509ef535 (commit)
from 5b8b29e890b0041ed7182b2cab4dac075a50bfa6 (commit)
commit 014a1b5a038a10fa92212564d144a30a509ef535
Author: Daniel Morales dan...@daniel.com.uy
Date: Tue Feb 16 16:36:08 2010 -0200
- src/xfdesktop-regular-file-icon.c:
- src/xfdesktop-regular-file-icon.h:
* Porting Regular File Icon. (GIO and thunarx-2 stuff)
- TODO.gio:
* A TODO file to track what is missing/need some research.
TODO.gio | 23 +++
src/xfdesktop-regular-file-icon.c | 362 -
src/xfdesktop-regular-file-icon.h |4 +-
3 files changed, 219 insertions(+), 170 deletions(-)
diff --git a/TODO.gio b/TODO.gio
new file mode 100644
index 000..39e59f1
--- /dev/null
+++ b/TODO.gio
@@ -0,0 +1,23 @@
+Port to GIO/gUDEV
+
+
+- src/xfdesktop-file-icon.c:
+-xfdesktop_file_icon_activated():
+- src/xfdesktop-regular-file-icon.c:
+- xfdesktop_regular_file_icon_do_drop_dest():
+
+* We have to implement a replacement for thunar_vfs_info_execute().
+
+- src/xfdesktop-job.[ch]: Implement
+- src/xfdesktop-file-jobs.[ch]: Implement
+* Maybe we can take a look and see how THUNAR does it :)
+
+- src/xfdesktop-regular-file-icon.c:
+* ask signal to jobs (currently commented until we implement Jobs)
+
+- GCancelable {
+* Maybe we can implement an GCancelable to use on:
+- xfdesktop_regular_file_icon_new
+- xfdesktop_regular_file_icon_update_gfile
+- xfdesktop_regular_file_icon_rename_file
+}
diff --git a/src/xfdesktop-regular-file-icon.c
b/src/xfdesktop-regular-file-icon.c
index ced25f9..8e53be7 100644
--- a/src/xfdesktop-regular-file-icon.c
+++ b/src/xfdesktop-regular-file-icon.c
@@ -49,6 +49,8 @@
#include thunarx/thunarx.h
#endif
+#include xfdesktop-job.h
+#include xfdesktop-file-jobs.h
#include xfdesktop-file-utils.h
#include xfdesktop-common.h
#include xfdesktop-regular-file-icon.h
@@ -61,7 +63,6 @@ struct _XfdesktopRegularFileIconPrivate
gchar *tooltip;
guint pix_opacity;
gint cur_pix_size;
-ThunarVfsInfo *info;
GdkScreen *gscreen;
};
@@ -77,10 +78,11 @@ static gboolean
xfdesktop_regular_file_icon_do_drop_dest(XfdesktopIcon *icon,
XfdesktopIcon
*src_icon,
GdkDragAction action);
-static G_CONST_RETURN ThunarVfsInfo
*xfdesktop_regular_file_icon_peek_info(XfdesktopFileIcon *icon);
-static void xfdesktop_regular_file_icon_update_info(XfdesktopFileIcon *icon,
-ThunarVfsInfo *info);
-static gboolean xfdesktop_regular_file_can_write_parent(XfdesktopFileIcon
*icon);
+static void xfdesktop_regular_file_icon_update_gfile(XfdesktopFileIcon *icon,
+ GFile *gfile);
+
+static gboolean xfdesktop_regular_file_can_rename_file(XfdesktopFileIcon
*icon);
+static gboolean xfdesktop_regular_file_can_delete_file(XfdesktopFileIcon
*icon);
static gboolean xfdesktop_regular_file_icon_rename_file(XfdesktopFileIcon
*icon,
const gchar *new_name);
static gboolean xfdesktop_regular_file_icon_delete_file(XfdesktopFileIcon
*icon);
@@ -89,7 +91,7 @@ static gboolean
xfdesktop_regular_file_icon_delete_file(XfdesktopFileIcon *icon)
static void xfdesktop_regular_file_icon_tfi_init(ThunarxFileInfoIface *iface);
#endif
-static void xfdesktop_delete_file_finished(ThunarVfsJob *job,
+static void xfdesktop_delete_file_finished(XfdesktopJob *job,
gpointer user_data);
static inline void
xfdesktop_regular_file_icon_invalidate_pixbuf(XfdesktopRegularFileIcon *icon);
@@ -125,12 +127,12 @@
xfdesktop_regular_file_icon_class_init(XfdesktopRegularFileIconClass *klass)
icon_class-get_allowed_drag_actions =
xfdesktop_regular_file_icon_get_allowed_drag_actions;
icon_class-get_allowed_drop_actions =
xfdesktop_regular_file_icon_get_allowed_drop_actions;
icon_class-do_drop_dest = xfdesktop_regular_file_icon_do_drop_dest;
-
-file_icon_class-peek_info = xfdesktop_regular_file_icon_peek_info;
-file_icon_class-update_info = xfdesktop_regular_file_icon_update_info;
-file_icon_class-can_rename_file = xfdesktop_regular_file_can_write_parent;
+
+file_icon_class-update_gfile = xfdesktop_regular_file_icon_update_gfile;
+
+file_icon_class-can_rename_file = xfdesktop_regular_file_can_rename_file;
file_icon_class-rename_file = xfdesktop_regular_file_icon_rename_file;
-file_icon_class-can_delete_file = xfdesktop_regular_file_can_write_parent;
+file_icon_class-can_delete_file = xfdesktop_regular_file_can_delete_file;
file_icon_class-delete_file = xfdesktop_regular_file_icon_delete_file;
}
@@ -156,9 +158,6 @@
[Xfce4-commits] xfdesktop:danielm/port-to-gio Check proxy connection before use it.
Updating branch refs/heads/danielm/port-to-gio to 1f96f9b5979e11071e61c0ae01dc4f44efde68db (commit) from f49510794894c1cfb51b880acbe16d8be485828b (commit) commit 1f96f9b5979e11071e61c0ae01dc4f44efde68db Author: Daniel Morales dan...@daniel.com.uy Date: Wed Feb 24 10:20:08 2010 -0200 Check proxy connection before use it. src/xfdesktop-regular-file-icon.c |8 ++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/xfdesktop-regular-file-icon.c b/src/xfdesktop-regular-file-icon.c index 5767bf2..2b0bd9a 100644 --- a/src/xfdesktop-regular-file-icon.c +++ b/src/xfdesktop-regular-file-icon.c @@ -369,6 +369,10 @@ xfdesktop_regular_file_icon_do_drop_dest(XfdesktopIcon *icon, gchar *dest_uri; gchar *name; +thunar_proxy = xfdesktop_file_utils_peek_thunar_proxy(); +if(!thunar_proxy) +return FALSE; + if(xfdesktop_file_utils_is_root(src_file_icon)) return FALSE; @@ -383,8 +387,6 @@ xfdesktop_regular_file_icon_do_drop_dest(XfdesktopIcon *icon, if(!dest_path) return FALSE; -thunar_proxy = xfdesktop_file_utils_peek_thunar_proxy(); - /* only one file, but null terminated */ filenames = g_new(gchar *, 2); filenames[0] = g_file_get_uri(file_icon-gfile); @@ -515,6 +517,8 @@ xfdesktop_regular_file_icon_delete_file(XfdesktopFileIcon *icon) g_return_val_if_fail(G_IS_FILE_INFO(file_icon-info), FALSE); thunar_proxy = xfdesktop_file_utils_peek_thunar_proxy(); +if(!thunar_proxy) +return FALSE; /* only one file, but null terminated */ filenames = g_new(gchar *, 2); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfdesktop:danielm/port-to-gio * src/xfdesktop-file-utils.c: * src/xfdesktop-file-utils.h: - Use GdkDragAction instead XfdesktopFileUtilsFileop
Updating branch refs/heads/danielm/port-to-gio
to b2f48a1cd61f62301d78b826f26d989c3af5b786 (commit)
from f79c70449f5aeeb300645878d841389d4d302ad1 (commit)
commit b2f48a1cd61f62301d78b826f26d989c3af5b786
Author: Daniel Morales dan...@daniel.com.uy
Date: Tue Feb 23 22:59:22 2010 -0200
* src/xfdesktop-file-utils.c:
* src/xfdesktop-file-utils.h:
- Use GdkDragAction instead XfdesktopFileUtilsFileop
src/xfdesktop-file-utils.c | 10 +-
src/xfdesktop-file-utils.h | 12
2 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/src/xfdesktop-file-utils.c b/src/xfdesktop-file-utils.c
index 4b5c9c0..47c41f0 100644
--- a/src/xfdesktop-file-utils.c
+++ b/src/xfdesktop-file-utils.c
@@ -56,7 +56,7 @@ void
xfdesktop_file_utils_handle_fileop_error(GtkWindow *parent,
const XfdesktopFileIcon *src_icon,
const XfdesktopFileIcon *dest_icon,
- XfdesktopFileUtilsFileop fileop,
+ GdkDragAction action,
GError *error)
{
g_return_if_fail(XFDESKTOP_IS_FILE_ICON(src_icon)
@@ -67,14 +67,14 @@ xfdesktop_file_utils_handle_fileop_error(GtkWindow *parent,
if(error) {
gchar *primary_fmt, *primary;
-switch(fileop) {
-case XFDESKTOP_FILE_UTILS_FILEOP_MOVE:
+switch(action) {
+case GDK_ACTION_MOVE:
primary_fmt = _(There was an error moving \%s\ to \%s\:);
break;
-case XFDESKTOP_FILE_UTILS_FILEOP_COPY:
+case GDK_ACTION_COPY:
primary_fmt = _(There was an error copying \%s\ to
\%s\:);
break;
-case XFDESKTOP_FILE_UTILS_FILEOP_LINK:
+case GDK_ACTION_LINK:
primary_fmt = _(There was an error linking \%s\ to
\%s\:);
break;
default:
diff --git a/src/xfdesktop-file-utils.h b/src/xfdesktop-file-utils.h
index af2b418..3693758 100644
--- a/src/xfdesktop-file-utils.h
+++ b/src/xfdesktop-file-utils.h
@@ -22,6 +22,9 @@
#define __XFDESKTOP_FILE_UTILS_H__
#include gio/gio.h
+
+#include gdk/gdkdnd.h
+
#include dbus/dbus-glib.h
#ifdef HAVE_THUNARX
@@ -30,17 +33,10 @@
#include xfdesktop-file-icon.h
-typedef enum
-{
-XFDESKTOP_FILE_UTILS_FILEOP_MOVE = 0,
-XFDESKTOP_FILE_UTILS_FILEOP_COPY,
-XFDESKTOP_FILE_UTILS_FILEOP_LINK,
-} XfdesktopFileUtilsFileop;
-
void xfdesktop_file_utils_handle_fileop_error(GtkWindow *parent,
const XfdesktopFileIcon
*src_icon,
const XfdesktopFileIcon
*dest_icon,
- XfdesktopFileUtilsFileop fileop,
+ GdkDragAction action,
GError *error);
GFileInfo *xfdesktop_file_utils_get_file_info(GFile *gfile,
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfdesktop:danielm/port-to-gio Minor sintax tweaking.
Updating branch refs/heads/danielm/port-to-gio
to 799c8d32b6052846234c32524b49f13da97e4297 (commit)
from 1f96f9b5979e11071e61c0ae01dc4f44efde68db (commit)
commit 799c8d32b6052846234c32524b49f13da97e4297
Author: Daniel Morales dan...@daniel.com.uy
Date: Wed Feb 24 10:33:02 2010 -0200
Minor sintax tweaking.
src/xfdesktop-file-utils.c | 56 ++--
1 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/src/xfdesktop-file-utils.c b/src/xfdesktop-file-utils.c
index 47c41f0..4d8ebfe 100644
--- a/src/xfdesktop-file-utils.c
+++ b/src/xfdesktop-file-utils.c
@@ -517,9 +517,12 @@ gboolean
xfdesktop_file_utils_launch_icon(const XfdesktopFileIcon *file_icon)
{
DBusGProxy *thunar_proxy;
-GtkWidget *icon_view, *toplevel;
-GdkScreen *gscreen;
-gboolean success = FALSE;
+GtkWidget *icon_view, *toplevel;
+GdkScreen *gscreen;
+GError *error = NULL;
+gbooleansuccess = FALSE;
+gchar *display_name;
+gchar *uri;
g_return_val_if_fail(XFDESKTOP_IS_FILE_ICON(file_icon), FALSE);
g_return_val_if_fail(G_IS_FILE(file_icon-gfile), FALSE);
@@ -531,34 +534,31 @@ xfdesktop_file_utils_launch_icon(const XfdesktopFileIcon
*file_icon)
/* use thunar D-BUS API */
thunar_proxy = xfdesktop_file_utils_peek_filemanager_proxy();
-if(thunar_proxy) {
- GError *error = NULL;
-gchar *display_name;
-gchar *uri;
-
-uri = g_file_get_uri(file_icon-gfile);
-display_name = gdk_screen_make_display_name(gscreen);
-
-success = org_xfce_FileManager_launch(thunar_proxy,
- uri,
- display_name,
- error);
-
-if(!success) {
-gchar *primary = g_markup_printf_escaped(_(Unable to launch
\%s\:),
-
g_file_info_get_display_name(file_icon-info));
-xfce_message_dialog(GTK_WINDOW(toplevel), _(Launch Error),
-GTK_STOCK_DIALOG_ERROR, primary,
-error-message,
-GTK_STOCK_CLOSE, GTK_RESPONSE_ACCEPT, NULL);
-g_error_free(error);
-g_free(primary);
-}
+if(!thunar_proxy)
+return FALSE;
+
+uri = g_file_get_uri(file_icon-gfile);
+display_name = gdk_screen_make_display_name(gscreen);
+
+success = org_xfce_FileManager_launch(thunar_proxy,
+ uri,
+ display_name,
+ error);
-g_free(uri);
-g_free(display_name);
+if(!success) {
+gchar *primary = g_markup_printf_escaped(_(Unable to launch \%s\:),
+
g_file_info_get_display_name(file_icon-info));
+xfce_message_dialog(GTK_WINDOW(toplevel), _(Launch Error),
+GTK_STOCK_DIALOG_ERROR, primary,
+error-message,
+GTK_STOCK_CLOSE, GTK_RESPONSE_ACCEPT, NULL);
+g_error_free(error);
+g_free(primary);
}
+g_free(uri);
+g_free(display_name);
+
return success;
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfdesktop:danielm/port-to-gio * src/xfdesktop-regular-file-icon.c: - Dropped Jobs stuff. Implemented copy, move, link and unlink functions using Thunar D-Bus API
Updating branch refs/heads/danielm/port-to-gio
to f49510794894c1cfb51b880acbe16d8be485828b (commit)
from b2f48a1cd61f62301d78b826f26d989c3af5b786 (commit)
commit f49510794894c1cfb51b880acbe16d8be485828b
Author: Daniel Morales dan...@daniel.com.uy
Date: Tue Feb 23 23:03:03 2010 -0200
* src/xfdesktop-regular-file-icon.c:
- Dropped Jobs stuff. Implemented copy, move, link and unlink
functions using Thunar D-Bus API
* TODO.gio:
- Updated
TODO.gio |9 --
src/xfdesktop-regular-file-icon.c | 256 +++--
2 files changed, 102 insertions(+), 163 deletions(-)
diff --git a/TODO.gio b/TODO.gio
index 39e59f1..29dba69 100644
--- a/TODO.gio
+++ b/TODO.gio
@@ -1,20 +1,11 @@
Port to GIO/gUDEV
-- src/xfdesktop-file-icon.c:
--xfdesktop_file_icon_activated():
- src/xfdesktop-regular-file-icon.c:
- xfdesktop_regular_file_icon_do_drop_dest():
* We have to implement a replacement for thunar_vfs_info_execute().
-- src/xfdesktop-job.[ch]: Implement
-- src/xfdesktop-file-jobs.[ch]: Implement
-* Maybe we can take a look and see how THUNAR does it :)
-
-- src/xfdesktop-regular-file-icon.c:
-* ask signal to jobs (currently commented until we implement Jobs)
-
- GCancelable {
* Maybe we can implement an GCancelable to use on:
- xfdesktop_regular_file_icon_new
diff --git a/src/xfdesktop-regular-file-icon.c
b/src/xfdesktop-regular-file-icon.c
index a0dbe25..5767bf2 100644
--- a/src/xfdesktop-regular-file-icon.c
+++ b/src/xfdesktop-regular-file-icon.c
@@ -45,12 +45,13 @@
#include libxfce4ui/libxfce4ui.h
+#include dbus/dbus-glib-lowlevel.h
+
#ifdef HAVE_THUNARX
#include thunarx/thunarx.h
#endif
-#include xfdesktop-job.h
-#include xfdesktop-file-jobs.h
+#include xfdesktop-dbus-bindings-filemanager.h
#include xfdesktop-file-utils.h
#include xfdesktop-common.h
#include xfdesktop-regular-file-icon.h
@@ -91,9 +92,6 @@ static gboolean
xfdesktop_regular_file_icon_delete_file(XfdesktopFileIcon *icon)
static void xfdesktop_regular_file_icon_tfi_init(ThunarxFileInfoIface *iface);
#endif
-static void xfdesktop_delete_file_finished(XfdesktopJob *job,
- gpointer user_data);
-
static inline void
xfdesktop_regular_file_icon_invalidate_pixbuf(XfdesktopRegularFileIcon *icon);
@@ -317,62 +315,6 @@
xfdesktop_regular_file_icon_get_allowed_drop_actions(XfdesktopIcon *icon)
return 0;
}
-static void
-xfdesktop_regular_file_icon_drag_job_error(XfdesktopJob *job,
- GError *error,
- gpointer user_data)
-{
-XfdesktopFileIcon *file_icon = XFDESKTOP_FILE_ICON(user_data);
-XfdesktopFileIcon *src_file_icon = g_object_get_data(G_OBJECT(job),
-
--xfdesktop-src-file-icon);
-XfdesktopFileUtilsFileop fileop =
GPOINTER_TO_INT(g_object_get_data(G_OBJECT(job),
-
--xfdesktop-file-icon-action));
-
-g_return_if_fail(file_icon);
-
-if(!src_file_icon)
-return;
-
-xfdesktop_file_utils_handle_fileop_error(NULL,
- src_file_icon,
- file_icon, fileop,
- error);
-}
-
-#if 0
-static XfdesktopJobResponse
-xfdesktop_regular_file_icon_interactive_job_ask(XfdesktopJob *job,
-const gchar *message,
-XfdesktopJobResponse choices,
-gpointer user_data)
-{
-GtkWidget *icon_view =
xfdesktop_icon_peek_icon_view(XFDESKTOP_ICON(user_data));
-GtkWidget *toplevel = gtk_widget_get_toplevel(icon_view);
-return xfdesktop_file_utils_interactive_job_ask(GTK_WINDOW(toplevel),
-message, choices);
-}
-#endif
-
-static void
-xfdesktop_regular_file_icon_drag_job_finished(XfdesktopJob *job,
- gpointer user_data)
-{
-XfdesktopFileIcon *file_icon = XFDESKTOP_FILE_ICON(user_data);
-XfdesktopFileIcon *src_file_icon = g_object_get_data(G_OBJECT(job),
-
--xfdesktop-src-file-icon);
-
-if(!xfdesktop_file_icon_remove_active_job(file_icon, job))
-g_critical(XfdesktopJob 0x%p not found in active jobs list, job);
-
-if(!xfdesktop_file_icon_remove_active_job(src_file_icon, job))
-g_critical(XfdesktopJob 0x%p not found in active jobs list, job);
-
-g_object_unref(G_OBJECT(job));
-
-g_object_unref(G_OBJECT(src_file_icon));
-g_object_unref(G_OBJECT(file_icon));
-}
-
static gboolean
[Xfce4-commits] xfdesktop:danielm/port-to-gio * Dropping File JOBS, we'll use Thunar D-BUS API * Removed gUDEV build checks.
Updating branch refs/heads/danielm/port-to-gio to a22f545060cbd1169f93129b8e115b0f4abb4aea (commit) from e69bb9e3d5a991dc417443f3835515a951c2cb94 (commit) commit a22f545060cbd1169f93129b8e115b0f4abb4aea Author: Daniel Morales dan...@daniel.com.uy Date: Tue Feb 23 19:42:09 2010 -0200 * Dropping File JOBS, we'll use Thunar D-BUS API * Removed gUDEV build checks. configure.ac.in | 66 -- src/Makefile.am | 17 +-- src/xfdesktop-file-jobs.c | 55 --- src/xfdesktop-file-jobs.h | 42 --- src/xfdesktop-job.c | 70 - src/xfdesktop-job.h | 69 6 files changed, 7 insertions(+), 312 deletions(-) diff --git a/configure.ac.in b/configure.ac.in index 714bdf4..1a569b4 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -25,7 +25,6 @@ m4_define([dbus_minimum_version], [0.34]) m4_define([wnck_minimum_version], [2.12]) m4_define([intltool_minimum_version], [0.31]) m4_define([xfconf_minimum_version], [4.6.0]) -m4_define([gudev_minimum_version], [145]) dnl init autoconf AC_INIT([xfdesktop], [xfdesktop_version], [http://bugzilla.xfce.org/]) @@ -106,15 +105,6 @@ else fi if test x$enable_desktop_icons = xyes -a x$enable_file_icons = xyes; then -dnl here i shall abuse the XDT_CHECK_PACKAGE macro -XDT_CHECK_PACKAGE([LIBEXO], [exo-1], - [exo_minimum_version], [], [ -echo *** Optional package exo-1 was either not found on your system -echo *** or is too old. Please install or upgrade to at least version -echo *** thunar_minimum_version, or adjust the PKG_CONFIG_PATH environment variable -echo *** if you installed the new version of the package in a nonstandard -echo *** prefix. File/launcher icons will be disabled. -]) XDT_CHECK_PACKAGE([DBUS], [dbus-glib-1], [dbus_minimum_version], [], [ echo *** Optional package dbus-glib-1 was either not found on your system echo *** or is too old. Please install or upgrade to at least version @@ -123,50 +113,15 @@ echo *** if you installed the new version of the package in a nonstandard echo *** prefix. File/launcher icons will be disabled. ]) enable_file_icons=no -if test x$LIBEXO_VERSION != x; then -already_have_libexo=yes - -if test x$DBUS_VERSION != x; then -enable_file_icons=yes -AC_DEFINE([ENABLE_FILE_ICONS], [1], - [Define if file icons should be enabled]) -fi +if test x$DBUS_VERSION != x; then +enable_file_icons=yes +AC_DEFINE([ENABLE_FILE_ICONS], [1], + [Define if file icons should be enabled]) fi fi AM_CONDITIONAL([ENABLE_FILE_ICONS], [test x$enable_file_icons = xyes]) -dnl if we want desktop icons, do we also want volume monitoring? -AC_ARG_ENABLE([volume-monitoring], -[AC_HELP_STRING([--disable-volume-monitoring], -[Do not compile in support for Volume monitoring (default=enabled)])], -[ac_cv_enable_volume_monitoring=$enableval], -[ac_cv_enable_volume_monitoring=yes]) -if test x$ac_cv_enable_volume_monitoring = xno -o x$enable_desktop_icons != xyes; then -enable_volume_monitoring=no -else -enable_volume_monitoring=yes -fi - -if test x$enable_desktop_icons = xyes -a x$enable_volume_monitoring = xyes; then -XDT_CHECK_PACKAGE([GUDEV], [gudev-1.0], - [gudev_minimum_version], [], [ -echo *** Optional package gudev-1.0 was either not found on your system -echo *** or is too old. Please install or upgrade to at least version -echo *** thunar_minimum_version, or adjust the PKG_CONFIG_PATH environment variable -echo *** if you installed the new version of the package in a nonstandard -echo *** prefix. Volume monitoring will be disabled. -]) -enable_volume_monitoring=no -if test x$GUDEV_VERSION != x; then -enable_volume_monitoring=yes -AC_DEFINE([ENABLE_VOLUME_MONITORING], [1], - [Define if volume monitoring should be enabled]) -fi -fi - -AM_CONDITIONAL([ENABLE_VOLUME_MONITORING], [test x$enable_volume_monitoring = xyes]) - dnl i'd rather have these two only checked conditionally, but this macro also dnl calls AM_CONDITIONAL(), which cannot be in an 'if' block @@ -174,16 +129,8 @@ XDT_CHECK_OPTIONAL_PACKAGE([THUNARX], [thunarx-2], [thunar_minimum_version], [thunarx], [Thunar's extension mechanism, to add external features to the desktop icon implementation]) -dnl maybe we already have it from file icons -if test x$already_have_libexo != xyes; then -XDT_CHECK_PACKAGE([LIB], [exo-1], [exo_minimum_version], [], [ -echo *** Optional package exo-1 was either not found on your system -echo *** or is too old. Please install or upgrade to at least version -echo *** dbus_minimum_version, or adjust the
[Xfce4-commits] xfdesktop:danielm/port-to-gio * src/xfdesktop-dbus-bindings-filemanager.xml: - Updated bindings file (Added Thunar interface) * src/xfdesktop-file-icon.c: * src/xfdesktop-file-icon.h
Updating branch refs/heads/danielm/port-to-gio to f79c70449f5aeeb300645878d841389d4d302ad1 (commit) from a22f545060cbd1169f93129b8e115b0f4abb4aea (commit) commit f79c70449f5aeeb300645878d841389d4d302ad1 Author: Daniel Morales dan...@daniel.com.uy Date: Tue Feb 23 19:52:24 2010 -0200 * src/xfdesktop-dbus-bindings-filemanager.xml: - Updated bindings file (Added Thunar interface) * src/xfdesktop-file-icon.c: * src/xfdesktop-file-icon.h: - Drop file Jobs. * src/xfdesktop-file-utils.c: * src/xfdesktop-file-utils.c: - Drop file Jobs stuff. - Added Thunar Dbus proxy. - Implemented xfdesktop_file_utils_launch_icon() src/xfdesktop-dbus-bindings-filemanager.xml | 109 ++ src/xfdesktop-file-icon.c | 113 +-- src/xfdesktop-file-icon.h |7 +- src/xfdesktop-file-utils.c | 212 +++ src/xfdesktop-file-utils.h | 24 +--- 5 files changed, 171 insertions(+), 294 deletions(-) diff --git a/src/xfdesktop-dbus-bindings-filemanager.xml b/src/xfdesktop-dbus-bindings-filemanager.xml index b76fa74..fd09019 100644 --- a/src/xfdesktop-dbus-bindings-filemanager.xml +++ b/src/xfdesktop-dbus-bindings-filemanager.xml @@ -97,4 +97,113 @@ arg direction=in name=display type=s / /method /interface + + !-- +org.xfce.Thunar + +The Thunar specific interface, which provides Thunar specific +methods, and which should not be implemented by any other +file manager. + +This interface is also subject to change. So, unless you know +what you are doing, and you want to limit yourself to Thunar, +do not use this interface, but use org.xfce.FileManager instead. + -- + interface name=org.xfce.Thunar +annotation name=org.freedesktop.DBus.GLib.CSymbol value=thunar_dbus_service / + +!-- + LaunchFiles (working_directory : STRING, filenames : ARRAY OF STRING, display : STRING, startup_id : STRING) : VOID + + working_directory : the directory, relative to which filenames should + be interpreted. + filenames : an array of file names to launch. The file names may + be either file:-URIs, absolute paths or paths relative + to the working_directory. + display : the screen on which to launch the filenames or + to use the default screen of the file manager. + startup_id: the DESKTOP_STARTUP_ID environment variable for properly + handling startup notification and focus stealing. +-- +method name=LaunchFiles + arg direction=in name=working_directory type=s / + arg direction=in name=filenames type=as / + arg direction=in name=display type=s / + arg direction=in name=startup_id type=s / +/method + +!-- + CopyInto (filenames : ARRAY OF STRING, target : STRING, display : STRING, startup_id : STRING) : VOID + + filenames : an array of file names to copy. The file names may + be either file:-URIs, absolute paths or paths relative + to the working_directory. + target: the target directory. + display : the screen on which to launch the filenames or + to use the default screen of the file manager. + startup_id: the DESKTOP_STARTUP_ID environment variable for properly + handling startup notification and focus stealing. +-- +method name=CopyInto + arg direction=in name=filenames type=as / + arg direction=in name=target type=s / + arg direction=in name=display type=s / + arg direction=in name=startup_id type=s / +/method + +!-- + MoveInto (filenames : ARRAY OF STRING, target : STRING, display : STRING, startup_id : STRING) : VOID + + filenames : an array of file names to move. The file names may + be either file:-URIs, absolute paths or paths relative + to the working_directory. + target: the target directory. + display : the screen on which to launch the filenames or + to use the default screen of the file manager. + startup_id: the DESKTOP_STARTUP_ID environment variable for properly + handling startup notification and focus stealing. +-- +method name=MoveInto + arg direction=in name=filenames type=as / + arg direction=in name=target type=s / + arg direction=in name=display type=s / + arg direction=in name=startup_id type=s / +/method + +!-- + LinkInto (filenames : ARRAY OF STRING, target : STRING, display : STRING, startup_id : STRING) : VOID + +
[Xfce4-commits] midori:master Make addons delete confirmation dialog more readable
Updating branch refs/heads/master to 1640aedd44d9c3a3dd5756335086bc7228a492f9 (commit) from 20125dfc510482c1921a5ff71b69e099479d1062 (commit) commit 1640aedd44d9c3a3dd5756335086bc7228a492f9 Author: Paweł Forysiuk tuxa...@o2.pl Date: Sat Aug 28 21:50:23 2010 +0200 Make addons delete confirmation dialog more readable extensions/addons.c | 25 ++--- 1 files changed, 18 insertions(+), 7 deletions(-) diff --git a/extensions/addons.c b/extensions/addons.c index 50a0cdf..3bd043b 100644 --- a/extensions/addons.c +++ b/extensions/addons.c @@ -224,13 +224,24 @@ midori_addons_button_delete_clicked_cb (GtkWidget* toolitem, gtk_tree_model_get (model, iter, 0, element, -1); dialog = gtk_message_dialog_new ( -GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (addons))), -GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, -GTK_MESSAGE_QUESTION, -GTK_BUTTONS_YES_NO, -_(Do you really want to remove '%s'?\n\n - The file '%s' will be permanently lost.\n), - element-displayname, element-fullpath); +GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (addons))), +GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, +GTK_MESSAGE_QUESTION, +GTK_BUTTONS_CANCEL, +_(Do you want to delete '%s'?), +element-displayname); +gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_DELETE, GTK_RESPONSE_YES); + +gtk_window_set_title (GTK_WINDOW (dialog), +addons-kind == ADDONS_USER_SCRIPTS +? _(Delete user script) +: _(Delete user style)); + +gtk_message_dialog_format_secondary_markup ( +GTK_MESSAGE_DIALOG (dialog), +_(The file b%s/b will be permanently deleted.), +element-fullpath); + delete_response = gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (GTK_WIDGET (dialog)); ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Show addon filename and/ or description in tooltip
Updating branch refs/heads/master
to ce56f60ccdb2604ac1de4257e84321806213dbcf (commit)
from 1640aedd44d9c3a3dd5756335086bc7228a492f9 (commit)
commit ce56f60ccdb2604ac1de4257e84321806213dbcf
Author: Paweł Forysiuk tuxa...@o2.pl
Date: Sun Aug 29 23:29:10 2010 +0200
Show addon filename and/ or description in tooltip
extensions/addons.c | 22 +++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/extensions/addons.c b/extensions/addons.c
index 3bd043b..7f5d68a 100644
--- a/extensions/addons.c
+++ b/extensions/addons.c
@@ -827,8 +827,9 @@ addons_update_elements (MidoriExtension* extension,
if (liststore)
gtk_list_store_clear (liststore);
else
-liststore = gtk_list_store_new (3, G_TYPE_POINTER,
+liststore = gtk_list_store_new (4, G_TYPE_POINTER,
G_TYPE_INT,
+G_TYPE_STRING,
G_TYPE_STRING);
keyfile = g_key_file_new ();
@@ -842,6 +843,9 @@ addons_update_elements (MidoriExtension* extension,
elements = NULL;
while (addon_files)
{
+gchar* filename;
+gchar* tooltip;
+
fullpath = addon_files-data;
element = g_new (struct AddonElement, 1);
element-displayname = g_filename_display_basename (fullpath);
@@ -888,10 +892,22 @@ addons_update_elements (MidoriExtension* extension,
element-enabled = FALSE;
}
+filename = g_path_get_basename (element-fullpath);
+if (element-description)
+{
+tooltip = g_strdup_printf (%s\n\n%s,
+ filename, element-description);
+g_free (filename);
+}
+else
+tooltip = filename;
+
gtk_list_store_append (liststore, iter);
gtk_list_store_set (liststore, iter,
-0, element, 1, 0, 2, element-fullpath, -1);
+0, element, 1, 0, 2, element-fullpath,
+3, tooltip, -1);
+g_free (tooltip);
addon_files = g_slist_next (addon_files);
elements = g_slist_prepend (elements, element);
}
@@ -936,7 +952,7 @@ addons_init (Addons* addons)
(GtkTreeCellDataFunc)addons_treeview_render_text_cb,
addons-treeview, NULL);
gtk_tree_view_append_column (GTK_TREE_VIEW (addons-treeview), column);
-gtk_tree_view_set_tooltip_column (GTK_TREE_VIEW (addons-treeview), 2);
+gtk_tree_view_set_tooltip_column (GTK_TREE_VIEW (addons-treeview), 3);
g_signal_connect (addons-treeview, row-activated,
G_CALLBACK (addons_treeview_row_activated_cb),
addons);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] midori:master Add button to open addon in text editor
Updating branch refs/heads/master
to d7b68b9d94656d37f86b136bec96f79a2092191e (commit)
from ce56f60ccdb2604ac1de4257e84321806213dbcf (commit)
commit d7b68b9d94656d37f86b136bec96f79a2092191e
Author: Paweł Forysiuk tuxa...@o2.pl
Date: Mon Aug 30 00:59:57 2010 +0200
Add button to open addon in text editor
extensions/addons.c | 41 +
1 files changed, 41 insertions(+), 0 deletions(-)
diff --git a/extensions/addons.c b/extensions/addons.c
index 7f5d68a..263c893 100644
--- a/extensions/addons.c
+++ b/extensions/addons.c
@@ -277,6 +277,39 @@ midori_addons_button_delete_clicked_cb (GtkWidget*
toolitem,
}
}
}
+static void
+midori_addons_open_in_editor_clicked_cb (GtkWidget* toolitem,
+ Addons*addons)
+{
+GtkTreeModel* model;
+GtkTreeIter iter;
+
+if (katze_tree_view_get_selected_iter (GTK_TREE_VIEW (addons-treeview),
+ model, iter))
+{
+struct AddonElement* element;
+MidoriWebSettings* settings;
+MidoriBrowser* browser;
+gchar* text_editor;
+gchar* element_uri;
+
+browser = midori_browser_get_for_widget (GTK_WIDGET
(addons-treeview));
+settings = katze_object_get_object (browser, settings);
+
+gtk_tree_model_get (model, iter, 0, element, -1);
+element_uri = g_filename_to_uri (element-fullpath, NULL, NULL);
+
+g_object_get (settings, text-editor, text_editor, NULL);
+if (text_editor *text_editor)
+sokoke_spawn_program (text_editor, element_uri, TRUE);
+else
+sokoke_show_uri (NULL, element_uri,
+ gtk_get_current_event_time (), NULL);
+
+g_free (element_uri);
+g_free (text_editor);
+}
+}
GtkWidget*
addons_get_toolbar (MidoriViewable* viewable)
@@ -311,6 +344,14 @@ addons_get_toolbar (MidoriViewable* viewable)
gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1);
gtk_widget_show (GTK_WIDGET (toolitem));
+/* Text editor button */
+toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_EDIT);
+gtk_tool_item_set_is_important (toolitem, TRUE);
+g_signal_connect (toolitem, clicked,
+G_CALLBACK (midori_addons_open_in_editor_clicked_cb), viewable);
+gtk_toolbar_insert (GTK_TOOLBAR (toolbar), toolitem, -1);
+gtk_widget_show (GTK_WIDGET (toolitem));
+
/* Delete button */
toolitem = gtk_tool_button_new_from_stock (GTK_STOCK_DELETE);
gtk_tool_item_set_is_important (toolitem, TRUE);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar-volman:master l10n: Updated Portuguese (pt) translation to 97%
Updating branch refs/heads/master to e740bc04051fb5736c573eeda005254b92bf1896 (commit) from 3d779bf7dbdac8b1ee42214a03d5a4c008832b05 (commit) commit e740bc04051fb5736c573eeda005254b92bf1896 Author: Sergio Marques smarque...@gmail.com Date: Mon Aug 30 01:52:17 2010 +0200 l10n: Updated Portuguese (pt) translation to 97% New status: 113 messages complete with 0 fuzzies and 3 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/pt.po | 53 ++--- 1 files changed, 22 insertions(+), 31 deletions(-) diff --git a/po/pt.po b/po/pt.po index 682cabe..216bd80 100644 --- a/po/pt.po +++ b/po/pt.po @@ -17,9 +17,8 @@ msgstr Language: \n #: ../thunar-volman/main.c:59 -#, fuzzy msgid The syfs path of the newly added device -msgstr O UDI do novo dispositivo HAL adicionado +msgstr O caminho syfs do dispositivo agora adicionado #: ../thunar-volman/main.c:60 #: ../thunar-volman-settings/thunar-volman-settings.desktop.in.in.h:1 @@ -184,16 +183,15 @@ msgstr Incapaz de montar o dispositivo #: ../thunar-volman/tvm-block-device.c:746 #, c-format msgid Could not detect the volume corresponding to the device -msgstr +msgstr Não foi possível detectar o volume que corresponde ao dispositivo #: ../thunar-volman/tvm-block-device.c:821 msgid Audio/Data CD msgstr CD de Áudio/Dados #: ../thunar-volman/tvm-block-device.c:822 -#, fuzzy msgid The CD in the drive contains both music and files -msgstr O CD contém música e outros ficheiros. +msgstr O CD na unidade contém música e ficheiros #: ../thunar-volman/tvm-block-device.c:824 msgid Would you like to listen to music or browse the files? @@ -210,27 +208,24 @@ msgstr _Tocar CD #: ../thunar-volman/tvm-block-device.c:916 #, c-format msgid Unknown block device type -msgstr +msgstr O tipo de dispositivo é desconhecido #: ../thunar-volman/tvm-device.c:139 #, c-format msgid Device type not supported -msgstr +msgstr O tipo de dispositivo não é suportado #: ../thunar-volman/tvm-input-device.c:74 -#, fuzzy msgid input-keyboard -msgstr Teclados +msgstr #: ../thunar-volman/tvm-input-device.c:75 -#, fuzzy msgid Keyboard detected -msgstr Teclados +msgstr Teclado detectado #: ../thunar-volman/tvm-input-device.c:76 -#, fuzzy msgid A keyboard was detected -msgstr Cartão de fotos detectado. +msgstr Foi detectado um teclado #: ../thunar-volman/tvm-input-device.c:86 #: ../thunar-volman/tvm-input-device.c:100 @@ -239,14 +234,13 @@ msgstr #: ../thunar-volman/tvm-input-device.c:87 #: ../thunar-volman/tvm-input-device.c:101 -#, fuzzy msgid Tablet detected -msgstr Capacidade Auto-Run detectada +msgstr Tablet detectado #: ../thunar-volman/tvm-input-device.c:88 #: ../thunar-volman/tvm-input-device.c:102 msgid A graphics tablet was detected -msgstr +msgstr Foi detectado um tablet de gráficos #: ../thunar-volman/tvm-input-device.c:110 msgid input-mouse @@ -254,30 +248,29 @@ msgstr #: ../thunar-volman/tvm-input-device.c:111 msgid Mouse detected -msgstr +msgstr Detectado um rato #: ../thunar-volman/tvm-input-device.c:112 msgid A mouse was detected -msgstr +msgstr Foi detectado um rato #: ../thunar-volman/tvm-input-device.c:139 #, c-format msgid Unsupported input device type -msgstr +msgstr O dispositivo introduzido não é suportado #: ../thunar-volman/tvm-run.c:171 #, c-format msgid Autoburning of blank CDs and DVDs is disabled -msgstr +msgstr A gravação automática dos CD/DVD vazios está inactiva #: ../thunar-volman/tvm-run.c:189 msgid Blank DVD inserted -msgstr +msgstr Inserido um DVD vazio #: ../thunar-volman/tvm-run.c:190 -#, fuzzy msgid You have inserted a blank DVD. -msgstr Inseriu um disco em branco. +msgstr Inseriu um DVD vazio. #: ../thunar-volman/tvm-run.c:191 ../thunar-volman/tvm-run.c:202 msgid What would you like to do? @@ -288,14 +281,12 @@ msgid Burn _DVD msgstr Gravar _DVD #: ../thunar-volman/tvm-run.c:200 -#, fuzzy msgid Blank CD inserted -msgstr CDs e DVDs vazios +msgstr Inserido um CD vazio #: ../thunar-volman/tvm-run.c:201 -#, fuzzy msgid You have inserted a blank CD. -msgstr Inseriu um disco em branco. +msgstr Inseriu um CD vazio. #: ../thunar-volman/tvm-run.c:204 msgid Burn _Data CD @@ -308,16 +299,16 @@ msgstr Gravar CD de Á_udio #: ../thunar-volman/tvm-run.c:229 #, c-format msgid The burn command may not be empty -msgstr +msgstr O comando de gravação não pode estar vazio #: ../thunar-volman/tvm-run.c:268 #, c-format msgid The CD player command is undefined -msgstr +msgstr O comando do leitor de CD não está definido #: ../thunar-volman/tvm-usb-device.c:62 msgid Camera detected -msgstr +msgstr Câmara detectada #: ../thunar-volman/tvm-usb-device.c:63 msgid A photo camera was detected @@ -334,7 +325,7 @@ msgstr Foi detectada uma impressora USB #: ../thunar-volman/tvm-usb-device.c:98 #, c-format msgid Unsupported USB device type -msgstr +msgstr O dispositivo
[Xfce4-commits] midori:master l10n: Updated Portuguese (pt) translation to 100%
Updating branch refs/heads/master to 03ac06565f7cc73fa25f9cbda3d30037026aa065 (commit) from d7b68b9d94656d37f86b136bec96f79a2092191e (commit) commit 03ac06565f7cc73fa25f9cbda3d30037026aa065 Author: Sergio Marques smarque...@gmail.com Date: Mon Aug 30 01:56:11 2010 +0200 l10n: Updated Portuguese (pt) translation to 100% New status: 643 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/pt.po | 56 1 files changed, 36 insertions(+), 20 deletions(-) diff --git a/po/pt.po b/po/pt.po index 43a87ff..ef1f122 100644 --- a/po/pt.po +++ b/po/pt.po @@ -7,16 +7,16 @@ msgid msgstr Project-Id-Version: Midori 0.2.2\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2010-08-29 16:08+\n +POT-Creation-Date: 2010-08-29 22:08+\n PO-Revision-Date: \n Last-Translator: Sérgio Marques smarque...@gmail.com\n Language-Team: Portuguese\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n +X-Poedit-Country: PORTUGAL\n Plural-Forms: nplurals=2; plural=(n != 1);\n X-Poedit-Language: Portuguese\n -X-Poedit-Country: PORTUGAL\n #: ../data/midori.desktop.in.h:1 msgid Lightweight web browser @@ -150,7 +150,7 @@ msgstr Mostrar diálogo de diagnóstico #: ../midori/main.c:1558 msgid Run the specified filename as javascript -msgstr Executar o ficheiro especificado como argumento java +msgstr Executar o ficheiro especificado como 'javascripts ' #: ../midori/main.c:1561 msgid Take a snapshot of the specified URI @@ -1471,11 +1471,11 @@ msgstr Carregar e apresentar automaticamente as imagens #: ../midori/midori-websettings.c:858 ../extensions/statusbar-features.c:100 msgid Enable scripts -msgstr Activar argumentos +msgstr Activar 'scripts ' #: ../midori/midori-websettings.c:859 msgid Enable embedded scripting languages -msgstr Activar argumentos de linguagem incorporados +msgstr Activar 'scripts ' de linguagem incorporados #: ../midori/midori-websettings.c:866 ../extensions/statusbar-features.c:112 msgid Enable Netscape plugins @@ -2309,45 +2309,52 @@ msgstr Bloqueador de publicidade msgid Block advertisements according to a filter list msgstr Bloquear publicidade de acordo com a lista -#: ../extensions/addons.c:130 ../extensions/addons.c:325 +#: ../extensions/addons.c:130 ../extensions/addons.c:336 msgid Userscripts msgstr Argumentos de Utilizador -#: ../extensions/addons.c:135 ../extensions/addons.c:327 +#: ../extensions/addons.c:135 ../extensions/addons.c:338 msgid Userstyles msgstr Estilos de utilizador -#: ../extensions/addons.c:191 ../extensions/addons.c:256 +#: ../extensions/addons.c:191 ../extensions/addons.c:267 #: ../extensions/feed-panel/main.c:129 msgid Error msgstr Erro #: ../extensions/addons.c:231 #, c-format -msgid -Do you really want to remove '%s'?\n -\n -The file '%s' will be permanently lost.\n -msgstr -Deseja realmente remover '%s'?\n -\n -O ficheiro '%s' será perdido para sempre.\n +msgid Do you want to delete '%s'? +msgstr Deseja realmente apagar '%s'? + +#: ../extensions/addons.c:237 +msgid Delete user script +msgstr Apagar 'script ' de utilizador -#: ../extensions/addons.c:1231 +#: ../extensions/addons.c:238 +msgid Delete user style +msgstr Apagar estilo de utilizador + +#: ../extensions/addons.c:242 +#, c-format +msgid The file b%s/b will be permanently deleted. +msgstr O ficheiro 'b%s/b' será apagado permanentemente. + +#: ../extensions/addons.c:1258 #, c-format msgid The configuration of the extension '%s' couldn't be saved: %s\n msgstr A configuração da extensão '%s' não foi gravada: %s\n -#: ../extensions/addons.c:1232 ../extensions/addons.c:1397 +#: ../extensions/addons.c:1259 ../extensions/addons.c:1424 msgid User addons msgstr Extras de utilizador -#: ../extensions/addons.c:1354 +#: ../extensions/addons.c:1381 #, c-format msgid Can't monitor folder '%s': %s msgstr Não é possível vigiar a pasta '%s': %s -#: ../extensions/addons.c:1398 +#: ../extensions/addons.c:1425 msgid Support for userscripts and userstyles msgstr Suporte a scripts e estilos de utilizador @@ -2726,6 +2733,15 @@ msgstr Editar facilmente a barra de ferramentas msgid Cache HTTP communication on disk msgstr Pôr comunicações HTTP em cache +#~ msgid +#~ Do you really want to remove '%s'?\n +#~ \n +#~ The file '%s' will be permanently lost.\n +#~ msgstr +#~ Deseja realmente remover '%s'?\n +#~ \n +#~ O ficheiro '%s' será perdido para sempre.\n + #~ msgid _Restore Tab #~ msgstr _Restaurar Separadores ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] thunar:master l10n: Updated Portuguese (pt) translation to 100%
Updating branch refs/heads/master to 83b887e3364dcd944ed3a2f2e93393adb0812d99 (commit) from 930d944f86d5b2f9ea48dc8dff577e6a98f0b219 (commit) commit 83b887e3364dcd944ed3a2f2e93393adb0812d99 Author: Sergio Marques smarque...@gmail.com Date: Mon Aug 30 01:58:17 2010 +0200 l10n: Updated Portuguese (pt) translation to 100% New status: 678 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/pt.po | 56 ++-- 1 files changed, 38 insertions(+), 18 deletions(-) diff --git a/po/pt.po b/po/pt.po index 6b40b01..79a7606 100644 --- a/po/pt.po +++ b/po/pt.po @@ -7,7 +7,7 @@ msgid msgstr Project-Id-Version: Thunar 1.0.1\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2010-07-26 16:05+\n +POT-Creation-Date: 2010-08-29 22:08+\n PO-Revision-Date: 2010-01-06 13:29-\n Last-Translator: Sergio Marques smarque...@gmail.com\n Language-Team: \n @@ -167,7 +167,7 @@ msgstr Criando ligações simbólicas em \%s\... msgid Moving files into \%s\... msgstr Movendo ficheiros para \%s\... -#: ../thunar/thunar-application.c:1461 +#: ../thunar/thunar-application.c:1467 #, c-format msgid Are you sure that you want to\n @@ -176,7 +176,7 @@ msgstr Tem a certeza de que deseja apagar\n permanentemente \%s\? -#: ../thunar/thunar-application.c:1466 +#: ../thunar/thunar-application.c:1472 #, c-format msgid Are you sure that you want to permanently\n @@ -191,58 +191,58 @@ msgstr[1] Tem a certeza de que quer apagar permanentemente\n os %u ficheiros seleccionados? -#: ../thunar/thunar-application.c:1486 +#: ../thunar/thunar-application.c:1492 msgid If you delete a file, it is permanently lost. msgstr Se apagar um ficheiro, é permanentemente perdido. -#: ../thunar/thunar-application.c:1496 +#: ../thunar/thunar-application.c:1502 msgid Deleting files... msgstr Removendo ficheiros... -#: ../thunar/thunar-application.c:1531 +#: ../thunar/thunar-application.c:1537 msgid Moving files into the trash... msgstr Movendo ficheiros para o lixo... -#: ../thunar/thunar-application.c:1570 +#: ../thunar/thunar-application.c:1576 msgid Creating files... msgstr Criando ficheiros... -#: ../thunar/thunar-application.c:1609 +#: ../thunar/thunar-application.c:1615 msgid Creating directories... msgstr Criando directórios... -#: ../thunar/thunar-application.c:1647 +#: ../thunar/thunar-application.c:1653 msgid Remove all files and folders from the Trash? msgstr Remover todos os ficheiros e pastas do Lixo? #. append the Empty Trash menu action #. prepare the menu item -#: ../thunar/thunar-application.c:1652 ../thunar/thunar-location-buttons.c:171 +#: ../thunar/thunar-application.c:1658 ../thunar/thunar-location-buttons.c:171 #: ../thunar/thunar-shortcuts-view.c:835 ../thunar/thunar-tree-view.c:1145 #: ../thunar/thunar-window.c:295 ../plugins/thunar-tpa/thunar-tpa.c:169 msgid _Empty Trash msgstr _Esvaziar Lixo -#: ../thunar/thunar-application.c:1656 +#: ../thunar/thunar-application.c:1662 msgid If you choose to empty the Trash, all items in it will be permanently lost. Please note that you can also delete them separately. msgstr Se escolher esvaziar o Lixo, todos os itens serão perdidos. Por favor, note que pode também apagá-los separadamente. -#: ../thunar/thunar-application.c:1673 +#: ../thunar/thunar-application.c:1679 msgid Emptying the Trash... msgstr A limpar o Lixo... -#: ../thunar/thunar-application.c:1719 +#: ../thunar/thunar-application.c:1725 #, c-format msgid Failed to determine the original path for \%s\ msgstr Falhou ao determinar o caminho original para \%s\ #. display an error dialog -#: ../thunar/thunar-application.c:1736 +#: ../thunar/thunar-application.c:1742 #, c-format msgid Could not restore \%s\ msgstr Incapaz de restaurar \%s\ -#: ../thunar/thunar-application.c:1744 +#: ../thunar/thunar-application.c:1750 msgid Restoring files... msgstr Restaurando ficheiros... @@ -494,23 +494,43 @@ msgstr Entre com o novo nome: msgid Cannot convert filename \%s\ to the local encoding msgstr Incapaz de converter nome de ficheiro \%s\ para a codificação local -#: ../thunar/thunar-dbus-service.c:367 +#: ../thunar/thunar-dbus-service.c:420 #, c-format msgid Invalid filename \%s\ msgstr Nome de ficheiro \%s\ inválido #. LaunchFiles() invoked without a valid working directory -#: ../thunar/thunar-dbus-service.c:696 +#: ../thunar/thunar-dbus-service.c:749 #, c-format msgid The working directory must be an absolute path msgstr O directório de trabalho deve ser um caminho absoluto #. LaunchFiles() invoked with an empty filename list -#: ../thunar/thunar-dbus-service.c:704 +#: ../thunar/thunar-dbus-service.c:757 #, c-format msgid Atleast one filename must be specified msgstr Pelo menos um nome de ficheiro deve ser especificado +#: ../thunar/thunar-dbus-service.c:803 +#, c-format +msgid At least one source filename
[Xfce4-commits] xfce4-settings:master l10n: Updated Portuguese (pt) translation to 100%
Updating branch refs/heads/master to 5f33001a1bdef69c1e730c74205dcf88657f5f6f (commit) from 259f8ad349386d4bd263c9cedb8bcaa02260629e (commit) commit 5f33001a1bdef69c1e730c74205dcf88657f5f6f Author: Sergio Marques smarque...@gmail.com Date: Mon Aug 30 02:04:17 2010 +0200 l10n: Updated Portuguese (pt) translation to 100% New status: 267 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/pt.po | 22 +++--- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/po/pt.po b/po/pt.po index 9568104..f1af751 100644 --- a/po/pt.po +++ b/po/pt.po @@ -7,7 +7,7 @@ msgid msgstr Project-Id-Version: xfce4-settings\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2010-08-29 16:06+\n +POT-Creation-Date: 2010-08-29 22:06+\n PO-Revision-Date: 2010-01-20 19:38+0100\n Last-Translator: Nuno Miguel nu...@netcabo.pt\n Language-Team: \n @@ -441,7 +441,7 @@ msgstr R_esolução: #: ../dialogs/display-settings/display-dialog.glade.h:4 msgid Ref_lection: -msgstr +msgstr Ref_lexão: #: ../dialogs/display-settings/display-dialog.glade.h:5 msgid Refresh _rate: @@ -453,11 +453,11 @@ msgstr Ro_tação: #: ../dialogs/display-settings/display-dialog.glade.h:7 msgid _Use this output -msgstr +msgstr _Utilizar esta saída #: ../dialogs/display-settings/minimal-display-dialog.glade.h:1 msgid Both displays cloned -msgstr +msgstr Foram clonadas as duas exibições #: ../dialogs/display-settings/minimal-display-dialog.glade.h:2 msgid Display settings @@ -465,11 +465,11 @@ msgstr Definições de exibição #: ../dialogs/display-settings/minimal-display-dialog.glade.h:3 msgid Several displays are available. Use:\n -msgstr +msgstr Diversas exibições disponíveis. Utilização:\n #: ../dialogs/display-settings/minimal-display-dialog.glade.h:5 msgid Use both displays to show the same contents -msgstr +msgstr Utilizar ambos os ecrãs para mostrar os mesmos conteúdos #: ../dialogs/display-settings/main.c:68 msgid Normal @@ -497,12 +497,12 @@ msgstr Vertical #: ../dialogs/display-settings/main.c:104 msgid Minimal interface to set up an external output -msgstr +msgstr Interface minimalista para configurar um ecrã externo #: ../dialogs/display-settings/main.c:171 #, c-format msgid The previous configuration will be restored in %i seconds if you do not reply to this question. -msgstr +msgstr A configuração anterior será restaurada em %i segundos, caso não responda a esta pergunta. #. Insert the mode #: ../dialogs/display-settings/main.c:505 @@ -512,11 +512,11 @@ msgstr %.1f Hz #: ../dialogs/display-settings/main.c:651 msgid The last active output must not be disabled, the system would be unusable. -msgstr +msgstr A última saída activa não pode ser desactivada pois o sistema ficaria inutilizado. #: ../dialogs/display-settings/main.c:653 msgid Selected output not disabled -msgstr +msgstr A saída anterior não foi desactivada #: ../dialogs/display-settings/main.c:1077 #: ../dialogs/display-settings/xfce-randr.c:259 @@ -545,7 +545,7 @@ msgstr Incapaz de iniciar as definições do controlador proprietário #: ../dialogs/display-settings/xfce-randr.c:267 #, c-format msgid This system is using RandR %d.%d. For the display settings to work version 1.2 is required at least -msgstr +msgstr Esta sistema utiliza o RandR %d.%d. Para que as definições do ecrã funcionem, deve utilizar a versão 1.2 #. set error #: ../dialogs/display-settings/xfce-randr.c:292 ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-time-out-plugin:master l10n: Updated Russian (ru) translation to 100%
Updating branch refs/heads/master to e190f1761f626c32641dc61e980a9bab62a56a2c (commit) from 867ad9bc356b719e90c6474a1dd07547d26e9ce5 (commit) commit e190f1761f626c32641dc61e980a9bab62a56a2c Author: Andres Kovtunos kovtu...@yandex.ru Date: Mon Aug 30 07:25:11 2010 +0200 l10n: Updated Russian (ru) translation to 100% New status: 43 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/ru.po | 16 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/po/ru.po b/po/ru.po index 583b581..209e480 100644 --- a/po/ru.po +++ b/po/ru.po @@ -20,7 +20,7 @@ msgstr #. Create menu item for taking an instant break #: ../panel-plugin/time-out.c:245 msgid Take a break -msgstr Время перекусить +msgstr Время отдохнуть #. Create menu item for enabling/disabling the countdown #: ../panel-plugin/time-out.c:253 @@ -31,27 +31,27 @@ msgstr Включен #: ../panel-plugin/time-out.c:390 #: ../panel-plugin/xfce4-time-out-plugin.desktop.in.in.h:2 msgid Time Out -msgstr Время вышло +msgstr Перерыв #. Create time settings section #: ../panel-plugin/time-out.c:407 msgid Time settings -msgstr Установка времени +msgstr Установка временных промежутков #. Create break countdown time label #: ../panel-plugin/time-out.c:420 msgid Time between breaks (minutes): -msgstr Время между перерывами (в минутах): +msgstr Длительность рабочего времени (в минутах): #. Create lock countdown time label #: ../panel-plugin/time-out.c:435 msgid Break length (minutes): -msgstr Время перерыва (в минутах): +msgstr Длительность перерыва (в минутах): #. Create postpone countdown time label #: ../panel-plugin/time-out.c:448 msgid Postpone length (minutes): -msgstr Отложить на (минут) +msgstr Откладывание (в минутах) #. Create behaviour section #: ../panel-plugin/time-out.c:461 @@ -76,12 +76,12 @@ msgstr Отображать оставшееся время на панели #. Create display hours check button #: ../panel-plugin/time-out.c:492 msgid Display hours -msgstr Показывать часы +msgstr Отображать часы #. Create display seconds check button #: ../panel-plugin/time-out.c:499 msgid Display seconds -msgstr Показывать секунды +msgstr Отображать секунды #. Create postpone button #: ../panel-plugin/time-out-lock-screen.c:185 ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
