[Xfce4-commits] xfce-utils:master Append Xfce path to XDG_DATA_DIRS (bug #7040).
Updating branch refs/heads/master to 40161f71df30c3d8b984346c8e794a531911d47a (commit) from dc2ded641bc527ada7cc5594ef25d40b2c73e1c5 (commit) commit 40161f71df30c3d8b984346c8e794a531911d47a Author: Nick Schermer n...@xfce.org Date: Tue Dec 28 10:56:09 2010 +0100 Append Xfce path to XDG_DATA_DIRS (bug #7040). It is better to append our path to XDG_DATA_DIRS instead of prepending, because the system paths are more important. scripts/startxfce4.in |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/scripts/startxfce4.in b/scripts/startxfce4.in index 6225b4b..2268dbe 100644 --- a/scripts/startxfce4.in +++ b/scripts/startxfce4.in @@ -34,7 +34,7 @@ then XDG_DATA_DIRS=@_datadir_@:/usr/local/share:/usr/share fi else - XDG_DATA_DIRS=@_datadir_@:$XDG_DATA_DIRS + XDG_DATA_DIRS=$XDG_DATA_DIRS:@_datadir_@ fi export XDG_DATA_DIRS ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-wmdock-plugin:master l10n: Updated Italian (it) translation to 100%
Updating branch refs/heads/master to 64c12cbde7185463211f1ddafde3b8d5bbb6fdc9 (commit) from a9698767ca22deea3ccd5aae415634ed035ea7f9 (commit) commit 64c12cbde7185463211f1ddafde3b8d5bbb6fdc9 Author: Cristian Marchi cri.pe...@gmail.com Date: Tue Dec 28 11:39:08 2010 +0100 l10n: Updated Italian (it) translation to 100% New status: 12 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/it.po |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/it.po b/po/it.po index 591aec6..ef5628e 100644 --- a/po/it.po +++ b/po/it.po @@ -8,7 +8,7 @@ msgstr Project-Id-Version: xfce4-wmdock-plugin\n Report-Msgid-Bugs-To: \n POT-Creation-Date: 2009-01-26 20:22+0100\n -PO-Revision-Date: 2010-09-06 21:06+0100\n +PO-Revision-Date: 2010-12-28 11:37+0100\n Last-Translator: Cristian Marchi cri.pe...@gmail.com\n Language-Team: Italian Translation Team xfce-it-translat...@googlegroups.com\n MIME-Version: 1.0\n ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-battery-plugin:master l10n: Updated Italian (it) translation to 100%
Updating branch refs/heads/master to d2b75742d13ac97ee964ba59d37840810d4f5aeb (commit) from 25469886b89afcf14c4ac5df36a722ba5db8fb47 (commit) commit d2b75742d13ac97ee964ba59d37840810d4f5aeb Author: Cristian Marchi cri.pe...@gmail.com Date: Tue Dec 28 11:40:46 2010 +0100 l10n: Updated Italian (it) translation to 100% New status: 32 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/it.po | 88 +++-- 1 files changed, 39 insertions(+), 49 deletions(-) diff --git a/po/it.po b/po/it.po index 0d30dff..40abb60 100644 --- a/po/it.po +++ b/po/it.po @@ -2,157 +2,147 @@ # Copyright (C) 2006-2007 The Xfce development team. # This file is distributed under the same license as the xfce4-battery-plugin package. # Fabio Riga u...@aruba.it, 2007. -# +# msgid msgstr Project-Id-Version: xfce4-battery-plugin 0.5.0\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2010-12-27 23:53+0900\n +POT-Creation-Date: 2010-12-28 05:05+\n PO-Revision-Date: 2007-05-08 19:07+0200\n Last-Translator: Fabio Riga u...@aruba.it\n Language-Team: Italian xfce-i...@xfce.org\n -Language: it\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n +Language: it\n Plural-Forms: nplurals=2; plural=(n != 1);\n -#: ../panel-plugin/battery.c:498 -#, fuzzy +#: ../panel-plugin/battery.c:499 msgid (No battery, AC on-line) -msgstr (Alimentato a corrente) +msgstr (Nessuna batteria, alimentazione da rete) -#: ../panel-plugin/battery.c:500 +#: ../panel-plugin/battery.c:501 msgid (Charging from AC) msgstr (Batteria in carica) -#: ../panel-plugin/battery.c:500 +#: ../panel-plugin/battery.c:501 msgid (AC on-line) msgstr (Alimentato a corrente) -#: ../panel-plugin/battery.c:510 +#: ../panel-plugin/battery.c:511 #, c-format msgid %d%% (%02d:%02d) remaining msgstr %d%% (%02d:%02d) rimanenti -#: ../panel-plugin/battery.c:512 +#: ../panel-plugin/battery.c:513 #, c-format msgid %02d:%02d remaining msgstr %02d:%02d rimanenti -#: ../panel-plugin/battery.c:514 +#: ../panel-plugin/battery.c:515 #, c-format msgid %d%% remaining msgstr %d%% rimanenti -#: ../panel-plugin/battery.c:516 +#: ../panel-plugin/battery.c:517 #, c-format msgid AC off-line msgstr Alimentato a batteria -#: ../panel-plugin/battery.c:580 -msgid -WARNING: Your battery has reached critical status. You should plug in or -shutdown your computer now to avoid possible data loss. -msgstr -ATTENZIONE: La batteria ha raggiunto il livello di carica critico. Collegare -il computer alla corrente o spegnerlo adesso per evitare perdite di dati. +#: ../panel-plugin/battery.c:581 +msgid WARNING: Your battery has reached critical status. You should plug in or shutdown your computer now to avoid possible data loss. +msgstr ATTENZIONE: La batteria ha raggiunto il livello di carica critico. Collegare il computer alla corrente o spegnerlo adesso per evitare perdite di dati. -#: ../panel-plugin/battery.c:594 -msgid -WARNING: Your battery is running low. You should consider plugging in or -shutting down your computer soon to avoid possible data loss. -msgstr -ATTENZIONE: La batteria si sta scaricando. Si consiglia di collegare il -computer alla corrente o di spegnerlo al più presto per evitare perdite di -dati. +#: ../panel-plugin/battery.c:595 +msgid WARNING: Your battery is running low. You should consider plugging in or shutting down your computer soon to avoid possible data loss. +msgstr ATTENZIONE: La batteria si sta scaricando. Si consiglia di collegare il computer alla corrente o di spegnerlo al più presto per evitare perdite di dati. -#: ../panel-plugin/battery.c:679 +#: ../panel-plugin/battery.c:680 msgid Battery msgstr Batteria -#: ../panel-plugin/battery.c:1105 +#: ../panel-plugin/battery.c:1106 msgid Select file msgstr Seleziona file -#: ../panel-plugin/battery.c:1146 +#: ../panel-plugin/battery.c:1147 msgid Select command msgstr Seleziona comando -#: ../panel-plugin/battery.c:1165 +#: ../panel-plugin/battery.c:1166 #, c-format msgid Unable to open the following url: %s msgstr Impossibile aprire il seguente url: %s -#: ../panel-plugin/battery.c:1189 ../panel-plugin/battmon.desktop.in.in.h:1 +#: ../panel-plugin/battery.c:1190 ../panel-plugin/battmon.desktop.in.in.h:1 msgid Battery Monitor msgstr Monitor della batteria -#: ../panel-plugin/battery.c:1218 +#: ../panel-plugin/battery.c:1219 msgid Low percentage: msgstr Percentuale bassa: -#: ../panel-plugin/battery.c:1229 +#: ../panel-plugin/battery.c:1230 msgid Critical percentage: msgstr Percentuale critica: -#: ../panel-plugin/battery.c:1242 +#: ../panel-plugin/battery.c:1243 msgid Low battery action: msgstr Azione per carica bassa: -#: ../panel-plugin/battery.c:1248 ../panel-plugin/battery.c:1289 +#: ../panel-plugin/battery.c:1249 ../panel-plugin/battery.c:1290 msgid
[Xfce4-commits] xfce4-cpufreq-plugin:master Make the plugin translatable
Updating branch refs/heads/master
to 70900f7e6981f8c95569f635fcb176d7fe8d4cf3 (commit)
from db8d70562927012871895a126bbe6673f34b2a59 (commit)
commit 70900f7e6981f8c95569f635fcb176d7fe8d4cf3
Author: Florian Rivoal friv...@xfce.org
Date: Tue Dec 28 19:38:42 2010 +0900
Make the plugin translatable
Fixes bug #7016
panel-plugin/xfce4-cpufreq-configure.c |5 +
panel-plugin/xfce4-cpufreq-linux.c |5 +
panel-plugin/xfce4-cpufreq-overview.c |5 +
panel-plugin/xfce4-cpufreq-plugin.c|5 +
po/POTFILES.in |3 +++
5 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/panel-plugin/xfce4-cpufreq-configure.c
b/panel-plugin/xfce4-cpufreq-configure.c
index 378a73e..457d5e4 100644
--- a/panel-plugin/xfce4-cpufreq-configure.c
+++ b/panel-plugin/xfce4-cpufreq-configure.c
@@ -29,6 +29,11 @@
#include xfce4-cpufreq-plugin.h
#include xfce4-cpufreq-configure.h
+#ifndef _
+# include libintl.h
+# define _(String) gettext (String)
+#endif
+
static void
check_button_changed (GtkWidget *button, CpuFreqPluginConfigure *configure)
{
diff --git a/panel-plugin/xfce4-cpufreq-linux.c
b/panel-plugin/xfce4-cpufreq-linux.c
index 86dbbf3..bbe56da 100644
--- a/panel-plugin/xfce4-cpufreq-linux.c
+++ b/panel-plugin/xfce4-cpufreq-linux.c
@@ -25,6 +25,11 @@
#include xfce4-cpufreq-plugin.h
#include xfce4-cpufreq-linux.h
+#ifndef _
+# include libintl.h
+# define _(String) gettext (String)
+#endif
+
static gboolean
cpufreq_cpu_parse_sysfs_init (gint cpu_number)
{
diff --git a/panel-plugin/xfce4-cpufreq-overview.c
b/panel-plugin/xfce4-cpufreq-overview.c
index b090a2e..d1736e1 100644
--- a/panel-plugin/xfce4-cpufreq-overview.c
+++ b/panel-plugin/xfce4-cpufreq-overview.c
@@ -23,6 +23,11 @@
#endif
#include libxfcegui4/libxfcegui4.h
+#ifndef _
+# include libintl.h
+# define _(String) gettext (String)
+#endif
+
#include xfce4-cpufreq-plugin.h
#ifdef __linux__
#include xfce4-cpufreq-linux.h
diff --git a/panel-plugin/xfce4-cpufreq-plugin.c
b/panel-plugin/xfce4-cpufreq-plugin.c
index 57d7358..a08aa3f 100644
--- a/panel-plugin/xfce4-cpufreq-plugin.c
+++ b/panel-plugin/xfce4-cpufreq-plugin.c
@@ -27,6 +27,11 @@
#include libxfce4util/libxfce4util.h
#include libxfcegui4/libxfcegui4.h
+#ifndef _
+# include libintl.h
+# define _(String) gettext (String)
+#endif
+
#include xfce4-cpufreq-plugin.h
#ifdef __linux__
#include xfce4-cpufreq-linux.h
diff --git a/po/POTFILES.in b/po/POTFILES.in
index ac9be7b..0a1ef9b 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,2 +1,5 @@
+panel-plugin/xfce4-cpufreq-configure.c
+panel-plugin/xfce4-cpufreq-linux.c
+panel-plugin/xfce4-cpufreq-overview.c
panel-plugin/xfce4-cpufreq-plugin.c
panel-plugin/xfce4-cpufreq-plugin.desktop.in.in
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-cpufreq-plugin:master Clean up and auto tools fixes
Updating branch refs/heads/master to db8d70562927012871895a126bbe6673f34b2a59 (commit) from 2354b959fcec6a8dd09dff11de0f3bca891e5703 (commit) commit db8d70562927012871895a126bbe6673f34b2a59 Author: Florian Rivoal friv...@xfce.org Date: Tue Dec 28 19:11:49 2010 +0900 Clean up and auto tools fixes INSTALL | 236 --- autogen.sh | 15 +-- configure.ac = configure.ac.in |7 +- panel-plugin/Makefile.am|2 +- po/ChangeLog| 173 po/LINGUAS |2 - po/xfce4-cpufreq-plugin.pot | 47 7 files changed, 11 insertions(+), 471 deletions(-) diff --git a/INSTALL b/INSTALL deleted file mode 100644 index 23e5f25..000 --- a/INSTALL +++ /dev/null @@ -1,236 +0,0 @@ -Installation Instructions -* - -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free -Software Foundation, Inc. - -This file is free documentation; the Free Software Foundation gives -unlimited permission to copy, distribute and modify it. - -Basic Installation -== - -These are generic installation instructions. - - The `configure' shell script attempts to guess correct values for -various system-dependent variables used during compilation. It uses -those values to create a `Makefile' in each directory of the package. -It may also create one or more `.h' files containing system-dependent -definitions. Finally, it creates a shell script `config.status' that -you can run in the future to recreate the current configuration, and a -file `config.log' containing compiler output (useful mainly for -debugging `configure'). - - It can also use an optional file (typically called `config.cache' -and enabled with `--cache-file=config.cache' or simply `-C') that saves -the results of its tests to speed up reconfiguring. (Caching is -disabled by default to prevent problems with accidental use of stale -cache files.) - - If you need to do unusual things to compile the package, please try -to figure out how `configure' could check whether to do them, and mail -diffs or instructions to the address given in the `README' so they can -be considered for the next release. If you are using the cache, and at -some point `config.cache' contains results you don't want to keep, you -may remove or edit it. - - The file `configure.ac' (or `configure.in') is used to create -`configure' by a program called `autoconf'. You only need -`configure.ac' if you want to change it or regenerate `configure' using -a newer version of `autoconf'. - -The simplest way to compile this package is: - - 1. `cd' to the directory containing the package's source code and type - `./configure' to configure the package for your system. If you're - using `csh' on an old version of System V, you might need to type - `sh ./configure' instead to prevent `csh' from trying to execute - `configure' itself. - - Running `configure' takes awhile. While running, it prints some - messages telling which features it is checking for. - - 2. Type `make' to compile the package. - - 3. Optionally, type `make check' to run any self-tests that come with - the package. - - 4. Type `make install' to install the programs and any data files and - documentation. - - 5. You can remove the program binaries and object files from the - source code directory by typing `make clean'. To also remove the - files that `configure' created (so you can compile the package for - a different kind of computer), type `make distclean'. There is - also a `make maintainer-clean' target, but that is intended mainly - for the package's developers. If you use it, you may have to get - all sorts of other programs in order to regenerate files that came - with the distribution. - -Compilers and Options -= - -Some systems require unusual options for compilation or linking that the -`configure' script does not know about. Run `./configure --help' for -details on some of the pertinent environment variables. - - You can give `configure' initial values for configuration parameters -by setting variables in the command line or in the environment. Here -is an example: - - ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix - - *Note Defining Variables::, for more details. - -Compiling For Multiple Architectures - - -You can compile the package for more than one kind of computer at the -same time, by placing the object files for each architecture in their -own directory. To do this, you must use a version of `make' that -supports the `VPATH' variable, such as GNU `make'. `cd' to the -directory where you want the object files and executables to go and run -the `configure' script. `configure' automatically checks for the -source code in the directory that `configure'
[Xfce4-commits] xfce4-cpufreq-plugin:master Update german translation
Updating branch refs/heads/master to 995c4157b22fd41a41f78196d3327f0ddd52c21b (commit) from 70900f7e6981f8c95569f635fcb176d7fe8d4cf3 (commit) commit 995c4157b22fd41a41f78196d3327f0ddd52c21b Author: Fabian Nowak timyst...@arcor.de Date: Tue Dec 28 19:42:55 2010 +0900 Update german translation po/de.po | 109 -- 1 files changed, 99 insertions(+), 10 deletions(-) diff --git a/po/de.po b/po/de.po index 12aa174..24a5610 100644 --- a/po/de.po +++ b/po/de.po @@ -3,41 +3,127 @@ # Copyright (C) 2007 THE xfce'S COPYRIGHT HOLDER # This file is distributed under the same license as the xfce package. # Fabian Nowak timyst...@arcor.de, 2007. -# +# msgid msgstr Project-Id-Version: xfce 4-cpufreq-plugin\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2006-09-10 21:29+0200\n +POT-Creation-Date: 2010-12-20 00:07+0100\n PO-Revision-Date: 2007-12-06 23:04+0100\n Last-Translator: Fabian Nowak timyst...@arcor.de\n Language-Team: German\n +Language: \n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n Plural-Forms: nplurals=2; plural=(n != 1);\n -#: ../panel-plugin/xfce4-cpufreq-plugin.c:72 +#: ../panel-plugin/xfce4-cpufreq-configure.c:105 +msgid Configure CPU Frequency Monitor +msgstr CPU-Frequenzüberwachung einrichten + +#: ../panel-plugin/xfce4-cpufreq-configure.c:107 +msgid Configure the CPU frequency plugin +msgstr CPU-Frequenzüberwachung einrichten + +#: ../panel-plugin/xfce4-cpufreq-configure.c:124 +msgid bMonitor/b +msgstr bMonitor/b + +#: ../panel-plugin/xfce4-cpufreq-configure.c:139 +msgid Timeout Interval: +msgstr Aktualisierungsintervall: + +#: ../panel-plugin/xfce4-cpufreq-configure.c:155 +msgid bPanel/b +msgstr bLeiste/b + +#: ../panel-plugin/xfce4-cpufreq-configure.c:172 +msgid Display CPU: +msgstr Angezeigte CPU: + +#. check buttons for display widgets in panel +#: ../panel-plugin/xfce4-cpufreq-configure.c:191 +msgid Show frame +msgstr Rahmen zeichnen + +#: ../panel-plugin/xfce4-cpufreq-configure.c:196 +msgid Show CPU icon +msgstr CPU-Symbol zeigen + +#: ../panel-plugin/xfce4-cpufreq-configure.c:201 +msgid Show CPU frequency +msgstr CPU-Frequenz zeigen + +#: ../panel-plugin/xfce4-cpufreq-configure.c:206 +msgid Show CPU governor +msgstr CPU-Multiplikator zeigen + +#: ../panel-plugin/xfce4-cpufreq-linux.c:401 +msgid +Your system does not support cpufreq.\n +The applet only shows the current cpu frequency +msgstr +Ihr System unterstütt cpufreq nicht.\n +Diese kleine Anwendung zeigt daher nur die derzeitige CPU-Frequenz. + +#: ../panel-plugin/xfce4-cpufreq-overview.c:58 +msgid Scaling driver: +msgstr Skalierungs-Treiber: + +#: ../panel-plugin/xfce4-cpufreq-overview.c:64 +#, c-format +msgid No scaling driver available +msgstr Kein Skalierungs-Treiber verfügbar + +#: ../panel-plugin/xfce4-cpufreq-overview.c:75 +msgid Available frequencies: +msgstr Verfügbare Frequenzen: + +#: ../panel-plugin/xfce4-cpufreq-overview.c:130 +msgid Available governors: +msgstr Verfügbare Multiplikatoren: + +#: ../panel-plugin/xfce4-cpufreq-overview.c:153 +msgid Current governor: +msgstr Derzeitiger Multiplikator: + +#: ../panel-plugin/xfce4-cpufreq-overview.c:188 +msgid CPU Information +msgstr CPU-Information + +#: ../panel-plugin/xfce4-cpufreq-overview.c:195 +msgid An overview of all the CPUs in the system +msgstr iÜbersicht über alle im System vorhandenen CPUs + +#: ../panel-plugin/xfce4-cpufreq-plugin.c:75 #, c-format msgid %d cpu available msgstr %d CPU-Leistung verfügbar -#: ../panel-plugin/xfce4-cpufreq-plugin.c:74 +#: ../panel-plugin/xfce4-cpufreq-plugin.c:77 msgid Frequency: msgstr Frequenz: -#: ../panel-plugin/xfce4-cpufreq-plugin.c:79 +#: ../panel-plugin/xfce4-cpufreq-plugin.c:84 msgid Governor: msgstr Multiplikator: -#: ../panel-plugin/xfce4-cpufreq-plugin.c:249 -#: ../panel-plugin/xfce4-cpufreq-plugin.c:274 +#: ../panel-plugin/xfce4-cpufreq-plugin.c:258 +#: ../panel-plugin/xfce4-cpufreq-plugin.c:280 msgid Could not create widgets ! msgstr Konnte Grafikobjekte nicht erzeugen! -#: ../panel-plugin/xfce4-cpufreq-plugin.c:271 -msgid Could not initialize linux backend ! -msgstr Konnten Linux-Backend nicht initialisieren! +#: ../panel-plugin/xfce4-cpufreq-plugin.c:277 +msgid +Your system is not configured correctly to support cpu frequency scaling ! +msgstr +Ihr System ist derzeit nicht so konfiguriert, dass die CPU-Frequenz skaliert +werden könnte. + +#: ../panel-plugin/xfce4-cpufreq-plugin.c:287 +msgid Your system is not supported yet ! +msgstr Ihr Systen wird noch nicht unterstützt! #: ../panel-plugin/xfce4-cpufreq-plugin.desktop.in.in.h:1 msgid CPU Frequency Monitor @@ -46,3 +132,6 @@ msgstr CPU-Frequenzüberwachung #: ../panel-plugin/xfce4-cpufreq-plugin.desktop.in.in.h:2 msgid Shows the cpu frequency and governours msgstr Zeigt die CPU-Frequenz und Multiplikatoren + +#~ msgid Could not initialize linux backend ! +#~ msgstr Konnten Linux-Backend nicht
[Xfce4-commits] xfce4-battery-plugin:master Compile fix for OpenBSD
Updating branch refs/heads/master
to 978739783bdca4fe6bfdff14ae3ed06ebd61987b (commit)
from d2b75742d13ac97ee964ba59d37840810d4f5aeb (commit)
commit 978739783bdca4fe6bfdff14ae3ed06ebd61987b
Author: Florian Rivoal friv...@xfce.org
Date: Tue Dec 28 20:19:40 2010 +0900
Compile fix for OpenBSD
panel-plugin/battery.c |5 +++--
panel-plugin/libacpi.c |2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/panel-plugin/battery.c b/panel-plugin/battery.c
index b96bfe7..ad8dba1 100644
--- a/panel-plugin/battery.c
+++ b/panel-plugin/battery.c
@@ -29,6 +29,7 @@
#elif __OpenBSD__
#include sys/param.h
#include machine/apmvar.h
+#define APMDEVICE /dev/apm
#elif __NetBSD__
#include sys/param.h
#include sys/ioctl.h
@@ -210,7 +211,7 @@ detect_battery_info(t_battmon *battmon)
battmon-method = BM_BROKEN;
fd = open(APMDEVICE, O_RDONLY);
if (fd == -1) return FALSE;
- + if (ioctl(fd, APM_IOC_GETPOWER, apm) == -1) {
+if (ioctl(fd, APM_IOC_GETPOWER, apm) == -1) {
close(fd);
return FALSE;
}
@@ -303,7 +304,7 @@ update_apm_status(t_battmon *battmon)
battmon-method = BM_BROKEN;
fd = open(APMDEVICE, O_RDONLY);
if (fd == -1) return TRUE;
- if (ioctl(fd, APM_IOC_GETPOWER, apminfo) == -1)
+ if (ioctl(fd, APM_IOC_GETPOWER, apm) == -1)
return TRUE;
close(fd);
charge = apm.battery_life;
diff --git a/panel-plugin/libacpi.c b/panel-plugin/libacpi.c
index 15050f2..87339b7 100644
--- a/panel-plugin/libacpi.c
+++ b/panel-plugin/libacpi.c
@@ -32,7 +32,7 @@
#if HAVE_SYSCTL
-#ifdef __NetBSD__
+#if defined(__NetBSD__) || defined (__OpenBSD__)
#include sys/param.h
/* CTLTYPE does not exist in NetBSD headers.
* Defining it to 0x0f here won't do any harm though. */
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-panel:master Use xfce_panel_pixbuf_from_source() in XfcePanelImage.
Updating branch refs/heads/master
to 7d9ab39f7ccd643ef8a03949590835bd2ac8b1ce (commit)
from 72c7bf9eefa179509b8c62d70db8a9b16a7d5fa4 (commit)
commit 7d9ab39f7ccd643ef8a03949590835bd2ac8b1ce
Author: Nick Schermer n...@xfce.org
Date: Tue Dec 28 12:55:09 2010 +0100
Use xfce_panel_pixbuf_from_source() in XfcePanelImage.
libxfce4panel/xfce-panel-image.c | 86 ++
1 files changed, 22 insertions(+), 64 deletions(-)
diff --git a/libxfce4panel/xfce-panel-image.c b/libxfce4panel/xfce-panel-image.c
index 92dd844..4b84f7e 100644
--- a/libxfce4panel/xfce-panel-image.c
+++ b/libxfce4panel/xfce-panel-image.c
@@ -33,6 +33,7 @@
#include common/panel-private.h
#include libxfce4panel/xfce-panel-macros.h
#include libxfce4panel/xfce-panel-image.h
+#include libxfce4panel/xfce-panel-convenience.h
#include libxfce4panel/libxfce4panel-alias.h
@@ -304,13 +305,10 @@ xfce_panel_image_size_allocate (GtkWidget *widget,
GtkAllocation *allocation)
{
XfcePanelImagePrivate *priv = XFCE_PANEL_IMAGE (widget)-priv;
- GdkPixbuf *pixbuf = NULL;
+ GdkPixbuf *pixbuf;
GdkScreen *screen;
- GtkIconTheme *icon_theme;
- GError*error = NULL;
+ GtkIconTheme *icon_theme = NULL;
gint size;
- gchar *p, *name;
- gchar *filename;
widget-allocation = *allocation;
@@ -328,78 +326,38 @@ xfce_panel_image_size_allocate (GtkWidget *widget,
/* free cache */
xfce_panel_image_unref_null (priv-cache);
+ size = MIN (priv-width, priv-height);
+ if (G_UNLIKELY (priv-force_icon_sizes size 32))
+{
+ /* we use some hardcoded values here for convienence,
+ * above 32 pixels svg icons will kick in */
+ if (size 16 size 22)
+size = 16;
+ else if (size 22 size 24)
+size = 22;
+ else if (size 24 size 32)
+size = 24;
+}
+
if (priv-pixbuf != NULL)
{
/* use the pixbuf set by the user */
pixbuf = g_object_ref (G_OBJECT (priv-pixbuf));
-}
- else if (G_UNLIKELY (g_path_is_absolute (priv-source)))
-{
- pixbuf = gdk_pixbuf_new_from_file (priv-source, error);
- if (G_UNLIKELY (pixbuf == NULL))
+
+ if (G_LIKELY (pixbuf != NULL))
{
- g_critical (Failed to load image \%s\: %s,
- priv-source, error-message);
- g_error_free (error);
- return;
+ /* scale the icon to the correct size */
+ priv-cache = xfce_panel_image_scale_pixbuf (pixbuf, size, size);
+ g_object_unref (G_OBJECT (pixbuf));
}
}
else
{
- size = MIN (priv-width, priv-height);
- if (G_UNLIKELY (priv-force_icon_sizes size 32))
-{
- /* we use some hardcoded values here for convienence,
- * above 32 pixels svg icons will kick in */
- if (size 16 size 22)
-size = 16;
- else if (size 22 size 24)
-size = 22;
- else if (size 24 size 32)
-size = 24;
-}
-
screen = gtk_widget_get_screen (widget);
if (G_LIKELY (screen != NULL))
icon_theme = gtk_icon_theme_get_for_screen (screen);
- else
-icon_theme = gtk_icon_theme_get_default ();
-
- /* get a pixbuf from the theme */
- pixbuf = gtk_icon_theme_load_icon (icon_theme, priv-source, size,
0, NULL);
- if (G_UNLIKELY (pixbuf == NULL))
-{
- /* try to lookup names like application.png in the theme */
- p = strrchr (priv-source, '.');
- if (p != NULL)
-{
- name = g_strndup (priv-source, p - priv-source);
- pixbuf = gtk_icon_theme_load_icon (icon_theme, name, size,
0, NULL);
- g_free (name);
-}
-
- /* maybe they point to a file in the pixbufs folder */
- if (G_UNLIKELY (pixbuf == NULL))
-{
- filename = g_build_filename (pixmaps, priv-source, NULL);
- name = xfce_resource_lookup (XFCE_RESOURCE_DATA, filename);
- g_free (filename);
-
- if (name != NULL)
-pixbuf = gdk_pixbuf_new_from_file (name, NULL);
- g_free (name);
-}
-}
-}
-
- if (G_LIKELY (pixbuf != NULL))
-{
- /* scale the icon to the correct size */
- priv-cache = xfce_panel_image_scale_pixbuf (pixbuf, priv-width,
- priv-height);
- /* release the pixbuf */
-
[Xfce4-commits] xfce4-panel:master Add xfce_panel_pixbuf_from_source().
Updating branch refs/heads/master
to 72c7bf9eefa179509b8c62d70db8a9b16a7d5fa4 (commit)
from 61c91e8365add52992e3015ff88e9beebdd7f64a (commit)
commit 72c7bf9eefa179509b8c62d70db8a9b16a7d5fa4
Author: Nick Schermer n...@xfce.org
Date: Tue Dec 28 12:53:39 2010 +0100
Add xfce_panel_pixbuf_from_source().
Convenience function to load pixbuf from icon names
the the ones used in desktop files.
Code is the same as that from XfcePanelImage.
docs/references/libxfce4panel-sections.txt |1 +
libxfce4panel/libxfce4panel.symbols|1 +
libxfce4panel/xfce-panel-convenience.c | 123
libxfce4panel/xfce-panel-convenience.h |4 +
4 files changed, 129 insertions(+), 0 deletions(-)
diff --git a/docs/references/libxfce4panel-sections.txt
b/docs/references/libxfce4panel-sections.txt
index 843e2b4..e681dc8 100644
--- a/docs/references/libxfce4panel-sections.txt
+++ b/docs/references/libxfce4panel-sections.txt
@@ -56,6 +56,7 @@ xfce_hvbox_get_type
xfce_panel_create_button
xfce_panel_create_toggle_button
xfce_panel_get_channel_name
+xfce_panel_pixbuf_from_source
xfce_allow_panel_customization
xfce_create_panel_button
xfce_create_panel_toggle_button
diff --git a/libxfce4panel/libxfce4panel.symbols
b/libxfce4panel/libxfce4panel.symbols
index 5c856ce..4821b79 100644
--- a/libxfce4panel/libxfce4panel.symbols
+++ b/libxfce4panel/libxfce4panel.symbols
@@ -76,6 +76,7 @@ xfce_hvbox_get_orientation
xfce_panel_create_button G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT
xfce_panel_create_toggle_button G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT
xfce_panel_get_channel_name
+xfce_panel_pixbuf_from_source
#endif
#endif
diff --git a/libxfce4panel/xfce-panel-convenience.c
b/libxfce4panel/xfce-panel-convenience.c
index a6e30d8..ed4e681 100644
--- a/libxfce4panel/xfce-panel-convenience.c
+++ b/libxfce4panel/xfce-panel-convenience.c
@@ -21,6 +21,10 @@
#include config.h
#endif
+#ifdef HAVE_MATH_H
+#include math.h
+#endif
+
#include libxfce4util/libxfce4util.h
#include gtk/gtk.h
@@ -118,5 +122,124 @@ xfce_panel_get_channel_name (void)
+/**
+ * xfce_panel_pixbuf_from_source:
+ * @source: string that contains the location of an icon
+ * @icon_theme: icon theme or %NULL to use the default icon theme
+ * @size: size the icon should be loaded
+ *
+ * Try to load a pixbug from a source string. The source could be
+ * an abolute path, an icon name or a filename that point to a
+ * file in the pixmaps directory.
+ *
+ * This function is particularly usefull for loading names from
+ * the Icon key of desktop files.
+ *
+ * The pixbufs is never bigger then @size. If it is when loaded from the
+ * disk, the pixbuf is scales preserving the aspect ratio.
+ *
+ * Returns: a GdkPixbuf or %NULL is nothing was found. The value should
+ * be released with g_object_unref is no long used.
+ *
+ * See also: XfcePanelImage
+ *
+ * Since: 4.8
+ **/
+GdkPixbuf *
+xfce_panel_pixbuf_from_source (const gchar *source,
+ GtkIconTheme *icon_theme,
+ gint size)
+{
+ GdkPixbuf *pixbuf = NULL;
+ gchar *p;
+ gchar *name;
+ gchar *filename;
+ gint src_w, src_h;
+ gdoublewratio, hratio;
+ gint dest_w, dest_h;
+ GdkPixbuf *dest;
+ GError*error = NULL;
+
+ g_return_val_if_fail (source != NULL, NULL);
+ g_return_val_if_fail (icon_theme == NULL || GTK_IS_ICON_THEME (icon_theme),
NULL);
+ g_return_val_if_fail (size 0, NULL);
+
+ if (G_UNLIKELY (g_path_is_absolute (source)))
+{
+ pixbuf = gdk_pixbuf_new_from_file (source, error);
+ if (G_UNLIKELY (pixbuf == NULL))
+{
+ g_message (Failed to load image \%s\: %s,
+ source, error-message);
+ g_error_free (error);
+}
+}
+ else
+{
+ if (G_UNLIKELY (icon_theme == NULL))
+icon_theme = gtk_icon_theme_get_default ();
+
+ /* try to load from the icon theme */
+ pixbuf = gtk_icon_theme_load_icon (icon_theme, source, size, 0, NULL);
+ if (G_UNLIKELY (pixbuf == NULL))
+{
+ /* try to lookup names like application.png in the theme */
+ p = strrchr (source, '.');
+ if (p != NULL)
+{
+ name = g_strndup (source, p - source);
+ pixbuf = gtk_icon_theme_load_icon (icon_theme, name, size, 0,
NULL);
+ g_free (name);
+}
+
+ /* maybe they point to a file in the pixbufs folder */
+ if (G_UNLIKELY (pixbuf == NULL))
+{
+ filename = g_build_filename (pixmaps, source, NULL);
+ name = xfce_resource_lookup (XFCE_RESOURCE_DATA, filename);
+ g_free (filename);
+
+ if (name != NULL)
+{
+ pixbuf = gdk_pixbuf_new_from_file (name, NULL);
+ g_free (name);
+}
+}
+}
+}
+
+
[Xfce4-commits] xfce4-panel:master Use XfcePanelImage in the launcher menu.
Updating branch refs/heads/master
to 8cc6d8cc0c23798c60f00207602446e22b5aa259 (commit)
from 7d9ab39f7ccd643ef8a03949590835bd2ac8b1ce (commit)
commit 8cc6d8cc0c23798c60f00207602446e22b5aa259
Author: Nick Schermer n...@xfce.org
Date: Tue Dec 28 12:56:06 2010 +0100
Use XfcePanelImage in the launcher menu.
plugins/launcher/launcher.c | 15 +--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/plugins/launcher/launcher.c b/plugins/launcher/launcher.c
index 7fbf7bd..fd228cb 100644
--- a/plugins/launcher/launcher.c
+++ b/plugins/launcher/launcher.c
@@ -40,6 +40,7 @@
#define ARROW_BUTTON_SIZE (12)
#define TOOLTIP_ICON_SIZE (32)
+#define MENU_ICON_SIZE (32)
#define MENU_POPUP_DELAY (225)
#define NO_ARROW_INSIDE_BUTTON(plugin) ((plugin)-arrow_position !=
LAUNCHER_ARROW_INTERNAL \
|| LIST_HAS_ONE_OR_NO_ENTRIES
((plugin)-items))
@@ -323,7 +324,9 @@ launcher_plugin_class_init (LauncherPluginClass *klass)
launcher_menu_icon_size = gtk_icon_size_from_name (panel-launcher-menu);
if (launcher_menu_icon_size == GTK_ICON_SIZE_INVALID)
-launcher_menu_icon_size = gtk_icon_size_register (panel-launcher-menu,
32, 32);
+launcher_menu_icon_size = gtk_icon_size_register (panel-launcher-menu,
+ MENU_ICON_SIZE,
+ MENU_ICON_SIZE);
launcher_tooltip_icon_size = gtk_icon_size_from_name
(panel-launcher-tooltip);
if (launcher_tooltip_icon_size == GTK_ICON_SIZE_INVALID)
@@ -1516,6 +1519,7 @@ launcher_plugin_menu_construct (LauncherPlugin *plugin)
GtkWidget *mi, *image;
const gchar*name, *icon_name;
GSList *li;
+ gintw, h, size;
panel_return_if_fail (XFCE_IS_LAUNCHER_PLUGIN (plugin));
panel_return_if_fail (plugin-menu == NULL);
@@ -1529,6 +1533,12 @@ launcher_plugin_menu_construct (LauncherPlugin *plugin)
/* get the arrow type of the plugin */
arrow_type = xfce_arrow_button_get_arrow_type (XFCE_ARROW_BUTTON
(plugin-arrow));
+ /* size of the menu items */
+ if (gtk_icon_size_lookup (launcher_menu_icon_size, w, h))
+size = MIN (w, h);
+ else
+size = MENU_ICON_SIZE;
+
/* walk through the menu entries */
for (li = plugin-items, n = 0; li != NULL; li = li-next, n++)
{
@@ -1572,7 +1582,8 @@ launcher_plugin_menu_construct (LauncherPlugin *plugin)
icon_name = garcon_menu_item_get_icon_name (item);
if (!exo_str_is_empty (icon_name))
{
- image = gtk_image_new_from_icon_name (icon_name,
launcher_menu_icon_size);
+ image = xfce_panel_image_new_from_source (icon_name);
+ xfce_panel_image_set_size (XFCE_PANEL_IMAGE (image), size);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (mi), image);
gtk_widget_show (image);
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-panel:master Use xfce_panel_pixbuf_from_source in launcher dialogs.
Updating branch refs/heads/master
to 32fcc728f3c902c686c4439d404cafd5241fdd9c (commit)
from 8cc6d8cc0c23798c60f00207602446e22b5aa259 (commit)
commit 32fcc728f3c902c686c4439d404cafd5241fdd9c
Author: Nick Schermer n...@xfce.org
Date: Tue Dec 28 13:06:31 2010 +0100
Use xfce_panel_pixbuf_from_source in launcher dialogs.
plugins/launcher/launcher-dialog.c | 22 +++---
plugins/launcher/launcher-dialog.glade |8
2 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/plugins/launcher/launcher-dialog.c
b/plugins/launcher/launcher-dialog.c
index a6b6b42..80bbc41 100644
--- a/plugins/launcher/launcher-dialog.c
+++ b/plugins/launcher/launcher-dialog.c
@@ -938,6 +938,9 @@ launcher_dialog_items_set_item (GtkTreeModel *model,
{
const gchar *name, *comment;
gchar *markup;
+ GdkPixbuf *icon = NULL;
+ const gchar *icon_name;
+ gint w, h;
panel_return_if_fail (GTK_IS_LIST_STORE (model));
panel_return_if_fail (GARCON_IS_MENU_ITEM (item));
@@ -950,12 +953,21 @@ launcher_dialog_items_set_item (GtkTreeModel
*model,
else
markup = g_markup_printf_escaped (b%s/b, name);
+ icon_name = garcon_menu_item_get_icon_name (item);
+ if (!exo_str_is_empty (icon_name))
+{
+ if (!gtk_icon_size_lookup (GTK_ICON_SIZE_DND, w, h))
+w = h = 32;
+
+ icon = xfce_panel_pixbuf_from_source (icon_name, NULL, MIN (w, h));
+}
+
if (dialog != NULL)
g_signal_handlers_block_by_func (G_OBJECT (model),
G_CALLBACK (launcher_dialog_tree_row_changed), dialog);
gtk_list_store_set (GTK_LIST_STORE (model), iter,
- COL_ICON, garcon_menu_item_get_icon_name (item),
+ COL_ICON, icon,
COL_NAME, markup,
COL_ITEM, item,
-1);
@@ -964,6 +976,8 @@ launcher_dialog_items_set_item (GtkTreeModel *model,
g_signal_handlers_unblock_by_func (G_OBJECT (model),
G_CALLBACK (launcher_dialog_tree_row_changed), dialog);
+ if (G_LIKELY (icon != NULL))
+g_object_unref (G_OBJECT (icon));
g_free (markup);
}
@@ -1144,12 +1158,6 @@ launcher_dialog_show (LauncherPlugin *plugin)
g_signal_connect_swapped (G_OBJECT (item), changed,
G_CALLBACK (gtk_tree_model_filter_refilter), object);
- /* setup the icon size in the icon renderers */
- object = gtk_builder_get_object (builder, addrenderericon);
- g_object_set (G_OBJECT (object), stock-size, GTK_ICON_SIZE_DND, NULL);
- object = gtk_builder_get_object (builder, itemrenderericon);
- g_object_set (G_OBJECT (object), stock-size, GTK_ICON_SIZE_DND, NULL);
-
/* load the plugin items */
launcher_dialog_items_load (dialog);
g_signal_connect_swapped (G_OBJECT (plugin), items-changed,
diff --git a/plugins/launcher/launcher-dialog.glade
b/plugins/launcher/launcher-dialog.glade
index 9032e49..79bb184 100644
--- a/plugins/launcher/launcher-dialog.glade
+++ b/plugins/launcher/launcher-dialog.glade
@@ -32,7 +32,7 @@
object class=GtkListStore id=add-store
columns
!-- column-name icon --
- column type=gchararray/
+ column type=GdkPixbuf/
!-- column-name name --
column type=gchararray/
!-- column-name item --
@@ -46,7 +46,7 @@
object class=GtkListStore id=item-store
columns
!-- column-name icon --
- column type=gchararray/
+ column type=GdkPixbuf/
!-- column-name name --
column type=gchararray/
!-- column-name item --
@@ -100,7 +100,7 @@
child
object class=GtkCellRendererPixbuf
id=itemrenderericon/
attributes
-attribute name=icon-name0/attribute
+attribute name=pixbuf0/attribute
/attributes
/child
child
@@ -484,7 +484,7 @@
child
object class=GtkCellRendererPixbuf
id=addrenderericon/
attributes
-attribute name=icon-name0/attribute
+attribute name=pixbuf0/attribute
/attributes
/child
child
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-panel:master Optimize loading icons from absolute paths.
Updating branch refs/heads/master
to 82bbb2b7ca6348d6e3b5ef14cd653f9383f7f298 (commit)
from 32fcc728f3c902c686c4439d404cafd5241fdd9c (commit)
commit 82bbb2b7ca6348d6e3b5ef14cd653f9383f7f298
Author: Nick Schermer n...@xfce.org
Date: Tue Dec 28 13:16:20 2010 +0100
Optimize loading icons from absolute paths.
libxfce4panel/xfce-panel-convenience.c |4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/libxfce4panel/xfce-panel-convenience.c
b/libxfce4panel/xfce-panel-convenience.c
index ed4e681..dc26ff8 100644
--- a/libxfce4panel/xfce-panel-convenience.c
+++ b/libxfce4panel/xfce-panel-convenience.c
@@ -166,13 +166,15 @@ xfce_panel_pixbuf_from_source (const gchar *source,
if (G_UNLIKELY (g_path_is_absolute (source)))
{
- pixbuf = gdk_pixbuf_new_from_file (source, error);
+ pixbuf = gdk_pixbuf_new_from_file_at_scale (source, size, size, TRUE,
error);
if (G_UNLIKELY (pixbuf == NULL))
{
g_message (Failed to load image \%s\: %s,
source, error-message);
g_error_free (error);
}
+
+ return pixbuf;
}
else
{
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-battery-plugin:master l10n: Updated Chinese (China) (zh_CN) translation to 100%
Updating branch refs/heads/master to 5f83d6f8631b3aa7eaf69631c193e78d21bca9ec (commit) from 978739783bdca4fe6bfdff14ae3ed06ebd61987b (commit) commit 5f83d6f8631b3aa7eaf69631c193e78d21bca9ec Author: Xu Meihong mhun...@gmail.com Date: Tue Dec 28 16:36:39 2010 +0100 l10n: Updated Chinese (China) (zh_CN) translation to 100% New status: 32 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/zh_CN.po | 79 +++--- 1 files changed, 37 insertions(+), 42 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index b97cd49..944653a 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -2,151 +2,146 @@ # Copyright (C) 2008 THE xfce'S COPYRIGHT HOLDER # This file is distributed under the same license as the xfce package. # Hunt Xu hun...@live.cn, 2008. -# +# msgid msgstr Project-Id-Version: xfce 4-battery-plugin\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2010-12-27 23:53+0900\n +POT-Creation-Date: 2010-12-28 11:06+\n PO-Revision-Date: 2008-12-04 18:19+0800\n Last-Translator: Hunt Xu hun...@live.cn\n Language-Team: Chinese (simplified)\n -Language: \n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n +Language: \n -#: ../panel-plugin/battery.c:498 -#, fuzzy +#: ../panel-plugin/battery.c:499 msgid (No battery, AC on-line) -msgstr （已连接至交流电源） +msgstr （没有电池，已连接至交流电源） -#: ../panel-plugin/battery.c:500 +#: ../panel-plugin/battery.c:501 msgid (Charging from AC) msgstr （从交流电源充电） -#: ../panel-plugin/battery.c:500 +#: ../panel-plugin/battery.c:501 msgid (AC on-line) msgstr （已连接至交流电源） -#: ../panel-plugin/battery.c:510 +#: ../panel-plugin/battery.c:511 #, c-format msgid %d%% (%02d:%02d) remaining msgstr 剩余 %d%% (%02d:%02d) -#: ../panel-plugin/battery.c:512 +#: ../panel-plugin/battery.c:513 #, c-format msgid %02d:%02d remaining msgstr 剩余 %02d:%02d -#: ../panel-plugin/battery.c:514 +#: ../panel-plugin/battery.c:515 #, c-format msgid %d%% remaining msgstr 剩余 %d%% -#: ../panel-plugin/battery.c:516 +#: ../panel-plugin/battery.c:517 #, c-format msgid AC off-line msgstr 交流电源已断开 -#: ../panel-plugin/battery.c:580 -msgid -WARNING: Your battery has reached critical status. You should plug in or -shutdown your computer now to avoid possible data loss. +#: ../panel-plugin/battery.c:581 +msgid WARNING: Your battery has reached critical status. You should plug in or shutdown your computer now to avoid possible data loss. msgstr 警告：您的电池电量已达临界值。请接上电源或者关机以避免数据丢失。 -#: ../panel-plugin/battery.c:594 -msgid -WARNING: Your battery is running low. You should consider plugging in or -shutting down your computer soon to avoid possible data loss. +#: ../panel-plugin/battery.c:595 +msgid WARNING: Your battery is running low. You should consider plugging in or shutting down your computer soon to avoid possible data loss. msgstr 警告：您的电池电量低。请接上电源或者关机以避免数据丢失。 -#: ../panel-plugin/battery.c:679 +#: ../panel-plugin/battery.c:680 msgid Battery msgstr 电池 -#: ../panel-plugin/battery.c:1105 +#: ../panel-plugin/battery.c:1106 msgid Select file msgstr 选择文件 -#: ../panel-plugin/battery.c:1146 +#: ../panel-plugin/battery.c:1147 msgid Select command msgstr 选择命令 -#: ../panel-plugin/battery.c:1165 +#: ../panel-plugin/battery.c:1166 #, c-format msgid Unable to open the following url: %s msgstr 无法打开以下网址：%s -#: ../panel-plugin/battery.c:1189 ../panel-plugin/battmon.desktop.in.in.h:1 +#: ../panel-plugin/battery.c:1190 ../panel-plugin/battmon.desktop.in.in.h:1 msgid Battery Monitor msgstr 电池监视器 -#: ../panel-plugin/battery.c:1218 +#: ../panel-plugin/battery.c:1219 msgid Low percentage: msgstr 低电量百分比： -#: ../panel-plugin/battery.c:1229 +#: ../panel-plugin/battery.c:1230 msgid Critical percentage: msgstr 临界电量百分比： -#: ../panel-plugin/battery.c:1242 +#: ../panel-plugin/battery.c:1243 msgid Low battery action: msgstr 电量低时采取如下动作： -#: ../panel-plugin/battery.c:1248 ../panel-plugin/battery.c:1289 +#: ../panel-plugin/battery.c:1249 ../panel-plugin/battery.c:1290 msgid Do nothing msgstr 什么都不做 -#: ../panel-plugin/battery.c:1250 ../panel-plugin/battery.c:1291 +#: ../panel-plugin/battery.c:1251 ../panel-plugin/battery.c:1292 msgid Display a warning message msgstr 显示一条警告信息 -#: ../panel-plugin/battery.c:1252 ../panel-plugin/battery.c:1293 +#: ../panel-plugin/battery.c:1253 ../panel-plugin/battery.c:1294 msgid Run command msgstr 执行命令 -#: ../panel-plugin/battery.c:1254 ../panel-plugin/battery.c:1295 +#: ../panel-plugin/battery.c:1255 ../panel-plugin/battery.c:1296 msgid Run command in terminal msgstr 在终端中执行命令 -#: ../panel-plugin/battery.c:1267 ../panel-plugin/battery.c:1307 +#: ../panel-plugin/battery.c:1268 ../panel-plugin/battery.c:1308 msgid Command: msgstr 命令： -#: ../panel-plugin/battery.c:1283 +#: ../panel-plugin/battery.c:1284 msgid Critical battery action: msgstr 电量到达临界值时采取如下动作： -#:
[Xfce4-commits] garcon:master l10n: Updated Chinese (China) (zh_CN) translation to 100%
Updating branch refs/heads/master to 3df4d212ad2b3a282b5a7c646ea69bbcdfa1627c (commit) from ff00489e5e159b83ed52868a188027075c691490 (commit) commit 3df4d212ad2b3a282b5a7c646ea69bbcdfa1627c Author: Xu Meihong mhun...@gmail.com Date: Tue Dec 28 16:37:00 2010 +0100 l10n: Updated Chinese (China) (zh_CN) translation to 100% New status: 29 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/zh_CN.po |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 2628aaf..4249637 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -8,14 +8,14 @@ msgid msgstr Project-Id-Version: 0.1.0\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2010-12-05 15:29+0100\n +POT-Creation-Date: 2010-12-28 11:04+\n PO-Revision-Date: 2010-11-23 22:57+0800\n Last-Translator: Hunt Xu hun...@live.cn\n Language-Team: Simplified Chinese i18n-x...@xfce.org\n -Language: \n MIME-Version: 1.0\n Content-Type: text/plain; charset=utf-8\n Content-Transfer-Encoding: 8bit\n +Language: \n #: ../data/xfce/xfce-accessories.directory.in.h:1 msgid Accessories @@ -124,7 +124,7 @@ msgstr 系统工具和实用程序 #: ../garcon/garcon-menu.c:698 #, c-format msgid File \%s\ not found -msgstr +msgstr 文件 \%s\ 未找到 #: ../garcon/garcon-menu-parser.c:278 #, c-format ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-panel:master Fix some compiler warnings.
Updating branch refs/heads/master
to a2b94844ad4132af5e883f93c74c6ad242e2f9b0 (commit)
from 82bbb2b7ca6348d6e3b5ef14cd653f9383f7f298 (commit)
commit a2b94844ad4132af5e883f93c74c6ad242e2f9b0
Author: Nick Schermer n...@xfce.org
Date: Tue Dec 28 17:01:17 2010 +0100
Fix some compiler warnings.
plugins/clock/clock.c |1 +
plugins/pager/pager-buttons.c | 12
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/plugins/clock/clock.c b/plugins/clock/clock.c
index a21ec57..375ad47 100644
--- a/plugins/clock/clock.c
+++ b/plugins/clock/clock.c
@@ -488,6 +488,7 @@ clock_plugin_size_changed (XfcePanelPlugin *panel_plugin,
else
{
ratio_size = -1;
+ offset = 0;
}
/* set the clock size */
diff --git a/plugins/pager/pager-buttons.c b/plugins/pager/pager-buttons.c
index 45fe38a..7dfc9aa 100644
--- a/plugins/pager/pager-buttons.c
+++ b/plugins/pager/pager-buttons.c
@@ -280,14 +280,14 @@ pager_buttons_rebuild_idle (gpointer user_data)
gint rows, cols;
gint row, col;
GtkWidget *button;
- WnckWorkspace *workspace;
+ WnckWorkspace *workspace = NULL;
GtkWidget *panel_plugin;
GtkWidget *label;
- gint workspace_width, workspace_height;
- gint screen_width, screen_height;
+ gint workspace_width, workspace_height = 0;
+ gint screen_width = 0, screen_height = 0;
gint viewport_x, viewport_y;
gboolean viewport_mode = FALSE;
- gint n_viewports;
+ gint n_viewports = 0;
gint *vp_info;
gchar text[8];
@@ -335,10 +335,14 @@ pager_buttons_rebuild_idle (gpointer user_data)
{
g_warning (only viewports with equally distributed screens are
supported: %dx%d %dx%d,
workspace_width, workspace_height, screen_width,
screen_height);
+
+ goto workspace_layout;
}
}
else
{
+ workspace_layout:
+
rows = CLAMP (1, pager-rows, n_workspaces);
cols = n_workspaces / rows;
if (cols * rows n_workspaces)
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-panel:master Use foreach to add application to store.
Updating branch refs/heads/master
to f04ce15341eb50b8dc739edb761dac7732325ae5 (commit)
from ed53fc21ce8fa4917b0243bd6dc9ca1d617b1867 (commit)
commit f04ce15341eb50b8dc739edb761dac7732325ae5
Author: Nick Schermer n...@xfce.org
Date: Thu Dec 23 20:50:42 2010 +0100
Use foreach to add application to store.
plugins/systray/systray.c | 110 +++-
1 files changed, 48 insertions(+), 62 deletions(-)
diff --git a/plugins/systray/systray.c b/plugins/systray/systray.c
index 9e4b626..c3f964c 100644
--- a/plugins/systray/systray.c
+++ b/plugins/systray/systray.c
@@ -75,8 +75,9 @@ static void systray_plugin_icon_removed
(SystrayManager
SystrayPlugin
*plugin);
static void systray_plugin_lost_selection (SystrayManager
*manager,
SystrayPlugin
*plugin);
-static void systray_plugin_dialog_add_application_names (SystrayPlugin
*plugin,
- GtkListStore
*store);
+static void systray_plugin_dialog_add_application_names (gpointer
key,
+ gpointer
value,
+ gpointer
user_data);
static void systray_plugin_dialog_hidden_toggled
(GtkCellRendererToggle *renderer,
const gchar
*path_string,
SystrayPlugin
*plugin);
@@ -571,7 +572,8 @@ systray_plugin_configure_plugin (XfcePanelPlugin
*panel_plugin)
store = gtk_builder_get_object (builder, applications-store);
panel_return_if_fail (GTK_IS_LIST_STORE (store));
- systray_plugin_dialog_add_application_names (plugin, GTK_LIST_STORE (store));
+ g_hash_table_foreach (plugin-names,
+ systray_plugin_dialog_add_application_names, store);
g_object_set_data (G_OBJECT (plugin), applications-store, store);
object = gtk_builder_get_object (builder, hidden-toggle);
@@ -851,78 +853,62 @@ systray_plugin_dialog_icon (GtkIconTheme *icon_theme,
static void
-systray_plugin_dialog_add_application_names (SystrayPlugin *plugin,
- GtkListStore *store)
+systray_plugin_dialog_add_application_names (gpointer key,
+ gpointer value,
+ gpointer user_data)
{
- GList*names, *li;
- const gchar *name;
- guint i;
- gboolean hidden;
- const gchar *title, *icon_name;
- gchar*camelcase;
- GdkPixbuf*icon;
+ GtkListStore *store = GTK_LIST_STORE (user_data);
+ const gchar *name = key;
+ gboolean hidden = GPOINTER_TO_UINT (value);
GtkIconTheme *icon_theme;
+ const gchar *title = NULL;
+ gchar*camelcase = NULL;
+ const gchar *icon_name = name;
+ GdkPixbuf*pixbuf;
+ guint i;
GtkTreeIter iter;
- panel_return_if_fail (XFCE_IS_SYSTRAY_PLUGIN (plugin));
- panel_return_if_fail (XFCE_IS_SYSTRAY_BOX (plugin-box));
panel_return_if_fail (GTK_IS_LIST_STORE (store));
+ panel_return_if_fail (name == NULL || g_utf8_validate (name, -1, NULL));
- icon_theme = gtk_icon_theme_get_default ();
+ /* skip invalid names */
+ if (exo_str_is_empty (name))
+ return;
- /* get the know application names and insert them in the store */
- /* TODO use foreach here */
- names = g_hash_table_get_keys (plugin-names);
- names = g_list_sort (names, (GCompareFunc) strcmp);
- for (li = names; li != NULL; li = li-next)
+ /* check if we have a better name for the application */
+ for (i = 0; i G_N_ELEMENTS (known_applications); i++)
{
- name = li-data;
-
- /* skip invalid names */
- if (exo_str_is_empty (name))
-continue;
-
- title = NULL;
- icon_name = name;
- camelcase = NULL;
- hidden = systray_plugin_names_get_hidden (plugin, name);
-
- /* check if we have a better name for the application */
- for (i = 0; i G_N_ELEMENTS (known_applications); i++)
-{
- if (strcmp (name, known_applications[i][0]) == 0)
-{
- icon_name = known_applications[i][1];
- title = _(known_applications[i][2]);
- break;
-}
-}
-
- /* create fallback title if the application was not found */
- if (title == NULL)
+ if (strcmp (name, known_applications[i][0]) == 0)
{
- camelcase = systray_plugin_dialog_camel_case (name);
- title = camelcase;
+ icon_name = known_applications[i][1];
+ title = _(known_applications[i][2]);
+ break;
}
+}
- /* try to load
[Xfce4-commits] xfce4-panel:master Move hidden name handling to plugin.
Updating branch refs/heads/master
to ed53fc21ce8fa4917b0243bd6dc9ca1d617b1867 (commit)
from a2b94844ad4132af5e883f93c74c6ad242e2f9b0 (commit)
commit ed53fc21ce8fa4917b0243bd6dc9ca1d617b1867
Author: Nick Schermer n...@xfce.org
Date: Thu Dec 23 20:15:20 2010 +0100
Move hidden name handling to plugin.
Improve readability of the box widget by moving names
handling to the panel plugin. Use _(s,g)et_hidden in the
socket as a proxy item to store the hidden state of the icon.
Also make the socket store its name, so we don't need to
duplicate it in other widgets.
plugins/systray/systray-box.c| 378 +++---
plugins/systray/systray-box.h| 19 +--
plugins/systray/systray-socket.c | 59 ++-
plugins/systray/systray-socket.h |7 +-
plugins/systray/systray.c| 251 +++--
5 files changed, 357 insertions(+), 357 deletions(-)
diff --git a/plugins/systray/systray-box.c b/plugins/systray/systray-box.c
index 6ac341c..7d11ac5 100644
--- a/plugins/systray/systray-box.c
+++ b/plugins/systray/systray-box.c
@@ -65,22 +65,14 @@ static void systray_box_forall
(GtkContainer*container,
GtkCallback callback,
gpointer
callback_data);
static GTypesystray_box_child_type(GtkContainer*container);
-static void systray_box_names_collect_visible (gpointer key,
- gpointer value,
- gpointer user_data);
-static void systray_box_names_collect_hidden (gpointer key,
- gpointer value,
- gpointer user_data);
-static gboolean systray_box_names_remove (gpointer key,
- gpointer value,
- gpointer user_data);
static void systray_box_button_set_arrow (SystrayBox *box);
static gboolean systray_box_button_press_event(GtkWidget *widget,
GdkEventButton *event,
GtkWidget *box);
static void systray_box_button_clicked(GtkToggleButton *button,
SystrayBox *box);
-static void systray_box_update_hidden (SystrayBox *box);
+static gint systray_box_compare_function (gconstpointera,
+ gconstpointerb);
@@ -124,9 +116,6 @@ typedef struct
/* the child widget */
GtkWidget*widget;
- /* whether it could be hidden */
- guint auto_hide : 1;
-
/* invisible icon because of invalid requisition */
guint invalid : 1;
@@ -135,13 +124,6 @@ typedef struct
}
SystrayBoxChild;
-enum
-{
- PROP_0,
- PROP_NAMES_HIDDEN,
- PROP_NAMES_VISIBLE
-};
-
XFCE_PANEL_DEFINE_TYPE (SystrayBox, systray_box, GTK_TYPE_CONTAINER)
@@ -170,20 +152,6 @@ systray_box_class_init (SystrayBoxClass *klass)
gtkcontainer_class-remove = systray_box_remove;
gtkcontainer_class-forall = systray_box_forall;
gtkcontainer_class-child_type = systray_box_child_type;
-
- g_object_class_install_property (gobject_class,
- PROP_NAMES_HIDDEN,
- g_param_spec_boxed (names-hidden,
- NULL, NULL,
-
PANEL_PROPERTIES_TYPE_VALUE_ARRAY,
- EXO_PARAM_READWRITE));
-
- g_object_class_install_property (gobject_class,
- PROP_NAMES_VISIBLE,
- g_param_spec_boxed (names-visible,
- NULL, NULL,
-
PANEL_PROPERTIES_TYPE_VALUE_ARRAY,
- EXO_PARAM_READWRITE));
}
@@ -200,7 +168,6 @@ systray_box_init (SystrayBox *box)
box-arrow_type = GTK_ARROW_LEFT;
box-show_hidden = FALSE;
box-guess_size = 128;
- box-names = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
/* create arrow button */
box-button = xfce_arrow_button_new (box-arrow_type);
@@ -221,25 +188,10 @@ systray_box_get_property (GObject *object,
GValue *value,
GParamSpec *pspec)
{
- SystrayBox *box = XFCE_SYSTRAY_BOX (object);
- GPtrArray *array;
+ /*SystrayBox *box = XFCE_SYSTRAY_BOX (object);*/
switch (prop_id)
[Xfce4-commits] xfce4-panel:master Move arrow button to plugin widget (bug #6694).
Updating branch refs/heads/master
to 4ea533ef90968e58a0aafd76a9055ac974a92e12 (commit)
from f04ce15341eb50b8dc739edb761dac7732325ae5 (commit)
commit 4ea533ef90968e58a0aafd76a9055ac974a92e12
Author: Nick Schermer n...@xfce.org
Date: Thu Dec 23 21:28:04 2010 +0100
Move arrow button to plugin widget (bug #6694).
Also set the relief of the button to none, so it looks better
on transparent panels. Needs some tweaks but those will land
with the upcomming commits.
plugins/systray/systray-box.c | 205 +
plugins/systray/systray-box.h |5 +
plugins/systray/systray.c | 68 +-
3 files changed, 135 insertions(+), 143 deletions(-)
diff --git a/plugins/systray/systray-box.c b/plugins/systray/systray-box.c
index 7d11ac5..9362044 100644
--- a/plugins/systray/systray-box.c
+++ b/plugins/systray/systray-box.c
@@ -33,7 +33,6 @@
#include systray-box.h
#include systray-socket.h
-#define BUTTON_SIZE(16)
#define SPACING(2)
#define OFFSCREEN (-)
#define IS_HORIZONTAL(box) ((box)-arrow_type == GTK_ARROW_LEFT \
@@ -65,17 +64,17 @@ static void systray_box_forall
(GtkContainer*container,
GtkCallback callback,
gpointer
callback_data);
static GTypesystray_box_child_type(GtkContainer*container);
-static void systray_box_button_set_arrow (SystrayBox *box);
-static gboolean systray_box_button_press_event(GtkWidget *widget,
- GdkEventButton *event,
- GtkWidget *box);
-static void systray_box_button_clicked(GtkToggleButton *button,
- SystrayBox *box);
static gint systray_box_compare_function (gconstpointera,
gconstpointerb);
+enum
+{
+ PROP_0,
+ PROP_HAS_HIDDEN
+};
+
struct _SystrayBoxClass
{
GtkContainerClass __parent__;
@@ -92,9 +91,6 @@ struct _SystrayBox
* that represents the hidden bool */
GHashTable *names;
- /* expand button */
- GtkWidget*button;
-
/* position of the arrow button */
GtkArrowType arrow_type;
@@ -152,6 +148,13 @@ systray_box_class_init (SystrayBoxClass *klass)
gtkcontainer_class-remove = systray_box_remove;
gtkcontainer_class-forall = systray_box_forall;
gtkcontainer_class-child_type = systray_box_child_type;
+
+ g_object_class_install_property (gobject_class,
+ PROP_HAS_HIDDEN,
+ g_param_spec_boolean (has-hidden,
+ NULL, NULL,
+ FALSE,
+ EXO_PARAM_READABLE));
}
@@ -162,22 +165,11 @@ systray_box_init (SystrayBox *box)
GTK_WIDGET_SET_FLAGS (box, GTK_NO_WINDOW);
box-childeren = NULL;
- box-button = NULL;
box-rows = 1;
box-n_hidden_childeren = 0;
box-arrow_type = GTK_ARROW_LEFT;
box-show_hidden = FALSE;
box-guess_size = 128;
-
- /* create arrow button */
- box-button = xfce_arrow_button_new (box-arrow_type);
- GTK_WIDGET_UNSET_FLAGS (box-button, GTK_CAN_DEFAULT | GTK_CAN_FOCUS);
- gtk_button_set_focus_on_click (GTK_BUTTON (box-button), FALSE);
- g_signal_connect (G_OBJECT (box-button), clicked,
- G_CALLBACK (systray_box_button_clicked), box);
- g_signal_connect (G_OBJECT (box-button), button-press-event,
- G_CALLBACK (systray_box_button_press_event), box);
- gtk_widget_set_parent (box-button, GTK_WIDGET (box));
}
@@ -188,10 +180,14 @@ systray_box_get_property (GObject *object,
GValue *value,
GParamSpec *pspec)
{
- /*SystrayBox *box = XFCE_SYSTRAY_BOX (object);*/
+ SystrayBox *box = XFCE_SYSTRAY_BOX (object);
switch (prop_id)
{
+case PROP_HAS_HIDDEN:
+ g_value_set_boolean (value, box-n_hidden_childeren 0);
+ break;
+
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@@ -275,7 +271,11 @@ systray_box_size_request (GtkWidget *widget,
/* decrease the hidden counter if needed */
if (systray_socket_get_hidden (XFCE_SYSTRAY_SOCKET
(child_info-widget)))
-box-n_hidden_childeren--;
+{
+ box-n_hidden_childeren--;
+ if (box-n_hidden_childeren == 0)
+g_object_notify (G_OBJECT (box), has-hidden);
+}
}
}
else
@@ -288,7 +288,11 @@ systray_box_size_request (GtkWidget *widget,
/* update counter */
if
[Xfce4-commits] xfce4-panel:master Only use orientation in systray box.
Updating branch refs/heads/master
to cf7bf8d019247388488fbe442624f75dd1bdcc51 (commit)
from 4ea533ef90968e58a0aafd76a9055ac974a92e12 (commit)
commit cf7bf8d019247388488fbe442624f75dd1bdcc51
Author: Nick Schermer n...@xfce.org
Date: Fri Dec 24 20:32:20 2010 +0100
Only use orientation in systray box.
Swapping the tray order if it is positioned on the
other side of the screen is hardly of any use, so
ditch is to make the allocation code simpler.
plugins/systray/systray-box.c | 37
plugins/systray/systray-box.h |4 +-
plugins/systray/systray.c | 76 ++---
3 files changed, 20 insertions(+), 97 deletions(-)
diff --git a/plugins/systray/systray-box.c b/plugins/systray/systray-box.c
index 9362044..f1d1874 100644
--- a/plugins/systray/systray-box.c
+++ b/plugins/systray/systray-box.c
@@ -35,8 +35,6 @@
#define SPACING(2)
#define OFFSCREEN (-)
-#define IS_HORIZONTAL(box) ((box)-arrow_type == GTK_ARROW_LEFT \
-|| (box)-arrow_type == GTK_ARROW_RIGHT)
@@ -91,8 +89,8 @@ struct _SystrayBox
* that represents the hidden bool */
GHashTable *names;
- /* position of the arrow button */
- GtkArrowType arrow_type;
+ /* orientation of the box */
+ guint horizontal : 1;
/* hidden childeren counter */
gint n_hidden_childeren;
@@ -167,7 +165,7 @@ systray_box_init (SystrayBox *box)
box-childeren = NULL;
box-rows = 1;
box-n_hidden_childeren = 0;
- box-arrow_type = GTK_ARROW_LEFT;
+ box-horizontal = TRUE;
box-show_hidden = FALSE;
box-guess_size = 128;
}
@@ -330,7 +328,7 @@ systray_box_size_request (GtkWidget *widget,
}
/* swap the sizes if the orientation is vertical */
- if (!IS_HORIZONTAL (box))
+ if (!box-horizontal)
{
swap = requisition-width;
requisition-width = requisition-height;
@@ -381,20 +379,20 @@ systray_box_size_allocate (GtkWidget *widget,
/* child size */
if (box-rows == 1)
{
- child_size = IS_HORIZONTAL (box) ? width : height;
+ child_size = box-horizontal ? width : height;
n = n_children - (box-show_hidden ? 0 : box-n_hidden_childeren);
child_size -= SPACING * MAX (n - 1, 0);
if (n 1)
child_size /= n;
- if (IS_HORIZONTAL (box))
+ if (box-horizontal)
y += MAX (height - child_size, 0) / 2;
else
x += MAX (width - child_size, 0) / 2;
}
else
{
- child_size = IS_HORIZONTAL (box) ? height : width;
+ child_size = box-horizontal ? height : width;
child_size -= SPACING * (box-rows - 1);
child_size /= box-rows;
}
@@ -424,19 +422,13 @@ systray_box_size_allocate (GtkWidget *widget,
n++;
/* swap coordinates on a vertical panel */
- if (!IS_HORIZONTAL (box))
+ if (!box-horizontal)
{
swap = child_allocation.x;
child_allocation.x = child_allocation.y;
child_allocation.y = swap;
}
- /* invert the icon order if the arrow button position is right or
down */
- if (box-arrow_type == GTK_ARROW_RIGHT)
-child_allocation.x = width - child_allocation.x - child_size;
- else if (box-arrow_type == GTK_ARROW_DOWN)
-child_allocation.y = height - child_allocation.y - child_size;
-
/* add root */
child_allocation.x += x;
child_allocation.y += y;
@@ -661,17 +653,18 @@ systray_box_set_guess_size (SystrayBox *box,
void
-systray_box_set_arrow_type (SystrayBox *box,
-GtkArrowType arrow_type)
+systray_box_set_orientation (SystrayBox *box,
+ GtkOrientation orientation)
{
+ gboolean horizontal;
+
panel_return_if_fail (XFCE_IS_SYSTRAY_BOX (box));
- if (G_LIKELY (arrow_type != box-arrow_type))
+ horizontal = !!(orientation == GTK_ORIENTATION_HORIZONTAL);
+ if (G_LIKELY (box-horizontal != horizontal))
{
- /* set new setting */
- box-arrow_type = arrow_type;
+ box-horizontal = horizontal;
- /* queue a resize */
if (box-childeren != NULL)
gtk_widget_queue_resize (GTK_WIDGET (box));
}
diff --git a/plugins/systray/systray-box.h b/plugins/systray/systray-box.h
index 57af888..cb5cf3d 100644
--- a/plugins/systray/systray-box.h
+++ b/plugins/systray/systray-box.h
@@ -38,8 +38,8 @@ GtkWidget *systray_box_new (void) G_GNUC_MALLOC;
void systray_box_set_guess_size (SystrayBox *box,
gint guess_size);
-void systray_box_set_arrow_type (SystrayBox *box,
-GtkArrowType arrow_type);
+void systray_box_set_orientation (SystrayBox *box,
+GtkOrientation
[Xfce4-commits] xfce4-panel:master Improve sort function a bit + other tiny changes.
Updating branch refs/heads/master
to bdc17ee8fc838690a408054c2a48a4cb9e1d67eb (commit)
from f3efda29fa46b470b9a132477c8b82e40f5ea375 (commit)
commit bdc17ee8fc838690a408054c2a48a4cb9e1d67eb
Author: Nick Schermer n...@xfce.org
Date: Sat Dec 25 11:53:44 2010 +0100
Improve sort function a bit + other tiny changes.
plugins/systray/systray-box.c | 50 ++--
1 files changed, 27 insertions(+), 23 deletions(-)
diff --git a/plugins/systray/systray-box.c b/plugins/systray/systray-box.c
index 3a85087..3814f6c 100644
--- a/plugins/systray/systray-box.c
+++ b/plugins/systray/systray-box.c
@@ -42,10 +42,12 @@ static void systray_box_get_property (GObject
*object,
guintprop_id,
GValue *value,
GParamSpec *pspec);
+/*
static void systray_box_set_property (GObject *object,
guintprop_id,
const GValue*value,
GParamSpec *pspec);
+*/
static void systray_box_finalize (GObject *object);
static void systray_box_size_request (GtkWidget *widget,
GtkRequisition
*requisition);
@@ -116,7 +118,7 @@ systray_box_class_init (SystrayBoxClass *klass)
gobject_class = G_OBJECT_CLASS (klass);
gobject_class-get_property = systray_box_get_property;
- gobject_class-set_property = systray_box_set_property;
+ /*gobject_class-set_property = systray_box_set_property;*/
gobject_class-finalize = systray_box_finalize;
gtkwidget_class = GTK_WIDGET_CLASS (klass);
@@ -177,13 +179,14 @@ systray_box_get_property (GObject *object,
+/*
static void
systray_box_set_property (GObject *object,
guint prop_id,
const GValue *value,
GParamSpec *pspec)
{
- /*SystrayBox *box = XFCE_SYSTRAY_BOX (object);*/
+ SystrayBox *box = XFCE_SYSTRAY_BOX (object);
switch (prop_id)
{
@@ -192,6 +195,7 @@ systray_box_set_property (GObject *object,
break;
}
}
+*/
@@ -205,7 +209,7 @@ systray_box_finalize (GObject *object)
{
/* free the child list */
g_slist_free (box-childeren);
- g_debug (Leaking memory, not all children have been removed);
+ g_debug (Not all icons has been removed from the systray.);
}
G_OBJECT_CLASS (systray_box_parent_class)-finalize (object);
@@ -494,7 +498,7 @@ systray_box_remove (GtkContainer *container,
box-childeren = g_slist_remove_link (box-childeren, li);
gtk_widget_unparent (child);
- /* resize, so we update the n_children in allocation */
+ /* resize, so we update has-hidden */
gtk_widget_queue_resize (GTK_WIDGET (container));
}
}
@@ -533,29 +537,29 @@ static gint
systray_box_compare_function (gconstpointer a,
gconstpointer b)
{
- GtkWidget *child_a = GTK_WIDGET (a);
- GtkWidget *child_b = GTK_WIDGET (b);
- const gchar *name_a;
- const gchar *name_b;
+ const gchar *name_a, *name_b;
+ gboolean hidden_a, hidden_b;
/* sort hidden icons before visible ones */
- if (systray_socket_get_hidden (XFCE_SYSTRAY_SOCKET (child_a))
- != systray_socket_get_hidden (XFCE_SYSTRAY_SOCKET (child_b)))
-return (systray_socket_get_hidden (XFCE_SYSTRAY_SOCKET (child_a)) ? -1 :
1);
-
- /* put icons without name after the hidden icons */
- name_a = systray_socket_get_name (XFCE_SYSTRAY_SOCKET (child_a));
- name_b = systray_socket_get_name (XFCE_SYSTRAY_SOCKET (child_b));
- if (exo_str_is_empty (name_a) || exo_str_is_empty (name_b))
-{
- if (!exo_str_is_empty (name_a) == !exo_str_is_empty (name_b))
-return 0;
- else
-return exo_str_is_empty (name_a) ? -1 : 1;
-}
+ hidden_a = systray_socket_get_hidden (XFCE_SYSTRAY_SOCKET (a));
+ hidden_b = systray_socket_get_hidden (XFCE_SYSTRAY_SOCKET (b));
+ if (hidden_a != hidden_b)
+return hidden_a ? -1 : 1;
+
+ /* sort icons by name */
+ name_a = systray_socket_get_name (XFCE_SYSTRAY_SOCKET (a));
+ name_b = systray_socket_get_name (XFCE_SYSTRAY_SOCKET (b));
+
+#if GLIB_CHECK_VERSION (2, 16, 0)
+ return g_strcmp0 (name_a, name_b);
+#else
+ if (name_a == NULL)
+return -(name_a != name_b);
+ if (name_b == NULL)
+return name_a != name_b;
- /* sort by name */
return strcmp (name_a, name_b);
+#endif
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-panel:master Drop child structure from box and only use widgets.
Updating branch refs/heads/master
to f3efda29fa46b470b9a132477c8b82e40f5ea375 (commit)
from e5aeb586a1c9b102178af98049e1e00bfab78d36 (commit)
commit f3efda29fa46b470b9a132477c8b82e40f5ea375
Author: Nick Schermer n...@xfce.org
Date: Fri Dec 24 21:07:43 2010 +0100
Drop child structure from box and only use widgets.
This makes the entire code easier to understand and
we don't need the additional child information anyways.
Also make the hidden property emit code smaller and
handle all of it in size_request.
plugins/systray/systray-box.c | 284 ++---
1 files changed, 96 insertions(+), 188 deletions(-)
diff --git a/plugins/systray/systray-box.c b/plugins/systray/systray-box.c
index 30871a5..3a85087 100644
--- a/plugins/systray/systray-box.c
+++ b/plugins/systray/systray-box.c
@@ -101,16 +101,6 @@ struct _SystrayBox
gint guess_size;
};
-typedef struct
-{
- /* the child widget */
- GtkWidget*widget;
-
- /* invisible icon because of invalid requisition */
- guint invalid : 1;
-}
-SystrayBoxChild;
-
XFCE_PANEL_DEFINE_TYPE (SystrayBox, systray_box, GTK_TYPE_CONTAINER)
@@ -229,13 +219,15 @@ systray_box_size_request (GtkWidget *widget,
{
SystrayBox *box = XFCE_SYSTRAY_BOX (widget);
GSList *li;
- SystrayBoxChild *child_info;
+ GtkWidget *child;
gint n_columns;
gint child_size = -1;
GtkRequisition child_req;
gint n_visible_childeren = 0;
gint swap;
gint guess_size, icon_size;
+ gint n_hidden_childeren = 0;
+ gboolean hidden;
panel_return_if_fail (XFCE_IS_SYSTRAY_BOX (widget));
panel_return_if_fail (requisition != NULL);
@@ -247,61 +239,42 @@ systray_box_size_request (GtkWidget *widget,
/* check if we need to hide or show any childeren */
for (li = box-childeren; li != NULL; li = li-next)
{
- child_info = li-data;
+ child = GTK_WIDGET (li-data);
/* get the icons size request */
- gtk_widget_size_request (child_info-widget, child_req);
+ gtk_widget_size_request (child, child_req);
- if (G_UNLIKELY (child_req.width == 1 || child_req.height == 1))
-{
- /* icons that return a 1 by 1 requisition supposed to be hidden */
- if (!child_info-invalid)
-{
- /* this icon should not be visible */
- child_info-invalid = TRUE;
-
- /* decrease the hidden counter if needed */
- if (systray_socket_get_hidden (XFCE_SYSTRAY_SOCKET
(child_info-widget)))
-{
- box-n_hidden_childeren--;
- if (box-n_hidden_childeren == 0)
-g_object_notify (G_OBJECT (box), has-hidden);
-}
-}
-}
- else
-{
- /* restore icon if it was previously invisible */
- if (G_UNLIKELY (child_info-invalid))
-{
- /* visible icon */
- child_info-invalid = FALSE;
-
- /* update counter */
- if (systray_socket_get_hidden (XFCE_SYSTRAY_SOCKET
(child_info-widget)))
-{
- box-n_hidden_childeren++;
- if (box-n_hidden_childeren == 1)
-g_object_notify (G_OBJECT (box), has-hidden);
-}
-}
+ /* a 1x1px request is in some tray implementations the same as
+ * an invisible icon, we allocate those offscreen in allocate */
+ if (child_req.width = 1 child_req.height = 1)
+continue;
- /* count the number of visible childeren */
- if (!systray_socket_get_hidden (XFCE_SYSTRAY_SOCKET
(child_info-widget)) || box-show_hidden)
-{
- /* get the icon size */
- icon_size = MIN (guess_size, MAX (child_req.width,
child_req.height));
+ hidden = systray_socket_get_hidden (XFCE_SYSTRAY_SOCKET (child));
+
+ if (!hidden || box-show_hidden)
+{
+ /* get the icon size */
+ icon_size = MIN (guess_size, MAX (child_req.width,
child_req.height));
- /* pick largest icon */
- if (G_UNLIKELY (child_size == -1))
-child_size = icon_size;
- else
-child_size = MAX (child_size, icon_size);
+ /* pick largest icon */
+ if (G_UNLIKELY (child_size == -1))
+child_size = icon_size;
+ else
+child_size = MAX (child_size, icon_size);
- /* increase number of visible childeren */
- n_visible_childeren++;
-}
+ /* increase number of visible childeren */
+ n_visible_childeren++;
}
+
+ if (hidden)
+n_hidden_childeren++;
+}
+
+ /* update the visibility of the arrow button */
+ if (box-n_hidden_childeren !=
[Xfce4-commits] xfce4-panel:master Try WM_NAME(STRING) too for tray application name.
Updating branch refs/heads/master
to 594216a874de159089743024fbeef9fc83bea7cb (commit)
from c9baeaac5678b846ddf0a7a4ed38a5699b0b3ea7 (commit)
commit 594216a874de159089743024fbeef9fc83bea7cb
Author: Nick Schermer n...@xfce.org
Date: Tue Dec 28 19:47:03 2010 +0100
Try WM_NAME(STRING) too for tray application name.
Qt applications don't set _NET_WM_NAME, so fallback to
WM_NAME(STRING).
plugins/systray/systray-socket.c | 68 -
1 files changed, 44 insertions(+), 24 deletions(-)
diff --git a/plugins/systray/systray-socket.c b/plugins/systray/systray-socket.c
index 8718078..e77690e 100644
--- a/plugins/systray/systray-socket.c
+++ b/plugins/systray/systray-socket.c
@@ -329,54 +329,74 @@ systray_socket_is_composited (SystraySocket *socket)
-const gchar *
-systray_socket_get_name (SystraySocket *socket)
+static gchar *
+systray_socket_get_name_prop (SystraySocket *socket,
+ const gchar *prop_name,
+ const gchar *type_name)
{
GdkDisplay *display;
- Atomutf8_string, type;
+ Atomreq_type, type;
gintresult;
+ gchar *val;
gintformat;
gulong nitems;
gulong bytes_after;
- gchar *val;
+ gchar *name = NULL;
panel_return_val_if_fail (XFCE_IS_SYSTRAY_SOCKET (socket), NULL);
-
- if (socket-name != NULL)
-return socket-name;
+ panel_return_val_if_fail (type_name != NULL prop_name != NULL, NULL);
display = gtk_widget_get_display (GTK_WIDGET (socket));
- utf8_string = gdk_x11_get_xatom_by_name_for_display (display, UTF8_STRING);
+ req_type = gdk_x11_get_xatom_by_name_for_display (display, type_name);
gdk_error_trap_push ();
result = XGetWindowProperty (GDK_DISPLAY_XDISPLAY (display),
socket-window,
- gdk_x11_get_xatom_by_name_for_display (display,
_NET_WM_NAME),
+ gdk_x11_get_xatom_by_name_for_display (display,
prop_name),
0, G_MAXLONG, False,
- utf8_string,
+ req_type,
type, format, nitems,
- bytes_after, (guchar **) val);
+ bytes_after,
+ (guchar **) val);
- if (gdk_error_trap_pop () != 0 || result != Success || val == NULL)
+ /* check if everything went fine */
+ if (gdk_error_trap_pop () != 0
+ || result != Success
+ || val == NULL)
return NULL;
- if (type != utf8_string || format != 8 || nitems == 0)
-{
- XFree (val);
- return NULL;
-}
+ /* check the returned data */
+ if (type == req_type
+ format == 8
+ nitems 0
+ g_utf8_validate (val, nitems, NULL))
+ {
+ /* lowercase the result */
+ name = g_utf8_strdown (val, nitems);
+ }
- if (!g_utf8_validate (val, nitems, NULL))
-{
- XFree (val);
- return NULL;
-}
+ XFree (val);
- socket-name = g_utf8_strdown (val, nitems);
+ return name;
+}
- XFree (val);
+
+
+const gchar *
+systray_socket_get_name (SystraySocket *socket)
+{
+ panel_return_val_if_fail (XFCE_IS_SYSTRAY_SOCKET (socket), NULL);
+
+ if (G_LIKELY (socket-name != NULL))
+return socket-name;
+
+ /* try _NET_WM_NAME first, for gtk icon implementations, fall back to
+ * WM_NAME for qt icons */
+ socket-name = systray_socket_get_name_prop (socket, _NET_WM_NAME,
UTF8_STRING);
+ if (G_UNLIKELY (socket-name == NULL))
+socket-name = systray_socket_get_name_prop (socket, WM_NAME, STRING);
return socket-name;
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-panel:master Remove unused variables in box structures.
Updating branch refs/heads/master to e5aeb586a1c9b102178af98049e1e00bfab78d36 (commit) from cf7bf8d019247388488fbe442624f75dd1bdcc51 (commit) commit e5aeb586a1c9b102178af98049e1e00bfab78d36 Author: Nick Schermer n...@xfce.org Date: Fri Dec 24 20:36:55 2010 +0100 Remove unused variables in box structures. plugins/systray/systray-box.c |7 --- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/plugins/systray/systray-box.c b/plugins/systray/systray-box.c index f1d1874..30871a5 100644 --- a/plugins/systray/systray-box.c +++ b/plugins/systray/systray-box.c @@ -85,10 +85,6 @@ struct _SystrayBox /* all the icons packed in this box */ GSList *childeren; - /* table with names, value contains an uint - * that represents the hidden bool */ - GHashTable *names; - /* orientation of the box */ guint horizontal : 1; @@ -112,9 +108,6 @@ typedef struct /* invisible icon because of invalid requisition */ guint invalid : 1; - - /* the name of the applcation */ - gchar*name; } SystrayBoxChild; ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-panel:master Move composited child function to plugin.
Updating branch refs/heads/master
to c8bdf2b20efc0447ca7074e969ea1bc11582e72e (commit)
from bdc17ee8fc838690a408054c2a48a4cb9e1d67eb (commit)
commit c8bdf2b20efc0447ca7074e969ea1bc11582e72e
Author: Nick Schermer n...@xfce.org
Date: Sat Dec 25 12:13:06 2010 +0100
Move composited child function to plugin.
This makes it more obvious this is something special
we need to do after Gtk's expose event to draw composited
icons.
plugins/systray/systray-box.c | 47
plugins/systray/systray.c | 53 +
2 files changed, 53 insertions(+), 47 deletions(-)
diff --git a/plugins/systray/systray-box.c b/plugins/systray/systray-box.c
index 3814f6c..3c12770 100644
--- a/plugins/systray/systray-box.c
+++ b/plugins/systray/systray-box.c
@@ -53,8 +53,6 @@ static void systray_box_size_request (GtkWidget
*widget,
GtkRequisition
*requisition);
static void systray_box_size_allocate (GtkWidget *widget,
GtkAllocation
*allocation);
-static gboolean systray_box_expose_event (GtkWidget *widget,
- GdkEventExpose *event);
static void systray_box_add (GtkContainer*container,
GtkWidget *child);
static void systray_box_remove(GtkContainer*container,
@@ -124,7 +122,6 @@ systray_box_class_init (SystrayBoxClass *klass)
gtkwidget_class = GTK_WIDGET_CLASS (klass);
gtkwidget_class-size_request = systray_box_size_request;
gtkwidget_class-size_allocate = systray_box_size_allocate;
- gtkwidget_class-expose_event = systray_box_expose_event;
gtkcontainer_class = GTK_CONTAINER_CLASS (klass);
gtkcontainer_class-add = systray_box_add;
@@ -417,50 +414,6 @@ systray_box_size_allocate (GtkWidget *widget,
-static gboolean
-systray_box_expose_event (GtkWidget *widget,
- GdkEventExpose *event)
-{
- SystrayBox*box = XFCE_SYSTRAY_BOX (widget);
- cairo_t *cr;
- GtkWidget *child;
- GSList*li;
- gboolean result;
- GtkAllocation *child_alloc;
-
- result = GTK_WIDGET_CLASS (systray_box_parent_class)-expose_event (widget,
event);
-
- if (gtk_widget_is_composited (widget))
-{
- cr = gdk_cairo_create (widget-window);
- gdk_cairo_region (cr, event-region);
- cairo_clip (cr);
-
- for (li = box-childeren; li != NULL; li = li-next)
-{
- child = GTK_WIDGET (li-data);
- child_alloc = child-allocation;
-
- /* skip invisible (offscreen) or not composited children */
- if (child_alloc-x 0
- || child_alloc-y 0
- || !systray_socket_is_composited (XFCE_SYSTRAY_SOCKET (child)))
-continue;
-
- /* paint the child */
- gdk_cairo_set_source_pixmap (cr, gtk_widget_get_window (child),
- child_alloc-x, child_alloc-y);
- cairo_paint (cr);
-}
-
- cairo_destroy (cr);
-}
-
- return result;
-}
-
-
-
static void
systray_box_add (GtkContainer *container,
GtkWidget*child)
diff --git a/plugins/systray/systray.c b/plugins/systray/systray.c
index 16f2018..7629f47 100644
--- a/plugins/systray/systray.c
+++ b/plugins/systray/systray.c
@@ -54,6 +54,8 @@ static void systray_plugin_orientation_changed
(XfcePanelPlugin
static gboolean systray_plugin_size_changed (XfcePanelPlugin
*panel_plugin,
gint
size);
static void systray_plugin_configure_plugin (XfcePanelPlugin
*panel_plugin);
+static void systray_plugin_box_expose_event (GtkWidget
*box,
+ GdkEventExpose
*event);
static void systray_plugin_button_toggled (GtkWidget
*button,
SystrayPlugin
*plugin);
static void systray_plugin_button_set_arrow (SystrayPlugin
*plugin);
@@ -217,6 +219,8 @@ systray_plugin_init (SystrayPlugin *plugin)
plugin-box = systray_box_new ();
gtk_box_pack_start (GTK_BOX (plugin-hvbox), plugin-box, TRUE, TRUE, 0);
+ g_signal_connect (G_OBJECT (plugin-box), expose-event,
+ G_CALLBACK (systray_plugin_box_expose_event), NULL);
gtk_widget_show (plugin-box);
plugin-button = xfce_arrow_button_new (GTK_ARROW_RIGHT);
@@ -546,6 +550,55 @@ systray_plugin_configure_plugin (XfcePanelPlugin
*panel_plugin)
static void
+systray_plugin_box_expose_event_icon (GtkWidget *child,
+
[Xfce4-commits] xfce4-panel:master Drop some unused systray code.
Updating branch refs/heads/master
to 38c03b442353041f6d8c1aaec89625caf108eec0 (commit)
from ad5a85c8e1e89bf8178575ff35a485c43832cc81 (commit)
commit 38c03b442353041f6d8c1aaec89625caf108eec0
Author: Nick Schermer n...@xfce.org
Date: Tue Dec 28 20:29:43 2010 +0100
Drop some unused systray code.
plugins/systray/systray-box.c | 27 ---
1 files changed, 0 insertions(+), 27 deletions(-)
diff --git a/plugins/systray/systray-box.c b/plugins/systray/systray-box.c
index b692d45..a7bd937 100644
--- a/plugins/systray/systray-box.c
+++ b/plugins/systray/systray-box.c
@@ -48,12 +48,6 @@ static void systray_box_get_property (GObject
*object,
guintprop_id,
GValue *value,
GParamSpec *pspec);
-/*
-static void systray_box_set_property (GObject *object,
- guintprop_id,
- const GValue*value,
- GParamSpec *pspec);
-*/
static void systray_box_finalize (GObject *object);
static void systray_box_size_request (GtkWidget *widget,
GtkRequisition
*requisition);
@@ -123,7 +117,6 @@ systray_box_class_init (SystrayBoxClass *klass)
gobject_class = G_OBJECT_CLASS (klass);
gobject_class-get_property = systray_box_get_property;
- /*gobject_class-set_property = systray_box_set_property;*/
gobject_class-finalize = systray_box_finalize;
gtkwidget_class = GTK_WIDGET_CLASS (klass);
@@ -184,26 +177,6 @@ systray_box_get_property (GObject *object,
-/*
-static void
-systray_box_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec)
-{
- SystrayBox *box = XFCE_SYSTRAY_BOX (object);
-
- switch (prop_id)
-{
-default:
- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- break;
-}
-}
-*/
-
-
-
static void
systray_box_finalize (GObject *object)
{
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-panel:master Add some known tray application names.
Updating branch refs/heads/master
to c9baeaac5678b846ddf0a7a4ed38a5699b0b3ea7 (commit)
from 750acf1cdabe2eed13c346a713adb5d46c47a4f1 (commit)
commit c9baeaac5678b846ddf0a7a4ed38a5699b0b3ea7
Author: Nick Schermer n...@xfce.org
Date: Tue Dec 28 16:21:03 2010 +0100
Add some known tray application names.
plugins/systray/systray.c |6 +-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/plugins/systray/systray.c b/plugins/systray/systray.c
index c179f7b..03e5c80 100644
--- a/plugins/systray/systray.c
+++ b/plugins/systray/systray.c
@@ -148,6 +148,10 @@ static const gchar *known_applications[][3] =
/* application name, icon-name, understandable name */
{ networkmanager applet, network-workgroup, Network Manager Applet },
{ thunar, Thunar, Thunar Progress Dialog },
+ { workrave, NULL, Workrave },
+ { workrave tray icon, NULL, Workrave Applet },
+ { audacious2, audacious, Audacious },
+ { wicd-client.py, wicd-gtk, Wicd },
};
@@ -893,7 +897,7 @@ systray_plugin_dialog_add_application_names (gpointer key,
if (strcmp (name, known_applications[i][0]) == 0)
{
icon_name = known_applications[i][1];
- title = _(known_applications[i][2]);
+ title = known_applications[i][2];
break;
}
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-panel:master Use xfce_panel_pixbuf_from_source() to load known apps.
Updating branch refs/heads/master
to 750acf1cdabe2eed13c346a713adb5d46c47a4f1 (commit)
from c8bdf2b20efc0447ca7074e969ea1bc11582e72e (commit)
commit 750acf1cdabe2eed13c346a713adb5d46c47a4f1
Author: Nick Schermer n...@xfce.org
Date: Tue Dec 28 16:20:21 2010 +0100
Use xfce_panel_pixbuf_from_source() to load known apps.
plugins/systray/systray.c | 37 -
1 files changed, 4 insertions(+), 33 deletions(-)
diff --git a/plugins/systray/systray.c b/plugins/systray/systray.c
index 7629f47..c179f7b 100644
--- a/plugins/systray/systray.c
+++ b/plugins/systray/systray.c
@@ -865,36 +865,6 @@ systray_plugin_dialog_camel_case (const gchar *text)
-static GdkPixbuf *
-systray_plugin_dialog_icon (GtkIconTheme *icon_theme,
-const gchar *icon_name)
-{
- GdkPixbuf *icon = NULL;
- gchar *first_occ;
- const gchar *p;
-
- panel_return_val_if_fail (!exo_str_is_empty (icon_name), NULL);
- panel_return_val_if_fail (GTK_IS_ICON_THEME (icon_theme), NULL);
-
- /* try to load the icon from the theme */
- icon = gtk_icon_theme_load_icon (icon_theme, icon_name, ICON_SIZE, 0, NULL);
- if (icon != NULL)
-return icon;
-
- /* try the first part when the name contains a space */
- p = g_utf8_strchr (icon_name, -1, ' ');
- if (p != NULL)
-{
- first_occ = g_strndup (icon_name, p - icon_name);
- icon = gtk_icon_theme_load_icon (icon_theme, first_occ, ICON_SIZE, 0,
NULL);
- g_free (first_occ);
-}
-
- return icon;
-}
-
-
-
static void
systray_plugin_dialog_add_application_names (gpointer key,
gpointer value,
@@ -903,7 +873,6 @@ systray_plugin_dialog_add_application_names (gpointer key,
GtkListStore *store = GTK_LIST_STORE (user_data);
const gchar *name = key;
gboolean hidden = GPOINTER_TO_UINT (value);
- GtkIconTheme *icon_theme;
const gchar *title = NULL;
gchar*camelcase = NULL;
const gchar *icon_name = name;
@@ -937,8 +906,10 @@ systray_plugin_dialog_add_application_names (gpointer key,
}
/* try to load the icon name */
- icon_theme = gtk_icon_theme_get_default ();
- pixbuf = systray_plugin_dialog_icon (icon_theme, icon_name);
+ if (G_LIKELY (icon_name != NULL))
+pixbuf = xfce_panel_pixbuf_from_source (icon_name, NULL, ICON_SIZE);
+ else
+pixbuf = NULL;
/* insert in the store */
gtk_list_store_append (store, iter);
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-panel:master Redo icon positioning (bug #5565, #9650 and more).
Updating branch refs/heads/master
to ad5a85c8e1e89bf8178575ff35a485c43832cc81 (commit)
from 594216a874de159089743024fbeef9fc83bea7cb (commit)
commit ad5a85c8e1e89bf8178575ff35a485c43832cc81
Author: Nick Schermer n...@xfce.org
Date: Mon Dec 27 20:28:49 2010 +0100
Redo icon positioning (bug #5565, #9650 and more).
Fix a string break to set the maximum icon size, instead of
the number of rows (bug #5565). This makes allocation easier
and better to understand for users.
Then some new allocation code, this should fix a whole pile
of bugs: #4871, #5200, #6892, #6950, #6984, #7001 and #7017.
Also non-squared icons are now supported (bug #5874).
plugins/systray/systray-box.c| 461 ++
plugins/systray/systray-box.h| 17 +-
plugins/systray/systray-dialog.glade | 16 +-
plugins/systray/systray.c| 47 ++--
4 files changed, 348 insertions(+), 193 deletions(-)
diff --git a/plugins/systray/systray-box.c b/plugins/systray/systray-box.c
index 3c12770..b692d45 100644
--- a/plugins/systray/systray-box.c
+++ b/plugins/systray/systray-box.c
@@ -23,6 +23,9 @@
#ifdef HAVE_STRING_H
#include string.h
#endif
+#ifdef HAVE_MATH_H
+#include math.h
+#endif
#include exo/exo.h
#include gtk/gtk.h
@@ -33,8 +36,11 @@
#include systray-box.h
#include systray-socket.h
-#define SPACING(2)
-#define OFFSCREEN (-)
+#define SPACING(2)
+#define OFFSCREEN (-)
+
+/* some icon implementations request a 1x1 size for invisible icons */
+#define REQUISITION_IS_INVISIBLE(child_req) ((child_req).width = 1
(child_req).height = 1)
@@ -90,15 +96,16 @@ struct _SystrayBox
/* hidden childeren counter */
gint n_hidden_childeren;
+ gint n_visible_children;
/* whether hidden icons are visible */
guint show_hidden : 1;
- /* number of rows */
- gint rows;
+ /* maximum icon size */
+ gint size_max;
- /* guess size, this is a value used to reduce the tray flickering */
- gint guess_size;
+ /* allocated size by the plugin */
+ gint size_alloc;
};
@@ -145,11 +152,12 @@ systray_box_init (SystrayBox *box)
GTK_WIDGET_SET_FLAGS (box, GTK_NO_WINDOW);
box-childeren = NULL;
- box-rows = 1;
+ box-size_max = SIZE_MAX_DEFAULT;
+ box-size_alloc = SIZE_MAX_DEFAULT;
box-n_hidden_childeren = 0;
+ box-n_visible_children = 0;
box-horizontal = TRUE;
box-show_hidden = FALSE;
- box-guess_size = 128;
}
@@ -215,96 +223,173 @@ systray_box_finalize (GObject *object)
static void
+systray_box_size_get_max_child_size (SystrayBox *box,
+ gintalloc_size,
+ gint *rows_ret,
+ gint *row_size_ret,
+ gint *offset_ret)
+{
+ GtkWidget *widget = GTK_WIDGET (box);
+ gint size;
+ gint rows;
+ gint row_size;
+
+ alloc_size -= 2 * GTK_CONTAINER (widget)-border_width;
+
+ /* count the number of rows that fit in the allocated space */
+ for (rows = 1;; rows++)
+{
+ size = rows * box-size_max + (rows - 1) * SPACING;
+ if (size alloc_size)
+continue;
+
+ /* decrease rows if the new size doesn't fit */
+ if (rows 1 size alloc_size)
+rows--;
+
+ break;
+}
+
+ row_size = (alloc_size - (rows - 1) * SPACING) / rows;
+ row_size = MIN (box-size_max, row_size);
+
+ if (rows_ret != NULL)
+*rows_ret = rows;
+
+ if (row_size_ret != NULL)
+*row_size_ret = row_size;
+
+ if (offset_ret != NULL)
+{
+ rows = MIN (rows, box-n_visible_children);
+ *offset_ret = (alloc_size - (rows * row_size + (rows - 1) * SPACING)) /
2;
+ if (*offset_ret 1)
+*offset_ret = 0;
+}
+}
+
+
+
+static void
systray_box_size_request (GtkWidget *widget,
GtkRequisition *requisition)
{
- SystrayBox *box = XFCE_SYSTRAY_BOX (widget);
- GSList *li;
- GtkWidget *child;
- gint n_columns;
- gint child_size = -1;
- GtkRequisition child_req;
- gint n_visible_childeren = 0;
- gint swap;
- gint guess_size, icon_size;
- gint n_hidden_childeren = 0;
- gboolean hidden;
-
- panel_return_if_fail (XFCE_IS_SYSTRAY_BOX (widget));
- panel_return_if_fail (requisition != NULL);
-
- /* get the guess size */
- guess_size = box-guess_size - (SPACING * (box-rows - 1));
- guess_size /= box-rows;
-
- /* check if we need to hide or show any childeren */
- for (li = box-childeren; li != NULL; li = li-next)
+ SystrayBox *box = XFCE_SYSTRAY_BOX (widget);
+ GtkWidget *child;
+ gintborder;
+ GtkRequisition child_req;
+ gintn_hidden_childeren = 0;
+ gintrows;
+ gdouble cols;
+ gint
[Xfce4-commits] xfvnc:master l10n: Updated Arabic (ar) translation to 61%
Updating branch refs/heads/master to 7fe4f1ba8fab3ddccfb89717236dbb87c30311cb (commit) from 9fa22a7cb134133895bf8653c298a939c4357b98 (commit) commit 7fe4f1ba8fab3ddccfb89717236dbb87c30311cb Author: كريم أولاد الشلحة herr.linu...@gmail.com Date: Tue Dec 28 20:57:33 2010 +0100 l10n: Updated Arabic (ar) translation to 61% New status: 11 messages complete with 0 fuzzies and 7 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/ar.po | 23 --- 1 files changed, 12 insertions(+), 11 deletions(-) diff --git a/po/ar.po b/po/ar.po index d629960..0f693a9 100644 --- a/po/ar.po +++ b/po/ar.po @@ -1,3 +1,4 @@ +# msgid msgstr Project-Id-Version: xfce\n @@ -13,16 +14,16 @@ msgstr #: ../xfvnc/main.c:28 msgid Connected. Starting session... -msgstr +msgstr إتصال. بدء الجلسة... #: ../xfvnc/main.c:50 #, c-format msgid XfVNC .:. %s -msgstr +msgstr XfVNC .:. %s #: ../xfvnc/main.c:64 msgid Connection Error -msgstr +msgstr خطأ أثناء الإتصال #: ../xfvnc/main.c:66 msgid There was an error connecting to the VNC server @@ -34,11 +35,11 @@ msgstr #: ../xfvnc/xfvnc.desktop.in.h:1 msgid VNC Viewer -msgstr +msgstr VNC عارض #: ../xfvnc/xfvnc.desktop.in.h:2 ../xfvnc/xfvnc.glade.h:4 msgid XfVNC -msgstr +msgstr XfVNC #: ../xfvnc/xfvnc.desktop.in.h:3 msgid Xfce VNC Viewer Application @@ -46,15 +47,15 @@ msgstr #: ../xfvnc/xfvnc.glade.h:1 msgid Connecting... -msgstr +msgstr إتصال #: ../xfvnc/xfvnc.glade.h:2 msgid Display _number: -msgstr +msgstr :رقم ال_عرض #: ../xfvnc/xfvnc.glade.h:3 msgid Show _fullscreen -msgstr +msgstr عرض في _كامل الشاشة #: ../xfvnc/xfvnc.glade.h:5 msgid XfVNC Status @@ -70,11 +71,11 @@ msgstr #: ../xfvnc/xfvnc.glade.h:8 msgid _Computer name: -msgstr +msgstr ر_قم الحاسوب: #: ../xfvnc/xfvnc.glade.h:9 msgid _Password: -msgstr +msgstr ك_لمة السر: #: ../xfvnc/xfvnc.glade.h:10 msgid _Recent servers: @@ -82,4 +83,4 @@ msgstr #: ../xfvnc/xfvnc.glade.h:11 msgid _View only -msgstr +msgstr العرض _فقط ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfvnc:master l10n: Updated Arabic (ar) translation to 100%
Updating branch refs/heads/master to c4a0070644402f93c64a7cda50fe568075da2538 (commit) from 7fe4f1ba8fab3ddccfb89717236dbb87c30311cb (commit) commit c4a0070644402f93c64a7cda50fe568075da2538 Author: كريم أولاد الشلحة herr.linu...@gmail.com Date: Tue Dec 28 21:04:52 2010 +0100 l10n: Updated Arabic (ar) translation to 100% New status: 18 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/ar.po | 14 +++--- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/po/ar.po b/po/ar.po index 0f693a9..084a684 100644 --- a/po/ar.po +++ b/po/ar.po @@ -27,11 +27,11 @@ msgstr خطأ أثناء الإتصال #: ../xfvnc/main.c:66 msgid There was an error connecting to the VNC server -msgstr +msgstr هنالك خطأ أثناء الإتصال بخادم VNC #: ../xfvnc/main.c:67 msgid Unfortunately, the type of error is unknown. -msgstr +msgstr للأسف. نوع الخطأ غير معروف. #: ../xfvnc/xfvnc.desktop.in.h:1 msgid VNC Viewer @@ -43,7 +43,7 @@ msgstr XfVNC #: ../xfvnc/xfvnc.desktop.in.h:3 msgid Xfce VNC Viewer Application -msgstr +msgstr تطبيق عارض Xfce VNC #: ../xfvnc/xfvnc.glade.h:1 msgid Connecting... @@ -59,15 +59,15 @@ msgstr عرض في _كامل الشاشة #: ../xfvnc/xfvnc.glade.h:5 msgid XfVNC Status -msgstr +msgstr XfVNC حالة #: ../xfvnc/xfvnc.glade.h:6 msgid Xfce VNC Viewer -msgstr +msgstr عارض Xfce VNC #: ../xfvnc/xfvnc.glade.h:7 msgid _Allow other clients to connect -msgstr +msgstr الس_ماح بإتصال عملاء أخرين #: ../xfvnc/xfvnc.glade.h:8 msgid _Computer name: @@ -79,7 +79,7 @@ msgstr ك_لمة السر: #: ../xfvnc/xfvnc.glade.h:10 msgid _Recent servers: -msgstr +msgstr الخ_وادم الحديثة: #: ../xfvnc/xfvnc.glade.h:11 msgid _View only ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-panel:master l10n: Updated Danish (da) translation to 100%
Updating branch refs/heads/master to 74f14deba1a726d0fe42d16eb872ceacbbfd4ea5 (commit) from 38c03b442353041f6d8c1aaec89625caf108eec0 (commit) commit 74f14deba1a726d0fe42d16eb872ceacbbfd4ea5 Author: Per Kongstad p_kongs...@op.pl Date: Tue Dec 28 21:20:41 2010 +0100 l10n: Updated Danish (da) translation to 100% New status: 344 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/da.po | 92 +++-- 1 files changed, 47 insertions(+), 45 deletions(-) diff --git a/po/da.po b/po/da.po index 2210ca8..0d6aa00 100644 --- a/po/da.po +++ b/po/da.po @@ -8,7 +8,7 @@ msgid msgstr Project-Id-Version: xfce4-panel 4.7.0\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2010-12-18 05:09+\n +POT-Creation-Date: 2010-12-28 20:04+\n PO-Revision-Date: 2010-06-14 11:44+0100\n Last-Translator: Per Kongstad p_kongs...@op.pl\n Language-Team: Danish da...@dansk-gruppen.dk\n @@ -34,7 +34,7 @@ msgid Customize the panel msgstr Tilpas panelet #: ../panel-preferences.desktop.in.h:2 -#: ../panel/panel-preferences-dialog.glade.h:24 ../panel/panel-window.c:2198 +#: ../panel/panel-preferences-dialog.glade.h:24 ../panel/panel-window.c:2200 #: ../migrate/main.c:84 msgid Panel msgstr Panel @@ -57,38 +57,38 @@ msgid Failed to open the documentation browser msgstr Kunne ikke åbne dokumentationsbrowseren #. I18N: %s is the name of the plugin -#: ../libxfce4panel/xfce-panel-plugin.c:887 +#: ../libxfce4panel/xfce-panel-plugin.c:889 #: ../panel/panel-preferences-dialog.c:1048 #, c-format msgid Are you sure that you want to remove \%s\? msgstr Er du sikker på at du vil fjerne \%s\? -#: ../libxfce4panel/xfce-panel-plugin.c:892 +#: ../libxfce4panel/xfce-panel-plugin.c:894 #: ../panel/panel-preferences-dialog.c:1051 msgid If you remove the item from the panel, it is permanently lost. msgstr Hvis du fjerner elementet fra panelet vil det være tabt. #. move item -#: ../libxfce4panel/xfce-panel-plugin.c:1052 +#: ../libxfce4panel/xfce-panel-plugin.c:1054 msgid _Move msgstr _Flyt -#: ../libxfce4panel/xfce-panel-plugin.c:1086 +#: ../libxfce4panel/xfce-panel-plugin.c:1088 msgid Pane_l msgstr Pane_l #. add new items -#: ../libxfce4panel/xfce-panel-plugin.c:1094 ../panel/panel-window.c:2210 +#: ../libxfce4panel/xfce-panel-plugin.c:1096 ../panel/panel-window.c:2212 msgid Add _New Items... msgstr Tilføj _nye elementer... #. customize panel -#: ../libxfce4panel/xfce-panel-plugin.c:1105 ../panel/panel-window.c:2221 +#: ../libxfce4panel/xfce-panel-plugin.c:1107 ../panel/panel-window.c:2223 msgid Panel Pr_eferences... msgstr Paneli_ndstillinger... #. logout item -#: ../libxfce4panel/xfce-panel-plugin.c:1122 ../panel/panel-window.c:2237 +#: ../libxfce4panel/xfce-panel-plugin.c:1124 ../panel/panel-window.c:2239 msgid Log _Out msgstr _Logud @@ -196,19 +196,19 @@ msgstr Ønsker du at starte panelet? Hvis du vil det skal du huske at gemme ses msgid No running instance of %s was found msgstr Ingen kørende instans af %s blev fundet -#: ../panel/panel-application.c:197 +#: ../panel/panel-application.c:196 msgid Failed to launch the migration application msgstr Kunne ikke starte migrationsprogrammet -#: ../panel/panel-application.c:1424 ../plugins/actions/actions.c:413 +#: ../panel/panel-application.c:1446 ../plugins/actions/actions.c:413 msgid You have started X without session manager. Clicking Quit will close the X server. msgstr Hvis du har startet X uden sessionshåndteringen vil dette lukke X-serveren ned. -#: ../panel/panel-application.c:1425 ../plugins/actions/actions.c:414 +#: ../panel/panel-application.c:1447 ../plugins/actions/actions.c:414 msgid Are you sure you want to quit the panel? msgstr Er du sikker på, at du vil afslutte panelet? -#: ../panel/panel-application.c:1433 ../plugins/actions/actions.c:422 +#: ../panel/panel-application.c:1455 ../plugins/actions/actions.c:422 #, c-format msgid Failed to execute command \%s\ msgstr Kunne ikke køre kommando \%s\ @@ -257,29 +257,29 @@ msgstr Fordi panelet kører i kiosktilstand, er du ikke tilladt at lave ændrin msgid Modifying the panel is not allowed msgstr Tilpasning af panelet er ikke tilladt -#: ../panel/panel-item-dialog.c:175 +#: ../panel/panel-item-dialog.c:188 msgid Add New Items msgstr Tilføj nye elementer -#: ../panel/panel-item-dialog.c:177 +#: ../panel/panel-item-dialog.c:190 msgid Add new plugins to the panel msgstr Tilføj nye udvidelsesmoduler til panelet -#: ../panel/panel-item-dialog.c:200 +#: ../panel/panel-item-dialog.c:213 #: ../plugins/launcher/launcher-dialog.glade.h:23 msgid _Search: msgstr _Søg: -#: ../panel/panel-item-dialog.c:208 +#: ../panel/panel-item-dialog.c:221 msgid Enter search phrase here msgstr Indtasts søgeudtryk her -#: ../panel/panel-plugin-external.c:418 +#: ../panel/panel-plugin-external.c:420 #, c-format msgid Plugin \%s\
[Xfce4-commits] xfce4-panel:master l10n: Updated Finnish (fi) translation to 100%
Updating branch refs/heads/master to f044801982f197ab58a2c016949bb13aec39e0c6 (commit) from 74f14deba1a726d0fe42d16eb872ceacbbfd4ea5 (commit) commit f044801982f197ab58a2c016949bb13aec39e0c6 Author: Jari Rahkonen jari.rahko...@pp1.inet.fi Date: Tue Dec 28 21:25:23 2010 +0100 l10n: Updated Finnish (fi) translation to 100% New status: 344 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/fi.po | 90 +++-- 1 files changed, 46 insertions(+), 44 deletions(-) diff --git a/po/fi.po b/po/fi.po index 2dd1379..202528c 100644 --- a/po/fi.po +++ b/po/fi.po @@ -8,8 +8,8 @@ msgid msgstr Project-Id-Version: xfce4-panel 4.7.2\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2010-12-18 17:09+\n -PO-Revision-Date: 2010-12-19 00:44+0200\n +POT-Creation-Date: 2010-12-28 20:04+\n +PO-Revision-Date: 2010-12-28 22:24+0200\n Last-Translator: Jari Rahkonen jari.rahko...@pp1.inet.fi\n Language-Team: Finnish xfce-i...@xfce.org\n MIME-Version: 1.0\n @@ -58,38 +58,38 @@ msgid Failed to open the documentation browser msgstr Dokumentaatioselaimen avaaminen epäonnistui #. I18N: %s is the name of the plugin -#: ../libxfce4panel/xfce-panel-plugin.c:887 +#: ../libxfce4panel/xfce-panel-plugin.c:889 #: ../panel/panel-preferences-dialog.c:1048 #, c-format msgid Are you sure that you want to remove \%s\? msgstr Haluatko varmasti poistaa osan \%s\? -#: ../libxfce4panel/xfce-panel-plugin.c:892 +#: ../libxfce4panel/xfce-panel-plugin.c:894 #: ../panel/panel-preferences-dialog.c:1051 msgid If you remove the item from the panel, it is permanently lost. msgstr Jos poistast osan paneelista, sitä ei voi palauttaa. #. move item -#: ../libxfce4panel/xfce-panel-plugin.c:1052 +#: ../libxfce4panel/xfce-panel-plugin.c:1054 msgid _Move msgstr Sii_rrä -#: ../libxfce4panel/xfce-panel-plugin.c:1086 +#: ../libxfce4panel/xfce-panel-plugin.c:1088 msgid Pane_l msgstr _Paneeli #. add new items -#: ../libxfce4panel/xfce-panel-plugin.c:1094 ../panel/panel-window.c:2212 +#: ../libxfce4panel/xfce-panel-plugin.c:1096 ../panel/panel-window.c:2212 msgid Add _New Items... msgstr _Lisää osia... #. customize panel -#: ../libxfce4panel/xfce-panel-plugin.c:1105 ../panel/panel-window.c:2223 +#: ../libxfce4panel/xfce-panel-plugin.c:1107 ../panel/panel-window.c:2223 msgid Panel Pr_eferences... msgstr Paneelin _asetukset #. logout item -#: ../libxfce4panel/xfce-panel-plugin.c:1122 ../panel/panel-window.c:2239 +#: ../libxfce4panel/xfce-panel-plugin.c:1124 ../panel/panel-window.c:2239 msgid Log _Out msgstr Kirjaudu _ulos @@ -205,18 +205,18 @@ msgstr %s ei ole käynnissä msgid Failed to launch the migration application msgstr Asetusten siirto-ohjelman käynnistys epäonnistui -#: ../panel/panel-application.c:1423 ../plugins/actions/actions.c:413 +#: ../panel/panel-application.c:1446 ../plugins/actions/actions.c:413 msgid You have started X without session manager. Clicking Quit will close the X server. msgstr X käynnistettiin ilman istunnonhallintaa. Lopeta-valinta sulkee X-palvelimen. -#: ../panel/panel-application.c:1424 ../plugins/actions/actions.c:414 +#: ../panel/panel-application.c:1447 ../plugins/actions/actions.c:414 msgid Are you sure you want to quit the panel? msgstr Haluatko varmasti sulkea paneelin? -#: ../panel/panel-application.c:1432 ../plugins/actions/actions.c:422 +#: ../panel/panel-application.c:1455 ../plugins/actions/actions.c:422 #, c-format msgid Failed to execute command \%s\ msgstr Komennon \%s\ suoritus epäonnistui @@ -270,29 +270,29 @@ msgstr msgid Modifying the panel is not allowed msgstr Paneelin muokkaus on estetty -#: ../panel/panel-item-dialog.c:175 +#: ../panel/panel-item-dialog.c:188 msgid Add New Items msgstr Lisää osia -#: ../panel/panel-item-dialog.c:177 +#: ../panel/panel-item-dialog.c:190 msgid Add new plugins to the panel msgstr Lisää uusia osia paneeliin -#: ../panel/panel-item-dialog.c:200 +#: ../panel/panel-item-dialog.c:213 #: ../plugins/launcher/launcher-dialog.glade.h:23 msgid _Search: msgstr _Hae: -#: ../panel/panel-item-dialog.c:208 +#: ../panel/panel-item-dialog.c:221 msgid Enter search phrase here msgstr Syötä haettava teksti tähän -#: ../panel/panel-plugin-external.c:418 +#: ../panel/panel-plugin-external.c:420 #, c-format msgid Plugin \%s\ unexpectedly left the panel, do you want to restart it? msgstr Osa \%s\ poistui paneelista yllättäen. Käynnistetäänkö se uudelleen? -#: ../panel/panel-plugin-external.c:420 +#: ../panel/panel-plugin-external.c:422 #, c-format msgid The plugin restarted more than once in the last %d seconds. If you press @@ -759,7 +759,7 @@ msgstr Valitse kuvake #: ../plugins/applicationsmenu/applicationsmenu.c:513 #: ../plugins/applicationsmenu/applicationsmenu.c:754 -#: ../plugins/launcher/launcher.c:2171 +#: ../plugins/launcher/launcher.c:2264 #,
[Xfce4-commits] xfce4-panel:master Block grabs from outside the panel.
Updating branch refs/heads/master
to a2b5a93be6807a3182655f587fe7bb317c98cd3c (commit)
from f044801982f197ab58a2c016949bb13aec39e0c6 (commit)
commit a2b5a93be6807a3182655f587fe7bb317c98cd3c
Author: Nick Schermer n...@xfce.org
Date: Tue Dec 28 21:43:42 2010 +0100
Block grabs from outside the panel.
The panel was unhiding when starting a grab in a dialog
that was part of the panel process; for example a dnd or
scroll in the launcher dialogs.
Prevent this by checking if the pointer is shading the panel.
panel/panel-window.c | 24 +++-
1 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/panel/panel-window.c b/panel/panel-window.c
index d2a4312..a41a308 100644
--- a/panel/panel-window.c
+++ b/panel/panel-window.c
@@ -1014,6 +1014,8 @@ panel_window_grab_notify (GtkWidget *widget,
{
PanelWindow *window = PANEL_WINDOW (widget);
GtkWidget *current;
+ GdkScreen *screen;
+ gint x, y;
current = gtk_grab_get_current ();
if (GTK_IS_MENU_SHELL (current))
@@ -1024,11 +1026,31 @@ panel_window_grab_notify (GtkWidget *widget,
}
else if (window-autohide_grab_block 0)
{
- /* drop previous menu block */
+ /* drop previous menu block or grab from outside window */
window-autohide_grab_block--;
}
else if (window-autohide_grab_block == 0)
{
+ if (current != NULL)
+{
+ gdk_display_get_pointer (gtk_widget_get_display (current),
+ screen, x, y, NULL);
+
+ /* filter out grab event that did not occur in the panel window,
+ * but in a windows that is part of this process */
+ if (gtk_window_get_screen (GTK_WINDOW (window)) != screen
+ || x window-alloc.x
+ || x window-alloc.x + window-alloc.width
+ || y window-alloc.y
+ || y window-alloc.y + window-alloc.height)
+{
+ /* block the next notification */
+ window-autohide_grab_block++;
+
+ return;
+}
+ }
+
/* avoid hiding the panel when the window is grabbed. this
* (for example) happens when the user drags in the pager plugin
* see bug #4597 */
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-panel:master l10n: Updated German (de) translation to 99%
Updating branch refs/heads/master to d802a5bfa4bde5204cdc455c1aa706e0d5c58fe0 (commit) from a2b5a93be6807a3182655f587fe7bb317c98cd3c (commit) commit d802a5bfa4bde5204cdc455c1aa706e0d5c58fe0 Author: Paul Seyfert pseyf...@mathphys.fsk.uni-heidelberg.de Date: Tue Dec 28 22:33:32 2010 +0100 l10n: Updated German (de) translation to 99% New status: 342 messages complete with 2 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/de.po | 137 +++-- 1 files changed, 70 insertions(+), 67 deletions(-) diff --git a/po/de.po b/po/de.po index 13707e0..ff38ba9 100644 --- a/po/de.po +++ b/po/de.po @@ -6,14 +6,14 @@ # Enrico Tröger enr...@xfce.org, 2008. # Simon Schneider si...@schneiderimtal.de, 2009 # Paul Seyfert pseyf...@mathphys.fsk.uni-heidelberg.de, 2010. -# +# msgid msgstr Project-Id-Version: xfce4-panel 4.7.0\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2010-12-18 05:09+\n -PO-Revision-Date: 2010-11-24 01:30+0100\n -Last-Translator: Fabian Nowak timyst...@arcor.de\n +POT-Creation-Date: 2010-12-28 20:04+\n +PO-Revision-Date: 2010-12-28 22:32+0100\n +Last-Translator: Paul Seyfert pseyf...@mathphys.fsk.uni-heidelberg.de\n Language-Team: German xfce-i18n...@xfce.org\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n @@ -33,7 +33,8 @@ msgid Customize the panel msgstr Leiste einrichten #: ../panel-preferences.desktop.in.h:2 -#: ../panel/panel-preferences-dialog.glade.h:24 ../panel/panel-window.c:2198 +#: ../panel/panel-preferences-dialog.glade.h:24 +#: ../panel/panel-window.c:2200 #: ../migrate/main.c:84 msgid Panel msgstr Leiste @@ -56,38 +57,41 @@ msgid Failed to open the documentation browser msgstr Konnte die Dokumentationsanzeige nicht öffnen #. I18N: %s is the name of the plugin -#: ../libxfce4panel/xfce-panel-plugin.c:887 +#: ../libxfce4panel/xfce-panel-plugin.c:889 #: ../panel/panel-preferences-dialog.c:1048 #, c-format msgid Are you sure that you want to remove \%s\? msgstr Soll »%s« wirklich entfernt werden? -#: ../libxfce4panel/xfce-panel-plugin.c:892 +#: ../libxfce4panel/xfce-panel-plugin.c:894 #: ../panel/panel-preferences-dialog.c:1051 msgid If you remove the item from the panel, it is permanently lost. msgstr Wenn Sie dieses Element von der Leiste entfernen, ist es dauerhaft verloren. #. move item -#: ../libxfce4panel/xfce-panel-plugin.c:1052 +#: ../libxfce4panel/xfce-panel-plugin.c:1054 msgid _Move msgstr _Verschieben -#: ../libxfce4panel/xfce-panel-plugin.c:1086 +#: ../libxfce4panel/xfce-panel-plugin.c:1088 msgid Pane_l msgstr _Leiste #. add new items -#: ../libxfce4panel/xfce-panel-plugin.c:1094 ../panel/panel-window.c:2210 +#: ../libxfce4panel/xfce-panel-plugin.c:1096 +#: ../panel/panel-window.c:2212 msgid Add _New Items... msgstr _Neue Elemente hinzufügen… #. customize panel -#: ../libxfce4panel/xfce-panel-plugin.c:1105 ../panel/panel-window.c:2221 +#: ../libxfce4panel/xfce-panel-plugin.c:1107 +#: ../panel/panel-window.c:2223 msgid Panel Pr_eferences... msgstr Leisten_einstellungen… #. logout item -#: ../libxfce4panel/xfce-panel-plugin.c:1122 ../panel/panel-window.c:2237 +#: ../libxfce4panel/xfce-panel-plugin.c:1124 +#: ../panel/panel-window.c:2239 msgid Log _Out msgstr _Abmelden @@ -95,7 +99,8 @@ msgstr _Abmelden msgid Show the 'Panel Preferences' dialog msgstr Dialog »Leiste einrichten« anzeigen -#: ../panel/main.c:78 ../panel/main.c:79 +#: ../panel/main.c:78 +#: ../panel/main.c:79 msgid PANEL-NUMBER msgstr LEISTENNUMMER @@ -190,24 +195,28 @@ msgstr Konnte keine D-Bus-Nachricht senden msgid Do you want to start the panel? If you do, make sure you save the session on logout, so the panel is automatically started the next time you login. msgstr Möchten Sie die Leiste starten? Ist das der Fall, so stellen Sie sicher, dass Sie die Sitzung beim Abmelden speichern, damit die Leiste beim nächsten Mal automatisch geladen wird. -#: ../panel/main.c:364 ../panel/main.c:378 +#: ../panel/main.c:364 +#: ../panel/main.c:378 #, c-format msgid No running instance of %s was found msgstr Keine laufende Instanz von %s gefunden -#: ../panel/panel-application.c:197 +#: ../panel/panel-application.c:196 msgid Failed to launch the migration application msgstr Konnte die Anwendung zum Migrieren der Leisteneinstellungen nicht starten -#: ../panel/panel-application.c:1424 ../plugins/actions/actions.c:413 +#: ../panel/panel-application.c:1446 +#: ../plugins/actions/actions.c:413 msgid You have started X without session manager. Clicking Quit will close the X server. msgstr Sie haben X ohne Sitzungsverwaltung gestartet. Wenn Sie jetzt »Beenden« klicken, beendet dies den X-Server. -#: ../panel/panel-application.c:1425 ../plugins/actions/actions.c:414 +#: ../panel/panel-application.c:1447 +#: ../plugins/actions/actions.c:414 msgid Are you sure you want to quit the panel? msgstr Soll
[Xfce4-commits] pyxfce:master fix netk test.
Updating branch refs/heads/master to cff81899796df74e8ac7ee478e829588b117e8de (commit) from 77c0630a736158bbac5a82b38e64d63b22def281 (commit) commit cff81899796df74e8ac7ee478e829588b117e8de Author: Danny Milosavljevic dan...@xfce.org Date: Tue Dec 28 22:57:47 2010 +0100 fix netk test. netk/tests/iwindowlist.py |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/netk/tests/iwindowlist.py b/netk/tests/iwindowlist.py index 3b1e108..ae5989e 100644 --- a/netk/tests/iwindowlist.py +++ b/netk/tests/iwindowlist.py @@ -3,7 +3,7 @@ import pygtk pygtk.require(2.0) import gtk -import xfce4 +import xfce4.netk screen = xfce4.netk.screen_get_default() ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] pyxfce:master add xfconf support.
Updating branch refs/heads/master
to 815985420f03d4b020a24037861829a0a86ddb62 (commit)
from cff81899796df74e8ac7ee478e829588b117e8de (commit)
commit 815985420f03d4b020a24037861829a0a86ddb62
Author: Danny Milosavljevic dan...@xfce.org
Date: Tue Dec 28 23:34:54 2010 +0100
add xfconf support.
Makefile.am |4 +-
configure.ac |3 +-
netk/gen |2 +-
xfconf/Makefile.am| 55 ++
netk/template.override = xfconf/binding.override |6 +-
netk/template.override = xfconf/channel.override |6 +-
netk/template.override = xfconf/errors.override |6 +-
xfconf/gen| 55 ++
netk/template.override = xfconf/types.override |6 +-
netk/netk.py = xfconf/xfconf.py |3 +-
netk/netkmodule.c = xfconf/xfconfmodule.c| 83 ++---
11 files changed, 152 insertions(+), 77 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index a642c1d..810c84d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,8 +13,8 @@ if HAVE_MIGHTY_MOUSE
SUBDIR_MIGHTY_MOUSE = panel
endif
-SUBDIRS = gui netk util $(SUBDIR_MIGHTY_MOUSE)
-DIST_SUBDIRS = gui netk util $(SUBDIR_MIGHTY_MOUSE)
+SUBDIRS = gui netk util xfconf $(SUBDIR_MIGHTY_MOUSE)
+DIST_SUBDIRS = gui netk util xfconf $(SUBDIR_MIGHTY_MOUSE)
PLATFORM_VERSION = 4.2
PLATFORM_WIN32 =
diff --git a/configure.ac b/configure.ac
index fee8f0a..fe10f1e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -43,7 +43,7 @@ dnl get rid of the -export-dynamic stuff from the configure
flags ...
export_dynamic=`(./libtool --config; echo eval echo
\\$export_dynamic_flag_spec) | sh`
BM_DEPEND([XFCE4_UTIL], [libxfce4util-1.0], [4.1.0])
-
+BM_DEPEND([XFCE4_XFCONF], [libxfconf-0], [4.6.2])
BM_DEPEND([XFCE4_GUI], [libxfcegui4-1.0], [4.3.90])
# new panel
@@ -88,5 +88,6 @@ AC_CONFIG_FILES(
netk/Makefile
panel/Makefile
util/Makefile
+ xfconf/Makefile
)
AC_OUTPUT
diff --git a/netk/gen b/netk/gen
index fb9c452..f1af90b 100755
--- a/netk/gen
+++ b/netk/gen
@@ -17,7 +17,7 @@ do
#echo ${defs}
- python /usr/share/pygtk/2.0/codegen/h2def.py $s ${defs}
+ python
/usr/lib/python2.6/site-packages/gtk-2.0/codegen/h2def.py $s ${defs}
fi
done
rm -f util.defs
diff --git a/xfconf/Makefile.am b/xfconf/Makefile.am
new file mode 100644
index 000..09d0e00
--- /dev/null
+++ b/xfconf/Makefile.am
@@ -0,0 +1,55 @@
+...@set_make@
+
+PLATFORM_VERSION = 4.2
+
+common_ldflags = -module -avoid-version -export-symbols-regex init_xfconf
+if PLATFORM_WIN32
+common_ldflags += -no-undefined
+endif
+
+INCLUDES = $(PYTHON_INCLUDES)
+
+CODEGEN_PATH = @CODEGEN_PATH@
+
+pyxfceexecdir = $(pyexecdir)/xfce4
+pyxfceexec_LTLIBRARIES = _xfconf.la
+pyxfceexec_PYTHON = xfconf.py
+_xfconf_la_CFLAGS = $(XFCE4_XFCONF_CFLAGS) $(PYTHON_CFLAGS) $(PYGTK_CFLAGS)
+_xfconf_la_LDFLAGS = $(common_ldflags)
+_xfconf_la_LIBADD = $(XFCE4_XFCONF_LIBS) $(PYTHON_LIBS)
+_xfconf_la_SOURCES = \
+ binding.c \
+ channel.c \
+ errors.c \
+ types.c \
+ xfconfmodule.c
+
+defsdir = $(pkgdatadir)/$(PLATFORM_VERSION)/defs
+defs_DATA = \
+ binding.defs \
+ channel.defs \
+ errors.defs \
+ types.defs
+
+xfconf_overrides = binding.override channel.override errors.override
types.override
+
+EXTRA_DIST = $(defs_DATA) $(xfconf_overrides) gen
+nodist__xfconf_la_SOURCES =
+
+PYGTK_DEFS=`pkg-config --variable=defsdir pygtk-2.0`
+
+.defs.c:
+ (cd $(srcdir) \
+ $(PYTHON) $(CODEGEN_PATH)/codegen.py \
+ $(PYGTK_CODEGEN_DEFINES) \
+--override $*.override \
+--register $(PYGTK_DEFS)/gtk-types.defs \
+--register $(PYGTK_DEFS)/gdk-types.defs \
+--register binding.defs \
+--register channel.defs \
+--register errors.defs \
+--register types.defs \
+--prefix py$* $*.defs) gen-$*.c \
+ cp gen-$*.c $*.c \
+ rm -f gen-$*.c
+
diff --git a/netk/template.override b/xfconf/binding.override
similarity index 73%
copy from netk/template.override
copy to xfconf/binding.override
index 0a4011a..fa9bf76 100644
--- a/netk/template.override
+++ b/xfconf/binding.override
@@ -4,13 +4,13 @@
%%
headers
#include pygobject.h
-#include gtk/gtk.h
-#include libxfcegui4/libxfcegui4.h
+#include glib.h
+#include xfconf/xfconf.h
%%
include
%%
-modulename *
+modulename classgroup
%%
import gobject.GObject as PyGObject_Type
%%
diff --git a/netk/template.override b/xfconf/channel.override
similarity index 73%
copy from netk/template.override
copy to xfconf/channel.override
index 0a4011a..fa9bf76 100644
--- a/netk/template.override
+++ b/xfconf/channel.override
@@ -4,13 +4,13 @@
%%
headers
#include pygobject.h
-#include gtk/gtk.h
[Xfce4-commits] pyxfce:master init xfconf, add list_channels.
Updating branch refs/heads/master
to ed71ded18db1b056936cb44537aea2a84e640a76 (commit)
from 815985420f03d4b020a24037861829a0a86ddb62 (commit)
commit ed71ded18db1b056936cb44537aea2a84e640a76
Author: Danny Milosavljevic dan...@xfce.org
Date: Tue Dec 28 23:48:50 2010 +0100
init xfconf, add list_channels.
xfconf/channel.override | 23 +++
xfconf/gen |8
xfconf/xfconfmodule.c |6 ++
3 files changed, 37 insertions(+), 0 deletions(-)
diff --git a/xfconf/channel.override b/xfconf/channel.override
index fa9bf76..c17574f 100644
--- a/xfconf/channel.override
+++ b/xfconf/channel.override
@@ -21,3 +21,26 @@ ignore-glob
%%
ignore-win32
%%
+override xfconf_list_channels kwargs
+static PyObject *
+_wrap_xfconf_list_channels(PyObject *self, PyObject *args, PyObject *kwargs)
+{
+static char *kwlist[] = { NULL };
+gchar **ret;
+int i;
+int count;
+
+if (!PyArg_ParseTupleAndKeywords(args, kwargs, :list_channels, kwlist))
+return NULL;
+ret = xfconf_list_channels();
+if (ret) {
+count = g_strv_length(ret);
+PyObject *py_ret = PyList_New(count);
+for(i = 0; i count; ++i)
+PyList_SetItem(py_ret, i, PyString_FromString(ret[i]));
+g_strfreev(ret);
+return py_ret;
+}
+Py_INCREF(Py_None);
+return Py_None;
+}
diff --git a/xfconf/gen b/xfconf/gen
index bfe32eb..ad3f8fc 100755
--- a/xfconf/gen
+++ b/xfconf/gen
@@ -41,6 +41,14 @@ cat P EOF
(c-name XfconfChannel)
(gtype-id XFCONF_TYPE_CHANNEL)
)
+
+(define-function list_channels
+ (c-name xfconf_list_channels)
+ (return-type gchar**)
+ (parameters
+ )
+)
+
EOF
cat P channel.defs channel.defs.new mv channel.defs.new channel.defs
diff --git a/xfconf/xfconfmodule.c b/xfconf/xfconfmodule.c
index 597538b..5cf0de0 100644
--- a/xfconf/xfconfmodule.c
+++ b/xfconf/xfconfmodule.c
@@ -64,10 +64,16 @@ my_register1()
DL_EXPORT(void)
init_xfconf(void)
{
+ GError* error = NULL;
+
/* set the default python encoding to utf-8 */
PyUnicode_SetDefaultEncoding(utf-8);
init_pygobject ();
+ if(!xfconf_init(error)) {
+ fprintf (stderr, Unable to initialize xfconf: %s\n,
error-message);
+ g_error_free(error);
+ }
my_register1 ();
}
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-panel:master l10n: Updated English (United Kingdom) (en_GB) translation to 100%
Updating branch refs/heads/master to 9829095db91e780e0956428bd0419bb5bb38f1cc (commit) from 3c1f6fb9867291d946c16b922305bf1dbd67e33c (commit) commit 9829095db91e780e0956428bd0419bb5bb38f1cc Author: Jeff Bailes thepizzak...@gmail.com Date: Wed Dec 29 00:15:40 2010 +0100 l10n: Updated English (United Kingdom) (en_GB) translation to 100% New status: 344 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/en_GB.po |1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/po/en_GB.po b/po/en_GB.po index d721f70..1e13278 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -1370,7 +1370,6 @@ msgid Notification Area msgstr Notification Area #: ../plugins/systray/systray-dialog.glade.h:6 -#, fuzzy msgid _Maximum icon size (px): msgstr _Maximum icon size (px): ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] xfce4-panel:master l10n: Updated English (United Kingdom) (en_GB) translation to 99%
Updating branch refs/heads/master to 3c1f6fb9867291d946c16b922305bf1dbd67e33c (commit) from d802a5bfa4bde5204cdc455c1aa706e0d5c58fe0 (commit) commit 3c1f6fb9867291d946c16b922305bf1dbd67e33c Author: Jeff Bailes thepizzak...@gmail.com Date: Wed Dec 29 00:15:05 2010 +0100 l10n: Updated English (United Kingdom) (en_GB) translation to 99% New status: 343 messages complete with 1 fuzzy and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/en_GB.po | 91 ++ 1 files changed, 47 insertions(+), 44 deletions(-) diff --git a/po/en_GB.po b/po/en_GB.po index 3a2d132..d721f70 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -10,7 +10,7 @@ msgid msgstr Project-Id-Version: xfce4-panel 4.8.0\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2010-12-19 05:09+\n +POT-Creation-Date: 2010-12-28 23:09+\n PO-Revision-Date: 2010-12-13 18:41+1100\n Last-Translator: \n Language-Team: \n @@ -33,7 +33,7 @@ msgid Customize the panel msgstr Customise the panel #: ../panel-preferences.desktop.in.h:2 -#: ../panel/panel-preferences-dialog.glade.h:24 ../panel/panel-window.c:2200 +#: ../panel/panel-preferences-dialog.glade.h:24 ../panel/panel-window.c: #: ../migrate/main.c:84 msgid Panel msgstr Panel @@ -56,38 +56,38 @@ msgid Failed to open the documentation browser msgstr Failed to open the documentation browser #. I18N: %s is the name of the plugin -#: ../libxfce4panel/xfce-panel-plugin.c:887 +#: ../libxfce4panel/xfce-panel-plugin.c:889 #: ../panel/panel-preferences-dialog.c:1048 #, c-format msgid Are you sure that you want to remove \%s\? msgstr Are you sure that you want to remove \%s\? -#: ../libxfce4panel/xfce-panel-plugin.c:892 +#: ../libxfce4panel/xfce-panel-plugin.c:894 #: ../panel/panel-preferences-dialog.c:1051 msgid If you remove the item from the panel, it is permanently lost. msgstr If you remove the item from the panel, it is permanently lost. #. move item -#: ../libxfce4panel/xfce-panel-plugin.c:1052 +#: ../libxfce4panel/xfce-panel-plugin.c:1054 msgid _Move msgstr _Move -#: ../libxfce4panel/xfce-panel-plugin.c:1086 +#: ../libxfce4panel/xfce-panel-plugin.c:1088 msgid Pane_l msgstr Pane_l #. add new items -#: ../libxfce4panel/xfce-panel-plugin.c:1094 ../panel/panel-window.c:2212 +#: ../libxfce4panel/xfce-panel-plugin.c:1096 ../panel/panel-window.c:2234 msgid Add _New Items... msgstr Add _New Items... #. customize panel -#: ../libxfce4panel/xfce-panel-plugin.c:1105 ../panel/panel-window.c:2223 +#: ../libxfce4panel/xfce-panel-plugin.c:1107 ../panel/panel-window.c:2245 msgid Panel Pr_eferences... msgstr Panel Pr_eferences... #. logout item -#: ../libxfce4panel/xfce-panel-plugin.c:1122 ../panel/panel-window.c:2239 +#: ../libxfce4panel/xfce-panel-plugin.c:1124 ../panel/panel-window.c:2261 msgid Log _Out msgstr Log _Out @@ -199,15 +199,15 @@ msgstr No running instance of %s was found msgid Failed to launch the migration application msgstr Failed to launch the migration application -#: ../panel/panel-application.c:1423 ../plugins/actions/actions.c:413 +#: ../panel/panel-application.c:1446 ../plugins/actions/actions.c:413 msgid You have started X without session manager. Clicking Quit will close the X server. msgstr You have started X without session manager. Clicking Quit will close the X server. -#: ../panel/panel-application.c:1424 ../plugins/actions/actions.c:414 +#: ../panel/panel-application.c:1447 ../plugins/actions/actions.c:414 msgid Are you sure you want to quit the panel? msgstr Are you sure you want to quit the panel? -#: ../panel/panel-application.c:1432 ../plugins/actions/actions.c:422 +#: ../panel/panel-application.c:1455 ../plugins/actions/actions.c:422 #, c-format msgid Failed to execute command \%s\ msgstr Failed to execute command \%s\ @@ -252,29 +252,29 @@ msgstr Because the panel is running in kiosk mode, you are not allowed to make msgid Modifying the panel is not allowed msgstr Modifying the panel is not allowed -#: ../panel/panel-item-dialog.c:175 +#: ../panel/panel-item-dialog.c:188 msgid Add New Items msgstr Add New Items -#: ../panel/panel-item-dialog.c:177 +#: ../panel/panel-item-dialog.c:190 msgid Add new plugins to the panel msgstr Add new plugins to the panel -#: ../panel/panel-item-dialog.c:200 +#: ../panel/panel-item-dialog.c:213 #: ../plugins/launcher/launcher-dialog.glade.h:23 msgid _Search: msgstr _Search: -#: ../panel/panel-item-dialog.c:208 +#: ../panel/panel-item-dialog.c:221 msgid Enter search phrase here msgstr Enter search phrase here -#: ../panel/panel-plugin-external.c:418 +#: ../panel/panel-plugin-external.c:420 #, c-format msgid Plugin \%s\ unexpectedly left the panel, do you want to restart it? msgstr Plugin \%s\ unexpectedly left the panel, do you want to restart it? -#: ../panel/panel-plugin-external.c:420 +#: ../panel/panel-plugin-external.c:422 #, c-format
[Xfce4-commits] pyxfce:master fix XfconfChannel.get_properties()
Updating branch refs/heads/master
to c397903391346d2078219ba03488f2ffa27cac6c (commit)
from ed71ded18db1b056936cb44537aea2a84e640a76 (commit)
commit c397903391346d2078219ba03488f2ffa27cac6c
Author: Danny Milosavljevic dan...@xfce.org
Date: Wed Dec 29 00:34:21 2010 +0100
fix XfconfChannel.get_properties()
xfconf/channel.override| 27 +++
xfconf/tests/testwmconf.py |9 +
xfconf/xfconfmodule.c |7 +--
3 files changed, 41 insertions(+), 2 deletions(-)
diff --git a/xfconf/channel.override b/xfconf/channel.override
index c17574f..6c89fd9 100644
--- a/xfconf/channel.override
+++ b/xfconf/channel.override
@@ -44,3 +44,30 @@ _wrap_xfconf_list_channels(PyObject *self, PyObject *args,
PyObject *kwargs)
Py_INCREF(Py_None);
return Py_None;
}
+%%
+override xfconf_channel_get_properties kwargs
+static PyObject *
+_wrap_xfconf_channel_get_properties(PyGObject *self, PyObject *args, PyObject
*kwargs)
+{
+static char *kwlist[] = { property_base, NULL };
+GHashTable *ret;
+char* path;
+
+if (!PyArg_ParseTupleAndKeywords(args, kwargs,
s:XfconfChannel.get_properties, kwlist, path))
+return NULL;
+ret = xfconf_channel_get_properties(XFCONF_CHANNEL(self-obj), path);
+if (ret) {
+GHashTableIter iter;
+gpointer key, value;
+PyObject* py_ret;
+py_ret = PyDict_New();
+g_hash_table_iter_init(iter, ret);
+while(g_hash_table_iter_next(iter, key, value)) {
+PyDict_SetItem(py_ret, PyString_FromString((const char*) key),
pyg_value_as_pyobject((GValue*) value, TRUE));
+}
+g_hash_table_destroy(ret);
+return py_ret;
+}
+Py_INCREF(Py_None);
+return Py_None;
+}
diff --git a/xfconf/tests/testwmconf.py b/xfconf/tests/testwmconf.py
new file mode 100644
index 000..2b26a37
--- /dev/null
+++ b/xfconf/tests/testwmconf.py
@@ -0,0 +1,9 @@
+#!/usr/bin/env python
+
+import xfce4.xfconf
+print(xfce4.xfconf.list_channels())
+wm = xfce4.xfconf.channel_get(xfwm4)
+print(wm.get_properties(/))
+wm = xfce4.xfconf.channel_get(xfwm4)
+print(wm.get_properties(/))
+
diff --git a/xfconf/xfconfmodule.c b/xfconf/xfconfmodule.c
index 5cf0de0..3594597 100644
--- a/xfconf/xfconfmodule.c
+++ b/xfconf/xfconfmodule.c
@@ -11,6 +11,8 @@
#include pygobject.h
#include pyerrors.h
+#include xfconf/xfconf.h
+
extern const PyMethodDef pybinding_functions[];
extern const PyMethodDef pychannel_functions[];
extern const PyMethodDef pyerrors_functions[];
@@ -71,8 +73,9 @@ init_xfconf(void)
init_pygobject ();
if(!xfconf_init(error)) {
- fprintf (stderr, Unable to initialize xfconf: %s\n,
error-message);
- g_error_free(error);
+ fprintf(stderr, Unable to initialize xfconf: %s\n,
error-message);
+ if(pyg_error_check(error))
+ return;
}
my_register1 ();
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] libxfce4menu:master l10n: Arabic translation
Updating branch refs/heads/master
to 50cfa94cb3a3ce86ee318d6cca6b47da397324e3 (commit)
from f1e3430e7ee2bbdb853c08300954663bb432e8a0 (commit)
commit 50cfa94cb3a3ce86ee318d6cca6b47da397324e3
Author: كريم أولاد الشلحة herr.linu...@gmail.com
Date: Wed Dec 29 01:56:55 2010 +0100
l10n: Arabic translation
New status: 5 messages complete with 0 fuzzies and 0 untranslated.
Transmitted-via: Transifex (translations.xfce.org).
po/{bg.po = ar.po} | 24 +---
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/po/bg.po b/po/ar.po
similarity index 52%
copy from po/bg.po
copy to po/ar.po
index 9016150..f7d3d0c 100644
--- a/po/bg.po
+++ b/po/ar.po
@@ -1,42 +1,44 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
-# Krasimir Chonov mk2...@abv.bg, 2010.
+# FIRST AUTHOR em...@address, YEAR.
#
msgid
msgstr
-Project-Id-Version: libxfce4menu 4.8.0\n
+Project-Id-Version: libxcfe4menu\n
Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2010-03-24 18:03+0100\n
-PO-Revision-Date: 2010-03-24 23:23+0200\n
-Last-Translator: Krasimir Chonov mk2...@abv.bg\n
-Language-Team: Bulgarian d...@fsa-bg.org\n
+POT-Creation-Date: 2010-12-27 17:07+\n
+PO-Revision-Date: 2010-12-27 22:00-\n
+Last-Translator: كريم أولاد الشلحة herr.linu...@gmail.com\n
+Language-Team: Arabic herr.linu...@gmail.com\n
MIME-Version: 1.0\n
Content-Type: text/plain; charset=utf-8\n
Content-Transfer-Encoding: 8bit\n
+X-Poedit-Language: Arabic\n
+X-Poedit-Country: MOROCCO\n
#. Let the caller know there was no suitable file
#: ../libxfce4menu/xfce-menu.c:743
#, c-format
msgid Failed to locate the system menu
-msgstr Неуспешен опит за локализиране на системното меню
+msgstr فشل عثور على موقع نطام القائمة
#: ../libxfce4menu/xfce-menu-item-cache.c:203
#, c-format
msgid Failed to create the libxfce4menu item cache in %s.
-msgstr Неуспешен опит за създаване на елемент от кеша на libxfce4menu в %s.
+msgstr فشل إنشاء libxfce4menu عنصر المخبأ في %s.
#: ../libxfce4menu/xfce-menu-item-cache.c:213
#, c-format
msgid Failed to load the libxfce4menu item cache from %s: %s.
-msgstr Неуспешен опит за зареждане на елемент от кеша на libxfce4menu от %s:
%s.
+msgstr فشل تحميل libxfce4menu عنصر المخبأ في %s: %s.
#: ../tests/test-display-menu.c:353
msgid XfceMenu: Display Menu Test
-msgstr XfceMenu: Изпробване на менюто „Дисплей“
+msgstr XfceMenu: إختبار عرض القائمة
#. Create button
#: ../tests/test-display-menu.c:362
msgid _Show menu
-msgstr _Показване на менюто
+msgstr _أظهر قائمة
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] libxfce4ui:master l10n: Arabic translation
Updating branch refs/heads/master
to 348e4ca1ded9c0e4d55629b43afa4a538e9eb950 (commit)
from 07687c57f3f05eb7ee76d20f342ec48d7d23ddba (commit)
commit 348e4ca1ded9c0e4d55629b43afa4a538e9eb950
Author: كريم أولاد الشلحة herr.linu...@gmail.com
Date: Wed Dec 29 02:01:07 2010 +0100
l10n: Arabic translation
New status: 30 messages complete with 0 fuzzies and 1 untranslated.
Transmitted-via: Transifex (translations.xfce.org).
po/{pt.po = ar.po} | 86 +-
1 files changed, 43 insertions(+), 43 deletions(-)
diff --git a/po/pt.po b/po/ar.po
similarity index 61%
copy from po/pt.po
copy to po/ar.po
index af34eff..bd61a96 100644
--- a/po/pt.po
+++ b/po/ar.po
@@ -1,78 +1,77 @@
-# European Portuguese translation for libxfce4ui.
+# SOME DESCRIPTIVE TITLE.
# 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, 2008, 2009.
-#
+# FIRST AUTHOR em...@address, YEAR.
+#
msgid
msgstr
-Project-Id-Version: libxfce4ui\n
+Project-Id-Version: libxcfe4ui\n
Report-Msgid-Bugs-To: \n
-POT-Creation-Date: 2010-12-01 11:07+\n
-PO-Revision-Date: 2010-11-11 16:05+0100\n
-Last-Translator: Nuno Miguel nu...@netcabo.pt\n
-Language-Team: \n
+POT-Creation-Date: 2010-12-27 17:07+\n
+PO-Revision-Date: 2010-12-28 14:57-\n
+Last-Translator: كريم أولاد الشلحة herr.linu...@gmail.com\n
+Language-Team: Arabic herr.linu...@gmail.com\n
MIME-Version: 1.0\n
-Content-Type: text/plain; charset=UTF-8\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-Language: Arabic\n
+X-Poedit-Country: MOROCCO\n
#: ../libxfce4ui/xfce-dialogs.c:69
msgid Information
-msgstr Informação
+msgstr معلومات
#: ../libxfce4ui/xfce-dialogs.c:102
msgid Warning
-msgstr Aviso
+msgstr تحذير
#: ../libxfce4ui/xfce-dialogs.c:136
msgid Error
-msgstr Erro
+msgstr خطأ
#: ../libxfce4ui/xfce-dialogs.c:187
msgid Question
-msgstr Questão
+msgstr سؤال
#: ../libxfce4ui/xfce-sm-client.c:1401
msgid Session management client ID
-msgstr ID do cliente de gestão de sessão
+msgstr حدد رقم معرّف إدارة الجلسة
#: ../libxfce4ui/xfce-sm-client.c:1401
msgid ID
-msgstr ID
+msgstr معرّف
#: ../libxfce4ui/xfce-sm-client.c:1402
msgid Disable session management
-msgstr Desactivar gestão de sessão
+msgstr تعطيل إدارة الجلسة
#: ../libxfce4ui/xfce-sm-client.c:1412
msgid Session management options
-msgstr Opções da gestão de sessão
+msgstr خيارات إدارة الجلسة
#: ../libxfce4ui/xfce-sm-client.c:1413
msgid Show session management options
-msgstr Mostrar opções de gestão de sessão
+msgstr عرض خيارات إدارة الجلسة
#: ../libxfce4ui/xfce-sm-client.c:1589
#, c-format
msgid Failed to connect to the session manager: %s
-msgstr Falha ao ligar ao gestor da sessão: %s
+msgstr فشل الإتصال بمدير الجلسة: %s
#: ../libxfce4ui/xfce-sm-client.c:1596
#, c-format
msgid Session manager did not return a valid client id
-msgstr O gestor de sessão não devolveu uma id de cliente válida
+msgstr
#. print warning for user
#: ../libxfce4ui/xfce-spawn.c:407
#, c-format
msgid Working directory \%s\ does not exist. It won't be used when spawning
\%s\.
-msgstr O directório de trabalho \%s\ não existe. Não será usado ao criar
\%s\.
+msgstr مسار العمل \%s\ غير موجود. ولن يستخدم عنذ توليد \%s\.
#: ../libxfce4kbd-private/xfce-shortcuts.c:52
msgid This shortcut is already being used for another window manager action.
Which action do you want to use?
-msgstr Este atalho já está a ser utilizado por outra acção do gestor de
janelas. Que acção pretende utilizar?
+msgstr هذا الإختصار يستخدم حاليا من طرف مدير عمل النوافذ أخر. أي واحد تريد
الإستعمال؟
#: ../libxfce4kbd-private/xfce-shortcuts.c:53
#: ../libxfce4kbd-private/xfce-shortcuts.c:56
@@ -80,78 +79,79 @@ msgstr Este atalho já está a ser utilizado por outra acção
do gestor de jan
#: ../libxfce4kbd-private/xfce-shortcuts.c:62
#, c-format
msgid Use '%s'
-msgstr Utilizar \%s\
+msgstr إستعمال '%s'
#: ../libxfce4kbd-private/xfce-shortcuts.c:53
msgid Keep the other one
-msgstr Manter o outro
+msgstr الحفاظ على واحد أخر
#: ../libxfce4kbd-private/xfce-shortcuts.c:55
#: ../libxfce4kbd-private/xfce-shortcuts.c:58
#, c-format
msgid This shortcut is already being used for the command '%s'. Which action
do you want to use?
-msgstr Este atalho já está a ser utilizado pelo comando '%s'. Que acção
pretende utilizar?
+msgstr هذا الإختصار يستعمل حاليا من طرف الأمر '%s'. أي واحد تريد الإستعمال؟
#: ../libxfce4kbd-private/xfce-shortcuts.c:56
#: ../libxfce4kbd-private/xfce-shortcuts.c:59
#, c-format
msgid Keep '%s'
-msgstr Manter \%s\
+msgstr الحفاظ على '%s'
#: ../libxfce4kbd-private/xfce-shortcuts.c:61
msgid This shortcut is already being used by a window manager action. Which
action do you
[Xfce4-commits] xfce4-panel:master l10n: Updated Russian (ru) translation to 95%
Updating branch refs/heads/master to f6fd4ec8f040d21e61adf3390398a02fadc0ad57 (commit) from 9829095db91e780e0956428bd0419bb5bb38f1cc (commit) commit f6fd4ec8f040d21e61adf3390398a02fadc0ad57 Author: Aleksandr Ponomarenko davian...@gmail.com Date: Wed Dec 29 02:44:51 2010 +0100 l10n: Updated Russian (ru) translation to 95% New status: 330 messages complete with 1 fuzzy and 13 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/ru.po | 94 +++-- 1 files changed, 48 insertions(+), 46 deletions(-) diff --git a/po/ru.po b/po/ru.po index 792b859..e9d29fb 100644 --- a/po/ru.po +++ b/po/ru.po @@ -11,7 +11,7 @@ msgid msgstr Project-Id-Version: xfce4-panel 4.7.0\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2010-12-18 00:14+\n +POT-Creation-Date: 2010-12-28 23:09+\n PO-Revision-Date: 2010-03-07 11:49+0300\n Last-Translator: Dima Smirnov a...@cnc-parts.info\n Language-Team: Russian\n @@ -34,7 +34,7 @@ msgid Customize the panel msgstr Настройка панели #: ../panel-preferences.desktop.in.h:2 -#: ../panel/panel-preferences-dialog.glade.h:24 ../panel/panel-window.c:2198 +#: ../panel/panel-preferences-dialog.glade.h:24 ../panel/panel-window.c: #: ../migrate/main.c:84 msgid Panel msgstr Панель @@ -57,38 +57,38 @@ msgid Failed to open the documentation browser msgstr Не удалось открыть программу просмотра документации #. I18N: %s is the name of the plugin -#: ../libxfce4panel/xfce-panel-plugin.c:887 +#: ../libxfce4panel/xfce-panel-plugin.c:889 #: ../panel/panel-preferences-dialog.c:1048 #, c-format msgid Are you sure that you want to remove \%s\? msgstr Вы действительно хотите \%s\? -#: ../libxfce4panel/xfce-panel-plugin.c:892 +#: ../libxfce4panel/xfce-panel-plugin.c:894 #: ../panel/panel-preferences-dialog.c:1051 msgid If you remove the item from the panel, it is permanently lost. msgstr Если вы удалите этот элемент с панели, он будет потерян навсегда. #. move item -#: ../libxfce4panel/xfce-panel-plugin.c:1052 +#: ../libxfce4panel/xfce-panel-plugin.c:1054 msgid _Move msgstr Пере_местить -#: ../libxfce4panel/xfce-panel-plugin.c:1086 +#: ../libxfce4panel/xfce-panel-plugin.c:1088 msgid Pane_l msgstr Пане_ль #. add new items -#: ../libxfce4panel/xfce-panel-plugin.c:1094 ../panel/panel-window.c:2210 +#: ../libxfce4panel/xfce-panel-plugin.c:1096 ../panel/panel-window.c:2234 msgid Add _New Items... msgstr _Добавить новый элемент... #. customize panel -#: ../libxfce4panel/xfce-panel-plugin.c:1105 ../panel/panel-window.c:2221 +#: ../libxfce4panel/xfce-panel-plugin.c:1107 ../panel/panel-window.c:2245 msgid Panel Pr_eferences... msgstr _Настройки панели #. logout item -#: ../libxfce4panel/xfce-panel-plugin.c:1122 ../panel/panel-window.c:2237 +#: ../libxfce4panel/xfce-panel-plugin.c:1124 ../panel/panel-window.c:2261 msgid Log _Out msgstr За_вершение сеанса @@ -189,26 +189,26 @@ msgstr Не удалось послать сообщение D-bus #: ../panel/main.c:361 msgid Do you want to start the panel? If you do, make sure you save the session on logout, so the panel is automatically started the next time you login. -msgstr +msgstr Запустить панель? Если вы решите сохранить сеанс при выходе, панель будет запускаться автоматически при входе в систему. #: ../panel/main.c:364 ../panel/main.c:378 #, c-format msgid No running instance of %s was found msgstr %s не запущен. -#: ../panel/panel-application.c:197 +#: ../panel/panel-application.c:196 msgid Failed to launch the migration application msgstr Не удалось запустить программу миграции -#: ../panel/panel-application.c:1424 ../plugins/actions/actions.c:413 +#: ../panel/panel-application.c:1446 ../plugins/actions/actions.c:413 msgid You have started X without session manager. Clicking Quit will close the X server. msgstr Вы запустили X-сервер без менеджера сеанса. После выхода X-сервер будет закрыт. -#: ../panel/panel-application.c:1425 ../plugins/actions/actions.c:414 +#: ../panel/panel-application.c:1447 ../plugins/actions/actions.c:414 msgid Are you sure you want to quit the panel? msgstr Вы действительно хотите выйти из панели? -#: ../panel/panel-application.c:1433 ../plugins/actions/actions.c:422 +#: ../panel/panel-application.c:1455 ../plugins/actions/actions.c:422 #, c-format msgid Failed to execute command \%s\ msgstr Не удалось запустить \%s\ @@ -253,29 +253,29 @@ msgstr Поскольку панель запущена в режиме пре msgid Modifying the panel is not allowed msgstr Изменение панели не разрешено -#: ../panel/panel-item-dialog.c:175 +#: ../panel/panel-item-dialog.c:188 msgid Add New Items msgstr Добавить новый элемент -#: ../panel/panel-item-dialog.c:177 +#: ../panel/panel-item-dialog.c:190 msgid Add new plugins to the panel msgstr Добавить новый модуль -#: ../panel/panel-item-dialog.c:200 +#: ../panel/panel-item-dialog.c:213 #: ../plugins/launcher/launcher-dialog.glade.h:23 msgid
[Xfce4-commits] xfce4-panel:master l10n: Updated Kazakh (kk) translation to 100%
Updating branch refs/heads/master to b7b2e938fbb4926a0a01117dcd0e8318aa54b6b0 (commit) from f6fd4ec8f040d21e61adf3390398a02fadc0ad57 (commit) commit b7b2e938fbb4926a0a01117dcd0e8318aa54b6b0 Author: Bauzhan Muftakhidinov baurthefi...@gmail.com Date: Wed Dec 29 04:45:15 2010 +0100 l10n: Updated Kazakh (kk) translation to 100% New status: 344 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/kk.po | 90 +++-- 1 files changed, 46 insertions(+), 44 deletions(-) diff --git a/po/kk.po b/po/kk.po index 95dbb55..410e9d9 100644 --- a/po/kk.po +++ b/po/kk.po @@ -7,7 +7,7 @@ msgid msgstr Project-Id-Version: xfce4-panel 4.7.0\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2010-12-19 23:09+\n +POT-Creation-Date: 2010-12-28 23:09+\n PO-Revision-Date: 2010-08-03 09:46+0600\n Last-Translator: Baurzhan Muftakhidinov baurthefi...@gmail.com\n Language-Team: Kazakh kk...@googlegroups.com\n @@ -30,7 +30,7 @@ msgid Customize the panel msgstr Панельді баптау #: ../panel-preferences.desktop.in.h:2 -#: ../panel/panel-preferences-dialog.glade.h:24 ../panel/panel-window.c:2200 +#: ../panel/panel-preferences-dialog.glade.h:24 ../panel/panel-window.c: #: ../migrate/main.c:84 msgid Panel msgstr Панель @@ -53,38 +53,38 @@ msgid Failed to open the documentation browser msgstr Құжаттама шолушысын ашу сәтсіз аяқталды #. I18N: %s is the name of the plugin -#: ../libxfce4panel/xfce-panel-plugin.c:887 +#: ../libxfce4panel/xfce-panel-plugin.c:889 #: ../panel/panel-preferences-dialog.c:1048 #, c-format msgid Are you sure that you want to remove \%s\? msgstr \%s\ өшіруді шынымен қалайсыз ба? -#: ../libxfce4panel/xfce-panel-plugin.c:892 +#: ../libxfce4panel/xfce-panel-plugin.c:894 #: ../panel/panel-preferences-dialog.c:1051 msgid If you remove the item from the panel, it is permanently lost. msgstr Элементті панельден өшірсеңіз, ол толығымен жойылады. #. move item -#: ../libxfce4panel/xfce-panel-plugin.c:1052 +#: ../libxfce4panel/xfce-panel-plugin.c:1054 msgid _Move msgstr Ж_ылжыту -#: ../libxfce4panel/xfce-panel-plugin.c:1086 +#: ../libxfce4panel/xfce-panel-plugin.c:1088 msgid Pane_l msgstr Пане_ль #. add new items -#: ../libxfce4panel/xfce-panel-plugin.c:1094 ../panel/panel-window.c:2212 +#: ../libxfce4panel/xfce-panel-plugin.c:1096 ../panel/panel-window.c:2234 msgid Add _New Items... msgstr Жаңа _элементтерді қосу... #. customize panel -#: ../libxfce4panel/xfce-panel-plugin.c:1105 ../panel/panel-window.c:2223 +#: ../libxfce4panel/xfce-panel-plugin.c:1107 ../panel/panel-window.c:2245 msgid Panel Pr_eferences... msgstr Панель ба_птаулары... #. logout item -#: ../libxfce4panel/xfce-panel-plugin.c:1122 ../panel/panel-window.c:2239 +#: ../libxfce4panel/xfce-panel-plugin.c:1124 ../panel/panel-window.c:2261 msgid Log _Out msgstr Жүйеден ш_ығу @@ -196,15 +196,15 @@ msgstr %s үшін қосулы тұрған нұсқалары табылма msgid Failed to launch the migration application msgstr Көшу қолданбасын жөнелту сәтсіз аяқталды -#: ../panel/panel-application.c:1423 ../plugins/actions/actions.c:413 +#: ../panel/panel-application.c:1446 ../plugins/actions/actions.c:413 msgid You have started X without session manager. Clicking Quit will close the X server. msgstr X серверін сессия басқарушысыз іске қосқансыз. Шығу басылған кезде X сервері өз жұмысын аяқтайды. -#: ../panel/panel-application.c:1424 ../plugins/actions/actions.c:414 +#: ../panel/panel-application.c:1447 ../plugins/actions/actions.c:414 msgid Are you sure you want to quit the panel? msgstr Панельдің жұмысын аяқтауды шынымен қалайсыз ба? -#: ../panel/panel-application.c:1432 ../plugins/actions/actions.c:422 +#: ../panel/panel-application.c:1455 ../plugins/actions/actions.c:422 #, c-format msgid Failed to execute command \%s\ msgstr \%s\ командасын орындау сәтсіз аяқталды @@ -249,29 +249,29 @@ msgstr Панель киоск түрінде қосулы тұр, қалыпт msgid Modifying the panel is not allowed msgstr Бұл панельді түзетуге рұқсат жоқ -#: ../panel/panel-item-dialog.c:175 +#: ../panel/panel-item-dialog.c:188 msgid Add New Items msgstr Жаңа элементтерді қосу -#: ../panel/panel-item-dialog.c:177 +#: ../panel/panel-item-dialog.c:190 msgid Add new plugins to the panel msgstr Панельге жаңа плагиндерді қосу -#: ../panel/panel-item-dialog.c:200 +#: ../panel/panel-item-dialog.c:213 #: ../plugins/launcher/launcher-dialog.glade.h:23 msgid _Search: msgstr І_здеу: -#: ../panel/panel-item-dialog.c:208 +#: ../panel/panel-item-dialog.c:221 msgid Enter search phrase here msgstr Іздеу мәтінін осында енгізіңіз -#: ../panel/panel-plugin-external.c:418 +#: ../panel/panel-plugin-external.c:420 #, c-format msgid Plugin \%s\ unexpectedly left the panel, do you want to restart it? msgstr \%s\ плагині күтпегенде панельден кетті, оны қайта қосу керек пе? -#:
[Xfce4-commits] xfce4-panel:master l10n: Updated Ukrainian (uk) translation to 100%
Updating branch refs/heads/master to e7427628c1af3f2343cb5377e9ac20d3da537919 (commit) from b7b2e938fbb4926a0a01117dcd0e8318aa54b6b0 (commit) commit e7427628c1af3f2343cb5377e9ac20d3da537919 Author: Dmitry Nikitin luckas...@mail.ru Date: Wed Dec 29 08:57:40 2010 +0100 l10n: Updated Ukrainian (uk) translation to 100% New status: 344 messages complete with 0 fuzzies and 0 untranslated. Transmitted-via: Transifex (translations.xfce.org). po/uk.po | 90 +++-- 1 files changed, 46 insertions(+), 44 deletions(-) diff --git a/po/uk.po b/po/uk.po index de31da9..1d8606a 100644 --- a/po/uk.po +++ b/po/uk.po @@ -8,7 +8,7 @@ msgid msgstr Project-Id-Version: xfce4-panel 4.7.0\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2010-12-21 05:09+\n +POT-Creation-Date: 2010-12-29 05:09+\n PO-Revision-Date: 2009-01-26 15:54+0200\n Last-Translator: Dmitry Nikitin luckas...@mail.ru\n Language-Team: Ukrainian xfce4-...@xfce.org\n @@ -32,7 +32,7 @@ msgid Customize the panel msgstr Упорядкувати панель #: ../panel-preferences.desktop.in.h:2 -#: ../panel/panel-preferences-dialog.glade.h:24 ../panel/panel-window.c:2200 +#: ../panel/panel-preferences-dialog.glade.h:24 ../panel/panel-window.c: #: ../migrate/main.c:84 msgid Panel msgstr Панель @@ -55,38 +55,38 @@ msgid Failed to open the documentation browser msgstr Не вдалось відкрити переглядач документації #. I18N: %s is the name of the plugin -#: ../libxfce4panel/xfce-panel-plugin.c:887 +#: ../libxfce4panel/xfce-panel-plugin.c:889 #: ../panel/panel-preferences-dialog.c:1048 #, c-format msgid Are you sure that you want to remove \%s\? msgstr Дійсно бажаєте видалити \%s\? -#: ../libxfce4panel/xfce-panel-plugin.c:892 +#: ../libxfce4panel/xfce-panel-plugin.c:894 #: ../panel/panel-preferences-dialog.c:1051 msgid If you remove the item from the panel, it is permanently lost. msgstr Якщо Ви видалите цей елемент з панелі, він буде повністю втрачений. #. move item -#: ../libxfce4panel/xfce-panel-plugin.c:1052 +#: ../libxfce4panel/xfce-panel-plugin.c:1054 msgid _Move msgstr Пере_містити -#: ../libxfce4panel/xfce-panel-plugin.c:1086 +#: ../libxfce4panel/xfce-panel-plugin.c:1088 msgid Pane_l msgstr Пане_ль #. add new items -#: ../libxfce4panel/xfce-panel-plugin.c:1094 ../panel/panel-window.c:2212 +#: ../libxfce4panel/xfce-panel-plugin.c:1096 ../panel/panel-window.c:2234 msgid Add _New Items... msgstr Дода_ти нові елементи... #. customize panel -#: ../libxfce4panel/xfce-panel-plugin.c:1105 ../panel/panel-window.c:2223 +#: ../libxfce4panel/xfce-panel-plugin.c:1107 ../panel/panel-window.c:2245 msgid Panel Pr_eferences... msgstr Налашт_ування панелі... #. logout item -#: ../libxfce4panel/xfce-panel-plugin.c:1122 ../panel/panel-window.c:2239 +#: ../libxfce4panel/xfce-panel-plugin.c:1124 ../panel/panel-window.c:2261 msgid Log _Out msgstr Вийти з _сеансу @@ -198,15 +198,15 @@ msgstr Не знайдено запущених екземплярів %s msgid Failed to launch the migration application msgstr Не вдалось запустити програму міграції -#: ../panel/panel-application.c:1423 ../plugins/actions/actions.c:413 +#: ../panel/panel-application.c:1446 ../plugins/actions/actions.c:413 msgid You have started X without session manager. Clicking Quit will close the X server. msgstr Ви запустили X без менеджера сесії. Натискання на кнопку виходу закриє X-сервер. -#: ../panel/panel-application.c:1424 ../plugins/actions/actions.c:414 +#: ../panel/panel-application.c:1447 ../plugins/actions/actions.c:414 msgid Are you sure you want to quit the panel? msgstr Ви впевнені, що бажаєте закрити панель? -#: ../panel/panel-application.c:1432 ../plugins/actions/actions.c:422 +#: ../panel/panel-application.c:1455 ../plugins/actions/actions.c:422 #, c-format msgid Failed to execute command \%s\ msgstr Не вдалось виконати команду \%s\ @@ -251,29 +251,29 @@ msgstr Через встановлений режим кіоска, Вам не msgid Modifying the panel is not allowed msgstr Модифікацію панелі не дозволено -#: ../panel/panel-item-dialog.c:175 +#: ../panel/panel-item-dialog.c:188 msgid Add New Items msgstr Додати нові елементи -#: ../panel/panel-item-dialog.c:177 +#: ../panel/panel-item-dialog.c:190 msgid Add new plugins to the panel msgstr Додати нове розширення на панель -#: ../panel/panel-item-dialog.c:200 +#: ../panel/panel-item-dialog.c:213 #: ../plugins/launcher/launcher-dialog.glade.h:23 msgid _Search: msgstr _Пошук: -#: ../panel/panel-item-dialog.c:208 +#: ../panel/panel-item-dialog.c:221 msgid Enter search phrase here msgstr Введіть тут фразу пошуку -#: ../panel/panel-plugin-external.c:418 +#: ../panel/panel-plugin-external.c:420 #, c-format msgid Plugin \%s\ unexpectedly left the panel, do you want to restart it? msgstr Розширення \%s\ раптово зникло з панелі, бажаєте його перезапустити? -#: ../panel/panel-plugin-external.c:420 +#:
